[csw-devel] SF.net SVN: gar:[10865] csw/mgar/pkg/vsftpd/trunk

[chninkel at users.sourceforge.net]

Revision: 10865
          http://gar.svn.sourceforge.net/gar/?rev=10865&view=rev
Author:   chninkel
Date:     2010-09-01 11:15:23 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
vsftpd: manually create the ftp home directory

Modified Paths:
--------------
    csw/mgar/pkg/vsftpd/trunk/checksums
    csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.preinstall
    csw/mgar/pkg/vsftpd/trunk/files/cswusergroup

Modified: csw/mgar/pkg/vsftpd/trunk/checksums
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/checksums	2010-09-01 10:36:33 UTC (rev 10864)
+++ csw/mgar/pkg/vsftpd/trunk/checksums	2010-09-01 11:15:23 UTC (rev 10865)
@@ -1,10 +1,10 @@
-a2f5b70fe49839b0463c9d90af0f11dd  CSWvsftpd.preinstall
+0ea60e4bd6ed8f5bfc79457c930f84e3  CSWvsftpd.preinstall
 eeaf77528b2da0c7730323838f30b7ef  README.CSW
 281c51282cabd9475cceef363bbc699b  build_options.patch
 778420c7a9c47afb78eff3957f5d07a5  changelog.CSW
 54c1c39c6bfa8747a4457f135fd5bca1  csw_build_system.patch
 57d1d89d4f4a2b63b71b80e694f05827  csw_paths.patch
-97284faaf1157370fcbe1737b5e725b4  cswusergroup
+36e99857f4727e99a13721c8f726c856  cswusergroup
 796d46089f9e9c25c897a34e0dcfadc8  cswvsftpd
 93173edf9931b8eb835c6d0177a7c6bd  cswvsftpd.xml
 83d13bd15ec4c0de2695640b7407c700  destdir.patch

Modified: csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.preinstall
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.preinstall	2010-09-01 10:36:33 UTC (rev 10864)
+++ csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.preinstall	2010-09-01 11:15:23 UTC (rev 10865)
@@ -5,4 +5,9 @@
 	if [ -z "$FTP_HOME" ] || [ ! -d "$FTP_HOME" ]; then
 		echo "WARNING: the ftp user doesn't have a valid home directory !" 
 	fi
+else
+	# we manually create the ftp home directory if the ftp user doesn't exist
+	#  cswusergroup action class can create the directory but populates it
+	# with skeleton files and we want an empty directory
+	mkdir -p "$PKG_INSTALL_ROOT/var/opt/csw/ftp"
 fi

Modified: csw/mgar/pkg/vsftpd/trunk/files/cswusergroup
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/cswusergroup	2010-09-01 10:36:33 UTC (rev 10864)
+++ csw/mgar/pkg/vsftpd/trunk/files/cswusergroup	2010-09-01 11:15:23 UTC (rev 10865)
@@ -1,2 +1,2 @@
 vsftpd:vsftpd:vsftpd privsep user:/var/opt/csw/empty/vsftpd:/bin/false:::NP
-ftp:nogroup:ftp user for anonymous access:/var/opt/csw/ftp:/bin/false:y::NP
+ftp:nogroup:ftp user for anonymous access:/var/opt/csw/ftp:/bin/false:::NP


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.