- merged 3.15.0 from PLD

diff --git a/logrotate.spec b/logrotate.spec
index 2465a7fe96c9348f650c1841bc859167edaa9b1e..fec8b173cafcdc61960425e62d3bfe64483a2809 100644 (file)
--- a/logrotate.spec
+++ b/logrotate.spec
@@ -19,12 +19,12 @@ Summary(ru.UTF-8):  Ротирует, компрессирует, удаляет
 Summary(tr.UTF-8):     Sistem günlüklerini yönlendirir, sıkıştırır ve mektup olarak yollar
 Summary(uk.UTF-8):     Ротує, компресує, видаляє та відправляє поштою лог-файли
 Name:          logrotate
-Version:       3.14.0
-Release:       2
+Version:       3.15.0
+Release:       1
 License:       GPL v2+
 Group:         Applications/System
 Source0:       https://github.com/logrotate/logrotate/releases/download/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 1c0f6e6e490c4bcac0a1e77ad1310683
+# Source0-md5: 320046f0b9fc38337e8827d4c5a866a0
 Source1:       %{name}.conf
 Source2:       %{name}.sysconfig
 Source3:       %{name}.cron

diff --git a/tabooext.patch b/tabooext.patch
index 3048d3978245e3e585b1eff2a3436edb909d760d..39bf8695fbf38c4df9c3bd2d026b670594438c94 100644 (file)
--- a/tabooext.patch
+++ b/tabooext.patch
@@ -1,10 +1,10 @@
---- logrotate-3.12.3/config.c~ 2017-05-22 15:10:22.000000000 +0300
-+++ logrotate-3.12.3/config.c  2017-07-02 20:26:14.825924824 +0300
-@@ -129,6 +129,7 @@
+--- logrotate-3.15.0/config.c~ 2018-10-05 18:01:21.000000000 +0300
++++ logrotate-3.15.0/config.c  2018-12-04 17:33:40.040702438 +0200
+@@ -134,6 +134,7 @@
  static const char *defTabooExts[] = {
-       ",v",
-       ".cfsaved",
-+      ".cvsignore",
-       ".disabled",
-       ".dpkg-dist",
-       ".dpkg-new",
+     ",v",
+     ".cfsaved",
++    ".cvsignore",
+     ".disabled",
+     ".dpkg-bak",
+     ".dpkg-del",