From d132f512b0d3d2b0e0001836d68113afd99a8b33 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Mon, 30 May 2011 17:31:33 +0000 Subject: [PATCH] - up to 3.2.4 Changed files: syslog-ng-link.patch -> 1.11 syslog-ng.spec -> 1.210 --- syslog-ng-link.patch | 63 +++++++------------------------------------- syslog-ng.spec | 10 +++---- 2 files changed, 14 insertions(+), 59 deletions(-) diff --git a/syslog-ng-link.patch b/syslog-ng-link.patch index b720439..7816712 100644 --- a/syslog-ng-link.patch +++ b/syslog-ng-link.patch @@ -1,55 +1,12 @@ ---- syslog-ng-2.0.3/configure.in.orig 2007-03-04 10:58:00.000000000 +0100 -+++ syslog-ng-2.0.3/configure.in 2007-04-03 23:53:53.219462987 +0200 -@@ -265,9 +265,8 @@ - AC_CHECK_LIB(door, door_create, BASE_LIBS="$BASE_LIBS -ldoor") - AC_CHECK_LIB(socket, socket, BASE_LIBS="$BASE_LIBS -lsocket") - AC_CHECK_LIB(rt, nanosleep, BASE_LIBS="$BASE_LIBS -lrt") --AC_CHECK_LIB(nsl, gethostbyname, BASE_LIBS="$BASE_LIBS -lnsl") -+AC_CHECK_LIB(resolv, gethostbyname, BASE_LIBS="$BASE_LIBS -lresolv") - AC_CHECK_LIB(regex, regexec, REGEX_LIBS="-lregex") --AC_CHECK_LIB(resolv, res_init, RESOLV_LIBS="-lresolv") +--- syslog-ng-3.2.4/lib/Makefile.am~ 2011-02-05 16:01:43.000000000 +0100 ++++ syslog-ng-3.2.4/lib/Makefile.am 2011-05-30 19:22:15.813931407 +0200 +@@ -3,7 +3,7 @@ + export top_srcdir - if test "x$enable_linux_caps" = "xyes" -o "x$enable_linux_caps" = "xauto"; then - AC_CHECK_LIB(cap, cap_set_proc, LIBCAP_LIBS="-lcap") -@@ -674,7 +674,7 @@ - CORE_DEPS_LIBS="$DEPS_LIBS" - SYSLOGNG_LINK='$(LINK)' - else -- DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $LD_START_STATIC -Wl,--whole-archive $GLIB_LIBS $EVTLOG_LIBS $PCRE_LIBS $REGEX_LIBS -Wl,--no-whole-archive $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS " -+ DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $LD_START_STATIC -Wl,--whole-archive $GLIB_LIBS $EVTLOG_LIBS $PCRE_LIBS $REGEX_LIBS -Wl,--no-whole-archive $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS -lrt " - CORE_DEPS_LIBS="" - # bypass libtool in case we want to do mixel linking - SYSLOGNG_LINK='$(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@' ---- syslog-ng-3.2.2/modules/dbparser/Makefile.am~ 2011-01-15 17:14:39.000000000 +0100 -+++ syslog-ng-3.2.2/modules/dbparser/Makefile.am 2011-01-17 20:06:00.103986725 +0100 -@@ -17,7 +17,7 @@ - timerwheel.c timerwheel.h \ - patternize.c patternize.h - libsyslog_ng_patterndb_la_LDFLAGS = -no-undefined --libsyslog_ng_patterndb_la_LIBADD = @OPENSSL_LIBS@ @DEPS_LIBS@ -+libsyslog_ng_patterndb_la_LIBADD = $(top_builddir)/lib/libsyslog-ng.la @OPENSSL_LIBS@ @DEPS_LIBS@ + lib_LTLIBRARIES = libsyslog-ng.la +-libsyslog_ng_la_LIBADD = @CORE_DEPS_LIBS@ ++libsyslog_ng_la_LIBADD = @CORE_DEPS_LIBS@ @GLIB_LIBS@ @EVTLOG_LIBS@ -lcap + libsyslog_ng_la_LDFLAGS = -no-undefined - module_LTLIBRARIES = libdbparser.la - libdbparser_la_SOURCES = \ ---- syslog-ng-3.2.2/configure.in~ 2011-02-23 08:46:17.152179679 +0100 -+++ syslog-ng-3.2.2/configure.in 2011-02-23 08:53:26.506748469 +0100 -@@ -458,7 +458,7 @@ - GLIB_LIBS=`echo $GLIB_LIBS | tr ' ' '\n' | egrep -v "^(-ldld?)|(-lrt)$" | tr '\n' ' '` - - old_LIBS=$LIBS -- LIBS="$LD_START_STATIC $GLIB_LIBS $LD_END_STATIC" -+ LIBS="$LD_START_STATIC $GLIB_LIBS $LD_END_STATIC $BASE_LIBS" - AC_CHECK_FUNC(g_hash_table_new, blb_cv_static_glib=yes, blb_cv_static_glib=no) - LIBS=$old_LIBS - fi ---- syslog-ng-3.2.2/configure.in~ 2011-02-23 08:53:58.767670120 +0100 -+++ syslog-ng-3.2.2/configure.in 2011-02-23 09:02:25.059826526 +0100 -@@ -675,7 +675,7 @@ - SYSLOGNG_LINK='$(LINK)' - else - DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $LD_START_STATIC -Wl,--whole-archive $GLIB_LIBS $EVTLOG_LIBS $PCRE_LIBS $REGEX_LIBS -Wl,--no-whole-archive $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS -lrt " -- CORE_DEPS_LIBS="" -+ CORE_DEPS_LIBS="$LD_START_STATIC -Wl,--whole-archive $GLIB_LIBS $EVTLOG_LIBS -Wl,--no-whole-archive $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS -lrt" - # bypass libtool in case we want to do mixel linking - SYSLOGNG_LINK='$(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@' - fi + libsyslog_ng_la_SOURCES = \ + diff --git a/syslog-ng.spec b/syslog-ng.spec index d97bbfa..1f35ab9 100644 --- a/syslog-ng.spec +++ b/syslog-ng.spec @@ -20,12 +20,12 @@ Summary: Syslog-ng - new generation of the system logger Summary(pl.UTF-8): Syslog-ng - zamiennik syskloga Summary(pt_BR.UTF-8): Daemon de log nova geração Name: syslog-ng -Version: 3.2.2 +Version: 3.2.4 Release: 0.1 License: GPL v2 Group: Daemons Source0: http://www.balabit.com/downloads/files/syslog-ng/sources/%{version}/source/%{name}_%{version}.tar.gz -# Source0-md5: ed8ebe559d52a63fb61e3e2db566643f +# Source0-md5: 5995f7dad0053a478b60a63f6f754203 Source1: %{name}.init Source2: %{name}.conf Source3: %{name}.logrotate @@ -51,7 +51,7 @@ BuildRequires: python-modules BuildRequires: tzdata %endif %if %{with dynamic} -BuildRequires: eventlog-devel >= 0.2 +BuildRequires: eventlog-devel >= 0.2.12 BuildRequires: glib2-devel >= 1:%{glib2_ver} BuildRequires: libcap-devel %{?with_sql:BuildRequires: libdbi-devel >= 0.8.3-2} @@ -60,7 +60,7 @@ BuildRequires: libwrap-devel BuildRequires: openssl-devel BuildRequires: pcre-devel %else -BuildRequires: eventlog-static >= 0.2 +BuildRequires: eventlog-static >= 0.2.12 BuildRequires: glib2-static >= 1:%{glib2_ver} BuildRequires: glibc-static BuildRequires: libcap-static @@ -257,8 +257,6 @@ exit 0 %attr(754,root,root) /etc/rc.d/init.d/syslog-ng %attr(755,root,root) %{_libdir}/libsyslog-ng.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libsyslog-ng.so.0 -%attr(755,root,root) %{_libdir}/libsyslog-ng-patterndb.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libsyslog-ng-patterndb.so.0 %dir %{_libdir}/syslog-ng %attr(755,root,root) %{_libdir}/syslog-ng/lib*.so %attr(755,root,root) %{_sbindir}/syslog-ng -- 2.44.0