diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2018-08-03 04:03:15 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2018-08-03 04:16:58 +0200 |
| commit | 11a46d9043be9d955c87f6db5b99d2464de6460d (patch) | |
| tree | bf6a37fc7e279e948e7fbee0f4c931622d6891f5 | |
| parent | 8f9434f8329acf44122b85c400ef7db378facef3 (diff) | |
| download | tde-packaging-11a46d9043be9d955c87f6db5b99d2464de6460d.tar.gz tde-packaging-11a46d9043be9d955c87f6db5b99d2464de6460d.zip | |
DEB trinity-keyring: Key is installed as file into /etc/apt/trusted.gpg.d
instead of adding into apt keyring
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 8b0882da7e9f22c630bcfe41a9125ecb048a92ee)
4 files changed, 34 insertions, 59 deletions
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/postinst b/ubuntu/maverick/metapackages/trinity-keyring/debian/postinst deleted file mode 100644 index 1da9ae7ae..000000000 --- a/ubuntu/maverick/metapackages/trinity-keyring/debian/postinst +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# postinst script for trinity-keyring - -set -e - -case "$1" in - configure) - if [ -x /usr/bin/apt-key ]; then - # Key F5CFC95C (2014.06.08) - apt-key add /usr/share/keyrings/trinity-keyring.gpg > /dev/null - - # Key 2B8638D0 (2010.06.15) - apt-key del 2B8638D0 2> /dev/null || true - fi - ;; - - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/preinst b/ubuntu/maverick/metapackages/trinity-keyring/debian/preinst new file mode 100644 index 000000000..53c7d0cbc --- /dev/null +++ b/ubuntu/maverick/metapackages/trinity-keyring/debian/preinst @@ -0,0 +1,29 @@ +#! /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 diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/prerm b/ubuntu/maverick/metapackages/trinity-keyring/debian/prerm deleted file mode 100644 index 5b746100f..000000000 --- a/ubuntu/maverick/metapackages/trinity-keyring/debian/prerm +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# prerm script for trinity-keyring - -set -e - -case "$1" in - remove) - if [ -x /usr/bin/apt-key ]; then - # Key F5CFC95C (2014.06.08) - apt-key del F5CFC95C 2> /dev/null || true - fi - ;; - - upgrade|failed-upgrade|deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/rules b/ubuntu/maverick/metapackages/trinity-keyring/debian/rules index 9f50d61b6..e2df3ba49 100755 --- a/ubuntu/maverick/metapackages/trinity-keyring/debian/rules +++ b/ubuntu/maverick/metapackages/trinity-keyring/debian/rules @@ -26,3 +26,8 @@ clean:: binary-install/trinity-keyring:: dh_testdir + mkdir -p debian/$(cdbs_curpkg)/etc/apt/trusted.gpg.d + gpg --output debian/$(cdbs_curpkg)/etc/apt/trusted.gpg.d/$(cdbs_curpkg).gpg \ + --dearmor keyrings/$(cdbs_curpkg).gpg + touch -r keyrings/$(cdbs_curpkg).gpg \ + debian/$(cdbs_curpkg)/etc/apt/trusted.gpg.d/$(cdbs_curpkg).gpg |