diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-28 08:47:30 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-28 08:47:30 +0100 |
| commit | d5acc51bdb801d2bb930af53220946e739dd5edd (patch) | |
| tree | ca90bf81203766e39c0f656cf371135530092422 /community/ldns | |
| parent | 1c2a0b0ad198c54e908452121ed1ab42e7d50809 (diff) | |
| parent | 2493f16093b14a81e949bd6a1b89724cb931807d (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/xemacs/PKGBUILD
community/gkrellm/PKGBUILD
community/ldns/PKGBUILD
community/tomoyo-tools/PKGBUILD
community/unbound/PKGBUILD
staging/kdelibs/PKGBUILD
staging/opencv/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'community/ldns')
| -rw-r--r-- | community/ldns/Makefile.patch | 20 | ||||
| -rw-r--r-- | community/ldns/PKGBUILD | 46 |
2 files changed, 40 insertions, 26 deletions
diff --git a/community/ldns/Makefile.patch b/community/ldns/Makefile.patch new file mode 100644 index 000000000..d98291ac9 --- /dev/null +++ b/community/ldns/Makefile.patch @@ -0,0 +1,20 @@ +--- old/Makefile.in 2012-01-12 00:11:36.000000000 +1100 ++++ new/Makefile.in 2012-01-27 11:36:16.110154453 +1100 +@@ -130,7 +130,7 @@ + exit -1 ; \ + fi + drill/drill: $(DRILL_LOBJS) $(LIB) +- $(LINK_EXE) $(DRILL_LOBJS) $(LIBS) -lldns -o drill/drill ++ $(LINK_EXE) $(DRILL_LOBJS) $(LIBS) $(LIBSSL_LIBS) -lldns -o drill/drill + + install-drill: drill/drill + $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) +@@ -157,7 +157,7 @@ + exit -1 ; \ + fi + $(EXAMPLE_PROGS): $(EXAMPLE_LOBJS) $(LIB) +- $(LINK_EXE) $@.lo $(LIBS) -lldns -o $@ ++ $(LINK_EXE) $@.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o $@ + + $(TESTNS): $(TESTNS_LOBJS) $(LIB) + $(LINK_EXE) $(TESTNS_LOBJS) $(LIBS) -lldns -o $(TESTNS) diff --git a/community/ldns/PKGBUILD b/community/ldns/PKGBUILD index 49febb4d2..46d7e1f5f 100644 --- a/community/ldns/PKGBUILD +++ b/community/ldns/PKGBUILD @@ -1,39 +1,38 @@ -# $Id: PKGBUILD 56190 2011-10-03 10:19:02Z bisson $ - +# $Id: PKGBUILD 62792 2012-01-27 01:01:36Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: jiribb <jiribb@gmail.com> and <mathieui> <mathieui@mathieui.net> # Contributor: mathieui <mathieui@mathieui.net> +# Contributor: jiribb <jiribb@gmail.com> pkgname=ldns -pkgver=1.6.11 +pkgver=1.6.12 pkgrel=1 -pkgdesc='Fast DNS library with DNSSEC support, including tools such as Drill' -arch=('i686' 'x86_64' 'mips64el') +pkgdesc='Fast DNS library supporting recent RFCs, including Drill and other tools' url='http://www.nlnetlabs.nl/projects/ldns/' license=('custom:BSD') +arch=('i686' 'x86_64' 'mips64el') +options=('!libtool') depends=('openssl') makedepends=('libpcap') optdepends=('libpcap: ldns-dpa tool') -options=('!libtool') -source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('2c4537eee39a1af63e8dde4f35498ce78c968c1f') +source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'Makefile.patch') +sha1sums=('1d61df0f666908551d5a62768f77d63e727810aa' + '01bce260e9639d9cd26109a689dddf2498e5026a') build() { cd "${srcdir}/${pkgname}-${pkgver}" - _conf='--prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-static=no --disable-rpath' - _tmp="$(mktemp -d)" + patch -p1 -i ../Makefile.patch - ./configure ${_conf} - make - make DESTDIR="${_tmp}" install + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-static=no \ + --disable-rpath \ + --with-drill \ + --with-examples \ - cd drill - ./configure ${_conf} --with-ldns="${_tmp}" - make - - cd ../examples - ./configure ${_conf} --with-ldns="${_tmp}" make } @@ -41,11 +40,6 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - cd drill - make DESTDIR="${pkgdir}" install - cd ../examples - make DESTDIR="${pkgdir}" install + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } |