From tg at mirbsd.de Mon Aug 9 14:52:18 2021 From: tg at mirbsd.de (Thorsten Glaser) Date: Mon, 9 Aug 2021 21:52:18 +0000 (UTC) Subject: [klibc] Fwd: Ubuntu (new upstream) klibc 2.0.8-6.1ubuntu2 Message-ID: Hi *, apparently *buntu have extra patches that might need consideration. bye, //mirabilos -- Gestern Nacht ist mein IRC-Netzwerk explodiert. Ich hatte nicht damit gerechnet, darum bin ich blutverschmiert? wer konnte ahnen, da? SIE so reagier?n? gestern Nacht ist mein IRC-Netzwerk explodiert~~~ (as of 2021-06-15 The MirOS Project temporarily reconvenes on OFTC) -------------- next part -------------- Format: 1.8 Date: Mon, 09 Aug 2021 16:46:29 +0200 Source: klibc Binary: libklibc-dev libklibc klibc-utils Architecture: source Version: 2.0.8-6.1ubuntu2 Distribution: impish Urgency: medium Maintainer: Ubuntu Developers Changed-By: Lukas M??rdian Description: klibc-utils - small utilities built with klibc for early boot libklibc - minimal libc subset for use with initramfs libklibc-dev - kernel headers used during the build of klibc Closes: 943425 Changes: klibc (2.0.8-6.1ubuntu2) impish; urgency=medium . * Merge with Debian; remaining changes: - Keep Ubuntu specific debian/patches/cf-protection.patch * Add debian/patches/armhf-min-fpu.patch for GCC-11 compatibility . klibc (2.0.8-6.1) unstable; urgency=medium . * Non-maintainer upload. * {set,long}jmp [s390x]: save/restore the correct FPU registers (f8???f15 not f1/f3/f5/f7) (Closes: #943425) . klibc (2.0.8-6) unstable; urgency=medium . * Upload to unstable * malloc: Set errno on failure * malloc: Fail if requested size > PTRDIFF_MAX (CVE-2021-31873) * calloc: Fail if multiplication overflows (CVE-2021-31870) * cpio: Fix possible integer overflow on 32-bit systems (CVE-2021-31872) * cpio: Fix possible crash on 64-bit systems (CVE-2021-31871) Checksums-Sha1: 0e4c4d25c88607fc819669eaeb140d5f8e565c04 2222 klibc_2.0.8-6.1ubuntu2.dsc c9ebe581aec22d9a9e325c90124331571622231a 26392 klibc_2.0.8-6.1ubuntu2.debian.tar.xz Checksums-Sha256: dbcdfba96d0e2ee1384d8e8cbab474e3ddae7014b6e1009633866d75b0109316 2222 klibc_2.0.8-6.1ubuntu2.dsc 700f69e4a27f583a4bca4e30aac57b2ee68f5642cf44d79145fb22dbe3178335 26392 klibc_2.0.8-6.1ubuntu2.debian.tar.xz Files: c88f6e3e52d58031798d9a57c0a3fe9b 2222 libs optional klibc_2.0.8-6.1ubuntu2.dsc 4fdc727ddefc9ef4858a3d054a025ea2 26392 libs optional klibc_2.0.8-6.1ubuntu2.debian.tar.xz Original-Maintainer: Debian Kernel Team -------------- next part -------------- diff -pruN 2.0.8-6.1/debian/changelog 2.0.8-6.1ubuntu2/debian/changelog --- 2.0.8-6.1/debian/changelog 2021-05-26 22:12:10.000000000 +0000 +++ 2.0.8-6.1ubuntu2/debian/changelog 2021-08-09 14:46:29.000000000 +0000 @@ -1,3 +1,11 @@ +klibc (2.0.8-6.1ubuntu2) impish; urgency=medium + + * Merge with Debian; remaining changes: + - Keep Ubuntu specific debian/patches/cf-protection.patch + * Add debian/patches/armhf-min-fpu.patch for GCC-11 compatibility + + -- Lukas M??rdian Mon, 09 Aug 2021 16:46:29 +0200 + klibc (2.0.8-6.1) unstable; urgency=medium * Non-maintainer upload. @@ -17,6 +25,13 @@ klibc (2.0.8-6) unstable; urgency=medium -- Ben Hutchings Fri, 30 Apr 2021 03:05:23 +0200 +klibc (2.0.8-5ubuntu1) hirsute; urgency=medium + + * Merge with Debian; remaining changes: + - Keep Ubuntu specific debian/patches/cf-protection.patch + + -- Matthias Klose Mon, 02 Nov 2020 13:12:53 +0100 + klibc (2.0.8-5) experimental; urgency=medium * alpha: Fix definitions of _NSIG and struct sigaction @@ -49,6 +64,19 @@ klibc (2.0.8-2) experimental; urgency=me -- Ben Hutchings Sat, 22 Aug 2020 21:35:52 +0100 +klibc (2.0.8-1ubuntu1) hirsute; urgency=medium + + * Merge with Debian unstable (LP: #1900124). Remaining changes: + - Keep Ubuntu specific debian/patches/cf-protection.patch + * Dropped changes (fixed in 2.0.8-1): + - klibc-fstype-drop-obsolete-support-for-ext4dev.patch + - loop-header.patch + - loop-fixes.patch + - loop-fixes2.patch + - gcc10-fcommon.patch + + -- Lukas M??rdian Mon, 26 Oct 2020 15:06:24 +0100 + klibc (2.0.8-1) unstable; urgency=medium [ Ben Hutchings ] @@ -70,6 +98,51 @@ klibc (2.0.8-1) unstable; urgency=medium -- Ben Hutchings Fri, 21 Aug 2020 01:34:13 +0100 +klibc (2.0.7-1ubuntu6) groovy; urgency=medium + + * debian/patches/gcc10-fcommon.patch: Apply one patch from upstream to + resolve linking issues with GCC10's new "-fno-common" default + + -- Lukas M??rdian Fri, 16 Oct 2020 09:35:34 +0200 + +klibc (2.0.7-1ubuntu5) focal; urgency=medium + + * Apply one patch from upstream and one local to resolve type mistmatch + compiler warnings from the switch to the kernel's UAPI loop.h header. + + -- Adam Conrad Wed, 06 Nov 2019 23:34:08 -0700 + +klibc (2.0.7-1ubuntu4) focal; urgency=medium + + * Fix losetup, by switching to kernel uapi header, instead of buggy + klibc one. LP: #1850184 + + -- Dimitri John Ledkov Thu, 07 Nov 2019 01:08:13 +0000 + +klibc (2.0.7-1ubuntu3) focal; urgency=medium + + * Make argc_save global. + + -- Dimitri John Ledkov Thu, 31 Oct 2019 18:46:55 +0000 + +klibc (2.0.7-1ubuntu2) focal; urgency=medium + + * Drop debugging cruft from the previous upload to minimize delta. + + -- Adam Conrad Thu, 31 Oct 2019 10:35:21 -0600 + +klibc (2.0.7-1ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + * Fix FTBFS on eoan and later with new gcc + - cf-protection.patch: Disable cf-protection for syscalls stub. + + * save-argc.patch: when build with gcc-9 linux-5.3, calling ioctl, + clears global argc, thus save it, to compare to it later. Otheriwse + losetup -f is broken LP: #1850184 + + -- Dimitri John Ledkov Thu, 31 Oct 2019 11:50:44 +0000 + klibc (2.0.7-1) unstable; urgency=medium [ Ben Hutchings ] @@ -101,6 +174,20 @@ klibc (2.0.7-1) unstable; urgency=medium -- Ben Hutchings Tue, 08 Oct 2019 02:14:11 +0100 +klibc (2.0.6-1ubuntu2) eoan; urgency=medium + + * Fix FTBFS on eoan and later with new linux and gcc (LP: #1843743) + - cf-protection.patch: Disable cf-protection for syscalls stub. + - mman-include.patch: Adjust for changes to linux headers in 5.3. + + -- Adam Conrad Mon, 21 Oct 2019 15:39:37 -0600 + +klibc (2.0.6-1ubuntu1) eoan; urgency=medium + + * Add support to specify ...:dns0:dns1 options to ipconfig -d. + + -- Dimitri John Ledkov Thu, 13 Jun 2019 10:23:04 +0100 + klibc (2.0.6-1) unstable; urgency=medium * New upstream version: diff -pruN 2.0.8-6.1/debian/control 2.0.8-6.1ubuntu2/debian/control --- 2.0.8-6.1/debian/control 2020-08-21 00:12:27.000000000 +0000 +++ 2.0.8-6.1ubuntu2/debian/control 2021-08-09 11:02:23.000000000 +0000 @@ -1,6 +1,7 @@ Source: klibc Priority: optional -Maintainer: Debian Kernel Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Kernel Team Uploaders: Ben Hutchings , maximilian attems Build-Depends: debhelper-compat (= 12), linux-libc-dev, m4 [sparc] # klcc will depend on ccache if it was installed at build time; see #777217 diff -pruN 2.0.8-6.1/debian/patches/armhf-min-fpu.patch 2.0.8-6.1ubuntu2/debian/patches/armhf-min-fpu.patch --- 2.0.8-6.1/debian/patches/armhf-min-fpu.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.8-6.1ubuntu2/debian/patches/armhf-min-fpu.patch 2021-08-09 14:45:44.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Specify minimum -mfpu= to fix FTBFS with GCC-11 on armhf + According to https://wiki.debian.org/ArmHardFloatPort#Minimum_CPU_.26_FPU +Author: Lukas M??rdian +Last-Update: 2021-08-09 +--- +--- klibc-2.0.8.orig/usr/klibc/arch/arm/MCONFIG ++++ klibc-2.0.8/usr/klibc/arch/arm/MCONFIG +@@ -10,7 +10,7 @@ + CPU_ARCH ?= armv4 + CPU_TUNE ?= strongarm + +-KLIBCOPTFLAGS += -Os -march=$(CPU_ARCH) -mtune=$(CPU_TUNE) ++KLIBCOPTFLAGS += -Os -march=$(CPU_ARCH) -mtune=$(CPU_TUNE) -mfpu=vfpv3-d16 + KLIBCBITSIZE = 32 + KLIBCREQFLAGS += -fno-exceptions + KLIBCSTRIPFLAGS += -R .ARM.exidx diff -pruN 2.0.8-6.1/debian/patches/cf-protection.patch 2.0.8-6.1ubuntu2/debian/patches/cf-protection.patch --- 2.0.8-6.1/debian/patches/cf-protection.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.8-6.1ubuntu2/debian/patches/cf-protection.patch 2021-08-09 11:02:23.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Disable cf-protection for the syscall stubs to fix FTBFS +Author: Adam Conrad +Last-Update: 2020-10-26 +Forwarded: not-needed, different default compiler flags + +--- klibc-2.0.6.orig/usr/klibc/syscalls/Kbuild ++++ klibc-2.0.6/usr/klibc/syscalls/Kbuild +@@ -28,7 +28,7 @@ clean-files += $(KLIBCINC)/klibc/havesys + # All the syscall stubs + clean-files += *.o *.S *.c *.list *.bin + +-EXTRA_KLIBCCFLAGS := -I$(srctree)/$(src) ++EXTRA_KLIBCCFLAGS := -fcf-protection=none -I$(srctree)/$(src) + + quiet_cmd_makelist = LIST $@ + cmd_makelist = echo '$(filter-out FORCE,$^)' > $@ diff -pruN 2.0.8-6.1/debian/patches/series 2.0.8-6.1ubuntu2/debian/patches/series --- 2.0.8-6.1/debian/patches/series 2021-05-26 22:09:21.000000000 +0000 +++ 2.0.8-6.1ubuntu2/debian/patches/series 2021-08-09 14:46:14.000000000 +0000 @@ -11,3 +11,5 @@ 0039-klibc-cpio-Fix-possible-integer-overflow-on-32-bit-s.patch 0040-klibc-cpio-Fix-possible-crash-on-64-bit-systems.patch 0041-klibc-set-long-jmp-s390x-save-restore-the-correct-re.patch +cf-protection.patch +armhf-min-fpu.patch