From 3b81d2781e39ce38c1c9b8fe7d33ac1f4ef2c042 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Tue, 26 Apr 2011 17:37:23 +0200 Subject: [PATCH] syslog-ng: Updated (2.0.9 -> 3.2.2) --- base/syslog-ng/head_n.patch | 14 +++++++------- base/syslog-ng/syslog-ng.conf | 4 ++++ base/syslog-ng/syslog-ng.desc | 8 +++++--- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/base/syslog-ng/head_n.patch b/base/syslog-ng/head_n.patch index ba4d63501..c4a531f21 100644 --- a/base/syslog-ng/head_n.patch +++ b/base/syslog-ng/head_n.patch @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../syslog-ng/head_n.patch -# Copyright (C) 2006 The OpenSDE Project +# Copyright (C) 2006 - 2011 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -14,15 +14,15 @@ # Foundation; either version 2 of the License, or (at your option) any later # version. # --- SDE-COPYRIGHT-NOTE-END --- ---- ./configure.in.orig 2006-11-21 14:51:40.000000000 +0200 -+++ ./configure.in 2006-11-21 14:52:48.000000000 +0200 -@@ -68,7 +68,7 @@ - AC_PROG_RANLIB + +--- syslog-ng-3.2.2/configure.in.orig 2011-01-15 17:14:31.000000000 +0100 ++++ syslog-ng-3.2.2/configure.in 2011-04-26 17:28:52.236077819 +0200 +@@ -262,7 +262,7 @@ + dnl *************************************************************************** AC_MSG_CHECKING(how to enable static linking for certain libraries) -ldversion=`ld -V 2>&1 | head -1` +ldversion=`ld -V 2>&1 | head -n 1` - ostype=`uname -s` if echo $ldversion | egrep "GNU|Solaris" > /dev/null; then LD_START_STATIC="-Wl,-Bstatic" - + LD_END_STATIC="-Wl,-Bdynamic" diff --git a/base/syslog-ng/syslog-ng.conf b/base/syslog-ng/syslog-ng.conf index 1383a8f61..c1dddee82 100644 --- a/base/syslog-ng/syslog-ng.conf +++ b/base/syslog-ng/syslog-ng.conf @@ -2,6 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../syslog-ng/syslog-ng.conf +# Copyright (C) 2011 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -12,6 +13,9 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- +# run autoreconf because we patch configure.in +hook_add preconf 9 'autoreconf -ivf' + # checking if we should linking glib and eventlog statically or dynamically if [ "$SDECFG_STATIC" == "1" ]; then var_append extraconfopt " " "--enable-static-linking" diff --git a/base/syslog-ng/syslog-ng.desc b/base/syslog-ng/syslog-ng.desc index b613c3e47..59e2da0a3 100644 --- a/base/syslog-ng/syslog-ng.desc +++ b/base/syslog-ng/syslog-ng.desc @@ -3,7 +3,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../syslog-ng/syslog-ng.desc -[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2011 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -32,9 +32,11 @@ [C] base/system +[F] NOPARALLEL + [L] GPL [S] Stable -[V] 2.0.9 +[V] 3.2.2 [P] X -----5---9 186.900 -[D] 179317910 syslog-ng-2.0.9.tar.gz http://www.balabit.com/downloads/files/syslog-ng/sources/stable/src/ +[D] 886789685 syslog-ng_3.2.2.tar.gz http://www.balabit.com/downloads/files/syslog-ng/sources/3.2.2/source/