From 4551b41523452c0d743a71cca34e4dca2ca7538c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 4 Jan 2023 12:06:28 +0000 Subject: gentoo auto-resync : 04:01:2023 - 12:06:28 --- app-crypt/p11-kit/Manifest | 3 +- .../files/p11-kit-0.24.1-configure-clang16.patch | 35 +++++++++++ app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild | 69 ++++++++++++++++++++++ app-crypt/p11-kit/p11-kit-0.24.1.ebuild | 62 ------------------- 4 files changed, 106 insertions(+), 63 deletions(-) create mode 100644 app-crypt/p11-kit/files/p11-kit-0.24.1-configure-clang16.patch create mode 100644 app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild delete mode 100644 app-crypt/p11-kit/p11-kit-0.24.1.ebuild (limited to 'app-crypt/p11-kit') diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest index 4dfeacba3386..558827ef7160 100644 --- a/app-crypt/p11-kit/Manifest +++ b/app-crypt/p11-kit/Manifest @@ -1,5 +1,6 @@ +AUX p11-kit-0.24.1-configure-clang16.patch 1071 BLAKE2B d12b500a4f38060ec9845cf6b0a348af11b8a1f02fb7d9c4cb2a74825305808d710ab6f69efc0b36f304f0e74a269a81b89b5651e2261c2109b6f942d80749d3 SHA512 5a6dc630d23607910faa1923e2389817f356df33a90e973612f92ef0617a53650cb316e1f2d009ddc658e4599721ad76b5a31ea2150928702c1b6937ab07023d DIST p11-kit-0.23.22.tar.xz 830016 BLAKE2B 4e1edfd9e2441d237c07a16c003aee5ffde38f1cf545c26e435645429f2cfa4fe7ca61cdc3c3940390aa040ba991f2ee3995b14cc31bb886d5eeffa8ed5e1721 SHA512 098819e6ca4ad9cc2a0bc2e478aea67354d051a4f03e6c7d75d13d2469b6dc7654f26b15530052f6ed51acb35531c2539e0f971b31e29e6673e857c903afb080 DIST p11-kit-0.24.1.tar.xz 838304 BLAKE2B e5cb98881279199e2674e2ff4f12d72c4d126c54429ee7ece6dd56ad1987f84abf58a67b8bf2405b19a5bca9d1106f8ec901364ac3d2488f65b3f92b51f850fe SHA512 8cf170c714bb9e0cf3df93e8ec55b8e3c55cabf2c6a27f177ac6de8b8028985df2ca0216d3215d6828dc2ae3095c4e1a4febe8cb26b88ec321defc66bb011e81 EBUILD p11-kit-0.23.22.ebuild 2010 BLAKE2B 0a5fd2558221b3bf49b43550b55db0844f743a71362998c5fef7edf7e6e997388bbf2b39df1cca795df74aa47753757396a7290306ed69ba0bfbd36fbed6664e SHA512 2093e6b8b09fc075161d9db832f6436f4f44501370ea5dd5f1d5a19765e88853d1dc6ac75f1c42cc99d4f5947243f8889c0acea05c6dcd22df6c8509e10c3c0d -EBUILD p11-kit-0.24.1.ebuild 2025 BLAKE2B 4bc37118a60aee8333efcfb54faa09e2c0a7a1c5821d42d02c0208ef602591d317ed9d896b69678252c645f8bbf5b492d87fb3e5398f2e9e22478dd718a27ce6 SHA512 9da02113a73c74ba8e1192e93dc3ba22d3bc5505c28999a409d15302b8529a90cc95c8f2441fac4f6667e323209230e4a6c34f0c2186ea7f63d6ae2987689d85 +EBUILD p11-kit-0.24.1-r1.ebuild 2201 BLAKE2B 65f24f8d400f9c7a014db35c5949ecdf236a16b4a10fb5d636178d35f35fd78cbeb369af0330f62aa39fa0bc0cc747c0a119ebd02768defb1c4b5bbdfcf9778b SHA512 280de89b3040e1ff0ddbb4222584d0a09bc036ac5950dddab7e2e0d4fff2dc53a05103260e1c294e077663009ce6672e6cda9dcc946d80d9277d3c33f75df7c3 MISC metadata.xml 462 BLAKE2B fa827cf8466907f22be017b9e86f15dff3107e681db7d799c09c75ce4ba5a3f2bde34e925945646b13c8a20973ab85884075810201720629f3868066832a8bab SHA512 e142dce54418ca0be110b2a1826c2234cada11110c5c0f8c6699f34405640cd8334638e9c35e1ff765cb2a68d40207cea01d4ba041fac3d8ba183ec1c18f062f diff --git a/app-crypt/p11-kit/files/p11-kit-0.24.1-configure-clang16.patch b/app-crypt/p11-kit/files/p11-kit-0.24.1-configure-clang16.patch new file mode 100644 index 000000000000..3af5da6c68ac --- /dev/null +++ b/app-crypt/p11-kit/files/p11-kit-0.24.1-configure-clang16.patch @@ -0,0 +1,35 @@ +https://github.com/p11-glue/p11-kit/commit/d39043f7c6e44247b5b1a237888e80b2a4d9c2b2 + +From d39043f7c6e44247b5b1a237888e80b2a4d9c2b2 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Mon, 12 Dec 2022 19:40:25 +0100 +Subject: [PATCH] Fix meson/configure _Thread_local checks for C99 + compatibility + +The type was missing from the definition, which happens to work +in current compilers for historic reasons. Implicit ints were +actually removed from C in 1999. +--- a/configure.ac ++++ b/configure.ac +@@ -148,7 +148,7 @@ if test "$os_unix" = "yes"; then + [ac_cv_tls_keyword= + for keyword in _Thread_local __thread; do + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], +- [[static ]$keyword[ foo;]])], ++ [[static ]$keyword[ int foo;]])], + [ac_cv_tls_keyword=$keyword]) + done]) + if test -n "$ac_cv_tls_keyword"; then +--- a/meson.build ++++ b/meson.build +@@ -200,7 +200,7 @@ if host_system != 'windows' + tls_test_code_template = ''' + #include + int main (void) { +-static @0@ foo; ++static @0@ int foo; + return 0; + } + ''' + + diff --git a/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild new file mode 100644 index 000000000000..e5ecd181f2ff --- /dev/null +++ b/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools multilib-minimal + +DESCRIPTION="Provides a standard configuration setup for installing PKCS#11" +HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html" +SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+asn1 debug +libffi systemd +trust" +REQUIRED_USE="trust? ( asn1 )" + +RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] ) + libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] ) + systemd? ( sys-apps/systemd:= ) + trust? ( app-misc/ca-certificates )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-configure-clang16.patch +) + +pkg_setup() { + # disable unsafe tests, bug#502088 + export FAKED_MODE=1 +} + +src_prepare() { + if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then + # Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700) + # drop to XPG6 to make feature_tests.h happy + sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die + # paths.h isn't available, oddly enough also not used albeit included + sed -i -e '/#include /d' trust/test-trust.c || die + # we don't have SUN_LEN here + sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \ + p11-kit/server.c || die + fi + + default + # TODO: drop in next release (after 0.24.1), p11-kit-0.24.1-configure-clang16.patch is emrged + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + $(use_enable trust trust-module) \ + $(use_with trust trust-paths "${EPREFIX}"/etc/ssl/certs/ca-certificates.crt) \ + $(use_enable debug) \ + $(use_with libffi) \ + $(use_with asn1 libtasn1) \ + $(multilib_native_use_with systemd) + + if multilib_is_native_abi; then + # re-use provided documentation + ln -s "${S}"/doc/manual/html doc/manual/html || die + fi +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -delete || die +} diff --git a/app-crypt/p11-kit/p11-kit-0.24.1.ebuild b/app-crypt/p11-kit/p11-kit-0.24.1.ebuild deleted file mode 100644 index 91ee0171c43a..000000000000 --- a/app-crypt/p11-kit/p11-kit-0.24.1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib-minimal - -DESCRIPTION="Provides a standard configuration setup for installing PKCS#11" -HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html" -SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+asn1 debug +libffi systemd +trust" -REQUIRED_USE="trust? ( asn1 )" - -RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] ) - libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] ) - systemd? ( sys-apps/systemd:= ) - trust? ( app-misc/ca-certificates )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -pkg_setup() { - # disable unsafe tests, bug#502088 - export FAKED_MODE=1 -} - -src_prepare() { - if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then - # Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700) - # drop to XPG6 to make feature_tests.h happy - sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die - # paths.h isn't available, oddly enough also not used albeit included - sed -i -e '/#include /d' trust/test-trust.c || die - # we don't have SUN_LEN here - sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \ - p11-kit/server.c || die - fi - default -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable trust trust-module) \ - $(use_with trust trust-paths "${EPREFIX}"/etc/ssl/certs/ca-certificates.crt) \ - $(use_enable debug) \ - $(use_with libffi) \ - $(use_with asn1 libtasn1) \ - $(multilib_native_use_with systemd) - - if multilib_is_native_abi; then - # re-use provided documentation - ln -s "${S}"/doc/manual/html doc/manual/html || die - fi -} - -multilib_src_install_all() { - einstalldocs - find "${D}" -name '*.la' -delete || die -} -- cgit v1.2.3