From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1BED6138334 for ; Tue, 28 May 2019 13:07:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D9EAE0893; Tue, 28 May 2019 13:07:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5F630E0893 for ; Tue, 28 May 2019 13:07:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8DB283451D2 for ; Tue, 28 May 2019 13:07:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 15624266 for ; Tue, 28 May 2019 13:07:41 +0000 (UTC) From: "Stefan Strogin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Stefan Strogin" Message-ID: <1559048211.d75cbc04fc3c8bfa79e6a2d6ef66c27d3a8a650c.steils@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/3proxy/, net-proxy/3proxy/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-proxy/3proxy/3proxy-0.8.12.ebuild net-proxy/3proxy/Manifest net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch X-VCS-Directories: net-proxy/3proxy/files/ net-proxy/3proxy/ X-VCS-Committer: steils X-VCS-Committer-Name: Stefan Strogin X-VCS-Revision: d75cbc04fc3c8bfa79e6a2d6ef66c27d3a8a650c X-VCS-Branch: master Date: Tue, 28 May 2019 13:07:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 155c075c-4aae-4273-8af7-88c910876116 X-Archives-Hash: feced74a64efaaf6608d38f26f718ad8 commit: d75cbc04fc3c8bfa79e6a2d6ef66c27d3a8a650c Author: Alex Efros yandex ru> AuthorDate: Sat Mar 2 20:45:09 2019 +0000 Commit: Stefan Strogin gentoo 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 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 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