summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2011-09-05 19:56:46 +0000
committerFabian Groffen <grobian@gentoo.org>2011-09-05 19:56:46 +0000
commit0e5486799d6455832e2efcadf97b7b23323b2176 (patch)
treea487f9670b76fccb2a46675c43b93d72b37075a8 /app-misc
parentadd ~arm, bug #379651 (diff)
downloadgentoo-2-0e5486799d6455832e2efcadf97b7b23323b2176.tar.gz
gentoo-2-0e5486799d6455832e2efcadf97b7b23323b2176.tar.bz2
gentoo-2-0e5486799d6455832e2efcadf97b7b23323b2176.zip
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
(Portage version: 2.2.01.19120-prefix/cvs/Darwin i386)
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/ca-certificates/ChangeLog10
-rw-r--r--app-misc/ca-certificates/ca-certificates-20110502-r3.ebuild93
2 files changed, 102 insertions, 1 deletions
diff --git a/app-misc/ca-certificates/ChangeLog b/app-misc/ca-certificates/ChangeLog
index ec74b1ef0b11..c47b9949a313 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-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/ca-certificates-20110502-r3.ebuild b/app-misc/ca-certificates/ca-certificates-20110502-r3.ebuild
new file mode 100644
index 000000000000..a46f012aeedb
--- /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
+}