diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-03-02 15:59:12 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-03-02 15:59:12 +0000 |
commit | 06a7b5647e11a8ddf69b1c3d3ded6a8ba28b923e (patch) | |
tree | 8d58c1f4b049da677b33209b072f2b3057268fe0 /sys-apps/man-db | |
parent | 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (diff) |
gentoo resync : 02.03.2018
Diffstat (limited to 'sys-apps/man-db')
-rw-r--r-- | sys-apps/man-db/Manifest | 5 | ||||
-rw-r--r-- | sys-apps/man-db/files/man-db-2.8.0-libseccomp_automagic.patch | 110 | ||||
-rw-r--r-- | sys-apps/man-db/man-db-2.8.2.ebuild (renamed from sys-apps/man-db/man-db-2.8.0-r2.ebuild) | 18 |
3 files changed, 12 insertions, 121 deletions
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest index b98955f9b286..6bb91435b180 100644 --- a/sys-apps/man-db/Manifest +++ b/sys-apps/man-db/Manifest @@ -1,10 +1,9 @@ -AUX man-db-2.8.0-libseccomp_automagic.patch 3579 BLAKE2B eaa3a3f5519acc762d34db8dfa43eac737f0fcf952efc90cb3197be68f65539ff84bc1ec8ee8b75e82ac293d9f5eb233c8da006da96f118f141ec309673fd1c7 SHA512 9fd8837514eb11c8a702c540ec40595e431632654de76234115ebef4d72d3ad680a977c83578fdbbaad316544a27a6283ddbde31942be20ab68ed186ba7a7827 AUX man-db.cron 217 BLAKE2B 38f11fe7c3b1bcdd9c81cc904ec9b22af3722cacf1b30fa1fd80d4416743aa2f8f4c2a9246b0037c7cc9fbf23af430af10f69a7bb6c3dbb8f809c9a49cb31cf4 SHA512 81a7082d7f0cdf17d8277af7142aaa98feb8c12cf41bb96c12af53fdd3e436a4d15a57ef76fb90390133cfdb25e1bb1b16e17a39b39b6517afc529b871426331 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 EBUILD man-db-2.7.6.1-r2.ebuild 3173 BLAKE2B 7fc7db98ce8e00ddd57564cfd72129b3b42e1505e3d0cf0ebe875b8793febd33024245e61f4db184955cdd4d60ed7862af9639874859e317a17996483627240b SHA512 0a51e238d3b399eb8fffbb01f229c614aad6c84691ca9b309c982a2e832a332f01d963f6d3e1da850dc667d6248acd04f564418838692bce98af70cc9d6aabf9 -EBUILD man-db-2.8.0-r2.ebuild 3278 BLAKE2B 71b8fe018cdad873b4939189f4fe229f04ad7c626f40dfc727d8a1e72339a7895ee7def5b53e7897b2f811303835e26ca112d6bcc308e9fb6859e432bb8d3758 SHA512 390b9c7265525aea65837ef9116ee41da92c54f2e9d1122d8313b22861f516cc22a0f10397f1521bc86a5fd10475db41b70dd9e7fd2ee992ae9657faff6b09e4 EBUILD man-db-2.8.1.ebuild 3389 BLAKE2B 32d6a4d0df1b7f1bcae76b6c91a88b736f781b71c8fbdbb31fdc035e0c95dbb84aeb922051cd7149d53b1201ebb5966fc7ec3ea3ca25a6b6ff7e561ef09664d4 SHA512 f5513746a0c73d3aa969c7e821d22119f41e81f3726a9702ce57b6c4a85f9321a512050af163f589295a5377f5430835fd6195c784a42ea692cd44b0c3222ab6 +EBUILD man-db-2.8.2.ebuild 3389 BLAKE2B 32d6a4d0df1b7f1bcae76b6c91a88b736f781b71c8fbdbb31fdc035e0c95dbb84aeb922051cd7149d53b1201ebb5966fc7ec3ea3ca25a6b6ff7e561ef09664d4 SHA512 f5513746a0c73d3aa969c7e821d22119f41e81f3726a9702ce57b6c4a85f9321a512050af163f589295a5377f5430835fd6195c784a42ea692cd44b0c3222ab6 EBUILD man-db-9999.ebuild 3389 BLAKE2B 32d6a4d0df1b7f1bcae76b6c91a88b736f781b71c8fbdbb31fdc035e0c95dbb84aeb922051cd7149d53b1201ebb5966fc7ec3ea3ca25a6b6ff7e561ef09664d4 SHA512 f5513746a0c73d3aa969c7e821d22119f41e81f3726a9702ce57b6c4a85f9321a512050af163f589295a5377f5430835fd6195c784a42ea692cd44b0c3222ab6 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79 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 deleted file mode 100644 index cf9c12573178..000000000000 --- a/sys-apps/man-db/files/man-db-2.8.0-libseccomp_automagic.patch +++ /dev/null @@ -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 - diff --git a/sys-apps/man-db/man-db-2.8.0-r2.ebuild b/sys-apps/man-db/man-db-2.8.2.ebuild index cb7cf8d1c4e8..627b8941479e 100644 --- a/sys-apps/man-db/man-db-2.8.0-r2.ebuild +++ b/sys-apps/man-db/man-db-2.8.2.ebuild @@ -7,12 +7,17 @@ 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" +if [[ "${PV}" = 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git" +else + SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" +fi 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" +IUSE="berkdb +gdbm +manpager nls seccomp selinux static-libs zlib" CDEPEND=" !sys-apps/man @@ -21,6 +26,7 @@ CDEPEND=" berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) + seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) " DEPEND=" @@ -38,10 +44,6 @@ RDEPEND=" " 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 @@ -62,7 +64,7 @@ src_configure() { --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 + $(use_with seccomp libseccomp) --with-db=$(usex gdbm gdbm $(usex berkdb db gdbm)) ) econf "${myeconfargs[@]}" |