hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

curl: bump to 7.55.1 

Update 200-no_docs_tests.patch.
Refresh patches.

Fixes the following CVEs:
- CVE-2017-1000099
- CVE-2017-1000100
- CVE-2017-1000101

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
openwrt-18.06
Stijn Tintel 2017-09-25 06:00:51 +03:00
parent 2ad649d134
commit d9beae9b9e
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/network/utils/curl/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=curl PKG_NAME:=curl
PKG_VERSION:=7.54.1 PKG_VERSION:=7.55.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@ -16,7 +16,7 @@ PKG_SOURCE_URL:=https://dl.uxnr.de/mirror/curl/ \
http://curl.mirror.anstey.ca/ \ http://curl.mirror.anstey.ca/ \
http://curl.askapache.com/download/ \ http://curl.askapache.com/download/ \
https://curl.haxx.se/download/ https://curl.haxx.se/download/
PKG_HASH:=fdfc4df2d001ee0c44ec071186e770046249263c491fcae48df0e1a3ca8f25a0 PKG_HASH:=e5b1a92ed3b0c11f149886458fa063419500819f1610c020d62f25b8e4b16cfb
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING

16
package/network/utils/curl/patches/200-no_docs_tests.patch
View File

@ -1,22 +1,22 @@
--- a/Makefile.am --- a/Makefile.am
+++ b/Makefile.am +++ b/Makefile.am
@@ -154,8 +154,8 @@ @@ -155,7 +155,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP)
bin_SCRIPTS = curl-config bin_SCRIPTS = curl-config
-SUBDIRS = lib docs src include SUBDIRS = lib src
-DIST_SUBDIRS = $(SUBDIRS) tests packages scripts -DIST_SUBDIRS = $(SUBDIRS) tests packages scripts include docs
+SUBDIRS = lib src include +DIST_SUBDIRS = $(SUBDIRS) packages include
+DIST_SUBDIRS = $(SUBDIRS) packages
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libcurl.pc pkgconfig_DATA = libcurl.pc
@@ -275,7 +275,7 @@ @@ -275,8 +275,8 @@ cygwinbin:
# We extend the standard install with a custom hook: # We extend the standard install with a custom hook:
install-data-hook: install-data-hook:
cd include && $(MAKE) install cd include && $(MAKE) install
- cd docs && $(MAKE) install - cd docs && $(MAKE) install
+# cd docs && $(MAKE) install - cd docs/libcurl && $(MAKE) install
+ #cd docs && $(MAKE) install
+ #cd docs/libcurl && $(MAKE) install
# We extend the standard uninstall with a custom hook: # We extend the standard uninstall with a custom hook:
uninstall-hook: uninstall-hook:

2
package/network/utils/curl/patches/310-mbedtls-disable-runtime-version-check.patch
View File

@ -1,6 +1,6 @@
--- a/lib/vtls/mbedtls.c --- a/lib/vtls/mbedtls.c
+++ b/lib/vtls/mbedtls.c +++ b/lib/vtls/mbedtls.c
@@ -796,7 +796,7 @@ @@ -796,7 +796,7 @@ void Curl_mbedtls_session_free(void *ptr
size_t Curl_mbedtls_version(char *buffer, size_t size) size_t Curl_mbedtls_version(char *buffer, size_t size)
{ {