From 6ea9e1c0224793e9afe1829c1eaa278c5b6774b3 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 23:07:57 +0100
Subject: [PATCH] update to 2.34 [release 2.34-1mamba;Sat Aug 14 2021]

---
 glibc.spec | 59 +++++++++++++-----------------------------------------
 1 file changed, 14 insertions(+), 45 deletions(-)

diff --git a/glibc.spec b/glibc.spec
index bcba12c..b503ffa 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -83,7 +83,7 @@
 %endif
 
 Name:          glibc
-Version:       2.33
+Version:       2.34
 Release:       1mamba
 Summary:       The GNU libc libraries
 Group:         System/Libraries
@@ -116,12 +116,6 @@ Patch17:       glibc-2.21-prevent-ehaustion-of-tls-slots.patch
 Patch18:       glibc-2.25-resolv-no-compat.patch
 License:       LGPL
 ## AUTOBUILDREQ-BEGIN
-BuildRequires: libaudit-devel
-BuildRequires: libcap-devel
-BuildRequires: libgd-devel
-BuildRequires: libpng-devel
-BuildRequires: libselinux-devel
-BuildRequires: libz-devel
 ## AUTOBUILDREQ-END
 BuildRequires: libidn-devel
 BuildRequires: binutils >= 2.13
@@ -151,7 +145,6 @@ Requires:      ldconfig = %{?epoch:%epoch:}%{version}-%{release}
 Requires:      locales = %{?epoch:%epoch:}%{version}-%{release}
 Requires:      glibc-utils = %{?epoch:%epoch:}%{version}-%{release}
 %systemd_requires
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 # FIXME :
 # $> localedef -v -c -i da_DK -f UTF-8 /tmp/da_DK.UTF-8
@@ -293,6 +286,10 @@ Cross Platform glibc for %{_target_platform}.
 %debug_package
 %endif
 
+# Filter out all GLIBC_PRIVATE symbols since they are internal to
+# the package and should not be examined by any other tool.
+%global __filter_GLIBC_PRIVATE 1
+
 %prep
 %setup -q
 #-D -T
@@ -313,43 +310,13 @@ ln -sf %{_includedir}/selinux selinux
 ln -sf %{_includedir}/sys/capability.h include/sys/capability.h
 %endif
 
-# do not try to explicitly provide GLIBC_PRIVATE versioned libraries
-%define _use_internal_dependency_generator 0
-%define __find_provides %{_builddir}/glibc-%{version}/find_provides.sh
-%define __find_requires %{_builddir}/glibc-%{version}/find_requires.sh
-
-# create find-provides and find-requires script in order to ignore GLIBC_PRIVATE errors
-cat > find_provides.sh << _EOF
-#! /bin/sh
-%if "%{_target_platform}" == "%{_host}"
-%if "%{?stage1}" != "1"
-# set again +x on libraries for which strip has been disabled in %install
-#chmod -x %{buildroot}/%{slibdir}/ld-*.so
-#chmod -x %{buildroot}/%{slibdir}/libc-*.so
-chmod +x %{buildroot}/%{slibdir}/libpthread-*.so
-chmod +x %{buildroot}/%{slibdir}/libthread_db-*.so
-%endif
-%endif
-%{_prefix}/lib/rpm/find-provides | grep -v GLIBC_PRIVATE
-# work around to avoid stripping libthread_db-1.0.so for debugging
-exit 0
-_EOF
-chmod +x find_provides.sh
-
-cat > find_requires.sh << _EOF
-#! /bin/sh
-%{_prefix}/lib/rpm/find-requires %{buildroot} %{glibc_target_cpu} | grep -v GLIBC_PRIVATE
-_EOF
-chmod +x find_requires.sh
-#___EOF
-
 %build
 #:<< ___EOF
 case %{target_cpu} in
    i*86|athlon*)
      platform_includes=asm-x86
      buildflags="-mtune=pentiumpro -g -O2"
-     CONFIG_OPTS="--enable-targets=i586-%{_target_vendor}-linux --enable-cet"
+     CONFIG_OPTS="--enable-targets=i586-%{_target_vendor}-linux --enable-static-pie --enable-cet"
    ;;
    ppc|powerpc)
      platform_includes=asm-powerpc
@@ -436,8 +403,10 @@ _configure_flags=(
 %if "%{_target_platform}" == "%{_host}"
    --enable-stack-protector=strong \
    --enable-stackguard-randomization \
+   --enable-systemtap \
 %endif
    --enable-bind-now \
+   --enable-lock-elision \
    --disable-profile \
    --disable-werror \
    PYTHON_PROG=%{__python3} \
@@ -540,7 +509,7 @@ ln -s ../lib/locale %{buildroot}/usr/lib32/locale
 %endif
 %endif
 
-make install -C ../glibc-build install_root=%{buildroot}
+%makeinstall -C ../glibc-build
 
 # install openmamba default supported locales
    mv localedata/SUPPORTED localedata/SUPPORTED.orig
@@ -604,8 +573,8 @@ rm -f %{buildroot}%{_prefix}/%{_target_platform}/%{_sysconfdir}/ld.so.cache
 %if "%{?stage1}" != "1"
 #chmod -x %{buildroot}/%{slibdir}/ld-*.so
 #chmod -x %{buildroot}/%{slibdir}/libc-*.so
-chmod -x %{buildroot}/%{slibdir}/libpthread-*.so
-chmod -x %{buildroot}/%{slibdir}/libthread_db-*.so
+chmod -w %{buildroot}/%{slibdir}/libpthread*.so.*
+chmod -w %{buildroot}/%{slibdir}/libthread_db*.so.*
 %endif
 %endif
 
@@ -772,11 +741,9 @@ fi
 %files multilib
 %defattr(-,root,root)
 %{_sysconfdir}/ld.so.conf.d/lib32-glibc.conf
-%{_prefix}/lib32/lib*-%{version}.so
 %{_prefix}/lib32/lib*.so.*
 %dir %{_prefix}/lib32/audit
 %{_prefix}/lib32/audit/sotruss-lib.so
-%{_prefix}/lib32/ld-%{version}.so
 %{_prefix}/lib32/ld-linux.so.*
 %dir %{_prefix}/lib32/gconv
 %{_prefix}/lib32/gconv/*
@@ -787,7 +754,6 @@ fi
 %{_prefix}/lib32/*.o
 %{_prefix}/lib32/lib*.a
 %{_prefix}/lib32/lib*.so
-%exclude %{_prefix}/lib32/lib*-%{version}.so
 %endif
 
 %if %{build_doc}
@@ -880,6 +846,9 @@ fi
 %endif
 
 %changelog
+* Sat Aug 14 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 2.34-1mamba
+- update to 2.34
+
 * Fri Feb 05 2021 Automatic Build System <autodist@mambasoft.it> 2.33-1mamba
 - automatic version update by autodist