SF.net SVN: gar:[24747] csw/mgar/pkg/syslog_ng/trunk
cptsalek at users.sourceforge.net
cptsalek at users.sourceforge.net
Sun Mar 22 13:09:08 CET 2015
Revision: 24747
http://sourceforge.net/p/gar/code/24747
Author: cptsalek
Date: 2015-03-22 12:09:07 +0000 (Sun, 22 Mar 2015)
Log Message:
-----------
syslog_ng/trunk: Update to Syslog-NG 3.6.2 major cleanup
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-Added-definition-for-htonll-and-ntohll.patch
csw/mgar/pkg/syslog_ng/trunk/files/0002-Add-asprintf.patch
csw/mgar/pkg/syslog_ng/trunk/files/0002-amqp_private.h
Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/Makefile 2015-03-22 12:06:23 UTC (rev 24746)
+++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2015-03-22 12:09:07 UTC (rev 24747)
@@ -1,7 +1,7 @@
# $Id$
NAME = syslog-ng
-VERSION = 3.5.3
+VERSION = 3.6.2
GARTYPE = v2
DESCRIPTION = A powerful syslogd replacement
@@ -21,7 +21,10 @@
# Patch taken from
# https://www.redhat.com/archives/open-scap-list/2011-May/msg00021.html
-PATCHFILES += 0001-Add-substitute-for-getline-on-Solaris.patch
+# PATCHFILES += 0001-Add-substitute-for-getline-on-Solaris.patch
+# Solaris <11 does not contain ntohll() and htonll()
+PATCHFILES += 0001-Added-definition-for-htonll-and-ntohll.patch
+PATCHFILES += 0002-Add-asprintf.patch
VENDOR_URL = http://www.balabit.com/network-security/syslog-ng/opensource-logging-system/
@@ -35,12 +38,20 @@
PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386
PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+# Need XPG4v2 for struct msghdr
+EXTRA_CFLAGS += -D_XOPEN_SOURCE=1 -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__
+# ...and -XPG6 to allow C99 with the flags above
+EXTRA_CFLAGS += -std=gnu99 -D_XPG6
+# We need id -u
+CONFIGURE_ENV_PATH = /usr/xpg4/bin:$(PATH)
+
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --enable-dynamic-linking
CONFIGURE_ARGS += --enable-spoof-source=no
CONFIGURE_ARGS += --enable-tcp-wrapper
CONFIGURE_ARGS += --enable-ssl
+BUILD_ARGS += V=1
GARCOMPILER = GNU
TEST_SCRIPTS =
@@ -63,13 +74,11 @@
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
+CHECKPKG_OVERRIDES_CSWsyslog-ng += file-with-bad-content|/usr/share|root/opt/csw/lib/libsyslog-ng-3.6.so.0.0.0
# This is optional
CHECKPKG_OVERRIDES_CSWsyslog-ng += missing-dependency|CSWperl
@@ -106,18 +115,13 @@
# 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_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_CSWsyslog-ng += shared-lib-package-contains-so-symlink
CHECKPKG_OVERRIDES_CSWsyslog-ng += shared-lib-pkgname-mismatch
-CHECKPKG_OVERRIDES_CSWsyslog-ng += soname-equals-filename
+# Needed on Sparc only
+CHECKPKG_OVERRIDES_CSWsyslog-ng += surplus-dependency|CSWlibintl8
-# Missing TLS symbols
-EXTRA_LINKER_FLAGS = -lgnutls
-
include gar/category.mk
post-install-modulated:
Modified: csw/mgar/pkg/syslog_ng/trunk/checksums
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/checksums 2015-03-22 12:06:23 UTC (rev 24746)
+++ csw/mgar/pkg/syslog_ng/trunk/checksums 2015-03-22 12:09:07 UTC (rev 24747)
@@ -1 +1 @@
-4cc29efa55fc41e65c48ece9bc88f88b syslog-ng_3.5.3.tar.gz
+6928e9be3499a2e9ae52ea8aa204b165 syslog-ng_3.6.2.tar.gz
Added: csw/mgar/pkg/syslog_ng/trunk/files/0001-Added-definition-for-htonll-and-ntohll.patch
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/files/0001-Added-definition-for-htonll-and-ntohll.patch (rev 0)
+++ csw/mgar/pkg/syslog_ng/trunk/files/0001-Added-definition-for-htonll-and-ntohll.patch 2015-03-22 12:09:07 UTC (rev 24747)
@@ -0,0 +1,39 @@
+From 2bb001058cb1f36642ba5604193ac9af4713fdc8 Mon Sep 17 00:00:00 2001
+From: Christian Walther <cwalther at opencsw.org>
+Date: Sat, 21 Mar 2015 20:52:12 +0100
+Subject: [PATCH] Added definition for htonll and ntohll
+
+---
+ modules/afamqp/rabbitmq-c/librabbitmq/amqp_private.h | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/modules/afamqp/rabbitmq-c/librabbitmq/amqp_private.h b/modules/afamqp/rabbitmq-c/librabbitmq/amqp_private.h
+index bbee792..7640218 100644
+--- a/modules/afamqp/rabbitmq-c/librabbitmq/amqp_private.h
++++ b/modules/afamqp/rabbitmq-c/librabbitmq/amqp_private.h
+@@ -33,6 +33,22 @@
+ * ***** END LICENSE BLOCK *****
+ */
+
++/* cwalther at opencsw.org:
++ * Fix missing htonll and ntohll by providing one.
++ * The following code is based on:
++ * https://web.archive.org/web/20090221024054/http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=5007142
++ */
++
++#ifndef htonll
++#ifdef _BIG_ENDIAN
++#define htonll(x) (x)
++#define ntohll(x) (x)
++#else
++#define htonll(x) ((((uint64_t)htonl(x)) << 32) + htonl(x >> 32))
++#define ntohll(x) ((((uint64_t)ntohl(x)) << 32) + ntohl(x >> 32))
++#endif
++#endif
++
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+--
+2.3.1
+
Added: csw/mgar/pkg/syslog_ng/trunk/files/0002-Add-asprintf.patch
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/files/0002-Add-asprintf.patch (rev 0)
+++ csw/mgar/pkg/syslog_ng/trunk/files/0002-Add-asprintf.patch 2015-03-22 12:09:07 UTC (rev 24747)
@@ -0,0 +1,98 @@
+From a5df4fa76caf2b468d4edf0cbb4a67f4639755cc Mon Sep 17 00:00:00 2001
+From: Christian Walther <cwalther at opencsw.org>
+Date: Sat, 21 Mar 2015 22:15:35 +0100
+Subject: [PATCH 2/2] Add asprintf
+
+---
+ modules/afamqp/rabbitmq-c/tools/asprintf.h | 63 ++++++++++++++++++++++++++++++
+ modules/afamqp/rabbitmq-c/tools/common.c | 4 ++
+ 2 files changed, 67 insertions(+)
+ create mode 100644 modules/afamqp/rabbitmq-c/tools/asprintf.h
+
+diff --git a/modules/afamqp/rabbitmq-c/tools/asprintf.h b/modules/afamqp/rabbitmq-c/tools/asprintf.h
+new file mode 100644
+index 0000000..dac119b
+--- /dev/null
++++ b/modules/afamqp/rabbitmq-c/tools/asprintf.h
+@@ -0,0 +1,63 @@
++/* $Id$ */
++
++/*
++ * Copyright (c) 2006 Nicholas Marriott <nicm at users.sourceforge.net>
++ *
++ * Permission to use, copy, modify, and distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
++ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#include <stdarg.h>
++#include <stdio.h>
++#ifdef HAVE_STDINT_H
++#include <stdint.h>
++#else
++#include <inttypes.h>
++#endif
++#include <string.h>
++
++int
++asprintf(char **ret, const char *fmt, ...)
++{
++ va_list ap;
++ int n;
++
++ va_start(ap, fmt);
++ n = vasprintf(ret, fmt, ap);
++ va_end(ap);
++
++ return (n);
++}
++
++int
++vasprintf(char **ret, const char *fmt, va_list ap)
++{
++ int n;
++ va_list ap2;
++
++ va_copy(ap2, ap);
++
++ if ((n = vsnprintf(NULL, 0, fmt, ap)) < 0)
++ goto error;
++
++ *ret = malloc(n + 1);
++ if ((n = vsnprintf(*ret, n + 1, fmt, ap2)) < 0) {
++ free(*ret);
++ goto error;
++ }
++
++ return (n);
++
++error:
++ *ret = NULL;
++ return (-1);
++}
+diff --git a/modules/afamqp/rabbitmq-c/tools/common.c b/modules/afamqp/rabbitmq-c/tools/common.c
+index 70f3bca..9d01f43 100644
+--- a/modules/afamqp/rabbitmq-c/tools/common.c
++++ b/modules/afamqp/rabbitmq-c/tools/common.c
+@@ -51,6 +51,10 @@
+ #include "compat.h"
+ #endif
+
++#ifndef asprintf
++#include "asprintf.h"
++#endif
++
+ void die(const char *fmt, ...)
+ {
+ va_list ap;
+--
+2.3.1
+
Added: csw/mgar/pkg/syslog_ng/trunk/files/0002-amqp_private.h
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/files/0002-amqp_private.h (rev 0)
+++ csw/mgar/pkg/syslog_ng/trunk/files/0002-amqp_private.h 2015-03-22 12:09:07 UTC (rev 24747)
@@ -0,0 +1,27 @@
+*** amqp_private.h.orig Sat Mar 21 20:07:11 2015
+--- amqp_private.h Sat Mar 21 20:09:29 2015
+***************
+*** 33,38 ****
+--- 33,54 ----
+ * ***** END LICENSE BLOCK *****
+ */
+
++ /* cwalther at opencsw.org:
++ * Fix missing htonll and ntohll by providing one.
++ * The following code is based on:
++ * https://web.archive.org/web/20090221024054/http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=5007142
++ */
++
++ #ifndef htonll
++ #ifdef _BIG_ENDIAN
++ #define htonll(x) (x)
++ #define ntohll(x) (x)
++ #else
++ #define htonll(x) ((((uint64_t)htonl(x)) << 32) + htonl(x >> 32))
++ #define ntohll(x) ((((uint64_t)ntohl(x)) << 32) + ntohl(x >> 32))
++ #endif
++ #endif
++
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
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