On 2017-11-19 18:36, Aurelien Jarno wrote:
> Package: release.debian.org
> Severity: normal
> Tags: stretch
> User: release.debian....@packages.debian.org
> Usertags: pu
>
> Dear stable release managers,
>
> I would like to upload a new glibc package for the next stretch release.
> It mostly consists in pulling the release/2.24/master upstream branch.
> Unfortunately this makes the patch big because:
> - it includes patches that were applied as debian patches before (mostly
> security ones)
> - upstream decided to backport all the test support from master in order
> to ease the backport of fixes from master including the corresponding
> tests
>
> I have therefore included two diffs, the full debdiff compared to
> version 2.24-11+deb9u1 currently in stable, and the one comparing the
> tree with all the patches applied. The biggest part of the later diff
> comes from the support infrastructure for tests (support/*) or from
> tests (tst-*). After removing changes which don't end-up in the binary
> packages, there are less than 600 lines changed.
>
> Most of the changes were already in buster/sid for quite some time, with
> the notable exception of compatibility with Intel C++ which is only in
> sid and experimental.
>
> Thanks for considering, and don't hesitate to ask for more details if
> needed.
I would also like to add the attached an additional patch to fix a
critical bug which has been filled recently, breaking some systems
during jessie to stretch upgrades (see bug#882272).
Thanks,
Aurelien
--
Aurelien Jarno GPG: 4096R/1DDD8C9B
aurel...@aurel32.net http://www.aurel32.net
diff --git a/debian/changelog b/debian/changelog
index 239aacd4..cb182fb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,9 @@ glibc (2.24-11+deb9u2) UNRELEASED; urgency=medium
- Fix invalid cast in group merging affecting ppc64 and s390x.
- Define collation for Malayalam chillu characters.
- Correct collation of U+0D36 and U+0D37 Malayalam characters.
+ * debian/script.in/nohwcap.sh: always check for all optimized packages
+ as multiarch allows one to install foreign architectures. Closes:
+ #882272.
[ Santiago Vila ]
* debian/debhelper.in/libc-bin.postinst: do not update /etc/nsswitch.conf
diff --git a/debian/script.in/nohwcap.sh b/debian/script.in/nohwcap.sh
index b952b886..5e0d0aee 100644
--- a/debian/script.in/nohwcap.sh
+++ b/debian/script.in/nohwcap.sh
@@ -3,33 +3,16 @@
# from /lib, and ignore all optimised libraries. This file is
# inconditionaly created in the preinst script of libc.
- # Get the list of optimized packages for a given architecture
- # Before removing a package from this list, make sure it appears
- # in the Conflicts: line of libc.
- case ${DPKG_MAINTSCRIPT_ARCH} in
- alpha)
- hwcappkgs="libc6-alphaev67"
- ;;
- i386)
- hwcappkgs="libc6-i686 libc6-xen"
- ;;
- kfreebsd-i386)
- hwcappkgs="libc0.1-i686"
- ;;
- esac
-
# We check the version between the current installed libc and
- # all optimized packages (on architectures where such packages
- # exists).
+ # all optimized packages. Due to multiarch, this has to be done
+ # independently of the architecture of the package.
all_upgraded=yes
- if [ -n "$hwcappkgs" ]; then
- for pkg in $hwcappkgs ; do
- ver=$(dpkg-query -l $pkg 2>/dev/null | sed -e '/^[a-z][a-z]\s/!d;/^.[nc]/d;' -e "s/^..\s\+$pkg[0-9a-z:]*\s\+//;s/\s.*//g")
- if [ -n "$ver" ] && [ "$ver" != "CURRENT_VER" ]; then
- all_upgraded=no
- fi
- done
- fi
+ for pkg in libc6.1-alphaev67 libc6-i686 libc6-xen libc0.1-i686 ; do
+ ver=$(dpkg-query -l $pkg 2>/dev/null | sed -e '/^[a-z][a-z]\s/!d;/^.[nc]/d;' -e "s/^..\s\+$pkg[0-9a-z:]*\s\+//;s/\s.*//g")
+ if [ -n "$ver" ] && [ "$ver" != "CURRENT_VER" ]; then
+ all_upgraded=no
+ fi
+ done
# If the versions of all optimized packages are the same as the libc
# one, we could remove /etc/ld.so.nohwcap. Otherwise, it will be removed
