diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 164081b..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -rabbit4.1-src.tar.gz -/rabbit4.11-src.tar.gz diff --git a/RabbIT-4.11.fedora-config-path.patch b/RabbIT-4.11.fedora-config-path.patch deleted file mode 100644 index c12aaf8..0000000 --- a/RabbIT-4.11.fedora-config-path.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- 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 deleted file mode 100644 index ee6f96c..0000000 --- a/RabbIT.spec +++ /dev/null @@ -1,244 +0,0 @@ -Name: RabbIT -%global lname %( echo %{name} | tr 'A-Z' 'a-z' ) - -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} - -Version: 4.11 -Release: 6%{?dist} -Summary: Proxy for a faster web -Summary(ru): Прокси для быстрого серфинга в ВЕБе -#By example of squid -Group: System Environment/Daemons -License: BSD -URL: http://www.khelekore.org/rabbit/ -Source0: http://www.khelekore.org/rabbit/%{lname}%{version}-src.tar.gz -#Startup scrip to start/stop daemon. Self produced. -Source1: %{lname}.init -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: jpackage-utils - -Requires: java-headless >= 1:1.6.0, jpackage-utils -Requires: ImageMagick, dnsjava - -#Adjust only used paths in default config. -Patch0: RabbIT-4.11.fedora-config-path.patch - -Requires(pre): /usr/sbin/useradd -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(postun): /usr/sbin/userdel - -BuildArchitectures: noarch - -%description -RabbIT is a web proxy that speeds up web surfing over slow links by doing: - o Compress text pages to gzip streams. This reduces size by up to 75% - o Compress images to 10% jpeg. This reduces size by up to 95% - o Remove advertising - o Remove background images - o Cache filtered pages and images - o Uses keepalive if possible - o Easy and powerful configuration - o Multi threaded solution written in java - o Modular and easily extended - o Complete HTTP/1.1 compliance - -%description -l ru -RabbIT фэто ВЕБ-прокси который ускоряет Ваш серфинг через медленные каналы. -Основные возможности и достоинства: - o Сжимает (gzip) все текстовые страницы. Это уменьшает их размер до 75% - o Сдимает картинки в jpeg с 10% качеством. Это уменьшает их размер до 95%! - o Удаляет рекламу - o Удаляет фоновые картинки - o Кеширует страницы и картинки - o Если доступно, использует постоянные соединения (keepalive) - o Простая, но мощная настройка - o Многопотоковый, написан на Java и работает практически везде. - o Модульный и легкорасширяемый - o Полная поддержка стандарта HTTP/1.1. - -%prep -%setup -q -n %{lname}%{version} - -%patch0 -p0 -b .conf-path - - -%build -# https://fedoraproject.org/wiki/Packaging/Java#class-path-in-manifest -sed -i '/class-path/I d' Manifest.mf -#Adjust path ( https://fedoraproject.org/wiki/Packaging/Java#build-classpath ): -#? sed -i "s#../external_libs/dnsjava-2.[[:digit:]].[[:digit:]].jar#$(build-classpath dnsjava)#" Manifest.mf - -make %{?_smp_mflags} - -#Make script-wrapper -cat << HEREDOC > %{name} -#!/bin/sh -java -jar %{_javadir}/%{name}.jar -f %{_sysconfdir}/%{name}/%{name}.conf -HEREDOC - -# Author say what it is iso-8859-1 -iconv -f iso-8859-1 -t UTF-8 htdocs/LICENSE.txt > htdocs/LICENSE.utf-8.txt -touch --reference htdocs/LICENSE.txt htdocs/LICENSE.utf-8.txt -iconv -f iso-8859-1 -t UTF-8 LICENSE > LICENSE.utf-8 -touch --reference LICENSE LICENSE.utf-8 -mv htdocs/LICENSE.utf-8.txt htdocs/LICENSE.txt -mv LICENSE.utf-8 LICENSE - -%install -rm -rf %{buildroot} -install -d %{buildroot}/%{_javadir} -install -m644 jars/rabbit4.jar %{buildroot}/%{_javadir}/%{name}.jar -install -d %{buildroot}/%{_bindir} -install -m755 %{name} %{buildroot}/%{_bindir}/%{name} - -install -d %{buildroot}/%{_sysconfdir}/%{name} -install -d %{buildroot}/%{_initrddir}/ - -sed 's#{{HTDOCS}}#%{_datadir}/%{name}#' %{SOURCE1} > %{buildroot}/%{_initrddir}/%{lname} - -install -d %{buildroot}/%{_datadir}/%{name}/htdocs -cp -r htdocs/* %{buildroot}/%{_datadir}/%{name}/htdocs/ - -install -d %{buildroot}/%{_localstatedir}/log/%{name} - -touch %{buildroot}/%{_localstatedir}/log/%{name}/main_run.log - -# We exclude rabbit.conf.orig, so, we can't do just install whole directory -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/nocache.conf %{buildroot}/%{_sysconfdir}/%{name}/ -install -m644 conf/%{lname}.conf %{buildroot}/%{_sysconfdir}/%{name}/%{name}.conf -install -m644 conf/users %{buildroot}/%{_sysconfdir}/%{name}/ - -%pre -# Add the "rabbit" user -/usr/sbin/useradd -c "%{lname}" -s /sbin/nologin -r -d "%{_pkgdocdir}/%{name}-%{version}" %{lname} 2> /dev/null || : - -%post -# Register service -/sbin/chkconfig --add %{lname} - -%preun -if [ $1 = 0 ]; then - /sbin/service %{lname} stop > /dev/null 2>&1 - /sbin/chkconfig --del %{lname} -fi - -%postun -/usr/sbin/userdel %{lname} - -%clean -rm -rf %{buildroot} - -%files -%defattr(-,root,root,-) -%attr(755,root,root) %{_initrddir}/%{lname} -%doc ChangeLog README Help.txt LICENSE -%{_datadir}/%{name}/ -%{_javadir}/%{name}.jar -%attr(755,%{lname},root) %{_bindir}/%{name} -%dir %attr(755,%{lname},root) %{_localstatedir}/log/%{name} -%attr(755,%{lname},root) %ghost %{_localstatedir}/log/%{name}/main_run.log -%config(noreplace) %{_sysconfdir}/%{name}/access -%config(noreplace) %{_sysconfdir}/%{name}/allowed -%config(noreplace) %{_sysconfdir}/%{name}/cache_only.conf -%config(noreplace) %{_sysconfdir}/%{name}/nocache.conf -%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf -%config(noreplace) %{_sysconfdir}/%{name}/users - -%changelog -* Wed Feb 03 2016 Fedora Release Engineering - 4.11-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jun 16 2015 Fedora Release Engineering - 4.11-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Jun 06 2014 Fedora Release Engineering - 4.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Mar 3 2014 Pavel Alexeev - 4.11-3 -- Require java-headless instead of java bz#1067945. - -* Wed Oct 23 2013 Pavel Alexeev - 4.11-2 -- Make jar unversioned - bz#1022161 - -* 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). - -* Fri Aug 02 2013 Fedora Release Engineering - 4.1-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 4.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 4.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 4.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 4.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Aug 15 2009 Pavel Alexeev - 4.1-9 -- Step to version 4.1. -- Robert Oloffson kindly change version enumeration by my request, now tarball have version and release. -- Own log dir also by %%{lname} user - -* Sun Aug 9 2009 Pavel Alexeev - 4.0-8 -- Step to new version 4.0 -- Use %%{name} in Source url -- Add %%ghost %%{_localstatedir}/log/%%{name}/main_run.log -- Own as rabbit user only binary file, not all package. -- Remove name from summary. -- Add russian localized Summary and description. -- Own %%{_datadir}/%%{name}/ instead of %%{_datadir}/%%{name}/htdocs -- Source1 RabbIT.init renamed to rabbit.init. -- Remade Patch0: RabbIT-3.17.fedora-config-path.patch -> RabbIT-4.0.fedora-config-path.patch -- Delete TODO from docs, it is not present anymore. -- Add lsb # Default-Start: 2 3 4 5, # Default-Stop: 0 1 6 to init file to do rpmlint happy. Turn pid and lock files to lowercase. -- Delete classpath from manifest. -- Default disable service running: --level - - -* Mon Apr 27 2009 Pavel Alexeev - 3.18-7 -- Accidentally leaved httpd instead on %%name in %%post script fixed. -- Path of http-root files changed from %%{_docdir}/%%{name}-%%{version} to %%{_datadir}/%%{name} - -* Sun Apr 12 2009 Pavel Alexeev - 3.18-6 -- In review ( https://bugzilla.redhat.com/show_bug.cgi?id=492810 ) was tald pack dnsjava separate. Do it: - o Remove bundled jar-package - o Cutoff classpath from manifest - o Add Requires dnsjava - -* Wed Apr 01 2009 Pavel Alexeev - 3.18-5 -- New version 3.18 - -* Tue Mar 31 2009 Pavel Alexeev - 3.17-4 -- After aontact author, now I known encoding of License (iso-8859-1) and recode it. -- Exclude /etc/RabbIT/empty.conf - -* Sun Mar 29 2009 Pavel Alexeev - 3.17-3 -- Add %%doc htdocs -- Add run from another user, not root! For that: - o Add Requires(pre): /usr/sbin/useradd - o Requires(postun): /usr/sbin/userdel - o In pre and postun sections add/delete user rabbit. -- Add %%{_localstatedir}/log/%%{name} in package. -- Inspired by rpmlint: - o %%{_initrddir}/%%{name} renamed to %%{_initrddir}/%%{lname} - -* Sun Mar 29 2009 Pavel Alexeev - 3.17-2 -- Add registration of service with chkconfig. Add it into Requires(post/preun), and according sections. -- BuildArchitectures: noarch -- Install also %%{_javadir}/dnsjava-2.0.6.jar - -* Sun Mar 29 2009 Pavel Alexeev - 3.17-1 -- Initial spec file. \ No newline at end of file diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..1186b4b --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Retire packages without systemd support, See FESCo ticket 1605 diff --git a/rabbit.init b/rabbit.init deleted file mode 100644 index ba4d3cc..0000000 --- a/rabbit.init +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/bash -# -# rabbit Startup script for the RabbIT proxy server -# -# chkconfig: - 85 15 -# description: RabbIT is a web proxy that speeds up web surfing over slow links by doing: -# o Compress text pages to gzip streams. This reduces size by up to 75% -# o Compress images to 10% jpeg. This reduces size by up to 95% -# o Remove advertising -# o Remove background images -# o Cache filtered pages and images -# o Uses keepalive if possible -# o Easy and powerful configuration -# o Multi threaded solution written in java -# o Modular and easily extended -# o Complete HTTP/1.1 compliance -# config: /etc/RabbIT/access -# config: /etc/RabbIT/allowed -# config: /etc/RabbIT/cache_only.conf -# config: /etc/RabbIT/empty.conf -# config: /etc/RabbIT/nocache.conf -# config: /etc/RabbIT/rabbit.conf -# config: /etc/RabbIT/users -# pidfile: /var/run/RabbIT.pid -# -### BEGIN INIT INFO -# Provides: rabbit -# Required-Start: $local_fs $remote_fs $network $named -# Required-Stop: $local_fs $remote_fs $network -# Should-Start: distcache -# Default-Stop: 0 1 6 -# Short-Description: Start and stop the RabbIT proxy server -# Description: RabbIT is a web proxy that speeds up web surfing over slow links by doing: -# o Compress text pages to gzip streams. This reduces size by up to 75% -# o Compress images to 10% jpeg. This reduces size by up to 95% -# o Remove advertising -# o Remove background images -# o Cache filtered pages and images -# o Uses keepalive if possible -# o Easy and powerful configuration -# o Multi threaded solution written in java -# o Modular and easily extended -# o Complete HTTP/1.1 compliance -### END INIT INFO - -# Source function library. -. /etc/rc.d/init.d/functions - -bin='/usr/bin/RabbIT' -prog='RabbIT proxy' -pidfile=${PIDFILE-/var/run/rabbit.pid} -lockfile=${LOCKFILE-/var/lock/subsys/rabbit} -HTDOCS_DIR="{{HTDOCS}}" -USER='rabbit' -RETVAL=0 - -start(){ - echo -n $"Starting $prog: " - daemon +15 --pidfile="$pidfile" --user="$USER" sh -c "cd \"$HTDOCS_DIR\"; exec \"$bin\" 2>&1 >> /var/log/RabbIT/main_run.log &" - RETVAL=$? - echo - if [ 0 -eq $RETVAL ]; then - touch ${lockfile} - #Pid of parent sh script - p=$( __pids_pidof "$bin" ) - [ -n $p ] && echo "Error: pid not found" && exit 1 - # Pid of child. Real java process!!! Idea from: http://209.85.129.132/search?q=cache:QnI67WuZkRcJ:www.experts-exchange.com/Programming/System/Linux/Q_20943601.html+kill+all+childs&cd=14&hl=en&ct=clnk - p=$(ps axef -o ppid,pid | sed -nr "s#^$p (.+)\$#\1#p") - echo $p > "$pidfile" - fi - return $RETVAL -} - -stop(){ - echo -n $"Stopping $prog: " - killproc -p ${pidfile} - RETVAL=$? - echo - [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile} -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status $bin - RETVAL=$? - ;; - restart) - stop - start - ;; - condrestart) - if [ -f ${pidfile} ] ; then - stop - start - fi - ;; - *) - echo $"Usage: $prog {start|stop|restart|condrestart|status}" - RETVAL=3 -esac - -exit $RETVAL \ No newline at end of file diff --git a/sources b/sources deleted file mode 100644 index 40328ed..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -b677e795fc89b8b6909435a2045edcfa rabbit4.11-src.tar.gz