Version bump #117958 for Jakub Moc.

Package-Manager: portage-2.1_pre3-r1

5 files changed, 238 insertions, 10 deletions

diff --git a/net-ftp/glftpd/ChangeLog b/net-ftp/glftpd/ChangeLog
index 24ec4d9985f6..19526ab35c95 100644
--- a/net-ftp/glftpd/ChangeLog
+++ b/net-ftp/glftpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/glftpd
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/glftpd/ChangeLog,v 1.12 2005/02/19 22:53:54 vapier Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/glftpd/ChangeLog,v 1.13 2006/01/06 02:41:18 vapier Exp $
+
+*glftpd-2.01 (06 Jan 2006)
+
+  06 Jan 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/glftpd-2.01-install.patch, +glftpd-2.01.ebuild:
+  Version bump #117958 for Jakub Moc.
 
 *glftpd-2.00 (19 Feb 2005)
 
diff --git a/net-ftp/glftpd/Manifest b/net-ftp/glftpd/Manifest
index 9ded2fe25631..c75b6e3392a5 100644
--- a/net-ftp/glftpd/Manifest
+++ b/net-ftp/glftpd/Manifest
@@ -1,12 +1,25 @@
-MD5 7752d3a2578390f4c936ee9a78ef4c84 ChangeLog 1335
-MD5 9765afee47eb196dd38c07bf2c28fef0 glftpd-2.00.ebuild 2852
-MD5 fb8d5f6b8fac69dbe80b089824d8d257 glftpd-1.32-r2.ebuild 2815
-MD5 2158fefa6b8983f5dd6bfe2c2b401558 files/digest-glftpd-2.00 65
-MD5 24b620c9e2a0384f8aa0570e9c6e8a87 files/glftpd.env.d 44
-MD5 6399dbb185314c6017b02b3df2cdf5ea files/glftpd.xinetd.d 384
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7323b6db59a37c24cbade7cd4d8c3a3b ChangeLog 1509
 MD5 4acdfa97d781bcecd8107b66a882ada8 files/1.32-install.patch 1432
-MD5 7bbb37fa6e8e057a09e8bf721abc5d28 files/glftpd-2.00-install.patch 2944
+MD5 16562ebfbe49bca89d32784bca1126f2 files/1.32-stack-overflow.patch 1818
 MD5 421ebf4ff7a3d7618578fa291d8bef23 files/digest-glftpd-1.32-r2 65
+MD5 2158fefa6b8983f5dd6bfe2c2b401558 files/digest-glftpd-2.00 65
+MD5 7c906648c0ba0a6d17f1d4f447e3c359 files/digest-glftpd-2.01 65
 MD5 e1aa846be11f6d73087d098f16a834b5 files/glftpd-2.00-gcc.patch 230
-MD5 16562ebfbe49bca89d32784bca1126f2 files/1.32-stack-overflow.patch 1818
+MD5 7bbb37fa6e8e057a09e8bf721abc5d28 files/glftpd-2.00-install.patch 2944
 MD5 3857787e3748c769f2920eebfedafb8b files/glftpd-2.00-script-path-checks.patch 830
+MD5 49a024542998a576389b00a08874cf97 files/glftpd-2.01-install.patch 3146
+MD5 24b620c9e2a0384f8aa0570e9c6e8a87 files/glftpd.env.d 44
+MD5 6399dbb185314c6017b02b3df2cdf5ea files/glftpd.xinetd.d 384
+MD5 fb8d5f6b8fac69dbe80b089824d8d257 glftpd-1.32-r2.ebuild 2815
+MD5 9765afee47eb196dd38c07bf2c28fef0 glftpd-2.00.ebuild 2852
+MD5 c62fc873c7151e566817ff18912aee72 glftpd-2.01.ebuild 2771
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDvdkR2+ySkm8kpY0RAmX3AKCCDEPMqSE4+AVm/XIGIlsNDvq3ZACgnCRi
+t010FifB061CHkbwv3eR5GA=
+=8tI7
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/glftpd/files/digest-glftpd-2.01 b/net-ftp/glftpd/files/digest-glftpd-2.01
new file mode 100644
index 000000000000..448293b8e7d0
--- /dev/null
+++ b/net-ftp/glftpd/files/digest-glftpd-2.01
@@ -0,0 +1 @@
+MD5 f15628798b1f6cfe71a781f035cfaa28 glftpd-LNX_2.01.tgz 2765868
diff --git a/net-ftp/glftpd/files/glftpd-2.01-install.patch b/net-ftp/glftpd/files/glftpd-2.01-install.patch
new file mode 100644
index 000000000000..dd0f04aa8de8
--- /dev/null
+++ b/net-ftp/glftpd/files/glftpd-2.01-install.patch
@@ -0,0 +1,105 @@
+--- installgl.sh
++++ installgl.sh
+@@ -273 +272,0 @@
+-read randomkey
+@@ -299 +298 @@
+-    read usetcpd
++    usetcpd=${USETCPD}
+@@ -363 +362 @@
+-    read jail
++    jail=y
+@@ -376 +375 @@
+-                read jaildir
++                jaildir=${GLROOT}
+@@ -388 +387 @@
+-                            read reply
++                            echo "SHOULD NOT HAVE BEEN HERE 1" ; exit 1
+@@ -420 +419 @@
+-        read useprivgroup
++        useprivgroup=n
+@@ -441 +440 @@
+-                    read privgroup
++                    echo "SHOULD NOT HAVE BEEN HERE 2" ; exit 1
+@@ -450 +449 @@
+-                        read reply
++                        echo "SHOULD NOT HAVE BEEN HERE 3" ; exit 1
+@@ -468 +467 @@
+-                        read jailusers
++                        echo "SHOULD NOT HAVE BEEN HERE 4" ; exit 1
+@@ -532 +531 @@
+-    read glroot
++    break
+@@ -544 +543 @@
+-                read reply
++                echo "SHOULD NOT HAVE BEEN HERE 5" ; exit 1
+@@ -620 +619 @@
+-  read keystroke
++  echo "SHOULD NOT HAVE BEEN HERE A" ; exit 1
+@@ -657 +656 @@
+-    read servicename
++    servicename=glftpd
+@@ -672 +671 @@
+-            read keystroke
++            keystroke=y
+@@ -694 +693 @@
+-    read keystroke
++    echo "SHOULD NOT HAVE BEEN HERE 6.2" ; exit 1
+@@ -751 +750 @@
+-        $usegcc $gccflags "$jaildir$glroot/bin/$base" "$cfile" >/dev/null 2>&1 || \
++        $usegcc $gccflags "$jaildir$glroot/bin/$base" "$cfile" >& "$cfile".cc.log || \
+@@ -754 +753 @@
+-            echo "OK."
++            echo "OK." ; rm -f "$cfile".cc.log
+@@ -757 +756 @@
+-            echo "FAILED!"
++            echo "FAILED!" ; cat "$cfile".cc.log
+@@ -885 +884 @@
+-    read port
++    port=21
+@@ -901,4 +899,0 @@
+-{ grep -v ^${servicename} /etc/services;
+-  echo "$servicename   $port/tcp"
+-} > /etc/services.new
+-mv -f /etc/services.new /etc/services
+@@ -950 +945 @@
+-        read whichnetd
++        whichnetd=${WHICHNETD}
+@@ -962,4 +957 @@
+-    echo "ERROR: Can't determine if you are using inetd or xinetd!"
+-    echo "This is usually because neither is running at the moment -"
+-    echo "install/start one of them and re-run this installer."
+-    exit 1
++    whichnetd=${WHICHNETD}
+@@ -980 +972 @@
+-   read keystroke
++   keystroke=n
+@@ -998 +990 @@
+-    read keystroke
++    echo "SHOULD NOT HAVE BEEN HERE B" ; exit 1
+@@ -1020 +1011,0 @@
+-      cp /etc/localtime /usr/lib/
+@@ -1040 +1031 @@
+-    read tlsname
++    tlsname="ftp server"
+@@ -1101 +1092 @@
+-    mv -f $base.pem $tls/
++    mv -f $base.pem $D$tls/
+@@ -1134 +1125 @@
+-  read tls
++  echo "SHOULD NOT HAVE BEEN HERE 7" ; exit 1
+@@ -1162 +1153 @@
+-        read tls
++        tls=/etc/glftpd-dsa.pem ; break
+@@ -1287,3 +1278,2 @@
+-    [ ! -d "/etc/xinetd.d" ] && {
+-        mkdir /etc/xinetd.d
+-        echo "includedir /etc/xinetd.d" >> /etc/xinetd.conf
++    [ ! -d "$D/etc/xinetd.d" ] && {
++        mkdir $D/etc/xinetd.d
+@@ -1291 +1281 @@
+-    cat <<EOF > /etc/xinetd.d/$servicename
++    cat <<EOF > $D/etc/xinetd.d/$servicename
+@@ -1324,3 +1313,0 @@
+-{ crontab -l | grep -v "$jaildir$glroot/bin/reset"
+-  echo "0  0 * * *      $jaildir$glroot/bin/reset ${euroweek}${confpath}"
+-} | crontab - > /dev/null
diff --git a/net-ftp/glftpd/glftpd-2.01.ebuild b/net-ftp/glftpd/glftpd-2.01.ebuild
new file mode 100644
index 000000000000..9a5035edc4bf
--- /dev/null
+++ b/net-ftp/glftpd/glftpd-2.01.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/glftpd/glftpd-2.01.ebuild,v 1.1 2006/01/06 02:41:18 vapier Exp $
+
+inherit eutils
+
+MY_P=${P/-/-LNX_}
+DESCRIPTION="a HIGHLY configurable ftp server"
+HOMEPAGE="http://www.glftpd.com/"
+SRC_URI="http://www.glftpd.com/files/${MY_P}.tgz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/openssl"
+RDEPEND="${DEPEND}
+	sys-apps/xinetd"
+
+S=${WORKDIR}/${MY_P}
+
+# custom options
+export CUSTOMGLROOT=${CUSTOMGLROOT:-/opt/glftpd}
+export GLROOT=${GLROOT:-${D}${CUSTOMGLROOT}}
+
+pkg_setup() {
+	[[ -d /proc/sysvipc ]] || die "You need System V IPC support in your kernel"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	cp installgl.sh{,.orig}
+	epatch "${FILESDIR}"/${P}-install.patch
+}
+
+yesno() { if $@ ; then echo y ; else echo n ; fi ; }
+
+src_install() {
+	dodir /etc/xinetd.d
+
+	# custom options
+	export USETCPD=$(yesno useq tcpd)
+	export JAIL=y
+	export MAKETLS=$(yesno [[ ! -e ${ROOT}/etc/glftpd-dsa.pem ]])
+	export WHICHNETD=x
+	"${S}"/installgl.sh || die "installgl.sh failed"
+
+	# fix the glftpd.conf file
+	sed -i \
+		-e "s:${GLROOT}:${CUSTOMGLROOT}/:" \
+		${GLROOT}/glftpd.conf
+
+	mv ${GLROOT}/glftpd.conf ${D}/etc/
+	ln -s /etc/glftpd.conf ${GLROOT}/glftpd.conf
+	if [[ -e ${ROOT}/etc/glftpd-dsa.pem ]] ; then
+		cp "${ROOT}"/etc/glftpd-dsa.pem "${D}"/etc/
+	else
+		cp ftpd-dsa.pem "${D}"/etc/glftpd-dsa.pem
+	fi
+	ln -s /etc/glftpd-dsa.pem ${GLROOT}/etc/glftpd-dsa.pem
+	fperms o-r /etc/glftpd-dsa.pem
+
+	# xinetd.d entry (use our custom one :])
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/glftpd.xinetd.d glftpd
+	dosed "s:GLROOT:${CUSTOMGLROOT}:g" /etc/xinetd.d/glftpd
+
+	# env entry to protect our ftp passwd/group files
+	newenvd ${FILESDIR}/glftpd.env.d 99glftpd
+	dosed "s:GLROOT:${CUSTOMGLROOT}:g" /etc/env.d/99glftpd
+
+	# chmod the glftpd dir so that user files will work
+	chmod 711 ${GLROOT}
+}
+
+pkg_postinst() {
+	echo
+	einfo "Read the documentation in /opt/glftpd/docs/"
+	einfo "After you setup your conf file, edit the xinetd"
+	einfo "entry in /etc/xinetd.d/glftpd to enable, then"
+	einfo "start xinetd: /etc/init.d/xinetd start"
+	echo
+	einfo "To add glftpd to your services file and to"
+	einfo "create a cronjob for auto generating statistics,"
+	einfo "just run this command after you install:"
+	echo
+	einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
+}
+
+pkg_config() {
+	einfo "Updating /etc/services"
+	{ grep -v ^glftpd /etc/services;
+	echo "glftpd   21/tcp"
+	} > /etc/services.new
+	mv -f /etc/services.new /etc/services
+
+	einfo "Updating crontab"
+	{ crontab -l | grep -v "bin/reset"
+	echo "0  0 * * *      ${CUSTOMGLROOT}/bin/reset -r ${CUSTOMGLROOT}/glftpd.conf"
+	} | crontab - > /dev/null
+}