From 9ba420fdcd12b6592a835d3b99c3df8f60fcbb45 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Wed, 14 Oct 2015 10:36:48 -0700 Subject: [PATCH] bump(sys-libs/libcap): sync with upstream --- .../metadata/md5-cache/sys-libs/libcap-2.17 | 12 -- .../metadata/md5-cache/sys-libs/libcap-2.19 | 12 -- .../metadata/md5-cache/sys-libs/libcap-2.20 | 13 -- .../metadata/md5-cache/sys-libs/libcap-2.21 | 13 -- .../metadata/md5-cache/sys-libs/libcap-2.22 | 13 -- .../md5-cache/sys-libs/libcap-2.22-r1 | 13 -- .../md5-cache/sys-libs/libcap-2.22-r2 | 4 +- .../md5-cache/sys-libs/libcap-2.24-r2 | 13 ++ .../portage-stable/sys-libs/libcap/ChangeLog | 24 ++- .../portage-stable/sys-libs/libcap/Manifest | 40 +---- .../files/2.16/0001-build-system-fixes.patch | 154 ------------------ ...h => libcap-2.24-build-system-fixes.patch} | 55 ++++--- .../files/libcap-2.24-setcap-errno.patch | 45 +++++ .../sys-libs/libcap/libcap-2.17.ebuild | 48 ------ .../sys-libs/libcap/libcap-2.19.ebuild | 47 ------ .../sys-libs/libcap/libcap-2.20.ebuild | 47 ------ .../sys-libs/libcap/libcap-2.21.ebuild | 48 ------ .../sys-libs/libcap/libcap-2.22-r1.ebuild | 52 ------ .../sys-libs/libcap/libcap-2.22-r2.ebuild | 6 +- .../sys-libs/libcap/libcap-2.22.ebuild | 51 ------ .../sys-libs/libcap/libcap-2.24-r2.ebuild | 73 +++++++++ 21 files changed, 192 insertions(+), 591 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.17 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.19 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.20 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.21 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.22 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.22-r1 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.24-r2 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libcap/files/2.16/0001-build-system-fixes.patch rename sdk_container/src/third_party/portage-stable/sys-libs/libcap/files/{libcap-2.20-build-system-fixes.patch => libcap-2.24-build-system-fixes.patch} (75%) create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libcap/files/libcap-2.24-setcap-errno.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.17.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.19.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.20.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.21.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.22-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.22.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.24-r2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.17 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.17 deleted file mode 100644 index 9aa7336ba4..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.17 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install unpack -DEPEND=sys-apps/attr pam? ( virtual/pam ) sys-kernel/linux-headers -DESCRIPTION=POSIX 1003.1e capabilities -HOMEPAGE=http://www.friedhoff.org/posixfilecaps.html -IUSE=pam -KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -LICENSE=GPL-2 BSD -RDEPEND=sys-apps/attr pam? ( virtual/pam ) -SLOT=0 -SRC_URI=mirror://kernel/linux/libs/security/linux-privs/libcap2/libcap-2.17.tar.bz2 -_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 pam aa1ebb3ab720ea04dbbdd6eaaf9554ed toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=9e04973604ff0c40dfbeaa8680d3912e diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.19 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.19 deleted file mode 100644 index b39a716d81..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.19 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install unpack -DEPEND=sys-apps/attr pam? ( virtual/pam ) sys-kernel/linux-headers -DESCRIPTION=POSIX 1003.1e capabilities -HOMEPAGE=http://www.friedhoff.org/posixfilecaps.html -IUSE=pam -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -LICENSE=GPL-2 BSD -RDEPEND=sys-apps/attr pam? ( virtual/pam ) -SLOT=0 -SRC_URI=mirror://kernel/linux/libs/security/linux-privs/libcap2/libcap-2.19.tar.bz2 -_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 pam aa1ebb3ab720ea04dbbdd6eaaf9554ed toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=e147d380f95e0042bf828f33d5244fe3 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.20 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.20 deleted file mode 100644 index 8da50123cf..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.20 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install prepare -DEPEND=sys-apps/attr pam? ( virtual/pam ) sys-kernel/linux-headers -DESCRIPTION=POSIX 1003.1e capabilities -EAPI=2 -HOMEPAGE=http://www.friedhoff.org/posixfilecaps.html -IUSE=pam -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -LICENSE=GPL-2 BSD -RDEPEND=sys-apps/attr pam? ( virtual/pam ) -SLOT=0 -SRC_URI=mirror://kernel/linux/libs/security/linux-privs/libcap2/libcap-2.20.tar.bz2 -_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 pam aa1ebb3ab720ea04dbbdd6eaaf9554ed toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=289ae3ccdaf35376f7bc26c26edeb5d8 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.21 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.21 deleted file mode 100644 index 0a6c3635fb..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.21 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install prepare -DEPEND=sys-apps/attr pam? ( virtual/pam ) sys-kernel/linux-headers -DESCRIPTION=POSIX 1003.1e capabilities -EAPI=2 -HOMEPAGE=http://www.friedhoff.org/posixfilecaps.html -IUSE=pam -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -LICENSE=GPL-2 BSD -RDEPEND=sys-apps/attr pam? ( virtual/pam ) -SLOT=0 -SRC_URI=mirror://kernel/linux/libs/security/linux-privs/libcap2/libcap-2.21.tar.bz2 -_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 pam aa1ebb3ab720ea04dbbdd6eaaf9554ed toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=cf89d8691b8945b51197c856e1b4e6eb diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.22 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.22 deleted file mode 100644 index c564db97ae..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.22 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=configure install prepare -DEPEND=sys-apps/attr pam? ( virtual/pam ) sys-kernel/linux-headers -DESCRIPTION=POSIX 1003.1e capabilities -EAPI=2 -HOMEPAGE=http://www.friedhoff.org/posixfilecaps.html -IUSE=pam -KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -LICENSE=|| ( GPL-2 BSD ) -RDEPEND=sys-apps/attr pam? ( virtual/pam ) -SLOT=0 -SRC_URI=mirror://gentoo/libcap-2.22.tar.bz2 -_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 pam aa1ebb3ab720ea04dbbdd6eaaf9554ed toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=4f421606ca88e432efa9939cf54f09d8 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.22-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.22-r1 deleted file mode 100644 index 08e2a93634..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.22-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=configure install prepare -DEPEND=sys-apps/attr pam? ( virtual/pam ) sys-kernel/linux-headers -DESCRIPTION=POSIX 1003.1e capabilities -EAPI=4 -HOMEPAGE=http://www.friedhoff.org/posixfilecaps.html -IUSE=pam -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux -LICENSE=|| ( GPL-2 BSD ) -RDEPEND=sys-apps/attr pam? ( virtual/pam ) -SLOT=0 -SRC_URI=mirror://gentoo/libcap-2.22.tar.bz2 -_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 pam aa1ebb3ab720ea04dbbdd6eaaf9554ed toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=7645535a852ffa433b16d779c2e21821 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.22-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.22-r2 index e7838be4c8..321b199cc7 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.22-r2 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.22-r2 @@ -4,10 +4,10 @@ DESCRIPTION=POSIX 1003.1e capabilities EAPI=4 HOMEPAGE=http://www.friedhoff.org/posixfilecaps.html IUSE=pam abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux +KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux LICENSE=|| ( GPL-2 BSD ) RDEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] pam? ( virtual/pam ) SLOT=0 SRC_URI=mirror://gentoo/libcap-2.22.tar.bz2 _eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 pam aa1ebb3ab720ea04dbbdd6eaaf9554ed toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=6b78bee1165cdb2481b42f038379f321 +_md5_=8f874f945f2f6b064a280bf727edb397 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.24-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.24-r2 new file mode 100644 index 0000000000..86c72c5d8c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/libcap-2.24-r2 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] pam? ( virtual/pam ) sys-kernel/linux-headers +DESCRIPTION=POSIX 1003.1e capabilities +EAPI=4 +HOMEPAGE=http://www.friedhoff.org/posixfilecaps.html +IUSE=pam static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux +LICENSE=|| ( GPL-2 BSD ) +RDEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] pam? ( virtual/pam ) +SLOT=0 +SRC_URI=mirror://kernel/linux/libs/security/linux-privs/libcap2/libcap-2.24.tar.xz +_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 pam aa1ebb3ab720ea04dbbdd6eaaf9554ed toolchain-funcs 42408102d713fbad60ca21349865edb4 +_md5_=2ee11468ed2901c26246cbb3084a2de4 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/ChangeLog b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/ChangeLog index 841276d827..a3991c4b52 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/ChangeLog +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/ChangeLog @@ -1,6 +1,26 @@ # ChangeLog for sys-libs/libcap -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.137 2014/09/15 08:24:08 ago Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.141 2015/07/13 06:04:27 vapier Exp $ + +*libcap-2.24-r2 (13 Jul 2015) + + 13 Jul 2015; Mike Frysinger + +files/libcap-2.24-setcap-errno.patch, +libcap-2.24-r2.ebuild: + Fix errno display in setcap #551672 by Helmut Jarausch. + +*libcap-2.24-r1 (29 May 2015) + + 29 May 2015; Mike Frysinger +libcap-2.24-r1.ebuild: + Fix install of pkg-config files #550730 by Martin Jansa. + +*libcap-2.24 (25 May 2015) + + 25 May 2015; Mike Frysinger + +files/libcap-2.24-build-system-fixes.patch, +libcap-2.24.ebuild: + Version bump #530164 by Nikoli. + + 25 May 2015; Mike Frysinger libcap-2.22-r2.ebuild: + Mark arm64/m68k/s390/sh stable. 15 Sep 2014; Agostino Sarubbo libcap-2.22-r2.ebuild: Stable for sparc, wrt bug #512012 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/Manifest index 43b334f7e4..9d8227b297 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/Manifest @@ -1,40 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX 2.16/0001-build-system-fixes.patch 4632 SHA256 4c4e5dc5d465e7db63076d80b627705e8c65adb55d2e97aeaa976e2fe5c12a1e SHA512 1b6d2e5e19f479eb6fd016965896613ab91ecd2c29e7e38e4c6ef86ce84c850bca738891b2e339e28d153977df2fb4b374f91692019ec00619e965d0c8e4dde6 WHIRLPOOL 2ce649612f96c653594a9c8e4670d81b412c6c34add94d7c90b69fd0ee49f6617d396da805ce921a0ef2d1d193e31d9433bf5b1a9fd5d3ac302bac7fc1f4ba96 -AUX libcap-2.20-build-system-fixes.patch 4832 SHA256 67a741af74c13a283e73cd3d9e828b73e1db68db19e8010e942c341b6d280842 SHA512 c8f4a3b6a9e8fa51f3095f11c5320a96ffce48ace96de5fe632b7087fe9f0813428b45cdebf6fa954ee1ace7acdf6cb11620df642194108097fc80969c668676 WHIRLPOOL 6216c3359bd72700938f9c4843f2b2312765db81e06e03cf7c51d954f2479a4b459b2b48b643820266319baac1d593c46b9bf74eafdf9eabc99784ef3d110d40 AUX libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch 840 SHA256 29be1427227f9b045151bd02597192bff1c6761c649014b0fd1384f08e010616 SHA512 59936147919f3a8959d87831583df96ab3e1883e58b746f6542cc6430434d2a93c07e79ff7e9fdf9698626aa42e60c6c57981025e46923be76ff2d65720d606c WHIRLPOOL c721054ac8538b748367b9a17971d3021831fdaf49260a2290484a506638ee8598946f001272e014937abb99569b17b0a3f9daed31ea426b6ce74f9a09460867 AUX libcap-2.21-include.patch 290 SHA256 60038e5f67928edbf7e1b43b8799d5a92cff40dd7c3678135c793ed434c29305 SHA512 6f4867c64121e1294824a2dc1ac02578c9900cd051aea41d0920f1f65e162e3acec86a42f7e4fa6ee1dff08554fe25bd740951e9dc8a11bf79471229f268cffd WHIRLPOOL c3233cf04efc380c274bbd2860576f68494a16e4b0a2827284a692b560650379e33497532b347c2e8aa5019d229f8ceb6be3e0a990e21eae5d459134115aafd1 AUX libcap-2.22-build-system-fixes.patch 5319 SHA256 f0c3323a5ec34e07eb397d6e1527ac3d6c519c4a91261a206019d25eb161f426 SHA512 d57181ce1dbe95c2c40cdc49cff8d7368287d512b0f05c296266071cb689b94891aca201c978d316cf2851b806b7bcb2acaef3aeef69ead6a380490aecaea0c7 WHIRLPOOL bf076c3bbba28c861cdccf1639d4fe3205fa4e3ec2c50da9a7d052d439cb7b4f8bfb4e8a770ffeaca4fa1612497a04ea151fadcb439f188f6576952933a88646 AUX libcap-2.22-no-perl.patch 2360 SHA256 4eca873685da1aec0d06e9d7681c285166f9ad7e7cb14c65da6e05cbb135e9ef SHA512 8c49d829cbae15f28ded70b96bc0715819b13183136d90b64b7b6bfbd85c262f0161d89450579e9b58961c724b34816919d111f839e3f5a7a68427ffe441881d WHIRLPOOL 1da9b5b8b54c38bf45117653122ee6dc55949c21c39152d18d2dc0c721d4b906f777a8734d184d18b2c7a25b2aa06aa68d1ccc4409b16915aeb8d9b014951759 -DIST libcap-2.17.tar.bz2 48899 SHA256 2cab109eed9bd944408c13efed910091479d8770cf9aa1bec4f9b26d9302f5b0 SHA512 f8c79889359f92c9f714b4fe602454f0e0ae7c78bf2fa2ddf849a1cda05a8ef7d993c69f7662cbb8939e42da6a43b401e9199d5aa9de220eafcede9a06f727b5 WHIRLPOOL dc6cb019ec32c529600eb8198098b69157b2ebf279e0b003a003e906aedda07ebac355cdcbbebde222aa1ab9a2d22be34b2b216b0c1249134404a736a540bea4 -DIST libcap-2.19.tar.bz2 53099 SHA256 ed1693e344054a398e68a7cc840892e3d1a880562743bdf28fd918649aa5a4ce SHA512 1453e3014fdff57c01e3dca5a4b5d1754e641ecb4011296a39d0d088ee1fe371e13f851ae2c6c29e7f0d7bfeeeb4c2a11d112da6ed4600f5d489788faaee9fb2 WHIRLPOOL 2b6ee718d91902617dda3cb7beaa3bf29e785dc635f33af635ab74245259dd0d81f8da1cc5bd38bbed8ff85752536b2596941c4da581a29d7380d039218fbd49 -DIST libcap-2.20.tar.bz2 53629 SHA256 20e7c1ea4d3d5c410efb3a6ff138dc417912fae316d883460dcd58d9803a9220 SHA512 3ab62d1a563d1f380485b4cb6ba77e9a4c8806b9d6b115c0bc9bad8c1e251bb4906a8b2cc21b07c0c274811e2f6d2aa3840696babb9348dcdf25eae166214810 WHIRLPOOL eb84e9fad6056d02e482e582fc26bcbeac456da7d0daeb1ad43f54056afd814bdeef231acd3037eab44eb3a5d7a4c23c7638a73ca7ee706a1c75e739edbc36a3 -DIST libcap-2.21.tar.bz2 54360 SHA256 9e1615bb331786eb6cb3968ca27153bcfac8a16cf8db9253b8407faa53b3f011 SHA512 71398dacc4dc3b896233d6c991f07b0913253512961195c597cd4f6714c316df2ae1954da1bf60c7d6011e67dcefda7f7effd6cd37be6e215a29fc7d81eaad2e WHIRLPOOL c5fff6a9a6e6c4c1b186422891d38f5dffab8b40f62ee54625359bb7980d4de8557979f78c459b9c4545496e8649cecc32983d2581d17e4b7349c85e882d7950 +AUX libcap-2.24-build-system-fixes.patch 4943 SHA256 c3d77ae406d13def200f520f6063b3783ae0dae46e740ad78ab189f8a6168210 SHA512 84283f0652f87a8c1f598413d03e8f3aeeb140b322519051df1873933d6d3ac738757e1c7c91ea6efc51548d224149b84d6a1fab0301a655eb609b183bc9e7ba WHIRLPOOL 1697c9223a59f10c5472b0286fa19a9a6c4b9dee16314f785164731043b4207f122b916bef7d596cb94e46eaf4eb7d376129cbedbcc7d317f1b49f17875d11d2 +AUX libcap-2.24-setcap-errno.patch 1491 SHA256 397462a3e207944a7ab2837a06794b225c29ad45e630de69e02df64225106586 SHA512 367037d6c42d07c359e9ee397cbc7431ea05c3d34deea93db1473394decb9f61a2c9de186652fc3a12fb615406ec1a2f4d76eb63c4410c6a2b5f435ece5b05ef WHIRLPOOL 07ce9f884251aad17fd9f7a3fef11e8193b66f3dcd9b58fb4aad755237cd7e4ad28e55a8d5434c65c5e56cc0a92af45f7bf677f0dc451276f46dcffe046a2ee1 DIST libcap-2.22.tar.bz2 60051 SHA256 73ebbd4877b5f69dd28b72098e510c5b318bc480f8201c4061ac98b78c04050f SHA512 d4e070cfed7dbf416c949e79fbfbfcde2da4705d4f55527b18482c9959b80fea2841bf70f317fa5e620e13a75a8e5da69f94304b8e54195f2d0492f14d342339 WHIRLPOOL 000e3c76e83366423efc0e935c6191496c0e9bf1cc559babdbeea74c8c81009e883985c5f1c739b4fb1744522e09bda253f6012b7e52284f291eabeaf20f6a88 -EBUILD libcap-2.17.ebuild 1295 SHA256 54ea6cf5fb44e049d786b30578c0f47a5d0b67bd22c7575592693656f4a2abc0 SHA512 5b87cfadadef6bfda562e7f194ad46b3ec146633e5e87ab82e964fdbb1b75fc58c41d2f440c4e779d20b9dbe66288aadf3741118403b6eb362177290ae5bb0fe WHIRLPOOL 4061e5d28dd48f3324fcdfec745a0cfd4893de85b64327a4b161a163eca14ffca7bd055a6208bf1100c159866431e1e0cc0f8564239ada65287aa3958763665a -EBUILD libcap-2.19.ebuild 1241 SHA256 8334b3d70bafccfbecac938629acfe6866b5f990a9ae449ec851c2e27a70d3cb SHA512 0a28f2c0e70b95595baf39c3807436945fe6c38c142722d3642b7e52a9638d03fec113a7dc5586aeb85bcce89c5a1fb3811a9154cd2dbb35e5234efd7c6b2d22 WHIRLPOOL 5a106f93a3303ed233bc16c0c671eea83bfeab2bc7757f31a4adaa9787e28f84240352961ef6e59d68396f0535843ca52e07d4b43ceddcd03016f2310eb5e86d -EBUILD libcap-2.20.ebuild 1255 SHA256 14c38763c45c488e74a49a4399b844ea6e5326e8a189feba5e2650b6e424becd SHA512 4623edc3861e947b3a9a0da631c33a6d4a08e667c03aff9c258a63ecf092cfb36db1dbc4553402ba97e6c4e8e0cc862e331a2a6232dd1982a58dd42376df4f2d WHIRLPOOL 814310ff27914937f4ca26b35b1f7e7ff66c82341ace9e8de379d83e7e9cd1bc6ef531244b66c75e6a6ef3b7aad46acdf7510801ff8229597477dc4626deaa66 -EBUILD libcap-2.21.ebuild 1299 SHA256 db3f1beac4841be548fb653eed670c7562816f3eb4b318304bb11290c4939754 SHA512 ffdf2859f2745aedc75a3f6ce09651f0c450eb1e4d049f7d5f24b21937d8a38db4e2a3a6d9b19803b4a41231756e236a18f584fe50b61f5b269011fe42a6c381 WHIRLPOOL c7789d4c0b496bbdd4f1aacf0247a24de139dd2ec909c0743308f1371afe5a4b6f764b9be295f2869fb7a2825a650844c448df1dc3b1290f530108cb338c8672 -EBUILD libcap-2.22-r1.ebuild 1491 SHA256 c4f6e82a96c0abc001b5c91dcd0e7bb6a33c6ad88fc992ab523fff7e55ea7a09 SHA512 6017d2e908b8f3cd20d80eace382855cbe7fef9ae18f35f114d8fb3d24fe64ef122435180b4d942289638f9f8d590aacc4f86d8a11adcbf6b6454e53bac86bd2 WHIRLPOOL 95887935fcd9f345b17f22bc11defc918fd80e1c5a6a597a7a3e17b446e11f65649d4aa93ccc38ed76731e7ba44f4a9ce31407fbdb2d53d01340b5a611beed25 -EBUILD libcap-2.22-r2.ebuild 1785 SHA256 b693636eb84891f2b73c90bde8eb6ec12de345e165a3bc3394cb2c800ab26d43 SHA512 1b51feb65667cab945c282d64dc87c68848d59eebedc89a05207802021964547402d2322eb358818b38494f92fb724ada773c4789da2664689aed85e1876e6ae WHIRLPOOL 5bc2815c30b6d26115182e78d390b01d164f35dc884430f31c852080b627c8016b9bc9d1ed7f24c99f49f6e13ff7c2d7b63f70b8d32e4198a1e55b59ab7e3a8a -EBUILD libcap-2.22.ebuild 1378 SHA256 b12f31434c4699323601597a5dd6b6d18b87c4a2e60e82e04e58ec64c8eda83b SHA512 408d78f78d9c1174fdbaddbf61f5388bbca6aa404bc1e7e1eb891120af82e376a0e50bf0cca17ab5697ae0b007f62e80a8637e1435c1d2f82bc99f941f1d29d1 WHIRLPOOL 8640b7f1887bbf4d4f8612dd68272f685d0c08596f179bc04d6565ff61ec0621ec774bcf0f3efd60c2e5c8f77428e3b36afda467f163caee5d4bb61ea0f5f46f -MISC ChangeLog 19000 SHA256 dc464da56b025a658ed8a6a6d7579d2a37c500c6edb64b4615cf0248b5668566 SHA512 5a5fb4f50e867d00b75c4e3e0f183dc70bf175debdf1e654f0184394cc58168f203141fae2eccf68c9f7a2de1970a78a97612bbc80454eda75e06fdbdb11dc42 WHIRLPOOL 71227c15e64d41fd17d0bfaded29739bb2a6c2936a4324a7aedbce1d89f0142571e265d00e376a443b0dc8114f149595b25f64796090fedc69789cfdec5d4010 +DIST libcap-2.24.tar.xz 63412 SHA256 cee4568f78dc851d726fc93f25f4ed91cc223b1fe8259daa4a77158d174e6c65 SHA512 c062bab936d651a50efa66dcfa51ab3ce4b0881195d23bb32142b5c8044d30e0e2152f3497844ce90c04f909aeffe2d41203efff41972e38758dcca7b653884b WHIRLPOOL bb7a9d8d3b999ad289962ebdc8b9eff87e25bd744a86ee4717e999738cb5a556a51826d0f0cbfc628629948fa8355d5d972208910d6c1c99bdf66a673b6f1cc8 +EBUILD libcap-2.22-r2.ebuild 1678 SHA256 51d0ce60fac8870d868684b911b46ba623bc099642725c6d7ff65af5b2b957ca SHA512 dc9e91d6db58ea46e12b0dfd0cbd089cf9fc64016feb387b77d90adad82cb8e256a0e6d890dd6dbf02f00d0d7ea146229052f2b400068dbd6934bd18f28328cf WHIRLPOOL b92dd3513226424d5a0542787444d98430cd3770a39b9a57e15d4633e3fdd669d8b669249ba815fa41c620fe37b134eb213bff37b593eb51cb2623010998f127 +EBUILD libcap-2.24-r2.ebuild 1899 SHA256 74081b32469043d2eda380d2de5540ee669c389ad0fd9650f852d5c89eb2695b SHA512 f9aa0ec61f55c388aced8a27ec34a63396df5c4e2a646e9655b3fe761988416178e4a29e09f4ac78af299e4c390bf2b0b5f7cefbb0eeab47654aec4ce168b186 WHIRLPOOL a6158fbc2f9db90d0a120c83d108566a2ec8eafc274ba3f02108a1ef9bc35f60f7688ffdbf9d2d9f421086dc78d3ffd2bdf95f60dda137d59e018d729c3184f2 +MISC ChangeLog 19662 SHA256 b0af676d62d97ad4f30806040c14cc2fc4a8b55cac6b4840bc05866ccaf0204e SHA512 f39e403217fe2cde0c5e67501505e142726af4c662cca86561f8d5b737e5c8c5148f3ec73f33638e7aeabc3bd4aab93663bb814ba0db8a8e2a5ed1b993fe3334 WHIRLPOOL 37c17ae1a701eec386716a6902bef89ddf2ce61ad2a2d87f674dcc83ba1e67c579950ed2c0380f571c803b41a94fd9a42d9975b5e8299d81b421c06cf879c0f3 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJUFqIpAAoJELp701BxlEWfDPYQALyjfmf1kG2N7r8HzhQnf/E+ -MvsFTfWr9jHRaLHLzGoHrFylfjzmdLGGBcAnOTGXbsAzqbR/Yw0dkWV5oyGWZEdS -usaYQJu8dQ+NDz4M7ugf3t7S/Hwc7sRDr+eGeAMclZgNrENFWO+sdFlPdiY+P8CC -a2klUbVYyl5za3+/xJoNfnudU6j99QzbuQAU24pGLPyKKc27RIWXOoIKwtb6xSWH -tw8D4xQnKksgWH7Miqfcr2E3gCa4daYMuANhqbl0ByM58WeY5BLdiKAyczaxO9IC -0XkNi4lkF9U7ciHP37lE+TFOnla4fBdJcSo+JyB3nqyE4TKd5Xj/u87AkD98eEHC -wpzpq+RlNsaWITaQbFuL5ha2ftoRp3g1a06taY5Lw9EROXjp7IXKCRlhNwJR7plY -hjrncz+D0ujkhIsfX/vkMsLMYti0I/7PzPahim2mxnBqLoRQfPKw9wAknT8MUDp2 -iR7X3m7ghF39ByUKhDKCkyK/jobyjKC4w9s0HMXyeXTbOBk3G3t0u1kRNxGtNzon -Ei93sWv8u9MRPpMN+9i6aaDxq4cLE4/lgwyez8d8NL0Uqhmq6MPt2hCOr7uQRFT6 -tk7r8233aYTyUZ/BQ7LtnzTAf29Y0aqi+LCDV3ADmkf0YYX+etBvim8L7WtR7Ugp -dWTgm9VFutJpLub1ed6a -=0Wq6 ------END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/files/2.16/0001-build-system-fixes.patch b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/files/2.16/0001-build-system-fixes.patch deleted file mode 100644 index e82975ba8f..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/files/2.16/0001-build-system-fixes.patch +++ /dev/null @@ -1,154 +0,0 @@ -From 7ee197885e113878aedab58bdda80302e42aff4c Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sun, 16 Nov 2008 09:10:31 -0500 -Subject: [PATCH] build system fixes - -This touches up the homebrewed build system to work much better "out of the -box" for people. Specifically: - - allow toolchain vars to be set via environment - - CC / BUILD_CC / AR / RANLIB - - CFLAGS / CPPFLAGS / LDFLAGS - - split CPPFLAGS out of CFLAGS - - break -fPIC out of global CFLAGS and only use where needed - - use LDLIBS for libraries, not LDFLAGS - -Signed-off-by: Mike Frysinger ---- - Make.Rules | 28 ++++++++++++++-------------- - libcap/Makefile | 11 ++++++----- - pam_cap/Makefile | 6 +++--- - progs/Makefile | 2 +- - 4 files changed, 24 insertions(+), 23 deletions(-) - -diff --git a/Make.Rules b/Make.Rules -index 6e63a5b..32cb5ea 100644 ---- a/Make.Rules -+++ b/Make.Rules -@@ -42,27 +42,27 @@ MINOR=16 - - # Compilation specifics - --KERNEL_HEADERS := $(topdir)/libcap/include --IPATH += -I$(topdir)/libcap/include -I$(KERNEL_HEADERS) -- --CC := gcc --CFLAGS := -O2 --BUILD_CC := $(CC) --BUILD_CFLAGS := $(CFLAGS) $(IPATH) --AR := ar --RANLIB := ranlib --DEBUG = -g #-DDEBUG --WARNINGS=-fPIC -Wall -Wwrite-strings \ -+CC ?= gcc -+BUILD_CC ?= $(CC) -+AR ?= ar -+RANLIB ?= ranlib -+CFLAGS ?= -O2 -+BUILD_CFLAGS ?= -O2 -pipe -+WARNINGS=-Wall -Wwrite-strings \ - -Wpointer-arith -Wcast-qual -Wcast-align \ - -Wstrict-prototypes -Wmissing-prototypes \ - -Wnested-externs -Winline -Wshadow - LD=$(CC) -Wl,-x -shared --LDFLAGS := #-g -+LDFLAGS ?= #-g - --SYSTEM_HEADERS = /usr/include -+KERNEL_HEADERS = $(topdir)/libcap/include -+LIBCAP_CPPFLAGS = -I$(topdir)/libcap/include -I$(KERNEL_HEADERS) -+CPPFLAGS += $(LIBCAP_CPPFLAGS) -+BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS) - INCS=$(topdir)/libcap/include/sys/capability.h - LDFLAGS += -L$(topdir)/libcap --CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) $(IPATH) -+CPPFLAGS += -Dlinux -+CFLAGS += $(WARNINGS) - PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi) - INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) - DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi) -diff --git a/libcap/Makefile b/libcap/Makefile -index 8a61752..cf99523 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -16,7 +16,7 @@ FILES=cap_alloc cap_proc cap_extint cap_flag cap_text - # no support). - ifeq ($(LIBATTR),yes) - FILES += cap_file --LDFLAGS += -lattr -+LDLIBS += -lattr - endif - - INCLS=libcap.h cap_names.h $(INCS) -@@ -24,6 +24,7 @@ OBJS=$(addsuffix .o, $(FILES)) - MAJLIBNAME=$(LIBNAME).$(VERSION) - MINLIBNAME=$(MAJLIBNAME).$(MINOR) - GPERF_OUTPUT = _caps_output.gperf -+CFLAGS += -fPIC - - all: $(MINLIBNAME) $(STALIBNAME) - -@@ -33,7 +34,7 @@ INCLUDE_GPERF_OUTPUT = -include $(GPERF_OUTPUT) - endif - - _makenames: _makenames.c cap_names.list.h -- $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@ -+ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@ - - cap_names.h: _makenames - ./_makenames > cap_names.h -@@ -50,15 +51,15 @@ $(STALIBNAME): $(OBJS) - $(RANLIB) $@ - - $(MINLIBNAME): $(OBJS) -- $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJLIBNAME) -o $@ $^ -+ $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJLIBNAME) -o $@ $^ $(LDLIBS) - ln -sf $(MINLIBNAME) $(MAJLIBNAME) - ln -sf $(MAJLIBNAME) $(LIBNAME) - - %.o: %.c $(INCLS) -- $(CC) $(CFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS) -- $(CC) $(CFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ - - install: all - mkdir -p -m 0755 $(INCDIR)/sys -diff --git a/pam_cap/Makefile b/pam_cap/Makefile -index eae88ed..bef59d2 100644 ---- a/pam_cap/Makefile -+++ b/pam_cap/Makefile -@@ -14,13 +14,13 @@ install: all - install -m 0755 pam_cap.so $(LIBDIR)/security - - pam_cap.so: pam_cap.o -- $(LD) $(LDFLAGS) -o pam_cap.so $< $(LDLIBS) -+ $(LD) $(CFLAGS) $(LDFLAGS) -o pam_cap.so $< $(LDLIBS) -lpam - - pam_cap.o: pam_cap.c -- $(CC) $(CFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - testcompile: test.c pam_cap.o -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ -lpam -ldl $(LDLIBS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $+ -lpam -ldl $(LDLIBS) - - clean: - rm -f *.o *.so testcompile *~ -diff --git a/progs/Makefile b/progs/Makefile -index a1542dc..612cf86 100644 ---- a/progs/Makefile -+++ b/progs/Makefile -@@ -22,7 +22,7 @@ $(BUILD): %: %.o - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS) - - %.o: %.c $(INCS) -- $(CC) $(CFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - install: all - mkdir -p -m 0755 $(SBINDIR) --- -1.6.0.4 - diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/files/libcap-2.20-build-system-fixes.patch b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/files/libcap-2.24-build-system-fixes.patch similarity index 75% rename from sdk_container/src/third_party/portage-stable/sys-libs/libcap/files/libcap-2.20-build-system-fixes.patch rename to sdk_container/src/third_party/portage-stable/sys-libs/libcap/files/libcap-2.24-build-system-fixes.patch index c7273df39a..64393275bb 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/files/libcap-2.20-build-system-fixes.patch +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/files/libcap-2.24-build-system-fixes.patch @@ -1,4 +1,4 @@ -From 5540f3c2a3bd70ebc8140b74ac5a0aecdbc53234 Mon Sep 17 00:00:00 2001 +From 0485ff3e7f62a331aa4f1e8ec4c2fdcee400e324 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 16 Nov 2008 09:10:31 -0500 Subject: [PATCH] build system fixes @@ -14,25 +14,25 @@ box" for people. Specifically: Signed-off-by: Mike Frysinger --- - Make.Rules | 25 +++++++++++++------------ - libcap/Makefile | 11 ++++++----- - pam_cap/Makefile | 8 +++++--- - progs/Makefile | 2 +- - 4 files changed, 25 insertions(+), 21 deletions(-) + Make.Rules | 26 ++++++++++++++------------ + libcap/Makefile | 11 ++++++----- + pam_cap/Makefile | 8 +++++--- + progs/Makefile | 2 +- + 4 files changed, 26 insertions(+), 21 deletions(-) diff --git a/Make.Rules b/Make.Rules -index 011aa14..6e432a6 100644 +index 18b7cf7..5364c46 100644 --- a/Make.Rules +++ b/Make.Rules -@@ -44,27 +44,28 @@ MINOR=19 +@@ -45,27 +45,29 @@ MINOR=24 # Compilation specifics --KERNEL_HEADERS := $(topdir)/libcap/include --IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS) +-KERNEL_HEADERS := $(topdir)/libcap/include/uapi +-IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include - -CC := gcc --CFLAGS := -O2 +-CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -BUILD_CC := $(CC) -BUILD_CFLAGS := $(CFLAGS) $(IPATH) -AR := ar @@ -53,8 +53,9 @@ index 011aa14..6e432a6 100644 +LDFLAGS ?= #-g -SYSTEM_HEADERS = /usr/include -+KERNEL_HEADERS = $(topdir)/libcap/include -+LIBCAP_CPPFLAGS = -I$(topdir)/libcap/include -I$(KERNEL_HEADERS) ++KERNEL_HEADERS = $(topdir)/libcap/include/uapi ++LIBCAP_CPPFLAGS = -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include ++LIBCAP_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +CPPFLAGS += $(LIBCAP_CPPFLAGS) +BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS) INCS=$(topdir)/libcap/include/sys/capability.h @@ -63,10 +64,10 @@ index 011aa14..6e432a6 100644 +CPPFLAGS += -Dlinux +CFLAGS += $(WARNINGS) $(DEBUG) PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi) - INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) + INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi) diff --git a/libcap/Makefile b/libcap/Makefile -index 4762c60..cf99523 100644 +index 0ccd2e7..6b446ea 100644 --- a/libcap/Makefile +++ b/libcap/Makefile @@ -16,7 +16,7 @@ FILES=cap_alloc cap_proc cap_extint cap_flag cap_text @@ -75,19 +76,19 @@ index 4762c60..cf99523 100644 FILES += cap_file -LDFLAGS += -lattr +LDLIBS += -lattr + DEPS = -lattr endif - INCLS=libcap.h cap_names.h $(INCS) -@@ -24,6 +24,7 @@ OBJS=$(addsuffix .o, $(FILES)) +@@ -25,6 +25,7 @@ OBJS=$(addsuffix .o, $(FILES)) MAJLIBNAME=$(LIBNAME).$(VERSION) MINLIBNAME=$(MAJLIBNAME).$(MINOR) GPERF_OUTPUT = _caps_output.gperf +CFLAGS += -fPIC - all: $(MINLIBNAME) $(STALIBNAME) + all: $(MINLIBNAME) $(STALIBNAME) libcap.pc -@@ -33,7 +34,7 @@ INCLUDE_GPERF_OUTPUT = -include $(GPERF_OUTPUT) - endif +@@ -43,7 +44,7 @@ libcap.pc: libcap.pc.in + $< >$@ _makenames: _makenames.c cap_names.list.h - $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@ @@ -95,7 +96,7 @@ index 4762c60..cf99523 100644 cap_names.h: _makenames ./_makenames > cap_names.h -@@ -50,15 +51,15 @@ $(STALIBNAME): $(OBJS) +@@ -60,15 +61,15 @@ $(STALIBNAME): $(OBJS) $(RANLIB) $@ $(MINLIBNAME): $(OBJS) @@ -113,9 +114,9 @@ index 4762c60..cf99523 100644 + $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ install: all - mkdir -p -m 0755 $(INCDIR)/sys + mkdir -p -m 0755 $(FAKEROOT)$(INCDIR)/sys diff --git a/pam_cap/Makefile b/pam_cap/Makefile -index 9ca5bef..bdae933 100644 +index cc32fb6..6f07b6b 100644 --- a/pam_cap/Makefile +++ b/pam_cap/Makefile @@ -9,6 +9,8 @@ include ../Make.Rules @@ -128,7 +129,7 @@ index 9ca5bef..bdae933 100644 $(MAKE) testcompile @@ -17,13 +19,13 @@ install: all - install -m 0755 pam_cap.so $(LIBDIR)/security + install -m 0755 pam_cap.so $(FAKEROOT)$(LIBDIR)/security pam_cap.so: pam_cap.o - $(LD) $(LDFLAGS) -o pam_cap.so $< $(LDLIBS) @@ -145,7 +146,7 @@ index 9ca5bef..bdae933 100644 clean: rm -f *.o *.so testcompile *~ diff --git a/progs/Makefile b/progs/Makefile -index ef51dc6..c261f57 100644 +index 778149e..8f4e2e6 100644 --- a/progs/Makefile +++ b/progs/Makefile @@ -22,7 +22,7 @@ $(BUILD): %: %.o @@ -156,7 +157,7 @@ index ef51dc6..c261f57 100644 + $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ install: all - mkdir -p -m 0755 $(SBINDIR) + mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR) -- -1.7.4.rc2 +2.4.1 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/files/libcap-2.24-setcap-errno.patch b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/files/libcap-2.24-setcap-errno.patch new file mode 100644 index 0000000000..08513f643e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/files/libcap-2.24-setcap-errno.patch @@ -0,0 +1,45 @@ +From 62b190c09d5652c58679dffd7f09e4aceb4c7daa Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Mon, 13 Jul 2015 01:59:14 -0400 +Subject: [PATCH] setcap: fix errno display + +The commit 056ffb0bd25d91ffbcb83c521fc4d3d9904ec4d4 broke the display of +the final error message because it would do more operations that would +clobber errno. Example: +(libcap-2.22) sudo setcap cap_ipc_lock=ep /proc/filesystems | head -1 +Failed to set capabilities on file `/proc/filesystems' (Operation not supported) +(libcap-2.23) sudo setcap cap_ipc_lock=ep /proc/filesystems | head -1 +Failed to set capabilities on file `/proc/filesystems' (Invalid argument) + +Save the original errno value and use that for the final display instead. + +URL: https://bugs.gentoo.org/551672 +Signed-off-by: Mike Frysinger +--- + progs/setcap.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/progs/setcap.c b/progs/setcap.c +index 83090ae..7304343 100644 +--- a/progs/setcap.c ++++ b/progs/setcap.c +@@ -171,6 +171,7 @@ int main(int argc, char **argv) + retval = cap_set_file(*++argv, cap_d); + if (retval != 0) { + int explained = 0; ++ int oerrno = errno; + #ifdef linux + cap_value_t cap; + cap_flag_value_t per_state; +@@ -193,7 +194,7 @@ int main(int argc, char **argv) + + fprintf(stderr, + "Failed to set capabilities on file `%s' (%s)\n", +- argv[0], strerror(errno)); ++ argv[0], strerror(oerrno)); + if (!explained) { + usage(); + } +-- +2.4.4 + diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.17.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.17.ebuild deleted file mode 100644 index 0d091726af..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.17.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.17.ebuild,v 1.8 2010/01/24 18:29:57 armin76 Exp $ - -inherit eutils multilib toolchain-funcs pam - -DESCRIPTION="POSIX 1003.1e capabilities" -HOMEPAGE="http://www.friedhoff.org/posixfilecaps.html" -SRC_URI="mirror://kernel/linux/libs/security/linux-privs/libcap${PV:0:1}/${P}.tar.bz2" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="pam" - -RDEPEND="sys-apps/attr - pam? ( virtual/pam )" -DEPEND="${RDEPEND} - sys-kernel/linux-headers" - -src_unpack() { - unpack ${P}.tar.bz2 - cd "${S}" - epatch "${FILESDIR}"/2.16/*.patch - sed -i -e '/cap_setfcap.*morgan/s:^:#:' pam_cap/capability.conf - sed -i \ - -e "/^PAM_CAP/s:=.*:=$(use pam && echo yes || echo no):" \ - -e '/^DYNAMIC/s:=.*:=yes:' \ - -e "/^lib=/s:=.*:=$(get_libdir):" \ - Make.Rules -} - -src_compile() { - tc-export BUILD_CC CC AR RANLIB - emake || die -} - -src_install() { - emake install DESTDIR="${D}" || die - - gen_usr_ldscript libcap.so - mv "${D}"/$(get_libdir)/libcap.a "${D}"/usr/$(get_libdir)/ || die - - dopammod pam_cap/pam_cap.so - dopamsecurity '' pam_cap/capability.conf - - dodoc CHANGELOG README doc/capability.notes -} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.19.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.19.ebuild deleted file mode 100644 index 14f4b5ac72..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.19.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.19.ebuild,v 1.1 2010/03/07 00:12:48 vapier Exp $ - -inherit eutils multilib toolchain-funcs pam - -DESCRIPTION="POSIX 1003.1e capabilities" -HOMEPAGE="http://www.friedhoff.org/posixfilecaps.html" -SRC_URI="mirror://kernel/linux/libs/security/linux-privs/libcap${PV:0:1}/${P}.tar.bz2" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="pam" - -RDEPEND="sys-apps/attr - pam? ( virtual/pam )" -DEPEND="${RDEPEND} - sys-kernel/linux-headers" - -src_unpack() { - unpack ${P}.tar.bz2 - cd "${S}" - epatch "${FILESDIR}"/2.16/*.patch - sed -i -e '/cap_setfcap.*morgan/s:^:#:' pam_cap/capability.conf - sed -i \ - -e "/^PAM_CAP/s:=.*:=$(use pam && echo yes || echo no):" \ - -e '/^DYNAMIC/s:=.*:=yes:' \ - -e "/^lib=/s:=.*:=/usr/$(get_libdir):" \ - Make.Rules -} - -src_compile() { - tc-export BUILD_CC CC AR RANLIB - emake || die -} - -src_install() { - emake install DESTDIR="${D}" || die - - gen_usr_ldscript -a cap - - dopammod pam_cap/pam_cap.so - dopamsecurity '' pam_cap/capability.conf - - dodoc CHANGELOG README doc/capability.notes -} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.20.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.20.ebuild deleted file mode 100644 index 3ce26e997b..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.20.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.20.ebuild,v 1.1 2011/01/25 21:00:58 vapier Exp $ - -EAPI="2" - -inherit eutils multilib toolchain-funcs pam - -DESCRIPTION="POSIX 1003.1e capabilities" -HOMEPAGE="http://www.friedhoff.org/posixfilecaps.html" -SRC_URI="mirror://kernel/linux/libs/security/linux-privs/libcap${PV:0:1}/${P}.tar.bz2" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="pam" - -RDEPEND="sys-apps/attr - pam? ( virtual/pam )" -DEPEND="${RDEPEND} - sys-kernel/linux-headers" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.20-build-system-fixes.patch - epatch "${FILESDIR}"/${PN}-2.20-ignore-RAISE_SETFCAP-install-failures.patch - sed -i \ - -e "/^PAM_CAP/s:=.*:=$(use pam && echo yes || echo no):" \ - -e '/^DYNAMIC/s:=.*:=yes:' \ - -e "/^lib=/s:=.*:=/usr/$(get_libdir):" \ - Make.Rules -} - -src_compile() { - tc-export BUILD_CC CC AR RANLIB - emake || die -} - -src_install() { - emake install DESTDIR="${D}" || die - - gen_usr_ldscript -a cap - - dopammod pam_cap/pam_cap.so - dopamsecurity '' pam_cap/capability.conf - - dodoc CHANGELOG README doc/capability.notes -} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.21.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.21.ebuild deleted file mode 100644 index 0fc646c7fb..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.21.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.21.ebuild,v 1.1 2011/06/15 05:28:48 jer Exp $ - -EAPI="2" - -inherit eutils multilib toolchain-funcs pam - -DESCRIPTION="POSIX 1003.1e capabilities" -HOMEPAGE="http://www.friedhoff.org/posixfilecaps.html" -SRC_URI="mirror://kernel/linux/libs/security/linux-privs/libcap${PV:0:1}/${P}.tar.bz2" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="pam" - -RDEPEND="sys-apps/attr - pam? ( virtual/pam )" -DEPEND="${RDEPEND} - sys-kernel/linux-headers" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.20-build-system-fixes.patch - epatch "${FILESDIR}"/${PN}-2.20-ignore-RAISE_SETFCAP-install-failures.patch - epatch "${FILESDIR}"/${PN}-2.21-include.patch - sed -i \ - -e "/^PAM_CAP/s:=.*:=$(use pam && echo yes || echo no):" \ - -e '/^DYNAMIC/s:=.*:=yes:' \ - -e "/^lib=/s:=.*:=/usr/$(get_libdir):" \ - Make.Rules -} - -src_compile() { - tc-export BUILD_CC CC AR RANLIB - emake || die -} - -src_install() { - emake install DESTDIR="${D}" || die - - gen_usr_ldscript -a cap - - dopammod pam_cap/pam_cap.so - dopamsecurity '' pam_cap/capability.conf - - dodoc CHANGELOG README doc/capability.notes -} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.22-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.22-r1.ebuild deleted file mode 100644 index 762d05c523..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.22-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.22-r1.ebuild,v 1.4 2014/01/19 10:18:06 vapier Exp $ - -EAPI="4" - -inherit eutils multilib toolchain-funcs pam - -DESCRIPTION="POSIX 1003.1e capabilities" -HOMEPAGE="http://www.friedhoff.org/posixfilecaps.html" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -# it's available under either of the licenses -LICENSE="|| ( GPL-2 BSD )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux" -IUSE="pam" - -RDEPEND="sys-apps/attr - pam? ( virtual/pam )" -DEPEND="${RDEPEND} - sys-kernel/linux-headers" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.22-build-system-fixes.patch - epatch "${FILESDIR}"/${PN}-2.22-no-perl.patch - epatch "${FILESDIR}"/${PN}-2.20-ignore-RAISE_SETFCAP-install-failures.patch - epatch "${FILESDIR}"/${PN}-2.21-include.patch - sed -i \ - -e "/^PAM_CAP/s:=.*:=$(usex pam):" \ - -e '/^DYNAMIC/s:=.*:=yes:' \ - -e "/^lib=/s:=.*:=/usr/$(get_libdir):" \ - Make.Rules -} - -src_configure() { - tc-export_build_env BUILD_CC - tc-export CC AR RANLIB -} - -src_install() { - # no configure, needs explicit install line #444724#c3 - emake install DESTDIR="${ED}" - - gen_usr_ldscript -a cap - - rm -rf "${ED}"/usr/$(get_libdir)/security - dopammod pam_cap/pam_cap.so - dopamsecurity '' pam_cap/capability.conf - - dodoc CHANGELOG README doc/capability.notes -} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.22-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.22-r2.ebuild index 12d130662b..b5e8e317c1 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.22-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.22-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.22-r2.ebuild,v 1.15 2014/09/15 08:24:08 ago Exp $ +# $Id$ EAPI="4" @@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2" # it's available under either of the licenses LICENSE="|| ( GPL-2 BSD )" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux" IUSE="pam" RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.22.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.22.ebuild deleted file mode 100644 index 8610481c44..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.22.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.22.ebuild,v 1.14 2014/01/19 10:18:06 vapier Exp $ - -EAPI="2" - -inherit eutils multilib toolchain-funcs pam - -DESCRIPTION="POSIX 1003.1e capabilities" -HOMEPAGE="http://www.friedhoff.org/posixfilecaps.html" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -# it's available under either of the licenses -LICENSE="|| ( GPL-2 BSD )" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="pam" - -RDEPEND="sys-apps/attr - pam? ( virtual/pam )" -DEPEND="${RDEPEND} - sys-kernel/linux-headers" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.22-build-system-fixes.patch - epatch "${FILESDIR}"/${PN}-2.22-no-perl.patch - epatch "${FILESDIR}"/${PN}-2.20-ignore-RAISE_SETFCAP-install-failures.patch - epatch "${FILESDIR}"/${PN}-2.21-include.patch - sed -i \ - -e "/^PAM_CAP/s:=.*:=$(usex pam):" \ - -e '/^DYNAMIC/s:=.*:=yes:' \ - -e "/^lib=/s:=.*:=/usr/$(get_libdir):" \ - Make.Rules -} - -src_configure() { - tc-export_build_env BUILD_CC - tc-export CC AR RANLIB -} - -src_install() { - emake install DESTDIR="${D}" || die - - gen_usr_ldscript -a cap - - rm -rf "${D}"/usr/$(get_libdir)/security - dopammod pam_cap/pam_cap.so - dopamsecurity '' pam_cap/capability.conf - - dodoc CHANGELOG README doc/capability.notes -} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.24-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.24-r2.ebuild new file mode 100644 index 0000000000..7dafa67a3e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.24-r2.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit eutils multilib multilib-minimal toolchain-funcs pam + +DESCRIPTION="POSIX 1003.1e capabilities" +HOMEPAGE="http://www.friedhoff.org/posixfilecaps.html" +SRC_URI="mirror://kernel/linux/libs/security/linux-privs/libcap2/${P}.tar.xz" + +# it's available under either of the licenses +LICENSE="|| ( GPL-2 BSD )" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux" +IUSE="pam static-libs" + +RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] + pam? ( virtual/pam )" +DEPEND="${RDEPEND} + sys-kernel/linux-headers" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.24-build-system-fixes.patch + epatch "${FILESDIR}"/${PN}-2.22-no-perl.patch + epatch "${FILESDIR}"/${PN}-2.20-ignore-RAISE_SETFCAP-install-failures.patch + epatch "${FILESDIR}"/${PN}-2.21-include.patch + epatch "${FILESDIR}"/${PN}-2.24-setcap-errno.patch #551672 + + multilib_copy_sources +} + +multilib_src_configure() { + local pam + if multilib_is_native_abi && use pam; then + pam=yes + else + pam=no + fi + + sed -i \ + -e "/^PAM_CAP/s:=.*:=${pam}:" \ + -e '/^DYNAMIC/s:=.*:=yes:' \ + -e '/^lib_prefix=/s:=.*:=$(prefix):' \ + -e "/^lib=/s:=.*:=$(get_libdir):" \ + Make.Rules +} + +multilib_src_compile() { + tc-export_build_env BUILD_CC + tc-export AR CC RANLIB + + default +} + +multilib_src_install() { + # no configure, needs explicit install line #444724#c3 + emake install DESTDIR="${ED}" + + multilib_is_native_abi && gen_usr_ldscript -a cap + use static-libs || rm "${ED}"/usr/$(get_libdir)/libcap.a + + rm -rf "${ED}"/usr/$(get_libdir)/security + if multilib_is_native_abi && use pam; then + dopammod pam_cap/pam_cap.so + dopamsecurity '' pam_cap/capability.conf + fi +} + +multilib_src_install_all() { + dodoc CHANGELOG README doc/capability.notes +}