diff options
author | Steve Langasek <steve.langasek@canonical.com> | 2019-02-09 21:28:06 -0800 |
---|---|---|
committer | Steve Langasek <steve.langasek@canonical.com> | 2019-02-09 21:32:44 -0800 |
commit | ab4c731c1dd379acd3e95971af57401fb0a650a1 (patch) | |
tree | 6a26fb8d0746cbbaa6c2d4b242c73442bcc1df06 /Cryptlib/OpenSSL/openssl-bio-b_print-disable-sse.patch | |
parent | 0d63079c7da8e86104ce4bbdae2f6cb8d2ea40c6 (diff) | |
parent | 9c12130f9cd2ae11a9336813dd1f1669c0b64ad0 (diff) | |
download | efi-boot-shim-debian/15+1533136590.3beb971-1.tar.gz efi-boot-shim-debian/15+1533136590.3beb971-1.zip |
* New upstream release.debian/15+1533136590.3beb971-1
- debian/patches/second-stage-path: dropped; the default loader path now
includes an arch suffix.
- debian/patches/sbsigntool-no-pesign: dropped; no longer needed.
* Drop remaining patches that were not being applied.
* Sync packaging from Ubuntu:
- debian/copyright: Update upstream source location.
- debian/control: add a Build-Depends on libelf-dev.
- Enable arm64 build.
- debian/patches/fixup_git.patch: don't run git in clean; we're not
really in a git tree.
- debian/rules, debian/shim.install: use the upstream install target as
intended, and move files to the target directory using dh_install.
- define RELEASE and COMMIT_ID for the snapshot.
- Set ENABLE_HTTPBOOT to enable the HTTP Boot feature.
- Update dh_auto_build/dh_auto_clean/dh_auto_install for new upstream
options: set MAKELEVEL.
- Define an EFI_ARCH variable, and use that for paths to shim. This
makes it possible to build a shim for other architectures than amd64.
- Set EFIDIR=$distro for dh_auto_install; that will let files be installed
in the "right" final directories, and makes boot.csv for us.
- Set ENABLE_SHIM_CERT, to keep using ephemeral self-signed certs built
at compile-time for MokManager and fallback.
- Set ENABLE_SBSIGN, to use sbsign instead of pesign for signing fallback
and MokManager.
Diffstat (limited to 'Cryptlib/OpenSSL/openssl-bio-b_print-disable-sse.patch')
-rw-r--r-- | Cryptlib/OpenSSL/openssl-bio-b_print-disable-sse.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Cryptlib/OpenSSL/openssl-bio-b_print-disable-sse.patch b/Cryptlib/OpenSSL/openssl-bio-b_print-disable-sse.patch index 4a9c76a7..2b1fc5bf 100644 --- a/Cryptlib/OpenSSL/openssl-bio-b_print-disable-sse.patch +++ b/Cryptlib/OpenSSL/openssl-bio-b_print-disable-sse.patch @@ -1,19 +1,19 @@ diff --git a/Cryptlib/OpenSSL/crypto/bio/b_print.c b/Cryptlib/OpenSSL/crypto/bio/b_print.c -index 90248fa..dfc26bc 100644 +index e91ab6d..f33caa2 100644 --- a/Cryptlib/OpenSSL/crypto/bio/b_print.c +++ b/Cryptlib/OpenSSL/crypto/bio/b_print.c -@@ -129,8 +129,10 @@ static int fmtstr(char **, char **, size_t *, size_t *, +@@ -51,8 +51,10 @@ static int fmtstr(char **, char **, size_t *, size_t *, const char *, int, int, int); static int fmtint(char **, char **, size_t *, size_t *, LLONG, int, int, int, int); +#ifndef OPENSSL_SYS_UEFI static int fmtfp(char **, char **, size_t *, size_t *, - LDOUBLE, int, int, int); + LDOUBLE, int, int, int, int); +#endif static int doapr_outch(char **, char **, size_t *, size_t *, int); static int _dopr(char **sbuffer, char **buffer, size_t *maxlen, size_t *retlen, int *truncated, -@@ -173,7 +175,9 @@ _dopr(char **sbuffer, +@@ -107,7 +109,9 @@ _dopr(char **sbuffer, { char ch; LLONG value; @@ -23,7 +23,7 @@ index 90248fa..dfc26bc 100644 char *strvalue; int min; int max; -@@ -276,10 +280,12 @@ _dopr(char **sbuffer, +@@ -210,10 +214,12 @@ _dopr(char **sbuffer, cflags = DP_C_LLONG; ch = *format++; break; @@ -36,7 +36,7 @@ index 90248fa..dfc26bc 100644 default: break; } -@@ -333,6 +339,7 @@ _dopr(char **sbuffer, +@@ -267,6 +273,7 @@ _dopr(char **sbuffer, min, max, flags)) return 0; break; @@ -44,15 +44,15 @@ index 90248fa..dfc26bc 100644 case 'f': if (cflags == DP_C_LDOUBLE) fvalue = va_arg(args, LDOUBLE); -@@ -358,6 +365,7 @@ _dopr(char **sbuffer, - else - fvalue = va_arg(args, double); +@@ -298,6 +305,7 @@ _dopr(char **sbuffer, + flags, G_FORMAT)) + return 0; break; +#endif case 'c': if(!doapr_outch(sbuffer, buffer, &currlen, maxlen, va_arg(args, int))) -@@ -575,6 +583,7 @@ fmtint(char **sbuffer, +@@ -530,6 +538,7 @@ fmtint(char **sbuffer, return 1; } @@ -60,7 +60,7 @@ index 90248fa..dfc26bc 100644 static LDOUBLE abs_val(LDOUBLE value) { LDOUBLE result = value; -@@ -733,6 +742,7 @@ fmtfp(char **sbuffer, +@@ -816,6 +825,7 @@ fmtfp(char **sbuffer, } return 1; } |