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

[wahwah at users.sourceforge.net]

Revision: 6112
          http://gar.svn.sourceforge.net/gar/?rev=6112&view=rev
Author:   wahwah
Date:     2009-08-25 13:18:23 +0000 (Tue, 25 Aug 2009)

Log Message:
-----------
syslog-ng: testing for the presence of svcadm instead of assuming it's there, fixed download path, added makecookie to the postinstall target

Modified Paths:
--------------
    csw/mgar/pkg/syslog_ng/trunk/Makefile
    csw/mgar/pkg/syslog_ng/trunk/checksums
    csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove
    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-08-25 13:18:13 UTC (rev 6111)
+++ csw/mgar/pkg/syslog_ng/trunk/Makefile	2009-08-25 13:18:23 UTC (rev 6112)
@@ -9,7 +9,7 @@
   logs using TCP.
 endef
 
-MASTER_SITES = http://www.balabit.com/network-security/syslog-ng/opensource-logging-system/
+MASTER_SITES = http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$(GARVERSION)/source/
 DISTFILES  = $(GARNAME)_$(GARVERSION).tar.gz
 DISTFILES += $(GARNAME).conf.CSW
 DISTFILES += cswsyslog_ng
@@ -23,7 +23,7 @@
 
 PACKAGES = CSWsyslogng
 
-SPKG_SOURCEURL = http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$(GARVERSION)/source/
+SPKG_SOURCEURL = http://www.balabit.com/network-security/syslog-ng/opensource-logging-system/
 
 SPKG_CLASSES = none cswcpsampleconf cswinitsmf
 PROTOTYPE_FILTER  = awk ' \
@@ -64,5 +64,6 @@
 	ginstall -d $(DESTDIR)/etc/opt/csw/init.d
 	ginstall -m 755 $(FILEDIR)/cswsyslog_ng \
 		$(DESTDIR)/etc/opt/csw/init.d/cswsyslog_ng
+	$(MAKECOOKIE)
 
 include gar/category.mk

Modified: csw/mgar/pkg/syslog_ng/trunk/checksums
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/checksums	2009-08-25 13:18:13 UTC (rev 6111)
+++ csw/mgar/pkg/syslog_ng/trunk/checksums	2009-08-25 13:18:23 UTC (rev 6112)
@@ -1,5 +1,5 @@
-2204f69bd703115748073e99297e5083  download/CSWsyslogng.postremove
-b4b01531e2de07e6e4231afc4079a168  download/CSWsyslogng.preinstall
+5189766b79c5ada82fcddda76f1d8d01  download/CSWsyslogng.postremove
+c714cbd4360ac0af8495697de2001c41  download/CSWsyslogng.preinstall
 fd0f7ccdc627d08a00a2e57fdbfd51d8  download/cswsyslog_ng
 69bad95775b98d26e52db8a8292e2790  download/syslog-ng.conf.CSW
 86c39779261545d2289e9c309e262b8d  download/syslog-ng_3.0.4.tar.gz

Modified: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove	2009-08-25 13:18:13 UTC (rev 6111)
+++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove	2009-08-25 13:18:23 UTC (rev 6112)
@@ -1,4 +1,6 @@
 #!/bin/sh
 
-echo "Enabling svc:/system/system-log:default"
-svcadm enable svc:/system/system-log:default
+if [ -e /usr/sbin/svcadm ]; then
+  echo "Enabling svc:/system/system-log:default"
+  /usr/sbin/svcadm enable svc:/system/system-log:default
+fi

Modified: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall	2009-08-25 13:18:13 UTC (rev 6111)
+++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall	2009-08-25 13:18:23 UTC (rev 6112)
@@ -1,4 +1,6 @@
 #!/bin/sh
 
-echo "Disabling svc:/system/system-log:default"
-svcadm disable svc:/system/system-log:default
+if [ -e /usr/sbin/svcadm ]; then
+  echo "Disabling svc:/system/system-log:default"
+  /usr/sbin/svcadm disable svc:/system/system-log:default
+fi


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