Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=ca33db2a8c76aa908d9fc1be170f1c375f8de5f1

commit ca33db2a8c76aa908d9fc1be170f1c375f8de5f1
Author: James Buren <[email protected]>
Date:   Wed Oct 3 23:32:43 2012 -0500

glibc-2.16.0-1-x86_64
* initial version bump
* drop old patches which no longer apply
* don't call init upon upgrades anymore (no longer needed for systemd)
* change maintainer to me

diff --git a/source/base/glibc/FrugalBuild b/source/base/glibc/FrugalBuild
index 7a65938..0a60241 100644
--- a/source/base/glibc/FrugalBuild
+++ b/source/base/glibc/FrugalBuild
@@ -1,5 +1,5 @@
# Compiling time: 8.20 SBU
-# Maintainer: Marius Cirsta <[email protected]>
+# Maintainer: James Buren <[email protected]>
# Contributor: Miklos Vajna <[email protected]>

case "$CARCH" in
@@ -10,8 +10,8 @@ esac
USE_GLIBC_PORTS=${USE_GLIBC_PORTS:-$USE_GLIBC_PORTS_DEFAULT}

pkgname=glibc
-pkgver=2.15
-pkgrel=5
+pkgver=2.16.0
+pkgrel=1
pkgdesc="GNU C Library"
url="http://www.gnu.org/software/libc/libc.html";
depends=()
@@ -22,29 +22,16 @@ rodepends=('tzdata')
groups=('base' 'chroot-core')
archs=('i686' 'x86_64' 'arm')
Fup2gnubz2
-source=(http://ftp.gnu.org/pub/gnu/glibc/glibc-$pkgver.tar.gz \
-       nis.diff \
-       glibc2.14-revert-sunrpc-removal.patch \
+_dlurl="http://ftp.gnu.org/pub/gnu/glibc";
+source=($_dlurl/glibc-$pkgver.tar.xz \
glibc-2.14-revert-4768ae77.patch \
-       glibc-2.14.1-gcc_fix-1.patch \
-       glibc-2.14.1-fixes-1.patch \
-       glibc-2.15-lddebug-scopes.patch \
-       glibc-2.15-nscd-race.patch)
-sha1sums=('33861d75dfc6e9d176f33c356929da792055146c' \
-          '9c4544aee1063f65da39273349f0780d5723747d' \
-          '9e07221a0f200898a680ed8682569606e4d3abbe' \
-          'cc22b01dc3d1a8d92b36a319e36ace98c5c55d80' \
-          '41a88bf6a20926a4a1e9792ae5eb2a9854dc44af' \
-          'cc8fe170befc0a1fe56d6c18da1afc73c8c72b1b' \
-          '05116b9dd4f2f2e8e0d97ba3af6acbd14652f2ff' \
-          '983667f97ebbec9b1469ea51073718f5673cb56f')
-
+       glibc-2.15-lddebug-scopes.patch)
+signatures=($_dlurl/glibc-$pkgver.tar.xz.sig '' '')

if Fuse GLIBC_PORTS; then
-       source=("${source[@]}" 
"http://ftp.gnu.org/gnu/libc/glibc-ports-$pkgver.tar.xz"; \
+       source=("${source[@]}" "$_dlurl/glibc-ports-$pkgver.tar.xz" \
glibc-ports-2.15-arm-dep-libmemusage.patch)
-       sha1sums=("${sha1sums[@]}" '65c4c239f703cc63a1fa65aa7b32ab13f833d99e' \
-               '89d330891232f831bf8755b319bbe88c8e72b496')
+       signatures=("${signatures[@]}" $_dlurl/glibc-ports-$pkgver.tar.xz.sig 
'')
fi

build()
@@ -53,7 +40,6 @@ build()
if Fuse GLIBC_PORTS; then
ln -sf $Fsrcdir/glibc-ports-$pkgver . || Fdie
fi
-       Fsed 'x86_64 \| ' '' sysdeps/unix/sysv/linux/configure{,.in}
Fpatchall
Ffilerel nscd/nscd.conf /etc/nscd.conf
## use Fdie here and kill the build
diff --git a/source/base/glibc/glibc-2.14.1-fixes-1.patch 
b/source/base/glibc/glibc-2.14.1-fixes-1.patch
deleted file mode 100644
index b2b87f1..0000000
--- a/source/base/glibc/glibc-2.14.1-fixes-1.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-Submitted By:            Matt Burgess <matthew_at_linuxfromscratch_dot_org>
-Date:                    2011-10-07
-Initial Package Version: 2.14.1
-Upstream Status:         From upstream
-Origin:                  Matt Burgess
-Description:             Fixes Firefox crashes and a bug when programs link to
-                         SDL.
-
-diff -Naur glibc-2.14.1.orig/elf/dl-close.c glibc-2.14.1/elf/dl-close.c
---- glibc-2.14.1.orig/elf/dl-close.c   2011-10-07 09:48:55.000000000 +0000
-+++ glibc-2.14.1/elf/dl-close.c        2011-10-07 19:43:10.346411120 +0000
-@@ -119,17 +119,8 @@
-   if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
-       || dl_close_state != not_pending)
-     {
--      if (map->l_direct_opencount == 0)
--      {
--        if (map->l_type == lt_loaded)
--          dl_close_state = rerun;
--        else if (map->l_type == lt_library)
--          {
--            struct link_map **oldp = map->l_initfini;
--            map->l_initfini = map->l_orig_initfini;
--            _dl_scope_free (oldp);
--          }
--      }
-+      if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
-+      dl_close_state = rerun;
-
-       /* There are still references to this object.  Do nothing more.  */
-       if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
-diff -Naur glibc-2.14.1.orig/elf/dl-deps.c glibc-2.14.1/elf/dl-deps.c
---- glibc-2.14.1.orig/elf/dl-deps.c    2011-10-07 09:48:55.000000000 +0000
-+++ glibc-2.14.1/elf/dl-deps.c 2011-10-07 19:43:10.348432639 +0000
-@@ -478,6 +478,7 @@
-                 nneeded * sizeof needed[0]);
-         atomic_write_barrier ();
-         l->l_initfini = l_initfini;
-+        l->l_free_initfini = 1;
-       }
-
-       /* If we have no auxiliary objects just go on to the next map.  */
-@@ -678,6 +679,7 @@
-   l_initfini[nlist] = NULL;
-   atomic_write_barrier ();
-   map->l_initfini = l_initfini;
-+  map->l_free_initfini = 1;
-   if (l_reldeps != NULL)
-     {
-       atomic_write_barrier ();
-@@ -686,7 +688,7 @@
-       _dl_scope_free (old_l_reldeps);
-     }
-   if (old_l_initfini != NULL)
--      map->l_orig_initfini = old_l_initfini;
-+    _dl_scope_free (old_l_initfini);
-
-   if (errno_reason)
-     _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
-diff -Naur glibc-2.14.1.orig/elf/dl-libc.c glibc-2.14.1/elf/dl-libc.c
---- glibc-2.14.1.orig/elf/dl-libc.c    2011-10-07 09:48:55.000000000 +0000
-+++ glibc-2.14.1/elf/dl-libc.c 2011-10-07 19:43:10.352411141 +0000
-@@ -279,6 +279,10 @@
-             if (! old->dont_free)
-               free (old);
-           }
-+
-+        /* Free the initfini dependency list.  */
-+        if (l->l_free_initfini)
-+          free (l->l_initfini);
-       }
-
-       if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
-diff -Naur glibc-2.14.1.orig/elf/rtld.c glibc-2.14.1/elf/rtld.c
---- glibc-2.14.1.orig/elf/rtld.c       2011-10-07 09:48:55.000000000 +0000
-+++ glibc-2.14.1/elf/rtld.c    2011-10-07 19:43:10.355406263 +0000
-@@ -2263,6 +2263,7 @@
-             lnp->dont_free = 1;
-             lnp = lnp->next;
-           }
-+        l->l_free_initfini = 0;
-
-         if (l != &GL(dl_rtld_map))
-           _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
-diff -Naur glibc-2.14.1.orig/include/link.h glibc-2.14.1/include/link.h
---- glibc-2.14.1.orig/include/link.h   2011-10-07 09:48:55.000000000 +0000
-+++ glibc-2.14.1/include/link.h        2011-10-07 19:43:10.357462703 +0000
-@@ -192,6 +192,9 @@
-                                                during LD_TRACE_PRELINKING=1
-                                                contains any DT_SYMBOLIC
-                                                libraries.  */
-+    unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
-+                                     freed, ie. not allocated with
-+                                     the dummy malloc in ld.so.  */
-
-     /* Collected information about own RPATH directories.  */
-     struct r_search_path_struct l_rpath_dirs;
-@@ -240,9 +243,6 @@
-
-     /* List of object in order of the init and fini calls.  */
-     struct link_map **l_initfini;
--    /* The init and fini list generated at startup, saved when the
--       object is also loaded dynamically.  */
--    struct link_map **l_orig_initfini;
-
-     /* List of the dependencies introduced through symbol binding.  */
-     struct link_map_reldeps
-diff -Naur glibc-2.14.1.orig/resolv/res_query.c glibc-2.14.1/resolv/res_query.c
---- glibc-2.14.1.orig/resolv/res_query.c       2011-10-07 09:48:55.000000000 
+0000
-+++ glibc-2.14.1/resolv/res_query.c    2011-10-07 19:43:10.361412711 +0000
-@@ -122,6 +122,7 @@
-                 int *resplen2)
- {
-       HEADER *hp = (HEADER *) answer;
-+      HEADER *hp2;
-       int n, use_malloc = 0;
-       u_int oflags = statp->_flags;
-
-@@ -239,26 +240,25 @@
-         /* __libc_res_nsend might have reallocated the buffer.  */
-         hp = (HEADER *) *answerp;
-
--      /* We simplify the following tests by assigning HP to HP2.  It
--         is easy to verify that this is the same as ignoring all
--         tests of HP2.  */
--      HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp;
--
--      if (n < (int) sizeof (HEADER) && answerp2 != NULL
--          && *resplen2 > (int) sizeof (HEADER))
-+      /* We simplify the following tests by assigning HP to HP2 or
-+         vice versa.  It is easy to verify that this is the same as
-+         ignoring all tests of HP or HP2.  */
-+      if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER))
-         {
--          /* Special case of partial answer.  */
--          assert (hp != hp2);
--          hp = hp2;
-+          hp2 = hp;
-         }
--      else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
--               && n > (int) sizeof (HEADER))
-+      else
-         {
--          /* Special case of partial answer.  */
--          assert (hp != hp2);
--          hp2 = hp;
-+          hp2 = (HEADER *) *answerp2;
-+          if (n < (int) sizeof (HEADER))
-+            {
-+              hp = hp2;
-+            }
-         }
-
-+      /* Make sure both hp and hp2 are defined */
-+      assert((hp != NULL) && (hp2 != NULL));
-+
-       if ((hp->rcode != NOERROR || ntohs(hp->ancount) == 0)
-           && (hp2->rcode != NOERROR || ntohs(hp2->ancount) == 0)) {
- #ifdef DEBUG
diff --git a/source/base/glibc/glibc-2.14.1-gcc_fix-1.patch 
b/source/base/glibc/glibc-2.14.1-gcc_fix-1.patch
deleted file mode 100644
index 02920c1..0000000
--- a/source/base/glibc/glibc-2.14.1-gcc_fix-1.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Submitted By:            Matt Burgess <matthew_at_linuxfromscratch_dot_org>
-Date:                    2010-04-18
-Initial Package Version: 2.11.1
-Upstream Status:         Not Submitted
-Origin:                  http://www.eglibc.org/archives/patches/msg00073.html
-Description:             Fixes the following build problem with GCC-4.5.0:
-
-/mnt/lfs/sources/libc-build/math/s_frexp.os.dt -MT 
/mnt/lfs/sources/libc-build/math/s_frexp.os
-./sysdeps/i386/fpu/s_frexp.S: Assembler messages:
-./sysdeps/i386/fpu/s_frexp.S:66: Error: invalid identifier for ".ifdef"
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first 
unrecognized character is `1'
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first 
unrecognized character is `1'
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first 
unrecognized character is `1'
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first 
unrecognized character is `.'
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first 
unrecognized character is `1'
-./sysdeps/i386/fpu/s_frexp.S:66: Error: expected comma after name `' in .size 
directive
-./sysdeps/i386/fpu/s_frexp.S:66: Error: ".endif" without ".if"
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk `.get_pc_thunk.dx' after 
expression
-make[2]: *** [/mnt/lfs/sources/libc-build/math/s_frexp.os] Error 1
-
-diff -Naur glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c 
glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c
---- glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c       2009-12-08 
20:10:20.000000000 +0000
-+++ glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c    2010-04-17 
11:34:06.882681001 +0000
-@@ -45,6 +45,11 @@
- /* Embed an #include to pull in the alignment and .end directives. */
- asm ("\n#include \"defs.h\"");
-
-+asm ("\n#if defined __i686 && defined __ASSEMBLER__");
-+asm ("\n#undef __i686");
-+asm ("\n#define __i686 __i686");
-+asm ("\n#endif");
-+
- /* The initial common code ends here. */
- asm ("\n/*@HEADER_ENDS*/");
-
-diff -Naur glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h 
glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h
---- glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h    2009-12-08 
20:10:20.000000000 +0000
-+++ glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h 2010-04-17 
11:34:06.882681001 +0000
-@@ -29,6 +29,10 @@
- #include <dl-sysdep.h>
- #include <tls.h>
-
-+#if defined __i686 && defined __ASSEMBLER__
-+#undef __i686
-+#define __i686 __i686
-+#endif
-
- /* For Linux we can use the system call table in the header file
-       /usr/include/asm/unistd.h
diff --git a/source/base/glibc/glibc-2.15-nscd-race.patch 
b/source/base/glibc/glibc-2.15-nscd-race.patch
deleted file mode 100644
index e18a67e..0000000
--- a/source/base/glibc/glibc-2.15-nscd-race.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-https://bugs.gentoo.org/416033
-http://sourceware.org/bugzilla/show_bug.cgi?id=13594
-
-From 509072a0f7f8a37bedf61a78c0cdd7783368c65a Mon Sep 17 00:00:00 2001
-From: Andreas Jaeger <[email protected]>
-Date: Tue, 15 May 2012 20:35:53 +0200
-Subject: [PATCH] Avoid race in nscd
-
-2012-05-15  Jeff Law  <[email protected]>
-            Andreas Jaeger  <[email protected]>
-
-        [BZ #13594]
-        * nscd/nscd-client.h (__nscd_acquire_maplock): New function, split
-        out from...
-        * nscd/nscd_helper.c (__nscd_get_map_ref): ... here.
-        * nscd/nscd-client.h: Add __nscd_acquire_maplock.
-        * nscd/nscd_gethst_r.c (__nscd_get_nl_timestamp): Add locking to
-        code changing __hst_map_handle.map.
----
- ChangeLog            |   11 +++++++++++
- NEWS                 |   20 ++++++++++----------
- nscd/nscd-client.h   |   21 +++++++++++++++++++--
- nscd/nscd_gethst_r.c |   21 +++++++++++++++++----
- nscd/nscd_helper.c   |   15 +++------------
- 5 files changed, 60 insertions(+), 28 deletions(-)
-
-diff --git a/nscd/nscd-client.h b/nscd/nscd-client.h
-index e57a23c..325368e 100644
---- a/nscd/nscd-client.h
-+++ b/nscd/nscd-client.h
-@@ -1,5 +1,4 @@
--/* Copyright (c) 1998, 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2011
--   Free Software Foundation, Inc.
-+/* Copyright (c) 1998-2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Thorsten Kukuk <[email protected]>, 1998.
-
-@@ -322,6 +321,24 @@ struct locked_map_ptr
- };
- #define libc_locked_map_ptr(class, name) class struct locked_map_ptr name
-
-+/* Try acquiring lock for mapptr, returns true if it succeeds, false
-+   if not.  */
-+static inline bool __nscd_acquire_maplock (volatile struct locked_map_ptr 
*mapptr)
-+{
-+  int cnt = 0;
-+  while (__builtin_expect (atomic_compare_and_exchange_val_acq (&mapptr->lock,
-+                                                              1, 0) != 0, 0))
-+    {
-+      // XXX Best number of rounds?
-+      if (__builtin_expect (++cnt > 5, 0))
-+      return false;
-+
-+      atomic_delay ();
-+    }
-+
-+  return true;
-+}
-+
-
- /* Open socket connection to nscd server.  */
- extern int __nscd_open_socket (const char *key, size_t keylen,
-diff --git a/nscd/nscd_gethst_r.c b/nscd/nscd_gethst_r.c
-index c1661f8..d64ad2e 100644
---- a/nscd/nscd_gethst_r.c
-+++ b/nscd/nscd_gethst_r.c
-@@ -1,5 +1,4 @@
--/* Copyright (C) 1998-2005, 2006, 2007, 2008, 2009, 2011
--   Free Software Foundation, Inc.
-+/* Copyright (C) 1998-2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <[email protected]>, 1998.
-
-@@ -100,9 +99,18 @@ libc_freeres_fn (hst_map_free)
- uint32_t
- __nscd_get_nl_timestamp (void)
- {
-+  uint32_t retval;
-   if (__nss_not_use_nscd_hosts != 0)
-     return 0;
-
-+  /* __nscd_get_mapping can change hst_map_handle.mapped to NO_MAPPING.
-+   However, __nscd_get_mapping assumes the prior value was not NO_MAPPING.
-+   Thus we have to acquire the lock to prevent this thread from changing
-+   hst_map_handle.mapped to NO_MAPPING while another thread is inside
-+    __nscd_get_mapping.  */
-+  if (!__nscd_acquire_maplock (&__hst_map_handle))
-+    return 0;
-+
-   struct mapped_database *map = __hst_map_handle.mapped;
-
-   if (map == NULL
-@@ -112,9 +120,14 @@ __nscd_get_nl_timestamp (void)
-     map = __nscd_get_mapping (GETFDHST, "hosts", &__hst_map_handle.mapped);
-
-   if (map == NO_MAPPING)
--    return 0;
-+    retval = 0;
-+  else
-+    retval = map->head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP];
-+
-+  /* Release the lock.  */
-+  __hst_map_handle.lock = 0;
-
--  return map->head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP];
-+  return retval;
- }
-
-
-diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c
-index 92558b6..96fb93d 100644
---- a/nscd/nscd_helper.c
-+++ b/nscd/nscd_helper.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1998-2007, 2008, 2009 Free Software Foundation, Inc.
-+/* Copyright (C) 1998-2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <[email protected]>, 1998.
-
-@@ -419,7 +419,6 @@ __nscd_get_mapping (request_type type, const char *key,
-   return result;
- }
-
--
- struct mapped_database *
- __nscd_get_map_ref (request_type type, const char *name,
-                   volatile struct locked_map_ptr *mapptr, int *gc_cyclep)
-@@ -428,16 +427,8 @@ __nscd_get_map_ref (request_type type, const char *name,
-   if (cur == NO_MAPPING)
-     return cur;
-
--  int cnt = 0;
--  while (__builtin_expect (atomic_compare_and_exchange_val_acq (&mapptr->lock,
--                                                              1, 0) != 0, 0))
--    {
--      // XXX Best number of rounds?
--      if (__builtin_expect (++cnt > 5, 0))
--      return NO_MAPPING;
--
--      atomic_delay ();
--    }
-+  if (!__nscd_acquire_maplock (mapptr))
-+    return NO_MAPPING;
-
-   cur = mapptr->mapped;
-
---
-1.7.8.6
-
diff --git a/source/base/glibc/glibc.install b/source/base/glibc/glibc.install
index 54e1a0d..9af63f2 100644
--- a/source/base/glibc/glibc.install
+++ b/source/base/glibc/glibc.install
@@ -9,10 +9,6 @@ post_install() {
}

post_upgrade() {
-       ## FS#3245
-       if [ -e /sbin/init ]; then
-               /sbin/init u
-       fi
#added support to /etc/ld.so.conf.d/*.conf
if ! grep -q '^include /etc/ld\.so\.conf\.d/\*\.conf' /etc/ld.so.conf ; then
echo "include /etc/ld.so.conf.d/*.conf" >> /etc/ld.so.conf
diff --git a/source/base/glibc/glibc2.14-revert-sunrpc-removal.patch 
b/source/base/glibc/glibc2.14-revert-sunrpc-removal.patch
deleted file mode 100644
index 52e1823..0000000
--- a/source/base/glibc/glibc2.14-revert-sunrpc-removal.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: glibc-2.14/include/libc-symbols.h
-===================================================================
---- glibc-2.14.orig/include/libc-symbols.h
-+++ glibc-2.14/include/libc-symbols.h
-@@ -635,7 +635,7 @@ for linking")
- # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
- # define libc_hidden_def(name) hidden_def (name)
- # define libc_hidden_weak(name) hidden_weak (name)
--# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
-+# define libc_hidden_nolink(name, version) hidden_def (name)
- # define libc_hidden_ver(local, name) hidden_ver (local, name)
- # define libc_hidden_data_def(name) hidden_data_def (name)
- # define libc_hidden_data_weak(name) hidden_data_weak (name)
-Index: glibc-2.14/sunrpc/Makefile
-===================================================================
---- glibc-2.14.orig/sunrpc/Makefile
-+++ glibc-2.14/sunrpc/Makefile
-@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth
-                                   des_crypt.h)
- headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
-                      $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
--headers = rpc/netdb.h
-+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
- install-others = $(inst_sysconfdir)/rpc
- generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) 
\
-           $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
diff --git a/source/base/glibc/nis.diff b/source/base/glibc/nis.diff
deleted file mode 100644
index f8fa058..0000000
--- a/source/base/glibc/nis.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <[email protected]>
-Date: Tue, 17 May 2011 17:42:30 +0200
-Subject: [PATCH] Reinstall NIS RPC headers
-
----
- nis/Makefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/nis/Makefile b/nis/Makefile
-index b5c9609..d2934d9 100644
---- a/nis/Makefile
-+++ b/nis/Makefile
-@@ -23,9 +23,9 @@ subdir       := nis
-
- aux                   := nis_hash
-
-+headers                       := $(wildcard rpcsvc/*.[hx])
- distribute            := nss-nis.h nss-nisplus.h nis_intern.h Banner \
--                         nisplus-parser.h nis_xdr.h nss \
--                         $(wildcard rpcsvc/*.[hx])
-+                         nisplus-parser.h nis_xdr.h nss
-
- # These are the databases available for the nis (and perhaps later nisplus)
- # service.  This must be a superset of the services in nss.
---
-1.7.5.4
-
-
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to