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

chninkel at users.sourceforge.net chninkel at users.sourceforge.net
Tue Aug 31 15:40:18 CEST 2010 

Revision: 10847
          http://gar.svn.sourceforge.net/gar/?rev=10847&view=rev
Author:   chninkel
Date:     2010-08-31 13:40:17 +0000 (Tue, 31 Aug 2010)

Log Message:
-----------
vsftpd: updated to 2.3.2 and switched to GAR dynamic prototype

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

Removed Paths:
-------------
    csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype

Modified: csw/mgar/pkg/vsftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/Makefile	2010-08-31 13:17:30 UTC (rev 10846)
+++ csw/mgar/pkg/vsftpd/trunk/Makefile	2010-08-31 13:40:17 UTC (rev 10847)
@@ -13,7 +13,7 @@
 ###### Package information #######
 
 GARNAME = vsftpd
-GARVERSION = 2.2.2
+GARVERSION = 2.3.2
 CATEGORIES = server
 
 DESCRIPTION = A very secure and fast FTP server.
@@ -31,11 +31,10 @@
 
 RUNTIME_DEP_PKGS  = CSWtcpwrap 
 RUNTIME_DEP_PKGS += CSWosslrt 
-RUNTIME_DEP_PKGS += CSWcswclassutils
 
 # adding configuration handling classes
 # (init/smf classes are dynamically added in checkinstall)
-SPKG_CLASSES = none cswpreserveconf cswusergroup cswinitsmf
+#SPKG_CLASSES = none cswpreserveconf cswusergroup cswinitsmf
 
 
 ###### Upstream and opencsw files information #######
@@ -44,12 +43,16 @@
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += CSWvsftpd.prototype CSWvsftpd.preinstall
+DISTFILES += CSWvsftpd.preinstall
 DISTFILES += changelog.CSW README.CSW
 DISTFILES += vsftpd.conf vsftpd.userlist
 DISTFILES += cswvsftpd cswvsftpd.xml vsftpd.smf_wrapper
 DISTFILES += cswusergroup 
 
+PRESERVECONF = /opt/csw/etc/vsftpd/vsftpd.conf /opt/csw/etc/vsftpd/vsftpd.userlist
+USERGROUP = /opt/csw/etc/pkg/CSWvsftpd/cswusergroup
+INITSMF = /etc/opt/csw/init.d/cswvsftpd
+
 # build options are set by modifying 
 # builddefs.h, so we patch it to enable
 # ssl and tcp wrapper support
@@ -93,6 +96,10 @@
 
 include gar/category.mk
 
+# /opt/csw/include is not take in account 
+# by vsftp build system
+CFLAGS += -I$(includedir)
+
 # dummyinc must be the last include directory
 # to search
 ifeq ($(GARCOMPILER),GNU)
@@ -110,7 +117,6 @@
 	( ginstall -d $(DESTDIR)$(sbindir); \
 	 ginstall -d $(DESTDIR)$(mandir)/man5; \
 	 ginstall -d $(DESTDIR)$(mandir)/man8; \
-	 ln -sf $(DESTDIR)$(mandir) $(DESTDIR)$(prefix)/man; \
 	 ginstall -d $(DESTDIR)$(docdir)/vsftpd )
 
 
@@ -132,3 +138,4 @@
 	done
 	ginstall -D "$(WORKDIR_FIRSTMOD)/changelog.CSW" "$(PKGROOT)$(docdir)/vsftpd/changelog.CSW"
 	ginstall -D "$(WORKDIR_FIRSTMOD)/README.CSW" "$(PKGROOT)$(docdir)/vsftpd/README.CSW"
+

Modified: csw/mgar/pkg/vsftpd/trunk/checksums
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/checksums	2010-08-31 13:17:30 UTC (rev 10846)
+++ csw/mgar/pkg/vsftpd/trunk/checksums	2010-08-31 13:40:17 UTC (rev 10847)
@@ -1,16 +1,15 @@
 a2f5b70fe49839b0463c9d90af0f11dd  CSWvsftpd.preinstall
-8944fcd302add66d5b2b287d390b9c91  CSWvsftpd.prototype
 eeaf77528b2da0c7730323838f30b7ef  README.CSW
 281c51282cabd9475cceef363bbc699b  build_options.patch
-eb30bdbd51e7226289cf9606c318608b  changelog.CSW
+778420c7a9c47afb78eff3957f5d07a5  changelog.CSW
 54c1c39c6bfa8747a4457f135fd5bca1  csw_build_system.patch
 a9e994d2b57999b76a0e03503745c01a  csw_paths.patch
 98e1d831801985daf5ce2ed01fbc0efd  cswusergroup
 796d46089f9e9c25c897a34e0dcfadc8  cswvsftpd
 93173edf9931b8eb835c6d0177a7c6bd  cswvsftpd.xml
-73e59f9ada47d3d20199f7c97849fb13  destdir.patch
+83d13bd15ec4c0de2695640b7407c700  destdir.patch
 a9a65f55cbfd01f9d72d1de25e67148d  set_priv_sep_user.patch
-6d6bc136af14c23f8fef6f1a51f55418  vsftpd-2.2.2.tar.gz
+bad7b117d737a738738836041edc00db  vsftpd-2.3.2.tar.gz
 f6ce22a6959b93e500a4ae800295c2ee  vsftpd.conf
 0d4a1cf36560892adb9eb9410a01c522  vsftpd.smf_wrapper
 60c736802e2ce00c531953b01e4a26f6  vsftpd.userlist

Deleted: csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype	2010-08-31 13:17:30 UTC (rev 10846)
+++ csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype	2010-08-31 13:40:17 UTC (rev 10847)
@@ -1,62 +0,0 @@
-d none /opt/csw/etc/pkg/CSWvsftpd 0755 root bin
-f cswinitsmf /etc/opt/csw/init.d/cswvsftpd 0755 root bin
-d none /opt/csw/etc/vsftpd 0755 root bin
-f cswpreserveconf /opt/csw/etc/vsftpd/vsftpd.conf.CSW 0644 root bin
-f cswpreserveconf /opt/csw/etc/vsftpd/vsftpd.userlist.CSW 0644 root bin
-f cswusergroup /opt/csw/etc/pkg/CSWvsftpd/cswusergroup 0644 root bin
-f none /opt/csw/sbin/vsftpd 0755 root bin
-f none /opt/csw/sbin/vsftpd.smf_wrapper 0755 root bin
-d none /opt/csw/share/doc/vsftpd 0755 root bin
-d none /opt/csw/share/doc/vsftpd/EXAMPLE 0755 root bin
-d none /opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE_NOINETD 0755 root bin
-f none /opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE_NOINETD/README 0644 root bin
-f none /opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf 0644 root bin
-d none /opt/csw/share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS_2 0755 root bin
-f none /opt/csw/share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS_2/README 0644 root bin
-d none /opt/csw/share/doc/vsftpd/EXAMPLE/PER_IP_CONFIG 0755 root bin
-f none /opt/csw/share/doc/vsftpd/EXAMPLE/PER_IP_CONFIG/README 0644 root bin
-f none /opt/csw/share/doc/vsftpd/EXAMPLE/PER_IP_CONFIG/hosts.allow 0644 root bin
-d none /opt/csw/share/doc/vsftpd/EXAMPLE/VIRTUAL_HOSTS 0755 root bin
-f none /opt/csw/share/doc/vsftpd/EXAMPLE/VIRTUAL_HOSTS/README 0644 root bin
-d none /opt/csw/share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS 0755 root bin
-f none /opt/csw/share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS/logins.txt 0644 root bin
-f none /opt/csw/share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS/vsftpd.pam 0644 root bin
-f none /opt/csw/share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS/vsftpd.conf 0644 root bin
-d none /opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE 0755 root bin
-f none /opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE/vsftpd.xinetd 0644 root bin
-f none /opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE/README 0644 root bin
-f none /opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE/vsftpd.conf 0644 root bin
-f none /opt/csw/share/doc/vsftpd/README.CSW 0755 root bin
-f none /opt/csw/share/doc/vsftpd/changelog.CSW 0644 root bin
-f none /opt/csw/share/doc/vsftpd/AUDIT 0644 root bin
-f none /opt/csw/share/doc/vsftpd/BENCHMARKS 0644 root bin
-f none /opt/csw/share/doc/vsftpd/BUGS 0644 root bin
-f none /opt/csw/share/doc/vsftpd/COPYING 0644 root bin
-f none /opt/csw/share/doc/vsftpd/COPYRIGHT 0644 root bin
-f none /opt/csw/share/doc/vsftpd/Changelog 0644 root bin
-f none /opt/csw/share/doc/vsftpd/FAQ 0644 root bin
-f none /opt/csw/share/doc/vsftpd/INSTALL 0644 root bin
-f none /opt/csw/share/doc/vsftpd/LICENSE 0644 root bin
-f none /opt/csw/share/doc/vsftpd/REFS 0644 root bin
-f none /opt/csw/share/doc/vsftpd/REWARD 0644 root bin
-d none /opt/csw/share/doc/vsftpd/SECURITY 0755 root bin
-f none /opt/csw/share/doc/vsftpd/SECURITY/DESIGN 0644 root bin
-f none /opt/csw/share/doc/vsftpd/SECURITY/IMPLEMENTATION 0644 root bin
-f none /opt/csw/share/doc/vsftpd/SECURITY/OVERVIEW 0644 root bin
-f none /opt/csw/share/doc/vsftpd/SECURITY/TRUST 0644 root bin
-f none /opt/csw/share/doc/vsftpd/SIZE 0644 root bin
-f none /opt/csw/share/doc/vsftpd/SPEED 0644 root bin
-f none /opt/csw/share/doc/vsftpd/TODO 0644 root bin
-f none /opt/csw/share/doc/vsftpd/TUNING 0644 root bin
-f none /opt/csw/share/doc/vsftpd/README 0644 root bin
-f none /opt/csw/share/doc/vsftpd/README.ssl 0644 root bin
-f none /opt/csw/share/doc/vsftpd/README.security 0644 root bin
-d none /opt/csw/share/man 0755 root bin
-d none /opt/csw/share/man/man1 0755 root bin
-d none /opt/csw/share/man/man5 0755 root bin
-f none /opt/csw/share/man/man5/vsftpd.conf.5 0644 root bin 
-d none /opt/csw/share/man/man8 0755 root bin
-f none /opt/csw/share/man/man8/vsftpd.8 0644 root bin
-d none /opt/csw/var/empty/vsftpd 0700 root sys
-d none /opt/csw/var/ftp 0755 root sys
-f none /var/opt/csw/svc/manifest/network/cswvsftpd.xml 0644 root sys

Modified: csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW	2010-08-31 13:17:30 UTC (rev 10846)
+++ csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW	2010-08-31 13:40:17 UTC (rev 10847)
@@ -1,3 +1,10 @@
+vsftpd (2.3.2,REV=2010.08.31) unstable
+
+  * New upstream version.
+  * [Build system] Switched to GAR dynamic prototype.
+
+ -- Yann Rouillard <yann at opencsw.org>  Tue, 31 Aug 2010 15:39:11 +0200
+
 vsftpd (2.2.2,REV=2009.12.04) unstable
 
   * New upstream version.

Modified: csw/mgar/pkg/vsftpd/trunk/files/destdir.patch
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/destdir.patch	2010-08-31 13:17:30 UTC (rev 10846)
+++ csw/mgar/pkg/vsftpd/trunk/files/destdir.patch	2010-08-31 13:40:17 UTC (rev 10847)
@@ -14,9 +14,9 @@
 -	if [ -x /usr/local/man ]; then \
 -		$(INSTALL) -m 644 vsftpd.8 /usr/local/man/man8/vsftpd.8; \
 -		$(INSTALL) -m 644 vsftpd.conf.5 /usr/local/man/man5/vsftpd.conf.5; \
-+	if [ -x $(DESTDIR)/$(prefix)/man ]; then \
-+		$(INSTALL) -m 644 vsftpd.8 $(DESTDIR)/$(prefix)/man/man8/vsftpd.8; \
-+		$(INSTALL) -m 644 vsftpd.conf.5 $(DESTDIR)/$(prefix)/man/man5/vsftpd.conf.5; \
++	if [ -x $(DESTDIR)/$(mandir) ]; then \
++		$(INSTALL) -m 644 vsftpd.8 $(DESTDIR)/$(mandir)/man8/vsftpd.8; \
++		$(INSTALL) -m 644 vsftpd.conf.5 $(DESTDIR)/$(mandir)/man5/vsftpd.conf.5; \
  	elif [ -x /usr/share/man ]; then \
  		$(INSTALL) -m 644 vsftpd.8 /usr/share/man/man8/vsftpd.8; \
  		$(INSTALL) -m 644 vsftpd.conf.5 /usr/share/man/man5/vsftpd.conf.5; \


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