From 0283a7456e3c16c3c2430160e57ea4f838dc94dc Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 24 Jul 2018 16:26:53 -0400 Subject: [PATCH] debian/patches/abort_abort_abort.patch: dropped patch, included upstream. --- debian/changelog | 1 + debian/patches/abort_abort_abort.patch | 18 ------------------ debian/patches/series | 1 - 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 debian/patches/abort_abort_abort.patch diff --git a/debian/changelog b/debian/changelog index d116272..5ea26c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ shim (15+1531942534.dd3230d-0ubuntu1) UNRELEASED; urgency=medium [ Mathieu Trudel-Lapierre ] * New upstream snapshot. + * debian/patches/abort_abort_abort.patch: dropped patch, included upstream. -- Mathieu Trudel-Lapierre Tue, 24 Jul 2018 16:24:51 -0400 diff --git a/debian/patches/abort_abort_abort.patch b/debian/patches/abort_abort_abort.patch deleted file mode 100644 index 2afdac4..0000000 --- a/debian/patches/abort_abort_abort.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Peter Jones -Subject: define abort to avoid an unnecessary reloc. - ---- - Cryptlib/Include/OpenSslSupport.h | 1 + - 1 file changed, 1 insertion(+) - -Index: b/Cryptlib/Include/OpenSslSupport.h -=================================================================== ---- a/Cryptlib/Include/OpenSslSupport.h -+++ b/Cryptlib/Include/OpenSslSupport.h -@@ -380,5 +380,6 @@ extern FILE *stdout; - #define atoi(nptr) AsciiStrDecimalToUintn(nptr) - #define gettimeofday(tvp,tz) do { (tvp)->tv_sec = time(NULL); (tvp)->tv_usec = 0; } while (0) - #define gmtime_r(timer,result) (result = NULL) -+#define abort() - - #endif diff --git a/debian/patches/series b/debian/patches/series index ae84c75..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +0,0 @@ -abort_abort_abort.patch