From 5ca19238f5a7edf20f8e5f7b78d982a36cf61626 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Wed, 16 Aug 2017 16:01:49 +0200
Subject: [PATCH] Drop glibc-fedora-ldd.patch (applied to upstream master)

---
 glibc-fedora-ldd.patch | 42 ------------------------------------------
 glibc.spec             |  3 ---
 2 files changed, 45 deletions(-)
 delete mode 100644 glibc-fedora-ldd.patch

diff --git a/glibc-fedora-ldd.patch b/glibc-fedora-ldd.patch
deleted file mode 100644
index 51aec73..0000000
--- a/glibc-fedora-ldd.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 83e5edd390eabe8f8e8e0d051f929b77a30c0767 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Fri, 18 Mar 2011 16:22:52 +0100
-Subject: [PATCH] ldd: never run file directly
-
-* elf/ldd.bash.in: Never run file directly.
-
----
- ChangeLog       |    4 ++++
- elf/ldd.bash.in |   14 +-------------
- 2 files changed, 5 insertions(+), 13 deletions(-)
-
---- a/elf/ldd.bash.in
-+++ b/elf/ldd.bash.in
-@@ -166,18 +166,6 @@ warning: you do not have execution permission for" "\`$file'" >&2
-       fi
-     done
-     case $ret in
--    0)
--      # If the program exits with exit code 5, it means the process has been
--      # invoked with __libc_enable_secure.  Fall back to running it through
--      # the dynamic linker.
--      try_trace "$file"
--      rc=$?
--      if [ $rc = 5 ]; then
--	try_trace "$RTLD" "$file"
--	rc=$?
--      fi
--      [ $rc = 0 ] || result=1
--      ;;
-     1)
-       # This can be a non-ELF binary or no binary at all.
-       nonelf "$file" || {
-@@ -185,7 +173,7 @@ warning: you do not have execution permission for" "\`$file'" >&2
- 	result=1
-       }
-       ;;
--    2)
-+    0|2)
-       try_trace "$RTLD" "$file" || result=1
-       ;;
-     *)
diff --git a/glibc.spec b/glibc.spec
index 622a60a..541a0ee 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -179,8 +179,6 @@ Source11: SUPPORTED
 # change this.
 Patch0001: glibc-fedora-nscd.patch
 
-Patch0003: glibc-fedora-ldd.patch
-
 Patch0004: glibc-fedora-ppc-unwind.patch
 
 # Build info files in the source tree, then move to the build
@@ -759,7 +757,6 @@ microbenchmark tests on the system.
 
 # Patch order matters.
 %patch0001 -p1
-%patch0003 -p1
 %patch0004 -p1
 %patch0005 -p1
 %patch0006 -p1