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

chninkel at users.sourceforge.net chninkel at users.sourceforge.net
Tue Jul 19 00:02:54 CEST 2011


Revision: 15107
          http://gar.svn.sourceforge.net/gar/?rev=15107&view=rev
Author:   chninkel
Date:     2011-07-18 22:02:54 +0000 (Mon, 18 Jul 2011)

Log Message:
-----------
vsftpd: fixed some policy compliance problems

Modified Paths:
--------------
    csw/mgar/pkg/vsftpd/trunk/Makefile
    csw/mgar/pkg/vsftpd/trunk/files/csw_paths.patch

Modified: csw/mgar/pkg/vsftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/Makefile	2011-07-18 21:50:46 UTC (rev 15106)
+++ csw/mgar/pkg/vsftpd/trunk/Makefile	2011-07-18 22:02:54 UTC (rev 15107)
@@ -32,7 +32,18 @@
 RUNTIME_DEP_PKGS  = CSWtcpwrap 
 RUNTIME_DEP_PKGS += CSWosslrt 
 
+# Reference to DTD path, can be safely ignored
+CHECKPKG_OVERRIDES_CSWvsftpd += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswvsftpd.xml
 
+# Various reference to default vsftpd path in documentation files, can be safely ignored
+CHECKPKG_OVERRIDES_CSWvsftpd += file-with-bad-content|/usr/local|root/opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE/vsftpd.xinetd
+CHECKPKG_OVERRIDES_CSWvsftpd += file-with-bad-content|/usr/local|root/opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE/README
+CHECKPKG_OVERRIDES_CSWvsftpd += file-with-bad-content|/usr/local|root/opt/csw/share/doc/vsftpd/INSTALL
+CHECKPKG_OVERRIDES_CSWvsftpd += file-with-bad-content|/usr/local|root/opt/csw/share/doc/vsftpd/Changelog
+CHECKPKG_OVERRIDES_CSWvsftpd += file-with-bad-content|/usr/share|root/opt/csw/share/doc/vsftpd/INSTALL
+CHECKPKG_OVERRIDES_CSWvsftpd += file-with-bad-content|/usr/share|root/opt/csw/share/doc/vsftpd/README.ssl
+
+
 ###### Upstream and opencsw files information #######
 
 # We define upstream file regex so we can be notifed of new upstream software release

Modified: csw/mgar/pkg/vsftpd/trunk/files/csw_paths.patch
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/csw_paths.patch	2011-07-18 21:50:46 UTC (rev 15106)
+++ csw/mgar/pkg/vsftpd/trunk/files/csw_paths.patch	2011-07-18 22:02:54 UTC (rev 15107)
@@ -49,3 +49,86 @@
                        &tunable_rsa_cert_file);
    install_str_setting(0, &tunable_dsa_cert_file);
    install_str_setting("DES-CBC3-SHA", &tunable_ssl_ciphers);
+--- vsftpd-2.3.2.orig/vsftpd.conf.5	Mon Oct 19 04:46:30 2009
++++ vsftpd-2.3.2.orig/vsftpd.conf.5	Mon Jul 18 23:17:14 2011
+@@ -4,7 +4,7 @@
+ .SH DESCRIPTION
+ vsftpd.conf may be used to control various aspects of vsftpd's behaviour. By
+ default, vsftpd looks for this file at the location
+-.BR /etc/vsftpd.conf .
++.BR /opt/csw/etc/vsftpd.conf .
+ However, you may override this by specifying a command line argument to
+ vsftpd. The command line argument is the pathname of the configuration file
+ for vsftpd. This behaviour is useful because you may wish to use an advanced
+@@ -138,7 +138,7 @@
+ different if chroot_local_user is set to YES. In this case, the list becomes
+ a list of users which are NOT to be placed in a chroot() jail.
+ By default, the file containing this list is
+-/etc/vsftpd.chroot_list, but you may override this with the
++/opt/csw/etc/vsftpd.chroot_list, but you may override this with the
+ .BR chroot_list_file
+ setting.
+ 
+@@ -177,7 +177,7 @@
+ .B deny_email_enable
+ If activated, you may provide a list of anonymous password e-mail responses
+ which cause login to be denied. By default, the file containing this list is
+-/etc/vsftpd.banned_emails, but you may override this with the
++/opt/csw/etc/vsftpd.banned_emails, but you may override this with the
+ .BR banned_email_file
+ setting.
+ 
+@@ -433,7 +433,7 @@
+ file specified by the
+ .BR email_password_file
+ setting. The file format is one password per line, no extra whitespace. The
+-default filename is /etc/vsftpd.email_passwords.
++default filename is /opt/csw/etc/vsftpd.email_passwords.
+ 
+ Default: NO
+ .TP
+@@ -764,7 +764,7 @@
+ .BR deny_email_enable
+ is enabled.
+ 
+-Default: /etc/vsftpd.banned_emails
++Default: /opt/csw/etc/vsftpd.banned_emails
+ .TP
+ .B banner_file
+ This option is the name of a file containing text to display when someone
+@@ -803,7 +803,7 @@
+ is enabled, then the list file becomes a list of users to NOT place in a
+ chroot() jail.
+ 
+-Default: /etc/vsftpd.chroot_list
++Default: /opt/csw/etc/vsftpd.chroot_list
+ .TP
+ .B cmds_allowed
+ This options specifies a comma separated list of allowed FTP commands (post
+@@ -864,7 +864,7 @@
+ .BR secure_email_list_enable
+ setting.
+ 
+-Default: /etc/vsftpd.email_passwords
++Default: /opt/csw/etc/vsftpd.email_passwords
+ .TP
+ .B ftp_username
+ This is the name of the user we use for handling anonymous FTP. The home
+@@ -955,7 +955,7 @@
+ This option specifies the location of the RSA certificate to use for SSL
+ encrypted connections.
+ 
+-Default: /usr/share/ssl/certs/vsftpd.pem
++Default: /opt/csw/ssl/certs/vsftpd.pem
+ .TP
+ .B rsa_private_key_file
+ This option specifies the location of the RSA private key to use for SSL
+@@ -969,7 +969,7 @@
+ directory should not be writable by the ftp user. This directory is used
+ as a secure chroot() jail at times vsftpd does not require filesystem access.
+ 
+-Default: /usr/share/empty
++Default: /var/opt/csw/empty/vsftpd
+ .TP
+ .B ssl_ciphers
+ This option can be used to select which SSL ciphers vsftpd will allow for


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


More information about the devel mailing list