[packages/syslog-ng] up to 3.6.2
glen
glen at pld-linux.org
Mon Jun 1 07:35:34 CEST 2015
commit bb684e69877064af58fcb2abfd8731e70051b8dd
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Jun 1 08:08:06 2015 +0300
up to 3.6.2
syslog-ng-datadir.patch | 21 +++++++++------------
syslog-ng-systemd.patch | 16 +++++++---------
syslog-ng.spec | 33 ++++++++++++++++++++++-----------
3 files changed, 38 insertions(+), 32 deletions(-)
---
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 315d04d..b756a9f 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -1,8 +1,17 @@
-#
# TODO:
-# - switch to LTS version
+# - switch to LTS version??? where???
# - relies on libs in /usr which is wrong
# (well, for modules bringing additional functionality it's acceptable IMO --q)
+# - new files:
+#/lib64/syslog-ng/libgraphite.so
+#/lib64/syslog-ng/libpseudofile.so
+#/lib64/syslog-ng/libsdjournal.so
+#/lib64/syslog-ng/libtest/libsyslog-ng-test.a
+#%{_pkgconfigdir}/syslog-ng-test.pc
+#%{_datadir}/syslog-ng/include/scl/graphite/README
+#%{_datadir}/syslog-ng/include/scl/graphite/plugin.conf
+#%{_datadir}/syslog-ng/include/scl/nodejs/plugin.conf
+
#
# Conditional build:
%bcond_with dynamic # link dynamically with glib, eventlog, pcre (modules are always linked dynamically)
@@ -25,28 +34,29 @@
%else
%define glib2_ver 1:2.24.0
%endif
+%define mver %(echo %{version} | cut -d. -f1,2)
Summary: Syslog-ng - new generation of the system logger
Summary(pl.UTF-8): Syslog-ng - systemowy demon logujący nowej generacji
Summary(pt_BR.UTF-8): Daemon de log nova geração
Name: syslog-ng
-Version: 3.5.6
-Release: 4
+Version: 3.6.2
+Release: 0.1
License: GPL v2+ with OpenSSL exception
Group: Daemons
Source0: http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/%{version}/source/%{name}_%{version}.tar.gz
-# Source0-md5: eee31ddb012b1fcf2b6a6a99f073a9a6
+# Source0-md5: 6928e9be3499a2e9ae52ea8aa204b165
Source1: %{name}.init
Source2: %{name}.conf
Source3: %{name}.logrotate
-Source4: http://www.balabit.com/support/documentation/syslog-ng-ose-3.5-guides/en/syslog-ng-ose-v3.5-guide-admin/pdf/%{name}-ose-v3.5-guide-admin.pdf
-# Source4-md5: 4c3c7f679e430373375752534e61abee
+Source4: http://www.balabit.com/support/documentation/syslog-ng-ose-%{mver}-guides/en/syslog-ng-ose-v%{mver}-guide-admin/pdf/%{name}-ose-v%{mver}-guide-admin.pdf
+# Source4-md5: bb12c18aef655096987911c4a9fe3ffa
Source5: %{name}-simple.conf
Patch0: %{name}-datadir.patch
Patch1: cap_syslog-vserver-workaround.patch
Patch2: %{name}-nolibs.patch
Patch3: %{name}-systemd.patch
Patch4: man-paths.patch
-URL: http://www.balabit.com/products/syslog_ng/
+URL: https://www.balabit.com/network-security/syslog-ng/opensource-logging-system
%{?with_geoip:BuildRequires: GeoIP-devel >= 1.5.1}
BuildRequires: autoconf >= 2.53
BuildRequires: automake
@@ -426,9 +436,9 @@ exit 0
%files
%defattr(644,root,root,755)
-%doc AUTHORS NEWS debian/syslog-ng.conf* contrib/relogger.pl
+%doc AUTHORS NEWS.md debian/syslog-ng.conf* contrib/relogger.pl
%doc contrib/syslog-ng.conf.{doc,simple,RedHat}
-%doc contrib/{apparmor,selinux,syslog2ng} doc/syslog-ng-ose-v3.5-guide-admin.pdf
+%doc contrib/{apparmor,selinux,syslog2ng} doc/syslog-ng-ose-v%{mver}-guide-admin.pdf
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
%attr(750,root,root) %dir %{_sysconfdir}/syslog-ng
%attr(750,root,root) %dir %{_sysconfdir}/syslog-ng/patterndb.d
@@ -536,7 +546,8 @@ exit 0
%files libs
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libsyslog-ng-%{version}.so
+%attr(755,root,root) %{_libdir}/libsyslog-ng-%{mver}.so.*.*.*
+%ghost %{_libdir}/libsyslog-ng-%{mver}.so.0
%dir %{_datadir}/syslog-ng
%files devel
diff --git a/syslog-ng-datadir.patch b/syslog-ng-datadir.patch
index 9eb4631..40731b9 100644
--- a/syslog-ng-datadir.patch
+++ b/syslog-ng-datadir.patch
@@ -1,20 +1,17 @@
---- 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 @@
+FIXME: drop this patch and just fix PATH_LOCALSTATEDIR ?
+
+
+--- syslog-ng-3.6.2/lib/syslog-ng.h~ 2014-12-15 16:48:45.000000000 +0200
++++ syslog-ng-3.6.2/lib/syslog-ng.h 2015-06-01 08:04:18.542588343 +0300
+@@ -42,7 +42,7 @@
+ #if ENABLE_ENV_WRAPPER
#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
+ #define SAFE_STRING(x) ((x) ? (x) : "NULL")
+
--- syslog-ng-3.2.2/scripts/update-patterndb.in~ 2010-11-20 09:47:33.000000000 +0100
+++ syslog-ng-3.2.2/scripts/update-patterndb.in 2011-01-27 20:43:14.656000204 +0100
@@ -3,6 +3,6 @@
diff --git a/syslog-ng-systemd.patch b/syslog-ng-systemd.patch
index ee401fc..54c88ec 100644
--- a/syslog-ng-systemd.patch
+++ b/syslog-ng-systemd.patch
@@ -1,15 +1,13 @@
---- syslog-ng-3.5.2/contrib/systemd/syslog-ng.service~ 2013-09-17 17:43:11.000000000 +0200
-+++ syslog-ng-3.5.2/contrib/systemd/syslog-ng.service 2013-12-01 22:50:06.249492652 +0100
-@@ -3,9 +3,11 @@
- Documentation=man:syslog-ng(8)
+--- syslog-ng-3.6.2/contrib/systemd/syslog-ng.service~ 2014-12-15 16:48:45.000000000 +0200
++++ syslog-ng-3.6.2/contrib/systemd/syslog-ng.service 2015-06-01 08:06:32.632888085 +0300
+@@ -4,7 +4,9 @@
[Service]
-+EnvironmentFile=-/etc/sysconfig/syslog-ng
Type=notify
- Sockets=syslog.socket
-ExecStart=/usr/sbin/syslog-ng -F
++EnvironmentFile=-/etc/sysconfig/syslog-ng
+ExecStartPre=-/bin/systemctl stop systemd-kmsg-syslogd.service
-+ExecStart=/sbin/syslog-ng -F -f /etc/syslog-ng/syslog-ng.conf --worker-threads=1024
++ExecStart=/sbin/syslog-ng -F -f /etc/syslog-ng/syslog-ng.conf -p /var/run/syslogd.pid --worker-threads=1024
ExecReload=/bin/kill -HUP $MAINPID
- StandardOutput=null
- Restart=on-failure
+ StandardOutput=journal
+ StandardError=journal
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/syslog-ng.git/commitdiff/bb684e69877064af58fcb2abfd8731e70051b8dd
More information about the pld-cvs-commit
mailing list