summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2014-09-26 19:40:47 +0000
committerIan Stakenvicius <axs@gentoo.org>2014-09-26 19:40:47 +0000
commit077beed508d48b099a970aeb9285a7a50c303f46 (patch)
tree0c1127964ac0d8d856d2766adbe2725b9e6d1f7b /app-admin/sysklogd
parentdropping file temporarily to adjust sticky options (diff)
downloadgentoo-2-077beed508d48b099a970aeb9285a7a50c303f46.tar.gz
gentoo-2-077beed508d48b099a970aeb9285a7a50c303f46.tar.bz2
gentoo-2-077beed508d48b099a970aeb9285a7a50c303f46.zip
fixed cvs sticky options on file(s) that should not have cvs keyword expansion
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
Diffstat (limited to 'app-admin/sysklogd')
-rw-r--r--app-admin/sysklogd/ChangeLog8
-rw-r--r--app-admin/sysklogd/files/sysklogd-1.5-debian-cron.patch38
2 files changed, 44 insertions, 2 deletions
diff --git a/app-admin/sysklogd/ChangeLog b/app-admin/sysklogd/ChangeLog
index a117e4e7e214..b5bd52bbb37b 100644
--- a/app-admin/sysklogd/ChangeLog
+++ b/app-admin/sysklogd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/sysklogd
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/ChangeLog,v 1.88 2013/08/24 09:41:56 pinkbyte Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/ChangeLog,v 1.89 2014/09/26 19:40:47 axs Exp $
+
+ 26 Sep 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+ +files/sysklogd-1.5-debian-cron.patch:
+ fixed cvs sticky options on file(s) that should not have cvs keyword expansion
24 Aug 2013; Sergey Popov <pinkbyte@gentoo.org> sysklogd-1.5-r3.ebuild:
Add ~mips keyword
diff --git a/app-admin/sysklogd/files/sysklogd-1.5-debian-cron.patch b/app-admin/sysklogd/files/sysklogd-1.5-debian-cron.patch
new file mode 100644
index 000000000000..7f6c2a79b0b2
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd-1.5-debian-cron.patch
@@ -0,0 +1,38 @@
+--- debian/cron.daily
++++ debian/cron.daily
+@@ -20,10 +20,6 @@
+ # Written by Martin Schulze <joey@debian.org>.
+ # $Id: cron.daily,v 1.14 2007-05-28 16:33:34 joey Exp $
+
+-test -x /usr/sbin/syslogd-listfiles || exit 0
+-test -x /sbin/syslogd || exit 0
+-test -f /usr/share/sysklogd/dummy || exit 0
+-
+ set -e
+
+ cd /var/log
+@@ -41,4 +37,4 @@
+
+ # Restart syslogd
+ #
+-/etc/init.d/sysklogd reload-or-restart > /dev/null
++/etc/init.d/sysklogd --quiet reload
+--- debian/cron.weekly
++++ debian/cron.weekly
+@@ -19,10 +19,6 @@
+ # Written by Ian A. Murdock <imurdock@debian.org>.
+ # $Id: cron.weekly,v 1.11 2007-05-28 16:33:34 joey Exp $
+
+-test -x /usr/sbin/syslogd-listfiles || exit 0
+-test -x /sbin/syslogd || exit 0
+-test -f /usr/share/sysklogd/dummy || exit 0
+-
+ set -e
+
+ cd /var/log
+@@ -40,4 +36,4 @@
+
+ # Restart syslogd
+ #
+-/etc/init.d/sysklogd reload-or-restart > /dev/null
++/etc/init.d/sysklogd --quiet reload