summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/gnupg/ChangeLog6
-rw-r--r--app-crypt/gnupg/gnupg-2.1.0.ebuild12
2 files changed, 13 insertions, 5 deletions
diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 09854e5b5a35..2da26ca6663a 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-crypt/gnupg
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.556 2014/11/08 23:19:32 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.557 2014/11/09 01:07:33 k_f Exp $
+
+ 09 Nov 2014; Kristian Fiskerstrand <k_f@gentoo.org> gnupg-2.1.0.ebuild:
+ Add info on secret key migration and remove invalid symlinks for keyserver
+ helpers replaced by dirmngr
08 Nov 2014; Kristian Fiskerstrand <k_f@gentoo.org> gnupg-2.1.0.ebuild:
Bump min requirement to 1.6.2 as a precautionary measure as some users of
diff --git a/app-crypt/gnupg/gnupg-2.1.0.ebuild b/app-crypt/gnupg/gnupg-2.1.0.ebuild
index 17820e3b65c3..17053f31f9b7 100644
--- a/app-crypt/gnupg/gnupg-2.1.0.ebuild
+++ b/app-crypt/gnupg/gnupg-2.1.0.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-crypt/gnupg/gnupg-2.1.0.ebuild,v 1.2 2014/11/08 23:19:32 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.1.0.ebuild,v 1.3 2014/11/09 01:07:33 k_f Exp $
EAPI="5"
@@ -124,9 +124,6 @@ src_install() {
dosym gpg2 /usr/bin/gpg
dosym gpgv2 /usr/bin/gpgv
- dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
- dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
- dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
@@ -160,4 +157,11 @@ pkg_postinst() {
ewarn "of the agent is currently used. If you are unsure of the gpg"
ewarn "agent you are using please run 'killall gpg-agent',"
ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
+
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ elog "If upgrading from a version prior than 2.1 you will have to re-import"
+ elog "secret keys after restarting the gpg-agent as the new version is using"
+ elog "a new storage mechanism."
+ elog "You can migrate the keys using gpg --import $HOME/.gnupg/secring.gpg"
+ fi
}