[csw-devel] SF.net SVN: gar:[6843] csw/mgar/pkg/syslog_ng/trunk

[wahwah at users.sourceforge.net]

Revision: 6843
          http://gar.svn.sourceforge.net/gar/?rev=6843&view=rev
Author:   wahwah
Date:     2009-10-12 09:12:22 +0000 (Mon, 12 Oct 2009)

Log Message:
-----------
syslog-ng: Removing old .ctl and .persist files from /opt/csw/var.

Modified Paths:
--------------
    csw/mgar/pkg/syslog_ng/trunk/Makefile
    csw/mgar/pkg/syslog_ng/trunk/checksums
    csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall

Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/Makefile	2009-10-12 07:47:40 UTC (rev 6842)
+++ csw/mgar/pkg/syslog_ng/trunk/Makefile	2009-10-12 09:12:22 UTC (rev 6843)
@@ -15,34 +15,17 @@
 DISTFILES += cswsyslog_ng
 DISTFILES += CSWsyslogng.preinstall
 DISTFILES += CSWsyslogng.postremove
-
-CATALOGNAME = syslog_ng
-
-# We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-
 PACKAGES = CSWsyslogng
-
+CATALOGNAME = syslog_ng
 SPKG_SOURCEURL = http://www.balabit.com/network-security/syslog-ng/opensource-logging-system/
+INITSMF = /etc/opt/csw/init\.d/cswsyslog_ng
+SAMPLECONF = /etc/opt/csw/syslog-ng\.conf\.CSW
 
-SPKG_CLASSES = none cswcpsampleconf cswinitsmf
-PROTOTYPE_FILTER  = awk ' \
-    $$$$3 ~ /\/init.d\/cswsyslog_ng$$$$/ { $$$$2 = "cswinitsmf" } \
-    $$$$3 ~ /\/syslog-ng\.conf\.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \
-    { print }'
-
 # shared /opt/csw support:
 localstatedir = /var/opt/csw
 sysconfdir = /etc/opt/csw
 
-PREREQUISITE_PKGS  = CSWeventlog
-PREREQUISITE_PKGS += CSWggettext
-PREREQUISITE_PKGS += CSWglib2
-PREREQUISITE_PKGS += CSWglib2devel
-PREREQUISITE_PKGS += CSWtcpwrap
-PREREQUISITE_PKGS += CSWpkgconfig
-PREREQUISITE_PKGS += CSWgcc4core
-
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-dynamic-linking
 CONFIGURE_ARGS += --enable-spoof-source=no
@@ -57,6 +40,12 @@
 REQUIRED_PKGS += CSWtcpwrap
 REQUIRED_PKGS += CSWcswclassutils
 
+PREREQUISITE_PKGS  = $(REQUIRED_PKGS)
+PREREQUISITE_PKGS += CSWggettext
+PREREQUISITE_PKGS += CSWglib2devel
+PREREQUISITE_PKGS += CSWpkgconfig
+PREREQUISITE_PKGS += CSWgcc4core
+
 GARCOMPILER = GNU
 TEST_SCRIPTS =
 

Modified: csw/mgar/pkg/syslog_ng/trunk/checksums
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/checksums	2009-10-12 07:47:40 UTC (rev 6842)
+++ csw/mgar/pkg/syslog_ng/trunk/checksums	2009-10-12 09:12:22 UTC (rev 6843)
@@ -1,5 +1,5 @@
-91e692a52c4c9668e3bcf8b8816425c3  download/CSWsyslogng.postremove
-7f8beb7c27a9b9ddf0ff1add6a5d4e50  download/CSWsyslogng.preinstall
-fcd5effdaa96da8abf9788bc5745bda3  download/cswsyslog_ng
-69bad95775b98d26e52db8a8292e2790  download/syslog-ng.conf.CSW
-86c39779261545d2289e9c309e262b8d  download/syslog-ng_3.0.4.tar.gz
+91e692a52c4c9668e3bcf8b8816425c3  CSWsyslogng.postremove
+c3da292b828f03158c7227f5b35feb12  CSWsyslogng.preinstall
+fcd5effdaa96da8abf9788bc5745bda3  cswsyslog_ng
+69bad95775b98d26e52db8a8292e2790  syslog-ng.conf.CSW
+86c39779261545d2289e9c309e262b8d  syslog-ng_3.0.4.tar.gz

Modified: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall	2009-10-12 07:47:40 UTC (rev 6842)
+++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall	2009-10-12 09:12:22 UTC (rev 6843)
@@ -4,3 +4,13 @@
   echo "Disabling svc:/system/system-log:default"
   /usr/sbin/svcadm disable svc:/system/system-log:default
 fi
+
+# The assumption is that this script is going to be run from the global zone
+# first. The -f option is for the rm command not to complain if it can't remove
+# the file.
+for f in /opt/csw/var/syslog-ng.{ctl,persist}; do
+  if [ -r "${f}" ];
+    echo "Removing an obsolete file: '${f}'."
+    rm -f "${f}"
+  fi
+done


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