From 2ac1d0166c08385151a792a6d9b6211a43c890918d5850dc3671e3036736ab16 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 5 Mar 2010 01:01:39 +0000
Subject: [PATCH] Accepting request 34042 from Base:System

checked in (request 34042)

OBS-URL: https://build.opensuse.org/request/show/34042
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=19
---
 glibc-2.4.90-nscd.diff | 37 +++++++++++--------------------------
 glibc.changes          |  5 -----
 glibc.spec             |  5 -----
 3 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/glibc-2.4.90-nscd.diff b/glibc-2.4.90-nscd.diff
index ce178a1..f66d910 100644
--- a/glibc-2.4.90-nscd.diff
+++ b/glibc-2.4.90-nscd.diff
@@ -1,7 +1,7 @@
 Index: nscd/cache.c
 ===================================================================
---- nscd/cache.c.orig	2010-01-18 18:01:41.000000000 +0100
-+++ nscd/cache.c	2010-02-14 14:58:08.000000000 +0100
+--- nscd/cache.c.orig
++++ nscd/cache.c
 @@ -267,28 +267,31 @@ prune_cache (struct database_dyn *table,
    if (table->inotify_descr < 0 && table->check_file && now != LONG_MAX)
      {
@@ -47,8 +47,8 @@ Index: nscd/cache.c
       Note that for the initial step, finding the entries to be removed,
 Index: nscd/connections.c
 ===================================================================
---- nscd/connections.c.orig	2010-01-18 18:01:41.000000000 +0100
-+++ nscd/connections.c	2010-02-14 14:58:08.000000000 +0100
+--- nscd/connections.c.orig
++++ nscd/connections.c
 @@ -119,6 +119,7 @@ struct database_dyn dbs[lastdb] =
      .suggested_module = DEFAULT_SUGGESTED_MODULE,
     .reset_res = 0,
@@ -94,8 +94,8 @@ Index: nscd/connections.c
  
 Index: 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
+--- nscd/nscd.conf.orig
++++ nscd/nscd.conf
 @@ -61,11 +61,11 @@
  	auto-propagate		group		yes
  
@@ -113,8 +113,8 @@ Index: nscd/nscd.conf
  
 Index: nscd/nscd.h
 ===================================================================
---- nscd/nscd.h.orig	2010-01-18 18:01:41.000000000 +0100
-+++ nscd/nscd.h	2010-02-14 14:59:07.000000000 +0100
+--- nscd/nscd.h.orig
++++ nscd/nscd.h
 @@ -80,8 +80,10 @@ struct database_dyn
    int propagate;
    int reset_res;
@@ -128,24 +128,9 @@ Index: nscd/nscd.h
  
 Index: nscd/nscd_stat.c
 ===================================================================
---- nscd/nscd_stat.c.orig	2010-01-18 18:01:41.000000000 +0100
-+++ nscd/nscd_stat.c	2010-02-14 15:02:41.000000000 +0100
-@@ -37,8 +37,13 @@
- #endif /* HAVE_SELINUX */
- 
- 
--/* We use this to make sure the receiver is the same.  */
-+/* We use this to make sure the receiver is the same.  Capture mtime
-+   of this file if possible.  */
-+#if defined(__TIMESTAMP__)
-+static const char compilation[21] = __TIMESTAMP__;
-+#else
- static const char compilation[21] = __DATE__ " " __TIME__;
-+#endif
- 
- /* Statistic data for one database.  */
- struct dbstat
-@@ -302,7 +307,7 @@ receive_print_stats (void)
+--- nscd/nscd_stat.c.orig
++++ nscd/nscd_stat.c
+@@ -302,7 +302,7 @@ receive_print_stats (void)
  	      data.dbs[i].maxnsearched,
  	      data.dbs[i].rdlockdelayed,
  	      data.dbs[i].wrlockdelayed,
diff --git a/glibc.changes b/glibc.changes
index de4e885..6b9a5c9 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Sun Feb 14 15:33:33 CET 2010 - rguenther@suse.de
-
-- avoid spurious differences in nscd on rebuilds.
-
 -------------------------------------------------------------------
 Mon Jan 25 17:35:25 CET 2010 - meissner@suse.de
 
diff --git a/glibc.spec b/glibc.spec
index 5c74907..40ac766 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -310,14 +310,9 @@ rm sysdeps/x86_64/fpu/s_sincos.S
 %patch20
 %patch21
 %patch22
-# avoid changing nscd_stat.c mtime to avoid code generation
-# differences on each rebuild
-touch -r nscd/nscd_stat.c nscd/s-stamp
 %patch23
 %patch24
 %patch25
-touch -r nscd/s-stamp nscd/nscd_stat.c
-rm nscd/s-stamp
 %patch26
 %patch27
 %patch29