From dfd4faf3f1da5276f26ffc0bf7d89c702db52f64 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 00:45:34 +0000 Subject: [PATCH 1/4] Initialize branch F-13 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..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 10a6a1dd37208a9fc5ce68053f762531a1b9c097 Mon Sep 17 00:00:00 2001 From: Pavel Alexeev Date: Mon, 15 Mar 2010 11:45:02 +0000 Subject: [PATCH 2/4] - 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 c4cd6ce82dd95cb058e7dc6a96cda5df7ae3e5be Mon Sep 17 00:00:00 2001 From: Pavel Alexeev Date: Sun, 30 May 2010 18:45:21 +0000 Subject: [PATCH 3/4] 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 5b42eb03dee9f29251409af740da0149b26f5925 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:44:59 +0000 Subject: [PATCH 4/4] 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 baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 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