Revision: 17442
http://gar.svn.sourceforge.net/gar/?rev=17442&view=rev
Author: wahwah
Date: 2012-03-18 12:44:14 +0000 (Sun, 18 Mar 2012)
Log Message:
-----------
syslog_ng/trunk: Renamed the package, version rollback to the one that builds
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/CSWsyslog-ng.cswreleasenotes
csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslog-ng.postremove
csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslog-ng.preinstall
Removed Paths:
-------------
csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.cswreleasenotes
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 2012-03-18 08:27:14 UTC (rev
17441)
+++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2012-03-18 12:44:14 UTC (rev
17442)
@@ -1,7 +1,7 @@
# $Id$
NAME = syslog-ng
-VERSION = 3.3.3
+VERSION = 3.2.5
CATEGORIES = server
GARTYPE = v2
@@ -16,9 +16,9 @@
DISTFILES = $(NAME)_$(VERSION).tar.gz
DISTFILES += $(NAME).conf.CSW
DISTFILES += cswsyslog_ng
-DISTFILES += CSWsyslogng.preinstall
-DISTFILES += CSWsyslogng.postremove
-DISTFILES += CSWsyslogng.cswreleasenotes
+DISTFILES += CSWsyslog-ng.preinstall
+DISTFILES += CSWsyslog-ng.postremove
+DISTFILES += CSWsyslog-ng.cswreleasenotes
SPKG_SOURCEURL =
http://www.balabit.com/network-security/syslog-ng/opensource-logging-system/
INITSMF = /etc/opt/csw/init\.d/cswsyslog_ng
@@ -33,6 +33,7 @@
CONFIGURE_ARGS += --enable-dynamic-linking
CONFIGURE_ARGS += --enable-spoof-source=no
CONFIGURE_ARGS += --enable-tcp-wrapper
+CONFIGURE_ARGS += --enable-ssl
GARCOMPILER = GNU
TEST_SCRIPTS =
@@ -41,33 +42,53 @@
# 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
-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
+PACKAGES = CSWsyslog-ng
+SPKG_DESC_CSWsyslog-ng = $(DESCRIPTION)
+RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWglib2
+RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibdbi1
+RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibevtlog0
+RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibgnutls26
+RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibpcre1
+RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibssl0-9-8
+RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibwrap1
+OBSOLETED_BY_CSWsyslog-ng = CSWsyslogng
+
+# It it were split, it'd look like this:
+# PACKAGES += CSWlibsyslog-ng0
+# CATALOGNAME_CSWlibsyslog-ng0 = libsyslog_ng0
+# PKGFILES_CSWlibsyslog-ng0 += $(call
baseisadirs,$(libdir),libsyslog-ng\.so\.0\.0\.0)
+# PKGFILES_CSWlibsyslog-ng0 += $(call
baseisadirs,$(libdir),libsyslog-ng\.so\.0(\.\d+)*)
+# SPKG_DESC_CSWlibsyslog-ng0 += $(DESCRIPTION), libsyslog-ng.so.0
+# RUNTIME_DEP_PKGS_CSWlibsyslog-ng0 += CSWlibevtlog0
+# RUNTIME_DEP_PKGS_CSWlibsyslog-ng0 += CSWlibintl8
+# RUNTIME_DEP_PKGS_CSWlibsyslog-ng0 += CSWlibwrap1
+# RUNTIME_DEP_PKGS_CSWlibsyslog-ng0 += CSWlibgnutls26
+# RUNTIME_DEP_PKGS_CSWlibsyslog-ng0 += CSWlibgcc-s1
+# RUNTIME_DEP_PKGS_CSWlibsyslog-ng0 += CSWlibpcre1
+# RUNTIME_DEP_PKGS_CSWlibsyslog-ng0 += CSWglib2
+#
+# PACKAGES += CSWsyslog-ng-dev
+# CATALOGNAME_CSWsyslog-ng-dev = syslog_ng_dev
+# SPKG_DESC_CSWsyslog-ng-dev += $(DESCRIPTION), development files
+# PKGFILES_CSWsyslog-ng-dev += /opt/csw/lib/libsyslog-ng.so
+# RUNTIME_DEP_PKGS_CSWsyslog-ng-dev += CSWlibsyslog-ng0
+
# 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
+CHECKPKG_OVERRIDES_CSWsyslog-ng +=
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
+CHECKPKG_OVERRIDES_CSWsyslog-ng += shared-lib-package-contains-so-symlink
+CHECKPKG_OVERRIDES_CSWsyslog-ng += shared-lib-pkgname-mismatch
# Missing TLS symbols
EXTRA_LINKER_FLAGS = -lgnutls
Modified: csw/mgar/pkg/syslog_ng/trunk/checksums
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/checksums 2012-03-18 08:27:14 UTC (rev
17441)
+++ csw/mgar/pkg/syslog_ng/trunk/checksums 2012-03-18 12:44:14 UTC (rev
17442)
@@ -1 +1 @@
-04b1804e8a5a1413c9b92428bc8227bb syslog-ng_3.3.3.tar.gz
+60737452ce898f9dc7170dfdc9bfd732 syslog-ng_3.2.5.tar.gz
Copied: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslog-ng.cswreleasenotes (from
rev 17354, csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.cswreleasenotes)
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslog-ng.cswreleasenotes
(rev 0)
+++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslog-ng.cswreleasenotes
2012-03-18 12:44:14 UTC (rev 17442)
@@ -0,0 +1 @@
+The /usr/share reference is for finding /usr/share/lib/zoneinfo.
Copied: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslog-ng.postremove (from rev
17354, csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove)
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslog-ng.postremove
(rev 0)
+++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslog-ng.postremove 2012-03-18
12:44:14 UTC (rev 17442)
@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# $Id$
+#
+
+if [ -x /usr/sbin/svcadm ]; then
+ echo "Enabling svc:/system/system-log:default"
+ /usr/sbin/svcadm enable svc:/system/system-log:default
+fi
Copied: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslog-ng.preinstall (from rev
17441, csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall)
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslog-ng.preinstall
(rev 0)
+++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslog-ng.preinstall 2012-03-18
12:44:14 UTC (rev 17442)
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# $Id$
+#
+
+# Until we have a better solution.
+# https://www.opencsw.org/mantis/view.php?id=4409
+# if [ -x /usr/sbin/svcadm ]; then
+# echo "Disabling svc:/system/system-log:default"
+# /usr/sbin/svcadm disable svc:/system/system-log:default
+# fi
+#
+# When autoenable_daemons is not set to off, syslog_ng will attempt to start
+# in the presence of the stock Solaris syslogd, and will fail.
+
+# 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}" ]; then
+ echo "Removing an obsolete file: '${f}'."
+ rm -f "${f}"
+ fi
+done
+
+exit 0
Deleted: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.cswreleasenotes
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.cswreleasenotes
2012-03-18 08:27:14 UTC (rev 17441)
+++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.cswreleasenotes
2012-03-18 12:44:14 UTC (rev 17442)
@@ -1 +0,0 @@
-The /usr/share reference is for finding /usr/share/lib/zoneinfo.
Deleted: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove 2012-03-18
08:27:14 UTC (rev 17441)
+++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove 2012-03-18
12:44:14 UTC (rev 17442)
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-# $Id$
-#
-
-if [ -x /usr/sbin/svcadm ]; then
- echo "Enabling svc:/system/system-log:default"
- /usr/sbin/svcadm enable svc:/system/system-log:default
-fi
Deleted: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall 2012-03-18
08:27:14 UTC (rev 17441)
+++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall 2012-03-18
12:44:14 UTC (rev 17442)
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $Id$
-#
-
-# Until we have a better solution.
-# https://www.opencsw.org/mantis/view.php?id=4409
-# if [ -x /usr/sbin/svcadm ]; then
-# echo "Disabling svc:/system/system-log:default"
-# /usr/sbin/svcadm disable svc:/system/system-log:default
-# fi
-#
-# When autoenable_daemons is not set to off, syslog_ng will attempt to start
-# in the presence of the stock Solaris syslogd, and will fail.
-
-# 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}" ]; then
- echo "Removing an obsolete file: '${f}'."
- rm -f "${f}"
- fi
-done
-
-exit 0
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
