ver bump

7 files changed, 104 insertions, 38 deletions

diff --git a/net-ftp/glftpd/ChangeLog b/net-ftp/glftpd/ChangeLog
index 838b28754db6..96dac76b820c 100644
--- a/net-ftp/glftpd/ChangeLog
+++ b/net-ftp/glftpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/glftpd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/glftpd/ChangeLog,v 1.6 2003/04/29 15:26:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/glftpd/ChangeLog,v 1.7 2003/12/03 05:01:57 vapier Exp $
+
+*glftpd-1.32 (03 Dec 2003)
+
+  03 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + TLS merge + major cleanup.
 
 *glftpd-1.30 (29 Apr 2003)
 
diff --git a/net-ftp/glftpd/files/1.32-install.patch b/net-ftp/glftpd/files/1.32-install.patch
new file mode 100644
index 000000000000..3d3386fa9ef0
--- /dev/null
+++ b/net-ftp/glftpd/files/1.32-install.patch
@@ -0,0 +1,57 @@
+--- installgl.sh.orig	2003-12-02 23:52:43.000000000 -0500
++++ installgl.sh	2003-12-02 23:56:17.000000000 -0500
+@@ -138 +138 @@
+-    read usetcpd
++    usetcpd=${USETCPD}
+@@ -173 +173 @@
+-    read jail
++    jail=y
+@@ -185 +185 @@
+-                read jaildir
++                jaildir=${GLROOT}
+@@ -197 +197 @@
+-                            read reply
++                            echo "SHOULD NOT HAVE BEEN HERE 1" ; exit 1
+@@ -229 +229 @@
+-        read useprivgroup
++        useprivgroup=n
+@@ -259 +259 @@
+-                        read reply
++                        echo "SHOULD NOT HAVE BEEN HERE 2" ; exit 1
+@@ -335 +335 @@
+-    read glroot
++    break
+@@ -347 +347 @@
+-                read reply
++                echo "SHOULD NOT HAVE BEEN HERE 3" ; exit 1
+@@ -514 +514 @@
+-    read port
++    port=${GLFTPD_PORT}
+@@ -527,2 +527 @@
+-} > /etc/services.new
+-mv -f /etc/services.new /etc/services
++} > /dev/null
+@@ -539 +538 @@
+-        read whichnetd
++        whichnetd=${WHICHNETD}
+@@ -571 +570 @@
+-    read tlsname
++    tlsname="ftp server"
+@@ -636 +634,0 @@
+-    mv -f $base.pem $tls/
+@@ -665 +663 @@
+-    read tlsq
++    tlsq=${MAKETLS}
+@@ -683 +681,2 @@
+-        read tls
++        tls=/etc/glftpd-dsa.pem
++        break
+@@ -735 +734 @@
+-    cat <<EOF > /etc/xinetd.d/glftpd
++    cat <<EOF > ${D}/etc/xinetd.d/glftpd
+@@ -750 +749 @@
+-    if killall -USR2 xinetd; then
++    if 0; then
+@@ -763 +762 @@
+-} | crontab - > /dev/null
++}
diff --git a/net-ftp/glftpd/files/digest-glftpd-1.30 b/net-ftp/glftpd/files/digest-glftpd-1.30
deleted file mode 100644
index 9ae9123c3646..000000000000
--- a/net-ftp/glftpd/files/digest-glftpd-1.30
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ef2b3d6b2c395b0878975ff7e0178c43 glftpd-LNX_1.30.tgz 1878390
diff --git a/net-ftp/glftpd/files/digest-glftpd-1.32 b/net-ftp/glftpd/files/digest-glftpd-1.32
new file mode 100644
index 000000000000..ae51c837d55b
--- /dev/null
+++ b/net-ftp/glftpd/files/digest-glftpd-1.32
@@ -0,0 +1 @@
+MD5 45913cf02c0c754f054eba9cfa213987 glftpd-LNX_1.32.tgz 1980714
diff --git a/net-ftp/glftpd/files/glftpd.env.d b/net-ftp/glftpd/files/glftpd.env.d
index 82c5ac05c5b1..44d6a6ae34a2 100644
--- a/net-ftp/glftpd/files/glftpd.env.d
+++ b/net-ftp/glftpd/files/glftpd.env.d
@@ -1 +1 @@
-CONFIG_PROTECT=/opt/glftpd/etc
+CONFIG_PROTECT=GLROOT/etc
diff --git a/net-ftp/glftpd/files/glftpd.xinetd.d b/net-ftp/glftpd/files/glftpd.xinetd.d
index daed9f9c3a33..35073d967e1e 100644
--- a/net-ftp/glftpd/files/glftpd.xinetd.d
+++ b/net-ftp/glftpd/files/glftpd.xinetd.d
@@ -7,6 +7,6 @@ service glftpd
     wait            = no
     user            = root
     server          = /usr/sbin/tcpd
-    server_args     = /opt/glftpd/bin/glftpd -l -i -o -r /opt/glftpd/glftpd.conf -s/opt/glftpd/bin/glstrings.bin 
+    server_args     = GLROOT/bin/glftpd -l -i -z cert=/etc/glftpd-dsa.pem -o -r GLROOT/glftpd.conf -sGLROOT/bin/glstrings.bin
     only_from       = 0.0.0.0
 }
diff --git a/net-ftp/glftpd/glftpd-1.30.ebuild b/net-ftp/glftpd/glftpd-1.32.ebuild
index 938e71228084..ec25d3ff5e5e 100644
--- a/net-ftp/glftpd/glftpd-1.30.ebuild
+++ b/net-ftp/glftpd/glftpd-1.32.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/glftpd/glftpd-1.30.ebuild,v 1.5 2003/07/25 03:56:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/glftpd/glftpd-1.32.ebuild,v 1.1 2003/12/03 05:01:57 vapier Exp $
+
+inherit eutils
 
 MY_P=${P/-/-LNX_}
 DESCRIPTION="a HIGHLY configurable ftp server"
@@ -11,64 +13,67 @@ LICENSE="freedist"
 SLOT="0"
 KEYWORDS="-* x86"
 
-DEPEND=""
-RDEPEND="sys-apps/xinetd"
-PDEPEND="net-ftp/glftpd-tls"
+DEPEND="dev-libs/openssl"
+RDEPEND="${DEPEND}
+	sys-apps/xinetd"
 
 S=${WORKDIR}/${MY_P}
-GLROOT=${D}/opt/glftpd/
-GLFTPD_PORT=${GLFTPD_PORT:-21}
+
+# custom options
+export CUSTOMGLROOT=${CUSTOMGLROOT:-/opt/glftpd}
+export GLROOT=${GLROOT:-${D}${CUSTOMGLROOT}}
+export GLFTPD_PORT=${GLFTPD_PORT:-21}
 
 pkg_setup() {
-	[ -d /proc/sysvipc/ ] || die "You need System V IPC support in your kernel"
+	[ -d /proc/sysvipc ] || die "You need System V IPC support in your kernel"
 }
 
-src_compile() {
-	[ `use tcpd` ]		&&	USETCPD=y	||	USETCPD=n
-	[ -z "${JAIL}" ]	&&	JAIL=y		||	JAIL=n
-	WHICHNETD=x
-
-	cp ${S}/installgl.sh ${S}/installgl.sh.old
-	sed -e "s:read usetcpd:usetcpd=${USETCPD}:" \
-	 -e "s:read jaildir:jaildir=${GLROOT}:" \
-	 -e "s:read jail:jail=y:" \
-	 -e "s:read reply:echo OMG; exit 1:" \
-	 -e "s:read useprivgroup:useprivgroup=n:" \
-	 -e "s:read glroot:break:" \
-	 -e "s:read port:port=${GLFTPD_PORT}:" \
-	 -e "s:read whichnetd:whichnetd=x:" \
-	 -e "s:killall -USR2 xinetd:0:" \
-	 -e "s:/etc/xinetd.d/glftpd:${D}/etc/xinetd.d/glftpd:" \
-	 -e "s:> /etc/services.new:>/dev/null:" \
-	 -e "s:mv -f /etc/services.new:dumbvar=:" \
-	 -e "s:| crontab -:>/dev/null:" \
-		${S}/installgl.sh.old > ${S}/installgl.sh
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	cp installgl.sh{,.orig}
+	epatch ${FILESDIR}/${PV}-install.patch
 }
 
+yesno() { if $@ ; then echo y ; else echo n ; fi ; }
+
 src_install() {
 	dodir /etc/xinetd.d
 
+	# custom options
+	export USETCPD=$(yesno [ `use tcpd` ])
+	export JAIL=y
+	export MAKETLS=$(yesno [ ! -e /etc/glftpd-dsa.pem ])
+	export WHICHNETD=x
 	${S}/installgl.sh
 
 	# fix the glftpd.conf file
-	cp ${GLROOT}/glftpd.conf ${GLROOT}/glftpd.conf.old
-	sed -e "s:${GLROOT}:/opt/glftpd/:" \
-		${GLROOT}/glftpd.conf.old > ${GLROOT}/glftpd.conf
-	rm ${GLROOT}/glftpd.conf.old
+	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 /etc/glftpd-dsa.pem ] ; then
+		cp /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
 	insinto /etc/env.d
 	newins ${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 ${D}/opt/glftpd
+	chmod 711 ${GLROOT}
 }
 
 pkg_postinst() {
@@ -83,7 +88,6 @@ pkg_postinst() {
 	einfo "just run this command after you install:"
 	echo
 	einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	echo
 }
 
 pkg_config() {
@@ -95,6 +99,6 @@ pkg_config() {
 
 	einfo "Updating crontab"
 	{ crontab -l | grep -v "bin/reset"
-	echo "0  0 * * *      $jaildir$glroot/bin/reset $confpath"
+	echo "0  0 * * *      ${CUSTOMGLROOT}/bin/reset -r ${CUSTOMGLROOT}/glftpd.conf"
 	} | crontab - > /dev/null
 }