packages: syslog-ng/syslog-ng-datadir.patch, syslog-ng/syslog-ng-link.patch...

Mon Jan 17 19:21:11 CET 2011

Author: arekm                        Date: Mon Jan 17 18:21:11 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- initial 3.2.2 update (needs more work)

---- Files affected:
packages/syslog-ng:
   syslog-ng-datadir.patch (1.2 -> 1.3) , syslog-ng-link.patch (1.6 -> 1.7) , syslog-ng.spec (1.199 -> 1.200) , fix-dac_override.patch (1.1 -> NONE)  (REMOVED), fix-unix-stream-caps.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/syslog-ng/syslog-ng-datadir.patch
diff -u packages/syslog-ng/syslog-ng-datadir.patch:1.2 packages/syslog-ng/syslog-ng-datadir.patch:1.3

--- packages/syslog-ng/syslog-ng-datadir.patch:1.2	Fri Dec 26 23:14:33 2008
+++ packages/syslog-ng/syslog-ng-datadir.patch	Mon Jan 17 19:21:06 2011
@@ -1,16 +1,17 @@
-diff -ur syslog-ng-2.0.6.orig/src/syslog-ng.h syslog-ng-2.0.6/src/syslog-ng.h
---- syslog-ng-2.0.6.orig/src/syslog-ng.h	2007-09-22 16:16:15.000000000 +0200
-+++ syslog-ng-2.0.6/src/syslog-ng.h	2007-12-08 08:25:22.000000000 +0100
-@@ -50,9 +50,9 @@
- #define PATH_SYSLOGNG           PATH_PREFIX "/libexec/syslog-ng"
+--- syslog-ng-3.2.2/lib/syslog-ng.h~	2011-01-04 12:57:06.000000000 +0100
++++ syslog-ng-3.2.2/lib/syslog-ng.h	2011-01-17 19:31:46.933293237 +0100
+@@ -47,10 +47,10 @@
+ #define PATH_SYSLOGNG           PATH_LIBEXECDIR "/syslog-ng"
  #endif
  
 -#define PATH_PERSIST_CONFIG     PATH_LOCALSTATEDIR "/syslog-ng.persist"
 -#define PATH_QDISK              PATH_LOCALSTATEDIR
 -#define PATH_PATTERNDB_FILE     PATH_LOCALSTATEDIR "/patterndb.xml"
+-#define PATH_XSDDIR             PATH_DATADIR "/xsd"
 +#define PATH_PERSIST_CONFIG     "/var/lib/syslog-ng/syslog-ng.persist"
 +#define PATH_QDISK              "/var/lib/syslog-ng"
 +#define PATH_PATTERNDB_FILE     "/var/lib/syslog-ng/patterndb.xml"
++#define PATH_XSDDIR             "/var/lib/syslog-ng/xsd"
  
  #define LOG_PRIORITY_LISTEN 0
  #define LOG_PRIORITY_READER 0

================================================================
Index: packages/syslog-ng/syslog-ng-link.patch
diff -u packages/syslog-ng/syslog-ng-link.patch:1.6 packages/syslog-ng/syslog-ng-link.patch:1.7
--- packages/syslog-ng/syslog-ng-link.patch:1.6	Fri Dec 26 23:14:34 2008
+++ packages/syslog-ng/syslog-ng-link.patch	Mon Jan 17 19:21:06 2011
@@ -11,3 +11,14 @@
  
  if test "x$enable_linux_caps" = "xyes" -o "x$enable_linux_caps" = "xauto"; then
  	AC_CHECK_LIB(cap, cap_set_proc, LIBCAP_LIBS="-lcap")
+--- 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@
+ 
+ module_LTLIBRARIES = libdbparser.la
+ libdbparser_la_SOURCES = \

================================================================
Index: packages/syslog-ng/syslog-ng.spec
diff -u packages/syslog-ng/syslog-ng.spec:1.199 packages/syslog-ng/syslog-ng.spec:1.200
--- packages/syslog-ng/syslog-ng.spec:1.199	Mon Jan 17 18:23:46 2011
+++ packages/syslog-ng/syslog-ng.spec	Mon Jan 17 19:21:06 2011
@@ -18,12 +18,12 @@
 Summary(pl.UTF-8):	Syslog-ng - zamiennik syskloga
 Summary(pt_BR.UTF-8):	Daemon de log nova geração
 Name:		syslog-ng
-Version:	3.0.9
-Release:	1
+Version:	3.2.2
+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:	481e5dedcf355268bf4c95bddcae9e55
+# Source0-md5:	ed8ebe559d52a63fb61e3e2db566643f
 Source1:	%{name}.init
 Source2:	%{name}.conf
 Source3:	%{name}.logrotate
@@ -34,8 +34,6 @@
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-datadir.patch
 Patch2:		%{name}-pyssl.patch
-Patch3:		fix-unix-stream-caps.patch
-Patch4:		fix-dac_override.patch
 URL:		http://www.balabit.com/products/syslog_ng/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
@@ -123,17 +121,17 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 cp -a %{SOURCE4} doc
 cp -a %{SOURCE5} contrib/syslog-ng.conf.simple
 
 %build
-%{__aclocal}
+%{__libtoolize}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
 %configure \
 	--sysconfdir=%{_sysconfdir}/syslog-ng \
+	--with-module-dir=/%{_lib}/syslog-ng \
 	--with-timezone-dir=%{_datadir}/zoneinfo \
 	--with-pidfile-dir=/var/run \
 	--enable-ssl \
@@ -142,6 +140,7 @@
 	--enable-spoof-source \
 	--enable-linux-caps \
 	--enable-pcre \
+	--enable-pacct \
 %if %{with sql}
 	--enable-sql \
 %endif
@@ -158,7 +157,7 @@
 install -d $RPM_BUILD_ROOT{/etc/{init,sysconfig,logrotate.d,rc.d/init.d},%{_sysconfdir}/syslog-ng} \
 	$RPM_BUILD_ROOT/var/{log,lib/%{name}}
 
-%{__make} install \
+%{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/syslog-ng
@@ -254,6 +253,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.200  2011/01/17 18:21:06  arekm
+- initial 3.2.2 update (needs more work)
+
 Revision 1.199  2011/01/17 17:23:46  arekm
 - up to 3.0.9 (bug-15 was fixed in a different way, so this patch is obsolete)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng-datadir.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng-link.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.spec?r1=1.199&r2=1.200&f=u

