From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BC85C158088 for ; Mon, 24 Jan 2022 22:43:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F27D2BC032; Mon, 24 Jan 2022 22:43:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 688732BC035 for ; Mon, 24 Jan 2022 22:43:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9B407342FAF for ; Mon, 24 Jan 2022 22:43:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0B6812BB for ; Mon, 24 Jan 2022 22:43:34 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1643064176.2b551428a1cc8663533c5577be4d6673272e1eef.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/bubblewrap/, sys-apps/bubblewrap/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/bubblewrap/Manifest sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild sys-apps/bubblewrap/files/bubblewrap-0.3.1-selinux-configure.patch X-VCS-Directories: sys-apps/bubblewrap/files/ sys-apps/bubblewrap/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 2b551428a1cc8663533c5577be4d6673272e1eef X-VCS-Branch: master Date: Mon, 24 Jan 2022 22:43:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7c6e8bb4-e3a6-4fb7-85e6-f7c9a7c04dea X-Archives-Hash: 7f39ccd6df1883dc79ac999ab74607db commit: 2b551428a1cc8663533c5577be4d6673272e1eef Author: Matt Turner gentoo org> AuthorDate: Mon Jan 24 21:14:15 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Jan 24 22:42:56 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b551428 sys-apps/bubblewrap: Drop old versions Signed-off-by: Matt Turner gentoo.org> sys-apps/bubblewrap/Manifest | 1 - sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild | 49 ----- .../files/bubblewrap-0.3.1-selinux-configure.patch | 224 --------------------- 3 files changed, 274 deletions(-) diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest index 7c9c4f4eed74..558902c44023 100644 --- a/sys-apps/bubblewrap/Manifest +++ b/sys-apps/bubblewrap/Manifest @@ -1,2 +1 @@ -DIST bubblewrap-0.4.1.tar.xz 214496 BLAKE2B bdbff50cc4e28c91d83c814df7f2ee15702962d26a9316bd841b1e63bf5976c4549c88e20869e8cc236a8a0c9a065518f945c356fa7a058f8831f5b1e9d4eb0d SHA512 0ff46dc0fda2d0cffbb36cc52ff43951b30cbd835a42cc56806acbbbd827796bfadbb1cfafc84d6b47a72c031ca44abe1c377acc0cc25fe3b33e854f5f687d35 DIST bubblewrap-0.5.0.tar.xz 137796 BLAKE2B 36aef94335d61ae55076a0a94cd6f2c335a87f8df9900c0c603c7ee870cf84c617a0c2ad99a5979cc1dd22740d652155fa6049e717eb210c9a83afe516daa107 SHA512 b1f5bde9562bf3176c51fdc22304b901e00e1de5189d9b5479aed7b651b84bed5539fc5bb3b1db58a05da4a57d69c9f41c40e15aa5a575746630e015674a02b7 diff --git a/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild b/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild deleted file mode 100644 index 431e9434907f..000000000000 --- a/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 linux-info - -DESCRIPTION="Unprivileged sandboxing tool, namespaces-powered chroot-like solution" -HOMEPAGE="https://github.com/containers/bubblewrap/" -SRC_URI="https://github.com/containers/${PN}/releases/download/v${PV}/${P}.tar.xz" - -LICENSE="LGPL-2+" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" -IUSE="selinux +suid" - -RDEPEND=" - sys-libs/libseccomp - sys-libs/libcap - selinux? ( >=sys-libs/libselinux-2.1.9 ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - app-text/docbook-xml-dtd:4.3 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - virtual/pkgconfig -" - -# tests require root priviledge -RESTRICT="test" -PATCHES=( - "${FILESDIR}/bubblewrap-0.3.1-selinux-configure.patch" # bug 674312 -) - -pkg_setup() { - if [[ ${MERGE_TYPE} != buildonly ]]; then - CONFIG_CHECK="~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS" - linux-info_pkg_setup - fi -} - -src_configure() { - econf \ - $(use_enable selinux) \ - "--enable-man" \ - "--with-bash-completion-dir=$(get_bashcompdir)" \ - "--with-priv-mode=$(usex suid setuid none)" -} diff --git a/sys-apps/bubblewrap/files/bubblewrap-0.3.1-selinux-configure.patch b/sys-apps/bubblewrap/files/bubblewrap-0.3.1-selinux-configure.patch deleted file mode 100644 index b8fad6cc1685..000000000000 --- a/sys-apps/bubblewrap/files/bubblewrap-0.3.1-selinux-configure.patch +++ /dev/null @@ -1,224 +0,0 @@ -Author: Jonas Jelten - -upstream decided to ship the generated ./configure file... -here's the updated configure script with the missing PKG_PROG_PKG_CONFIG call - -=================================================================== ---- bubblewrap-0.3.1.orig/configure -+++ bubblewrap-0.3.1/configure -@@ -5224,107 +5224,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - --for ac_header in sys/capability.h --do : -- ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default" --if test "x$ac_cv_header_sys_capability_h" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_SYS_CAPABILITY_H 1 --_ACEOF -- --else -- as_fn_error $? "*** POSIX caps headers not found" "$LINENO" 5 --fi -- --done -- -- --# Check whether --enable-man was given. --if test "${enable_man+set}" = set; then : -- enableval=$enable_man; --else -- enable_man=maybe --fi -- -- --if test "$enable_man" != no; then : -- -- # Extract the first word of "xsltproc", so it can be a program name with args. --set dummy xsltproc; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if ${ac_cv_path_XSLTPROC+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- case $XSLTPROC in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -- -- ;; --esac --fi --XSLTPROC=$ac_cv_path_XSLTPROC --if test -n "$XSLTPROC"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 --$as_echo "$XSLTPROC" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- -- if test -z "$XSLTPROC"; then : -- -- if test "$enable_man" = yes; then : -- -- as_fn_error $? "xsltproc is required for --enable-man" "$LINENO" 5 -- --fi -- enable_man=no -- --else -- -- enable_man=yes -- --fi -- --fi -- if test "$enable_man" != no; then -- ENABLE_MAN_TRUE= -- ENABLE_MAN_FALSE='#' --else -- ENABLE_MAN_TRUE='#' -- ENABLE_MAN_FALSE= --fi -- -- -- --# Check whether --with-bash-completion-dir was given. --if test "${with_bash_completion_dir+set}" = set; then : -- withval=$with_bash_completion_dir; --else -- with_bash_completion_dir=yes --fi -- -- --if test "x$with_bash_completion_dir" = "xyes"; then -- - - - -@@ -5445,6 +5344,107 @@ $as_echo "no" >&6; } - fi - fi - -+for ac_header in sys/capability.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default" -+if test "x$ac_cv_header_sys_capability_h" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_SYS_CAPABILITY_H 1 -+_ACEOF -+ -+else -+ as_fn_error $? "*** POSIX caps headers not found" "$LINENO" 5 -+fi -+ -+done -+ -+ -+# Check whether --enable-man was given. -+if test "${enable_man+set}" = set; then : -+ enableval=$enable_man; -+else -+ enable_man=maybe -+fi -+ -+ -+if test "$enable_man" != no; then : -+ -+ # Extract the first word of "xsltproc", so it can be a program name with args. -+set dummy xsltproc; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_path_XSLTPROC+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $XSLTPROC in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+fi -+XSLTPROC=$ac_cv_path_XSLTPROC -+if test -n "$XSLTPROC"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 -+$as_echo "$XSLTPROC" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+ if test -z "$XSLTPROC"; then : -+ -+ if test "$enable_man" = yes; then : -+ -+ as_fn_error $? "xsltproc is required for --enable-man" "$LINENO" 5 -+ -+fi -+ enable_man=no -+ -+else -+ -+ enable_man=yes -+ -+fi -+ -+fi -+ if test "$enable_man" != no; then -+ ENABLE_MAN_TRUE= -+ ENABLE_MAN_FALSE='#' -+else -+ ENABLE_MAN_TRUE='#' -+ ENABLE_MAN_FALSE= -+fi -+ -+ -+ -+# Check whether --with-bash-completion-dir was given. -+if test "${with_bash_completion_dir+set}" = set; then : -+ withval=$with_bash_completion_dir; -+else -+ with_bash_completion_dir=yes -+fi -+ -+ -+if test "x$with_bash_completion_dir" = "xyes"; then -+ - pkg_failed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BASH_COMPLETION" >&5 - $as_echo_n "checking for BASH_COMPLETION... " >&6; }