From a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 28 Apr 2018 20:02:04 +0100 Subject: gentoo resync : 28.04.2018 --- net-proxy/3proxy/files/3proxy-0.7.1.2-gentoo.patch | 43 ---------------------- net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch | 43 ---------------------- 2 files changed, 86 deletions(-) delete mode 100644 net-proxy/3proxy/files/3proxy-0.7.1.2-gentoo.patch delete mode 100644 net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch (limited to 'net-proxy/3proxy/files') diff --git a/net-proxy/3proxy/files/3proxy-0.7.1.2-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.7.1.2-gentoo.patch deleted file mode 100644 index 715992bdc9d8..000000000000 --- a/net-proxy/3proxy/files/3proxy-0.7.1.2-gentoo.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- Makefile.Linux.orig 2015-04-18 01:55:14.195955388 +0300 -+++ Makefile.Linux 2015-04-21 02:30:16.835282128 +0300 -@@ -11,11 +11,11 @@ - 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 -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL - COUT = -o - LN = gcc - DCFLAGS = -fpic --LDFLAGS = -Wall -O2 -pthread -+LDFLAGS += -Wall -pthread - DLFLAGS = -shared - DLSUFFICS = .ld.so - # -lpthreads may be reuqired on some platforms instead of -pthreads -@@ -38,12 +38,12 @@ - include Makefile.inc - - allplugins: -- @list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ; cd ../.. ; done -+ @list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; $(MAKE) ; cd ../.. ; done - - DESTDIR = --prefix = /usr/local -+prefix = - exec_prefix = $(prefix) --man_prefix = $(prefix)/share -+man_prefix = $(prefix)/usr/share - - INSTALL = /usr/bin/install - INSTALL_BIN = $(INSTALL) -m 755 ---- src/stringtable.c.orig 2015-04-21 02:23:10.895258697 +0300 -+++ src/stringtable.c 2015-04-21 02:23:31.141926478 +0300 -@@ -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/net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch deleted file mode 100644 index d12c9b2b5d65..000000000000 --- a/net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- Makefile.Linux.orig 2016-03-23 07:25:19.209178284 +0200 -+++ Makefile.Linux 2016-03-23 07:27:06.704181518 +0200 -@@ -10,11 +10,11 @@ - BUILDDIR = - CC = gcc - --CFLAGS = -g -O2 -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL -+CFLAGS += -g -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL - COUT = -o - LN = gcc - DCFLAGS = -fpic --LDFLAGS = -O2 -pthread -+LDFLAGS += -pthread - DLFLAGS = -shared - DLSUFFICS = .ld.so - # -lpthreads may be reuqired on some platforms instead of -pthreads -@@ -39,12 +39,12 @@ - include Makefile.inc - - allplugins: -- @list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ; cd ../.. ; done -+ @list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; $(MAKE) ; cd ../.. ; done - - DESTDIR = --prefix = /usr/local -+prefix = - exec_prefix = $(prefix) --man_prefix = $(prefix)/share -+man_prefix = $(prefix)/usr/share - - INSTALL = /usr/bin/install - INSTALL_BIN = $(INSTALL) -m 755 ---- src/stringtable.c.orig 2016-03-23 07:27:41.216182556 +0200 -+++ src/stringtable.c 2016-03-23 07:27:55.280182979 +0200 -@@ -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 -- cgit v1.2.3