version bump, KEYWORD fixing

6 files changed, 110 insertions, 7 deletions

diff --git a/net-ftp/glftpd/ChangeLog b/net-ftp/glftpd/ChangeLog
index 4d1215dbb5f8..2693d2e9845b 100644
--- a/net-ftp/glftpd/ChangeLog
+++ b/net-ftp/glftpd/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for net-ftp/glftpd
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/glftpd/ChangeLog,v 1.3 2002/12/13 10:59:56 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/glftpd/ChangeLog,v 1.4 2003/01/12 18:31:31 vapier Exp $
+
+*net-ftp/glftpd-1.28 (12 Jan 2003)
+
+  12 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *net-ftp/glftpd-1.27 (23 Oct 2002)
 
   23 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
diff --git a/net-ftp/glftpd/files/digest-glftpd-1.28 b/net-ftp/glftpd/files/digest-glftpd-1.28
new file mode 100644
index 000000000000..e11e2421e15d
--- /dev/null
+++ b/net-ftp/glftpd/files/digest-glftpd-1.28
@@ -0,0 +1 @@
+MD5 67f8009f679ba67543fa02dee5625efc glftpd-LNX_1.28.tgz 1581522
diff --git a/net-ftp/glftpd/files/glftpd.env.d b/net-ftp/glftpd/files/glftpd.env.d
index ee9835847746..82c5ac05c5b1 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=/opt/glftpd/etc
diff --git a/net-ftp/glftpd/files/glftpd.xinetd.d b/net-ftp/glftpd/files/glftpd.xinetd.d
index 9094c26cefe6..daed9f9c3a33 100644
--- a/net-ftp/glftpd/files/glftpd.xinetd.d
+++ b/net-ftp/glftpd/files/glftpd.xinetd.d
@@ -1,6 +1,6 @@
 service glftpd
 {
-    disable         = no
+    disable         = yes
     flags           = REUSE NAMEINARGS
     socket_type     = stream
     protocol        = tcp
diff --git a/net-ftp/glftpd/glftpd-1.27.ebuild b/net-ftp/glftpd/glftpd-1.27.ebuild
index f001528f7098..50d0d14c408c 100644
--- a/net-ftp/glftpd/glftpd-1.27.ebuild
+++ b/net-ftp/glftpd/glftpd-1.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/glftpd/glftpd-1.27.ebuild,v 1.3 2002/12/15 10:44:20 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/glftpd/glftpd-1.27.ebuild,v 1.4 2003/01/12 18:31:31 vapier Exp $
 
 DESCRIPTION="a HIGHLY configurable ftp server"
 HOMEPAGE="http://www.glftpd.com/"
@@ -8,7 +8,7 @@ MY_P=${P/-/-LNX_}
 SRC_URI="http://www.glftpd.com/files/${MY_P}.tgz"
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="~x86"
 
 DEPEND=""
 RDEPEND="sys-apps/xinetd"
diff --git a/net-ftp/glftpd/glftpd-1.28.ebuild b/net-ftp/glftpd/glftpd-1.28.ebuild
new file mode 100644
index 000000000000..56b1648023ec
--- /dev/null
+++ b/net-ftp/glftpd/glftpd-1.28.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/glftpd/glftpd-1.28.ebuild,v 1.1 2003/01/12 18:31:31 vapier Exp $
+
+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="~x86"
+
+DEPEND=""
+RDEPEND="sys-apps/xinetd"
+
+S=${WORKDIR}/${MY_P}
+GLROOT="${D}/opt/glftpd/"
+[ -z "${GLFTPD_PORT}" ]	&&	GLFTPD_PORT=21
+
+pkg_setup() {
+	[ -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_install() {
+	dodir /etc/xinetd.d
+
+	${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
+
+	mv ${GLROOT}/glftpd.conf ${D}/etc/
+	ln -s /etc/glftpd.conf ${GLROOT}/glftpd.conf
+
+	# xinetd.d entry (use our custom one :])
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/glftpd.xinetd.d glftpd
+
+	# env entry to protect our ftp passwd/group files
+	insinto /etc/env.d
+	newins ${FILESDIR}/glftpd.env.d 99glftpd
+
+	# chmod the glftpd dir so that user files will work
+	chmod 711 ${D}/opt/glftpd
+}
+
+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}/${P}/${P}.ebuild config"
+	echo
+}
+
+pkg_config() {
+	einfo "Updating /etc/services"
+	{ grep -v ^glftpd /etc/services;
+	echo "glftpd   ${GLFTPD_PORT}/tcp"
+	} > /etc/services.new
+	mv -f /etc/services.new /etc/services
+
+	einfo "Updating crontab"
+	{ crontab -l | grep -v "bin/reset"
+	echo "0  0 * * *      $jaildir$glroot/bin/reset $confpath"
+	} | crontab - > /dev/null
+}