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

[wahwah at users.sourceforge.net]

Revision: 6798
          http://gar.svn.sourceforge.net/gar/?rev=6798&view=rev
Author:   wahwah
Date:     2009-10-08 22:16:48 +0000 (Thu, 08 Oct 2009)

Log Message:
-----------
syslog-ng: Making it use localstatedir, http://www.opencsw.org/bugtrack/view.php?id=3945

Modified Paths:
--------------
    csw/mgar/pkg/syslog_ng/trunk/Makefile
    csw/mgar/pkg/syslog_ng/trunk/checksums
    csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng

Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/Makefile	2009-10-08 21:10:29 UTC (rev 6797)
+++ csw/mgar/pkg/syslog_ng/trunk/Makefile	2009-10-08 22:16:48 UTC (rev 6798)
@@ -9,7 +9,7 @@
   logs using TCP.
 endef
 
-MASTER_SITES = http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$(GARVERSION)/source/
+MASTER_SITES = http://www.balabit.com/downloads/files/$(GARNAME)/open-source-edition/$(GARVERSION)/source/
 DISTFILES  = $(GARNAME)_$(GARVERSION).tar.gz
 DISTFILES += $(GARNAME).conf.CSW
 DISTFILES += cswsyslog_ng
@@ -31,6 +31,10 @@
     $$$$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
@@ -42,7 +46,6 @@
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-dynamic-linking
 CONFIGURE_ARGS += --enable-spoof-source=no
-CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw
 
 REQUIRED_PKGS  = CSWgcc4corert
 REQUIRED_PKGS += CSWeventlog
@@ -64,6 +67,7 @@
 	ginstall -d $(DESTDIR)/etc/opt/csw/init.d
 	ginstall -m 755 $(FILEDIR)/cswsyslog_ng \
 		$(DESTDIR)/etc/opt/csw/init.d/cswsyslog_ng
-	$(MAKECOOKIE)
+	ginstall -m 755 -d $(DESTDIR)$(localstatedir)/run
+	@$(MAKECOOKIE)
 
 include gar/category.mk

Modified: csw/mgar/pkg/syslog_ng/trunk/checksums
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/checksums	2009-10-08 21:10:29 UTC (rev 6797)
+++ csw/mgar/pkg/syslog_ng/trunk/checksums	2009-10-08 22:16:48 UTC (rev 6798)
@@ -1,5 +1,5 @@
 91e692a52c4c9668e3bcf8b8816425c3  download/CSWsyslogng.postremove
 7f8beb7c27a9b9ddf0ff1add6a5d4e50  download/CSWsyslogng.preinstall
-fd0f7ccdc627d08a00a2e57fdbfd51d8  download/cswsyslog_ng
+efa7aa43448b8a3014a10b2056382379  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/cswsyslog_ng
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng	2009-10-08 21:10:29 UTC (rev 6797)
+++ csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng	2009-10-08 22:16:48 UTC (rev 6798)
@@ -10,12 +10,16 @@
 # changes for OpenCSW by Ihsan Dogan, 10. November 2008
 # changes for zone support by Maciej Blizinski, 2009-07-15.
 
+localstatedir=/var/opt/csw
+sysconfdir=/etc/opt/csw
 DAEMON=/opt/csw/sbin/syslog-ng
-OPTIONS="-f /etc/opt/csw/syslog-ng.conf"
+CONFIG_FILE="${sysconfdir}/syslog-ng.conf"
+PID_FILE="${localstatedir}/run"
+OPTIONS="-f ${CONFIG_FILE}"
 
 case "$1" in
   start)
-    if [ -f /etc/opt/csw/syslog-ng.conf -a -f /opt/csw/sbin/syslog-ng ]; then
+    if [ -f "${CONFIG_FILE}" -a -f "${DAEMON}" ]; then
       echo 'syslog-ng service starting.'
       #
       # Before syslog-ng starts, save any messages from previous
@@ -27,14 +31,14 @@
         [ "x$DUMPADM_DEVICE" != xswap ] && \
             /usr/bin/savecore -m -f $DUMPADM_DEVICE
       fi
-      $DAEMON $OPTIONS -p /var/run/syslog-ng.pid
+      $DAEMON $OPTIONS -p ${PID_FILE}
     fi
     ;;
 
   stop)
-    if [ -f /var/run/syslog-ng.pid ]; then
-      syspid=`/usr/bin/cat /var/run/syslog-ng.pid`
-      [ "$syspid" -gt 0 ] && kill -15 $syspid && rm /var/run/syslog-ng.pid
+    if [ -f ${PID_FILE} ]; then
+      syspid=`/usr/bin/cat ${PID_FILE}`
+      [ "$syspid" -gt 0 ] && kill -15 $syspid && rm ${PID_FILE}
     fi
     ;;
   *)


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