From 48239fa489e484fa61b584940780de16346ec8b6 Mon Sep 17 00:00:00 2001 From: Ladar Levison Date: Mon, 23 Oct 2023 20:55:53 -0500 Subject: [PATCH] Fixed the FreeBSD archive location. --- http/generic.freebsd11.vagrant.cfg | 2 +- http/generic.hardenedbsd11.vagrant.cfg | 2 +- http/magma.freebsd11.vagrant.cfg | 2 +- robox.sh | 12 ++++++------ scripts/dragonflybsd5/vmware.sh | 2 +- scripts/freebsd11/pkg.sh | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/http/generic.freebsd11.vagrant.cfg b/http/generic.freebsd11.vagrant.cfg index d60852096..dd8305231 100644 --- a/http/generic.freebsd11.vagrant.cfg +++ b/http/generic.freebsd11.vagrant.cfg @@ -25,7 +25,7 @@ nameserver 208.67.220.220 EOF mkdir -p /usr/local/etc/pkg/repos -echo 'FreeBSD: { url: "pkg+http://mirrors.lavabit.com/freebsd-packages/FreeBSD%3A11%3Aamd64/latest/" }' > /usr/local/etc/pkg/repos/FreeBSD.conf +echo 'FreeBSD: { url: "pkg+http://mirrors.lavabit.com/freebsd-archive/FreeBSD%3A11%3Aamd64/latest/" }' > /usr/local/etc/pkg/repos/FreeBSD.conf ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install sed ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install curl diff --git a/http/generic.hardenedbsd11.vagrant.cfg b/http/generic.hardenedbsd11.vagrant.cfg index a90b614fd..87db82ead 100644 --- a/http/generic.hardenedbsd11.vagrant.cfg +++ b/http/generic.hardenedbsd11.vagrant.cfg @@ -24,7 +24,7 @@ nameserver 208.67.220.220 EOF mkdir -p /usr/local/etc/pkg/repos -echo 'HardenedBSD: { url: "pkg+http://mirrors.lavabit.com/freebsd-packages/FreeBSD%3A11%3Aamd64/latest/" }' > /usr/local/etc/pkg/repos/FreeBSD.conf +echo 'HardenedBSD: { url: "pkg+http://mirrors.lavabit.com/freebsd-archive/FreeBSD%3A11%3Aamd64/latest/" }' > /usr/local/etc/pkg/repos/FreeBSD.conf ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install sed ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install curl diff --git a/http/magma.freebsd11.vagrant.cfg b/http/magma.freebsd11.vagrant.cfg index 78d3f9a0a..311879d80 100644 --- a/http/magma.freebsd11.vagrant.cfg +++ b/http/magma.freebsd11.vagrant.cfg @@ -25,7 +25,7 @@ nameserver 208.67.220.220 EOF mkdir -p /usr/local/etc/pkg/repos -echo 'FreeBSD: { url: "pkg+http://mirrors.lavabit.com/freebsd-packages/FreeBSD%3A11%3Aamd64/latest/" }' > /usr/local/etc/pkg/repos/FreeBSD.conf +echo 'FreeBSD: { url: "pkg+http://mirrors.lavabit.com/freebsd-archive/FreeBSD%3A11%3Aamd64/latest/" }' > /usr/local/etc/pkg/repos/FreeBSD.conf ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install sed ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install curl diff --git a/robox.sh b/robox.sh index ca352827d..2ed8ed4ea 100755 --- a/robox.sh +++ b/robox.sh @@ -269,10 +269,10 @@ REPOS+=( "https://ftp.debian.org/debian/dists/trixie/InRelease" ) REPOS+=( "https://security.debian.org/debian-security/dists/trixie-security/updates/Release" ) # FreeBSD 11 -REPOS+=( "https://mirrors.lavabit.com/freebsd-packages/FreeBSD:11:amd64/latest/packagesite.txz" ) +REPOS+=( "https://mirrors.lavabit.com/freebsd-archive/FreeBSD:11:amd64/latest/packagesite.txz" ) # FreeBSD 12 -REPOS+=( "https://mirrors.lavabit.com/freebsd-packages/FreeBSD:12:amd64/latest/packagesite.txz" ) +REPOS+=( "https://mirrors.lavabit.com/freebsd-archive/FreeBSD:12:amd64/latest/packagesite.txz" ) # FreeBSD 13 REPOS+=( "https://pkg.freebsd.org/FreeBSD:13:amd64/latest/packagesite.txz" ) @@ -326,10 +326,10 @@ FUTURE+=( "https://dl.fedoraproject.org/pub/fedora/linux/releases/40/Server/x86_ FUTURE+=( "https://dl.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/repodata/repomd.xml" ) # FreeBSD 11 -REPOS+=( "https://mirrors.lavabit.com/freebsd-packages/FreeBSD:11:amd64/latest/packagesite.txz" ) +REPOS+=( "https://mirrors.lavabit.com/freebsd-archive/FreeBSD:11:amd64/latest/packagesite.txz" ) # FreeBSD 12 -REPOS+=( "https://mirrors.lavabit.com/freebsd-packages/FreeBSD:12:amd64/latest/packagesite.txz" ) +REPOS+=( "https://mirrors.lavabit.com/freebsd-archive/FreeBSD:12:amd64/latest/packagesite.txz" ) # FreeBSD 13 REPOS+=( "https://pkg.freebsd.org/FreeBSD:13:amd64/latest/packagesite.txz" ) @@ -346,7 +346,7 @@ REPOS+=( "https://mirrors.kernel.org/gentoo/snapshots/portage-latest.tar.xz.gpgs REPOS+=( "https://mirrors.kernel.org/gentoo/snapshots/portage-latest.tar.xz.md5sum" ) # HardenedBSD 12 -REPOS+=( "https://mirrors.lavabit.com/freebsd-packages/FreeBSD:12:amd64/latest/packagesite.txz" ) +REPOS+=( "https://mirrors.lavabit.com/freebsd-archive/FreeBSD:12:amd64/latest/packagesite.txz" ) # HardenedBSD 13 REPOS+=( "https://pkg.hardenedbsd.org/HardenedBSD/pkg/FreeBSD:13:amd64/packagesite.txz" ) @@ -559,7 +559,7 @@ RESOURCES+=( "https://files.pythonhosted.org/packages/97/8d/77b8cedcfbf936761485 RESOURCES+=( "https://files.pythonhosted.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/enum34-1.1.6.tar.gz" ) RESOURCES+=( "https://files.pythonhosted.org/packages/e7/a7/4cd50e57cc6f436f1cc3a7e8fa700ff9b8b4d471620629074913e3735fb2/cffi-1.11.5.tar.gz" ) RESOURCES+=( "http://archive.debian.org/debian/pool/main/libj/libjpeg-turbo/libjpeg62-turbo_1.5.1-2_amd64.deb" ) -RESOURCES+=( "https://mirrors.lavabit.com/freebsd-packages/FreeBSD:11:amd64/latest/All/open-vm-tools-nox11-11.3.0,2.pkg" ) +RESOURCES+=( "https://mirrors.lavabit.com/freebsd-archive/FreeBSD:11:amd64/latest/All/open-vm-tools-nox11-11.3.0,2.pkg" ) RESOURCES+=( "https://raw.githubusercontent.com/curl/curl/85f91248cffb22d151d5983c32f0dbf6b1de572a/lib/mk-ca-bundle.pl" ) RESOURCES+=( "https://sourceware.org/pub/valgrind/valgrind-3.15.0.tar.bz2" ) RESOURCES+=( "https://storage.googleapis.com/git-repo-downloads/repo" ) diff --git a/scripts/dragonflybsd5/vmware.sh b/scripts/dragonflybsd5/vmware.sh index b1cc4b2ba..d7c160428 100644 --- a/scripts/dragonflybsd5/vmware.sh +++ b/scripts/dragonflybsd5/vmware.sh @@ -14,7 +14,7 @@ if [[ `dmidecode -s system-product-name` != "VMware Virtual Platform" ]]; then fi # Dpownload the FreeBSD package beacause Dragonfly doesn't have one. -curl -o open-vm-tools-nox11-11.3.0.pkg "https://mirrors.lavabit.com/freebsd-packages/FreeBSD:11:amd64/latest/All/open-vm-tools-nox11-11.3.0,2.pkg" +curl -o open-vm-tools-nox11-11.3.0.pkg "https://mirrors.lavabit.com/freebsd-archive/FreeBSD:11:amd64/latest/All/open-vm-tools-nox11-11.3.0,2.pkg" # Fuse libraries are required. pkg-static install --yes fuse fuse-utils diff --git a/scripts/freebsd11/pkg.sh b/scripts/freebsd11/pkg.sh index 8b8bd2137..9fd6c0f9f 100644 --- a/scripts/freebsd11/pkg.sh +++ b/scripts/freebsd11/pkg.sh @@ -9,7 +9,7 @@ export ASSUME_ALWAYS_YES=yes mkdir -p /usr/local/etc/pkg/repos/ rm -f /var/db/pkg/FreeBSD.meta /var/db/pkg/repo-FreeBSD.sqlite /var/db/pkg/repo-FreeBSD.sqlite-journal # echo 'FreeBSD: { url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest/" }' > /usr/local/etc/pkg/repos/FreeBSD.conf -echo 'FreeBSD: { url: "pkg+http://mirrors.lavabit.com/freebsd-packages/${}/latest/" }' > /usr/local/etc/pkg/repos/FreeBSD.conf +echo 'FreeBSD: { url: "pkg+http://mirrors.lavabit.com/freebsd-archive/${}/latest/" }' > /usr/local/etc/pkg/repos/FreeBSD.conf # Install the packages needed to update the CA bundle. pkg bootstrap @@ -35,7 +35,7 @@ rm $HOME/ca-bundle.crt $HOME/certdata.txt $HOME/mk-ca-bundle.pl /var/db/pkg/Free # Switch to using HTTPS and perform the system upgrade. rm -f /var/db/pkg/FreeBSD.meta /var/db/pkg/repo-FreeBSD.sqlite /var/db/pkg/repo-FreeBSD.sqlite-journal -echo 'FreeBSD: { url: "pkg+https://mirrors.lavabit.com/freebsd-packages/${ABI}/latest" }' > /usr/local/etc/pkg/repos/FreeBSD.conf +echo 'FreeBSD: { url: "pkg+https://mirrors.lavabit.com/freebsd-archive/${ABI}/latest" }' > /usr/local/etc/pkg/repos/FreeBSD.conf pkg-static update -f pkg-static upgrade --yes