packages: syslog-ng/syslog-ng.spec, syslog-ng/syslog-ng-nolibs.patch (NEW) ...

qboosh qboosh at pld-linux.org
Fri Nov 11 10:45:05 CET 2011


Author: qboosh                       Date: Fri Nov 11 09:45:05 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added nolibs patch (drop unnecessary linking with -lnsl -lresolv)
- added missing release 3 note to previous changelog entry

---- Files affected:
packages/syslog-ng:
   syslog-ng.spec (1.224 -> 1.225) , syslog-ng-nolibs.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/syslog-ng/syslog-ng.spec
diff -u packages/syslog-ng/syslog-ng.spec:1.224 packages/syslog-ng/syslog-ng.spec:1.225
--- packages/syslog-ng/syslog-ng.spec:1.224	Fri Nov 11 10:35:03 2011
+++ packages/syslog-ng/syslog-ng.spec	Fri Nov 11 10:45:00 2011
@@ -39,6 +39,7 @@
 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
@@ -180,6 +181,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 cp -a %{SOURCE4} doc
 cp -a %{SOURCE5} contrib/syslog-ng.conf.simple
 
@@ -386,12 +388,17 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.225  2011/11/11 09:45:00  qboosh
+- added nolibs patch (drop unnecessary linking with -lnsl -lresolv)
+- added missing release 3 note to previous changelog entry
+
 Revision 1.224  2011/11/11 09:35:03  qboosh
 - package -devel
 - separated -libs (required by -devel), so no daemon is required for development
 - filterout_ld as-needed options for dynamic linking too (otherwise tests fail)
 - BRs/Rs cleanup wrt. dynamic/mixed linking: only core (libsyslong-ng and syslog-ng daemon)
   use mixed linking, everything else is always linked dynamically)
+- release 3
 
 Revision 1.223  2011/11/10 17:42:42  qboosh
 - use system libmongo-client

================================================================
Index: packages/syslog-ng/syslog-ng-nolibs.patch
diff -u /dev/null packages/syslog-ng/syslog-ng-nolibs.patch:1.1
--- /dev/null	Fri Nov 11 10:45:05 2011
+++ packages/syslog-ng/syslog-ng-nolibs.patch	Fri Nov 11 10:45:00 2011
@@ -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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.spec?r1=1.224&r2=1.225&f=u



More information about the pld-cvs-commit mailing list