mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 17:18:59 +00:00
6637af95aa
Add two patches from Debian fixing CVEs in the bsdiff application.
CVE-2014-9862: Heap vulnerability in bspatch
CVE-2020-14315: Memory Corruption Vulnerability in bspatch
Copied the patches from this location:
https://salsa.debian.org/debian/bsdiff/-/blob/debian/latest/debian/patches/20-CVE-2014-9862.patch
https://salsa.debian.org/debian/bsdiff/-/blob/debian/latest/debian/patches/33-CVE-2020-14315.patch
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit cac723e8b8)
81 lines
1.9 KiB
Makefile
81 lines
1.9 KiB
Makefile
#
|
|
# Copyright (C) 2016 OpenWrt.org
|
|
#
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
# See /LICENSE for more information.
|
|
#
|
|
|
|
include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=bsdiff
|
|
PKG_VERSION:=4.3
|
|
PKG_RELEASE:=2
|
|
|
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
|
PKG_SOURCE_URL:=https://www.daemonology.net/bsdiff/
|
|
PKG_HASH:=18821588b2dc5bf159aa37d3bcb7b885d85ffd1e19f23a0c57a58723fea85f48
|
|
PKG_MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
|
|
HOST_BUILD_DEPENDS:=bzip2/host
|
|
|
|
PKG_LICENSE:=BSD-2-Clause
|
|
PKG_CPE_ID:=cpe:/a:daemonology:bsdiff
|
|
|
|
include $(INCLUDE_DIR)/host-build.mk
|
|
include $(INCLUDE_DIR)/package.mk
|
|
|
|
define Package/bsdiff
|
|
SECTION:=utils
|
|
CATEGORY:=Utilities
|
|
DEPENDS:=+libbz2
|
|
TITLE:=Binary diff tool
|
|
URL:=https://www.daemonology.net/bsdiff/
|
|
endef
|
|
|
|
define Package/bspatch
|
|
SECTION:=utils
|
|
CATEGORY:=Utilities
|
|
DEPENDS:=+libbz2
|
|
TITLE:=Binary patch tool
|
|
URL:=https://www.daemonology.net/bsdiff/
|
|
endef
|
|
|
|
|
|
define Build/Compile
|
|
$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) \
|
|
-o $(PKG_BUILD_DIR)/bsdiff \
|
|
$(PKG_BUILD_DIR)/bsdiff.c -lbz2
|
|
$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) \
|
|
-o $(PKG_BUILD_DIR)/bspatch \
|
|
$(PKG_BUILD_DIR)/bspatch.c -lbz2
|
|
endef
|
|
|
|
define Package/bsdiff/install
|
|
$(INSTALL_DIR) $(1)/usr/bin/
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/bsdiff $(1)/usr/bin/bsdiff
|
|
endef
|
|
|
|
define Package/bspatch/install
|
|
$(INSTALL_DIR) $(1)/usr/bin/
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/bspatch $(1)/usr/bin/bspatch
|
|
endef
|
|
|
|
define Host/Install
|
|
$(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin/
|
|
$(MAKE) -C $(HOST_BUILD_DIR) PREFIX=$(STAGING_DIR_HOSTPKG)/ install
|
|
endef
|
|
|
|
define Host/Compile
|
|
$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \
|
|
-o $(HOST_BUILD_DIR)/bsdiff \
|
|
$(HOST_BUILD_DIR)/bsdiff.c -lbz2
|
|
endef
|
|
|
|
define Host/Install
|
|
$(INSTALL_BIN) $(HOST_BUILD_DIR)/bsdiff $(STAGING_DIR_HOSTPKG)/bin/
|
|
endef
|
|
|
|
$(eval $(call HostBuild))
|
|
|
|
$(eval $(call BuildPackage,bsdiff))
|
|
$(eval $(call BuildPackage,bspatch))
|