glibc package update

Signed-off-by: basebuilder_pel7x64builder0 <basebuilder@powerel.org>
2020-12-14 17:19:44 +01:00 · 2020-12-14 17:19:44 +01:00 · 528230e2ef
parent 79342afd8b
commit 528230e2ef
5 changed files with 3652 additions and 49 deletions
--- a/SOURCES/glibc-rh1418978-1.patch
+++ b/SOURCES/glibc-rh1418978-1.patch
--- a/SOURCES/glibc-rh1439165-syscall-names.patch
+++ b/SOURCES/glibc-rh1439165-syscall-names.patch
@ -1,5 +1,6 @@
 This patch contains the sysdeps/unix/sysv/linux/syscall-names.list file
-from upstream and is continuously updated for new kernel versions.
+from upstream for Linux 4.13, and forms the baseline, subsequent changes
+are cherry picked from upstream.

 diff --git a/sysdeps/unix/sysv/linux/syscall-names.list b/sysdeps/unix/sysv/linux/syscall-names.list
 new file mode 100644
--- a/SOURCES/glibc-rh1439165.patch
+++ b/SOURCES/glibc-rh1439165.patch
@ -3,8 +3,8 @@ Posted upstream at:
  https://sourceware.org/ml/libc-alpha/2017-04/msg00082.html

 sysdeps/unix/sysv/linux/syscall-names.list is stored as a separate patch
-(glibc-rh1439165-syscall-names.patch) in the source RPM for easier
-updates.
+(glibc-rh1439165-syscall-names.patch) in the source RPM, and is the
+baseline for subsequent changes.

 Author: Florian Weimer <fweimer@redhat.com>

--- a/SOURCES/glibc-rh1457479-3.patch
+++ b/SOURCES/glibc-rh1457479-3.patch
@ -1,3 +1,7 @@
+Note; the test is known to fail on the RHEL 7.7 kernel - the patch
+fixes PT_GETREGS (which we want) but adds PTRACE_SINGLEBLOCK (which we
+don't support yet).  So, the test case was not included.  - DJ
+
 commit b08a6a0dea63742313ed3d9577c1e2d83436b196
 Author: Stefan Liebler <stli@linux.vnet.ibm.com>
 Date:   Mon Jun 19 16:27:25 2017 +0200
--- a/SPECS/glibc.spec
+++ b/SPECS/glibc.spec
@ -1,6 +1,6 @@
 %define glibcsrcdir glibc-2.17-c758a686
 %define glibcversion 2.17
-%define glibcrelease 260%{?dist}
+%define glibcrelease 317%{?dist}
 ##############################################################################
 # We support the following options:
 # --with/--without,
@ -264,6 +264,10 @@ Patch0069: glibc-rh1448107.patch
 #
 ##############################################################################

+# Armhfp build issue
+Patch9998: glibc-armhfp-ELF_MACHINE_NO_REL-undefined.patch
+Patch9999: glibc-rh1256317-armhfp-build-issue.patch
+
 Patch1000: glibc-rh905877.patch
 Patch1001: glibc-rh958652.patch
 Patch1002: glibc-rh977870.patch
@ -937,6 +941,7 @@ Patch1757: glibc-rh1337242.patch
 Patch17580: glibc-rh1418978-max_align_t.patch
 Patch1758: glibc-rh1418978-0.patch
 Patch1759: glibc-rh1418978-1.patch
+Patch2752: glibc-rh1418978-1a.patch
 Patch1760: glibc-rh1418978-2-1.patch
 Patch1761: glibc-rh1418978-2-2.patch
 Patch1762: glibc-rh1418978-2-3.patch
@ -1154,11 +1159,14 @@ Patch1899: glibc-rh1527904-4.patch

 # RHBZ #1534635: CVE-2018-1000001 glibc: realpath() buffer underflow.
 Patch1900: glibc-rh1534635.patch
-
 # RHBZ #1529982: recompile glibc to fix incorrect CFI information on i386.
 Patch1901: glibc-rh1529982.patch
-
 Patch1902: glibc-rh1523119-compat-symbols.patch
+# RHBZ #1609067: Backfort of upstream [#15804] - fix race condition in pldd
+Patch1903: glibc-rh1609067.patch
+# RHBZ #1672771: 
+Patch1904: glibc-rh1672771.patch
+
 Patch2500: glibc-rh1505492-nscd_stat.patch
 Patch2501: glibc-rh1564638.patch
 Patch2502: glibc-rh1566623.patch
@ -1418,6 +1426,108 @@ Patch2749: glibc-rh1401665-3.patch
 Patch2750: glibc-rh1401665-4.patch
 Patch2751: glibc-rh1401665-5.patch

+Patch2753: glibc-rh1595191-1.patch
+Patch2754: glibc-rh1595191-2.patch
+Patch2755: glibc-rh1595191-3.patch
+Patch2756: glibc-rh1595191-4.patch
+Patch2757: glibc-rh1647490-1.patch
+Patch2758: glibc-rh1647490-2.patch
+Patch2759: glibc-rh1647490-3.patch
+Patch2760: glibc-rh1647490-4.patch
+Patch2761: glibc-rh1647490-5.patch
+Patch2762: glibc-rh1639524.patch
+Patch2763: glibc-rh1647490-6.patch
+Patch2764: glibc-rh1579730-1.patch
+Patch2765: glibc-rh1579730-2.patch
+Patch2766: glibc-rh1579730-3.patch
+Patch2767: glibc-rh1630440-1.patch
+Patch2768: glibc-rh1630440-2.patch
+Patch2769: glibc-rh1646373.patch
+Patch2770: glibc-rh1591268.patch
+Patch2771: glibc-rh1592475-1.patch
+Patch2772: glibc-rh1592475-2.patch
+Patch2773: glibc-rh1592475-3.patch
+Patch2774: glibc-rh1657015-1.patch
+Patch2775: glibc-rh1657015-2.patch
+Patch2776: glibc-rh1657015-3.patch
+Patch2777: glibc-rh1657015-4.patch
+Patch2778: glibc-rh1673465-1.patch
+Patch2779: glibc-rh1673465-2.patch
+Patch2780: glibc-rh1673465-3.patch
+Patch2781: glibc-rh1673465-4.patch
+Patch2782: glibc-rh1673465-5.patch
+Patch2783: glibc-rh1673465-6.patch
+Patch2784: glibc-rh1673465-7.patch
+Patch2785: glibc-rh1039304-1.patch
+Patch2786: glibc-rh1039304-2.patch
+Patch2787: glibc-rh1039304-3.patch
+Patch2788: glibc-rh1039304-4.patch
+Patch2789: glibc-rh1443872.patch
+Patch2790: glibc-rh1472832.patch
+Patch2791: glibc-rh1673465-8.patch
+Patch2792: glibc-rh1443872-2.patch
+Patch2793: glibc-rh1579354.patch
+Patch2794: glibc-rh1579739.patch
+Patch2795: glibc-rh1641981.patch
+Patch2796: glibc-rh1579739-2.patch
+Patch2797: glibc-rh1684874-1.patch
+Patch2798: glibc-rh1684874-2.patch
+Patch2799: glibc-rh1488370.patch
+Patch2800: glibc-rh1662842.patch
+Patch2801: glibc-rh1163509-1.patch
+Patch2802: glibc-rh1163509-2.patch
+Patch2803: glibc-rh1163509-3.patch
+Patch2804: glibc-rh1163509-4.patch
+Patch2805: glibc-rh1163509-5.patch
+Patch2806: glibc-rh1555189-1.patch
+Patch2807: glibc-rh1555189-2.patch
+Patch2808: glibc-rh1427734-1.patch
+Patch2809: glibc-rh1427734-2.patch
+Patch2810: glibc-rh1414263.patch
+Patch2811: glibc-rh1406732-1.patch
+Patch2812: glibc-rh1406732-2.patch
+Patch2813: glibc-rh1406732-3.patch
+Patch2814: glibc-rh1406732-4.patch
+Patch2815: glibc-rh1406732-5.patch
+Patch2816: glibc-rh1670041.patch
+Patch2817: glibc-rh1451308.patch
+Patch2818: glibc-rh1636229-1.patch
+Patch2819: glibc-rh1636229-2.patch
+Patch2820: glibc-rh1636229-3.patch
+Patch2821: glibc-rh1636229-4.patch
+Patch2822: glibc-rh1579451.patch
+Patch2823: glibc-rh1634021.patch
+Patch2824: glibc-rh1691534-1.patch
+Patch2825: glibc-rh1691534-2.patch
+Patch2826: glibc-rh1698015.patch
+Patch2827: glibc-rh1065574-1.patch
+Patch2828: glibc-rh1065574-2.patch
+Patch2829: glibc-rh1065574-3.patch
+Patch2830: glibc-rh1065574-4.patch
+Patch2831: glibc-rh1065574-5.patch
+Patch2832: glibc-rh1065574-6.patch
+Patch2833: glibc-rh1065574-7.patch
+Patch2834: glibc-rh1484832.patch
+Patch2835: glibc-rh1740039-1.patch
+Patch2836: glibc-rh1740039-2.patch
+Patch2837: glibc-rh1775599.patch
+Patch2838: glibc-rh1235112.patch
+Patch2839: glibc-rh1728915-1.patch
+Patch2840: glibc-rh1728915-2.patch
+Patch2841: glibc-rh1772307.patch
+Patch2842: glibc-rh1747465-1.patch
+Patch2843: glibc-rh1747465-2.patch
+Patch2844: glibc-rh1747465-3.patch
+Patch2845: glibc-rh1747465-4.patch
+Patch2846: glibc-rh1747465-5.patch
+Patch2847: glibc-rh1747465-6.patch
+Patch2848: glibc-rh1747465-7.patch
+Patch2849: glibc-rh1747465-8.patch
+Patch2850: glibc-rh1775816.patch
+Patch2851: glibc-rh1763325.patch
+Patch2852: glibc-rh1406732-6.patch
+Patch2853: glibc-rh1834816.patch
+
 ##############################################################################
 #
 # Patches submitted, but not yet approved upstream.
@ -1617,6 +1727,9 @@ BuildRequires: systemd
 # the required semantics.
 BuildRequires: gcc >= 4.8.5-25

+# This RPM version introduced --g-libs.
+BuildRequires: rpm-build >= 4.11.3-38.el7
+
 %define enablekernel 2.6.32
 Conflicts: kernel < %{enablekernel}
 %define target %{_target_cpu}-powerel-linux
@ -2384,6 +2497,7 @@ package or when debugging this package.
 %patch17580 -p1
 %patch1758 -p1
 %patch1759 -p1
+%patch2752 -p1
 %patch1760 -p1
 %patch1761 -p1
 %patch1762 -p1
@ -2564,6 +2678,8 @@ package or when debugging this package.
 %patch1900 -p1
 %patch1901 -p1
 %patch1902 -p1
+%patch1903 -p1
+%patch1904 -p1
 %patch2500 -p1
 %patch2501 -p1
 %patch2502 -p1
@ -2820,6 +2936,112 @@ package or when debugging this package.
 %patch2749 -p1
 %patch2750 -p1
 %patch2751 -p1
+%patch2753 -p1
+%patch2754 -p1
+%patch2755 -p1
+%patch2756 -p1
+%patch2757 -p1
+%patch2758 -p1
+%patch2759 -p1
+%patch2760 -p1
+%patch2761 -p1
+%patch2762 -p1
+%patch2763 -p1
+%patch2764 -p1
+%patch2765 -p1
+%patch2766 -p1
+%patch2767 -p1
+%patch2768 -p1
+%patch2769 -p1
+%patch2770 -p1
+%patch2771 -p1
+%patch2772 -p1
+%patch2773 -p1
+%patch2774 -p1
+%patch2775 -p1
+%patch2776 -p1
+%patch2777 -p1
+%patch2778 -p1
+%patch2779 -p1
+%patch2780 -p1
+%patch2781 -p1
+%patch2782 -p1
+%patch2783 -p1
+%patch2784 -p1
+%patch2785 -p1
+%patch2786 -p1
+%patch2787 -p1
+%patch2788 -p1
+%patch2789 -p1
+%patch2790 -p1
+%patch2791 -p1
+%patch2792 -p1
+%patch2793 -p1
+%patch2794 -p1
+%patch2795 -p1
+%patch2796 -p1
+%patch2797 -p1
+%patch2798 -p1
+%patch2799 -p1
+%patch2800 -p1
+%patch2801 -p1
+%patch2802 -p1
+%patch2803 -p1
+%patch2804 -p1
+%patch2805 -p1
+%patch2806 -p1
+%patch2807 -p1
+%patch2808 -p1
+%patch2809 -p1
+%patch2810 -p1
+%patch2811 -p1
+%patch2812 -p1
+%patch2813 -p1
+%patch2814 -p1
+%patch2815 -p1
+%patch2816 -p1
+%patch2817 -p1
+%patch2818 -p1
+%patch2819 -p1
+%patch2820 -p1
+%patch2821 -p1
+%patch2822 -p1
+%patch2823 -p1
+%patch2824 -p1
+%patch2825 -p1
+%patch2826 -p1
+%patch2827 -p1
+%patch2828 -p1
+%patch2829 -p1
+%patch2830 -p1
+%patch2831 -p1
+%patch2832 -p1
+%patch2833 -p1
+%patch2834 -p1
+%patch2835 -p1
+%patch2836 -p1
+%patch2837 -p1
+%patch2838 -p1
+%patch2839 -p1
+%patch2840 -p1
+%patch2841 -p1
+%patch2842 -p1
+%patch2843 -p1
+%patch2844 -p1
+%patch2845 -p1
+%patch2846 -p1
+%patch2847 -p1
+%patch2848 -p1
+%patch2849 -p1
+%patch2850 -p1
+%patch2851 -p1
+%patch2852 -p1
+%patch2853 -p1
+
+%ifarch %{arm}
+%patch9998 -p1
+%patch9999 -p1
+%endif

 ##############################################################################
 # %%prep - Additional prep required...
@ -2860,6 +3082,9 @@ touch `find . -name configure`
 # Ensure *-kw.h files are current to prevent regenerating them.
 touch locale/programs/*-kw.h

+# RHBZ #1640764: Ensure plural.c is current to prevent regenerating it (bison)
+touch intl/plural.c
+
 ##############################################################################
 # Build glibc...
 ##############################################################################
@ -3317,7 +3542,7 @@ $olddir/build-%{target}/elf/ld.so \
    --prefix ${RPM_BUILD_ROOT} --add-to-archive \
    *_*
 rm -rf *_*
-mv locale-archive{,.tmpl}
+cp locale-archive{,.tmpl}
 popd
 %endif

@ -3696,7 +3921,7 @@ ls -l $RPM_BUILD_ROOT/usr/bin/getconf
 ls -l $RPM_BUILD_ROOT/usr/libexec/getconf
 eu-readelf -hS $RPM_BUILD_ROOT/usr/bin/getconf $RPM_BUILD_ROOT/usr/libexec/getconf/*

-find_debuginfo_args='--strict-build-id -g'
+find_debuginfo_args='--strict-build-id --g-libs'
 %ifarch %{debuginfocommonarches}
 find_debuginfo_args="$find_debuginfo_args \
  -l common.filelist -l utils.filelist -l nscd.filelist \
@ -3933,7 +4158,7 @@ rm -f *.filelist*
 %files -f common.filelist common
 %defattr(-,root,root)
 %attr(0644,root,root) %verify(not md5 size mtime) %{_prefix}/lib/locale/locale-archive.tmpl
-%attr(0644,root,root) %verify(not md5 size mtime mode) %ghost %config(missingok,noreplace) %{_prefix}/lib/locale/locale-archive
+%attr(0644,root,root) %verify(not md5 size mtime mode) %ghost %{_prefix}/lib/locale/locale-archive
 %dir %attr(755,root,root) /etc/default
 %verify(not md5 size mtime) %config(noreplace) /etc/default/nss
 %doc documentation/*