network/3proxy: Updated for version 0.6

4 files changed, 81 insertions, 0 deletions

diff --git a/network/3proxy/patches/Makefile.Linux.patch b/network/3proxy/patches/Makefile.Linux.patch
new file mode 100644
index 000000000000..e8705daee3f6
--- /dev/null
+++ b/network/3proxy/patches/Makefile.Linux.patch
@@ -0,0 +1,21 @@
+diff -Nur 3proxy-0.6.orig/Makefile.Linux 3proxy-0.6/Makefile.Linux
+--- 3proxy-0.6.orig/Makefile.Linux	2008-09-30 08:58:43.000000000 -0500
++++ 3proxy-0.6/Makefile.Linux	2009-06-24 12:01:44.148796740 -0500
+@@ -11,7 +11,7 @@
+ BUILDDIR =
+ CC = gcc
+ 
+-CFLAGS = -Wall -g -O2 -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
++CFLAGS = -Wall -g $(EXTRA_CFLAGS) -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
+ COUT = -o 
+ LN = gcc
+ DCFLAGS = -fpic
+@@ -69,7 +69,7 @@
+ 
+ install-bin:
+ 	$(INSTALL_BIN) -d $(BINDIR)
+-	$(INSTALL_BIN) -s $(INSTALL_OBJS) $(BINDIR)
++	$(INSTALL_BIN) $(INSTALL_OBJS) $(BINDIR)
+ 
+ install-etc-dir:
+ 	$(INSTALL_BIN) -d $(ETCDIR)
diff --git a/network/3proxy/patches/add3proxyuser.sh.patch b/network/3proxy/patches/add3proxyuser.sh.patch
new file mode 100644
index 000000000000..8a0ca8800686
--- /dev/null
+++ b/network/3proxy/patches/add3proxyuser.sh.patch
@@ -0,0 +1,15 @@
+diff -Nur 3proxy-0.6.orig/scripts/add3proxyuser.sh 3proxy-0.6/scripts/add3proxyuser.sh
+--- 3proxy-0.6.orig/scripts/add3proxyuser.sh	2007-06-11 03:18:12.000000000 -0500
++++ 3proxy-0.6/scripts/add3proxyuser.sh	2009-06-24 12:27:33.614202884 -0500
+@@ -1,8 +1,8 @@
+ #!/bin/sh
+ if [ $4 ]; then  
+-	echo $1:`/usr/local/etc/3proxy/bin/mycrypt $$ $2` >> /usr/local/etc/3proxy/passwd
+-	echo countin \"`wc -l /usr/local/etc/3proxy/counters|awk '{print $1}'`/$1\" D $3 $1 >> /usr/local/etc/3proxy/counters
+-	echo bandlimin $4 $1 >> /usr/local/etc/3proxy/bandlimiters
++	echo $1:`/usr/bin/mycrypt $$ $2` >> /etc/3proxy/passwd
++	echo countin \"$(wc -l /etc/3proxy/counters | awk '{print $1}')/$1\" D $3 $1 >> /etc/3proxy/counters
++	echo bandlimin $4 $1 >> /etc/3proxy/bandlimiters
+ else
+ 	echo usage: $0 username password day_limit bandwidth
+ 	echo "	"day_limit - traffic limit in MB per day
diff --git a/network/3proxy/patches/fix_etcdir.patch b/network/3proxy/patches/fix_etcdir.patch
new file mode 100644
index 000000000000..1390d3c630b3
--- /dev/null
+++ b/network/3proxy/patches/fix_etcdir.patch
@@ -0,0 +1,12 @@
+diff -Nur 3proxy-0.6.orig/src/stringtable.c 3proxy-0.6/src/stringtable.c
+--- 3proxy-0.6.orig/src/stringtable.c	2008-02-03 05:28:24.000000000 -0600
++++ 3proxy-0.6/src/stringtable.c	2009-06-24 12:21:01.637499557 -0500
+@@ -38,7 +38,7 @@
+ /* 24 */	NULL,
+ #ifndef TPROXY_CONF
+ #ifndef _WIN32
+-/* 25 */	(unsigned char *)"/usr/local/etc/3proxy/3proxy.cfg",
++/* 25 */	(unsigned char *)"/etc/3proxy/3proxy.cfg",
+ #else
+ /* 25 */	(unsigned char *)"3proxy.cfg",
+ #endif
diff --git a/network/3proxy/patches/fixup_manpages.patch b/network/3proxy/patches/fixup_manpages.patch
new file mode 100644
index 000000000000..90bfc86c6a91
--- /dev/null
+++ b/network/3proxy/patches/fixup_manpages.patch
@@ -0,0 +1,33 @@
+diff -Nur 3proxy-0.6.orig/man/3proxy.8 3proxy-0.6/man/3proxy.8
+--- 3proxy-0.6.orig/man/3proxy.8	2007-03-01 06:08:33.000000000 -0600
++++ 3proxy-0.6/man/3proxy.8	2009-06-24 12:36:24.277595082 -0500
+@@ -84,7 +84,7 @@
+ configuration from stdin. It makes it possible to use 3proxy.cfg file as
+ executable script just by setting +x mode and adding
+ .br
+-#!/usr/local/3proxy/3proxy
++#!/usr/bin/3proxy
+ .br
+ as a first line in 3proxy.cfg
+ .TP
+@@ -133,7 +133,7 @@
+ wget to automate this task.
+ .SH FILES
+ .TP
+-.I "/usr/local/3proxy/3proxy.cfg (3proxy.cfg)"
++.I "/etc/3proxy/3proxy.cfg (3proxy.cfg)"
+ .BR 3proxy
+ configuration file
+ .SH BUGS
+diff -Nur 3proxy-0.6.orig/man/3proxy.cfg.3 3proxy-0.6/man/3proxy.cfg.3
+--- 3proxy-0.6.orig/man/3proxy.cfg.3	2009-02-02 04:00:11.000000000 -0600
++++ 3proxy-0.6/man/3proxy.cfg.3	2009-06-24 12:37:03.844291883 -0500
+@@ -30,7 +30,7 @@
+  File inclusion:

+ .br

+ You can include file by using $FILENAME macro (replace FILENAME with a path

+-to file, for example $/usr/local/etc/3proxy/conf.incl or 

++to file, for example $/etc/3proxy/conf.incl or 

+  $"c:\\Program Files\\3proxy\\include.cfg" Quotation is

+ required in last example because path contains space character. 

+ For included file <CR> (end of line characters) is treated as space character