From 4bb7bd9cdd42f57229fedf5169bc31d7297de504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 22 Apr 2019 00:31:28 +0200 Subject: [PATCH] Update repositories to R4.1 --- archlinux/PKGBUILD | 2 +- ...-4.0.conf => PKGBUILD-qubes-repo-4.1.conf} | 2 +- misc/qubes-r4.list.in | 32 +++++++++---------- misc/qubes-r4.repo.in | 24 +++++++------- 4 files changed, 30 insertions(+), 30 deletions(-) rename archlinux/{PKGBUILD-qubes-repo-4.0.conf => PKGBUILD-qubes-repo-4.1.conf} (81%) diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index ac641ac..ab6a0db 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -23,7 +23,7 @@ source=( PKGBUILD.qubes-ensure-lib-modules.service PKGBUILD.qubes-update-desktop-icons.hook PKGBUILD-qubes-pacman-options.conf PKGBUILD-qubes-repo-3.2.conf - PKGBUILD-qubes-repo-4.0.conf + PKGBUILD-qubes-repo-4.1.conf PKGBUILD-keyring-keys PKGBUILD-keyring-trusted PKGBUILD-keyring-revoked diff --git a/archlinux/PKGBUILD-qubes-repo-4.0.conf b/archlinux/PKGBUILD-qubes-repo-4.1.conf similarity index 81% rename from archlinux/PKGBUILD-qubes-repo-4.0.conf rename to archlinux/PKGBUILD-qubes-repo-4.1.conf index 3c02cfb..bee5f87 100644 --- a/archlinux/PKGBUILD-qubes-repo-4.0.conf +++ b/archlinux/PKGBUILD-qubes-repo-4.1.conf @@ -1,2 +1,2 @@ -[qubes-r4.0] +[qubes-r4.1] Server = http://olivier.medoc.free.fr/archlinux/current diff --git a/misc/qubes-r4.list.in b/misc/qubes-r4.list.in index 0609ac1..1e1a186 100644 --- a/misc/qubes-r4.list.in +++ b/misc/qubes-r4.list.in @@ -1,34 +1,34 @@ # Main qubes updates repository -deb [arch=amd64] https://deb.qubes-os.org/r4.0/vm @DIST@ main -#deb-src https://deb.qubes-os.org/r4.0/vm @DIST@ main +deb [arch=amd64] https://deb.qubes-os.org/r4.1/vm @DIST@ main +#deb-src https://deb.qubes-os.org/r4.1/vm @DIST@ main # Qubes updates candidates repository -#deb [arch=amd64] https://deb.qubes-os.org/r4.0/vm @DIST@-testing main -#deb-src https://deb.qubes-os.org/r4.0/vm @DIST@-testing main +#deb [arch=amd64] https://deb.qubes-os.org/r4.1/vm @DIST@-testing main +#deb-src https://deb.qubes-os.org/r4.1/vm @DIST@-testing main # Qubes security updates testing repository -#deb [arch=amd64] https://deb.qubes-os.org/r4.0/vm @DIST@-securitytesting main -#deb-src https://deb.qubes-os.org/r4.0/vm @DIST@-securitytesting main +#deb [arch=amd64] https://deb.qubes-os.org/r4.1/vm @DIST@-securitytesting main +#deb-src https://deb.qubes-os.org/r4.1/vm @DIST@-securitytesting main # Qubes experimental/unstable repository -#deb [arch=amd64] https://deb.qubes-os.org/r4.0/vm @DIST@-unstable main -#deb-src https://deb.qubes-os.org/r4.0/vm @DIST@-unstable main +#deb [arch=amd64] https://deb.qubes-os.org/r4.1/vm @DIST@-unstable main +#deb-src https://deb.qubes-os.org/r4.1/vm @DIST@-unstable main # Qubes Tor updates repositories # Main qubes updates repository -#deb [arch=amd64] http://deb.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.0/vm @DIST@ main -#deb-src http://deb.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.0/vm @DIST@ main +#deb [arch=amd64] http://deb.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.1/vm @DIST@ main +#deb-src http://deb.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.1/vm @DIST@ main # Qubes updates candidates repository -#deb [arch=amd64] http://deb.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.0/vm @DIST@-testing main -#deb-src http://deb.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.0/vm @DIST@-testing main +#deb [arch=amd64] http://deb.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.1/vm @DIST@-testing main +#deb-src http://deb.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.1/vm @DIST@-testing main # Qubes security updates testing repository -#deb [arch=amd64] http://deb.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.0/vm @DIST@-securitytesting main -#deb-src http://deb.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.0/vm @DIST@-securitytesting main +#deb [arch=amd64] http://deb.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.1/vm @DIST@-securitytesting main +#deb-src http://deb.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.1/vm @DIST@-securitytesting main # Qubes experimental/unstable repository -#deb [arch=amd64] http://deb.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.0/vm @DIST@-unstable main -#deb-src http://deb.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.0/vm @DIST@-unstable main +#deb [arch=amd64] http://deb.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.1/vm @DIST@-unstable main +#deb-src http://deb.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.1/vm @DIST@-unstable main diff --git a/misc/qubes-r4.repo.in b/misc/qubes-r4.repo.in index aecd8b2..6305d1a 100644 --- a/misc/qubes-r4.repo.in +++ b/misc/qubes-r4.repo.in @@ -1,34 +1,34 @@ -[qubes-vm-r4.0-current] +[qubes-vm-r4.1-current] name = Qubes OS Repository for VM (updates) -baseurl = https://yum.qubes-os.org/r4.0/current/vm/@DIST@$releasever -#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.0/current/vm/@DIST@$releasever +baseurl = https://yum.qubes-os.org/r4.1/current/vm/@DIST@$releasever +#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.1/current/vm/@DIST@$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] +[qubes-vm-r4.1-current-testing] name = Qubes OS Repository for VM (updates-testing) -baseurl = https://yum.qubes-os.org/r4.0/current-testing/vm/@DIST@$releasever -#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.0/current-testing/vm/@DIST@$releasever +baseurl = https://yum.qubes-os.org/r4.1/current-testing/vm/@DIST@$releasever +#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.1/current-testing/vm/@DIST@$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] +[qubes-vm-r4.1-security-testing] name = Qubes OS Repository for VM (security-testing) -baseurl = https://yum.qubes-os.org/r4.0/security-testing/vm/@DIST@$releasever -#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.0/security-testing/vm/@DIST@$releasever +baseurl = https://yum.qubes-os.org/r4.1/security-testing/vm/@DIST@$releasever +#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.1/security-testing/vm/@DIST@$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] +[qubes-vm-r4.1-unstable] name = Qubes OS Repository for VM (unstable) -baseurl = https://yum.qubes-os.org/r4.0/unstable/vm/@DIST@$releasever -#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.0/unstable/vm/@DIST@$releasever +baseurl = https://yum.qubes-os.org/r4.1/unstable/vm/@DIST@$releasever +#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.1/unstable/vm/@DIST@$releasever gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4-unstable gpgcheck = 1 enabled=0