aboutsummaryrefslogtreecommitdiffstats
path: root/package/libs/openssl/patches/160-disable_doc_tests.patch
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2016-01-29 13:25:24 +0000
committerJo-Philipp Wich <jow@openwrt.org>2016-01-29 13:25:24 +0000
commit4e6115d12bd90db0b8eaeb78936dc88e873ec79b (patch)
tree22d33cf97973bc46016f94183b51218050aa9164 /package/libs/openssl/patches/160-disable_doc_tests.patch
parent2121dd7cd92250b740c02ac9786dcd35b0f64de7 (diff)
downloadupstream-barrier_breaker.tar.gz
upstream-barrier_breaker.tar.bz2
upstream-barrier_breaker.zip
BB: openssl: update to 1.0.2f (fixes CVE-2016-0701, CVE-2015-3197)barrier_breaker
Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> Backport of r48531. git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@48549 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/libs/openssl/patches/160-disable_doc_tests.patch')
-rw-r--r--package/libs/openssl/patches/160-disable_doc_tests.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/package/libs/openssl/patches/160-disable_doc_tests.patch b/package/libs/openssl/patches/160-disable_doc_tests.patch
index 274e5d0bbb..a3bee38721 100644
--- a/package/libs/openssl/patches/160-disable_doc_tests.patch
+++ b/package/libs/openssl/patches/160-disable_doc_tests.patch
@@ -27,7 +27,7 @@
WDIRS= windows
LIBS= libcrypto.a libssl.a
SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
-@@ -274,7 +274,7 @@ reflect:
+@@ -273,7 +273,7 @@ reflect:
sub_all: build_all
@@ -36,9 +36,9 @@
build_libs: build_libcrypto build_libssl openssl.pc
-@@ -534,7 +534,7 @@ dist:
- dist_pem_h:
- (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
+@@ -530,7 +530,7 @@ dist:
+ @$(MAKE) SDIRS='$(SDIRS)' clean
+ @$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar
-install: all install_docs install_sw
+install: all install_sw
@@ -47,9 +47,9 @@
@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
--- a/Makefile.org
+++ b/Makefile.org
-@@ -532,7 +532,7 @@ dist:
- dist_pem_h:
- (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
+@@ -528,7 +528,7 @@ dist:
+ @$(MAKE) SDIRS='$(SDIRS)' clean
+ @$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar
-install: all install_docs install_sw
+install: all install_sw