[gentoo-commits] repo/gentoo:master commit in: net-proxy/3proxy/, net-proxy/3proxy/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: net-proxy/3proxy/, net-proxy/3proxy/files/
@ 2017-02-16 11:00 Michael Palimaka
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2017-02-16 11:00 UTC (permalink / raw
  To: gentoo-commits

commit:     3a7381e43e9b75f4264f3bf359c5b9073bf5cb91
Author:     Alex Efros <powerman <AT> powerman <DOT> name>
AuthorDate: Sun Feb 12 17:49:48 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 11:00:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a7381e4

net-proxy/3proxy: sort KEYWORDS, cleanup CFLAGS

Package-Manager: portage-2.3.3

 net-proxy/3proxy/3proxy-0.8.9.ebuild             | 2 +-
 net-proxy/3proxy/files/3proxy-0.8.8-gentoo.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-proxy/3proxy/3proxy-0.8.9.ebuild b/net-proxy/3proxy/3proxy-0.8.9.ebuild
index 48f0da44a3..aab3b40e72 100644
--- a/net-proxy/3proxy/3proxy-0.8.9.ebuild
+++ b/net-proxy/3proxy/3proxy-0.8.9.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.3proxy.ru/"
 SRC_URI="https://github.com/z3APA3A/3proxy/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 PATCHES=(

diff --git a/net-proxy/3proxy/files/3proxy-0.8.8-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.8.8-gentoo.patch
index a88dedefff..1f8d478cd0 100644
--- a/net-proxy/3proxy/files/3proxy-0.8.8-gentoo.patch
+++ b/net-proxy/3proxy/files/3proxy-0.8.8-gentoo.patch
@@ -5,7 +5,7 @@
  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
++CFLAGS += -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
  COUT = -o 
  LN = gcc
  DCFLAGS = -fpic


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-proxy/3proxy/, net-proxy/3proxy/files/
@ 2018-04-26 11:12 Mikle Kolyada
  0 siblings, 0 replies; 6+ messages in thread
From: Mikle Kolyada @ 2018-04-26 11:12 UTC (permalink / raw
  To: gentoo-commits

commit:     d6584109887b0b79bb058e0cb79b58ceca4ecf52
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 26 11:11:15 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 11:11:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6584109

net-proxy/3proxy: QA: drop low quality unstable ebuilds

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-proxy/3proxy/3proxy-0.7.1.2.ebuild             | 41 ---------------------
 net-proxy/3proxy/3proxy-0.7.1.4.ebuild             | 41 ---------------------
 net-proxy/3proxy/3proxy-0.8.6.ebuild               | 41 ---------------------
 net-proxy/3proxy/3proxy-0.8.8.ebuild               | 42 ---------------------
 net-proxy/3proxy/Manifest                          |  4 --
 net-proxy/3proxy/files/3proxy-0.7.1.2-gentoo.patch | 43 ----------------------
 net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch   | 43 ----------------------
 7 files changed, 255 deletions(-)

diff --git a/net-proxy/3proxy/3proxy-0.7.1.2.ebuild b/net-proxy/3proxy/3proxy-0.7.1.2.ebuild
deleted file mode 100644
index 092c5f001ef..00000000000
--- a/net-proxy/3proxy/3proxy-0.7.1.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="A really tiny cross-platform proxy servers set"
-HOMEPAGE="https://www.3proxy.ru/"
-SRC_URI="https://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 man/3proxy*.[38]
-
-	dodoc Readme
-	docinto html
-	dodoc -r doc/html/*
-	docinto cfg
-	dodoc -r cfg/*
-}

diff --git a/net-proxy/3proxy/3proxy-0.7.1.4.ebuild b/net-proxy/3proxy/3proxy-0.7.1.4.ebuild
deleted file mode 100644
index 2773257c641..00000000000
--- a/net-proxy/3proxy/3proxy-0.7.1.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="A really tiny cross-platform proxy servers set"
-HOMEPAGE="https://www.3proxy.ru/"
-SRC_URI="https://3proxy.ru/${PV}/${P}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE=""
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.1.2-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 man/3proxy*.[38]
-
-	dodoc Readme
-	docinto html
-	dodoc -r doc/html/*
-	docinto cfg
-	dodoc -r cfg/*
-}

diff --git a/net-proxy/3proxy/3proxy-0.8.6.ebuild b/net-proxy/3proxy/3proxy-0.8.6.ebuild
deleted file mode 100644
index bb8b7196c0a..00000000000
--- a/net-proxy/3proxy/3proxy-0.8.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="A really tiny cross-platform proxy servers set"
-HOMEPAGE="https://www.3proxy.ru/"
-SRC_URI="https://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/3proxy-0.8.8.ebuild b/net-proxy/3proxy/3proxy-0.8.8.ebuild
deleted file mode 100644
index 9b778390a91..00000000000
--- a/net-proxy/3proxy/3proxy-0.8.8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A really tiny cross-platform proxy servers set"
-HOMEPAGE="https://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 3bfe1ca516a..d6c16bd0308 100644
--- a/net-proxy/3proxy/Manifest
+++ b/net-proxy/3proxy/Manifest
@@ -1,6 +1,2 @@
 DIST 3proxy-0.5.3k.tgz 190797 BLAKE2B c8c043166a927e24880735b7d5f17645ac5b93804649bc5009d3fc027cfcc01f5a28f468da0dfc3e367f42874b777806a082cc37e8f95942801378ef66d64e34 SHA512 d709d57fc7c1a31ab190dd4692a93d9a4866a0cfea4cb6d2ff8dc8f8a3ec2ff674496a4c63854580a933948a6f899db2cc21e5b82a6f854bc236e5779014ae00
-DIST 3proxy-0.7.1.2.tgz 478532 BLAKE2B 1855c6c2ba317dbbff7274495438a2db8c78e0a8e715c089404aabfe3f742697c6031685e2bafa42211ecb44e114c766ca0d756f609a98b950404b9127029b72 SHA512 c7f4e25d2630e8c6c25bbc09a5f9f201448d57a85d404cd1f6304946d9a31083845bd8d481f610fe1cd1f56be349eb774cdae135430efcfdd1952a0403d01735
-DIST 3proxy-0.7.1.4.tgz 478617 BLAKE2B 29d729d513c25d33b03c738bdc5aa99ab4b1ea5c3b95a0ff31365084edee6b9d2f0519c5c1dc939a2bf09ec93a7959b3feb4269334aea14f92d0af415cabbd27 SHA512 af361666ec6d53decee6a66f4ec5621e0bbaccfaae8f6cadd5c00c91a417916b2b1b97a660fd47566677c3343f603a45b92f085a48a26eaa429398938d29383a
-DIST 3proxy-0.8.6.tgz 508359 BLAKE2B 01d6d379304c7827a2392548dea1752b758a40654d986b219c57c12d1734213ef9b54a8d98b9d000ea0dfe0581db4de4eba6bda8e8458f1fbe04e34fd246e296 SHA512 394fcf8f6d088543b2380ad6bf058d276caed29300df7de963895add788a867cab5860f6fc3f1279e10304db5b0ac147af232f9acd3986188bfa56ad2307aae4
-DIST 3proxy-0.8.8.tar.gz 497039 BLAKE2B 5f2211941480a36269dc424a9ae0aad477abf94180e2e9a64d8e7094e796722a163fa8964d52903dd4cbb870eed12f967f422ba76b8cb06e1d5b838b9f9aef84 SHA512 ea35ae862f006428950264a673266cff016ad35f3fcbfc842438fef8b1f484c665cfdf30ad1346527c1b18d0c552e3f806416a73f5cc1d35fc1045e322ea4e3d
 DIST 3proxy-0.8.9.tar.gz 497006 BLAKE2B c57e98eb586dfacefd530e091fecbee274d8104698ca082b71ea0607294199cb7db63fc32787236b7e797c928a7ba4f7bafa3ef35551bef76aacfbdf1f259fff SHA512 35153882fec7077b05b23f9cea91443126a8a9faf9818915612e0739196a8bd1f00e0bcefb339a86bad10bb0c1b9891bd06847934787f4758ec55e6cc2e9e815

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
deleted file mode 100644
index 715992bdc9d..00000000000
--- a/net-proxy/3proxy/files/3proxy-0.7.1.2-gentoo.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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

diff --git a/net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch
deleted file mode 100644
index d12c9b2b5d6..00000000000
--- a/net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-proxy/3proxy/, net-proxy/3proxy/files/
@ 2019-05-28 13:07 Stefan Strogin
  0 siblings, 0 replies; 6+ messages in thread
From: Stefan Strogin @ 2019-05-28 13:07 UTC (permalink / raw
  To: gentoo-commits

commit:     d75cbc04fc3c8bfa79e6a2d6ef66c27d3a8a650c
Author:     Alex Efros <powerman-asdf <AT> yandex <DOT> ru>
AuthorDate: Sat Mar  2 20:45:09 2019 +0000
Commit:     Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Tue May 28 12:56:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d75cbc04

net-proxy/3proxy: Version bump to 0.8.12 and EAPI=7

Signed-off-by: Aleksandr Efros <powerman-asdf <AT> yandex.ru>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/11220
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>

 net-proxy/3proxy/3proxy-0.8.12.ebuild             | 40 ++++++++++++++++++
 net-proxy/3proxy/Manifest                         |  1 +
 net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch | 49 +++++++++++++++++++++++
 3 files changed, 90 insertions(+)

diff --git a/net-proxy/3proxy/3proxy-0.8.12.ebuild b/net-proxy/3proxy/3proxy-0.8.12.ebuild
new file mode 100644
index 00000000000..3bf12098bc4
--- /dev/null
+++ b/net-proxy/3proxy/3proxy-0.8.12.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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.8.12-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 120f5c7f410..3d99915e3f4 100644
--- a/net-proxy/3proxy/Manifest
+++ b/net-proxy/3proxy/Manifest
@@ -1 +1,2 @@
+DIST 3proxy-0.8.12.tar.gz 528990 BLAKE2B fb338c93e25fe4d03d626118f8c3ef52af7104599e11d535dfa572c4fb47d609da66f199406a3c6bb9739766163bb7b54b529f71d4d6ff637567f2f67d3a9ed1 SHA512 33412e89991055598e06210dbcd7b2f9ee6810753c8f40ada02f222def0a49047a90ff7f2efa6895bc4f8ad99193866c980de2e79464310a77cc8e63c8b9813d
 DIST 3proxy-0.8.9.tar.gz 497006 BLAKE2B c57e98eb586dfacefd530e091fecbee274d8104698ca082b71ea0607294199cb7db63fc32787236b7e797c928a7ba4f7bafa3ef35551bef76aacfbdf1f259fff SHA512 35153882fec7077b05b23f9cea91443126a8a9faf9818915612e0739196a8bd1f00e0bcefb339a86bad10bb0c1b9891bd06847934787f4758ec55e6cc2e9e815

diff --git a/net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch
new file mode 100644
index 00000000000..33950f45cee
--- /dev/null
+++ b/net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch
@@ -0,0 +1,49 @@
+diff -uNr a/Makefile.Linux b/Makefile.Linux
+--- a/Makefile.Linux	2018-04-18 22:48:45.000000000 +0300
++++ b/Makefile.Linux	2019-05-26 14:42:38.927811513 +0300
+@@ -8,13 +8,13 @@
+ # library support. Add -DSAFESQL for poorely written ODBC library / drivers.
+ 
+ BUILDDIR =
+-CC = gcc
++CC ?= gcc
+ 
+-CFLAGS = -g -O2 -fno-strict-aliasing -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
++CFLAGS += -fno-strict-aliasing -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
+ COUT = -o 
+-LN = gcc
++LN ?= gcc
+ DCFLAGS = -fpic
+-LDFLAGS = -O2 -fno-strict-aliasing -pthread
++LDFLAGS += -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		= /usr/local
++prefix		=
+ exec_prefix	= $(prefix)
+-man_prefix	= $(prefix)/share
++man_prefix	= $(prefix)/usr/share
+ 
+ INSTALL		= /usr/bin/install
+ INSTALL_BIN	= $(INSTALL) -m 755
+diff -uNr a/src/stringtable.c b/src/stringtable.c
+--- a/src/stringtable.c	2018-04-18 22:48:45.000000000 +0300
++++ b/src/stringtable.c	2019-05-26 14:42:07.437810566 +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] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-proxy/3proxy/, net-proxy/3proxy/files/
@ 2020-03-20  1:12 Thomas Deutschmann
  0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2020-03-20  1:12 UTC (permalink / raw
  To: gentoo-commits

commit:     b7299ec1e28d8f5d972da8c10a7c12ea57cd1af6
Author:     Alex Efros <powerman-asdf <AT> yandex <DOT> ru>
AuthorDate: Thu Mar 19 08:04:03 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Mar 20 01:11:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7299ec1

net-proxy/3proxy: remove old versions

Bug: https://bugs.gentoo.org/show_bug.cgi?id=711282
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Aleksandr Efros <powerman-asdf <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/15010
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-proxy/3proxy/3proxy-0.8.12.ebuild            | 46 ------------------------
 net-proxy/3proxy/3proxy-0.8.9.ebuild             | 40 ---------------------
 net-proxy/3proxy/Manifest                        |  2 --
 net-proxy/3proxy/files/3proxy-0.8.8-gentoo.patch | 43 ----------------------
 4 files changed, 131 deletions(-)

diff --git a/net-proxy/3proxy/3proxy-0.8.12.ebuild b/net-proxy/3proxy/3proxy-0.8.12.ebuild
deleted file mode 100644
index 5ebf6061b3d..00000000000
--- a/net-proxy/3proxy/3proxy-0.8.12.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 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.8.12-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 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/3proxy-0.8.9.ebuild b/net-proxy/3proxy/3proxy-0.8.9.ebuild
deleted file mode 100644
index ba16aeca009..00000000000
--- a/net-proxy/3proxy/3proxy-0.8.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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.8.8-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 ee244468567..a16145b6779 100644
--- a/net-proxy/3proxy/Manifest
+++ b/net-proxy/3proxy/Manifest
@@ -1,3 +1 @@
-DIST 3proxy-0.8.12.tar.gz 528990 BLAKE2B fb338c93e25fe4d03d626118f8c3ef52af7104599e11d535dfa572c4fb47d609da66f199406a3c6bb9739766163bb7b54b529f71d4d6ff637567f2f67d3a9ed1 SHA512 33412e89991055598e06210dbcd7b2f9ee6810753c8f40ada02f222def0a49047a90ff7f2efa6895bc4f8ad99193866c980de2e79464310a77cc8e63c8b9813d
 DIST 3proxy-0.8.13.tar.gz 529072 BLAKE2B 45b756bf1ddaaf560f4f35c88e78d24dbafa28c3144de5317d9f5177c51da85a2148a7db743a656ddf853325e18edbcb200b37ff02afae2f203c3bfab66e1b58 SHA512 94b4a2568917c1d720276e38050a13e144d3e92ff41edd02eeebac0a6c21e6a839a58ea7dcb3abc03370e0f18452c953cfd7ad15ebac87e66b78d94fa52fbd79
-DIST 3proxy-0.8.9.tar.gz 497006 BLAKE2B c57e98eb586dfacefd530e091fecbee274d8104698ca082b71ea0607294199cb7db63fc32787236b7e797c928a7ba4f7bafa3ef35551bef76aacfbdf1f259fff SHA512 35153882fec7077b05b23f9cea91443126a8a9faf9818915612e0739196a8bd1f00e0bcefb339a86bad10bb0c1b9891bd06847934787f4758ec55e6cc2e9e815

diff --git a/net-proxy/3proxy/files/3proxy-0.8.8-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.8.8-gentoo.patch
deleted file mode 100644
index 1f8d478cd08..00000000000
--- a/net-proxy/3proxy/files/3proxy-0.8.8-gentoo.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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 += -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] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-proxy/3proxy/, net-proxy/3proxy/files/
@ 2020-10-27  7:35 Joonas Niilola
  0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2020-10-27  7:35 UTC (permalink / raw
  To: gentoo-commits

commit:     213b345dfe3375390741c8212c4b0e5f6078b850
Author:     Alex Efros <powerman-asdf <AT> yandex <DOT> ru>
AuthorDate: Thu Oct 22 19:57:08 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Oct 27 07:35:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=213b345d

net-proxy/3proxy: bump to 0.9.0

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Aleksandr Efros <powerman-asdf <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/18005
Signed-off-by: Joonas Niilola <juippis <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 insertions(+)

diff --git a/net-proxy/3proxy/3proxy-0.9.0.ebuild b/net-proxy/3proxy/3proxy-0.9.0.ebuild
new file mode 100644
index 00000000000..8ba6dc7366b
--- /dev/null
+++ b/net-proxy/3proxy/3proxy-0.9.0.ebuild
@@ -0,0 +1,47 @@
+# 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 a16145b6779..e30757d1ed5 100644
--- a/net-proxy/3proxy/Manifest
+++ b/net-proxy/3proxy/Manifest
@@ -1 +1,2 @@
 DIST 3proxy-0.8.13.tar.gz 529072 BLAKE2B 45b756bf1ddaaf560f4f35c88e78d24dbafa28c3144de5317d9f5177c51da85a2148a7db743a656ddf853325e18edbcb200b37ff02afae2f203c3bfab66e1b58 SHA512 94b4a2568917c1d720276e38050a13e144d3e92ff41edd02eeebac0a6c21e6a839a58ea7dcb3abc03370e0f18452c953cfd7ad15ebac87e66b78d94fa52fbd79
+DIST 3proxy-0.9.0.tar.gz 607014 BLAKE2B dae9004ea1474080fbbd4a3ff3a2690f8a6afb2ab2c045dbdaa25adf10ff2c58501d46a5a99b24db526b153ce00d281851ec08499d908709c5801c27aa7b0ca8 SHA512 7429389bf70c38d57e7a6f34e649a04aaad4f81555b7ef131cae026123ff7877d3f1aef8d10f84b9fc2c58e9ad5ab3d55e4af7326dbce14c05f3cd9973fafd83

diff --git a/net-proxy/3proxy/files/3proxy-0.9.0-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.9.0-gentoo.patch
new file mode 100644
index 00000000000..d7c530535f6
--- /dev/null
+++ b/net-proxy/3proxy/files/3proxy-0.9.0-gentoo.patch
@@ -0,0 +1,36 @@
+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] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-proxy/3proxy/, net-proxy/3proxy/files/
@ 2020-12-10  7:31 Joonas Niilola
  0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2020-12-10  7:31 UTC (permalink / raw
  To: gentoo-commits

commit:     aafeea3ac7082ada0301238bd80eef5c40c77bbd
Author:     Alex Efros <powerman-asdf <AT> yandex <DOT> ru>
AuthorDate: Sat Dec  5 05:40:12 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Dec 10 07:30:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aafeea3a

net-proxy/3proxy: remove old version

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Aleksandr Efros <powerman-asdf <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/18511
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-proxy/3proxy/3proxy-0.8.13.ebuild             | 46 ---------------------
 net-proxy/3proxy/Manifest                         |  1 -
 net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch | 49 -----------------------
 3 files changed, 96 deletions(-)

diff --git a/net-proxy/3proxy/3proxy-0.8.13.ebuild b/net-proxy/3proxy/3proxy-0.8.13.ebuild
deleted file mode 100644
index 345db508eed..00000000000
--- a/net-proxy/3proxy/3proxy-0.8.13.ebuild
+++ /dev/null
@@ -1,46 +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.8.12-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 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 e30757d1ed5..16b6fe43d8d 100644
--- a/net-proxy/3proxy/Manifest
+++ b/net-proxy/3proxy/Manifest
@@ -1,2 +1 @@
-DIST 3proxy-0.8.13.tar.gz 529072 BLAKE2B 45b756bf1ddaaf560f4f35c88e78d24dbafa28c3144de5317d9f5177c51da85a2148a7db743a656ddf853325e18edbcb200b37ff02afae2f203c3bfab66e1b58 SHA512 94b4a2568917c1d720276e38050a13e144d3e92ff41edd02eeebac0a6c21e6a839a58ea7dcb3abc03370e0f18452c953cfd7ad15ebac87e66b78d94fa52fbd79
 DIST 3proxy-0.9.0.tar.gz 607014 BLAKE2B dae9004ea1474080fbbd4a3ff3a2690f8a6afb2ab2c045dbdaa25adf10ff2c58501d46a5a99b24db526b153ce00d281851ec08499d908709c5801c27aa7b0ca8 SHA512 7429389bf70c38d57e7a6f34e649a04aaad4f81555b7ef131cae026123ff7877d3f1aef8d10f84b9fc2c58e9ad5ab3d55e4af7326dbce14c05f3cd9973fafd83

diff --git a/net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch
deleted file mode 100644
index 33950f45cee..00000000000
--- a/net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -uNr a/Makefile.Linux b/Makefile.Linux
---- a/Makefile.Linux	2018-04-18 22:48:45.000000000 +0300
-+++ b/Makefile.Linux	2019-05-26 14:42:38.927811513 +0300
-@@ -8,13 +8,13 @@
- # library support. Add -DSAFESQL for poorely written ODBC library / drivers.
- 
- BUILDDIR =
--CC = gcc
-+CC ?= gcc
- 
--CFLAGS = -g -O2 -fno-strict-aliasing -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
-+CFLAGS += -fno-strict-aliasing -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
- COUT = -o 
--LN = gcc
-+LN ?= gcc
- DCFLAGS = -fpic
--LDFLAGS = -O2 -fno-strict-aliasing -pthread
-+LDFLAGS += -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		= /usr/local
-+prefix		=
- exec_prefix	= $(prefix)
--man_prefix	= $(prefix)/share
-+man_prefix	= $(prefix)/usr/share
- 
- INSTALL		= /usr/bin/install
- INSTALL_BIN	= $(INSTALL) -m 755
-diff -uNr a/src/stringtable.c b/src/stringtable.c
---- a/src/stringtable.c	2018-04-18 22:48:45.000000000 +0300
-+++ b/src/stringtable.c	2019-05-26 14:42:07.437810566 +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] 6+ messages in thread

end of thread, other threads:[~2020-12-10  7:31 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-10  7:31 [gentoo-commits] repo/gentoo:master commit in: net-proxy/3proxy/, net-proxy/3proxy/files/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2020-10-27  7:35 Joonas Niilola
2020-03-20  1:12 Thomas Deutschmann
2019-05-28 13:07 Stefan Strogin
2018-04-26 11:12 Mikle Kolyada
2017-02-16 11:00 Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox