fix for bug #475352, remove broken symlinks

(Portage version: 2.2.8-r1/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key DD11F94A)

5 files changed, 26 insertions, 21 deletions

diff --git a/app-misc/ca-certificates/ChangeLog b/app-misc/ca-certificates/ChangeLog
index dd2ca8e548b3..61d31f18717e 100644
--- a/app-misc/ca-certificates/ChangeLog
+++ b/app-misc/ca-certificates/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-misc/ca-certificates
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.102 2014/03/22 09:34:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.103 2014/03/27 00:49:50 zerochaos Exp $
+
+*ca-certificates-20130906-r1 (27 Mar 2014)
+*ca-certificates-20140223.3.16-r1 (27 Mar 2014)
+*ca-certificates-20140223.3.15.5-r1 (27 Mar 2014)
+*ca-certificates-20140223-r1 (27 Mar 2014)
+
+  27 Mar 2014; Rick Farina <zerochaos@gentoo.org>
+  +ca-certificates-20130906-r1.ebuild, +ca-certificates-20140223-r1.ebuild,
+  +ca-certificates-20140223.3.15.5-r1.ebuild,
+  +ca-certificates-20140223.3.16-r1.ebuild, -ca-certificates-20130906.ebuild,
+  -ca-certificates-20140223.3.15.5.ebuild,
+  -ca-certificates-20140223.3.16.ebuild, -ca-certificates-20140223.ebuild:
+  fix for bug #475352, remove broken symlinks
 
 *ca-certificates-20140223.3.16 (22 Mar 2014)
 
diff --git a/app-misc/ca-certificates/ca-certificates-20130906.ebuild b/app-misc/ca-certificates/ca-certificates-20130906-r1.ebuild
index b661ec86e987..d5acb3f7ab00 100644
--- a/app-misc/ca-certificates/ca-certificates-20130906.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20130906-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20130906.ebuild,v 1.11 2014/03/19 07:46:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20130906-r1.ebuild,v 1.1 2014/03/27 00:49:50 zerochaos Exp $
 
 EAPI="4"
 
@@ -89,9 +89,7 @@ pkg_postinst() {
 		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 {} +"
+		ewarn "Removing the following broken symlinks:"
+		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
 	fi
 }
diff --git a/app-misc/ca-certificates/ca-certificates-20140223.ebuild b/app-misc/ca-certificates/ca-certificates-20140223-r1.ebuild
index e9acf8562aba..9e6fd4f0d319 100644
--- a/app-misc/ca-certificates/ca-certificates-20140223.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20140223-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20140223.ebuild,v 1.3 2014/03/21 23:09:20 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20140223-r1.ebuild,v 1.1 2014/03/27 00:49:50 zerochaos Exp $
 
 # The Debian ca-certificates package merely takes the CA database as it exists
 # in the nss package and repackages it for use by openssl.
@@ -172,9 +172,7 @@ pkg_postinst() {
 		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 {} +"
+		ewarn "Removing the following broken symlinks:"
+		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
 	fi
 }
diff --git a/app-misc/ca-certificates/ca-certificates-20140223.3.16.ebuild b/app-misc/ca-certificates/ca-certificates-20140223.3.15.5-r1.ebuild
index d1605d480801..26b90ee04500 100644
--- a/app-misc/ca-certificates/ca-certificates-20140223.3.16.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20140223.3.15.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20140223.3.16.ebuild,v 1.1 2014/03/22 09:34:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20140223.3.15.5-r1.ebuild,v 1.1 2014/03/27 00:49:50 zerochaos Exp $
 
 # The Debian ca-certificates package merely takes the CA database as it exists
 # in the nss package and repackages it for use by openssl.
@@ -178,9 +178,7 @@ pkg_postinst() {
 		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 {} +"
+		ewarn "Removing the following broken symlinks:"
+		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
 	fi
 }
diff --git a/app-misc/ca-certificates/ca-certificates-20140223.3.15.5.ebuild b/app-misc/ca-certificates/ca-certificates-20140223.3.16-r1.ebuild
index 452f5fda1061..2d55c6cc444d 100644
--- a/app-misc/ca-certificates/ca-certificates-20140223.3.15.5.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20140223.3.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20140223.3.15.5.ebuild,v 1.4 2014/03/21 23:09:20 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20140223.3.16-r1.ebuild,v 1.1 2014/03/27 00:49:50 zerochaos Exp $
 
 # The Debian ca-certificates package merely takes the CA database as it exists
 # in the nss package and repackages it for use by openssl.
@@ -178,9 +178,7 @@ pkg_postinst() {
 		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 {} +"
+		ewarn "Removing the following broken symlinks:"
+		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
 	fi
 }