From ae1cf67d167dc04dbeaa0770374b256481323dbc Mon Sep 17 00:00:00 2001 From: Alexander Pyhalov <apyhalov@gmail.com> Date: Wed, 09 Mar 2016 22:57:09 +0100 Subject: [PATCH] bind: update to 9.10.3-P4, fixes CVE-2016-1285, CVE-2016-1286, CVE-2016-2088 --- components/network/bind/Solaris/dns-server.sh | 0 components/network/bind/bindc.p5m | 12 ++++++------ components/network/bind/resolve.deps | 0 components/network/bind/bind.license | 0 components/network/bind/Solaris/server.xml | 0 components/network/bind/bind.p5m | 0 components/network/bind/patches/15912313.nslookup-revert.patch | 0 components/network/bind/Makefile | 19 +++++++++---------- components/network/bind/Solaris/migration.txt | 0 9 files changed, 15 insertions(+), 16 deletions(-) diff --git a/components/bind/Makefile b/components/network/bind/Makefile similarity index 92% rename from components/bind/Makefile rename to components/network/bind/Makefile index cfa5169..173bc6f 100644 --- a/components/bind/Makefile +++ b/components/network/bind/Makefile @@ -20,26 +20,25 @@ # # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. # -include ../../make-rules/shared-macros.mk +include ../../../make-rules/shared-macros.mk COMPONENT_NAME= bind -COMPONENT_VERSION= 9.10.3-P3 -COMPONENT_REVISION= 2 -IPS_COMPONENT_VERSION= 9.10.3.3 +COMPONENT_VERSION= 9.10.3-P4 +IPS_COMPONENT_VERSION= 9.10.3.4 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_PROJECT_URL= http://www.isc.org/software/bind/ # hash from: sha256sum $(COMPONENT_ARCHIVE) | sed 's/\(.[^ ]*\).*/sha256:\1/' COMPONENT_ARCHIVE_HASH= \ - sha256:690810d1fbb72afa629e74638d19cd44e28d2b2e5eb63f55c705ad85d1a4cb83 + sha256:2ac044b5fbdf45fb45107af0df961b3b7cb5262a3bf1948ed3fe7a170dd13e3e COMPONENT_ARCHIVE_URL= \ http://ftp.isc.org/isc/bind9/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= service/dns-server -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_TOP)/make-rules/prep.mk +include $(WS_TOP)/make-rules/configure.mk +include $(WS_TOP)/make-rules/ips.mk # Missing files in build dir without this. COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D)) @@ -76,7 +75,7 @@ .PHONY: build build: $(BUILD_32) -include ../../make-rules/shared-targets.mk +include $(WS_TOP)/make-rules/shared-targets.mk # Install. # @@ -164,4 +163,4 @@ BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +include $(WS_TOP)/make-rules/depend.mk diff --git a/components/bind/Solaris/dns-server.sh b/components/network/bind/Solaris/dns-server.sh similarity index 100% rename from components/bind/Solaris/dns-server.sh rename to components/network/bind/Solaris/dns-server.sh diff --git a/components/bind/Solaris/migration.txt b/components/network/bind/Solaris/migration.txt similarity index 100% rename from components/bind/Solaris/migration.txt rename to components/network/bind/Solaris/migration.txt diff --git a/components/bind/Solaris/server.xml b/components/network/bind/Solaris/server.xml similarity index 100% rename from components/bind/Solaris/server.xml rename to components/network/bind/Solaris/server.xml diff --git a/components/bind/bind.license b/components/network/bind/bind.license similarity index 100% rename from components/bind/bind.license rename to components/network/bind/bind.license diff --git a/components/bind/bind.p5m b/components/network/bind/bind.p5m similarity index 100% rename from components/bind/bind.p5m rename to components/network/bind/bind.p5m diff --git a/components/bind/bindc.p5m b/components/network/bind/bindc.p5m similarity index 90% rename from components/bind/bindc.p5m rename to components/network/bind/bindc.p5m index 69bb599..6d1deb0 100644 --- a/components/bind/bindc.p5m +++ b/components/network/bind/bindc.p5m @@ -43,10 +43,10 @@ license bind.license license="ISC license" file path=usr/lib/dns/libbind9.so.140.0.10 -file path=usr/lib/dns/libdns.so.162.1.2 +file path=usr/lib/dns/libdns.so.162.1.3 file path=usr/lib/dns/libirs.so.141.0.4 file path=usr/lib/dns/libisc.so.160.0.0 -file path=usr/lib/dns/libisccc.so.140.0.3 +file path=usr/lib/dns/libisccc.so.140.0.4 file path=usr/lib/dns/libisccfg.so.140.3.0 file path=usr/lib/dns/liblwres.so.141.0.3 file path=usr/sbin/delv @@ -59,14 +59,14 @@ link path=usr/lib/dns/libbind9.so target=libbind9.so.140.0.10 link path=usr/lib/dns/libbind9.so.140 target=libbind9.so.140.0.10 -link path=usr/lib/dns/libdns.so target=libdns.so.162.1.2 -link path=usr/lib/dns/libdns.so.162 target=libdns.so.162.1.2 +link path=usr/lib/dns/libdns.so target=libdns.so.162.1.3 +link path=usr/lib/dns/libdns.so.162 target=libdns.so.162.1.3 link path=usr/lib/dns/libirs.so target=libirs.so.141.0.4 link path=usr/lib/dns/libirs.so.141 target=libirs.so.141.0.4 link path=usr/lib/dns/libisc.so target=libisc.so.160.0.0 link path=usr/lib/dns/libisc.so.160 target=libisc.so.160.0.0 -link path=usr/lib/dns/libisccc.so target=libisccc.so.140.0.3 -link path=usr/lib/dns/libisccc.so.140 target=libisccc.so.140.0.3 +link path=usr/lib/dns/libisccc.so target=libisccc.so.140.0.4 +link path=usr/lib/dns/libisccc.so.140 target=libisccc.so.140.0.4 link path=usr/lib/dns/libisccfg.so target=libisccfg.so.140.3.0 link path=usr/lib/dns/libisccfg.so.140 target=libisccfg.so.140.3.0 link path=usr/lib/dns/liblwres.so target=liblwres.so.141.0.3 diff --git a/components/bind/patches/15912313.nslookup-revert.patch b/components/network/bind/patches/15912313.nslookup-revert.patch similarity index 100% rename from components/bind/patches/15912313.nslookup-revert.patch rename to components/network/bind/patches/15912313.nslookup-revert.patch diff --git a/components/bind/resolve.deps b/components/network/bind/resolve.deps similarity index 100% rename from components/bind/resolve.deps rename to components/network/bind/resolve.deps -- Gitblit v1.9.3