diff -Nru glibc-2.27/debian/changelog glibc-2.27/debian/changelog --- glibc-2.27/debian/changelog 2022-01-24 12:53:44.000000000 +0000 +++ glibc-2.27/debian/changelog 2022-05-03 10:19:39.000000000 +0000 @@ -1,3 +1,14 @@ +glibc (2.27-3ubuntu1.6) bionic; urgency=medium + + [ Gunnar Hjalmarsson ] + * d/local/usr_sbin/update-locale: improve sanity checks. (LP: #1892825) + + [ Aurelien Jarno ] + * debian/debhelper.in/libc.preinst: drop the check for kernel release + > 255 now that glibc and preinstall script are fixed. (LP: #1962225) + + -- Michael Hudson-Doyle Tue, 03 May 2022 22:19:39 +1200 + glibc (2.27-3ubuntu1.5) bionic-security; urgency=medium * SECURITY UPDATE: infinite loop in iconv diff -Nru glibc-2.27/debian/debhelper.in/libc.preinst glibc-2.27/debian/debhelper.in/libc.preinst --- glibc-2.27/debian/debhelper.in/libc.preinst 2020-12-07 16:38:09.000000000 +0000 +++ glibc-2.27/debian/debhelper.in/libc.preinst 2022-05-03 04:29:09.000000000 +0000 @@ -126,21 +126,6 @@ system=`uname -s` if [ "$system" = "Linux" ] then - # Test to make sure z < 255, in x.y.z-n form of kernel version - # Also make sure we don't trip on x.y.zFOO-n form - kernel_rev=$(uname -r | sed 's/\([0-9]*\.\)\{1,2\}\([0-9]*\)\(.*\)/\2/') - if [ "$kernel_rev" -ge 255 ] - then - echo "ERROR: Your kernel version indicates a revision number" - echo "of 255 or greater. Glibc has a number of built in" - echo "assumptions that this revision number is less than 255." - echo "If you\'ve built your own kernel, please make sure that any" - echo "custom version numbers are appended to the upstream" - echo "kernel number with a dash or some other delimiter." - echo - exit 1 - fi - # sanity checking for the appropriate kernel on each architecture. kernel_ver=`uname -r` case ${DPKG_MAINTSCRIPT_ARCH:-$(dpkg --print-architecture)} in diff -Nru glibc-2.27/debian/gbp.conf glibc-2.27/debian/gbp.conf --- glibc-2.27/debian/gbp.conf 2020-12-07 16:38:09.000000000 +0000 +++ glibc-2.27/debian/gbp.conf 2022-05-03 04:27:35.000000000 +0000 @@ -1,3 +1,5 @@ -[buildpackage] +[DEFAULT] pristine-tar = False overlay = True +debian-tag = ubuntu/%(version)s +debian-tag-msg= %(pkg)s Ubuntu release %(version)s diff -Nru glibc-2.27/debian/local/usr_sbin/update-locale glibc-2.27/debian/local/usr_sbin/update-locale --- glibc-2.27/debian/local/usr_sbin/update-locale 2020-12-07 16:38:09.000000000 +0000 +++ glibc-2.27/debian/local/usr_sbin/update-locale 2022-05-03 04:27:41.000000000 +0000 @@ -64,7 +64,7 @@ } for (@ARGV) { - if (m/(.*?)=(.*)/) + if (m/(\w+)=(.*)/) { $arg{$1} = $2; }