use /etc/apt/trusted.gpg.d/ mechanism to install trusted apt keys

Also add Proxmox Virtual Environment 5.x Release Key

diff --git a/Makefile b/Makefile
index 1cd5ba19c0b18ce57bdc5381ba14ca6af98abc47..38df2ebb56baf9700a89180fd6c8deb5078f4a68 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -89,13 +89,18 @@ LINUX_TOOLS_DEB=${LINUX_TOOLS_PKG}_${KERNEL_VER}-${PKGREL}_amd64.deb
 
 DEBS=${DST_DEB} ${HDR_DEB} ${FW_DEB} ${PVE_DEB} ${VIRTUAL_HDR_DEB} ${LINUX_TOOLS_DEB}
 
+PVE_RELEASE_KEYS=                              \
+       proxmox-ve/proxmox-release-4.x.pubkey   \
+       proxmox-ve/proxmox-release-5.x.pubkey
+
 all: check_gcc ${DEBS}
 
-${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst
+${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst ${PVE_RELEASE_KEYS}
        rm -rf proxmox-ve/data
        mkdir -p proxmox-ve/data/DEBIAN
        mkdir -p proxmox-ve/data/usr/share/doc/${PVEPKG}/
-       install -m 0644 proxmox-ve/proxmox-release\@proxmox.com.pubkey proxmox-ve/data/usr/share/doc/${PVEPKG}
+       mkdir -p proxmox-ve/data/etc/apt/trusted.gpg.d
+       gpg2 --no-default-keyring --keyring ./proxmox-ve/data/etc/apt/trusted.gpg.d/proxmox-ve.gpg --import ${PVE_RELEASE_KEYS}
        sed -e 's/@KVNAME@/${KVNAME}/' -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@RELEASE@/${RELEASE}/' -e 's/@PKGREL@/${PKGREL}/' <proxmox-ve/control >proxmox-ve/data/DEBIAN/control
        sed -e 's/@KVNAME@/${KVNAME}/' <proxmox-ve/postinst >proxmox-ve/data/DEBIAN/postinst
        chmod 0755 proxmox-ve/data/DEBIAN/postinst

diff --git a/proxmox-ve/postinst b/proxmox-ve/postinst
index 78e97e9b125e18321cbdc28db5946555891a18d6..baf3d293c955241f401cebdd6b22464821faaff4 100755 (executable)
--- a/proxmox-ve/postinst
+++ b/proxmox-ve/postinst
@@ -16,9 +16,8 @@ case "$1" in
     # Configure this package.  If the package must prompt the user for
     # information, do it here.
 
-    # install release key
-    echo -n "installing proxmox release key: "
-    /usr/bin/apt-key add '/usr/share/doc/proxmox-ve/proxmox-release@proxmox.com.pubkey' || /bin/true
+    # cleanup - remove Proxmox Release Key key from /etc/apt/trusted.gpg
+    /usr/bin/apt-key --keyring /etc/apt/trusted.gpg del 9887F95A >/dev/null 2>&1 || /bin/true
 
     # setup kernel links for installation CD (rescue boot)
     mkdir -p /boot/pve

diff --git a/proxmox-ve/proxmox-release-4.x.pubkey b/proxmox-ve/proxmox-release-4.x.pubkey
new file mode 100644 (file)
index 0000000..816a8b8
--- /dev/null
+++ b/proxmox-ve/proxmox-release-4.x.pubkey
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+mQGiBEkGw8URBACes0Nn6KGrblcNfylEonfSuqEyCDz4P0SoPc09ieqhacdJYZZu
+gOJkdAQMESUvVG9S/KolkQI0eR3VqW5PxdC7Uon8lnLofy+iicJhaZvBQA8voOJ9
+Myv4SrrBPrsa64pLppZ2zYJ2Vj+x26tvYRG1L8G20FDKejnrcLmAOLz+twCgo5rj
+Lcyh1gGAE/ktluKIS6EpfmsEAJAjyiiDs2HZcBh7RrlV25kZEk7rwwrrMXmkGpBb
+iElZjbRY6cHl+IvwEHD89ShuADuiEOVMqQ8nSbaFQAblqBK+Q1klZUxmppw1UfG5
++x3X7MrULg0YAgAMqwBPgYrAYfV6tdzO3HY6dP5aRNBVYxCgvnXpHw4XW4GC8qRO
+NmBPBACLSxG4Q2md/6jHVnoQT4UsPA5Nn2imKsLqS62WQBQyM8W+LtlyxT+QAf+t
++D/XFv5ZUQQq766cR4WnmOkNLAqmFaSrUF2T58UPxOC6TsTkrFkI+kVJFqHedag2
+9n+EFXK/DzrsmElWiMyYuMYkOzNn/2cbYnpLq4zO5cwi7BNoRrQxUHJveG1veCBS
+ZWxlYXNlIEtleSA8cHJveG1veC1yZWxlYXNlQHByb3htb3guY29tPohgBBMRAgAg
+BQJJBsPFAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQwjrH9JiH+VqTLwCf
+TVzFdNADeZ00bKpyE8u4BHZJK+4AmwVbhpnb4EkSHYqNhrhEIVSynxm0uQINBEkG
+w8oQCAD323YC4+yp1fJGyI2o8GjnPWKRbmJPhoaeungGkFD0M2Ke2/NlgoQnwwyH
+FRCLxmjc48r++hlSN+OhVuGrvSl5mh0R3Tv5m17OD1KmkAMT9TcrZ7mqn2D79iv3
+TkO27Z76Rs+Wnfu/dc+85wCJDGx9oK8hmJTu6Qc62AkdVCfTULoKSQ3u7LFkGQP9
+I+wtOLnLIc8TpGNuwJ97gIAsfZEkbg3zS39loPwQdIV4b48Hfiz7uMEc4Zwx2bqL
++6sp1vK3jfr7Vb1vQyqG9pvDQ5LSbjh9PCCEmbLtyEIDx8hogNZ9M0ShgZzOwRj4
+vF/sdAdxIT4/7TlMi8jzZqFYSDN/AAMFCACBFBtH1KF45gt70BwgDDv+2zxCy3nP
+3kT2W2f2P3OzTSsu0HGGrIZFtllemAVv89sXlJvZEOzIDvWFizwTiaSW0orj1ni4
+Rz5tNIKnv2T1nJbKWnK7hKO+VKopSCADfFW4FxOwnkV1tV/k7WtCsP+y7X4b/9PA
+EFDYY81MZo3pXvvk989SmoNL2mAdcVYRn1vVCAsciVX6QZFuaupFl4J+57G0OO9P
+tNXn9Hesw7qMo0H52WLp/l8WOhKcghV3+2V4NgpPqZiWD0bOclSO41gmeRWyNo0h
+lVzmRVZF0Np9gXzIBVvaq3pHMglb8rOLm/AsNxgZlDe1PqJiSWFZR96EiEkEGBEC
+AAkFAkkGw8oCGwwACgkQwjrH9JiH+VrCsgCfQA5nxXoNgngILmP3+J6iazwbt48A
+njRGHVUQoR1WV2YlrbwONA2D5Epq
+=twvw
+-----END PGP PUBLIC KEY BLOCK-----

diff --git a/proxmox-ve/proxmox-release-5.x.pubkey b/proxmox-ve/proxmox-release-5.x.pubkey
new file mode 100644 (file)
index 0000000..e7002c9
--- /dev/null
+++ b/proxmox-ve/proxmox-release-5.x.pubkey
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+mQINBFfDyocBEADBqGXU2sVZeyJhjvcYHbkzcjfP9OKBgkPmpKNG8kP+fT+OsX8U
+FCAmIKXMOd/3fWhdSv7V2/3JaiEmsYn1a1vWhIlgFj2VonE/YS9JqqW7suodSon0
+b52XNwxRisOapU40EOUEjSGhoVUuvNNFkXImKEdtIgzVyyFCf2pj+TXBGWhOtCtK
+du/zctioq85HR3Zk1YokJCho4/uRU7bElmLNFHSmI7jAU33jmU6ZI3MpxTFq0bd5
++75IQYOQi4SLktE/xFZPaX54DlIzYCaVvjr57/DKOlwa4nnL0PGbfdS9rwBVxN1E
+VvRsLG3z0crtFtunpJxKN1TI4HM/vZzfvTt9FH38Xx1yhwlUZKqx42YCImYJSBY/
+mxx/XjVZqaGSqBoSLgI+zKmOPEoo6i2nhZhCrm/GuuEV+hP5MHch3YhqO2/xYcCP
+eeM9CU8ham84m9uCJ6ol8H0iiImztHXHCGWJ1AFq567NOXE407vQNpM2z49bNlR4
+QYvlXuvM0wJLKo+LFTftj6SjyweMdd3FRzxGUDQaG9YjpBe20etBS3ETTySiDnxN
+eLVRe2nKG+e36VugaELJ+T8GZlhT+2s34EPrS4WUdqpwsrIouMXPeMPp0z3VO/7A
+qyTlTK5TaDgLj+LQIZF9dI3aXDhH1Z9OKXsS2m7tSBJeBCY15jDFH9Og2wARAQAB
+tElQcm94bW94IFZpcnR1YWwgRW52aXJvbm1lbnQgNS54IFJlbGVhc2UgS2V5IDxw
+cm94bW94LXJlbGVhc2VAcHJveG1veC5jb20+iQI/BBMBCAApBQJXw8qHAhsDBQkS
+zAMABwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AACgkQDZoZUOLvBgM6RA/+KKtA
+TciGES4TEgsLuHPoM5E0X4JWhMq2jN6znmzo5kIVmHXEk4LxeeppMoICsc6DMoDL
+9n4M5m5YqlIYAs78SrxjSdDspPeV2/gPegDD/U8rx+OhGNBORpewSi9jq6iq/bWN
+kT2Pwvk/lmDmnHebtCWvxB2y0mkcaAw87w8c5xYgOnnL/slwcegUN7/m6pcien5b
+Ijixt75Kq3ol45y4QRnkYDnoejMnlinEB4U2qfdkiVxEpwLZ97ipKo+wIQ9tMqmk
+q8xVoT39+JJESBAaJO3P19NSJiLtNjkPpoNFNOYJRubY9wD9/2Q1jx7V04U/4zuh
+AppsFcGt/cn5K0Vy6KqPgUAyyMjRB/+MKpL/4zdFcpwy6gu7c0eqMdXw1lW9YYF0
+XQhhxVuet1xbVazIH4NgkwCJvOPVcJwILkmGorTtJPvHgS/V+NFYh3n6Q0GWY5gC
++dturtMnLxsi6GrE0mamqHuJ7mW3zli2zClURCJaePwdd8i+anZzQwT2wg3oXBtA
+gOZgeZFuC4OrGnfK5hj9n/LV1PjMwEmliiFDNRPOGDrmKbn7LBocem3ams0dKxfg
+Eh/97QpKJh15NM677TiQmzbFmBBPA5BPLRzPlVi4eemDyv5ggYdSckz+sCiUMzy3
+x7aL/VB66uF1IYQFp5/WeGRMOv3n3Bkq5S2aEO4=
+=hfNW
+-----END PGP PUBLIC KEY BLOCK-----

diff --git a/proxmox-ve/proxmox-release@proxmox.com.pubkey b/proxmox-ve/proxmox-release@proxmox.com.pubkey
deleted file mode 100644 (file)
index 816a8b8..0000000
--- a/proxmox-ve/proxmox-release@proxmox.com.pubkey
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-mQGiBEkGw8URBACes0Nn6KGrblcNfylEonfSuqEyCDz4P0SoPc09ieqhacdJYZZu
-gOJkdAQMESUvVG9S/KolkQI0eR3VqW5PxdC7Uon8lnLofy+iicJhaZvBQA8voOJ9
-Myv4SrrBPrsa64pLppZ2zYJ2Vj+x26tvYRG1L8G20FDKejnrcLmAOLz+twCgo5rj
-Lcyh1gGAE/ktluKIS6EpfmsEAJAjyiiDs2HZcBh7RrlV25kZEk7rwwrrMXmkGpBb
-iElZjbRY6cHl+IvwEHD89ShuADuiEOVMqQ8nSbaFQAblqBK+Q1klZUxmppw1UfG5
-+x3X7MrULg0YAgAMqwBPgYrAYfV6tdzO3HY6dP5aRNBVYxCgvnXpHw4XW4GC8qRO
-NmBPBACLSxG4Q2md/6jHVnoQT4UsPA5Nn2imKsLqS62WQBQyM8W+LtlyxT+QAf+t
-+D/XFv5ZUQQq766cR4WnmOkNLAqmFaSrUF2T58UPxOC6TsTkrFkI+kVJFqHedag2
-9n+EFXK/DzrsmElWiMyYuMYkOzNn/2cbYnpLq4zO5cwi7BNoRrQxUHJveG1veCBS
-ZWxlYXNlIEtleSA8cHJveG1veC1yZWxlYXNlQHByb3htb3guY29tPohgBBMRAgAg
-BQJJBsPFAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQwjrH9JiH+VqTLwCf
-TVzFdNADeZ00bKpyE8u4BHZJK+4AmwVbhpnb4EkSHYqNhrhEIVSynxm0uQINBEkG
-w8oQCAD323YC4+yp1fJGyI2o8GjnPWKRbmJPhoaeungGkFD0M2Ke2/NlgoQnwwyH
-FRCLxmjc48r++hlSN+OhVuGrvSl5mh0R3Tv5m17OD1KmkAMT9TcrZ7mqn2D79iv3
-TkO27Z76Rs+Wnfu/dc+85wCJDGx9oK8hmJTu6Qc62AkdVCfTULoKSQ3u7LFkGQP9
-I+wtOLnLIc8TpGNuwJ97gIAsfZEkbg3zS39loPwQdIV4b48Hfiz7uMEc4Zwx2bqL
-+6sp1vK3jfr7Vb1vQyqG9pvDQ5LSbjh9PCCEmbLtyEIDx8hogNZ9M0ShgZzOwRj4
-vF/sdAdxIT4/7TlMi8jzZqFYSDN/AAMFCACBFBtH1KF45gt70BwgDDv+2zxCy3nP
-3kT2W2f2P3OzTSsu0HGGrIZFtllemAVv89sXlJvZEOzIDvWFizwTiaSW0orj1ni4
-Rz5tNIKnv2T1nJbKWnK7hKO+VKopSCADfFW4FxOwnkV1tV/k7WtCsP+y7X4b/9PA
-EFDYY81MZo3pXvvk989SmoNL2mAdcVYRn1vVCAsciVX6QZFuaupFl4J+57G0OO9P
-tNXn9Hesw7qMo0H52WLp/l8WOhKcghV3+2V4NgpPqZiWD0bOclSO41gmeRWyNo0h
-lVzmRVZF0Np9gXzIBVvaq3pHMglb8rOLm/AsNxgZlDe1PqJiSWFZR96EiEkEGBEC
-AAkFAkkGw8oCGwwACgkQwjrH9JiH+VrCsgCfQA5nxXoNgngILmP3+J6iazwbt48A
-njRGHVUQoR1WV2YlrbwONA2D5Epq
-=twvw
------END PGP PUBLIC KEY BLOCK-----