update proftpd-1.2.2 to proftpd-1.2.4

11 files changed, 172 insertions, 142 deletions

diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.2 b/net-ftp/proftpd/files/digest-proftpd-1.2.2
deleted file mode 100644
index 16959563588e..000000000000
--- a/net-ftp/proftpd/files/digest-proftpd-1.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 598735da589cffce5009473639abbef8 proftpd-1.2.2.tar.bz2
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.2-r6 b/net-ftp/proftpd/files/digest-proftpd-1.2.2-r6
deleted file mode 100644
index 16959563588e..000000000000
--- a/net-ftp/proftpd/files/digest-proftpd-1.2.2-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 598735da589cffce5009473639abbef8 proftpd-1.2.2.tar.bz2
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.4 b/net-ftp/proftpd/files/digest-proftpd-1.2.4
new file mode 100644
index 000000000000..13b1df80cb6d
--- /dev/null
+++ b/net-ftp/proftpd/files/digest-proftpd-1.2.4
@@ -0,0 +1 @@
+MD5 98570c48e3187ddaac385e33e0765c74 proftpd-1.2.4.tar.bz2
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.4-r6 b/net-ftp/proftpd/files/digest-proftpd-1.2.4-r6
new file mode 100644
index 000000000000..13b1df80cb6d
--- /dev/null
+++ b/net-ftp/proftpd/files/digest-proftpd-1.2.4-r6
@@ -0,0 +1 @@
+MD5 98570c48e3187ddaac385e33e0765c74 proftpd-1.2.4.tar.bz2
diff --git a/net-ftp/proftpd/files/proftpd.rc6 b/net-ftp/proftpd/files/proftpd.rc6
index d6c1e5cf3855..d772b1e5bf3f 100644
--- a/net-ftp/proftpd/files/proftpd.rc6
+++ b/net-ftp/proftpd/files/proftpd.rc6
@@ -1,22 +1,26 @@
 #!/sbin/runscript
 
+depend() {
+	need net
+}
+
 checkconfig() {
-    if [ ! -e /etc/proftpd/proftpd.conf ] ; then
-	eerror "You need an /etc/proftpd/proftpd.conf file first"
-	eerror "There is a sample file in /usr/share/doc/proftpd"
-	return 1
-    fi
+	if [ ! -e /etc/proftpd/proftpd.conf ] ; then
+		eerror "You need an /etc/proftpd/proftpd.conf file first"
+		eerror "There is a sample file in /usr/share/doc/proftpd"
+		return 1
+	fi
 }
 
 start() {
-    checkconfig || return 1
-    ebegin "Starting proftpd"
-    start-stop-daemon --start --quiet --exec /usr/sbin/proftpd -- -d -p /var/run/proftpd.pid
-    eend $?
+	checkconfig || return 1
+	ebegin "Starting proftpd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/proftpd -- -d -p /var/run/proftpd.pid
+	eend $?
 }
 
 stop() {
-    ebegin "Stopping proftpd"
-    start-stop-daemon --stop --quiet --pidfile /var/run/proftpd.pid
-    eend $?
+	ebegin "Stopping proftpd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/proftpd.pid
+	eend $?
 }
diff --git a/net-ftp/proftpd/proftpd-1.2.2-r6.ebuild b/net-ftp/proftpd/proftpd-1.2.2-r6.ebuild
deleted file mode 100644
index a3322575898d..000000000000
--- a/net-ftp/proftpd/proftpd-1.2.2-r6.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.2-r6.ebuild,v 1.2 2001/09/09 06:08:14 woodchip Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An advanced and very configurable FTP server"
-SRC_URI="ftp://www.linuxceptional.com/proftpd/distrib/source/${P}.tar.bz2"
-HOMEPAGE="http://www.proftpd.net/"
-
-DEPEND="virtual/glibc
-        pam? ( >=sys-libs/pam-0.75 )
-        mysql? ( >=dev-db/mysql-3.23.26 )
-        ldap? ( >=net-nds/openldap-1.2.11 )
-        postgres? ( >=dev-db/postgresql-7.1 )"
-
-src_compile() {
-    local modules myconf
-    modules="mod_ratio:mod_readme:mod_linuxprivs"
-
-    use pam && modules="$modules:mod_pam"
-    use ldap && modules="$modules:mod_ldap"
-
-    if [ "`use mysql`" ]; then
-        modules="$modules:mod_sql:mod_sql_mysql"
-    elif [ "`use postgres`" ]; then
-        modules="$modules:mod_sql:mod_sql_postgres"
-        myconf="${myconf} --with-includes=/usr/include/postgresql"
-    fi
-
-    ./configure --host=${CHOST} --prefix=/usr --sbindir=/usr/sbin \
-	--sysconfdir=/etc/proftpd --localstatedir=/var/run \
-	--mandir=/usr/share/man --with-modules=$modules \
-	--disable-sendfile --enable-shadow --enable-autoshadow $myconf
-    assert
-    make || die
-}
-
-src_install() {                               
-    make install prefix=${D}/usr sysconfdir=${D}/etc/proftpd \
-	mandir=${D}/usr/share/man localstatedir=${D}/var/run \
-	sbindir=${D}/usr/sbin || die
-
-    dodoc contrib/README.mod_sql ${FILESDIR}/proftpd.conf
-    dodoc COPYING CREDITS ChangeLog NEWS README*
-    cd doc ; dodoc API Changes* license.txt GetConf
-    dodoc ShowUndocumented Undocumented.txt development.notes
-    docinto html ; dodoc *.html
-    docinto rfc ; dodoc rfc/*.txt
-
-    cd ${S}
-    dodir /home/ftp
-    dobin contrib/genuser.pl
-
-    cd ${D}/etc/proftpd
-    mv proftpd.conf proftpd.conf.distrib
-
-    insinto /etc/proftpd
-    newins ${FILESDIR}/proftpd.conf proftpd.conf.sample
-
-    exeinto /etc/init.d
-    newexe ${FILESDIR}/proftpd.rc6 proftpd
-}
diff --git a/net-ftp/proftpd/proftpd-1.2.2.ebuild b/net-ftp/proftpd/proftpd-1.2.2.ebuild
deleted file mode 100644
index 3d6309875701..000000000000
--- a/net-ftp/proftpd/proftpd-1.2.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.2.ebuild,v 1.2 2001/09/09 06:08:14 woodchip Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An advanced and very configurable FTP server"
-SRC_URI="ftp://www.linuxceptional.com/proftpd/distrib/source/${P}.tar.bz2"
-HOMEPAGE="http://www.proftpd.net/"
-
-DEPEND="virtual/glibc
-        pam? ( >=sys-libs/pam-0.75 )
-        mysql? ( >=dev-db/mysql-3.23.26 )
-        ldap? ( >=net-nds/openldap-1.2.11 )
-        postgres? ( >=dev-db/postgresql-7.1 )"
-
-src_compile() {
-    local modules myconf
-    modules="mod_ratio:mod_readme:mod_linuxprivs"
-
-    use pam && modules="$modules:mod_pam"
-    use ldap && modules="$modules:mod_ldap"
-
-    if [ "`use mysql`" ]; then
-        modules="$modules:mod_sql:mod_sql_mysql"
-    elif [ "`use postgres`" ]; then
-        modules="$modules:mod_sql:mod_sql_postgres"
-        myconf="${myconf} --with-includes=/usr/include/postgresql"
-    fi
-
-    ./configure --host=${CHOST} --prefix=/usr --sbindir=/usr/sbin \
-	--sysconfdir=/etc/proftpd --localstatedir=/var/run \
-	--mandir=/usr/share/man --with-modules=$modules \
-	--disable-sendfile --enable-shadow --enable-autoshadow $myconf
-    assert
-    make || die
-}
-
-src_install() {                               
-    make install prefix=${D}/usr sysconfdir=${D}/etc/proftpd \
-	mandir=${D}/usr/share/man localstatedir=${D}/var/run \
-	sbindir=${D}/usr/sbin || die
-
-    dodoc contrib/README.mod_sql ${FILESDIR}/proftpd.conf
-    dodoc COPYING CREDITS ChangeLog NEWS README*
-    cd doc ; dodoc API Changes* license.txt GetConf
-    dodoc ShowUndocumented Undocumented.txt development.notes
-    docinto html ; dodoc *.html
-    docinto rfc ; dodoc rfc/*.txt
-
-    cd ${S}
-    dodir /home/ftp
-    dobin contrib/genuser.pl
-
-    cd ${D}/etc/proftpd
-    mv proftpd.conf proftpd.conf.distrib
-
-    insinto /etc/proftpd
-    newins ${FILESDIR}/proftpd.conf proftpd.conf.sample
-
-    exeinto /etc/rc.d/init.d
-    newexe ${FILESDIR}/proftpd.rc5 proftpd
-}
diff --git a/net-ftp/proftpd/proftpd-1.2.4-r6.ebuild b/net-ftp/proftpd/proftpd-1.2.4-r6.ebuild
new file mode 100644
index 000000000000..e078f9d9fa54
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.2.4-r6.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Donny Davies <woodchip@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.4-r6.ebuild,v 1.1 2001/10/20 14:38:12 woodchip Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="An advanced and very configurable FTP server"
+SRC_URI="ftp://www.linuxceptional.com/proftpd/distrib/source/${P}.tar.bz2"
+HOMEPAGE="http://www.proftpd.net/"
+
+DEPEND="virtual/glibc
+	pam? ( >=sys-libs/pam-0.75 )
+	mysql? ( >=dev-db/mysql-3.23.26 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	postgres? ( >=dev-db/postgresql-7.1 )"
+
+src_compile() {
+
+	local modules myconf
+	modules="mod_ratio:mod_readme:mod_linuxprivs"
+
+	use pam && modules="$modules:mod_pam"
+	use ldap && modules="$modules:mod_ldap"
+
+	if [ "`use mysql`" ]; then
+		modules="$modules:mod_sql:mod_sql_mysql"
+	elif [ "`use postgres`" ]; then
+		modules="$modules:mod_sql:mod_sql_postgres"
+		myconf="${myconf} --with-includes=/usr/include/postgresql"
+	fi
+
+	./configure \
+	--host=${CHOST} \
+	--prefix=/usr \
+	--sbindir=/usr/sbin \
+	--sysconfdir=/etc/proftpd \
+	--localstatedir=/var/run \
+	--mandir=/usr/share/man \
+	--with-modules=${modules} \
+	--disable-sendfile \
+	--enable-shadow \
+	--enable-autoshadow \
+	${myconf}
+	assert "bad configure"
+
+	make || die "compile problem"
+}
+
+src_install() {                               
+
+	make \
+	sysconfdir=${D}/etc/proftpd \
+	localstatedir=${D}/var/run \
+	mandir=${D}/usr/share/man \
+	sbindir=${D}/usr/sbin \
+	prefix=${D}/usr \
+	install || die "install problem"
+
+	dobin contrib/genuser.pl
+	dodir /home/ftp
+
+	dodoc contrib/README.mod_sql ${FILESDIR}/proftpd.conf
+	dodoc COPYING CREDITS ChangeLog NEWS README*
+	cd doc ; dodoc API Changes* license.txt GetConf
+	dodoc ShowUndocumented Undocumented.txt development.notes
+	docinto html ; dodoc *.html
+	docinto rfc ; dodoc rfc/*.txt
+
+	cd ${D}/etc/proftpd
+	mv proftpd.conf proftpd.conf.distrib
+
+	insinto /etc/proftpd
+	newins ${FILESDIR}/proftpd.conf proftpd.conf.sample
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/proftpd.rc6 proftpd
+}
diff --git a/net-ftp/proftpd/proftpd-1.2.4.ebuild b/net-ftp/proftpd/proftpd-1.2.4.ebuild
new file mode 100644
index 000000000000..ed0a916353cb
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.2.4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Donny Davies <woodchip@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.4.ebuild,v 1.1 2001/10/20 14:38:12 woodchip Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="An advanced and very configurable FTP server"
+SRC_URI="ftp://www.linuxceptional.com/proftpd/distrib/source/${P}.tar.bz2"
+HOMEPAGE="http://www.proftpd.net/"
+
+DEPEND="virtual/glibc
+	pam? ( >=sys-libs/pam-0.75 )
+	mysql? ( >=dev-db/mysql-3.23.26 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	postgres? ( >=dev-db/postgresql-7.1 )"
+
+src_compile() {
+
+	local modules myconf
+	modules="mod_ratio:mod_readme:mod_linuxprivs"
+
+	use pam && modules="$modules:mod_pam"
+	use ldap && modules="$modules:mod_ldap"
+
+	if [ "`use mysql`" ]; then
+		modules="$modules:mod_sql:mod_sql_mysql"
+	elif [ "`use postgres`" ]; then
+		modules="$modules:mod_sql:mod_sql_postgres"
+		myconf="${myconf} --with-includes=/usr/include/postgresql"
+	fi
+
+	./configure \
+	--host=${CHOST} \
+	--prefix=/usr \
+	--sbindir=/usr/sbin \
+	--sysconfdir=/etc/proftpd \
+	--localstatedir=/var/run \
+	--mandir=/usr/share/man \
+	--with-modules=${modules} \
+	--disable-sendfile \
+	--enable-shadow \
+	--enable-autoshadow \
+	${myconf}
+	assert "bad configure"
+
+	make || die "compile problem"
+}
+
+src_install() {                               
+
+	make \
+	sysconfdir=${D}/etc/proftpd \
+	localstatedir=${D}/var/run \
+	mandir=${D}/usr/share/man \
+	sbindir=${D}/usr/sbin \
+	prefix=${D}/usr \
+	install || die "install problem"
+
+	dobin contrib/genuser.pl
+	dodir /home/ftp
+
+	dodoc contrib/README.mod_sql ${FILESDIR}/proftpd.conf
+	dodoc COPYING CREDITS ChangeLog NEWS README*
+	cd doc ; dodoc API Changes* license.txt GetConf
+	dodoc ShowUndocumented Undocumented.txt development.notes
+	docinto html ; dodoc *.html
+	docinto rfc ; dodoc rfc/*.txt
+
+	cd ${D}/etc/proftpd
+	mv proftpd.conf proftpd.conf.distrib
+
+	insinto /etc/proftpd
+	newins ${FILESDIR}/proftpd.conf proftpd.conf.sample
+
+	exeinto /etc/rc.d/init.d ; newexe ${FILESDIR}/proftpd.rc5 proftpd
+}
diff --git a/profiles/default-1.0_rc6/packages b/profiles/default-1.0_rc6/packages
index 167e5df4a28b..1c494cb6de30 100644
--- a/profiles/default-1.0_rc6/packages
+++ b/profiles/default-1.0_rc6/packages
@@ -141,7 +141,7 @@
 >=net-www/apache-1.3.20-r6
 >=net-analyzer/ucd-snmp-4.1.2-r6
 >=net-ftp/oftpd-0.3.6-r6
->=net-ftp/proftpd-1.2.2-r6
+>=net-ftp/proftpd-1.2.4-r6
 >=net-misc/dhcp-3.0_rc12-r6
 >=net-misc/bind-9.1.3-r6
 >=net-misc/netkit-timed-0.17-r6
diff --git a/profiles/default/packages b/profiles/default/packages
index 3b0c54215686..de95c3b35513 100644
--- a/profiles/default/packages
+++ b/profiles/default/packages
@@ -120,7 +120,7 @@
 <net-www/apache-1.3.20-r6
 <net-analyzer/ucd-snmp-4.1.2-r6
 <net-ftp/oftpd-0.3.6-r6
-<net-ftp/proftpd-1.2.2-r6
+<net-ftp/proftpd-1.2.4-r6
 <net-misc/dhcp-3.0_rc12-r6
 <net-misc/bind-9.1.3-r6
 <net-misc/netkit-timed-0.17-r6