Fix ca-certificates.conf generation #177298 by Remy Blank.

Package-Manager: portage-2.1.2.5

4 files changed, 66 insertions, 15 deletions

diff --git a/app-misc/ca-certificates/ChangeLog b/app-misc/ca-certificates/ChangeLog
index b5ee15f30608..8583cf1ea53b 100644
--- a/app-misc/ca-certificates/ChangeLog
+++ b/app-misc/ca-certificates/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/ca-certificates
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.8 2007/05/05 05:55:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.9 2007/05/06 11:33:28 vapier Exp $
+
+*ca-certificates-20070303-r1 (06 May 2007)
+
+  06 May 2007; Mike Frysinger <vapier@gentoo.org>
+  +ca-certificates-20070303-r1.ebuild:
+  Fix ca-certificates.conf generation #177298 by Remy Blank.
 
 *ca-certificates-20070303 (05 May 2007)
 
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index b8549951d12a..910a5db4f8bf 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -12,14 +12,14 @@ EBUILD ca-certificates-20061027.2.ebuild 1049 RMD160 70a132e52d3f1b7d90565524c13
 MD5 eda15eba6474b1e25e94b553aad21a3c ca-certificates-20061027.2.ebuild 1049
 RMD160 70a132e52d3f1b7d90565524c135c895bfe7413e ca-certificates-20061027.2.ebuild 1049
 SHA256 0a6c7ace4db6e6ee9c5c29960632db2281549cdc8a2bea27c5cb2454065b6c56 ca-certificates-20061027.2.ebuild 1049
-EBUILD ca-certificates-20070303.ebuild 1040 RMD160 d29be8017e235a870147df5786a847441d88f4c2 SHA1 49c2f67b3f3162a57221dedb870728bcbfc51859 SHA256 242c28136b88610442d21ee5d862b7b1086765fa6ced47151d1cdaffb7a148f9
-MD5 0a8ed46a2b654363ea895896046e5e1d ca-certificates-20070303.ebuild 1040
-RMD160 d29be8017e235a870147df5786a847441d88f4c2 ca-certificates-20070303.ebuild 1040
-SHA256 242c28136b88610442d21ee5d862b7b1086765fa6ced47151d1cdaffb7a148f9 ca-certificates-20070303.ebuild 1040
-MISC ChangeLog 1406 RMD160 dcea0901a2916a47de7b614eff632523d27ffffa SHA1 33d17091aed8416dfdfe7720a9a4125b9ea5be72 SHA256 cee83525711f2857ecaa37fb6c0bb4c5eecd427470b990b0f76d627256bb5b26
-MD5 23247ee45b25499e8a98cc796d15e462 ChangeLog 1406
-RMD160 dcea0901a2916a47de7b614eff632523d27ffffa ChangeLog 1406
-SHA256 cee83525711f2857ecaa37fb6c0bb4c5eecd427470b990b0f76d627256bb5b26 ChangeLog 1406
+EBUILD ca-certificates-20070303-r1.ebuild 1050 RMD160 e67c14f1ed307a1de27960320017de284db50c84 SHA1 77fa185ab5cc52826373637cb4af18daeb208292 SHA256 dd35addb0fee96e41cb5ff383a8d8b3cfa0558b1d77b0ac35102435d31a55bba
+MD5 db1d79ace9a44974d72aa800b5be9111 ca-certificates-20070303-r1.ebuild 1050
+RMD160 e67c14f1ed307a1de27960320017de284db50c84 ca-certificates-20070303-r1.ebuild 1050
+SHA256 dd35addb0fee96e41cb5ff383a8d8b3cfa0558b1d77b0ac35102435d31a55bba ca-certificates-20070303-r1.ebuild 1050
+MISC ChangeLog 1601 RMD160 a2bfa2217cb4f6f9da52f29c89c473e0088ca935 SHA1 1070f90a42a20466f7c9de5ee76ba1503d521c39 SHA256 837851789f258218b476b46b9aa0757e5a30fc7f2a6de88c7405b1b09145cba6
+MD5 212310030ea030cf266b782cde3c08e4 ChangeLog 1601
+RMD160 a2bfa2217cb4f6f9da52f29c89c473e0088ca935 ChangeLog 1601
+SHA256 837851789f258218b476b46b9aa0757e5a30fc7f2a6de88c7405b1b09145cba6 ChangeLog 1601
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -30,13 +30,13 @@ SHA256 b140f41855466986f7e5d345c24f2e124b612c20bca4e46f7557490918c4c97c files/di
 MD5 36ea5110aec775c9fbed5fb69b4810b8 files/digest-ca-certificates-20061027.2 280
 RMD160 1f22586a46c7240fc5d3d519e358945e62f5f109 files/digest-ca-certificates-20061027.2 280
 SHA256 ec7c3507bb4eab22ff6c4e84c7d57d65ff730a6e56b744645fec7b1770e4d2ee files/digest-ca-certificates-20061027.2 280
-MD5 d795d13d9c5db84eb7c8e1062bde282f files/digest-ca-certificates-20070303 274
-RMD160 d1b4ef14f7bc63621058bca13e89c44e84f96ba0 files/digest-ca-certificates-20070303 274
-SHA256 6336e42863a6ec6ed3b5f211da070edd4a049b838b58570108d4c1989f6bb66f files/digest-ca-certificates-20070303 274
+MD5 d795d13d9c5db84eb7c8e1062bde282f files/digest-ca-certificates-20070303-r1 274
+RMD160 d1b4ef14f7bc63621058bca13e89c44e84f96ba0 files/digest-ca-certificates-20070303-r1 274
+SHA256 6336e42863a6ec6ed3b5f211da070edd4a049b838b58570108d4c1989f6bb66f files/digest-ca-certificates-20070303-r1 274
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGPByz8bi6rjpTunYRAp/JAJ9LuWwAAff4SwA0pOr6p+07qqRAQgCbBExL
-aIA1a9xXACTQfjZuonkojok=
-=5kkF
+iD8DBQFGPb0o8bi6rjpTunYRAsMiAKCMaD00XoOTWTABr/MsV6ZCXsn5ogCfdIzw
+LPwtO78foYncRoL0cvcFwIs=
+=baLf
 -----END PGP SIGNATURE-----
diff --git a/app-misc/ca-certificates/ca-certificates-20070303-r1.ebuild b/app-misc/ca-certificates/ca-certificates-20070303-r1.ebuild
new file mode 100644
index 000000000000..61b7a0fe5e06
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20070303-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20070303-r1.ebuild,v 1.1 2007/05/06 11:33:28 vapier 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="freedist"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=sys-apps/portage-2.1.2"
+RDEPEND="dev-libs/openssl"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	unpack ./data.tar.gz
+	rm -f control.tar.gz data.tar.gz debian-binary
+}
+
+src_install() {
+	cp -pPR * "${D}"/ || die "installing data failed"
+
+	(
+	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
+}
+
+pkg_postinst() {
+	[[ ${ROOT} != "/" ]] && return 0
+	update-ca-certificates
+}
diff --git a/app-misc/ca-certificates/files/digest-ca-certificates-20070303-r1 b/app-misc/ca-certificates/files/digest-ca-certificates-20070303-r1
new file mode 100644
index 000000000000..96f5fc3c5661
--- /dev/null
+++ b/app-misc/ca-certificates/files/digest-ca-certificates-20070303-r1
@@ -0,0 +1,3 @@
+MD5 bb33a371510956bc8bbe6366ba643148 ca-certificates_20070303_all.deb 97182
+RMD160 f569d903a6e55e8699f5fbf43358831f85925031 ca-certificates_20070303_all.deb 97182
+SHA256 ecef927c097fe08677c87799510f33efbf955f00120d74e347227731a1405f91 ca-certificates_20070303_all.deb 97182