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

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Wed Jul 15 12:52:01 CEST 2009


Revision: 5575
          http://gar.svn.sourceforge.net/gar/?rev=5575&view=rev
Author:   wahwah
Date:     2009-07-15 10:52:01 +0000 (Wed, 15 Jul 2009)

Log Message:
-----------
syslog-ng: ported to mGAR v2

- SMF support via classutils
- dynamic prototype
- dynamic gspec
- dynamic depend file
- automatic disabling of system-log
- configuration file handled by classutils

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
    csw/mgar/pkg/syslog_ng/trunk/files/syslog-ng.conf.CSW

Added Paths:
-----------
    csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove
    csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall

Removed Paths:
-------------
    csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.depend
    csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.gspec
    csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postinstall
    csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.prototype

Property Changed:
----------------
    csw/mgar/pkg/syslog_ng/trunk/


Property changes on: csw/mgar/pkg/syslog_ng/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2

Added: svn:mergeinfo
   + /csw/mgar/pkg/syslog_ng/branches/smf-via-classutils:5096-5574

Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/Makefile	2009-07-14 17:03:06 UTC (rev 5574)
+++ csw/mgar/pkg/syslog_ng/trunk/Makefile	2009-07-15 10:52:01 UTC (rev 5575)
@@ -9,36 +9,57 @@
   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 += $(call admfiles,CSWsyslogng, postinstall depend prototype)
-DISTFILES += syslog-ng.conf.CSW
+DISTFILES += $(GARNAME).conf.CSW
 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
 
-SPKG_SOURCEURL = http://www.balabit.com/network-security/syslog-ng/
-SPKG_CLASSES = none cswinitsmf
+PACKAGES = CSWsyslogng
 
+SPKG_SOURCEURL = http://www.balabit.com/network-security/$(GARNAME)/
+
+SPKG_CLASSES = none cswcpsampleconf cswinitsmf
+PROTOTYPE_FILTER  = awk ' \
+    $$$$3 ~ /\/init.d\/cswsyslog_ng$$$$/ { $$$$2 = "cswinitsmf" } \
+    $$$$3 ~ /\/syslog-ng\.conf\.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \
+    { print }'
+
 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
+CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw
 
+REQUIRED_PKGS  = CSWgcc4corert
+REQUIRED_PKGS += CSWeventlog
+REQUIRED_PKGS += CSWggettextrt
+REQUIRED_PKGS += CSWglib2
+REQUIRED_PKGS += CSWtcpwrap
+REQUIRED_PKGS += CSWcswclassutils
+
 GARCOMPILER = GNU
-#TEST_TARGET = check
 TEST_SCRIPTS =
 
-# adding configuration file
-post-install:
-	ginstall -d $(DESTDIR)$(sysconfdir)
-	ginstall -m 444 $(WORKDIR)/syslog-ng.conf.CSW $(DESTDIR)$(sysconfdir)/syslog-ng.conf.CSW
+post-install-modulated:
+	ginstall -d $(DESTDIR)/etc/opt/csw
+	ginstall -m 444 $(WORKDIR)/$(GARNAME).conf.CSW \
+		$(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW
 	ginstall -d $(DESTDIR)/etc/opt/csw/init.d
-	ginstall -m 755 files/cswsyslog_ng $(DESTDIR)/etc/opt/csw/init.d/cswsyslog_ng
+	ginstall -m 755 $(FILEDIR)/cswsyslog_ng \
+		$(DESTDIR)/etc/opt/csw/init.d/cswsyslog_ng
 
 include gar/category.mk

Modified: csw/mgar/pkg/syslog_ng/trunk/checksums
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/checksums	2009-07-14 17:03:06 UTC (rev 5574)
+++ csw/mgar/pkg/syslog_ng/trunk/checksums	2009-07-15 10:52:01 UTC (rev 5575)
@@ -1,7 +1,5 @@
+2204f69bd703115748073e99297e5083  download/CSWsyslogng.postremove
+b4b01531e2de07e6e4231afc4079a168  download/CSWsyslogng.preinstall
+fd0f7ccdc627d08a00a2e57fdbfd51d8  download/cswsyslog_ng
+69bad95775b98d26e52db8a8292e2790  download/syslog-ng.conf.CSW
 e5ca55796c11899739affa417ff8a71e  download/syslog-ng_2.0.10.tar.gz
-6726e851fa8e6e6658584faaeaa6716d  download/CSWsyslogng.gspec
-3de835dbfde225227a1ed36f548e1d34  download/CSWsyslogng.postinstall
-479df38d9a0e3a31422cea79b287412b  download/CSWsyslogng.depend
-d906b84aa704d887fc98179d49dd5db2  download/CSWsyslogng.prototype
-ae942a41cbdc6fb0f8a4438d7f5a00d5  download/syslog-ng.conf.CSW
-168ce024423e8dbee8c1597d8a1ef3ef  download/cswsyslog_ng

Deleted: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.depend
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.depend	2009-07-14 17:03:06 UTC (rev 5574)
+++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.depend	2009-07-15 10:52:01 UTC (rev 5575)
@@ -1,6 +0,0 @@
-P	CSWcommon
-P	CSWcswclassutils
-P	CSWeventlog
-P	CSWggettextrt
-P	CSWglib2
-P	CSWtcpwrap

Deleted: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.gspec
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.gspec	2009-07-14 17:03:06 UTC (rev 5574)
+++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.gspec	2009-07-15 10:52:01 UTC (rev 5575)
@@ -1,5 +0,0 @@
-%var            bitname syslog_ng
-%var            pkgname CSWsyslogng
-%var		SERVICE_CONF_FILES /opt/csw/etc/syslog-ng.conf
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/COPYING

Deleted: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postinstall
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postinstall	2009-07-14 17:03:06 UTC (rev 5574)
+++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postinstall	2009-07-15 10:52:01 UTC (rev 5575)
@@ -1,3 +0,0 @@
-if [ ! -f $BASEDIR/opt/csw/etc/syslog-ng.conf ] ; then
-        cp $BASEDIR/opt/csw/etc/syslog-ng.conf.CSW $BASEDIR/opt/csw/etc/syslog-ng.conf
-fi

Copied: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove (from rev 5574, csw/mgar/pkg/syslog_ng/branches/smf-via-classutils/files/CSWsyslogng.postremove)
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove	                        (rev 0)
+++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove	2009-07-15 10:52:01 UTC (rev 5575)
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo "Enabling svc:/system/system-log:default"
+svcadm enable svc:/system/system-log:default

Copied: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall (from rev 5574, csw/mgar/pkg/syslog_ng/branches/smf-via-classutils/files/CSWsyslogng.preinstall)
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall	                        (rev 0)
+++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall	2009-07-15 10:52:01 UTC (rev 5575)
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo "Disabling svc:/system/system-log:default"
+svcadm disable svc:/system/system-log:default

Deleted: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.prototype
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.prototype	2009-07-14 17:03:06 UTC (rev 5574)
+++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.prototype	2009-07-15 10:52:01 UTC (rev 5575)
@@ -1,13 +0,0 @@
-d none /opt/csw/bin 0755 root bin
-f none /opt/csw/bin/loggen 0755 root bin
-d none /opt/csw/etc 0755 root bin
-f none /opt/csw/etc/syslog-ng.conf.CSW 0444 root bin
-d none /opt/csw/sbin 0755 root bin
-f none /opt/csw/sbin/syslog-ng 0755 root bin
-d none /opt/csw/share 0755 root bin
-d none /opt/csw/share/man 0755 root bin
-d none /opt/csw/share/man/man5 0755 root bin
-f none /opt/csw/share/man/man5/syslog-ng.conf.5 0644 root bin
-d none /opt/csw/share/man/man8 0755 root bin
-f none /opt/csw/share/man/man8/syslog-ng.8 0644 root bin
-f cswinitsmf /etc/opt/csw/init.d/cswsyslog_ng 0755 root bin

Modified: csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng	2009-07-14 17:03:06 UTC (rev 5574)
+++ csw/mgar/pkg/syslog_ng/trunk/files/cswsyslog_ng	2009-07-15 10:52:01 UTC (rev 5575)
@@ -9,11 +9,11 @@
 # changes for OpenCSW by Ihsan Dogan, 10. November 2008
 
 DAEMON=/opt/csw/sbin/syslog-ng
-OPTIONS="-f /opt/csw/etc/syslog-ng.conf"
+OPTIONS="-f /etc/opt/csw/syslog-ng.conf"
 
 case "$1" in
 	start)
-	        if [ -f /opt/csw/etc/syslog-ng.conf -a -f /opt/csw/sbin/syslog-ng ]; then
+	        if [ -f /etc/opt/csw/syslog-ng.conf -a -f /opt/csw/sbin/syslog-ng ]; then
 	                echo 'syslog-ng service starting.'
 	                #
 	                # Before syslog-ng starts, save any messages from previous

Modified: csw/mgar/pkg/syslog_ng/trunk/files/syslog-ng.conf.CSW
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/files/syslog-ng.conf.CSW	2009-07-14 17:03:06 UTC (rev 5574)
+++ csw/mgar/pkg/syslog_ng/trunk/files/syslog-ng.conf.CSW	2009-07-15 10:52:01 UTC (rev 5575)
@@ -29,7 +29,7 @@
 
 filter f_filter1   { level(err) or
 		     (level(notice) and facility (auth, kern)); };
-filter f_filter2   { level(err) or
+filter f_filter2   { level(info) or
                      (facility(kern) and level(notice)) or
                      (facility(daemon) and level(notice)) or
                      (facility(mail) and level(crit)); };


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