Commit 7efd9efe authored by Paul Martin's avatar Paul Martin Committed by Tobias Frost

Import Debian changes 3.8.7-2

logrotate (3.8.7-2) unstable; urgency=low

  * New patch:
    - taboo-716649.patch: Add .dpkg-bak and .dpkg-del to taboo extensions.
      (Closes: #716649)
  * Bump standards version to 3.9.6. (No changes needed.)
parent e683095f
logrotate (3.8.7-2) unstable; urgency=low
* New patch:
- taboo-716649.patch: Add .dpkg-bak and .dpkg-del to taboo extensions.
(Closes: #716649)
* Bump standards version to 3.9.6. (No changes needed.)
-- Paul Martin <pm@debian.org> Tue, 05 May 2015 23:18:48 +0100
logrotate (3.8.7-1) unstable; urgency=low
* New patch:
......
......@@ -6,7 +6,7 @@ Build-Depends: libpopt-dev, debhelper (>= 9),
libselinux1-dev [linux-any], libacl1-dev [linux-any]
Vcs-Svn: http://svn.fedorahosted.org/svn/logrotate/
Homepage: https://fedorahosted.org/logrotate/
Standards-Version: 3.9.5
Standards-Version: 3.9.6
Package: logrotate
Architecture: any
......
......@@ -5,3 +5,4 @@ cpp-crossbuild.patch
chown-484762.patch
mktime-718332.patch
man-su-explanation-729315.patch
taboo-716649.patch
Index: logrotate-3.8.7/config.c
===================================================================
--- logrotate-3.8.7.orig/config.c 2015-05-05 22:40:51.826487901 +0100
+++ logrotate-3.8.7/config.c 2015-05-05 22:41:03.638727815 +0100
@@ -113,6 +113,7 @@
static char *defTabooExts[] = { ".rpmsave", ".rpmorig", "~", ",v",
".disabled", ".dpkg-old", ".dpkg-dist", ".dpkg-new", ".cfsaved",
".ucf-old", ".ucf-dist", ".ucf-new",
+ ".dpkg-bak", ".dpkg-del",
".rpmnew", ".swp", ".cfsaved", ".rhn-cfg-tmp-*"
};
static int defTabooCount = sizeof(defTabooExts) / sizeof(char *);
Index: logrotate-3.8.7/logrotate.8
===================================================================
--- logrotate-3.8.7.orig/logrotate.8 2015-05-05 22:35:36.396112268 +0100
+++ logrotate-3.8.7/logrotate.8 2015-05-05 22:42:22.896337801 +0100
@@ -514,7 +514,7 @@
for information on the taboo extensions). If a + precedes the list of
extensions, the current taboo extension list is augmented, otherwise it
is replaced. At startup, the taboo extension list
-contains .rpmsave, .rpmorig, ~, .disabled, .dpkg\-old, .dpkg\-dist, .dpkg\-new, .cfsaved, .ucf\-old, .ucf\-dist, .ucf\-new, .rpmnew, .swp, .cfsaved, .rhn\-cfg\-tmp\-*
+contains .rpmsave, .rpmorig, ~, .disabled, .dpkg\-old, .dpkg\-dist, .dpkg\-new, .dpkg-bak, .dpkg-del, .cfsaved, .ucf\-old, .ucf\-dist, .ucf\-new, .rpmnew, .swp, .cfsaved, .rhn\-cfg\-tmp\-*
.TP
\fBweekly\fR
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment