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

[chninkel at users.sourceforge.net]

Revision: 10854
          http://gar.svn.sourceforge.net/gar/?rev=10854&view=rev
Author:   chninkel
Date:     2010-08-31 21:56:32 +0000 (Tue, 31 Aug 2010)

Log Message:
-----------
vsftpd: fixed missing /var/empty directory in prototype

Modified Paths:
--------------
    csw/mgar/pkg/vsftpd/trunk/Makefile
    csw/mgar/pkg/vsftpd/trunk/checksums
    csw/mgar/pkg/vsftpd/trunk/files/cswusergroup

Modified: csw/mgar/pkg/vsftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/Makefile	2010-08-31 17:12:16 UTC (rev 10853)
+++ csw/mgar/pkg/vsftpd/trunk/Makefile	2010-08-31 21:56:32 UTC (rev 10854)
@@ -53,6 +53,13 @@
 USERGROUP = /opt/csw/etc/pkg/CSWvsftpd/cswusergroup
 INITSMF = /etc/opt/csw/init.d/cswvsftpd
 
+# The vsftpd user home directory has special rights
+PROTOTYPE_MODIFIERS = empty
+PROTOTYPE_FILES_empty = \/opt\/csw\/var\/empty\/vsftpd
+PROTOTYPE_PERMS_empty = 0700
+PROTOTYPE_USER_empty = root
+PROTOTYPE_GROUP_empty = sys
+
 # build options are set by modifying 
 # builddefs.h, so we patch it to enable
 # ssl and tcp wrapper support
@@ -120,7 +127,7 @@
 	 ginstall -d $(DESTDIR)$(docdir)/vsftpd )
 
 
-post-merge: merge-doc-files merge-config-files merge-init-file
+post-merge: merge-doc-files merge-config-files merge-init-file merge-empty-directory
 
 merge-init-file:
 	ginstall -D "$(WORKDIR_FIRSTMOD)/cswvsftpd" "$(PKGROOT)/etc/opt/csw/init.d/cswvsftpd"
@@ -139,3 +146,5 @@
 	ginstall -D "$(WORKDIR_FIRSTMOD)/changelog.CSW" "$(PKGROOT)$(docdir)/vsftpd/changelog.CSW"
 	ginstall -D "$(WORKDIR_FIRSTMOD)/README.CSW" "$(PKGROOT)$(docdir)/vsftpd/README.CSW"
 
+merge-empty-directory:
+	ginstall -d "$(PKGROOT)$(localstatedir)/empty/vsftpd"

Modified: csw/mgar/pkg/vsftpd/trunk/checksums
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/checksums	2010-08-31 17:12:16 UTC (rev 10853)
+++ csw/mgar/pkg/vsftpd/trunk/checksums	2010-08-31 21:56:32 UTC (rev 10854)
@@ -4,7 +4,7 @@
 778420c7a9c47afb78eff3957f5d07a5  changelog.CSW
 54c1c39c6bfa8747a4457f135fd5bca1  csw_build_system.patch
 a9e994d2b57999b76a0e03503745c01a  csw_paths.patch
-98e1d831801985daf5ce2ed01fbc0efd  cswusergroup
+3dc08f17f383de22b400f1af00ff7ef6  cswusergroup
 796d46089f9e9c25c897a34e0dcfadc8  cswvsftpd
 93173edf9931b8eb835c6d0177a7c6bd  cswvsftpd.xml
 83d13bd15ec4c0de2695640b7407c700  destdir.patch

Modified: csw/mgar/pkg/vsftpd/trunk/files/cswusergroup
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/cswusergroup	2010-08-31 17:12:16 UTC (rev 10853)
+++ csw/mgar/pkg/vsftpd/trunk/files/cswusergroup	2010-08-31 21:56:32 UTC (rev 10854)
@@ -1,2 +1,2 @@
-vsftpd:vsftpd:vsftpd privsep user:/opt/csw/var/empty/vsftpd:/bin/false::
-ftp:nogroup:ftp user for anonymous access:/opt/csw/var/ftp:/bin/false::
+vsftpd:vsftpd:vsftpd privsep user:/opt/csw/var/empty/vsftpd:/bin/false:::NP
+ftp:nogroup:ftp user for anonymous access:/opt/csw/var/ftp:/bin/false:y::NP


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