From fc89a66dc77c03d018885b7c884fd972fdb61961 Mon Sep 17 00:00:00 2001 From: Mrityunjay Raj Date: Sun, 15 Feb 2026 23:34:46 +0530 Subject: [PATCH] upgrade http:// URLs to https:// and remove dead librelist.com link, fixes #9342 --- .github/workflows/ci.yml | 2 +- Vagrantfile | 2 +- docs/global.rst.inc | 3 +-- docs/internals/data-structures.rst | 4 ++-- src/borg/archiver/_common.py | 2 +- src/borg/helpers/fs.py | 4 ++-- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f9590cff..338dae804 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -485,7 +485,7 @@ jobs: netbsd) arch="$(uname -m)" sudo -E mkdir -p /usr/pkg/etc/pkgin - echo "http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/${arch}/10.1/All" | sudo tee /usr/pkg/etc/pkgin/repositories.conf > /dev/null + echo "https://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/${arch}/10.1/All" | sudo tee /usr/pkg/etc/pkgin/repositories.conf > /dev/null sudo -E pkgin update sudo -E pkgin -y upgrade sudo -E pkgin -y install zstd lz4 xxhash git diff --git a/Vagrantfile b/Vagrantfile index e1904c7ae..578700821 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -97,7 +97,7 @@ end def packages_netbsd return <<-EOF - echo 'http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$arch/9.3/All' > /usr/pkg/etc/pkgin/repositories.conf + echo 'https://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$arch/9.3/All' > /usr/pkg/etc/pkgin/repositories.conf pkgin update pkgin -y upgrade pkg_add zstd lz4 xxhash git diff --git a/docs/global.rst.inc b/docs/global.rst.inc index 1568458d6..308fd9d58 100644 --- a/docs/global.rst.inc +++ b/docs/global.rst.inc @@ -26,6 +26,5 @@ .. _mfusepy: https://pypi.org/project/mfusepy/ .. _pyfuse3: https://pypi.org/project/pyfuse3/ .. _userspace filesystems: https://en.wikipedia.org/wiki/Filesystem_in_Userspace -.. _Cython: http://cython.org/ +.. _Cython: https://cython.org/ .. _virtualenv: https://pypi.org/project/virtualenv/ -.. _mailing list discussion about internals: http://librelist.com/browser/attic/2014/5/6/questions-and-suggestions-about-inner-working-of-attic> diff --git a/docs/internals/data-structures.rst b/docs/internals/data-structures.rst index f621def4e..05a4166cb 100644 --- a/docs/internals/data-structures.rst +++ b/docs/internals/data-structures.rst @@ -7,8 +7,8 @@ Data structures and file formats ================================ This page documents the internal data structures and storage -mechanisms of Borg. It is partly based on `mailing list -discussion about internals`_ and also on static code analysis. +mechanisms of Borg. It is partly based on mailing list +discussions and also on static code analysis. .. todo:: Clarify terms, perhaps create a glossary. ID (client?) vs. key (repository?), diff --git a/src/borg/archiver/_common.py b/src/borg/archiver/_common.py index b072fd03b..673e53d41 100644 --- a/src/borg/archiver/_common.py +++ b/src/borg/archiver/_common.py @@ -298,7 +298,7 @@ def define_exclude_and_patterns(add_option, *, tag_files=False, strip_components "--exclude-caches", dest="exclude_caches", action="store_true", - help="exclude directories that contain a CACHEDIR.TAG file " "(http://www.bford.info/cachedir/spec.html)", + help="exclude directories that contain a CACHEDIR.TAG file " "(https://www.bford.info/cachedir/spec.html)", ) add_option( "--exclude-if-present", diff --git a/src/borg/helpers/fs.py b/src/borg/helpers/fs.py index 49e649ed5..e7eaf8166 100644 --- a/src/borg/helpers/fs.py +++ b/src/borg/helpers/fs.py @@ -150,7 +150,7 @@ def get_cache_dir(*, legacy=False, create=True): """ # This file is a cache directory tag created by Borg. # For information about cache directory tags, see: - # http://www.bford.info/cachedir/spec.html + # https://www.bford.info/cachedir/spec.html """ ).encode("ascii") ) @@ -184,7 +184,7 @@ def get_config_dir(*, legacy=False, create=True): def dir_is_cachedir(path=None, dir_fd=None): """Determines whether the specified directory is a cache directory (and therefore should potentially be excluded from the backup) according to - the CACHEDIR.TAG protocol (http://www.bford.info/cachedir/spec.html). + the CACHEDIR.TAG protocol (https://www.bford.info/cachedir/spec.html). If dir_fd is provided, operations will be based on the directory file descriptor. Otherwise (path is provided), operations will be based on the directory path.