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

[chninkel at users.sourceforge.net]

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

Log Message:
-----------
vsftpd: rather create the ftp home directory in the prototype

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

Modified: csw/mgar/pkg/vsftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/Makefile	2010-09-01 11:42:07 UTC (rev 10869)
+++ csw/mgar/pkg/vsftpd/trunk/Makefile	2010-09-01 11:42:13 UTC (rev 10870)
@@ -127,7 +127,7 @@
 	 ginstall -d $(DESTDIR)$(docdir)/vsftpd )
 
 
-post-merge: merge-doc-files merge-config-files merge-init-file merge-empty-directory
+post-merge: merge-doc-files merge-config-files merge-init-file merge-special-directories
 
 merge-init-file:
 	ginstall -D "$(WORKDIR_FIRSTMOD)/cswvsftpd" "$(PKGROOT)/etc/opt/csw/init.d/cswvsftpd"
@@ -148,3 +148,5 @@
 
 merge-empty-directory:
 	ginstall -d "$(PKGROOT)/var/opt/csw/empty/vsftpd"
+	ginstall -d "$(PKGROOT)/var/opt/csw/ftp"
+	

Modified: csw/mgar/pkg/vsftpd/trunk/checksums
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/checksums	2010-09-01 11:42:07 UTC (rev 10869)
+++ csw/mgar/pkg/vsftpd/trunk/checksums	2010-09-01 11:42:13 UTC (rev 10870)
@@ -1,4 +1,4 @@
-0ea60e4bd6ed8f5bfc79457c930f84e3  CSWvsftpd.preinstall
+a2f5b70fe49839b0463c9d90af0f11dd  CSWvsftpd.preinstall
 eeaf77528b2da0c7730323838f30b7ef  README.CSW
 281c51282cabd9475cceef363bbc699b  build_options.patch
 778420c7a9c47afb78eff3957f5d07a5  changelog.CSW

Modified: csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.preinstall
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.preinstall	2010-09-01 11:42:07 UTC (rev 10869)
+++ csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.preinstall	2010-09-01 11:42:13 UTC (rev 10870)
@@ -5,9 +5,4 @@
 	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


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