Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: glibc

glibc (2.29-0ubuntu3) eoan; urgency=medium * debian/sysdeps/{amd64/i386/x32}.mk: Enable Intel Control Flow Integrity to fix FTFBS since this is now default in gcc. LP: #1833067. -- Alex Murray <alex.murray@canonical.com> Mon, 03 Jun 2019 21:55:06 +0930 glibc (2.29-0ubuntu2) disco; urgency=medium * debian/patches/git-updates.diff: Update from upstream stable branch, including "S390: Mark vx and vxe as important hwcap" (LP: #1821200) * debian/testsuite-xfail-debian.mk: XFAIL new tst-nss-test3 for disco. * debian/debhelper.in/libc.postinst: Only restart services once each. * debian/patches/arm/unsubmitted-ldso-abi-check.diff: Fix rtld segv in dl_open() introduced via merge with upstream at 2.28 (LP: #1821677) * debian/testsuite-xfail-debian.mk: XFAIL new tst-support_descriptors. -- Adam Conrad <adconrad@ubuntu.com> Sun, 07 Apr 2019 14:12:24 -0600 glibc (2.29-0ubuntu1) disco; urgency=medium * Merge with current 2.29 from Debian experimental git, remaining changes: - Enable libc6{,-dev}-armel on armhf and libc6{-dev}-armhf on armel. - Heavily mangle the way we do service restarting on major upgrades. - Build i386 variants as -march=i686, build amd64 with -O3, and build ppc64 variants (both 64-bit and 32-bit) with -O3 -fno-tree-vectorize. - Build generic i386 flavour with -mno-tls-direct-seg-refs for Xen. - Drop the libc6-xen flavour, as the above change covers Xen's needs. - Enable systemtap support, which is currently disabled in Debian. - Don't build libc-l10n, its contents get stripped for language-packs. - Drop libc-bin manpages Recommends to Suggests to keep it in standard. - Revert dropping the ldconfig wrapper, xenial still has a lot of packages that don't ship a trigger but instead call in postinst. - Use DH_COMPAT=8 for dh_strip to fix debug sections for valgrind. - Mangle locales package to support Ubuntu language packs seamlessly. - Let tst-ttyname fail on armhf and armel, as it currently fails in lxc. * debian/patches/ubuntu/submitted-no-sprintf-pre-truncate.diff: Adjust to new upstream code, and mangle the upstream tests to expect our behaviour. * debian/{script.in/nsscheck.sh,debhelper.in/libc.*inst}: Tidy up NSS_CHECK code, fixing handling for GDM and removing file-rc cruft from yesteryear. -- Adam Conrad <adconrad@ubuntu.com> Thu, 21 Feb 2019 07:19:41 -0700 glibc (2.29-0experimental0) UNRELEASED; urgency=medium * New upstream release 2.29, with git updates up to 2019-02-20: - debian/symbols.wildcard: Add 2.29, and debian/control: Regenrate. - debian/patches/localedata/locales_CH.diff: Applied upstream. - debian/patches/localedata/submitted-it_IT-thousands_sep.diff: Upstreamed. - debian/patches/localedata/git-en_US-date_fmt.diff: Applied upstream. - debian/patches/hurd-i386/git-magic-pid.diff: Applied upstream. - debian/patches/hurd-i386/git-interrupt_timeout_EIO.diff: Upstreamed. - debian/patches/hurd-i386/git-interrupt_timeout.diff: Applied upstream. - debian/patches/hurd-i386/git-intr-msg.diff: Applied upstream. - debian/patches/hurd-i386/git-pci.diff: Applied upstream. - debian/patches/hurd-i386/git-msync.diff: Applied upstream. - debian/patches/hurd-i386/git-spawn-open.diff: Applied upstream. - debian/patches/hurd-i386/git-tst-preadvwritev2-common.c.diff: Upstreamed. - debian/patches/hurd-i386/git-fcntl64.diff: Applied upstream. - debian/patches/hurd-i386/git-lockf-0.diff: Applied upstream. - debian/patches/hurd-i386/git-libpthread_setpshared.diff: Upstreamed. - debian/patches/hurd-i386/git-AT_EMPTY_PATH.diff: Applied upstream. - debian/patches/hurd-i386/git-altstack.diff: Applied upstream. - debian/patches/riscv64/git-thread-debugging.diff: Applied upstream. - debian/patches/sparc/submitted-sparc64-socketcall.diff: Applied upstream. - debian/patches/any/local-tst-mktime2.diff: Applied upstream. - debian/patches/all/local-remove-manual.diff: Rebased. - debian/patches/alpha/local-string-functions.diff: Rebased. - debian/patches/any/git-libio-stdout-putc.diff: Rebased. - debian/patches/hurd-i386/local-exec_filename.diff: Rebased. - debian/patches/hurd-i386/local-hurdsig-globaldisp-version.diff: Rebased. - debian/patches/hurd-i386/submitted-anon-mmap-shared.diff: Rebased. - debian/patches/hurd-i386/tg-EGREGIOUS-fr.diff: Rebased. - debian/patches/hurd-i386/tg-EIEIO-fr.diff: Rebased. - debian/patches/hurd-i386/tg-hurdsig-global-dispositions.diff: Rebased. - debian/patches/hurd-i386/tg-io_select_timeout.diff: Rebased. - debian/patches/kfreebsd/submitted-auxv.diff: Rebased. * debian/rules.d/build.mk: Switch to new localedata/install-locale-files: - debian/patches/localedata/local-all-no-archive.diff: Dropped for above. * debian/testsuite-xfail-debian.mk: XFAIL tst-thread-exit-clobber, and tst-minsigstksz*, and tst-xsigstack on armhf, which fail on aarch64 hosts. -- Adam Conrad <adconrad@0c3.net> Wed, 20 Feb 2019 01:22:52 -0700 glibc (2.28-8) UNRELEASED; urgency=medium * debian/patches/git-updates.diff: update from upstream stable branch. -- Aurelien Jarno <aurel32@debian.org> Mon, 18 Feb 2019 08:16:13 +0100

Modifications :
  1. Download patch debian/sysdeps/mips.mk

    --- 2.29-0experimental0/debian/sysdeps/mips.mk 2019-08-15 20:31:32.000000000 +0000 +++ 2.29-0ubuntu3/debian/sysdeps/mips.mk 2018-04-16 20:02:33.000000000 +0000 @@ -1,5 +1,5 @@ # configuration options for all flavours -CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)$(DEB_GCC_VERSION) -no-pie +extra_cflags = -mno-plt # multilib flavours ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
  2. Download patch debian/sysdeps/mipsr6.mk

    --- 2.29-0experimental0/debian/sysdeps/mipsr6.mk 2019-08-15 20:31:32.000000000 +0000 +++ 2.29-0ubuntu3/debian/sysdeps/mipsr6.mk 2018-04-16 20:02:33.000000000 +0000 @@ -1,5 +1,5 @@ # configuration options for all flavours -CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)$(DEB_GCC_VERSION) -no-pie +extra_cflags = -mno-plt # multilib flavours ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
  3. Download patch debian/script.in/nsscheck.sh

    --- 2.29-0experimental0/debian/script.in/nsscheck.sh 2019-08-14 16:21:44.000000000 +0000 +++ 2.29-0ubuntu3/debian/script.in/nsscheck.sh 2019-02-21 20:46:55.000000000 +0000 @@ -1,10 +1,9 @@ echo -n "Checking for services that may need to be restarted..." # Only get the ones that are installed, and configured - check=$(dpkg -s $check 2> /dev/null | egrep '^Package:|^Status:' | awk '{if ($1 ~ /^Package:/) { package=$2 } else if ($0 ~ /^Status: .* installed$/) { print package }}') + [ -n "$check" ] && check=$(dpkg -s $check 2> /dev/null | egrep '^Package:|^Status:' | awk '{if ($1 ~ /^Package:/) { package=$2 } else if ($0 ~ /^Status: .* installed$/) { print package }}') # some init scripts don't match the package names check=$(echo $check | \ - sed -e's/\bapache2.2-common\b/apache2/g' \ - -e's/\bat\b/atd/g' \ + sed -e's/\bat\b/atd/g' \ -e's/\bdovecot-common\b/dovecot/g' \ -e's/\bexim4-base\b/exim4/g' \ -e's/\blpr\b/lpd/g' \
  4. Download patch debian/sysdeps/armel.mk

    --- 2.29-0experimental0/debian/sysdeps/armel.mk 2019-08-14 18:45:57.000000000 +0000 +++ 2.29-0ubuntu3/debian/sysdeps/armel.mk 2019-02-21 13:46:18.000000000 +0000 @@ -5,37 +5,37 @@ extra_config_options = --enable-multi-ar ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES))) # build hard-float (armhf) alternative library -#GLIBC_PASSES += armhf -#DEB_ARCH_MULTILIB_PACKAGES += libc6-armhf libc6-dev-armhf -#armhf_configure_target = arm-linux-gnueabihf -#armhf_CC = $(CC) -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard -#armhf_CXX = $(CXX) -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard -#armhf_slibdir = /lib/arm-linux-gnueabihf -#armhf_libdir = /usr/lib/arm-linux-gnueabihf -# -#define libc6-dev-armhf_extra_pkg_install -# -#mkdir -p debian/libc6-dev-armhf/usr/include -#ln -sf arm-linux-gnueabi/bits debian/libc6-dev-armhf/usr/include/ -#ln -sf arm-linux-gnueabi/gnu debian/libc6-dev-armhf/usr/include/ -#ln -sf arm-linux-gnueabi/fpu_control.h debian/libc6-dev-armhf/usr/include/ -# -#mkdir -p debian/libc6-dev-armhf/usr/include/arm-linux-gnueabi/gnu -#cp -a debian/tmp-armhf/usr/include/gnu/lib-names-hard.h \ -# debian/tmp-armhf/usr/include/gnu/stubs-hard.h \ -# debian/libc6-dev-armhf/usr/include/arm-linux-gnueabi/gnu -# -#mkdir -p debian/libc6-dev-armhf/usr/include/sys -#for i in `ls debian/tmp-libc/usr/include/arm-linux-gnueabi/sys` ; do \ -# ln -sf ../arm-linux-gnueabi/sys/$$i debian/libc6-dev-armhf/usr/include/sys/$$i ; \ -#done -# -#endef -# -#define libc6-armhf_extra_pkg_install -#mkdir -p debian/libc6-armhf$(armhf_slibdir) -#ln -sf $(armhf_slibdir)/ld-linux-armhf.so.3 debian/libc6-armhf/lib -#ln -sf ld-linux-armhf.so.3 debian/libc6-armhf$(armhf_slibdir)/ld-linux.so.3 -#endef +GLIBC_PASSES += armhf +DEB_ARCH_MULTILIB_PACKAGES += libc6-armhf libc6-dev-armhf +armhf_configure_target = arm-linux-gnueabihf +armhf_CC = $(CC) -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard +armhf_CXX = $(CXX) -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard +armhf_slibdir = /lib/arm-linux-gnueabihf +armhf_libdir = /usr/lib/arm-linux-gnueabihf + +define libc6-dev-armhf_extra_pkg_install + +mkdir -p debian/libc6-dev-armhf/usr/include +ln -sf arm-linux-gnueabi/bits debian/libc6-dev-armhf/usr/include/ +ln -sf arm-linux-gnueabi/gnu debian/libc6-dev-armhf/usr/include/ +ln -sf arm-linux-gnueabi/fpu_control.h debian/libc6-dev-armhf/usr/include/ + +mkdir -p debian/libc6-dev-armhf/usr/include/arm-linux-gnueabi/gnu +cp -a debian/tmp-armhf/usr/include/gnu/lib-names-hard.h \ + debian/tmp-armhf/usr/include/gnu/stubs-hard.h \ + debian/libc6-dev-armhf/usr/include/arm-linux-gnueabi/gnu + +mkdir -p debian/libc6-dev-armhf/usr/include/sys +for i in `ls debian/tmp-libc/usr/include/arm-linux-gnueabi/sys` ; do \ + ln -sf ../arm-linux-gnueabi/sys/$$i debian/libc6-dev-armhf/usr/include/sys/$$i ; \ +done + +endef + +define libc6-armhf_extra_pkg_install +mkdir -p debian/libc6-armhf$(armhf_slibdir) +ln -sf $(armhf_slibdir)/ld-linux-armhf.so.3 debian/libc6-armhf/lib +ln -sf ld-linux-armhf.so.3 debian/libc6-armhf$(armhf_slibdir)/ld-linux.so.3 +endef endif # multilib
  5. Download patch debian/sysdeps/mips64r6el.mk

    --- 2.29-0experimental0/debian/sysdeps/mips64r6el.mk 2019-08-15 20:31:32.000000000 +0000 +++ 2.29-0ubuntu3/debian/sysdeps/mips64r6el.mk 2018-04-16 20:02:33.000000000 +0000 @@ -1,5 +1,5 @@ # configuration options for all flavours -CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)$(DEB_GCC_VERSION) -no-pie +extra_cflags = -mno-plt # main library libc_rtlddir = /lib64 @@ -60,7 +60,7 @@ endef # create a symlink for the 32 bit dynamic linker in /lib define libc6-mips32_extra_pkg_install mkdir -p debian/libc6-mips32/lib -ln -sf /libo32/ld-linux-mipsn8.so.1 debian/libc6-mips32/lib +ln -sf /libo32/ld.so.1 debian/libc6-mips32/lib endef endif # multilib
  6. Download patch debian/tests/control

    --- 2.29-0experimental0/debian/tests/control 2019-08-15 20:31:32.000000000 +0000 +++ 2.29-0ubuntu3/debian/tests/control 2019-02-21 14:04:27.000000000 +0000 @@ -1,3 +1,3 @@ Tests: rebuild -Depends: @builddeps@, fakeroot, binutils, linux-libc-dev [linux-any], gcc-9 +Depends: @builddeps@, fakeroot, binutils, linux-libc-dev [linux-any], gcc-8 Restrictions: allow-stderr
  7. Download patch debian/sysdeps/mips64r6.mk

    --- 2.29-0experimental0/debian/sysdeps/mips64r6.mk 2019-08-15 20:31:32.000000000 +0000 +++ 2.29-0ubuntu3/debian/sysdeps/mips64r6.mk 2018-04-16 20:02:33.000000000 +0000 @@ -1,5 +1,5 @@ # configuration options for all flavours -CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)$(DEB_GCC_VERSION) -no-pie +extra_cflags = -mno-plt # main library libc_rtlddir = /lib64 @@ -60,7 +60,7 @@ endef # create a symlink for the 32 bit dynamic linker in /lib define libc6-mips32_extra_pkg_install mkdir -p debian/libc6-mips32/lib -ln -sf /libo32/ld-linux-mipsn8.so.1 debian/libc6-mips32/lib +ln -sf /libo32/ld.so.1 debian/libc6-mips32/lib endef endif # multilib
  8. Download patch debian/sysdeps/mipsel.mk

    --- 2.29-0experimental0/debian/sysdeps/mipsel.mk 2019-08-15 20:31:32.000000000 +0000 +++ 2.29-0ubuntu3/debian/sysdeps/mipsel.mk 2018-04-16 20:02:33.000000000 +0000 @@ -1,5 +1,5 @@ # configuration options for all flavours -CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)$(DEB_GCC_VERSION) -no-pie +extra_cflags = -mno-plt # multilib flavours ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
  9. Download patch debian/patches/ubuntu/localedata/ckb_IQ-new_locale.diff
  10. Download patch debian/debhelper.in/libc-bin.lintian-overrides

    --- 2.29-0experimental0/debian/debhelper.in/libc-bin.lintian-overrides 2019-07-29 09:56:57.000000000 +0000 +++ 2.29-0ubuntu3/debian/debhelper.in/libc-bin.lintian-overrides 2019-02-21 13:46:18.000000000 +0000 @@ -1,12 +1,15 @@ # ldconfig must be executable even when the libc is not configured, and # thus must be linked statically -libc-bin: statically-linked-binary sbin/ldconfig +libc-bin: statically-linked-binary sbin/ldconfig.real # pt_chown must be setuid root and in /usr/lib, otherwise non-root users # won't be able to login libc-bin: setuid-binary usr/lib/pt_chown 4755 root/root libc-bin: sharedobject-in-library-directory-missing-soname usr/lib/pt_chown +# ldconfig.real doesn't have a manpage, since it's just ldconfig renamed +libc-bin: binary-without-manpage sbin/ldconfig.real + # ldconfig is called in the postinst for trigger support libc-bin: postinst-has-useless-call-to-ldconfig
  11. Download patch debian/control.in/main

    --- 2.29-0experimental0/debian/control.in/main 2019-08-15 20:31:32.000000000 +0000 +++ 2.29-0ubuntu3/debian/control.in/main 2019-02-21 13:46:18.000000000 +0000 @@ -3,19 +3,20 @@ Section: libs Priority: required Build-Depends: gettext, dpkg (>= 1.18.7), dpkg-dev (>= 1.17.14), xz-utils, file, quilt, autoconf, gawk, debhelper (>= 10), rdfind, symlinks, netbase, gperf, bison, - linux-libc-dev (>= 3.9) [linux-any], + linux-libc-dev (>= 3.9) [linux-any], systemtap-sdt-dev [linux-any], libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any], mig (>= 1.5-3) [hurd-i386], gnumach-dev (>= 2:1.8+git20181103-1~) [hurd-i386], hurd-dev (>= 1:0.9.git20181030-1) [hurd-i386] | hurd-headers-dev [hurd-i386], hurd-dev (>= 1:0.9.git20181030-1) [hurd-i386] <!stage1> | libihash-dev [hurd-i386] <!stage1>, kfreebsd-kernel-headers [kfreebsd-any], binutils (>= 2.29), - g++-9, g++-9-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 s390x sparc sparc64 x32] <!nobiarch>, + g++-8, g++-8-multilib [amd64 armhf armel i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 s390x sparc sparc64 x32] <!nobiarch>, python3:native <!nocheck>, libidn2-0 (>= 2.0.5~) <!nocheck>, libc-bin (>= @GLIBC_VERSION@) <cross> Build-Depends-Indep: perl, po-debconf (>= 1.0) -Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org> Uploaders: Clint Adams <clint@debian.org>, Aurelien Jarno <aurel32@debian.org>, Adam Conrad <adconrad@0c3.net>, Samuel Thibault <sthibault@debian.org> Standards-Version: 4.2.1 Vcs-Browser: https://salsa.debian.org/glibc-team/glibc @@ -29,7 +30,7 @@ Priority: required Essential: yes Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: manpages +Suggests: manpages Build-Profiles: <!stage1> Description: GNU C Library: Binaries This package contains utility programs related to the GNU C Library. @@ -72,8 +73,7 @@ Architecture: all Section: doc Priority: optional Multi-Arch: foreign -Depends: ${misc:Depends} -Suggests: glibc-doc-reference +Depends: ${misc:Depends}, glibc-doc-reference (>= 2.18) Build-Profiles: <!stage1> Description: GNU C Library: Documentation Contains man pages for libpthread functions and the complete GNU C Library @@ -99,8 +99,9 @@ Package: locales Architecture: all Section: localization Priority: standard -Depends: libc-bin (>> @GLIBC_VERSION@), libc-l10n (>> @GLIBC_VERSION@), ${misc:Depends}, debconf | debconf-2.0 -Replaces: manpages-fr-extra (<< 20141022) +Depends: libc-bin (>> @GLIBC_VERSION@), ${misc:Depends}, debconf | debconf-2.0 +Breaks: libc-bin (<< 2.23) +Replaces: libc-bin (<< 2.23), manpages-fr-extra (<< 20141022) Build-Profiles: <!stage1> Description: GNU C Library: National Language (locale) data [support] Machine-readable data files, shared objects and programs used by the @@ -117,7 +118,7 @@ Architecture: any Section: localization Priority: optional Multi-Arch: foreign -Depends: libc-l10n (>> @GLIBC_VERSION@), ${misc:Depends} +Depends: ${misc:Depends} Breaks: locales (<< 2.13-17) Build-Profiles: <!stage1> Description: GNU C Library: Precompiled locale data @@ -139,3 +140,22 @@ Description: GNU C Library: Name Service query. You should install this package only if you use slow services like LDAP, NIS or NIS+. +Package: multiarch-support +Architecture: any +Section: oldlibs +Multi-Arch: foreign +Depends: ${misc:Depends}, + libc6 (>= 2.3.6-2) [!any-i386 !alpha !armhf !hurd-any !ia64 !kfreebsd-any], + libc6.1 (>= 2.3.6-2) [alpha ia64], + libc0.3 (>= 2.3.6-2) [!linux-any !kfreebsd-any !hurd-i386], + libc0.1 (>= 2.3.6-2) [!linux-any !hurd-any !kfreebsd-i386], + libc6 (>= 2.13-5) [armhf i386], + libc0.3 (>= 2.13-5) [hurd-i386], + libc0.1 (>= 2.13-5) [kfreebsd-i386], +Priority: optional +Build-Profiles: <!stage1> +Description: Transitional package to ensure multiarch compatibility + This is a transitional package used to ensure multiarch support is present + in ld.so before unpacking libraries to the multiarch directories. It can + be removed once nothing on the system depends on it. +
  12. Download patch debian/local/usr_sbin/locale-gen

    --- 2.29-0experimental0/debian/local/usr_sbin/locale-gen 2019-07-29 09:56:57.000000000 +0000 +++ 2.29-0ubuntu3/debian/local/usr_sbin/locale-gen 2019-02-21 13:46:18.000000000 +0000 @@ -1,10 +1,12 @@ -#!/bin/sh +#!/bin/bash set -e LOCALEGEN=/etc/locale.gen LOCALES=/usr/share/i18n/locales USER_LOCALES=/usr/local/share/i18n/locales +SUPPORTED=/var/lib/locales/supported.d +ALIASES=/usr/share/locale/locale.alias if [ -n "$POSIXLY_CORRECT" ]; then unset POSIXLY_CORRECT fi @@ -14,14 +16,89 @@ fi [ -s $LOCALEGEN ] || exit 0; KEEP= -if [ "$1" = '--keep-existing' ]; then - KEEP=1 -fi +IS_LANG=no +ARCHIVE=yes + +# Handle command-line options +prev= +while true +do + option="$1" + if [ -n "$prev" ]; then + eval "$prev=\$option" + prev= + continue + fi + + case $option in + -h|--help) + cat <<EOT +Usage: locale-gen [OPTIONS] +Options: + -h, --help display this message and exit + --purge remove existing locales before processing + --archive store compiled locale data inside a single archive + --no-archive do not store compiled locale data inside a single archive + (default) + --aliases=FILE read locale aliases from FILE. (Default: /etc/locale.alias) + --lang treat argument as generic language code +EOT + exit 0 + ;; + --purge) + # This is the default when called without arguments + ;; + --no-purge) + KEEP=1 + ;; + --archive) + ARCHIVE=yes + ;; + --no-archive) + ARCHIVE=no + ;; + --keep-existing) + KEEP=1 + ;; + --aliases) + prev=ALIASES + ;; + --aliases=*) + ALIASES=$(expr "x$option" : 'x[^=]*=\(.*\)') + ;; + --lang) + IS_LANG=yes + ;; + --*) + echo "locale-gen: invalid option -- $option" + echo "Try 'locale-gen --help' for more information." + exit 1 + ;; + *) + break + ;; + esac + + shift +done + +no_archive= +[ "$ARCHIVE" = yes ] || no_archive="--no-archive" +locale_alias= +[ -n "$ALIASES" ] && [ -r "$ALIASES" ] && locale_alias="-A $ALIASES" -if [ -z "$KEEP" ]; then +if [ -z "$1" ] && [ -z "$KEEP" ]; then # Remove all old locale dir and locale-archive before generating new # locale data. rm -rf /usr/lib/locale/locale-archive || true + for dir in /usr/lib/locale/*; do + [ -e "$dir" ] || continue + if [ "${dir#/usr/lib/locale/}" = C.UTF-8 ]; then + # owned by libc-bin + continue + fi + rm -rf "$dir" 2>/dev/null || true + done fi umask 022 @@ -35,8 +112,46 @@ is_entry_ok() { fi } +add_to_locale_gen() { + echo "$1" | while read locale; do + if ! grep -q "^[# ]*$locale *\$" $LOCALEGEN; then + echo "# $locale" >> $LOCALEGEN + fi + sed -i -e "0,/^[# ]*$locale *$/ s/^[# ]*$locale *$/$locale/" $LOCALEGEN + done +} + +if [ -z "$1" ]; then + GENERATE="`cat $SUPPORTED/* $LOCALEGEN 2>/dev/null || true`" +else + GENERATE= + while [ -n "$1" ]; do + if [ -f "$SUPPORTED/$1" ]; then + GENERATE="$GENERATE\n`cat $SUPPORTED/$1`" + elif [ $IS_LANG = no ] && L=`grep "^${1/%.utf8/.UTF-8} " /usr/share/i18n/SUPPORTED`; then + # convert utf8 to UTF-8 and check if the requested locale exists + GENERATE="$GENERATE\n$L" + add_to_locale_gen "$L" + elif [ $IS_LANG = no ] && L=`grep "^${1%.[uU][tT][fF]*} UTF-8" /usr/share/i18n/SUPPORTED`; then + # recognize 'll_CC.UTF-8' or 'll_CC.utf8' as ll_CC without codeset + GENERATE="$GENERATE\n$L" + add_to_locale_gen "$L" + else + # try to come up with a sensible default + L=`grep -E "^${1}( |[._@][^[:space:]]* )UTF-8" /usr/share/i18n/SUPPORTED || true` + if [ -z "$L" ]; then + echo "Error: '$1' is not a supported language or locale" >&2 + exit 1 + fi + GENERATE="$GENERATE\n$L" + add_to_locale_gen "$L" + fi + shift + done +fi + echo "Generating locales (this might take a while)..." -while read locale charset; do \ +echo -e "$GENERATE" | sort -u | while read locale charset; do \ case $locale in \#*) continue;; "") continue;; esac; \ is_entry_ok || continue if [ "$KEEP" ] && PERL_BADLANG=0 perl -MPOSIX -e \ @@ -57,7 +172,7 @@ while read locale charset; do \ input=$USER_LOCALES/$input fi fi - localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale || :; \ + localedef $no_archive -i $input -c -f $charset $locale_alias $locale || :; \ echo ' done'; \ -done < $LOCALEGEN +done echo "Generation complete."
  13. Download patch debian/rules

    --- 2.29-0experimental0/debian/rules 2019-08-15 20:31:32.000000000 +0000 +++ 2.29-0ubuntu3/debian/rules 2019-02-21 13:46:18.000000000 +0000 @@ -33,6 +33,8 @@ stamp := $(CURDIR)/stamp-dir/ DUMMY := $(shell mkdir -p $(stamp)) # Beyond here you shouldn't need to customise anything: +export SHELL = /bin/bash -e + DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_ENDIAN ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_ENDIAN) DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) @@ -94,14 +96,14 @@ mvec = no BASE_CC = gcc BASE_CXX = g++ BASE_MIG = mig -DEB_GCC_VERSION ?= -9 +DEB_GCC_VERSION ?= -8 RUN_TESTSUITE = yes TIMEOUTFACTOR = 25 # Set cross and native compiler names, including version. -CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)$(DEB_GCC_VERSION) -CXX = $(DEB_HOST_GNU_TYPE)-$(BASE_CXX)$(DEB_GCC_VERSION) +CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)$(DEB_GCC_VERSION) -no-pie -fno-PIE +CXX = $(DEB_HOST_GNU_TYPE)-$(BASE_CXX)$(DEB_GCC_VERSION) -no-pie -fno-PIE MIG = $(DEB_HOST_GNU_TYPE)-$(BASE_MIG) BUILD_CC = $(DEB_BUILD_GNU_TYPE)-$(BASE_CC) BUILD_CXX = $(DEB_BUILD_GNU_TYPE)-$(BASE_CXX) @@ -134,13 +136,9 @@ ifneq ($(filter stage1,$(DEB_BUILD_PROFI DEB_BUILD_OPTIONS+=nocheck endif else - DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-pic libc-bin libc-dev-bin - DEB_INDEP_REGULAR_PACKAGES = glibc-doc glibc-source libc-l10n locales - ifneq ($(filter noudeb,$(DEB_BUILD_PROFILES)),) - DEB_UDEB_PACKAGES = - else - DEB_UDEB_PACKAGES = $(libc)-udeb - endif + DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-pic libc-bin libc-dev-bin multiarch-support + DEB_INDEP_REGULAR_PACKAGES = glibc-doc glibc-source locales + DEB_UDEB_PACKAGES = $(libc)-udeb ## Locales can only be pre-generated during native compiles ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH)) DEB_ARCH_REGULAR_PACKAGES += locales-all
  14. Download patch debian/control.in/libc

    --- 2.29-0experimental0/debian/control.in/libc 2019-08-14 16:21:44.000000000 +0000 +++ 2.29-0ubuntu3/debian/control.in/libc 2019-02-21 14:02:58.000000000 +0000 @@ -5,15 +5,16 @@ Priority: optional Multi-Arch: same Depends: ${shlibs:Depends}, ${libgcc:Depends} Recommends: libidn2-0 (>= 2.0.5~) -Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386] -Provides: libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386] -Conflicts: libc6-loongson2f [mipsel], libc0.1-i686 [kfreebsd-i386], libc6-i686 [i386], openrc (<< 0.27-2~) +Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386] +Provides: libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386], libc6-xen [i386], libc6-armel [armel], libc6-armhf [armhf] +Conflicts: libc6-loongson2f [mipsel], libc0.1-i686 [kfreebsd-i386], libc6-i686 [i386], openrc (<< 0.27-2~), libc6-xen [i386] Breaks: nscd (<< @GLIBC_VERSION@), locales (<< @GLIBC_VERSION@), locales-all (<< @GLIBC_VERSION@), hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3), r-cran-later (<< 0.7.5+dfsg-2), nocache (<< 1.1-1~) Replaces: libc6-amd64 [amd64], libc6-i386 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386], + libc6-xen [i386], libc6-x32 [x32], libc0.1-i386 [kfreebsd-i386], libc6-powerpc [powerpc], @@ -38,7 +39,7 @@ Multi-Arch: same Depends: @libc@ (= ${binary:Version}) <!stage1>, libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386] Replaces: hurd-dev (<< 20120408-3) [hurd-i386], kfreebsd-kernel-headers (<< 10.3~4) [kfreebsd-amd64 kfreebsd-i386] Suggests: glibc-doc, manpages-dev -Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64] +Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64], libc6-dev-armel [armel], libc6-dev-armhf [armhf] Breaks: binutils (<< 2.26), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3), check (<< 0.9.10-6.1+b1) [s390x], kfreebsd-kernel-headers (<< 10.3~4) [kfreebsd-amd64 kfreebsd-i386], libperl5.26 (<< 5.26.1-3) Conflicts: @libc-dev-conflict@ Description: GNU C Library: Development Libraries and Header Files
  15. Download patch debian/patches/ubuntu/localedata/es_DO-am_pm.diff

    --- 2.29-0experimental0/debian/patches/ubuntu/localedata/es_DO-am_pm.diff 1970-01-01 00:00:00.000000000 +0000 +++ 2.29-0ubuntu3/debian/patches/ubuntu/localedata/es_DO-am_pm.diff 2019-02-21 13:46:18.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Define 12-hours a.m./p.m. format +Bug-Ubuntu: https://launchpad.net/bugs/1288843 +Forwarded: http://sourceware.org/bugzilla/show_bug.cgi?id=16045 +Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com> + +--- a/localedata/locales/es_DO 2012-03-06 10:10:20.000000000 +0100 ++++ b/localedata/locales/es_DO 2014-03-09 01:03:37.309958275 +0100 +@@ -114,8 +114,8 @@ + d_t_fmt "%a %d %b %Y %T %Z" + d_fmt "%d//%m//%y" + t_fmt "%T" +-am_pm "";"" +-t_fmt_ampm "" ++am_pm "a.m.";"p.m." ++t_fmt_ampm "%I:%M:%S %p" + week 7;19971130;1 + END LC_TIME +
  16. Download patch debian/patches/any/submitted-ld.so-cache-new-format.diff

    --- 2.29-0experimental0/debian/patches/any/submitted-ld.so-cache-new-format.diff 2019-08-15 20:31:32.000000000 +0000 +++ 2.29-0ubuntu3/debian/patches/any/submitted-ld.so-cache-new-format.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ -2018-09-16 Josh Triplett <josh@joshtriplett.org> - - * elf/ldconfig.c: Default to the new format for ld.so.cache. glibc has - supported this format for 18+ years. - * elf/dl-cache.c (_dl_load_cache_lookup): Reorder conditionals to look - for the new format first. - ---- a/elf/dl-cache.c -+++ b/elf/dl-cache.c -@@ -203,7 +203,14 @@ _dl_load_cache_lookup (const char *name) - - the old format with the new format in it - - only the new format - The following checks if the cache contains any of these formats. */ -- if (file != MAP_FAILED && cachesize > sizeof *cache -+ if (file != MAP_FAILED && cachesize > sizeof *cache_new -+ && memcmp (file, CACHEMAGIC_VERSION_NEW, -+ sizeof CACHEMAGIC_VERSION_NEW - 1) == 0) -+ { -+ cache_new = file; -+ cache = file; -+ } -+ else if (file != MAP_FAILED && cachesize > sizeof *cache - && memcmp (file, CACHEMAGIC, sizeof CACHEMAGIC - 1) == 0 - /* Check for corruption, avoiding overflow. */ - && ((cachesize - sizeof *cache) / sizeof (struct file_entry) -@@ -223,13 +230,6 @@ _dl_load_cache_lookup (const char *name) - sizeof CACHEMAGIC_VERSION_NEW - 1) != 0) - cache_new = (void *) -1; - } -- else if (file != MAP_FAILED && cachesize > sizeof *cache_new -- && memcmp (file, CACHEMAGIC_VERSION_NEW, -- sizeof CACHEMAGIC_VERSION_NEW - 1) == 0) -- { -- cache_new = file; -- cache = file; -- } - else - { - if (file != MAP_FAILED) ---- a/elf/ldconfig.c -+++ b/elf/ldconfig.c -@@ -95,7 +95,7 @@ int opt_verbose; - - /* Format to support. */ - /* 0: only libc5/glibc2; 1: both; 2: only glibc 2.2. */ --int opt_format = 1; -+int opt_format = 2; - - /* Build cache. */ - static int opt_build_cache = 1; -@@ -148,7 +148,7 @@ static const struct argp_option options[] = - { NULL, 'f', N_("CONF"), 0, N_("Use CONF as configuration file"), 0}, - { NULL, 'n', NULL, 0, N_("Only process directories specified on the command line. Don't build cache."), 0}, - { NULL, 'l', NULL, 0, N_("Manually link individual libraries."), 0}, -- { "format", 'c', N_("FORMAT"), 0, N_("Format to use: new, old or compat (default)"), 0}, -+ { "format", 'c', N_("FORMAT"), 0, N_("Format to use: new (default), old, or compat"), 0}, - { "ignore-aux-cache", 'i', NULL, 0, N_("Ignore auxiliary cache file"), 0}, - { NULL, 0, NULL, 0, NULL, 0 } - };
  17. Download patch debian/sysdeps/mips64el.mk

    --- 2.29-0experimental0/debian/sysdeps/mips64el.mk 2019-08-15 20:31:32.000000000 +0000 +++ 2.29-0ubuntu3/debian/sysdeps/mips64el.mk 2018-04-16 20:02:33.000000000 +0000 @@ -1,5 +1,5 @@ # configuration options for all flavours -CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)$(DEB_GCC_VERSION) -no-pie +extra_cflags = -mno-plt # main library libc_rtlddir = /lib64
  18. Download patch debian/shlibs-add-udebs

    --- 2.29-0experimental0/debian/shlibs-add-udebs 2019-08-16 09:06:00.000000000 +0000 +++ 2.29-0ubuntu3/debian/shlibs-add-udebs 2017-03-20 17:03:33.000000000 +0000 @@ -40,10 +40,6 @@ expr_libc2="libutil$W libcrypt$W librt$W expr_libc3="libnss_dns$W libnss_files$W" expr_hurd="libmachuser$W libhurduser$W" -# Remove udeb entries wrongly added by dh_makeshlibs (see bugs #934889 -# and #934891) -sed -i -e '/^udeb:/d' $shlibs_file - for expr in $expr_libc1 $expr_libc2 $expr_libc3 $expr_hurd; do add_udeb_line "$expr" $package-udeb done
  19. Download patch debian/sysdeps/ppc64.mk

    --- 2.29-0experimental0/debian/sysdeps/ppc64.mk 2019-08-14 18:45:57.000000000 +0000 +++ 2.29-0ubuntu3/debian/sysdeps/ppc64.mk 2019-02-21 13:46:18.000000000 +0000 @@ -3,6 +3,7 @@ extra_config_options = --enable-multi-ar # main library libc_rtlddir = /lib64 +libc_extra_cflags = -O3 -fno-tree-vectorize # multilib flavours ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES))) @@ -14,6 +15,7 @@ libc6-powerpc_shlib_dep = libc6-powerpc powerpc_configure_target = powerpc-linux-gnu powerpc_CC = $(CC) -m32 powerpc_CXX = $(CXX) -m32 +powerpc_extra_cflags = -O3 -fno-tree-vectorize powerpc_slibdir = /lib32 powerpc_libdir = /usr/lib32
  20. Download patch debian/patches/hurd-i386/git-renameat2.diff

    --- 2.29-0experimental0/debian/patches/hurd-i386/git-renameat2.diff 2019-08-14 16:21:44.000000000 +0000 +++ 2.29-0ubuntu3/debian/patches/hurd-i386/git-renameat2.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,158 +0,0 @@ -commit 1b2184177553ce4ef8458034927ef50854be2af6 -Author: Samuel Thibault <samuel.thibault@ens-lyon.org> -Date: Wed Feb 27 07:53:13 2019 -0800 - - hurd: Add renameat2 support for RENAME_NOREPLACE - - * include/stdio.h (__renameat2): New hidden prototype. - * stdio-common/renameat2.c (__renameat2): Add hidden definition. - * sysdeps/mach/hurd/renameat.c (__renameat): Move implementation to... - * sysdeps/mach/hurd/renameat2.c (__renameat2): ... new function, and - add support for RENAME_NOREPLACE. - * sysdeps/unix/sysv/linux/renameat2.c (__renameat2): Add hidden definition. - -diff --git a/include/stdio.h b/include/stdio.h -index 7d1877ea5e..5302e61024 100644 ---- a/include/stdio.h -+++ b/include/stdio.h -@@ -261,6 +261,8 @@ __putc_unlocked (int __c, FILE *__stream) - - extern __typeof (renameat) __renameat; - libc_hidden_proto (__renameat) -+extern __typeof (renameat2) __renameat2; -+libc_hidden_proto (__renameat2) - - # endif /* not _ISOMAC */ - #endif /* stdio.h */ -diff --git a/stdio-common/renameat2.c b/stdio-common/renameat2.c -index ce60173455..00cb2ec6c5 100644 ---- a/stdio-common/renameat2.c -+++ b/stdio-common/renameat2.c -@@ -20,7 +20,7 @@ - #include <stdio.h> - - int --renameat2 (int oldfd, const char *old, int newfd, const char *new, -+__renameat2 (int oldfd, const char *old, int newfd, const char *new, - unsigned int flags) - { - if (flags == 0) -@@ -28,3 +28,5 @@ renameat2 (int oldfd, const char *old, int newfd, const char *new, - __set_errno (EINVAL); - return -1; - } -+libc_hidden_def (__renameat2) -+weak_alias (__renameat2, renameat2) -diff --git a/sysdeps/mach/hurd/renameat.c b/sysdeps/mach/hurd/renameat.c -index 9aa231091c..a05f550a57 100644 ---- a/sysdeps/mach/hurd/renameat.c -+++ b/sysdeps/mach/hurd/renameat.c -@@ -24,26 +24,7 @@ - int - __renameat (int oldfd, const char *old, int newfd, const char *new) - { -- error_t err; -- file_t olddir, newdir; -- const char *oldname, *newname; -- -- olddir = __directory_name_split_at (oldfd, old, (char **) &oldname); -- if (olddir == MACH_PORT_NULL) -- return -1; -- newdir = __directory_name_split_at (newfd, new, (char **) &newname); -- if (newdir == MACH_PORT_NULL) -- { -- __mach_port_deallocate (__mach_task_self (), olddir); -- return -1; -- } -- -- err = __dir_rename (olddir, oldname, newdir, newname, 0); -- __mach_port_deallocate (__mach_task_self (), olddir); -- __mach_port_deallocate (__mach_task_self (), newdir); -- if (err) -- return __hurd_fail (err); -- return 0; -+ return __renameat2 (oldfd, old, newfd, new, 0); - } - libc_hidden_def (__renameat) - weak_alias (__renameat, renameat) -diff --git a/sysdeps/mach/hurd/renameat2.c b/sysdeps/mach/hurd/renameat2.c -new file mode 100644 -index 0000000000..2ed49cbac9 ---- /dev/null -+++ b/sysdeps/mach/hurd/renameat2.c -@@ -0,0 +1,56 @@ -+/* Rename a file using relative source and destination names. Hurd version. -+ Copyright (C) 1991-2019 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <http://www.gnu.org/licenses/>. */ -+ -+#include <stdio.h> -+#include <hurd.h> -+#include <hurd/fd.h> -+ -+/* Rename the file OLD relative to OLDFD to NEW relative to NEWFD. */ -+int -+__renameat2 (int oldfd, const char *old, int newfd, const char *new, -+ unsigned int flags) -+{ -+ error_t err; -+ file_t olddir, newdir; -+ const char *oldname, *newname; -+ int excl = 0; -+ -+ if (flags & (RENAME_EXCHANGE | RENAME_WHITEOUT)) -+ return __hurd_fail (ENOSYS); -+ if (flags & RENAME_NOREPLACE) -+ excl = 1; -+ -+ olddir = __directory_name_split_at (oldfd, old, (char **) &oldname); -+ if (olddir == MACH_PORT_NULL) -+ return -1; -+ newdir = __directory_name_split_at (newfd, new, (char **) &newname); -+ if (newdir == MACH_PORT_NULL) -+ { -+ __mach_port_deallocate (__mach_task_self (), olddir); -+ return -1; -+ } -+ -+ err = __dir_rename (olddir, oldname, newdir, newname, excl); -+ __mach_port_deallocate (__mach_task_self (), olddir); -+ __mach_port_deallocate (__mach_task_self (), newdir); -+ if (err) -+ return __hurd_fail (err); -+ return 0; -+} -+libc_hidden_def (__renameat2) -+weak_alias (__renameat2, renameat2) -diff --git a/sysdeps/unix/sysv/linux/renameat2.c b/sysdeps/unix/sysv/linux/renameat2.c -index 566868cc93..a9cc2ea6b8 100644 ---- a/sysdeps/unix/sysv/linux/renameat2.c -+++ b/sysdeps/unix/sysv/linux/renameat2.c -@@ -21,7 +21,7 @@ - #include <sysdep.h> - - int --renameat2 (int oldfd, const char *old, int newfd, const char *new, -+__renameat2 (int oldfd, const char *old, int newfd, const char *new, - unsigned int flags) - { - #if !defined (__NR_renameat) || defined (__ASSUME_RENAMEAT2) -@@ -42,3 +42,5 @@ renameat2 (int oldfd, const char *old, int newfd, const char *new, - return -1; - #endif - } -+libc_hidden_def (__renameat2) -+weak_alias (__renameat2, renameat2)
  21. Download patch debian/sysdeps/i386.mk

    --- 2.29-0experimental0/debian/sysdeps/i386.mk 2019-08-14 18:45:57.000000000 +0000 +++ 2.29-0ubuntu3/debian/sysdeps/i386.mk 2019-06-03 12:25:06.000000000 +0000 @@ -1,30 +1,6 @@ # configuration options for all flavours -extra_config_options = --enable-multi-arch --enable-static-pie - -ifeq (,$(filter stage1 stage2, $(DEB_BUILD_PROFILES))) -# We use -mno-tls-direct-seg-refs to not wrap-around segments, as it -# greatly increase the speed when running under the 32bit Xen hypervisor. -GLIBC_PASSES += xen -DEB_ARCH_REGULAR_PACKAGES += libc6-xen -xen_extra_cflags = -mno-tls-direct-seg-refs -xen_slibdir = /lib/$(DEB_HOST_MULTIARCH)/i686/nosegneg - -define libc6-xen_extra_pkg_install -mkdir -p debian/libc6-xen/etc/ld.so.conf.d -echo '# This directive teaches ldconfig to search in nosegneg subdirectories' > debian/libc6-xen/etc/ld.so.conf.d/libc6-xen.conf -echo '# and cache the DSOs there with extra bit 1 set in their hwcap match' >> debian/libc6-xen/etc/ld.so.conf.d/libc6-xen.conf -echo '# fields. In Xen guest kernels, the vDSO tells the dynamic linker to' >> debian/libc6-xen/etc/ld.so.conf.d/libc6-xen.conf -echo '# search in nosegneg subdirectories and to match this extra hwcap bit' >> debian/libc6-xen/etc/ld.so.conf.d/libc6-xen.conf -echo '# in the ld.so.cache file.' >> debian/libc6-xen/etc/ld.so.conf.d/libc6-xen.conf -echo 'hwcap 1 nosegneg' >> debian/libc6-xen/etc/ld.so.conf.d/libc6-xen.conf -endef - -define libc6-dev_extra_pkg_install -mkdir -p debian/libc6-dev/$(libdir)/xen -cp -af debian/tmp-xen/$(libdir)/*.a \ - debian/libc6-dev/$(libdir)/xen -endef -endif +extra_config_options = --enable-multi-arch --enable-static-pie --enable-cet +libc_extra_cflags = -mno-tls-direct-seg-refs # multilib flavours ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
  22. Download patch debian/patches/ubuntu/submitted-no-sprintf-pre-truncate.diff

    --- 2.29-0experimental0/debian/patches/ubuntu/submitted-no-sprintf-pre-truncate.diff 1970-01-01 00:00:00.000000000 +0000 +++ 2.29-0ubuntu3/debian/patches/ubuntu/submitted-no-sprintf-pre-truncate.diff 2019-02-21 15:31:53.000000000 +0000 @@ -0,0 +1,38 @@ +Description: when a program is compiled with -D_FORTIFY_SOURCE=2, the + vsprintf_chk function is called to handle sprintf/snprintf, but it + needlessly pretruncates the destination which changes the results of + sprintf(foo, "%sbar", baz). This patch restores the original behavior + that many programs have depended on. +Bug: http://sourceware.org/bugzilla/show_bug.cgi?id=7075 +Bug-Ubuntu: https://launchpad.net/bugs/305901 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=563637 +Author: Kees Cook <kees@ubuntu.com> +Author: Adam Conrad <adconrad@ubuntu.com> + +Index: glibc-2.9/libio/iovsprintf.c +=================================================================== +--- glibc-2.9.orig/libio/iovsprintf.c 2008-12-23 21:30:07.000000000 -0800 ++++ glibc-2.9/libio/iovsprintf.c 2008-12-23 21:30:19.000000000 -0800 +@@ -76,7 +76,6 @@ + if ((mode_flags & PRINTF_CHK) != 0) + { + _IO_JUMPS (&sf._sbf) = &_IO_str_chk_jumps; +- string[0] = '\0'; + } + else + _IO_JUMPS (&sf._sbf) = &_IO_str_jumps; +--- glibc-2.9.orig/libio/tst-sprintf-ub.c.orig 2019-02-20 02:25:11.467294842 -0700 ++++ glibc-2.9/libio/tst-sprintf-ub.c 2019-02-21 08:30:37.129814828 -0700 +@@ -38,12 +38,7 @@ + va_list args; + char *arg; + +- /* Expected results for fortified and non-fortified sprintf. */ +-#if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 1 +- const char *expected = "CD"; +-#else + const char *expected = "ABCD"; +-#endif + + va_start (args, buf); + arg = va_arg (args, char *);
  23. Download patch debian/control
  24. Download patch debian/rules.d/debhelper.mk

    --- 2.29-0experimental0/debian/rules.d/debhelper.mk 2019-07-29 09:56:57.000000000 +0000 +++ 2.29-0ubuntu3/debian/rules.d/debhelper.mk 2019-02-21 13:46:18.000000000 +0000 @@ -33,6 +33,13 @@ $(patsubst %,$(stamp)binaryinst_%,$(DEB_ dh_link -p$(curpass) dh_bugfiles -p$(curpass) + if test "$(curpass)" = "libc-bin"; then \ + mv debian/$(curpass)/sbin/ldconfig \ + debian/$(curpass)/sbin/ldconfig.real; \ + install -m755 -o0 -g0 debian/local/sbin/ldconfig \ + debian/$(curpass)/sbin/ldconfig; \ + fi + # when you want to install extra packages, use extra_pkg_install. $(call xx,extra_pkg_install) @@ -44,7 +51,7 @@ ifeq ($(filter nostrip,$(DEB_BUILD_OPTIO # work even without that package installed. if test "$(NOSTRIP_$(curpass))" != 1; then \ if test "$(DEBUG_$(curpass))" = 1; then \ - dh_strip -p$(curpass) -Xlibpthread $(DH_STRIP_DEBUG_PACKAGE); \ + DH_COMPAT=8 dh_strip -p$(curpass) -Xlibpthread $(DH_STRIP_DEBUG_PACKAGE); \ for f in $$(find debian/$(curpass) -name libpthread-\*.so) ; do \ dbgfile=$$(LC_ALL=C readelf -n $$f | sed -e '/Build ID:/!d' \ -e "s#^.*Build ID: \([0-9a-f]\{2\}\)\([0-9a-f]\+\)#\1/\2.debug#") ; \ @@ -56,7 +63,7 @@ ifeq ($(filter nostrip,$(DEB_BUILD_OPTIO --remove-section=.note $$f ; \ done ; \ else \ - dh_strip -p$(curpass) -Xlibpthread; \ + DH_COMPAT=8 dh_strip -p$(curpass) -Xlibpthread; \ fi ; \ for f in $$(find debian/$(curpass) -name \*crt\*.o) ; do \ $(DEB_HOST_GNU_TYPE)-strip --strip-debug --remove-section=.comment \ @@ -67,6 +74,9 @@ endif dh_compress -p$(curpass) dh_fixperms -p$(curpass) -Xpt_chown + if [ $(curpass) = locales ] ; then \ + chmod +x debian/$(curpass)/usr/share/locales/*-language-pack ; \ + fi # Use this instead of -X to dh_fixperms so that we can use # an unescaped regular expression. ld.so must be executable; # libc.so and NPTL's libpthread.so print useful version @@ -106,7 +116,7 @@ $(patsubst %,$(stamp)binaryinst_%,$(DEB_ dh_testroot dh_installdirs -p$(curpass) dh_install -p$(curpass) - dh_strip -p$(curpass) + DH_COMPAT=8 dh_strip -p$(curpass) # when you want to install extra packages, use extra_pkg_install. $(call xx,extra_pkg_install)
  25. Download patch debian/patches/ubuntu/local-altlocaledir.diff

    --- 2.29-0experimental0/debian/patches/ubuntu/local-altlocaledir.diff 1970-01-01 00:00:00.000000000 +0000 +++ 2.29-0ubuntu3/debian/patches/ubuntu/local-altlocaledir.diff 2019-02-21 13:46:18.000000000 +0000 @@ -0,0 +1,38 @@ +# All lines beginning with `# DP:' are a description of the patch. +# DP: Description: support alternative gettext tree in +# DP: /usr/share/locale-langpack +# DP: Dpatch author: Martin Pitt <martin.pitt@canonical.com> +# DP: Patch author: Martin Pitt <martin.pitt@canonical.com> +# DP: Upstream status: Ubuntu-Specific +# DP: Date: 2004-12-06 20:44:10 CET +# DP: Updated: 2016-10-05 13:51:00 CET + +--- glibc-2.3.5.orig/intl/l10nflist.c ++++ glibc-2.3.5/intl/l10nflist.c +@@ -267,7 +267,7 @@ _nl_make_l10nflist (l10nfile_list, dirli + + retval = (struct loaded_l10nfile *) + malloc (sizeof (*retval) + (__argz_count (dirlist, dirlist_len) +- * (1 << pop (mask)) ++ * 2 * (1 << pop (mask)) + * sizeof (struct loaded_l10nfile *))); + if (retval == NULL) + { +@@ -310,6 +310,17 @@ _nl_make_l10nflist (l10nfile_list, dirli + language, territory, codeset, + normalized_codeset, modifier, filename, 1); + } ++ const char* langpack_dir = "/usr/share/locale-langpack"; ++ if (strncmp(filename, "LC_MESSAGES", strlen("LC_MESSAGES")) == 0) { ++ for (cnt = mask; cnt >= 0; --cnt) ++ if ((cnt & ~mask) == 0) ++ { ++ retval->successor[entries++] ++ = _nl_make_l10nflist (l10nfile_list, langpack_dir, strlen (langpack_dir) + 1, cnt, ++ language, territory, codeset, ++ normalized_codeset, modifier, filename, 1); ++ } ++ } + retval->successor[entries] = NULL; + + return retval;
  26. Download patch debian/patches/hurd-i386/local-fix-nss.diff

    --- 2.29-0experimental0/debian/patches/hurd-i386/local-fix-nss.diff 2019-08-14 16:21:44.000000000 +0000 +++ 2.29-0ubuntu3/debian/patches/hurd-i386/local-fix-nss.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -TODO: -make the Makefile part newns-support-specific -make the main Makefile put tests-container in unsupported tests when newns is not supported. - -Index: glibc-2.29/nss/tst-nss-test3.c -=================================================================== ---- glibc-2.29.orig/nss/tst-nss-test3.c -+++ glibc-2.29/nss/tst-nss-test3.c -@@ -16,6 +16,7 @@ - License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ - -+#include <sched.h> - #include <nss.h> - #include <stdio.h> - #include <stdlib.h> -@@ -107,12 +108,15 @@ do_test (void) - int i; - struct group *g = NULL; - -+#ifndef CLONE_NEWNS -+ __nss_configure_lookup ("group", "test1"); -+#else - /* Previously we used __nss_configure_lookup to isolate the test - from the host environment and to get it to lookup from our new - test1 NSS service module, but now this test is run in a different - root filesystem via the test-container support and we directly - configure the use of the test1 NSS service. */ -- __nss_configure_lookup ("group", "test1"); -+#endif - - setgrent (); - -Index: glibc-2.29/nss/Makefile -=================================================================== ---- glibc-2.29.orig/nss/Makefile -+++ glibc-2.29/nss/Makefile -@@ -59,7 +59,7 @@ tests = test-netdb test-digits-dots ts - tst-nss-test5 - xtests = bug-erange - --tests-container = \ -+tests += \ - tst-nss-test3 - - # Tests which need libdl
  27. Download patch debian/patches/ubuntu/local-disable-nscd-netgroup-caching.diff

    --- 2.29-0experimental0/debian/patches/ubuntu/local-disable-nscd-netgroup-caching.diff 1970-01-01 00:00:00.000000000 +0000 +++ 2.29-0ubuntu3/debian/patches/ubuntu/local-disable-nscd-netgroup-caching.diff 2019-02-21 13:46:18.000000000 +0000 @@ -0,0 +1,13 @@ +--- eglibc-2.16.orig/nscd/nscd.conf ++++ eglibc-2.16/nscd/nscd.conf +@@ -80,7 +80,9 @@ + shared services yes + max-db-size services 33554432 + +- enable-cache netgroup yes ++# netgroup caching is known-broken, so disable it in the default config, ++# see: https://bugs.launchpad.net/ubuntu/+source/eglibc/+bug/1068889 ++ enable-cache netgroup no + positive-time-to-live netgroup 28800 + negative-time-to-live netgroup 20 + suggested-size netgroup 211
  28. Download patch debian/debhelper.in/locales.install

    --- 2.29-0experimental0/debian/debhelper.in/locales.install 2019-07-29 09:56:57.000000000 +0000 +++ 2.29-0ubuntu3/debian/debhelper.in/locales.install 2019-02-21 13:46:18.000000000 +0000 @@ -3,3 +3,5 @@ debian/tmp-libc/usr/share/i18n/* usr/sha debian/local/usr_sbin/locale-gen usr/sbin debian/local/usr_sbin/update-locale usr/sbin debian/local/usr_sbin/validlocale usr/sbin +debian/local/usr_share_locales/install-language-pack usr/share/locales +debian/local/usr_share_locales/remove-language-pack usr/share/locales
  29. Download patch debian/sysdeps/mips64.mk

    --- 2.29-0experimental0/debian/sysdeps/mips64.mk 2019-08-15 20:31:32.000000000 +0000 +++ 2.29-0ubuntu3/debian/sysdeps/mips64.mk 2018-04-16 20:02:33.000000000 +0000 @@ -1,5 +1,5 @@ # configuration options for all flavours -CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)$(DEB_GCC_VERSION) -no-pie +extra_cflags = -mno-plt # main library libc_rtlddir = /lib64
  30. Download patch debian/sysdeps/amd64.mk

    --- 2.29-0experimental0/debian/sysdeps/amd64.mk 2019-08-14 18:45:57.000000000 +0000 +++ 2.29-0ubuntu3/debian/sysdeps/amd64.mk 2019-06-03 12:25:06.000000000 +0000 @@ -1,8 +1,9 @@ # configuration options for all flavours -extra_config_options = --enable-multi-arch --enable-static-pie +extra_config_options = --enable-multi-arch --enable-static-pie --enable-cet # main library libc_mvec = yes +libc_extra_cflags = -O3 libc_rtlddir = /lib64 # multilib flavours
  31. Download patch debian/glibc-source.filelist

    --- 2.29-0experimental0/debian/glibc-source.filelist 2019-08-14 16:21:44.000000000 +0000 +++ 2.29-0ubuntu3/debian/glibc-source.filelist 2018-02-22 09:46:35.000000000 +0000 @@ -67,6 +67,7 @@ debian/libc6.symbols.mipsn32r6el debian/libc6.symbols.mipsr6 debian/libc6.symbols.mipsr6el debian/libc6.symbols.powerpc +debian/libc6.symbols.powerpcspe debian/libc6.symbols.ppc64 debian/libc6.symbols.ppc64el debian/libc6.symbols.s390x
  32. Download patch debian/testsuite-xfail-debian.mk
  33. Download patch debian/sysdeps/mipsr6el.mk

    --- 2.29-0experimental0/debian/sysdeps/mipsr6el.mk 2019-08-15 20:31:32.000000000 +0000 +++ 2.29-0ubuntu3/debian/sysdeps/mipsr6el.mk 2018-04-16 20:02:33.000000000 +0000 @@ -1,5 +1,5 @@ # configuration options for all flavours -CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)$(DEB_GCC_VERSION) -no-pie +extra_cflags = -mno-plt # multilib flavours ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
  34. Download patch debian/patches/hurd-i386/tg-bits_atomic.h_multiple_threads.diff
  35. Download patch debian/sysdeps/ppc64el.mk

    --- 2.29-0experimental0/debian/sysdeps/ppc64el.mk 2019-08-14 18:45:57.000000000 +0000 +++ 2.29-0ubuntu3/debian/sysdeps/ppc64el.mk 2019-02-21 13:46:18.000000000 +0000 @@ -3,3 +3,4 @@ extra_config_options = --enable-multi-ar # main library libc_rtlddir = /lib64 +libc_extra_cflags = -O3 -fno-tree-vectorize
  36. Download patch debian/patches/ubuntu/localedata/eo_US.diff
  37. Download patch debian/debhelper.in/locales.config

    --- 2.29-0experimental0/debian/debhelper.in/locales.config 2019-07-29 09:56:57.000000000 +0000 +++ 2.29-0ubuntu3/debian/debhelper.in/locales.config 2019-02-21 13:46:18.000000000 +0000 @@ -34,12 +34,20 @@ if [ -e $LG ]; then GEN_LOCALES="$(convert_locale "$GEN_LOCALES")" fi +# This upgrades from Ubuntu << 16.04, where locale-gen wrote user locales +# to /var/lib/locales/supported.d/local, but we want them in /etc/locale.gen +if [ -f /var/lib/locales/supported.d/local ]; then + LOCAL_LOCALES="$(sed -e '/^[a-zA-Z]/!d' -e 's/ *$//g' /var/lib/locales/supported.d/local)" + LOCAL_LOCALES="$(convert_locale "$LOCAL_LOCALES")" + GEN_LOCALES=$(printf '%s\n' "$GEN_LOCALES" "$LOCAL_LOCALES") +fi + # List of supported locales (PROVIDED_LOCALES + USER_LOCALES + GEN_LOCALES) SUPPORTED_LOCALES="$(printf '%s\n' "$PROVIDED_LOCALES" "$USER_LOCALES" "$GEN_LOCALES" | grep -v "^$" | sort -u | tr '\n' ',' | sed -e 's/, */, /g' -e 's/, *$//g')" db_subst locales/locales_to_be_generated locales "$SUPPORTED_LOCALES" # Get the list of selected locales from /etc/locale.gen -if [ -e /etc/locale.gen ]; then +if [ -e /etc/locale.gen -o -f /var/lib/locales/supported.d/local ]; then if [ -L $LG ] && [ "$(readlink $LG)" = "/usr/share/i18n/SUPPORTED" ]; then SELECTED_LOCALES="All locales" else @@ -77,6 +85,13 @@ while [ "$STATE" -ge 0 ]; do RET=$SUPPORTED_LOCALES fi DEFAULT_LOCALES="$(echo $RET | sed -e 's/ [^ ]*,/,/g' -e 's/ [^ ]*$//')" + for langpack in /var/lib/locales/supported.d/*; do + if [ -f $langpack ]; then + while read locale charset; do + DEFAULT_LOCALES="$DEFAULT_LOCALES, $locale" + done < $langpack + fi + done if [ -n "$DEFAULT_LOCALES" ]; then db_subst locales/default_environment_locale locales $DEFAULT_LOCALES db_input medium locales/default_environment_locale || true
  38. Download patch debian/debhelper.in/libc.postinst
  39. Download patch debian/po/da.po

    --- 2.29-0experimental0/debian/po/da.po 2019-08-14 16:21:44.000000000 +0000 +++ 2.29-0ubuntu3/debian/po/da.po 2017-09-03 20:41:15.000000000 +0000 @@ -1,15 +1,15 @@ -# Danish translation glibc. -# Copyright (C) 2019 glibc & nedenstående oversættere. -# This file is distributed under the same license as the glibc package. +# Danish translation eglibc. +# Copyright (C) 2016 eglibc & nedenstående oversættere. +# This file is distributed under the same license as the eglibc package. # Morten Brix Pedersen <morten@wtf.dk>. 2006. -# Joe Hansen <joedalton2@yahoo.dk>, 2010, 2012, 2016, 2019. +# Joe Hansen <joedalton2@yahoo.dk>, 2010, 2012, 2016. # msgid "" msgstr "" -"Project-Id-Version: glibc\n" +"Project-Id-Version: eglibc\n" "Report-Msgid-Bugs-To: glibc@packages.debian.org\n" "POT-Creation-Date: 2017-08-26 13:35+0200\n" -"PO-Revision-Date: 2019-02-23 14:04+0200\n" +"PO-Revision-Date: 2016-07-10 14:04+0200\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n" "Language: da\n" @@ -263,11 +263,16 @@ msgstr "Kerneversion er ikke understøtt #. Type: note #. Description #: ../debhelper.in/libc.templates:7001 +#, fuzzy +#| msgid "" +#| "This version of the GNU libc requires kernel version ${kernel_ver} or " +#| "later. Older versions might work but are not officially supported. " +#| "Please consider upgrading your kernel." msgid "" "This version of the GNU libc requires kernel version ${kernel_ver} or " "later. Older versions might work but are not officially supported by " "Debian. Please consider upgrading your kernel." msgstr "" "Denne version af GNU libc kræver kerneversionen ${kernel_ver} eller senere. " -"Ældre versioner kan fungere men er ikke officielt understøttet af Debian. " -"Overvej at opgradere din kerne." +"Ældre versioner kan fungere men er ikke officielt understøttet. Overvej at " +"opgradere din kerne."
  40. Download patch debian/patches/hurd-i386/libpthread_sigs.diff

    --- 2.29-0experimental0/debian/patches/hurd-i386/libpthread_sigs.diff 2019-08-14 16:21:44.000000000 +0000 +++ 2.29-0ubuntu3/debian/patches/hurd-i386/libpthread_sigs.diff 2018-08-23 19:10:27.000000000 +0000 @@ -1,51 +1,27 @@ -From: Samuel Thibault <samuel.thibault@ens-lyon.org> -Subject: Enable global signal distribution in htl +To be activated with glibc 2.28 to re-install thread signal dispatch -* sysdeps/mach/hurd/htl/pt-sigstate-init.c (__pthread_sigstate_init): -Call _hurd_sigstate_set_global_rcv(). -* sysdeps/mach/hurd/htl/pt-sigstate-destroy.c -(__pthread_sigstate_destroy): Call _hurd_sigstate_delete(). -* sysdeps/mach/hurd/htl/pt-sigstate.c: Include <hurd/msg.h> -(__pthread_sigstate): Use _hurd_sigstate_lock()/_hurd_sigstate_unlock() -and _hurd_sigstate_pending(). Call __msg_sig_post() to wake up thread -with pending signals. -* sysdeps/mach/hurd/Makefile (LDLIBS-pthread.so): Add -$(objdir)/hurd/libhurduser.so. - - ---- - sysdeps/mach/hurd/Makefile | 2 ++ - sysdeps/mach/hurd/htl/pt-sigstate-destroy.c | 1 + - sysdeps/mach/hurd/htl/pt-sigstate-init.c | 2 +- - sysdeps/mach/hurd/htl/pt-sigstate.c | 12 ++++++++++-- - 4 files changed, 14 insertions(+), 3 deletions(-) - -diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile -index 3a853a6cd9..8a865a0e1f 100644 ---- a/sysdeps/mach/hurd/Makefile -+++ b/sysdeps/mach/hurd/Makefile -@@ -206,4 +206,6 @@ ifeq ($(subdir),nis) - CFLAGS-ypclnt.c += -DUSE_BINDINGDIR=1 - endif - -+LDLIBS-pthread.so += $(objdir)/hurd/libhurduser.so -+ - endif # in-Makerules -diff --git a/sysdeps/mach/hurd/htl/pt-sigstate-destroy.c b/sysdeps/mach/hurd/htl/pt-sigstate-destroy.c -index e7154a371d..229a415487 100644 ---- a/sysdeps/mach/hurd/htl/pt-sigstate-destroy.c -+++ b/sysdeps/mach/hurd/htl/pt-sigstate-destroy.c -@@ -23,4 +23,5 @@ +Revert of +commit 5049fabcfad4d5197669e5aa13d4d5f87f39d0bb +Author: Samuel Thibault <samuel.thibault@ens-lyon.org> +Date: Thu Jan 25 01:47:51 2018 +0100 + + Until posix thread signal distribution is commited + +diff --git b/sysdeps/mach/hurd/htl/pt-sigstate-destroy.c a/sysdeps/mach/hurd/htl/pt-sigstate-destroy.c +index fce56c5d0d..d5e28d22d8 100644 +--- b/sysdeps/mach/hurd/htl/pt-sigstate-destroy.c ++++ a/sysdeps/mach/hurd/htl/pt-sigstate-destroy.c +@@ -24,4 +24,5 @@ void __pthread_sigstate_destroy (struct __pthread *thread) { + _hurd_sigstate_delete (thread->kernel_thread); } -diff --git a/sysdeps/mach/hurd/htl/pt-sigstate-init.c b/sysdeps/mach/hurd/htl/pt-sigstate-init.c -index 70832f9576..507fb8ade2 100644 ---- a/sysdeps/mach/hurd/htl/pt-sigstate-init.c -+++ b/sysdeps/mach/hurd/htl/pt-sigstate-init.c -@@ -35,7 +35,7 @@ __pthread_sigstate_init (struct __pthread *thread) +diff --git b/sysdeps/mach/hurd/htl/pt-sigstate-init.c a/sysdeps/mach/hurd/htl/pt-sigstate-init.c +index 660d5a02a6..4848f2ea91 100644 +--- b/sysdeps/mach/hurd/htl/pt-sigstate-init.c ++++ a/sysdeps/mach/hurd/htl/pt-sigstate-init.c +@@ -36,7 +36,7 @@ __pthread_sigstate_init (struct __pthread *thread) if (do_init_global) { struct hurd_sigstate *ss = _hurd_thread_sigstate (thread->kernel_thread); @@ -54,11 +30,20 @@ index 70832f9576..507fb8ade2 100644 } else if (__pthread_num_threads >= 2) do_init_global = 1; -diff --git a/sysdeps/mach/hurd/htl/pt-sigstate.c b/sysdeps/mach/hurd/htl/pt-sigstate.c -index f7050ec0df..2ddceb229e 100644 ---- a/sysdeps/mach/hurd/htl/pt-sigstate.c -+++ b/sysdeps/mach/hurd/htl/pt-sigstate.c -@@ -20,6 +20,7 @@ + + +Revert of +commit 797492f8769ced63b209246858c0550e23009e40 +Author: Samuel Thibault <samuel.thibault@ens-lyon.org> +Date: Thu Jan 25 01:49:49 2018 +0100 + + Revert signal disposition, not in glibc's cvs yet + +diff --git b/sysdeps/mach/hurd/htl/pt-sigstate.c a/sysdeps/mach/hurd/htl/pt-sigstate.c +index bae6ae7c45..74fd72a2c0 100644 +--- b/sysdeps/mach/hurd/htl/pt-sigstate.c ++++ a/sysdeps/mach/hurd/htl/pt-sigstate.c +@@ -21,6 +21,7 @@ #include <assert.h> #include <signal.h> #include <hurd/signal.h> @@ -66,7 +51,7 @@ index f7050ec0df..2ddceb229e 100644 #include <pt-internal.h> -@@ -29,11 +30,12 @@ __pthread_sigstate (struct __pthread *thread, int how, +@@ -31,11 +32,12 @@ __pthread_sigstate (struct __pthread *thread, int how, { error_t err = 0; struct hurd_sigstate *ss; @@ -80,7 +65,7 @@ index f7050ec0df..2ddceb229e 100644 if (oset != NULL) *oset = ss->blocked; -@@ -64,7 +66,13 @@ __pthread_sigstate (struct __pthread *thread, int how, +@@ -66,7 +68,13 @@ __pthread_sigstate (struct __pthread *thread, int how, if (!err && clear_pending) __sigemptyset (&ss->pending); @@ -95,5 +80,3 @@ index f7050ec0df..2ddceb229e 100644 return err; } --- -tg: (0bfe57e3de..) t/libpthread_sigs (depends on: baseline t/hurdsig-SA_SIGINFO t/hurdsig-boot-fix t/hurdsig-fixes t/hurdsig-fixes-2 t/hurdsig-global-dispositions t/hurdsig-global-dispositions-versions)
  41. Download patch debian/patches/git-updates.diff
  42. Download patch debian/local/sbin/ldconfig

    --- 2.29-0experimental0/debian/local/sbin/ldconfig 1970-01-01 00:00:00.000000000 +0000 +++ 2.29-0ubuntu3/debian/local/sbin/ldconfig 2019-02-21 13:46:18.000000000 +0000 @@ -0,0 +1,16 @@ +#!/bin/sh + +if test $# = 0 \ + && test x"$LDCONFIG_NOTRIGGER" = x \ + && test x"$DPKG_MAINTSCRIPT_PACKAGE" != x \ + && dpkg-trigger --check-supported 2>/dev/null +then + if dpkg-trigger --no-await ldconfig; then + if test x"$LDCONFIG_TRIGGER_DEBUG" != x; then + echo "ldconfig: wrapper deferring update (trigger activated)" + fi + exit 0 + fi +fi + +exec /sbin/ldconfig.real "$@"
  43. Download patch debian/patches/hurd-i386/submitted-net.diff

    --- 2.29-0experimental0/debian/patches/hurd-i386/submitted-net.diff 2019-08-14 16:21:44.000000000 +0000 +++ 2.29-0ubuntu3/debian/patches/hurd-i386/submitted-net.diff 2018-08-23 19:10:27.000000000 +0000 @@ -96,7 +96,7 @@ Index: glibc-2.27/sysdeps/gnu/net/ethern --- /dev/null +++ glibc-2.27/sysdeps/gnu/net/ethernet.h @@ -0,0 +1,84 @@ -+/* Copyright (C) 1997-2019 Free Software Foundation, Inc. ++/* Copyright (C) 1997-2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or @@ -186,7 +186,7 @@ Index: glibc-2.27/sysdeps/gnu/net/if_arp +++ glibc-2.27/sysdeps/gnu/net/if_arp.h @@ -0,0 +1,183 @@ +/* Definitions for Address Resolution Protocol. -+ Copyright (C) 1997-2019 Free Software Foundation, Inc. ++ Copyright (C) 1997-2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. + @@ -373,7 +373,7 @@ Index: glibc-2.27/sysdeps/gnu/net/if_eth --- /dev/null +++ glibc-2.27/sysdeps/gnu/net/if_ether.h @@ -0,0 +1,115 @@ -+/* Copyright (C) 1997-2019 Free Software Foundation, Inc. ++/* Copyright (C) 1997-2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or @@ -669,7 +669,7 @@ Index: glibc-2.27/sysdeps/gnu/net/route. --- /dev/null +++ glibc-2.27/sysdeps/gnu/net/route.h @@ -0,0 +1,144 @@ -+/* Copyright (C) 1997-2019 Free Software Foundation, Inc. ++/* Copyright (C) 1997-2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or @@ -818,7 +818,7 @@ Index: glibc-2.27/sysdeps/gnu/netinet/if --- /dev/null +++ glibc-2.27/sysdeps/gnu/netinet/if_ether.h @@ -0,0 +1,103 @@ -+/* Copyright (C) 1996-2019 Free Software Foundation, Inc. ++/* Copyright (C) 1996-2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or @@ -941,7 +941,7 @@ Index: glibc-2.27/sysdeps/mach/hurd/net/ --- glibc-2.27.orig/sysdeps/mach/hurd/net/ethernet.h +++ /dev/null @@ -1,76 +0,0 @@ --/* Copyright (C) 1997-2019 Free Software Foundation, Inc. +-/* Copyright (C) 1997-2018 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or @@ -1023,7 +1023,7 @@ Index: glibc-2.27/sysdeps/mach/hurd/net/ +++ /dev/null @@ -1,145 +0,0 @@ -/* Definitions for Address Resolution Protocol. -- Copyright (C) 1997-2019 Free Software Foundation, Inc. +- Copyright (C) 1997-2018 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. - @@ -1172,7 +1172,7 @@ Index: glibc-2.27/sysdeps/mach/hurd/net/ --- glibc-2.27.orig/sysdeps/mach/hurd/net/if_ether.h +++ /dev/null @@ -1,84 +0,0 @@ --/* Copyright (C) 1997-2019 Free Software Foundation, Inc. +-/* Copyright (C) 1997-2018 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or @@ -1261,7 +1261,7 @@ Index: glibc-2.27/sysdeps/mach/hurd/net/ --- glibc-2.27.orig/sysdeps/mach/hurd/net/route.h +++ /dev/null @@ -1,140 +0,0 @@ --/* Copyright (C) 1997-2019 Free Software Foundation, Inc.. +-/* Copyright (C) 1997-2018 Free Software Foundation, Inc.. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or @@ -1420,7 +1420,7 @@ Index: glibc-2.27/sysdeps/unix/sysv/linu --- glibc-2.27.orig/sysdeps/unix/sysv/linux/net/ethernet.h +++ /dev/null @@ -1,84 +0,0 @@ --/* Copyright (C) 1997-2019 Free Software Foundation, Inc. +-/* Copyright (C) 1997-2018 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or @@ -1510,7 +1510,7 @@ Index: glibc-2.27/sysdeps/unix/sysv/linu +++ /dev/null @@ -1,183 +0,0 @@ -/* Definitions for Address Resolution Protocol. -- Copyright (C) 1997-2019 Free Software Foundation, Inc. +- Copyright (C) 1997-2018 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. - @@ -1885,7 +1885,7 @@ Index: glibc-2.27/sysdeps/unix/sysv/linu --- glibc-2.27.orig/sysdeps/unix/sysv/linux/net/route.h +++ /dev/null @@ -1,144 +0,0 @@ --/* Copyright (C) 1997-2019 Free Software Foundation, Inc. +-/* Copyright (C) 1997-2018 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or @@ -2034,7 +2034,7 @@ Index: glibc-2.27/sysdeps/unix/sysv/linu --- glibc-2.27.orig/sysdeps/unix/sysv/linux/netinet/if_ether.h +++ /dev/null @@ -1,104 +0,0 @@ --/* Copyright (C) 1996-2019 Free Software Foundation, Inc. +-/* Copyright (C) 1996-2018 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or
  44. Download patch debian/patches/any/git-pexpect-pretty-printers.diff

    --- 2.29-0experimental0/debian/patches/any/git-pexpect-pretty-printers.diff 2019-08-14 16:21:44.000000000 +0000 +++ 2.29-0ubuntu3/debian/patches/any/git-pexpect-pretty-printers.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -2019-02-14 Jan Kratochvil <jan.kratochvil@redhat.com> - - * scripts/test_printers_common.py: Set TERM to a known harmless - value. - ---- a/scripts/test_printers_common.py -+++ b/scripts/test_printers_common.py -@@ -60,6 +60,10 @@ TIMEOUTFACTOR = os.environ.get('TIMEOUTFACTOR') - if TIMEOUTFACTOR: - timeout = int(TIMEOUTFACTOR) - -+# Otherwise GDB is run in interactive mode and readline may send escape -+# sequences confusing output for pexpect. -+os.environ["TERM"]="dumb" -+ - try: - # Check the gdb version. - version_cmd = '{0} --version'.format(gdb_invocation, timeout=timeout)
  45. Download patch debian/debhelper.in/libc-bin.postinst

    --- 2.29-0experimental0/debian/debhelper.in/libc-bin.postinst 2019-07-29 09:56:57.000000000 +0000 +++ 2.29-0ubuntu3/debian/debhelper.in/libc-bin.postinst 2019-02-21 13:46:18.000000000 +0000 @@ -48,6 +48,8 @@ if [ "$1" = "configure" ] && [ "$2" != " fi if [ "$1" = "triggered" ] || [ "$1" = "configure" ]; then + LDCONFIG_NOTRIGGER=y + export LDCONFIG_NOTRIGGER ldconfig || ldconfig --verbose exit 0 fi
  46. Download patch debian/sysdeps/mipsn32r6el.mk

    --- 2.29-0experimental0/debian/sysdeps/mipsn32r6el.mk 2019-08-15 20:31:32.000000000 +0000 +++ 2.29-0ubuntu3/debian/sysdeps/mipsn32r6el.mk 2018-04-16 20:02:33.000000000 +0000 @@ -1,5 +1,5 @@ # configuration options for all flavours -CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)$(DEB_GCC_VERSION) -no-pie +extra_cflags = -mno-plt # main library libc_rtlddir = /lib32 @@ -60,7 +60,7 @@ endef # create a symlink for the 32 bit dynamic linker in /lib define libc6-mips32_extra_pkg_install mkdir -p debian/libc6-mips32/lib -ln -sf /libo32/ld-linux-mipsn8.so.1 debian/libc6-mips32/lib +ln -sf /libo32/ld.so.1 debian/libc6-mips32/lib endef endif # multilib
  47. Download patch debian/patches/series

    --- 2.29-0experimental0/debian/patches/series 2019-08-15 20:31:32.000000000 +0000 +++ 2.29-0ubuntu3/debian/patches/series 2019-02-21 14:05:45.000000000 +0000 @@ -75,10 +75,9 @@ hurd-i386/tg-ONSTACK.diff hurd-i386/tg-libc_rwlock_recursive.diff hurd-i386/local-no_unsupported_ioctls.diff hurd-i386/local-exec_filename.diff -hurd-i386/libpthread_sigs.diff +#hurd-i386/libpthread_sigs.diff; Disabled in 2.28 hurd-i386/local-hurd_sigstate-PLT.diff hurd-i386/tg-WRLCK-upgrade.diff -hurd-i386/git-renameat2.diff i386/local-biarch.diff i386/unsubmitted-quiet-ldconfig.diff @@ -138,6 +137,16 @@ any/local-bootstrap-headers.diff any/submitted-resolv-unaligned.diff any/local-cudacc-float128.diff any/git-libio-stdout-putc.diff -any/git-pexpect-pretty-printers.diff -any/git-socket-constants.diff -any/submitted-ld.so-cache-new-format.diff + +# Ubuntu patches live in their own little world, to maintain sanity +ubuntu/local-altlocaledir.diff +ubuntu/local-disable-ld_audit.diff +ubuntu/local-disable-nscd-netgroup-caching.diff +ubuntu/submitted-no-sprintf-pre-truncate.diff +ubuntu/localedata/ckb_IQ-new_locale.diff +ubuntu/localedata/en_IE-am_pm.diff +ubuntu/localedata/eo_US.diff +ubuntu/localedata/es_DO-am_pm.diff +ubuntu/localedata/lv_LV-currency.diff +ubuntu/localedata/sd_PK.diff +ubuntu/localedata/ug_CN@latin.diff
  48. Download patch debian/debhelper.in/libc.preinst

    --- 2.29-0experimental0/debian/debhelper.in/libc.preinst 2019-07-29 09:56:57.000000000 +0000 +++ 2.29-0ubuntu3/debian/debhelper.in/libc.preinst 2019-02-21 20:46:34.000000000 +0000 @@ -298,6 +298,8 @@ then fi check="kdm postgresql xdm" + # the following substitution processes the check variable + # and returns results in the services variable # NSS services check: __NSS_CHECK__ if [ -n "$services" ]; then @@ -305,7 +307,11 @@ then db_version 2.0 db_reset glibc/upgrade db_subst glibc/upgrade services $services - db_input critical glibc/upgrade || true + if [ "$RELEASE_UPGRADE_MODE" = desktop ]; then + db_input medium glibc/upgrade || true + else + db_input critical glibc/upgrade || true + fi db_go || true db_get glibc/upgrade answer=$RET @@ -348,6 +354,102 @@ then exit 1 fi fi + + services="" + check="apache2 apache apache-ssl apache-perl autofs at" + check="$check boa cucipop courier-authdaemon cron cups exim" + check="$check exim4-base dovecot-common cucipop incron lprng lpr" + check="$check lpr-ppd mysql-server nis openbsd-inetd" + check="$check openldapd postgresql-common proftpd postfix postfix-tls" + check="$check rsync samba sasl2-bin slapd smail sendmail snmpd ssh" + check="$check spamassassin vsftpd wu-ftpd wu-ftpd-academ wwwoffle" + check="$check webmin dropbear gdm gdm3" + # the following substitution processes the check variable + # and returns results in the services variable + # NSS services check: + __NSS_CHECK__ + if [ -n "$services" ]; then + if [ -f /usr/share/debconf/confmodule ] ; then + db_version 2.0 + if [ "$RELEASE_UPGRADE_MODE" = desktop ]; then + db_input medium libraries/restart-without-asking || true + else + db_input critical libraries/restart-without-asking || true + fi + db_go || true + + db_get libraries/restart-without-asking + if [ "$RET" != true ]; then + db_reset glibc/restart-services + db_set glibc/restart-services "$services" + if [ "$RELEASE_UPGRADE_MODE" = desktop ]; then + db_input medium glibc/restart-services || true + else + db_input critical glibc/restart-services || true + fi + db_go || true + db_get glibc/restart-services + services="$RET" + fi + else + echo + echo "Name Service Switch update in the C Library: post-installation question." + echo + echo "Running services and programs that are using NSS need to be restarted," + echo "otherwise they might not be able to do lookup or authentication any more" + echo "(for services such as ssh, this can affect your ability to login)." + echo "Note: restarting sshd/telnetd should not affect any existing connections." + echo + echo "The services detected are: " + echo " $services" + echo + echo "If other services have begun to fail mysteriously after this upgrade, it is" + echo "probably necessary to restart them too. We recommend that you reboot your" + echo "machine after the upgrade to avoid NSS-related troubles." + echo + frontend=`echo "$DEBIAN_FRONTEND" | tr '[:upper:]' '[:lower:]'` + if [ "$frontend" = noninteractive ]; then + echo "Non-interactive mode, restarting services" + answer=yes + else + echo -n "Do you wish to restart services? [Y/n] " + read answer + case $answer in + N*|n*) services="" ;; + *) ;; + esac + fi + fi + + if [ -n "$services" ]; then + echo "Stopping some services possibly affected by the upgrade (will be restarted later):" + for service in $services; do + case "$service" in + cron) + # See bug (LP: #508083) + echo -n " $service: stopping..." + if invoke-rc.d ${service} stop > /dev/null 2>&1; then + echo "done." + echo "$service" >> /var/run/services.need_start + else + echo "FAILED! ($?)" + echo "$service" >> /var/run/services.need_restart + fi + ;; + + *) + # log service details to allow postinst to handle the + # restart. + echo "$service" >> /var/run/services.need_restart + ;; + esac + done + + fi + echo + else + echo "Nothing to restart." + fi fi # end upgrading and $preversion lt GLIBC_VERSION fi # Upgrading
  49. Download patch debian/local/usr_share_locales/remove-language-pack

    --- 2.29-0experimental0/debian/local/usr_share_locales/remove-language-pack 1970-01-01 00:00:00.000000000 +0000 +++ 2.29-0ubuntu3/debian/local/usr_share_locales/remove-language-pack 2019-02-21 13:46:18.000000000 +0000 @@ -0,0 +1,68 @@ +#!/bin/sh -e + +if [ -z "$1" ]; then + echo "Usage: $0 <language code> <class> [<version>]" + exit 0 +fi + +# Copied from locale-gen +normalize_locale() { + # Insert a leading x in case $1 begins with a dash + this_locale=x$1 + charset= + if echo $this_locale | LC_ALL=C grep '\.' > /dev/null 2>&1; then + charset=$(echo $this_locale | sed -e 's/^x//' -e 's/.*\(\.[^@]*\).*/\1/' | LC_ALL=C tr '[A-Z]' '[a-z]' | LC_ALL=C sed -e 's/[^a-z0-9.]//g') + fi + modifier= + if echo $this_locale | LC_ALL=C grep '@' > /dev/null 2>&1; then + modifier=$(echo $this_locale | sed -e 's/^x//' -e 's/.*\(@[^.]*\).*/\1/') + fi + main=$(echo $this_locale | sed -e 's/^x//' -e 's/[.@].*//') + echo $main$charset$modifier +} + +get_supported_local_normalized() { + [ -e /etc/locale.gen ] || return 0 + sort -u /etc/locale.gen | while read locale charset; do + case $locale in + \#*) continue ;; + "") continue ;; + esac + normalize_locale "$locale" + done +} + +remove_locale() { + this_locale=$(normalize_locale "$1") + if ! echo "$supported_local_normalized" | fgrep -qx "$this_locale"; then + if [ -e /usr/lib/locale/locale-archive ]; then + localedef --delete-from-archive "$this_locale" + fi + fi +} + +# remove binary locales +# do nothing for gnome/kde +if [ -z "$2" ]; then + # do not remove locales if we merely remove language-support-* without + # removing language-pack-* + if [ ! -e /var/lib/locales/supported.d/$1 ]; then + supported_local_normalized="$(get_supported_local_normalized)" + if [ "$1" = 'zh-hans' ]; then + remove_locale zh_CN.utf8 + remove_locale zh_SG.utf8 + elif [ "$1" = 'zh-hant' ]; then + remove_locale zh_HK.utf8 + remove_locale zh_TW.utf8 + else + if [ -e /usr/lib/locale/locale-archive ]; then + for l in $(localedef --list-archive|grep "^$1[._@]"); do + remove_locale "$l" + done + fi + fi + fi +fi + +# ensure that .desktop caches are up to date +dpkg-trigger gmenucache || true
  50. Download patch debian/patches/ubuntu/localedata/ug_CN@latin.diff

    --- 2.29-0experimental0/debian/patches/ubuntu/localedata/ug_CN@latin.diff 1970-01-01 00:00:00.000000000 +0000 +++ 2.29-0ubuntu3/debian/patches/ubuntu/localedata/ug_CN@latin.diff 2019-02-21 13:46:18.000000000 +0000 @@ -0,0 +1,164 @@ +Bug: http://sourceware.org/bugzilla/show_bug.cgi?id=13865 + +Index: langpack-locales/locales/ug_CN@latin +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ b/localedata/locales/ug_CN@latin 2012-04-04 12:01:25.459348798 +0200 +@@ -0,0 +1,145 @@ ++escape_char / ++comment_char % ++% ++% Uyghur Latin locale ++% Source: http://en.wikipedia.org/wiki/Uyghur_language ++% Contact: Eagle Burkut ++% Email: eagle.burkut@gmail.com ++% Language: ug ++% Territory: CN ++% Revision: 1.00 ++% Date: 2012-03-17 ++% Users: general ++% Charset: UTF-8 ++% Distribution and use is free, ++% also for commercial purposes. ++ ++LC_IDENTIFICATION ++title "Uyghur Latin locale" ++source "http://en.wikipedia.org/wiki/Uyghur_language" ++address "" ++contact "Eagle Burkut" ++email "eagle.burkut@gmail.com" ++tel "" ++fax "" ++language "Uyghur" ++territory "China" ++revision "1.00" ++date "2012-03-17" ++ ++category "i18n:2012";LC_IDENTIFICATION ++category "i18n:2012";LC_CTYPE ++category "i18n:2012";LC_COLLATE ++category "i18n:2012";LC_TIME ++category "i18n:2012";LC_NUMERIC ++category "i18n:2012";LC_MONETARY ++category "i18n:2012";LC_MESSAGES ++category "i18n:2012";LC_PAPER ++category "i18n:2012";LC_NAME ++category "i18n:2012";LC_ADDRESS ++category "i18n:2012";LC_TELEPHONE ++category "i18n:2012";LC_MEASUREMENT ++ ++END LC_IDENTIFICATION ++ ++LC_COLLATE ++copy "iso14651_t1" ++END LC_COLLATE ++ ++LC_CTYPE ++copy "i18n" ++END LC_CTYPE ++ ++LC_MONETARY ++copy "ug_CN" ++END LC_MONETARY ++ ++LC_NUMERIC ++copy "ug_CN" ++END LC_NUMERIC ++ ++LC_TELEPHONE ++copy "ug_CN" ++END LC_TELEPHONE ++ ++LC_TIME ++ ++abday "<U0059><U0065>";/ ++ "<U0044><U00FC>";/ ++ "<U0053><U0065>";/ ++ "<U0043><U0068>";/ ++ "<U0050><U0065>";/ ++ "<U004A><U00FC>";/ ++ "<U0053><U0068>" ++day "<U0059><U0065><U006B><U0073><U0068><U0065><U006E><U0062><U0065>";/ ++ "<U0044><U00FC><U0073><U0068><U0065><U006E><U0062><U0065>";/ ++ "<U0053><U0065><U0079><U0073><U0068><U0065><U006E><U0062><U0065>";/ ++ "<U0043><U0068><U0061><U0072><U0073><U0068><U0065><U006E><U0062><U0065>";/ ++ "<U0050><U0065><U0079><U0073><U0068><U0065><U006E><U0062><U0065>";/ ++ "<U004A><U00FC><U006D><U0065>";/ ++ "<U0053><U0068><U0065><U006E><U0062><U0065>" ++abmon "<U0051><U0065>";/ ++ "<U0048><U0075>";/ ++ "<U004E><U006F>";/ ++ "<U00DC><U006D>";/ ++ "<U0042><U0061>";/ ++ "<U0053><U0065>";/ ++ "<U0043><U0068>";/ ++ "<U0054><U006F>";/ ++ "<U004D><U0069>";/ ++ "<U004F><U007A>";/ ++ "<U004F><U0071>";/ ++ "<U004B><U00F6>" ++mon "<U0051><U0065><U0068><U0072><U0069><U0074><U0061><U006E>";/ ++ "<U0048><U0075><U0074>";/ ++ "<U004E><U006F><U0072><U0075><U007A>";/ ++ "<U00DC><U006D><U0069><U0064>";/ ++ "<U0042><U0061><U0068><U0061><U0072>";/ ++ "<U0053><U0065><U0070><U0065><U0072>";/ ++ "<U0043><U0068><U0069><U006C><U006C><U0065>";/ ++ "<U0054><U006F><U006D><U0075><U007A>";/ ++ "<U004D><U0069><U007A><U0061><U006E>";/ ++ "<U004F><U0067><U0068><U0075><U007A>";/ ++ "<U004F><U0067><U0068><U006C><U0061><U0071>";/ ++ "<U004B><U00F6><U006E><U0065><U006B>" ++ ++% %a, %Y-%m-%d, %T (abday, YYYY-mm-dd, HH:MM:SS) (Ye, 2012-12-31, 23:08:59) ++d_t_fmt "<U0025><U0061><U002C><U0020><U0025><U0059><U002D><U0025><U006D><U002D><U0025><U0064>/ ++<U002C><U0020><U0025><U0054>" ++ ++% %a, %Y-%m-%d (abday, YYYY-mm-dd) (Ye, 2012-12-31) ++d_fmt "<U0025><U0061><U002C><U0020><U0025><U0059><U002D><U0025><U006D><U002D><U0025><U0064>" ++ ++% %T (HH:MM:SS) ++t_fmt "<U0025><U0054>" ++ ++am_pm "";"" ++ ++% %a, %Y-%m-%d, %T (abday, YYYY-mm-dd, HH:MM:SS) (Ye, 2012-12-31, 23:08:59) ++date_fmt "<U0025><U0061><U002C><U0020><U0025><U0059><U002D><U0025><U006D><U002D><U0025><U0064>/ ++<U002C><U0020><U0025><U0054>" ++ ++END LC_TIME ++ ++LC_MESSAGES ++yesexpr "<U005E><U005B><U0079><U0059><U005D><U002E><U002A>" ++noexpr "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>" ++yesstr "<U0059><U0065><U0073>" ++nostr "<U004E><U006F>" ++END LC_MESSAGES ++ ++LC_PAPER ++copy "ug_CN" ++END LC_PAPER ++ ++LC_MEASUREMENT ++copy "ug_CN" ++END LC_MEASUREMENT ++ ++LC_NAME % to be fixed ++copy "ug_CN" ++END LC_NAME ++ ++LC_ADDRESS % to be fixed ++copy "ug_CN" ++END LC_ADDRESS +Index: langpack-locales/SUPPORTED +=================================================================== +--- a/localedata/SUPPORTED 2012-04-04 12:00:54.671347626 +0200 ++++ b/localedata/SUPPORTED 2012-04-04 12:01:34.139349128 +0200 +@@ -420,6 +420,7 @@ + tt_RU/UTF-8 \ + tt_RU@iqtelif/UTF-8 \ + ug_CN/UTF-8 \ ++ug_CN@latin/UTF-8 \ + uk_UA.UTF-8/UTF-8 \ + uk_UA/KOI8-U \ + unm_US/UTF-8 \
  51. Download patch debian/rules.d/control.mk

    --- 2.29-0experimental0/debian/rules.d/control.mk 2019-08-14 16:21:44.000000000 +0000 +++ 2.29-0ubuntu3/debian/rules.d/control.mk 2019-02-21 13:46:18.000000000 +0000 @@ -2,7 +2,7 @@ libc_packages := libc6 libc6.1 libc0.1 l libc0_1_archs := kfreebsd-amd64 kfreebsd-i386 libc0_3_archs := hurd-i386 libc6_archs := amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el \ - mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc ppc64 ppc64el riscv64 \ + mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc powerpcspe ppc64 ppc64el riscv64 \ sparc sparc64 s390x sh3 sh4 x32 libc6_1_archs := alpha ia64 @@ -38,8 +38,8 @@ $(stamp)control: debian/rules.d/control. cat debian/control.in/mips32 >> $@T cat debian/control.in/mipsn32 >> $@T cat debian/control.in/mips64 >> $@T -# cat debian/control.in/armhf >> $@T -# cat debian/control.in/armel >> $@T + cat debian/control.in/armhf >> $@T + cat debian/control.in/armel >> $@T cat debian/control.in/kfreebsd-i386 >> $@T cat debian/control.in/x32 >> $@T cat debian/control.in/opt >> $@T
  52. Download patch debian/local/manpages/locale-gen.8

    --- 2.29-0experimental0/debian/local/manpages/locale-gen.8 2019-07-29 09:56:57.000000000 +0000 +++ 2.29-0ubuntu3/debian/local/manpages/locale-gen.8 2019-02-21 13:46:18.000000000 +0000 @@ -86,6 +86,13 @@ The main configuration file, which has a line that is not empty and does not begin with a # is treated as a locale definition that is to be built. +\fB/var/lib/locales/supported.d/\fP +.PP +A directory containing locale.gen snippets provided by language-pack +packages. Do not edit these manually, they will be overwritten on +package upgrades. +.PP + .SH "SEE ALSO" .PP localedef(1), locale(1), locale.gen(5).
  53. Download patch debian/sysdeps/x32.mk

    --- 2.29-0experimental0/debian/sysdeps/x32.mk 2019-08-14 18:45:57.000000000 +0000 +++ 2.29-0ubuntu3/debian/sysdeps/x32.mk 2019-06-03 12:25:06.000000000 +0000 @@ -1,5 +1,5 @@ # configuration options for all flavours -extra_config_options = --enable-multi-arch --enable-static-pie +extra_config_options = --enable-multi-arch --enable-static-pie --enable-cet # main library libc_mvec = yes
  54. Download patch debian/sysdeps/mipsn32.mk

    --- 2.29-0experimental0/debian/sysdeps/mipsn32.mk 2019-08-15 20:31:32.000000000 +0000 +++ 2.29-0ubuntu3/debian/sysdeps/mipsn32.mk 2018-04-16 20:02:33.000000000 +0000 @@ -1,5 +1,5 @@ # configuration options for all flavours -CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)$(DEB_GCC_VERSION) -no-pie +extra_cflags = -mno-plt # main library libc_rtlddir = /lib32 @@ -12,6 +12,7 @@ GLIBC_PASSES += mips64 DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64 libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver)) mips64_configure_target = mips64-linux-gnuabi64 +mips64_extra_cflags = -mno-plt mips64_CC = $(CC) -mabi=64 mips64_CXX = $(CXX) -mabi=64 mips64_rtlddir = /lib64 @@ -23,6 +24,7 @@ GLIBC_PASSES += mips32 DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32 libc6-mips32_shlib_dep = libc6-mips32 (>= $(shlib_dep_ver)) mips32_configure_target = mips-linux-gnu +mips32_extra_cflags = -mno-plt mips32_CC = $(CC) -mabi=32 mips32_CXX = $(CXX) -mabi=32 mips32_rtlddir = /lib
  55. Download patch debian/patches/localedata/local-all-no-archive.diff

    --- 2.29-0experimental0/debian/patches/localedata/local-all-no-archive.diff 1970-01-01 00:00:00.000000000 +0000 +++ 2.29-0ubuntu3/debian/patches/localedata/local-all-no-archive.diff 2018-02-22 09:46:35.000000000 +0000 @@ -0,0 +1,15 @@ +--- + localedata/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/localedata/Makefile ++++ b/localedata/Makefile +@@ -222,7 +222,7 @@ + echo -n `echo $$locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \ + echo -n '...'; \ + input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ +- $(LOCALEDEF) $$flags --alias-file=../intl/locale.alias \ ++ $(LOCALEDEF) $$flags --alias-file=../intl/locale.alias --no-archive \ + -i locales/$$input -f charmaps/$$charset \ + $(addprefix --prefix=,$(install_root)) $$locale \ + && echo ' done'; \
  56. Download patch debian/changelog.ubuntu
  57. Download patch debian/patches/ubuntu/localedata/en_IE-am_pm.diff

    --- 2.29-0experimental0/debian/patches/ubuntu/localedata/en_IE-am_pm.diff 1970-01-01 00:00:00.000000000 +0000 +++ 2.29-0ubuntu3/debian/patches/ubuntu/localedata/en_IE-am_pm.diff 2019-02-21 13:46:18.000000000 +0000 @@ -0,0 +1,14 @@ +# Description: Add am_pm for en_IE. +# Ubuntu: https://launchpad.net/bugs/199899 +# Upstream: http://sourceware.org/bugzilla/show_bug.cgi?id=3236 +--- a/localedata/locales/en_IE ++++ b/localedata/locales/en_IE +@@ -110,7 +110,7 @@ mon "January";/ + d_t_fmt "%a %d %b %Y %T %Z" + d_fmt "%d//%m//%y" + t_fmt "%T" +-am_pm "";"" ++am_pm "AM";"PM" + t_fmt_ampm "" + week 7;19971130;4 + END LC_TIME
  58. Download patch debian/patches/any/git-libio-stdout-putc.diff

    --- 2.29-0experimental0/debian/patches/any/git-libio-stdout-putc.diff 2019-08-14 16:21:44.000000000 +0000 +++ 2.29-0ubuntu3/debian/patches/any/git-libio-stdout-putc.diff 2019-02-21 13:45:58.000000000 +0000 @@ -13,12 +13,12 @@ --- a/libio/Makefile +++ b/libio/Makefile -@@ -65,7 +65,7 @@ +@@ -64,7 +64,7 @@ tst-setvbuf1 tst-popen1 tst-fgetwc bug-wsetpos tst-fseek \ tst-fwrite-error tst-ftell-partial-wide tst-ftell-active-handler \ tst-ftell-append tst-fputws tst-bz22415 tst-fgetc-after-eof \ -- tst-sprintf-ub tst-sprintf-chk-ub tst-wfile-sync -+ tst-sprintf-ub tst-sprintf-chk-ub tst-wfile-sync tst-bz24051 +- tst-sprintf-ub tst-sprintf-chk-ub ++ tst-sprintf-ub tst-sprintf-chk-ub tst-bz24051 tests-internal = tst-vtables tst-vtables-interposed tst-readline
  59. Download patch debian/local/usr_share_locales/install-language-pack

    --- 2.29-0experimental0/debian/local/usr_share_locales/install-language-pack 1970-01-01 00:00:00.000000000 +0000 +++ 2.29-0ubuntu3/debian/local/usr_share_locales/install-language-pack 2019-02-21 13:46:18.000000000 +0000 @@ -0,0 +1,19 @@ +#!/bin/sh -e + +if [ -z "$1" ]; then + echo "Usage: $0 <language code> <class> [<version>]" + exit 0 +fi + +# install locales for base packages (not for gnome/kde) +if [ -z "$2" ]; then + # Update requested locales if locales-all is not installed + if dpkg-query -s locales-all >/dev/null 2>&1 ; then + echo "locales-all installed, skipping locales generation" + else + /usr/sbin/locale-gen --keep-existing "$1" + fi +fi + +# ensure that .desktop caches are up to date +dpkg-trigger gmenucache || true
  60. Download patch debian/debhelper.in/locales.postinst

    --- 2.29-0experimental0/debian/debhelper.in/locales.postinst 2019-08-14 16:21:44.000000000 +0000 +++ 2.29-0ubuntu3/debian/debhelper.in/locales.postinst 2019-02-21 13:46:18.000000000 +0000 @@ -73,6 +73,11 @@ EOF update-locale "LANG=$DEFAULT_ENVIRONMENT" fi fi + # Remove cruft from locales from Ubuntu << 16.04: + if dpkg --compare-versions "$2" lt 2.23; then + rm -f /var/lib/locales/supported.d/local + rm -rf /var/lib/belocs + fi fi #DEBHELPER#
  61. Download patch debian/patches/ubuntu/localedata/sd_PK.diff
  62. Download patch debian/sysdeps/powerpcspe.mk

    --- 2.29-0experimental0/debian/sysdeps/powerpcspe.mk 1970-01-01 00:00:00.000000000 +0000 +++ 2.29-0ubuntu3/debian/sysdeps/powerpcspe.mk 2016-10-05 19:57:57.000000000 +0000 @@ -0,0 +1,3 @@ +# configuration options for all flavours +extra_config_options = --without-fp +
  63. Download patch debian/sysdeps/mipsn32r6.mk

    --- 2.29-0experimental0/debian/sysdeps/mipsn32r6.mk 2019-08-15 20:31:32.000000000 +0000 +++ 2.29-0ubuntu3/debian/sysdeps/mipsn32r6.mk 2018-04-16 20:02:33.000000000 +0000 @@ -1,5 +1,5 @@ # configuration options for all flavours -CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)$(DEB_GCC_VERSION) -no-pie +extra_cflags = -mno-plt # main library libc_rtlddir = /lib32 @@ -12,6 +12,7 @@ GLIBC_PASSES += mips64 DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64 libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver)) mips64_configure_target = mipsisa64r6-linux-gnuabi64 +mips64_extra_cflags = -mno-plt mips64_CC = $(CC) -mabi=64 mips64_CXX = $(CXX) -mabi=64 mips64_rtlddir = /lib64 @@ -23,6 +24,7 @@ GLIBC_PASSES += mips32 DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32 libc6-mips32_shlib_dep = libc6-mips32 (>= $(shlib_dep_ver)) mips32_configure_target = mipsisa32r6-linux-gnu +mips32_extra_cflags = -mno-plt mips32_CC = $(CC) -mabi=32 mips32_CXX = $(CXX) -mabi=32 mips32_rtlddir = /lib @@ -60,7 +62,7 @@ endef # create a symlink for the 32 bit dynamic linker in /lib define libc6-mips32_extra_pkg_install mkdir -p debian/libc6-mips32/lib -ln -sf /libo32/ld-linux-mipsn8.so.1 debian/libc6-mips32/lib +ln -sf /libo32/ld.so.1 debian/libc6-mips32/lib endef endif # multilib
  64. Download patch debian/patches/any/git-socket-constants.diff
  65. Download patch debian/patches/ubuntu/local-disable-ld_audit.diff

    --- 2.29-0experimental0/debian/patches/ubuntu/local-disable-ld_audit.diff 1970-01-01 00:00:00.000000000 +0000 +++ 2.29-0ubuntu3/debian/patches/ubuntu/local-disable-ld_audit.diff 2019-02-21 13:46:18.000000000 +0000 @@ -0,0 +1,20 @@ +Description: pro-actively disable LD_AUDIT for setuid binaries, regardless + of where the libraries are loaded from. This is to try to make sure that + CVE-2010-3856 cannot sneak back in. Upstream is unlikely to take this, + since it limits the functionality of LD_AUDIT. +Author: Kees Cook <kees@ubuntu.com> +Author: Adam Conrad <adconrad@0c3.net> + +Index: eglibc-2.15/elf/rtld.c +=================================================================== +--- eglibc-2.15.orig/elf/rtld.c 2012-05-09 10:05:29.456899131 -0700 ++++ eglibc-2.15/elf/rtld.c 2012-05-09 10:38:53.952009069 -0700 +@@ -2442,7 +2442,7 @@ + char *p; + + while ((p = (strsep) (&str, ":")) != NULL) +- if (dso_name_valid_for_suid (p)) ++ if (! __glibc_unlikely (__libc_enable_secure) && dso_name_valid_for_suid (p)) + { + /* This is using the local malloc, not the system malloc. The + memory can never be freed. */
  66. Download patch debian/patches/series.hurd-i386

    --- 2.29-0experimental0/debian/patches/series.hurd-i386 2019-08-14 16:21:44.000000000 +0000 +++ 2.29-0ubuntu3/debian/patches/series.hurd-i386 2019-02-21 13:45:58.000000000 +0000 @@ -9,4 +9,3 @@ hurd-i386/local-versions-hack.diff hurd-i386/unsubmitted-prof-eintr.diff hurd-i386/tg-glibc-2.24-restore-malloc-hook.diff hurd-i386/unsubmitted-getaux_at_secure.diff -hurd-i386/local-fix-nss.diff
  67. Download patch debian/libc6.symbols.powerpcspe

    --- 2.29-0experimental0/debian/libc6.symbols.powerpcspe 1970-01-01 00:00:00.000000000 +0000 +++ 2.29-0ubuntu3/debian/libc6.symbols.powerpcspe 2016-01-27 14:17:05.000000000 +0000 @@ -0,0 +1,12 @@ +#include "libc6.symbols.common" +ld.so.1 #PACKAGE# #MINVER# +#include "symbols.wildcards" +### TLS support enabled in Debian upload 2.3.5 + __tls_get_addr@GLIBC_2.3 2.3.5 +libc.so.6 #PACKAGE# #MINVER# +#include "symbols.wildcards" +### +### Override headers already defined in libc6.symbols.common +### +libpthread.so.0 #PACKAGE# (>= 2.3.5), #PACKAGE# #MINVER# +#include "symbols.wildcards"
  68. Download patch debian/sysdeps/armhf.mk

    --- 2.29-0experimental0/debian/sysdeps/armhf.mk 2019-08-14 18:45:57.000000000 +0000 +++ 2.29-0ubuntu3/debian/sysdeps/armhf.mk 2019-02-21 13:46:18.000000000 +0000 @@ -16,36 +16,36 @@ endef ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES))) # build soft-float (armel) alternative library -#GLIBC_PASSES += armel -#DEB_ARCH_MULTILIB_PACKAGES += libc6-armel libc6-dev-armel -#armel_configure_target = arm-linux-gnueabi -#armel_CC = $(CC) -mfloat-abi=soft -#armel_CXX = $(CXX) -mfloat-abi=soft -#armel_slibdir = /lib/arm-linux-gnueabi -#armel_libdir = /usr/lib/arm-linux-gnueabi -# -#define libc6-dev-armel_extra_pkg_install -# -#mkdir -p debian/libc6-dev-armel/usr/include -#ln -sf arm-linux-gnueabihf/bits debian/libc6-dev-armel/usr/include/ -#ln -sf arm-linux-gnueabihf/gnu debian/libc6-dev-armel/usr/include/ -#ln -sf arm-linux-gnueabihf/fpu_control.h debian/libc6-dev-armel/usr/include/ -# -#mkdir -p debian/libc6-dev-armel/usr/include/arm-linux-gnueabihf/gnu -#cp -a debian/tmp-armel/usr/include/gnu/lib-names-soft.h \ -# debian/tmp-armel/usr/include/gnu/stubs-soft.h \ -# debian/libc6-dev-armel/usr/include/arm-linux-gnueabihf/gnu -# -#mkdir -p debian/libc6-dev-armel/usr/include/sys -#for i in `ls debian/tmp-libc/usr/include/arm-linux-gnueabihf/sys` ; do \ -# ln -sf ../arm-linux-gnueabihf/sys/$$i debian/libc6-dev-armel/usr/include/sys/$$i ; \ -#done -# -#endef -# -#define libc6-armel_extra_pkg_install -#mkdir -p debian/libc6-armel/lib -#ln -sf $(armel_slibdir)/ld-linux.so.3 debian/libc6-armel/lib -#endef +GLIBC_PASSES += armel +DEB_ARCH_MULTILIB_PACKAGES += libc6-armel libc6-dev-armel +armel_configure_target = arm-linux-gnueabi +armel_CC = $(CC) -mfloat-abi=soft +armel_CXX = $(CXX) -mfloat-abi=soft +armel_slibdir = /lib/arm-linux-gnueabi +armel_libdir = /usr/lib/arm-linux-gnueabi + +define libc6-dev-armel_extra_pkg_install + +mkdir -p debian/libc6-dev-armel/usr/include +ln -sf arm-linux-gnueabihf/bits debian/libc6-dev-armel/usr/include/ +ln -sf arm-linux-gnueabihf/gnu debian/libc6-dev-armel/usr/include/ +ln -sf arm-linux-gnueabihf/fpu_control.h debian/libc6-dev-armel/usr/include/ + +mkdir -p debian/libc6-dev-armel/usr/include/arm-linux-gnueabihf/gnu +cp -a debian/tmp-armel/usr/include/gnu/lib-names-soft.h \ + debian/tmp-armel/usr/include/gnu/stubs-soft.h \ + debian/libc6-dev-armel/usr/include/arm-linux-gnueabihf/gnu + +mkdir -p debian/libc6-dev-armel/usr/include/sys +for i in `ls debian/tmp-libc/usr/include/arm-linux-gnueabihf/sys` ; do \ + ln -sf ../arm-linux-gnueabihf/sys/$$i debian/libc6-dev-armel/usr/include/sys/$$i ; \ +done + +endef + +define libc6-armel_extra_pkg_install +mkdir -p debian/libc6-armel/lib +ln -sf $(armel_slibdir)/ld-linux.so.3 debian/libc6-armel/lib +endef endif # multilib
  69. Download patch debian/patches/ubuntu/localedata/lv_LV-currency.diff

    --- 2.29-0experimental0/debian/patches/ubuntu/localedata/lv_LV-currency.diff 1970-01-01 00:00:00.000000000 +0000 +++ 2.29-0ubuntu3/debian/patches/ubuntu/localedata/lv_LV-currency.diff 2019-02-21 13:46:18.000000000 +0000 @@ -0,0 +1,24 @@ +Description: Changed to currency EUR/‬€ +Bug-Ubuntu: https://launchpad.net/bugs/1264551 +Forwarded: https://sourceware.org/bugzilla/show_bug.cgi?id=16374 +Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com> + +--- a/localedata/locales/lv_LV 2012-03-06 10:10:19.000000000 +0100 ++++ b/localedata/locales/lv_LV 2014-09-28 22:37:43.021365004 +0200 +@@ -2131,12 +2133,12 @@ + negative_sign "-" + int_frac_digits 2 + frac_digits 2 +-p_cs_precedes 1 ++p_cs_precedes 0 + p_sep_by_space 1 +-n_cs_precedes 1 ++n_cs_precedes 0 + n_sep_by_space 1 +-p_sign_posn 3 +-n_sign_posn 3 ++p_sign_posn 1 ++n_sign_posn 1 + END LC_MONETARY + + LC_NUMERIC
  70. Download patch debian/sysdeps/mipsn32el.mk

    --- 2.29-0experimental0/debian/sysdeps/mipsn32el.mk 2019-08-15 20:31:32.000000000 +0000 +++ 2.29-0ubuntu3/debian/sysdeps/mipsn32el.mk 2018-04-16 20:02:33.000000000 +0000 @@ -1,5 +1,5 @@ # configuration options for all flavours -CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)$(DEB_GCC_VERSION) -no-pie +extra_cflags = -mno-plt # main library libc_rtlddir = /lib32
  71. Download patch debian/sysdeps/linux.mk

    --- 2.29-0experimental0/debian/sysdeps/linux.mk 2019-08-14 18:45:57.000000000 +0000 +++ 2.29-0ubuntu3/debian/sysdeps/linux.mk 2019-02-21 13:46:18.000000000 +0000 @@ -13,7 +13,7 @@ pldd = yes threads = yes ifeq ($(filter stage1 stage2,$(DEB_BUILD_PROFILES)),) - libc_extra_config_options = --with-selinux $(extra_config_options) + libc_extra_config_options = --with-selinux --enable-systemtap $(extra_config_options) endif ifndef LINUX_SOURCE @@ -46,6 +46,9 @@ $(stamp)mkincludedir: fi ; \ done + ln -s /usr/include/$(DEB_HOST_MULTIARCH)/sys/sdt.h debian/include/sys/sdt.h + ln -s /usr/include/$(DEB_HOST_MULTIARCH)/sys/sdt-config.h debian/include/sys/sdt-config.h + # To make configure happy if libc6-dev is not installed. touch debian/include/assert.h
  72. Download patch debian/rules.d/build.mk

    --- 2.29-0experimental0/debian/rules.d/build.mk 2019-08-14 16:21:44.000000000 +0000 +++ 2.29-0ubuntu3/debian/rules.d/build.mk 2019-02-21 13:46:18.000000000 +0000 @@ -89,8 +89,8 @@ $(stamp)configure_%: $(stamp)config_sub_ --enable-stack-protector=strong \ --enable-obsolete-rpc \ --enable-obsolete-nsl \ - --with-pkgversion="Debian GLIBC $(DEB_VERSION)" \ - --with-bugurl="http://www.debian.org/Bugs/" \ + --with-pkgversion="Ubuntu GLIBC $(DEB_VERSION)" \ + --with-bugurl="https://bugs.launchpad.net/ubuntu/+source/glibc/+bugs" \ $(if $(filter $(pt_chown),yes),--enable-pt_chown) \ $(if $(filter $(threads),no),--disable-nscd) \ $(if $(filter $(call xx,mvec),no),--disable-mathvec) \

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: glibc-doc-reference

glibc-doc-reference (2.28-1ubuntu1) eoan; urgency=low * Merge from Debian unstable. Remaining changes: - Revert "Revert: Remove inappropriate joke". -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 02 May 2019 15:17:52 -0700

Modifications :
  1. Download patch debian/control

    --- 2.28-1/debian/control 2018-12-04 19:43:13.000000000 +0000 +++ 2.28-1ubuntu1/debian/control 2018-12-05 01:09:11.000000000 +0000 @@ -3,7 +3,8 @@ Section: non-free/doc Priority: optional Build-Depends: debhelper (>= 10) Build-Depends-Indep: texinfo, gawk, texlive-binaries, texlive-latex-base -Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org> Uploaders: Clint Adams <schizo@debian.org>, Aurelien Jarno <aurel32@debian.org>, Adam Conrad <adconrad@0c3.net> Standards-Version: 4.2.1 Vcs-Browser: https://salsa.debian.org/glibc-team/glibc-doc-reference
  2. Download patch debian/patches/series

    --- 2.28-1/debian/patches/series 2018-03-03 12:55:45.000000000 +0000 +++ 2.28-1ubuntu1/debian/patches/series 2018-12-05 01:09:11.000000000 +0000 @@ -1,2 +1,3 @@ 01-build-system.diff 02-dont-clutter-main-info-directory.diff +Revert-Revert-Remove-inappropriate-joke.patch
  3. Download patch debian/patches/Revert-Revert-Remove-inappropriate-joke.patch

    --- 2.28-1/debian/patches/Revert-Revert-Remove-inappropriate-joke.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.28-1ubuntu1/debian/patches/Revert-Revert-Remove-inappropriate-joke.patch 2018-11-09 17:11:21.000000000 +0000 @@ -0,0 +1,34 @@ +From 41a9e27758f9ead95ca1c4f545cf24f1e95aa23e Mon Sep 17 00:00:00 2001 +From: Dimitri John Ledkov <xnox@ubuntu.com> +Date: Fri, 9 Nov 2018 17:05:16 +0000 +Subject: [PATCH] Revert "Revert: Remove inappropriate joke" + +This reverts commit ffa81c22a3ac0fb75ad9bf2b1c3cdbf9eafa0bc9. + +Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com> +--- + manual/startup.texi | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/manual/startup.texi b/manual/startup.texi +index 7395d32dd0..21c48cd037 100644 +--- a/manual/startup.texi ++++ b/manual/startup.texi +@@ -1005,14 +1005,6 @@ This function actually terminates the process by raising a + intercept this signal; see @ref{Signal Handling}. + @end deftypefun + +-@c Put in by rms. Don't remove. +-@cartouche +-@strong{Future Change Warning:} Proposed Federal censorship regulations +-may prohibit us from giving you information about the possibility of +-calling this function. We would be required to say that this is not an +-acceptable way of terminating a program. +-@end cartouche +- + @node Termination Internals + @subsection Termination Internals + +-- +2.19.1 +
  1. glibc
  2. glibc-doc-reference