diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2014-10-16 08:34:38 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2014-10-16 08:34:38 +0000 |
| commit | f93d02af63a9e546cf7ba390c842b56ca6de8fec (patch) | |
| tree | db17c754257dbac926655e931ac0e422e8ec18b2 /package/libs/openssl/patches/200-parallel_build.patch | |
| parent | d58dc833941a4663190d82a4d38d1ba6a379caa4 (diff) | |
| download | upstream-f93d02af63a9e546cf7ba390c842b56ca6de8fec.tar.gz upstream-f93d02af63a9e546cf7ba390c842b56ca6de8fec.tar.bz2 upstream-f93d02af63a9e546cf7ba390c842b56ca6de8fec.zip | |
BB: openssl: update to v1.0.1j (CVE-2014-3513, CVE-2014-3567, CVE-2014-3568)
Also refresh patches and bump copyright year in Makefile.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Backport of r42929
git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@42930 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/libs/openssl/patches/200-parallel_build.patch')
| -rw-r--r-- | package/libs/openssl/patches/200-parallel_build.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/package/libs/openssl/patches/200-parallel_build.patch b/package/libs/openssl/patches/200-parallel_build.patch index c43ffa1186..646c51ba16 100644 --- a/package/libs/openssl/patches/200-parallel_build.patch +++ b/package/libs/openssl/patches/200-parallel_build.patch @@ -97,7 +97,7 @@ fi; \ --- a/crypto/Makefile +++ b/crypto/Makefile -@@ -88,11 +88,11 @@ testapps: +@@ -90,11 +90,11 @@ testapps: @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi subdirs: @@ -111,7 +111,7 @@ links: @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) -@@ -103,7 +103,7 @@ links: +@@ -105,7 +105,7 @@ links: # lib: $(LIB): are splitted to avoid end-less loop lib: $(LIB) @touch lib @@ -120,7 +120,7 @@ $(AR) $(LIB) $(LIBOBJ) [ -z "$(FIPSLIBDIR)" ] || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o $(RANLIB) $(LIB) || echo Never mind. -@@ -114,7 +114,7 @@ shared: buildinf.h lib subdirs +@@ -116,7 +116,7 @@ shared: buildinf.h lib subdirs fi libs: @@ -129,7 +129,7 @@ install: @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... -@@ -123,7 +123,7 @@ install: +@@ -125,7 +125,7 @@ install: (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ done; @@ -169,7 +169,7 @@ ctags $(SRC) --- a/test/Makefile +++ b/test/Makefile -@@ -124,7 +124,7 @@ install: +@@ -129,7 +129,7 @@ install: tags: ctags $(SRC) @@ -178,7 +178,7 @@ apps: @(cd ..; $(MAKE) DIRS=apps all) -@@ -365,109 +365,109 @@ FIPS_BUILD_CMD=shlib_target=; if [ -n "$ +@@ -384,109 +384,109 @@ BUILD_CMD_STATIC=shlib_target=; \ link_app.$${shlib_target} $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) @@ -321,9 +321,9 @@ - @target=$(SRPTEST); $(BUILD_CMD) + +@target=$(SRPTEST); $(BUILD_CMD) - #$(AESTEST).o: $(AESTEST).c - # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c -@@ -480,7 +480,7 @@ $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLI + $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO) + @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC) +@@ -505,7 +505,7 @@ $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMET # fi dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) |