Fix for Prefix migration gone bad. Make sure update-ca-certificates knows about...

Package-Manager: portage-2.2.01.19120-prefix/cvs/Darwin i386

diff --git a/app-misc/ca-certificates/ChangeLog b/app-misc/ca-certificates/ChangeLog
index ec74b1ef0b118c8464125e8ecdbf3363c706e3b7..c47b9949a31340c7a9ccb742f87b3e1bc93cc286 100644 (file)
--- a/app-misc/ca-certificates/ChangeLog
+++ b/app-misc/ca-certificates/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/ca-certificates
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.52 2011/09/03 17:33:45 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.53 2011/09/05 19:56:46 grobian Exp $
+
+*ca-certificates-20110502-r3 (05 Sep 2011)
+
+  05 Sep 2011; Fabian Groffen <grobian@gentoo.org>
+  +ca-certificates-20110502-r3.ebuild:
+  Fix for Prefix migration gone bad. Make sure update-ca-certificates knows
+  about the offset, such that it doesn't generate symlinks pointing outside the
+  offset. Bug #381937
 
   03 Sep 2011; Fabian Groffen <grobian@gentoo.org>
   ca-certificates-20110502-r2.ebuild:

diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index d2e1efa011b4e44f4bc15e01348b1b5ab85e024b..dcbe5d807ca54531265fc9ddf17fb7f7de426b81 100644 (file)
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -10,13 +10,14 @@ EBUILD ca-certificates-20090709.ebuild 2126 RMD160 3d24608ff5c55225ed5c81a67857c
 EBUILD ca-certificates-20110421.ebuild 2119 RMD160 4d43af5a2d49eede27e6cd6b41568bfc45e655d9 SHA1 0c8c63fa35f9ab2f0bf8b867951647cba76e345f SHA256 1223e4710e2d72fbb97f93bfa77351912b20b6ea07e83c7672bd24b1d812a634
 EBUILD ca-certificates-20110502-r1.ebuild 2116 RMD160 58b09920e8e77b7fdbb88d694e905c8b1d23f821 SHA1 64f97fe7afe251eb984509bfefe0e31dd2d74c49 SHA256 39b705809344be81df5d717a63f7909127481f9ec052c2169d74ac2eda508e68
 EBUILD ca-certificates-20110502-r2.ebuild 2858 RMD160 262b5a79440219a1a28f0fd18f153820ecb4fbd5 SHA1 a687a1f60539688d64911b2ede31f8981d128c26 SHA256 3c67bf66b6bf7d4f17fe3cf4eeb696331e62e201b51cdacd6bfc523ec3b2b0c6
+EBUILD ca-certificates-20110502-r3.ebuild 3044 RMD160 5d3a1ae811581011e32148b247987f83a4326f68 SHA1 264c10574d82523545d4c55efaeee59aa31e694d SHA256 274b6f0817b1fd899fb92a898e960bc18cb00b861703f94875cd7c4f6b1dfaa6
 EBUILD ca-certificates-20110502.ebuild 2120 RMD160 eff412c030efac5272b3109326d483857cb62f67 SHA1 533aa547d6360b0cd5af7b696763cd22d5e33abe SHA256 11ba88945cc66cc74f3e2236f0be28ed5e55162b7f1133929f7c4d6c7081dc05
-MISC ChangeLog 8357 RMD160 247fb6444d34e6349e695ca3bffa9e58114fbf63 SHA1 73bf0f4c92c1b740dc131909499df621880efd79 SHA256 a78dc34089f1a333dea06307238cbdb941f7af33e116754ad873a71ba7661a72
+MISC ChangeLog 8670 RMD160 c8405203217a62d80c522a28e3c5c99112ffb3fc SHA1 954ca390987cdb9a49e568cf6deeb65cb8e7979b SHA256 a1d665986fa5c56c1b4088963ef465dfa925b0e08f93540abd100f037857bc56
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (Darwin)
 
-iEYEARECAAYFAk5iZP4ACgkQX3X2B8XHTokqvgCfXO0J3Rai02k+S4FwctsUwuLH
-6DsAn2Gi6i4ywzlaHiJiBnEP/vUe5KiH
-=Yb7o
+iEYEARECAAYFAk5lKYQACgkQX3X2B8XHTom+XQCfQMywCceM2zJRcKsRbSy47PKz
+SFsAnRJOHH49PVE/bxAnnmY2+ohsplBz
+=GmA3
 -----END PGP SIGNATURE-----

diff --git a/app-misc/ca-certificates/ca-certificates-20110502-r3.ebuild b/app-misc/ca-certificates/ca-certificates-20110502-r3.ebuild
new file mode 100644 (file)
index 0000000..a46f012
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20110502-r3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20110502-r3.ebuild,v 1.1 2011/09/05 19:56:46 grobian Exp $
+
+EAPI="3"
+
+inherit eutils
+
+DESCRIPTION="Common CA Certificates PEM files"
+HOMEPAGE="http://packages.debian.org/sid/ca-certificates"
+SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}+nmu1_all.deb"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+DEPEND="|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp sys-freebsd/freebsd-ubin )"
+RDEPEND="${DEPEND}
+       dev-libs/openssl
+       sys-apps/debianutils
+       kernel_AIX? ( app-arch/deb2targz )" # platforms like AIX don't have a good ar
+
+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() {
+       if [[ -n ${EPREFIX} ]] ; then
+               # need to perform everything in the offset, #381937
+               mkdir -p "./${EPREFIX}"
+               cd "./${EPREFIX}" || die
+       fi
+       unpack ${A}
+       unpack ./data.tar.gz
+       rm -f control.tar.gz data.tar.gz debian-binary
+}
+
+src_prepare() {
+       cd "./${EPREFIX}" || die
+       epatch "${FILESDIR}"/${PN}-20090709-root.patch
+       sed -i -e '/="$ROOT/s:ROOT/:ROOT'"${EPREFIX}"'/:' \
+               usr/sbin/update-ca-certificates || die
+}
+
+src_compile() {
+       (
+       echo "# Automatically generated by ${CATEGORY}/${PF}"
+       echo "# $(date -u)"
+       echo "# Do not edit."
+       cd "${S}${EPREFIX}"/usr/share/ca-certificates
+       find * -name '*.crt' | LC_ALL=C sort
+       ) > "${S}${EPREFIX}"/etc/ca-certificates.conf
+
+       "${S}${EPREFIX}"/usr/sbin/update-ca-certificates --root "${S}"
+}
+
+src_install() {
+       cp -pPR * "${D}"/ || die
+
+       mv "${ED}"/usr/share/doc/{ca-certificates,${PF}} || die
+       prepalldocs
+
+       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 "${EROOT}"
+       fi
+
+       local c badcerts=0
+       for c in $(find -L "${EROOT}"etc/ssl/certs/ -type l) ; do
+               ewarn "Broken symlink for a certificate at $c"
+               badcerts=1
+       done
+       if [ $badcerts -eq 1 ]; then
+               ewarn "You MUST remove the above broken symlinks"
+               ewarn "Otherwise any SSL validation that use the directory may fail!"
+               ewarn "To batch-remove them, run:"
+               ewarn "find -L ${EROOT}etc/ssl/certs/ -type l -exec rm {} +"
+       fi
+}