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

[chninkel at users.sourceforge.net]

Revision: 5219
          http://gar.svn.sourceforge.net/gar/?rev=5219&view=rev
Author:   chninkel
Date:     2009-06-09 21:10:38 +0000 (Tue, 09 Jun 2009)

Log Message:
-----------
vsftpd: fixed RLMIT_NPROC bug

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

Added Paths:
-----------
    csw/mgar/pkg/vsftpd/trunk/files/no_rlimit_nproc.patch

Modified: csw/mgar/pkg/vsftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/Makefile	2009-06-09 20:51:46 UTC (rev 5218)
+++ csw/mgar/pkg/vsftpd/trunk/Makefile	2009-06-09 21:10:38 UTC (rev 5219)
@@ -47,7 +47,7 @@
 DISTFILES += CSWvsftpd.prototype CSWvsftpd.preinstall
 DISTFILES += changelog.CSW README.CSW
 DISTFILES += vsftpd.conf vsftpd.userlist
-DISTFILES += cswvsftpd 
+DISTFILES += cswvsftpd cswvsftpd.xml
 DISTFILES += cswusergroup 
 
 # build options are set by modifying 
@@ -71,6 +71,9 @@
 # vsftpd makfile
 PATCHFILES += destdir.patch
 
+# solaris doesn't have RLIMIT_NPROC
+PATCHFILES += no_rlimit_nproc.patch
+
 # Documentation files
 DOCFILES  = AUDIT BENCHMARKS BUGS COPYING COPYRIGHT Changelog FAQ INSTALL LICENSE REFS
 DOCFILES += REWARD SIZE SPEED TODO TUNING README README.ssl README.security

Modified: csw/mgar/pkg/vsftpd/trunk/checksums
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/checksums	2009-06-09 20:51:46 UTC (rev 5218)
+++ csw/mgar/pkg/vsftpd/trunk/checksums	2009-06-09 21:10:38 UTC (rev 5219)
@@ -7,7 +7,9 @@
 a9e994d2b57999b76a0e03503745c01a  download/csw_paths.patch
 98e1d831801985daf5ce2ed01fbc0efd  download/cswusergroup
 630e59a947e2fde13beab3185d77d913  download/cswvsftpd
+020a0de7fa69337c7884d2f73851d45d  download/cswvsftpd.xml
 73e59f9ada47d3d20199f7c97849fb13  download/destdir.patch
+81d5a4a3831f318cd9e7ea3b3634f41b  download/no_rlimit_nproc.patch
 a9a65f55cbfd01f9d72d1de25e67148d  download/set_priv_sep_user.patch
 6a8c8579d50adf0d0fc07226c03bfb52  download/vsftpd-2.1.2.tar.gz
 f6ce22a6959b93e500a4ae800295c2ee  download/vsftpd.conf

Added: csw/mgar/pkg/vsftpd/trunk/files/no_rlimit_nproc.patch
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/no_rlimit_nproc.patch	                        (rev 0)
+++ csw/mgar/pkg/vsftpd/trunk/files/no_rlimit_nproc.patch	2009-06-09 21:10:38 UTC (rev 5219)
@@ -0,0 +1,19 @@
+diff --speed-large-files --minimal -Nru vsftpd-2.1.2.orig/sysutil.c vsftpd-2.1.2/sysutil.c
+--- vsftpd-2.1.2.orig/sysutil.c	2009-05-27 08:14:59.000000000 +0200
++++ vsftpd-2.1.2/sysutil.c	2009-06-09 22:56:52.905511283 +0200
+@@ -2779,6 +2779,7 @@
+ void
+ vsf_sysutil_set_no_procs()
+ {
++#ifdef RLIMIT_NPROC
+   int ret;
+   struct rlimit rlim;
+   rlim.rlim_cur = 0;
+@@ -2788,6 +2789,7 @@
+   {
+     die("setrlimit NPROC");
+   }
++#endif
+ }
+ 
+ void


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