From 718de5179bc0a6aecf08e2b86f325842a3a3ef12 Mon Sep 17 00:00:00 2001 From: adrianp Date: Sat, 25 Oct 2008 10:26:43 +0000 Subject: Update to 1.6.12 Some key changes: * configure.in: changed "source" to "." as the source command is a bashism, changed a couple of double equal signs to single ones, moved libol to the statically linked libs as AIX links to .a files dynamically unless static linking is explicitly requested * src/filters.c (do_filter_netmask): fixed negation for the netmask() filter * src/macros.c: added LEVEL_NUM and FACILITY_NUM macros --- sysutils/syslog-ng/Makefile | 11 +++++++---- sysutils/syslog-ng/distinfo | 10 ++++------ sysutils/syslog-ng/patches/patch-ad | 13 ------------- sysutils/syslog-ng/patches/patch-ae | 13 ------------- 4 files changed, 11 insertions(+), 36 deletions(-) delete mode 100644 sysutils/syslog-ng/patches/patch-ad delete mode 100644 sysutils/syslog-ng/patches/patch-ae (limited to 'sysutils') diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile index ebc5e5adf01..f0a1debc9f7 100644 --- a/sysutils/syslog-ng/Makefile +++ b/sysutils/syslog-ng/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2008/05/26 02:13:24 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2008/10/25 10:26:43 adrianp Exp $ -DISTNAME= syslog-ng-1.6.11 -PKGREVISION= 1 +DISTNAME= syslog-ng-1.6.12 CATEGORIES= sysutils -MASTER_SITES= http://www.balabit.com/downloads/syslog-ng/1.6/src/ +MASTER_SITES= http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/ MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://www.balabit.com/network-security/syslog-ng/ @@ -32,6 +31,10 @@ SUBST_MESSAGE.conf= Fixing configuration file paths. .include "../../security/tcp_wrappers/buildlink3.mk" .include "../../sysutils/libol/buildlink3.mk" +.if ${OPSYS} == "SunOS" +CONFIGURE_ARGS+= --enable-full-dynamic +.endif + BUILDLINK_API_DEPENDS.libol+= libol>=0.3.0 PKG_OPTIONS_VAR= PKG_OPTIONS.syslog-ng diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo index 9a71ff83a85..2f672880920 100644 --- a/sysutils/syslog-ng/distinfo +++ b/sysutils/syslog-ng/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.2 2006/10/14 02:03:50 rillig Exp $ +$NetBSD: distinfo,v 1.3 2008/10/25 10:26:43 adrianp Exp $ -SHA1 (syslog-ng-1.6.11.tar.gz) = acbee602fd4cb6a1ca40238742642413cd6f1787 -RMD160 (syslog-ng-1.6.11.tar.gz) = 2ddd5eaae12dbcef4b4e67f83d01a3bab8b2cce0 -Size (syslog-ng-1.6.11.tar.gz) = 712166 bytes +SHA1 (syslog-ng-1.6.12.tar.gz) = 02bf683cd96f0ec213992a41835af04afb1a4ab7 +RMD160 (syslog-ng-1.6.12.tar.gz) = b7a091bd2e6cfa1fd6eea50aee2ef016e8df6c40 +Size (syslog-ng-1.6.12.tar.gz) = 717903 bytes SHA1 (patch-ac) = 73b60fa4cf2cce6821873c51dba6b5327ee08f07 -SHA1 (patch-ad) = 958baef5cc2bb14be777d9a33dd06fa6212decfc -SHA1 (patch-ae) = d6ffff377bf2ff3c618b4c43a189a6c152c2fb7e diff --git a/sysutils/syslog-ng/patches/patch-ad b/sysutils/syslog-ng/patches/patch-ad deleted file mode 100644 index 20b3a747259..00000000000 --- a/sysutils/syslog-ng/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2006/10/14 02:03:50 rillig Exp $ - ---- configure.orig 2006-10-14 04:01:47.000000000 +0200 -+++ configure 2006-10-14 04:02:24.000000000 +0200 -@@ -7577,7 +7577,7 @@ elif echo $ldversion | egrep "HP" > /dev - LD_END_STATIC="-Wl,-a,shared_archive" - echo "$as_me:$LINENO: result: HP-UX" >&5 - echo "${ECHO_T}HP-UX" >&6 --elif test "$ostype" == "AIX"; then -+elif test "$ostype" = "AIX"; then - LD_START_STATIC="-Wl,-bstatic" - LD_END_STATIC="-Wl,-bdynamic" - echo "$as_me:$LINENO: result: AIX" >&5 diff --git a/sysutils/syslog-ng/patches/patch-ae b/sysutils/syslog-ng/patches/patch-ae deleted file mode 100644 index a7cc3be9db4..00000000000 --- a/sysutils/syslog-ng/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2006/10/14 02:03:50 rillig Exp $ - ---- configure.in.orig 2006-05-03 13:10:43.000000000 +0200 -+++ configure.in 2006-10-14 04:02:17.000000000 +0200 -@@ -349,7 +349,7 @@ elif echo $ldversion | egrep "HP" > /dev - LD_START_STATIC="-Wl,-a,archive" - LD_END_STATIC="-Wl,-a,shared_archive" - AC_MSG_RESULT(HP-UX) --elif test "$ostype" == "AIX"; then -+elif test "$ostype" = "AIX"; then - LD_START_STATIC="-Wl,-bstatic" - LD_END_STATIC="-Wl,-bdynamic" - AC_MSG_RESULT(AIX) -- cgit v1.2.3