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

[chninkel at users.sourceforge.net]

Revision: 10921
          http://gar.svn.sourceforge.net/gar/?rev=10921&view=rev
Author:   chninkel
Date:     2010-09-03 12:37:36 +0000 (Fri, 03 Sep 2010)

Log Message:
-----------
vsftpd: configuration directory migration from /opt/csw/etc/vsftpd to /etc/opt/csw/vsftpd

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

Modified: csw/mgar/pkg/vsftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/Makefile	2010-09-03 11:50:47 UTC (rev 10920)
+++ csw/mgar/pkg/vsftpd/trunk/Makefile	2010-09-03 12:37:36 UTC (rev 10921)
@@ -32,11 +32,7 @@
 RUNTIME_DEP_PKGS  = CSWtcpwrap 
 RUNTIME_DEP_PKGS += CSWosslrt 
 
-# adding configuration handling classes
-# (init/smf classes are dynamically added in checkinstall)
-#SPKG_CLASSES = none cswpreserveconf cswusergroup cswinitsmf
 
-
 ###### Upstream and opencsw files information #######
 
 # We define upstream file regex so we can be notifed of new upstream software release
@@ -49,10 +45,12 @@
 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
+PRESERVECONF = $(sysconfdir)/vsftpd/vsftpd.conf $(sysconfdir)/vsftpd/vsftpd.userlist
+USERGROUP = /etc/opt/csw/pkg/CSWvsftpd/cswusergroup
 INITSMF = /etc/opt/csw/init.d/cswvsftpd
 
+MIGRATE_FILES = vsftpd
+
 # The vsftpd user home directory has special rights
 PROTOTYPE_MODIFIERS = empty
 PROTOTYPE_FILES_empty = \/opt\/csw\/var\/empty\/vsftpd
@@ -103,6 +101,11 @@
 
 include gar/category.mk
 
+# to support shared /opt/csw setup
+# see http://wiki.opencsw.org/shared-opt-csw-setup
+localstatedir   = /var$(prefix)
+sysconfdir      = /etc$(prefix)
+
 # /opt/csw/include is not take in account 
 # by vsftp build system
 CFLAGS += -I$(includedir)

Modified: csw/mgar/pkg/vsftpd/trunk/checksums
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/checksums	2010-09-03 11:50:47 UTC (rev 10920)
+++ csw/mgar/pkg/vsftpd/trunk/checksums	2010-09-03 12:37:36 UTC (rev 10921)
@@ -1,15 +1 @@
-a2f5b70fe49839b0463c9d90af0f11dd  CSWvsftpd.preinstall
-eeaf77528b2da0c7730323838f30b7ef  README.CSW
-281c51282cabd9475cceef363bbc699b  build_options.patch
-778420c7a9c47afb78eff3957f5d07a5  changelog.CSW
-54c1c39c6bfa8747a4457f135fd5bca1  csw_build_system.patch
-57d1d89d4f4a2b63b71b80e694f05827  csw_paths.patch
-36e99857f4727e99a13721c8f726c856  cswusergroup
-796d46089f9e9c25c897a34e0dcfadc8  cswvsftpd
-93173edf9931b8eb835c6d0177a7c6bd  cswvsftpd.xml
-83d13bd15ec4c0de2695640b7407c700  destdir.patch
-a9a65f55cbfd01f9d72d1de25e67148d  set_priv_sep_user.patch
 bad7b117d737a738738836041edc00db  vsftpd-2.3.2.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	2010-09-03 11:50:47 UTC (rev 10920)
+++ csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW	2010-09-03 12:37:36 UTC (rev 10921)
@@ -1,3 +1,10 @@
+vsftpd (2.3.2,REV=2010.09.03) UNRELEASED
+
+  * Configuration file migration from /opt/csw/etc/vsftpd to
+  /etc/opt/csw/vsftpd.
+
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 03 Sep 2010 14:21:04 +0200
+
 vsftpd (2.3.2,REV=2010.08.31) unstable
 
   * New upstream version.


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