commit ccca7e27c7af1c7c20e82e7ddce869d379e53e2c
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Tue Dec 25 12:22:50 2012 +0100
- initial update to 2.7
0020_all_glibc-tweak-rfc1918-lookup.patch | 27 ----
glibc-format.patch | 33 ----
glibc-missing-nls.patch | 4 +-
glibc-paths.patch | 6 +-
glibc-posix-sh.patch | 14 +-
glibc-rh-bug-769421.patch | 252 ------------------------------
glibc.spec | 38 +++--
7 files changed, 30 insertions(+), 344 deletions(-)
---
diff --git a/glibc.spec b/glibc.spec
index 5cfb6c1..74835b4 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -7,21 +7,20 @@
# - math/{test-fenv,test-tgmath,test-float,test-ifloat},
debug/backtrace-tst(SEGV) fail on alpha
#
# Conditional build:
-# min_kernel (default is 2.6.12)
+# min_kernel (default is 2.6.16)
%bcond_without memusage # don't build memusage utility
%bcond_without selinux # without SELinux support (in nscd)
%bcond_with tests # perform "make test"
%bcond_without localedb # don't build localedb-all (is time consuming)
%bcond_with cross # build using crossgcc (without libgcc_eh)
#
-%{!?min_kernel:%global min_kernel 2.6.12}
+%{!?min_kernel:%global min_kernel 2.6.16}
%ifarch sparc64
%undefine with_memusage
%endif
-%define core_version 2.16
-%define ports_version 2.16.0
+%define core_version 2.17
%define llh_version 7:2.6.20.4-1
Summary: GNU libc
@@ -34,15 +33,13 @@ Summary(ru.UTF-8): GNU libc версии
Summary(tr.UTF-8): GNU libc
Summary(uk.UTF-8): GNU libc версії
Name: glibc
-Version: %{core_version}.0
-Release: 4
+Version: %{core_version}
+Release: 0.1
Epoch: 6
License: LGPL v2.1+
Group: Libraries
Source0: http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz
# Source0-md5: 80b181b02ab249524ec92822c0174cf7
-Source1:
http://ftp.gnu.org/gnu/glibc/%{name}-ports-%{ports_version}.tar.xz
-# Source1-md5: 9a2439641be7ca8b01a3175324013031
Source2: nscd.init
Source3: nscd.sysconfig
Source4: nscd.logrotate
@@ -64,8 +61,8 @@ Patch7: 1070_all_glibc-fadvise64_64.patch
Patch8: %{name}-missing-nls.patch
Patch9: %{name}-java-libc-wait.patch
Patch10: %{name}-info.patch
-Patch11: %{name}-format.patch
-Patch12: %{name}-rh-bug-769421.patch
+Patch11: %{name}-autoconf.patch
+
Patch14: %{name}-sparc-errno_fix.patch
Patch15: %{name}-new-charsets.patch
Patch16: %{name}-tzfile-noassert.patch
@@ -83,11 +80,8 @@ Patch29: %{name}-arm-alignment-fix.patch
Patch30: %{name}-bug-12492.patch
Patch31: %{name}-origin.patch
Patch32: %{name}-Os-fail-workaround.patch
-Patch33: 0020_all_glibc-tweak-rfc1918-lookup.patch
Patch38: 1055_all_glibc-resolv-dynamic.patch
-
-Patch42: %{name}-pr13013.patch
URL: http://www.gnu.org/software/libc/
%{?with_selinux:BuildRequires: audit-libs-devel}
BuildRequires: autoconf
@@ -931,8 +925,12 @@ Memory usage profiler.
Narzędzie do profilowania zużycia pamięci.
%prep
-%setup -q -a1
-mv %{name}-ports-%{ports_version} ports
+%setup -q
+
+%if "%{min_kernel}" < "2.6.16"
+echo "Minimal supported kernel is 2.6.16" >&2
+exit 1
+%endif
%patch2 -p1
%patch3 -p0
@@ -944,11 +942,12 @@ mv %{name}-ports-%{ports_version} ports
%patch9 -p1
%patch10 -p1
%patch11 -p1
-%patch12 -p1
+
%patch14 -p0
%patch15 -p1
%patch16 -p1
-%patch17 -p1
+# CHECK ME
+#%patch17 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
@@ -963,12 +962,9 @@ mv %{name}-ports-%{ports_version} ports
%patch30 -p0
%patch31 -p1
%patch32 -p1
-%patch33 -p1
%patch38 -p1
-%patch42 -p1
-
# cleanup backups after patching
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -1005,6 +1001,8 @@ PATH=$(pwd)/alt-tools:$PATH; export PATH
AWK="gawk" \
../%configure \
+ --with-bugurl=http://bugs.pld-linux.org/ \
+ --with-pkgversion=%{name}-%{epoch}:%{version}-%{release} \
--with-binutils=$(pwd)/alt-tools \
--enable-kernel="%{min_kernel}" \
--with-headers=%{_includedir} \
diff --git a/0020_all_glibc-tweak-rfc1918-lookup.patch
b/0020_all_glibc-tweak-rfc1918-lookup.patch
deleted file mode 100644
index b814fe2..0000000
--- a/0020_all_glibc-tweak-rfc1918-lookup.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-http://bugs.gentoo.org/315977
-
-diff --git a/posix/gai.conf b/posix/gai.conf
-index 195287e..efba67b 100644
---- a/posix/gai.conf
-+++ b/posix/gai.conf
-@@ -56,9 +56,7 @@
- #
- # scopev4 <mask> <value>
- # Add another rule to the RFC 3484 scope table for IPv4 addresses.
--# By default the scope IDs described in section 3.2 in RFC 3484 are
--# used. Changing these defaults should hardly ever be necessary.
--# The defaults are equivalent to:
-+# The definitions in RFC 3484 are equivalent to:
- #
- #scopev4 ::ffff:169.254.0.0/112 2
- #scopev4 ::ffff:127.0.0.0/104 2
-@@ -72,6 +70,6 @@
- # have the same scope and are therefore not sorted first. To change
- # this use only these rules:
- #
--#scopev4 ::ffff:169.254.0.0/112 2
--#scopev4 ::ffff:127.0.0.0/104 2
--#scopev4 ::ffff:0.0.0.0/96 14
-+scopev4 ::ffff:169.254.0.0/112 2
-+scopev4 ::ffff:127.0.0.0/104 2
-+scopev4 ::ffff:0.0.0.0/96 14
diff --git a/glibc-format.patch b/glibc-format.patch
deleted file mode 100644
index c37d00f..0000000
--- a/glibc-format.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- glibc-2.16.0/sunrpc/rpc_hout.c.orig 2012-06-30 21:12:34.000000000
+0200
-+++ glibc-2.16.0/sunrpc/rpc_hout.c 2012-11-05 19:35:07.650720620 +0100
-@@ -579,7 +579,7 @@ pdeclaration (const char *name, declarat
- break;
- }
- }
-- f_print (fout, separator);
-+ f_print (fout, "%s", separator);
- }
-
- static int
---- glibc-2.16.0/sunrpc/rpc_main.c.orig 2012-11-05 19:29:09.910752451
+0100
-+++ glibc-2.16.0/sunrpc/rpc_main.c 2012-11-05 19:35:49.249302261 +0100
-@@ -647,7 +647,7 @@ h_output (const char *infile, const char
- }
- else if (tblflag)
- {
-- fprintf (fout, rpcgen_table_dcl);
-+ fprintf (fout, "%s", rpcgen_table_dcl);
- }
-
- if (Cflag)
---- glibc-2.16.0/sunrpc/rpc_svcout.c.orig 2012-11-05 19:45:54.353824657
+0100
-+++ glibc-2.16.0/sunrpc/rpc_svcout.c 2012-11-05 19:45:22.272347802 +0100
-@@ -353,7 +353,7 @@ write_real_program (const definition * d
- f_print (fout, " (");
- /* arg name */
- if (proc->arg_num > 1)
-- f_print (fout, proc->args.argname);
-+ f_print (fout, "%s", proc->args.argname);
- else
- ptype (proc->args.decls->decl.prefix,
- proc->args.decls->decl.type, 0);
diff --git a/glibc-missing-nls.patch b/glibc-missing-nls.patch
index e461a63..b21d98a 100644
--- a/glibc-missing-nls.patch
+++ b/glibc-missing-nls.patch
@@ -41,11 +41,11 @@
+msgid "SECS"
+msgstr "SEK"
+
- #: argp/argp-parse.c:106
+ #: argp/argp-parse.c:105
msgid "Hang for SECS seconds (default 3600)"
-msgstr "Zatrzymanie na SECS sekund (domyślnie 3600)"
+msgstr "Zatrzymanie na SEK sekund (domyślnie 3600)"
- #: argp/argp-parse.c:167
+ #: argp/argp-parse.c:166
msgid "Print program version"
diff --git a/glibc-paths.patch b/glibc-paths.patch
index 101c553..3b6da3c 100644
--- a/glibc-paths.patch
+++ b/glibc-paths.patch
@@ -1,7 +1,7 @@
diff -Naur glibc-2.2.3/sysdeps/unix/sysv/linux/paths.h
glibc-2.2.3-p/sysdeps/unix/sysv/linux/paths.h
--- glibc-2.2.3/sysdeps/unix/sysv/linux/paths.h Thu Nov 16 20:12:05 2000
+++ glibc-2.2.3-p/sysdeps/unix/sysv/linux/paths.h Tue Jul 3 15:00:49 2001
-@@ -55,13 +55,13 @@
+@@ -56,13 +56,13 @@
#define _PATH_NOLOGIN "/etc/nologin"
#define _PATH_PRESERVE "/var/lib"
#define _PATH_RWHODIR "/var/spool/rwho"
@@ -11,10 +11,10 @@ diff -Naur glibc-2.2.3/sysdeps/unix/sysv/linux/paths.h
glibc-2.2.3-p/sysdeps/uni
#define _PATH_SHELLS "/etc/shells"
#define _PATH_TTY "/dev/tty"
#define _PATH_UNIX "/boot/vmlinux"
- #define _PATH_UTMP "/var/run/utmp"
+ #define _PATH_UTMP "/var/run/utmp"
-#define _PATH_VI "/usr/bin/vi"
+#define _PATH_VI "/bin/vi"
- #define _PATH_WTMP "/var/log/wtmp"
+ #define _PATH_WTMP "/var/log/wtmp"
/* Provide trailing slash, since mostly used for building pathnames. */
--- glibc-2.3.4/nscd/nscd.h.orig 2004-10-15 23:13:19.000000000 +0200
diff --git a/glibc-posix-sh.patch b/glibc-posix-sh.patch
index 3286310..daacd53 100644
--- a/glibc-posix-sh.patch
+++ b/glibc-posix-sh.patch
@@ -6,10 +6,10 @@
# Copyright (C) 1996-2011, 2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
-@@ -36,16 +36,16 @@
+@@ -35,16 +35,16 @@
case "$1" in
--vers | --versi | --versio | --version)
- echo 'ldd (GNU libc) @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
@@ -26,15 +26,15 @@
--help print this help and exit
--version print version information and exit
-d, --data-relocs process data relocations
-@@ -53,7 +53,7 @@
+@@ -52,7 +52,7 @@
-u, --unused print unused direct dependencies
-v, --verbose print all information
"
-- echo $"For bug reporting instructions, please see:
-+ echo "For bug reporting instructions, please see:
- <http://www.gnu.org/software/libc/bugs.html>.
- "
+- 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
+ ;;
@@ -79,15 +79,15 @@
shift
;;
diff --git a/glibc-rh-bug-769421.patch b/glibc-rh-bug-769421.patch
deleted file mode 100644
index 8030133..0000000
--- a/glibc-rh-bug-769421.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-http://sourceware.org/ml/libc-alpha/2012-01/msg00002.html
-
-The following patch:
-Has been reported as causing numerous problems in Fedora & Debian. I
-don't think anyone has done any serious analysis of the issue, but the
-patch has been pulled from both distributions because of the
-instability it's introduced.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=769421
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=651899
-
-
-commit c5a0802a682dba23f92d47f0f99775aebfbe2539
-Author: Andreas Schwab <[email protected]>
-Date: Mon Nov 28 13:38:19 2011 +0100
-
- Handle EAGAIN from FUTEX_WAIT_REQUEUE_PI
-
-2011-11-28 Andreas Schwab <[email protected]>
-
- * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S: Handle
- EAGAIN from FUTEX_WAIT_REQUEUE_PI.
- * sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S: Likewise.
-
-diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
-index 54590b7..53970d7 100644
---- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
-+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
-@@ -134,7 +134,6 @@ __pthread_cond_wait:
- cmpl $PI_BIT, %eax
- jne 18f
-
--90:
- movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx
- movl %ebp, %edx
- xorl %esi, %esi
-@@ -148,9 +147,6 @@ __pthread_cond_wait:
- sete 16(%esp)
- je 19f
-
-- cmpl $-EAGAIN, %eax
-- je 91f
--
- /* Normal and PI futexes dont mix. Use normal futex functions only
- if the kernel does not support the PI futex functions. */
- cmpl $-ENOSYS, %eax
-@@ -395,78 +391,6 @@ __pthread_cond_wait:
- #endif
- call __lll_unlock_wake
- jmp 11b
--
--91:
--.LcleanupSTART2:
-- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to
-- call it again. */
--
-- /* Get internal lock. */
-- movl $1, %edx
-- xorl %eax, %eax
-- LOCK
--#if cond_lock == 0
-- cmpxchgl %edx, (%ebx)
--#else
-- cmpxchgl %edx, cond_lock(%ebx)
--#endif
-- jz 92f
--
--#if cond_lock == 0
-- movl %ebx, %edx
--#else
-- leal cond_lock(%ebx), %edx
--#endif
--#if (LLL_SHARED-LLL_PRIVATE) > 255
-- xorl %ecx, %ecx
--#endif
-- cmpl $-1, dep_mutex(%ebx)
-- setne %cl
-- subl $1, %ecx
-- andl $(LLL_SHARED-LLL_PRIVATE), %ecx
--#if LLL_PRIVATE != 0
-- addl $LLL_PRIVATE, %ecx
--#endif
-- call __lll_lock_wait
--
--92:
-- /* Increment the cond_futex value again, so it can be used as a new
-- expected value. */
-- addl $1, cond_futex(%ebx)
-- movl cond_futex(%ebx), %ebp
--
-- /* Unlock. */
-- LOCK
--#if cond_lock == 0
-- subl $1, (%ebx)
--#else
-- subl $1, cond_lock(%ebx)
--#endif
-- je 93f
--#if cond_lock == 0
-- movl %ebx, %eax
--#else
-- leal cond_lock(%ebx), %eax
--#endif
--#if (LLL_SHARED-LLL_PRIVATE) > 255
-- xorl %ecx, %ecx
--#endif
-- cmpl $-1, dep_mutex(%ebx)
-- setne %cl
-- subl $1, %ecx
-- andl $(LLL_SHARED-LLL_PRIVATE), %ecx
--#if LLL_PRIVATE != 0
-- addl $LLL_PRIVATE, %ecx
--#endif
-- call __lll_unlock_wake
--
--93:
-- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
-- xorl %ecx, %ecx
-- movl dep_mutex(%ebx), %edi
-- jmp 90b
--.LcleanupEND2:
--
- .size __pthread_cond_wait, .-__pthread_cond_wait
- versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
- GLIBC_2_3_2)
-@@ -639,10 +563,6 @@ __condvar_w_cleanup:
- .long .LcleanupEND-.Lsub_cond_futex
- .long __condvar_w_cleanup-.LSTARTCODE
- .uleb128 0
-- .long .LcleanupSTART2-.LSTARTCODE
-- .long .LcleanupEND2-.LcleanupSTART2
-- .long __condvar_w_cleanup-.LSTARTCODE
-- .uleb128 0
- .long .LcallUR-.LSTARTCODE
- .long .LENDCODE-.LcallUR
- .long 0
-diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
-index d837d15..7535baa 100644
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
-+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
-@@ -23,7 +23,6 @@
- #include <lowlevelcond.h>
- #include <tcb-offsets.h>
- #include <pthread-pi-defines.h>
--#include <pthread-errnos.h>
- #include <stap-probe.h>
-
- #include <kernel-features.h>
-@@ -134,14 +133,11 @@ __pthread_cond_wait:
- cmpl $PI_BIT, %eax
- jne 61f
-
--90:
- movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %esi
- movl $SYS_futex, %eax
- syscall
-
- movl $1, %r8d
-- cmpq $-EAGAIN, %rax
-- je 91f
- #ifdef __ASSUME_REQUEUE_PI
- jmp 62f
- #else
-@@ -328,70 +324,6 @@ __pthread_cond_wait:
-
- 13: movq %r10, %rax
- jmp 14b
--
--91:
--.LcleanupSTART2:
-- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to
-- call it again. */
-- movq 8(%rsp), %rdi
--
-- /* Get internal lock. */
-- movl $1, %esi
-- xorl %eax, %eax
-- LOCK
--#if cond_lock == 0
-- cmpxchgl %esi, (%rdi)
--#else
-- cmpxchgl %esi, cond_lock(%rdi)
--#endif
-- jz 92f
--
--#if cond_lock != 0
-- addq $cond_lock, %rdi
--#endif
-- LP_OP(cmp) $-1, dep_mutex-cond_lock(%rdi)
-- movl $LLL_PRIVATE, %eax
-- movl $LLL_SHARED, %esi
-- cmovne %eax, %esi
-- callq __lll_lock_wait
--#if cond_lock != 0
-- subq $cond_lock, %rdi
--#endif
--92:
-- /* Increment the cond_futex value again, so it can be used as a new
-- expected value. */
-- incl cond_futex(%rdi)
-- movl cond_futex(%rdi), %edx
--
-- /* Release internal lock. */
-- LOCK
--#if cond_lock == 0
-- decl (%rdi)
--#else
-- decl cond_lock(%rdi)
--#endif
-- jz 93f
--
--#if cond_lock != 0
-- addq $cond_lock, %rdi
--#endif
-- LP_OP(cmp) $-1, dep_mutex-cond_lock(%rdi)
-- movl $LLL_PRIVATE, %eax
-- movl $LLL_SHARED, %esi
-- cmovne %eax, %esi
-- /* The call preserves %rdx. */
-- callq __lll_unlock_wake
--#if cond_lock != 0
-- subq $cond_lock, %rdi
--#endif
--93:
-- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
-- xorq %r10, %r10
-- mov dep_mutex(%rdi), %R8_LP
-- leaq cond_futex(%rdi), %rdi
-- jmp 90b
--.LcleanupEND2:
--
- .size __pthread_cond_wait, .-__pthread_cond_wait
- versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
- GLIBC_2_3_2)
-@@ -544,15 +476,11 @@ __condvar_cleanup1:
- .uleb128 .LcleanupSTART-.LSTARTCODE
- .uleb128 .LcleanupEND-.LcleanupSTART
- .uleb128 __condvar_cleanup1-.LSTARTCODE
-- .uleb128 0
-- .uleb128 .LcleanupSTART2-.LSTARTCODE
-- .uleb128 .LcleanupEND2-.LcleanupSTART2
-- .uleb128 __condvar_cleanup1-.LSTARTCODE
-- .uleb128 0
-+ .uleb128 0
- .uleb128 .LcallUR-.LSTARTCODE
- .uleb128 .LENDCODE-.LcallUR
- .uleb128 0
-- .uleb128 0
-+ .uleb128 0
- .Lcstend:
-
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/glibc.git/commitdiff/ccca7e27c7af1c7c20e82e7ddce869d379e53e2c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
