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

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Mon Jun 13 10:13:27 CEST 2011


Revision: 14800
          http://gar.svn.sourceforge.net/gar/?rev=14800&view=rev
Author:   wahwah
Date:     2011-06-13 08:13:27 +0000 (Mon, 13 Jun 2011)

Log Message:
-----------
pkg/syslog_ng/trunk: Upgrade, not splitting libraries

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

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

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

Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/Makefile	2011-06-13 06:57:09 UTC (rev 14799)
+++ csw/mgar/pkg/syslog_ng/trunk/Makefile	2011-06-13 08:13:27 UTC (rev 14800)
@@ -1,5 +1,7 @@
+# $Id$
+
 NAME = syslog-ng
-VERSION = 3.0.5
+VERSION = 3.2.4
 CATEGORIES = server
 
 DESCRIPTION = A powerful syslogd replacement
@@ -15,13 +17,13 @@
 DISTFILES += cswsyslog_ng
 DISTFILES += CSWsyslogng.preinstall
 DISTFILES += CSWsyslogng.postremove
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-PACKAGES = CSWsyslogng
-CATALOGNAME = syslog_ng
+DISTFILES += CSWsyslogng.cswreleasenotes
+
 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
 
+
 # shared /opt/csw support:
 localstatedir = /var/opt/csw
 sysconfdir = /etc/opt/csw
@@ -31,27 +33,41 @@
 CONFIGURE_ARGS += --enable-spoof-source=no
 CONFIGURE_ARGS += --enable-tcp-wrapper
 
-RUNTIME_DEP_PKGS += CSWeventlog
-RUNTIME_DEP_PKGS += CSWosslrt
-RUNTIME_DEP_PKGS += CSWzlib
-RUNTIME_DEP_PKGS += CSWpcrert
-RUNTIME_DEP_PKGS += CSWggettextrt
-RUNTIME_DEP_PKGS += CSWglib2
-RUNTIME_DEP_PKGS += CSWtcpwrap
+GARCOMPILER = GNU
+TEST_SCRIPTS =
 
+# The configure script finds -lwrap but doesn't actually use it.
+# We need to be more pushy.
+EXTRA_LDFLAGS = -L/opt/csw/lib -lwrap -lsocket
+
+PACKAGES = CSWsyslogng
+SPKG_DESC_CSWsyslogng = $(DESCRIPTION)
+CATALOGNAME_CSWsyslogng = syslog_ng
+RUNTIME_DEP_PKGS_CSWsyslogng += CSWgcc4corert
+RUNTIME_DEP_PKGS_CSWsyslogng += CSWglib2
+RUNTIME_DEP_PKGS_CSWsyslogng += CSWlibevtlog0
+RUNTIME_DEP_PKGS_CSWsyslogng += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWsyslogng += CSWlibpcre0
+RUNTIME_DEP_PKGS_CSWsyslogng += CSWosslrt
+RUNTIME_DEP_PKGS_CSWsyslogng += CSWtcpwrap
+
 BUILD_DEP_PKGS  = $(RUNTIME_DEP_PKGS)
+BUILD_DEP_PKGS += CSWgcc4core
 BUILD_DEP_PKGS += CSWggettext
 BUILD_DEP_PKGS += CSWglib2devel
 BUILD_DEP_PKGS += CSWpkgconfig
-BUILD_DEP_PKGS += CSWgcc4core
 
-GARCOMPILER = GNU
-TEST_SCRIPTS =
+CHECKPKG_OVERRIDES_CSWsyslogng-dev += catalogname-does-not-match-pkgname|pkgname=CSWsyslogng-dev|catalogname=syslog_ng_dev|expected-catalogname=syslogng_dev
+CHECKPKG_OVERRIDES_CSWsyslogng += catalogname-does-not-match-pkgname|pkgname=CSWsyslogng|catalogname=syslog_ng|expected-catalogname=syslogng
 
-# The configure script finds -lwrap but doesn't actually use it.
-# We need to be more pushy.
-EXTRA_LDFLAGS = -L/opt/csw/lib -lwrap -lsocket
+# A reference to /usr/share/lib/zoneinfo
+CHECKPKG_OVERRIDES_CSWsyslogng += file-with-bad-content|/usr/share|root/opt/csw/lib/libsyslog-ng.so.0.0.0
 
+# Not splitting the syslog-ng libraries.  There are no known packages linking
+# to syslog's shared objects.
+CHECKPKG_OVERRIDES_CSWsyslogng += shared-lib-package-contains-so-symlink
+CHECKPKG_OVERRIDES_CSWsyslogng += shared-lib-pkgname-mismatch
+
 post-install-modulated:
 	ginstall -d $(DESTDIR)/etc/opt/csw
 	ginstall -m 444 $(WORKDIR)/$(NAME).conf.CSW \


Property changes on: csw/mgar/pkg/syslog_ng/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: csw/mgar/pkg/syslog_ng/trunk/checksums
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/checksums	2011-06-13 06:57:09 UTC (rev 14799)
+++ csw/mgar/pkg/syslog_ng/trunk/checksums	2011-06-13 08:13:27 UTC (rev 14800)
@@ -1,5 +1 @@
-ab950f80af5ca165ef3f5ba2df04f9be  CSWsyslogng.postremove
-d58b011085f44206053562078c012857  CSWsyslogng.preinstall
-b7a833c17d8b1f53528b35d169354f73  cswsyslog_ng
-69bad95775b98d26e52db8a8292e2790  syslog-ng.conf.CSW
-28f0d9ff2243b330e8cd6311ef9b2f12  syslog-ng_3.0.5.tar.gz
+5995f7dad0053a478b60a63f6f754203  syslog-ng_3.2.4.tar.gz

Added: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.cswreleasenotes
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.cswreleasenotes	                        (rev 0)
+++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.cswreleasenotes	2011-06-13 08:13:27 UTC (rev 14800)
@@ -0,0 +1 @@
+The /usr/share reference is for finding /usr/share/lib/zoneinfo.


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