diff --git a/main/ndisc6/APKBUILD b/main/ndisc6/APKBUILD index 263d0caa0cb95641a19c7e78a5dd53669d9c12ae..f0be130bb6d71a54638b64acc10f3f22ac27d270 100644 --- a/main/ndisc6/APKBUILD +++ b/main/ndisc6/APKBUILD @@ -2,7 +2,7 @@ # Contributor: ungleich <foss@ungleich.ch> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=ndisc6 -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=0 pkgdesc="a small collection of useful tools for IPv6 networking" url="https://www.remlab.net/ndisc6" @@ -13,7 +13,6 @@ subpackages="$pkgname-doc rdnssd rdnssd-openrc:openrc:noarch $pkgname-dnssort::n source="https://www.remlab.net/files/ndisc6/ndisc6-$pkgver.tar.bz2 rdnssd.initd rdnssd.resolvconf - rdnssd-fix-merge-hook-regex.patch " build() { @@ -55,8 +54,7 @@ rdnssd() { } sha512sums=" -5a27b78dfb527fd6d0264452b8697f4dcd61758d0c334f7de5daf14198d5bc983027ac49d679630fe35af8ce21349403377385cda188632df859c8218485c843 ndisc6-1.0.5.tar.bz2 +e9ce26d139c5cdcaac7a507c247ace5ba1d6bc95a92fbdb693788e463183965390a8228133a8bbbf07ba19eeae64c7a12ce13eb031c1a0c0c47b086d42c527ae ndisc6-1.0.6.tar.bz2 7225d35c258bc59c23850811583811e3f62936cc395a010e5e0d32734916dec5f7c434b0915075a26c4670bd218b2e47269b7a685a71eab185766ba614f6f3cf rdnssd.initd 7b23eafa78bd88d43d0910dbb6cb8d248c00425edb0826571c4d4f9129de33f07093dba4a42f05a549ef1bb9a0fd301716a30bf95ceea18d445e291f0169a444 rdnssd.resolvconf -6e24c20f5b54ed4867ead508e7f85dddc86804441e0876778927e815f4871d31e35e3872e1631b2b147641b18f735dcca9609072217a9e622b10b328b19d2e73 rdnssd-fix-merge-hook-regex.patch " diff --git a/main/ndisc6/rdnssd-fix-merge-hook-regex.patch b/main/ndisc6/rdnssd-fix-merge-hook-regex.patch deleted file mode 100644 index 85e89136c4b420ec2960a1ca93dce5c30c96e35c..0000000000000000000000000000000000000000 --- a/main/ndisc6/rdnssd-fix-merge-hook-regex.patch +++ /dev/null @@ -1,17 +0,0 @@ -Reason: '{,1}' is not valid in regular expressions, it should be '{0,1}'. -Busybox sed does not accept the former. -Upstream: no - -diff --git a/rdnss/merge-hook.in b/rdnss/merge-hook.in -index 383a57c..00ddcb2 100644 ---- a/rdnss/merge-hook.in -+++ b/rdnss/merge-hook.in -@@ -38,7 +38,7 @@ myresolvconf="$localstatedir/run/rdnssd/resolv.conf" - - # These should be POSIX-compliant BREs - RE_NSV4='^nameserver *\([0-9]\{1,3\}\.\)\{3,3\}[0-9]\{1,3\} *$' --RE_NSV4OR6='^nameserver *[a-fA-F0-9:\.]\{1,46\}\(%[a-zA-Z0-9]\{1,\}\)\{,1\} *$' -+RE_NSV4OR6='^nameserver *[a-fA-F0-9:\.]\{1,46\}\(%[a-zA-Z0-9]\{1,\}\)\{0,1\} *$' - - # Count how many IPv6 nameservers we can fit -