[csw-devel] SF.net SVN: gar:[4284] csw/mgar/pkg/vsftpd/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Sun Apr 12 15:26:17 CEST 2009
Revision: 4284
http://gar.svn.sourceforge.net/gar/?rev=4284&view=rev
Author: chninkel
Date: 2009-04-12 13:26:16 +0000 (Sun, 12 Apr 2009)
Log Message:
-----------
vsftpd: switched to cswpreserveconf class
Modified Paths:
--------------
csw/mgar/pkg/vsftpd/trunk/Makefile
csw/mgar/pkg/vsftpd/trunk/checksums
csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.depend
csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype
Removed Paths:
-------------
csw/mgar/pkg/vsftpd/trunk/files/i.conf
csw/mgar/pkg/vsftpd/trunk/files/r.conf
Modified: csw/mgar/pkg/vsftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/Makefile 2009-04-12 13:19:37 UTC (rev 4283)
+++ csw/mgar/pkg/vsftpd/trunk/Makefile 2009-04-12 13:26:16 UTC (rev 4284)
@@ -30,7 +30,7 @@
# adding configuration handling classes
# (init/smf classes are dynamically added in checkinstall)
-SPKG_CLASSES = none conf
+SPKG_CLASSES = none cswpreserveconf
###### Upstream and opencsw files information #######
@@ -43,7 +43,6 @@
DISTFILES += changelog.CSW README.CSW
DISTFILES += vsftpd.conf vsftpd.userlist
DISTFILES += cswvsftpd cswvsftpd.xml svc-cswvsftpd
-DISTFILES += i.conf r.conf
# build options are set by modifying
# builddefs.h, so we patch it to enable
@@ -114,7 +113,7 @@
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"
+ ginstall -D "$(WORKDIR_FIRSTMOD)/vsftpd.userlist" "$(PKGROOT)$(sysconfdir)/vsftpd/vsftpd.userlist.CSW"
merge-doc-files:
for FILE in $(DOCFILES); do \
Modified: csw/mgar/pkg/vsftpd/trunk/checksums
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/checksums 2009-04-12 13:19:37 UTC (rev 4283)
+++ csw/mgar/pkg/vsftpd/trunk/checksums 2009-04-12 13:26:16 UTC (rev 4284)
@@ -1,8 +1,8 @@
314e73654490c2abe742b7ed7be798b1 download/CSWvsftpd.csw_usrgrp_config
-81319e5dd110b08a476c3b31af2fd573 download/CSWvsftpd.depend
+6193a623b66f1132fa0d3e64904ecf15 download/CSWvsftpd.depend
598e429baa86555a44a3da6581a78704 download/CSWvsftpd.gspec
a2f5b70fe49839b0463c9d90af0f11dd download/CSWvsftpd.preinstall
-c3916a9a49d6167fc67c07754d8aa980 download/CSWvsftpd.prototype
+3445fbf0fc7e28cc7f2db827dfbaddb0 download/CSWvsftpd.prototype
eeaf77528b2da0c7730323838f30b7ef download/README.CSW
281c51282cabd9475cceef363bbc699b download/build_options.patch
68178673c7d33baead2d7b97e878ed79 download/changelog.CSW
@@ -11,8 +11,6 @@
8a11892757760e07534a4a455f051e84 download/cswvsftpd
5d093652c802b21dd00a52b2d012d977 download/cswvsftpd.xml
73e59f9ada47d3d20199f7c97849fb13 download/destdir.patch
-9b2ae27f98333b73ff2b16ed98ee896a download/i.conf
-5d9e9fb1a5b6af82ce915f72ebc5e3b7 download/r.conf
a9a65f55cbfd01f9d72d1de25e67148d download/set_priv_sep_user.patch
32905b27a67ac3d4c93a52e10a3a80fd download/svc-cswvsftpd
7890b54e7ffa6106ffbdfda53f47fa41 download/vsftpd-2.1.0.tar.gz
Modified: csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.depend
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.depend 2009-04-12 13:19:37 UTC (rev 4283)
+++ csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.depend 2009-04-12 13:26:16 UTC (rev 4284)
@@ -1,2 +1,3 @@
P CSWtcpwrap tcpwrappers (ipv6.4 patched) lib and tools for pre-screening tcp connections
P CSWosslrt openssl Openssl meta package
+P CSWcswclassutils
Modified: csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype 2009-04-12 13:19:37 UTC (rev 4283)
+++ csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype 2009-04-12 13:26:16 UTC (rev 4284)
@@ -1,8 +1,6 @@
-i i.conf
-i r.conf
d none /opt/csw/etc/vsftpd 0755 root bin
f none /opt/csw/etc/vsftpd/vsftpd.conf.CSW 0755 root bin
-e conf /opt/csw/etc/vsftpd/vsftpd.userlist 0755 root bin
+f cswpreserveconf /opt/csw/etc/vsftpd/vsftpd.userlist.CSW 0755 root bin
f none /opt/csw/sbin/vsftpd 0755 root bin
d none /opt/csw/share/doc/vsftpd 0755 root bin
d none /opt/csw/share/doc/vsftpd/EXAMPLE 0755 root bin
Deleted: csw/mgar/pkg/vsftpd/trunk/files/i.conf
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/i.conf 2009-04-12 13:19:37 UTC (rev 4283)
+++ csw/mgar/pkg/vsftpd/trunk/files/i.conf 2009-04-12 13:26:16 UTC (rev 4284)
@@ -1,54 +0,0 @@
-#
-# Copyright 2006 Yann Rouillard <yann at blastwave.org>
-# All rights reserved. Use is subject to license terms.
-#
-# Redistribution and/or use, with or without modification, is
-# permitted. This code is without warranty of any kind. The
-# author(s) shall not be liable in the event that use of the
-# software causes damage.
-#
-# i.conf - class script which install configuration files
-#
-# If the configuration file already exists on the filesystem,
-# this script will let the existing file intact and will
-# install a copy of the file provided in the package suffixed
-# with .CSW
-# except for service configuration files which are always installed
-# CSW suffixed under Solaris 9 as they are used to enable/disable
-# a service according to blastwave standards.
-#
-umask 0022
-
-if [ -z "$PKG_INSTALL_ROOT" ]; then
- PKG_INSTALL_ROOT=/
-fi
-
-while read SRC DEST; do
- if [ -f "${PKG_INSTALL_ROOT}/$DEST" ]; then
- cp "$SRC" "${PKG_INSTALL_ROOT}/$DEST.CSW"
- else
- cp "$SRC" "${PKG_INSTALL_ROOT}/$DEST"
- fi
-done
-
-# Unfortunately pkgadd doesn't backup the source file if the destination file is identical.
-# It's a problem with zones installation where pkgadd try to find the backup files, so
-# we do the backup manually
-awk '{ if ( $3 == "conf" ) print $2,$3,$4,$5,$6,$7 }' $INST_DATADIR/$PKG/pkgmap | \
- while read FTYPE CLASS FPATH MODE OWNER GROUP; do
- if echo $FPATH | grep "^/" >/dev/null; then
- INST_PATH="$INST_DATADIR/$PKG/root/$FPATH"
- SAVE_PATH="$PKGSAV/pspool/$PKG/root/$FPATH"
- else
- INST_PATH="$INST_DATADIR/$PKG/reloc/$FPATH"
- SAVE_PATH="$PKGSAV/pspool/$PKG/reloc/$FPATH"
- fi
-
- if [ ! -f "$SAVE_PATH" ]; then
- mkdir -p "`LANG=C dirname $SAVE_PATH`"
- cp "$INST_PATH" "$SAVE_PATH"
- fi
- done
-
-exit 0
-
Deleted: csw/mgar/pkg/vsftpd/trunk/files/r.conf
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/r.conf 2009-04-12 13:19:37 UTC (rev 4283)
+++ csw/mgar/pkg/vsftpd/trunk/files/r.conf 2009-04-12 13:26:16 UTC (rev 4284)
@@ -1,21 +0,0 @@
-#
-# Copyright 2006 Yann Rouillard <yann at blastwave.org>
-# All rights reserved. Use is subject to license terms.
-#
-# Redistribution and/or use, with or without modification, is
-# permitted. This code is without warranty of any kind. The
-# author(s) shall not be liable in the event that use of the
-# software causes damage.
-#
-# r.conf - class script which removes configuration files
-#
-# This script doesn't delete config file, only backup ones
-# installed by the package.
-#
-
-while read DEST; do
- if [ -f "$DEST.CSW" ]; then
- rm "$DEST.CSW"
- fi
-done
-
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