From 2e70fa5dd217d90009968cdda0970227c8cca757 Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Fri, 23 Jun 2017 15:14:34 +0200
Subject: [PATCH] glibc: Rebuild with working patches to tame ldconfig

The two patches applied were supposed to change the behaviour of
ldconfig. It should not generate the symlinks for the shared libraries
by default and it should not remove stale symlinks by default.

However, the first patch was faulty and didn't actually change the
default. It was corrected (with a -v2 appended to its name). The second
patch had to be rebased on the first on.

Rebuild with fixed patches.
Increase build number.

    diff /src/mariux/patches/glibc-2.25-0001-ldconfig-don-t-generate-links-by-default.patch /src/mariux/patches/glibc-2.25-0001-ldconfig-don-t-generate-links-by-default-v2.patch
    1c1
    < From ed11660d1f553413c0ffaf283c3272dc492b56ac Mon Sep 17 00:00:00 2001
    ---
    > From fbee17a0750763583dd4c8e51dfd16adae652104 Mon Sep 17 00:00:00 2001
    9,10c9,10
    <  elf/ldconfig.c | 6 +++++-
    <  1 file changed, 5 insertions(+), 1 deletion(-)
    ---
    >  elf/ldconfig.c | 8 ++++++--
    >  1 file changed, 6 insertions(+), 2 deletions(-)
    13c13
    < index 99caf9e..5e3dbfc 100644
    ---
    > index 99caf9e..3515738 100644
    15a16,24
    > @@ -102,7 +102,7 @@ static int opt_build_cache = 1;
    >
    >  /* Enable symbolic link processing.  If set, create or update symbolic
    >     links, and remove stale symbolic links.  */
    > -static int opt_link = 1;
    > +static int opt_link = 0;
    >
    >  /* Only process directories specified on the command line.  */
    >  static int opt_only_cline;

    diff /src/mariux/patches/glibc-2.25-0002-ldconfig-don-t-remove-stale-symlinks-by-default.patch /src/mariux/patches/glibc-2.25-0002-ldconfig-don-t-remove-stale-symlinks-by-default-v2.patch
    1c1
    < From 61b9ad6e5f8bb5c3180f4eb7f16810f27789b32f Mon Sep 17 00:00:00 2001
    ---
    > From 498f603053a2e0e0c35e8146070cc7a797b3a184 Mon Sep 17 00:00:00 2001
    12c12
    < index 5e3dbfc..6f79f59 100644
    ---
    > index 3515738..5c5eeb6 100644
    17c17
    <  static int opt_link = 1;
    ---
    >  static int opt_link = 0;
---
 glibc.be0 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/glibc.be0 b/glibc.be0
index b9bdd73d4..1ce6c317d 100755
--- a/glibc.be0
+++ b/glibc.be0
@@ -1,12 +1,12 @@
 #!/bin/env beesh
 
-# BEE_VERSION glibc-2.25-0
+# BEE_VERSION glibc-2.25-1
 
 SRCURL[0]="https://ftp.gnu.org/gnu/glibc/glibc-${PKGVERSION}.tar.bz2"
 
 PATCHURL=(
-    /src/mariux/patches/glibc-2.25-0001-ldconfig-don-t-generate-links-by-default.patch
-    /src/mariux/patches/glibc-2.25-0002-ldconfig-don-t-remove-stale-symlinks-by-default.patch
+    /src/mariux/patches/glibc-2.25-0001-ldconfig-don-t-generate-links-by-default-v2.patch
+    /src/mariux/patches/glibc-2.25-0002-ldconfig-don-t-remove-stale-symlinks-by-default-v2.patch
 )
 
 SYSCONFDIR=/etc