[arch-commits] Commit in unbound/repos (6 files)
David Runge
dvzrv at gemini.archlinux.org
Sat Aug 14 11:18:30 UTC 2021
Date: Saturday, August 14, 2021 @ 11:18:30
Author: dvzrv
Revision: 998528
archrelease: copy trunk to community-testing-x86_64
Added:
unbound/repos/community-testing-x86_64/
unbound/repos/community-testing-x86_64/PKGBUILD
(from rev 998527, unbound/trunk/PKGBUILD)
unbound/repos/community-testing-x86_64/unbound-1.13.2-fix_libpython_linking.patch
(from rev 998527, unbound/trunk/unbound-1.13.2-fix_libpython_linking.patch)
unbound/repos/community-testing-x86_64/unbound-sysusers.conf
(from rev 998527, unbound/trunk/unbound-sysusers.conf)
unbound/repos/community-testing-x86_64/unbound-tmpfiles.conf
(from rev 998527, unbound/trunk/unbound-tmpfiles.conf)
unbound/repos/community-testing-x86_64/unbound-trusted-key.hook
(from rev 998527, unbound/trunk/unbound-trusted-key.hook)
--------------------------------------------+
PKGBUILD | 96 +++++++++++++++++++++++++++
unbound-1.13.2-fix_libpython_linking.patch | 68 +++++++++++++++++++
unbound-sysusers.conf | 1
unbound-tmpfiles.conf | 1
unbound-trusted-key.hook | 10 ++
5 files changed, 176 insertions(+)
Copied: unbound/repos/community-testing-x86_64/PKGBUILD (from rev 998527, unbound/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2021-08-14 11:18:30 UTC (rev 998528)
@@ -0,0 +1,96 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Hisato Tatekura <hisato_tatekura at excentrics.net>
+# Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
+
+pkgname=unbound
+pkgver=1.13.2
+pkgrel=1
+pkgdesc="Validating, recursive, and caching DNS resolver"
+arch=(x86_64)
+url="https://unbound.net/"
+license=(BSD)
+depends=(dnssec-anchors fstrm hiredis openssl ldns libevent libnghttp2 libsodium)
+makedepends=(expat protobuf-c systemd python swig)
+optdepends=(
+ 'expat: for unbound-anchor'
+ 'sh: for unbound-control-setup'
+ 'python: python-bindings'
+)
+provides=(libunbound.so)
+backup=(etc/${pkgname}/${pkgname}.conf)
+source=("https://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"{,.asc}
+ "${pkgname}-1.13.2-fix_libpython_linking.patch"
+ ${pkgname}-sysusers.conf
+ ${pkgname}-tmpfiles.conf
+ ${pkgname}-trusted-key.hook)
+sha512sums=('1e89441446e7a25c6a49bded645f8b348c1758c3be54e3a986041cb1f00c45d152fd469dc52666fb820574db9d51b16f1627dc8afcb9519508d4833ca358191a'
+ 'SKIP'
+ '836ec61c79f91e429feed7fca7b8df64c0233aa621b3c49011ad39854b231bbc7ab73408785278b0b8b7d1038bd2c9c57548d973ce796cccdb575307ff5318c6'
+ 'ef71d4e9b0eb0cc602d66bd0573d9424578fe33ef28a852c582d56f0fd34fdd63046c365ef7aed8b84a461b81254240af7ad3fd539da72f9587817d21bd6c585'
+ '6b1849ae9d7cf427f6fa6cd0590e8f8c3f06210d2d6795e543b0f325a9e866db0f5db2275a29fa90f688783c0dd16f19c8a49a9817d5f5444e13f8f2df3ff712'
+ '613826cdf5ab6e77f2805fa2aa65272508dcd11090add1961b3df6dfac3b67db016bc9f45fbcf0ef0de82b2d602c153d5263a488027a6cf13a72680b581b266d')
+b2sums=('71806edc86b323ff1f9f2d7bd3f699b15da2cd1cfefe9ca6008d74915dd6c7b45690026fb0244531ae563a3ca1b142f21fc8aed97ba4bb0015d8ab9196ff045a'
+ 'SKIP'
+ 'b2b7f27f1d339ea8ded8733cb71cbdb0d4b11c925a412fe78a0848c80fa401fc381a1c041b85879999a2c3f273021e6ff0bd748af479d914df2eb4b94614b821'
+ '292a3c2e5fde292a03b6c9b2ddabd5089f52e73b50a404c3d9f54c1a43184924b661a21eea61cc521c594c1005a3b40b630fa585a38195c61298f9b24b248b92'
+ 'd3951006b43068be904c6b91a9e0563d56228225854e12b40abbdd4ba9b47338e97265837297a6de879acbc8051bb749163f9457683f5e12fc29ac2e7b687fd3'
+ 'd28785390eb6c125bd26ca11f097fe8864b080482157deeb7c70e9bee47ff2844abaed574db59a7c152ed3ec0acba05cfee4c3751f7a9f553320b064578f86c7')
+validpgpkeys=(EDFAA3F2CA4E6EB05681AF8E9F6F1C2D7E045F8D) # W.C.A. Wijngaards <wouter at nlnetlabs.nl>
+
+prepare() {
+ 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 -Np1 -i ../"${pkgname}-1.13.2-fix_libpython_linking.patch"
+
+ autoreconf -vfi
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --sbindir=/usr/bin \
+ --disable-rpath \
+ --enable-dnscrypt \
+ --enable-dnstap \
+ --enable-pie \
+ --enable-relro-now \
+ --enable-subnet \
+ --enable-systemd \
+ --enable-tfo-client \
+ --enable-tfo-server \
+ --enable-cachedb \
+ --with-libhiredis \
+ --with-conf-file=/etc/unbound/unbound.conf \
+ --with-pidfile=/run/unbound.pid \
+ --with-rootkey-file=/etc/trusted-key.key \
+ --with-libevent \
+ --with-libnghttp2 \
+ --with-pyunbound
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+check() {
+ cd ${pkgname}-${pkgver}
+ make -k check
+}
+
+package() {
+ 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}/
+ 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 unbound-trusted-key.hook -t "${pkgdir}"/usr/share/libalpm/hooks/
+}
Copied: unbound/repos/community-testing-x86_64/unbound-1.13.2-fix_libpython_linking.patch (from rev 998527, unbound/trunk/unbound-1.13.2-fix_libpython_linking.patch)
===================================================================
--- community-testing-x86_64/unbound-1.13.2-fix_libpython_linking.patch (rev 0)
+++ community-testing-x86_64/unbound-1.13.2-fix_libpython_linking.patch 2021-08-14 11:18:30 UTC (rev 998528)
@@ -0,0 +1,68 @@
+From 98087a051e657c4604050c3d1e6735950b9ea76f Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125 at gmail.com>
+Date: Fri, 23 Jul 2021 13:23:05 +0800
+Subject: [PATCH] - Reduce unnecessary linking
+
+- Link to libpython only when needed, fixes #242
+
+When pyunbound is enabled while pythonmodule is not (i.e., ./configure
+--without-pythonmodule --with-pyunbound), only the Python library
+_unbound.so uses Python functions, and main programs (unbound,
+unbound-anchor, ...) and libunbound.so do not. This patch removes
+unneeded linking.
+
+- Link the Python library _unbound.so to Python only. _unbound.so does
+ not directly use libraries used by libunbound. This patch removes
+ unneeded linking mentioned in [1]
+
+[1] https://github.com/NLnetLabs/unbound/pull/511#issuecomment-886072003
+---
+ Makefile.in | 3 ++-
+ configure.ac | 12 ++++++++----
+ 2 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index ff5dc8fae..58413d7a5 100644
+--- 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@
+@@ -476,7 +477,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 libunbound.la $(LIBS)
++ $(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 libunbound.la $(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
+index fe911723c..0fc1e00a4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -699,11 +699,15 @@ 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"
+- else
+- LIBS="$PYTHON_LDFLAGS"
++ if test x_$ub_with_pythonmod != x_no; then
++ if test -n "$LIBS"; then
++ LIBS="$PYTHON_LDFLAGS $LIBS"
++ else
++ LIBS="$PYTHON_LDFLAGS"
++ fi
+ fi
++ PYTHON_LIBS="$PYTHON_LDFLAGS"
++ AC_SUBST(PYTHON_LIBS)
+ if test -n "$CPPFLAGS"; then
+ CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
+ else
Copied: unbound/repos/community-testing-x86_64/unbound-sysusers.conf (from rev 998527, unbound/trunk/unbound-sysusers.conf)
===================================================================
--- community-testing-x86_64/unbound-sysusers.conf (rev 0)
+++ community-testing-x86_64/unbound-sysusers.conf 2021-08-14 11:18:30 UTC (rev 998528)
@@ -0,0 +1 @@
+u unbound - "unbound" /etc/unbound
Copied: unbound/repos/community-testing-x86_64/unbound-tmpfiles.conf (from rev 998527, unbound/trunk/unbound-tmpfiles.conf)
===================================================================
--- community-testing-x86_64/unbound-tmpfiles.conf (rev 0)
+++ community-testing-x86_64/unbound-tmpfiles.conf 2021-08-14 11:18:30 UTC (rev 998528)
@@ -0,0 +1 @@
+C /etc/unbound/trusted-key.key - - - - /etc/trusted-key.key
Copied: unbound/repos/community-testing-x86_64/unbound-trusted-key.hook (from rev 998527, unbound/trunk/unbound-trusted-key.hook)
===================================================================
--- community-testing-x86_64/unbound-trusted-key.hook (rev 0)
+++ community-testing-x86_64/unbound-trusted-key.hook 2021-08-14 11:18:30 UTC (rev 998528)
@@ -0,0 +1,10 @@
+[Trigger]
+Type = Path
+Target = etc/trusted-key.key
+Operation = Install
+Operation = Upgrade
+
+[Action]
+Description = Updating trusted-key.key for unbound...
+When = PostTransaction
+Exec = /bin/cp -f /etc/trusted-key.key /etc/unbound/
More information about the arch-commits
mailing list