diff options
| -rw-r--r-- | package/libs/openssl/Makefile | 6 | ||||
| -rw-r--r-- | package/libs/openssl/patches/150-no_engines.patch | 2 | ||||
| -rw-r--r-- | package/libs/openssl/patches/200-parallel_build.patch | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index 4b386ab4e4..0c42362c6e 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2012 OpenWrt.org +# Copyright (C) 2006-2014 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssl -PKG_VERSION:=1.0.1i +PKG_VERSION:=1.0.1j PKG_RELEASE:=1 PKG_USE_MIPS16:=0 @@ -18,7 +18,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.openssl.org/source/ \ ftp://ftp.funet.fi/pub/crypt/mirrors/ftp.openssl.org/source \ ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ -PKG_MD5SUM:=c8dc151a671b9b92ff3e4c118b174972 +PKG_MD5SUM:=f7175c9cd3c39bb1907ac8bba9df8ed3 PKG_LICENSE:=SSLEAY OPENSSL PKG_LICENSE_FILES:=LICENSE diff --git a/package/libs/openssl/patches/150-no_engines.patch b/package/libs/openssl/patches/150-no_engines.patch index 92a3a78389..16817d6d65 100644 --- a/package/libs/openssl/patches/150-no_engines.patch +++ b/package/libs/openssl/patches/150-no_engines.patch @@ -1,6 +1,6 @@ --- a/Configure +++ b/Configure -@@ -2004,6 +2004,11 @@ EOF +@@ -2011,6 +2011,11 @@ EOF close(OUT); } 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) |