* Re: [PR PATCH] [Updated] bind: update to 9.16.2
2020-04-28 0:15 [PR PATCH] bind: update to 9.16.2 rmccask
@ 2020-04-28 3:23 ` rmccask
2020-04-28 15:12 ` rmccask
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: rmccask @ 2020-04-28 3:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 369 bytes --]
There is an updated pull request by rmccask against master on the void-packages repository
https://github.com/rmccask/void-packages bind-branch
https://github.com/void-linux/void-packages/pull/21417
bind: update to 9.16.2
After this is approved, I will add a revbump for bro.
A patch file from https://github.com/void-linux/void-packages/pull/21417.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bind-branch-21417.patch --]
[-- Type: text/x-diff, Size: 5530 bytes --]
From 3c5875dee594d5147370a36e4901b3aa06389cd6 Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Mon, 27 Apr 2020 17:57:20 -0400
Subject: [PATCH] bind: update to 9.16.2
---
common/shlibs | 14 +++---
srcpkgs/bind/patches/bind.so_bsdcompat.patch | 11 -----
srcpkgs/bind/template | 45 ++++++--------------
srcpkgs/bind/update | 1 +
4 files changed, 22 insertions(+), 49 deletions(-)
delete mode 100644 srcpkgs/bind/patches/bind.so_bsdcompat.patch
diff --git a/common/shlibs b/common/shlibs
index 419ff4641d2..9f57b500d0a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1050,13 +1050,13 @@ libgssglue.so.1 libgssglue-0.3_1
libtirpc.so.3 libtirpc-1.0.2_1
librpcsecgss.so.3 librpcsecgss-0.19_1
libnfsidmap.so.1 libnfsidmap-2.4.3_2
-libbind9.so.161 bind-libs-9.11.5_1
-libdns.so.1107 bind-libs-9.11.10_1
-libirs.so.161 bind-libs-9.11.5_1
-libisc.so.1104 bind-libs-9.11.13_1
-libisccc.so.161 bind-libs-9.11.5_1
-libisccfg.so.163 bind-libs-9.11.5_1
-liblwres.so.161 bind-libs-9.11.5_1
+libbind9.so.1600 bind-libs-9.16.2_1
+libdns.so.1602 bind-libs-9.16.2_1
+libirs.so.1600 bind-libs-9.16.2_1
+libisc.so.1602 bind-libs-9.16.2_1
+libisccc.so.1600 bind-libs-9.16.2_1
+libisccfg.so.1600 bind-libs-9.16.2_1
+libns.so.1602 bind-libs-9.16.2_1
libplist.so.3 libplist-1.12_1
libplist++.so.3 libplist++-1.12_1
libnsbmp.so.0 libnsbmp-0.0.3_1
diff --git a/srcpkgs/bind/patches/bind.so_bsdcompat.patch b/srcpkgs/bind/patches/bind.so_bsdcompat.patch
deleted file mode 100644
index 5d78031b7b0..00000000000
--- a/srcpkgs/bind/patches/bind.so_bsdcompat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/isc/unix/socket.c.orig 2005-11-03 17:08:42.000000000 -0600
-+++ ./lib/isc/unix/socket.c 2006-02-18 13:09:15.000000000 -0600
-@@ -245,6 +245,8 @@
-
- #define SOCK_DEAD(s) ((s)->references == 0)
-
-+#undef SO_BSDCOMPAT
-+
- static void
- manager_log(isc_socketmgr_t *sockmgr,
- isc_logcategory_t *category, isc_logmodule_t *module, int level,
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 135b0baff8d..6fbe87049b6 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,6 @@
# Template file for 'bind'
pkgname=bind
-reverts="9.13.6_1"
-version=9.11.13
+version=9.16.2
revision=1
_fullver="${version}${_patchver:+-${_patchver}}"
wrksrc="${pkgname}-${_fullver}"
@@ -9,19 +8,21 @@ build_style=gnu-configure
configure_args="--disable-static --enable-threads --enable-largefile
--with-libtool --enable-atomic --sysconfdir=/etc/named --enable-epoll
--enable-ipv6 --with-randomdev=/dev/random --with-ecdsa=yes --with-eddsa=no
- --with-libtool --with-openssl=${XBPS_CROSS_BASE}/usr --without-gssapi --without-gost
- --enable-openssl-hash --with-readline --with-tuning=default --without-python
- --enable-fetchlimit --enable-sit --with-libidn2 $(vopt_enable seccomp)
+ --with-libtool --with-openssl=${XBPS_CROSS_BASE}/usr --without-gssapi
+ --without-gost --enable-openssl-hash --with-readline --with-tuning=default
+ --without-python --enable-fetchlimit --enable-sit
+ --with-libidn2 $(vopt_enable seccomp)
$(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
-hostmakedepends="automake libtool perl"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel libatomic-devel
- libidn2-devel $(vopt_if geoip geoip-devel) $(vopt_if seccomp libseccomp-devel)"
+hostmakedepends="automake libtool perl pkg-config"
+makedepends="libressl-devel libxml2-devel libcap-devel readline-devel
+ libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)
+ $(vopt_if seccomp libseccomp-devel)"
short_desc="Berkeley Internet Name Domain server"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="ISC"
+license="MPL-2.0"
homepage="https://www.isc.org/downloads/bind/"
-distfiles="https://ftp.isc.org/isc/bind9/${_fullver}/bind-${_fullver}.tar.gz"
-checksum=fd3f3cc9fcfcdaa752db35eb24598afa1fdcc2509d3227fc90a8631b7b400f7d
+distfiles="https://ftp.isc.org/isc/bind9/${_fullver}/bind-${_fullver}.tar.xz"
+checksum=d9e5b77cfca5ccad97f19cddc87128758ec15c16e6585000c6b2f84fc225993f
conf_files="/etc/named/named.conf"
system_accounts="named"
@@ -36,19 +37,6 @@ case "$XBPS_TARGET_MACHINE" in
x86_64*|i686*) build_options_default+=" seccomp";;
esac
-pre_configure() {
- # various bind-utils segfault with musl-1.1.24 in catgets
- # TODO: actually fix instead of disabling it
- case "$XBPS_TARGET_MACHINE" in
- *-musl) vsed -e 's/#define HAVE_CATGETS 1//g' -i configure
- esac
-}
-
-do_check() {
- # requires special network setup
- :
-}
-
post_install() {
vsv named
vinstall ${FILESDIR}/named.logrotate 600 etc/logrotate.d named
@@ -63,7 +51,7 @@ post_install() {
bind-libs_package() {
short_desc+=" - Runtime libraries"
pkg_install() {
- vmove usr/lib/*.so.*
+ vmove "usr/lib/*.so.*"
}
}
@@ -81,12 +69,7 @@ bind-devel_package() {
depends="bind-libs>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
- vmove usr/bin/isc-config.sh
- vmove usr/bin/bind9-config
- vmove usr/share/man/man1/isc-config.sh.1
- vmove usr/share/man/man1/bind9-config.1
vmove usr/include
- vmove usr/share/man/man3
- vmove usr/lib/*.so
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/bind/update b/srcpkgs/bind/update
index 1333af1353a..60b037222f8 100644
--- a/srcpkgs/bind/update
+++ b/srcpkgs/bind/update
@@ -1,2 +1,3 @@
site="http://ftp.isc.org/isc/bind9/"
pattern="9\.[\d.]+(?=/)"
+ignore="*.*[13579].*"
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: bind: update to 9.16.2
2020-04-28 0:15 [PR PATCH] bind: update to 9.16.2 rmccask
2020-04-28 3:23 ` [PR PATCH] [Updated] " rmccask
@ 2020-04-28 15:12 ` rmccask
2020-04-28 16:16 ` rmccask
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: rmccask @ 2020-04-28 15:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 247 bytes --]
New comment by rmccask on void-packages repository
https://github.com/void-linux/void-packages/pull/21417#issuecomment-620668406
Comment:
It appears that bro does not dynamically link to the bind shared libraries so no revbump should be needed.
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: bind: update to 9.16.2
2020-04-28 0:15 [PR PATCH] bind: update to 9.16.2 rmccask
2020-04-28 3:23 ` [PR PATCH] [Updated] " rmccask
2020-04-28 15:12 ` rmccask
@ 2020-04-28 16:16 ` rmccask
2020-04-28 19:42 ` [PR PATCH] [Updated] " rmccask
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: rmccask @ 2020-04-28 16:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 247 bytes --]
New comment by rmccask on void-packages repository
https://github.com/void-linux/void-packages/pull/21417#issuecomment-620668406
Comment:
It appears that bro does not dynamically link to the bind shared libraries so no revbump should be needed.
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Updated] bind: update to 9.16.2
2020-04-28 0:15 [PR PATCH] bind: update to 9.16.2 rmccask
` (2 preceding siblings ...)
2020-04-28 16:16 ` rmccask
@ 2020-04-28 19:42 ` rmccask
2020-04-29 17:52 ` rmccask
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: rmccask @ 2020-04-28 19:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 384 bytes --]
There is an updated pull request by rmccask against master on the void-packages repository
https://github.com/rmccask/void-packages bind-branch
https://github.com/void-linux/void-packages/pull/21417
bind: update to 9.16.2
I thought I might need to revbump bro but it appears to be unneeded.
A patch file from https://github.com/void-linux/void-packages/pull/21417.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bind-branch-21417.patch --]
[-- Type: text/x-diff, Size: 5606 bytes --]
From 97d0dcff67624b7f626029920f7d90fc6324a932 Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Mon, 27 Apr 2020 17:57:20 -0400
Subject: [PATCH] bind: update to 9.16.2
---
common/shlibs | 14 +++---
srcpkgs/bind/patches/bind.so_bsdcompat.patch | 11 -----
srcpkgs/bind/template | 46 +++++++-------------
srcpkgs/bind/update | 1 +
4 files changed, 23 insertions(+), 49 deletions(-)
delete mode 100644 srcpkgs/bind/patches/bind.so_bsdcompat.patch
diff --git a/common/shlibs b/common/shlibs
index 419ff4641d2..9f57b500d0a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1050,13 +1050,13 @@ libgssglue.so.1 libgssglue-0.3_1
libtirpc.so.3 libtirpc-1.0.2_1
librpcsecgss.so.3 librpcsecgss-0.19_1
libnfsidmap.so.1 libnfsidmap-2.4.3_2
-libbind9.so.161 bind-libs-9.11.5_1
-libdns.so.1107 bind-libs-9.11.10_1
-libirs.so.161 bind-libs-9.11.5_1
-libisc.so.1104 bind-libs-9.11.13_1
-libisccc.so.161 bind-libs-9.11.5_1
-libisccfg.so.163 bind-libs-9.11.5_1
-liblwres.so.161 bind-libs-9.11.5_1
+libbind9.so.1600 bind-libs-9.16.2_1
+libdns.so.1602 bind-libs-9.16.2_1
+libirs.so.1600 bind-libs-9.16.2_1
+libisc.so.1602 bind-libs-9.16.2_1
+libisccc.so.1600 bind-libs-9.16.2_1
+libisccfg.so.1600 bind-libs-9.16.2_1
+libns.so.1602 bind-libs-9.16.2_1
libplist.so.3 libplist-1.12_1
libplist++.so.3 libplist++-1.12_1
libnsbmp.so.0 libnsbmp-0.0.3_1
diff --git a/srcpkgs/bind/patches/bind.so_bsdcompat.patch b/srcpkgs/bind/patches/bind.so_bsdcompat.patch
deleted file mode 100644
index 5d78031b7b0..00000000000
--- a/srcpkgs/bind/patches/bind.so_bsdcompat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/isc/unix/socket.c.orig 2005-11-03 17:08:42.000000000 -0600
-+++ ./lib/isc/unix/socket.c 2006-02-18 13:09:15.000000000 -0600
-@@ -245,6 +245,8 @@
-
- #define SOCK_DEAD(s) ((s)->references == 0)
-
-+#undef SO_BSDCOMPAT
-+
- static void
- manager_log(isc_socketmgr_t *sockmgr,
- isc_logcategory_t *category, isc_logmodule_t *module, int level,
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 135b0baff8d..ce661603689 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,6 @@
# Template file for 'bind'
pkgname=bind
-reverts="9.13.6_1"
-version=9.11.13
+version=9.16.2
revision=1
_fullver="${version}${_patchver:+-${_patchver}}"
wrksrc="${pkgname}-${_fullver}"
@@ -9,19 +8,22 @@ build_style=gnu-configure
configure_args="--disable-static --enable-threads --enable-largefile
--with-libtool --enable-atomic --sysconfdir=/etc/named --enable-epoll
--enable-ipv6 --with-randomdev=/dev/random --with-ecdsa=yes --with-eddsa=no
- --with-libtool --with-openssl=${XBPS_CROSS_BASE}/usr --without-gssapi --without-gost
- --enable-openssl-hash --with-readline --with-tuning=default --without-python
- --enable-fetchlimit --enable-sit --with-libidn2 $(vopt_enable seccomp)
+ --with-libtool --with-openssl=${XBPS_CROSS_BASE}/usr --without-gssapi
+ --without-gost --enable-openssl-hash --with-readline --with-tuning=default
+ --without-python --enable-fetchlimit --enable-sit
+ --with-libidn2 $(vopt_enable seccomp)
$(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
-hostmakedepends="automake libtool perl"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel libatomic-devel
- libidn2-devel $(vopt_if geoip geoip-devel) $(vopt_if seccomp libseccomp-devel)"
+hostmakedepends="automake libtool perl pkg-config"
+makedepends="libressl-devel libxml2-devel libcap-devel readline-devel
+ libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)
+ $(vopt_if seccomp libseccomp-devel)"
short_desc="Berkeley Internet Name Domain server"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="ISC"
+license="MPL-2.0"
homepage="https://www.isc.org/downloads/bind/"
-distfiles="https://ftp.isc.org/isc/bind9/${_fullver}/bind-${_fullver}.tar.gz"
-checksum=fd3f3cc9fcfcdaa752db35eb24598afa1fdcc2509d3227fc90a8631b7b400f7d
+changelog="https://gitlab.isc.org/isc-projects/bind9/-/blob/v9_16/CHANGES"
+distfiles="https://ftp.isc.org/isc/bind9/${_fullver}/bind-${_fullver}.tar.xz"
+checksum=d9e5b77cfca5ccad97f19cddc87128758ec15c16e6585000c6b2f84fc225993f
conf_files="/etc/named/named.conf"
system_accounts="named"
@@ -36,19 +38,6 @@ case "$XBPS_TARGET_MACHINE" in
x86_64*|i686*) build_options_default+=" seccomp";;
esac
-pre_configure() {
- # various bind-utils segfault with musl-1.1.24 in catgets
- # TODO: actually fix instead of disabling it
- case "$XBPS_TARGET_MACHINE" in
- *-musl) vsed -e 's/#define HAVE_CATGETS 1//g' -i configure
- esac
-}
-
-do_check() {
- # requires special network setup
- :
-}
-
post_install() {
vsv named
vinstall ${FILESDIR}/named.logrotate 600 etc/logrotate.d named
@@ -63,7 +52,7 @@ post_install() {
bind-libs_package() {
short_desc+=" - Runtime libraries"
pkg_install() {
- vmove usr/lib/*.so.*
+ vmove "usr/lib/*.so.*"
}
}
@@ -81,12 +70,7 @@ bind-devel_package() {
depends="bind-libs>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
- vmove usr/bin/isc-config.sh
- vmove usr/bin/bind9-config
- vmove usr/share/man/man1/isc-config.sh.1
- vmove usr/share/man/man1/bind9-config.1
vmove usr/include
- vmove usr/share/man/man3
- vmove usr/lib/*.so
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/bind/update b/srcpkgs/bind/update
index 1333af1353a..60b037222f8 100644
--- a/srcpkgs/bind/update
+++ b/srcpkgs/bind/update
@@ -1,2 +1,3 @@
site="http://ftp.isc.org/isc/bind9/"
pattern="9\.[\d.]+(?=/)"
+ignore="*.*[13579].*"
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Updated] bind: update to 9.16.2
2020-04-28 0:15 [PR PATCH] bind: update to 9.16.2 rmccask
` (3 preceding siblings ...)
2020-04-28 19:42 ` [PR PATCH] [Updated] " rmccask
@ 2020-04-29 17:52 ` rmccask
2020-04-29 21:24 ` rmccask
2020-05-05 14:27 ` [PR PATCH] [Merged]: bind: update to 9.16.2; Claim maintainer Gottox
6 siblings, 0 replies; 8+ messages in thread
From: rmccask @ 2020-04-29 17:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 384 bytes --]
There is an updated pull request by rmccask against master on the void-packages repository
https://github.com/rmccask/void-packages bind-branch
https://github.com/void-linux/void-packages/pull/21417
bind: update to 9.16.2
I thought I might need to revbump bro but it appears to be unneeded.
A patch file from https://github.com/void-linux/void-packages/pull/21417.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bind-branch-21417.patch --]
[-- Type: text/x-diff, Size: 5508 bytes --]
From 3d10d2a82ff20b0e4d209e3ce231078768fafc71 Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Mon, 27 Apr 2020 17:57:20 -0400
Subject: [PATCH] bind: update to 9.16.2
---
common/shlibs | 14 +++----
srcpkgs/bind/patches/bind.so_bsdcompat.patch | 11 ------
srcpkgs/bind/template | 41 +++++++-------------
srcpkgs/bind/update | 1 +
4 files changed, 23 insertions(+), 44 deletions(-)
delete mode 100644 srcpkgs/bind/patches/bind.so_bsdcompat.patch
diff --git a/common/shlibs b/common/shlibs
index 419ff4641d2..9f57b500d0a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1050,13 +1050,13 @@ libgssglue.so.1 libgssglue-0.3_1
libtirpc.so.3 libtirpc-1.0.2_1
librpcsecgss.so.3 librpcsecgss-0.19_1
libnfsidmap.so.1 libnfsidmap-2.4.3_2
-libbind9.so.161 bind-libs-9.11.5_1
-libdns.so.1107 bind-libs-9.11.10_1
-libirs.so.161 bind-libs-9.11.5_1
-libisc.so.1104 bind-libs-9.11.13_1
-libisccc.so.161 bind-libs-9.11.5_1
-libisccfg.so.163 bind-libs-9.11.5_1
-liblwres.so.161 bind-libs-9.11.5_1
+libbind9.so.1600 bind-libs-9.16.2_1
+libdns.so.1602 bind-libs-9.16.2_1
+libirs.so.1600 bind-libs-9.16.2_1
+libisc.so.1602 bind-libs-9.16.2_1
+libisccc.so.1600 bind-libs-9.16.2_1
+libisccfg.so.1600 bind-libs-9.16.2_1
+libns.so.1602 bind-libs-9.16.2_1
libplist.so.3 libplist-1.12_1
libplist++.so.3 libplist++-1.12_1
libnsbmp.so.0 libnsbmp-0.0.3_1
diff --git a/srcpkgs/bind/patches/bind.so_bsdcompat.patch b/srcpkgs/bind/patches/bind.so_bsdcompat.patch
deleted file mode 100644
index 5d78031b7b0..00000000000
--- a/srcpkgs/bind/patches/bind.so_bsdcompat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/isc/unix/socket.c.orig 2005-11-03 17:08:42.000000000 -0600
-+++ ./lib/isc/unix/socket.c 2006-02-18 13:09:15.000000000 -0600
-@@ -245,6 +245,8 @@
-
- #define SOCK_DEAD(s) ((s)->references == 0)
-
-+#undef SO_BSDCOMPAT
-+
- static void
- manager_log(isc_socketmgr_t *sockmgr,
- isc_logcategory_t *category, isc_logmodule_t *module, int level,
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 135b0baff8d..da55db601fb 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,6 @@
# Template file for 'bind'
pkgname=bind
-reverts="9.13.6_1"
-version=9.11.13
+version=9.16.2
revision=1
_fullver="${version}${_patchver:+-${_patchver}}"
wrksrc="${pkgname}-${_fullver}"
@@ -9,19 +8,22 @@ build_style=gnu-configure
configure_args="--disable-static --enable-threads --enable-largefile
--with-libtool --enable-atomic --sysconfdir=/etc/named --enable-epoll
--enable-ipv6 --with-randomdev=/dev/random --with-ecdsa=yes --with-eddsa=no
- --with-libtool --with-openssl=${XBPS_CROSS_BASE}/usr --without-gssapi --without-gost
- --enable-openssl-hash --with-readline --with-tuning=default --without-python
- --enable-fetchlimit --enable-sit --with-libidn2 $(vopt_enable seccomp)
+ --with-libtool --with-openssl=${XBPS_CROSS_BASE}/usr --without-gssapi
+ --without-gost --enable-openssl-hash --with-readline --with-tuning=default
+ --without-python --enable-fetchlimit --enable-sit
+ --with-libidn2 $(vopt_enable seccomp)
$(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
-hostmakedepends="automake libtool perl"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel libatomic-devel
- libidn2-devel $(vopt_if geoip geoip-devel) $(vopt_if seccomp libseccomp-devel)"
+hostmakedepends="automake libtool perl pkg-config"
+makedepends="libressl-devel libxml2-devel libcap-devel readline-devel
+ libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)
+ $(vopt_if seccomp libseccomp-devel)"
short_desc="Berkeley Internet Name Domain server"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="ISC"
+license="MPL-2.0"
homepage="https://www.isc.org/downloads/bind/"
-distfiles="https://ftp.isc.org/isc/bind9/${_fullver}/bind-${_fullver}.tar.gz"
-checksum=fd3f3cc9fcfcdaa752db35eb24598afa1fdcc2509d3227fc90a8631b7b400f7d
+changelog="https://gitlab.isc.org/isc-projects/bind9/-/blob/v9_16/CHANGES"
+distfiles="https://ftp.isc.org/isc/bind9/${_fullver}/bind-${_fullver}.tar.xz"
+checksum=d9e5b77cfca5ccad97f19cddc87128758ec15c16e6585000c6b2f84fc225993f
conf_files="/etc/named/named.conf"
system_accounts="named"
@@ -36,14 +38,6 @@ case "$XBPS_TARGET_MACHINE" in
x86_64*|i686*) build_options_default+=" seccomp";;
esac
-pre_configure() {
- # various bind-utils segfault with musl-1.1.24 in catgets
- # TODO: actually fix instead of disabling it
- case "$XBPS_TARGET_MACHINE" in
- *-musl) vsed -e 's/#define HAVE_CATGETS 1//g' -i configure
- esac
-}
-
do_check() {
# requires special network setup
:
@@ -63,7 +57,7 @@ post_install() {
bind-libs_package() {
short_desc+=" - Runtime libraries"
pkg_install() {
- vmove usr/lib/*.so.*
+ vmove "usr/lib/*.so.*"
}
}
@@ -81,12 +75,7 @@ bind-devel_package() {
depends="bind-libs>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
- vmove usr/bin/isc-config.sh
- vmove usr/bin/bind9-config
- vmove usr/share/man/man1/isc-config.sh.1
- vmove usr/share/man/man1/bind9-config.1
vmove usr/include
- vmove usr/share/man/man3
- vmove usr/lib/*.so
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/bind/update b/srcpkgs/bind/update
index 1333af1353a..60b037222f8 100644
--- a/srcpkgs/bind/update
+++ b/srcpkgs/bind/update
@@ -1,2 +1,3 @@
site="http://ftp.isc.org/isc/bind9/"
pattern="9\.[\d.]+(?=/)"
+ignore="*.*[13579].*"
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Updated] bind: update to 9.16.2
2020-04-28 0:15 [PR PATCH] bind: update to 9.16.2 rmccask
` (4 preceding siblings ...)
2020-04-29 17:52 ` rmccask
@ 2020-04-29 21:24 ` rmccask
2020-05-05 14:27 ` [PR PATCH] [Merged]: bind: update to 9.16.2; Claim maintainer Gottox
6 siblings, 0 replies; 8+ messages in thread
From: rmccask @ 2020-04-29 21:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 384 bytes --]
There is an updated pull request by rmccask against master on the void-packages repository
https://github.com/rmccask/void-packages bind-branch
https://github.com/void-linux/void-packages/pull/21417
bind: update to 9.16.2
I thought I might need to revbump bro but it appears to be unneeded.
A patch file from https://github.com/void-linux/void-packages/pull/21417.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bind-branch-21417.patch --]
[-- Type: text/x-diff, Size: 5576 bytes --]
From b689d8cc5b2dfd818faa90017a80291c14f86383 Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Mon, 27 Apr 2020 17:57:20 -0400
Subject: [PATCH] bind: update to 9.16.2; Claim maintainer
---
common/shlibs | 14 +++----
srcpkgs/bind/patches/bind.so_bsdcompat.patch | 11 -----
srcpkgs/bind/template | 43 ++++++++------------
srcpkgs/bind/update | 1 +
4 files changed, 24 insertions(+), 45 deletions(-)
delete mode 100644 srcpkgs/bind/patches/bind.so_bsdcompat.patch
diff --git a/common/shlibs b/common/shlibs
index 419ff4641d2..9f57b500d0a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1050,13 +1050,13 @@ libgssglue.so.1 libgssglue-0.3_1
libtirpc.so.3 libtirpc-1.0.2_1
librpcsecgss.so.3 librpcsecgss-0.19_1
libnfsidmap.so.1 libnfsidmap-2.4.3_2
-libbind9.so.161 bind-libs-9.11.5_1
-libdns.so.1107 bind-libs-9.11.10_1
-libirs.so.161 bind-libs-9.11.5_1
-libisc.so.1104 bind-libs-9.11.13_1
-libisccc.so.161 bind-libs-9.11.5_1
-libisccfg.so.163 bind-libs-9.11.5_1
-liblwres.so.161 bind-libs-9.11.5_1
+libbind9.so.1600 bind-libs-9.16.2_1
+libdns.so.1602 bind-libs-9.16.2_1
+libirs.so.1600 bind-libs-9.16.2_1
+libisc.so.1602 bind-libs-9.16.2_1
+libisccc.so.1600 bind-libs-9.16.2_1
+libisccfg.so.1600 bind-libs-9.16.2_1
+libns.so.1602 bind-libs-9.16.2_1
libplist.so.3 libplist-1.12_1
libplist++.so.3 libplist++-1.12_1
libnsbmp.so.0 libnsbmp-0.0.3_1
diff --git a/srcpkgs/bind/patches/bind.so_bsdcompat.patch b/srcpkgs/bind/patches/bind.so_bsdcompat.patch
deleted file mode 100644
index 5d78031b7b0..00000000000
--- a/srcpkgs/bind/patches/bind.so_bsdcompat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/isc/unix/socket.c.orig 2005-11-03 17:08:42.000000000 -0600
-+++ ./lib/isc/unix/socket.c 2006-02-18 13:09:15.000000000 -0600
-@@ -245,6 +245,8 @@
-
- #define SOCK_DEAD(s) ((s)->references == 0)
-
-+#undef SO_BSDCOMPAT
-+
- static void
- manager_log(isc_socketmgr_t *sockmgr,
- isc_logcategory_t *category, isc_logmodule_t *module, int level,
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 135b0baff8d..dcf6785a4d4 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,6 @@
# Template file for 'bind'
pkgname=bind
-reverts="9.13.6_1"
-version=9.11.13
+version=9.16.2
revision=1
_fullver="${version}${_patchver:+-${_patchver}}"
wrksrc="${pkgname}-${_fullver}"
@@ -9,19 +8,22 @@ build_style=gnu-configure
configure_args="--disable-static --enable-threads --enable-largefile
--with-libtool --enable-atomic --sysconfdir=/etc/named --enable-epoll
--enable-ipv6 --with-randomdev=/dev/random --with-ecdsa=yes --with-eddsa=no
- --with-libtool --with-openssl=${XBPS_CROSS_BASE}/usr --without-gssapi --without-gost
- --enable-openssl-hash --with-readline --with-tuning=default --without-python
- --enable-fetchlimit --enable-sit --with-libidn2 $(vopt_enable seccomp)
+ --with-libtool --with-openssl=${XBPS_CROSS_BASE}/usr --without-gssapi
+ --without-gost --enable-openssl-hash --with-readline --with-tuning=default
+ --without-python --enable-fetchlimit --enable-sit
+ --with-libidn2 $(vopt_enable seccomp)
$(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
-hostmakedepends="automake libtool perl"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel libatomic-devel
- libidn2-devel $(vopt_if geoip geoip-devel) $(vopt_if seccomp libseccomp-devel)"
+hostmakedepends="automake libtool perl pkg-config"
+makedepends="libressl-devel libxml2-devel libcap-devel readline-devel
+ libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)
+ $(vopt_if seccomp libseccomp-devel)"
short_desc="Berkeley Internet Name Domain server"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="ISC"
+maintainer="Randy McCaskill <randy@mccaskill.us>"
+license="MPL-2.0"
homepage="https://www.isc.org/downloads/bind/"
-distfiles="https://ftp.isc.org/isc/bind9/${_fullver}/bind-${_fullver}.tar.gz"
-checksum=fd3f3cc9fcfcdaa752db35eb24598afa1fdcc2509d3227fc90a8631b7b400f7d
+changelog="https://gitlab.isc.org/isc-projects/bind9/-/blob/v9_16/CHANGES"
+distfiles="https://ftp.isc.org/isc/bind9/${_fullver}/bind-${_fullver}.tar.xz"
+checksum=d9e5b77cfca5ccad97f19cddc87128758ec15c16e6585000c6b2f84fc225993f
conf_files="/etc/named/named.conf"
system_accounts="named"
@@ -36,14 +38,6 @@ case "$XBPS_TARGET_MACHINE" in
x86_64*|i686*) build_options_default+=" seccomp";;
esac
-pre_configure() {
- # various bind-utils segfault with musl-1.1.24 in catgets
- # TODO: actually fix instead of disabling it
- case "$XBPS_TARGET_MACHINE" in
- *-musl) vsed -e 's/#define HAVE_CATGETS 1//g' -i configure
- esac
-}
-
do_check() {
# requires special network setup
:
@@ -63,7 +57,7 @@ post_install() {
bind-libs_package() {
short_desc+=" - Runtime libraries"
pkg_install() {
- vmove usr/lib/*.so.*
+ vmove "usr/lib/*.so.*"
}
}
@@ -81,12 +75,7 @@ bind-devel_package() {
depends="bind-libs>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
- vmove usr/bin/isc-config.sh
- vmove usr/bin/bind9-config
- vmove usr/share/man/man1/isc-config.sh.1
- vmove usr/share/man/man1/bind9-config.1
vmove usr/include
- vmove usr/share/man/man3
- vmove usr/lib/*.so
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/bind/update b/srcpkgs/bind/update
index 1333af1353a..60b037222f8 100644
--- a/srcpkgs/bind/update
+++ b/srcpkgs/bind/update
@@ -1,2 +1,3 @@
site="http://ftp.isc.org/isc/bind9/"
pattern="9\.[\d.]+(?=/)"
+ignore="*.*[13579].*"
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Merged]: bind: update to 9.16.2; Claim maintainer
2020-04-28 0:15 [PR PATCH] bind: update to 9.16.2 rmccask
` (5 preceding siblings ...)
2020-04-29 21:24 ` rmccask
@ 2020-05-05 14:27 ` Gottox
6 siblings, 0 replies; 8+ messages in thread
From: Gottox @ 2020-05-05 14:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
There's a merged pull request on the void-packages repository
bind: update to 9.16.2; Claim maintainer
https://github.com/void-linux/void-packages/pull/21417
Description:
^ permalink raw reply [flat|nested] 8+ messages in thread