bzip2: Fix CVE-2016-3189

[openwrt/openwrt.git] / package / utils / bzip2 / Makefile

diff --git a/package/utils/bzip2/Makefile b/package/utils/bzip2/Makefile
index 425173ce527462b36c897e34aa23915bea445ab9..ea2fc768339176b40a4aaa33d5cf52653a14dd5d 100644 (file)
--- a/package/utils/bzip2/Makefile
+++ b/package/utils/bzip2/Makefile
@@ -9,15 +9,16 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bzip2
 PKG_VERSION:=1.0.6
-PKG_RELEASE:=2
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.bzip.org/$(PKG_VERSION)
-PKG_MD5SUM:=00b516f4704d4a7cb50a1d97e6e8e15b
+PKG_HASH:=a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
 
 PKG_LICENSE:=BZIP2
 PKG_LICENSE_FILES:=LICENSE
+PKG_CPE_ID:=cpe:/a:bzip:bzip2
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
@@ -82,6 +83,8 @@ endef
 define Package/bzip2/install
        $(INSTALL_DIR) $(1)/usr/bin/
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/bzip2-shared $(1)/usr/bin/bzip2
+       $(INSTALL_DIR) $(1)/bin/
+       $(LN) ../usr/bin/bzip2 $(1)/bin/bzip2
 endef
 
 HOST_CFLAGS += \
@@ -93,11 +96,11 @@ HOST_MAKE_FLAGS+= \
        all
 
 HOST_CONFIGURE_ARGS+= \
-       --prefix=$(STAGING_DIR_HOST)
+       --prefix=$(STAGING_DIR_HOSTPKG)
 
 define Host/Install
-       $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/
-       $(MAKE) -C $(HOST_BUILD_DIR) PREFIX=$(STAGING_DIR_HOST)/usr/ install
+       $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin/
+       $(MAKE) -C $(HOST_BUILD_DIR) PREFIX=$(STAGING_DIR_HOSTPKG)/ install
 endef
 
 $(eval $(call HostBuild))