diff options
| author |   Sam Jorna <wraeth@gentoo.org> | 2016-03-24 15:15:02 +1100 |
|---|---|---|
| committer | Sam Jorna <wraeth@gentoo.org> | 2016-03-24 15:15:10 +1100 |
| commit | 1cf47799c54ca2484060751d56d673da928f3831 (patch) | |
| tree | 260f66879a19dd4377f7f7995422a1a06bedb147 /net-proxy | |
| parent | dev-embedded/u-boot-tools: version bump to 2016.03 (diff) | |
| download | gentoo-1cf47799c54ca2484060751d56d673da928f3831.tar.gz gentoo-1cf47799c54ca2484060751d56d673da928f3831.tar.bz2 gentoo-1cf47799c54ca2484060751d56d673da928f3831.zip | |
net-proxy/3proxy: add fixed patch, bug 547234
When originally added, line endings in patch somehow got modified.
Gentoo-bug: 547234
Package-Manager: portage-2.2.28
Signed-off-by: Sam Jorna <wraeth@gentoo.org>
Diffstat (limited to 'net-proxy')
| -rw-r--r-- | net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch index 01f21e82d540..d12c9b2b5d65 100644 --- a/net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch +++ b/net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch @@ -1,43 +1,43 @@ --- 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 + 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 + 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 + /* 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
|