diff options
Diffstat (limited to 'app-misc/ca-certificates')
3 files changed, 34 insertions, 7 deletions
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest index fe8111cb4e5d..a6b0613a2d0c 100644 --- a/app-misc/ca-certificates/Manifest +++ b/app-misc/ca-certificates/Manifest @@ -1,4 +1,5 @@ AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d4fc6a8b59b9931db387e9045167973a0bb98ee11164ccbc13c7ea7fb545fab45a8112df5806a5a13d2b77abf682eec1390a15 SHA512 4e68e6068921e9ed54bda68af422a491cb530b60ffbb85fe1986a403cd9023522c179b5afcf65e22c223a665163d1c2d1993322d652053b72e3fe07efe692d59 +AUX ca-certificates-20211016.3.72-no-cryptography.patch 824 BLAKE2B fb71347a7763e15f5a3fc3d63513346afcd0e74d7b01fb2e107d874eb314608fa5e2823826bf7adfc0bac83396a0828a8ad9eb680cad6f2034a32280f85e7e4e SHA512 b132682f54451c0a17073135c96153bb0de97496c9c5b1f3c5fe019a2dccf6497e7a88322b2fccec3fb7252100d1c2a9bd9e4e124d8774c6fd369ada0d600c9a DIST ca-certificates_20210119.tar.xz 232964 BLAKE2B 593352912d2b490e3f46ea032ac1ddf1c87a7ac93859d475461cbba490918cdec853b0bb30bb253a634d8d597ca6f0304bc81122b4b31b5b31fd6a80e1faaf33 SHA512 a824209fa0ff0865872a07d8e6b901d8407f599243810fd5c820e1f69226e05b0b4f1e25e5ff3d8d398ff952529084442f026e32220961f359f6323f6bf03373 DIST ca-certificates_20211016.tar.xz 239608 BLAKE2B 9b4730b54fd9f472fe4e5427bf912d9a61d10d2c289d1e443b54cca469fa87f9e02b8f67e7e087aceceffc7dd2b4043cdb5380e2652bc619d51f3a224c64f717 SHA512 bedf072c8aa1b05b249ea272f5cecfe16bdcd762c02c712323f12ac7a278e8814453f5f3caad86a2581e451788b292ed3a76a6a81620926459bb890133cffde1 DIST nss-3.66.tar.gz 82401896 BLAKE2B ae369899af681e1c6ea8046098c83da08c2112b16d85a0eaee46e9d4f97dfb3f7c3e97eb681ec947b5648446c6db51e8f1396ec9bb6c731c9678ecf925e7f743 SHA512 327129cb065a8c19246e081e3cbc4798c81dc52eab6ee366eade151e9d308990592075c52a7c672165725fd855a0c539d56a803c26ef066561c584d693e0e467 @@ -7,5 +8,5 @@ DIST nss-3.72.tar.gz 83928300 BLAKE2B d92889e27e99095a18090eff0c08b8653ef1f53f49 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4 EBUILD ca-certificates-20210119.3.66.ebuild 5729 BLAKE2B 621fa9f502341120c79456c777adc53bc5f745e30c5f0262f9939115d0aa689e050c1fa0804c60f576e6a6e4d551eed66ae1688fb1221f3df0457a5d1fc12c66 SHA512 ebc95de3a0c5d64927d6aea7399ed7d7d314ff275de0e8ffe3c62a26b86518104cdba475ca99b01de0967a0dcc807bd8e1b5fc7528f77d890a7f7d46b30f2855 EBUILD ca-certificates-20210119.3.71.ebuild 5737 BLAKE2B 58d29e546924fffc92dbcea7b2758b5486c1338852d3d6794df12cd07770552ad961fcdf961bb2c486dfb0a15b12d234cd4e4ac4c127f1ac2fedf4b829daf0ea SHA512 5750aa5e1c62ad82dadac6a67fb847d4f6c18f30c2fd4eca0da9c798ef285a49784633f399f1df0cd4a3a480fa936f471c06e90a693b46ab7d943574dec9c7a6 -EBUILD ca-certificates-20211016.3.72.ebuild 5965 BLAKE2B f9001217538d1467841354b4098b9a6617dc2b9b238401c8d8863b1faacf4d591e25043cc9ac9037e2b3e9173d79db254d082aca4cf04fc0a048d41146fa0f7b SHA512 799ee21a47c0c0f7e8aad254e1188b932d908f12b204db9428e234f4ca520f7bb90af524c0daf92c41fff1f2b708ecb0584f82608978e38a34b863a4f7fa6926 +EBUILD ca-certificates-20211016.3.72.ebuild 5906 BLAKE2B f93d6e3a59c78016256a839849c2e1869225429276c30add1ce26399979cc57f4f45c1121560836d7b85f0d899e75d522d5d06e419cd17e15738775d431cef6c SHA512 d190a2b873aaa825a98b79adb6e80de12f1b7fb1eb3231c20bab79e1936f037ad8c29ecd0bbcc65a8c1f8b5cc989ee27e560ed5950cb4f201397ba9446749da3 MISC metadata.xml 373 BLAKE2B 578ac9cb9ac73fc04e06667e896227927d5438e5c1ef3eae1966e8d01a8dd915669b8c81418f6558b4b5d561473111e50f9d94d4b50f1f03355130c9d9be61f0 SHA512 56216f969a510a4c054109ca6fab651cfb0aaf4768d43f70a21aeea6778ced6793957d9bd39bede89e9fc8577aa6c27bf1ca0402aa1e9aa49ec5981a3230b954 diff --git a/app-misc/ca-certificates/ca-certificates-20211016.3.72.ebuild b/app-misc/ca-certificates/ca-certificates-20211016.3.72.ebuild index 86df307180a7..30183fb5044d 100644 --- a/app-misc/ca-certificates/ca-certificates-20211016.3.72.ebuild +++ b/app-misc/ca-certificates/ca-certificates-20211016.3.72.ebuild @@ -62,8 +62,6 @@ CDEPEND="app-misc/c_rehash BDEPEND="${CDEPEND}" if ! ${PRECOMPILED} ; then BDEPEND+=" ${PYTHON_DEPS}" - # See bug #821706 - BDEPEND+=" $(python_gen_any_dep 'dev-python/cryptography[${PYTHON_USEDEP}]')" fi DEPEND="" @@ -76,10 +74,6 @@ RDEPEND="${CDEPEND} S=${WORKDIR} -python_check_deps() { - has_version -b "dev-python/cryptography[${PYTHON_USEDEP}]" -} - pkg_setup() { # For the conversion to having it in CONFIG_PROTECT_MASK, # we need to tell users about it once manually first. @@ -126,6 +120,11 @@ src_prepare() { default eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch + + pushd "${S}/${PN}-${DEB_VER}" >/dev/null || die + eapply "${FILESDIR}"/${P}-no-cryptography.patch + popd >/dev/null || die + local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g') sed -i \ -e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \ diff --git a/app-misc/ca-certificates/files/ca-certificates-20211016.3.72-no-cryptography.patch b/app-misc/ca-certificates/files/ca-certificates-20211016.3.72-no-cryptography.patch new file mode 100644 index 000000000000..fb98eb2828e7 --- /dev/null +++ b/app-misc/ca-certificates/files/ca-certificates-20211016.3.72-no-cryptography.patch @@ -0,0 +1,27 @@ +Remove the dependency on non-portable dev-python/cryptography. +https://bugs.gentoo.org/821706#c4 by Alex Xu + +--- a/mozilla/certdata2pem.py ++++ b/mozilla/certdata2pem.py +@@ -28,8 +28,6 @@ + import textwrap + import io + +-from cryptography import x509 +- + + objects = [] + +@@ -122,12 +120,6 @@ + if not obj['CKA_LABEL'] in trust or not trust[obj['CKA_LABEL']]: + continue + +- cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) +- if cert.not_valid_after < datetime.datetime.now(): +- print('!'*74) +- print('Trusted but expired certificate found: %s' % obj['CKA_LABEL']) +- print('!'*74) +- + bname = obj['CKA_LABEL'][1:-1].replace('/', '_')\ + .replace(' ', '_')\ + .replace('(', '=')\ |