- up to 2.25

diff --git a/1070_all_glibc-fadvise64_64.patch b/1070_all_glibc-fadvise64_64.patch
deleted file mode 100644 (file)
index b05c09f..0000000
--- a/1070_all_glibc-fadvise64_64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-ripped from Debian
-
----
- sysdeps/unix/sysv/linux/posix_fadvise.c |   13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
---- a/sysdeps/unix/sysv/linux/posix_fadvise.c
-+++ b/sysdeps/unix/sysv/linux/posix_fadvise.c
-@@ -35,6 +35,19 @@
-     return INTERNAL_SYSCALL_ERRNO (ret, err);
-   return 0;
- #else
-+# ifdef __NR_fadvise64_64
-+  INTERNAL_SYSCALL_DECL (err);  
-+  int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd,
-+                            __LONG_LONG_PAIR ((long) (offset >> 31),
-+                                              (long) offset),
-+                            __LONG_LONG_PAIR ((long) (len >> 31),
-+                                              (long) len),
-+                            advise);
-+  if (INTERNAL_SYSCALL_ERROR_P (ret, err))
-+    return INTERNAL_SYSCALL_ERRNO (ret, err);
-+  return 0;
-+# else
-   return ENOSYS;
-+# endif
- #endif
- }

diff --git a/branch.sh b/branch.sh
index e2444a6aa85e7ed0bc3d16dbf5446c568276f143..357a98197f936e039bc6dcb4235e857be68e7151 100755 (executable)
--- a/branch.sh
+++ b/branch.sh
@@ -2,8 +2,8 @@
 set -e
 url=git://sourceware.org/git/glibc.git
 package=glibc
-tag=glibc-2.24
-branch=release/2.24/master
+tag=glibc-2.25
+branch=release/2.25/master
 out=$package-git.patch
 repo=$package.git
 

diff --git a/glibc-no-bash-nls.patch b/glibc-no-bash-nls.patch
index 26e87b04ed6b74d54c757f4921dc3e098159909b..8156ceb2839670fecfb93bb727c2605a32785a5c 100644 (file)
--- a/glibc-no-bash-nls.patch
+++ b/glibc-no-bash-nls.patch
@@ -3,7 +3,7 @@
 @@ -1,4 +1,4 @@
 -#! @BASH@
 +#!/bin/sh
- # Copyright (C) 1996-2016 Free Software Foundation, Inc.
+ # Copyright (C) 1996-2017 Free Software Foundation, Inc.
  # This file is part of the GNU C Library.
  
 @@ -35,16 +35,16 @@ while test $# -gt 0; do
@@ -14,7 +14,7 @@
 +    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.
- " "2016"
+ " "2017"
 -    printf $"Written by %s and %s.
 +    printf "Written by %s and %s.
  " "Roland McGrath" "Ulrich Drepper"
@@ -111,7 +111,7 @@
 @@ -1,4 +1,4 @@
 -#! @BASH@
 +#!/bin/sh
- # Copyright (C) 2011-2016 Free Software Foundation, Inc.
+ # Copyright (C) 2011-2017 Free Software Foundation, Inc.
  # This file is part of the GNU C Library.
  
 @@ -72,18 +72,18 @@ while test $# -gt 0; do
@@ -122,7 +122,7 @@
 +    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.
- " "2016"
+ " "2017"
 -    printf $"Written by %s.\n" "Ulrich Drepper"
 +    printf "Written by %s.\n" "Ulrich Drepper"
      exit 0

diff --git a/glibc.spec b/glibc.spec
index 1bdd547b7c801fbc93c3499ce621749f33ab669e..325c4c9ea3244ce2266175f47a12316813f3ac3f 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -27,7 +27,7 @@
 %undefine      with_memusage
 %endif
 
-%define                core_version    2.24
+%define                core_version    2.25
 %define                llh_version     7:2.6.32.1-1
 
 Summary:       GNU libc
@@ -41,12 +41,12 @@ Summary(tr.UTF-8):  GNU libc
 Summary(uk.UTF-8):     GNU libc версії
 Name:          glibc
 Version:       %{core_version}
-Release:       4
+Release:       1
 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz
-# Source0-md5: 97dc5517f92016f3d70d83e3162ad318
+# Source0-md5: 1496c3bf41adf9db0ebd0af01f202eed
 Source2:       nscd.init
 Source3:       nscd.sysconfig
 Source4:       nscd.logrotate
@@ -58,7 +58,7 @@ Source7:      %{name}-LD-path.c
 Source9:       nscd.tmpfiles
 # use branch.sh to update glibc-git.patch
 Patch0:                glibc-git.patch
-# Patch0-md5:  a19b5c057fa2e7df73cbdf716c371485
+# Patch0-md5:  d41d8cd98f00b204e9800998ecf8427e
 # against GNU TP (libc domain)
 #Patch1:               %{name}-pl.po-update.patch
 Patch2:                %{name}-pld.patch
@@ -66,7 +66,7 @@ Patch3:               %{name}-crypt-blowfish.patch
 Patch4:                %{name}-no-bash-nls.patch
 Patch5:                %{name}-sparc-softfp-gcc.patch
 Patch6:                %{name}-paths.patch
-Patch7:                1070_all_glibc-fadvise64_64.patch
+
 Patch8:                %{name}-missing-nls.patch
 Patch9:                %{name}-nss_include_dirs.patch
 Patch10:       %{name}-info.patch
@@ -957,7 +957,7 @@ exit 1
 %{!?with_bash_nls:%patch4 -p1}
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
+
 %patch8 -p1
 %patch9 -p0
 
@@ -1016,7 +1016,9 @@ AWK="gawk" \
        --enable-nss-crypt%{!?with_nss_crypt:=no} \
        --enable-obsolete-rpc \
        --enable-profile \
+       --enable-stack-protector=strong \
        --enable-stackguard-randomization \
+       --enable-tunables \
        --with-binutils=$(pwd)/alt-tools \
        --with-bugurl=http://bugs.pld-linux.org/ \
        --with-headers=%{_includedir} \
@@ -1128,7 +1130,7 @@ cp -p %{SOURCE9} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/nscd.conf
 rm -rf documentation
 install -d documentation
 
-for f in ChangeLog.old DESIGN-{condvar,rwlock,systemtap-probes}.txt TODO{,-kernel,-testing}; do
+for f in ChangeLog.old DESIGN-systemtap-probes.txt TODO{,-kernel,-testing}; do
        cp -af nptl/$f documentation/$f.nptl
 done
 cp -af crypt/README.ufc-crypt ChangeLog* documentation
@@ -1884,7 +1886,7 @@ fi
 
 %files devel-doc
 %defattr(644,root,root,755)
-%doc documentation/* PROJECTS
+%doc documentation/*
 %{_infodir}/libc.info*
 
 %{_mandir}/man1/sprof.1*
@@ -1966,6 +1968,7 @@ fi
 %{_libdir}/libcrypt.a
 %{_libdir}/libdl.a
 %{_libdir}/libm.a
+%{_libdir}/libm-%{core_version}.a
 %{_libdir}/libmcheck.a
 %ifarch %{x8664} x32
 %{_libdir}/libmvec.a