mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-24 07:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1800 from mischief/openssl-1.0.2g

Browse Source 
dev-libs/openssl: bump to 1.0.2g
This commit is contained in:
Nick Owens 2016-03-01 14:19:39 -08:00
commit 8f43d859d9
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-1.0.2e-parallel-build.patch → sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-1.0.2g-parallel-build.patch vendored
View File

@ -1,5 +1,5 @@
--- openssl-1.0.2e/crypto/Makefile --- openssl-1.0.2g/crypto/Makefile
+++ openssl-1.0.2e/crypto/Makefile +++ openssl-1.0.2g/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
@ -41,8 +41,8 @@
lint: lint:
@target=lint; $(RECURSIVE_MAKE) @target=lint; $(RECURSIVE_MAKE)
--- openssl-1.0.2e/engines/Makefile --- openssl-1.0.2g/engines/Makefile
+++ openssl-1.0.2e/engines/Makefile +++ openssl-1.0.2g/engines/Makefile
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
all: lib subdirs all: lib subdirs
@ -70,9 +70,9 @@
tags: tags:
ctags $(SRC) ctags $(SRC)
--- openssl-1.0.2e/Makefile.org --- openssl-1.0.2g/Makefile.org
+++ openssl-1.0.2e/Makefile.org +++ openssl-1.0.2g/Makefile.org
@@ -280,17 +280,17 @@ @@ -279,17 +279,17 @@
build_libssl: build_ssl libssl.pc build_libssl: build_ssl libssl.pc
build_crypto: build_crypto:
@ -96,7 +96,7 @@
all_testapps: build_libs build_testapps all_testapps: build_libs build_testapps
build_testapps: build_testapps:
@@ -548,7 +548,7 @@ @@ -544,7 +544,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;
@ -105,8 +105,8 @@
@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.2e/Makefile.shared --- openssl-1.0.2g/Makefile.shared
+++ openssl-1.0.2e/Makefile.shared +++ openssl-1.0.2g/Makefile.shared
@@ -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`; \
@ -123,9 +123,9 @@
( $(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.2e/test/Makefile --- openssl-1.0.2g/test/Makefile
+++ openssl-1.0.2e/test/Makefile +++ openssl-1.0.2g/test/Makefile
@@ -138,7 +138,7 @@ @@ -139,7 +139,7 @@
tags: tags:
ctags $(SRC) ctags $(SRC)
@ -134,7 +134,7 @@
apps: apps:
@(cd ..; $(MAKE) DIRS=apps all) @(cd ..; $(MAKE) DIRS=apps all)
@@ -416,127 +416,127 @@ @@ -421,130 +421,130 @@
link_app.$${shlib_target} link_app.$${shlib_target}
$(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
@ -301,9 +301,13 @@
- @target=$(CLIENTHELLOTEST) $(BUILD_CMD) - @target=$(CLIENTHELLOTEST) $(BUILD_CMD)
+ +@target=$(CLIENTHELLOTEST) $(BUILD_CMD) + +@target=$(CLIENTHELLOTEST) $(BUILD_CMD)
$(SSLV2CONFTEST)$(EXE_EXT): $(SSLV2CONFTEST).o
- @target=$(SSLV2CONFTEST) $(BUILD_CMD)
+ +@target=$(SSLV2CONFTEST) $(BUILD_CMD)
#$(AESTEST).o: $(AESTEST).c #$(AESTEST).o: $(AESTEST).c
# $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
@@ -549,7 +549,7 @@ @@ -557,7 +557,7 @@
# fi # fi
dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)

5
sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/openssl-1.0.2f-r1.ebuild → sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/openssl-1.0.2g.ebuild vendored
View File

@ -55,7 +55,7 @@ src_prepare() {
if ! use vanilla ; then if ! use vanilla ; then
epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421 epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743 epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743
epatch "${FILESDIR}"/${PN}-1.0.2e-parallel-build.patch epatch "${FILESDIR}"/${PN}-1.0.2g-parallel-build.patch
epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch
epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch
epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028 epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028
@ -133,6 +133,8 @@ multilib_src_configure() {
local config="Configure" local config="Configure"
[[ -z ${sslout} ]] && config="config" [[ -z ${sslout} ]] && config="config"
# we enable sslv2 here so that rebuilding openssl doesn't break other
# programs that linked to it.
echoit \ echoit \
./${config} \ ./${config} \
${sslout} \ ${sslout} \
@ -143,6 +145,7 @@ multilib_src_configure() {
enable-mdc2 \ enable-mdc2 \
enable-rc5 \ enable-rc5 \
enable-tlsext \ enable-tlsext \
enable-ssl2 \
$(use_ssl asm) \ $(use_ssl asm) \
$(use_ssl gmp gmp -lgmp) \ $(use_ssl gmp gmp -lgmp) \
$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \