diff options
-rw-r--r-- | nonprism/your-privacy/PKGBUILD | 17 | ||||
-rw-r--r-- | nonsystemd/networkmanager/PKGBUILD | 3 |
2 files changed, 18 insertions, 2 deletions
diff --git a/nonprism/your-privacy/PKGBUILD b/nonprism/your-privacy/PKGBUILD index caeae56a7..6b4f52e38 100644 --- a/nonprism/your-privacy/PKGBUILD +++ b/nonprism/your-privacy/PKGBUILD @@ -12,7 +12,7 @@ pkgname=your-privacy -pkgver=20211130 +pkgver=20221006 pkgrel=1 _gitver=ab32447a5a47a2a5ec5a3fa6043dc6b9024e3674 pkgdesc="This package will remove support for protocols and services known to endanger privacy." @@ -21,6 +21,7 @@ url=https://wiki.parabola.nu/Blacklist license=(GPL3) makedepends=(librelib) +backup=(etc/NetworkManager/conf.d/20-connectivity.conf) install=${pkgname}.install source=(${pkgname}-blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver} @@ -42,4 +43,18 @@ package() # disable automatic archlinux-keyring refresh install -Dm644 archlinux-keyring.hook "${pkgdir}"/usr/share/libalpm/hooks/archlinux-keyring.hook + + # disable NetworkManager connectviity check + # TODO: This may disable some user-friendliness features. + # Something a bit more sophisticated may be needed, + # such as a source-level replacement check: + # $ dns_ip=$(sed 's|^nameserver ||p;d' /etc/resolv.conf) ; [[ -n "${dns_ip}" ]] && ping -c 1 ${dns_ip} &> /dev/null ; + # As of now, we are over-riding 'networkmanager' only for [nonsystemd], + # which already changes the target URI to parabola.nu. + # This simple solution is an attempt to avoid also packaging it for [nonprism]. + install -Dm644 /dev/stdin "${pkgdir}"/etc/NetworkManager/conf.d/20-connectivity.conf <<EOF +[connectivity] +uri=https://www.parabola.nu/static/nm-check.txt +enabled=false +EOF } diff --git a/nonsystemd/networkmanager/PKGBUILD b/nonsystemd/networkmanager/PKGBUILD index 43f459025..44c08d760 100644 --- a/nonsystemd/networkmanager/PKGBUILD +++ b/nonsystemd/networkmanager/PKGBUILD @@ -133,7 +133,8 @@ END # packaged configuration install -Dm644 /dev/stdin usr/lib/NetworkManager/conf.d/20-connectivity.conf <<END [connectivity] -uri=http://ping.archlinux.org/nm-check.txt +uri=https://www.parabola.nu/static/nm-check.txt +enabled=false END shopt -s globstar |