* [gentoo-commits] repo/gentoo:master commit in: net-proxy/3proxy/files/, net-proxy/3proxy/
@ 2017-02-12 12:01 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2017-02-12 12:01 UTC (permalink / raw
To: gentoo-commits
commit: efd18d8e86a5ead0f454310f3e750a38ed82e813
Author: Alex Efros <powerman <AT> powerman <DOT> name>
AuthorDate: Fri Dec 16 18:34:08 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 12:01:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efd18d8e
net-proxy/3proxy: version bump to 0.8.8
Package-Manager: portage-2.3.0
net-proxy/3proxy/3proxy-0.8.8.ebuild | 42 +++++++++++++++++++++++
net-proxy/3proxy/Manifest | 1 +
net-proxy/3proxy/files/3proxy-0.8.8-gentoo.patch | 43 ++++++++++++++++++++++++
3 files changed, 86 insertions(+)
diff --git a/net-proxy/3proxy/3proxy-0.8.8.ebuild b/net-proxy/3proxy/3proxy-0.8.8.ebuild
new file mode 100644
index 0000000000..0226bc84db
--- /dev/null
+++ b/net-proxy/3proxy/3proxy-0.8.8.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=6
+
+DESCRIPTION="A really tiny cross-platform proxy servers set"
+HOMEPAGE="http://www.3proxy.ru/"
+SRC_URI="https://github.com/z3APA3A/3proxy/archive/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE=""
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+)
+
+DOCS=( README cfg )
+HTML_DOCS=( doc/html/. )
+
+src_prepare() {
+ default
+ cp Makefile.Linux Makefile || die
+}
+
+src_install() {
+ local x
+
+ pushd src >/dev/null || die
+ dobin 3proxy
+ for x in proxy socks ftppr pop3p tcppm udppm mycrypt dighosts icqpr smtpp; do
+ newbin ${x} ${PN}-${x}
+ [[ -f "${S}"/man/${x}.8 ]] && newman "${S}"/man/${x}.8 ${PN}-${x}.8
+ done
+ popd >/dev/null
+
+ doman man/3proxy*.[38]
+
+ einstalldocs
+}
diff --git a/net-proxy/3proxy/Manifest b/net-proxy/3proxy/Manifest
index 44312a92b9..d9fa5d61e4 100644
--- a/net-proxy/3proxy/Manifest
+++ b/net-proxy/3proxy/Manifest
@@ -2,3 +2,4 @@ DIST 3proxy-0.5.3k.tgz 190797 SHA256 7bbe159a0157480c653ef3976495a9b1993435a44ea
DIST 3proxy-0.7.1.2.tgz 478532 SHA256 e1157aab3ff8215a3b1f35c61a9d6011e60ad38b52d9f74a1fc4cae14ba16a31 SHA512 c7f4e25d2630e8c6c25bbc09a5f9f201448d57a85d404cd1f6304946d9a31083845bd8d481f610fe1cd1f56be349eb774cdae135430efcfdd1952a0403d01735 WHIRLPOOL bdfd70a0054b71457f49bcc09af8f26d1cf371d10fb60adc256ad5a60f54167fc1d8e26f9355785223647392b5697adaa4ebeec26c7009a09e1f8d317cdf7089
DIST 3proxy-0.7.1.4.tgz 478617 SHA256 905a080ea3ba45a522a2d871bfdda94168561f7dd81c01a4be3540eda8f6c98f SHA512 af361666ec6d53decee6a66f4ec5621e0bbaccfaae8f6cadd5c00c91a417916b2b1b97a660fd47566677c3343f603a45b92f085a48a26eaa429398938d29383a WHIRLPOOL 08ab0ff3a26bce973ffe0077bddc84f356c0c8f8e3a8c06faadb932b10f8c8fc7000d3aaf372bcfe6a2ffcfa4516b23dc3f10bc5509afd404af466d0f765f1d5
DIST 3proxy-0.8.6.tgz 508359 SHA256 7819237ce043465d887cb0b25d8594de932ed9a694a32a4e46b895ee55675fa2 SHA512 394fcf8f6d088543b2380ad6bf058d276caed29300df7de963895add788a867cab5860f6fc3f1279e10304db5b0ac147af232f9acd3986188bfa56ad2307aae4 WHIRLPOOL d1640a5d0765b3332263ed09e9349e470a5b8c5f57ba65b993cff6bb89d3818ee4da40193e7bdbcfec891810ffe05db02ae5ad25216e00613738e302c1880c88
+DIST 3proxy-0.8.8.tar.gz 497039 SHA256 a614527db4056a29672362b6491378d74dbcc21433efa293d351d225d2cccf67 SHA512 ea35ae862f006428950264a673266cff016ad35f3fcbfc842438fef8b1f484c665cfdf30ad1346527c1b18d0c552e3f806416a73f5cc1d35fc1045e322ea4e3d WHIRLPOOL 13587ae2ac034a5342852b426b270eb32005675799ae9d42951b1f0b0944259abb342e748cbbba3bcdf77d3071779d0aca836aef12caa67f670c267f59663e40
diff --git a/net-proxy/3proxy/files/3proxy-0.8.8-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.8.8-gentoo.patch
new file mode 100644
index 0000000000..a88dedefff
--- /dev/null
+++ b/net-proxy/3proxy/files/3proxy-0.8.8-gentoo.patch
@@ -0,0 +1,43 @@
+--- a/Makefile.Linux 2016-12-16 20:24:53.809856430 +0200
++++ b/Makefile.Linux 2016-12-16 20:26:24.912859170 +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
+@@ -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
+--- a/src/stringtable.c 2016-12-16 20:24:53.811856430 +0200
++++ b/src/stringtable.c 2016-12-16 20:26:48.288859873 +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
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-proxy/3proxy/files/, net-proxy/3proxy/
@ 2024-04-17 8:01 Petr Vaněk
0 siblings, 0 replies; 5+ messages in thread
From: Petr Vaněk @ 2024-04-17 8:01 UTC (permalink / raw
To: gentoo-commits
commit: 2d45988f451d968fac8f025018a9680384f15ceb
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 17 07:57:10 2024 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Wed Apr 17 07:59:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d45988f
net-proxy/3proxy: drop 0.9.0
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
net-proxy/3proxy/3proxy-0.9.0.ebuild | 47 ------------------------
net-proxy/3proxy/Manifest | 1 -
net-proxy/3proxy/files/3proxy-0.9.0-gentoo.patch | 36 ------------------
3 files changed, 84 deletions(-)
diff --git a/net-proxy/3proxy/3proxy-0.9.0.ebuild b/net-proxy/3proxy/3proxy-0.9.0.ebuild
deleted file mode 100644
index bd5edecfd3a0..000000000000
--- a/net-proxy/3proxy/3proxy-0.9.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A really tiny cross-platform proxy servers set"
-HOMEPAGE="https://www.3proxy.ru/"
-SRC_URI="https://github.com/z3APA3A/3proxy/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ~sparc x86"
-IUSE=""
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.9.0-gentoo.patch
-)
-
-DOCS=( README cfg )
-HTML_DOCS=( doc/html/. )
-
-src_prepare() {
- default
- cp Makefile.Linux Makefile || die
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" LN="$(tc-getCC)"
-}
-
-src_install() {
- local x
-
- pushd bin >/dev/null || die
- dolib.so *.so
- dobin 3proxy
- for x in ftppr mycrypt pop3p proxy smtpp socks tcppm udppm; do
- newbin ${x} ${PN}-${x}
- [[ -f "${S}"/man/${x}.8 ]] && newman "${S}"/man/${x}.8 ${PN}-${x}.8
- done
- popd >/dev/null
-
- doman man/3proxy*.[38]
-
- einstalldocs
-}
diff --git a/net-proxy/3proxy/Manifest b/net-proxy/3proxy/Manifest
index dde3c28222fe..45d5f8ce6708 100644
--- a/net-proxy/3proxy/Manifest
+++ b/net-proxy/3proxy/Manifest
@@ -1,2 +1 @@
-DIST 3proxy-0.9.0.tar.gz 607014 BLAKE2B dae9004ea1474080fbbd4a3ff3a2690f8a6afb2ab2c045dbdaa25adf10ff2c58501d46a5a99b24db526b153ce00d281851ec08499d908709c5801c27aa7b0ca8 SHA512 7429389bf70c38d57e7a6f34e649a04aaad4f81555b7ef131cae026123ff7877d3f1aef8d10f84b9fc2c58e9ad5ab3d55e4af7326dbce14c05f3cd9973fafd83
DIST 3proxy-0.9.4.tar.gz 610340 BLAKE2B 7b98cc26fc943fcf15a6518a7adb79ccc79d8250b359f97318e9a48b4bb2643a88ee5fed49216d4ee71b436d0a21231e148f616c78b1dfab8b0b720a4223ccfd SHA512 d3316f6ee1217e580ce593a7bfd9d76672487a89862f247373b0acf3ea207887c758168e33b25db9fc974063deab0826c20d455cab2536d03eee49d8bddda6b5
diff --git a/net-proxy/3proxy/files/3proxy-0.9.0-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.9.0-gentoo.patch
deleted file mode 100644
index d7c530535f64..000000000000
--- a/net-proxy/3proxy/files/3proxy-0.9.0-gentoo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -uNr a/Makefile.Linux b/Makefile.Linux
---- a/Makefile.Linux 2020-10-22 11:38:44.000000000 +0300
-+++ b/Makefile.Linux 2020-10-22 22:38:26.257745810 +0300
-@@ -8,13 +8,13 @@
- # library support. Add -DSAFESQL for poorely written ODBC library / drivers.
-
- BUILDDIR = ../bin/
--CC = gcc
-+CC ?= gcc
-
--CFLAGS = -g -fPIC -O2 -fno-strict-aliasing -c -pthread -DWITHSPLICE -D_GNU_SOURCE -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL -DWITH_NETFILTER
-+CFLAGS += -fPIC -fno-strict-aliasing -c -pthread -DWITHSPLICE -D_GNU_SOURCE -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL -DWITH_NETFILTER
- COUT = -o
--LN = gcc
-+LN ?= gcc
- DCFLAGS =
--LDFLAGS = -fPIE -O2 -fno-strict-aliasing -pthread
-+LDFLAGS += -fPIE -fno-strict-aliasing -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 =
- exec_prefix = $(prefix)
--man_prefix = /usr/share
-+man_prefix = $(prefix)/usr/share
-
- INSTALL = /usr/bin/install
- INSTALL_BIN = $(INSTALL) -m 755
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-proxy/3proxy/files/, net-proxy/3proxy/
@ 2023-03-22 1:20 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-03-22 1:20 UTC (permalink / raw
To: gentoo-commits
commit: 20d962742de92d136470b6a3dd2c4e6727ffa2ff
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Tue Mar 21 14:02:28 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 01:19:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20d96274
net-proxy/3proxy: add 0.9.4
- EAPI bump
- update HOMEPAGE and SRC_URI
- update gentoo patch
- add fix for clang-16 [1,2]
- remove src_compile phase, CC is now exported in src_prepare, LN is
not needed anymore as it is set to $(CC) by default.
[1] https://github.com/3proxy/3proxy/issues/895
[2] https://github.com/3proxy/3proxy/pull/907
Closes: https://bugs.gentoo.org/881015
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/30287
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-proxy/3proxy/3proxy-0.9.4.ebuild | 47 ++++++++++++++++++
net-proxy/3proxy/Manifest | 1 +
.../files/3proxy-0.9.4-function-pointer-fix.patch | 58 ++++++++++++++++++++++
net-proxy/3proxy/files/3proxy-0.9.4-gentoo.patch | 38 ++++++++++++++
4 files changed, 144 insertions(+)
diff --git a/net-proxy/3proxy/3proxy-0.9.4.ebuild b/net-proxy/3proxy/3proxy-0.9.4.ebuild
new file mode 100644
index 000000000000..80444d214f60
--- /dev/null
+++ b/net-proxy/3proxy/3proxy-0.9.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A really tiny cross-platform proxy servers set"
+HOMEPAGE="
+ https://3proxy.ru/
+ https://github.com/3proxy/3proxy/
+"
+SRC_URI="https://github.com/3proxy/3proxy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
+
+PATCHES=(
+ "${FILESDIR}/${P}-gentoo.patch"
+ "${FILESDIR}/${P}-function-pointer-fix.patch"
+)
+
+DOCS=( README cfg )
+HTML_DOCS=( doc/html/. )
+
+src_prepare() {
+ default
+ tc-export CC
+ cp Makefile.Linux Makefile || die
+}
+
+src_install() {
+ local x
+
+ pushd bin >/dev/null || die
+ dolib.so *.so
+ dobin 3proxy
+ for x in ftppr mycrypt pop3p proxy smtpp socks tcppm udppm; do
+ newbin ${x} ${PN}-${x}
+ [[ -f "${S}"/man/${x}.8 ]] && newman "${S}"/man/${x}.8 ${PN}-${x}.8
+ done
+ popd >/dev/null
+
+ doman man/3proxy*.[38]
+
+ einstalldocs
+}
diff --git a/net-proxy/3proxy/Manifest b/net-proxy/3proxy/Manifest
index 16b6fe43d8d4..dde3c28222fe 100644
--- a/net-proxy/3proxy/Manifest
+++ b/net-proxy/3proxy/Manifest
@@ -1 +1,2 @@
DIST 3proxy-0.9.0.tar.gz 607014 BLAKE2B dae9004ea1474080fbbd4a3ff3a2690f8a6afb2ab2c045dbdaa25adf10ff2c58501d46a5a99b24db526b153ce00d281851ec08499d908709c5801c27aa7b0ca8 SHA512 7429389bf70c38d57e7a6f34e649a04aaad4f81555b7ef131cae026123ff7877d3f1aef8d10f84b9fc2c58e9ad5ab3d55e4af7326dbce14c05f3cd9973fafd83
+DIST 3proxy-0.9.4.tar.gz 610340 BLAKE2B 7b98cc26fc943fcf15a6518a7adb79ccc79d8250b359f97318e9a48b4bb2643a88ee5fed49216d4ee71b436d0a21231e148f616c78b1dfab8b0b720a4223ccfd SHA512 d3316f6ee1217e580ce593a7bfd9d76672487a89862f247373b0acf3ea207887c758168e33b25db9fc974063deab0826c20d455cab2536d03eee49d8bddda6b5
diff --git a/net-proxy/3proxy/files/3proxy-0.9.4-function-pointer-fix.patch b/net-proxy/3proxy/files/3proxy-0.9.4-function-pointer-fix.patch
new file mode 100644
index 000000000000..9c51f90f1df1
--- /dev/null
+++ b/net-proxy/3proxy/files/3proxy-0.9.4-function-pointer-fix.patch
@@ -0,0 +1,58 @@
+Use poll with nfds_t type
+
+Fixes: https://github.com/3proxy/3proxy/issues/895
+Bug: https://bugs.gentoo.org/881015
+Upstream-PR: https://github.com/3proxy/3proxy/pull/907
+
+diff --git a/src/common.c b/src/common.c
+index e8106e2..27ad390 100644
+--- a/src/common.c
++++ b/src/common.c
+@@ -157,7 +157,7 @@ int
+ WINAPI
+ #endif
+
+- mypoll(struct mypollfd *fds, unsigned int nfds, int timeout){
++ mypoll(struct mypollfd *fds, nfds_t nfds, int timeout){
+ fd_set readfd;
+ fd_set writefd;
+ fd_set oobfd;
+diff --git a/src/structures.h b/src/structures.h
+index 8d41374..ee778c2 100644
+--- a/src/structures.h
++++ b/src/structures.h
+@@ -69,6 +69,7 @@ int mutex_unlock(int *val);
+ #ifdef WITH_POLL
+ #include <poll.h>
+ #else
++typedef unsigned int nfds_t;
+ #ifdef WITH_WSAPOLL
+
+ #define poll(A,B,C) WSAPoll(A,B,C)
+@@ -84,7 +85,7 @@ int
+ #ifdef _WIN32
+ WINAPI
+ #endif
+- mypoll(struct mypollfd *fds, unsigned int nfds, int timeout);
++ mypoll(struct mypollfd *fds, nfds_t nfds, int timeout);
+ #ifndef POLLIN
+ #define POLLIN 1
+ #endif
+@@ -701,7 +702,7 @@ struct sockfuncs {
+ int (WINAPI *_getsockname)(SOCKET s, struct sockaddr * name, int * namelen);
+ int (WINAPI *_getsockopt)(SOCKET s, int level, int optname, char * optval, int * optlen);
+ int (WINAPI *_setsockopt)(SOCKET s, int level, int optname, const char *optval, int optlen);
+- int (WINAPI *_poll)(struct pollfd *fds, unsigned int nfds, int timeout);
++ int (WINAPI *_poll)(struct pollfd *fds, nfds_t nfds, int timeout);
+ int (WINAPI *_send)(SOCKET s, const char *msg, int len, int flags);
+ int (WINAPI *_sendto)(SOCKET s, const char *msg, int len, int flags, const struct sockaddr *to, int tolen);
+ int (WINAPI *_recv)(SOCKET s, char *buf, int len, int flags);
+@@ -718,7 +719,7 @@ struct sockfuncs {
+ int (*_getsockname)(SOCKET s, struct sockaddr * name, socklen_t * namelen);
+ int (*_getsockopt)(SOCKET s, int level, int optname, void * optval, socklen_t * optlen);
+ int (*_setsockopt)(int s, int level, int optname, const void *optval, socklen_t optlen);
+- int (*_poll)(struct pollfd *fds, unsigned int nfds, int timeout);
++ int (*_poll)(struct pollfd *fds, nfds_t nfds, int timeout);
+ size_t (*_send)(SOCKET s, const void *msg, size_t len, int flags);
+ size_t (*_sendto)(SOCKET s, const void *msg, size_t len, int flags, const struct sockaddr *to, SASIZETYPE tolen);
+ size_t (*_recv)(SOCKET s, void *buf, size_t len, int flags);
diff --git a/net-proxy/3proxy/files/3proxy-0.9.4-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.9.4-gentoo.patch
new file mode 100644
index 000000000000..57a9b479f1e3
--- /dev/null
+++ b/net-proxy/3proxy/files/3proxy-0.9.4-gentoo.patch
@@ -0,0 +1,38 @@
+diff --git a/Makefile.Linux b/Makefile.Linux
+index 4f3f2b3..f15f6ff 100644
+--- a/Makefile.Linux
++++ b/Makefile.Linux
+@@ -8,13 +8,13 @@
+ # library support. Add -DSAFESQL for poorely written ODBC library / drivers.
+
+ BUILDDIR = ../bin/
+-CC = gcc
++CC ?= gcc
+
+-CFLAGS = -g -fPIC -O2 -fno-strict-aliasing -c -pthread -DWITHSPLICE -D_GNU_SOURCE -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL -DWITH_NETFILTER
++CFLAGS += -fPIC -fno-strict-aliasing -c -pthread -DWITHSPLICE -D_GNU_SOURCE -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL -DWITH_NETFILTER
+ COUT = -o
+ LN = $(CC)
+ DCFLAGS =
+-LDFLAGS = -fPIE -O2 -fno-strict-aliasing -pthread
++LDFLAGS += -fPIE -fno-strict-aliasing -pthread
+ DLFLAGS = -shared
+ DLSUFFICS = .ld.so
+ # -lpthreads may be reuqired on some platforms instead of -pthreads
+@@ -40,13 +40,13 @@ PLUGINS = StringsPlugin TrafficPlugin PCREPlugin TransparentPlugin
+ 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 =
+ exec_prefix = $(prefix)
+-man_prefix = /usr/share
+-chroot_prefix = /usr/local
++man_prefix = $(prefix)/usr/share
++chroot_prefix = $(prefix)/usr/local
+
+ INSTALL = /usr/bin/install
+ INSTALL_BIN = $(INSTALL) -m 755
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-proxy/3proxy/files/, net-proxy/3proxy/
@ 2016-03-23 18:36 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2016-03-23 18:36 UTC (permalink / raw
To: gentoo-commits
commit: e1a95ea7057f58af9bc89c834630a2f25829d658
Author: Alex Efros <powerman <AT> powerman <DOT> name>
AuthorDate: Wed Mar 23 04:45:56 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 18:21:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1a95ea7
net-proxy/3proxy: Version bump to 0.7.1.2
Closes: https://github.com/gentoo/gentoo/pull/1118
net-proxy/3proxy/3proxy-0.7.1.2.ebuild | 43 ++++++++++++++++++++++
net-proxy/3proxy/Manifest | 1 +
net-proxy/3proxy/files/3proxy-0.7.1.2-gentoo.patch | 43 ++++++++++++++++++++++
3 files changed, 87 insertions(+)
diff --git a/net-proxy/3proxy/3proxy-0.7.1.2.ebuild b/net-proxy/3proxy/3proxy-0.7.1.2.ebuild
new file mode 100644
index 0000000..ca001f1
--- /dev/null
+++ b/net-proxy/3proxy/3proxy-0.7.1.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=6
+inherit eutils
+
+DESCRIPTION="A really tiny cross-platform proxy servers set"
+HOMEPAGE="http://www.3proxy.ru/"
+SRC_URI="http://3proxy.ru/${PV}/${P}.tgz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE=""
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gentoo.patch
+ cp Makefile.Linux Makefile || die
+ default
+}
+
+src_install() {
+ local x
+
+ cd src || die
+ dobin 3proxy
+ for x in proxy socks ftppr pop3p tcppm udppm mycrypt dighosts countersutil ; do
+ newbin ${x} ${PN}-${x}
+ [[ -f ${S}/man/${x}.8 ]] && newman "${S}"/man/${x}.8 ${PN}-${x}.8
+ done
+ cd ..
+
+ doman "${S}"/man/3proxy*.[38]
+
+ cd "${S}"
+ dodoc Readme
+ dohtml -r doc/html/*
+ docinto cfg
+ dodoc cfg/*.{txt,sample}
+ docinto cfg/sql
+ dodoc cfg/sql/*.{cfg,sql}
+}
diff --git a/net-proxy/3proxy/Manifest b/net-proxy/3proxy/Manifest
index e552889..c3d41f8 100644
--- a/net-proxy/3proxy/Manifest
+++ b/net-proxy/3proxy/Manifest
@@ -1,2 +1,3 @@
DIST 3proxy-0.5.3k.tgz 190797 SHA256 7bbe159a0157480c653ef3976495a9b1993435a44ea0e7c03784320e3ac28ea3 SHA512 d709d57fc7c1a31ab190dd4692a93d9a4866a0cfea4cb6d2ff8dc8f8a3ec2ff674496a4c63854580a933948a6f899db2cc21e5b82a6f854bc236e5779014ae00 WHIRLPOOL 98b7ccab3447674c82e2f8fb94f9840cc696038fb7a443d55795e9b32052c1de3e76797a444bad1daed8bee27835b930c045073b666cd7fb54bc643c5b962760
DIST 3proxy-0.6.1.tgz 480160 SHA256 10f8804258791e80353a334dc9b80473a02c6dda939de76451e655f643aadd7f SHA512 2a32549424de3bce0b59b1ad28e203d4f96b58d8fb7b8b39dfdccc4dada20655ac109eafab1ffa99279eb98f4425a51ec8154bf0d51b4c23382f3244f0e989f0 WHIRLPOOL dfae9eaa3d8e6129a77d8b93d389036ef583cdf1862f0f0f794f00c6947617dcba96040d9a31c23befa687a6435c86152959d0a692b1cf9c6ffd02e9531f4697
+DIST 3proxy-0.7.1.2.tgz 478532 SHA256 e1157aab3ff8215a3b1f35c61a9d6011e60ad38b52d9f74a1fc4cae14ba16a31 SHA512 c7f4e25d2630e8c6c25bbc09a5f9f201448d57a85d404cd1f6304946d9a31083845bd8d481f610fe1cd1f56be349eb774cdae135430efcfdd1952a0403d01735 WHIRLPOOL bdfd70a0054b71457f49bcc09af8f26d1cf371d10fb60adc256ad5a60f54167fc1d8e26f9355785223647392b5697adaa4ebeec26c7009a09e1f8d317cdf7089
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
new file mode 100644
index 0000000..28b0be2
--- /dev/null
+++ b/net-proxy/3proxy/files/3proxy-0.7.1.2-gentoo.patch
@@ -0,0 +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
+@@ -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
+--- 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
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-proxy/3proxy/files/, net-proxy/3proxy/
@ 2016-03-23 18:36 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2016-03-23 18:36 UTC (permalink / raw
To: gentoo-commits
commit: f01def842dbc187708fe681ff40ae2bad3dbfb7a
Author: Alex Efros <powerman <AT> powerman <DOT> name>
AuthorDate: Wed Mar 23 05:55:51 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 18:21:22 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f01def84
net-proxy/3proxy: Version bump to 0.8.6
Closes: https://github.com/gentoo/gentoo/pull/1118
net-proxy/3proxy/3proxy-0.8.6.ebuild | 41 ++++++++++++++++++++++
net-proxy/3proxy/Manifest | 1 +
net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch | 43 ++++++++++++++++++++++++
3 files changed, 85 insertions(+)
diff --git a/net-proxy/3proxy/3proxy-0.8.6.ebuild b/net-proxy/3proxy/3proxy-0.8.6.ebuild
new file mode 100644
index 0000000..758a288
--- /dev/null
+++ b/net-proxy/3proxy/3proxy-0.8.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=6
+inherit eutils
+
+DESCRIPTION="A really tiny cross-platform proxy servers set"
+HOMEPAGE="http://www.3proxy.ru/"
+SRC_URI="http://3proxy.ru/${PV}/${P}.tgz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE=""
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gentoo.patch
+ cp Makefile.Linux Makefile || die
+ default
+}
+
+src_install() {
+ local x
+
+ cd src || die
+ dobin 3proxy
+ for x in proxy socks ftppr pop3p tcppm udppm mycrypt dighosts icqpr smtpp; do
+ newbin ${x} ${PN}-${x}
+ [[ -f "${S}"/man/${x}.8 ]] && newman "${S}"/man/${x}.8 ${PN}-${x}.8
+ done
+ cd ..
+
+ doman man/3proxy*.[38]
+
+ dodoc Readme
+ docinto html
+ dodoc -r doc/html/*
+ docinto cfg
+ dodoc -r cfg/*
+}
diff --git a/net-proxy/3proxy/Manifest b/net-proxy/3proxy/Manifest
index e9c3a4f..b61b0e4 100644
--- a/net-proxy/3proxy/Manifest
+++ b/net-proxy/3proxy/Manifest
@@ -2,3 +2,4 @@ DIST 3proxy-0.5.3k.tgz 190797 SHA256 7bbe159a0157480c653ef3976495a9b1993435a44ea
DIST 3proxy-0.6.1.tgz 480160 SHA256 10f8804258791e80353a334dc9b80473a02c6dda939de76451e655f643aadd7f SHA512 2a32549424de3bce0b59b1ad28e203d4f96b58d8fb7b8b39dfdccc4dada20655ac109eafab1ffa99279eb98f4425a51ec8154bf0d51b4c23382f3244f0e989f0 WHIRLPOOL dfae9eaa3d8e6129a77d8b93d389036ef583cdf1862f0f0f794f00c6947617dcba96040d9a31c23befa687a6435c86152959d0a692b1cf9c6ffd02e9531f4697
DIST 3proxy-0.7.1.2.tgz 478532 SHA256 e1157aab3ff8215a3b1f35c61a9d6011e60ad38b52d9f74a1fc4cae14ba16a31 SHA512 c7f4e25d2630e8c6c25bbc09a5f9f201448d57a85d404cd1f6304946d9a31083845bd8d481f610fe1cd1f56be349eb774cdae135430efcfdd1952a0403d01735 WHIRLPOOL bdfd70a0054b71457f49bcc09af8f26d1cf371d10fb60adc256ad5a60f54167fc1d8e26f9355785223647392b5697adaa4ebeec26c7009a09e1f8d317cdf7089
DIST 3proxy-0.7.1.4.tgz 478617 SHA256 905a080ea3ba45a522a2d871bfdda94168561f7dd81c01a4be3540eda8f6c98f SHA512 af361666ec6d53decee6a66f4ec5621e0bbaccfaae8f6cadd5c00c91a417916b2b1b97a660fd47566677c3343f603a45b92f085a48a26eaa429398938d29383a WHIRLPOOL 08ab0ff3a26bce973ffe0077bddc84f356c0c8f8e3a8c06faadb932b10f8c8fc7000d3aaf372bcfe6a2ffcfa4516b23dc3f10bc5509afd404af466d0f765f1d5
+DIST 3proxy-0.8.6.tgz 508359 SHA256 7819237ce043465d887cb0b25d8594de932ed9a694a32a4e46b895ee55675fa2 SHA512 394fcf8f6d088543b2380ad6bf058d276caed29300df7de963895add788a867cab5860f6fc3f1279e10304db5b0ac147af232f9acd3986188bfa56ad2307aae4 WHIRLPOOL d1640a5d0765b3332263ed09e9349e470a5b8c5f57ba65b993cff6bb89d3818ee4da40193e7bdbcfec891810ffe05db02ae5ad25216e00613738e302c1880c88
diff --git a/net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch
new file mode 100644
index 0000000..01f21e8
--- /dev/null
+++ b/net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch
@@ -0,0 +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
+@@ -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
+--- 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-04-17 8:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-12 12:01 [gentoo-commits] repo/gentoo:master commit in: net-proxy/3proxy/files/, net-proxy/3proxy/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2024-04-17 8:01 Petr Vaněk
2023-03-22 1:20 Sam James
2016-03-23 18:36 Patrice Clement
2016-03-23 18:36 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox