commit 5a10107bce4c8d56dcc582ebace69a336a7367f2
parent d2e608f18f361334707f6b7c8b872b87c5f8f0c1
Author: Franco (nextime) Lanza <nextime@nexlab.it>
Date: Tue, 11 Oct 2016 15:23:57 +0200
Split keys and put the right one in /etc/apt/trusted.gpg.d
Diffstat:
8 files changed, 49 insertions(+), 35 deletions(-)
diff --git a/SHA512SUMS.txt.asc b/SHA512SUMS.txt.asc
@@ -1,21 +1,24 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-86fc41ed1397e14f2186cbb496e1392d795b2c577d13b9bb774d9c3cfb1d53e182bad32bc808e314c394b74cd4568a0d876823aba8931d618a4dae47075894f0 keyrings/devuan-keyring.gpg
+34ea84eb02420b74d78827f437ae7eebff52c9b7ae4f9a252a3bcd67465229e80fd3f2077156b19c298bf9b156debce009d4d290a5c8f6c938eab48f178f9bfe keyrings/devuan-archive-keyring.gpg
+5fe59b58082538f063f81d646f029d8bece92704eb36da8731d190d857160ee08ff39e0c48de59aa6c373f0ace2ec46a84e62699b7b9383ef63303ce4ab38f95 keyrings/devuan-keyring-2016-archive.gpg
+4cde5907e4743a02e2dd333db093e32ae03b0ff5a65867f0737126367c4cf87719e36248a714cc9c168f930773a2529f7fbb7ea43587054e7d6afd4d951a93e4 keyrings/devuan-keyring-2016-cdimage.gpg
+746faee3fae20a4898942d723e0b0442aaedcb375650c6603f541a208be3a7b60dc61248c98ba066e2a038d79beeda48aaa3dbdf84cbbada83fb9ad07a2cdf78 keyrings/devuan-keyring.gpg
cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e keyrings/devuan-removed-keys.gpg
-----BEGIN PGP SIGNATURE-----
-iQIcBAEBCAAGBQJX+227AAoJEChlXWDlX6uJexEP/RGknpesuTm9DW2eq7Px3s0W
-LPdQEPyQoNwRD+/8UglFjrvNSxgDzVeB+L5mp/szqxtwK17xOgnXIoGa8WzySiqw
-Dn42r2g5feLKYk4g5Pd3M2AD665D7f5aKU2nckRPfrgHLs01QAvCIy1Mw1EjJadH
-/1P20SRJySKs3xFrMSjPZFMEttoGpE+AWBT4qKBbvrUT/G1HVvfN29EDte1o6jBT
-ELw/Ba6JC5+96770/ZgAQWpw+fUGNaAhMYpZDJCecdpAhF2QHhg7rJq0cC4AYH/q
-xsN0YzsiZ8FMe5heC4yMMGYR/Kog/3z9JJLVPVt/MnFAOrXb04UvQ72rf0rPY/DM
-tJD0TxxM2ZoAdt4kdOSKnESaJcTPvUj4J0tUerRR8NXvegrEOMV2i0WsnARjiBQR
-cEixCmNtSKa1BwMPuDESPR/sRwm3UPjCPqlu+17Rrv2z/VT9WuYeB1wClksjq8tR
-MwuTZeXzTi93Y+iadprn9To8TGxY09HjDlx+f6Sq9uFp77s9w6AAoAz+m9YA7RoR
-47kJTrFe/YEXM4+6qXVVQJM5KlGZ6POBDfB9m6jmjWIkA/pBtRQtuSz/BRXu5ntl
-EBvflIWslJfil92ZymO/EYyIyeAgitif6hbWZrV1Hug2jBApYIck8aaUbNXnh+ui
-zHESRZKvGcNQCYkfGwRY
-=EiNR
+iQIcBAEBCAAGBQJX/OapAAoJEG8g6vZJpPzAjE8P/2gsNi1fE2ag5iUxZFZzEANh
+oG/6opc0AxOQpbXrwxvRRp/s0UTZDNr32IAE9cKLSng7qxsfWMPZITXr0BTPleOL
+KbZG44G+MUCKvZ0otx7JHJf8gFgtXQxvsp+LSyt/rvQsAB9Ny3PbJwM/HGSUkn3F
+i+AQGYTz6JFUZHMXMkUsfbNiOI7i6jSvVG/uVPXpWGepv987cRkw4eFIuCK0kXH1
+op1x7HFga6iTxbOJjoDVlUTKjmbnTdyw5shjLPcQ4HdfewigJRWxPmnnjwSiVKEz
+ARUulvVCsID+KYJ6fAJXDTBCwrION5fI/QTv5W0URAKZzShElUUXXMg1KCLgYgmR
+duDguppaqG1t6HxuKr8sLxJhL+eAI1EzWNu/9Z9J79ER0o2KR4GkWNRdZsYAN0rR
+/0YgMBrUzCflW3M08vpsVlS4XV4UGnCyukkbXGn8+Qx7zqA+NbGxdG+LCVRN1RK5
+VDplK/qIMQZf9p6gTv7JHQe3mUZpC78QrpYokXUpRwHW6+vDPDhl7qY4OL3LJJ1i
+josVrxE2Y2s3kXyDLavSMBFAt+3fL2VNPhFAiuDNjfkNpOFVef+Gg/3bTtfaFjZF
+XVEBcNVzRDL2Gwpk+8wBa2+2rOMU5smxf8EDuIrQXnvDDmvrsqyS7S1VQRFAStVg
+WXmYKAI0UI9wo+zz2+AD
+=4Cta
-----END PGP SIGNATURE-----
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+devuan-keyring (2016.10.11) unstable; urgency=medium
+
+ * split keys, put archive keys in /etc/apt/trusted.gpg.d
+ * update Franco (nextime) Lanza keys
+
+ -- Franco (nextime) Lanza <nextime@devuan.org> Tue, 11 Oct 2016 15:21:38 +0200
+
devuan-keyring (2016.10.10) unstable; urgency=medium
* Removed apt-key dependency
diff --git a/debian/rules b/debian/rules
@@ -32,6 +32,10 @@ binary-indep: checkroot
$(install_dir) debian/tmp/usr/share/keyrings/
$(install_file) keyrings/devuan-keyring.gpg debian/tmp/usr/share/keyrings/
+ $(install_dir) debian/tmp/etc/apt/trusted.gpg.d/
+ $(install_file) keyrings/devuan-keyring-2016-archive.gpg debian/tmp/etc/apt/trusted.gpg.d/
+ $(install_file) keyrings/devuan-keyring-2016-cdimage.gpg debian/tmp/etc/apt/trusted.gpg.d/
+
$(install_dir) debian/tmp/usr/share/doc/devuan-keyring/
$(install_file) README.md debian/tmp/usr/share/doc/devuan-keyring/
$(install_file) debian/changelog debian/tmp/usr/share/doc/devuan-keyring/changelog
@@ -51,6 +55,8 @@ binary-indep: checkroot
$(install_file) keyrings/devuan-keyring.gpg debian/devuan-keyring-udeb/usr/share/keyrings/
install -m 755 debian/devuan-keyring-udeb.postinst debian/devuan-keyring-udeb/DEBIAN/postinst
+
+
# Don't let dpkg-gencontrol write incorrect guesses to debian/files.
# Instead, register the udeb manually.
dpkg-gencontrol -ndevuan-keyring-udeb_$(VERSION)_all.udeb -pdevuan-keyring-udeb -Tdebian/devuan-keyring-udeb.substvars -Pdebian/devuan-keyring-udeb -isp
@@ -73,15 +79,13 @@ checkroot:
test root = "`whoami`"
regenerate-key-fragments:
- rm -f keyrings/ubuntu-keyring-*.gpg
- gpg --no-default-keyring --keyring ./keyrings/ubuntu-archive-keyring.gpg --output keyrings/ubuntu-keyring-2004-archive.gpg --export 0x630239CC130E1A7FD81A27B140976EAF437D05B5
- gpg --no-default-keyring --keyring ./keyrings/ubuntu-archive-keyring.gpg --output keyrings/ubuntu-keyring-2004-cdimage.gpg --export 0xC5986B4F1257FFA86632CBA746181433FBB75451
- gpg --no-default-keyring --keyring ./keyrings/ubuntu-archive-keyring.gpg --output keyrings/ubuntu-keyring-2012-archive.gpg --export 0x790BC7277767219C42C86F933B4FE6ACC0B21F32
- gpg --no-default-keyring --keyring ./keyrings/ubuntu-archive-keyring.gpg --output keyrings/ubuntu-keyring-2012-cdimage.gpg --export 0x843938DF228D22F7B3742BC0D94AA3F0EFE21092
+ rm -f keyrings/devuan-keyring-*.gpg
+ gpg --no-default-keyring --keyring ./keyrings/devuan-archive-keyring.gpg --output keyrings/devuan-keyring-2016-archive.gpg --export 0x72E3CB773315DFA2E464743D94532124541922FB
+ gpg --no-default-keyring --keyring ./keyrings/devuan-archive-keyring.gpg --output keyrings/devuan-keyring-2016-cdimage.gpg --export 0xCF1921B2D91C6435848E810099C46A90B1FB3B59
sha512sum keyrings/*.gpg | gpg --clearsign > SHA512SUMS.txt.asc
checkkeyrings:
- gpg --no-default-keyring --keyring /usr/share/keyrings/debian-keyring.gpg --decrypt SHA512SUMS.txt.asc | sha512sum -c -
- gpg --no-default-keyring --keyring /usr/share/keyrings/debian-keyring.gpg --decrypt md5sums.txt | md5sum -c -
+ gpg --no-default-keyring --keyring /usr/share/keyrings/devuan-keyring.gpg --decrypt SHA512SUMS.txt.asc | sha512sum -c -
+ gpg --no-default-keyring --keyring /usr/share/keyrings/devuan-keyring.gpg --decrypt md5sums.txt | md5sum -c -
.PHONY: binary binary-arch binary-indep clean checkroot build
diff --git a/keyrings/devuan-archive-keyring.gpg b/keyrings/devuan-archive-keyring.gpg
Binary files differ.
diff --git a/keyrings/devuan-keyring-2016-archive.gpg b/keyrings/devuan-keyring-2016-archive.gpg
Binary files differ.
diff --git a/keyrings/devuan-keyring-2016-cdimage.gpg b/keyrings/devuan-keyring-2016-cdimage.gpg
Binary files differ.
diff --git a/keyrings/devuan-keyring.gpg b/keyrings/devuan-keyring.gpg
Binary files differ.
diff --git a/md5sums.txt b/md5sums.txt
@@ -1,20 +1,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-7c9c6df47329d95ea2c79a403f313b40 keyrings/devuan-keyring.gpg
+a592455f23c5bb0c9e8efaef8b8dbf82 keyrings/devuan-keyring.gpg
-----BEGIN PGP SIGNATURE-----
-iQIcBAEBCAAGBQJX+21OAAoJEChlXWDlX6uJnJ0QAJOvMLUNBIYSWg5E560RDdy9
-on8+CmkaDIHi9FqqEl1QMHIJsZTfTcdTe88ohxgILkeDIYLtw5jeYHW80OiC2pDl
-N0OD9d+LbgLd1Efm9EMS7x2ye6OXLnbcJvHvVZr6E60iYRWf+Gy1HaBMFM5tuL+q
-/Qlj3Gw5QW9TNo3SHZL98231haYivzyVJubIt69kuiTDxQ/9YZ6hYnAw3ku/1z+p
-BWsxvp90eZlK2kSBSBHfgHqkNDSA9QSXZgVZ/W5uPmddDjZZqYp5DqpzEHrWaz34
-DkRXRWFZak43gs76Uy+zOeR0p/nsswD1gnfr2cdg+Em3EG48qoMc4b3mLtqMRLT/
-lLw9/5i6EIKtqPNP+Kt7wVTDiMZwFjffsZ3lVt6ikLstCJ07o7DKyvvNTSk/Bq4E
-bigc2V8XLLp456WGr2vUOKLd0FDBMD/QpV9Ez0/rQcZ6J+c2dFl/AjjaDfrOW9dW
-BeMhz0Q+SgQyuqjjxgML88Nl4NhBVRUKBX0IuccaemuUOo/x4zwbtcnifyMHZw9l
-U1auYqPG2RJHiXiJB19bCnKFPBHVyG3Df90gWleuKMqeWvIr5usfKWRvs1iuQ5Gc
-GaZJ/UoHhPlUVgSN5YbK1JGalBLe/fkkXAxLmpwf0uAmYLEiK86axvqOh/xUsWE+
-dpwmRA6WF/zdVV3Ez7O8
-=FIL0
+iQIcBAEBCAAGBQJX/ObdAAoJEG8g6vZJpPzAfCAP/14BmpxvxfMNmr42plZspNH+
+c50k+jeWAz49Ulz5wFBrPQ7+o7Eoucec8OFGBsOWeRsm3Dnw1HcngLU2s1Qag29i
+UoDVia958t4nBKemnSgWu/t8FF6MGmCeMrjzb63KnIBaClMpr7tWWf0BrGgUNF0O
+YWvZFRe9VNfixPAH0whicgO6a+CMD4JXjAyyMgyjmS5N0n3HsOJpWSYMVVXqwt43
+zOt7998koxwZl0pKD+ive4qJKMdGCXnKGn+rd325O+sOKuG72EkfNIpGIiekOprH
+WxF0gIP4Ht84HPvzpp+8nqbsdW/l3L29BoRJtayNDSiWa4UfLDQvZpIKssb2rHO1
+LjahVIOyQ2KFgVXRiutqCZRt+2psaIwwbPJneUuUAi4sUUElTChcisPJ2J5d8+Eo
+GM7JE0DLmc+DoWXlj3S8hItH0UW3xHwKEOI6bsmlasTmQFiVUUL08sUXSBN5w4Cq
+N1MG4CVJO8Arw/zD33maQ+katSGZg8n23aS7hZVx5og/o5cE0QJwt/bdEKWEF3K1
+TdmzZeKBUmZn1yM4/4zawKCtiGdoHphR1L4AWiEAP/3h2IUv8bxUM4fKR7cPaHsb
+oXZVVVy9Dw1xUmbThaeBE/Z2wIYEiPnVMfG59MlfenabefoEvgQk6O+DWa44Au8t
+pxkRcoHARz97tS6CyWOH
+=TgJr
-----END PGP SIGNATURE-----
