- added nolibs patch (drop unnecessary linking with -lnsl -lresolv)

- added missing release 3 note to previous changelog entry

Changed files:
    syslog-ng-nolibs.patch -> 1.1
    syslog-ng.spec -> 1.225

diff --git a/syslog-ng-nolibs.patch b/syslog-ng-nolibs.patch
new file mode 100644 (file)
index 0000000..a372af0
--- /dev/null
+++ b/syslog-ng-nolibs.patch
@@ -0,0 +1,17 @@
+--- syslog-ng-3.3.1/configure.in.orig  2011-09-29 08:35:39.000000000 +0200
++++ syslog-ng-3.3.1/configure.in       2011-11-11 10:37:51.371629795 +0100
+@@ -465,11 +465,10 @@
+ dnl ***************************************************************************
+ dnl Checks for libraries
+ AC_CHECK_LIB(door, door_create, BASE_LIBS="$BASE_LIBS -ldoor")
+-AC_CHECK_LIB(socket, socket, BASE_LIBS="$BASE_LIBS -lsocket")
++AC_CHECK_FUNC([socket], [:], [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(regex, regexec, REGEX_LIBS="-lregex")
+-AC_CHECK_LIB(resolv, res_init, RESOLV_LIBS="-lresolv")
++AC_CHECK_FUNC([gethostbyname], [:], [AC_CHECK_LIB(nsl, gethostbyname, BASE_LIBS="$BASE_LIBS -lnsl")])
++AC_CHECK_FUNC([regexec], [:], [AC_CHECK_LIB(regex, regexec, REGEX_LIBS="-lregex")])
+ 
+ 
+ if test "x$enable_linux_caps" = "xyes" -o "x$enable_linux_caps" = "xauto"; then

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 71c228f2c8aa7de88b2709211203c59a534a4520..59048e041548b64e0037c444941f39112888a67e 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -38,6 +38,7 @@ Source5:      %{name}-simple.conf
 Source6:       %{name}.upstart
 Patch0:                %{name}-datadir.patch
 Patch1:                cap_syslog-vserver-workaround.patch
+Patch2:                %{name}-nolibs.patch
 URL:           http://www.balabit.com/products/syslog_ng/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
@@ -179,6 +180,7 @@ Pliki nagłówkowe do tworzenia modułów dla sysloga-ng.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 cp -a %{SOURCE4} doc
 cp -a %{SOURCE5} contrib/syslog-ng.conf.simple