commit: 1493b3ed1027bf1f52b28f87ff0e2c4947cd6a95 Author: Sam Jorna <wraeth <AT> gentoo <DOT> org> AuthorDate: Thu Mar 24 09:06:22 2016 +0000 Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org> CommitDate: Thu Mar 24 09:06:34 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1493b3ed
net-proxy/3proxy: fix broken patch, #547234 Gentoo-bug: 547234 Package-Manager: portage-2.2.28 Signed-off-by: Sam Jorna <wraeth <AT> gentoo.org> net-proxy/3proxy/files/3proxy-0.7.1.2-gentoo.patch | 72 +++++++++++----------- 1 file changed, 36 insertions(+), 36 deletions(-) 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 index 28b0be2..715992b 100644 --- a/net-proxy/3proxy/files/3proxy-0.7.1.2-gentoo.patch +++ b/net-proxy/3proxy/files/3proxy-0.7.1.2-gentoo.patch @@ -1,43 +1,43 @@ --- 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 + 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 + 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 + /* 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
