commit syslogd for openSUSE:Factory

2012-02-08 Thread h_root
Hello community,

here is the log from the commit of package syslogd for openSUSE:Factory checked 
in at 2012-02-08 15:35:01

Comparing /work/SRC/openSUSE:Factory/syslogd (Old)
 and  /work/SRC/openSUSE:Factory/.syslogd.new (New)


Package is "syslogd", Maintainer is "wer...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/syslogd/syslogd.changes  2011-11-23 
19:37:49.0 +0100
+++ /work/SRC/openSUSE:Factory/.syslogd.new/syslogd.changes 2012-02-08 
15:35:02.0 +0100
@@ -1,0 +2,6 @@
+Fri Feb  3 16:31:30 UTC 2012 - wer...@suse.de
+
+- Do not use early configuration setup for networkless configuration
+  (bnc #728565)
+
+---



Other differences:
--
++ syslog-service-generator ++
--- /var/tmp/diff_new_pack.erbabJ/_old  2012-02-08 15:35:04.0 +0100
+++ /var/tmp/diff_new_pack.erbabJ/_new  2012-02-08 15:35:04.0 +0100
@@ -130,7 +130,6 @@
break
esac
done < ${config}
-   test -z "$network" && config=/etc/rsyslog.early.conf
 else
config=/etc/rsyslog.early.conf
 fi


-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit syslogd for openSUSE:Factory

2012-02-24 Thread h_root
Hello community,

here is the log from the commit of package syslogd for openSUSE:Factory checked 
in at 2012-02-24 12:06:50

Comparing /work/SRC/openSUSE:Factory/syslogd (Old)
 and  /work/SRC/openSUSE:Factory/.syslogd.new (New)


Package is "syslogd", Maintainer is "wer...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/syslogd/syslogd.changes  2012-02-08 
15:35:02.0 +0100
+++ /work/SRC/openSUSE:Factory/.syslogd.new/syslogd.changes 2012-02-24 
12:06:52.0 +0100
@@ -1,0 +2,16 @@
+Mon Feb 20 19:43:28 UTC 2012 - m...@suse.com
+
+- Detect if we have to use the new /run/systemd/journal/syslog
+  socket instead of the /dev/log under newer systemd versions.
+
+---
+Mon Feb 20 12:25:12 UTC 2012 - m...@suse.com
+
+- syslog-service: Added SYSLOG_REQUIRES_NETWORK variable allowing
+  the user to configure (override) whether the syslog daemon config
+  requires network or can be started early. Default is to detect
+  it for syslogd and syslog-ng and to just start rsyslogd early
+  with its normal config. Removed the rsyslog.early.conf use as it
+  is usually not needed [enable on-disk queues] (bnc#728565).
+
+---

New:

  sysklogd-1.4.1-systemd-sock-name.patch



Other differences:
--
++ syslogd.spec ++
--- /var/tmp/diff_new_pack.kxTOFB/_old  2012-02-24 12:06:54.0 +0100
+++ /var/tmp/diff_new_pack.kxTOFB/_new  2012-02-24 12:06:54.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package syslogd
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -71,6 +71,7 @@
 Patch23:sysklogd-1.4.1-reload.dif
 Patch24:sysklogd-1.4.1-systemd.dif
 Patch25:sysklogd-1.4.1-systemd-multi.dif
+Patch26:sysklogd-1.4.1-systemd-sock-name.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 %{expand: %%global sysdsysunitdir %(pkg-config systemd 
--variable=systemdsystemunitdir)}
 %{expand: %%global sysdsysconfdir %(pkg-config systemd 
--variable=systemdsystemconfdir)}
@@ -162,6 +163,7 @@
 %patch23 -p0 -b .reload
 %patch24 -p0 -b .sd
 %patch25 -p0 -b .sd2
+%patch26 -p0 -b .sd3
 %patch0  -p0
 
 %build

++ rc.earlysyslog ++
--- /var/tmp/diff_new_pack.kxTOFB/_old  2012-02-24 12:06:54.0 +0100
+++ /var/tmp/diff_new_pack.kxTOFB/_new  2012-02-24 12:06:54.0 +0100
@@ -41,7 +41,7 @@
 case "$SYSLOG_DAEMON" in
 rsyslogd)
syslog=rsyslogd
-   config=/etc/rsyslog.early.conf
+   config=/etc/rsyslog.conf
;;
 syslog-ng)
syslog=syslog-ng
@@ -71,22 +71,41 @@
 
 case "$SYSLOG_DAEMON" in
 syslog-ng)
-   while read line ; do
-   case "$line" in
-   \#*|"") continue ;;
-   *udp\ *|*udp\(*) exit 0 ;;
-   *tcp\ *|*tcp\(*) exit 0 ;;
-   esac
-   done < ${config}
+   case ${SYSLOG_REQUIRES_NETWORK} in
+   yes)exit 0 ;;
+   no);;
+   "")
+   while read line ; do
+   case "$line" in
+   \#*|"") continue ;;
+   *udp\ *|*udp\(*) exit 0 ;;
+   *tcp\ *|*tcp\(*) exit 0 ;;
+   esac
+   done < ${config}
+   ;;
+   esac
+   ;;
+rsyslogd)
+   # Network is usually not required for properly configured
+   # rsyslogd with enabled on-disk queues for remote logging,
+   # so we just start it with its normal configuration.
+   # "yes" allows the user to disable the early start.
+   case ${SYSLOG_REQUIRES_NETWORK} in
+   yes)exit 0 ;;
+   no|"") ;;
+   esac
;;
 *)
-   # in hope this works with the rsyslog.early.conf file
-   # (hard to implement for rsyslog with its includes/if
-   # statements)...
-   while read select action ; do
-   case "$select" in \#*|"") continue ;; esac
-   case "$action" in *@*)exit 0   ;; esac
-   done < ${config}
+   case ${SYSLOG_REQUIRES_NETWORK} in
+   yes)exit 0 ;;
+   no);;
+   "")
+   while read select action ; do
+   case "$select" in \#*|"") continue ;; esac
+   case "$action" in *@*)exit 0   ;; esac
+   done < ${config}
+   ;;
+   esac
;;
 esac
 

++ rc.syslog ++
--- /var/tmp/diff_new_pack.kxTOFB/_old  2012-02-24 12:06:54.0 +0100
+++ /var/tmp/diff_new_pack.kxTOFB/_new  2012-02-24 12:06:54.

commit syslogd for openSUSE:Factory

2012-03-09 Thread h_root
Hello community,

here is the log from the commit of package syslogd for openSUSE:Factory checked 
in at 2012-03-09 21:28:22

Comparing /work/SRC/openSUSE:Factory/syslogd (Old)
 and  /work/SRC/openSUSE:Factory/.syslogd.new (New)


Package is "syslogd", Maintainer is "wer...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/syslogd/syslogd.changes  2012-02-24 
12:06:52.0 +0100
+++ /work/SRC/openSUSE:Factory/.syslogd.new/syslogd.changes 2012-03-09 
21:28:29.0 +0100
@@ -1,0 +2,12 @@
+Wed Mar  7 14:22:13 UTC 2012 - wer...@suse.de
+
+- Restart the syslog service only from post of the klogd package if
+  the needed script is available (bnc#750478) Thanks to Lars Müller.
+- Some cleanup due rpm lint warnings
+
+---
+Tue Mar  6 12:33:27 UTC 2012 - wer...@suse.de
+
+- Add `su news news' to logrotate entry for news log file (bnc#750263) 
+
+---



Other differences:
--
++ syslogd.spec ++
--- /var/tmp/diff_new_pack.JRdl9E/_old  2012-03-09 21:28:33.0 +0100
+++ /var/tmp/diff_new_pack.JRdl9E/_new  2012-03-09 21:28:33.0 +0100
@@ -24,8 +24,14 @@
 License:GPL-2.0+
 Group:  System/Daemons
 BuildRequires:  pkg-config systemd-devel
-PreReq: coreutils %fillup_prereq sed
-PreReq: klogd syslog-service
+Requires(post): %fillup_prereq
+Requires(post):   %insserv_prereq
+Requires(post): permissions
+Requires(postun): %insserv_prereq
+Requires(prereq): coreutils
+Requires(prereq): klogd
+Requires(prereq): sed
+Requires(prereq): syslog-service
 Provides:   syslog
 Provides:   sysklogd
 AutoReqProv:on
@@ -95,7 +101,9 @@
 %package -n klogd
 License:GPL-2.0+
 Provides:   klogd:/sbin/klogd
-PreReq: %insserv_prereq  %fillup_prereq
+Requires(post): %fillup_prereq
+Requires(post):   %insserv_prereq
+Requires(postun): %insserv_prereq
 Summary:The kernel log daemon
 Group:  System/Daemons
 AutoReqProv:on
@@ -118,7 +126,9 @@
 
 %package -n syslog-service
 License:GPL-2.0+
-PreReq: %insserv_prereq  %fillup_prereq
+Requires(post): %fillup_prereq
+Requires(post): %insserv_prereq
+Requires(postun): %insserv_prereq
 Provides:   klogd:/etc/init.d/syslog
 Requires:   /etc/init.d/network logrotate
 Summary:Syslog service files & scripts
@@ -204,7 +214,13 @@
> $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.syslog
 %endif
 
+%if %{defined verify_permissions}
+%verifyscript
+%verify_permissions -e /etc/syslog.conf
+%endif
+
 %post
+%set_permissions /etc/syslog.conf
 # 
 # add syslog variables provided by syslogd if needed
 #
@@ -245,7 +261,9 @@
 chown news:news var/log/news/news.notice
 
 %postun
-%restart_on_update syslog
+if test -x /etc/init.d/syslog ; then
+   %restart_on_update syslog
+fi
 %{insserv_cleanup}
 # reset SYSLOG_DAEMON variable
 if test -f etc/sysconfig/syslog ; then
@@ -266,10 +284,14 @@
 mkdir -p -m 0755 var/run/syslog-ng
 
 %preun -n syslog-service
-%stop_on_removal syslog
+if test -x /etc/init.d/syslog ; then
+%stop_on_removal syslog
+fi
 
 %postun -n syslog-service
-%restart_on_update syslog
+if test -x /etc/init.d/syslog ; then
+   %restart_on_update syslog
+fi
 %{insserv_cleanup}
 
 %post -n klogd
@@ -277,13 +299,19 @@
 # add syslog variables provided by klogd if needed
 #
 %{fillup_only -ns syslog klogd}
-%restart_on_update syslog
+if test -x /etc/init.d/syslog ; then
+   %restart_on_update syslog
+fi
 
 %preun -n klogd
-%restart_on_update syslog
+if test -x /etc/init.d/syslog ; then
+   %restart_on_update syslog
+fi
 
 %postun -n klogd
-%restart_on_update syslog
+if test -x /etc/init.d/syslog ; then
+   %restart_on_update syslog
+fi
 %{insserv_cleanup}
 
 %files

++ logrotate.syslog ++
--- /var/tmp/diff_new_pack.JRdl9E/_old  2012-03-09 21:28:33.0 +0100
+++ /var/tmp/diff_new_pack.JRdl9E/_new  2012-03-09 21:28:33.0 +0100
@@ -49,6 +49,7 @@
 missingok
 notifempty
 size +4096k
+su news news
 create 640 news news
 sharedscripts
 postrotate


-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit syslogd for openSUSE:Factory

2011-11-07 Thread h_root
Hello community,

here is the log from the commit of package syslogd for openSUSE:Factory checked 
in at 2011-11-07 15:57:36

Comparing /work/SRC/openSUSE:Factory/syslogd (Old)
 and  /work/SRC/openSUSE:Factory/.syslogd.new (New)


Package is "syslogd", Maintainer is "wer...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/syslogd/syslogd.changes  2011-10-24 
14:02:40.0 +0200
+++ /work/SRC/openSUSE:Factory/.syslogd.new/syslogd.changes 2011-11-07 
15:57:39.0 +0100
@@ -1,0 +2,5 @@
+Mon Nov  7 10:04:35 UTC 2011 - wer...@suse.de
+
+- Invert network/early logic for rsyslog (bnc#728565)
+
+---



Other differences:
--
++ syslog-service-generator ++
--- /var/tmp/diff_new_pack.P5nOYD/_old  2011-11-07 15:57:50.0 +0100
+++ /var/tmp/diff_new_pack.P5nOYD/_new  2011-11-07 15:57:50.0 +0100
@@ -110,7 +110,7 @@
 ;;
 rsyslogd)
 syslog=rsyslogd
-config=/etc/rsyslog.early.conf
+config=/etc/rsyslog.conf
 socksdir=/var/run/rsyslog
 socks=$socksdir/additional-log-sockets.conf
 #
@@ -130,9 +130,9 @@
break
esac
done < ${config}
-   test -n "$network" && config=/etc/rsyslog.conf
+   test -z "$network" && config=/etc/rsyslog.early.conf
 else
-   config=/etc/rsyslog.conf
+   config=/etc/rsyslog.early.conf
 fi
 if test -r "$config" ; then
while read one two rest ; do


-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit syslogd for openSUSE:Factory

2011-11-23 Thread h_root
Hello community,

here is the log from the commit of package syslogd for openSUSE:Factory checked 
in at 2011-11-23 19:37:47

Comparing /work/SRC/openSUSE:Factory/syslogd (Old)
 and  /work/SRC/openSUSE:Factory/.syslogd.new (New)


Package is "syslogd", Maintainer is "wer...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/syslogd/syslogd.changes  2011-11-07 
15:57:39.0 +0100
+++ /work/SRC/openSUSE:Factory/.syslogd.new/syslogd.changes 2011-11-23 
19:37:49.0 +0100
@@ -1,0 +2,5 @@
+Tue Nov 22 08:17:38 UTC 2011 - wer...@suse.de
+
+- Add pre requires for fillup and insserv to klogd package (bnc#731541) 
+
+---



Other differences:
--
++ syslogd.spec ++
--- /var/tmp/diff_new_pack.8kpBts/_old  2011-11-23 19:37:50.0 +0100
+++ /var/tmp/diff_new_pack.8kpBts/_new  2011-11-23 19:37:50.0 +0100
@@ -94,6 +94,7 @@
 %package -n klogd
 License:GPLv2+
 Provides:   klogd:/sbin/klogd
+PreReq: %insserv_prereq  %fillup_prereq
 Summary:The kernel log daemon
 Group:  System/Daemons
 AutoReqProv:on


-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit syslogd for openSUSE:Factory

2011-09-01 Thread h_root

Hello community,

here is the log from the commit of package syslogd for openSUSE:Factory
checked in at Thu Sep 1 17:16:04 CEST 2011.




--- syslogd/syslogd.changes 2011-08-22 15:14:46.0 +0200
+++ /mounts/work_src_done/STABLE/syslogd/syslogd.changes2011-09-01 
13:43:14.0 +0200
@@ -1,0 +2,10 @@
+Thu Sep  1 11:41:23 UTC 2011 - wer...@suse.de
+
+- Opps, move /etc/sysconfig/syslogd -> /etc/sysconfig/syslog
+
+---
+Wed Aug 24 11:24:09 UTC 2011 - m...@suse.de
+
+- Improved syslog-service package summary
+
+---

calling whatdependson for head-i586




Other differences:
--
++ syslogd.spec ++
--- /var/tmp/diff_new_pack.AlS8bo/_old  2011-09-01 17:15:40.0 +0200
+++ /var/tmp/diff_new_pack.AlS8bo/_new  2011-09-01 17:15:40.0 +0200
@@ -30,7 +30,7 @@
 Provides:   sysklogd
 AutoReqProv:on
 Version:1.4.1
-Release:743
+Release:745
 Summary:The Syslog daemon
 Source: sysklogd-1.4.1.tar.bz2
 Source1:logrotate.syslog
@@ -119,7 +119,7 @@
 PreReq: %insserv_prereq  %fillup_prereq
 Provides:   klogd:/etc/init.d/syslog
 Requires:   /etc/init.d/network logrotate
-Summary:The kernel log daemon
+Summary:Syslog service files & scripts
 Group:  System/Daemons
 AutoReqProv:on
 BuildArch:  noarch
@@ -131,7 +131,7 @@
 
 Authors:
 
-Marius Tomaschewsk
+Marius Tomaschewski
 Werner Fink
 
 %prep
@@ -204,7 +204,7 @@
 # 
 # add syslog variables provided by syslogd if needed
 #
-%{fillup_only -ns syslog syslogd}
+%{fillup_only -ns syslog syslog}
 #
 # check if daemon configured in SYSLOG_DAEMON is
 # installed and switch to ourself if it's missed







Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit syslogd for openSUSE:Factory

2011-09-02 Thread h_root

Hello community,

here is the log from the commit of package syslogd for openSUSE:Factory
checked in at Fri Sep 2 13:20:35 CEST 2011.




--- syslogd/syslogd.changes 2011-09-01 13:43:14.0 +0200
+++ /mounts/work_src_done/STABLE/syslogd/syslogd.changes2011-09-02 
10:24:28.0 +0200
@@ -1,0 +2,6 @@
+Fri Sep  2 08:23:34 UTC 2011 - wer...@suse.de
+
+- Fix sysvinit boot script as klogd is not required anymore for
+  rsyslogd and syslog-ng (bnc#715648)
+
+---

calling whatdependson for head-i586




Other differences:
--
++ syslogd.spec ++
--- /var/tmp/diff_new_pack.I2xsjJ/_old  2011-09-02 13:20:20.0 +0200
+++ /var/tmp/diff_new_pack.I2xsjJ/_new  2011-09-02 13:20:20.0 +0200
@@ -30,7 +30,7 @@
 Provides:   sysklogd
 AutoReqProv:on
 Version:1.4.1
-Release:745
+Release:747
 Summary:The Syslog daemon
 Source: sysklogd-1.4.1.tar.bz2
 Source1:logrotate.syslog

++ rc.syslog ++
--- /var/tmp/diff_new_pack.I2xsjJ/_old  2011-09-02 13:20:21.0 +0200
+++ /var/tmp/diff_new_pack.I2xsjJ/_new  2011-09-02 13:20:21.0 +0200
@@ -95,7 +95,7 @@
 test "$1" == "stop" && exit 0
 exit 5
 }
-test -x ${klog_bin}   || {
+test ! -x ${klog_bin} -a "$start_klogd" = yes && {
 echo "${klog_bin} is not installed" 1>&2
 test "$1" == "stop" && exit 0
 exit 5







Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit syslogd for openSUSE:Factory

2011-09-20 Thread h_root

Hello community,

here is the log from the commit of package syslogd for openSUSE:Factory
checked in at Tue Sep 20 12:59:13 CEST 2011.




--- syslogd/syslogd.changes 2011-09-02 10:24:28.0 +0200
+++ /mounts/work_src_done/STABLE/syslogd/syslogd.changes2011-09-20 
10:42:42.0 +0200
@@ -1,0 +2,9 @@
+Tue Sep 20 08:38:55 UTC 2011 - wer...@suse.de
+
+- Add syslink to /dev/null for earlysyslog service unit to avoid
+  to start it twice with systemd
+- Do not disable SysV service links with systemd
+- For syslog service unit add conflicts witjh syslog-ng and rsyslog
+  service units
+
+---

calling whatdependson for head-i586




Other differences:
--
++ syslogd.spec ++
--- /var/tmp/diff_new_pack.V8oBvt/_old  2011-09-20 12:59:07.0 +0200
+++ /var/tmp/diff_new_pack.V8oBvt/_new  2011-09-20 12:59:07.0 +0200
@@ -195,6 +195,7 @@
 install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{sysdsysunitdir}/
 install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{sysdsysunitdir}/
 install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{sysdsysunitdir}/
+ln -sf /dev/null $RPM_BUILD_ROOT%{sysdsysunitdir}/earlysyslog.service
 %ifarch s390 s390x
 sed 's/^KERNEL_LOGLEVEL=1/KERNEL_LOGLEVEL=7/' %{SOURCE2} \
> $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.syslog
@@ -304,6 +305,7 @@
 %config(noreplace) /etc/logrotate.d/syslog
 %config /etc/init.d/syslog
 %config /etc/init.d/earlysyslog
+%config %{sysdsysunitdir}/earlysyslog.service
 %config %{sysdsysunitdir}/syslog.service
 %config %{sysdsysunitdir}/klog.service
 %doc %{_mandir}/man8/syslog.8.gz

++ syslog-service-generator ++
--- /var/tmp/diff_new_pack.V8oBvt/_old  2011-09-20 12:59:07.0 +0200
+++ /var/tmp/diff_new_pack.V8oBvt/_new  2011-09-20 12:59:07.0 +0200
@@ -321,12 +321,4 @@
 fi
 
 #
-# Last but not least remove the old (early) service links from SystemV init
-#
-for service in /etc/init.d/*.d/*syslog ; do
-test -h $service || continue
-/bin/rm -f $service
-done
-
-#
 # end of /lib/systemd/system-generator/syslog-service-generator

++ syslog.service ++
--- /var/tmp/diff_new_pack.V8oBvt/_old  2011-09-20 12:59:07.0 +0200
+++ /var/tmp/diff_new_pack.V8oBvt/_new  2011-09-20 12:59:07.0 +0200
@@ -18,7 +18,7 @@
 After=var-run.mount
 Before=syslog.target
 OnFailure=systemd-kmsg-syslogd.service
-Names=earlysyslog.service
+Conflicts=syslog-ng.service rsyslog.service
 
 #
 # Now systemd include the further dependency rules and







Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit syslogd for openSUSE:Factory

2011-12-06 Thread h_root
Hello community,

here is the log from the commit of package syslogd for openSUSE:Factory checked 
in at 2011-12-06 19:06:53

Comparing /work/SRC/openSUSE:Factory/syslogd (Old)
 and  /work/SRC/openSUSE:Factory/.syslogd.new (New)


Package is "syslogd", Maintainer is "wer...@suse.com"

Changes:




Other differences:
--
++ syslogd.spec ++
--- /var/tmp/diff_new_pack.T9AstG/_old  2011-12-06 19:40:49.0 +0100
+++ /var/tmp/diff_new_pack.T9AstG/_new  2011-12-06 19:40:49.0 +0100
@@ -21,7 +21,7 @@
 Name:   syslogd
 %define omc_prefix /usr/share/omc
 %define omc_svcdir %{omc_prefix}/svcinfo.d
-License:GPLv2+
+License:GPL-2.0+
 Group:  System/Daemons
 BuildRequires:  pkg-config systemd-devel
 PreReq: coreutils %fillup_prereq sed
@@ -92,7 +92,7 @@
 Shane Alderton 
 
 %package -n klogd
-License:GPLv2+
+License:GPL-2.0+
 Provides:   klogd:/sbin/klogd
 PreReq: %insserv_prereq  %fillup_prereq
 Summary:The kernel log daemon
@@ -116,7 +116,7 @@
 Shane Alderton 
 
 %package -n syslog-service
-License:GPLv2+
+License:GPL-2.0+
 PreReq: %insserv_prereq  %fillup_prereq
 Provides:   klogd:/etc/init.d/syslog
 Requires:   /etc/init.d/network logrotate


-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit syslogd for openSUSE:Factory

2011-08-19 Thread h_root

Hello community,

here is the log from the commit of package syslogd for openSUSE:Factory
checked in at Fri Aug 19 15:28:25 CEST 2011.




--- syslogd/syslogd.changes 2011-06-28 10:51:34.0 +0200
+++ syslogd/syslogd.changes 2011-08-19 14:34:28.0 +0200
@@ -1,0 +2,14 @@
+Fri Aug 19 12:32:29 UTC 2011 - wer...@suse.de
+
+- Make klogd.service and syslog.service static files and let
+  systemd include syslog.core within syslog.service, only the
+  syslog.core will be generated depending on /etc/sysconfig/syslog
+- Do not touch the files as long as syslog.service or klogd.service
+  are active 
+
+---
+Wed Aug 17 15:45:58 UTC 2011 - wer...@suse.de
+
+- Add generator script for better support with systemd 
+
+---

calling whatdependson for head-i586


New:

  klogd.service
  syslog-service-generator
  syslog.service



Other differences:
--
++ syslogd.spec ++
--- /var/tmp/diff_new_pack.cqwcRn/_old  2011-08-19 15:25:27.0 +0200
+++ /var/tmp/diff_new_pack.cqwcRn/_new  2011-08-19 15:25:27.0 +0200
@@ -23,11 +23,12 @@
 %define omc_svcdir %{omc_prefix}/svcinfo.d
 License:GPLv2+
 Group:  System/Daemons
+BuildRequires:  pkg-config systemd-devel
 PreReq: coreutils %fillup_prereq klogd sed
 Provides:   syslog
 AutoReqProv:on
 Version:1.4.1
-Release:739
+Release:741
 Summary:The Syslog daemon
 Source: sysklogd-1.4.1.tar.bz2
 Source1:logrotate.syslog
@@ -36,6 +37,9 @@
 Source4:rc.earlysyslog
 Source5:syslog.xml
 Source6:syslog.8
+Source7:syslog-service-generator
+Source8:klogd.service
+Source9:syslog.service
 Patch0: sysklogd-1.4.1.dif
 Patch1: sysklogd-1.4.1-dgram.patch
 Patch2: sysklogd-1.4.1-sparc.patch
@@ -63,6 +67,8 @@
 Patch24:sysklogd-1.4.1-systemd.dif
 Patch25:sysklogd-1.4.1-systemd-multi.dif
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+%{expand: %%global sysdsysunitdir %(pkg-config systemd 
--variable=systemdsystemunitdir)}
+%{expand: %%global sysdsysconfdir %(pkg-config systemd 
--variable=systemdsystemconfdir)}
 
 %description
 The syslogd daemon is the general system logging daemon, which is
@@ -147,7 +153,10 @@
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{5,8}
 mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
+mkdir -p $RPM_BUILD_ROOT%{sysdsysunitdir}-generators
+mkdir -p $RPM_BUILD_ROOT%{sysdsysunitdir}
 mkdir -p -m 0755 $RPM_BUILD_ROOT/var/run/rsyslog
+mkdir -p -m 0755 $RPM_BUILD_ROOT/var/run/syslog-ng
 make install MANDIR=%{_mandir} DESTDIR=$RPM_BUILD_ROOT
 ln -sf ../etc/init.d/syslog $RPM_BUILD_ROOT/sbin/rcsyslog
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/syslog
@@ -157,6 +166,9 @@
 install -d $RPM_BUILD_ROOT/%{omc_svcdir}/
 install -m 600 %{SOURCE5} $RPM_BUILD_ROOT/%{omc_svcdir}/
 install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/%{_mandir}/man8/syslog.8
+install -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{sysdsysunitdir}-generators/
+install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{sysdsysunitdir}/
+install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{sysdsysunitdir}/
 %ifarch s390 s390x
 sed 's/^KERNEL_LOGLEVEL=1/KERNEL_LOGLEVEL=7/' %{SOURCE2} \
> $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.syslog
@@ -203,6 +215,7 @@
 touch var/log/news/news.notice; chmod 640 var/log/news/news.notice
 chown news:news var/log/news/news.notice
 mkdir -p -m 0755 /var/run/rsyslog
+mkdir -p -m 0755 /var/run/syslog-ng
 
 %preun
 %stop_on_removal syslog
@@ -239,12 +252,16 @@
 %config(noreplace) /etc/logrotate.d/syslog
 %config /etc/init.d/syslog
 %config /etc/init.d/earlysyslog
+%config %{sysdsysunitdir}/klogd.service
+%config %{sysdsysunitdir}/syslog.service
 %doc %{_mandir}/man8/klogd.8.gz
 %doc %{_mandir}/man8/sysklogd.8.gz
 %doc %{_mandir}/man8/syslog.8.gz
-/sbin/rcsyslog
 /sbin/klogd
+/sbin/rcsyslog
+%attr(0744,root,root) %{sysdsysunitdir}-generators/syslog-service-generator
 %attr(0755,root,root) %dir %ghost /var/run/rsyslog/
+%attr(0755,root,root) %dir %ghost /var/run/syslog-ng/
 %{omc_svcdir}/syslog.xml
 
 %changelog

++ klogd.service ++
# /lib/systemd/system/klogd.service
#
# This file is part of package klogd.
#
# Copyright (c) 2011 SuSE LINUX Products GmbH, Germany.
# Author: Werner Fink
# Please send feedback to http://www.suse.de/feedback
#
# Description:
#
#  Used to start klogd, the System Kernel Logging Service
#  if and only if the System Logger does not provide this
#  its self.  If the System Logger can do Kernel Logging
#  Service this file should be masked by a symbolic link
#  from /etc/systemd/system/klogd.service to /dev/null.
#
#  If klogd.service is

commit syslogd for openSUSE:Factory

2011-08-23 Thread h_root

Hello community,

here is the log from the commit of package syslogd for openSUSE:Factory
checked in at Tue Aug 23 09:16:23 CEST 2011.




--- syslogd/syslogd.changes 2011-08-19 14:34:28.0 +0200
+++ /mounts/work_src_done/STABLE/syslogd/syslogd.changes2011-08-22 
15:14:46.0 +0200
@@ -1,0 +2,13 @@
+Mon Aug 22 13:07:16 UTC 2011 - wer...@suse.de
+
+- Package split: klogd -> klogd + syslog-service because the
+  service boot scripts and service unit files do belong to all
+  system logger daemons.
+
+---
+Mon Aug 22 11:10:10 UTC 2011 - wer...@suse.de
+
+- Check for klogd buitin service for syslog-ng and not syslogd
+- Remove the klogd enable/disable service links if required 
+
+---

calling whatdependson for head-i586


New:

  klog.service
  sysconfig.klogd
  sysconfig.syslogd



Other differences:
--
++ syslogd.spec ++
--- /var/tmp/diff_new_pack.OQTEvG/_old  2011-08-23 09:09:46.0 +0200
+++ /var/tmp/diff_new_pack.OQTEvG/_new  2011-08-23 09:09:46.0 +0200
@@ -24,22 +24,27 @@
 License:GPLv2+
 Group:  System/Daemons
 BuildRequires:  pkg-config systemd-devel
-PreReq: coreutils %fillup_prereq klogd sed
+PreReq: coreutils %fillup_prereq sed
+PreReq: klogd syslog-service
 Provides:   syslog
+Provides:   sysklogd
 AutoReqProv:on
 Version:1.4.1
-Release:741
+Release:743
 Summary:The Syslog daemon
 Source: sysklogd-1.4.1.tar.bz2
 Source1:logrotate.syslog
 Source2:sysconfig.syslog
-Source3:rc.syslog
-Source4:rc.earlysyslog
-Source5:syslog.xml
-Source6:syslog.8
-Source7:syslog-service-generator
-Source8:klogd.service
-Source9:syslog.service
+Source3:sysconfig.syslogd
+Source4:sysconfig.klogd
+Source5:rc.syslog
+Source6:rc.earlysyslog
+Source7:syslog.xml
+Source8:syslog.8
+Source9:syslog-service-generator
+Source10:   klogd.service
+Source11:   syslog.service
+Source12:   klog.service
 Patch0: sysklogd-1.4.1.dif
 Patch1: sysklogd-1.4.1-dgram.patch
 Patch2: sysklogd-1.4.1-sparc.patch
@@ -88,12 +93,10 @@
 
 %package -n klogd
 License:GPLv2+
-PreReq: %insserv_prereq  %fillup_prereq
-Provides:   sysklogd
-Provides:   syslogd:/sbin/klogd
-Requires:   /etc/init.d/network logrotate
+Provides:   klogd:/sbin/klogd
 Summary:The kernel log daemon
 Group:  System/Daemons
+AutoReqProv:on
 
 %description -n klogd
 The klogd daemon 'listens' to kernel log messages, prioritizes them,
@@ -111,6 +114,26 @@
 Juha Virtanen 
 Shane Alderton 
 
+%package -n syslog-service
+License:GPLv2+
+PreReq: %insserv_prereq  %fillup_prereq
+Provides:   klogd:/etc/init.d/syslog
+Requires:   /etc/init.d/network logrotate
+Summary:The kernel log daemon
+Group:  System/Daemons
+AutoReqProv:on
+BuildArch:  noarch
+
+%description -n syslog-service
+The package syslog-service provides the service boot
+scripts for SysV and the service unit files for systemd.
+
+
+Authors:
+
+Marius Tomaschewsk
+Werner Fink
+
 %prep
 %setup -n sysklogd-1.4.1
 %patch1  -p0 -b .dgram
@@ -161,14 +184,17 @@
 ln -sf ../etc/init.d/syslog $RPM_BUILD_ROOT/sbin/rcsyslog
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/syslog
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates
-install -m 754 %{SOURCE3} $RPM_BUILD_ROOT/etc/init.d/syslog
-install -m 754 %{SOURCE4} $RPM_BUILD_ROOT/etc/init.d/earlysyslog
+install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/var/adm/fillup-templates
+install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/var/adm/fillup-templates
+install -m 754 %{SOURCE5} $RPM_BUILD_ROOT/etc/init.d/syslog
+install -m 754 %{SOURCE6} $RPM_BUILD_ROOT/etc/init.d/earlysyslog
 install -d $RPM_BUILD_ROOT/%{omc_svcdir}/
-install -m 600 %{SOURCE5} $RPM_BUILD_ROOT/%{omc_svcdir}/
-install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/%{_mandir}/man8/syslog.8
-install -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{sysdsysunitdir}-generators/
-install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{sysdsysunitdir}/
-install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{sysdsysunitdir}/
+install -m 600 %{SOURCE7} $RPM_BUILD_ROOT/%{omc_svcdir}/
+install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/%{_mandir}/man8/syslog.8
+install -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{sysdsysunitdir}-generators/
+install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{sysdsysunitdir}/
+install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{sysdsysunitdir}/
+install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{sysdsysunitdir}/
 %ifarch s390 s390x
 sed 's/^KERNEL_LOG

commit syslogd for openSUSE:Factory

2011-05-27 Thread h_root

Hello community,

here is the log from the commit of package syslogd for openSUSE:Factory
checked in at Fri May 27 12:27:48 CEST 2011.




--- syslogd/syslogd.changes 2011-01-20 10:42:29.0 +0100
+++ /mounts/work_src_done/STABLE/syslogd/syslogd.changes2011-05-27 
10:05:53.0 +0200
@@ -1,0 +2,5 @@
+Fri May 27 07:53:38 UTC 2011 - m...@suse.de
+
+- Removed touch of obsolete /var/log/boot.log from spec post.
+
+---

calling whatdependson for head-i586




Other differences:
--
++ syslogd.spec ++
--- /var/tmp/diff_new_pack.Qnl3PV/_old  2011-05-27 12:24:36.0 +0200
+++ /var/tmp/diff_new_pack.Qnl3PV/_new  2011-05-27 12:24:36.0 +0200
@@ -27,7 +27,7 @@
 Provides:   syslog
 AutoReqProv:on
 Version:1.4.1
-Release:727
+Release:733
 Summary:The Syslog daemon
 Source: sysklogd-1.4.1.tar.bz2
 Source1:logrotate.syslog
@@ -188,7 +188,6 @@
 #
 mkdir -p var/log
 touch var/log/messages;  chmod 640 var/log/messages
-touch var/log/boot.log;  chmod 640 var/log/boot.log
 touch var/log/mail;  chmod 640 var/log/mail
 touch var/log/mail.info; chmod 640 var/log/mail.info
 touch var/log/mail.warn; chmod 640 var/log/mail.warn







Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit syslogd for openSUSE:Factory

2011-06-06 Thread h_root

Hello community,

here is the log from the commit of package syslogd for openSUSE:Factory
checked in at Mon Jun 6 09:48:41 CEST 2011.




--- syslogd/syslogd.changes 2011-05-27 10:05:53.0 +0200
+++ /mounts/work_src_done/STABLE/syslogd/syslogd.changes2011-05-27 
13:48:02.0 +0200
@@ -1,0 +2,5 @@
+Fri May 27 11:47:47 UTC 2011 - lnus...@suse.de
+
+- don't use /var/lock/subsys
+
+---

calling whatdependson for head-i586




Other differences:
--
++ syslogd.spec ++
--- /var/tmp/diff_new_pack.mO9Edv/_old  2011-06-06 09:47:59.0 +0200
+++ /var/tmp/diff_new_pack.mO9Edv/_new  2011-06-06 09:47:59.0 +0200
@@ -27,7 +27,7 @@
 Provides:   syslog
 AutoReqProv:on
 Version:1.4.1
-Release:733
+Release:735
 Summary:The Syslog daemon
 Source: sysklogd-1.4.1.tar.bz2
 Source1:logrotate.syslog

++ rc.syslog ++
--- /var/tmp/diff_new_pack.mO9Edv/_old  2011-06-06 09:47:59.0 +0200
+++ /var/tmp/diff_new_pack.mO9Edv/_new  2011-06-06 09:47:59.0 +0200
@@ -96,8 +96,8 @@
 test "$1" == "stop" && exit 0
 exit 5
 }
-test -s /var/lock/subsys/syslogd && {
-read -t 5 syslog_use < /var/lock/subsys/syslogd
+test -s /run/rcsyslog && {
+read -t 5 syslog_use < /run/rcsyslog
 }
 test -z "$syslog_use" && syslog_use=${syslog_bin}
 syslog_use_pid="/var/run/${syslog_use##*\/}.pid"
@@ -117,16 +117,16 @@
 rc_reset
 case "$1" in
 start)
-   if test -e /var/lock/subsys/earlysyslog ; then
+   if test -e /run/rcearlysyslog ; then
# Syslog service already done
-   rm -f  /var/lock/subsys/earlysyslog
+   rm -f  /run/rcearlysyslog
case "$SYSLOG_DAEMON" in
rsyslogd) ;; # switch to normal config
*) exit 0 ;;
esac
elif test "$2" = "early" ; then
# Start syslog service early
-   > /var/lock/subsys/earlysyslog
+   > /run/rcearlysyslog
fi
 
if ! test -e /dev/xconsole ; then
@@ -137,7 +137,7 @@
if test -s ${syslog_use_pid} ; then
killproc -p ${syslog_use_pid} ${syslog_use}
echo -n "Re-"
-   rm -f /var/lock/subsys/syslogd
+   rm -f /run/rcsyslog
fi
echo -n "Starting syslog services"
test -z "$KERNEL_LOGLEVEL" && KERNEL_LOGLEVEL=1
@@ -181,7 +181,7 @@
rc_status
 
# Remember the currently used syslog daemon
-   echo ${syslog_bin} > /var/lock/subsys/syslogd
+   echo ${syslog_bin} > /run/rcsyslog
 
if test $? -eq 0 ; then
if test "$start_klogd" = yes ; then
@@ -192,7 +192,7 @@
rc_status -v
;;
 stop)
-   rm -f /var/lock/subsys/earlysyslog
+   rm -f /run/rcearlysyslog
test "$2" = "early" && exit 0
 
echo -n "Shutting down syslog services"
@@ -202,7 +202,7 @@
killproc ${klog_bin}
fi
killproc -p ${syslog_use_pid} ${syslog_use} ; rc_status -v
-   rm -f /var/lock/subsys/syslogd
+   rm -f /run/rcsyslog
;;
 try-restart|condrestart)
if test "$1" = "condrestart"; then







Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit syslogd for openSUSE:Factory

2011-06-07 Thread h_root

Hello community,

here is the log from the commit of package syslogd for openSUSE:Factory
checked in at Tue Jun 7 09:00:57 CEST 2011.




--- syslogd/syslogd.changes 2011-05-27 13:48:02.0 +0200
+++ /mounts/work_src_done/STABLE/syslogd/syslogd.changes2011-06-06 
15:19:47.0 +0200
@@ -1,0 +2,6 @@
+Mon Jun  6 13:11:31 UTC 2011 - m...@suse.de
+
+- Disabled klogd in /etc/init.d/syslog, when the syslog-ng.conf
+  config file reads /proc/kmsg directly.
+
+---

calling whatdependson for head-i586




Other differences:
--
++ syslogd.spec ++
--- /var/tmp/diff_new_pack.aogR1v/_old  2011-06-07 09:00:14.0 +0200
+++ /var/tmp/diff_new_pack.aogR1v/_new  2011-06-07 09:00:14.0 +0200
@@ -27,7 +27,7 @@
 Provides:   syslog
 AutoReqProv:on
 Version:1.4.1
-Release:735
+Release:737
 Summary:The Syslog daemon
 Source: sysklogd-1.4.1.tar.bz2
 Source1:logrotate.syslog

++ rc.syslog ++
--- /var/tmp/diff_new_pack.aogR1v/_old  2011-06-07 09:00:14.0 +0200
+++ /var/tmp/diff_new_pack.aogR1v/_new  2011-06-07 09:00:14.0 +0200
@@ -67,6 +67,12 @@
if [ ! -d $ngsocksdir ]; then
mkdir -p $ngsocksdir
fi
+   test -r "$config" && \
+   while read line; do
+   case $line in file*/proc/kmsg*)
+   start_klogd=no ; break ;;
+   esac
+   done < $config
;;
 *)
syslog=syslogd







Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit syslogd for openSUSE:Factory

2011-06-29 Thread h_root

Hello community,

here is the log from the commit of package syslogd for openSUSE:Factory
checked in at Wed Jun 29 14:07:02 CEST 2011.




--- syslogd/syslogd.changes 2011-06-06 15:19:47.0 +0200
+++ /mounts/work_src_done/STABLE/syslogd/syslogd.changes2011-06-28 
10:51:34.0 +0200
@@ -1,0 +2,5 @@
+Tue Jun 28 08:51:31 UTC 2011 - a...@suse.de
+
+- Fix build - create ghost dir during install
+
+---

calling whatdependson for head-i586




Other differences:
--
++ syslogd.spec ++
--- /var/tmp/diff_new_pack.fhxR2L/_old  2011-06-29 14:06:25.0 +0200
+++ /var/tmp/diff_new_pack.fhxR2L/_new  2011-06-29 14:06:25.0 +0200
@@ -27,7 +27,7 @@
 Provides:   syslog
 AutoReqProv:on
 Version:1.4.1
-Release:737
+Release:739
 Summary:The Syslog daemon
 Source: sysklogd-1.4.1.tar.bz2
 Source1:logrotate.syslog
@@ -147,6 +147,7 @@
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{5,8}
 mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
+mkdir -p -m 0755 $RPM_BUILD_ROOT/var/run/rsyslog
 make install MANDIR=%{_mandir} DESTDIR=$RPM_BUILD_ROOT
 ln -sf ../etc/init.d/syslog $RPM_BUILD_ROOT/sbin/rcsyslog
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/syslog







Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit syslogd for openSUSE:Factory

2011-10-24 Thread h_root
Hello community,

here is the log from the commit of package syslogd for openSUSE:Factory checked 
in at 2011-10-24 12:37:57

Comparing /work/SRC/openSUSE:Factory/syslogd (Old)
 and  /work/SRC/openSUSE:Factory/.syslogd.new (New)


Package is "syslogd", Maintainer is "wer...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/syslogd/syslogd.changes  2011-09-23 
12:47:17.0 +0200
+++ /work/SRC/openSUSE:Factory/.syslogd.new/syslogd.changes 2011-10-24 
14:02:40.0 +0200
@@ -1,0 +2,11 @@
+Mon Oct 24 08:29:15 UTC 2011 - wer...@suse.de
+
+- Wrap touch command with correct umask (bnc#725875) 
+
+---
+Fri Oct 21 09:15:14 UTC 2011 - wer...@suse.de
+
+- Help the bash by using TMPDIR=/run to avoid trouble with the
+  temporary files used for here-documents (bnc#724610) 
+
+---



Other differences:
--
++ syslog-service-generator ++
--- /var/tmp/diff_new_pack.W3fWcM/_old  2011-10-24 14:02:42.0 +0200
+++ /var/tmp/diff_new_pack.W3fWcM/_new  2011-10-24 14:02:42.0 +0200
@@ -18,6 +18,9 @@
 #
 
 umask 0022
+TMPDIR=/run
+
+export TMPDIR
 
 : ${SBINDIR:=/sbin}
 : ${RUN_PATH:=/run/systemd}
@@ -54,6 +57,17 @@
 fi
 
 #
+# Simple helper for correct permissions of the socket
+#
+touch ()
+{
+local mask=$(umask)
+umask 0066
+/bin/touch ${1+"$@"}
+umask $mask
+}
+
+#
 # Default is no network and start klogd
 #
 network=
@@ -91,7 +105,7 @@
done < $config
 fi
 /bin/mkdir -p -m 0755 ${socksdir#/var}
-/bin/touch -m 0600 ${socks#/var}
+touch ${socks#/var}
 params="$SYSLOG_NG_PARAMS"
 ;;
 rsyslogd)
@@ -129,7 +143,7 @@
done < $config
 fi
 /bin/mkdir -p -m 0755 ${socksdir#/var}
-/bin/touch -m 0600 ${socks#/var}
+touch ${socks#/var}
 compat=${RSYSLOGD_COMPAT_VERSION:-${RSYSLOGD_NATIVE_VERSION}}
 params="-c ${compat:-3} -f $config $RSYSLOGD_PARAMS"
 ;;
@@ -145,7 +159,7 @@
done < ${config}
 fi
 /bin/mkdir -p -m 0755 ${socksdir#/var}
-/bin/touch -m 0600 ${socks#/var}
+touch ${socks#/var}
 params="$SYSLOGD_PARAMS"
 esac
 


-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org