public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/ca-certificates/
Date: Tue,  8 May 2018 08:47:05 +0000 (UTC)	[thread overview]
Message-ID: <1525769220.f153ad14bc98813fee11b927a8429b341c8e880f.polynomial-c@gentoo> (raw)

commit:     f153ad14bc98813fee11b927a8429b341c8e880f
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue May  8 08:46:41 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue May  8 08:47:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f153ad14

app-misc/ca-certificates: Bump to version 20180409.3.37

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 app-misc/ca-certificates/Manifest                  |   1 +
 .../ca-certificates-20180409.3.37.ebuild           | 179 +++++++++++++++++++++
 2 files changed, 180 insertions(+)

diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 579c2f900bd..f871a29de34 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -1,4 +1,5 @@
 DIST ca-certificates_20170717.tar.xz 293028 BLAKE2B 85076cd980841f32e2544c7be020fca9bcd5ef7066ae3cef195cbf9755f8b8e800a8e4076662fa1b7da600c2235e49048eb6e1166b0618fc7685221ab790fed3 SHA512 dfeb5a19bb33bcb127a159b73fcc63b41c99827d77eb4a6069def0cffc7ae8dd10dab97c1ddfdd5b70d0c93e650a51ed5dcd03908516e7ca8b3022bf46eeb7e6
 DIST ca-certificates_20180409.tar.xz 246908 BLAKE2B b553d4347f1a5b88fe59c7269dee617f61cde54d4df1a3aa4b3a7e9aa4b2ee81415e5c421352505ca4b2e0e480b053ccb04024bddfb51450d298d8fdd0567c36 SHA512 e0742da19416d367618547107cc0f1cc045d5ba62c30fb7238e0e36ec0d19ea48e2ffdee2c68a9f06954025c58db9a5376f149e221ede95a3a029cda39d86a53
 DIST nss-3.36.1.tar.gz 23026430 BLAKE2B 76eaf5b24f8954a4e14cf556912250a3ddb7b333054a2ea4ee3d218493a8f12c77a37455aae354ef6ddd9bd55c33a269dad515806d70ef38727fa8a382d47fd4 SHA512 096fe4360b6d584a746ac6156830f8cff821fd173bd889d7a396238919328a227fa4ebb46f738970a4001773046f3dd4f4675b85ff6de8420a4a7657b3ba0c65
+DIST nss-3.37.tar.gz 23027581 BLAKE2B 0ce7190a029321d5620dc8b9aedf1f4252c53dbef57149afbad432b6bc4b590db026505d23f5c766827d5c0179ab931b8a0435a2e9785eff3db515ed7211e512 SHA512 ad5175f126705f57092ac80421ac005bcc32bb18a4a44a527df25994fa90b3bc18af08506683564f619a22076f71232e2b3c9e6e25d6312d0bfed63684139103
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0

diff --git a/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild b/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild
new file mode 100644
index 00000000000..8d5bc12f58e
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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.
+
+# When triaging bugs from users, here's some handy tips:
+# - To see what cert is hitting errors, use openssl:
+#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
+#   Focus on the errors written to stderr.
+#
+# - Look at the upstream log as to why certs were added/removed:
+#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
+#
+# - If people want to add/remove certs, tell them to file w/mozilla:
+#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit eutils python-any-r1
+
+if [[ ${PV} == *.* ]] ; then
+	# Compile from source ourselves.
+	PRECOMPILED=false
+	inherit versionator
+
+	DEB_VER=$(get_version_component_range 1)
+	NSS_VER=$(get_version_component_range 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/~axs/distfiles/nss-cacert-class1-class3.patch
+		)"
+fi
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+${PRECOMPILED} || IUSE+=" cacert"
+
+DEPEND=""
+if ${PRECOMPILED} ; then
+	DEPEND+=" !<sys-apps/portage-2.1.10.41"
+fi
+# c_rehash: we run `c_rehash`
+# debianutils: we run `run-parts`
+RDEPEND="${DEPEND}
+	app-misc/c_rehash
+	sys-apps/debianutils"
+
+if ! ${PRECOMPILED}; then
+	DEPEND+=" ${PYTHON_DEPS}"
+fi
+
+S=${WORKDIR}
+
+pkg_setup() {
+	# For the conversion to having it in CONFIG_PROTECT_MASK,
+	# we need to tell users about it once manually first.
+	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
+		|| ewarn "You should run update-ca-certificates manually after etc-update"
+}
+
+src_unpack() {
+	${PRECOMPILED} || default
+
+	# Do all the work in the image subdir to avoid conflicting with source
+	# dirs in $WORKDIR.  Need to perform everything in the offset #381937
+	mkdir -p "image/${EPREFIX}"
+	cd "image/${EPREFIX}" || die
+
+	${PRECOMPILED} && unpacker_src_unpack
+}
+
+src_prepare() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		mkdir -p usr/sbin
+		cp -p "${S}"/${PN}/sbin/update-ca-certificates usr/sbin/ || die
+
+		if use cacert ; then
+			pushd "${S}"/nss-${NSS_VER} >/dev/null
+			eapply -p0 "${DISTDIR}"/nss-cacert-class1-class3.patch
+			popd >/dev/null
+		fi
+	fi
+
+	default
+	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
+	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
+		python_setup
+		local d="${S}/${PN}/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
+		if use cacert ; then
+			mkdir -p "${c}"/cacert.org
+			mv "${d}"/CAcert_Inc..crt "${c}"/cacert.org/cacert.org_root.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}"
+	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 ca-certificates
+		doman sbin/*.8
+		dodoc debian/README.* examples/ca-certificates-local/README
+	fi
+
+	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
+	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
+}


             reply	other threads:[~2018-05-08  8:47 UTC|newest]

Thread overview: 202+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-08  8:47 Lars Wendler [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-07-01 18:55 [gentoo-commits] repo/gentoo:master commit in: app-misc/ca-certificates/ Mike Gilbert
2024-06-01  3:46 Ionen Wolkens
2024-04-29  8:12 Arthur Zamarin
2024-03-15 20:26 Arthur Zamarin
2024-03-14  8:18 Arthur Zamarin
2024-03-14  7:48 Arthur Zamarin
2024-03-14  6:44 Sam James
2024-03-14  6:23 Sam James
2024-03-14  6:19 Sam James
2024-03-14  6:11 Sam James
2024-03-14  6:06 Sam James
2024-02-08  1:36 Sam James
2024-02-03  6:56 Sam James
2024-02-02 16:27 Arthur Zamarin
2024-02-02 13:34 Arthur Zamarin
2024-02-02  6:40 Sam James
2024-02-02  4:33 Sam James
2024-01-22 13:12 Sam James
2024-01-18  0:28 Sam James
2024-01-17  8:53 Arthur Zamarin
2024-01-17  6:34 Sam James
2024-01-17  5:59 Sam James
2024-01-17  5:50 Sam James
2024-01-17  5:33 Sam James
2024-01-03  2:20 Ionen Wolkens
2023-12-21 16:01 Arthur Zamarin
2023-12-21 15:15 Sam James
2023-12-21 13:18 Arthur Zamarin
2023-12-21 12:56 Sam James
2023-12-21 11:55 Sam James
2023-12-21 11:55 Sam James
2023-12-21 11:12 Arthur Zamarin
2023-12-02  7:13 Sam James
2023-11-20 17:06 Robin H. Johnson
2023-09-01  8:02 Sam James
2023-06-05  3:59 Sam James
2023-06-05  3:57 Sam James
2023-05-13  7:15 Arthur Zamarin
2023-05-13  5:08 Sam James
2023-05-13  3:17 Sam James
2023-05-13  3:17 Sam James
2023-05-13  3:17 Sam James
2023-05-13  3:17 Sam James
2023-05-13  3:17 Sam James
2023-05-13  3:17 Sam James
2023-05-06  8:48 Sam James
2023-05-06  8:48 Sam James
2023-05-06  8:48 Sam James
2023-03-24 13:49 Arthur Zamarin
2023-03-24 13:48 Arthur Zamarin
2023-03-22  9:37 Sam James
2023-03-10  9:33 Sam James
2023-03-10  8:08 Sam James
2023-03-10  8:08 Sam James
2023-03-10  8:08 Sam James
2023-03-10  7:44 Arthur Zamarin
2023-03-10  7:44 Arthur Zamarin
2023-03-10  7:44 Arthur Zamarin
2023-03-10  7:44 Arthur Zamarin
2023-03-10  7:44 Arthur Zamarin
2023-02-16  5:28 Sam James
2023-02-04  1:48 Mike Gilbert
2023-01-09  5:53 Sam James
2023-01-09  5:41 Sam James
2023-01-09  5:41 Sam James
2023-01-09  5:41 Sam James
2023-01-09  5:41 Sam James
2023-01-09  5:41 Sam James
2023-01-09  5:41 Sam James
2023-01-09  5:41 Sam James
2023-01-06  8:40 Sam James
2022-12-10  3:26 Sam James
2022-11-18 11:18 Arthur Zamarin
2022-11-18  7:00 Arthur Zamarin
2022-11-18  7:00 Sam James
2022-11-18  6:50 Arthur Zamarin
2022-11-18  6:48 Arthur Zamarin
2022-11-18  6:47 Arthur Zamarin
2022-11-18  6:46 Sam James
2022-11-18  6:46 Sam James
2022-11-18  6:23 Sam James
2022-11-18  6:23 Sam James
2022-09-23  6:14 Sam James
2022-09-17  5:38 Arthur Zamarin
2022-09-16 18:27 Arthur Zamarin
2022-09-16  8:40 Arthur Zamarin
2022-09-07  1:50 Sam James
2022-09-06 21:59 Jakov Smolić
2022-09-06 21:53 Sam James
2022-09-06 21:49 Jakov Smolić
2022-09-06 21:37 Sam James
2022-09-06 21:35 Sam James
2022-07-05  2:30 Sam James
2022-06-02  5:38 Sam James
2022-04-25 15:59 Sam James
2022-04-03  1:48 Sam James
2022-03-31  0:47 Sam James
2021-11-04 19:07 Sam James
2021-11-04 17:53 Lars Wendler
2021-11-04 17:53 Lars Wendler
2021-10-15 14:33 Thomas Deutschmann
2021-09-27  4:26 Robin H. Johnson
2021-05-28 19:36 Thomas Deutschmann
2021-05-28 19:16 Thomas Deutschmann
2021-04-16 11:35 Thomas Deutschmann
2021-04-16 11:35 Thomas Deutschmann
2021-03-17 20:49 Thomas Deutschmann
2021-02-21 12:10 Lars Wendler
2021-02-21 12:10 Lars Wendler
2021-02-15 23:44 Mike Frysinger
2020-12-14 21:42 Thomas Deutschmann
2020-11-14 22:56 Thomas Deutschmann
2020-10-06 16:36 Lars Wendler
2020-08-20 15:08 Thomas Deutschmann
2020-06-02 17:28 Thomas Deutschmann
2020-06-02 17:13 Robin H. Johnson
2020-06-01 22:56 Robin H. Johnson
2020-04-17 20:59 Andreas Sturmlechner
2019-07-18  8:25 Lars Wendler
2019-07-18  8:25 Lars Wendler
2019-07-18  8:16 Agostino Sarubbo
2019-05-04 10:35 Andreas K. Hüttel
2019-03-18 14:29 Lars Wendler
2019-02-19 12:28 Fabian Groffen
2019-02-18  9:02 Lars Wendler
2019-01-07 19:53 Thomas Deutschmann
2019-01-07 19:53 Thomas Deutschmann
2018-12-25 20:18 Lars Wendler
2018-10-01 14:03 Lars Wendler
2018-04-22 17:34 Thomas Deutschmann
2018-04-20  6:54 Sergei Trofimovich
2018-04-18 11:31 Mikle Kolyada
2018-04-18  8:27 Lars Wendler
2018-04-18  8:27 Lars Wendler
2018-04-18  4:37 Mart Raudsepp
2018-04-17 22:50 Thomas Deutschmann
2018-04-17 16:01 Thomas Deutschmann
2018-04-17  9:39 Lars Wendler
2018-04-11  8:19 Lars Wendler
2018-03-07  9:14 Lars Wendler
2018-03-07  9:13 Lars Wendler
2018-01-20 10:04 Lars Wendler
2018-01-20 10:04 Lars Wendler
2018-01-12  4:10 Mike Frysinger
2017-12-24  9:46 Mart Raudsepp
2017-11-29 17:27 Lars Wendler
2017-11-29 17:27 Lars Wendler
2017-11-15 18:51 Lars Wendler
2017-11-01 14:50 Jeroen Roovers
2017-09-21 22:26 Lars Wendler
2017-09-21 22:26 Lars Wendler
2017-09-14 21:24 Lars Wendler
2017-09-14 21:24 Lars Wendler
2017-08-08  7:40 Lars Wendler
2017-08-08  7:40 Lars Wendler
2017-08-08  7:40 Lars Wendler
2017-08-08  7:40 Lars Wendler
2017-05-05 13:49 Lars Wendler
2017-05-05 13:49 Lars Wendler
2017-04-06 13:08 Lars Wendler
2017-04-06 13:08 Lars Wendler
2017-03-24  9:29 Lars Wendler
2017-03-23  7:59 Lars Wendler
2017-03-08  9:47 Lars Wendler
2017-03-08  9:47 Lars Wendler
2017-02-21  9:30 Lars Wendler
2017-02-18  6:45 Lars Wendler
2017-02-18  5:47 Markus Meier
2017-02-14 10:35 Lars Wendler
2017-02-14 10:35 Lars Wendler
2017-01-12 22:02 Lars Wendler
2017-01-12 22:02 Lars Wendler
2017-01-10  7:16 Jeroen Roovers
2017-01-06 14:33 Tobias Klausmann
2017-01-04 11:23 Agostino Sarubbo
2016-12-23 13:10 Lars Wendler
2016-12-03 20:20 Lars Wendler
2016-12-02 17:05 Lars Wendler
2016-12-02 14:48 Lars Wendler
2016-12-02 14:48 Lars Wendler
2016-10-28  9:28 Lars Wendler
2016-10-25 18:45 Lars Wendler
2016-10-25 14:52 Lars Wendler
2016-10-05  7:59 Lars Wendler
2016-10-05  7:53 Lars Wendler
2016-10-05  7:53 Lars Wendler
2016-04-22 18:12 Mike Frysinger
2016-03-21  2:39 Mike Frysinger
2016-03-21  2:39 Mike Frysinger
2016-02-29  8:46 Stephen Klimaszewski
2016-02-20  7:46 Jeroen Roovers
2016-02-13 15:33 Agostino Sarubbo
2016-02-12  9:00 Jeroen Roovers
2016-02-10 20:48 Markus Meier
2016-02-06 16:28 Robin H. Johnson
2016-02-04 11:08 Tobias Klausmann
2015-12-22 23:35 Mike Frysinger
2015-11-25 14:23 Benda XU
2015-10-01  9:40 Julian Ospald
2015-09-26 17:46 Mike Frysinger
2015-09-20 13:28 Julian Ospald

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1525769220.f153ad14bc98813fee11b927a8429b341c8e880f.polynomial-c@gentoo \
    --to=polynomial-c@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox