From f4be704ac0b5f13292acd6471d9423e20431ec05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 13 Jun 2017 11:38:49 +0200 Subject: [PATCH] Ship Qubes 4.0 repository definition and keys --- Makefile | 4 +-- debian/qubes-core-agent.install | 2 +- misc/RPM-GPG-KEY-qubes-3-primary | 40 ------------------------------ misc/RPM-GPG-KEY-qubes-3-unstable | 29 ---------------------- misc/RPM-GPG-KEY-qubes-4-primary | 39 +++++++++++++++++++++++++++++ misc/RPM-GPG-KEY-qubes-4-unstable | 29 ++++++++++++++++++++++ misc/qubes-archive-keyring.gpg | Bin 1137 -> 1142 bytes misc/qubes-r3.list.in | 15 ----------- misc/qubes-r3.repo | 31 ----------------------- misc/qubes-r4.list.in | 15 +++++++++++ misc/qubes-r4.repo | 31 +++++++++++++++++++++++ rpm_spec/core-agent.spec | 2 +- 12 files changed, 118 insertions(+), 119 deletions(-) delete mode 100644 misc/RPM-GPG-KEY-qubes-3-primary delete mode 100644 misc/RPM-GPG-KEY-qubes-3-unstable create mode 100644 misc/RPM-GPG-KEY-qubes-4-primary create mode 100644 misc/RPM-GPG-KEY-qubes-4-unstable delete mode 100644 misc/qubes-r3.list.in delete mode 100644 misc/qubes-r3.repo create mode 100644 misc/qubes-r4.list.in create mode 100644 misc/qubes-r4.repo diff --git a/Makefile b/Makefile index 26fc053..4c9a795 100644 --- a/Makefile +++ b/Makefile @@ -142,7 +142,7 @@ install-sysvinit: install-init install network/qubes-iptables $(DESTDIR)/etc/init.d/ install-rh: install-systemd install-systemd-dropins install-sysvinit - install -D -m 0644 misc/qubes-r3.repo $(DESTDIR)/etc/yum.repos.d/qubes-r3.repo + install -D -m 0644 misc/qubes-r4.repo $(DESTDIR)/etc/yum.repos.d/qubes-r4.repo install -d $(DESTDIR)$(LIBDIR)/yum-plugins/ install -m 0644 misc/yum-qubes-hooks.py* $(DESTDIR)$(LIBDIR)/yum-plugins/ install -D -m 0644 misc/yum-qubes-hooks.conf $(DESTDIR)/etc/yum/pluginconf.d/yum-qubes-hooks.conf @@ -306,7 +306,7 @@ endif install-deb: install-common install-systemd install-systemd-dropins mkdir -p $(DESTDIR)/etc/apt/sources.list.d - sed -e "s/@DIST@/`lsb_release -cs`/" misc/qubes-r3.list.in > $(DESTDIR)/etc/apt/sources.list.d/qubes-r3.list + sed -e "s/@DIST@/`lsb_release -cs`/" misc/qubes-r4.list.in > $(DESTDIR)/etc/apt/sources.list.d/qubes-r4.list install -D -m 644 misc/qubes-archive-keyring.gpg $(DESTDIR)/etc/apt/trusted.gpg.d/qubes-archive-keyring.gpg install -D -m 644 network/00notify-hook $(DESTDIR)/etc/apt/apt.conf.d/00notify-hook install -d $(DESTDIR)/etc/sysctl.d diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install index d5abfb6..d0118c7 100644 --- a/debian/qubes-core-agent.install +++ b/debian/qubes-core-agent.install @@ -1,6 +1,6 @@ etc/X11/xorg-preload-apps.conf etc/apt/apt.conf.d/00notify-hook -etc/apt/sources.list.d/qubes-r3.list +etc/apt/sources.list.d/qubes-r4.list etc/apt/trusted.gpg.d/qubes-archive-keyring.gpg etc/default/grub.d/30-qubes.cfg etc/fstab diff --git a/misc/RPM-GPG-KEY-qubes-3-primary b/misc/RPM-GPG-KEY-qubes-3-primary deleted file mode 100644 index 66751ab..0000000 --- a/misc/RPM-GPG-KEY-qubes-3-primary +++ /dev/null @@ -1,40 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 - -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 -=idYC ------END PGP PUBLIC KEY BLOCK----- diff --git a/misc/RPM-GPG-KEY-qubes-3-unstable b/misc/RPM-GPG-KEY-qubes-3-unstable deleted file mode 100644 index 622dd4f..0000000 --- a/misc/RPM-GPG-KEY-qubes-3-unstable +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 - -mQINBFRuA2sBEACjOSNmDK6g6vpirgy0mRbRORP44eI0R45JN3oSGgsmCD5jJSTo -RRUE1RknbK26+bjnsKAKwpP67CA3So/5sa4l7i7G4xJdgVZooM3ZTK7ubQCqkMYB -h4yYTBAtt7vi6olhKvEkCvhzozcUa4/qW/NuIuTCpF0G0kBUWyqqYQzwtWD5QimE -6NjbxjuKf0P0KtzUvF2SdNYh87kXUj+6+RcA6VxjsLY3gSWnl+786L4yKUekRjB7 -JvD9yMd1V+U/P1MUamJFyn68Aih6dRi17/ZvHKHY0gj6k6acE34Oy6SDmbwuWWeZ -jMpSACAHHhWJID0wwrig3ZsxV4lGWoND/n+OSmEyWg4J8dB1thZpoBgjL05prBgC -oygzwyHlyewVqdtdjMJOSSk34pehQ35lPQ9XqASnF1igQaVTKFxUIg1eoaQMZibd -dSJzEcwuFUeJ1S22lyUdtaC/WdGb5vvHSEDiOA/3Ll0gpaHm2tor08J0s9C6CD2Q -irF/FwUu52yO/bNtOkXunX5G2Ua+c49o3D6bvc+mfBY4EVKN5k6URW+vy47gJDbH -4CVcxgBRoFy8SdAogqf/H/4+UOAR5jo5QLzsRq0mRHRbleLHwyH5PQxF9M73UVgL -J5OohzOoThyiWbIesjyFw9aiC1Dk9l6ugprPTAS6LPNpxNaByNlpbX/eJQARAQAB -tCdRdWJlcyBPUyBSZWxlYXNlIDMgVW5zdGFibGUgU2lnbmluZyBLZXmJAjgEEwEC -ACIFAlRuA2sCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEJP+RAmjx3Ot -WFMP/1y98l3kXaIUIXZFjdtCmiZvFZKETP5S/81Rn32PISSs5TklxWbt6B3rNY67 -ovtK10qJXxarLeu0+IR+UM+AV1R/OvT3qtrJuvbbr0vIyy0RONaapoPIdI2eD2FC -E/7JTv7KibKSE4nI9W9ZdRboJB1MPigffBR7qAC2ReCGtyKVUWRCKh57aQqbSDkZ -AruTV1gXbFDusuKh1kQ2zVXFMn9KU98Qv0nKewjndNwnfOk7UFdsTkRCEyHr19wx -KOuoLH4bfCyV8dEfriM5d6ABjmpv0Olp9XFT5YznoxrsXAjO0aUIBiNYYTk5vRLG -ixBJGRjruDUzCZ8gIObIEwfAJsJ4LsFZ5LI0csF2uNueeogmNm0LfejyrWBlyRfW -XdM5WP9vAbWectxNfaW84pPkvAEaer2W+x9ddO+FirTPNgU0M55JxcjKve8XsbuK -iOA80h8eiMuukn2CDENVG9g7hiui9YzcenQKzmZIYYARWPzSKRyRrMFWrhDjOZ+R -sG2PKzuJVIatGqhzqjD4CmoMPkVDli9p1ADOJLMJu062D53aWjgVi6DFHt5cZmFx -rvDPiLqy/uuWWSDaDgX36KEenvwzQLjlEdTrN8a3qiBMxeceLWFLQqAknQnmU19/ -HcyP+lX0FzFFm1yIB/aEQpcXsfJcil0Dg6zAeFbXxdQYWlVm -=7CDU ------END PGP PUBLIC KEY BLOCK----- diff --git a/misc/RPM-GPG-KEY-qubes-4-primary b/misc/RPM-GPG-KEY-qubes-4-primary new file mode 100644 index 0000000..f39a58c --- /dev/null +++ b/misc/RPM-GPG-KEY-qubes-4-primary @@ -0,0 +1,39 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=d8U3 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/misc/RPM-GPG-KEY-qubes-4-unstable b/misc/RPM-GPG-KEY-qubes-4-unstable new file mode 100644 index 0000000..7b120fe --- /dev/null +++ b/misc/RPM-GPG-KEY-qubes-4-unstable @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2 + +mQINBFk/KJsBEADR8mS6Z0NYFnY99BdaYN2Hng2IYIc56qMr+OpdwnriiGZhnd9m +LyL/HJoFpg+kqdZyI9u31kAzXb2GbaCc75O46T1QckrlTInQns889k43vxRHIZCe +KhIAakexLI1MynUIZtwB23pSeNrfIpkNMY2VwE6wrY57fSnb3+67/Jj7spVoMekw +2M6U3cbzB7ijBECmzvRCnF2X0qs0r3qyaneunkCUPHbhM6/EUim722efMzVDu43Z +XEIC3Vw/ydWk2ulyHEdK8ZZ8OfyiMEWvUFm1yvFDr4jS3Wl0bHYs4kGozlu9xGDz +MO9966awBW4yCIl5XzIR2qcYdeDZmNysbafOkmcB8ObRkOAZeGjCpJBs0mgpMSfN +ZXAQFw/COw7yyPH2GLxIOPYLYHzM0XkOPIvl5vl9F2pLT2x9emIR1D8lgqdNMIhW +4eIcw50jS1TjyBCcS4cgiiCHT+rdSp6u7GpqRfwQNXBHOGHptkLY+VrqwtJ+5ckG +oMIVKq/cLpHVe5usBiPs8v8uK0ufNvj3NmuAypwNsW49igLBOhIy8s9OjDnGtWfX +2NU/QXQm/IBAAzXZ0VKPl9U4rAaidpJt991OZ+D2BAwZn2Go/vUPWi6/IqAvaE7g +vZjBW7Hucpd6h26lEAIdzFqgym6yqCdQxdaOn9pP1qzRplUXqo9DAH2i5QARAQAB +tCdRdWJlcyBPUyBSZWxlYXNlIDQgVW5zdGFibGUgU2lnbmluZyBLZXmJAjcEEwEI +ACEFAlk/KJsCGwMFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQevnGU3u23ofo +4g//Tmjw09UAL0uV/Oyjz1C0JBWQ7T7rt63L5KQ2S0DRjEykBJnZ8MPkYb0oXjOh +SAqhJdA0Exjo+OIyofpLkT/Sjz02qE4auQni9aUYr6IqfLmOaQHkCxq8MNhSyu8s +T7zTLPcP8JO86U0lWZ0n2k5fAyZKFqKIBQJAOGg1M3W4m0jIhNK5VCNLGCxyDvZJ +kmh4STQdQWA5pu6dw8ruwhfWUPKXUVJttWWXTJd+MDR5Q/QNNATsK+123zmjqB85 +Wz1H6f4aGXrJGkz8Ize22H+56mxZ/B7ZFRAeKZwH1wXRg8mE33k77aJW0QrIbc7Y +TVeZBTs38AxiG+0fiFTdZWmknkJ9YEcTMYtYlUrxpqaPjw1x8tLKd/mo/A7yvdo8 +XzvRs04aXVGS65jYS9rA4uTKXJ3q/pKouPLQT4GEcnDWWP63un3Ku6iSVyWWnOS6 +xJbFo1pgoSpNqjVh+oL3qU88nbN7KGaSua9FsAJknKzvzZheLqvrBddEFUvELGwx +bbXzzwocIISe9m3NZnOMdjAGjmoukwCVFEFeq/9ieLRe5wcbKNg8pogiQRt8Izar +lsSbtUT0s8X4EmD+61/g6nu8+RcNeYPrWqB4KMbYPiz30qsiP7XoTNVJYDxjU5md +6watPaYvxmqnXkjdwM4Zpaq3cs3YZcMyqp/y2eus89EmDIY= +=ShJt +-----END PGP PUBLIC KEY BLOCK----- diff --git a/misc/qubes-archive-keyring.gpg b/misc/qubes-archive-keyring.gpg index f8e60d27cae6263c1a685a55cfb49c50b4c1b868..7a2d634b3ea4a2afc0dd687cb6f883c910097416 100644 GIT binary patch delta 1130 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 diff --git a/misc/qubes-r3.list.in b/misc/qubes-r3.list.in deleted file mode 100644 index 205b588..0000000 --- a/misc/qubes-r3.list.in +++ /dev/null @@ -1,15 +0,0 @@ -# Main qubes updates repository -deb [arch=amd64] http://deb.qubes-os.org/r3.2/vm @DIST@ main -#deb-src http://deb.qubes-os.org/r3.2/vm @DIST@ main - -# Qubes updates candidates repository -#deb [arch=amd64] http://deb.qubes-os.org/r3.2/vm @DIST@-testing main -#deb-src http://deb.qubes-os.org/r3.2/vm @DIST@-testing main - -# Qubes security updates testing repository -#deb [arch=amd64] http://deb.qubes-os.org/r3.2/vm @DIST@-securitytesting main -#deb-src http://deb.qubes-os.org/r3.2/vm @DIST@-securitytesting main - -# Qubes experimental/unstable repository -#deb [arch=amd64] http://deb.qubes-os.org/r3.2/vm @DIST@-unstable main -#deb-src http://deb.qubes-os.org/r3.2/vm @DIST@-unstable main diff --git a/misc/qubes-r3.repo b/misc/qubes-r3.repo deleted file mode 100644 index d352a7f..0000000 --- a/misc/qubes-r3.repo +++ /dev/null @@ -1,31 +0,0 @@ -[qubes-vm-r3.2-current] -name = Qubes OS Repository for VM (updates) -baseurl = http://yum.qubes-os.org/r3.2/current/vm/fc$releasever -gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-3-primary -skip_if_unavailable=False -gpgcheck = 1 -enabled=1 - -[qubes-vm-r3.2-current-testing] -name = Qubes OS Repository for VM (updates-testing) -baseurl = http://yum.qubes-os.org/r3.2/current-testing/vm/fc$releasever -gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-3-primary -skip_if_unavailable=False -gpgcheck = 1 -enabled=0 - -[qubes-vm-r3.2-security-testing] -name = Qubes OS Repository for VM (security-testing) -baseurl = http://yum.qubes-os.org/r3.2/security-testing/vm/fc$releasever -gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-3-primary -skip_if_unavailable=False -gpgcheck = 1 -enabled=0 - -[qubes-vm-r3.2-unstable] -name = Qubes OS Repository for VM (unstable) -baseurl = http://yum.qubes-os.org/r3.2/unstable/vm/fc$releasever -gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-3-unstable -gpgcheck = 1 -enabled=0 - diff --git a/misc/qubes-r4.list.in b/misc/qubes-r4.list.in new file mode 100644 index 0000000..2766d18 --- /dev/null +++ b/misc/qubes-r4.list.in @@ -0,0 +1,15 @@ +# Main qubes updates repository +deb [arch=amd64] http://deb.qubes-os.org/r4.0/vm @DIST@ main +#deb-src http://deb.qubes-os.org/r4.0/vm @DIST@ main + +# Qubes updates candidates repository +#deb [arch=amd64] http://deb.qubes-os.org/r4.0/vm @DIST@-testing main +#deb-src http://deb.qubes-os.org/r4.0/vm @DIST@-testing main + +# Qubes security updates testing repository +#deb [arch=amd64] http://deb.qubes-os.org/r4.0/vm @DIST@-securitytesting main +#deb-src http://deb.qubes-os.org/r4.0/vm @DIST@-securitytesting main + +# Qubes experimental/unstable repository +#deb [arch=amd64] http://deb.qubes-os.org/r4.0/vm @DIST@-unstable main +#deb-src http://deb.qubes-os.org/r4.0/vm @DIST@-unstable main diff --git a/misc/qubes-r4.repo b/misc/qubes-r4.repo new file mode 100644 index 0000000..92aa78f --- /dev/null +++ b/misc/qubes-r4.repo @@ -0,0 +1,31 @@ +[qubes-vm-r4.0-current] +name = Qubes OS Repository for VM (updates) +baseurl = http://yum.qubes-os.org/r4.0/current/vm/fc$releasever +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4-primary +skip_if_unavailable=False +gpgcheck = 1 +enabled=1 + +[qubes-vm-r4.0-current-testing] +name = Qubes OS Repository for VM (updates-testing) +baseurl = http://yum.qubes-os.org/r4.0/current-testing/vm/fc$releasever +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4-primary +skip_if_unavailable=False +gpgcheck = 1 +enabled=0 + +[qubes-vm-r4.0-security-testing] +name = Qubes OS Repository for VM (security-testing) +baseurl = http://yum.qubes-os.org/r4.0/security-testing/vm/fc$releasever +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4-primary +skip_if_unavailable=False +gpgcheck = 1 +enabled=0 + +[qubes-vm-r4.0-unstable] +name = Qubes OS Repository for VM (unstable) +baseurl = http://yum.qubes-os.org/r4.0/unstable/vm/fc$releasever +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4-unstable +gpgcheck = 1 +enabled=0 + diff --git a/rpm_spec/core-agent.spec b/rpm_spec/core-agent.spec index bc83a72..8261183 100644 --- a/rpm_spec/core-agent.spec +++ b/rpm_spec/core-agent.spec @@ -534,7 +534,7 @@ rm -f %{name}-%{version} %config(noreplace) /etc/udev/rules.d/50-qubes-misc.rules %config(noreplace) /etc/qubes-suspend-module-blacklist %config(noreplace) /etc/yum.conf.d/qubes-proxy.conf -%config(noreplace) /etc/yum.repos.d/qubes-r3.repo +%config(noreplace) /etc/yum.repos.d/qubes-r4.repo /etc/yum/pluginconf.d/yum-qubes-hooks.conf %config(noreplace) /etc/dnf/plugins/qubes-hooks.conf %if %{fedora} < 22