1 |
commit: d75cbc04fc3c8bfa79e6a2d6ef66c27d3a8a650c |
2 |
Author: Alex Efros <powerman-asdf <AT> yandex <DOT> ru> |
3 |
AuthorDate: Sat Mar 2 20:45:09 2019 +0000 |
4 |
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 28 12:56:51 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d75cbc04 |
7 |
|
8 |
net-proxy/3proxy: Version bump to 0.8.12 and EAPI=7 |
9 |
|
10 |
Signed-off-by: Aleksandr Efros <powerman-asdf <AT> yandex.ru> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
Closes: https://github.com/gentoo/gentoo/pull/11220 |
13 |
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> |
14 |
|
15 |
net-proxy/3proxy/3proxy-0.8.12.ebuild | 40 ++++++++++++++++++ |
16 |
net-proxy/3proxy/Manifest | 1 + |
17 |
net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch | 49 +++++++++++++++++++++++ |
18 |
3 files changed, 90 insertions(+) |
19 |
|
20 |
diff --git a/net-proxy/3proxy/3proxy-0.8.12.ebuild b/net-proxy/3proxy/3proxy-0.8.12.ebuild |
21 |
new file mode 100644 |
22 |
index 00000000000..3bf12098bc4 |
23 |
--- /dev/null |
24 |
+++ b/net-proxy/3proxy/3proxy-0.8.12.ebuild |
25 |
@@ -0,0 +1,40 @@ |
26 |
+# Copyright 1999-2019 Gentoo Authors |
27 |
+# Distributed under the terms of the GNU General Public License v2 |
28 |
+ |
29 |
+EAPI=7 |
30 |
+ |
31 |
+DESCRIPTION="A really tiny cross-platform proxy servers set" |
32 |
+HOMEPAGE="https://www.3proxy.ru/" |
33 |
+SRC_URI="https://github.com/z3APA3A/3proxy/archive/${PV}.tar.gz -> ${P}.tar.gz" |
34 |
+LICENSE="BSD" |
35 |
+SLOT="0" |
36 |
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86" |
37 |
+IUSE="" |
38 |
+ |
39 |
+PATCHES=( |
40 |
+ "${FILESDIR}"/${PN}-0.8.12-gentoo.patch |
41 |
+) |
42 |
+ |
43 |
+DOCS=( README cfg ) |
44 |
+HTML_DOCS=( doc/html/. ) |
45 |
+ |
46 |
+src_prepare() { |
47 |
+ default |
48 |
+ cp Makefile.Linux Makefile || die |
49 |
+} |
50 |
+ |
51 |
+src_install() { |
52 |
+ local x |
53 |
+ |
54 |
+ pushd src >/dev/null || die |
55 |
+ dobin 3proxy |
56 |
+ for x in proxy socks ftppr pop3p tcppm udppm mycrypt dighosts icqpr smtpp; do |
57 |
+ newbin ${x} ${PN}-${x} |
58 |
+ [[ -f "${S}"/man/${x}.8 ]] && newman "${S}"/man/${x}.8 ${PN}-${x}.8 |
59 |
+ done |
60 |
+ popd >/dev/null |
61 |
+ |
62 |
+ doman man/3proxy*.[38] |
63 |
+ |
64 |
+ einstalldocs |
65 |
+} |
66 |
|
67 |
diff --git a/net-proxy/3proxy/Manifest b/net-proxy/3proxy/Manifest |
68 |
index 120f5c7f410..3d99915e3f4 100644 |
69 |
--- a/net-proxy/3proxy/Manifest |
70 |
+++ b/net-proxy/3proxy/Manifest |
71 |
@@ -1 +1,2 @@ |
72 |
+DIST 3proxy-0.8.12.tar.gz 528990 BLAKE2B fb338c93e25fe4d03d626118f8c3ef52af7104599e11d535dfa572c4fb47d609da66f199406a3c6bb9739766163bb7b54b529f71d4d6ff637567f2f67d3a9ed1 SHA512 33412e89991055598e06210dbcd7b2f9ee6810753c8f40ada02f222def0a49047a90ff7f2efa6895bc4f8ad99193866c980de2e79464310a77cc8e63c8b9813d |
73 |
DIST 3proxy-0.8.9.tar.gz 497006 BLAKE2B c57e98eb586dfacefd530e091fecbee274d8104698ca082b71ea0607294199cb7db63fc32787236b7e797c928a7ba4f7bafa3ef35551bef76aacfbdf1f259fff SHA512 35153882fec7077b05b23f9cea91443126a8a9faf9818915612e0739196a8bd1f00e0bcefb339a86bad10bb0c1b9891bd06847934787f4758ec55e6cc2e9e815 |
74 |
|
75 |
diff --git a/net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch |
76 |
new file mode 100644 |
77 |
index 00000000000..33950f45cee |
78 |
--- /dev/null |
79 |
+++ b/net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch |
80 |
@@ -0,0 +1,49 @@ |
81 |
+diff -uNr a/Makefile.Linux b/Makefile.Linux |
82 |
+--- a/Makefile.Linux 2018-04-18 22:48:45.000000000 +0300 |
83 |
++++ b/Makefile.Linux 2019-05-26 14:42:38.927811513 +0300 |
84 |
+@@ -8,13 +8,13 @@ |
85 |
+ # library support. Add -DSAFESQL for poorely written ODBC library / drivers. |
86 |
+ |
87 |
+ BUILDDIR = |
88 |
+-CC = gcc |
89 |
++CC ?= gcc |
90 |
+ |
91 |
+-CFLAGS = -g -O2 -fno-strict-aliasing -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL |
92 |
++CFLAGS += -fno-strict-aliasing -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL |
93 |
+ COUT = -o |
94 |
+-LN = gcc |
95 |
++LN ?= gcc |
96 |
+ DCFLAGS = -fpic |
97 |
+-LDFLAGS = -O2 -fno-strict-aliasing -pthread |
98 |
++LDFLAGS += -fno-strict-aliasing -pthread |
99 |
+ DLFLAGS = -shared |
100 |
+ DLSUFFICS = .ld.so |
101 |
+ # -lpthreads may be reuqired on some platforms instead of -pthreads |
102 |
+@@ -39,12 +39,12 @@ |
103 |
+ include Makefile.inc |
104 |
+ |
105 |
+ allplugins: |
106 |
+- @list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ; cd ../.. ; done |
107 |
++ @list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; $(MAKE) ; cd ../.. ; done |
108 |
+ |
109 |
+ DESTDIR = |
110 |
+-prefix = /usr/local |
111 |
++prefix = |
112 |
+ exec_prefix = $(prefix) |
113 |
+-man_prefix = $(prefix)/share |
114 |
++man_prefix = $(prefix)/usr/share |
115 |
+ |
116 |
+ INSTALL = /usr/bin/install |
117 |
+ INSTALL_BIN = $(INSTALL) -m 755 |
118 |
+diff -uNr a/src/stringtable.c b/src/stringtable.c |
119 |
+--- a/src/stringtable.c 2018-04-18 22:48:45.000000000 +0300 |
120 |
++++ b/src/stringtable.c 2019-05-26 14:42:07.437810566 +0300 |
121 |
+@@ -38,7 +38,7 @@ |
122 |
+ /* 24 */ NULL, |
123 |
+ #ifndef TPROXY_CONF |
124 |
+ #ifndef _WIN32 |
125 |
+-/* 25 */ (unsigned char *)"/usr/local/etc/3proxy/3proxy.cfg", |
126 |
++/* 25 */ (unsigned char *)"/etc/3proxy/3proxy.cfg", |
127 |
+ #else |
128 |
+ /* 25 */ (unsigned char *)"3proxy.cfg", |
129 |
+ #endif |