1 |
commit: 7e03c964d4bd88231014930bf1c67e1e36334ac1 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 18 10:17:10 2020 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 18 10:30:06 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e03c964 |
7 |
|
8 |
sys-apps/man-db: Removed old |
9 |
|
10 |
Package-Manager: Portage-3.0.7, Repoman-3.0.1 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
sys-apps/man-db/Manifest | 2 - |
14 |
sys-apps/man-db/man-db-2.8.7.ebuild | 127 ----------------------------- |
15 |
sys-apps/man-db/man-db-2.9.2.ebuild | 157 ------------------------------------ |
16 |
3 files changed, 286 deletions(-) |
17 |
|
18 |
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest |
19 |
index 7e6c1b9c89c..80770634388 100644 |
20 |
--- a/sys-apps/man-db/Manifest |
21 |
+++ b/sys-apps/man-db/Manifest |
22 |
@@ -1,3 +1 @@ |
23 |
-DIST man-db-2.8.7.tar.xz 1839012 BLAKE2B 19b438b1083cfd838421f29ed053fe85686929bc9f2105fe399ea99622f138bca2c8888a17cddb9223362db2d5f9c4bb3669865ecf749fe845ea8e4223027f67 SHA512 9f9d6f3b776c0b35f95c179fb668f2dc3db3d3e63a162cfda98c5d126fe147f2418e1a1503037ebe28314f57d9b6f48b7f7674d611df14424973a866a61ff2d9 |
24 |
-DIST man-db-2.9.2.tar.xz 1885484 BLAKE2B 46778ebdecffcdefedd062e3f6a01a54054b57aa9636450dd148f62184b9bb919deb72e3b57b2fc75670fc2d8d274417f00994f7030fee913d572637e080b4c1 SHA512 47b63c074cf61c15f82230cc35a0062ab6ded8c3229475c6667a47ca518346d0555616c5b07bb01515b31bd80cbdc9870cd05ffff35097d013252401c6927002 |
25 |
DIST man-db-2.9.3.tar.xz 1885840 BLAKE2B 6163660af60a2900220d7b1de74caa9cb9e5764cc5da20469a8fb08e19ee1948937916664fdc493b89da8fd829aa512877892245fabc00fb586c7754c0da3d53 SHA512 ca1c1214753483f6e22efe69a9df9852e0de01a9ad3b9950dcbbc9f38e6060100b98a84333256f8c734002e66e2fd6256bc017a31bd9acfc42002dca2c0f879b |
26 |
|
27 |
diff --git a/sys-apps/man-db/man-db-2.8.7.ebuild b/sys-apps/man-db/man-db-2.8.7.ebuild |
28 |
deleted file mode 100644 |
29 |
index c0b49d500cd..00000000000 |
30 |
--- a/sys-apps/man-db/man-db-2.8.7.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,127 +0,0 @@ |
33 |
-# Copyright 1999-2020 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=7 |
37 |
- |
38 |
-inherit systemd |
39 |
- |
40 |
-DESCRIPTION="a man replacement that utilizes berkdb instead of flat files" |
41 |
-HOMEPAGE="http://www.nongnu.org/man-db/" |
42 |
-if [[ "${PV}" = 9999* ]] ; then |
43 |
- inherit git-r3 |
44 |
- EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git" |
45 |
-else |
46 |
- SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" |
47 |
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux" |
48 |
-fi |
49 |
- |
50 |
-LICENSE="GPL-3" |
51 |
-SLOT="0" |
52 |
-IUSE="berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib" |
53 |
- |
54 |
-CDEPEND=" |
55 |
- !sys-apps/man |
56 |
- >=dev-libs/libpipeline-1.5.0 |
57 |
- sys-apps/groff |
58 |
- gdbm? ( sys-libs/gdbm:= ) |
59 |
- !gdbm? ( berkdb? ( sys-libs/db:= ) ) |
60 |
- !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) |
61 |
- seccomp? ( sys-libs/libseccomp ) |
62 |
- zlib? ( sys-libs/zlib ) |
63 |
-" |
64 |
-DEPEND="${CDEPEND}" |
65 |
-BDEPEND=" |
66 |
- app-arch/xz-utils |
67 |
- virtual/pkgconfig |
68 |
- nls? ( |
69 |
- >=app-text/po4a-0.45 |
70 |
- sys-devel/gettext |
71 |
- ) |
72 |
-" |
73 |
-RDEPEND=" |
74 |
- ${CDEPEND} |
75 |
- acct-group/man |
76 |
- acct-user/man |
77 |
- selinux? ( sec-policy/selinux-mandb ) |
78 |
-" |
79 |
-PDEPEND="manpager? ( app-text/manpager )" |
80 |
- |
81 |
-pkg_setup() { |
82 |
- if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150 |
83 |
- ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings" |
84 |
- fi |
85 |
-} |
86 |
- |
87 |
-src_configure() { |
88 |
- export ac_cv_lib_z_gzopen=$(usex zlib) |
89 |
- local myeconfargs=( |
90 |
- --with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d |
91 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
92 |
- --disable-setuid #662438 |
93 |
- --enable-cache-owner=man |
94 |
- --with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x" |
95 |
- $(use_enable nls) |
96 |
- $(use_enable static-libs static) |
97 |
- $(use_with seccomp libseccomp) |
98 |
- --with-db=$(usex gdbm gdbm $(usex berkdb db gdbm)) |
99 |
- ) |
100 |
- econf "${myeconfargs[@]}" |
101 |
- |
102 |
- # Disable color output from groff so that the manpager can add it. #184604 |
103 |
- sed -i \ |
104 |
- -e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \ |
105 |
- src/man_db.conf || die |
106 |
- |
107 |
- cat > 15man-db <<-EOF || die |
108 |
- SANDBOX_PREDICT="/var/cache/man" |
109 |
- EOF |
110 |
-} |
111 |
- |
112 |
-src_install() { |
113 |
- default |
114 |
- dodoc docs/{HACKING,TODO} |
115 |
- find "${ED}" -name "*.la" -delete || die |
116 |
- |
117 |
- exeinto /etc/cron.daily |
118 |
- newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884 |
119 |
- |
120 |
- insinto /etc/sandbox.d |
121 |
- doins 15man-db |
122 |
-} |
123 |
- |
124 |
-pkg_preinst() { |
125 |
- local cachedir="${EROOT}/var/cache/man" |
126 |
- # If the system was already exploited, and the attacker is hiding in the |
127 |
- # cachedir of the old man-db, let's wipe them out. |
128 |
- # see bug #602588 comment 18 |
129 |
- local _replacing_version= |
130 |
- local _setgid_vuln=0 |
131 |
- for _replacing_version in ${REPLACING_VERSIONS}; do |
132 |
- if ver_test '2.7.6.1-r2' -le "${_replacing_version}"; then |
133 |
- debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!" |
134 |
- else |
135 |
- _setgid_vuln=1 |
136 |
- debug-print "Applying cleanup for security bug #602588" |
137 |
- fi |
138 |
- done |
139 |
- [[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}" |
140 |
- |
141 |
- # Fall back to recreating the cachedir |
142 |
- if [[ ! -d ${cachedir} ]] ; then |
143 |
- mkdir -p "${cachedir}" || die |
144 |
- chown man:man "${cachedir}" || die |
145 |
- fi |
146 |
- |
147 |
- # Update the whatis cache |
148 |
- if [[ -f ${cachedir}/whatis ]] ; then |
149 |
- einfo "Cleaning ${cachedir} from sys-apps/man" |
150 |
- find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete |
151 |
- fi |
152 |
-} |
153 |
- |
154 |
-pkg_postinst() { |
155 |
- if [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then |
156 |
- einfo "Rebuilding man-db from scratch with new database format!" |
157 |
- su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null |
158 |
- fi |
159 |
-} |
160 |
|
161 |
diff --git a/sys-apps/man-db/man-db-2.9.2.ebuild b/sys-apps/man-db/man-db-2.9.2.ebuild |
162 |
deleted file mode 100644 |
163 |
index 8ad0f47c856..00000000000 |
164 |
--- a/sys-apps/man-db/man-db-2.9.2.ebuild |
165 |
+++ /dev/null |
166 |
@@ -1,157 +0,0 @@ |
167 |
-# Copyright 1999-2020 Gentoo Authors |
168 |
-# Distributed under the terms of the GNU General Public License v2 |
169 |
- |
170 |
-EAPI=7 |
171 |
- |
172 |
-inherit systemd |
173 |
- |
174 |
-DESCRIPTION="a man replacement that utilizes berkdb instead of flat files" |
175 |
-HOMEPAGE="http://www.nongnu.org/man-db/" |
176 |
-if [[ "${PV}" = 9999* ]] ; then |
177 |
- inherit autotools git-r3 |
178 |
- EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git" |
179 |
-else |
180 |
- SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" |
181 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
182 |
-fi |
183 |
- |
184 |
-LICENSE="GPL-3" |
185 |
-SLOT="0" |
186 |
-IUSE="berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib" |
187 |
- |
188 |
-CDEPEND=" |
189 |
- !sys-apps/man |
190 |
- >=dev-libs/libpipeline-1.5.0 |
191 |
- sys-apps/groff |
192 |
- gdbm? ( sys-libs/gdbm:= ) |
193 |
- !gdbm? ( berkdb? ( sys-libs/db:= ) ) |
194 |
- !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) |
195 |
- seccomp? ( sys-libs/libseccomp ) |
196 |
- zlib? ( sys-libs/zlib ) |
197 |
-" |
198 |
-DEPEND="${CDEPEND}" |
199 |
-BDEPEND=" |
200 |
- app-arch/xz-utils |
201 |
- virtual/pkgconfig |
202 |
- nls? ( |
203 |
- >=app-text/po4a-0.45 |
204 |
- sys-devel/gettext |
205 |
- ) |
206 |
-" |
207 |
-RDEPEND=" |
208 |
- ${CDEPEND} |
209 |
- acct-group/man |
210 |
- acct-user/man |
211 |
- selinux? ( sec-policy/selinux-mandb ) |
212 |
-" |
213 |
-PDEPEND="manpager? ( app-text/manpager )" |
214 |
- |
215 |
-pkg_setup() { |
216 |
- if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150 |
217 |
- ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings" |
218 |
- fi |
219 |
-} |
220 |
- |
221 |
-src_unpack() { |
222 |
- if [[ "${PV}" == *9999 ]] ; then |
223 |
- git-r3_src_unpack |
224 |
- |
225 |
- # We need to mess with gnulib :-/ |
226 |
- EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git" \ |
227 |
- EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \ |
228 |
- git-r3_src_unpack |
229 |
- else |
230 |
- default |
231 |
- fi |
232 |
-} |
233 |
- |
234 |
-src_prepare() { |
235 |
- default |
236 |
- if [[ "${PV}" == *9999 ]] ; then |
237 |
- local bootstrap_opts=( |
238 |
- --gnulib-srcdir=../gnulib |
239 |
- --no-bootstrap-sync |
240 |
- --copy |
241 |
- --no-git |
242 |
- ) |
243 |
- AUTORECONF="/bin/true" \ |
244 |
- LIBTOOLIZE="/bin/true" \ |
245 |
- sh ./bootstrap "${bootstrap_opts[@]}" || die |
246 |
- |
247 |
- eautoreconf |
248 |
- fi |
249 |
-} |
250 |
- |
251 |
-src_configure() { |
252 |
- export ac_cv_lib_z_gzopen=$(usex zlib) |
253 |
- local myeconfargs=( |
254 |
- --with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d |
255 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
256 |
- --disable-setuid #662438 |
257 |
- --enable-cache-owner=man |
258 |
- --with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x" |
259 |
- $(use_enable nls) |
260 |
- $(use_enable static-libs static) |
261 |
- $(use_with seccomp libseccomp) |
262 |
- --with-db=$(usex gdbm gdbm $(usex berkdb db gdbm)) |
263 |
- ) |
264 |
- econf "${myeconfargs[@]}" |
265 |
- |
266 |
- # Disable color output from groff so that the manpager can add it. #184604 |
267 |
- sed -i \ |
268 |
- -e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \ |
269 |
- src/man_db.conf || die |
270 |
- |
271 |
- cat > 15man-db <<-EOF || die |
272 |
- SANDBOX_PREDICT="/var/cache/man" |
273 |
- EOF |
274 |
-} |
275 |
- |
276 |
-src_install() { |
277 |
- default |
278 |
- dodoc docs/{HACKING,TODO} |
279 |
- find "${ED}" -type f -name "*.la" -delete || die |
280 |
- |
281 |
- exeinto /etc/cron.daily |
282 |
- newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884 |
283 |
- |
284 |
- insinto /etc/sandbox.d |
285 |
- doins 15man-db |
286 |
-} |
287 |
- |
288 |
-pkg_preinst() { |
289 |
- local cachedir="${EROOT}/var/cache/man" |
290 |
- # If the system was already exploited, and the attacker is hiding in the |
291 |
- # cachedir of the old man-db, let's wipe them out. |
292 |
- # see bug #602588 comment 18 |
293 |
- local _replacing_version= |
294 |
- local _setgid_vuln=0 |
295 |
- for _replacing_version in ${REPLACING_VERSIONS}; do |
296 |
- if ver_test '2.7.6.1-r2' -le "${_replacing_version}"; then |
297 |
- debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!" |
298 |
- else |
299 |
- _setgid_vuln=1 |
300 |
- debug-print "Applying cleanup for security bug #602588" |
301 |
- fi |
302 |
- done |
303 |
- [[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}" |
304 |
- |
305 |
- # Fall back to recreating the cachedir |
306 |
- if [[ ! -d ${cachedir} ]] ; then |
307 |
- mkdir -p "${cachedir}" || die |
308 |
- chown man:man "${cachedir}" || die |
309 |
- fi |
310 |
- |
311 |
- # Update the whatis cache |
312 |
- if [[ -f ${cachedir}/whatis ]] ; then |
313 |
- einfo "Cleaning ${cachedir} from sys-apps/man" |
314 |
- find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete |
315 |
- fi |
316 |
-} |
317 |
- |
318 |
-pkg_postinst() { |
319 |
- if [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then |
320 |
- einfo "Rebuilding man-db from scratch with new database format!" |
321 |
- su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null |
322 |
- fi |
323 |
-} |