From 29efd7db303b443e103311cc0e458ee5c134e8e5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 6 Jan 2023 12:11:06 +0000 Subject: gentoo auto-resync : 06:01:2023 - 12:11:06 --- app-misc/Manifest.gz | Bin 49752 -> 49740 bytes app-misc/ca-certificates/Manifest | 2 + .../ca-certificates-20211016.3.87.ebuild | 203 +++++++++++++++++++++ app-misc/pax-utils/Manifest | 4 +- app-misc/pax-utils/pax-utils-1.3.6.ebuild | 77 ++++++++ app-misc/pax-utils/pax-utils-9999.ebuild | 32 ++-- 6 files changed, 300 insertions(+), 18 deletions(-) create mode 100644 app-misc/ca-certificates/ca-certificates-20211016.3.87.ebuild create mode 100644 app-misc/pax-utils/pax-utils-1.3.6.ebuild (limited to 'app-misc') diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz index 58e7c00a6b30..4084c9609578 100644 Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest index cd010137edb6..3215c63109c6 100644 --- a/app-misc/ca-certificates/Manifest +++ b/app-misc/ca-certificates/Manifest @@ -3,7 +3,9 @@ AUX ca-certificates-20211016.3.72-no-cryptography.patch 824 BLAKE2B fb71347a7763 DIST ca-certificates_20211016.tar.xz 239608 BLAKE2B 9b4730b54fd9f472fe4e5427bf912d9a61d10d2c289d1e443b54cca469fa87f9e02b8f67e7e087aceceffc7dd2b4043cdb5380e2652bc619d51f3a224c64f717 SHA512 bedf072c8aa1b05b249ea272f5cecfe16bdcd762c02c712323f12ac7a278e8814453f5f3caad86a2581e451788b292ed3a76a6a81620926459bb890133cffde1 DIST nss-3.83.tar.gz 84844191 BLAKE2B f2e26f69450cbd2c94c5efdd959cb19e874bcb63d09098406ef49f4997bd04bc0ee4bc285c1c4f0ec461194171342c7d31965ac7bc7eefc284783542dfe853b1 SHA512 550cf1116e39e58041feaa67913f570d791e8153cc0522ba7ae02e27a61e0a4e6a25224be0f25d51a842dc11c70d600263450ebff0a9fdaa2840bafa3fc9ddd5 DIST nss-3.86.tar.gz 71423531 BLAKE2B 36703d99d9616020a165085469be650c2f4ce3e11c2f4f6bd974b1b89f1b9fcfdaa4ffd4d6ee98dabce82e616c170548efa1e51722b524dda8815faccfcf5181 SHA512 c09aeb52d7898617b65a1090cbdd29f6457eff2ebdc61aadb2dbf7b5044eae010ee5eeea729825f1258902936a61a1bff552ee9b26b2f01e5d448bbd8791d1cb +DIST nss-3.87.tar.gz 71435408 BLAKE2B 0d69e18b1e2c4ccfc86db8f3afba94d5000e8ab2a4e766eb6f99f13f57d78b62dd711a0f5f70a24378a3cf1e435cc8ecb7e6fbeae18d5db0176660a0ea35dac2 SHA512 4ec7b94e537df109638b821f3a7e3b7bf31d89c3739a6e4c85cad4fab876390ae482971d6f66198818400f467661e86f39dc1d2a4a88077fd81e3a0b7ed64110 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4 EBUILD ca-certificates-20211016.3.83.ebuild 6060 BLAKE2B 65055ba9783e74caf0d12dd5f8c5a3af47c13f9b65aa0b3f1b502545487d22b772edae7a766888e669c15855dcd265c1f873258c49c6e0935a30d6488b989ef3 SHA512 8f9562825f04768b7c23cdc41f9c2ea4166f419e05adfccd1f6b16e9245f859679d39a0064b9129d6ee16435dff2b191c2c85493a782fff3afdbf77ecc479225 EBUILD ca-certificates-20211016.3.86.ebuild 6068 BLAKE2B 42e0ed7648b050dc4beea8265c81d8cbe261bb778d1c566bad797777cbc606d1004f444614469c0d8cca960a12851ff34f657e179a85834388678880bd5fe91a SHA512 e44128aee9d68765af5470cdf5c7497552f0c51b3bd58fa0677480d303dd092a31416accc8285723130ae5cee6cd73319e4285deeb2457962fe84094e959dc74 +EBUILD ca-certificates-20211016.3.87.ebuild 6068 BLAKE2B d3b32af9fa2fa9a3b465365c5eade1fdac6daa7de0761863adef20d4cddf38081452ed1c5024da311437c995278d8898ad3204cdc4606f7c46acc01277750a90 SHA512 2861181c1906865b11f0e6518704e92d71a197f89d80cdc1329342736699af6cc99689ae263e5aa7ce1cd6d961a36baaf91d6a6b985eb51baac46b5be92e02de MISC metadata.xml 373 BLAKE2B 578ac9cb9ac73fc04e06667e896227927d5438e5c1ef3eae1966e8d01a8dd915669b8c81418f6558b4b5d561473111e50f9d94d4b50f1f03355130c9d9be61f0 SHA512 56216f969a510a4c054109ca6fab651cfb0aaf4768d43f70a21aeea6778ced6793957d9bd39bede89e9fc8577aa6c27bf1ca0402aa1e9aa49ec5981a3230b954 diff --git a/app-misc/ca-certificates/ca-certificates-20211016.3.87.ebuild b/app-misc/ca-certificates/ca-certificates-20211016.3.87.ebuild new file mode 100644 index 000000000000..f3e798fed1f3 --- /dev/null +++ b/app-misc/ca-certificates/ca-certificates-20211016.3.87.ebuild @@ -0,0 +1,203 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# The Debian ca-certificates package merely takes the CA database as it exists +# in the nss package and repackages it for use by openssl. +# +# The issue with using the compiled debs directly is two fold: +# - they do not update frequently enough for us to rely on them +# - they pull the CA database from nss tip of tree rather than the release +# +# So we take the Debian source tools and combine them with the latest nss +# release to produce (largely) the same end result. The difference is that +# now we know our cert database is kept in sync with nss and, if need be, +# can be sync with nss tip of tree more frequently to respond to bugs. + +# Where possible, bump to stable/LTS releases of NSS for the last part +# of the version (when not using a pure Debian release). + +# When triaging user reports, refer to our wiki for tips: +# https://wiki.gentoo.org/wiki/Certificates#Debugging_certificate_issues + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) + +inherit python-any-r1 + +if [[ ${PV} == *.* ]] ; then + # Compile from source ourselves. + PRECOMPILED=false + + DEB_VER=$(ver_cut 1) + NSS_VER=$(ver_cut 2-) + RTM_NAME="NSS_${NSS_VER//./_}_RTM" +else + # Debian precompiled version. + PRECOMPILED=true + inherit unpacker +fi + +DESCRIPTION="Common CA Certificates PEM files" +HOMEPAGE="https://packages.debian.org/sid/ca-certificates" +NMU_PR="" +if ${PRECOMPILED} ; then + SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb" +else + SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz + https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz + cacert? ( + https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch + )" +fi + +LICENSE="MPL-1.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="" +${PRECOMPILED} || IUSE+=" cacert" + +# c_rehash: we run `c_rehash` +# debianutils: we run `run-parts` +CDEPEND="app-misc/c_rehash + sys-apps/debianutils" + +BDEPEND="${CDEPEND}" +if ! ${PRECOMPILED} ; then + BDEPEND+=" ${PYTHON_DEPS}" +fi + +DEPEND="" +if ${PRECOMPILED} ; then + DEPEND+=" !/dev/null || die + eapply "${DISTDIR}"/nss-cacert-class1-class3-r2.patch + popd >/dev/null || die + fi + fi + + default + eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch + + pushd "${S}/${PN}-${DEB_VER}" >/dev/null || die + eapply "${FILESDIR}"/${PN}-20211016.3.72-no-cryptography.patch + popd >/dev/null || die + + local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g') + sed -i \ + -e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \ + -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \ + -e 's/openssl rehash/c_rehash/' \ + usr/sbin/update-ca-certificates || die +} + +src_compile() { + cd "image/${EPREFIX}" || die + + if ! ${PRECOMPILED} ; then + local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}" + + # Grab the database from the nss sources. + cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die + emake -C "${d}" + + # Now move the files to the same places that the precompiled would. + mkdir -p etc/ssl/certs \ + etc/ca-certificates/update.d \ + "${c}"/mozilla \ + || die + if use cacert ; then + mkdir -p "${c}"/cacert.org || die + mv "${d}"/CA_Cert_Signing_Authority.crt \ + "${c}"/cacert.org/cacert.org_class1.crt || die + mv "${d}"/CAcert_Class_3_Root.crt \ + "${c}"/cacert.org/cacert.org_class3.crt || die + fi + mv "${d}"/*.crt "${c}"/mozilla/ || die + else + mv usr/share/doc/{ca-certificates,${PF}} || die + fi + + ( + echo "# Automatically generated by ${CATEGORY}/${PF}" + echo "# $(date -u)" + echo "# Do not edit." + cd "${c}" || die + find * -name '*.crt' | LC_ALL=C sort + ) > etc/ca-certificates.conf + + sh usr/sbin/update-ca-certificates --root "${S}/image" || die +} + +src_install() { + cp -pPR image/* "${D}"/ || die + if ! ${PRECOMPILED} ; then + cd ${PN}-${DEB_VER} || die + doman sbin/*.8 + dodoc debian/README.* examples/ca-certificates-local/README + fi + + echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates || die + doenvd 98ca-certificates +} + +pkg_postinst() { + if [[ -d "${EROOT}/usr/local/share/ca-certificates" ]] ; then + # If the user has local certs, we need to rebuild again + # to include their stuff in the db. + # However it's too overzealous when the user has custom certs in place. + # --fresh is to clean up dangling symlinks + "${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}" + fi + + if [[ -n "$(find -L "${EROOT}"/etc/ssl/certs/ -type l)" ]] ; then + ewarn "Removing the following broken symlinks:" + ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)" + fi +} diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest index 19fa5632e165..9a7df707b0d4 100644 --- a/app-misc/pax-utils/Manifest +++ b/app-misc/pax-utils/Manifest @@ -1,5 +1,7 @@ AUX pax-utils-1.3.5-man-reorder-xmlto-arguments.patch 921 BLAKE2B c97680a374985c23602c98227ad8045f2dbeedd5c5a23374b26f7ce30fe0dedc789077229c4fed4bd8cc18ecb8e9c61f9a13a768dfcb500165e120ef7a7a7d06 SHA512 74ff3095b188c4f88608952b7619297c385dec98df16b336a3ad7fcd2c2514542c4e0053664e81400a729a8183d6a84fd04202826e143c63a4e5aff133f6a071 DIST pax-utils-1.3.5.tar.xz 119764 BLAKE2B 13bd4dbdadefb382133bf42a2b1e740e84ac11661595b082346c80ff05fc7423f5d75cc01ff8a651d921310ae66c2b39a862d0b9db5d7f18e11d393360627fcf SHA512 f2b1753e15907461cc395abffe033d7f7ab8eb15e296b874e2c9d00507458672347b32d7f2f05d3a8625fc3afbdbf0721543f84e062afce7181a726d967e4836 +DIST pax-utils-1.3.6.tar.xz 113816 BLAKE2B de33820acc5cbbace2f7e3f831dc1c4d2ead58e1b0418c96ef42694d7f0cc1d49a37764d6f8b60a00aaa25fd3d40ba64fb4cf1798e07b917936704738e6f1042 SHA512 94d6bdcac0109cc7218fc523594100b4bb5877e0709f5443903ae8aca96e8f3f45cf47b28b57ac146caf6713ad7895a6f67adf4364d9a14986c8b7e0399f3865 EBUILD pax-utils-1.3.5.ebuild 1970 BLAKE2B e3c67c370df7ec3c695216ed3f2879b24ca78ae2d99f0caeb5f12aee45a142f584a335cd8d2c24f148280ea3c26e8fd895a6af92be52eaa59eddf50939b97a10 SHA512 1b6cf737bb31ae270547578cb5a869a5d1903dde91156c61bb992ffcc1389c662fb3152b6734c0d9d05c77eb49201f9537938073dd1f6377afa3bb34489aa70c -EBUILD pax-utils-9999.ebuild 1912 BLAKE2B e70d992c11df700503c62b31746251d7228b6d57b41f59b1f5f667ecebc019b3e30311268a415cf9bebfda92c94e68b31f1d41e8266f572f338a2295e5832752 SHA512 c839c87166845284074d0e53084625e72da5b24e47e6f4d567d0688298d81facc731fee26c0347d54be65198a811384b582c080486cd3b2a7dd94cf14a9da800 +EBUILD pax-utils-1.3.6.ebuild 1913 BLAKE2B ca26957882c6bbfc6b06634895ed2b3d070efe365f8ddf5d7968f344c6c2b62292635fa8c7b577f331b2ff6c0c65c46f37d15eb7393f0f8d591d24eef6d7c348 SHA512 0737b0e5735e001af77119cbbb801811176722460226fe54ab2337a79c7712832ef094a29bc9eefd42c4dcf587dc4fd65b3caa9abb29a6e34ebe51460d1ed59b +EBUILD pax-utils-9999.ebuild 1913 BLAKE2B ca26957882c6bbfc6b06634895ed2b3d070efe365f8ddf5d7968f344c6c2b62292635fa8c7b577f331b2ff6c0c65c46f37d15eb7393f0f8d591d24eef6d7c348 SHA512 0737b0e5735e001af77119cbbb801811176722460226fe54ab2337a79c7712832ef094a29bc9eefd42c4dcf587dc4fd65b3caa9abb29a6e34ebe51460d1ed59b MISC metadata.xml 780 BLAKE2B a1bd460e70b7a2a4bc0e5012fb28a31890ebe745e9d1d99ad427b0382d9df9ffb8363dbf8907aef9e35da0ee59e489b80f084dce205250040d437ccc229ce49c SHA512 61246256f126a5533829b7e0af50168e7a7395f98fc21a64abc970955892874bc690901a36f791bd73a36e7b659e3843b63c504a9f360c5e41f1ce3678b08b5e diff --git a/app-misc/pax-utils/pax-utils-1.3.6.ebuild b/app-misc/pax-utils/pax-utils-1.3.6.ebuild new file mode 100644 index 000000000000..599c1ab4a187 --- /dev/null +++ b/app-misc/pax-utils/pax-utils-1.3.6.ebuild @@ -0,0 +1,77 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Note: if bumping pax-utils because of syscall changes in glibc, please +# revbump glibc and update the dependency in its ebuild for the affected +# versions. +PYTHON_COMPAT=( python3_{8..11} ) + +inherit meson python-single-r1 + +DESCRIPTION="ELF utils that can check files for security relevant properties" +HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pax-utils.git" + inherit git-r3 +else + SRC_URI=" + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz + https://dev.gentoo.org/~vapier/dist/${P}.tar.xz + " + 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" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="caps +man python seccomp test" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + test? ( python ) +" +RESTRICT="!test? ( test )" + +MY_PYTHON_DEPS=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pyelftools[${PYTHON_USEDEP}] + ') +" +RDEPEND=" + caps? ( >=sys-libs/libcap-2.24 ) + python? ( ${MY_PYTHON_DEPS} ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + caps? ( virtual/pkgconfig ) + man? ( app-text/xmlto ) + python? ( ${MY_PYTHON_DEPS} ) +" + +pkg_setup() { + if use test || use python; then + python-single-r1_pkg_setup + fi +} + +src_configure() { + local emesonargs=( + "-Dlddtree_implementation=$(usex python python sh)" + $(meson_feature caps use_libcap) + $(meson_feature man build_manpages) + $(meson_use seccomp use_seccomp) + $(meson_use test tests) + + # fuzzing is currently broken + -Duse_fuzzing=false + ) + meson_src_configure +} + +src_install() { + meson_src_install + + use python && python_fix_shebang "${ED}"/usr/bin/lddtree +} diff --git a/app-misc/pax-utils/pax-utils-9999.ebuild b/app-misc/pax-utils/pax-utils-9999.ebuild index 9aae26cb7eaf..599c1ab4a187 100644 --- a/app-misc/pax-utils/pax-utils-9999.ebuild +++ b/app-misc/pax-utils/pax-utils-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,39 +17,37 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pax-utils.git" inherit git-r3 else - SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz - https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" + SRC_URI=" + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz + https://dev.gentoo.org/~vapier/dist/${P}.tar.xz + " 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" fi LICENSE="GPL-2" SLOT="0" IUSE="caps +man python seccomp test" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + test? ( python ) +" +RESTRICT="!test? ( test )" -_PYTHON_DEPS=" +MY_PYTHON_DEPS=" ${PYTHON_DEPS} $(python_gen_cond_dep ' dev-python/pyelftools[${PYTHON_USEDEP}] ') " - -RDEPEND="caps? ( >=sys-libs/libcap-2.24 ) - python? ( ${_PYTHON_DEPS} ) +RDEPEND=" + caps? ( >=sys-libs/libcap-2.24 ) + python? ( ${MY_PYTHON_DEPS} ) " DEPEND="${RDEPEND}" BDEPEND=" caps? ( virtual/pkgconfig ) man? ( app-text/xmlto ) - - python? ( ${_PYTHON_DEPS} ) -" -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( python ) -" -RESTRICT=" - !test? ( test ) + python? ( ${MY_PYTHON_DEPS} ) " pkg_setup() { -- cgit v1.2.3