Version bump for secuity bug #81035

Package-Manager: portage-2.0.51-r15

6 files changed, 156 insertions, 8 deletions

diff --git a/net-ftp/frox/ChangeLog b/net-ftp/frox/ChangeLog
index 89a27197088e..76af87ddc76d 100644
--- a/net-ftp/frox/ChangeLog
+++ b/net-ftp/frox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/frox
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/ChangeLog,v 1.1 2005/01/24 14:05:34 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/ChangeLog,v 1.2 2005/02/07 11:15:15 dragonheart Exp $
+
+*frox-0.7.18 (07 Feb 2005)
+
+  07 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/config-0.7.18.patch, files/frox.rc, +frox-0.7.18.ebuild:
+  Version bump for secuity bug #81035
 
 *frox-0.7.17 (24 Jan 2005)
 
diff --git a/net-ftp/frox/Manifest b/net-ftp/frox/Manifest
index d2e7414f7e52..02c96e88d2dc 100644
--- a/net-ftp/frox/Manifest
+++ b/net-ftp/frox/Manifest
@@ -3,13 +3,16 @@ Hash: SHA1
 
 MD5 be8717c8af7e78c0352162e8ec2324a8 frox-0.7.17.ebuild 1526
 MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
-MD5 e3fc1fdbf8703ac6c553227814dd0f85 ChangeLog 431
-MD5 596f68e71d4f88d5fffac0fe207ead3b files/frox.rc 1088
+MD5 636e3b4f965ba04ff08d7ffbb93d1707 ChangeLog 617
+MD5 e2d9fbeb73f2f77bfb6876a22408a8e7 frox-0.7.18.ebuild 1786
+MD5 c24bdfcbd28e6bd71f002adc5527b092 files/frox.rc 1080
 MD5 b7ee81e7aac314baf746d17c3560ef04 files/digest-frox-0.7.17 64
+MD5 4fc077cd1a556548e43d1bbc6176c1fb files/digest-frox-0.7.18 64
+MD5 e80a76dccec13cd8104fe980f63395fd files/config-0.7.18.patch 1953
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB9QC1mdTrptrqvGERAr+8AJwLonxio/GwbD69kWoamwSwLNX9vQCeLXo7
-nvqJuHsaQQ09/81cDAGOJtk=
-=k+zs
+iD8DBQFCB03KmdTrptrqvGERAgIvAKCWF56nDPx7JhFKtIUgcpwMjj2qNgCfTm5S
+sRuLIdp0qKe/bbjzXO8eD2U=
+=tyzj
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/frox/files/config-0.7.18.patch b/net-ftp/frox/files/config-0.7.18.patch
new file mode 100644
index 000000000000..2a1ee45e05b1
--- /dev/null
+++ b/net-ftp/frox/files/config-0.7.18.patch
@@ -0,0 +1,66 @@
+--- frox.conf	2005-02-04 19:54:55.000000000 +0930
++++ /etc/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/digest-frox-0.7.18 b/net-ftp/frox/files/digest-frox-0.7.18
new file mode 100644
index 000000000000..215190b8427b
--- /dev/null
+++ b/net-ftp/frox/files/digest-frox-0.7.18
@@ -0,0 +1 @@
+MD5 d30c35b9820d706ff2f9a6ab3b501247 frox-0.7.18.tar.bz2 173355
diff --git a/net-ftp/frox/files/frox.rc b/net-ftp/frox/files/frox.rc
index 949d0e58a251..72d0a505c9f4 100644
--- a/net-ftp/frox/files/frox.rc
+++ b/net-ftp/frox/files/frox.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/files/frox.rc,v 1.1 2005/01/24 14:05:34 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/files/frox.rc,v 1.2 2005/02/07 11:15:16 dragonheart Exp $
 
 PROGNAME=`basename $1`
 
diff --git a/net-ftp/frox/frox-0.7.18.ebuild b/net-ftp/frox/frox-0.7.18.ebuild
new file mode 100644
index 000000000000..7c4c35a86894
--- /dev/null
+++ b/net-ftp/frox/frox-0.7.18.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2005 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.ebuild,v 1.1 2005/02/07 11:15:15 dragonheart Exp $
+
+inherit eutils
+
+IUSE="clamav"
+
+MY_P=${P/_/}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A transparent ftp proxy"
+SRC_URI="http://frox.sourceforge.net/download/${MY_P}.tar.bz2"
+HOMEPAGE="http://frox.sourceforge.net/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~amd64"
+
+DEPEND="clamav? ( >=app-antivirus/clamav-0.80 )"
+
+
+pkg_setup() {
+	enewgroup ftpproxy
+	enewuser ftpproxy -1 /bin/false /var/spool/frox ftpproxy
+}
+
+src_compile() {
+
+	econf \
+		--sbindir=/usr/sbin \
+		--localstatedir=/var/run \
+		--sysconfdir=/etc \
+		--enable-http-cache --enable-local-cache \
+		`use_enable clamav virus-scan` || die "bad ./configure"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	keepdir /var/run/frox
+	keepdir /var/spool/frox
+	keepdir /var/log/frox
+
+	fperms 700 /var/spool/frox
+	fowners ftpproxy:ftpproxy /var/run/frox /var/spool/frox /var/log/frox
+
+	dodoc BUGS COPYING README \
+		doc/CREDITS doc/ChangeLog doc/FAQ doc/INSTALL \
+		doc/INTERNALS doc/README.transdata doc/RELEASE \
+		doc/SECURITY doc/TODO
+
+	dohtml doc/*.html doc/*.sgml
+
+	mv doc/frox.man doc/frox.man.8
+	mv doc/frox.conf.man doc/frox.conf.man.8
+	doman doc/frox.man.8 doc/frox.conf.man.8
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/frox.rc frox
+
+	cd src
+	epatch ${FILESDIR}/config-${PV}.patch || die "config patch failed"
+
+	if use clamav; then
+		sed -e "s:^# VirusScanner.*:# VirusScanner '\"/usr/bin/clamscan\" \"%s\"':" \
+			frox.conf > ${D}/etc/frox.conf.example
+		ewarn "Virus scanner potentialy broken in chroot - see bug #81035."
+	else
+		cp frox.conf ${D}/etc/frox.conf.example
+	fi
+}