Merge pull request #9789 from ja-pa/libarchive-security-fix-18.06

[OpenWrt 18.06] libarchive: update to version 3.4.0 (security fix)
This commit is contained in:
Rosen Penev
2019-08-22 18:18:46 -07:00
committed by GitHub
+22 -8
View File
@@ -8,12 +8,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libarchive PKG_NAME:=libarchive
PKG_VERSION:=3.3.2 PKG_VERSION:=3.4.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.libarchive.org/downloads PKG_SOURCE_URL:=https://codeload.github.com/libarchive/libarchive/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=ed2dbd6954792b2c054ccf8ec4b330a54b85904a80cef477a1c74643ddafa0ce PKG_HASH:=c160d3c45010a51a924208f13f6b7b956dabdf8c5c60195df188a599028caa7c
PKG_MAINTAINER:=Johannes Morgenroth <morgenroth@ibr.cs.tu-bs.de> PKG_MAINTAINER:=Johannes Morgenroth <morgenroth@ibr.cs.tu-bs.de>
PKG_LICENSE:=BSD-2-Clause PKG_LICENSE:=BSD-2-Clause
@@ -27,7 +28,7 @@ define Package/libarchive/Default
CATEGORY:=Libraries CATEGORY:=Libraries
DEPENDS:=+zlib +liblzma +libbz2 +libexpat DEPENDS:=+zlib +liblzma +libbz2 +libexpat
TITLE:=Multi-format archive and compression library TITLE:=Multi-format archive and compression library
URL:=http://www.libarchive.org/ URL:=https://www.libarchive.org/
endef endef
define Package/libarchive define Package/libarchive
@@ -41,13 +42,24 @@ define Package/libarchive-noopenssl
VARIANT:=noopenssl VARIANT:=noopenssl
endef endef
define Package/bsdtar define Package/bsdtar/Default
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
SUBMENU:=Compression SUBMENU:=Compression
DEPENDS:=+libarchive-noopenssl TITLE:=tar BSD variant
TITLE:=BSD variant that supports various file compression formats URL:=https://www.libarchive.org/
URL:=http://www.libarchive.org/ endef
define Package/bsdtar
$(call Package/bsdtar/Default)
DEPENDS:= +libarchive
endef
define Package/bsdtar-noopenssl
$(call Package/bsdtar/Default)
TITLE += (without OpenSSL dependency)
DEPENDS:= +libarchive-noopenssl
VARIANT:=noopenssl
endef endef
define Package/bsdtar/description define Package/bsdtar/description
@@ -91,7 +103,9 @@ define Package/bsdtar/install
endef endef
Package/libarchive-noopenssl/install = $(Package/libarchive/install) Package/libarchive-noopenssl/install = $(Package/libarchive/install)
Package/bsdtar-noopenssl/install = $(Package/bsdtar/install)
$(eval $(call BuildPackage,libarchive)) $(eval $(call BuildPackage,libarchive))
$(eval $(call BuildPackage,libarchive-noopenssl)) $(eval $(call BuildPackage,libarchive-noopenssl))
$(eval $(call BuildPackage,bsdtar)) $(eval $(call BuildPackage,bsdtar))
$(eval $(call BuildPackage,bsdtar-noopenssl))