From 21fdbc5b6a6b1f85ace87815400244f0836b3fa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 17 Jul 2023 17:04:06 +0200 Subject: [PATCH] debian: put keyring archive into version-specific file It will ease upgrades, as the key will differ between versions, so having different names allows shipping new keyring into older releases without conflicts. QubesOS/qubes-issues#7832 --- debian/qubes-core-agent.install | 1 + package-managers/Makefile | 4 ++- .../apt-qubes-archive-keyring-4.2.gpg | Bin 0 -> 1166 bytes .../apt-qubes-archive-keyring.gpg | Bin 1166 -> 33 bytes package-managers/apt-qubes-r4.list.in | 32 +++++++++--------- 5 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 package-managers/apt-qubes-archive-keyring-4.2.gpg mode change 100644 => 120000 package-managers/apt-qubes-archive-keyring.gpg diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install index 9c01ce7d7..6a82eaa6d 100644 --- a/debian/qubes-core-agent.install +++ b/debian/qubes-core-agent.install @@ -158,6 +158,7 @@ usr/lib/qubes/tinyproxy-wrapper usr/share/glib-2.0/schemas/* usr/share/kde4/services/*.desktop usr/share/keyrings/qubes-archive-keyring.gpg +usr/share/keyrings/qubes-archive-keyring-4.2.gpg usr/share/keyrings/qubes-ubuntu-archive-keyring.gpg usr/share/kservices5/ServiceMenus/*.desktop usr/share/applications/*.desktop diff --git a/package-managers/Makefile b/package-managers/Makefile index de2ed0b9f..acd9e0805 100644 --- a/package-managers/Makefile +++ b/package-managers/Makefile @@ -60,7 +60,9 @@ else sed "s/@DIST@/$(DIST)/" apt-qubes-r4.list.in \ > $(DESTDIR)$(APTCONFDIR)/sources.list.d/qubes-r4.list endif - install -D -m 0644 apt-qubes-archive-keyring.gpg \ + install -D -m 0644 apt-qubes-archive-keyring-4.2.gpg \ + $(DESTDIR)/usr/share/keyrings/qubes-archive-keyring-4.2.gpg + ln -s qubes-archive-keyring-4.2.gpg \ $(DESTDIR)/usr/share/keyrings/qubes-archive-keyring.gpg install -D -m 0644 apt-qubes-ubuntu-archive-keyring.gpg \ $(DESTDIR)/usr/share/keyrings/qubes-ubuntu-archive-keyring.gpg diff --git a/package-managers/apt-qubes-archive-keyring-4.2.gpg b/package-managers/apt-qubes-archive-keyring-4.2.gpg new file mode 100644 index 0000000000000000000000000000000000000000..70d8e6a8c87742bc11e339b39e1e7426ec98cbdf GIT binary patch literal 1166 zcmV;91abSB0u2OXJV{*v5CF#&ATj*-&fU$jI_&9$Yv76d|NEG}bmX8ejh&D2)vV|4 zoFt!1L7e{Hh%zk(=?fdO`FYy}b4xGm69rw-8+X3yJ7iK>64llA$rJm(Ng;zn;}Z_s zLQ?7kQGoAI8hPrcp*euQCtRrhC)t<7tF5)}N`rYE7_RFr@9B^9Vb$oS4yjWU*F|8qpJ zeMk%$8K_bn^2~g0Z{UD(e!`_))WRd^MUL_ z_B_Pz;htWqafSb(n@hw7FA^33u`NFLQ@S6!JG}e>E6a+m`eHLz?1hQqM{&!f+4bDi z*@~>gd9Xg044_tN+a1~O(+0(15Jjp%7fJiWRD~{q_;A&;3eM#^b}|JritP7|yhRVK zMbM(p^#TG;+2X)3@VtDZt!`xu{gr#9OxtQx{sjVKJV{*w8v_Lk2?z%Q z0wMwi6$%Lm3jzcd0s{d89tQ#!fB*^!5L>q#L>tQx{*ki}{vsPp1y$e!>r1(Vn;td6 z$>CXu#!{nRyPPChoUP`g`*gmcfER06g^>P>NlOsgB=V>iT%Z2V?hyCQ6 zzwH93a~HD?$F*-VUP>O5jv$y)vG%KukLX|7yBF84e}h;;$&i_U%3WYUS3mGT!txW~}C zpn7+v$=(o{GTC~`tDV8j556Ht&R1!^=%m_@xL+NB=KNICnFaeSO`(gSM+y@-k2||^ z!kN+fW2uYn@gVz#PBF3>c<2T$!l{$fx%A8kuEI7r@$PaHF%561TIX!#r1JEPy|mH3 z3d|>@s~Z3~`$`=CG3EC;)+OVukb4qz{1i16e5y64llA$rJm(Ng;zn;}Z_s zLQ?7kQGoAI8hPrcp*euQCtRrhC)t<7tF5)}N`rYE7_RFr@9B^9Vb$oS4yjWU*F|8qpJ zeMk%$8K_bn^2~g0Z{UD(e!`_))WRd^MUL_ z_B_Pz;htWqafSb(n@hw7FA^33u`NFLQ@S6!JG}e>E6a+m`eHLz?1hQqM{&!f+4bDi z*@~>gd9Xg044_tN+a1~O(+0(15Jjp%7fJiWRD~{q_;A&;3eM#^b}|JritP7|yhRVK zMbM(p^#TG;+2X)3@VtDZt!`xu{gr#9OxtQx{sjVKJV{*w8v_Lk2?z%Q z0wMwi6$%Lm3jzcd0s{d89tQ#!fB*^!5L>q#L>tQx{*ki}{vsPp1y$e!>r1(Vn;td6 z$>CXu#!{nRyPPChoUP`g`*gmcfER06g^>P>NlOsgB=V>iT%Z2V?hyCQ6 zzwH93a~HD?$F*-VUP>O5jv$y)vG%KukLX|7yBF84e}h;;$&i_U%3WYUS3mGT!txW~}C zpn7+v$=(o{GTC~`tDV8j556Ht&R1!^=%m_@xL+NB=KNICnFaeSO`(gSM+y@-k2||^ z!kN+fW2uYn@gVz#PBF3>c<2T$!l{$fx%A8kuEI7r@$PaHF%561TIX!#r1JEPy|mH3 z3d|>@s~Z3~`$`=CG3EC;)+OVukb4qz{1i16e5y