Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/, app-admin/logrotate/files/
Date: Sat, 31 Aug 2019 14:11:14
Message-Id: 1567260651.86f7551364e4556b522c529606d1563fac1d5deb.zlogene@gentoo
1 commit: 86f7551364e4556b522c529606d1563fac1d5deb
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 31 14:10:51 2019 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 31 14:10:51 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86f75513
7
8 app-admin/logrotate: Drop old
9
10 Package-Manager: Portage-2.3.69, Repoman-2.3.16
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 app-admin/logrotate/Manifest | 1 -
14 .../logrotate/files/logrotate-3.9.1-Werror.patch | 12 ----
15 .../files/logrotate-3.9.1-atomic-create.patch | 43 ------------
16 .../logrotate/files/logrotate-3.9.1-fbsd.patch | 57 ---------------
17 .../files/logrotate-3.9.1-ignore-hidden.patch | 15 ----
18 .../files/logrotate-3.9.1-noasprintf.patch | 55 ---------------
19 app-admin/logrotate/logrotate-3.9.1.ebuild | 81 ----------------------
20 7 files changed, 264 deletions(-)
21
22 diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
23 index 3c8b173781a..811a098c7fe 100644
24 --- a/app-admin/logrotate/Manifest
25 +++ b/app-admin/logrotate/Manifest
26 @@ -2,4 +2,3 @@ DIST logrotate-3.13.0.tar.gz 213726 BLAKE2B b9970a0fb49b9de9c83ee679fd4587b6a162
27 DIST logrotate-3.14.0.tar.gz 215413 BLAKE2B 7914188922d81b1f8b6c4e493fae71d23bc9e65ebfcb190ebb4287c875af53204cbecb51c2731a3dc57530a30c685c3a626074265d9a2462714ff6ff077ea5ca SHA512 5f584d9be01737960eaffcf43746270a5395486d2161577a9ee3e757cb4dfe5a207c8b1d097181dd413560d76ecc0e3d526f87d1b123a52dc3e5e49d529a5fb5
28 DIST logrotate-3.15.0.tar.gz 219496 BLAKE2B b9f9cd0b22b79c3da1ea6092c5f3ebf9fca39da3a4bb7e1da39a8bf96f0bdb573864b77681671ad227cfc444bbc3e64a518805780580adb954bfacd564f00e2f SHA512 9520f15eaec54da426699f1f5ce31949d1372fa25c5c127dfbf29ff717a1c15a6fd14437c1d7b67b116b12c8a5c28f6012e39ad4b3ca2b053c874d02efe98d84
29 DIST logrotate-3.15.1.tar.gz 220263 BLAKE2B c164c542a0770965f5193f5816509f566b9afeb82ce8388a184d16c2b3e79aa0ef93be10d477c85f62037f01b3e626ea56d3173ca8cf017b8aa315f2e23b1a2b SHA512 72294607762751fb1aaaca1d62ebd87d109d837d50606176159a5e74782a993123321967b7a6185df6ca9c87a54febb832ac7537ceaa580a895901a995570cd5
30 -DIST logrotate-3.9.1.tar.gz 79061 BLAKE2B b07f8fd8eb59cc4d6c80441a3b5a8aab090bc13eb8fa5e35b111feb2203fb2c3092daa469e6fec02a29b1d377bca33fbbf5859bcd351a1f4a0d82343c5f65d3d SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28
31
32 diff --git a/app-admin/logrotate/files/logrotate-3.9.1-Werror.patch b/app-admin/logrotate/files/logrotate-3.9.1-Werror.patch
33 deleted file mode 100644
34 index b8cecc4ebfb..00000000000
35 --- a/app-admin/logrotate/files/logrotate-3.9.1-Werror.patch
36 +++ /dev/null
37 @@ -1,12 +0,0 @@
38 -diff -Nuar a/Makefile.am b/Makefile.am
39 ---- a/Makefile.am 2015-04-03 09:39:35.000000000 +0200
40 -+++ b/Makefile.am 2015-06-28 14:03:12.429999875 +0200
41 -@@ -1,7 +1,7 @@
42 - MAN = logrotate.8
43 - MAN5 = logrotate.conf.5
44 -
45 --AM_CFLAGS = -Wall -Werror
46 -+AM_CFLAGS = -Wall
47 - sbin_PROGRAMS = logrotate
48 - logrotate_SOURCES = logrotate.c log.c config.c basenames.c
49 -
50
51 diff --git a/app-admin/logrotate/files/logrotate-3.9.1-atomic-create.patch b/app-admin/logrotate/files/logrotate-3.9.1-atomic-create.patch
52 deleted file mode 100644
53 index fdad8b6ea00..00000000000
54 --- a/app-admin/logrotate/files/logrotate-3.9.1-atomic-create.patch
55 +++ /dev/null
56 @@ -1,43 +0,0 @@
57 -diff -Nuar a/logrotate.c b/logrotate.c
58 ---- a/logrotate.c 2015-06-28 13:57:18.449999884 +0200
59 -+++ b/logrotate.c 2015-06-28 14:02:20.799999876 +0200
60 -@@ -371,15 +371,18 @@
61 - int createOutputFile(char *fileName, int flags, struct stat *sb, acl_type acl, int force_mode)
62 - {
63 - int fd;
64 -- struct stat sb_create;
65 -- int acl_set = 0;
66 --
67 -- fd = open(fileName, (flags | O_EXCL | O_NOFOLLOW),
68 -- (S_IRUSR | S_IWUSR) & sb->st_mode);
69 -+ int acl_set = 0;
70 -+ struct stat sb_create;
71 -+ char template[PATH_MAX + 1];
72 -+ mode_t umask_value;
73 -+ snprintf(template, PATH_MAX, "%s/logrotate_temp.XXXXXX", ourDirName(fileName));
74 -+ umask_value = umask(0000);
75 -+ fd = mkostemp(template, (flags | O_EXCL | O_NOFOLLOW));
76 -+ umask(umask_value);
77 -
78 - if (fd < 0) {
79 -- message(MESS_ERROR, "error creating output file %s: %s\n",
80 -- fileName, strerror(errno));
81 -+ message(MESS_ERROR, "error creating unique temp file: %s\n",
82 -+ strerror(errno));
83 - return -1;
84 - }
85 - if (fchmod(fd, (S_IRUSR | S_IWUSR) & sb->st_mode)) {
86 -@@ -430,6 +433,13 @@
87 - }
88 - }
89 -
90 -+ if (rename(template, fileName)) {
91 -+ message(MESS_ERROR, "error renaming temp file to %s: %s\n",
92 -+ fileName, strerror(errno));
93 -+ close(fd);
94 -+ return -1;
95 -+ }
96 -+
97 - return fd;
98 - }
99 -
100
101 diff --git a/app-admin/logrotate/files/logrotate-3.9.1-fbsd.patch b/app-admin/logrotate/files/logrotate-3.9.1-fbsd.patch
102 deleted file mode 100644
103 index 6e329d6149f..00000000000
104 --- a/app-admin/logrotate/files/logrotate-3.9.1-fbsd.patch
105 +++ /dev/null
106 @@ -1,57 +0,0 @@
107 -diff -Nuar a/config.c b/config.c
108 ---- a/config.c 2015-06-28 13:54:18.309999889 +0200
109 -+++ b/config.c 2015-06-28 13:56:49.599999885 +0200
110 -@@ -1,6 +1,6 @@
111 - #include "queue.h"
112 - /* Alloca is defined in stdlib.h in NetBSD */
113 --#ifndef __NetBSD__
114 -+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
115 - #include <alloca.h>
116 - #endif
117 - #include <limits.h>
118 -@@ -24,6 +24,10 @@
119 - #include <fnmatch.h>
120 - #include <sys/mman.h>
121 -
122 -+#if !defined(PATH_MAX) && defined(__FreeBSD__)
123 -+#include <sys/param.h>
124 -+#endif
125 -+
126 - #include "basenames.h"
127 - #include "log.h"
128 - #include "logrotate.h"
129 -diff -Nuar a/logrotate.c b/logrotate.c
130 ---- a/logrotate.c 2015-04-03 09:39:35.000000000 +0200
131 -+++ b/logrotate.c 2015-06-28 13:57:18.449999884 +0200
132 -@@ -1,6 +1,6 @@
133 - #include "queue.h"
134 - /* alloca() is defined in stdlib.h in NetBSD */
135 --#ifndef __NetBSD__
136 -+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
137 - #include <alloca.h>
138 - #endif
139 - #include <limits.h>
140 -@@ -26,6 +26,10 @@
141 - #include <limits.h>
142 - #endif
143 -
144 -+#if !defined(PATH_MAX) && defined(__FreeBSD__)
145 -+#include <sys/param.h>
146 -+#endif
147 -+
148 - #include "basenames.h"
149 - #include "log.h"
150 - #include "logrotate.h"
151 -diff -Nuar a/Makefile b/Makefile
152 ---- a/Makefile 2015-04-03 09:39:35.000000000 +0200
153 -+++ b/Makefile 2015-06-28 13:58:05.729999883 +0200
154 -@@ -22,7 +22,9 @@
155 -
156 - ifeq ($(WITH_ACL),yes)
157 - CFLAGS += -DWITH_ACL
158 -+ifneq ($(OS_NAME),FreeBSD)
159 - LOADLIBES += -lacl
160 -+endif
161 - # See pretest
162 - TEST_ACL=1
163 - else
164
165 diff --git a/app-admin/logrotate/files/logrotate-3.9.1-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.9.1-ignore-hidden.patch
166 deleted file mode 100644
167 index 31d9298779c..00000000000
168 --- a/app-admin/logrotate/files/logrotate-3.9.1-ignore-hidden.patch
169 +++ /dev/null
170 @@ -1,15 +0,0 @@
171 -diff -Nuar a/config.c b/config.c
172 ---- a/config.c 2015-04-03 09:39:35.000000000 +0200
173 -+++ b/config.c 2015-06-28 13:54:18.309999889 +0200
174 -@@ -359,7 +359,10 @@
175 - char *pattern;
176 -
177 - /* Check if fname is '.' or '..'; if so, return false */
178 -- if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
179 -+ /* Don't include 'hidden' files either; this breaks Gentoo
180 -+ portage config file management http://bugs.gentoo.org/87683 */
181 -+ if (fname[0] == '.')
182 -+
183 - return 0;
184 -
185 - /* Check if fname is ending in a taboo-extension; if so, return false */
186
187 diff --git a/app-admin/logrotate/files/logrotate-3.9.1-noasprintf.patch b/app-admin/logrotate/files/logrotate-3.9.1-noasprintf.patch
188 deleted file mode 100644
189 index 7983943ca89..00000000000
190 --- a/app-admin/logrotate/files/logrotate-3.9.1-noasprintf.patch
191 +++ /dev/null
192 @@ -1,55 +0,0 @@
193 -diff -Nuar a/config.c b/config.c
194 ---- a/config.c 2015-06-28 13:56:49.599999885 +0200
195 -+++ b/config.c 2015-06-28 13:59:34.799999880 +0200
196 -@@ -49,39 +49,6 @@
197 - #include "asprintf.c"
198 - #endif
199 -
200 --#if !defined(asprintf) && !defined(_FORTIFY_SOURCE)
201 --#include <stdarg.h>
202 --
203 --int asprintf(char **string_ptr, const char *format, ...)
204 --{
205 -- va_list arg;
206 -- char *str;
207 -- int size;
208 -- int rv;
209 --
210 -- va_start(arg, format);
211 -- size = vsnprintf(NULL, 0, format, arg);
212 -- size++;
213 -- va_start(arg, format);
214 -- str = malloc(size);
215 -- if (str == NULL) {
216 -- va_end(arg);
217 -- /*
218 -- * Strictly speaking, GNU asprintf doesn't do this,
219 -- * but the caller isn't checking the return value.
220 -- */
221 -- fprintf(stderr, "failed to allocate memory\\n");
222 -- exit(1);
223 -- }
224 -- rv = vsnprintf(str, size, format, arg);
225 -- va_end(arg);
226 --
227 -- *string_ptr = str;
228 -- return (rv);
229 --}
230 --
231 --#endif
232 --
233 - #if !defined(strndup)
234 - char *strndup(const char *s, size_t n)
235 - {
236 -diff -Nuar a/logrotate.h b/logrotate.h
237 ---- a/logrotate.h 2015-04-03 09:39:35.000000000 +0200
238 -+++ b/logrotate.h 2015-06-28 13:59:47.429999880 +0200
239 -@@ -80,8 +80,5 @@
240 - extern int debug;
241 -
242 - int readAllConfigPaths(const char **paths);
243 --#if !defined(asprintf) && !defined(_FORTIFY_SOURCE)
244 --int asprintf(char **string_ptr, const char *format, ...);
245 --#endif
246 -
247 - #endif
248
249 diff --git a/app-admin/logrotate/logrotate-3.9.1.ebuild b/app-admin/logrotate/logrotate-3.9.1.ebuild
250 deleted file mode 100644
251 index 060e11be388..00000000000
252 --- a/app-admin/logrotate/logrotate-3.9.1.ebuild
253 +++ /dev/null
254 @@ -1,81 +0,0 @@
255 -# Copyright 1999-2017 Gentoo Foundation
256 -# Distributed under the terms of the GNU General Public License v2
257 -
258 -EAPI=5
259 -
260 -inherit autotools eutils toolchain-funcs flag-o-matic
261 -
262 -DESCRIPTION="Rotates, compresses, and mails system logs"
263 -HOMEPAGE="https://github.com/logrotate/logrotate"
264 -SRC_URI="mirror://gentoo/${P}.tar.gz"
265 -
266 -LICENSE="GPL-2"
267 -SLOT="0"
268 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
269 -IUSE="acl +cron selinux"
270 -
271 -CDEPEND="
272 - >=dev-libs/popt-1.5
273 - selinux? (
274 - sys-libs/libselinux
275 - )
276 - acl? ( virtual/acl )"
277 -
278 -DEPEND="${CDEPEND}
279 - >=sys-apps/sed-4"
280 -
281 -RDEPEND="${CDEPEND}
282 - selinux? ( sec-policy/selinux-logrotate )
283 - cron? ( virtual/cron )"
284 -
285 -install_cron_file() {
286 - exeinto /etc/cron.daily
287 - newexe "${S}"/examples/logrotate.cron "${PN}"
288 -}
289 -
290 -src_prepare() {
291 - epatch \
292 - "${FILESDIR}"/${P}-ignore-hidden.patch \
293 - "${FILESDIR}"/${P}-fbsd.patch \
294 - "${FILESDIR}"/${P}-noasprintf.patch \
295 - "${FILESDIR}"/${P}-atomic-create.patch \
296 - "${FILESDIR}"/${P}-Werror.patch
297 - eautoreconf
298 -}
299 -
300 -src_configure() {
301 - econf $(use_with acl) $(use_with selinux)
302 -}
303 -
304 -src_compile() {
305 - emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}"
306 -}
307 -
308 -src_test() {
309 - emake test
310 -}
311 -
312 -src_install() {
313 - insinto /usr
314 - dosbin logrotate
315 - doman logrotate.8
316 - dodoc CHANGES examples/logrotate*
317 -
318 - insinto /etc
319 - doins "${FILESDIR}"/logrotate.conf
320 -
321 - use cron && install_cron_file
322 -
323 - keepdir /etc/logrotate.d
324 -}
325 -
326 -pkg_postinst() {
327 - if [[ -z ${REPLACING_VERSIONS} ]] ; then
328 - elog "If you wish to have logrotate e-mail you updates, please"
329 - elog "emerge virtual/mailx and configure logrotate in"
330 - elog "/etc/logrotate.conf appropriately"
331 - elog
332 - elog "Additionally, /etc/logrotate.conf may need to be modified"
333 - elog "for your particular needs. See man logrotate for details."
334 - fi
335 -}