aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/ldns/APKBUILD28
-rw-r--r--main/ldns/fix-doc-generation.patch11
2 files changed, 21 insertions, 18 deletions
diff --git a/main/ldns/APKBUILD b/main/ldns/APKBUILD
index b98d07815c..566db159db 100644
--- a/main/ldns/APKBUILD
+++ b/main/ldns/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ldns
pkgver=1.6.17
-pkgrel=2
+pkgrel=3
pkgdesc="Lowlevel DNS(SEC) library"
url="http://nlnetlabs.nl/projects/ldns/"
arch="all"
@@ -14,6 +14,7 @@ install=""
subpackages="$pkgname-dev $pkgname-doc drill $pkgname-tools"
source="http://nlnetlabs.nl/downloads/ldns/ldns-$pkgver.tar.gz
CVE-2014-3209.patch
+ fix-doc-generation.patch
"
_builddir="$srcdir"/ldns-$pkgver
@@ -38,28 +39,16 @@ build() {
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--localstatedir=/var \
- || return 1
- (cd drill && ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr) \
- || return 1
- (cd examples && ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr) \
+ --with-drill \
+ --with-examples \
|| return 1
make || return 1
- make -C drill || return 1
- make -C examples || return 1
}
package() {
cd "$_builddir"
make DESTDIR="$pkgdir" install || return 1
- make -C drill DESTDIR="$pkgdir" install || return 1
- make -C examples DESTDIR="$pkgdir" install || return 1
mkdir -p "$pkgdir"/usr/lib/pkgconfig
cat > "$pkgdir"/usr/lib/pkgconfig/libldns.pc<<EOF
@@ -92,8 +81,11 @@ tools() {
}
md5sums="a79423bcc4129e6d59b616b1cae11e5e ldns-1.6.17.tar.gz
-6923f96397cee285a8b390af6362c62c CVE-2014-3209.patch"
+6923f96397cee285a8b390af6362c62c CVE-2014-3209.patch
+c1557943461e7c1f64a6f67c41b6df4e fix-doc-generation.patch"
sha256sums="8b88e059452118e8949a2752a55ce59bc71fa5bc414103e17f5b6b06f9bcc8cd ldns-1.6.17.tar.gz
-12fe00517756fd6923d992e694471fb9e521c279e99fa4e0fb395ef10e5165eb CVE-2014-3209.patch"
+12fe00517756fd6923d992e694471fb9e521c279e99fa4e0fb395ef10e5165eb CVE-2014-3209.patch
+2139e23beeea3f33926047f0d7626e40a9ddd66a92cbe537ad96dbe42a292873 fix-doc-generation.patch"
sha512sums="5de42b4b8622591db51efb0956735deee9cd5e0bee12249a03b65c5b45d7c51bf9c2edb310ef9d7431af49aef77d968bfa2455a7dedfa80cde3d433436c83785 ldns-1.6.17.tar.gz
-cc17fff95a61db8427c3496c0b0a4d991126b3b331a04f79496acb6fcca63ec47606acbcebd3578a944c0f4e3eaf6aff16a908a6dae3fe954751a1bec3ccecc8 CVE-2014-3209.patch"
+cc17fff95a61db8427c3496c0b0a4d991126b3b331a04f79496acb6fcca63ec47606acbcebd3578a944c0f4e3eaf6aff16a908a6dae3fe954751a1bec3ccecc8 CVE-2014-3209.patch
+e23879716eab143184a8cdaeca665e6dbaf76b7d870d218b80d338bd129fe5282d9954367f721fcdf9ed31aaa31bcafdb3c6c0b67be10035b9d227dc1b724046 fix-doc-generation.patch"
diff --git a/main/ldns/fix-doc-generation.patch b/main/ldns/fix-doc-generation.patch
new file mode 100644
index 0000000000..6d2d2d0c9d
--- /dev/null
+++ b/main/ldns/fix-doc-generation.patch
@@ -0,0 +1,11 @@
+--- a/doc/doxyparse.pl
++++ b/doc/doxyparse.pl
+@@ -273,7 +273,7 @@
+
+ print MAN $MAN_MIDDLE;
+
+- if (defined(@$also)) {
++ if (@$also) {
+ print MAN "\n.SH SEE ALSO\n\\fI";
+ print MAN join "\\fR, \\fI", @$also;
+ print MAN "\\fR.\nAnd ";