[PC-BSD Commits] r3024 - in pbibuild/modules/vsftpd: . overlay-dir overlay-dir/services

[svn at pcbsd.org]

Author: fabry
Date: 2008-12-02 05:02:40 -0800 (Tue, 02 Dec 2008)
New Revision: 3024

Added:
   pbibuild/modules/vsftpd/overlay-dir/services/vsftpd/
Modified:
   pbibuild/modules/vsftpd/build.sh
   pbibuild/modules/vsftpd/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/vsftpd/overlay-dir/vsftpd.conf
   pbibuild/modules/vsftpd/overlay-dir/vsftpdcfg
   pbibuild/modules/vsftpd/pbi.conf
Log:
a few adjustments on vsftpd module

Modified: pbibuild/modules/vsftpd/build.sh
===================================================================
--- pbibuild/modules/vsftpd/build.sh	2008-12-02 10:59:21 UTC (rev 3023)
+++ pbibuild/modules/vsftpd/build.sh	2008-12-02 13:02:40 UTC (rev 3024)
@@ -9,21 +9,3 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,vsftpd${PORTVER},g" $PBIDIR/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh $PBIDIR/removepbi.sh
-chmod 755 $PBIDIR/removepbi.sh
-
-# Save the right version number in the vsftpd.conf file
-sed -e "s,CHANGEME,vsftpd$PORTVER,g" $PBIDIR/vsftpd.conf > /tmp/vsftpd.conf
-mv /tmp/vsftpd.conf $PBIDIR/vsftpd.conf
-
-# Save the right version number in the vsftpd.conf file
-sed -e "s,CHANGEME,$PORTVER,g" $PBIDIR/vsftpdcfg > /tmp/vsftpdcfg
-mv /tmp/vsftpdcfg $PBIDIR/vsftpdcfg
-chmod 755 $PBIDIR/vsftpdcfg
-
-# Save the right version number in the AnonDir file
-sed -e "s,CHANGEME,$PORTVER,g" $PBIDIR/AnonDir > /tmp/AnonDir
-mv /tmp/AnonDir $PBIDIR/AnonDir
-chmod 755 $PBIDIR/AnonDir

Modified: pbibuild/modules/vsftpd/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/vsftpd/overlay-dir/PBI.SetupScript.sh	2008-12-02 10:59:21 UTC (rev 3023)
+++ pbibuild/modules/vsftpd/overlay-dir/PBI.SetupScript.sh	2008-12-02 13:02:40 UTC (rev 3024)
@@ -14,6 +14,17 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
+
+# Save the right version number in the removepbi.sh script
+sed -e "s,CHANGEME,vsftpd${PORTVER},g" /Programs/$PBIDIR/scripts/removepbi.sh > /tmp/removepbi.sh
+mv /tmp/removepbi.sh /Programs/$PBIDIR/removepbi.sh
+chmod 755 /Programs/$PBIDIR/removepbi.sh
+
+# Save the right version number in the vsftpd.conf file
+sed -e "s,CHANGEME,/Programs/$PROGDIR,g" /Programs/$PBIDIR/vsftpdcfg > /tmp/vsftpdcfg
+mv /tmp/vsftpdcfg /Programs/$PROGDIR/vsftpdcfg
+chmod 755 /Programs/$PROGDIR/vsftpdcfg
+
 cp /Programs/${PROGDIR}/bin/vsftpd /usr/local/libexec/vsftpd
 ln -s /Programs/${PROGDIR}/man/man5/vsftpd.conf.5.gz /usr/local/man/man5/vsftpd.conf.5.gz
 ln -s /Programs/${PROGDIR}/man/man8/vsftpd.8.gz /usr/local/man/man8/vsftpd.8.gz

Modified: pbibuild/modules/vsftpd/overlay-dir/vsftpd.conf
===================================================================
--- pbibuild/modules/vsftpd/overlay-dir/vsftpd.conf	2008-12-02 10:59:21 UTC (rev 3023)
+++ pbibuild/modules/vsftpd/overlay-dir/vsftpd.conf	2008-12-02 13:02:40 UTC (rev 3024)
@@ -14,7 +14,7 @@
 anonymous_enable=NO
 ftp_username=ftp
 no_anon_password=YES
-anon_root=/Programs/CHANGEME/anon_ftp
+anon_root=/usr/home/anon_ftp
 #
 # Uncomment this to allow local users to log in.
 local_enable=NO
@@ -86,7 +86,7 @@
 #ascii_download_enable=YES
 #
 # You may fully customise the login banner string:
-#banner_file=/Programs/CHANGEME/anon_ftp/FTPServer
+#banner_file=/usr/home/anon_ftp/FTPServer
 ftpd_banner=Welcome to this FTP Server running under PC-BSD OS.
 #
 # You may specify a file of disallowed anonymous e-mail addresses. Apparently

Modified: pbibuild/modules/vsftpd/overlay-dir/vsftpdcfg
===================================================================
--- pbibuild/modules/vsftpd/overlay-dir/vsftpdcfg	2008-12-02 10:59:21 UTC (rev 3023)
+++ pbibuild/modules/vsftpd/overlay-dir/vsftpdcfg	2008-12-02 13:02:40 UTC (rev 3024)
@@ -1,4 +1,2 @@
 #!/bin/sh 
-VER="CHANGEME"
-PROGDIR="vsftpd${VER}"
-kwrite /Programs/${PROGDIR}/vsftpd.conf
+kwrite CHANGEME/vsftpd.conf

Modified: pbibuild/modules/vsftpd/pbi.conf
===================================================================
--- pbibuild/modules/vsftpd/pbi.conf	2008-12-02 10:59:21 UTC (rev 3023)
+++ pbibuild/modules/vsftpd/pbi.conf	2008-12-02 13:02:40 UTC (rev 3024)
@@ -32,6 +32,6 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="25"
+BUILDKEY="27"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY