[csw-devel] SF.net SVN: gar:[5215] csw/mgar/pkg/vsftpd/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Tue Jun 9 21:57:50 CEST 2009
Revision: 5215
http://gar.svn.sourceforge.net/gar/?rev=5215&view=rev
Author: chninkel
Date: 2009-06-09 19:57:49 +0000 (Tue, 09 Jun 2009)
Log Message:
-----------
vsftpd: updated to 2.1.1
Modified Paths:
--------------
csw/mgar/pkg/vsftpd/trunk/Makefile
csw/mgar/pkg/vsftpd/trunk/checksums
csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype
csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW
csw/mgar/pkg/vsftpd/trunk/files/cswvsftpd.xml
Modified: csw/mgar/pkg/vsftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/Makefile 2009-06-09 18:44:02 UTC (rev 5214)
+++ csw/mgar/pkg/vsftpd/trunk/Makefile 2009-06-09 19:57:49 UTC (rev 5215)
@@ -13,7 +13,7 @@
###### Package information #######
GARNAME = vsftpd
-GARVERSION = 2.1.0
+GARVERSION = 2.1.1
CATEGORIES = server
DESCRIPTION = A very secure and fast FTP server.
@@ -35,7 +35,7 @@
# adding configuration handling classes
# (init/smf classes are dynamically added in checkinstall)
-SPKG_CLASSES = none cswpreserveconf cswusergroup
+SPKG_CLASSES = none cswpreserveconf cswusergroup cswinitsmf
###### Upstream and opencsw files information #######
@@ -47,7 +47,7 @@
DISTFILES += CSWvsftpd.prototype CSWvsftpd.preinstall
DISTFILES += changelog.CSW README.CSW
DISTFILES += vsftpd.conf vsftpd.userlist
-DISTFILES += cswvsftpd cswvsftpd.xml svc-cswvsftpd
+DISTFILES += cswvsftpd
DISTFILES += cswusergroup
# build options are set by modifying
@@ -82,12 +82,6 @@
DOCFILES += EXAMPLE/INTERNET_SITE_NOINETD/README EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf
-# little hack to be able to still use old smf support with gar v2
-# until openssh is migrated to cswclassutils init system
-DISTFILES += vsftpd_dyngspec.fakespec
-_CATEGORY_GSPEC_INCLUDE = ../../$(DOWNLOADDIR)/vsftpd_dyngspec.fakespec
-
-
##### Build and installation information #####
GARCOMPILER = SUN
@@ -120,8 +114,11 @@
ginstall -d $(DESTDIR)$(docdir)/vsftpd )
-post-merge: merge-doc-files merge-config-files
+post-merge: merge-doc-files merge-config-files merge-init-file
+merge-init-file:
+ ginstall -D "$(WORKDIR_FIRSTMOD)/cswvsftpd" "$(PKGROOT)/etc/init.d/cswvsftpd"
+
merge-config-files:
ginstall -D "$(WORKDIR_FIRSTMOD)/vsftpd.conf" "$(PKGROOT)$(sysconfdir)/vsftpd/vsftpd.conf.CSW"
ginstall -D "$(WORKDIR_FIRSTMOD)/vsftpd.userlist" "$(PKGROOT)$(sysconfdir)/vsftpd/vsftpd.userlist.CSW"
Modified: csw/mgar/pkg/vsftpd/trunk/checksums
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/checksums 2009-06-09 18:44:02 UTC (rev 5214)
+++ csw/mgar/pkg/vsftpd/trunk/checksums 2009-06-09 19:57:49 UTC (rev 5215)
@@ -1,17 +1,14 @@
a2f5b70fe49839b0463c9d90af0f11dd download/CSWvsftpd.preinstall
-accf66084b40cc8ea89037f1cc351833 download/CSWvsftpd.prototype
+2cc88ffd0b8be226f3977b9105701159 download/CSWvsftpd.prototype
eeaf77528b2da0c7730323838f30b7ef download/README.CSW
281c51282cabd9475cceef363bbc699b download/build_options.patch
-68178673c7d33baead2d7b97e878ed79 download/changelog.CSW
+dfb43f73fcf859af22510af9600a954e download/changelog.CSW
54c1c39c6bfa8747a4457f135fd5bca1 download/csw_build_system.patch
a9e994d2b57999b76a0e03503745c01a download/csw_paths.patch
98e1d831801985daf5ce2ed01fbc0efd download/cswusergroup
8a11892757760e07534a4a455f051e84 download/cswvsftpd
-5d093652c802b21dd00a52b2d012d977 download/cswvsftpd.xml
73e59f9ada47d3d20199f7c97849fb13 download/destdir.patch
a9a65f55cbfd01f9d72d1de25e67148d download/set_priv_sep_user.patch
-32905b27a67ac3d4c93a52e10a3a80fd download/svc-cswvsftpd
-7890b54e7ffa6106ffbdfda53f47fa41 download/vsftpd-2.1.0.tar.gz
+b1fab0e6212738f9f3572e067c419778 download/vsftpd-2.1.1.tar.gz
f6ce22a6959b93e500a4ae800295c2ee download/vsftpd.conf
60c736802e2ce00c531953b01e4a26f6 download/vsftpd.userlist
-372d9e524d45e1b62578ef3361c8524c download/vsftpd_dyngspec.fakespec
Modified: csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype 2009-06-09 18:44:02 UTC (rev 5214)
+++ csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype 2009-06-09 19:57:49 UTC (rev 5215)
@@ -1,3 +1,5 @@
+d none /opt/csw/etc/pkg/CSWvsftpd 0755 root bin
+f cswinitsmf /etc/init.d/cswvsftpd 0755 root bin
d none /opt/csw/etc/vsftpd 0755 root bin
f none /opt/csw/etc/vsftpd/vsftpd.conf.CSW 0644 root bin
f cswpreserveconf /opt/csw/etc/vsftpd/vsftpd.userlist.CSW 0644 root bin
Modified: csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2009-06-09 18:44:02 UTC (rev 5214)
+++ csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2009-06-09 19:57:49 UTC (rev 5215)
@@ -1,3 +1,9 @@
+vsftpd (2.1.1,REV=2009.05.28) unstable
+
+ * New upstream version.
+
+ -- Yann Rouillard <yann at opencsw.org> Thu, 28 May 2009 23:57:00 +0200
+
vsftpd (2.1.0,REV=2009.03.21) unstable
* New upstream version.
Modified: csw/mgar/pkg/vsftpd/trunk/files/cswvsftpd.xml
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/cswvsftpd.xml 2009-06-09 18:44:02 UTC (rev 5214)
+++ csw/mgar/pkg/vsftpd/trunk/files/cswvsftpd.xml 2009-06-09 19:57:49 UTC (rev 5215)
@@ -52,23 +52,17 @@
<exec_method
type='method'
name='start'
- exec='/opt/csw/lib/svc/method/svc-cswvsftpd start'
+ exec='/opt/csw/sbin/vsftpd'
timeout_seconds='-1'>
</exec_method>
<exec_method
type='method'
name='stop'
- exec='/opt/csw/lib/svc/method/svc-cswvsftpd stop'
+ exec=':kill'
timeout_seconds='-1'>
</exec_method>
- <exec_method
- type='method'
- name='restart'
- exec='/opt/csw/lib/svc/method/svc-cswvsftpd restart'
- timeout_seconds='-1'>
- </exec_method>
</instance>
<template>
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