diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/abort_abort_abort.patch | 18 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 27 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index f55cf3c3..c5832328 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +shim (13-0ubuntu2) UNRELEASED; urgency=medium + + * debian/patches/abort_abort_abort.patch: signtool.exe isn't happy with some + of the structure of our binary, partly because abort() is thought to be an + external symbol, which causes some relocalisations to appear. + + -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com> Mon, 06 Nov 2017 09:13:01 -0500 + shim (13-0ubuntu1) artful; urgency=medium * New upstream release: 13 diff --git a/debian/patches/abort_abort_abort.patch b/debian/patches/abort_abort_abort.patch new file mode 100644 index 00000000..2afdac4c --- /dev/null +++ b/debian/patches/abort_abort_abort.patch @@ -0,0 +1,18 @@ +From: Peter Jones <pjones@redhat.com> +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 e69de29b..ae84c759 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +abort_abort_abort.patch |