Gentoo Archives: gentoo-commits

From: "José María Alonso" <nimiux@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/, app-admin/logrotate/files/
Date: Thu, 01 Feb 2018 20:42:25
Message-Id: 1517517655.49280b6dc51df4c4a73c27df24a38f8515fd4cf8.nimiux@gentoo
1 commit: 49280b6dc51df4c4a73c27df24a38f8515fd4cf8
2 Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 1 20:40:05 2018 +0000
4 Commit: José María Alonso <nimiux <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 1 20:40:55 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49280b6d
7
8 app-admin/logrotate: Drops old version 3.12.3
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 app-admin/logrotate/Manifest | 1 -
13 .../logrotate/files/logrotate-3.12.3-fbsd.patch | 36 --------
14 .../files/logrotate-3.12.3-ignore-hidden.patch | 14 ---
15 app-admin/logrotate/logrotate-3.12.3-r1.ebuild | 99 ----------------------
16 app-admin/logrotate/logrotate-3.12.3-r2.ebuild | 99 ----------------------
17 5 files changed, 249 deletions(-)
18
19 diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
20 index 50ece1aff4f..c0753bf1cec 100644
21 --- a/app-admin/logrotate/Manifest
22 +++ b/app-admin/logrotate/Manifest
23 @@ -1,3 +1,2 @@
24 -DIST logrotate-3.12.3.tar.gz 202991 BLAKE2B 26e6507eeeeae15cfa1e183a64151a66600462a48aa6eb951b30634b90644b24ae7ceb9e26da5954919c83e05cab5a102589b621b7a8fdc8bea8d40dd1c813fe SHA512 ab700a50736c7ce8a6e5b9dc2504919c6d3e6ae48a7f112f6980253df5c6bab7fc507c82a0cd961d73ed1312c930da46d96d9f27046996644e0759c84c6a1ae9
25 DIST logrotate-3.13.0.tar.gz 213726 BLAKE2B b9970a0fb49b9de9c83ee679fd4587b6a1623cf1aae2444e818339361c7b7762ce51fcbd124fefafbe47d529dd21ef346a6c9a267da20547914388db99dce003 SHA512 3dec2fcdd674d3337b71fd70339cb5e3dd06b4bc24bee191356a30c2a211a290ae7747e63b90581e32a6d6d1f73cf62d5b0ee5a91aa05bad4d6ee403a35d9e76
26 DIST logrotate-3.9.1.tar.gz 79061 BLAKE2B b07f8fd8eb59cc4d6c80441a3b5a8aab090bc13eb8fa5e35b111feb2203fb2c3092daa469e6fec02a29b1d377bca33fbbf5859bcd351a1f4a0d82343c5f65d3d SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28
27
28 diff --git a/app-admin/logrotate/files/logrotate-3.12.3-fbsd.patch b/app-admin/logrotate/files/logrotate-3.12.3-fbsd.patch
29 deleted file mode 100644
30 index 67a60e3af17..00000000000
31 --- a/app-admin/logrotate/files/logrotate-3.12.3-fbsd.patch
32 +++ /dev/null
33 @@ -1,36 +0,0 @@
34 -diff -Nuar a/config.c b/config.c
35 ---- a/config.c 2017-04-22 23:46:08.201991730 +0200
36 -+++ b/config.c 2017-04-22 23:49:43.021996055 +0200
37 -@@ -25,6 +25,10 @@
38 - #include <sys/mman.h>
39 - #include <libgen.h>
40 -
41 -+#if !defined(PATH_MAX) && defined(__FreeBSD__)
42 -+#include <sys/param.h>
43 -+#endif
44 -+
45 - #include "log.h"
46 - #include "logrotate.h"
47 -
48 -diff -Nuar a/logrotate.c b/logrotate.c
49 ---- a/logrotate.c 2017-04-21 10:52:10.000000000 +0200
50 -+++ b/logrotate.c 2017-04-22 23:50:20.691996814 +0200
51 -@@ -1,6 +1,6 @@
52 - #include "queue.h"
53 - /* alloca() is defined in stdlib.h in NetBSD */
54 --#ifndef __NetBSD__
55 -+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
56 - #include <alloca.h>
57 - #endif
58 - #include <limits.h>
59 -@@ -27,6 +27,10 @@
60 - #include <limits.h>
61 - #endif
62 -
63 -+#if !defined(PATH_MAX) && defined(__FreeBSD__)
64 -+#include <sys/param.h>
65 -+#endif
66 -+
67 - #include "log.h"
68 - #include "logrotate.h"
69 -
70
71 diff --git a/app-admin/logrotate/files/logrotate-3.12.3-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.12.3-ignore-hidden.patch
72 deleted file mode 100644
73 index 0bbb91dcb4f..00000000000
74 --- a/app-admin/logrotate/files/logrotate-3.12.3-ignore-hidden.patch
75 +++ /dev/null
76 @@ -1,14 +0,0 @@
77 -diff -Nuar a/config.c b/config.c
78 ---- a/config.c 2017-04-18 14:57:02.000000000 +0200
79 -+++ b/config.c 2017-04-22 23:46:08.201991730 +0200
80 -@@ -389,7 +389,9 @@
81 - int i;
82 -
83 - /* Check if fname is '.' or '..'; if so, return false */
84 -- if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
85 -+ /* Don't include 'hidden' files either; this breaks Gentoo
86 -+ portage config file management http://bugs.gentoo.org/87683 */
87 -+ if (fname[0] == '.')
88 - return 0;
89 -
90 - /* Check if fname is ending in a taboo-extension; if so, return false */
91
92 diff --git a/app-admin/logrotate/logrotate-3.12.3-r1.ebuild b/app-admin/logrotate/logrotate-3.12.3-r1.ebuild
93 deleted file mode 100644
94 index 81b5ffc20c5..00000000000
95 --- a/app-admin/logrotate/logrotate-3.12.3-r1.ebuild
96 +++ /dev/null
97 @@ -1,99 +0,0 @@
98 -# Copyright 1999-2017 Gentoo Foundation
99 -# Distributed under the terms of the GNU General Public License v2
100 -
101 -EAPI=6
102 -
103 -inherit systemd
104 -
105 -DESCRIPTION="Rotates, compresses, and mails system logs"
106 -HOMEPAGE="https://github.com/logrotate/logrotate"
107 -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
108 -
109 -LICENSE="GPL-2"
110 -SLOT="0"
111 -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
112 -IUSE="acl +cron selinux"
113 -
114 -CDEPEND="
115 - >=dev-libs/popt-1.5
116 - selinux? ( sys-libs/libselinux )
117 - acl? ( virtual/acl )"
118 -
119 -DEPEND="${CDEPEND}
120 - >=sys-apps/sed-4"
121 -
122 -RDEPEND="${CDEPEND}
123 - selinux? ( sec-policy/selinux-logrotate )
124 - cron? ( virtual/cron )"
125 -
126 -STATEFILE="/var/lib/misc/logrotate.status"
127 -OLDSTATEFILE="/var/lib/logrotate.status"
128 -
129 -move_old_state_file() {
130 - elog "logrotate state file is now located at ${STATEFILE}"
131 - elog "See bug #357275"
132 - if [[ -e "${OLDSTATEFILE}" ]] ; then
133 - elog "Moving your current state file to new location: ${STATEFILE}"
134 - mv -n "${OLDSTATEFILE}" "${STATEFILE}"
135 - fi
136 -}
137 -
138 -install_cron_file() {
139 - exeinto /etc/cron.daily
140 - newexe "${S}"/examples/logrotate.cron "${PN}"
141 -}
142 -
143 -PATCHES=(
144 - "${FILESDIR}/${P}-ignore-hidden.patch"
145 - "${FILESDIR}/${P}-fbsd.patch"
146 -)
147 -
148 -src_prepare() {
149 - default
150 - sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
151 -}
152 -
153 -src_configure() {
154 - econf $(use_with acl) $(use_with selinux) --with-state-file-path="${STATEFILE}"
155 -}
156 -
157 -src_test() {
158 - emake test
159 -}
160 -
161 -src_install() {
162 - insinto /usr
163 - dobin logrotate
164 - doman logrotate.8
165 - dodoc ChangeLog.md examples/logrotate-default
166 -
167 - insinto /etc
168 - doins "${FILESDIR}"/logrotate.conf
169 -
170 - use cron && install_cron_file
171 -
172 - systemd_dounit examples/logrotate.{service,timer}
173 -
174 - keepdir /etc/logrotate.d
175 -}
176 -
177 -pkg_postinst() {
178 - elog
179 - elog "The ${PN} binary is now installed under /usr/bin. Please"
180 - elog "update your links"
181 - elog
182 - move_old_state_file
183 - elog
184 - elog "If you are running systemd you might need to run:"
185 - elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
186 - elog "in order to create the new location of the logrotate state file"
187 - elog
188 - if [[ -z ${REPLACING_VERSIONS} ]] ; then
189 - elog "If you wish to have logrotate e-mail you updates, please"
190 - elog "emerge virtual/mailx and configure logrotate in"
191 - elog "/etc/logrotate.conf appropriately"
192 - elog
193 - elog "Additionally, /etc/logrotate.conf may need to be modified"
194 - elog "for your particular needs. See man logrotate for details."
195 - fi
196 -}
197
198 diff --git a/app-admin/logrotate/logrotate-3.12.3-r2.ebuild b/app-admin/logrotate/logrotate-3.12.3-r2.ebuild
199 deleted file mode 100644
200 index f0661a39594..00000000000
201 --- a/app-admin/logrotate/logrotate-3.12.3-r2.ebuild
202 +++ /dev/null
203 @@ -1,99 +0,0 @@
204 -# Copyright 1999-2017 Gentoo Foundation
205 -# Distributed under the terms of the GNU General Public License v2
206 -
207 -EAPI=6
208 -
209 -inherit systemd
210 -
211 -DESCRIPTION="Rotates, compresses, and mails system logs"
212 -HOMEPAGE="https://github.com/logrotate/logrotate"
213 -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
214 -
215 -LICENSE="GPL-2"
216 -SLOT="0"
217 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
218 -IUSE="acl +cron selinux"
219 -
220 -CDEPEND="
221 - >=dev-libs/popt-1.5
222 - selinux? ( sys-libs/libselinux )
223 - acl? ( virtual/acl )"
224 -
225 -DEPEND="${CDEPEND}
226 - >=sys-apps/sed-4"
227 -
228 -RDEPEND="${CDEPEND}
229 - selinux? ( sec-policy/selinux-logrotate )
230 - cron? ( virtual/cron )"
231 -
232 -STATEFILE="/var/lib/misc/logrotate.status"
233 -OLDSTATEFILE="/var/lib/logrotate.status"
234 -
235 -move_old_state_file() {
236 - elog "logrotate state file is now located at ${STATEFILE}"
237 - elog "See bug #357275"
238 - if [[ -e "${OLDSTATEFILE}" ]] ; then
239 - elog "Moving your current state file to new location: ${STATEFILE}"
240 - mv -n "${OLDSTATEFILE}" "${STATEFILE}"
241 - fi
242 -}
243 -
244 -install_cron_file() {
245 - exeinto /etc/cron.daily
246 - newexe "${S}"/examples/logrotate.cron "${PN}"
247 -}
248 -
249 -PATCHES=(
250 - "${FILESDIR}/${P}-ignore-hidden.patch"
251 - "${FILESDIR}/${P}-fbsd.patch"
252 -)
253 -
254 -src_prepare() {
255 - default
256 - sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
257 -}
258 -
259 -src_configure() {
260 - econf $(use_with acl) $(use_with selinux) --with-state-file-path="${STATEFILE}"
261 -}
262 -
263 -src_test() {
264 - emake test
265 -}
266 -
267 -src_install() {
268 - insinto /usr
269 - dobin logrotate
270 - doman logrotate.8
271 - dodoc ChangeLog.md examples/logrotate-default
272 -
273 - insinto /etc
274 - doins "${FILESDIR}"/logrotate.conf
275 -
276 - use cron && install_cron_file
277 -
278 - systemd_dounit examples/logrotate.{service,timer}
279 - systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
280 -
281 - keepdir /etc/logrotate.d
282 -}
283 -
284 -pkg_postinst() {
285 - elog
286 - elog "The ${PN} binary is now installed under /usr/bin. Please"
287 - elog "update your links"
288 - elog
289 - move_old_state_file
290 - elog "If you are running systemd you might need to run:"
291 - elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
292 - elog "in order to create the new location of the logrotate state file"
293 - elog
294 - if [[ -z ${REPLACING_VERSIONS} ]] ; then
295 - elog "If you wish to have logrotate e-mail you updates, please"
296 - elog "emerge virtual/mailx and configure logrotate in"
297 - elog "/etc/logrotate.conf appropriately"
298 - elog
299 - elog "Additionally, /etc/logrotate.conf may need to be modified"
300 - elog "for your particular needs. See man logrotate for details."
301 - fi
302 -}