diff --git a/community/ndisc6/APKBUILD b/main/ndisc6/APKBUILD similarity index 88% rename from community/ndisc6/APKBUILD rename to main/ndisc6/APKBUILD index d58d4ca21e10ab433621f977f4ed7331791c10ee..bc4544e0652fe31e934e9c61f9fbf28548bf6e17 100644 --- a/community/ndisc6/APKBUILD +++ b/main/ndisc6/APKBUILD @@ -2,18 +2,18 @@ # Maintainer: Kevin Daudt pkgname=ndisc6 pkgver=1.0.4 -pkgrel=3 +pkgrel=4 pkgdesc="a small collection of useful tools for IPv6 networking" url="https://www.remlab.net/ndisc6" arch="all" license="GPL-2.0-or-later" makedepends="linux-headers perl" -depends="sed" # merge-hook uses regex not supported by bb sed subpackages="$pkgname-doc rdnssd rdnssd-openrc:openrc:noarch $pkgname-dnssort::noarch" source="https://www.remlab.net/files/ndisc6/ndisc6-$pkgver.tar.bz2 remove-undef-gnu-source.patch rdnssd.initd rdnssd.resolvconf + rdnssd-fix-merge-hook-regex.patch " build() { @@ -57,4 +57,5 @@ rdnssd() { sha512sums="6f6cd939fb7079518db5c1bcd11353c722237d7735d229f9fd20d03e9f16b1ddf07c7c78c91364886148f2a82d6805eafe7e27da6b4e7c99b111603ec5fab842 ndisc6-1.0.4.tar.bz2 182f365ab743185c594394a92a0408f0feac09e969367080be0b62b966a2e10ce59256e0aca263d5cd6809d81fa8e7370317e136659d843599daa1fb88b51bf8 remove-undef-gnu-source.patch 5475dbe63b2855f6f5fdb0663dd235a4261db44f8f639b4b13712b62f9ca2adf9de6e899e72eee238a284d40d11f9fdd4778e11cdec739ee3abbffc85ac36d21 rdnssd.initd -7b23eafa78bd88d43d0910dbb6cb8d248c00425edb0826571c4d4f9129de33f07093dba4a42f05a549ef1bb9a0fd301716a30bf95ceea18d445e291f0169a444 rdnssd.resolvconf" +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 new file mode 100644 index 0000000000000000000000000000000000000000..85e89136c4b420ec2960a1ca93dce5c30c96e35c --- /dev/null +++ b/main/ndisc6/rdnssd-fix-merge-hook-regex.patch @@ -0,0 +1,17 @@ +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 + diff --git a/community/ndisc6/rdnssd.initd b/main/ndisc6/rdnssd.initd similarity index 100% rename from community/ndisc6/rdnssd.initd rename to main/ndisc6/rdnssd.initd diff --git a/community/ndisc6/rdnssd.resolvconf b/main/ndisc6/rdnssd.resolvconf similarity index 100% rename from community/ndisc6/rdnssd.resolvconf rename to main/ndisc6/rdnssd.resolvconf diff --git a/community/ndisc6/remove-undef-gnu-source.patch b/main/ndisc6/remove-undef-gnu-source.patch similarity index 100% rename from community/ndisc6/remove-undef-gnu-source.patch rename to main/ndisc6/remove-undef-gnu-source.patch