Skip to content

Commit 0457015

Browse files
Merge pull request #9343 from mr-raj12/fix-http-urls-master
upgrade http:// URLs to https:// and remove dead librelist.com link, fixes #9342
2 parents 2489109 + fc89a66 commit 0457015

6 files changed

Lines changed: 8 additions & 9 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ jobs:
488488
netbsd)
489489
arch="$(uname -m)"
490490
sudo -E mkdir -p /usr/pkg/etc/pkgin
491-
echo "http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/${arch}/10.1/All" | sudo tee /usr/pkg/etc/pkgin/repositories.conf > /dev/null
491+
echo "https://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/${arch}/10.1/All" | sudo tee /usr/pkg/etc/pkgin/repositories.conf > /dev/null
492492
sudo -E pkgin update
493493
sudo -E pkgin -y upgrade
494494
sudo -E pkgin -y install zstd lz4 xxhash git

Vagrantfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ end
9797

9898
def packages_netbsd
9999
return <<-EOF
100-
echo 'http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$arch/9.3/All' > /usr/pkg/etc/pkgin/repositories.conf
100+
echo 'https://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$arch/9.3/All' > /usr/pkg/etc/pkgin/repositories.conf
101101
pkgin update
102102
pkgin -y upgrade
103103
pkg_add zstd lz4 xxhash git

docs/global.rst.inc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,5 @@
2626
.. _mfusepy: https://pypi.org/project/mfusepy/
2727
.. _pyfuse3: https://pypi.org/project/pyfuse3/
2828
.. _userspace filesystems: https://en.wikipedia.org/wiki/Filesystem_in_Userspace
29-
.. _Cython: http://cython.org/
29+
.. _Cython: https://cython.org/
3030
.. _virtualenv: https://pypi.org/project/virtualenv/
31-
.. _mailing list discussion about internals: http://librelist.com/browser/attic/2014/5/6/questions-and-suggestions-about-inner-working-of-attic>

docs/internals/data-structures.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Data structures and file formats
77
================================
88

99
This page documents the internal data structures and storage
10-
mechanisms of Borg. It is partly based on `mailing list
11-
discussion about internals`_ and also on static code analysis.
10+
mechanisms of Borg. It is partly based on mailing list
11+
discussions and also on static code analysis.
1212

1313
.. todo:: Clarify terms, perhaps create a glossary.
1414
ID (client?) vs. key (repository?),

src/borg/archiver/_common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ def define_exclude_and_patterns(add_option, *, tag_files=False, strip_components
298298
"--exclude-caches",
299299
dest="exclude_caches",
300300
action="store_true",
301-
help="exclude directories that contain a CACHEDIR.TAG file " "(http://www.bford.info/cachedir/spec.html)",
301+
help="exclude directories that contain a CACHEDIR.TAG file " "(https://www.bford.info/cachedir/spec.html)",
302302
)
303303
add_option(
304304
"--exclude-if-present",

src/borg/helpers/fs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def get_cache_dir(*, legacy=False, create=True):
150150
"""
151151
# This file is a cache directory tag created by Borg.
152152
# For information about cache directory tags, see:
153-
# http://www.bford.info/cachedir/spec.html
153+
# https://www.bford.info/cachedir/spec.html
154154
"""
155155
).encode("ascii")
156156
)
@@ -184,7 +184,7 @@ def get_config_dir(*, legacy=False, create=True):
184184
def dir_is_cachedir(path=None, dir_fd=None):
185185
"""Determines whether the specified directory is a cache directory (and
186186
therefore should potentially be excluded from the backup) according to
187-
the CACHEDIR.TAG protocol (http://www.bford.info/cachedir/spec.html).
187+
the CACHEDIR.TAG protocol (https://www.bford.info/cachedir/spec.html).
188188
189189
If dir_fd is provided, operations will be based on the directory file descriptor.
190190
Otherwise (path is provided), operations will be based on the directory path.

0 commit comments

Comments
 (0)