[PC-BSD Commits] r2871 - in pbibuild/modules/vsftpd: . overlay-dir overlay-dir/autolibs overlay-dir/share/doc

svn at pcbsd.org svn at pcbsd.org
Wed Oct 8 13:14:18 PDT 2008


Author: kris
Date: 2008-10-08 13:14:17 -0700 (Wed, 08 Oct 2008)
New Revision: 2871

Removed:
   pbibuild/modules/vsftpd/overlay-dir/autolibs/libc.so.6
   pbibuild/modules/vsftpd/overlay-dir/autolibs/libpam.so.3
   pbibuild/modules/vsftpd/overlay-dir/autolibs/libutil.so.5
   pbibuild/modules/vsftpd/overlay-dir/autolibs/libwrap.so.4
   pbibuild/modules/vsftpd/overlay-dir/share/doc/vsftpd/
   pbibuild/modules/vsftpd/overlay-dir/vsftpd
Modified:
   pbibuild/modules/vsftpd/build.sh
   pbibuild/modules/vsftpd/copy-files
   pbibuild/modules/vsftpd/overlay-dir/PBI.RemoveScript.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/overlay-dir/vsftpdstart
   pbibuild/modules/vsftpd/pbi.conf
Log:

Did some cleanup of the vsftpd PBI module, it should be buildable now and work on 7



Modified: pbibuild/modules/vsftpd/build.sh
===================================================================
--- pbibuild/modules/vsftpd/build.sh	2008-10-08 19:03:37 UTC (rev 2870)
+++ pbibuild/modules/vsftpd/build.sh	2008-10-08 20:14:17 UTC (rev 2871)
@@ -13,3 +13,12 @@
 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,${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

Modified: pbibuild/modules/vsftpd/copy-files
===================================================================
--- pbibuild/modules/vsftpd/copy-files	2008-10-08 19:03:37 UTC (rev 2870)
+++ pbibuild/modules/vsftpd/copy-files	2008-10-08 20:14:17 UTC (rev 2871)
@@ -0,0 +1,3 @@
+/usr/local/libexec/vsftpd bin/
+/usr/local/share/vsftpd share/
+/usr/local/share/doc/vsftpd share/doc/

Modified: pbibuild/modules/vsftpd/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/vsftpd/overlay-dir/PBI.RemoveScript.sh	2008-10-08 19:03:37 UTC (rev 2870)
+++ pbibuild/modules/vsftpd/overlay-dir/PBI.RemoveScript.sh	2008-10-08 20:14:17 UTC (rev 2871)
@@ -10,9 +10,9 @@
 rm -fR /usr/local/man/man5/vsftpd.conf.5.gz
 rm -fR /usr/local/man/man8/vsftpd.8.gz
 rm -fR /usr/local/share/doc/vsftpd
+rm -fR /usr/local/share/vsftpd
 rm -fR /usr/local/etc/vsftpd.conf.dist
 rm -fR /usr/local/etc/vsftpd.conf
-rm -fR /usr/local/share/vsftpd
 rm -fR /usr/local/bin/vsftpdstart
 rm -fR /usr/local/bin/vsftpdstop
-rm -fR /usr/local/bin/vsftpdcfg
\ No newline at end of file
+rm -fR /usr/local/bin/vsftpdcfg

Modified: pbibuild/modules/vsftpd/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/vsftpd/overlay-dir/PBI.SetupScript.sh	2008-10-08 19:03:37 UTC (rev 2870)
+++ pbibuild/modules/vsftpd/overlay-dir/PBI.SetupScript.sh	2008-10-08 20:14:17 UTC (rev 2871)
@@ -14,17 +14,17 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-cp /Programs/${PROGDIR}/vsftpd /usr/local/libexec/vsftpd
+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
 ln -s /Programs/${PROGDIR}/share/doc/vsftpd /usr/local/share/doc/vsftpd
+ln -s /Programs/${PROGDIR}/share/vsftpd /usr/local/share/vsftpd
 ln -s /Programs/${PROGDIR}/vsftpd.conf.dist /usr/local/etc/vsftpd.conf.dist
 ln -s /Programs/${PROGDIR}/vsftpd.conf /usr/local/etc/vsftpd.conf
-ln -s /Programs/${PROGDIR}/vsftpdstart /usr/local/bin/vsftpdstart
-ln -s /Programs/${PROGDIR}/vsftpdstop /usr/local/bin/vsftpdstop
+ln -s /Programs/${PROGDIR}/.sbin/vsftpdstart /usr/local/bin/vsftpdstart
+ln -s /Programs/${PROGDIR}/.sbin/vsftpdstop /usr/local/bin/vsftpdstop
 ln -s /Programs/${PROGDIR}/vsftpdcfg /usr/local/bin/vsftpdcfg
-mkdir /usr/local/share/vsftpd
-mkdir /usr/local/share/vsftpd/empty
+
 USERS=$(kdialog --title "vsftp Server" --menu "vsftpd will be used by :" a "Anonymous Users ONLY" b "Local Users ONLY" c "Anonymous and Local Users")
 if [ "$?" = "0" ] 
 then 

Modified: pbibuild/modules/vsftpd/overlay-dir/vsftpd.conf
===================================================================
--- pbibuild/modules/vsftpd/overlay-dir/vsftpd.conf	2008-10-08 19:03:37 UTC (rev 2870)
+++ pbibuild/modules/vsftpd/overlay-dir/vsftpd.conf	2008-10-08 20:14:17 UTC (rev 2871)
@@ -14,7 +14,7 @@
 anonymous_enable=YES
 ftp_username=ftp
 no_anon_password=YES
-anon_root=/Programs/vsftpd2.0.5/anon_ftp
+anon_root=/Programs/CHANGEME/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/vsftpd2.0.5/anon_ftp/FTPServer
+banner_file=/Programs/CHANGEME/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-10-08 19:03:37 UTC (rev 2870)
+++ pbibuild/modules/vsftpd/overlay-dir/vsftpdcfg	2008-10-08 20:14:17 UTC (rev 2871)
@@ -1,2 +1,4 @@
 #!/bin/sh 
-kwrite /Programs/vsftpd2.0.5/vsftpd.conf
\ No newline at end of file
+VER="CHANGEME"
+PROGDIR="vsftpd${VER}"
+kwrite /Programs/${PROGDIR}/vsftpd.conf

Modified: pbibuild/modules/vsftpd/overlay-dir/vsftpdstart
===================================================================
--- pbibuild/modules/vsftpd/overlay-dir/vsftpdstart	2008-10-08 19:03:37 UTC (rev 2870)
+++ pbibuild/modules/vsftpd/overlay-dir/vsftpdstart	2008-10-08 20:14:17 UTC (rev 2871)
@@ -1,11 +1,5 @@
 #!/bin/sh 
-if [ ! -e "/usr/local/man/man5/vsftpd.conf.5.gz" ]
-then
-ln -s /Programs/vsftpd2.0.5/man/man5/vsftpd.conf.5.gz /usr/local/man/man5/vsftpd.conf.5.gz
-ln -s /Programs/vsftpd2.0.5/man/man8/vsftpd.8.gz /usr/local/man/man8/vsftpd.8.gz
-ln -s /Programs/vsftpd2.0.5/share/doc/vsftpd /usr/local/share/doc/vsftpd
-ln -s /Programs/vsftpd2.0.5/vsftpd.conf.dist /usr/local/etc/vsftpd.conf.dist
-ln -s /Programs/vsftpd2.0.5/vsftpd.conf /usr/local/etc/vsftpd.conf
-fi
-./vsftpd &
+
+/usr/local/libexec/vsftpd &
+
 kdialog --title "vsftpd Server" --passivepopup "vsftpd Server is up and running" 3

Modified: pbibuild/modules/vsftpd/pbi.conf
===================================================================
--- pbibuild/modules/vsftpd/pbi.conf	2008-10-08 19:03:37 UTC (rev 2870)
+++ pbibuild/modules/vsftpd/pbi.conf	2008-10-08 20:14:17 UTC (rev 2871)
@@ -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="05"
+BUILDKEY="25"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY



More information about the Commits mailing list