forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
net-proxy/3proxy: fix broken patch, #547234
Gentoo-bug: 547234 Package-Manager: portage-2.2.28 Signed-off-by: Sam Jorna <[email protected]>
- Loading branch information
Showing
1 changed file
with
36 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |