* [gentoo-commits] repo/gentoo:master commit in: net-proxy/3proxy/files/
@ 2016-03-24 4:18 Sam Jorna
0 siblings, 0 replies; 4+ messages in thread
From: Sam Jorna @ 2016-03-24 4:18 UTC (permalink / raw
To: gentoo-commits
commit: 1cf47799c54ca2484060751d56d673da928f3831
Author: Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 04:15:02 2016 +0000
Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 04:15:10 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cf47799
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 <AT> gentoo.org>
net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch | 72 ++++++++++++------------
1 file 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 01f21e8..d12c9b2 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/3proxy/files/
@ 2016-03-24 9:09 Sam Jorna
0 siblings, 0 replies; 4+ messages in thread
From: Sam Jorna @ 2016-03-24 9:09 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/3proxy/files/
@ 2017-01-15 2:33 Göktürk Yüksek
0 siblings, 0 replies; 4+ messages in thread
From: Göktürk Yüksek @ 2017-01-15 2:33 UTC (permalink / raw
To: gentoo-commits
commit: aabc08d6b1eaeab5c2dc886d226d8c7810f63d39
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jan 8 12:38:46 2017 +0000
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 02:32:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aabc08d6
net-proxy/3proxy: remove unused patch
net-proxy/3proxy/files/3proxy-0.6-gentoo.patch | 34 --------------------------
1 file changed, 34 deletions(-)
diff --git a/net-proxy/3proxy/files/3proxy-0.6-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.6-gentoo.patch
deleted file mode 100644
index c3c4df4..00000000
--- a/net-proxy/3proxy/files/3proxy-0.6-gentoo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Nru 3proxy-0.6.orig/Makefile.unix 3proxy-0.6/Makefile.unix
---- 3proxy-0.6.orig/Makefile.unix 2007-04-10 16:29:25.000000000 +0000
-+++ 3proxy-0.6/Makefile.unix 2009-03-24 19:13:09.000000000 +0000
-@@ -12,10 +12,10 @@
- CC = gcc
-
- # you may need -L/usr/pkg/lib for older NetBSD versions
--CFLAGS = -Wall -g -O2 -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
-+CFLAGS += -Wall -g -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
- COUT = -o
- LN = gcc
--LDFLAGS = -Wall -O2 -pthread
-+LDFLAGS += -Wall -pthread
- # -lpthreads may be reuqired on some platforms instead of -pthreads
- # -ldl or -lld may be required for some platforms
- DCFLAGS = -fpic
-@@ -55,4 +55,4 @@
- fi
-
- 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
-diff -Nru 3proxy-0.6.orig/src/stringtable.c 3proxy-0.6/src/stringtable.c
---- 3proxy-0.6.orig/src/stringtable.c 2008-02-03 11:28:24.000000000 +0000
-+++ 3proxy-0.6/src/stringtable.c 2009-03-24 19:12:44.000000000 +0000
-@@ -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.cfg",
- #else
- /* 25 */ (unsigned char *)"3proxy.cfg",
- #endif
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/3proxy/files/
@ 2018-07-11 11:27 Tony Vroon
0 siblings, 0 replies; 4+ messages in thread
From: Tony Vroon @ 2018-07-11 11:27 UTC (permalink / raw
To: gentoo-commits
commit: 4abe6dd8a7781234a4cda3dadcc32377134bcd05
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jul 8 09:15:57 2018 +0000
Commit: Tony Vroon <chainsaw <AT> gentoo <DOT> org>
CommitDate: Wed Jul 11 11:27:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4abe6dd8
net-proxy/3proxy: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/9131
net-proxy/3proxy/files/3proxy-0.5.3k-gentoo.patch | 26 -----------------------
1 file changed, 26 deletions(-)
diff --git a/net-proxy/3proxy/files/3proxy-0.5.3k-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.5.3k-gentoo.patch
deleted file mode 100644
index a88a2878043..00000000000
--- a/net-proxy/3proxy/files/3proxy-0.5.3k-gentoo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- Makefile.unix.orig 2005-04-30 18:29:00.000000000 +0000
-+++ Makefile.unix 2008-10-12 17:18:21.000000000 +0000
-@@ -9,10 +9,10 @@
- CC = gcc
-
- # you may need -L/usr/pkg/lib for older NetBSD versions
--CFLAGS = -Wall -g -O2 -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
-+CFLAGS += -Wall -g -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
- COUT = -o
- LN = gcc
--LDFLAGS = -Wall -O2 -pthread
-+LDFLAGS += -Wall -pthread
- # -lpthreads may be reuqired on some platforms instead of -pthreads
- LIBS =
- LNOUT = -o
---- src/stringtable.c.orig 2008-01-09 21:14:46.000000000 +0000
-+++ src/stringtable.c 2008-10-12 17:19:19.000000000 +0000
-@@ -23,7 +23,7 @@
- /* 19 */ NULL,
- #ifndef TPROXY_CONF
- #ifndef _WIN32
--/* 20 */ (unsigned char *)"/usr/local/etc/3proxy.cfg",
-+/* 20 */ (unsigned char *)"/etc/3proxy.cfg",
- #else
- /* 20 */ (unsigned char *)"3proxy.cfg",
- #endif
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-07-11 11:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-24 4:18 [gentoo-commits] repo/gentoo:master commit in: net-proxy/3proxy/files/ Sam Jorna
-- strict thread matches above, loose matches on Subject: below --
2016-03-24 9:09 Sam Jorna
2017-01-15 2:33 Göktürk Yüksek
2018-07-11 11:27 Tony Vroon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox