mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
sys-apps/man-db: Removed old.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
This commit is contained in:
Lars Wendler
@@ -1,4 +1,3 @@
|
||||
DIST man-db-2.7.6.1.tar.xz 1541316 BLAKE2B ea3aa7e90ea8af4882bd99d99374cc37d9c0c7f70bb970973eb3f2178aa4323bcdebc7f39f142ec0144dbe55a9f86aba15d9fe281d2662d280b8e6dca9452f24 SHA512 623c5e7f8b7c289908b2c926f8777293b8d39aeceef0d2509d701a8b0bfa81408650f655c8608318221786c751a79ee91124b07993de5298cd7fa6d8bb737301
|
||||
DIST man-db-2.8.0.tar.xz 1620344 BLAKE2B abb2879848f4db187d28bb3d8359ecfab0033ea3a5333ebd1a837733de563972d97153f11c08e8669553dc5cddea12ca774117985b32d218a30db407437717f3 SHA512 06f52ecd6e7ced858a32117ea4be3ed5fc3d4428cb810d31b85dd75556e999f5badc6eb81f642b56afe2a697462ccca9fd8cc5ecfbd40f132d5a74f84f316d39
|
||||
DIST man-db-2.8.1.tar.xz 1621664 BLAKE2B 94496c1ca912e7cea2c98be8443d5b13dd685c5af86e9996b625fae44384f4cacf24a4196d77a080da10baa385b5e63d8b090c2bfcc492f2a41757d7a3840468 SHA512 82e75df32eb8575f47c3f36b5f2bbc827776747abfa39af589802e6566636c0771df0ee3197cb2bec3318c3055ff4e9d04c7da13b3bc6ea8a1ea1b1340554ef0
|
||||
DIST man-db-2.8.2.tar.xz 1622504 BLAKE2B fc551838488323914319cde2b4d0d724be63741a1e0ed816a67a26da89dfa84a7faf99a9aba20e0e254129aa0f26505b76f4ba6be6786281c4d105e96829e9ee SHA512 ffd6c3ba605da419c819dcad10edf713242074a035ce405f4c97dbbd2a7e9b253f82efae1022d08d9f04591014e752ff38a3f8727e5a5cf60d33a9167cc2d8fc
|
||||
|
||||
@@ -1,110 +0,0 @@
|
||||
From 3d4ab15670079aa8e898f80a650b3be941230486 Mon Sep 17 00:00:00 2001
|
||||
From: Lars Wendler <polynomial-c@gentoo.org>
|
||||
Date: Tue, 6 Feb 2018 15:30:21 +0100
|
||||
Subject: [PATCH] Change libseccomp logic to not be automagic only
|
||||
|
||||
Introduce --without-libseccomp configure option so that users can
|
||||
disable seccomp even if libseccomp is available on the system.
|
||||
|
||||
The default is unchanged from before this patch. If no
|
||||
--with(out)-libseccomp has been given on the command line, the macro
|
||||
looks for presence of libseccomp and uses that if found.
|
||||
|
||||
* m4/man-libseccomp.m4: Guard pkg-config test with a command-line
|
||||
option.
|
||||
---
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 3f949306..8eaca64e 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -1718,6 +1718,7 @@ with_included_regex
|
||||
enable_nls
|
||||
with_libiconv_prefix
|
||||
with_libintl_prefix
|
||||
+with_libseccomp
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
host_alias
|
||||
@@ -2459,6 +2460,7 @@ Optional Packages:
|
||||
--without-libiconv-prefix don't search for libiconv in includedir and libdir
|
||||
--with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
|
||||
--without-libintl-prefix don't search for libintl in includedir and libdir
|
||||
+ --without-libseccomp do not confine subprocesses using seccomp
|
||||
|
||||
Some influential environment variables:
|
||||
CC C compiler command
|
||||
@@ -47295,6 +47297,15 @@ fi
|
||||
|
||||
# Check for libseccomp library.
|
||||
|
||||
+# Check whether --with-libseccomp was given.
|
||||
+if test "${with_libseccomp+set}" = set; then :
|
||||
+ withval=$with_libseccomp;
|
||||
+else
|
||||
+ with_libseccomp=check
|
||||
+fi
|
||||
+
|
||||
+ if test "x$with_libseccomp" != "xno"; then
|
||||
+
|
||||
pkg_failed=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libseccomp" >&5
|
||||
$as_echo_n "checking for libseccomp... " >&6; }
|
||||
@@ -47353,11 +47364,15 @@ fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$libseccomp_PKG_ERRORS" >&5
|
||||
|
||||
- :
|
||||
+ if test "x$with_libseccomp" = "xyes"; then
|
||||
+ as_fn_error $? "--with-libseccomp given but cannot find libseccomp" "$LINENO" 5
|
||||
+ fi
|
||||
elif test $pkg_failed = untried; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
- :
|
||||
+ if test "x$with_libseccomp" = "xyes"; then
|
||||
+ as_fn_error $? "--with-libseccomp given but cannot find libseccomp" "$LINENO" 5
|
||||
+ fi
|
||||
else
|
||||
libseccomp_CFLAGS=$pkg_cv_libseccomp_CFLAGS
|
||||
libseccomp_LIBS=$pkg_cv_libseccomp_LIBS
|
||||
@@ -47367,6 +47382,7 @@ $as_echo "yes" >&6; }
|
||||
$as_echo "#define HAVE_LIBSECCOMP 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
+ fi
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: default CC = \"$CC\"" >&5
|
||||
diff --git a/m4/man-libseccomp.m4 b/m4/man-libseccomp.m4
|
||||
index a9377317..c90e3aa4 100644
|
||||
--- a/m4/man-libseccomp.m4
|
||||
+++ b/m4/man-libseccomp.m4
|
||||
@@ -1,9 +1,18 @@
|
||||
-# man-libseccomp.m4 serial 1
|
||||
+# man-libseccomp.m4 serial 2
|
||||
dnl MAN_LIBSECCOMP
|
||||
-dnl Check for the libseccomp library.
|
||||
+dnl Add a --without-libseccomp option; check for the libseccomp library.
|
||||
AC_DEFUN([MAN_LIBSECCOMP],
|
||||
-[PKG_CHECK_MODULES([libseccomp], [libseccomp],
|
||||
- [AC_DEFINE([HAVE_LIBSECCOMP], [1],
|
||||
- [Define to 1 if you have the `libseccomp' library.])],
|
||||
- [:])
|
||||
+ [AC_ARG_WITH([libseccomp],
|
||||
+ [AS_HELP_STRING([--without-libseccomp],
|
||||
+ [do not confine subprocesses using seccomp])],
|
||||
+ [],
|
||||
+ [with_libseccomp=check])
|
||||
+ if test "x$with_libseccomp" != "xno"; then
|
||||
+ PKG_CHECK_MODULES([libseccomp], [libseccomp],
|
||||
+ [AC_DEFINE([HAVE_LIBSECCOMP], [1],
|
||||
+ [Define to 1 if you have the `libseccomp' library.])],
|
||||
+ [if test "x$with_libseccomp" = "xyes"; then
|
||||
+ AC_MSG_ERROR([--with-libseccomp given but cannot find libseccomp])
|
||||
+ fi])
|
||||
+ fi
|
||||
]) # MAN_LIBSECCOMP
|
||||
--
|
||||
2.16.1
|
||||
|
||||
@@ -1,120 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit ltprune user versionator
|
||||
|
||||
DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
|
||||
HOMEPAGE="http://www.nongnu.org/man-db/"
|
||||
SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
|
||||
IUSE="berkdb +gdbm +manpager nls selinux static-libs zlib"
|
||||
|
||||
CDEPEND="
|
||||
!sys-apps/man
|
||||
>=dev-libs/libpipeline-1.5.0
|
||||
sys-apps/groff
|
||||
berkdb? ( sys-libs/db:= )
|
||||
gdbm? ( sys-libs/gdbm:= )
|
||||
!berkdb? ( !gdbm? ( sys-libs/gdbm:= ) )
|
||||
zlib? ( sys-libs/zlib )
|
||||
"
|
||||
DEPEND="
|
||||
${CDEPEND}
|
||||
app-arch/xz-utils
|
||||
virtual/pkgconfig
|
||||
nls? (
|
||||
>=app-text/po4a-0.45
|
||||
sys-devel/gettext
|
||||
)
|
||||
"
|
||||
RDEPEND="
|
||||
${CDEPEND}
|
||||
selinux? ( sec-policy/selinux-mandb )
|
||||
"
|
||||
PDEPEND="manpager? ( app-text/manpager )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-libseccomp_automagic.patch"
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
# Create user now as Makefile in src_install does setuid/chown
|
||||
enewgroup man 15
|
||||
enewuser man 13 -1 /usr/share/man man
|
||||
|
||||
if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
|
||||
ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings"
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
export ac_cv_lib_z_gzopen=$(usex zlib)
|
||||
local myeconfargs=(
|
||||
--docdir='$(datarootdir)'/doc/${PF}
|
||||
--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
|
||||
--enable-setuid
|
||||
--enable-cache-owner=man
|
||||
--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"
|
||||
$(use_enable nls)
|
||||
$(use_enable static-libs static)
|
||||
--without-libseccomp
|
||||
--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
|
||||
)
|
||||
econf "${myeconfargs[@]}"
|
||||
|
||||
# Disable color output from groff so that the manpager can add it. #184604
|
||||
sed -i \
|
||||
-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
|
||||
src/man_db.conf || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
dodoc docs/{HACKING,TODO}
|
||||
prune_libtool_files
|
||||
|
||||
exeinto /etc/cron.daily
|
||||
newexe "${FILESDIR}"/man-db.cron man-db #289884
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
local cachedir="${EROOT}var/cache/man"
|
||||
# If the system was already exploited, and the attacker is hiding in the
|
||||
# cachedir of the old man-db, let's wipe them out.
|
||||
# see bug #602588 comment 18
|
||||
local _replacing_version=
|
||||
local _setgid_vuln=0
|
||||
for _replacing_version in ${REPLACING_VERSIONS}; do
|
||||
if version_is_at_least '2.7.6.1-r2' "${_replacing_version}"; then
|
||||
debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!"
|
||||
else
|
||||
_setgid_vuln=1
|
||||
debug-print "Applying cleanup for security bug #602588"
|
||||
fi
|
||||
done
|
||||
[[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}"
|
||||
|
||||
# Fall back to recreating the cachedir
|
||||
if [[ ! -d ${cachedir} ]] ; then
|
||||
mkdir -p "${cachedir}" || die
|
||||
chown man:man "${cachedir}" || die
|
||||
fi
|
||||
|
||||
# Update the whatis cache
|
||||
if [[ -f ${cachedir}/whatis ]] ; then
|
||||
einfo "Cleaning ${cachedir} from sys-apps/man"
|
||||
find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
|
||||
einfo "Rebuilding man-db from scratch with new database format!"
|
||||
mandb --quiet --create
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user