diff --git a/SOURCES/findutils-4.5.11-fd-leak.patch b/SOURCES/findutils-4.5.11-fd-leak.patch
new file mode 100644
index 0000000..6959919
--- /dev/null
+++ b/SOURCES/findutils-4.5.11-fd-leak.patch
@@ -0,0 +1,134 @@
+From 08c5fbec81ff04a6fd307ed07eddccefa3b43d44 Mon Sep 17 00:00:00 2001
+From: Bernhard Voelker <mail@bernhard-voelker.de>
+Date: Fri, 2 Aug 2013 12:16:44 +0200
+Subject: [PATCH] find: fix fd leak with --execdir option (bug#34976)
+
+Prevent "Failed to save working dir[...]: Too many open files"
+error by closing the file descriptor of the working directory.
+
+* find/exec.c (impl_pred_exec): Free the working directory if find
+executes the command in the local dir, i.e. if it has been saved
+by record_exec_dir().
+* find/testsuite/sv-34976-execdir-fd-leak.sh: Add test.
+* find/testsuite/Makefile.am (test_shell_progs): Mention the test.
+
+Upstream-commit: 183115d0484816336f9c4d2a3198b5eae2ad4b92
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ find/exec.c | 2 +
+ find/testsuite/Makefile.am | 2 +-
+ find/testsuite/sv-34976-execdir-fd-leak.sh | 76 ++++++++++++++++++++++++++++++
+ 3 files changed, 79 insertions(+), 1 deletion(-)
+ create mode 100644 find/testsuite/sv-34976-execdir-fd-leak.sh
+
+diff --git a/find/exec.c b/find/exec.c
+index f731d82..60d9109 100644
+--- a/find/exec.c
++++ b/find/exec.c
+@@ -213,6 +213,8 @@ impl_pred_exec (const char *pathname,
+ {
+ result = false;
+ }
++ if (local)
++ free_cwd (execp->wd_for_exec);
+ }
+ if (buf)
+ {
+diff --git a/find/testsuite/Makefile.am b/find/testsuite/Makefile.am
+index a1e49b8..e8b1173 100644
+--- a/find/testsuite/Makefile.am
++++ b/find/testsuite/Makefile.am
+@@ -247,7 +247,7 @@ EXTRA_DIST_GOLDEN = \
+ test_escapechars.golden
+
+ test_shell_progs = sv-bug-32043.sh test_escapechars.sh test_escape_c.sh \
+- test_inode.sh sv-34079.sh
++ test_inode.sh sv-34079.sh sv-34976-execdir-fd-leak.sh
+
+ EXTRA_DIST = $(EXTRA_DIST_EXP) $(EXTRA_DIST_XO) $(EXTRA_DIST_GOLDEN) \
+ $(test_shell_progs) binary_locations.sh
+diff --git a/find/testsuite/sv-34976-execdir-fd-leak.sh b/find/testsuite/sv-34976-execdir-fd-leak.sh
+new file mode 100644
+index 0000000..2d5dace
+--- /dev/null
++++ b/find/testsuite/sv-34976-execdir-fd-leak.sh
+@@ -0,0 +1,76 @@
++#! /bin/sh
++# Copyright (C) 2013 Free Software Foundation, Inc.
++#
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
++#
++
++# This test verifies that find does not leak a file descriptor for the working
++# directory specified by the -execdir option [Savannah bug #34976].
++
++testname="$(basename $0)"
++
++. "${srcdir}"/binary_locations.sh
++
++# Test if restricting the number of file descriptors via ulimit -n works.
++test_ulimit() {
++ n="$1" # number of files
++ l="$2" # limit to use
++ (
++ ulimit -n "$l" || exit 1
++ for i in $(seq $n) ; do
++ printf "exec %d> /dev/null || exit 1\n" $i
++ done | sh ;
++ ) 2>/dev/null
++}
++# Opening 30 files with a limit of 40 should work.
++test_ulimit 30 40 || { echo "SKIP: ulimit does not work" >&2; exit 0 ; }
++# Opening 30 files with a limit of 20 should fail.
++test_ulimit 30 20 && { echo "SKIP: ulimit does not work" >&2; exit 0 ; }
++
++die() {
++ echo "$@" >&2
++ exit 1
++}
++
++# Create test files, each 100 in the directories ".", "one" and "two".
++make_test_data() {
++ d="$1"
++ (
++ cd "$1" || exit 1
++ mkdir one two || exit 1
++ for i in $(seq 0 100) ; do
++ printf "./%03d one/%03d two/%03d " $i $i $i
++ done \
++ | xargs touch || exit 1
++ ) \
++ || die "failed to set up the test in ${outdir}"
++}
++
++outdir="$(mktemp -d)" || die "FAIL: could not create a test files."
++
++# Create some test files.
++make_test_data "${outdir}" || die "FAIL: failed to set up the test in ${outdir}"
++
++fail=0
++for exe in "${ftsfind}" "${oldfind}"; do
++ ( ulimit -n 30 && \
++ ${exe} "${outdir}" -type f -execdir cat '{}' \; >/dev/null; ) \
++ || { \
++ echo "Option -execdir of ${exe} leaks file descriptors" >&2 ; \
++ fail=1 ; \
++ }
++done
++
++rm -rf "${outdir}" || exit 1
++exit $fail
+--
+2.5.0
+
diff --git a/SPECS/findutils.spec b/SPECS/findutils.spec
index 9ab9eaa..f47e85a 100644
--- a/SPECS/findutils.spec
+++ b/SPECS/findutils.spec
@@ -1,7 +1,7 @@
Summary: The GNU versions of find utilities (find and xargs)
Name: findutils
Version: 4.5.11
-Release: 5%{?dist}
+Release: 6%{?dist}
Epoch: 1
License: GPLv3+
Group: Applications/File
@@ -28,6 +28,9 @@ Patch5: findutils-4.5.11-ppc-gnulib-tests.patch
# print a warning if find -perm +omode is used (#1116237)
Patch6: findutils-4.5.11-bz1116237.patch
+# fix file descriptor leak with --execdir option (#1309633)
+Patch7: findutils-4.5.11-fd-leak.patch
+
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
Conflicts: filesystem < 3
@@ -62,6 +65,9 @@ rm -rf locate
%patch5 -p1
%patch6 -p1
+%patch7 -p1
+chmod 0755 "find/testsuite/sv-34976-execdir-fd-leak.sh"
+
# needed because of findutils-4.4.0-no-locate.patch
autoreconf -iv
@@ -107,6 +113,9 @@ fi
%{_infodir}/find-maint.info.gz
%changelog
+* Thu Feb 18 2016 Kamil Dudka <kdudka@redhat.com> - 1:4.5.11-6
+- fix file descriptor leak with --execdir option (#1309633)
+
* Mon Jun 01 2015 Kamil Dudka <kdudka@redhat.com> - 1:4.5.11-5
- print a warning if find -perm +omode is used (#1116237)