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

[arekm]

Author: arekm                        Date: Tue Nov 29 17:27:44 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- systemd subpackage

---- Files affected:
packages/syslog-ng:
   syslog-ng.spec (1.229 -> 1.230) , syslog-ng-systemd.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/syslog-ng/syslog-ng.spec
diff -u packages/syslog-ng/syslog-ng.spec:1.229 packages/syslog-ng/syslog-ng.spec:1.230
--- packages/syslog-ng/syslog-ng.spec:1.229	Mon Nov 14 07:11:48 2011
+++ packages/syslog-ng/syslog-ng.spec	Tue Nov 29 18:27:39 2011
@@ -24,7 +24,7 @@
 Summary(pt_BR.UTF-8):	Daemon de log nova geração
 Name:		syslog-ng
 Version:	3.3.1
-Release:	4
+Release:	5
 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
@@ -39,6 +39,7 @@
 Patch0:		%{name}-datadir.patch
 Patch1:		cap_syslog-vserver-workaround.patch
 Patch2:		%{name}-nolibs.patch
+Patch3:		%{name}-systemd.patch
 URL:		http://www.balabit.com/products/syslog_ng/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
@@ -217,11 +218,21 @@
 %description devel -l pl.UTF-8
 Pliki nagłówkowe do tworzenia modułów dla sysloga-ng.
 
+%package systemd
+Summary:	systemd units for syslog-ng
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+Requires:	systemd
+
+%description systemd
+systemd units for syslog-ng
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 cp -a %{SOURCE4} doc
 cp -a %{SOURCE5} contrib/syslog-ng.conf.simple
 
@@ -245,7 +256,8 @@
 	--with-module-dir=%{_libdir}/syslog-ng \
 	--with-pidfile-dir=/var/run \
 	--with-timezone-dir=%{_datadir}/zoneinfo \
-	--disable-systemd \
+	--enable-systemd \
+	--with-systemdsystemunitdir=/lib/systemd/system \
 	--enable-ipv6 \
 	--enable-linux-caps \
 	--enable-pacct \
@@ -451,12 +463,19 @@
 %{_datadir}/syslog-ng/tools
 %{_pkgconfigdir}/syslog-ng.pc
 
+%files systemd
+%defattr(644,root,root,755)
+/lib/systemd/system/syslog-ng.service
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.230  2011/11/29 17:27:39  arekm
+- systemd subpackage
+
 Revision 1.229  2011/11/14 06:11:48  arekm
 - rel 4; install pc in pkgconfigdir
 

================================================================
Index: packages/syslog-ng/syslog-ng-systemd.patch
diff -u /dev/null packages/syslog-ng/syslog-ng-systemd.patch:1.1
--- /dev/null	Tue Nov 29 18:27:44 2011
+++ packages/syslog-ng/syslog-ng-systemd.patch	Tue Nov 29 18:27:39 2011
@@ -0,0 +1,14 @@
+--- syslog-ng-3.3.1/contrib/systemd/syslog-ng.service~	2011-09-09 09:14:53.000000000 +0200
++++ syslog-ng-3.3.1/contrib/systemd/syslog-ng.service	2011-11-29 18:24:53.010449488 +0100
+@@ -2,9 +2,10 @@
+ Description=System Logger Daemon
+ 
+ [Service]
++EnvironmentFile=/etc/sysconfig/syslog-ng
+ Sockets=syslog.socket
+ ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
+-ExecStart=/usr/sbin/syslog-ng -F
++ExecStart=/sbin/syslog-ng -F -f /etc/syslog-ng/syslog-ng.conf --worker-threads=1024
+ ExecReload=/bin/kill -HUP $MAINPID
+ StandardOutput=null
+ 
================================================================

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