Skip to content

S
slapos
Commit bb9699ee authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki
Browse files
Options

version up : OpenSSL 1.0.2d.

parent f0a3c3fa
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 35 deletions
component/openssl/buildout.cfg
View file @ bb9699ee
...@@ -16,13 +16,13 @@ parts = ...@@ -16,13 +16,13 @@ parts =
[openssl] [openssl]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://www.openssl.org/source/openssl-1.0.2c.tar.gz url = https://www.openssl.org/source/openssl-1.0.2d.tar.gz
md5sum = 8c8d81a9ae7005276e486702edbcd4b6 md5sum = 38dd619b2e77cbac69b99f52a053d25a
patch-binary = ${patch:location}/bin/patch patch-binary = ${patch:location}/bin/patch
patches = patches =
${:_profile_base_location_}/openssl-nodoc.patch#a78c14908fe9ec624b1fb9fa97e01bb9 ${:_profile_base_location_}/openssl-nodoc.patch#cc910f6a572e8c9d78614f915ccb0f0d
${:_profile_base_location_}/openssl-exlibs.patch#fba5c873cf974ba80a973be41da3c738 ${:_profile_base_location_}/openssl-exlibs.patch#fba5c873cf974ba80a973be41da3c738
${:_profile_base_location_}/openssl-1.0.2a-parallel-build.patch#2a79dd064f610860857b50a41eace64d ${:_profile_base_location_}/openssl-1.0.2d-parallel-build.patch#e4cf66a48a85a0da68fd4842e6fab54b
patch-options = -p1 patch-options = -p1
configure-command = ./config configure-command = ./config
configure-options = configure-options =
......
component/openssl/openssl-1.0.2a-parallel-build.patch → component/openssl/openssl-1.0.2d-parallel-build.patch
View file @ bb9699ee
https://rt.openssl.org/Ticket/Display.html?id=2084&user=guest&pass=guest diff -ur openssl-1.0.2d.orig/crypto/Makefile openssl-1.0.2d/crypto/Makefile
https://rt.openssl.org/Ticket/Display.html?id=3738&user=guest&pass=guest --- openssl-1.0.2d.orig/crypto/Makefile 2015-07-09 21:02:54.000000000 +0900
+++ openssl-1.0.2d/crypto/Makefile 2015-07-09 22:59:19.585880610 +0900
--- openssl-1.0.2a/crypto/Makefile
+++ openssl-1.0.2a/crypto/Makefile
@@ -85,11 +85,11 @@ @@ -85,11 +85,11 @@
@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
...@@ -44,8 +42,9 @@ https://rt.openssl.org/Ticket/Display.html?id=3738&user=guest&pass=guest ...@@ -44,8 +42,9 @@ https://rt.openssl.org/Ticket/Display.html?id=3738&user=guest&pass=guest
lint: lint:
@target=lint; $(RECURSIVE_MAKE) @target=lint; $(RECURSIVE_MAKE)
--- openssl-1.0.2a/engines/Makefile diff -ur openssl-1.0.2d.orig/engines/Makefile openssl-1.0.2d/engines/Makefile
+++ openssl-1.0.2a/engines/Makefile --- openssl-1.0.2d.orig/engines/Makefile 2015-07-09 21:03:07.000000000 +0900
+++ openssl-1.0.2d/engines/Makefile 2015-07-09 22:59:19.585880610 +0900
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
all: lib subdirs all: lib subdirs
...@@ -73,38 +72,39 @@ https://rt.openssl.org/Ticket/Display.html?id=3738&user=guest&pass=guest ...@@ -73,38 +72,39 @@ https://rt.openssl.org/Ticket/Display.html?id=3738&user=guest&pass=guest
tags: tags:
ctags $(SRC) ctags $(SRC)
--- openssl-1.0.2a/Makefile.org diff -ur openssl-1.0.2d.orig/Makefile.org openssl-1.0.2d/Makefile.org
+++ openssl-1.0.2a/Makefile.org --- openssl-1.0.2d.orig/Makefile.org 2015-07-09 20:57:15.000000000 +0900
@@ -274,17 +274,17 @@ +++ openssl-1.0.2d/Makefile.org 2015-07-09 22:59:57.214057201 +0900
build_libs: build_crypto build_ssl build_engines @@ -278,21 +278,21 @@
build_libssl: build_ssl libssl.pc
build_crypto: build_crypto:
- @dir=crypto; target=all; $(BUILD_ONE_CMD) - @dir=crypto; target=all; $(BUILD_ONE_CMD)
+ +@dir=crypto; target=all; $(BUILD_ONE_CMD) + +@dir=crypto; target=all; $(BUILD_ONE_CMD)
-build_ssl: build_ssl: build_crypto
+build_ssl: build_crypto
- @dir=ssl; target=all; $(BUILD_ONE_CMD) - @dir=ssl; target=all; $(BUILD_ONE_CMD)
+ +@dir=ssl; target=all; $(BUILD_ONE_CMD) + +@dir=ssl; target=all; $(BUILD_ONE_CMD)
-build_engines: build_engines: build_crypto
+build_engines: build_crypto
- @dir=engines; target=all; $(BUILD_ONE_CMD) - @dir=engines; target=all; $(BUILD_ONE_CMD)
+ +@dir=engines; target=all; $(BUILD_ONE_CMD) + +@dir=engines; target=all; $(BUILD_ONE_CMD)
-build_apps: build_apps: build_libs
+build_apps: build_libs
- @dir=apps; target=all; $(BUILD_ONE_CMD) - @dir=apps; target=all; $(BUILD_ONE_CMD)
+ +@dir=apps; target=all; $(BUILD_ONE_CMD) + +@dir=apps; target=all; $(BUILD_ONE_CMD)
-build_tests: build_tests: build_libs
+build_tests: build_libs
- @dir=test; target=all; $(BUILD_ONE_CMD) - @dir=test; target=all; $(BUILD_ONE_CMD)
+ +@dir=test; target=all; $(BUILD_ONE_CMD) + +@dir=test; target=all; $(BUILD_ONE_CMD)
-build_tools: build_tools: build_libs
+build_tools: build_libs
- @dir=tools; target=all; $(BUILD_ONE_CMD) - @dir=tools; target=all; $(BUILD_ONE_CMD)
+ +@dir=tools; target=all; $(BUILD_ONE_CMD) + +@dir=tools; target=all; $(BUILD_ONE_CMD)
all_testapps: build_libs build_testapps all_testapps: build_libs build_testapps
build_testapps: build_testapps:
@@ -555,7 +555,7 @@ - @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
+ +@dir=crypto; target=testapps; $(BUILD_ONE_CMD)
fips_premain_dso$(EXE_EXT): libcrypto.a
[ -z "$(FIPSCANLIB)" ] || $(CC) $(CFLAG) -Iinclude \
@@ -543,7 +543,7 @@
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
done; done;
...@@ -113,8 +113,9 @@ https://rt.openssl.org/Ticket/Display.html?id=3738&user=guest&pass=guest ...@@ -113,8 +113,9 @@ https://rt.openssl.org/Ticket/Display.html?id=3738&user=guest&pass=guest
@set -e; liblist="$(LIBS)"; for i in $$liblist ;\ @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
do \ do \
if [ -f "$$i" ]; then \ if [ -f "$$i" ]; then \
--- openssl-1.0.2a/Makefile.shared diff -ur openssl-1.0.2d.orig/Makefile.shared openssl-1.0.2d/Makefile.shared
+++ openssl-1.0.2a/Makefile.shared --- openssl-1.0.2d.orig/Makefile.shared 2015-07-09 20:53:21.000000000 +0900
+++ openssl-1.0.2d/Makefile.shared 2015-07-09 22:59:19.589880628 +0900
@@ -105,6 +105,7 @@ @@ -105,6 +105,7 @@
SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
...@@ -131,9 +132,10 @@ https://rt.openssl.org/Ticket/Display.html?id=3738&user=guest&pass=guest ...@@ -131,9 +132,10 @@ https://rt.openssl.org/Ticket/Display.html?id=3738&user=guest&pass=guest
( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \ ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \ ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
fi; \ fi; \
--- openssl-1.0.2a/test/Makefile diff -ur openssl-1.0.2d.orig/test/Makefile openssl-1.0.2d/test/Makefile
+++ openssl-1.0.2a/test/Makefile --- openssl-1.0.2d.orig/test/Makefile 2015-07-09 21:03:09.000000000 +0900
@@ -133,7 +133,7 @@ +++ openssl-1.0.2d/test/Makefile 2015-07-09 22:59:19.589880628 +0900
@@ -134,7 +134,7 @@
tags: tags:
ctags $(SRC) ctags $(SRC)
...@@ -142,7 +144,7 @@ https://rt.openssl.org/Ticket/Display.html?id=3738&user=guest&pass=guest ...@@ -142,7 +144,7 @@ https://rt.openssl.org/Ticket/Display.html?id=3738&user=guest&pass=guest
apps: apps:
@(cd ..; $(MAKE) DIRS=apps all) @(cd ..; $(MAKE) DIRS=apps all)
@@ -402,121 +402,121 @@ @@ -408,121 +408,121 @@
link_app.$${shlib_target} link_app.$${shlib_target}
$(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
...@@ -301,9 +303,9 @@ https://rt.openssl.org/Ticket/Display.html?id=3738&user=guest&pass=guest ...@@ -301,9 +303,9 @@ https://rt.openssl.org/Ticket/Display.html?id=3738&user=guest&pass=guest
- @target=$(CONSTTIMETEST) $(BUILD_CMD) - @target=$(CONSTTIMETEST) $(BUILD_CMD)
+ +@target=$(CONSTTIMETEST) $(BUILD_CMD) + +@target=$(CONSTTIMETEST) $(BUILD_CMD)
#$(AESTEST).o: $(AESTEST).c $(VERIFYEXTRATEST)$(EXE_EXT): $(VERIFYEXTRATEST).o
# $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c @target=$(VERIFYEXTRATEST) $(BUILD_CMD)
@@ -529,7 +529,7 @@ @@ -538,7 +538,7 @@
# fi # fi
dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7