Partial 2.34 update.

diff --git a/branch.sh b/branch.sh
index b4e19b9e2da459d9a3fc2bcfd0a8886cdc72a4f1..ef57bb83afc3bd862c889c0e48b7447d99d339dc 100755 (executable)
--- a/branch.sh
+++ b/branch.sh
@@ -2,8 +2,8 @@
 set -e
 url=git://sourceware.org/git/glibc.git
 package=glibc
 set -e
 url=git://sourceware.org/git/glibc.git
 package=glibc

-tag=glibc-2.33
-branch=release/2.33/master
+tag=glibc-2.34
+branch=release/2.34/master

 out=$package-git.patch
 repo=$package.git
 
 out=$package-git.patch
 repo=$package.git
 

diff --git a/glibc-new-charsets.patch b/glibc-new-charsets.patch
index 52d9da81ffe2d19979944f5a011b71cf1220ee58..f041922d9d911a98193ee3e54f99319e170733c3 100644 (file)
--- a/glibc-new-charsets.patch
+++ b/glibc-new-charsets.patch
@@ -34,6 +34,18 @@ diff -urNp -x '*.orig' glibc-2.33.org/iconvdata/Makefile glibc-2.33/iconvdata/Ma
 diff -urNp -x '*.orig' glibc-2.33.org/iconvdata/gconv-modules glibc-2.33/iconvdata/gconv-modules
 --- glibc-2.33.org/iconvdata/gconv-modules     2021-02-01 18:15:33.000000000 +0100
 +++ glibc-2.33/iconvdata/gconv-modules 2021-03-20 14:29:23.200826328 +0100
 diff -urNp -x '*.orig' glibc-2.33.org/iconvdata/gconv-modules glibc-2.33/iconvdata/gconv-modules
 --- glibc-2.33.org/iconvdata/gconv-modules     2021-02-01 18:15:33.000000000 +0100
 +++ glibc-2.33/iconvdata/gconv-modules 2021-03-20 14:29:23.200826328 +0100

+@@ -395,6 +401,8 @@ alias      ISO-IR-203//            ISO-8859-15//
+ alias ISO_8859-15//           ISO-8859-15//
+ alias LATIN-9//               ISO-8859-15//
+ alias LATIN9//                ISO-8859-15//
++alias L9//                    ISO-8859-15//
++alias 8859-15//               ISO-8859-15//
+ alias ISO_8859-15:1998//      ISO-8859-15//
+ module        ISO-8859-15//           INTERNAL                ISO8859-15      1
+ module        INTERNAL                ISO-8859-15//           ISO8859-15      1
+diff -urNp -x '*.orig' glibc-2.33.org/iconvdata/gconv-modules-extra.conf glibc-2.33/iconvdata/gconv-modules-extra.conf
+--- glibc-2.33.org/iconvdata/gconv-modules-extra.conf  2021-02-01 18:15:33.000000000 +0100
++++ glibc-2.33/iconvdata/gconv-modules-extra.conf      2021-03-20 14:29:23.200826328 +0100

 @@ -355,23 +355,28 @@ alias    ISO8859-10//            ISO-8859-10//
  alias ISO885910//             ISO-8859-10//
  alias LATIN6//                ISO-8859-10//
 @@ -355,23 +355,28 @@ alias    ISO8859-10//            ISO-8859-10//
  alias ISO885910//             ISO-8859-10//
  alias LATIN6//                ISO-8859-10//


@@ -71,15 +83,6 @@ diff -urNp -x '*.orig' glibc-2.33.org/iconvdata/gconv-modules glibc-2.33/iconvda
  alias ISO_8859-14:1998//      ISO-8859-14//
  alias ISO_8859-14//           ISO-8859-14//
  alias ISO-CELTIC//            ISO-8859-14//
  alias ISO_8859-14:1998//      ISO-8859-14//
  alias ISO_8859-14//           ISO-8859-14//
  alias ISO-CELTIC//            ISO-8859-14//

-@@ -395,6 +401,8 @@ alias      ISO-IR-203//            ISO-8859-15//
- alias ISO_8859-15//           ISO-8859-15//
- alias LATIN-9//               ISO-8859-15//
- alias LATIN9//                ISO-8859-15//
-+alias L9//                    ISO-8859-15//
-+alias 8859-15//               ISO-8859-15//
- alias ISO_8859-15:1998//      ISO-8859-15//
- module        ISO-8859-15//           INTERNAL                ISO8859-15      1
- module        INTERNAL                ISO-8859-15//           ISO8859-15      1

 @@ -405,6 +413,7 @@ alias      ISO885916//             ISO-8859-16//
  alias ISO-IR-226//            ISO-8859-16//
  alias LATIN10//               ISO-8859-16//
 @@ -405,6 +413,7 @@ alias      ISO885916//             ISO-8859-16//
  alias ISO-IR-226//            ISO-8859-16//
  alias LATIN10//               ISO-8859-16//

diff --git a/glibc-no-bash-nls.patch b/glibc-no-bash-nls.patch
index 4dc6b57f9e99e2caeb77a017803553d073cb090c..f5d8a2a925f256d3961801a72da5bc8997e7003c 100644 (file)
--- a/glibc-no-bash-nls.patch
+++ b/glibc-no-bash-nls.patch
@@ -1,7 +1,7 @@
 --- glibc-2.31/elf/ldd.bash.in.orig    2020-02-01 12:52:50.000000000 +0100
 +++ glibc-2.31/elf/ldd.bash.in 2020-02-01 14:02:07.365985940 +0100
 @@ -1,4 +1,4 @@
 --- glibc-2.31/elf/ldd.bash.in.orig    2020-02-01 12:52:50.000000000 +0100
 +++ glibc-2.31/elf/ldd.bash.in 2020-02-01 14:02:07.365985940 +0100
 @@ -1,4 +1,4 @@

--#! @BASH@
+-#!/bin/bash

 +#!/bin/sh
  # Copyright (C) 1996-2021 Free Software Foundation, Inc.
  # This file is part of the GNU C Library.
 +#!/bin/sh
  # Copyright (C) 1996-2021 Free Software Foundation, Inc.
  # This file is part of the GNU C Library.


@@ -109,7 +109,7 @@
 --- glibc-2.31/elf/sotruss.sh.orig     2020-02-01 13:38:05.830462075 +0100
 +++ glibc-2.31/elf/sotruss.sh  2020-02-01 14:06:25.601253626 +0100
 @@ -1,4 +1,4 @@
 --- glibc-2.31/elf/sotruss.sh.orig     2020-02-01 13:38:05.830462075 +0100
 +++ glibc-2.31/elf/sotruss.sh  2020-02-01 14:06:25.601253626 +0100
 @@ -1,4 +1,4 @@

--#! @BASH@
+-#!/bin/bash

 +#!/bin/sh
  # Copyright (C) 2011-2021 Free Software Foundation, Inc.
  # This file is part of the GNU C Library.
 +#!/bin/sh
  # Copyright (C) 2011-2021 Free Software Foundation, Inc.
  # This file is part of the GNU C Library.

diff --git a/glibc.spec b/glibc.spec
index 6c2b8dd278c774d16313776a17dd0db79d5dbe70..3b209b2d6011c13b79f3bbaa6dc8d622bccfdfed 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -36,7 +36,7 @@
 %undefine              with_static_pie
 %endif
 
 %undefine              with_static_pie
 %endif
 

-%define                core_version    2.33
+%define                core_version    2.34

 %define                llh_version     7:2.6.32.1-1
 
 Summary:       GNU libc
 %define                llh_version     7:2.6.32.1-1
 
 Summary:       GNU libc


@@ -50,24 +50,24 @@ Summary(tr.UTF-8):  GNU libc
 Summary(uk.UTF-8):     GNU libc версії
 Name:          glibc
 Version:       %{core_version}
 Summary(uk.UTF-8):     GNU libc версії
 Name:          glibc
 Version:       %{core_version}

-Release:       5
+Release:       0.1

 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       https://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz
 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       https://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz

-# Source0-md5: 390bbd889c7e8e8a7041564cb6b27cca
+# Source0-md5: 31998b53fb39cb946e96abc310af1c89

 Source2:       nscd.init
 Source3:       nscd.sysconfig
 Source4:       nscd.logrotate
 # from man-pages.spec --with tars
 Source5:       %{name}-man-pages.tar.xz
 Source2:       nscd.init
 Source3:       nscd.sysconfig
 Source4:       nscd.logrotate
 # from man-pages.spec --with tars
 Source5:       %{name}-man-pages.tar.xz

-# Source5-md5: ff93a5e391bcff0d88dd4f8c3f96577d
+# Source5-md5: e66023386d2cc0d6a1d5c29bdbf03550

 Source6:       %{name}-localedb-gen
 Source7:       %{name}-LD-path.c
 Source9:       nscd.tmpfiles
 # use branch.sh to update glibc-git.patch
 Source6:       %{name}-localedb-gen
 Source7:       %{name}-LD-path.c
 Source9:       nscd.tmpfiles
 # use branch.sh to update glibc-git.patch

-Patch0:                glibc-git.patch
-# Patch0-md5:  049e56141bf71acd5d131ee63e11211d
+#Patch0:               glibc-git.patch
+# Patch0-md5:  d41d8cd98f00b204e9800998ecf8427e

 # against GNU TP (libc domain)
 #Patch1:               %{name}-pl.po-update.patch
 Patch2:                %{name}-pld.patch
 # against GNU TP (libc domain)
 #Patch1:               %{name}-pl.po-update.patch
 Patch2:                %{name}-pld.patch


@@ -945,7 +945,7 @@ echo "Minimal supported kernel is 3.2.0" >&2
 exit 1
 %endif
 
 exit 1
 %endif
 

-%patch0 -p1
+#%patch0 -p1

 
 %patch2 -p1
 %patch3 -p1
 
 %patch2 -p1
 %patch3 -p1


@@ -1089,11 +1089,11 @@ install -p glibc-postinst                               $RPM_BUILD_ROOT/sbin
 mv -f $RPM_BUILD_ROOT/%{_lib}/libpcprofile.so  $RPM_BUILD_ROOT%{_libdir}
 
 # make symlinks across top-level directories absolute
 mv -f $RPM_BUILD_ROOT/%{_lib}/libpcprofile.so  $RPM_BUILD_ROOT%{_libdir}
 
 # make symlinks across top-level directories absolute

-for l in BrokenLocale anl %{?with_crypt:crypt} dl \
+for l in BrokenLocale anl %{?with_crypt:crypt} \

 %ifarch %{x8664} x32
        mvec \
 %endif
 %ifarch %{x8664} x32
        mvec \
 %endif

-       resolv rt thread_db util; do
+       ; do

        test -L $RPM_BUILD_ROOT%{_libdir}/lib${l}.so || exit 1
        %{__rm} $RPM_BUILD_ROOT%{_libdir}/lib${l}.so
        ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/lib${l}.so.*) $RPM_BUILD_ROOT%{_libdir}/lib${l}.so
        test -L $RPM_BUILD_ROOT%{_libdir}/lib${l}.so || exit 1
        %{__rm} $RPM_BUILD_ROOT%{_libdir}/lib${l}.so
        ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/lib${l}.so.*) $RPM_BUILD_ROOT%{_libdir}/lib${l}.so