From c7b25b8d05ec8202a2dc60803d81b0bd185b1c4f Mon Sep 17 00:00:00 2001 From: Pavel Alexeev Date: Mon, 15 Mar 2010 11:38:55 +0000 Subject: [PATCH 1/5] - Update to version 0.6.1 - In NM event processing replace service restart to condrestart - BZ#572662 --- .cvsignore | 2 +- 3proxy.spec | 10 +++++++--- sources | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6e2ffc7..fa2cc0c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +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 db96c92..b2477f8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -2ebd9c06939021f6c2aca31d67782f71 3proxy-0.6.tgz d9a0d2959ed2d5511ea59c563d34b692 3proxy.cfg -9aff12ce0d7dfc69ac7b4794a7747ae0 3proxy.init +5b15eaeb993ca0b048a5bc0f2b53465b 3proxy.init +03790467a12e16ed8785ae688ecf9b68 3proxy-0.6.1.tgz From 4460b1f8d0121c3c27be9d1c1cec418f7ae24e49 Mon Sep 17 00:00:00 2001 From: Pavel Alexeev Date: Sun, 30 May 2010 17:58:04 +0000 Subject: [PATCH 2/5] Correct path to config file in man (BUG#596087) add Patch0: 3proxy-0.6.1-config-path.patch --- .cvsignore | 4 +--- sources | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index fa2cc0c..ef3c88b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -3proxy.cfg -3proxy.init -3proxy-0.6.1.tgz +3proxy-0.6.1-config-path.patch diff --git a/sources b/sources index b2477f8..887f550 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -d9a0d2959ed2d5511ea59c563d34b692 3proxy.cfg -5b15eaeb993ca0b048a5bc0f2b53465b 3proxy.init -03790467a12e16ed8785ae688ecf9b68 3proxy-0.6.1.tgz +b20790ea04b8cd8b366df9323416f604 3proxy-0.6.1-config-path.patch From cd8f98ab6c305205bdbbe4c4a9950c85071b2d4d Mon Sep 17 00:00:00 2001 From: Pavel Alexeev Date: Sun, 30 May 2010 18:18:12 +0000 Subject: [PATCH 3/5] Correct path to config file in man (BUG#596087) add Patch0: 3proxy-0.6.1-config-path.patch --- .cvsignore | 3 +++ 3proxy.spec | 10 +++++++++- sources | 3 +++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.cvsignore b/.cvsignore index ef3c88b..08ff98a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,4 @@ +3proxy.init +3proxy.cfg +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 887f550..5cf5eeb 100644 --- a/sources +++ b/sources @@ -1 +1,4 @@ +5b15eaeb993ca0b048a5bc0f2b53465b 3proxy.init +d9a0d2959ed2d5511ea59c563d34b692 3proxy.cfg +03790467a12e16ed8785ae688ecf9b68 3proxy-0.6.1.tgz b20790ea04b8cd8b366df9323416f604 3proxy-0.6.1-config-path.patch From 5970885433b1ab7ffc77e5cf906042670e8112d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:45:04 +0000 Subject: [PATCH 4/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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/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 From c5cc3de94b466824f302497981a84ec15b9db8af Mon Sep 17 00:00:00 2001 From: "Pavel Alexeev (aka Pahan-Hubbitus)" Date: Thu, 4 Nov 2010 18:07:18 +0300 Subject: [PATCH 5/5] - Add man3/3proxy.cfg.3 man (BZ#648204). - Gone explicit man gzip - leave it for rpm. --- 3proxy.cfg | 2 +- 3proxy.spec | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/3proxy.cfg b/3proxy.cfg index 8212546..1c038ac 100644 --- a/3proxy.cfg +++ b/3proxy.cfg @@ -175,4 +175,4 @@ admin # now we needn't any root rights. We can chroot and setgid/setuid. -###$Id: 3proxy.cfg,v 1.1 2009/08/27 20:14:25 hubbitus Exp $####### +###$Id: 3proxy.cfg.sample,v 1.5 2004/07/16 12:37:20 vlad Exp $####### diff --git a/3proxy.spec b/3proxy.spec index 971b34c..5849319 100644 --- a/3proxy.spec +++ b/3proxy.spec @@ -1,6 +1,6 @@ Name: 3proxy Version: 0.6.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Tiny but very powerful proxy Summary(ru): Маленький, но крайне мощный прокси-сервер @@ -53,7 +53,7 @@ rm -rf %{buildroot} mkdir -p %{buildroot}%{_sysconfdir} mkdir -p %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/ -mkdir -p %{buildroot}%{_mandir}/man8 +mkdir -p %{buildroot}%{_mandir}/man{3,8} mkdir -p %{buildroot}%{_localstatedir}/log/%{name} install -m755 -D src/3proxy %{buildroot}%{_bindir}/3proxy install -m755 -D src/dighosts %{buildroot}%{_bindir}/dighosts @@ -69,9 +69,8 @@ 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" + for man in man/*.{3,8} ; do + install "$man" "%{buildroot}%{_mandir}/man${man:(-1)}/" done cat > %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/40-%{name} < - 0.6.1-10 +- Add man3/3proxy.cfg.3 man (BZ#648204). +- Gone explicit man gzip - leave it for rpm. + * 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