some cosmetic changes, activated anonymous ftp and removed earlier versions

4 files changed, 26 insertions, 58 deletions

diff --git a/net-ftp/pure-ftpd/files/pftpd.inetd b/net-ftp/pure-ftpd/files/pftpd.inetd
index d8b6061e5edd..5f6be4849c36 100644
--- a/net-ftp/pure-ftpd/files/pftpd.inetd
+++ b/net-ftp/pure-ftpd/files/pftpd.inetd
@@ -1,6 +1,6 @@
 # ----------------
 # Pure-FTPd Server
 # ----------------
-ftp		stream	tcp	nowait	root	/usr/sbin/pure-ftpd -4 -B
+ftp		stream	tcp	nowait	root	/usr/sbin/pure-ftpd pure-ftpd -4 -B -b -N -w -W -x -s
 
 
diff --git a/net-ftp/pure-ftpd/files/welcome.msg b/net-ftp/pure-ftpd/files/welcome.msg
new file mode 100644
index 000000000000..b06325536bbe
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/welcome.msg
@@ -0,0 +1,11 @@
+Hello %R, there are %N (max %M) users logged in at the moment.
+Local time is: %T
+
+Please use your email address as password and NOT silly words
+like "mozilla@" or "WWWuser@", as some Web browsers do!
+
+If you have any questions concerning this ftp archive or would
+like to announce your uploads, please send a mail to the ftp-admin
+of this server: %E
+
+All transfers are logged. If you don't like this, disconnect now.
diff --git a/net-ftp/pure-ftpd/pure-ftpd-0.98.8.ebuild b/net-ftp/pure-ftpd/pure-ftpd-0.98.8.ebuild
deleted file mode 100644
index ef38238a8dec..000000000000
--- a/net-ftp/pure-ftpd/pure-ftpd-0.98.8.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Parag Mehta <pm@gentoo.org>
-#$HEADER$
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="A Fast Production Quality FTP Server - Bug fixes backported from 0.99 . No new feature. Use this version on production servers."
-SRC_URI="http://prdownloads.sourceforge.net/pureftpd/${A}"
-HOMEPAGE="http://pureftpd.sourceforge.net"
-
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=sys-libs/pam-0.75"
-
-src_compile() {
-
-    cd ${S}
-    try ./configure --prefix=/usr  --with-throttling --with-virtualhosts\
-	--with-ratios --with-largefile --with-cookie --with-welcomemsg 
-    try make
-
-}
-
-src_install () {
-
-    cd ${S}
-    try make DESTDIR=${D} install
-    dodoc COPYING ChangeLog README README.Configuration-File 
-    dodoc README.Contrib README.LDAP README.Netfilter
-    dodir /etc/pure-ftpd
-    cp $S/configuration-file/*.pl ${D}/usr/sbin/
-    cp $S/configuration-file/*.py ${D}/usr/sbin/
-    cp $S/configuration-file/pure-ftpd.conf ${D}/etc/pure-ftpd/pure-ftpd.conf
-    cp ${FILESDIR}/ftpusers ${D}/etc
-    echo "Please do no forget to run, the following syntax :"
-    echo "ebuild pure-ftpd-0.98.8.ebuild config"
-    echo "This will add the necessary post install config to your system."
-}
-
-pkg_config() {
-	echo "This config script will add pftpd lines to your /etc/xinetd.conf."
-	echo "Press control-C to abort, hit Enter to continue."
-	echo
-	read
-	cat ${FILESDIR}/pftpd.inetd >> ${ROOT}etc/inetd.conf
-	ln -s /dev/null /etc/pure-ftpd/127.0.0.1
-	/etc/rc.d/init.d/svc-xinetd restart
-	echo "Modifications applied."
-}
-
-
-
diff --git a/net-ftp/pure-ftpd/pure-ftpd-0.99.ebuild b/net-ftp/pure-ftpd/pure-ftpd-0.99-r1.ebuild
index 3dba2dccfa0a..7af879c55091 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-0.99.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-0.99-r1.ebuild
@@ -3,7 +3,7 @@
 # Author Parag Mehta <pm@gentoo.org>
 #$HEADER$
 
-A=${P}.tar.gz
+A=pure-ftpd-0.99.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="A Fast Production Quality FTP Server - Bug fixes backported from 0.99 . No new feature. Use this version on production servers."
 SRC_URI="http://prdownloads.sourceforge.net/pureftpd/${A}"
@@ -17,7 +17,7 @@ src_compile() {
     cd ${S}
     try ./configure --prefix=/usr  --with-throttling --with-virtualhosts \
 	--with-ratios --with-largefile --with-cookie --with-welcomemsg \
-	--with-altlog --with-ftpwho 
+	--with-altlog --with-ftpwho --with-uploadscript
     try make
 
 }
@@ -35,9 +35,19 @@ src_install () {
     cp ${FILESDIR}/ftpusers ${D}/etc
     cp ${FILESDIR}/pure-ftpwho_html.py ${D}/usr/sbin/
     cp ${FILESDIR}/pure-ftp_xml_python.py ${D}/usr/sbin/
+    dodir /home/ftp	
+    dodir /home/ftp/pub
+    dodir /home/ftp/incoming
+    chown ftp.bin /home/ftp
+    chown ftp.bin /home/ftp/incoming
+    chmod 757 /home/ftp/incoming
+    chown -R root.root /home/ftp/pub
+    dosym /dev/null /etc/pure-ftpd/127.0.0.1
+    cp ${FILESDIR}/welcome.msg /home/ftp/
     echo -e "\033[1;42m\033[1;33m Please do no forget to run, the following syntax : \033[0m"
-    echo -e "\033[1;42m\033[1;33m ebuild pure-ftpd-0.99.ebuild config \033[0m"
+    echo -e "\033[1;42m\033[1;33m ebuild pure-ftpd-0.99-r1.ebuild config \033[0m"
     echo -e "\033[1;42m\033[1;33m This will add the necessary post install config to your system. \033[0m"
+    read
 }
 
 pkg_config() {
@@ -45,8 +55,7 @@ pkg_config() {
 	echo "Press control-C to abort now OR hit Enter to continue."
 	echo
 	read
-	cat ${FILESDIR}/pftpd.inetd >> ${ROOT}etc/inetd.conf
-	ln -s /dev/null /etc/pure-ftpd/127.0.0.1
+	cat ${FILESDIR}/pftpd.inetd >> ${ROOT}/etc/inetd.conf
 	/etc/rc.d/init.d/svc-xinetd restart
 	echo "Modifications applied."
 }