projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
openssl: update to 1.0.2f (fixes CVE-2016-0701, CVE-2015-3197)
[openwrt.git]
/
package
/
libs
/
openssl
/
patches
/
200-parallel_build.patch
diff --git
a/package/libs/openssl/patches/200-parallel_build.patch
b/package/libs/openssl/patches/200-parallel_build.patch
index
edb201a
..
66e6d6b
100644
(file)
--- a/
package/libs/openssl/patches/200-parallel_build.patch
+++ b/
package/libs/openssl/patches/200-parallel_build.patch
@@
-1,6
+1,6
@@
--- a/Makefile.org
+++ b/Makefile.org
--- a/Makefile.org
+++ b/Makefile.org
-@@ -2
80,17 +280
,17 @@ build_libcrypto: build_crypto build_engi
+@@ -2
79,17 +279
,17 @@ build_libcrypto: build_crypto build_engi
build_libssl: build_ssl libssl.pc
build_crypto:
build_libssl: build_ssl libssl.pc
build_crypto:
@@
-24,7
+24,7
@@
all_testapps: build_libs build_testapps
build_testapps:
all_testapps: build_libs build_testapps
build_testapps:
-@@ -46
2,7 +462
,7 @@ update: errors stacks util/libeay.num ut
+@@ -46
1,7 +461
,7 @@ update: errors stacks util/libeay.num ut
@set -e; target=update; $(RECURSIVE_BUILD_CMD)
depend:
@set -e; target=update; $(RECURSIVE_BUILD_CMD)
depend:
@@
-33,9
+33,9
@@
lint:
@set -e; target=lint; $(RECURSIVE_BUILD_CMD)
lint:
@set -e; target=lint; $(RECURSIVE_BUILD_CMD)
-@@ -52
7,9 +527
,9 @@ dist:
- dist_pem_h:
- (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
+@@ -52
3,9 +523
,9 @@ dist:
+ @$(MAKE) SDIRS='$(SDIRS)' clean
+ @$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar
-install: all install_sw
+install: install_sw
-install: all install_sw
+install: install_sw
@@
-45,7
+45,7
@@
@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
-@@ -53
8,12 +538
,19 @@ install_sw:
+@@ -53
4,12 +534
,19 @@ install_sw:
$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
$(INSTALL_PREFIX)$(OPENSSLDIR)/private
$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
$(INSTALL_PREFIX)$(OPENSSLDIR)/private
@@
-66,7
+66,7
@@
@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
do \
if [ -f "$$i" ]; then \
@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
do \
if [ -f "$$i" ]; then \
-@@ -62
7,12 +634
,7 @@ install_html_docs:
+@@ -62
3,12 +630
,7 @@ install_html_docs:
done; \
done
done; \
done