1 |
commit: a5c681ca67e58d09aab9b5fa042962e52da24dbc |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 28 21:02:24 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 28 21:02:24 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5c681ca |
7 |
|
8 |
sys-apps/man-db: Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
sys-apps/man-db/Manifest | 1 - |
13 |
.../files/man-db-2.8.0-libseccomp_automagic.patch | 110 ------------------- |
14 |
sys-apps/man-db/man-db-2.8.0-r2.ebuild | 120 --------------------- |
15 |
3 files changed, 231 deletions(-) |
16 |
|
17 |
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest |
18 |
index 6cb874011fe..b15f0dbb4d8 100644 |
19 |
--- a/sys-apps/man-db/Manifest |
20 |
+++ b/sys-apps/man-db/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
DIST man-db-2.7.6.1.tar.xz 1541316 BLAKE2B ea3aa7e90ea8af4882bd99d99374cc37d9c0c7f70bb970973eb3f2178aa4323bcdebc7f39f142ec0144dbe55a9f86aba15d9fe281d2662d280b8e6dca9452f24 SHA512 623c5e7f8b7c289908b2c926f8777293b8d39aeceef0d2509d701a8b0bfa81408650f655c8608318221786c751a79ee91124b07993de5298cd7fa6d8bb737301 |
23 |
-DIST man-db-2.8.0.tar.xz 1620344 BLAKE2B abb2879848f4db187d28bb3d8359ecfab0033ea3a5333ebd1a837733de563972d97153f11c08e8669553dc5cddea12ca774117985b32d218a30db407437717f3 SHA512 06f52ecd6e7ced858a32117ea4be3ed5fc3d4428cb810d31b85dd75556e999f5badc6eb81f642b56afe2a697462ccca9fd8cc5ecfbd40f132d5a74f84f316d39 |
24 |
DIST man-db-2.8.1.tar.xz 1621664 BLAKE2B 94496c1ca912e7cea2c98be8443d5b13dd685c5af86e9996b625fae44384f4cacf24a4196d77a080da10baa385b5e63d8b090c2bfcc492f2a41757d7a3840468 SHA512 82e75df32eb8575f47c3f36b5f2bbc827776747abfa39af589802e6566636c0771df0ee3197cb2bec3318c3055ff4e9d04c7da13b3bc6ea8a1ea1b1340554ef0 |
25 |
DIST man-db-2.8.2.tar.xz 1622504 BLAKE2B fc551838488323914319cde2b4d0d724be63741a1e0ed816a67a26da89dfa84a7faf99a9aba20e0e254129aa0f26505b76f4ba6be6786281c4d105e96829e9ee SHA512 ffd6c3ba605da419c819dcad10edf713242074a035ce405f4c97dbbd2a7e9b253f82efae1022d08d9f04591014e752ff38a3f8727e5a5cf60d33a9167cc2d8fc |
26 |
|
27 |
diff --git a/sys-apps/man-db/files/man-db-2.8.0-libseccomp_automagic.patch b/sys-apps/man-db/files/man-db-2.8.0-libseccomp_automagic.patch |
28 |
deleted file mode 100644 |
29 |
index cf9c1257317..00000000000 |
30 |
--- a/sys-apps/man-db/files/man-db-2.8.0-libseccomp_automagic.patch |
31 |
+++ /dev/null |
32 |
@@ -1,110 +0,0 @@ |
33 |
-From 3d4ab15670079aa8e898f80a650b3be941230486 Mon Sep 17 00:00:00 2001 |
34 |
-From: Lars Wendler <polynomial-c@g.o> |
35 |
-Date: Tue, 6 Feb 2018 15:30:21 +0100 |
36 |
-Subject: [PATCH] Change libseccomp logic to not be automagic only |
37 |
- |
38 |
-Introduce --without-libseccomp configure option so that users can |
39 |
-disable seccomp even if libseccomp is available on the system. |
40 |
- |
41 |
-The default is unchanged from before this patch. If no |
42 |
---with(out)-libseccomp has been given on the command line, the macro |
43 |
-looks for presence of libseccomp and uses that if found. |
44 |
- |
45 |
-* m4/man-libseccomp.m4: Guard pkg-config test with a command-line |
46 |
-option. |
47 |
---- |
48 |
- |
49 |
-diff --git a/configure b/configure |
50 |
-index 3f949306..8eaca64e 100755 |
51 |
---- a/configure |
52 |
-+++ b/configure |
53 |
-@@ -1718,6 +1718,7 @@ with_included_regex |
54 |
- enable_nls |
55 |
- with_libiconv_prefix |
56 |
- with_libintl_prefix |
57 |
-+with_libseccomp |
58 |
- ' |
59 |
- ac_precious_vars='build_alias |
60 |
- host_alias |
61 |
-@@ -2459,6 +2460,7 @@ Optional Packages: |
62 |
- --without-libiconv-prefix don't search for libiconv in includedir and libdir |
63 |
- --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib |
64 |
- --without-libintl-prefix don't search for libintl in includedir and libdir |
65 |
-+ --without-libseccomp do not confine subprocesses using seccomp |
66 |
- |
67 |
- Some influential environment variables: |
68 |
- CC C compiler command |
69 |
-@@ -47295,6 +47297,15 @@ fi |
70 |
- |
71 |
- # Check for libseccomp library. |
72 |
- |
73 |
-+# Check whether --with-libseccomp was given. |
74 |
-+if test "${with_libseccomp+set}" = set; then : |
75 |
-+ withval=$with_libseccomp; |
76 |
-+else |
77 |
-+ with_libseccomp=check |
78 |
-+fi |
79 |
-+ |
80 |
-+ if test "x$with_libseccomp" != "xno"; then |
81 |
-+ |
82 |
- pkg_failed=no |
83 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libseccomp" >&5 |
84 |
- $as_echo_n "checking for libseccomp... " >&6; } |
85 |
-@@ -47353,11 +47364,15 @@ fi |
86 |
- # Put the nasty error message in config.log where it belongs |
87 |
- echo "$libseccomp_PKG_ERRORS" >&5 |
88 |
- |
89 |
-- : |
90 |
-+ if test "x$with_libseccomp" = "xyes"; then |
91 |
-+ as_fn_error $? "--with-libseccomp given but cannot find libseccomp" "$LINENO" 5 |
92 |
-+ fi |
93 |
- elif test $pkg_failed = untried; then |
94 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
95 |
- $as_echo "no" >&6; } |
96 |
-- : |
97 |
-+ if test "x$with_libseccomp" = "xyes"; then |
98 |
-+ as_fn_error $? "--with-libseccomp given but cannot find libseccomp" "$LINENO" 5 |
99 |
-+ fi |
100 |
- else |
101 |
- libseccomp_CFLAGS=$pkg_cv_libseccomp_CFLAGS |
102 |
- libseccomp_LIBS=$pkg_cv_libseccomp_LIBS |
103 |
-@@ -47367,6 +47382,7 @@ $as_echo "yes" >&6; } |
104 |
- $as_echo "#define HAVE_LIBSECCOMP 1" >>confdefs.h |
105 |
- |
106 |
- fi |
107 |
-+ fi |
108 |
- |
109 |
- |
110 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: default CC = \"$CC\"" >&5 |
111 |
-diff --git a/m4/man-libseccomp.m4 b/m4/man-libseccomp.m4 |
112 |
-index a9377317..c90e3aa4 100644 |
113 |
---- a/m4/man-libseccomp.m4 |
114 |
-+++ b/m4/man-libseccomp.m4 |
115 |
-@@ -1,9 +1,18 @@ |
116 |
--# man-libseccomp.m4 serial 1 |
117 |
-+# man-libseccomp.m4 serial 2 |
118 |
- dnl MAN_LIBSECCOMP |
119 |
--dnl Check for the libseccomp library. |
120 |
-+dnl Add a --without-libseccomp option; check for the libseccomp library. |
121 |
- AC_DEFUN([MAN_LIBSECCOMP], |
122 |
--[PKG_CHECK_MODULES([libseccomp], [libseccomp], |
123 |
-- [AC_DEFINE([HAVE_LIBSECCOMP], [1], |
124 |
-- [Define to 1 if you have the `libseccomp' library.])], |
125 |
-- [:]) |
126 |
-+ [AC_ARG_WITH([libseccomp], |
127 |
-+ [AS_HELP_STRING([--without-libseccomp], |
128 |
-+ [do not confine subprocesses using seccomp])], |
129 |
-+ [], |
130 |
-+ [with_libseccomp=check]) |
131 |
-+ if test "x$with_libseccomp" != "xno"; then |
132 |
-+ PKG_CHECK_MODULES([libseccomp], [libseccomp], |
133 |
-+ [AC_DEFINE([HAVE_LIBSECCOMP], [1], |
134 |
-+ [Define to 1 if you have the `libseccomp' library.])], |
135 |
-+ [if test "x$with_libseccomp" = "xyes"; then |
136 |
-+ AC_MSG_ERROR([--with-libseccomp given but cannot find libseccomp]) |
137 |
-+ fi]) |
138 |
-+ fi |
139 |
- ]) # MAN_LIBSECCOMP |
140 |
--- |
141 |
-2.16.1 |
142 |
- |
143 |
|
144 |
diff --git a/sys-apps/man-db/man-db-2.8.0-r2.ebuild b/sys-apps/man-db/man-db-2.8.0-r2.ebuild |
145 |
deleted file mode 100644 |
146 |
index cb7cf8d1c4e..00000000000 |
147 |
--- a/sys-apps/man-db/man-db-2.8.0-r2.ebuild |
148 |
+++ /dev/null |
149 |
@@ -1,120 +0,0 @@ |
150 |
-# Copyright 1999-2018 Gentoo Foundation |
151 |
-# Distributed under the terms of the GNU General Public License v2 |
152 |
- |
153 |
-EAPI=6 |
154 |
- |
155 |
-inherit ltprune user versionator |
156 |
- |
157 |
-DESCRIPTION="a man replacement that utilizes berkdb instead of flat files" |
158 |
-HOMEPAGE="http://www.nongnu.org/man-db/" |
159 |
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" |
160 |
- |
161 |
-LICENSE="GPL-3" |
162 |
-SLOT="0" |
163 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" |
164 |
-IUSE="berkdb +gdbm +manpager nls selinux static-libs zlib" |
165 |
- |
166 |
-CDEPEND=" |
167 |
- !sys-apps/man |
168 |
- >=dev-libs/libpipeline-1.5.0 |
169 |
- sys-apps/groff |
170 |
- berkdb? ( sys-libs/db:= ) |
171 |
- gdbm? ( sys-libs/gdbm:= ) |
172 |
- !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) |
173 |
- zlib? ( sys-libs/zlib ) |
174 |
-" |
175 |
-DEPEND=" |
176 |
- ${CDEPEND} |
177 |
- app-arch/xz-utils |
178 |
- virtual/pkgconfig |
179 |
- nls? ( |
180 |
- >=app-text/po4a-0.45 |
181 |
- sys-devel/gettext |
182 |
- ) |
183 |
-" |
184 |
-RDEPEND=" |
185 |
- ${CDEPEND} |
186 |
- selinux? ( sec-policy/selinux-mandb ) |
187 |
-" |
188 |
-PDEPEND="manpager? ( app-text/manpager )" |
189 |
- |
190 |
-PATCHES=( |
191 |
- "${FILESDIR}/${P}-libseccomp_automagic.patch" |
192 |
-) |
193 |
- |
194 |
-pkg_setup() { |
195 |
- # Create user now as Makefile in src_install does setuid/chown |
196 |
- enewgroup man 15 |
197 |
- enewuser man 13 -1 /usr/share/man man |
198 |
- |
199 |
- if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150 |
200 |
- ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings" |
201 |
- fi |
202 |
-} |
203 |
- |
204 |
-src_configure() { |
205 |
- export ac_cv_lib_z_gzopen=$(usex zlib) |
206 |
- local myeconfargs=( |
207 |
- --docdir='$(datarootdir)'/doc/${PF} |
208 |
- --with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d |
209 |
- --enable-setuid |
210 |
- --enable-cache-owner=man |
211 |
- --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" |
212 |
- $(use_enable nls) |
213 |
- $(use_enable static-libs static) |
214 |
- --without-libseccomp |
215 |
- --with-db=$(usex gdbm gdbm $(usex berkdb db gdbm)) |
216 |
- ) |
217 |
- econf "${myeconfargs[@]}" |
218 |
- |
219 |
- # Disable color output from groff so that the manpager can add it. #184604 |
220 |
- sed -i \ |
221 |
- -e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \ |
222 |
- src/man_db.conf || die |
223 |
-} |
224 |
- |
225 |
-src_install() { |
226 |
- default |
227 |
- dodoc docs/{HACKING,TODO} |
228 |
- prune_libtool_files |
229 |
- |
230 |
- exeinto /etc/cron.daily |
231 |
- newexe "${FILESDIR}"/man-db.cron man-db #289884 |
232 |
-} |
233 |
- |
234 |
-pkg_preinst() { |
235 |
- local cachedir="${EROOT}var/cache/man" |
236 |
- # If the system was already exploited, and the attacker is hiding in the |
237 |
- # cachedir of the old man-db, let's wipe them out. |
238 |
- # see bug #602588 comment 18 |
239 |
- local _replacing_version= |
240 |
- local _setgid_vuln=0 |
241 |
- for _replacing_version in ${REPLACING_VERSIONS}; do |
242 |
- if version_is_at_least '2.7.6.1-r2' "${_replacing_version}"; then |
243 |
- debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!" |
244 |
- else |
245 |
- _setgid_vuln=1 |
246 |
- debug-print "Applying cleanup for security bug #602588" |
247 |
- fi |
248 |
- done |
249 |
- [[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}" |
250 |
- |
251 |
- # Fall back to recreating the cachedir |
252 |
- if [[ ! -d ${cachedir} ]] ; then |
253 |
- mkdir -p "${cachedir}" || die |
254 |
- chown man:man "${cachedir}" || die |
255 |
- fi |
256 |
- |
257 |
- # Update the whatis cache |
258 |
- if [[ -f ${cachedir}/whatis ]] ; then |
259 |
- einfo "Cleaning ${cachedir} from sys-apps/man" |
260 |
- find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete |
261 |
- fi |
262 |
-} |
263 |
- |
264 |
-pkg_postinst() { |
265 |
- if [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then |
266 |
- einfo "Rebuilding man-db from scratch with new database format!" |
267 |
- mandb --quiet --create |
268 |
- fi |
269 |
-} |