From 6dc001ac6c10ff1144bce819b3b84bb7a0fb819c50e86dd48e075a49d79a65fd Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Mon, 27 Sep 2010 13:39:18 +0000
Subject: [PATCH] Accepting request 49221 from Base:System

Copy from Base:System/findutils based on submit request 49221 from user prusnak

OBS-URL: https://build.opensuse.org/request/show/49221
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/findutils?expand=0&rev=23
---
 findutils-updatedb_ignore_nfsv4.patch | 13 +++++++++++++
 findutils.changes                     | 12 ++++++++++++
 findutils.spec                        | 20 ++++----------------
 nobody-wrapper.tar.bz2                |  3 ---
 4 files changed, 29 insertions(+), 19 deletions(-)
 create mode 100644 findutils-updatedb_ignore_nfsv4.patch
 delete mode 100644 nobody-wrapper.tar.bz2

diff --git a/findutils-updatedb_ignore_nfsv4.patch b/findutils-updatedb_ignore_nfsv4.patch
new file mode 100644
index 0000000..3c7d9c4
--- /dev/null
+++ b/findutils-updatedb_ignore_nfsv4.patch
@@ -0,0 +1,13 @@
+Index: locate/updatedb.sh
+===================================================================
+--- locate/updatedb.sh.orig	2010-08-23 12:27:24.000000000 +0200
++++ locate/updatedb.sh	2010-08-23 12:29:20.495699371 +0200
+@@ -228,7 +228,7 @@ done
+ 
+ PATH=/bin:/usr/bin:${BINDIR}; export PATH
+ 
+-: ${PRUNEFS="nfs NFS proc afs smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs sysfs shfs cifs 9P unknown"}
++: ${PRUNEFS="nfs nfs4 NFS proc afs smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs sysfs shfs cifs 9P unknown"}
+ 
+ if test -n "$PRUNEFS"; then
+ prunefs_exp=`echo $PRUNEFS |sed -e 's/\([^ ][^ ]*\)/-fstype \1 -o/g'`
diff --git a/findutils.changes b/findutils.changes
index 63d4fad..42440c1 100644
--- a/findutils.changes
+++ b/findutils.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Sep 27 06:30:15 UTC 2010 - lnussel@suse.de
+
+- remove nobody wrapper again. It's not needed due to a fix in
+  coreutils that allows su from root to any user without account
+  checks.
+
+-------------------------------------------------------------------
+Mon Aug 23 12:36:49 CEST 2010 - pth@suse.de
+
+- Add NFSv4 to updatedb's prune list, i.e. make ignore such file systems.
+
 -------------------------------------------------------------------
 Fri Jul 30 18:53:26 CEST 2010 - werner@suse.de
 
diff --git a/findutils.spec b/findutils.spec
index 5601d56..c685701 100644
--- a/findutils.spec
+++ b/findutils.spec
@@ -22,13 +22,12 @@ Url:            http://www.gnu.org/software/findutils/
 License:        GPLv3+
 Group:          Productivity/File utilities
 Version:        4.4.2
-Release:        7
+Release:        8
 Summary:        The GNU versions of find utilities (find and xargs)
 # retreived from http://ftp.gnu.org/pub/gnu/findutils/findutils-4.4.2.tar.gz
 Source:         findutils-%{version}.tar.bz2
 Source1:        sysconfig.locate
 Source2:        cron.daily.updatedb
-Source3:        nobody-wrapper.tar.bz2
 # Use /proc/mounts instead of /etc/mtab as autofs entries are only
 # listed in the kernels >= 2.6.32
 Patch0:         findutils-use_proc_mounts.patch
@@ -44,6 +43,7 @@ Patch3:         findutils-4.4.2-selinux.patch
 Patch4:         findutils-4.4.2-selinux-gnulib.patch
 Patch5:         findutils-4.4.2-updatedb.patch
 Patch6:         findutils-prune_unknown.patch
+Patch7:         findutils-updatedb_ignore_nfsv4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} > 1100
 BuildRequires:  libselinux-devel
@@ -84,7 +84,7 @@ job will update the files database every night or shortly after
 switching on the computer.
 
 %prep
-%setup -q -b 3
+%setup -q
 %patch0
 %patch1 -p1
 %patch2 -p1
@@ -92,6 +92,7 @@ switching on the computer.
 %patch4 -p1
 %patch5
 %patch6
+%patch7
 
 %build
 autoreconf
@@ -107,10 +108,6 @@ export DEFAULT_ARG_SIZE="(31u * 1024u)"
   --enable-d_type-optimisation
 make %{?_smp_mflags}
 
-pushd ../nobody-wrapper
-  gcc $RPM_OPT_FLAGS -o nobody nobody.c
-popd
-
 %check
 make check
 
@@ -128,13 +125,6 @@ mv $RPM_BUILD_ROOT{%{_bindir},/bin}/find
 # create /usr/bin/find -> /bin/find symlink
 ln -sf ../../bin/find $RPM_BUILD_ROOT%{_bindir}
 
-pushd ../nobody-wrapper
-  mkdir $RPM_BUILD_ROOT%{_sbindir}/
-  mkdir $RPM_BUILD_ROOT%{_mandir}/man8
-  install -m 0755 nobody   $RPM_BUILD_ROOT%{_sbindir}/
-  install -m 0644 nobody.8 $RPM_BUILD_ROOT%{_mandir}/man8/
-popd
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -153,11 +143,9 @@ rm -rf $RPM_BUILD_ROOT
 /bin/find
 %{_bindir}/find
 %{_bindir}/xargs
-%{_sbindir}/nobody
 %doc %{_infodir}/find.info*.gz
 %doc %{_mandir}/man1/find.1.gz
 %doc %{_mandir}/man1/xargs.1.gz
-%doc %{_mandir}/man8/nobody.8.gz
 
 %files lang -f %{name}.lang
 %defattr(-,root,root,-)
diff --git a/nobody-wrapper.tar.bz2 b/nobody-wrapper.tar.bz2
deleted file mode 100644
index 511f447..0000000
--- a/nobody-wrapper.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5987c255cfb25812d62c1283d597df2d858e8a46456908af75ae24c8800e19a3
-size 2532