[lilac] updated to 1.13.1-3

3 files changed, 85 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 18490349dd69..a2a2af12a8b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,44 +1,47 @@
 pkgbase = unbound-python
 	pkgdesc = Validating, recursive, and caching DNS resolver, with Python bindings
 	pkgver = 1.13.1
-	pkgrel = 1
+	pkgrel = 3
 	url = https://unbound.net/
 	arch = x86_64
 	license = BSD
 	makedepends = expat
 	makedepends = protobuf-c
 	makedepends = systemd
+	makedepends = python
 	makedepends = swig
 	depends = dnssec-anchors
 	depends = fstrm
 	depends = hiredis
-	depends = openssl
 	depends = ldns
 	depends = libevent
 	depends = libnghttp2
 	depends = libsodium
+	depends = openssl
 	depends = python
 	optdepends = expat: for unbound-anchor
 	optdepends = sh: for unbound-control-setup
+	optdepends = python: python-bindings
 	provides = libunbound.so
-	provides = unbound
-	provides = python-unbound
+	provides = unbound=1.13.1
 	conflicts = unbound
-	conflicts = python-unbound
 	backup = etc/unbound/unbound.conf
 	source = https://unbound.net/downloads/unbound-1.13.1.tar.gz
 	source = https://unbound.net/downloads/unbound-1.13.1.tar.gz.asc
+	source = unbound-fix-libpython-linking.patch
 	source = unbound-sysusers.conf
 	source = unbound-tmpfiles.conf
 	source = unbound-trusted-key.hook
 	validpgpkeys = EDFAA3F2CA4E6EB05681AF8E9F6F1C2D7E045F8D
 	sha512sums = f4d26dca28dbcc33a5e65a55147fa01077c331292e88b6a87798cb6c3d4edb0515015d131fd893c92b74d22d9998a640f0adce404e6192d61ebe69a6a599287c
 	sha512sums = SKIP
+	sha512sums = e810992fbf645bb804edd218881809cf894fccffcae0668ee40d053354ea6bbab5f3abf2e82fadc0c47877fcfe13263b6423f8ebd2a27e38aedb9c512085eb63
 	sha512sums = ef71d4e9b0eb0cc602d66bd0573d9424578fe33ef28a852c582d56f0fd34fdd63046c365ef7aed8b84a461b81254240af7ad3fd539da72f9587817d21bd6c585
 	sha512sums = 6b1849ae9d7cf427f6fa6cd0590e8f8c3f06210d2d6795e543b0f325a9e866db0f5db2275a29fa90f688783c0dd16f19c8a49a9817d5f5444e13f8f2df3ff712
 	sha512sums = 613826cdf5ab6e77f2805fa2aa65272508dcd11090add1961b3df6dfac3b67db016bc9f45fbcf0ef0de82b2d602c153d5263a488027a6cf13a72680b581b266d
 	b2sums = 5fabb9205773a1983842e41cf7a4d6c3878fa8beb7c8ccc71ae1edf7738cb9506c3d7bb32cf887b305317ca695bf876d9f5bf9aeb0129b0e9e926d437b3e6eb3
 	b2sums = SKIP
+	b2sums = e80e46e841e5ebcf261c2e1a5f4bb61d6f182afd95b3ce6609ac9c466a94a48eefe11adfb8d57a670896ea78dd71394ff75d2233d8efc6a03d621b049ab991bb
 	b2sums = 292a3c2e5fde292a03b6c9b2ddabd5089f52e73b50a404c3d9f54c1a43184924b661a21eea61cc521c594c1005a3b40b630fa585a38195c61298f9b24b248b92
 	b2sums = d3951006b43068be904c6b91a9e0563d56228225854e12b40abbdd4ba9b47338e97265837297a6de879acbc8051bb749163f9457683f5e12fc29ac2e7b687fd3
 	b2sums = d28785390eb6c125bd26ca11f097fe8864b080482157deeb7c70e9bee47ff2844abaed574db59a7c152ed3ec0acba05cfee4c3751f7a9f553320b064578f86c7
@@ -47,11 +50,11 @@ pkgname = unbound-python
 	depends = dnssec-anchors
 	depends = fstrm
 	depends = hiredis
-	depends = openssl
 	depends = ldns
 	depends = libevent
 	depends = libnghttp2
 	depends = libsodium
+	depends = openssl
 	depends = python
 	depends = libprotobuf-c.so
 	depends = libsystemd.so
diff --git a/PKGBUILD b/PKGBUILD
index f5ad9f0ce275..2ad9b83e5683 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: David Runge <dvzrv@archlinux.org>
+# Maintainer: Bruno Pagani <archange@archlinux.org>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Hisato Tatekura <hisato_tatekura@excentrics.net>
 # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
@@ -6,48 +7,52 @@
 _pkgname=unbound
 pkgname=unbound-python
 pkgver=1.13.1
-pkgrel=1
+pkgrel=3
 pkgdesc="Validating, recursive, and caching DNS resolver, with Python bindings"
+arch=(x86_64)
 url="https://unbound.net/"
-license=('BSD')
-arch=('x86_64')
-depends=('dnssec-anchors' 'fstrm' 'hiredis' 'openssl' 'ldns' 'libevent'
-'libnghttp2' 'libsodium' 'python')
-makedepends=('expat' 'protobuf-c' 'systemd' 'swig')
+license=(BSD)
+depends=("dnssec-anchors" "fstrm" "hiredis" "ldns" "libevent" "libnghttp2" "libsodium" "openssl" "python")
+makedepends=(expat protobuf-c systemd python swig)
 optdepends=(
   'expat: for unbound-anchor'
   'sh: for unbound-control-setup'
+  'python: python-bindings'
 )
-provides=('libunbound.so' 'unbound' 'python-unbound')
-conflicts=('unbound' 'python-unbound')
-backup=("etc/${_pkgname}/${_pkgname}.conf")
+provides=("libunbound.so" "unbound=$pkgver")
+backup=(etc/${_pkgname}/${_pkgname}.conf)
 source=("https://unbound.net/downloads/${_pkgname}-${pkgver}.tar.gz"{,.asc}
-        "${_pkgname}-sysusers.conf"
-        "${_pkgname}-tmpfiles.conf"
-        "${_pkgname}-trusted-key.hook")
+        unbound-fix-libpython-linking.patch
+        ${_pkgname}-sysusers.conf
+        ${_pkgname}-tmpfiles.conf
+        ${_pkgname}-trusted-key.hook)
 sha512sums=('f4d26dca28dbcc33a5e65a55147fa01077c331292e88b6a87798cb6c3d4edb0515015d131fd893c92b74d22d9998a640f0adce404e6192d61ebe69a6a599287c'
             'SKIP'
+            'e810992fbf645bb804edd218881809cf894fccffcae0668ee40d053354ea6bbab5f3abf2e82fadc0c47877fcfe13263b6423f8ebd2a27e38aedb9c512085eb63'
             'ef71d4e9b0eb0cc602d66bd0573d9424578fe33ef28a852c582d56f0fd34fdd63046c365ef7aed8b84a461b81254240af7ad3fd539da72f9587817d21bd6c585'
             '6b1849ae9d7cf427f6fa6cd0590e8f8c3f06210d2d6795e543b0f325a9e866db0f5db2275a29fa90f688783c0dd16f19c8a49a9817d5f5444e13f8f2df3ff712'
             '613826cdf5ab6e77f2805fa2aa65272508dcd11090add1961b3df6dfac3b67db016bc9f45fbcf0ef0de82b2d602c153d5263a488027a6cf13a72680b581b266d')
 b2sums=('5fabb9205773a1983842e41cf7a4d6c3878fa8beb7c8ccc71ae1edf7738cb9506c3d7bb32cf887b305317ca695bf876d9f5bf9aeb0129b0e9e926d437b3e6eb3'
         'SKIP'
+        'e80e46e841e5ebcf261c2e1a5f4bb61d6f182afd95b3ce6609ac9c466a94a48eefe11adfb8d57a670896ea78dd71394ff75d2233d8efc6a03d621b049ab991bb'
         '292a3c2e5fde292a03b6c9b2ddabd5089f52e73b50a404c3d9f54c1a43184924b661a21eea61cc521c594c1005a3b40b630fa585a38195c61298f9b24b248b92'
         'd3951006b43068be904c6b91a9e0563d56228225854e12b40abbdd4ba9b47338e97265837297a6de879acbc8051bb749163f9457683f5e12fc29ac2e7b687fd3'
         'd28785390eb6c125bd26ca11f097fe8864b080482157deeb7c70e9bee47ff2844abaed574db59a7c152ed3ec0acba05cfee4c3751f7a9f553320b064578f86c7')
-validpgpkeys=('EDFAA3F2CA4E6EB05681AF8E9F6F1C2D7E045F8D') # W.C.A. Wijngaards <wouter@nlnetlabs.nl>
+validpgpkeys=(EDFAA3F2CA4E6EB05681AF8E9F6F1C2D7E045F8D) # W.C.A. Wijngaards <wouter@nlnetlabs.nl>
 
 prepare() {
-  cd "${_pkgname}-${pkgver}"
+  cd ${_pkgname}-${pkgver}
   # set default location of trusted-key.key
   sed '/# trust-anchor-file:/c\\ttrust-anchor-file: /etc/unbound/trusted-key.key' \
     -i doc/example.conf.in
+  # backport https://github.com/NLnetLabs/unbound/pull/511
+  patch -p1 < ../unbound-fix-libpython-linking.patch
 
   autoreconf -vfi
 }
 
 build() {
-  cd "${_pkgname}-${pkgver}"
+  cd ${_pkgname}-${pkgver}
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --localstatedir=/var \
@@ -68,31 +73,26 @@ build() {
               --with-rootkey-file=/etc/trusted-key.key \
               --with-libevent \
               --with-libnghttp2 \
-              --with-pythonmodule \
-              --with-pyunbound
+              --with-pyunbound --with-pythonmodule
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
 check() {
-  cd "${_pkgname}-${pkgver}"
+  cd ${_pkgname}-${pkgver}
   make -k check
 }
 
 package() {
-  depends+=('libprotobuf-c.so' 'libsystemd.so')
-
-  cd "${_pkgname}-${pkgver}"
+  depends+=(libprotobuf-c.so libsystemd.so)
+  cd ${_pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
-  install -vDm 644 "contrib/${_pkgname}.service" \
-    -t "${pkgdir}/usr/lib/systemd/system/"
-  install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
-  # sysusers.d
-  install -vDm 644 "../${_pkgname}-sysusers.conf" \
-    "${pkgdir}/usr/lib/sysusers.d/${_pkgname}.conf"
-  # tmpfiles.d
-  install -vDm 644 "../${_pkgname}-tmpfiles.conf" \
-    "${pkgdir}/usr/lib/tmpfiles.d/${_pkgname}.conf"
+  install -vDm 644 contrib/${_pkgname}.service -t "${pkgdir}"/usr/lib/systemd/system/
+  install -vDm 644 LICENSE -t "${pkgdir}"/usr/share/licenses/${_pkgname}/
+  cd ..
+  install -vDm 644 ${_pkgname}-sysusers.conf "${pkgdir}"/usr/lib/sysusers.d/${_pkgname}.conf
+  install -vDm 644 ${_pkgname}-tmpfiles.conf "${pkgdir}"/usr/lib/tmpfiles.d/${_pkgname}.conf
   # libalpm hook to copy the dnssec-anchors provided key to /etc/unbound
-  install -vDm 644 ../${_pkgname}-trusted-key.hook \
-    -t "${pkgdir}/usr/share/libalpm/hooks/"
+  install -vDm 644 unbound-trusted-key.hook -t "${pkgdir}"/usr/share/libalpm/hooks/
 }
+conflicts=("unbound")
diff --git a/unbound-fix-libpython-linking.patch b/unbound-fix-libpython-linking.patch
new file mode 100644
index 000000000000..eaac55cdfc51
--- /dev/null
+++ b/unbound-fix-libpython-linking.patch
@@ -0,0 +1,44 @@
+diff --git a/Makefile.in b/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -61,6 +61,7 @@ PYTHON_CPPFLAGS=-I. @PYTHON_CPPFLAGS@
+ CFLAGS=-DSRCDIR=$(srcdir) @CFLAGS@
+ LDFLAGS=@LDFLAGS@
+ LIBS=@LIBS@
++PYTHON_LIBS=@PYTHON_LIBS@
+ LIBOBJS=@LIBOBJS@
+ # filter out ctime_r from compat obj.
+ LIBOBJ_WITHOUT_CTIME=@LIBOBJ_WITHOUT_CTIME@
+@@ -474,7 +475,7 @@ libunbound/python/libunbound_wrap.c:	$(srcdir)/libunbound/python/libunbound.i un
+ 
+ # Pyunbound python unbound wrapper
+ _unbound.la:	libunbound_wrap.lo libunbound.la
+-	$(LIBTOOL) --tag=CC --mode=link $(CC) $(RUNTIME_PATH) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -module -avoid-version -no-undefined -shared -o $@ libunbound_wrap.lo -rpath $(PYTHON_SITE_PKG) -L. -L.libs -lunbound
++	$(LIBTOOL) --tag=CC --mode=link $(CC) $(RUNTIME_PATH) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -module -avoid-version -no-undefined -shared -o $@ libunbound_wrap.lo -rpath $(PYTHON_SITE_PKG) -L. -L.libs -lunbound $(LIBS) $(PYTHON_LIBS)
+ 
+ util/config_file.c:	util/configparser.h
+ util/configlexer.c:  $(srcdir)/util/configlexer.lex util/configparser.h
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -699,11 +699,17 @@ if test x_$ub_test_python != x_no; then
+       AC_SUBST(PY_MAJOR_VERSION)
+       # Have Python
+       AC_DEFINE(HAVE_PYTHON,1,[Define if you have Python libraries and header files.])
+-      if test -n "$LIBS"; then
+-        LIBS="$PYTHON_LDFLAGS $LIBS"
++      if test x_$ub_with_pythonmod != x_no; then
++        if test -n "$LIBS"; then
++          LIBS="$PYTHON_LDFLAGS $LIBS"
++        else
++          LIBS="$PYTHON_LDFLAGS"
++        fi
++        PYTHON_LIBS=""
+       else
+-        LIBS="$PYTHON_LDFLAGS"
++        PYTHON_LIBS="$PYTHON_LDFLAGS"
+       fi
++      AC_SUBST(PYTHON_LIBS)
+       if test -n "$CPPFLAGS"; then
+         CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
+       else