new 1.2.2 version ebuilds, which now support both rc5 and rc6 inits. several cleanups, mysql module is now distributed with proftpd -- no need for 3rd party download.. unless of security issues.. think thats about it

10 files changed, 148 insertions, 165 deletions

diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.1 b/net-ftp/proftpd/files/digest-proftpd-1.2.1
deleted file mode 100644
index c2ca88ba59b4..000000000000
--- a/net-ftp/proftpd/files/digest-proftpd-1.2.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8892253fc167d0c868db843598e55ec8 mod_sql-3.1.5.patch.tar.gz
-MD5 0ca3b3c10d2a87a4c3f72a4f76df6a89 proftpd-1.2.1.tar.bz2
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.2 b/net-ftp/proftpd/files/digest-proftpd-1.2.2
new file mode 100644
index 000000000000..16959563588e
--- /dev/null
+++ b/net-ftp/proftpd/files/digest-proftpd-1.2.2
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000000..16959563588e
--- /dev/null
+++ b/net-ftp/proftpd/files/digest-proftpd-1.2.2-r6
@@ -0,0 +1 @@
+MD5 598735da589cffce5009473639abbef8 proftpd-1.2.2.tar.bz2
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.2_rc3 b/net-ftp/proftpd/files/digest-proftpd-1.2.2_rc3
deleted file mode 100644
index 1443bdaff037..000000000000
--- a/net-ftp/proftpd/files/digest-proftpd-1.2.2_rc3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6cf5790721722da80e0e17d2cd6fb7c0 mod_sql-3.2.2.tar.gz
-MD5 4c40f7fb9efa2886c0b5b82c972eed37 proftpd-1.2.2rc3.tar.bz2
diff --git a/net-ftp/proftpd/files/proftpd b/net-ftp/proftpd/files/proftpd.rc5
index fcbc7bfa441b..fcbc7bfa441b 100644
--- a/net-ftp/proftpd/files/proftpd
+++ b/net-ftp/proftpd/files/proftpd.rc5
diff --git a/net-ftp/proftpd/files/proftpd.rc6 b/net-ftp/proftpd/files/proftpd.rc6
new file mode 100644
index 000000000000..d6c1e5cf3855
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd.rc6
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+
+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
+}
+
+start() {
+    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 $?
+}
diff --git a/net-ftp/proftpd/proftpd-1.2.1.ebuild b/net-ftp/proftpd/proftpd-1.2.1.ebuild
deleted file mode 100644
index 26d263f4ac15..000000000000
--- a/net-ftp/proftpd/proftpd-1.2.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.1.ebuild,v 1.4 2001/07/21 07:57:32 jerry Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="proftpd."
-SRC_URI="ftp://ftp.proftpd.org/distrib/${P}.tar.bz2
-     http://www.lastditcheffort.org/aah/src/mod_sql-3.1.5.patch.tar.gz"
-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_unpack() {
-    unpack ${P}.tar.bz2
-    cd ${S}
-    gzip -dc ${DISTDIR}/mod_sql-3.1.5.patch.tar.gz | patch -p0
-}
-
-src_compile() {                           
-    local modules
-    local myinc
-    modules="mod_ratio:mod_readme:mod_linuxprivs"
-
-    if [ "`use pam`" ]; then
-        modules="$modules:mod_pam"
-    fi
-
-    if [ "`use mysql`" ]; then
-        modules="$modules:mod_sql:mod_sql_mysql"
-    elif [ "`use postgres`" ]; then
-        modules="$modules:mod_sql:mod_sql_postgres"
-        myinc="/usr/include/postgresql"
-    fi
-
-    if [ "`use ldap`" ]; then
-        modules="$modules:mod_ldap"
-    fi
-
-    if [ "$myinc" ]; then
-        myinc="--with-includes=$myinc"
-    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 $myinc
-
-    try make
-}
-
-src_install() {                               
-    try make install prefix=${D}/usr sysconfdir=${D}/etc/proftpd \
-        mandir=${D}/usr/share/man localstatedir=${D}/var/run \
-        sbindir=${D}/usr/sbin
-
-    into /usr
-    dodir /home/ftp
-    dobin contrib/genuser.pl
-    dodoc COPYING CREDITS ChangeLog NEWS
-    dodoc README*
-    cd doc
-    dodoc API Changes-1.2.0pre3 license.txt GetConf ShowUndocumented
-    dodoc Undocumented.txt development.notes 
-    docinto html
-    dodoc *.html
-    docinto rfc
-    dodoc rfc/*.txt
-
-    cp ${FILESDIR}/proftpd.conf ${D}/etc/proftpd
-
-    insinto /etc/rc.d/init.d
-    insopts -m 0755
-    doins ${FILESDIR}/proftpd
-}
diff --git a/net-ftp/proftpd/proftpd-1.2.2-r6.ebuild b/net-ftp/proftpd/proftpd-1.2.2-r6.ebuild
new file mode 100644
index 000000000000..c8af12cf3a57
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.2.2-r6.ebuild
@@ -0,0 +1,62 @@
+# 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.1 2001/09/08 18:35:01 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
+
+    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
new file mode 100644
index 000000000000..ad3b14f2600b
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.2.2.ebuild
@@ -0,0 +1,62 @@
+# 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.1 2001/09/08 18:35:01 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
+
+    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.2_rc3.ebuild b/net-ftp/proftpd/proftpd-1.2.2_rc3.ebuild
deleted file mode 100644
index 2e12f8c05f29..000000000000
--- a/net-ftp/proftpd/proftpd-1.2.2_rc3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.2_rc3.ebuild,v 1.4 2001/07/21 07:57:32 jerry Exp $
-
-P=${PN}-1.2.2rc3
-S=${WORKDIR}/${P}
-DESCRIPTION="proftpd."
-SRC_URI="ftp://ftp.proftpd.org/distrib/${P}.tar.bz2
-     http://www.lastditcheffort.org/aah/src/mod_sql-3.2.2.tar.gz"
-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_unpack() {
-    unpack ${P}.tar.bz2
-    cd ${S}/contrib
-    unpack mod_sql-3.2.2.tar.gz
-}
-
-src_compile() {                           
-    local modules
-    local myinc
-    modules="mod_ratio:mod_readme:mod_linuxprivs"
-
-    if [ "`use pam`" ]; then
-        modules="$modules:mod_pam"
-    fi
-
-    if [ "`use mysql`" ]; then
-        modules="$modules:mod_sql:mod_sql_mysql"
-    elif [ "`use postgres`" ]; then
-        modules="$modules:mod_sql:mod_sql_postgres"
-        myinc="/usr/include/postgresql"
-    fi
-
-    if [ "`use ldap`" ]; then
-        modules="$modules:mod_ldap"
-    fi
-
-    if [ "$myinc" ]; then
-        myinc="--with-includes=$myinc"
-    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 $myinc
-
-    try make
-}
-
-src_install() {                               
-    try make install prefix=${D}/usr sysconfdir=${D}/etc/proftpd \
-        mandir=${D}/usr/share/man localstatedir=${D}/var/run \
-        sbindir=${D}/usr/sbin
-
-    into /usr
-    dodir /home/ftp
-    dobin contrib/genuser.pl
-    dodoc COPYING CREDITS ChangeLog NEWS
-    dodoc README* contrib/README.mod_sql
-    cd doc
-    dodoc API Changes-1.2.0pre3 license.txt GetConf ShowUndocumented
-    dodoc Undocumented.txt development.notes 
-    docinto html
-    dodoc *.html
-    docinto rfc
-    dodoc rfc/*.txt
-
-    cp ${FILESDIR}/proftpd.conf ${D}/etc/proftpd
-
-    insinto /etc/rc.d/init.d
-    insopts -m 0755
-    doins ${FILESDIR}/proftpd
-}