diff options
author | Kai Kang <kai.kang@windriver.com> | 2017-07-12 09:25:05 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-17 14:01:39 +0100 |
commit | 39f74e11fda240c39135c5f12ed24cc8f0364c72 (patch) | |
tree | 8cc55d435d41368d4e1169dd7f868689039be6cf /meta/recipes-connectivity/bind/bind_9.10.3-P3.bb | |
parent | e6c05f57a5ee2eb74f69b8e9367cfd9b36f023a8 (diff) | |
download | poky-39f74e11fda240c39135c5f12ed24cc8f0364c72.tar.gz |
bind: 9.10.3-P3 -> 9.10.5-P3
Upgrade bind from 9.10.3-P3 to 9.10.5-P3
* Update md5sum of LIC_FILES_CHKSUM that it update year in file COPYRIGHT
* Remvoe mips1-not-support-opcode.diff which has been merged
* Remove CVE patches that there are backported from upstream
* Use python3 for build and make sure install .py files to right directory
(From OE-Core rev: 9ee6a0a6599d081767b63382a576e67aed12cf4d)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/bind/bind_9.10.3-P3.bb')
-rw-r--r-- | meta/recipes-connectivity/bind/bind_9.10.3-P3.bb | 122 |
1 files changed, 0 insertions, 122 deletions
diff --git a/meta/recipes-connectivity/bind/bind_9.10.3-P3.bb b/meta/recipes-connectivity/bind/bind_9.10.3-P3.bb deleted file mode 100644 index 7eb79b0ea0..0000000000 --- a/meta/recipes-connectivity/bind/bind_9.10.3-P3.bb +++ /dev/null | |||
@@ -1,122 +0,0 @@ | |||
1 | SUMMARY = "ISC Internet Domain Name Server" | ||
2 | HOMEPAGE = "http://www.isc.org/sw/bind/" | ||
3 | SECTION = "console/network" | ||
4 | |||
5 | LICENSE = "ISC & BSD" | ||
6 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=0a95f52a0ab6c5f52dedc9a45e7abb3f" | ||
7 | |||
8 | DEPENDS = "openssl libcap" | ||
9 | |||
10 | SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \ | ||
11 | file://conf.patch \ | ||
12 | file://make-etc-initd-bind-stop-work.patch \ | ||
13 | file://mips1-not-support-opcode.diff \ | ||
14 | file://dont-test-on-host.patch \ | ||
15 | file://generate-rndc-key.sh \ | ||
16 | file://named.service \ | ||
17 | file://bind9 \ | ||
18 | file://init.d-add-support-for-read-only-rootfs.patch \ | ||
19 | file://bind-confgen-build-unix.o-once.patch \ | ||
20 | file://0001-build-use-pkg-config-to-find-libxml2.patch \ | ||
21 | file://bind-ensure-searching-for-json-headers-searches-sysr.patch \ | ||
22 | file://0001-gen.c-extend-DIRNAMESIZE-from-256-to-512.patch \ | ||
23 | file://0001-lib-dns-gen.c-fix-too-long-error.patch \ | ||
24 | file://CVE-2016-1285.patch \ | ||
25 | file://CVE-2016-1286_1.patch \ | ||
26 | file://CVE-2016-1286_2.patch \ | ||
27 | file://CVE-2016-2088.patch \ | ||
28 | file://CVE-2016-2775.patch \ | ||
29 | file://CVE-2016-2776.patch \ | ||
30 | file://CVE-2016-8864.patch \ | ||
31 | file://CVE-2016-6170.patch \ | ||
32 | " | ||
33 | |||
34 | UPSTREAM_CHECK_URI = "ftp://ftp.isc.org/isc/bind9/" | ||
35 | UPSTREAM_CHECK_REGEX = "(?P<pver>9(\.\d+)+(-P\d+)*)/" | ||
36 | |||
37 | SRC_URI[md5sum] = "bcf7e772b616f7259420a3edc5df350a" | ||
38 | SRC_URI[sha256sum] = "690810d1fbb72afa629e74638d19cd44e28d2b2e5eb63f55c705ad85d1a4cb83" | ||
39 | |||
40 | ENABLE_IPV6 = "--enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)}" | ||
41 | EXTRA_OECONF = " ${ENABLE_IPV6} --with-libtool --enable-threads \ | ||
42 | --disable-devpoll --enable-epoll --with-gost=no \ | ||
43 | --with-gssapi=no --with-ecdsa=yes \ | ||
44 | --sysconfdir=${sysconfdir}/bind \ | ||
45 | --with-openssl=${STAGING_LIBDIR}/.. \ | ||
46 | " | ||
47 | inherit autotools update-rc.d systemd useradd pkgconfig | ||
48 | |||
49 | # PACKAGECONFIGs readline and libedit should NOT be set at same time | ||
50 | PACKAGECONFIG ?= "readline" | ||
51 | PACKAGECONFIG[httpstats] = "--with-libxml2,--without-libxml2,libxml2" | ||
52 | PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline" | ||
53 | PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit" | ||
54 | PACKAGECONFIG[urandom] = "--with-randomdev=/dev/urandom,--with-randomdev=/dev/random,," | ||
55 | |||
56 | USERADD_PACKAGES = "${PN}" | ||
57 | USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \ | ||
58 | --user-group bind" | ||
59 | |||
60 | INITSCRIPT_NAME = "bind" | ||
61 | INITSCRIPT_PARAMS = "defaults" | ||
62 | |||
63 | SYSTEMD_SERVICE_${PN} = "named.service" | ||
64 | |||
65 | PARALLEL_MAKE = "" | ||
66 | |||
67 | RDEPENDS_${PN} = "python3-core" | ||
68 | RDEPENDS_${PN}-dev = "" | ||
69 | |||
70 | PACKAGE_BEFORE_PN += "${PN}-utils" | ||
71 | FILES_${PN}-utils = "${bindir}/host ${bindir}/dig" | ||
72 | FILES_${PN}-dev += "${bindir}/isc-config.h" | ||
73 | FILES_${PN} += "${sbindir}/generate-rndc-key.sh" | ||
74 | |||
75 | do_install_prepend() { | ||
76 | # clean host path in isc-config.sh before the hardlink created | ||
77 | # by "make install": | ||
78 | # bind9-config -> isc-config.sh | ||
79 | sed -i -e "s,${STAGING_LIBDIR},${libdir}," ${B}/isc-config.sh | ||
80 | } | ||
81 | |||
82 | do_install_append() { | ||
83 | rm "${D}${bindir}/nslookup" | ||
84 | rm "${D}${mandir}/man1/nslookup.1" | ||
85 | rmdir "${D}${localstatedir}/run" | ||
86 | rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" | ||
87 | install -d -o bind "${D}${localstatedir}/cache/bind" | ||
88 | install -d "${D}${sysconfdir}/bind" | ||
89 | install -d "${D}${sysconfdir}/init.d" | ||
90 | install -m 644 ${S}/conf/* "${D}${sysconfdir}/bind/" | ||
91 | install -m 755 "${S}/init.d" "${D}${sysconfdir}/init.d/bind" | ||
92 | sed -i -e '1s,#!.*python,#! /usr/bin/python3,' ${D}${sbindir}/dnssec-coverage ${D}${sbindir}/dnssec-checkds | ||
93 | |||
94 | # Install systemd related files | ||
95 | install -d ${D}${sbindir} | ||
96 | install -m 755 ${WORKDIR}/generate-rndc-key.sh ${D}${sbindir} | ||
97 | install -d ${D}${systemd_unitdir}/system | ||
98 | install -m 0644 ${WORKDIR}/named.service ${D}${systemd_unitdir}/system | ||
99 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ | ||
100 | -e 's,@SBINDIR@,${sbindir},g' \ | ||
101 | ${D}${systemd_unitdir}/system/named.service | ||
102 | |||
103 | install -d ${D}${sysconfdir}/default | ||
104 | install -m 0644 ${WORKDIR}/bind9 ${D}${sysconfdir}/default | ||
105 | |||
106 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | ||
107 | install -d ${D}${sysconfdir}/tmpfiles.d | ||
108 | echo "d /run/named 0755 bind bind - -" > ${D}${sysconfdir}/tmpfiles.d/bind.conf | ||
109 | fi | ||
110 | } | ||
111 | |||
112 | CONFFILES_${PN} = " \ | ||
113 | ${sysconfdir}/bind/named.conf \ | ||
114 | ${sysconfdir}/bind/named.conf.local \ | ||
115 | ${sysconfdir}/bind/named.conf.options \ | ||
116 | ${sysconfdir}/bind/db.0 \ | ||
117 | ${sysconfdir}/bind/db.127 \ | ||
118 | ${sysconfdir}/bind/db.empty \ | ||
119 | ${sysconfdir}/bind/db.local \ | ||
120 | ${sysconfdir}/bind/db.root \ | ||
121 | " | ||
122 | |||