From: Raspbian automatic forward porter Date: Wed, 2 Nov 2022 00:05:30 +0000 (+0000) Subject: Merge version 13~preview2-7+rpi1 and 13.0.0+r11-1 to produce 13.0.0+r11-1+rpi1 X-Git-Tag: archive/raspbian/13.0.0+r11-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6c80491f1f5555a3155f0fe412873e0acfdc1bb9;p=android-platform-external-boringssl.git Merge version 13~preview2-7+rpi1 and 13.0.0+r11-1 to produce 13.0.0+r11-1+rpi1 --- 6c80491f1f5555a3155f0fe412873e0acfdc1bb9 diff --cc debian/changelog index d3573e6,67f9cef..bf1c5dd --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,12 +1,22 @@@ - android-platform-external-boringssl (13~preview2-7+rpi1) bookworm-staging; urgency=medium ++android-platform-external-boringssl (13.0.0+r11-1+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 10.0.0+r36-1+rpi1 by Peter Michael Green at Tue, 19 Jan 2021 16:01:40 +0000] + * Mark asm as armv6 to avoid setting off armv7 contamination checker. + * set __ARM_MAX_ARCH__ to 6. + * disable HWAES define. + * disable GHASH_ASM_ARM define. + - -- Peter Michael Green Thu, 14 Jul 2022 13:55:23 +0000 ++ -- Raspbian forward porter Wed, 02 Nov 2022 00:05:30 +0000 ++ + android-platform-external-boringssl (13.0.0+r11-1) unstable; urgency=medium + + * New upstream release 13.0.0+r11 + * debian/patches: Remove backport patch. + * debian/copyright: Update file list. + * debian/sources.mk: Update by script. + * debian/control: Add myself as uploader. + + -- Roger Shimizu Sat, 29 Oct 2022 01:58:01 -0700 android-platform-external-boringssl (13~preview2-7) unstable; urgency=medium diff --cc debian/patches/series index 889511d,8cbc366..2429b36 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,4 -1,2 +1,3 @@@ 01-Add-new-Arch-ia64-riscv64-sh4-x32.patch 02-sources-mk.patch - Sync-to-81502beeddc5f116d44d0898c.patch +armv6.patch