OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Feb-2005 09:08:12
Branch: HEAD Handle: 2005021108081200
Added files:
openpkg-src/findutils findutils.patch
Modified files:
openpkg-src/findutils findutils.spec rc.findutils
Log:
simplify sort and tmpdir hacking; fix su(1) usage under non-Linux
systems
Summary:
Revision Changes Path
1.3 +39 -0 openpkg-src/findutils/findutils.patch
1.60 +5 -5 openpkg-src/findutils/findutils.spec
1.12 +1 -0 openpkg-src/findutils/rc.findutils
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/findutils/findutils.patch
============================================================================
$ cvs diff -u -r0 -r1.3 findutils.patch
--- /dev/null 2005-02-11 09:08:12 +0100
+++ findutils.patch 2005-02-11 09:08:12 +0100
@@ -0,0 +1,39 @@
+Index: locate/updatedb.sh
+--- locate/updatedb.sh.orig 2005-02-11 08:51:54 +0100
++++ locate/updatedb.sh 2005-02-11 08:52:57 +0100
+@@ -166,7 +166,7 @@
+ if test -n "$SEARCHPATHS"; then
+ if [ "$LOCALUSER" != "" ]; then
+ # : A1
+- su $LOCALUSER -s $SHELL -c \
++ su $LOCALUSER -c \
+ "$find $SEARCHPATHS $FINDOPTIONS \
+ \\( $prunefs_exp \
+ -type d -regex '$PRUNEREGEX' \\) -prune -o $print_option"
+@@ -182,7 +182,7 @@
+ myuid=`getuid`
+ if [ "$myuid" = 0 ]; then
+ # : A3
+- su $NETUSER -s $SHELL -c \
++ su $NETUSER -c \
+ "$find $NETPATHS $FINDOPTIONS \\( -type d -regex '$PRUNEREGEX' -prune
\\) -o $print_option" ||
+ exit $?
+ else
+@@ -236,7 +236,7 @@
+ if test -n "$SEARCHPATHS"; then
+ if [ "$LOCALUSER" != "" ]; then
+ # : A5
+- su $LOCALUSER -s $SHELL -c \
++ su $LOCALUSER -c \
+ "$find $SEARCHPATHS $FINDOPTIONS \
+ \( $prunefs_exp \
+ -type d -regex '$PRUNEREGEX' \) -prune -o $print_option" || exit $?
+@@ -252,7 +252,7 @@
+ myuid=`getuid`
+ if [ "$myuid" = 0 ]; then
+ # : A7
+- su $NETUSER -s $SHELL -c \
++ su $NETUSER -c \
+ "$find $NETPATHS $FINDOPTIONS \\( -type d -regex '$PRUNEREGEX' -prune
\\) -o $print_option" ||
+ exit $?
+ else
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/findutils/findutils.spec
============================================================================
$ cvs diff -u -r1.59 -r1.60 findutils.spec
--- openpkg-src/findutils/findutils.spec 8 Feb 2005 18:48:42 -0000
1.59
+++ openpkg-src/findutils/findutils.spec 11 Feb 2005 08:08:12 -0000
1.60
@@ -34,11 +34,12 @@
Group: Utility
License: GPL
Version: 4.2.17
-Release: 20050208
+Release: 20050211
# list of sources
Source0: ftp://alpha.gnu.org/gnu/findutils/findutils-%{version}.tar.gz
Source1: rc.findutils
+Patch0: findutils.patch
# build information
Prefix: %{l_prefix}
@@ -60,9 +61,7 @@
%prep
%setup -q
- %{l_shtool} subst \
- -e 's;| sort ;| %{l_prefix}/bin/gsort -T `%{l_rc} --query
findutils_tmpdir` ;g' \
- locate/updatedb.sh
+ %patch -p0
%build
CC="%{l_cc}"
@@ -71,7 +70,8 @@
case "%{l_platform -t}" in
*-freebsd* ) CPPFLAGS="-DHAVE_F_FSTYPENAME_IN_STATFS" ;;
esac
- export CC CFLAGS CPPFLAGS
+ SORT="%{l_prefix}/bin/gsort"
+ export CC CFLAGS CPPFLAGS SORT
./configure \
--prefix=%{l_prefix} \
--libexecdir=%{l_prefix}/libexec/findutils \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/findutils/rc.findutils
============================================================================
$ cvs diff -u -r1.11 -r1.12 rc.findutils
--- openpkg-src/findutils/rc.findutils 30 Jan 2004 10:06:39 -0000
1.11
+++ openpkg-src/findutils/rc.findutils 11 Feb 2005 08:08:12 -0000
1.12
@@ -15,6 +15,7 @@
%daily -u @l_susr@
rcService findutils enable yes || exit 0
+ TMPDIR="$findutils_tmpdir" \
@l_prefix@/bin/updatedb \
--localpaths="${findutils_localpaths}" \
--netpaths="${findutils_netpaths}" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
