From: Bernd Kuhls Date: Sat, 9 Feb 2019 10:11:38 +0000 (+0100) Subject: package/libopenssl: renumber patches X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b1ff0c0786a8953bdcadd778e75449638f485588;p=buildroot.git package/libopenssl: renumber patches Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- diff --git a/package/libopenssl/0002-Reproducible-build-do-not-leak-compiler-path.patch b/package/libopenssl/0002-Reproducible-build-do-not-leak-compiler-path.patch new file mode 100644 index 0000000000..820c2addf1 --- /dev/null +++ b/package/libopenssl/0002-Reproducible-build-do-not-leak-compiler-path.patch @@ -0,0 +1,29 @@ +From b70be8c65365a8fc564226360d45adbbb29fc0af Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Tue, 24 Oct 2017 16:58:32 +0200 +Subject: [PATCH] Reproducible build: do not leak compiler path + +Signed-off-by: Peter Seiderer + +[Rebased on openssl-1.1.1.a] +Signed-off-by: Peter Seiderer +--- + crypto/build.info | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/crypto/build.info b/crypto/build.info +index 2c619c6..49ca6ab 100644 +--- a/crypto/build.info ++++ b/crypto/build.info +@@ -10,7 +10,7 @@ EXTRA= ../ms/uplink-x86.pl ../ms/uplink.c ../ms/applink.c \ + ppccpuid.pl pariscid.pl alphacpuid.pl arm64cpuid.pl armv4cpuid.pl + + DEPEND[cversion.o]=buildinf.h +-GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(LIB_CFLAGS) $(CPPFLAGS_Q)" "$(PLATFORM)" ++GENERATE[buildinf.h]=../util/mkbuildinf.pl "$$(basename $(CC)) $(LIB_CFLAGS) $(CPPFLAGS_Q)" "$(PLATFORM)" + DEPEND[buildinf.h]=../configdata.pm + + GENERATE[uplink-x86.s]=../ms/uplink-x86.pl $(PERLASM_SCHEME) +-- +2.20.1 + diff --git a/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch b/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch new file mode 100644 index 0000000000..c51a3cd684 --- /dev/null +++ b/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch @@ -0,0 +1,27 @@ +From 1281ffc7959bd2070563e17a52ee4424196d885c Mon Sep 17 00:00:00 2001 +From: Patrick Havelange +Date: Wed, 23 Jan 2019 12:21:21 +0100 +Subject: [PATCH] Introduce the OPENSSL_NO_MADVISE to disable call to madvise() + +Upstream: https://github.com/openssl/openssl/pull/8089 +Signed-off-by: Patrick Havelange +--- + crypto/mem_sec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c +index 9e0f670..32c7282 100644 +--- a/crypto/mem_sec.c ++++ b/crypto/mem_sec.c +@@ -485,7 +485,7 @@ static int sh_init(size_t size, int minsize) + if (mlock(sh.arena, sh.arena_size) < 0) + ret = 2; + #endif +-#ifdef MADV_DONTDUMP ++#if defined(MADV_DONTDUMP) && !defined(OPENSSL_NO_MADVISE) + if (madvise(sh.arena, sh.arena_size, MADV_DONTDUMP) < 0) + ret = 2; + #endif +-- +2.17.1 + diff --git a/package/libopenssl/0003-Reproducible-build-do-not-leak-compiler-path.patch b/package/libopenssl/0003-Reproducible-build-do-not-leak-compiler-path.patch deleted file mode 100644 index 820c2addf1..0000000000 --- a/package/libopenssl/0003-Reproducible-build-do-not-leak-compiler-path.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b70be8c65365a8fc564226360d45adbbb29fc0af Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Tue, 24 Oct 2017 16:58:32 +0200 -Subject: [PATCH] Reproducible build: do not leak compiler path - -Signed-off-by: Peter Seiderer - -[Rebased on openssl-1.1.1.a] -Signed-off-by: Peter Seiderer ---- - crypto/build.info | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/crypto/build.info b/crypto/build.info -index 2c619c6..49ca6ab 100644 ---- a/crypto/build.info -+++ b/crypto/build.info -@@ -10,7 +10,7 @@ EXTRA= ../ms/uplink-x86.pl ../ms/uplink.c ../ms/applink.c \ - ppccpuid.pl pariscid.pl alphacpuid.pl arm64cpuid.pl armv4cpuid.pl - - DEPEND[cversion.o]=buildinf.h --GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(LIB_CFLAGS) $(CPPFLAGS_Q)" "$(PLATFORM)" -+GENERATE[buildinf.h]=../util/mkbuildinf.pl "$$(basename $(CC)) $(LIB_CFLAGS) $(CPPFLAGS_Q)" "$(PLATFORM)" - DEPEND[buildinf.h]=../configdata.pm - - GENERATE[uplink-x86.s]=../ms/uplink-x86.pl $(PERLASM_SCHEME) --- -2.20.1 - diff --git a/package/libopenssl/0004-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch b/package/libopenssl/0004-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch deleted file mode 100644 index c51a3cd684..0000000000 --- a/package/libopenssl/0004-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 1281ffc7959bd2070563e17a52ee4424196d885c Mon Sep 17 00:00:00 2001 -From: Patrick Havelange -Date: Wed, 23 Jan 2019 12:21:21 +0100 -Subject: [PATCH] Introduce the OPENSSL_NO_MADVISE to disable call to madvise() - -Upstream: https://github.com/openssl/openssl/pull/8089 -Signed-off-by: Patrick Havelange ---- - crypto/mem_sec.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c -index 9e0f670..32c7282 100644 ---- a/crypto/mem_sec.c -+++ b/crypto/mem_sec.c -@@ -485,7 +485,7 @@ static int sh_init(size_t size, int minsize) - if (mlock(sh.arena, sh.arena_size) < 0) - ret = 2; - #endif --#ifdef MADV_DONTDUMP -+#if defined(MADV_DONTDUMP) && !defined(OPENSSL_NO_MADVISE) - if (madvise(sh.arena, sh.arena_size, MADV_DONTDUMP) < 0) - ret = 2; - #endif --- -2.17.1 - diff --git a/package/libopenssl/0004-apps-ocsp.c-Use-the-same-HAVE_FORK-NO_FORK-as-in-spe.patch b/package/libopenssl/0004-apps-ocsp.c-Use-the-same-HAVE_FORK-NO_FORK-as-in-spe.patch new file mode 100644 index 0000000000..83989fe742 --- /dev/null +++ b/package/libopenssl/0004-apps-ocsp.c-Use-the-same-HAVE_FORK-NO_FORK-as-in-spe.patch @@ -0,0 +1,46 @@ +From 4c992673890f1d1ecb9aa46112b2ca80db016b67 Mon Sep 17 00:00:00 2001 +From: Richard Levitte +Date: Mon, 12 Nov 2018 18:16:27 +0100 +Subject: [PATCH] apps/ocsp.c Use the same HAVE_FORK / NO_FORK as in speed.c + +This allows the user to override our defaults if needed, and in a +consistent manner. + +Partial fix for #7607 + +Upstream: https://github.com/openssl/openssl/pull/7624 +Signed-off-by: Patrick Havelange +--- + apps/ocsp.c | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +diff --git a/apps/ocsp.c b/apps/ocsp.c +index 7fd78624bb..315b072932 100644 +--- a/apps/ocsp.c ++++ b/apps/ocsp.c +@@ -36,7 +36,21 @@ NON_EMPTY_TRANSLATION_UNIT + # include + # include + +-# if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_NO_SOCK) \ ++#ifndef HAVE_FORK ++# if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) ++# define HAVE_FORK 0 ++# else ++# define HAVE_FORK 1 ++# endif ++#endif ++ ++#if HAVE_FORK ++# undef NO_FORK ++#else ++# define NO_FORK ++#endif ++ ++# if !defined(NO_FORK) && !defined(OPENSSL_NO_SOCK) \ + && !defined(OPENSSL_NO_POSIX_IO) + # define OCSP_DAEMON + # include +-- +2.17.1 + diff --git a/package/libopenssl/0005-apps-ocsp.c-Use-the-same-HAVE_FORK-NO_FORK-as-in-spe.patch b/package/libopenssl/0005-apps-ocsp.c-Use-the-same-HAVE_FORK-NO_FORK-as-in-spe.patch deleted file mode 100644 index 83989fe742..0000000000 --- a/package/libopenssl/0005-apps-ocsp.c-Use-the-same-HAVE_FORK-NO_FORK-as-in-spe.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4c992673890f1d1ecb9aa46112b2ca80db016b67 Mon Sep 17 00:00:00 2001 -From: Richard Levitte -Date: Mon, 12 Nov 2018 18:16:27 +0100 -Subject: [PATCH] apps/ocsp.c Use the same HAVE_FORK / NO_FORK as in speed.c - -This allows the user to override our defaults if needed, and in a -consistent manner. - -Partial fix for #7607 - -Upstream: https://github.com/openssl/openssl/pull/7624 -Signed-off-by: Patrick Havelange ---- - apps/ocsp.c | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -diff --git a/apps/ocsp.c b/apps/ocsp.c -index 7fd78624bb..315b072932 100644 ---- a/apps/ocsp.c -+++ b/apps/ocsp.c -@@ -36,7 +36,21 @@ NON_EMPTY_TRANSLATION_UNIT - # include - # include - --# if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_NO_SOCK) \ -+#ifndef HAVE_FORK -+# if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) -+# define HAVE_FORK 0 -+# else -+# define HAVE_FORK 1 -+# endif -+#endif -+ -+#if HAVE_FORK -+# undef NO_FORK -+#else -+# define NO_FORK -+#endif -+ -+# if !defined(NO_FORK) && !defined(OPENSSL_NO_SOCK) \ - && !defined(OPENSSL_NO_POSIX_IO) - # define OCSP_DAEMON - # include --- -2.17.1 -