[csw-devel] SF.net SVN: gar:[7132] csw/mgar/pkg/openssl/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Thu Nov 5 19:17:23 CET 2009
Revision: 7132
http://gar.svn.sourceforge.net/gar/?rev=7132&view=rev
Author: chninkel
Date: 2009-11-05 18:17:23 +0000 (Thu, 05 Nov 2009)
Log Message:
-----------
openssl: switched to cswpreserveconf for configuration file handling
Modified Paths:
--------------
csw/mgar/pkg/openssl/trunk/Makefile
csw/mgar/pkg/openssl/trunk/checksums
csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype
Removed Paths:
-------------
csw/mgar/pkg/openssl/trunk/files/i.conf
csw/mgar/pkg/openssl/trunk/files/r.conf
Modified: csw/mgar/pkg/openssl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl/trunk/Makefile 2009-11-05 18:02:46 UTC (rev 7131)
+++ csw/mgar/pkg/openssl/trunk/Makefile 2009-11-05 18:17:23 UTC (rev 7132)
@@ -43,7 +43,7 @@
SPKG_DESC_CSWosslutils = Openssl binaries and related tools
CATALOGNAME_CSWosslutils = openssl_utils
REQUIRED_PKGS_CSWosslutils = CSWosslrt
-SPKG_CLASSES_CSWosslutils = none conf
+SPKG_CLASSES_CSWosslutils = none cswpreserveconf
###### Upstream and opencsw files information #######
@@ -60,7 +60,6 @@
DISTFILES += CSWossldevel.prototype-i386 CSWossldevel.prototype-sparc
DISTFILES += CSWosslutils.prototype
DISTFILES += changelog.CSW README.CSW
-DISTFILES += i.conf r.conf
DOCFILES = CHANGES CHANGES.SSLeay PROBLEMS README FAQ README.ASN1 INSTALL NEWS README.ENGINE
@@ -164,7 +163,7 @@
install-certs:
[ -f $(PKGROOT)$(prefix)/ssl/openssl.cnf ] && \
- ginstall -D $(PKGROOT)$(prefix)/ssl/openssl.cnf $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf
+ ginstall -D $(PKGROOT)$(prefix)/ssl/openssl.cnf $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf.CSW
install-oldlibs: $(addprefix install-oldlibs-,$(OLDLIBS))
install-oldlibs-%:
Modified: csw/mgar/pkg/openssl/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssl/trunk/checksums 2009-11-05 18:02:46 UTC (rev 7131)
+++ csw/mgar/pkg/openssl/trunk/checksums 2009-11-05 18:17:23 UTC (rev 7132)
@@ -1,23 +1,13 @@
-e555c6d58d276aec7fdc53363e338ab3 download/openssl-0.9.8k.tar.gz
-b5ded4412606a0996595015bc2ff6974 download/CSWossl.gspec
-05b45e7124833dee48e5f3c45591e95b download/CSWossl.depend
-bd9bb4dfb9602fba461b21fa37f97765 download/CSWossl.prototype
-83480e01971e71d037bd44fa5ed4e4e5 download/CSWosslrt.gspec
-05ace5330714d6cd9c0e076b6ae2518f download/CSWosslrt.checkinstall
-c9de908daad1a31fca20329cb043ad3c download/CSWosslrt.preinstall
-1c3f600eaf942a18ecab3637e1fc32bd download/CSWosslrt.postinstall
-cbf34987267073fb1f60bff86492dd8b download/CSWosslrt.depend
-463d53d6fcab5f33e2e204a831d47ccc download/CSWosslrt.prototype-i386
-ec547e9a56e0933a928fd9d505c19333 download/CSWosslrt.prototype-sparc
-2ac43ebf4689d236540e22171541be4e download/CSWossldevel.gspec
-37995caa7f4155066b00fb7503e853da download/CSWossldevel.depend
-da3116a1d8dfd2bd3e4f2a11f4fb5f8b download/CSWossldevel.prototype-i386
-bd40fcb60dfef960da30c718b718149d download/CSWossldevel.prototype-sparc
-eec77249fb642c525cad67dcd055fb77 download/CSWosslutils.gspec
-37995caa7f4155066b00fb7503e853da download/CSWosslutils.depend
-a441995e4e3c95497e77aa613d2c673c download/CSWosslutils.prototype
-904ceefa66b6b7b7e93ae0e9bc58bac8 download/changelog.CSW
-b78faa440d6f6a2a07663de331678648 download/README.CSW
-7fdc09cd3c11db459c83c8946f7872f6 download/i.conf
-a454ac09091085813ec8900f5a0c917c download/r.conf
-64f7c3f3a6cae483209b69c31c82557d download/openssl.0.9.8.patch
+bd9bb4dfb9602fba461b21fa37f97765 CSWossl.prototype
+da3116a1d8dfd2bd3e4f2a11f4fb5f8b CSWossldevel.prototype-i386
+bd40fcb60dfef960da30c718b718149d CSWossldevel.prototype-sparc
+05ace5330714d6cd9c0e076b6ae2518f CSWosslrt.checkinstall
+1c3f600eaf942a18ecab3637e1fc32bd CSWosslrt.postinstall
+c9de908daad1a31fca20329cb043ad3c CSWosslrt.preinstall
+463d53d6fcab5f33e2e204a831d47ccc CSWosslrt.prototype-i386
+ec547e9a56e0933a928fd9d505c19333 CSWosslrt.prototype-sparc
+89ccb44272d2a4eb33fd4086c3348f3e CSWosslutils.prototype
+b78faa440d6f6a2a07663de331678648 README.CSW
+904ceefa66b6b7b7e93ae0e9bc58bac8 changelog.CSW
+e555c6d58d276aec7fdc53363e338ab3 openssl-0.9.8k.tar.gz
+64f7c3f3a6cae483209b69c31c82557d openssl.0.9.8.patch
Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype 2009-11-05 18:02:46 UTC (rev 7131)
+++ csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype 2009-11-05 18:17:23 UTC (rev 7132)
@@ -62,7 +62,7 @@
f none /opt/csw/ssl/misc/c_name 0755 root bin
s none /opt/csw/ssl/openssl.cnf=/opt/csw/etc/ssl/openssl.cnf 0644 root bin
d none /opt/csw/etc/ssl 0755 root bin
-e conf /opt/csw/etc/ssl/openssl.cnf 0644 root bin
+f cswpreserveconf /opt/csw/etc/ssl/openssl.cnf.CSW 0644 root bin
f none /opt/csw/share/doc/openssl_utils/changelog.CSW=changelog.CSW 644 root bin
f none /opt/csw/share/doc/openssl_utils/CHANGES=CHANGES 644 root bin
f none /opt/csw/share/doc/openssl_utils/CHANGES.SSLeay=CHANGES 644 root bin
Deleted: csw/mgar/pkg/openssl/trunk/files/i.conf
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/i.conf 2009-11-05 18:02:46 UTC (rev 7131)
+++ csw/mgar/pkg/openssl/trunk/files/i.conf 2009-11-05 18:17:23 UTC (rev 7132)
@@ -1,54 +0,0 @@
-#
-# Copyright 2006 Yann Rouillard <yann at opencsw.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 opencsw 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/openssl/trunk/files/r.conf
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/r.conf 2009-11-05 18:02:46 UTC (rev 7131)
+++ csw/mgar/pkg/openssl/trunk/files/r.conf 2009-11-05 18:17:23 UTC (rev 7132)
@@ -1,21 +0,0 @@
-#
-# Copyright 2006 Yann Rouillard <yann at opencsw.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