Include a bit of CONFIG_PROTECT_MASK magic, so that the /etc/ca-certificates.conf is updated before update-ca-certificates is run, resolves bug #177397.

(Portage version: 2.1.5.2)

2 files changed, 66 insertions, 1 deletions

diff --git a/app-misc/ca-certificates/ChangeLog b/app-misc/ca-certificates/ChangeLog
index 5ad5ff452175..a8d087fa9f5b 100644
--- a/app-misc/ca-certificates/ChangeLog
+++ b/app-misc/ca-certificates/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/ca-certificates
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.15 2008/05/25 04:32:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.16 2008/05/31 18:35:24 robbat2 Exp $
+
+*ca-certificates-20080514-r1 (31 May 2008)
+
+  31 May 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +ca-certificates-20080514-r1.ebuild:
+  Include a bit of CONFIG_PROTECT_MASK magic, so that the
+  /etc/ca-certificates.conf is updated before update-ca-certificates is run,
+  resolves bug #177397.
 
 *ca-certificates-20080514 (25 May 2008)
 
diff --git a/app-misc/ca-certificates/ca-certificates-20080514-r1.ebuild b/app-misc/ca-certificates/ca-certificates-20080514-r1.ebuild
new file mode 100644
index 000000000000..d589b810175a
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20080514-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20080514-r1.ebuild,v 1.1 2008/05/31 18:35:24 robbat2 Exp $
+
+inherit eutils
+
+DESCRIPTION="Common CA Certificates PEM files"
+HOMEPAGE="http://www.cacert.org/"
+SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}_all.deb"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp sys-freebsd/freebsd-ubin )"
+RDEPEND="${DEPEND}
+	dev-libs/openssl"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	unpack ./data.tar.gz
+	rm -f control.tar.gz data.tar.gz debian-binary
+}
+
+pkg_setup() {
+	# For the conversion to having it in CONFIG_PROTECT_MASK,
+	# we need to tell users about it once manually first.
+	[[ -f /etc/env.d/98ca-certificates ]] \
+		|| ewarn "You should run update-ca-certificates manually after etc-update"
+}
+
+src_install() {
+	cp -pPR * "${D}"/ || die "installing data failed"
+
+	(
+	echo "# Automatically generated by ${CAT}/${PF}"
+	echo "# $(date -u)"
+	echo "# Do not edit."
+	cd "${D}"/usr/share/ca-certificates
+	find . -name '*.crt' | sort | cut -b3-
+	) > "${D}"/etc/ca-certificates.conf
+
+	mv "${D}"/usr/share/doc/{ca-certificates,${PF}} || die
+	prepalldocs
+	dodir /etc/env.d/
+	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > "${D}/etc/env.d/98ca-certificates"
+}
+
+pkg_postinst() {
+	[[ ${ROOT} != "/" ]] && return 0
+	# However it's too overzealous when the user has custom certs in place.
+	# --fresh is to clean up dangling symlinks
+	update-ca-certificates
+}