Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Libcap bump 2.56 #22205

Closed
wants to merge 2 commits into from
Closed

Conversation

SoapGentoo
Copy link
Member

No description provided.

@gentoo-bot
Copy link

Pull Request assignment

Submitter: @SoapGentoo
Areas affected: ebuilds, eclasses
Packages affected: sys-libs/libcap

sys-libs/libcap: @gentoo/base-system

Linked bugs

No bugs to link found. If your pull request references any of the Gentoo bug reports, please add appropriate GLEP 66 tags to the commit message and request reassignment.

If you do not receive any reply to this pull request, please open or link a bug to attract the attention of maintainers.


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits. labels Sep 3, 2021
LICENSE="|| ( GPL-2 BSD )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="pam static-libs"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

captree!

Copy link
Member

@mgorny mgorny left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. For a special value of 'good'.

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2021-09-03 16:38 UTC
Newest commit scanned: 768c270
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/02298d7177/output.html

@SoapGentoo
Copy link
Member Author

--- libcap-2.55-r1.ebuild
+++ libcap-2.56.ebuild
@@ -13,24 +13,24 @@
 LICENSE="|| ( GPL-2 BSD )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="pam static-libs"
+IUSE="pam static-libs tools"
 
 # While the build system optionally uses gperf, we don't DEPEND on it because
 # the build automatically falls back when it's unavailable.  #604802
 PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )"
 DEPEND="${PDEPEND}
 	sys-kernel/linux-headers"
-
-# Requires test suite being run as root (via sudo)
-RESTRICT="test"
+BDEPEND="tools? ( dev-lang/go )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.55-build-system-fixes.patch
+	"${FILESDIR}"/${PN}-2.56-build-system-fixes.patch
 	"${FILESDIR}"/${PN}-2.38-no_perl.patch
 	"${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch
 	"${FILESDIR}"/${PN}-2.21-include.patch
 )
 
+QA_FLAGS_IGNORED="sbin/captree" # go binaries don't use LDFLAGS
+
 src_prepare() {
 	default
 	multilib_copy_sources
@@ -38,19 +38,22 @@
 
 run_emake() {
 	local args=(
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		RANLIB="$(tc-getRANLIB)"
 		exec_prefix="${EPREFIX}"
 		lib_prefix="${EPREFIX}/usr"
 		lib="$(get_libdir)"
 		prefix="${EPREFIX}/usr"
 		PAM_CAP="$(usex pam yes no)"
 		DYNAMIC=yes
-		GOLANG=no
+		GOLANG="$(multilib_native_usex tools yes no)"
 	)
 	emake "${args[@]}" "$@"
 }
 
 src_configure() {
-	tc-export AR CC OBJCOPY RANLIB
 	tc-export_build_env BUILD_CC
 	multilib-minimal_src_configure
 }
@@ -59,6 +62,10 @@
 	run_emake
 }
 
+multilib_src_test() {
+	run_emake test
+}
+
 multilib_src_install() {
 	# no configure, needs explicit install line #444724#c3
 	run_emake DESTDIR="${D}" install
@@ -69,9 +76,8 @@
 		rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.a || die
 	fi
 
-	if [[ -d "${ED}"/usr/$(get_libdir)/security ]] ; then
-		rm -r "${ED}"/usr/$(get_libdir)/security || die
-	fi
+	# install pam plugins ourselves
+	rm -rf "${ED}"/usr/$(get_libdir)/security || die
 
 	if use pam ; then
 		dopammod pam_cap/pam_cap.so

@SoapGentoo SoapGentoo force-pushed the libcap-bump-2.56 branch 2 times, most recently from 4dde05e to 2b529ef Compare September 3, 2021 17:29
Signed-off-by: David Seifert <soap@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2021-09-03 22:33 UTC
Newest commit scanned: 879bcf9
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/9853b1702c/output.html

@gentoo-bot gentoo-bot closed this in d017c72 Sep 3, 2021
@SoapGentoo SoapGentoo deleted the libcap-bump-2.56 branch September 3, 2021 22:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits.
Projects
None yet
6 participants