diff --git a/.gitignore b/.gitignore index 5965c53..164081b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ rabbit4.1-src.tar.gz +/rabbit4.11-src.tar.gz diff --git a/RabbIT-4.0.fedora-config-path.patch b/RabbIT-4.0.fedora-config-path.patch deleted file mode 100644 index cdc58a4..0000000 --- a/RabbIT-4.0.fedora-config-path.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -NaurEbBH conf.orig/rabbit.conf conf/rabbit.conf ---- conf.orig/rabbit.conf 2009-01-11 21:32:34.000000000 +0300 -+++ conf/rabbit.conf 2009-03-29 16:02:05.000000000 +0400 -@@ -49,10 +49,10 @@ - # is used or you can set the system property - # "java.util.logging.config.file" to configure your own loggers/handlers. - # --access_log=logs/access_log.%g -+access_log=/var/log/RabbIT/access_log.%g - access_size_limit=10 # in MB - access_num_files=100 --error_log=logs/error_log.%g -+error_log=/var/log/RabbIT/error_log.%g - error_size_limit=1 # in MB - error_num_files=10 - -@@ -242,7 +242,7 @@ - # This is a filter to allow simple accesscontrol. - - # this file store the available ip-ranges that can use the proxy. --accessfile=conf/access -+accessfile=/etc/RabbIT/access - - - [rabbit.filter.HttpBaseFilter] -@@ -254,7 +254,7 @@ - - # authenticate users (basic method only) with this user-password file. - # this is used for meta/admin access... --userfile=conf/users -+userfile=/etc/RabbIT/users - - # If you set cookieid to "true" rabbit will not cache resources - # that seem to use cookie based identification. This should only -@@ -332,7 +332,7 @@ - # This filter is not enabled by default, add it to - # httpinfilters if you want it. - # allowed user.. --userfile=conf/allowed -+userfile=/etc/RabbIT/allowed - - - [rabbit.filter.SQLProxyAuth] diff --git a/RabbIT-4.11.fedora-config-path.patch b/RabbIT-4.11.fedora-config-path.patch new file mode 100644 index 0000000..c12aaf8 --- /dev/null +++ b/RabbIT-4.11.fedora-config-path.patch @@ -0,0 +1,42 @@ +--- conf/rabbit.conf.orig 2012-02-05 13:28:20.000000000 +0400 ++++ conf/rabbit.conf 2013-10-07 20:35:56.208438331 +0400 +@@ -79,10 +79,10 @@ + # is used or you can set the system property + # "java.util.logging.config.file" to configure your own loggers/handlers. + # +-access_log=logs/access_log.%g ++access_log=/var/log/RabbIT/access_log.%g + access_size_limit=10 # in MB + access_num_files=100 +-error_log=logs/error_log.%g ++error_log=/var/log/RabbIT/error_log.%g + error_size_limit=1 # in MB + error_num_files=10 + +@@ -302,7 +302,7 @@ + # This is a filter to allow simple accesscontrol. + + # this file store the available ip-ranges that can use the proxy. +-accessfile=conf/access ++accessfile=/etc/RabbIT/access + + + [rabbit.filter.HttpBaseFilter] +@@ -314,7 +314,7 @@ + + # authenticate users (basic method only) with this user-password file. + # this is used for meta/admin access... +-userfile=conf/users ++userfile=/etc/RabbIT/users + + # If you set cookieid to "true" rabbit will not cache resources + # that seem to use cookie based identification. This should only +@@ -422,7 +422,7 @@ + # rabbit.filter.authenticate.Authenticator interface. + authenticator=plain + # For plain text file authentication: +-userfile=conf/allowed ++userfile=/etc/RabbIT/allowed + + # The database resource to use, must match a loaded resource + #resource=jdbc/host_blocker_database diff --git a/RabbIT.spec b/RabbIT.spec index fde0055..9463488 100644 --- a/RabbIT.spec +++ b/RabbIT.spec @@ -3,8 +3,8 @@ Name: RabbIT %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} -Version: 4.1 -Release: 15%{?dist} +Version: 4.11 +Release: 1%{?dist} Summary: Proxy for a faster web Summary(ru): Прокси для быстрого серфинга в ВЕБе #By example of squid @@ -23,7 +23,7 @@ Requires: java >= 1:1.6.0, jpackage-utils Requires: ImageMagick, dnsjava #Adjust only used paths in default config. -Patch0: RabbIT-4.0.fedora-config-path.patch +Patch0: RabbIT-4.11.fedora-config-path.patch Requires(pre): /usr/sbin/useradd Requires(post): chkconfig @@ -60,7 +60,7 @@ RabbIT фэто ВЕБ-прокси который ускоряет Ваш се� o Полная поддержка стандарта HTTP/1.1. %prep -%setup -q -n %{lname}4 +%setup -q -n %{lname}%{version} %patch0 -p0 -b .conf-path @@ -103,7 +103,6 @@ install -d %{buildroot}/%{_datadir}/%{name}/htdocs cp -r htdocs/* %{buildroot}/%{_datadir}/%{name}/htdocs/ install -d %{buildroot}/%{_localstatedir}/log/%{name} -#install -d %{buildroot}/%{_localstatedir}/run/%{name}.pid touch %{buildroot}/%{_localstatedir}/log/%{name}/main_run.log @@ -111,7 +110,6 @@ touch %{buildroot}/%{_localstatedir}/log/%{name}/main_run.log install -m644 conf/access %{buildroot}/%{_sysconfdir}/%{name}/ install -m644 conf/allowed %{buildroot}/%{_sysconfdir}/%{name}/ install -m644 conf/cache_only.conf %{buildroot}/%{_sysconfdir}/%{name}/ -#install -m644 conf/empty.conf %{buildroot}/%{_sysconfdir}/%{name}/ install -m644 conf/nocache.conf %{buildroot}/%{_sysconfdir}/%{name}/ install -m644 conf/%{lname}.conf %{buildroot}/%{_sysconfdir}/%{name}/%{name}.conf install -m644 conf/users %{buildroot}/%{_sysconfdir}/%{name}/ @@ -148,12 +146,15 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/%{name}/access %config(noreplace) %{_sysconfdir}/%{name}/allowed %config(noreplace) %{_sysconfdir}/%{name}/cache_only.conf -#%config(noreplace) %{_sysconfdir}/%{name}/empty.conf %config(noreplace) %{_sysconfdir}/%{name}/nocache.conf %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) %{_sysconfdir}/%{name}/users %changelog +* Mon Oct 7 2013 Pavel Alexeev - 4.11-1 +- Update to 4.11 to fix badurl (http://www.mail-archive.com/devel@lists.fedoraproject.org/msg67796.html) +- Rebase patch RabbIT-4.0.fedora-config-path.patch to RabbIT-4.11.fedora-config-path.patch + * Sat Aug 24 2013 Pavel Alexeev - 4.1-15 - Reflect docdir changes (bz#993928). diff --git a/sources b/sources index 0d19000..40328ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ee3ae82bf8757102aa748d2feed38727 rabbit4.1-src.tar.gz +b677e795fc89b8b6909435a2045edcfa rabbit4.11-src.tar.gz