From 21000e72887749a0d283586816e210e0dcc85d91 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Mon, 23 May 2022 21:08:02 -0500 Subject: [PATCH] various: change default repo to repo-fi.voidlinux.org --- .github/issue_template.md | 2 +- README.md | 2 +- common/travis/fetch-xbps.sh | 2 +- etc/xbps.d/repos-remote-aarch64-musl.conf | 6 +++--- etc/xbps.d/repos-remote-aarch64.conf | 6 +++--- etc/xbps.d/repos-remote-musl.conf | 6 +++--- etc/xbps.d/repos-remote-x86_64-multilib.conf | 4 ++-- etc/xbps.d/repos-remote.conf | 6 +++--- srcpkgs/9base/template | 2 +- srcpkgs/cargo-bootstrap/template | 2 +- srcpkgs/fastttyrec/template | 2 +- srcpkgs/ghc-bin/template | 12 ++++++------ srcpkgs/libfetch/template | 2 +- srcpkgs/lxc/files/lxc-void | 4 ++-- srcpkgs/rtmpdump/template | 2 +- srcpkgs/rust-bootstrap/template | 2 +- srcpkgs/rust/template | 2 +- srcpkgs/void-repo-multilib/template | 4 ++-- srcpkgs/void-repo-nonfree/template | 14 +++++++------- srcpkgs/xbps/template | 4 ++-- 20 files changed, 43 insertions(+), 43 deletions(-) diff --git a/.github/issue_template.md b/.github/issue_template.md index 10a72b0729c2..9ff1f8b4e5cf 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -1,4 +1,4 @@ - + ### System * xuname: diff --git a/README.md b/README.md index 7047a958b669..d2a682f7b48f 100644 --- a/README.md +++ b/README.md @@ -431,7 +431,7 @@ xbps-src can be used in any recent Linux distribution matching the CPU architect To use xbps-src in your Linux distribution use the following instructions. Let's start downloading the xbps static binaries: - $ wget http://alpha.de.repo.voidlinux.org/static/xbps-static-latest.-musl.tar.xz + $ wget http://repo-fi.voidlinux.org/static/xbps-static-latest.-musl.tar.xz $ mkdir ~/XBPS $ tar xvf xbps-static-latest.-musl.tar.xz -C ~/XBPS $ export PATH=~/XBPS/usr/bin:$PATH diff --git a/common/travis/fetch-xbps.sh b/common/travis/fetch-xbps.sh index 5a4e458cf565..5ffda1987e7a 100755 --- a/common/travis/fetch-xbps.sh +++ b/common/travis/fetch-xbps.sh @@ -7,7 +7,7 @@ TAR=tar command -v bsdtar >/dev/null && TAR=bsdtar ARCH=$(uname -m)-musl VERSION=0.59_5 -URL="https://alpha.de.repo.voidlinux.org/static/xbps-static-static-${VERSION}.${ARCH}.tar.xz" +URL="https://repo-fi.voidlinux.org/static/xbps-static-static-${VERSION}.${ARCH}.tar.xz" FILE=${URL##*/} mkdir -p /tmp/bin diff --git a/etc/xbps.d/repos-remote-aarch64-musl.conf b/etc/xbps.d/repos-remote-aarch64-musl.conf index 4c81aaa9aa8a..016129de3ed8 100644 --- a/etc/xbps.d/repos-remote-aarch64-musl.conf +++ b/etc/xbps.d/repos-remote-aarch64-musl.conf @@ -1,4 +1,4 @@ # aarch64 voidlinux remote repositories -repository=https://alpha.de.repo.voidlinux.org/current/aarch64 -repository=https://alpha.de.repo.voidlinux.org/current/aarch64/nonfree -repository=https://alpha.de.repo.voidlinux.org/current/aarch64/debug +repository=https://repo-fi.voidlinux.org/current/aarch64 +repository=https://repo-fi.voidlinux.org/current/aarch64/nonfree +repository=https://repo-fi.voidlinux.org/current/aarch64/debug diff --git a/etc/xbps.d/repos-remote-aarch64.conf b/etc/xbps.d/repos-remote-aarch64.conf index 4c81aaa9aa8a..016129de3ed8 100644 --- a/etc/xbps.d/repos-remote-aarch64.conf +++ b/etc/xbps.d/repos-remote-aarch64.conf @@ -1,4 +1,4 @@ # aarch64 voidlinux remote repositories -repository=https://alpha.de.repo.voidlinux.org/current/aarch64 -repository=https://alpha.de.repo.voidlinux.org/current/aarch64/nonfree -repository=https://alpha.de.repo.voidlinux.org/current/aarch64/debug +repository=https://repo-fi.voidlinux.org/current/aarch64 +repository=https://repo-fi.voidlinux.org/current/aarch64/nonfree +repository=https://repo-fi.voidlinux.org/current/aarch64/debug diff --git a/etc/xbps.d/repos-remote-musl.conf b/etc/xbps.d/repos-remote-musl.conf index b47df7393ab2..19505d554262 100644 --- a/etc/xbps.d/repos-remote-musl.conf +++ b/etc/xbps.d/repos-remote-musl.conf @@ -1,4 +1,4 @@ # voidlinux remote repositories (musl) -repository=https://alpha.de.repo.voidlinux.org/current/musl -repository=https://alpha.de.repo.voidlinux.org/current/musl/nonfree -repository=https://alpha.de.repo.voidlinux.org/current/musl/debug +repository=https://repo-fi.voidlinux.org/current/musl +repository=https://repo-fi.voidlinux.org/current/musl/nonfree +repository=https://repo-fi.voidlinux.org/current/musl/debug diff --git a/etc/xbps.d/repos-remote-x86_64-multilib.conf b/etc/xbps.d/repos-remote-x86_64-multilib.conf index e770aa1f4b5e..5154badc8f44 100644 --- a/etc/xbps.d/repos-remote-x86_64-multilib.conf +++ b/etc/xbps.d/repos-remote-x86_64-multilib.conf @@ -1,3 +1,3 @@ # voidlinux remote repositories (x86_64/glibc) -repository=https://alpha.de.repo.voidlinux.org/current/multilib -repository=https://alpha.de.repo.voidlinux.org/current/multilib/nonfree +repository=https://repo-fi.voidlinux.org/current/multilib +repository=https://repo-fi.voidlinux.org/current/multilib/nonfree diff --git a/etc/xbps.d/repos-remote.conf b/etc/xbps.d/repos-remote.conf index 47c867ecac01..b2ac04d4c199 100644 --- a/etc/xbps.d/repos-remote.conf +++ b/etc/xbps.d/repos-remote.conf @@ -1,4 +1,4 @@ # voidlinux remote repositories (glibc) -repository=https://alpha.de.repo.voidlinux.org/current -repository=https://alpha.de.repo.voidlinux.org/current/nonfree -repository=https://alpha.de.repo.voidlinux.org/current/debug +repository=https://repo-fi.voidlinux.org/current +repository=https://repo-fi.voidlinux.org/current/nonfree +repository=https://repo-fi.voidlinux.org/current/debug diff --git a/srcpkgs/9base/template b/srcpkgs/9base/template index e7cee72701f8..429f1a576494 100644 --- a/srcpkgs/9base/template +++ b/srcpkgs/9base/template @@ -13,7 +13,7 @@ license="custom:Plan9" homepage="http://git.suckless.org/9base" # Checked out from http://git.suckless.org/9base/ and created tarball with # git archive -o 9base-${_githash}.tar.gz --prefix=9base/ master . -distfiles="https://alpha.de.repo.voidlinux.org/distfiles/9base-${_githash}.tar.gz" +distfiles="https://repo-fi.voidlinux.org/distfiles/9base-${_githash}.tar.gz" checksum=b315509470c25db88595bd0e9478428dea54d7836fe2ba9d07279ae9496366fb conflicts="plan9port" provides="plan9port-20160418_4" diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template index e75f8763b5b8..b13373238e52 100644 --- a/srcpkgs/cargo-bootstrap/template +++ b/srcpkgs/cargo-bootstrap/template @@ -19,7 +19,7 @@ _bootver=1.57.0 case "$XBPS_TARGET_MACHINE" in x86_64*|i686|ppc64le) ;; *) - _bootstrap_url="https://alpha.de.repo.voidlinux.org/distfiles" + _bootstrap_url="https://repo-fi.voidlinux.org/distfiles" _bootver=${version} ;; esac diff --git a/srcpkgs/fastttyrec/template b/srcpkgs/fastttyrec/template index 237b8bcfd501..c8667d9f46c4 100644 --- a/srcpkgs/fastttyrec/template +++ b/srcpkgs/fastttyrec/template @@ -7,7 +7,7 @@ short_desc="Compress ttyrec recordings" maintainer="Andrew Benson " license="GPL-2.0-or-later" homepage="https://web.archive.org/web/20170709180030/http://www.phong.org/nethack/" -distfiles="https://alpha.de.repo.voidlinux.org/distfiles/${pkgname}-${version}.tar.bz2" +distfiles="https://repo-fi.voidlinux.org/distfiles/${pkgname}-${version}.tar.bz2" checksum=a366562d3a38220779f2da2d4d6ec4c868ab17d6530b9a37c4eb12499e1e911a do_install() { diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template index 21847afbecb5..b79f08e00b6f 100644 --- a/srcpkgs/ghc-bin/template +++ b/srcpkgs/ghc-bin/template @@ -21,7 +21,7 @@ x86_64) ;; x86_64-musl) # create with "make binary-dist" - distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz" + distfiles="https://repo-fi.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz" checksum=e21eaddeffcd5de7abe43b1f3982a3bc2c5b5f408d2574857cb2b0368106e12c ;; i686) @@ -29,24 +29,24 @@ i686) checksum=fdeb9f8928fbe994064778a8e1e85bb1a58a6cd3dd7b724fcc2a1dcfda6cad47 ;; ppc64le) - distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz" + distfiles="https://repo-fi.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz" checksum=7de8114c991f9a2a3b0f5e472da76e3956be6447efec4b1157f14e707049f22d ;; ppc64le-musl) - distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux-musl.tar.xz" + distfiles="https://repo-fi.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux-musl.tar.xz" checksum=37de8e069712307c9b2039e92f56e540e80ca1390dd27aa247ebe18c40e0c629 ;; ppc64) - distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64-void-linux.tar.xz" + distfiles="https://repo-fi.voidlinux.org/distfiles/ghc-${version}-powerpc64-void-linux.tar.xz" checksum=6eb8684fdbede0cded7e3f7b93574b968f5f66dd2fcd4ec30ac5f0c402af6602 ;; aarch64) - distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-aarch64-void-linux.tar.xz" + distfiles="https://repo-fi.voidlinux.org/distfiles/ghc-${version}-aarch64-void-linux.tar.xz" checksum=44a20a896246dce64392b7d0feedd0a28a9d733245a803e95dbe4b4b7e15b4fd depends+=" llvm" ;; aarch64-musl) - distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-aarch64-void-linux-musl.tar.xz" + distfiles="https://repo-fi.voidlinux.org/distfiles/ghc-${version}-aarch64-void-linux-musl.tar.xz" checksum=de98e2ff33a25cb32a28c738066fecacb736a33cac12688876eec4eb96d88607 depends+=" llvm" ;; diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template index 5522f74d617f..4e5f2e3eb2b1 100644 --- a/srcpkgs/libfetch/template +++ b/srcpkgs/libfetch/template @@ -8,7 +8,7 @@ short_desc="File Transfer Library for URLs" maintainer="Orphaned " license="BSD-3-Clause" homepage="https://www.NetBSD.org" -distfiles="https://alpha.de.repo.voidlinux.org/distfiles/libfetch-${version}.tar.xz" +distfiles="https://repo-fi.voidlinux.org/distfiles/libfetch-${version}.tar.xz" checksum=4e6d4541f213c9ab42ea94d49c2573f0a6f54b04f14668530960f1424b04f722 do_build() { diff --git a/srcpkgs/lxc/files/lxc-void b/srcpkgs/lxc/files/lxc-void index bcb1d244ca73..d22ad72e621e 100755 --- a/srcpkgs/lxc/files/lxc-void +++ b/srcpkgs/lxc/files/lxc-void @@ -154,7 +154,7 @@ EOF rm -f ${vkb64} mkdir -p ${rootfs}/usr/share/xbps.d - echo "repository=http://alpha.de.repo.voidlinux.org/current" > ${rootfs}/usr/share/xbps.d/00-repository-main.conf + echo "repository=http://repo-fi.voidlinux.org/current" > ${rootfs}/usr/share/xbps.d/00-repository-main.conf if ! xbps-install ${xbps_cachedir:+ -c $xbps_cachedir} \ ${xbps_config:+-C $xbps_config} -r "${rootfs}" \ @@ -232,7 +232,7 @@ fi type xbps-install >/dev/null 2>&1 if [ ${?} -ne 0 ]; then - echo "'xbps-install' command is missing, download xbps from http://alpha.de.repo.voidlinux.org/static/" + echo "'xbps-install' command is missing, download xbps from http://repo-fi.voidlinux.org/static/" exit 1 fi diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template index 561317d1e117..7f59cf7f1adf 100644 --- a/srcpkgs/rtmpdump/template +++ b/srcpkgs/rtmpdump/template @@ -9,7 +9,7 @@ short_desc="Toolkit for RTMP streams" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://rtmpdump.mplayerhq.hu/" -distfiles="https://alpha.de.repo.voidlinux.org/distfiles/${pkgname}-${version%.*}_p${_patchlevel}.tar.gz" +distfiles="https://repo-fi.voidlinux.org/distfiles/${pkgname}-${version%.*}_p${_patchlevel}.tar.gz" checksum=d6da3b683f1045f02d94a81b0c583318dba021f69bdab970c5d5d73e8c38860f CFLAGS="-Wno-unused-const-variable -Wno-unused-but-set-variable" diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template index bbedb66430b6..2327ed36fa2f 100644 --- a/srcpkgs/rust-bootstrap/template +++ b/srcpkgs/rust-bootstrap/template @@ -19,7 +19,7 @@ _bootstrap_url="https://static.rust-lang.org/dist" case "$XBPS_MACHINE" in x86_64*|i686|ppc64le|ppc) ;; - *) _bootstrap_url="https://alpha.de.repo.voidlinux.org/distfiles";; + *) _bootstrap_url="https://repo-fi.voidlinux.org/distfiles";; esac distfiles=" diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index 560a629f3da2..dd8f2f27ff77 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -5,7 +5,7 @@ # See: https://github.com/rust-lang/core-team/issues/4 # # Always make sure custom distfiles used for bootstrap are -# uploaded to https://alpha.de.repo.voidlinux.org/distfiles/ +# uploaded to https://repo-fi.voidlinux.org/distfiles/ # pkgname=rust version=1.57.0 diff --git a/srcpkgs/void-repo-multilib/template b/srcpkgs/void-repo-multilib/template index dc78ebcff773..7d8db0ad8f1a 100644 --- a/srcpkgs/void-repo-multilib/template +++ b/srcpkgs/void-repo-multilib/template @@ -1,7 +1,7 @@ # Template file for 'void-repo-multilib' pkgname=void-repo-multilib version=6 -revision=3 +revision=4 build_style=meta archs="x86_64" short_desc="Void Linux drop-in file for the multilib repository" @@ -12,7 +12,7 @@ homepage="http://www.voidlinux.org" do_install() { vmkdir usr/share/xbps.d for f in multilib multilib-nonfree; do - echo "repository=https://alpha.de.repo.voidlinux.org/current/${f/-/\/}" > \ + echo "repository=https://repo-fi.voidlinux.org/current/${f/-/\/}" > \ ${DESTDIR}/usr/share/xbps.d/10-repository-${f}.conf done } diff --git a/srcpkgs/void-repo-nonfree/template b/srcpkgs/void-repo-nonfree/template index bdab3342c5a0..5677e46bc5e7 100644 --- a/srcpkgs/void-repo-nonfree/template +++ b/srcpkgs/void-repo-nonfree/template @@ -1,7 +1,7 @@ # Template file for 'void-repo-nonfree' pkgname=void-repo-nonfree version=9 -revision=5 +revision=6 build_style=meta short_desc="Void Linux drop-in file for the nonfree repository" maintainer="Orphaned " @@ -12,21 +12,21 @@ do_install() { vmkdir usr/share/xbps.d case "$XBPS_TARGET_MACHINE" in aarch64*) - echo "repository=https://alpha.de.repo.voidlinux.org/current/aarch64/nonfree" > \ + echo "repository=https://repo-fi.voidlinux.org/current/aarch64/nonfree" > \ ${DESTDIR}/usr/share/xbps.d/10-repository-nonfree.conf - echo "repository=https://alpha.de.repo.voidlinux.org/current/aarch64/debug" > \ + echo "repository=https://repo-fi.voidlinux.org/current/aarch64/debug" > \ ${DESTDIR}/usr/share/xbps.d/20-repository-debug.conf ;; *-musl) - echo "repository=https://alpha.de.repo.voidlinux.org/current/musl/nonfree" > \ + echo "repository=https://repo-fi.voidlinux.org/current/musl/nonfree" > \ ${DESTDIR}/usr/share/xbps.d/10-repository-nonfree.conf - echo "repository=https://alpha.de.repo.voidlinux.org/current/musl/debug" > \ + echo "repository=https://repo-fi.voidlinux.org/current/musl/debug" > \ ${DESTDIR}/usr/share/xbps.d/20-repository-debug.conf ;; *) - echo "repository=https://alpha.de.repo.voidlinux.org/current/nonfree" > \ + echo "repository=https://repo-fi.voidlinux.org/current/nonfree" > \ ${DESTDIR}/usr/share/xbps.d/10-repository-nonfree.conf - echo "repository=https://alpha.de.repo.voidlinux.org/current/debug" > \ + echo "repository=https://repo-fi.voidlinux.org/current/debug" > \ ${DESTDIR}/usr/share/xbps.d/20-repository-debug.conf ;; esac diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index 8f986d22f9f3..cb2e5258fa51 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,7 +1,7 @@ # Template file for 'xbps' pkgname=xbps version=0.59.1 -revision=5 +revision=6 bootstrap=yes build_style=configure short_desc="XBPS package system utilities" @@ -35,7 +35,7 @@ do_configure() { } post_install() { - local repo="https://alpha.de.repo.voidlinux.org/current" suffix= + local repo="https://repo-fi.voidlinux.org/current" suffix= case "$XBPS_TARGET_MACHINE" in aarch64*) suffix="/aarch64";; *-musl) suffix="/musl";;