Skip to content
Snippets Groups Projects
Commit b888f65c authored by Dylan Aïssi's avatar Dylan Aïssi
Browse files

Merge updates from debian/bookworm-security

parents d00c79b1 27c6e055
No related branches found
No related tags found
3 merge requests!66Merge changes from apertis/v2024-security into apertis/v2024,!55Backport v2024 <- v2025dev2: Update from debian/bookworm-security,!51Update from debian/bookworm-security for apertis/v2025dev2
target
This diff is collapsed.
# GPL-3+ test. Not distributed.
libio/tst-fwrite-error.c
# GPL-3+ build script. Doesn't affect the artifacts.
scripts/move-if-change
# LGPL-3+ Hurd Thread Library. Ignore as Hurd is not targetted.
sysdeps/htl/pt-kill.c
sysdeps/htl/pt-mutex-transfer-np.c
sysdeps/htl/raise.c
.*:
license: LGPL-2.1+
hurd/hurdmalloc.c:
license: MIT-CMU
iconvdata/testdata/:
license: LGPL-2.1+
localedata/unicode-gen/:
license: Unicode-TOU
mach/:
license: MIT-CMU
math/:
license: ISC
posix/:
license: zlib
sysdeps/generic/:
license: ISC
sysdeps/i386/:
license: ISC
sysdeps/ia64/:
license: ISC
sysdeps/ieee754/:
license: ISC
sysdeps/m68k/m680x0/fpu/s_logbl.c:
license: ISC
sysdeps/m68k/m680x0/fpu/s_nextafterl.c:
license: ISC
sysdeps/mach/sys/:
license: MIT-CMU
......@@ -22,6 +22,17 @@ glibc (2.36-9+deb12u5) bookworm; urgency=medium
 
-- Aurelien Jarno <aurel32@debian.org> Sun, 24 Mar 2024 13:07:31 +0100
 
glibc (2.36-9+deb12u4+apertis1) apertis; urgency=medium
* Sync updates from debian/bookworm-security
* Remaining Apertis changes:
- Remove bashisms from ldd and tzselect
- Remove libasyncns-dev from Breaks fields
This block the build of pulseaudio on OBS and this break
is not relevant for Apertis.
-- Dylan Aïssi <dylan.aissi@collabora.com> Wed, 31 Jan 2024 09:43:26 +0100
glibc (2.36-9+deb12u4) bookworm-security; urgency=medium
 
* debian/patches/any/local-CVE-2023-6246.patch: Fix a heap buffer overflow
......@@ -35,6 +46,17 @@ glibc (2.36-9+deb12u4) bookworm-security; urgency=medium
 
-- Aurelien Jarno <aurel32@debian.org> Tue, 23 Jan 2024 21:57:06 +0100
 
glibc (2.36-9+deb12u3+apertis1) apertis; urgency=medium
* Sync updates from debian/bookworm-security
* Remaining Apertis changes:
- Remove bashisms from ldd and tzselect
- Remove libasyncns-dev from Breaks fields
This block the build of pulseaudio on OBS and this break
is not relevant for Apertis.
-- Dylan Aïssi <dylan.aissi@collabora.com> Tue, 03 Oct 2023 21:49:03 +0200
glibc (2.36-9+deb12u3) bookworm-security; urgency=medium
 
* debian/patches/any/local-CVE-2023-4911.patch: Fix a buffer overflow in the
......@@ -59,6 +81,17 @@ glibc (2.36-9+deb12u2) bookworm; urgency=medium
 
-- Aurelien Jarno <aurel32@debian.org> Thu, 28 Sep 2023 22:50:47 +0200
 
glibc (2.36-9+deb12u1+apertis1) apertis; urgency=medium
* Sync updates from debian/bookworm
* Remaining Apertis changes:
- Remove bashisms from ldd and tzselect
- Remove libasyncns-dev from Breaks fields
This block the build of pulseaudio on OBS and this break
is not relevant for Apertis.
-- Apertis CI <devel@lists.apertis.org> Thu, 27 Jul 2023 14:29:26 +0000
glibc (2.36-9+deb12u1) bookworm; urgency=medium
 
[ Aurelien Jarno ]
......@@ -91,6 +124,29 @@ glibc (2.36-9+deb12u1) bookworm; urgency=medium
 
-- Aurelien Jarno <aurel32@debian.org> Thu, 13 Jul 2023 20:07:47 +0200
 
glibc (2.36-9+apertis3) apertis; urgency=medium
* Remove the remaining occurrence of libasyncns-dev in Breaks field in
the template file.
-- Dylan Aïssi <dylan.aissi@collabora.com> Fri, 05 May 2023 09:47:11 +0200
glibc (2.36-9+apertis2) apertis; urgency=medium
* Remove libasyncns-dev from Breaks fields
This block the build of pulseaudio on OBS and this break
is not relevant for Apertis.
-- Dylan Aïssi <dylan.aissi@collabora.com> Thu, 04 May 2023 17:22:07 +0200
glibc (2.36-9+apertis1) apertis; urgency=medium
* Sync updates from debian/bookworm
* Remaining Apertis changes:
- Remove bashisms from ldd and tzselect
-- Dylan Aïssi <dylan.aissi@collabora.com> Tue, 02 May 2023 16:15:25 +0200
glibc (2.36-9) unstable; urgency=medium
 
[ Aurelien Jarno ]
......@@ -129,6 +185,14 @@ glibc (2.36-9) unstable; urgency=medium
 
-- Aurelien Jarno <aurel32@debian.org> Mon, 10 Apr 2023 10:35:16 +0200
 
glibc (2.36-8+apertis1) apertis; urgency=medium
* Sync updates from debian/bookworm
* Remaining Apertis changes:
- Remove bashisms from ldd and tzselect
-- Ritesh Raj Sarraf <ritesh.sarraf@collabora.com> Thu, 30 Mar 2023 14:04:19 +0530
glibc (2.36-8) unstable; urgency=medium
 
[ Samuel Thibault ]
......@@ -1424,6 +1488,30 @@ glibc (2.31-14) unstable; urgency=medium
 
-- Aurelien Jarno <aurel32@debian.org> Tue, 17 Aug 2021 16:27:59 +0200
 
glibc (2.31-13+deb11u3+apertis1) apertis; urgency=medium
* Sync updates from Debian Bullseye
* Remaining Apertis changes:
- Remove bashisms from ldd and tzselect
-- Dylan Aïssi <daissi@debian.org> Tue, 10 May 2022 15:10:05 +0200
glibc (2.31-13+deb11u2+apertis1) apertis; urgency=medium
* Sync updates from Debian Bullseye
* Remaining Apertis changes:
- Remove bashisms from ldd and tzselect
-- Apertis CI <devel@lists.apertis.org> Wed, 13 Oct 2021 15:54:47 +0000
glibc (2.31-13+apertis1) apertis; urgency=medium
* Sync updates from Debian Bullseye
* Remaining Apertis changes:
- Remove bashisms from ldd and tzselect
-- Dylan Aïssi <dylan.aissi@collabora.com> Mon, 27 Sep 2021 12:04:00 +0000
glibc (2.31-13) unstable; urgency=medium
 
[ Colin Watson ]
......@@ -1437,6 +1525,13 @@ glibc (2.31-13) unstable; urgency=medium
 
-- Aurelien Jarno <aurel32@debian.org> Tue, 06 Jul 2021 21:16:59 +0200
 
glibc (2.31-12+apertis1) apertis; urgency=medium
* Sync updates from Debian Bullseye
* Add missing copyright information.
-- Apertis CI <devel@lists.apertis.org> Mon, 19 Jul 2021 10:15:35 +0000
glibc (2.31-12) unstable; urgency=medium
 
* debian/po/de.po: fix encoding declaration. Closes: #986450.
......@@ -1493,6 +1588,34 @@ glibc (2.31-10) unstable; urgency=medium
 
-- Aurelien Jarno <aurel32@debian.org> Sun, 21 Mar 2021 00:38:37 +0100
 
glibc (2.31-9apertis2) apertis; urgency=medium
* Remove bashisms from runtime scripts.
Restore and adopt to new `glibc` version patch removing bashisms.
Dropped fixes from `nscd/nscd.init` since we do not support NIS and
do not use `sysvinit` in favor to `systemd`.
-- Denis Pynkin <denis.pynkin@collabora.com> Fri, 07 May 2021 14:42:44 +0300
glibc (2.31-9apertis1) apertis; urgency=medium
[ Ritesh Raj Sarraf ]
* Sync updates from Debian Bullseye
* Drop patches now part of the new upstream release
- remove-bashisms
- apertis/backport-Replace-gen-as-const.awk-by-gen-as-const.py.patch
- apertis/backport-Fix-test-as-const-jmp_buf-ssp.c-generation-on-gnu-i3.patch
- apertis/backport-Make-gen-as-const.py-handle-consistently-with-awk-sc.patch
- apertis/backport-Move-tst-signal-numbers-to-Python.patch
- apertis/backport-Add-test-that-MAP_-constants-agree-with-kernel.patch
- apertis/backport-Use-a-proper-C-tokenizer-to-implement-the-obsolete-t.patch
- apertis/backport-Linux-Use-in-tree-copy-of-SO_-constants-for-__USE_MI.patch
[ Emanuele Aina ]
* debian/apertis/gitlab-ci.yml: Drop since we use an external definition
-- Ritesh Raj Sarraf <ritesh.sarraf@collabora.com> Mon, 15 Mar 2021 19:19:20 +0530
glibc (2.31-9) unstable; urgency=medium
 
[ Samuel Thibault ]
......@@ -2338,6 +2461,23 @@ glibc (2.29-0experimental0) experimental; urgency=medium
 
-- Aurelien Jarno <aurel32@debian.org> Fri, 16 Aug 2019 12:42:42 +0200
 
glibc (2.28-10co2) apertis; urgency=medium
[ Ritesh Raj Sarraf ]
* debian/apertis/component: Set to target
[ Emanuele Aina ]
* Backport fixes for tests on kernels >= 5.1
-- Emanuele Aina <emanuele.aina@collabora.com> Fri, 31 Jul 2020 21:06:48 +0000
glibc (2.28-10co1) apertis; urgency=medium
* Merge from Debian. Remaining changes:
+ Import bashisms patch by Andrej Shadura
-- Andrej Shadura <andrewsh@debian.org> Thu, 05 Sep 2019 15:29:59 +0200
glibc (2.28-10) unstable; urgency=medium
 
[ Aurelien Jarno ]
......@@ -2375,6 +2515,12 @@ glibc (2.28-8) unstable; urgency=medium
 
-- Samuel Thibault <sthibault@debian.org> Wed, 27 Feb 2019 21:56:01 -0800
 
glibc (2.28-7co1) apertis; urgency=medium
* Import bashisms patch by Andrej Shadura
-- Sjoerd Simons <sjoerd.simons@collabora.co.uk> Thu, 21 Feb 2019 22:13:11 +0100
glibc (2.28-7) unstable; urgency=medium
 
* debian/patches/hurd-i386/local-no-bootstrap-fs-access.diff: Refresh.
......
This diff is collapsed.
......@@ -39,7 +39,7 @@ Depends: @libc@ (= ${binary:Version}) <!stage1>, libc-dev-bin (= ${binary:Versio
Replaces: hurd-dev (<< 20120408-3) [hurd-i386], kfreebsd-kernel-headers (<< 10.3~4) [kfreebsd-amd64 kfreebsd-i386], @libc@ (<= 2.32-1)
Suggests: glibc-doc, manpages-dev
Provides: libc-dev (= ${binary:Version}), libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
Breaks: check (<< 0.15.2-2+b1) [s390x], kfreebsd-kernel-headers (<< 10.3~4) [kfreebsd-amd64 kfreebsd-i386], libperl5.26 (<< 5.26.1-3), ${libc-dev:Breaks}, python3.7 (<< 3.7.7-1+b1), python3.8 (<< 3.8.2-1+b1), libgcc-7-dev (<< 7.5.0-6~), libgcc-8-dev (<< 8.4.0-2~), libgcc-9-dev (<< 9.3.0-5~), libgcc-10-dev (<< 10-20200321-1~), libassimp-dev (<= 5.2.4~ds0-1), libbson-dev (<= 1.22.0-1), libdeal.ii-dev (<= 9.4.0-1), libdolfin-dev-common (<= 2019.2.0~git20220407.d29e24d-5), libeckit-dev (<= 1.20.0-1), libfclib-dev (<= 3.1.0+dfsg-2), libfltk1.3-dev (<= 1.3.8-4+b1), libinsighttoolkit4-dev (<= 4.13.3withdata-dfsg2-3+b1), libinsighttoolkit5-dev (<= 5.2.1-5+b1), libismrmrd-dev (<= 1.8.0-2), liblog4cplus-dev (<= 2.0.7-1), libmgl-dev (<= 8.0.1-2), libmimalloc2.0 (<= 2.0.6+ds-1), libminc-dev (<= 2.4.03-5), libmrpt-ros1bridge-dev (<= 1:2.4.9+ds-4+b2), libnetcdf-dev (<= 1:4.9.0-3), libnetcdf-mpi-dev (<= 1:4.9.0-1), libnetcdf-pnetcdf-dev (<= 1:4.9.0-1), libns3-dev (<= 3.36.1+dfsg-4), libopenms-dev (<= 2.6.0+cleaned1-3+b1), libtrilinos-amesos2-dev (<= 13.2.0-3), libtrilinos-amesos-dev (<= 13.2.0-3), libtrilinos-anasazi-dev (<= 13.2.0-3), libtrilinos-aztecoo-dev (<= 13.2.0-3), libtrilinos-belos-dev (<= 13.2.0-3), libtrilinos-epetra-dev (<= 13.2.0-3), libtrilinos-epetraext-dev (<= 13.2.0-3), libtrilinos-galeri-dev (<= 13.2.0-3), libtrilinos-ifpack2-dev (<= 13.2.0-3), libtrilinos-ifpack-dev (<= 13.2.0-3), libtrilinos-intrepid2-dev (<= 13.2.0-3), libtrilinos-intrepid-dev (<= 13.2.0-3), libtrilinos-isorropia-dev (<= 13.2.0-3), libtrilinos-kokkos-dev (<= 13.2.0-3), libtrilinos-kokkos-kernels-dev (<= 13.2.0-3), libtrilinos-komplex-dev (<= 13.2.0-3), libtrilinos-ml-dev (<= 13.2.0-3), libtrilinos-moertel-dev (<= 13.2.0-3), libtrilinos-muelu-dev (<= 13.2.0-3), libtrilinos-nox-dev (<= 13.2.0-3), libtrilinos-phalanx-dev (<= 13.2.0-3), libtrilinos-pike-dev (<= 13.2.0-3), libtrilinos-piro-dev (<= 13.2.0-3), libtrilinos-pliris-dev (<= 13.2.0-3), libtrilinos-rol-dev (<= 13.2.0-3), libtrilinos-rtop-dev (<= 13.2.0-3), libtrilinos-rythmos-dev (<= 13.2.0-3), libtrilinos-sacado-dev (<= 13.2.0-3), libtrilinos-shylu-dev (<= 13.2.0-3), libtrilinos-stokhos-dev (<= 13.2.0-3), libtrilinos-stratimikos-dev (<= 13.2.0-3), libtrilinos-teko-dev (<= 13.2.0-3), libtrilinos-teuchos-dev (<= 13.2.0-3), libtrilinos-thyra-dev (<= 13.2.0-3), libtrilinos-tpetra-dev (<= 13.2.0-3), libtrilinos-trilinoscouplings-dev (<= 13.2.0-3), libtrilinos-triutils-dev (<= 13.2.0-3), libtrilinos-xpetra-dev (<= 13.2.0-3), libtrilinos-zoltan2-dev (<= 13.2.0-3), libvisp-dev (<= 3.5.0-2+b1), libvotca-dev (<= 2022-3), libvtk6-dev (<= 6.3.0+dfsg2-8.1+b1), libvtk7-dev (<= 7.1.1+dfsg2-10.2), igblast (<= 1.19.0-1), libasyncns-dev (<= 0.8-6+b2), libatm1-dev (<= 1:2.5.1-4), libaws20-dev (<= 20.2-2+b1), libboinc-app-dev (<= 7.20.2+dfsg-1), libcups2-dev (<= 2.4.2-1), libdkim-dev (<= 1:1.0.21-4+b2), libghc-resolv-dev (<= 0.1.2.0-3), libghc-resolv-prof (<= 0.1.2.0-3), libglib2.0-dev (<= 2.72.3-1), libgloox-dev (<= 1.0.24-2+b1), libhesiod-dev (<= 3.2.1-3.1+b1), libinfinity-0.7-dev (<= 0.7.2-1+b1), libldap-dev (<= 2.5.12+dfsg-2), libloudmouth1-dev (<= 1.5.4-1), libmongoc-dev (<= 1.22.1-1), libmysqlclient-dev (<= 8.0.29-1), libnfsidmap-dev (<= 1:2.6.1-2), libola-dev (<= 0.10.8.nojsmin-2), libopenafs-dev (<= 1.8.8.1-3), libopendkim-dev (<= 2.11.0~beta2-7), libopendmarc-dev (<= 1.4.2-1), libopenzwave1.6-dev (<= 1.6.1914+ds-1), libpg-query-dev (<= 13-2.1.2-2), librbl-dev (<= 2.11.0~beta2-7), libre-dev (<= 1.1.0-1+b1), libshishi-dev (<= 1.0.2-11), libslurm-dev (<= 21.08.8.2-1), libsocksd0-dev (<= 1.4.2+dfsg-7+b4), libspf2-dev (<= 1.2.10-7.1+b1), libstrophe-dev (<= 0.12.1-2), libtaningia-dev (<= 0.2.2-2+b1), libvbr-dev (<= 2.11.0~beta2-7), open-vm-tools-dev (<= 2:12.0.5-2), pidgin-librvp (<= 0.9.7cvs-3), proftpd-dev (<= 1.3.7d+dfsg-2), slurm-wlm-basic-plugins-dev (<= 21.08.8.2-1), catch (<< 1.12.2-0.1), heimdal-multidev (<= 7.7.0+dfsg-4), binutils (<< 2.38)
Breaks: check (<< 0.15.2-2+b1) [s390x], kfreebsd-kernel-headers (<< 10.3~4) [kfreebsd-amd64 kfreebsd-i386], libperl5.26 (<< 5.26.1-3), ${libc-dev:Breaks}, python3.7 (<< 3.7.7-1+b1), python3.8 (<< 3.8.2-1+b1), libgcc-7-dev (<< 7.5.0-6~), libgcc-8-dev (<< 8.4.0-2~), libgcc-9-dev (<< 9.3.0-5~), libgcc-10-dev (<< 10-20200321-1~), libassimp-dev (<= 5.2.4~ds0-1), libbson-dev (<= 1.22.0-1), libdeal.ii-dev (<= 9.4.0-1), libdolfin-dev-common (<= 2019.2.0~git20220407.d29e24d-5), libeckit-dev (<= 1.20.0-1), libfclib-dev (<= 3.1.0+dfsg-2), libfltk1.3-dev (<= 1.3.8-4+b1), libinsighttoolkit4-dev (<= 4.13.3withdata-dfsg2-3+b1), libinsighttoolkit5-dev (<= 5.2.1-5+b1), libismrmrd-dev (<= 1.8.0-2), liblog4cplus-dev (<= 2.0.7-1), libmgl-dev (<= 8.0.1-2), libmimalloc2.0 (<= 2.0.6+ds-1), libminc-dev (<= 2.4.03-5), libmrpt-ros1bridge-dev (<= 1:2.4.9+ds-4+b2), libnetcdf-dev (<= 1:4.9.0-3), libnetcdf-mpi-dev (<= 1:4.9.0-1), libnetcdf-pnetcdf-dev (<= 1:4.9.0-1), libns3-dev (<= 3.36.1+dfsg-4), libopenms-dev (<= 2.6.0+cleaned1-3+b1), libtrilinos-amesos2-dev (<= 13.2.0-3), libtrilinos-amesos-dev (<= 13.2.0-3), libtrilinos-anasazi-dev (<= 13.2.0-3), libtrilinos-aztecoo-dev (<= 13.2.0-3), libtrilinos-belos-dev (<= 13.2.0-3), libtrilinos-epetra-dev (<= 13.2.0-3), libtrilinos-epetraext-dev (<= 13.2.0-3), libtrilinos-galeri-dev (<= 13.2.0-3), libtrilinos-ifpack2-dev (<= 13.2.0-3), libtrilinos-ifpack-dev (<= 13.2.0-3), libtrilinos-intrepid2-dev (<= 13.2.0-3), libtrilinos-intrepid-dev (<= 13.2.0-3), libtrilinos-isorropia-dev (<= 13.2.0-3), libtrilinos-kokkos-dev (<= 13.2.0-3), libtrilinos-kokkos-kernels-dev (<= 13.2.0-3), libtrilinos-komplex-dev (<= 13.2.0-3), libtrilinos-ml-dev (<= 13.2.0-3), libtrilinos-moertel-dev (<= 13.2.0-3), libtrilinos-muelu-dev (<= 13.2.0-3), libtrilinos-nox-dev (<= 13.2.0-3), libtrilinos-phalanx-dev (<= 13.2.0-3), libtrilinos-pike-dev (<= 13.2.0-3), libtrilinos-piro-dev (<= 13.2.0-3), libtrilinos-pliris-dev (<= 13.2.0-3), libtrilinos-rol-dev (<= 13.2.0-3), libtrilinos-rtop-dev (<= 13.2.0-3), libtrilinos-rythmos-dev (<= 13.2.0-3), libtrilinos-sacado-dev (<= 13.2.0-3), libtrilinos-shylu-dev (<= 13.2.0-3), libtrilinos-stokhos-dev (<= 13.2.0-3), libtrilinos-stratimikos-dev (<= 13.2.0-3), libtrilinos-teko-dev (<= 13.2.0-3), libtrilinos-teuchos-dev (<= 13.2.0-3), libtrilinos-thyra-dev (<= 13.2.0-3), libtrilinos-tpetra-dev (<= 13.2.0-3), libtrilinos-trilinoscouplings-dev (<= 13.2.0-3), libtrilinos-triutils-dev (<= 13.2.0-3), libtrilinos-xpetra-dev (<= 13.2.0-3), libtrilinos-zoltan2-dev (<= 13.2.0-3), libvisp-dev (<= 3.5.0-2+b1), libvotca-dev (<= 2022-3), libvtk6-dev (<= 6.3.0+dfsg2-8.1+b1), libvtk7-dev (<= 7.1.1+dfsg2-10.2), igblast (<= 1.19.0-1), libatm1-dev (<= 1:2.5.1-4), libaws20-dev (<= 20.2-2+b1), libboinc-app-dev (<= 7.20.2+dfsg-1), libcups2-dev (<= 2.4.2-1), libdkim-dev (<= 1:1.0.21-4+b2), libghc-resolv-dev (<= 0.1.2.0-3), libghc-resolv-prof (<= 0.1.2.0-3), libglib2.0-dev (<= 2.72.3-1), libgloox-dev (<= 1.0.24-2+b1), libhesiod-dev (<= 3.2.1-3.1+b1), libinfinity-0.7-dev (<= 0.7.2-1+b1), libldap-dev (<= 2.5.12+dfsg-2), libloudmouth1-dev (<= 1.5.4-1), libmongoc-dev (<= 1.22.1-1), libmysqlclient-dev (<= 8.0.29-1), libnfsidmap-dev (<= 1:2.6.1-2), libola-dev (<= 0.10.8.nojsmin-2), libopenafs-dev (<= 1.8.8.1-3), libopendkim-dev (<= 2.11.0~beta2-7), libopendmarc-dev (<= 1.4.2-1), libopenzwave1.6-dev (<= 1.6.1914+ds-1), libpg-query-dev (<= 13-2.1.2-2), librbl-dev (<= 2.11.0~beta2-7), libre-dev (<= 1.1.0-1+b1), libshishi-dev (<= 1.0.2-11), libslurm-dev (<= 21.08.8.2-1), libsocksd0-dev (<= 1.4.2+dfsg-7+b4), libspf2-dev (<= 1.2.10-7.1+b1), libstrophe-dev (<= 0.12.1-2), libtaningia-dev (<= 0.2.2-2+b1), libvbr-dev (<= 2.11.0~beta2-7), open-vm-tools-dev (<= 2:12.0.5-2), pidgin-librvp (<= 0.9.7cvs-3), proftpd-dev (<= 1.3.7d+dfsg-2), slurm-wlm-basic-plugins-dev (<= 21.08.8.2-1), catch (<< 1.12.2-0.1), heimdal-multidev (<= 7.7.0+dfsg-4), binutils (<< 2.38)
Conflicts: @libc-dev-conflict@
Description: GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
......
From a5f5a0b75d039555a591882a37bc497803ac09cd Mon Sep 17 00:00:00 2001
From: Denis Pynkin <denis.pynkin@collabora.com>
Date: Fri, 7 May 2021 14:11:03 +0300
Subject: [PATCH] Remove bashisms from runtime scripts
Restore and adopt to new `glibc` version patch removing bashisms.
Dropped fixes from `nscd/nscd.init` since we do not support NIS and
do not use `sysvinit` in favor to `systemd`.
Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>
---
elf/ldd.bash.in | 30 +++++++++++++++---------------
timezone/tzselect.ksh | 2 +-
2 files changed, 16 insertions(+), 16 deletions(-)
--- a/elf/ldd.bash.in
+++ b/elf/ldd.bash.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Copyright (C) 1996-2022 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
@@ -35,16 +35,16 @@
case "$1" in
--vers | --versi | --versio | --version)
echo 'ldd @PKGVERSION@@VERSION@'
- printf $"Copyright (C) %s Free Software Foundation, Inc.
+ printf "Copyright (C) %s Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
" "2022"
- printf $"Written by %s and %s.
+ printf "Written by %s and %s.
" "Roland McGrath" "Ulrich Drepper"
exit 0
;;
--h | --he | --hel | --help)
- echo $"Usage: ldd [OPTION]... FILE...
+ echo "Usage: ldd [OPTION]... FILE...
--help print this help and exit
--version print version information and exit
-d, --data-relocs process data relocations
@@ -52,7 +52,7 @@
-u, --unused print unused direct dependencies
-v, --verbose print all information
"
- printf $"For bug reporting instructions, please see:\\n%s.\\n" \
+ printf "For bug reporting instructions, please see:\\n%s.\\n" \
"@REPORT_BUGS_TO@"
exit 0
;;
@@ -77,15 +77,15 @@
shift
;;
--v | --ve | --ver)
- echo >&2 $"ldd: option \`$1' is ambiguous"
+ echo >&2 "ldd: option \`$1' is ambiguous"
exit 1
;;
--) # Stop option processing.
shift; break
;;
-*)
- echo >&2 'ldd:' $"unrecognized option" "\`$1'"
- echo >&2 $"Try \`ldd --help' for more information."
+ echo >&2 'ldd:' "unrecognized option" "\`$1'"
+ echo >&2 "Try \`ldd --help' for more information."
exit 1
;;
*)
@@ -121,8 +121,8 @@
case $# in
0)
- echo >&2 'ldd:' $"missing file arguments"
- echo >&2 $"Try \`ldd --help' for more information."
+ echo >&2 'ldd:' "missing file arguments"
+ echo >&2 "Try \`ldd --help' for more information."
exit 1
;;
1)
@@ -144,10 +144,10 @@
;;
esac
if test ! -e "$file"; then
- echo "ldd: ${file}:" $"No such file or directory" >&2
+ echo "ldd: ${file}:" "No such file or directory" >&2
result=1
elif test ! -f "$file"; then
- echo "ldd: ${file}:" $"not regular file" >&2
+ echo "ldd: ${file}:" "not regular file" >&2
result=1
elif test -r "$file"; then
RTLD=
@@ -168,7 +168,7 @@
1)
# This can be a non-ELF binary or no binary at all.
nonelf "$file" || {
- echo $" not a dynamic executable" >&2
+ echo " not a dynamic executable" >&2
result=1
}
;;
@@ -176,12 +176,12 @@
try_trace "$RTLD" "$file" || result=1
;;
*)
- echo 'ldd:' ${RTLD} $"exited with unknown exit code" "($ret)" >&2
+ echo 'ldd:' ${RTLD} "exited with unknown exit code" "($ret)" >&2
exit 1
;;
esac
else
- echo 'ldd:' $"error: you do not have read permission for" "\`$file'" >&2
+ echo 'ldd:' "error: you do not have read permission for" "\`$file'" >&2
result=1
fi
done
--- a/timezone/tzselect.ksh
+++ b/timezone/tzselect.ksh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Ask the user about the time zone, and output the resulting TZ value to stdout.
# Interact with the user via stderr and stdin.
......@@ -121,3 +121,5 @@ any/git-floatn-gcc-13-support.diff
any/local-disable-tst-bz29951.diff
any/local-qsort-memory-corruption.patch
any/local-CVE-2024-2961-iso-2022-cn-ext.diff
apertis/Remove-bashisms-from-runtime-scripts.patch
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment