diff options
| author | Paul Wassi <p.wassi@gmx.at> | 2018-03-30 08:15:00 +0200 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2018-03-31 10:20:20 +0200 |
| commit | db893ec7f05e296ea50831246739bfc6cd29f50d (patch) | |
| tree | 31e4ae6cf7508db113333c2713a2be2f8bfe4b75 | |
| parent | a64fae835481238a9f6b1c9fba9b10a536dd5f2c (diff) | |
| download | upstream-db893ec7f05e296ea50831246739bfc6cd29f50d.tar.gz upstream-db893ec7f05e296ea50831246739bfc6cd29f50d.tar.bz2 upstream-db893ec7f05e296ea50831246739bfc6cd29f50d.zip | |
openssl: update to 1.0.2o
Fixes CVE-2018-0739
Signed-off-by: Paul Wassi <p.wassi@gmx.at>
| -rw-r--r-- | package/libs/openssl/Makefile | 4 | ||||
| -rw-r--r-- | package/libs/openssl/patches/150-no_engines.patch | 2 | ||||
| -rw-r--r-- | package/libs/openssl/patches/200-parallel_build.patch | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index 95e6cff864..8409730d70 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssl PKG_BASE:=1.0.2 -PKG_BUGFIX:=n +PKG_BUGFIX:=o PKG_VERSION:=$(PKG_BASE)$(PKG_BUGFIX) PKG_RELEASE:=1 PKG_USE_MIPS16:=0 @@ -24,7 +24,7 @@ PKG_SOURCE_URL:= \ http://gd.tuwien.ac.at/infosys/security/openssl/source/ \ http://www.openssl.org/source/ \ http://www.openssl.org/source/old/$(PKG_BASE)/ -PKG_HASH:=370babb75f278c39e0c50e8c4e7493bc0f18db6867478341a832a982fd15a8fe +PKG_HASH:=ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d PKG_LICENSE:=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 1cb04bdabb..102e7a3272 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 -@@ -2130,6 +2130,11 @@ EOF +@@ -2136,6 +2136,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 f2acc4a27b..0616551b6e 100644 --- a/package/libs/openssl/patches/200-parallel_build.patch +++ b/package/libs/openssl/patches/200-parallel_build.patch @@ -164,7 +164,7 @@ ctags $(SRC) --- a/test/Makefile +++ b/test/Makefile -@@ -144,7 +144,7 @@ install: +@@ -145,7 +145,7 @@ install: tags: ctags $(SRC) @@ -173,7 +173,7 @@ apps: @(cd ..; $(MAKE) DIRS=apps all) -@@ -578,7 +578,7 @@ $(DTLSTEST)$(EXE_EXT): $(DTLSTEST).o ssl +@@ -586,7 +586,7 @@ $(DTLSTEST)$(EXE_EXT): $(DTLSTEST).o ssl # fi dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) |