Revision bump: EAPI 5, epatch_user, remove unneeded MY_P, clean up in src_install, set proper category for frox.conf manpages. Updated initscript, fix for bug #450204

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

5 files changed, 209 insertions, 8 deletions

diff --git a/net-ftp/frox/ChangeLog b/net-ftp/frox/ChangeLog
index 06e9d1ca539c..3d501623279f 100644
--- a/net-ftp/frox/ChangeLog
+++ b/net-ftp/frox/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-ftp/frox
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/ChangeLog,v 1.20 2012/07/29 17:18:36 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/ChangeLog,v 1.21 2013/06/17 14:36:38 pinkbyte Exp $
+
+*frox-0.7.18-r5 (17 Jun 2013)
+
+  17 Jun 2013; Sergey Popov <pinkbyte@gentoo.org> +frox-0.7.18-r5.ebuild,
+  +files/frox-0.7.18-config.patch, +files/frox.initd:
+  Revision bump: EAPI 5, epatch_user, remove unneeded MY_P, clean up in
+  src_install, set proper category for frox.conf manpages. Updated initscript,
+  fix for bug #450204
 
   29 Jul 2012; Raúl Porcel <armin76@gentoo.org> frox-0.7.18-r2.ebuild,
   frox-0.7.18-r4.ebuild:
diff --git a/net-ftp/frox/Manifest b/net-ftp/frox/Manifest
index 4c4b6f4583bf..1946538414cf 100644
--- a/net-ftp/frox/Manifest
+++ b/net-ftp/frox/Manifest
@@ -1,19 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 0.7.18-netfilter-includes.patch 548 SHA256 76f0737fc5c53c2e52c1e9ccfbd0184575e6d13ac1c96299a4261ac34583f8b1 SHA512 1cb88a5daceb6ec194c4bfd28318362b4181177074a261868265229f8528de4b68d62e92d6381075b78874bd2b65a5eda47c36dcea80fc481f0a34dce83380a1 WHIRLPOOL f99fff353c87eff27e9ecf022050ecd3788aea3b3fb3a5e1e7cf13130e45a4ec39cf6f173c26de8fd933cdd52e2901a89dd95a1fba6469d34be65a1fe0d5102f
 AUX 0.7.18-respect-CFLAGS.patch 328 SHA256 1b42fcd733cc63c773ab95c3516f4604edd08ee999dbf5f3743d78db0856e87d SHA512 a4e36b6835a132f04f14ef79de6d97fe22273f439b1d7753ae1a7d9c0d9e38ba9bd55ed31e9721b78416b5bdd5e711740b706545efe2c062d4b6f9a09508f001 WHIRLPOOL 28f634bb1fe42cd21a3e282c5d14e39ae8b17330b9176598e8ca584838bd0d0b90f5024a3dadc796b050834c5f270064c92f75c29bb23e231dde5f15dd7b108d
 AUX config-0.7.18.patch 1952 SHA256 68ad304da31d7adf3200cf29ef77ebaa099d5dea2998897d02c5264f91e868d8 SHA512 a0f71c7c684bdef34568ac2ef10f9c46f4d6f4f086ab777e37f588087ce1a72bb92016a23435e9df12e62cf551b1e8e159783129fcdd822ef83b28f4e650921b WHIRLPOOL c5b080f3b2a44dd0ae38618e156d23a39f5633303e25871eb3b13a201a93ab511e1a980c88315dfa1d9f756753d8b328d53359f2a900bca81ae2b89ccba9ec9a
+AUX frox-0.7.18-config.patch 1960 SHA256 dd6b2bd265d20b569c4b897d66f5b1317b4642998a454e7889fc458c1f6dbd5a SHA512 69210560adaa38cc94960f4e76ba4ae9f20b5044c0d3d84e835a107554ae3f5315f9463c7730ada716c63615cab782d140e8df8c2b9f9bcf6e844a7bd7033666 WHIRLPOOL e398ec03ffa3fad930a5cb4b8238b234ee5aa565b5cb8faa43fce4a96b5da42befe7a9079321001294304e531c9eacd188b6df46334b8ddd7f072d392ec3f8ef
+AUX frox.initd 978 SHA256 cbc9ecb21488c37abbc97b8808c149fcea7dddf52418cb322bda61a9fcd92dbf SHA512 a9b88a73ba85b103b5a8fb64ec50692bdbdceed0f31a10001a666ff8aa2334e6ee54ad027cded4ccbc9cde6d78273f7c5deade5af2a07d2f3af75adc30c5694e WHIRLPOOL b66cf212b43da0330508e91d81f19a85cb6badc7adeb64a40773436776be2bebf156c86ff22d6e6ea294064bceff074f0aebc05e842f4d2ceaff62f949846e14
 AUX frox.rc 1069 SHA256 2ad11b059524b4bfd8284326f498ebf37bf31b5bed4d92776807f67046634f5e SHA512 a3b94c248a888f1de26281f2b54320e0ddf037281b1225978b39e21800f23273119c7ec3e3d30b78b419d901ce036fe1667fea8e3984033b5e77fc2198fd36e2 WHIRLPOOL 269b79475ae9d62f83156e4787ff627400c37d8657b4e7f6fee00da840333ea2d37f784348d092e2f74b06f7e2b7eb86e66a2b4503c0d4a427b51112404acaa1
 DIST frox-0.7.18.tar.bz2 173355 SHA256 f7b637dd108444ff9c2302aa134f434e1606a2f965c01492abfbdc9b1c0bd0fc
 EBUILD frox-0.7.18-r2.ebuild 1790 SHA256 240fc886ed96f9c1f5ce947642ebeae8390990de6dc8bcf28800154c02c0dea7 SHA512 bae9edceda8a9f383bafa522217078cceed5398980e4322bcf262c5cc0636f0414c9ec36746c7c888b1c8db710ede9275322c5ca1ad5b7e4a6ab618f88d4ed9a WHIRLPOOL 7edee458faf14787b91ff0ef09a1860a5c04d4a5b82dd507f8db63b8c6e275e6a0dd85e76908d1cf9e2d72d4504fcb9fcd560a211c71725cdaab61f169236685
 EBUILD frox-0.7.18-r4.ebuild 2134 SHA256 e2d953bf7d82d2f394d160c7b27cbd3d76f7d571145497f4375c6e9a3b75aedf SHA512 3ed67e89c1056eae8433fd4b25abc3effda22cd070c8db0f00231521b45513f265386f526f38e1abf045043f3565069b8169fb1f1efb2bf61552b62b1ccdbfe3 WHIRLPOOL da5769a6cc22adc44ff7436ccd49a6b3abed376b5a70fb03da58633172493e0ec1ebfbce90178596add29666cb0da0bf7c3ef9f9fc7b2d62e55de890125217d8
-MISC ChangeLog 3213 SHA256 bb2f464bcfc210328a0ced0cf089495179855ea1ab7f72dc3e80b3230ebc402d SHA512 6a7d47f567a8ddad073271641bed14a0dbc3f32c52459bfeb7e0d53f7b669ad8e13bd1e93a3f3efcc670bfd19e63edfe78931695ed9104b73d5bb14d0a61e461 WHIRLPOOL bec514984895c9f2fba1aae9bec2208e1e6ce7288f0cc725052a3ed7204108b80f0b0031e3b569e6c6581e944b4083d5f186ebcad836b1b389bbdd8e85fbc72c
+EBUILD frox-0.7.18-r5.ebuild 1975 SHA256 9431bef1908cd2153e18413cc77984dcf73226c8499f6efbe9962545054b8592 SHA512 84742980f325e21473f1324255283c437e855ffec75d4bd026ff79827232c150d99286d0580d92938d619836d2631db8a563b708c9eb700eee2890912bdf6414 WHIRLPOOL dbb5a0521f941908312332ce9d1e5195e7a41e50502d7f0b9b2903356dd5612e2f5f0434bf3b89c981c8071521e42de26344eeeaac8ecb4a5e4eed7666f9c3de
+MISC ChangeLog 3547 SHA256 143b9ee498af80a9c9bcdadb3676d4e2f167941ce82115d2e59550d947040d2e SHA512 e056f0c8892bf00af413f2d90cfe55358d974c4e6a208713b6a58958adbdc84536d1fc192c426c7babb444913a88725cde665040cae84e2a9f8cb25cba2ea852 WHIRLPOOL 95e128bc7da73d57fc409b3ac59aa68f3df5fa71f13dfd1af1d202070de4b9c1520b8c74d429a917892560f0350aef181b871de265fa2c33346c93185054f0fd
 MISC metadata.xml 341 SHA256 684946b86c6a12c6799fe043728f4d51ef626d0bb528bdf267c13d1843e5e1fb SHA512 e2072841820169a7cdabafeb8ac995773c261ac29693fab2aa398bf9ee2e8d3059eff7a14898ecdf2c7bf9e1ad6574bd1a6977f3739a9ecbb3ec0ac0be145d25 WHIRLPOOL b4d1e5f15124d0019e4f746c3a8c939b0347848b6456ba8896484d22979626bef0477d84a7d21711a2f555c890aa39b157910ddbe3d977cf709ad53636070ccd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEARECAAYFAlAVcHIACgkQuQc30/atMkDslgCgvXTGLBkyUlaqd5qjp+VoxtqA
-kk8AoKKuEd/pU7VyO54aYcfR3w7OCQGd
-=kktD
+iQEcBAEBCAAGBQJRvx94AAoJECo/aRed9267Zw0H/3TUjTuIxvgkocsZMJB1Y674
+IlhbWodqwerkPJ4O+9fMk0/aVUC92/L9LN9/1CL0fE5n5Tx/sVintzklVTl/aE8A
+rpxMRNcxEe26kb6NU/N+vhcvv/wufgXr0j7VDR8denTmGhEITEkTWHhiuTxHItSs
+zX58QELJXhPPABZWmjNRZH1B0YZBAR2Utm5L0yWp12OqN0ke7GnzVH7tTbOv93Po
+n4Nr5kZASKBN0oS+aO/7+DBAD1GNeRzu0pxP6SPTOoBdzsJDNHpsVZ7GJvpaF0Tx
+tFQzv1AqkHRRldd4FQ9xMFxahr/1xQNe4KVw43pZ7iYni1iJ6swKKyad8IOQWJw=
+=Pmb6
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/frox/files/frox-0.7.18-config.patch b/net-ftp/frox/files/frox-0.7.18-config.patch
new file mode 100644
index 000000000000..feee37e3674e
--- /dev/null
+++ b/net-ftp/frox/files/frox-0.7.18-config.patch
@@ -0,0 +1,66 @@
+--- a/src/frox.conf	2005-02-04 19:54:55.000000000 +0930
++++ b/src/frox.conf	2005-02-07 19:35:32.995421344 +0930
+@@ -18,7 +18,9 @@
+ # commented out to listen on all local IPs.
+ #
+ # Listen firewall.localnet
+-Listen 192.168.2.1
++# Listen 192.168.2.1
++
++Listen 127.0.0.1
+ 
+ # Port to listen on. Must be supplied.
+ #
+@@ -26,7 +28,7 @@
+ 
+ # If specified then bind to this device
+ #
+-BindToDevice eth0
++#BindToDevice eth0
+ 
+ # Whether to run from inetd. You should still define Port above, but
+ # it isn't used for much.
+@@ -69,12 +71,12 @@
+ ####################################################################
+ # General Options                                                  #
+ ####################################################################
+-# User and group to drop priveliges to. This must be specified - if
++User ftpproxy
+ # you really want to run as root (not a good idea) you must say so
+ # specifically, and have compiled with --enable-run-as-root.
+ #
+-# User nobody
+-# Group nogroup
++User ftpproxy
++Group ftpproxy
+ 
+ # This is frox's working directory - it must be specified. Temporary
+ # files and sockets will be created here. If you are using local
+@@ -83,7 +85,7 @@
+ # also chroot to this dir on startup. To avoid this you must specifically 
+ # set DontChroot to Yes.
+ #
+-# WorkingDir /usr/local/lib/frox
++WorkingDir /var/spool/frox
+ # DontChroot Yes
+ 
+ # Logging level. 0=No logging. 5=Critical errors only. 10= All errors.
+@@ -96,15 +98,15 @@
+ # transferred irrespective of the log level. You can turn this off
+ # below.
+ #
+-# LogLevel 15
+-# LogFile /usr/local/lib/frox/frox-log
++LogLevel 20
++LogFile /var/log/frox/frox-log
+ # XferLogging no
+ 
+ # File to store PID in. Default is not to. If this file is not within
+ # the Chroot directory then it cannot be deleted on exit, but will
+ # otherwise work fine.
+ #
+-PidFile /var/run/frox.pid
++PidFile /var/run/frox/frox.pid
+ 
+ 
+ ####################################################################
diff --git a/net-ftp/frox/files/frox.initd b/net-ftp/frox/files/frox.initd
new file mode 100644
index 000000000000..8ed9f332e87a
--- /dev/null
+++ b/net-ftp/frox/files/frox.initd
@@ -0,0 +1,38 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/files/frox.initd,v 1.1 2013/06/17 14:36:38 pinkbyte Exp $
+
+extra_commands="reload"
+
+FROX_CONFIG="/etc/frox.conf"
+FROX_PID_FILE="/var/run/frox/frox.pid"
+FROX_OPTS="-f ${FROX_CONFIG}"
+
+checkconfig() {
+	local piddir="$(dirname ${FROX_PID_FILE})"
+	checkpath -q -d -o ftpproxy:ftpproxy -m 0770 "${piddir}" || return 1
+	if [ ! -f "${FROX_CONFIG}" ] ; then
+		eerror "missing ${FROX_CONFIG}"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --quiet --exec /usr/sbin/frox -- ${FROX_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/frox --pidfile "${FROX_PID_FILE}"
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading configuration"
+	start-stop-daemon --signal HUP --pidfile "${FROX_PID_FILE}"
+	eend $?
+}
diff --git a/net-ftp/frox/frox-0.7.18-r5.ebuild b/net-ftp/frox/frox-0.7.18-r5.ebuild
new file mode 100644
index 000000000000..072f0a9d816d
--- /dev/null
+++ b/net-ftp/frox/frox-0.7.18-r5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/frox-0.7.18-r5.ebuild,v 1.1 2013/06/17 14:36:38 pinkbyte Exp $
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="A transparent ftp proxy"
+SRC_URI="http://frox.sourceforge.net/download/${P}.tar.bz2"
+HOMEPAGE="http://frox.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="clamav ssl transparent"
+
+DEPEND="clamav? ( >=app-antivirus/clamav-0.80 )
+	ssl? ( dev-libs/openssl )
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6 )"
+RDEPEND="${DEPEND}"
+
+# INSTALL has useful filewall rules
+DOCS=(
+	BUGS README
+	doc/CREDITS doc/ChangeLog doc/FAQ doc/INSTALL
+	doc/INTERNALS doc/README.transdata doc/RELEASE
+	doc/SECURITY doc/TODO
+)
+
+pkg_setup() {
+	enewgroup ftpproxy
+	enewuser ftpproxy -1 -1 /var/spool/frox ftpproxy
+
+	use clamav && ewarn "Virus scanner potentialy broken in chroot - see bug #81035"
+}
+
+src_prepare () {
+	epatch "${FILESDIR}/${PV}-respect-CFLAGS.patch"
+	epatch "${FILESDIR}/${PV}-netfilter-includes.patch"
+	epatch "${FILESDIR}/${P}-config.patch"
+
+	if use clamav ; then
+		sed -i -e "s:^# VirusScanner.*:# VirusScanner '\"/usr/bin/clamscan\" \"%s\"':" \
+			"src/${PN}.conf" || die
+	fi
+
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-http-cache --enable-local-cache \
+		--enable-procname \
+		--enable-configfile=/etc/frox.conf \
+		$(use_enable !kernel_linux libiptc) \
+		$(use_enable clamav virus-scan) \
+		$(use_enable ssl) \
+		$(use_enable transparent transparent-data) \
+		$(use_enable !transparent ntp)
+}
+
+src_install() {
+	default
+
+	keepdir /var/{log,spool}/"${PN}"
+
+	fperms 700 /var/spool/frox
+	fowners ftpproxy:ftpproxy /var/{log,spool}/frox
+
+	dohtml doc/*.html doc/*.sgml
+
+	newman "doc/${PN}.man" "${PN}.man.8"
+	newman "doc/${PN}.conf.man" "${PN}.conf.man.5"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+
+	insinto /etc
+	newins "src/${PN}.conf" "${PN}.conf.example"
+}