Revision: 23203
http://sourceforge.net/p/gar/code/23203
Author: dmichelsen
Date: 2014-03-12 13:54:14 +0000 (Wed, 12 Mar 2014)
Log Message:
-----------
syslog_ng/trunk: Update to 3.5.3, does not compile yet
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/0001-Add-substitute-for-getline-on-Solaris.patch
Property Changed:
----------------
csw/mgar/pkg/syslog_ng/trunk/
Index: csw/mgar/pkg/syslog_ng/trunk
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk 2014-03-12 13:27:03 UTC (rev 23202)
+++ csw/mgar/pkg/syslog_ng/trunk 2014-03-12 13:54:14 UTC (rev 23203)
Property changes on: csw/mgar/pkg/syslog_ng/trunk
___________________________________________________________________
Modified: svn:ignore
## -1,4 +1 ##
-cookies
-download
work
-
Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/Makefile 2014-03-12 13:27:03 UTC (rev
23202)
+++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2014-03-12 13:54:14 UTC (rev
23203)
@@ -1,7 +1,7 @@
# $Id$
NAME = syslog-ng
-VERSION = 3.2.5
+VERSION = 3.5.3
GARTYPE = v2
DESCRIPTION = A powerful syslogd replacement
@@ -12,27 +12,29 @@
endef
MASTER_SITES =
http://www.balabit.com/downloads/files/$(NAME)/open-source-edition/$(VERSION)/source/
-DISTFILES = $(NAME)_$(VERSION).tar.gz
+DISTFILES += $(NAME)_$(VERSION).tar.gz
DISTFILES += $(NAME).conf.CSW
DISTFILES += cswsyslog_ng
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
-SAMPLECONF = /etc/opt/csw/syslog-ng\.conf\.CSW
+# Patch taken from
+# https://www.redhat.com/archives/open-scap-list/2011-May/msg00021.html
+PATCHFILES += 0001-Add-substitute-for-getline-on-Solaris.patch
+VENDOR_URL =
http://www.balabit.com/network-security/syslog-ng/opensource-logging-system/
+
+INITSMF += /etc/opt/csw/init\.d/cswsyslog_ng
+PRESERVECONF += $(sysconfdir)/syslog-ng\.conf
+PRESERVECONF += $(sysconfdir)/scl\.conf
+
# Syslog links against glib2, which is packaged in different packages on
# Solaris 9 and Solaris 10. Therefore, we need to build separately on 9 and
# 10, and declare different dependencies.
PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386
PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
-# shared /opt/csw support:
-localstatedir = /var/opt/csw
-sysconfdir = /etc/opt/csw
-
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --enable-dynamic-linking
CONFIGURE_ARGS += --enable-spoof-source=no
@@ -60,7 +62,18 @@
RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibpcre1
RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibssl1-0-0
RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibwrap1
+RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibuuid1
+RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibgnutls28
+# This is correct, zoneinfo is searched at
+# /usr/share/zoneinfo/
+# /usr/share/lib/zoneinfo/
+CHECKPKG_OVERRIDES_CSWsyslog-ng +=
file-with-bad-content|/usr/share|root/opt/csw/lib/libsyslog-ng-3.5.3.so
+
+# This is optional
+CHECKPKG_OVERRIDES_CSWsyslog-ng += missing-dependency|CSWperl
+
# Specifying different dependencies for 5.9 and 5.10.
RUNTIME_DEP_PKGS_CSWsyslog-ng_5.10 += CSWlibglib2-0-0
RUNTIME_DEP_PKGS_CSWsyslog-ng_5.10 += CSWlibgmodule2-0-0
@@ -100,6 +113,7 @@
# to syslog's shared objects.
CHECKPKG_OVERRIDES_CSWsyslog-ng += shared-lib-package-contains-so-symlink
CHECKPKG_OVERRIDES_CSWsyslog-ng += shared-lib-pkgname-mismatch
+CHECKPKG_OVERRIDES_CSWsyslog-ng += soname-equals-filename
# Missing TLS symbols
EXTRA_LINKER_FLAGS = -lgnutls
Modified: csw/mgar/pkg/syslog_ng/trunk/checksums
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/checksums 2014-03-12 13:27:03 UTC (rev
23202)
+++ csw/mgar/pkg/syslog_ng/trunk/checksums 2014-03-12 13:54:14 UTC (rev
23203)
@@ -1 +1 @@
-60737452ce898f9dc7170dfdc9bfd732 syslog-ng_3.2.5.tar.gz
+4cc29efa55fc41e65c48ece9bc88f88b syslog-ng_3.5.3.tar.gz
Added:
csw/mgar/pkg/syslog_ng/trunk/files/0001-Add-substitute-for-getline-on-Solaris.patch
===================================================================
---
csw/mgar/pkg/syslog_ng/trunk/files/0001-Add-substitute-for-getline-on-Solaris.patch
(rev 0)
+++
csw/mgar/pkg/syslog_ng/trunk/files/0001-Add-substitute-for-getline-on-Solaris.patch
2014-03-12 13:54:14 UTC (rev 23203)
@@ -0,0 +1,74 @@
+From e16517fc1f6a56a100b3dc4981392ccfee4bdf3e Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <d...@opencsw.org>
+Date: Wed, 12 Mar 2014 14:38:31 +0100
+Subject: [PATCH] Add substitute for getline() on Solaris
+
+---
+ lib/filter/filter-in-list.c | 51 +++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 51 insertions(+)
+
+diff --git a/lib/filter/filter-in-list.c b/lib/filter/filter-in-list.c
+index 2fbbbe6..7222876 100644
+--- a/lib/filter/filter-in-list.c
++++ b/lib/filter/filter-in-list.c
+@@ -30,6 +30,57 @@
+ #include <stdio.h>
+ #include <string.h>
+
++#if defined(__SVR4) && defined(__sun)
++
++#define _GETLINE_BUFLEN 255
++
++ssize_t getline(char **lineptr, size_t *n, FILE *stream) {
++ int c;
++ size_t alloced = 0;
++ char *linebuf;
++
++ if (*lineptr == NULL) {
++ linebuf = malloc(sizeof(char) * (_GETLINE_BUFLEN + 1));
++ alloced = _GETLINE_BUFLEN + 1;
++ } else {
++ linebuf = *lineptr;
++ alloced = *n;
++ }
++ ssize_t linelen = 0;
++
++ do {
++ c = fgetc(stream);
++ if (c == EOF) {
++ break;
++ }
++ if (linelen >= alloced) {
++ linebuf = realloc(linebuf, sizeof(char) * (alloced +
_GETLINE_BUFLEN + 1));
++ alloced += (_GETLINE_BUFLEN + 1);
++ }
++ *(linebuf + linelen) = (unsigned char)c;
++ linelen++;
++ } while (c != '\n');
++
++ /* empty line means EOF or some other error */
++ if (linelen == 0) {
++ if (linebuf != NULL && *lineptr == NULL) {
++ free(linebuf);
++ linebuf = NULL;
++ }
++ linelen = -1;
++ *n = alloced;
++ } else {
++ if (linebuf != NULL) {
++ linebuf[linelen] = '\0';
++ }
++ *n = alloced;
++ *lineptr = linebuf;
++ }
++
++ return linelen;
++}
++#endif
++
+ typedef struct _FilterInList
+ {
+ FilterExprNode super;
+--
+1.8.4.1
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
