From e2fff6d960484df187c811cb0d3793a63c1c85cd Mon Sep 17 00:00:00 2001 From: Pavel Alexeev Date: Mon, 9 Nov 2009 12:48:51 +0000 Subject: [PATCH 1/7] - Fix BZ#533144: - Add reload section to service file, fix stop. - Add %%{_sysconfdir}/NetworkManager/dispatcher.d/40-%%{name} (Thanks to Pankaj Pandey) - Include man-files. - Add Requires: initscripts as owner directory %%{_sysconfdir}/NetworkManager/dispatcher.d/ --- 3proxy.spec | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/3proxy.spec b/3proxy.spec index a902b18..5c41b07 100644 --- a/3proxy.spec +++ b/3proxy.spec @@ -1,6 +1,6 @@ Name: 3proxy Version: 0.6 -Release: 3%{?dist} +Release: 5%{?dist} Summary: Tiny but very powerful proxy Summary(ru): Маленький, но крайне мощный прокси-сервер @@ -15,6 +15,7 @@ Source2: 3proxy.cfg # EPEL still require it BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dos2unix +Requires: initscripts %description 3proxy -- light proxy server. @@ -46,9 +47,8 @@ dos2unix Changelog rm -rf %{buildroot} mkdir -p %{buildroot}%{_sysconfdir} -mkdir -p %{buildroot}%{_sysconfdir} -mkdir -p %{buildroot}%{_man3dir} -mkdir -p %{buildroot}%{_man8dir} +mkdir -p %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/ +mkdir -p %{buildroot}%{_mandir}/man8 mkdir -p %{buildroot}%{_localstatedir}/log/%{name} install -m755 -D src/3proxy %{buildroot}%{_bindir}/3proxy install -m755 -D src/dighosts %{buildroot}%{_bindir}/dighosts @@ -64,6 +64,19 @@ install -m755 -D src/udppm %{buildroot}%{_bindir}/udppm install -pD -m755 %{SOURCE1} %{buildroot}/%{_initrddir}/%{name} install -pD -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}.cfg + for man in man/*.8 ; do + gzip -9c "$man" > "%{buildroot}%{_mandir}/man8/$( basename $man ).gz" + touch --reference "$man" "%{buildroot}%{_mandir}/man8/$( basename $man ).gz" + done + +cat > %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/40-%{name} < - 0.6-5 +- Fix BZ#533144: +- Add reload section to service file, fix stop. +- Add %%{_sysconfdir}/NetworkManager/dispatcher.d/40-%%{name} (Thanks to Pankaj Pandey) +- Include man-files. +- Add Requires: initscripts as owner directory %%{_sysconfdir}/NetworkManager/dispatcher.d/ + * Thu Aug 20 2009 Pavel Alexeev - 0.6-3 - Fedora Review started - thank you Peter Lemenkov. - Change rights (0755->0644) of config. From 06b3766248613053b2e75c97f6f4d076a0004a55 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:49:52 +0000 Subject: [PATCH 2/7] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d1e1256..543adab 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: 3proxy -# $Id$ +# $Id: Makefile,v 1.1 2009/08/26 22:17:25 kevin Exp $ NAME := 3proxy SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 0d61de1c9c59e83d6ef353fa9712e320cf3fbdd9 Mon Sep 17 00:00:00 2001 From: Pavel Alexeev Date: Sat, 28 Nov 2009 22:29:58 +0000 Subject: [PATCH 3/7] Again new init-script for Fix BZ#533144 :). --- 3proxy.init | 16 +++++++--------- 3proxy.spec | 8 +++++++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/3proxy.init b/3proxy.init index 47948da..556ee54 100644 --- a/3proxy.init +++ b/3proxy.init @@ -11,7 +11,6 @@ # # processname: 3proxy # config: /etc/3proxy.cfg -# pidfile: /var/run/3proxy.pid WITHOUT_RC_COMPAT=1 @@ -22,26 +21,25 @@ prog=3proxy CONFIG=/etc/3proxy.cfg PROXY=/usr/bin/3proxy RETVAL=0 -PIDFILE=/var/run/3proxy.pid LOCKFILE=/var/lock/subsys/3proxy #LOGFILE=/var/log/3proxy.log start() { echo -n $"Starting $prog: " # daemon --pidfile "${PIDFILE}" sh -c "exec \"$PROXY\" \"$CONFIG\" 2>&1 > \"$LOGFILE\" &" - daemon --pidfile "${PIDFILE}" "$PROXY" "$CONFIG" + daemon "$PROXY" "$CONFIG" RETVAL=$? echo - [ $RETVAL = 0 ] && touch ${LOCKFILE} + [ 0 -eq $RETVAL ] && touch ${LOCKFILE} return $RETVAL } stop() { echo -n $"Stopping $prog: " - killproc -p "${PIDFILE}" -d 1 "$PROXY" + killproc -d 3 "$prog" RETVAL=$? echo - [ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE} + [ 0 -eq $RETVAL ] && rm -f ${LOCKFILE} return $RETVAL } @@ -52,7 +50,7 @@ restart() { reload(){ echo -n $"Reloading $prog: " - killproc -p ${pidfile} $httpd -USR1 + killproc $prog -USR1 RETVAL=$? echo } @@ -75,11 +73,11 @@ case "$1" in RETVAL=$? ;; status) - status -p "$PIDFILE" "$PROXY" + status "$PROXY" RETVAL=$? ;; *) - echo $"Usage: $0 {start|stop|restart|condrestart|status}" + echo $"Usage: $0 {start|stop|restart|condrestart|status|reload}" RETVAL=1 ;; esac diff --git a/3proxy.spec b/3proxy.spec index 5c41b07..6fee4ad 100644 --- a/3proxy.spec +++ b/3proxy.spec @@ -1,6 +1,6 @@ Name: 3proxy Version: 0.6 -Release: 5%{?dist} +Release: 7%{?dist} Summary: Tiny but very powerful proxy Summary(ru): Маленький, но крайне мощный прокси-сервер @@ -101,6 +101,12 @@ fi %{_mandir}/man8/*.8.gz %changelog +* Wed Nov 25 2009 Pavel Alexeev - 0.6-7 +- Again new init-script for Fix BZ#533144 :). + +* Wed Nov 25 2009 Pavel Alexeev - 0.6-6 +- Forgot commit new init-script for Fix BZ#533144. + * Sun Nov 8 2009 Pavel Alexeev - 0.6-5 - Fix BZ#533144: - Add reload section to service file, fix stop. From d9f0f0a043f605dcce4515cc1f71eed35ed86f75 Mon Sep 17 00:00:00 2001 From: Pavel Alexeev Date: Mon, 15 Mar 2010 13:01:05 +0000 Subject: [PATCH 4/7] - Update to version 0.6.1 - In NM event processing replace service restart to condrestart - BZ#572662 --- .cvsignore | 4 +++- 3proxy.spec | 10 +++++++--- sources | 4 +++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index e7857b0..fa2cc0c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,3 @@ -3proxy-0.6.tgz +3proxy.cfg +3proxy.init +3proxy-0.6.1.tgz diff --git a/3proxy.spec b/3proxy.spec index 6fee4ad..d7fd40d 100644 --- a/3proxy.spec +++ b/3proxy.spec @@ -1,6 +1,6 @@ Name: 3proxy -Version: 0.6 -Release: 7%{?dist} +Version: 0.6.1 +Release: 8%{?dist} Summary: Tiny but very powerful proxy Summary(ru): Маленький, но крайне мощный прокси-сервер @@ -73,7 +73,7 @@ cat > %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/40-%{name} < - 0.6.1-8 +- Update to version 0.6.1 +- In NM event processing replace service restart to condrestart - BZ#572662 + * Wed Nov 25 2009 Pavel Alexeev - 0.6-7 - Again new init-script for Fix BZ#533144 :). diff --git a/sources b/sources index dd62cf4..b2477f8 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -2ebd9c06939021f6c2aca31d67782f71 3proxy-0.6.tgz +d9a0d2959ed2d5511ea59c563d34b692 3proxy.cfg +5b15eaeb993ca0b048a5bc0f2b53465b 3proxy.init +03790467a12e16ed8785ae688ecf9b68 3proxy-0.6.1.tgz From a3195c9ba261a846659933fe2b819735e071513c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 01:41:05 +0000 Subject: [PATCH 5/7] Initialize branch EL-6 for 3proxy --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 2048bbd6fccbcea9c04b79b2dc59077ad1ea0f05 Mon Sep 17 00:00:00 2001 From: Pavel Alexeev Date: Sun, 30 May 2010 18:54:59 +0000 Subject: [PATCH 6/7] Correct path to config file in man (BUG#596087) add Patch0: 3proxy-0.6.1-config-path.patch --- .cvsignore | 1 + 3proxy.spec | 10 +++++++++- sources | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.cvsignore b/.cvsignore index fa2cc0c..729eb92 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ 3proxy.cfg 3proxy.init 3proxy-0.6.1.tgz +3proxy-0.6.1-config-path.patch diff --git a/3proxy.spec b/3proxy.spec index d7fd40d..971b34c 100644 --- a/3proxy.spec +++ b/3proxy.spec @@ -1,6 +1,6 @@ Name: 3proxy Version: 0.6.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Tiny but very powerful proxy Summary(ru): Маленький, но крайне мощный прокси-сервер @@ -17,6 +17,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dos2unix Requires: initscripts +# I correct config path in man only. It is fully Fedora related. +Patch0: 3proxy-0.6.1-config-path.patch + %description 3proxy -- light proxy server. Universal proxy server with HTTP, HTTPS, SOCKS v4, SOCKS v4a, SOCKS v5, FTP, @@ -35,6 +38,8 @@ SOCKS v5, FTP, POP3, UDP и TCP проброс портов (portmapping), сп %prep %setup -q +%patch0 -p0 -b .man-cfg + # To use "fedora" CFLAGS (exported) sed -i -e "s/CFLAGS =/CFLAGS +=/" Makefile.Linux @@ -101,6 +106,9 @@ fi %{_mandir}/man8/*.8.gz %changelog +* Sun May 30 2010 Pavel Alexeev - 0.6.1-9 +- Correct path to config file in man (BUG#596087) add Patch0: 3proxy-0.6.1-config-path.patch + * Mon Mar 15 2010 Pavel Alexeev - 0.6.1-8 - Update to version 0.6.1 - In NM event processing replace service restart to condrestart - BZ#572662 diff --git a/sources b/sources index b2477f8..8f58d6e 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ d9a0d2959ed2d5511ea59c563d34b692 3proxy.cfg 5b15eaeb993ca0b048a5bc0f2b53465b 3proxy.init 03790467a12e16ed8785ae688ecf9b68 3proxy-0.6.1.tgz +b20790ea04b8cd8b366df9323416f604 3proxy-0.6.1-config-path.patch From 33979d921686634d422526e1f0b391fb66c9da66 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:45:05 +0000 Subject: [PATCH 7/7] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 543adab..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: 3proxy -# $Id: Makefile,v 1.1 2009/08/26 22:17:25 kevin Exp $ -NAME := 3proxy -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 diff --git a/import.log b/import.log deleted file mode 100644 index 6fff697..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -proxy-0_6-3_fc11:HEAD:3proxy-0.6-3.fc11.src.rpm:1251404030