Kentaro Hayashi
null+****@clear*****
Sun Aug 12 23:41:01 JST 2018
Kentaro Hayashi 2018-08-12 23:41:01 +0900 (Sun, 12 Aug 2018) New Revision: cf3c9d79c178ff372b134c5e4db633297e3c6ae8 https://github.com/groonga/groonga/commit/cf3c9d79c178ff372b134c5e4db633297e3c6ae8 Message: packages apt: put keyring to /etc/apt/trusted.gpg.d/ Instead of adding key manually to trusted.gpg by apt-key command, just put groonga keyring under /etc/apt/trusted.gpg.d/. Modified files: packages/apt/debian/groonga-keyring.install packages/apt/debian/groonga-keyring.postinst packages/apt/debian/rules Modified: packages/apt/debian/groonga-keyring.install (+1 -1) =================================================================== --- packages/apt/debian/groonga-keyring.install 2018-08-12 23:40:16 +0900 (a068a88bf) +++ packages/apt/debian/groonga-keyring.install 2018-08-12 23:41:01 +0900 (9a70dcf76) @@ -1 +1 @@ -usr/share/keyrings/* +etc/apt/trusted.gpg.d/* Modified: packages/apt/debian/groonga-keyring.postinst (+1 -4) =================================================================== --- packages/apt/debian/groonga-keyring.postinst 2018-08-12 23:40:16 +0900 (7ec4890da) +++ packages/apt/debian/groonga-keyring.postinst 2018-08-12 23:41:01 +0900 (7cdb6f543) @@ -6,10 +6,7 @@ prevver="$2" case "$1" in configure) - if [ -x /usr/bin/apt-key ]; then - apt-key add /usr/share/keyrings/groonga-keyring.gpg - apt-key add /usr/share/keyrings/groonga-keyring-rsa4096.gpg - fi + : ;; abort-upgrade|abort-deconfigure|abort-remove) : Modified: packages/apt/debian/rules (+10 -5) =================================================================== --- packages/apt/debian/rules 2018-08-12 23:40:16 +0900 (39c865962) +++ packages/apt/debian/rules 2018-08-12 23:41:01 +0900 (cb4fbeddd) @@ -10,10 +10,15 @@ export DH_OPTIONS dh $@ override_dh_install: - install -d debian/tmp/usr/share/keyrings/ - install -m 0644 groonga-keyring.gpg \ - debian/tmp/usr/share/keyrings/ - install -m 0644 groonga-keyring-rsa4096.gpg \ - debian/tmp/usr/share/keyrings/ + touch keyring.gpg + gpg --no-default-keyring \ + --keyring ./keyring.gpg \ + --import groonga-keyring.gpg + gpg --no-default-keyring \ + --keyring ./keyring.gpg \ + --import groonga-keyring-rsa4096.gpg + install -d debian/tmp/etc/apt/trusted.gpg.d/ + install -m 0644 keyring.gpg \ + debian/tmp/etc/apt/trusted.gpg.d/groonga-keyring.gpg dh_install -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20180812/b421f9c6/attachment-0001.htm
