rpm/glibc
SHA256
1
0
Fork 0
forked from pool/glibc
Code Pull Requests Activity

Accepting request 114582 from home:a_jaeger:my-factory-packages

Browse Source 
Cleanup patches.

OBS-URL: https://build.opensuse.org/request/show/114582
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=170
This commit is contained in:
Andreas Jaeger 2012-04-19 11:14:21 +00:00 committed by Git OBS Bridge
parent a235bac650
commit 075d187ee3
21 changed files with 188 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
getaddrinfo-ipv6-sanity.diff
View File

@ -1,9 +1,9 @@
References: bnc#361697
Index: sysdeps/posix/getaddrinfo.c
Index: glibc-2.15/sysdeps/posix/getaddrinfo.c
===================================================================
--- sysdeps/posix/getaddrinfo.c.orig
+++ sysdeps/posix/getaddrinfo.c
--- glibc-2.15.orig/sysdeps/posix/getaddrinfo.c
+++ glibc-2.15/sysdeps/posix/getaddrinfo.c
@@ -269,7 +269,7 @@ extern service_user *__nss_hosts_databas
static int
gaih_inet (const char *name, const struct gaih_service *service,

10
glibc-2.16-fix-check-localplt.patch
View File

@ -11,10 +11,10 @@ Date: Fri Feb 10 21:05:54 2012 +0100
* sysdeps/i386/fpu/feupdateenv.c (__feupdateenv) Invoke __feraiseexcept
instead of feraiseexcept.
diff --git a/sysdeps/i386/fpu/feupdateenv.c b/sysdeps/i386/fpu/feupdateenv.c
index 70f9ee2..6e2ce35 100644
--- a/sysdeps/i386/fpu/feupdateenv.c
+++ b/sysdeps/i386/fpu/feupdateenv.c
Index: glibc-2.15/sysdeps/i386/fpu/feupdateenv.c
===================================================================
--- glibc-2.15.orig/sysdeps/i386/fpu/feupdateenv.c
+++ glibc-2.15/sysdeps/i386/fpu/feupdateenv.c
@@ -1,5 +1,5 @@
/* Install given floating-point environment and raise exceptions.
- Copyright (C) 1997,99,2000,01,07,2010 Free Software Foundation, Inc.
@ -22,7 +22,7 @@ index 70f9ee2..6e2ce35 100644
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -44,7 +44,7 @@ __feupdateenv (const fenv_t *envp)
@@ -45,7 +45,7 @@ __feupdateenv (const fenv_t *envp)
/* Raise the saved exception. Incidently for us the implementation
defined format of the values in objects of type fexcept_t is the
same as the ones specified using the FE_* constants. */

6
glibc-2.3.2.no_archive.diff
View File

@ -3,10 +3,10 @@ Wed Jun 4 14:29:07 CEST 2003 - kukuk@suse.de
- Make --no-archive default for localedef
Index: locale/programs/localedef.c
Index: glibc-2.15/locale/programs/localedef.c
===================================================================
--- locale/programs/localedef.c.orig
+++ locale/programs/localedef.c
--- glibc-2.15.orig/locale/programs/localedef.c
+++ glibc-2.15/locale/programs/localedef.c
@@ -82,7 +82,7 @@ const char *alias_file;
static struct localedef_t *locales;

8
glibc-2.3.3-nscd-db-path.diff
View File

@ -2,12 +2,10 @@
* nscd/nscd.h: Move persistent storage back to /var/run/nscd
Index: nscd/nscd.h
Index: glibc-2.15/nscd/nscd.h
===================================================================
diff --git a/nscd/nscd.h b/nscd/nscd.h
index fdaf01b..23b6a94 100644
--- nscd/nscd.h
+++ nscd/nscd.h
--- glibc-2.15.orig/nscd/nscd.h
+++ glibc-2.15/nscd/nscd.h
@@ -113,11 +113,11 @@ struct database_dyn

6
glibc-2.3.90-bindresvport.blacklist.diff
View File

@ -1,7 +1,7 @@
Index: sunrpc/bindrsvprt.c
Index: glibc-2.15/sunrpc/bindrsvprt.c
===================================================================
--- sunrpc/bindrsvprt.c.orig
+++ sunrpc/bindrsvprt.c
--- glibc-2.15.orig/sunrpc/bindrsvprt.c
+++ glibc-2.15/sunrpc/bindrsvprt.c
@@ -29,28 +29,108 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

6
glibc-2.3.90-langpackdir.diff
View File

@ -1,7 +1,7 @@
Index: intl/loadmsgcat.c
Index: glibc-2.15/intl/loadmsgcat.c
===================================================================
--- intl/loadmsgcat.c.orig
+++ intl/loadmsgcat.c
--- glibc-2.15.orig/intl/loadmsgcat.c
+++ glibc-2.15/intl/loadmsgcat.c
@@ -806,8 +806,52 @@ _nl_load_domain (domain_file, domainbind
if (domain_file->filename == NULL)
goto out;

4
glibc-2.3.locales.diff.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:23c4a947e7dee14c05556bc30c1dded5458a7b9ba8b306cb7bce93dd57fb9b96
size 329206
oid sha256:fe966fc1d1082da024fda16d4ad1e8e2b73f30d646701d24a27882ec653b5807
size 329247

6
glibc-2.4.90-revert-only-euro.diff
View File

@ -1,7 +1,7 @@
Index: locale/iso-4217.def
Index: glibc-2.15/locale/iso-4217.def
===================================================================
--- locale/iso-4217.def.orig
+++ locale/iso-4217.def
--- glibc-2.15.orig/locale/iso-4217.def
+++ glibc-2.15/locale/iso-4217.def
@@ -8,6 +8,7 @@
*
* !!! The list has to be sorted !!!

6
glibc-2.8-getconf.diff
View File

@ -2,10 +2,10 @@ This is required for too noisy rpmlint:
glibc.i586: E: hardlink-across-partition (Badness: 10000) /usr/lib/getconf/POSIX_V7_ILP32_OFFBIG /usr/bin/getconf
Index: posix/Makefile
Index: glibc-2.15/posix/Makefile
===================================================================
--- posix/Makefile.orig
+++ posix/Makefile
--- glibc-2.15.orig/posix/Makefile
+++ glibc-2.15/posix/Makefile
@@ -316,8 +316,7 @@ $(inst_libexecdir)/getconf: $(inst_bindi
$(addprefix $(..)./scripts/mkinstalldirs ,\
$(filter-out $(wildcard $@),$@))

12
glibc-cpusetsize.diff
View File

@ -1,7 +1,7 @@
Index: bits/sched.h
Index: glibc-2.15/bits/sched.h
===================================================================
--- bits/sched.h.orig
+++ bits/sched.h
--- glibc-2.15.orig/bits/sched.h
+++ glibc-2.15/bits/sched.h
@@ -54,7 +54,7 @@ struct __sched_param
#if defined _SCHED_H && !defined __cpu_set_t_defined
# define __cpu_set_t_defined
@ -11,10 +11,10 @@ Index: bits/sched.h
# define __NCPUBITS (8 * sizeof (__cpu_mask))
/* Type for array elements in 'cpu_set_t'. */
Index: sysdeps/unix/sysv/linux/bits/sched.h
Index: glibc-2.15/sysdeps/unix/sysv/linux/bits/sched.h
===================================================================
--- sysdeps/unix/sysv/linux/bits/sched.h.orig
+++ sysdeps/unix/sysv/linux/bits/sched.h
--- glibc-2.15.orig/sysdeps/unix/sysv/linux/bits/sched.h
+++ glibc-2.15/sysdeps/unix/sysv/linux/bits/sched.h
@@ -113,7 +113,7 @@ struct __sched_param
#if defined _SCHED_H && !defined __cpu_set_t_defined
# define __cpu_set_t_defined

11
glibc-elf-localscope.diff
View File

@ -1,7 +1,8 @@
diff -ru elf~/dl-close.c elf/dl-close.c
--- elf~/dl-close.c 2011-02-04 00:35:03.000000000 +0100
+++ elf/dl-close.c 2011-02-22 02:16:12.367883000 +0100
@@ -180,24 +186,28 @@
Index: glibc-2.15/elf/dl-close.c
===================================================================
--- glibc-2.15.orig/elf/dl-close.c
+++ glibc-2.15/elf/dl-close.c
@@ -180,24 +180,28 @@ _dl_close_worker (struct link_map *map)
/* Signal the object is still needed. */
l->l_idx = IDX_STILL_USED;
@ -42,7 +43,7 @@ diff -ru elf~/dl-close.c elf/dl-close.c
++lp;
}
}
@@ -206,19 +216,25 @@
@@ -206,19 +210,25 @@ _dl_close_worker (struct link_map *map)
for (unsigned int j = 0; j < l->l_reldeps->act; ++j)
{
struct link_map *jmap = l->l_reldeps->list[j];

6
glibc-fini-unwind.diff
View File

@ -1,7 +1,7 @@
Index: sysdeps/x86_64/elf/initfini.c
Index: glibc-2.15/sysdeps/x86_64/elf/initfini.c
===================================================================
--- sysdeps/x86_64/elf/initfini.c.orig 2004-08-16 06:50:55.000000000 +0200
+++ sysdeps/x86_64/elf/initfini.c 2010-04-16 16:41:11.000000000 +0200
--- glibc-2.15.orig/sysdeps/x86_64/elf/initfini.c
+++ glibc-2.15/sysdeps/x86_64/elf/initfini.c
@@ -44,6 +44,25 @@
* crtn.s puts the corresponding function epilogues
in the .init and .fini sections. */

6
glibc-gai-private4.diff
View File

@ -1,5 +1,7 @@
--- posix/gai.conf~ 2010-05-12 04:10:58.087661000 +0200
+++ posix/gai.conf 2010-05-12 04:14:40.638820000 +0200
Index: glibc-2.15/posix/gai.conf
===================================================================
--- glibc-2.15.orig/posix/gai.conf
+++ glibc-2.15/posix/gai.conf
@@ -67,11 +67,66 @@
#scopev4 ::ffff:192.168.0.0/112 5
#scopev4 ::ffff:0.0.0.0/96 14

20
glibc-nscd-hconf.diff
View File

@ -1,10 +1,10 @@
See:
http://sourceware.org/bugzilla/show_bug.cgi?id=11928
diff --git a/nscd/aicache.c b/nscd/aicache.c
index 3cb2208..2e92929 100644
--- a/nscd/aicache.c
+++ b/nscd/aicache.c
Index: glibc-2.15/nscd/aicache.c
===================================================================
--- glibc-2.15.orig/nscd/aicache.c
+++ glibc-2.15/nscd/aicache.c
@@ -26,6 +26,7 @@
#include <time.h>
#include <unistd.h>
@ -13,7 +13,7 @@ index 3cb2208..2e92929 100644
#include "dbg_log.h"
#include "nscd.h"
@@ -103,6 +104,8 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req,
@@ -103,6 +104,8 @@ addhstaiX (struct database_dyn *db, int
if (__res_maybe_init (&_res, 0) == -1)
no_more = 1;
@ -22,11 +22,11 @@ index 3cb2208..2e92929 100644
/* If we are looking for both IPv4 and IPv6 address we don't want
the lookup functions to automatically promote IPv4 addresses to
diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c
index ed55bec..c79b85a 100644
--- a/resolv/res_hconf.c
+++ b/resolv/res_hconf.c
@@ -84,7 +84,9 @@ static const struct cmd
Index: glibc-2.15/resolv/res_hconf.c
===================================================================
--- glibc-2.15.orig/resolv/res_hconf.c
+++ glibc-2.15/resolv/res_hconf.c
@@ -83,7 +83,9 @@ static const struct cmd
};
/* Structure containing the state. */

6
glibc-nscd.conf.patch
View File

@ -1,7 +1,7 @@
Index: nscd/nscd.conf
Index: glibc-2.15/nscd/nscd.conf
===================================================================
--- nscd/nscd.conf.orig 2010-01-18 18:01:41.000000000 +0100
+++ nscd/nscd.conf 2010-02-14 14:58:08.000000000 +0100
--- glibc-2.15.orig/nscd/nscd.conf
+++ glibc-2.15/nscd/nscd.conf
@@ -61,11 +61,11 @@
auto-propagate group yes

10
glibc-resolv-mdnshint.diff
View File

@ -1,8 +1,8 @@
diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c
index ed55bec..f06db75 100644
--- a/resolv/res_hconf.c
+++ b/resolv/res_hconf.c
@@ -243,9 +243,12 @@ parse_line (const char *fname, int line_num, const char *str)
Index: glibc-2.15/resolv/res_hconf.c
===================================================================
--- glibc-2.15.orig/resolv/res_hconf.c
+++ glibc-2.15/resolv/res_hconf.c
@@ -242,9 +242,12 @@ parse_line (const char *fname, int line_
if (c == NULL)
{
char *buf;

12
glibc-resolv-reload.diff
View File

@ -72,9 +72,10 @@ Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="glibc-2.5-resolvconf.patch"
diff -ur resolv.orig/res_libc.c resolv/res_libc.c
--- resolv.orig/res_libc.c 2005-11-01 01:06:40.000000000 +0100
+++ resolv/res_libc.c 2010-03-15 14:13:18.000000000 +0100
Index: glibc-2.15/resolv/res_libc.c
===================================================================
--- glibc-2.15.orig/resolv/res_libc.c
+++ glibc-2.15/resolv/res_libc.c
@@ -22,7 +22,7 @@
#include <arpa/nameser.h>
#include <resolv.h>
@ -84,7 +85,7 @@ diff -ur resolv.orig/res_libc.c resolv/res_libc.c
/* The following bit is copied from res_data.c (where it is #ifdef'ed
out) since res_init() should go into libc.so but the rest of that
@@ -89,12 +89,34 @@
@@ -89,12 +89,34 @@ res_init(void) {
return (__res_vinit(&_res, 1));
}
@ -119,6 +120,3 @@ diff -ur resolv.orig/res_libc.c resolv/res_libc.c
if (__res_initstamp != resp->_u._ext.initstamp) {
if (resp->nscount > 0)
__res_iclose (resp, true);
--------------060407080409020101000002--

6
glibc-testsuite.patch
View File

@ -1,9 +1,9 @@
test-lfs runs for ever on ReiserFS. Let's disable it completely.
Index: io/Makefile
Index: glibc-2.15/io/Makefile
===================================================================
--- io/Makefile.orig
+++ io/Makefile
--- glibc-2.15.orig/io/Makefile
+++ glibc-2.15/io/Makefile
@@ -64,7 +64,7 @@ static-only-routines = stat fstat lstat
others := pwd

16
glibc-version.diff
View File

@ -1,8 +1,8 @@
Index: csu/version.c
Index: glibc-2.15/csu/version.c
===================================================================
--- csu/version.c.orig
+++ csu/version.c
@@ -25,19 +25,20 @@ static const char __libc_release[] = REL
--- glibc-2.15.orig/csu/version.c
+++ glibc-2.15/csu/version.c
@@ -25,11 +25,12 @@ static const char __libc_release[] = REL
static const char __libc_version[] = VERSION;
static const char banner[] =
@ -16,11 +16,3 @@ Index: csu/version.c
Compiled by GNU CC version "__VERSION__".\n"
#include "version-info.h"
#ifdef LIBC_ABIS_STRING
LIBC_ABIS_STRING
#endif
#ifdef GLIBC_OLDEST_ABI
"The oldest ABI supported: " GLIBC_OLDEST_ABI ".\n"
#endif
"For bug reporting instructions, please see:\n\
<http://www.gnu.org/software/libc/bugs.html>.\n";

5
glibc.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Apr 19 11:12:43 UTC 2012 - aj@suse.de
- Reorder patches, refresh to apply cleanly with -p1.
-------------------------------------------------------------------
Wed Apr 18 11:35:48 UTC 2012 - aj@suse.de

207
glibc.spec
View File

@ -120,17 +120,17 @@ Source: glibc-%{version}-%{git_id}.tar.bz2
Source2: glibc-ports-%{glibc_ports_ver}-%{ports_git_id}.tar.bz2
Source3: noversion.tar.bz2
Source4: manpages.tar.bz2
Source8: nsswitch.conf
Source9: nscd.init
Source10: bindresvport.blacklist
Source12: glibc_post_upgrade.c
Source15: glibc.rpmlintrc
Source16: baselibs.conf
Source5: nsswitch.conf
Source6: nscd.init
Source7: bindresvport.blacklist
Source8: glibc_post_upgrade.c
Source9: glibc.rpmlintrc
Source10: baselibs.conf
# For systemd
Source20: nscd.conf
Source21: nscd.service
Source22: nscd.socket
#
# crypt_blowfish
Source50: http://www.openwall.com/crypt/crypt_blowfish-%{crypt_bf_version}.tar.gz
Source51: http://www.openwall.com/crypt/crypt_blowfish-%{crypt_bf_version}.tar.gz.sign
@ -146,7 +146,7 @@ NoSource: 0
#
###
# Patches are ordered as:
# Patches are ordered in the following groups:
# Patches that we will never upstream or which have not been looked at: 0-999
# Patches taken from upstream: 1000-2000
# Patches that are going upstream, waiting approval: 2000-3000
@ -161,87 +161,87 @@ NoSource: 0
###
### openSUSE extensions, configuration
# PATCH-FEATURE-OPENSUSE -- add crypt_blowfish support - bnc#700876
Patch0005: glibc-2.14-crypt.diff
Patch1: glibc-2.14-crypt.diff
# PATCH-FEATURE-OPENSUSE -- use separate symbol version for Owl extensions - lnussel@suse.de
Patch0006: glibc-2.14-crypt-versioning.diff
Patch2: glibc-2.14-crypt-versioning.diff
# PATCH-FEATURE-OPENSUSE -- add sha support to crypt_blowfish lnussel@suse.de
Patch0080: crypt_blowfish-1.2-sha.diff
Patch3: crypt_blowfish-1.2-sha.diff
# PATCH-FEATURE-OPENSUSE -- use separate symbol version for Owl extensions - lnussel@suse.de
Patch0081: crypt_blowfish-1.2-versioning.diff
Patch4: crypt_blowfish-1.2-versioning.diff
# PATCH-FIX-OPENSUSE Avoid build failure on noexecstack marker on ARM dmueller@suse.de
Patch0082: crypt_blowfish-1.2-hack_around_arm.diff
Patch5: crypt_blowfish-1.2-hack_around_arm.diff
# PATCH-FIX-OPENSUSE Fix path for nscd databases
Patch23: glibc-2.3.3-nscd-db-path.diff
Patch6: glibc-2.3.3-nscd-db-path.diff
# PATCH-FIX-OPENSUSE Fix path for nss_db (bnc#753657) - aj@suse.de
Patch97: nss-db-path.patch
Patch7: nss-db-path.patch
# PATCH-FIX-OPENSUSE adjust nscd.conf
Patch22: glibc-nscd.conf.patch
Patch8: glibc-nscd.conf.patch
# PATCH-FIX-OPENSUSE do not use compile time in binaries
Patch87: glibc-nodate.patch
Patch9: glibc-nodate.patch
# PATCH-FIX-OPENSUSE -- add some extra information to version output - kukuk@suse.de
Patch7: glibc-version.diff
Patch10: glibc-version.diff
# PATCH-FIX-OPENSUSE remove lfs test from testsuite aj@suse.de
Patch0: glibc-testsuite.patch
Patch11: glibc-testsuite.patch
# PATCH-FIX-OPENSUSE handle old glibc binaries
Patch1: glibc-2.3.90-noversion.diff
Patch12: glibc-2.3.90-noversion.diff
# PATCH-FIX-OPENSUSE -- Make --no-archive default for localedef - kukuk@suse.de
Patch12: glibc-2.3.2.no_archive.diff
Patch13: glibc-2.3.2.no_archive.diff
# PATCH-FIX-OPENSUSE -- add blacklist for bindresvport
Patch14: glibc-2.3.90-bindresvport.blacklist.diff
# PATCH-FIX-OPENSUSE prefer -lang rpm packages
Patch25: glibc-2.3.90-langpackdir.diff
Patch15: glibc-2.3.90-langpackdir.diff
# PATCH-FIX-OPENSUSE Do not generate hardlink for getconf
Patch29: glibc-2.8-getconf.diff
Patch16: glibc-2.8-getconf.diff
# PATCH-FIX-OPENSUSE add option --enable-runbinaries to disable running of compiled binaries
Patch33: glibc-compiled-binaries.diff
Patch17: glibc-compiled-binaries.diff
# PATCH-FEATURE-SLE increase cpusetsize to 4096, needs to be kept for compatibility kukuk@suse.de (XXX: Review)
Patch38: glibc-cpusetsize.diff
Patch18: glibc-cpusetsize.diff
# PATCH-FIX-OPENSUSE Do not trigger an abort when an i586 Intel CPU is running the i686 library, as valgrind does. bnc#681398 aj@suse.de
Patch71: x86-cpuid-level2.patch
Patch19: x86-cpuid-level2.patch
### Locale related patches
# PATCH-FIX-OPENSUSE Add additional locales
Patch0100: glibc-2.3.locales.diff.bz2
Patch100: glibc-2.3.locales.diff.bz2
# PATCH-FIX-OPENSUSE Support pre-EURO currencies (XXX: Still needed?)
Patch0101: glibc-2.4.90-revert-only-euro.diff
Patch101: glibc-2.4.90-revert-only-euro.diff
# PATCH-FIX-OPENSUSE -- Add no_NO back (XXX: Still needed?)
Patch0102: glibc-2.4.90-no_NO.diff
Patch102: glibc-2.4.90-no_NO.diff
# PATCH-FIX-OPENSUSE -- Renames for China
Patch0103: glibc-2.4-china.diff
Patch103: glibc-2.4-china.diff
# PATCH-FIX-OPENSUSE Fix gb18030 code bnc#54080
Patch0104: gb18030.patch.bz2
Patch104: gb18030.patch.bz2
### Broken patches in glibc that we revert for now:
# PATCH-FEATURE-OPENSUSE Revert sunrpc removal aj@suse.de
Patch0066: glibc2.14-revert-sunrpc-removal.patch
Patch200: glibc2.14-revert-sunrpc-removal.patch
# PATCH-FIX-OPENSUSE revert seeking on fclose for now bnc#711829 matz@suse.de
Patch0067: glibc-revert-fseek-on-fclose.diff
Patch201: glibc-revert-fseek-on-fclose.diff
# PATCH-FIX-OPENSUSE revert pthread-cond-wait change since it causes hangs - aj@suse.de
Patch88: pthread-cond-wait-revert.patch
Patch202: pthread-cond-wait-revert.patch
### Network related patches
# PATCH-FIX-OPENSUSE reload /etc/resolv.conf on change
Patch3: glibc-resolv-reload.diff
Patch300: glibc-resolv-reload.diff
# PATCH-FIX-OPENSUSE Fix hangs in UDP RPC calls bso#5379 bnc#257745 aj@suse.de
Patch28: glibc-2.2-sunrpc.diff
Patch301: glibc-2.2-sunrpc.diff
# PATCH-FIX-OPENSUSE only use ipv6 if real ipv6 address exists bnc#361697, bnc#684534
Patch30: getaddrinfo-ipv6-sanity.diff
Patch302: getaddrinfo-ipv6-sanity.diff
# PATCH-FIX-OPENSUSE Consider private IPv4 addresses as global-scope in gai.conf [bnc#597616]
Patch45: glibc-gai-private4.diff
Patch303: glibc-gai-private4.diff
# PATCH-FIX-OPENSUSE Warn about usage of mdns in resolv.conv
Patch46: glibc-resolv-mdnshint.diff
Patch304: glibc-resolv-mdnshint.diff
# PATCH-FIX-OPENSUSE nscd does not account for 'multi on' in /etc/host.conf when ai-resolving host bso#11928
Patch47: glibc-nscd-hconf.diff
Patch305: glibc-nscd-hconf.diff
# PATCH-FIX-OPENSUSE disable rewriting ::1 to 127.0.0.1 for /etc/hosts bnc#684534, bnc#706719
Patch65: glibc-fix-double-loopback.diff
Patch306: glibc-fix-double-loopback.diff
### Misc patches
# PATCH-FIX-OPENSUSE don't use unwind tables for initfini (solved differently for glibc 2.16)
Patch36: glibc-no-unwind-tables.diff
Patch400: glibc-no-unwind-tables.diff
# FIX-OPENSUSE compile some files with -fno-strict-aliasing
Patch58: glibc-strict-aliasing.diff
Patch401: glibc-strict-aliasing.diff
# PATCH-FIX-OPENSUSE avoid false positive warning that triggers brp postcheck fail
Patch84: nscd-avoid-gcc-warning.diff
Patch402: nscd-avoid-gcc-warning.diff
###
# Patches from upstream
@ -277,17 +277,17 @@ Patch2002: armhf-ld-so.patch
# PATCH-FIX-UPSTREAM Fix crash when nscd is not running (bso#135949) - aj@suse.de
Patch2003: glibc-nscd-crash-bso13594.patch
# PATCH-FIX-OPENSUSE Fix crash (access-after-free) in dl_lookup_x bnc#703140, bso#13579 matz@suse.de
Patch69: glibc-fix-noload.patch
Patch2004: glibc-fix-noload.patch
# PATCH-FIX-OPENSUSE bnc#657627, http://sourceware.org/bugzilla/show_bug.cgi?id=12561
Patch52: glibc-elf-localscope.diff
Patch2005: glibc-elf-localscope.diff
# PATCH-FIX-OPENSUSE Fix cycle detection - aj@suse.de
Patch95: cycle-detection.patch
Patch2006: cycle-detection.patch
# PATCH-FIX-OPENSUSE Fix cycle detection 2 (from Fedora) - aj@suse.de
Patch99: glibc-sw13618-2.patch
Patch2007: glibc-sw13618-2.patch
# PATCH-FIX-OPENSUSE Fix LD_PROFILE (glibc bug#13818) - aj@suse.de
Patch96: glibc-ld-profile.patch
Patch2008: glibc-ld-profile.patch
# PATCH-FIX-OPENSUSE _fini does not have proper unwinding information on x86_64 bso#11610
Patch49: glibc-fini-unwind.diff
Patch2009: glibc-fini-unwind.diff
%description
The GNU C Library provides the most important standard libraries used
@ -469,76 +469,81 @@ versions of your software.
# Owl crypt_blowfish
tar -xzf %SOURCE50
pushd crypt_blowfish-%{crypt_bf_version}
%patch0080 -p1
%patch0081 -p1
%patch0082
%patch3 -p1
%patch4 -p1
%patch5
popd
mv crypt/{crypt.h,gnu-crypt.h}
mv crypt_blowfish-%crypt_bf_version/*.[chS] crypt/
#
%patch0
# libNoVersion part is only active on ix86
%patch1 -p1
%patch3
%patch0100
%patch0005 -p1
%patch0006 -p1
%patch7
%patch0101
%patch12
%patch14
%patch0102 -p1
%patch0103 -p1
%patch0104 -p1
%patch2 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
# avoid changing nscd_stat.c mtime to avoid code generation
# differences on each rebuild
touch -r nscd/nscd_stat.c nscd/s-stamp
%patch22
%patch23
%patch9 -p1
touch -r nscd/s-stamp nscd/nscd_stat.c
rm nscd/s-stamp
%patch25
%patch28 -p1
%patch29
%patch30
%patch33 -p1
%patch36 -p1
%patch38
%patch1009 -p1
%patch45
%patch46 -p1
%patch47 -p1
%patch49
# XXX: Does not pass testsuite, still there's no better solution yet
%patch52
%patch58 -p1
%patch65 -p1
%patch0066 -p1
%patch0067 -p1
%patch69 -p1
%patch71 -p1
%patch2001 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch19 -p1
%patch100 -p1
%patch101 -p1
%patch102 -p1
%patch103 -p1
%patch104 -p1
%patch200 -p1
%patch201 -p1
%patch202 -p1 -R
%patch300 -p1
%patch301 -p1
%patch302 -p1
%patch303 -p1
%patch304 -p1
%patch305 -p1
%patch306 -p1
%patch400 -p1
%patch401 -p1
%patch402 -p1
%patch1000 -p1
%patch84 -p1
%patch87 -p1
%patch88 -p1 -R
%patch1001 -p1
%patch1002 -p1
%patch1003 -p1
%patch1004 -p1
%patch1005 -p1
%patch95 -p1
# XXX Disable, it breaks the testsuite, test elf/tst-audit2
# %patch96 -p1
%patch97 -p1
%patch2003 -p1
%patch1006 -p1
%patch99 -p1
%patch1007 -p1
%patch1008 -p1
%patch1009 -p1
%patch2001 -p1
%ifarch armv7l
%patch2002 -p1
%endif
%patch2003 -p1
%patch2004 -p1
# XXX: Does not pass testsuite, still there's no better solution yet
%patch2005 -p1
%patch2006 -p1
%patch2007 -p1
# XXX Disable, it breaks the testsuite, test elf/tst-audit2
# %patch2008 -p1
%patch2009 -p1
#
# Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed!
@ -925,8 +930,8 @@ cp -av bits/stdio-lock.h %{buildroot}%{_includedir}/bits/stdio-lock.h
install -m 0700 glibc_post_upgrade %{buildroot}%{_sbindir}
install -m 644 $RPM_SOURCE_DIR/bindresvport.blacklist %{buildroot}/etc
install -m 644 $RPM_SOURCE_DIR/nsswitch.conf %{buildroot}/etc
install -m 644 %{SOURCE7} %{buildroot}/etc
install -m 644 %{SOURCE5} %{buildroot}/etc
install -m 644 posix/gai.conf %{buildroot}/etc
mkdir -p %{buildroot}/etc/default
@ -953,7 +958,7 @@ popd
cp nscd/nscd.conf %{buildroot}/etc
mkdir -p %{buildroot}/etc/init.d
install -m 755 $RPM_SOURCE_DIR/nscd.init %{buildroot}/etc/init.d/nscd
install -m 755 %{SOURCE6} %{buildroot}/etc/init.d/nscd
ln -sf /etc/init.d/nscd %{buildroot}/usr/sbin/rcnscd
mkdir -p %{buildroot}/var/run/nscd
touch %{buildroot}/var/run/nscd/{passwd,group,hosts}