public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/bubblewrap/, sys-apps/bubblewrap/files/
@ 2020-02-29  7:35 Jason Zaman
  0 siblings, 0 replies; 3+ messages in thread
From: Jason Zaman @ 2020-02-29  7:35 UTC (permalink / raw
  To: gentoo-commits

commit:     aa32777b624878b41d3c182737426b790c955ab6
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 29 07:31:35 2020 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Feb 29 07:34:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa32777b

sys-apps/bubblewrap: Fix USE=selinux build

The ./configure checks for selinux are incorrect and fails to build
Closes: https://bugs.gentoo.org/674312
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>

 sys-apps/bubblewrap/bubblewrap-0.3.1-r2.ebuild     |  48 +++++
 .../files/bubblewrap-0.3.1-selinux-configure.patch | 224 +++++++++++++++++++++
 2 files changed, 272 insertions(+)

diff --git a/sys-apps/bubblewrap/bubblewrap-0.3.1-r2.ebuild b/sys-apps/bubblewrap/bubblewrap-0.3.1-r2.ebuild
new file mode 100644
index 00000000000..6eef7003675
--- /dev/null
+++ b/sys-apps/bubblewrap/bubblewrap-0.3.1-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 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/projectatomic/bubblewrap"
+SRC_URI="https://github.com/projectatomic/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="selinux +suid"
+
+RDEPEND="
+	sys-libs/libseccomp
+	sys-libs/libcap
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+"
+DEPEND="${RDEPEND}
+	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
new file mode 100644
index 00000000000..b8fad6cc168
--- /dev/null
+++ b/sys-apps/bubblewrap/files/bubblewrap-0.3.1-selinux-configure.patch
@@ -0,0 +1,224 @@
+Author: Jonas Jelten <jj@sft.mx>
+
+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; }


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/bubblewrap/, sys-apps/bubblewrap/files/
@ 2022-01-24 22:43 Matt Turner
  0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2022-01-24 22:43 UTC (permalink / raw
  To: gentoo-commits

commit:     2b551428a1cc8663533c5577be4d6673272e1eef
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 24 21:14:15 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> 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 <mattst88 <AT> 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 <jj@sft.mx>
-
-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; }


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/bubblewrap/, sys-apps/bubblewrap/files/
@ 2022-04-21 23:06 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-04-21 23:06 UTC (permalink / raw
  To: gentoo-commits

commit:     44e40e05abd9a2c8aec404ab99620fac7de665fe
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 23:06:18 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 23:06:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44e40e05

sys-apps/bubblewrap: fix build with Clang

Closes: https://bugs.gentoo.org/834912
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild        |  4 +++
 .../files/bubblewrap-0.6.1-clang-printf.patch      | 30 ++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild b/sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild
index cc06208a257a..388a422db4d4 100644
--- a/sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild
+++ b/sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild
@@ -30,6 +30,10 @@ BDEPEND="
 # tests require root priviledge
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-clang-printf.patch
+)
+
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		CONFIG_CHECK="~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"

diff --git a/sys-apps/bubblewrap/files/bubblewrap-0.6.1-clang-printf.patch b/sys-apps/bubblewrap/files/bubblewrap-0.6.1-clang-printf.patch
new file mode 100644
index 000000000000..7c7e0ff29988
--- /dev/null
+++ b/sys-apps/bubblewrap/files/bubblewrap-0.6.1-clang-printf.patch
@@ -0,0 +1,30 @@
+https://github.com/containers/bubblewrap/commit/08dc2bb54658e003724f570224541a674645d87f.patch
+https://bugs.gentoo.org/834912
+
+From 08dc2bb54658e003724f570224541a674645d87f Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Fri, 18 Mar 2022 10:25:51 +0100
+Subject: [PATCH] tests: properly tag ok as being printf-like
+
+Avoids breaking warning with clang
+
+Fixes #478
+
+Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+---
+ tests/test-utils.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/test-utils.c b/tests/test-utils.c
+index c9b859d2..41874a15 100644
+--- a/tests/test-utils.c
++++ b/tests/test-utils.c
+@@ -25,6 +25,8 @@
+ 
+ /* A small implementation of TAP */
+ static unsigned int test_number = 0;
++
++__attribute__((format(printf, 1, 2)))
+ static void
+ ok (const char *format, ...)
+ {


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-04-21 23:06 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-21 23:06 [gentoo-commits] repo/gentoo:master commit in: sys-apps/bubblewrap/, sys-apps/bubblewrap/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2022-01-24 22:43 Matt Turner
2020-02-29  7:35 Jason Zaman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox