From: Raspbian automatic forward porter Date: Fri, 20 Jan 2023 23:35:28 +0000 (+0000) Subject: Merge version 13.0.0+r24-1+rpi1 and 13.0.0+r24-2 to produce 13.0.0+r24-2+rpi1 X-Git-Tag: archive/raspbian/13.0.0+r24-2+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=06ae0f984caabf151330614391c942811b3a8c24;p=android-platform-external-boringssl.git Merge version 13.0.0+r24-1+rpi1 and 13.0.0+r24-2 to produce 13.0.0+r24-2+rpi1 --- 06ae0f984caabf151330614391c942811b3a8c24 diff --cc debian/changelog index c7497df,2166488..2d2d955 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,10 +1,20 @@@ - android-platform-external-boringssl (13.0.0+r24-1+rpi1) bookworm-staging; urgency=medium ++android-platform-external-boringssl (13.0.0+r24-2+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. + - -- Raspbian forward porter Thu, 19 Jan 2023 02:00:13 +0000 ++ -- Raspbian forward porter Fri, 20 Jan 2023 23:35:28 +0000 ++ + android-platform-external-boringssl (13.0.0+r24-2) unstable; urgency=medium + + * debian/patches: Refresh again. + * debian/rules: Add script to import new upstream. + * debian/lintian-overrides: Add mips*el specific tag. + + -- Roger Shimizu Tue, 17 Jan 2023 21:08:43 -0800 android-platform-external-boringssl (13.0.0+r24-1) unstable; urgency=medium diff --cc debian/patches/series index 3d32f4c,b93aa22..0270320 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,4 -1,3 +1,4 @@@ 01-Add-new-Arch-ia64-riscv64-sh4-x32.patch 02-sources-mk.patch - 0003-Disable-failing-test.patch + 03-Disable-failing-test.patch +armv6.patch