Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/3proxy/files/, net-proxy/3proxy/
Date: Sun, 12 Feb 2017 12:01:26
Message-Id: 1486900871.efd18d8e86a5ead0f454310f3e750a38ed82e813.kensington@gentoo
1 commit: efd18d8e86a5ead0f454310f3e750a38ed82e813
2 Author: Alex Efros <powerman <AT> powerman <DOT> name>
3 AuthorDate: Fri Dec 16 18:34:08 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 12 12:01:11 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efd18d8e
7
8 net-proxy/3proxy: version bump to 0.8.8
9
10 Package-Manager: portage-2.3.0
11
12 net-proxy/3proxy/3proxy-0.8.8.ebuild | 42 +++++++++++++++++++++++
13 net-proxy/3proxy/Manifest | 1 +
14 net-proxy/3proxy/files/3proxy-0.8.8-gentoo.patch | 43 ++++++++++++++++++++++++
15 3 files changed, 86 insertions(+)
16
17 diff --git a/net-proxy/3proxy/3proxy-0.8.8.ebuild b/net-proxy/3proxy/3proxy-0.8.8.ebuild
18 new file mode 100644
19 index 0000000000..0226bc84db
20 --- /dev/null
21 +++ b/net-proxy/3proxy/3proxy-0.8.8.ebuild
22 @@ -0,0 +1,42 @@
23 +# Copyright 1999-2017 Gentoo Foundation
24 +# Distributed under the terms of the GNU General Public License v2
25 +# $Id$
26 +EAPI=6
27 +
28 +DESCRIPTION="A really tiny cross-platform proxy servers set"
29 +HOMEPAGE="http://www.3proxy.ru/"
30 +SRC_URI="https://github.com/z3APA3A/3proxy/archive/${P}.tar.gz"
31 +LICENSE="BSD"
32 +SLOT="0"
33 +KEYWORDS="~x86 ~amd64 ~ppc"
34 +IUSE=""
35 +
36 +S="${WORKDIR}/${PN}-${P}"
37 +
38 +PATCHES=(
39 + "${FILESDIR}"/${P}-gentoo.patch
40 +)
41 +
42 +DOCS=( README cfg )
43 +HTML_DOCS=( doc/html/. )
44 +
45 +src_prepare() {
46 + default
47 + cp Makefile.Linux Makefile || die
48 +}
49 +
50 +src_install() {
51 + local x
52 +
53 + pushd src >/dev/null || die
54 + dobin 3proxy
55 + for x in proxy socks ftppr pop3p tcppm udppm mycrypt dighosts icqpr smtpp; do
56 + newbin ${x} ${PN}-${x}
57 + [[ -f "${S}"/man/${x}.8 ]] && newman "${S}"/man/${x}.8 ${PN}-${x}.8
58 + done
59 + popd >/dev/null
60 +
61 + doman man/3proxy*.[38]
62 +
63 + einstalldocs
64 +}
65
66 diff --git a/net-proxy/3proxy/Manifest b/net-proxy/3proxy/Manifest
67 index 44312a92b9..d9fa5d61e4 100644
68 --- a/net-proxy/3proxy/Manifest
69 +++ b/net-proxy/3proxy/Manifest
70 @@ -2,3 +2,4 @@ DIST 3proxy-0.5.3k.tgz 190797 SHA256 7bbe159a0157480c653ef3976495a9b1993435a44ea
71 DIST 3proxy-0.7.1.2.tgz 478532 SHA256 e1157aab3ff8215a3b1f35c61a9d6011e60ad38b52d9f74a1fc4cae14ba16a31 SHA512 c7f4e25d2630e8c6c25bbc09a5f9f201448d57a85d404cd1f6304946d9a31083845bd8d481f610fe1cd1f56be349eb774cdae135430efcfdd1952a0403d01735 WHIRLPOOL bdfd70a0054b71457f49bcc09af8f26d1cf371d10fb60adc256ad5a60f54167fc1d8e26f9355785223647392b5697adaa4ebeec26c7009a09e1f8d317cdf7089
72 DIST 3proxy-0.7.1.4.tgz 478617 SHA256 905a080ea3ba45a522a2d871bfdda94168561f7dd81c01a4be3540eda8f6c98f SHA512 af361666ec6d53decee6a66f4ec5621e0bbaccfaae8f6cadd5c00c91a417916b2b1b97a660fd47566677c3343f603a45b92f085a48a26eaa429398938d29383a WHIRLPOOL 08ab0ff3a26bce973ffe0077bddc84f356c0c8f8e3a8c06faadb932b10f8c8fc7000d3aaf372bcfe6a2ffcfa4516b23dc3f10bc5509afd404af466d0f765f1d5
73 DIST 3proxy-0.8.6.tgz 508359 SHA256 7819237ce043465d887cb0b25d8594de932ed9a694a32a4e46b895ee55675fa2 SHA512 394fcf8f6d088543b2380ad6bf058d276caed29300df7de963895add788a867cab5860f6fc3f1279e10304db5b0ac147af232f9acd3986188bfa56ad2307aae4 WHIRLPOOL d1640a5d0765b3332263ed09e9349e470a5b8c5f57ba65b993cff6bb89d3818ee4da40193e7bdbcfec891810ffe05db02ae5ad25216e00613738e302c1880c88
74 +DIST 3proxy-0.8.8.tar.gz 497039 SHA256 a614527db4056a29672362b6491378d74dbcc21433efa293d351d225d2cccf67 SHA512 ea35ae862f006428950264a673266cff016ad35f3fcbfc842438fef8b1f484c665cfdf30ad1346527c1b18d0c552e3f806416a73f5cc1d35fc1045e322ea4e3d WHIRLPOOL 13587ae2ac034a5342852b426b270eb32005675799ae9d42951b1f0b0944259abb342e748cbbba3bcdf77d3071779d0aca836aef12caa67f670c267f59663e40
75
76 diff --git a/net-proxy/3proxy/files/3proxy-0.8.8-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.8.8-gentoo.patch
77 new file mode 100644
78 index 0000000000..a88dedefff
79 --- /dev/null
80 +++ b/net-proxy/3proxy/files/3proxy-0.8.8-gentoo.patch
81 @@ -0,0 +1,43 @@
82 +--- a/Makefile.Linux 2016-12-16 20:24:53.809856430 +0200
83 ++++ b/Makefile.Linux 2016-12-16 20:26:24.912859170 +0200
84 +@@ -10,11 +10,11 @@
85 + BUILDDIR =
86 + CC = gcc
87 +
88 +-CFLAGS = -g -O2 -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
89 ++CFLAGS += -g -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
90 + COUT = -o
91 + LN = gcc
92 + DCFLAGS = -fpic
93 +-LDFLAGS = -O2 -pthread
94 ++LDFLAGS += -pthread
95 + DLFLAGS = -shared
96 + DLSUFFICS = .ld.so
97 + # -lpthreads may be reuqired on some platforms instead of -pthreads
98 +@@ -39,12 +39,12 @@
99 + include Makefile.inc
100 +
101 + allplugins:
102 +- @list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ; cd ../.. ; done
103 ++ @list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; $(MAKE) ; cd ../.. ; done
104 +
105 + DESTDIR =
106 +-prefix = /usr/local
107 ++prefix =
108 + exec_prefix = $(prefix)
109 +-man_prefix = $(prefix)/share
110 ++man_prefix = $(prefix)/usr/share
111 +
112 + INSTALL = /usr/bin/install
113 + INSTALL_BIN = $(INSTALL) -m 755
114 +--- a/src/stringtable.c 2016-12-16 20:24:53.811856430 +0200
115 ++++ b/src/stringtable.c 2016-12-16 20:26:48.288859873 +0200
116 +@@ -38,7 +38,7 @@
117 + /* 24 */ NULL,
118 + #ifndef TPROXY_CONF
119 + #ifndef _WIN32
120 +-/* 25 */ (unsigned char *)"/usr/local/etc/3proxy/3proxy.cfg",
121 ++/* 25 */ (unsigned char *)"/etc/3proxy/3proxy.cfg",
122 + #else
123 + /* 25 */ (unsigned char *)"3proxy.cfg",
124 + #endif