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

[chninkel at users.sourceforge.net]

Revision: 6824
          http://gar.svn.sourceforge.net/gar/?rev=6824&view=rev
Author:   chninkel
Date:     2009-10-10 22:42:59 +0000 (Sat, 10 Oct 2009)

Log Message:
-----------
vsftpd: removed no_rlimit_nproc patch

Modified Paths:
--------------
    csw/mgar/pkg/vsftpd/trunk/Makefile
    csw/mgar/pkg/vsftpd/trunk/checksums
    csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW

Removed 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-10-10 22:41:57 UTC (rev 6823)
+++ csw/mgar/pkg/vsftpd/trunk/Makefile	2009-10-10 22:42:59 UTC (rev 6824)
@@ -13,7 +13,7 @@
 ###### Package information #######
 
 GARNAME = vsftpd
-GARVERSION = 2.1.2
+GARVERSION = 2.2.0
 CATEGORIES = server
 
 DESCRIPTION = A very secure and fast FTP server.
@@ -71,9 +71,6 @@
 # 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-10-10 22:41:57 UTC (rev 6823)
+++ csw/mgar/pkg/vsftpd/trunk/checksums	2009-10-10 22:42:59 UTC (rev 6824)
@@ -1,17 +1,16 @@
-a2f5b70fe49839b0463c9d90af0f11dd  download/CSWvsftpd.preinstall
-8944fcd302add66d5b2b287d390b9c91  download/CSWvsftpd.prototype
-eeaf77528b2da0c7730323838f30b7ef  download/README.CSW
-281c51282cabd9475cceef363bbc699b  download/build_options.patch
-16b388b04478ebdc9ee7ebac6a03387d  download/changelog.CSW
-54c1c39c6bfa8747a4457f135fd5bca1  download/csw_build_system.patch
-a9e994d2b57999b76a0e03503745c01a  download/csw_paths.patch
-98e1d831801985daf5ce2ed01fbc0efd  download/cswusergroup
-796d46089f9e9c25c897a34e0dcfadc8  download/cswvsftpd
-93173edf9931b8eb835c6d0177a7c6bd  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
-0d4a1cf36560892adb9eb9410a01c522  download/vsftpd.smf_wrapper
-60c736802e2ce00c531953b01e4a26f6  download/vsftpd.userlist
+a2f5b70fe49839b0463c9d90af0f11dd  CSWvsftpd.preinstall
+8944fcd302add66d5b2b287d390b9c91  CSWvsftpd.prototype
+eeaf77528b2da0c7730323838f30b7ef  README.CSW
+281c51282cabd9475cceef363bbc699b  build_options.patch
+1680c237d8aa01a3571b80e426dba7a3  changelog.CSW
+54c1c39c6bfa8747a4457f135fd5bca1  csw_build_system.patch
+a9e994d2b57999b76a0e03503745c01a  csw_paths.patch
+98e1d831801985daf5ce2ed01fbc0efd  cswusergroup
+796d46089f9e9c25c897a34e0dcfadc8  cswvsftpd
+93173edf9931b8eb835c6d0177a7c6bd  cswvsftpd.xml
+73e59f9ada47d3d20199f7c97849fb13  destdir.patch
+a9a65f55cbfd01f9d72d1de25e67148d  set_priv_sep_user.patch
+e4eb190af270ae65d57a84274a38ec31  vsftpd-2.2.0.tar.gz
+f6ce22a6959b93e500a4ae800295c2ee  vsftpd.conf
+0d4a1cf36560892adb9eb9410a01c522  vsftpd.smf_wrapper
+60c736802e2ce00c531953b01e4a26f6  vsftpd.userlist

Modified: csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW	2009-10-10 22:41:57 UTC (rev 6823)
+++ csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW	2009-10-10 22:42:59 UTC (rev 6824)
@@ -1,3 +1,11 @@
+vsftpd (2.2.0,REV=2009.10.10) unstable
+
+  * New upstream version.
+  * Removed no_rlimit_nproc.patch as the same modification has been applied
+  upstream.
+
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 10 Oct 2009 23:37:15 +0200
+
 vsftpd (2.1.2,REV=2009.06.30) unstable
 
   * New upstream version.

Deleted: csw/mgar/pkg/vsftpd/trunk/files/no_rlimit_nproc.patch
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/no_rlimit_nproc.patch	2009-10-10 22:41:57 UTC (rev 6823)
+++ csw/mgar/pkg/vsftpd/trunk/files/no_rlimit_nproc.patch	2009-10-10 22:42:59 UTC (rev 6824)
@@ -1,19 +0,0 @@
-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.