SHA256
1
0
forked from pool/findutils
findutils/findutils-4.4.2-updatedb.patch
Marcus Meissner 987ed52315 Accepting request 200285 from home:bernhard-voelker:branches:Base:System
- Remove patches:
  - findutils-4.5.10-use_proc_mounts.patch:
    /etc/mtab is a link to /proc/self/mounts nowadays.
  - findutils-4.5.10-prune_unknown.patch:
    merge patch into findutils-4.4.2-updatedb.patch.
  - findutils-4.5.10-updatedb_ignore_nfsv4.patch:
    fixed upstream.
  - findutils-stdio.in.patch:
    fixed upstream (in included gnulib).
  - findutils-init_stat_buf.patch:
    fixed upstream.

- Refresh other patches:
  - findutils-4.4.2-updatedb.patch:
    refresh with changes from the above, removed patch.
  - findutils-4.4.2-xautofs.patch:
    refresh, and added -xautofs in find's usage text.

- Adapt findutils.spec:
  - Version bump.
  - Remove above removed patches.
  - Add BuildRequires for makeinfo.
  - configure call: remove --enable-d_type-optimization
    option because turned on by default since 4.2.15.
  - Do not remove oldfind's man page in %install.
  - Add oldfind's binary and man page in %files.

- Update to 4.5.12
  See /usr/share/doc/packages/findutils/NEWS,
  section "Major changes in release 4.5.12, 2013-09-22"

- Update to 4.5.11 (2013-02-02)
  See /usr/share/doc/packages/findutils/NEWS,
  section "Major changes in release 4.5.11, 2013-02-02"

OBS-URL: https://build.opensuse.org/request/show/200285
OBS-URL: https://build.opensuse.org/package/show/Base:System/findutils?expand=0&rev=46
2013-09-25 14:15:56 +00:00

72 lines
2.1 KiB
Diff

---
doc/find.texi | 2 +-
locate/updatedb.1 | 5 ++---
locate/updatedb.sh | 1 +
3 files changed, 4 insertions(+), 4 deletions(-)
Index: doc/find.texi
===================================================================
--- doc/find.texi.orig
+++ doc/find.texi
@@ -3587,7 +3587,7 @@ Default is none.
@item --prunepaths='@var{path}@dots{}'
Directories to omit from the database, which would otherwise be
included. The environment variable @code{PRUNEPATHS} also sets this
-value. Default is @file{/tmp /usr/tmp /var/tmp /afs}. The paths are
+value. Default is @file{/tmp /usr/tmp /var/tmp /afs /var/spool}. The paths are
used as regular expressions (with @code{find ... -regex}, so you need
to specify these paths in the same way that @code{find} will encounter
them. This means for example that the paths must not include trailing
Index: locate/updatedb.1
===================================================================
--- locate/updatedb.1.orig
+++ locate/updatedb.1
@@ -75,8 +75,7 @@ Default is \fInfs NFS proc\fP.
.TP
.B \-\-output=\fIdbfile\fP
The database file to build.
-Default is system-dependent. In Debian GNU/Linux, the default
-is /var/cache/locate/locatedb.
+Default is /var/lib/locatedb.
.TP
.B \-\-localuser=\fIuser\fP
The user to search non-network directories as, using \fBsu\fP(1).
@@ -85,7 +84,7 @@ You can also use the environment variabl
.TP
.B \-\-netuser=\fIuser\fP
The user to search network directories as, using \fBsu\fP(1).
-Default is \fBdaemon\fP.
+Default is \fBnobody\fP.
You can also use the environment variable \fBNETUSER\fP to set this user.
.TP
.B \-\-old\-format
Index: locate/updatedb.sh
===================================================================
--- locate/updatedb.sh.orig
+++ locate/updatedb.sh
@@ -165,6 +165,7 @@ select_shell() {
/sfs
/tmp
/usr/tmp
+/var/spool
/var/tmp
"}
@@ -196,7 +197,7 @@ fi
export TMPDIR
# The user to search network directories as.
-: ${NETUSER=daemon}
+: ${NETUSER=nobody}
# The directory containing the subprograms.
if test -n "$LIBEXECDIR" ; then
@@ -273,6 +274,7 @@ proc
shfs
smbfs
sysfs
+unknown
"}
if test -n "$PRUNEFS"; then