Merge branch 'r4.1-repos'

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

archlinux/PKGBUILD-qubes-repo-4.0.conf → 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

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
 

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