* [Buildroot] [PATCH v2 next] package/bind: update to 9.18.28
@ 2024-08-13 3:10 Waldemar Brodkorb
2024-08-14 21:51 ` Thomas Petazzoni via buildroot
0 siblings, 1 reply; 2+ messages in thread
From: Waldemar Brodkorb @ 2024-08-13 3:10 UTC (permalink / raw)
To: buildroot
Bind 9.16.x is EOL since April 2024.
See here for what version should be used in production:
https://kb.isc.org/docs/aa-01540
Remove patch 0001 as CC_FOR_BUILD is used in upstream code
to compile host utility gen.
Add new patch 0001 to fix a rndc linking error.
See here for a changelog:
https://downloads.isc.org/isc/bind9/9.18.28/doc/arm/html/notes.html
COPYRIGHT file has been updated, following Copyright holders were
added:
Copyright Joyent, Inc. and other Node contributors. All rights reserved.
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
v1->v2:
- add patch to fix a linking error reported by Thomas P.
---
.checkpackageignore | 1 -
package/bind/0001-cross.patch | 34 -------------------
...1-rndc-add-missing-libns-CFLAGS-LIBS.patch | 34 +++++++++++++++++++
package/bind/bind.hash | 8 ++---
package/bind/bind.mk | 5 ++-
5 files changed, 42 insertions(+), 40 deletions(-)
delete mode 100644 package/bind/0001-cross.patch
create mode 100644 package/bind/0001-rndc-add-missing-libns-CFLAGS-LIBS.patch
diff --git a/.checkpackageignore b/.checkpackageignore
index 8fe4a16eb8..4f78f7d4aa 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -338,7 +338,6 @@ package/benejson/0001-c-std.patch lib_patch.Upstream
package/benejson/0002-Use-print-as-a-function-for-Py3-compatibility.patch lib_patch.Upstream
package/berkeleydb/0001-cwd-db_config.patch lib_patch.Upstream
package/berkeleydb/0002-atomic_compare_exchange.patch lib_patch.Upstream
-package/bind/0001-cross.patch lib_patch.Upstream
package/bind/S81named Shellcheck lib_sysv.Indent lib_sysv.Variables
package/bird/0001-configure.ac-fix-build-with-autoconf-2.70.patch lib_patch.Upstream
package/bmx7/0001-Fix-schedule.c-378-36-error-SIOCGSTAMP-undeclared.patch lib_patch.Upstream
diff --git a/package/bind/0001-cross.patch b/package/bind/0001-cross.patch
deleted file mode 100644
index f39be2f837..0000000000
--- a/package/bind/0001-cross.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 505cc9fcadda5607dc4c5bacb03928c0b35162a8 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Wed, 4 Nov 2020 17:51:38 +0100
-Subject: [PATCH] Use host compiler to build 'gen' since it's run when
- building.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-[Fabrice: updated for 9.11.10]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
----
- lib/dns/Makefile.in | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
-index 8fc4e94f26..4ac92857e0 100644
---- a/lib/dns/Makefile.in
-+++ b/lib/dns/Makefile.in
-@@ -184,10 +184,8 @@ code.h: gen
- ./gen -s ${srcdir} > code.h || { rm -f $@ ; exit 1; }
-
- gen: gen.c
-- ${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \
-- ${LFS_CFLAGS} ${LFS_LDFLAGS} \
-- ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c \
-- ${BUILD_LIBS} ${LFS_LIBS}
-+ ${HOSTCC} ${HOST_CFLAGS} -I${top_srcdir}/lib/isc/include \
-+ ${HOST_LDFLAGS} -o $@ ${srcdir}/gen.c
-
- timestamp: include libdns.@A@
- touch timestamp
---
-2.29.1
-
diff --git a/package/bind/0001-rndc-add-missing-libns-CFLAGS-LIBS.patch b/package/bind/0001-rndc-add-missing-libns-CFLAGS-LIBS.patch
new file mode 100644
index 0000000000..ef7f5ff0dc
--- /dev/null
+++ b/package/bind/0001-rndc-add-missing-libns-CFLAGS-LIBS.patch
@@ -0,0 +1,34 @@
+From 1a7d7caa699a18d28db09af7329b8c145ec86d63 Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <wbx@openadk.org>
+Date: Sun, 11 Aug 2024 11:13:08 +0200
+Subject: [PATCH] rndc: add missing libns CFLAGS/LIBS
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+Upstream: https://gitlab.isc.org/isc-projects/bind9/-/issues/4840
+---
+ bin/rndc/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/bin/rndc/Makefile.am b/bin/rndc/Makefile.am
+index a668522bc2..77071e7569 100644
+--- a/bin/rndc/Makefile.am
++++ b/bin/rndc/Makefile.am
+@@ -2,6 +2,7 @@ include $(top_srcdir)/Makefile.top
+
+ AM_CPPFLAGS += \
+ $(LIBISC_CFLAGS) \
++ $(LIBNS_CFLAGS) \
+ $(LIBDNS_CFLAGS) \
+ $(LIBISCCFG_CFLAGS) \
+ $(LIBISCCC_CFLAGS) \
+@@ -20,6 +21,7 @@ rndc_SOURCES = \
+
+ rndc_LDADD = \
+ $(LIBISC_LIBS) \
++ $(LIBNS_LIBS) \
+ $(LIBDNS_LIBS) \
+ $(LIBISCCC_LIBS) \
+ $(LIBISCCFG_LIBS) \
+--
+2.39.2
+
diff --git a/package/bind/bind.hash b/package/bind/bind.hash
index 482b046c8d..feb3430a73 100644
--- a/package/bind/bind.hash
+++ b/package/bind/bind.hash
@@ -1,4 +1,4 @@
-# Verified from https://ftp.isc.org/isc/bind9/9.16.48/bind-9.16.48.tar.xz.asc
-# with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD
-sha256 8d3814582348f90dead1ad410b1019094cd399d3d83930abebb2b3b1eb0b2bbb bind-9.16.48.tar.xz
-sha256 13491a682dc0f5ee2273cebd3949e2be62f9470fe659419a03a308d4f444773b COPYRIGHT
+# Verified from https://ftp.isc.org/isc/bind9/9.18.28/bind-9.18.28.tar.xz.asc
+# with key 706B6C28620E76F91D11F7DF510A642A06C52CEC
+sha256 e7cce9a165f7b619eefc4832f0a8dc16b005d29e3890aed6008c506ea286a5e7 bind-9.18.28.tar.xz
+sha256 9734825d67a3ac967b2c2f7c9a83c9e5db1c2474dbe9599157c3a4188749ebd4 COPYRIGHT
diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index 0d81ffabd6..61aa557f0b 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -4,7 +4,7 @@
#
################################################################################
-BIND_VERSION = 9.16.48
+BIND_VERSION = 9.18.28
BIND_SOURCE= bind-$(BIND_VERSION).tar.xz
BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION)
# bind does not support parallel builds.
@@ -24,6 +24,8 @@ BIND_TARGET_SERVER_SBIN += lwresd named named-checkconf named-checkzone
BIND_TARGET_SERVER_SBIN += named-compilezone rndc rndc-confgen dnssec-dsfromkey
BIND_TARGET_SERVER_SBIN += dnssec-keyfromlabel dnssec-signzone tsig-keygen
BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate
+# 0001-rndc-add-missing-libns-CFLAGS-LIBS.patch
+BIND_AUTORECONF = YES
BIND_CONF_ENV = \
BUILD_CC="$(TARGET_CC)" \
LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl`
@@ -31,6 +33,7 @@ BIND_CONF_OPTS = \
--without-cmocka \
--without-lmdb \
--enable-epoll \
+ --disable-doh \
--disable-backtrace \
--with-openssl=$(STAGING_DIR)/usr
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH v2 next] package/bind: update to 9.18.28
2024-08-13 3:10 [Buildroot] [PATCH v2 next] package/bind: update to 9.18.28 Waldemar Brodkorb
@ 2024-08-14 21:51 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-08-14 21:51 UTC (permalink / raw)
To: Waldemar Brodkorb; +Cc: buildroot
On Tue, 13 Aug 2024 05:10:23 +0200
Waldemar Brodkorb <wbx@openadk.org> wrote:
> Bind 9.16.x is EOL since April 2024.
> See here for what version should be used in production:
> https://kb.isc.org/docs/aa-01540
>
> Remove patch 0001 as CC_FOR_BUILD is used in upstream code
> to compile host utility gen.
>
> Add new patch 0001 to fix a rndc linking error.
>
> See here for a changelog:
> https://downloads.isc.org/isc/bind9/9.18.28/doc/arm/html/notes.html
>
> COPYRIGHT file has been updated, following Copyright holders were
> added:
> Copyright Joyent, Inc. and other Node contributors. All rights reserved.
>
> Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
> ---
> v1->v2:
> - add patch to fix a linking error reported by Thomas P.
> ---
> .checkpackageignore | 1 -
> package/bind/0001-cross.patch | 34 -------------------
> ...1-rndc-add-missing-libns-CFLAGS-LIBS.patch | 34 +++++++++++++++++++
> package/bind/bind.hash | 8 ++---
> package/bind/bind.mk | 5 ++-
> 5 files changed, 42 insertions(+), 40 deletions(-)
> delete mode 100644 package/bind/0001-cross.patch
> create mode 100644 package/bind/0001-rndc-add-missing-libns-CFLAGS-LIBS.patch
Thanks a lot, but your patch fixing the issue has been rejected
upstream, claiming the issue is elsewhere, so it looks like more
investigation is needed I'm afraid :/
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-08-14 21:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-13 3:10 [Buildroot] [PATCH v2 next] package/bind: update to 9.18.28 Waldemar Brodkorb
2024-08-14 21:51 ` Thomas Petazzoni via buildroot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).