[syslog-ng/el6] * Update to 3.2.4
Jose Pedro Oliveira
jpo at fedoraproject.org
Wed May 25 21:26:16 UTC 2011
commit 41807f2be0a72e24deb514c537f8e47452e2e0f6
Author: Jose Pedro Oliveira <jpo at di.uminho.pt>
Date: Wed May 25 22:25:26 2011 +0100
* Update to 3.2.4
.gitignore | 1 +
sources | 2 +-
syslog-ng-3.2.4-disable-sql-and-ssl-tests.patch | 19 ++++
syslog-ng.conf | 2 +-
syslog-ng.spec | 131 +++++++++++++++++------
syslog-ng.sysconfig | 4 +
6 files changed, 125 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 999c77f..892ef47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
syslog-ng-2.1.4.tar.gz
syslog-ng-2.1.4-libnet.patch
/syslog-ng_3.1.4.tar.gz
+/syslog-ng_3.2.4.tar.gz
diff --git a/sources b/sources
index c4b5419..501145d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-48e6646d12d30c655f4391b970d61f56 syslog-ng_3.1.4.tar.gz
+5995f7dad0053a478b60a63f6f754203 syslog-ng_3.2.4.tar.gz
diff --git a/syslog-ng-3.2.4-disable-sql-and-ssl-tests.patch b/syslog-ng-3.2.4-disable-sql-and-ssl-tests.patch
new file mode 100644
index 0000000..633fc82
--- /dev/null
+++ b/syslog-ng-3.2.4-disable-sql-and-ssl-tests.patch
@@ -0,0 +1,19 @@
+diff -ruN syslog-ng-3.2.4/tests/functional/func_test.py syslog-ng-3.2.4-modified/tests/functional/func_test.py
+--- syslog-ng-3.2.4/tests/functional/func_test.py 2010-07-09 11:19:27.000000000 +0100
++++ syslog-ng-3.2.4-modified/tests/functional/func_test.py 2011-05-12 03:23:48.276226460 +0100
+@@ -60,11 +60,12 @@
+ # import test modules
+ import test_file_source
+ import test_filters
+-import test_input_drivers
++#import test_input_drivers
+ import test_performance
+-import test_sql
++#import test_sql
+
+-tests = (test_input_drivers, test_sql, test_file_source, test_filters, test_performance)
++#tests = (test_input_drivers, test_sql, test_file_source, test_filters, test_performance)
++tests = (test_file_source, test_filters, test_performance)
+
+ init_env()
+ seed_rnd()
diff --git a/syslog-ng.conf b/syslog-ng.conf
index 11bc10a..28cbe68 100644
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -1,4 +1,4 @@
- at version:3.0
+ at version:3.2
# syslog-ng configuration file.
#
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 29e977a..df8f9ea 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -1,30 +1,39 @@
-%define evtlog_ver 0.2.12
+%global evtlog_ver 0.2.12
-%define _sbindir /sbin
+%global _sbindir /sbin
+%global _libdir /%{_lib}
Name: syslog-ng
-Version: 3.1.4
-Release: 3%{?dist}
+Version: 3.2.4
+Release: 1%{?dist}
Summary: Next-generation syslog server
Group: System Environment/Daemons
License: GPLv2+
-Url: http://www.balabit.com/products/syslog_ng/
+Url: http://www.balabit.com/network-security/syslog-ng
Source0: http://www.balabit.com/downloads/files?path=/syslog-ng/sources/%{version}/source/%{name}_%{version}.tar.gz
Source1: syslog-ng.conf
Source2: syslog-ng.init.d
Source3: syslog-ng.sysconfig
Source4: syslog-ng.logrotate
+Patch0: syslog-ng-3.2.4-disable-sql-and-ssl-tests.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig
+BuildRequires: libtool
BuildRequires: eventlog-devel >= %{evtlog_ver}
BuildRequires: glib2-devel >= 2.10.1
+#BuildRequires: libdbi-devel
BuildRequires: libnet-devel >= 1.1.4-3
-BuildRequires: pcre-devel >= 7.3
+#BuildRequires: openssl-devel
+BuildRequires: pcre-devel >= 6.1
BuildRequires: tcp_wrappers-devel
+# For the test suite
+BuildRequires: python
+
Requires: logrotate
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
@@ -47,8 +56,19 @@ Forwarding logs over TCP and remembering all forwarding hops makes it
ideal for firewalled environments.
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
%prep
%setup -q
+%patch0 -p1
# fix perl path
%{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
@@ -56,17 +76,34 @@ ideal for firewalled environments.
# fix executable perms on contrib files
%{__chmod} -c a-x contrib/syslog2ng
+# fix authors file
+/usr/bin/iconv -f iso8859-1 -t utf-8 AUTHORS > AUTHORS.conv && \
+ %{__mv} -f AUTHORS.conv AUTHORS
+
%build
%configure \
+ --prefix=/ \
+ --libdir=/%{_lib} \
+ --includedir=%{_includedir} \
--sysconfdir=%{_sysconfdir}/%{name} \
--localstatedir=%{_sharedstatedir}/%{name} \
+ --datadir=%{_datadir}/%{name} \
+ --with-module-dir=/%{_lib}/%{name} \
--enable-ipv6 \
--enable-tcp-wrapper \
--enable-pcre \
--enable-spoof-source \
+ --disable-sql \
+ --disable-ssl \
+ --enable-shared \
+ --disable-static \
--enable-dynamic-linking
+# remove rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
make %{_smp_mflags}
@@ -74,7 +111,7 @@ make %{_smp_mflags}
%{__rm} -rf %{buildroot}
make DESTDIR=%{buildroot} install
-%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/%{name}
+#%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/%{name}
%{__install} -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/syslog-ng.conf
%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/init.d
@@ -86,17 +123,13 @@ make DESTDIR=%{buildroot} install
%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/logrotate.d
%{__install} -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/syslog
-# make local state dir
+# create the local state dir
%{__install} -d -m 755 %{buildroot}/%{_sharedstatedir}/%{name}
-# create the patterndb.d configuration directory (should be fixed in 3.2.4)
-%{__install} -d -m 755 %{buildroot}/%{_sysconfdir}/%{name}/patterndb.d
-
-
-# fix authors file
-/usr/bin/iconv -f iso8859-1 -t utf-8 AUTHORS > AUTHORS.conv && \
- %{__mv} -f AUTHORS.conv AUTHORS
-
+# install the main library header files
+%{__install} -d -m 755 %{buildroot}%{_includedir}/%{name}
+%{__install} -p -m 644 config.h %{buildroot}%{_includedir}/%{name}
+%{__install} -p -m 644 lib/*.h %{buildroot}%{_includedir}/%{name}
# install vim files
%{__install} -d -m 755 %{buildroot}%{_datadir}/%{name}
@@ -108,12 +141,21 @@ for vimver in 70 71 72 73 ; do
cd -
done
+ldconfig -N -n %{buildroot}/%{_lib}
+
+find %{buildroot} -name "*.la" -exec rm -f {} \;
+
+
+%check
+LD_LIBRARY_PATH=%{buildroot}/%{_lib}:%{buildroot}/%{_lib}/%{name} make check
+
%clean
rm -rf %{buildroot}
%post
+/sbin/ldconfig
/sbin/chkconfig --add %{name}
@@ -126,6 +168,7 @@ fi
%postun
+/sbin/ldconfig
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
/sbin/service %{name} condrestart >/dev/null 2>&1
@@ -159,9 +202,12 @@ fi
%doc doc/security/*.txt
%doc doc/examples/syslog-ng.conf.sample
%doc contrib/{relogger.pl,syslog2ng,syslog-ng.conf.doc}
+
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/patterndb.d
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%config(noreplace) %{_sysconfdir}/%{name}/modules.conf
+%config(noreplace) %{_sysconfdir}/%{name}/scl.conf
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%config(noreplace) %{_sysconfdir}/logrotate.d/syslog
%{_sysconfdir}/init.d/%{name}
@@ -171,28 +217,49 @@ fi
%{_bindir}/loggen
%{_bindir}/pdbtool
%{_bindir}/update-patterndb
-%{_datadir}/%{name}
-%{_mandir}/man1/*
-%{_mandir}/man5/*
-%{_mandir}/man8/*
+%{_libdir}/lib%{name}.so.*
+%{_libdir}/%{name}/*.so
+
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/syslog-ng.vim
%ghost %{_datadir}/vim/
+# uhm, some better places for those?
+%{_datadir}/%{name}/xsd/
+
+%{_mandir}/man1/loggen.1*
+%{_mandir}/man1/pdbtool.1*
+%{_mandir}/man1/syslog-ng-ctl.1*
+%{_mandir}/man5/syslog-ng.conf.5*
+%{_mandir}/man8/syslog-ng.8*
+
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/libsyslog-ng.so
+%{_includedir}/%{name}/
+# scl files
+%{_datadir}/%{name}/include/
+
%changelog
-* Mon May 9 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.4-3
-- Bumped the eventlog version to match the latest upstream version (0.2.12)
-- Overrided the default _localstatedir value (configure --localstatedir)
- (value hardcoded in update-patterndb)
-- Manually created the patterndb.d configuration directory (update-patterndb)
- (see also https://bugzilla.balabit.com/show_bug.cgi?id=119 comments >= 4)
-- Minor modifications of the %%post, %%preun and %%postun scripts
-- Corrected a couple of macro references in changelog entries (rpmlint)
-- Expanded tabs to spaces (also added a vim modeline)
+* Tue May 17 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.4-1
+- Updated the homepage URL
+- Syslog-ng data directory in %%{_datadir}/%%{name}
+- Include the main library header files in the devel subpackage
+
+* Fri May 13 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.4-0
+- Update to 3.2.4
+- No need to create the directory /etc/syslog-ng in the install section
+- Enable the test suite (but excluding the SQL and SSL tests)
+
+* Mon May 2 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.3-1
+- update to 3.2.3.
* Mon Apr 25 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.4-2
- cleans the sysconfig and logrotate file mess (#651823 comments 17, 20 and 21)
-- add support for vim versions 72 and 73; drop support for versions 6.2 and 6.3
-- clean the spoofsource conditional logical: libnet resides in /lib{,64}
+- add support for vim versions 72 and 73; drop support for 6x
+- clean the spoofsource conditional logical: libnet resides in /lib{,64} since
since 2009
* Wed Apr 13 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.4-1
@@ -200,7 +267,7 @@ fi
- updated the source URL
- versioned some of the build requirements
- dropped the libnet patch (syslog-ng-2.1.4-libnet.patch)
-- dropped support for EPEL-4 and EPEL-5 (syslog-ng 3.x requires pcre >= 7.3)
+- dropped support for EPEL-4 and EPEL-5 (syslog-ng 4.x requires pcre >= 7.3)
- new file: update-patterndb
* Sat Jul 24 2010 Doug Warner <silfreed at fedoraproject.org> - 3.1.1-1
diff --git a/syslog-ng.sysconfig b/syslog-ng.sysconfig
index f0c36b0..6d26b8b 100644
--- a/syslog-ng.sysconfig
+++ b/syslog-ng.sysconfig
@@ -1,3 +1,7 @@
+#---
+# Syslog-ng command line options
+# See syslog-ng(8) for more details
+#---
SYSLOGNG_PID="/var/run/syslog-ng.pid"
SYSLOGNG_OPTIONS="-p $SYSLOGNG_PID"
SYSLOGNG_COMPAT_PID="/var/run/syslogd.pid"
More information about the scm-commits
mailing list