Date: Saturday, September 24, 2022 @ 08:31:00
Author: dvzrv
Revision: 1309274
upgpkg: unbound 1.16.3-1: Upgrade to 1.6.3.
Remove unnecessary quotes and curly braces.
Simplify calls to make using -C option.
Fix indentation for configure call so that all options have one line each.
Modified:
unbound/trunk/PKGBUILD
----------+
PKGBUILD | 84 ++++++++++++++++++++++++++++++-------------------------------
1 file changed, 42 insertions(+), 42 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-09-24 08:28:53 UTC (rev 1309273)
+++ PKGBUILD 2022-09-24 08:31:00 UTC (rev 1309274)
@@ -5,7 +5,7 @@
# Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail
service>
pkgname=unbound
-pkgver=1.16.2
+pkgver=1.16.3
pkgrel=1
pkgdesc="Validating, recursive, and caching DNS resolver"
arch=(x86_64)
@@ -21,19 +21,19 @@
provides=(libunbound.so)
backup=(etc/${pkgname}/${pkgname}.conf)
source=(
- "https://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"{,.asc}
- ${pkgname}-1.14.0-trust_anchor_file.patch
- ${pkgname}-sysusers.conf
- ${pkgname}-tmpfiles.conf
- ${pkgname}-trusted-key.hook
+ https://unbound.net/downloads/$pkgname-$pkgver.tar.gz{,.asc}
+ $pkgname-1.14.0-trust_anchor_file.patch
+ $pkgname-sysusers.conf
+ $pkgname-tmpfiles.conf
+ $pkgname-trusted-key.hook
)
-sha512sums=('0ea65ea63265be677441bd2a28df12098ec5e86c3372240c2874f9bd13752b8b818da81ae6076cf02cbeba3d36e397698a4c2b50570be1a6a8e47f57a0251572'
+sha512sums=('ef5cda926dd1082a750615d8687bccd756869c66e9f24f984fda4c6613f94f3e4884db328b8d7b490777a75d3e616dcb61c5258e7777923c0590e6fabacd207c'
'SKIP'
'9590d3d459d96f99cbc7482fae0f5318dd22a034e45cff18079e4f3c9f9c3c1d7af90cdd5353fb469eac08c535555fd164097b496286b807b2117e8a3a6cd304'
'ef71d4e9b0eb0cc602d66bd0573d9424578fe33ef28a852c582d56f0fd34fdd63046c365ef7aed8b84a461b81254240af7ad3fd539da72f9587817d21bd6c585'
'6b1849ae9d7cf427f6fa6cd0590e8f8c3f06210d2d6795e543b0f325a9e866db0f5db2275a29fa90f688783c0dd16f19c8a49a9817d5f5444e13f8f2df3ff712'
'613826cdf5ab6e77f2805fa2aa65272508dcd11090add1961b3df6dfac3b67db016bc9f45fbcf0ef0de82b2d602c153d5263a488027a6cf13a72680b581b266d')
-b2sums=('2f7f119d12807ff5c000fd500be72a0825614da3e1f079f9b8d15a651bda2fa0b41599a55c6f76b17ff56120aa61e48042469063f08dd199333520172ca16750'
+b2sums=('b97deade78ab903363e06ff9d71b9895c754378ec276bb17556de62c48a88af5fbabd26f97fb47313d1e631fe75dee245aa38fbf42a865ac3e764882a1124a51'
'SKIP'
'0978ab5c0474ed29de9c0904a46d114413e094dafeadaac4f10cdbc19e4152fcc064d7cdb8c331da7c2531075aa699326b84e21da1a8218a6f00a10f0e107b3d'
'292a3c2e5fde292a03b6c9b2ddabd5089f52e73b50a404c3d9f54c1a43184924b661a21eea61cc521c594c1005a3b40b630fa585a38195c61298f9b24b248b92'
@@ -42,53 +42,53 @@
validpgpkeys=(EDFAA3F2CA4E6EB05681AF8E9F6F1C2D7E045F8D) # W.C.A. Wijngaards
<[email protected]>
prepare() {
- cd ${pkgname}-${pkgver}
# enable trusted-anchor-file and set it to an unbound specific location
- patch -p1 < ../${pkgname}-1.14.0-trust_anchor_file.patch
- autoreconf -vfi
+ patch -p1 -d $pkgname-$pkgver -i ../$pkgname-1.14.0-trust_anchor_file.patch
+ cd $pkgname-$pkgver
+ autoreconf -fiv
}
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
+ 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
+ # prevent excessive overlinking due to libtool
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
}
check() {
- cd ${pkgname}-${pkgver}
- make -k check
+ make -k check -C $pkgname-$pkgver
}
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}/
- 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
+ make DESTDIR="$pkgdir" install -C $pkgname-$pkgver
+ install -vDm 644 $pkgname-$pkgver/contrib/$pkgname.service -t
"$pkgdir/usr/lib/systemd/system/"
+ install -vDm 644 $pkgname-$pkgver/LICENSE -t
"$pkgdir/usr/share/licenses/$pkgname/"
+ 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/
+ install -vDm 644 unbound-trusted-key.hook -t
"$pkgdir/usr/share/libalpm/hooks/"
}
