From c6136c7e38a634c213f06a8ad6625d41a35a96b9711b877fae47224d40c65111 Mon Sep 17 00:00:00 2001 From: Pedro Monreal Gonzalez Date: Mon, 10 Jan 2022 09:13:15 +0000 Subject: [PATCH] Accepting request 944823 from home:stroeder:sys update to 3.19.0 OBS-URL: https://build.opensuse.org/request/show/944823 OBS-URL: https://build.opensuse.org/package/show/Base:System/logrotate?expand=0&rev=92 --- logrotate-3.13.0-systemd_add_home_env.patch | 12 --------- logrotate-3.18.1.tar.xz | 3 --- logrotate-3.18.1.tar.xz.asc | 16 ------------ logrotate-3.19.0-systemd_add_home_env.patch | 11 ++++++++ logrotate-3.19.0.tar.xz | 3 +++ logrotate-3.19.0.tar.xz.asc | 16 ++++++++++++ logrotate-dont_warn_on_size=_syntax.patch | 29 --------------------- logrotate.changes | 18 +++++++++++++ logrotate.spec | 8 +++--- 9 files changed, 51 insertions(+), 65 deletions(-) delete mode 100644 logrotate-3.13.0-systemd_add_home_env.patch delete mode 100644 logrotate-3.18.1.tar.xz delete mode 100644 logrotate-3.18.1.tar.xz.asc create mode 100644 logrotate-3.19.0-systemd_add_home_env.patch create mode 100644 logrotate-3.19.0.tar.xz create mode 100644 logrotate-3.19.0.tar.xz.asc delete mode 100644 logrotate-dont_warn_on_size=_syntax.patch diff --git a/logrotate-3.13.0-systemd_add_home_env.patch b/logrotate-3.13.0-systemd_add_home_env.patch deleted file mode 100644 index 1c8b2f1..0000000 --- a/logrotate-3.13.0-systemd_add_home_env.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: logrotate-3.14.0/examples/logrotate.service -=================================================================== ---- logrotate-3.14.0.orig/examples/logrotate.service -+++ logrotate-3.14.0/examples/logrotate.service -@@ -11,6 +11,7 @@ ExecStart=/usr/sbin/logrotate /etc/logro - Nice=19 - IOSchedulingClass=best-effort - IOSchedulingPriority=7 -+Environment=HOME=/root - - # hardening options - # details: https://www.freedesktop.org/software/systemd/man/systemd.exec.html diff --git a/logrotate-3.18.1.tar.xz b/logrotate-3.18.1.tar.xz deleted file mode 100644 index 1b6abd2..0000000 --- a/logrotate-3.18.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:14a924e4804b3974e85019a9f9352c2a69726702e6656155c48bcdeace68a5dc -size 162124 diff --git a/logrotate-3.18.1.tar.xz.asc b/logrotate-3.18.1.tar.xz.asc deleted file mode 100644 index 48e1fad..0000000 --- a/logrotate-3.18.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEmSqW4HUFbnnNghT5hz2zdXKjezYFAmCnuBYACgkQhz2zdXKj -ezYHVhAAj1FztazRPopzx0PRrxdJ04+eaDtwbblZcH6N2NUCSnn/jMpx3iKZgogJ -WmA/SzaK9BBh4VQhi9kphTyTRcXQc0c0ApieVeKNfkrIQImfigcrlHzA3aBo7fhb -xLQqgPqBV+9l5hxaqKlShEgRN13FwN59PiYeirbHQfONMTe/OJajCysZExrQQ584 -dVfpmmXBXg1HpZlKat0ZNlEzaguapIPMsTaowbkkb7iOl606K6U6dT+SkRX9Peo8 -4FlE2OirnF7sXy6fggVOZsA4va/qdSMneA/QosfvugosEL6MUgQ0928VhfD30VAl -wEeIi+LAzs/Dm92f5b9D/KwQhUUVdoLCFj46u19TN4CtR/DM5r4bMKKqzo+V1Nzk -/2amuVwAPb/Lz5mqSdoocgHoG1pHPRCOFDhKmcYKcT9SIyU4lJvbgaazwsXXOCCH -qd6iIqmxvQdKWRPXF9Y6wSBVr6TObyc9G2NmrpqBXefep6zt4qeQyekzWGGS/qNc -MfJv16MZEGcEExRdTo4L5z6B9cbVZix0XLeybwcCchf70lzRFiDAMe4dvQfkYlYC -XvyCR+mWRIja2cgatCFJOJotMnbjqnxg8wgZVGvpcnSc+9vCmquvgnmmWNi1HcjV -WWHHjI8V8l0FGSyXATk/B8iFrIOstZwxqcsgF9Dk8VYsaEri06M= -=uDcC ------END PGP SIGNATURE----- diff --git a/logrotate-3.19.0-systemd_add_home_env.patch b/logrotate-3.19.0-systemd_add_home_env.patch new file mode 100644 index 0000000..c8ac9ad --- /dev/null +++ b/logrotate-3.19.0-systemd_add_home_env.patch @@ -0,0 +1,11 @@ +diff -ur logrotate-3.19.0.orig/examples/logrotate.service logrotate-3.19.0/examples/logrotate.service +--- logrotate-3.19.0.orig/examples/logrotate.service 2020-08-21 15:02:38.000000000 +0200 ++++ logrotate-3.19.0/examples/logrotate.service 2022-01-07 21:28:10.258744210 +0100 +@@ -12,6 +12,7 @@ + Nice=19 + IOSchedulingClass=best-effort + IOSchedulingPriority=7 ++Environment=HOME=/root + + # hardening options + # details: https://www.freedesktop.org/software/systemd/man/systemd.exec.html diff --git a/logrotate-3.19.0.tar.xz b/logrotate-3.19.0.tar.xz new file mode 100644 index 0000000..c048e18 --- /dev/null +++ b/logrotate-3.19.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ddd5274d684c5c99ca724e8069329f343ebe376e07493d537d9effdc501214ba +size 166276 diff --git a/logrotate-3.19.0.tar.xz.asc b/logrotate-3.19.0.tar.xz.asc new file mode 100644 index 0000000..56560e2 --- /dev/null +++ b/logrotate-3.19.0.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEmSqW4HUFbnnNghT5hz2zdXKjezYFAmHYAiwACgkQhz2zdXKj +ezYGlA//cGjoPxXWWGpdY6RxUBf9LLVVdTObkcx5P/4IUalR1md49ysk3Cw8XrGG +SbhFgTmrW4l+0ZRLaGXsSqEqKrMyUhGxQfRAOZIoOg3f84pPTG5evPcc3Xlp0o/C +ki/SQdjregUdrizsASis9lqp5o94RtH5p5NcUjj2/C0vaH08WzVtasSXp7L+02an +ewCytUYQJT32Nzukg1v1mY/+9il2yA1cXqU6IEkJR4opXvZ4kq6PMe0+AuQs0MkD +3/qkWiP98RUmrWfx6lDUSSTOts3xmpuxzKwnRsaJk8rSAm4VSTDbfotPpjEQM0it ++XtOzCiMdRLZ5hUzIerPdTs4SY696Usy6c58cwH6ocYuC3KQjZB8zhKJ4vbLH3bm +c+AJM8KZ4ey5Dnexx4QXhS16dJDjS2682qBHOPCnXnR9b4S2N5HWQHj9M8pDiaAa +ftafvq/13k4yziXn+pkUyKA6Ytx9VfVBpsMLfVAeJ93Q5K4pDbXc6UX0YXMxy660 +Ca1yG4sXhK0O9m8qPLUzBhcvzn8evAt08IXB/eDCEcwpOlH3xvxZt5aFikBM6der +Am5w38WjecbNOEirKzBi6ksMPv/K1+6dTqMIIDkLIQchACV8kIIDjI3ptr50PhBn +QS06qD7Oiy+BJQ/fSGhJtlaVbbk1+w0EzuWXXqE8E8V5B5Um1Xw= +=pq5V +-----END PGP SIGNATURE----- diff --git a/logrotate-dont_warn_on_size=_syntax.patch b/logrotate-dont_warn_on_size=_syntax.patch deleted file mode 100644 index 64cef72..0000000 --- a/logrotate-dont_warn_on_size=_syntax.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit a98c38bc867ec59e00625b48262bb3334c8f5728 -Author: Christian Göttsche -Date: Mon Jul 26 19:35:00 2021 +0200 - - Do not warn on key value pair separated by only an equal sign - - Do not warn if a configuration directive is specified with the key and - value separated by just an equal sign, like: - - size=+2048k - - The warning is intended for the usage of: - - size2048k - - Fixes: 2b588b5e ("Log if keyword is not properly separated") - Fixes: #410 - ---- a/config.c 2021-10-19 14:09:18.320365539 +0200 -+++ b/config.c 2021-10-19 13:52:39.810800011 +0200 -@@ -1109,7 +1109,7 @@ static int readConfigFile(const char *co - configFile, lineNum); - continue; - } -- if (!isspace((unsigned char)*start)) { -+ if (!isspace((unsigned char)*start) && *start != '=') { - message(MESS_NORMAL, "%s:%d keyword '%s' not properly" - " separated, found %#x\n", - configFile, lineNum, key, *start); diff --git a/logrotate.changes b/logrotate.changes index 95a9918..197ede1 100644 --- a/logrotate.changes +++ b/logrotate.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Fri Jan 7 20:23:36 UTC 2022 - Michael Ströder + +- update to 3.19.0: + * continue on EINTR in compressLogFile() (#430) + * enforce stricter parsing of configuration files (#427, #431) + * avoid confusing error message in debug mode (#426) + * fix full_write() on incomplete write (#415) + * do not use alloca() any more (#412) + * do not rotate hard links unless allowhardlink is used (#407) + * change directory after dropping privileges (#397) + * add defence in depth when dropping privileges (#400) + * remove invalid configuration on error (#408) + * do not open symbolic link log files by accident (#399) + * do not write state if state file is /dev/null (#395) +- rebased and renamed logrotate-3.13.0-systemd_add_home_env.patch +- removed obsolete logrotate-dont_warn_on_size=_syntax.patch + ------------------------------------------------------------------- Tue Oct 19 11:36:39 UTC 2021 - Manfred Hollstein diff --git a/logrotate.spec b/logrotate.spec index 9f321bb..2626202 100644 --- a/logrotate.spec +++ b/logrotate.spec @@ -1,7 +1,7 @@ # # spec file for package logrotate # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: logrotate -Version: 3.18.1 +Version: 3.19.0 Release: 0 Summary: Cron service for rotating, compressing, mailing and removing system log files License: GPL-2.0-or-later @@ -29,8 +29,7 @@ Source1: logrotate.wtmp Source2: logrotate.default Source10: https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc Source100: %{name}-rpmlintrc -Patch0: logrotate-3.13.0-systemd_add_home_env.patch -Patch1: logrotate-dont_warn_on_size=_syntax.patch +Patch0: logrotate-3.19.0-systemd_add_home_env.patch BuildRequires: acl BuildRequires: libacl-devel BuildRequires: pkgconfig @@ -51,7 +50,6 @@ It manages plain files only and is not involved in systemd's journal rotation. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %configure \