summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2016-06-13 05:16:26 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-15 08:35:02 +0100
commitc6930da838df8e1cabe2f71180e02d1f6ecc15a6 (patch)
tree4dbf4b86e7043b70e6d2dca2a85b87f7d0b8ea90 /meta
parent7028192246552fd9e4aa3674da9c30670fd4ec86 (diff)
downloadpoky-c6930da838df8e1cabe2f71180e02d1f6ecc15a6.tar.gz
dhcp: upgrade to 4.3.4
- Drop fix-external-bind.patch, which dhcp 4.3.4 supports option --with-libbind=PATH - Add tweak-to-support-external-bind.patch, tweak the external bind to oe-core's sysroot rather than external bind source build. - Drop CVE-2015-8605.patch, CVE-2016-2774.patch, dhcp 4.3.4 has fixed them - Add configure option --with-randomdev=/dev/random (From OE-Core rev: f9172ba3a26a1dc6fc010ed0f1300782fa411636) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp.inc3
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch6
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/CVE-2015-8605.patch99
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/CVE-2016-2774.patch65
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch2
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch115
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch78
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/libxml2-configure-argument.patch19
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/link-with-lcrypto.patch21
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch34
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/tweak-to-support-external-bind.patch117
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp_4.3.4.bb (renamed from meta/recipes-connectivity/dhcp/dhcp_4.3.3.bb)8
12 files changed, 222 insertions, 345 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index 5e396f1594..d237d5824f 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -46,7 +46,8 @@ EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \
46 --with-cli-lease-file=${localstatedir}/lib/dhcp/dhclient.leases \ 46 --with-cli-lease-file=${localstatedir}/lib/dhcp/dhclient.leases \
47 --with-cli6-lease-file=${localstatedir}/lib/dhcp/dhclient6.leases \ 47 --with-cli6-lease-file=${localstatedir}/lib/dhcp/dhclient6.leases \
48 --with-libbind=${STAGING_LIBDIR}/ \ 48 --with-libbind=${STAGING_LIBDIR}/ \
49 --enable-paranoia \ 49 --enable-paranoia \
50 --with-randomdev=/dev/random \
50 " 51 "
51 52
52do_install_append () { 53do_install_append () {
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch
index 434421230a..47443a50ef 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch
@@ -8,10 +8,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
8 1 file changed, 1 insertion(+), 1 deletion(-) 8 1 file changed, 1 insertion(+), 1 deletion(-)
9 9
10diff --git a/includes/site.h b/includes/site.h 10diff --git a/includes/site.h b/includes/site.h
11index 73fa4e8..9c33de3 100644 11index 1dd1251..abb66e4 100644
12--- a/includes/site.h 12--- a/includes/site.h
13+++ b/includes/site.h 13+++ b/includes/site.h
14@@ -280,7 +280,7 @@ 14@@ -289,7 +289,7 @@
15 situations. We plan to revisit this feature and may 15 situations. We plan to revisit this feature and may
16 make non-backwards compatible changes including the 16 make non-backwards compatible changes including the
17 removal of this define. Use at your own risk. */ 17 removal of this define. Use at your own risk. */
@@ -21,5 +21,5 @@ index 73fa4e8..9c33de3 100644
21 /* Include old error codes. This is provided in case you 21 /* Include old error codes. This is provided in case you
22 are building an external program similar to omshell for 22 are building an external program similar to omshell for
23-- 23--
241.9.1 242.8.1
25 25
diff --git a/meta/recipes-connectivity/dhcp/dhcp/CVE-2015-8605.patch b/meta/recipes-connectivity/dhcp/dhcp/CVE-2015-8605.patch
deleted file mode 100644
index 923d5d5c58..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/CVE-2015-8605.patch
+++ /dev/null
@@ -1,99 +0,0 @@
1Solves CVE-2015-8605 that caused DoS when an invalid lenght field in IPv4 UDP
2was recived by the server.
3
4Upstream-Status: Backport
5CVE: CVE-2015-8605
6
7Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
8
9=======================================================================
10diff --git a/common/packet.c b/common/packet.c
11index b530432..e600e37 100644
12--- a/common/packet.c
13+++ b/common/packet.c
14@@ -220,7 +220,28 @@ ssize_t decode_hw_header (interface, buf, bufix, from)
15 }
16 }
17
18-/* UDP header and IP header decoded together for convenience. */
19+/*!
20+ *
21+ * \brief UDP header and IP header decoded together for convenience.
22+ *
23+ * Attempt to decode the UDP and IP headers and, if necessary, checksum
24+ * the packet.
25+ *
26+ * \param inteface - the interface on which the packet was recevied
27+ * \param buf - a pointer to the buffer for the received packet
28+ * \param bufix - where to start processing the buffer, previous
29+ * routines may have processed parts of the buffer already
30+ * \param from - space to return the address of the packet sender
31+ * \param buflen - remaining length of the buffer, this will have been
32+ * decremented by bufix by the caller
33+ * \param rbuflen - space to return the length of the payload from the udp
34+ * header
35+ * \param csum_ready - indication if the checksum is valid for use
36+ * non-zero indicates the checksum should be validated
37+ *
38+ * \return - the index to the first byte of the udp payload (that is the
39+ * start of the DHCP packet
40+ */
41
42 ssize_t
43 decode_udp_ip_header(struct interface_info *interface,
44@@ -231,7 +252,7 @@ decode_udp_ip_header(struct interface_info *interface,
45 unsigned char *data;
46 struct ip ip;
47 struct udphdr udp;
48- unsigned char *upp, *endbuf;
49+ unsigned char *upp;
50 u_int32_t ip_len, ulen, pkt_len;
51 static unsigned int ip_packets_seen = 0;
52 static unsigned int ip_packets_bad_checksum = 0;
53@@ -241,11 +262,8 @@ decode_udp_ip_header(struct interface_info *interface,
54 static unsigned int udp_packets_length_overflow = 0;
55 unsigned len;
56
57- /* Designate the end of the input buffer for bounds checks. */
58- endbuf = buf + bufix + buflen;
59-
60 /* Assure there is at least an IP header there. */
61- if ((buf + bufix + sizeof(ip)) > endbuf)
62+ if (sizeof(ip) > buflen)
63 return -1;
64
65 /* Copy the IP header into a stack aligned structure for inspection.
66@@ -257,13 +275,17 @@ decode_udp_ip_header(struct interface_info *interface,
67 ip_len = (*upp & 0x0f) << 2;
68 upp += ip_len;
69
70- /* Check the IP packet length. */
71+ /* Check packet lengths are within the buffer:
72+ * first the ip header (ip_len)
73+ * then the packet length from the ip header (pkt_len)
74+ * then the udp header (ip_len + sizeof(udp)
75+ * We are liberal in what we accept, the udp payload should fit within
76+ * pkt_len, but we only check against the full buffer size.
77+ */
78 pkt_len = ntohs(ip.ip_len);
79- if (pkt_len > buflen)
80- return -1;
81-
82- /* Assure after ip_len bytes that there is enough room for a UDP header. */
83- if ((upp + sizeof(udp)) > endbuf)
84+ if ((ip_len > buflen) ||
85+ (pkt_len > buflen) ||
86+ ((ip_len + sizeof(udp)) > buflen))
87 return -1;
88
89 /* Copy the UDP header into a stack aligned structure for inspection. */
90@@ -284,7 +306,8 @@ decode_udp_ip_header(struct interface_info *interface,
91 return -1;
92
93 udp_packets_length_checked++;
94- if ((upp + ulen) > endbuf) {
95+ /* verify that the payload length from the udp packet fits in the buffer */
96+ if ((ip_len + ulen) > buflen) {
97 udp_packets_length_overflow++;
98 if (((udp_packets_length_checked > 4) &&
99 (udp_packets_length_overflow != 0)) &&
diff --git a/meta/recipes-connectivity/dhcp/dhcp/CVE-2016-2774.patch b/meta/recipes-connectivity/dhcp/dhcp/CVE-2016-2774.patch
deleted file mode 100644
index 4836dbc2ac..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/CVE-2016-2774.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1From b9f56d578ebfd649b5d829960540859ac6ca931c Mon Sep 17 00:00:00 2001
2From: Catalin Enache <catalin.enache@windriver.com>
3Date: Tue, 12 Apr 2016 18:23:31 +0300
4Subject: [PATCH] Add patch to limit the value of an fd we accept for a
5 connection.
6
7By limiting the highest value we accept for an fd we limit the number
8of connections.
9
10Upstream-Status: Backport
11CVE: CVE-2016-2774
12
13Author: Shawn Routhier <sar@isc.org>
14Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
15---
16 includes/site.h | 6 ++++++
17 omapip/listener.c | 9 +++++++--
18 3 files changed, 18 insertions(+), 2 deletions(-)
19
20diff --git a/includes/site.h b/includes/site.h
21index 9c33de3..df020c8 100644
22--- a/includes/site.h
23+++ b/includes/site.h
24@@ -290,6 +290,12 @@
25 this option will be removed at some time. */
26 /* #define INCLUDE_OLD_DHCP_ISC_ERROR_CODES */
27
28+/* Limit the value of a file descriptor the serve will use
29+ when accepting a connecting request. This can be used to
30+ limit the number of TCP connections that the server will
31+ allow at one time. A value of 0 means there is no limit.*/
32+#define MAX_FD_VALUE 200
33+
34 /* Include definitions for various options. In general these
35 should be left as is, but if you have already defined one
36 of these and prefer your definition you can comment the
37diff --git a/omapip/listener.c b/omapip/listener.c
38index 8bdcdbd..61473cf 100644
39--- a/omapip/listener.c
40+++ b/omapip/listener.c
41@@ -3,7 +3,7 @@
42 Subroutines that support the generic listener object. */
43
44 /*
45- * Copyright (c) 2012,2014 by Internet Systems Consortium, Inc. ("ISC")
46+ * Copyright (c) 2012,2014,2016 by Internet Systems Consortium, Inc. ("ISC")
47 * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
48 * Copyright (c) 1999-2003 by Internet Software Consortium
49 *
50@@ -233,7 +233,12 @@ isc_result_t omapi_accept (omapi_object_t *h)
51 return ISC_R_NORESOURCES;
52 return ISC_R_UNEXPECTED;
53 }
54-
55+
56+ if ((MAX_FD_VALUE != 0) && (socket > MAX_FD_VALUE)) {
57+ close(socket);
58+ return (ISC_R_NORESOURCES);
59+ }
60+
61 #if defined (TRACING)
62 /* If we're recording a trace, remember the connection. */
63 if (trace_record ()) {
64--
652.7.4
diff --git a/meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch b/meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch
index 47ea5554b8..96095a5e08 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch
@@ -66,5 +66,5 @@ diff --git a/client/scripts/linux b/client/scripts/linux
66 } 66 }
67 67
68-- 68--
691.8.1.2 692.8.1
70 70
diff --git a/meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch b/meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch
deleted file mode 100644
index 956c5d8b58..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch
+++ /dev/null
@@ -1,115 +0,0 @@
1Upstream-Status: Pending
2
311/30/2010
4--with-libbind=PATH is available but not used by Makefile,
5this patch is to allow building with external bind
6
7Signed-off-by: Qing He <qing.he@intel.com>
8
9Rebase the patch to 4.3.3
10Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11---
12diff --git a/Makefile.am b/Makefile.am
13--- a/Makefile.am
14+++ b/Makefile.am
15@@ -25,7 +25,7 @@ EXTRA_DIST = RELNOTES LICENSE \
16 bind/Makefile.in bind/bind.tar.gz bind/version.tmp \
17 common/tests/Atffile server/tests/Atffile
18
19-SUBDIRS = bind includes tests common omapip client dhcpctl relay server
20+SUBDIRS = includes tests common omapip client dhcpctl relay server
21
22 nobase_include_HEADERS = dhcpctl/dhcpctl.h
23
24diff --git a/client/Makefile.am b/client/Makefile.am
25--- a/client/Makefile.am
26+++ b/client/Makefile.am
27@@ -10,8 +10,8 @@ dhclient_SOURCES = clparse.c dhclient.c dhc6.c \
28 scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
29 scripts/netbsd scripts/nextstep scripts/openbsd \
30 scripts/solaris scripts/openwrt
31-dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../bind/lib/libirs.a \
32- ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a
33+dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a $(libbind)/libirs.a \
34+ $(libbind)/libdns.a $(libbind)/libisccfg.a $(libbind)/libisc.a
35 man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
36 EXTRA_DIST = $(man_MANS)
37
38diff --git a/configure.ac b/configure.ac
39--- a/configure.ac
40+++ b/configure.ac
41@@ -623,6 +623,7 @@ no)
42 fi
43 ;;
44 esac
45+AC_SUBST([libbind])
46
47 # OpenLDAP support.
48 AC_ARG_WITH(ldap,
49diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am
50--- a/dhcpctl/Makefile.am
51+++ b/dhcpctl/Makefile.am
52@@ -6,12 +6,12 @@ EXTRA_DIST = $(man_MANS)
53
54 omshell_SOURCES = omshell.c
55 omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
56- ../bind/lib/libirs.a ../bind/lib/libdns.a \
57- ../bind/lib/libisccfg.a ../bind/lib/libisc.a
58+ $(libbind)/libirs.a $(libbind)/libdns.a \
59+ $(libbind)/libisccfg.a $(libbind)/libisc.a
60
61 libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
62
63 cltest_SOURCES = cltest.c
64 cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
65- ../bind/lib/libirs.a ../bind/lib/libdns.a \
66- ../bind/lib/libisccfg.a ../bind/lib/libisc.a
67+ $(libbind)/libirs.a $(libbind)/libdns.a \
68+ $(libbind)/libisccfg.a $(libbind)/libisc.a
69diff --git a/omapip/Makefile.am b/omapip/Makefile.am
70--- a/omapip/Makefile.am
71+++ b/omapip/Makefile.am
72@@ -10,6 +10,6 @@ man_MANS = omapi.3
73 EXTRA_DIST = $(man_MANS)
74
75 svtest_SOURCES = test.c
76-svtest_LDADD = libomapi.a ../bind/lib/libirs.a ../bind/lib/libdns.a \
77- ../bind/lib/libisccfg.a ../bind/lib/libisc.a
78+svtest_LDADD = libomapi.a $(libbind)/libirs.a $(libbind)/libdns.a \
79+ $(libbind)/libisccfg.a $(libbind)/libisc.a
80
81diff --git a/relay/Makefile.am b/relay/Makefile.am
82--- a/relay/Makefile.am
83+++ b/relay/Makefile.am
84@@ -3,8 +3,8 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
85 sbin_PROGRAMS = dhcrelay
86 dhcrelay_SOURCES = dhcrelay.c
87 dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
88- ../bind/lib/libirs.a ../bind/lib/libdns.a \
89- ../bind/lib/libisccfg.a ../bind/lib/libisc.a
90+ $(libbind)/libirs.a $(libbind)/libdns.a \
91+ $(libbind)/libisccfg.a $(libbind)/libisc.a
92 man_MANS = dhcrelay.8
93 EXTRA_DIST = $(man_MANS)
94
95diff --git a/server/Makefile.am b/server/Makefile.am
96--- a/server/Makefile.am
97+++ b/server/Makefile.am
98@@ -14,10 +14,12 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
99
100 dhcpd_CFLAGS = $(LDAP_CFLAGS)
101 dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
102- ../dhcpctl/libdhcpctl.a ../bind/lib/libirs.a \
103- ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a \
104+ ../dhcpctl/libdhcpctl.a $(libbind)/libirs.a \
105+ $(libbind)/libdns.a $(libbind)/libisccfg.a $(libbind)/libisc.a \
106 $(LDAP_LIBS)
107
108+ dhcpd_CFLAGS = $(LDAP_CFLAGS)
109+
110 man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
111 EXTRA_DIST = $(man_MANS)
112
113--
1141.9.1
115
diff --git a/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch b/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch
index b3f8fdb0a1..2f44147ad6 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch
@@ -4,80 +4,88 @@ Upstream-Status: Pending
4 4
5RP 2013/03/21 5RP 2013/03/21
6 6
7Rebase to 4.3.1 7Rebase to 4.3.4
8
8Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 9Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
9--- 10---
11 client/Makefile.am | 4 ++--
12 common/Makefile.am | 3 ++-
13 dhcpctl/Makefile.am | 2 ++
14 omapip/Makefile.am | 1 +
15 relay/Makefile.am | 2 +-
16 server/Makefile.am | 2 +-
17 6 files changed, 9 insertions(+), 5 deletions(-)
18
10diff --git a/client/Makefile.am b/client/Makefile.am 19diff --git a/client/Makefile.am b/client/Makefile.am
11index 8411960..1740f72 100644 20index 2cb83d8..4730bb3 100644
12--- a/client/Makefile.am 21--- a/client/Makefile.am
13+++ b/client/Makefile.am 22+++ b/client/Makefile.am
14@@ -4,6 +4,8 @@ 23@@ -7,11 +7,11 @@ SUBDIRS = . tests
15 # production code. Sadly, we are not there yet. 24 BINDLIBDIR = @BINDDIR@/lib
16 SUBDIRS = . tests 25
26 AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
27- -DLOCALSTATEDIR='"$(localstatedir)"'
28+ -DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes
17 29
18+AM_CPPFLAGS = -I$(top_srcdir)/includes
19+
20 dist_sysconf_DATA = dhclient.conf.example 30 dist_sysconf_DATA = dhclient.conf.example
21 sbin_PROGRAMS = dhclient 31 sbin_PROGRAMS = dhclient
22 dhclient_SOURCES = clparse.c dhclient.c dhc6.c \ 32-dhclient_SOURCES = clparse.c dhclient.c dhc6.c \
23@@ -17,8 +19,8 @@ EXTRA_DIST = $(man_MANS) 33+dhclient_SOURCES = $(srcdir)/clparse.c $(srcdir)/dhclient.c $(srcdir)/dhc6.c \
24 34 scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
25 dhclient.o: dhclient.c 35 scripts/netbsd scripts/nextstep scripts/openbsd \
26 $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ 36 scripts/solaris scripts/openwrt
27- -DLOCALSTATEDIR='"$(localstatedir)"' -c dhclient.c
28+ -DLOCALSTATEDIR='"$(localstatedir)"' -c $(srcdir)/dhclient.c
29
30 dhc6.o: dhc6.c
31 $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
32- -DLOCALSTATEDIR='"$(localstatedir)"' -c dhc6.c
33+ -DLOCALSTATEDIR='"$(localstatedir)"' -c $(srcdir)/dhc6.c
34diff --git a/common/Makefile.am b/common/Makefile.am 37diff --git a/common/Makefile.am b/common/Makefile.am
35index eddef05..5ce045f 100644 38index 113aee8..0f24fbb 100644
36--- a/common/Makefile.am 39--- a/common/Makefile.am
37+++ b/common/Makefile.am 40+++ b/common/Makefile.am
38@@ -1,4 +1,4 @@ 41@@ -1,4 +1,5 @@
39-AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' 42-AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"'
40+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' 43+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"'
44+
41 AM_CFLAGS = $(LDAP_CFLAGS) 45 AM_CFLAGS = $(LDAP_CFLAGS)
42 46
43 noinst_LIBRARIES = libdhcp.a 47 noinst_LIBRARIES = libdhcp.a
44diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am 48diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am
45index 2987a53..cd72d75 100644 49index ceb0de1..ba8dd8b 100644
46--- a/dhcpctl/Makefile.am 50--- a/dhcpctl/Makefile.am
47+++ b/dhcpctl/Makefile.am 51+++ b/dhcpctl/Makefile.am
48@@ -1,3 +1,5 @@ 52@@ -1,5 +1,7 @@
53 BINDLIBDIR = @BINDDIR@/lib
54
49+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) 55+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir)
50+ 56+
51 bin_PROGRAMS = omshell 57 bin_PROGRAMS = omshell
52 lib_LIBRARIES = libdhcpctl.a 58 lib_LIBRARIES = libdhcpctl.a
53 noinst_PROGRAMS = cltest 59 noinst_PROGRAMS = cltest
54diff --git a/omapip/Makefile.am b/omapip/Makefile.am 60diff --git a/omapip/Makefile.am b/omapip/Makefile.am
55index 5074479..9c0fab3 100644 61index 446a594..dd1afa0 100644
56--- a/omapip/Makefile.am 62--- a/omapip/Makefile.am
57+++ b/omapip/Makefile.am 63+++ b/omapip/Makefile.am
58@@ -1,3 +1,5 @@ 64@@ -1,4 +1,5 @@
65 BINDLIBDIR = @BINDDIR@/lib
59+AM_CPPFLAGS = -I$(top_srcdir)/includes 66+AM_CPPFLAGS = -I$(top_srcdir)/includes
60+ 67
61 lib_LIBRARIES = libomapi.a 68 lib_LIBRARIES = libomapi.a
62 noinst_PROGRAMS = svtest 69 noinst_PROGRAMS = svtest
63
64diff --git a/relay/Makefile.am b/relay/Makefile.am 70diff --git a/relay/Makefile.am b/relay/Makefile.am
65index ec72a31..f842071 100644 71index 3060eca..6d652f6 100644
66--- a/relay/Makefile.am 72--- a/relay/Makefile.am
67+++ b/relay/Makefile.am 73+++ b/relay/Makefile.am
68@@ -1,4 +1,4 @@ 74@@ -1,6 +1,6 @@
75 BINDLIBDIR = @BINDDIR@/lib
76
69-AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' 77-AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
70+AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes 78+AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
71 79
72 sbin_PROGRAMS = dhcrelay 80 sbin_PROGRAMS = dhcrelay
73 dhcrelay_SOURCES = dhcrelay.c 81 dhcrelay_SOURCES = dhcrelay.c
74diff --git a/server/Makefile.am b/server/Makefile.am 82diff --git a/server/Makefile.am b/server/Makefile.am
75index a446f0b..d0b873a 100644 83index 54feedf..3990b9c 100644
76--- a/server/Makefile.am 84--- a/server/Makefile.am
77+++ b/server/Makefile.am 85+++ b/server/Makefile.am
78@@ -4,7 +4,7 @@ 86@@ -6,7 +6,7 @@ SUBDIRS = . tests
79 # production code. Sadly, we are not there yet. 87
80 SUBDIRS = . tests 88 BINDLIBDIR = @BINDDIR@/lib
81 89
82-AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' 90-AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
83+AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes 91+AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
@@ -85,5 +93,5 @@ index a446f0b..d0b873a 100644
85 dist_sysconf_DATA = dhcpd.conf.example 93 dist_sysconf_DATA = dhcpd.conf.example
86 sbin_PROGRAMS = dhcpd 94 sbin_PROGRAMS = dhcpd
87-- 95--
881.9.1 962.8.1
89 97
diff --git a/meta/recipes-connectivity/dhcp/dhcp/libxml2-configure-argument.patch b/meta/recipes-connectivity/dhcp/dhcp/libxml2-configure-argument.patch
index 9d2fbfb292..14356621c0 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/libxml2-configure-argument.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/libxml2-configure-argument.patch
@@ -5,10 +5,18 @@ Upstream-Status: Pending
5 5
6Signed-off-by: Christopher Larson <chris_larson@mentor.com> 6Signed-off-by: Christopher Larson <chris_larson@mentor.com>
7 7
8--- dhcp-4.3.3.orig/configure.ac 2016-03-16 20:25:53.830697637 -0700 8Rebase to 4.3.4
9+++ dhcp-4.3.3/configure.ac 2016-03-16 20:28:19.415355257 -0700 9Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
10@@ -631,7 +631,16 @@ 10---
11 configure.ac | 11 ++++++++++-
12 1 file changed, 10 insertions(+), 1 deletion(-)
11 13
14diff --git a/configure.ac b/configure.ac
15index 726c88e..1684df1 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -718,7 +718,16 @@ AC_SUBST(BINDSRCDIR)
19
12 # We need to find libxml2 if bind was built with support enabled 20 # We need to find libxml2 if bind was built with support enabled
13 # otherwise we'll fail to build omapip/test.c 21 # otherwise we'll fail to build omapip/test.c
14-AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],) 22-AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],)
@@ -22,6 +30,9 @@ Signed-off-by: Christopher Larson <chris_larson@mentor.com>
22+ AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested]) 30+ AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested])
23+ fi]) 31+ fi])
24+fi 32+fi
25 33
26 # OpenLDAP support. 34 # OpenLDAP support.
27 AC_ARG_WITH(ldap, 35 AC_ARG_WITH(ldap,
36--
372.8.1
38
diff --git a/meta/recipes-connectivity/dhcp/dhcp/link-with-lcrypto.patch b/meta/recipes-connectivity/dhcp/dhcp/link-with-lcrypto.patch
index 57e10b0297..0d0e0dd08e 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/link-with-lcrypto.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/link-with-lcrypto.patch
@@ -5,14 +5,20 @@ From 4.2.0 final release, -lcrypto check was removed and we compile static libra
5from bind that are linked to libcrypto. This is why i added a patch in order to add 5from bind that are linked to libcrypto. This is why i added a patch in order to add
6-lcrypto to LIBS. 6-lcrypto to LIBS.
7 7
8Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
9Upstream-Status: Pending 8Upstream-Status: Pending
9Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
10 10
11Index: dhcp-4.2.3-P2-r0/dhcp-4.2.3-P2/configure.ac 11Rebase to 4.3.4
12=================================================================== 12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13--- dhcp-4.2.3-P2.orig/configure.ac 2012-02-02 18:04:20.843023196 +0200 13---
14+++ dhcp-4.2.3-P2/configure.ac 2012-02-02 17:58:16.000000000 +0200 14 configure.ac | 4 ++++
15@@ -456,6 +456,10 @@ 15 1 file changed, 4 insertions(+)
16
17diff --git a/configure.ac b/configure.ac
18index 097b0c3..726c88e 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -584,6 +584,10 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[void foo() __attribute__((noreturn));
16 # Look for optional headers. 22 # Look for optional headers.
17 AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h) 23 AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
18 24
@@ -23,3 +29,6 @@ Index: dhcp-4.2.3-P2-r0/dhcp-4.2.3-P2/configure.ac
23 # Solaris needs some libraries for functions 29 # Solaris needs some libraries for functions
24 AC_SEARCH_LIBS(socket, [socket]) 30 AC_SEARCH_LIBS(socket, [socket])
25 AC_SEARCH_LIBS(inet_ntoa, [nsl]) 31 AC_SEARCH_LIBS(inet_ntoa, [nsl])
32--
332.8.1
34
diff --git a/meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch b/meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch
index 61dd6a7186..d84df5cd34 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch
@@ -8,23 +8,32 @@ Upstream-Status: Pending
8 8
9Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com> 9Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
10 10
11--- dhcp-4.2.5-P1/client/scripts/linux.orig 2013-09-04 12:22:55.000000000 +0500 11Rebase to 4.3.4
12+++ dhcp-4.2.5-P1/client/scripts/linux 2013-09-04 12:52:19.068761518 +0500 12
13@@ -103,17 +103,11 @@ 13Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
14---
15 client/scripts/linux | 82 ++++++++++++++++++++++++++++------------------------
16 1 file changed, 45 insertions(+), 37 deletions(-)
17
18diff --git a/client/scripts/linux b/client/scripts/linux
19index a02cfd9..232a0aa 100755
20--- a/client/scripts/linux
21+++ b/client/scripts/linux
22@@ -101,17 +101,11 @@ fi
14 if [ x$old_broadcast_address != x ]; then 23 if [ x$old_broadcast_address != x ]; then
15 old_broadcast_arg="broadcast $old_broadcast_address" 24 old_broadcast_arg="broadcast $old_broadcast_address"
16 fi 25 fi
17-if [ x$new_subnet_mask != x ]; then 26-if [ x$new_subnet_mask != x ]; then
18- new_subnet_arg="netmask $new_subnet_mask" 27- new_subnet_arg="netmask $new_subnet_mask"
19-fi 28+if [ -n "$new_subnet_mask" ]; then
29+ new_mask="/$new_subnet_mask"
30 fi
20-if [ x$old_subnet_mask != x ]; then 31-if [ x$old_subnet_mask != x ]; then
21- old_subnet_arg="netmask $old_subnet_mask" 32- old_subnet_arg="netmask $old_subnet_mask"
22-fi 33-fi
23-if [ x$alias_subnet_mask != x ]; then 34-if [ x$alias_subnet_mask != x ]; then
24- alias_subnet_arg="netmask $alias_subnet_mask" 35- alias_subnet_arg="netmask $alias_subnet_mask"
25+if [ -n "$new_subnet_mask" ]; then 36-fi
26+ new_mask="/$new_subnet_mask"
27 fi
28-if [ x$new_interface_mtu != x ]; then 37-if [ x$new_interface_mtu != x ]; then
29- mtu_arg="mtu $new_interface_mtu" 38- mtu_arg="mtu $new_interface_mtu"
30+if [ -n "$alias_subnet_mask" ]; then 39+if [ -n "$alias_subnet_mask" ]; then
@@ -32,7 +41,7 @@ Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
32 fi 41 fi
33 if [ x$IF_METRIC != x ]; then 42 if [ x$IF_METRIC != x ]; then
34 metric_arg="metric $IF_METRIC" 43 metric_arg="metric $IF_METRIC"
35@@ -127,9 +121,9 @@ 44@@ -125,9 +119,9 @@ fi
36 if [ x$reason = xPREINIT ]; then 45 if [ x$reason = xPREINIT ]; then
37 if [ x$alias_ip_address != x ]; then 46 if [ x$alias_ip_address != x ]; then
38 # Bring down alias interface. Its routes will disappear too. 47 # Bring down alias interface. Its routes will disappear too.
@@ -44,7 +53,7 @@ Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
44 53
45 # We need to give the kernel some time to get the interface up. 54 # We need to give the kernel some time to get the interface up.
46 sleep 1 55 sleep 1
47@@ -156,25 +150,30 @@ 56@@ -154,25 +148,30 @@ if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
48 if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \ 57 if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
49 [ x$alias_ip_address != x$old_ip_address ]; then 58 [ x$alias_ip_address != x$old_ip_address ]; then
50 # Possible new alias. Remove old alias. 59 # Possible new alias. Remove old alias.
@@ -81,7 +90,7 @@ Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
81 done 90 done
82 else 91 else
83 # we haven't changed the address, have we changed other options 92 # we haven't changed the address, have we changed other options
84@@ -182,21 +181,23 @@ 93@@ -180,21 +179,23 @@ if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
85 if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then 94 if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then
86 # if we've changed routers delete the old and add the new. 95 # if we've changed routers delete the old and add the new.
87 for router in $old_routers; do 96 for router in $old_routers; do
@@ -112,7 +121,7 @@ Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
112 fi 121 fi
113 make_resolv_conf 122 make_resolv_conf
114 exit_with_hooks 0 123 exit_with_hooks 0
115@@ -206,42 +207,49 @@ 124@@ -204,42 +205,49 @@ if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \
116 || [ x$reason = xSTOP ]; then 125 || [ x$reason = xSTOP ]; then
117 if [ x$alias_ip_address != x ]; then 126 if [ x$alias_ip_address != x ]; then
118 # Turn off alias interface. 127 # Turn off alias interface.
@@ -174,3 +183,6 @@ Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
174 exit_with_hooks 1 183 exit_with_hooks 1
175 fi 184 fi
176 185
186--
1872.8.1
188
diff --git a/meta/recipes-connectivity/dhcp/dhcp/tweak-to-support-external-bind.patch b/meta/recipes-connectivity/dhcp/dhcp/tweak-to-support-external-bind.patch
new file mode 100644
index 0000000000..03c6abb799
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp/tweak-to-support-external-bind.patch
@@ -0,0 +1,117 @@
1From ad7bb401f47714fc30c408853b796ce0f1c7e65f Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Sat, 11 Jun 2016 22:51:44 -0400
4Subject: [PATCH] tweak to support external bind
5
6Tweak the external bind to oe-core's sysroot rather than
7external bind source build.
8
9Upstream-Status: Inappropriate <oe-core specific>
10
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12---
13 client/Makefile.am | 2 +-
14 client/tests/Makefile.am | 2 +-
15 common/tests/Makefile.am | 2 +-
16 dhcpctl/Makefile.am | 2 +-
17 omapip/Makefile.am | 2 +-
18 relay/Makefile.am | 2 +-
19 server/Makefile.am | 2 +-
20 server/tests/Makefile.am | 2 +-
21 8 files changed, 8 insertions(+), 8 deletions(-)
22
23diff --git a/client/Makefile.am b/client/Makefile.am
24index 4730bb3..84d8131 100644
25--- a/client/Makefile.am
26+++ b/client/Makefile.am
27@@ -4,7 +4,7 @@
28 # production code. Sadly, we are not there yet.
29 SUBDIRS = . tests
30
31-BINDLIBDIR = @BINDDIR@/lib
32+BINDLIBDIR = @BINDDIR@
33
34 AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
35 -DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes
36diff --git a/client/tests/Makefile.am b/client/tests/Makefile.am
37index da69ea9..fe35e57 100644
38--- a/client/tests/Makefile.am
39+++ b/client/tests/Makefile.am
40@@ -1,6 +1,6 @@
41 SUBDIRS = .
42
43-BINDLIBDIR = @BINDDIR@/lib
44+BINDLIBDIR = @BINDDIR@
45
46 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
47 AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir)
48diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am
49index f8d6b0e..05cd9c1 100644
50--- a/common/tests/Makefile.am
51+++ b/common/tests/Makefile.am
52@@ -1,6 +1,6 @@
53 SUBDIRS = .
54
55-BINDLIBDIR = @BINDDIR@/lib
56+BINDLIBDIR = @BINDDIR@
57
58 AM_CPPFLAGS = $(ATF_CFLAGS) -I$(top_srcdir)/includes
59
60diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am
61index ba8dd8b..9b2486e 100644
62--- a/dhcpctl/Makefile.am
63+++ b/dhcpctl/Makefile.am
64@@ -1,4 +1,4 @@
65-BINDLIBDIR = @BINDDIR@/lib
66+BINDLIBDIR = @BINDDIR@
67
68 AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir)
69
70diff --git a/omapip/Makefile.am b/omapip/Makefile.am
71index dd1afa0..e4a8599 100644
72--- a/omapip/Makefile.am
73+++ b/omapip/Makefile.am
74@@ -1,4 +1,4 @@
75-BINDLIBDIR = @BINDDIR@/lib
76+BINDLIBDIR = @BINDDIR@
77 AM_CPPFLAGS = -I$(top_srcdir)/includes
78
79 lib_LIBRARIES = libomapi.a
80diff --git a/relay/Makefile.am b/relay/Makefile.am
81index 6d652f6..b3bf578 100644
82--- a/relay/Makefile.am
83+++ b/relay/Makefile.am
84@@ -1,4 +1,4 @@
85-BINDLIBDIR = @BINDDIR@/lib
86+BINDLIBDIR = @BINDDIR@
87
88 AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
89
90diff --git a/server/Makefile.am b/server/Makefile.am
91index 3990b9c..b5d8c2d 100644
92--- a/server/Makefile.am
93+++ b/server/Makefile.am
94@@ -4,7 +4,7 @@
95 # production code. Sadly, we are not there yet.
96 SUBDIRS = . tests
97
98-BINDLIBDIR = @BINDDIR@/lib
99+BINDLIBDIR = @BINDDIR@
100
101 AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
102
103diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
104index 65a9f74..2892309 100644
105--- a/server/tests/Makefile.am
106+++ b/server/tests/Makefile.am
107@@ -1,6 +1,6 @@
108 SUBDIRS = .
109
110-BINDLIBDIR = @BINDDIR@/lib
111+BINDLIBDIR = @BINDDIR@
112
113 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
114 AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir)
115--
1162.8.1
117
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.3.3.bb b/meta/recipes-connectivity/dhcp/dhcp_4.3.4.bb
index 97dde1df48..9e082911bd 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.3.3.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.3.4.bb
@@ -1,19 +1,17 @@
1require dhcp.inc 1require dhcp.inc
2 2
3SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \ 3SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
4 file://fix-external-bind.patch \
5 file://link-with-lcrypto.patch \ 4 file://link-with-lcrypto.patch \
6 file://fixsepbuild.patch \ 5 file://fixsepbuild.patch \
7 file://dhclient-script-drop-resolv.conf.dhclient.patch \ 6 file://dhclient-script-drop-resolv.conf.dhclient.patch \
8 file://replace-ifconfig-route.patch \ 7 file://replace-ifconfig-route.patch \
9 file://CVE-2015-8605.patch \
10 file://0001-site.h-enable-gentle-shutdown.patch \ 8 file://0001-site.h-enable-gentle-shutdown.patch \
11 file://CVE-2016-2774.patch \
12 file://libxml2-configure-argument.patch \ 9 file://libxml2-configure-argument.patch \
10 file://tweak-to-support-external-bind.patch \
13 " 11 "
14 12
15SRC_URI[md5sum] = "c5577b09c9017cdd319a11ff6364268e" 13SRC_URI[md5sum] = "0138319fe2b788cf4bdf34fbeaf9ff54"
16SRC_URI[sha256sum] = "553c4945b09b1c1b904c4780f34f72aaefa2fc8c6556715de0bc9d4e3d255ede" 14SRC_URI[sha256sum] = "f5115aee3dd3e6925de4ba47b80ab732ba48b481c8364b6ebade2d43698d607e"
17 15
18PACKAGECONFIG ?= "" 16PACKAGECONFIG ?= ""
19PACKAGECONFIG[bind-httpstats] = "--with-libxml2,--without-libxml2,libxml2" 17PACKAGECONFIG[bind-httpstats] = "--with-libxml2,--without-libxml2,libxml2"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 21:21:16 +0000