Use the code to remove the old keys the same as debian-archive-keyring.
Add package trinity-keyring-udeb, which could be suitable for the installer.
This resolves bug 3170.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 8eb14d9610
)
pull/92/head
parent
b493215bf0
commit
b41db7f878
@ -1,29 +0,0 @@
|
|||||||
#! /bin/sh
|
|
||||||
# preinst script for trinity-keyring
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
install|upgrade)
|
|
||||||
if [ ! -f /etc/apt/trusted.gpg.d/trinity-keyring.gpg ] &&
|
|
||||||
[ -f /etc/apt/trusted.gpg ]; then
|
|
||||||
# Remove key F5CFC95C (2014.06.08) from apt keyring
|
|
||||||
apt-key --keyring /etc/apt/trusted.gpg del F5CFC95C 2> /dev/null || true
|
|
||||||
|
|
||||||
# Remove key 2B8638D0 (2010.06.15) from apt keyring
|
|
||||||
apt-key --keyring /etc/apt/trusted.gpg del 2B8638D0 2> /dev/null || true
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
abort-upgrade)
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
echo "preinst called with unknown argument \`$1'" >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
#DEBHELPER#
|
|
||||||
|
|
||||||
exit 0
|
|
@ -0,0 +1 @@
|
|||||||
|
keyrings usr/share
|
@ -0,0 +1,34 @@
|
|||||||
|
#! /bin/sh
|
||||||
|
# preinst script for trinity-keyring
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
install|upgrade)
|
||||||
|
# remove keys from the trusted.gpg file as they are now shipped in fragment files in trusted.gpg.d
|
||||||
|
if dpkg --compare-versions "$2" 'lt' "2012.1" && which gpg > /dev/null && which apt-key > /dev/null; then
|
||||||
|
TRUSTEDFILE='/etc/apt/trusted.gpg'
|
||||||
|
eval $(apt-config shell TRUSTEDFILE Apt::GPGV::TrustedKeyring)
|
||||||
|
eval $(apt-config shell TRUSTEDFILE Dir::Etc::Trusted/f)
|
||||||
|
if [ -e "$TRUSTEDFILE" ]; then
|
||||||
|
# Key F5CFC95C - 2014.06.08
|
||||||
|
# Key 2B8638D0 - 2010.06.15
|
||||||
|
for KEY in F5CFC95C 2B8638D0; do
|
||||||
|
apt-key --keyring "$TRUSTEDFILE" del $KEY > /dev/null 2>&1 || :
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
|
||||||
|
abort-upgrade)
|
||||||
|
;;
|
||||||
|
|
||||||
|
*)
|
||||||
|
echo "preinst called with unknown argument \`$1'" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
#DEBHELPER#
|
||||||
|
|
||||||
|
exit 0
|
Loading…
Reference in new issue