head 1.8; access; symbols OPENPKG_E1_MP_HEAD:1.8 OPENPKG_E1_MP:1.8 OPENPKG_E1_MP_2_STABLE:1.7.4.1 OPENPKG_E1_FP:1.7.4.1 OPENPKG_2_STABLE_MP:1.8 OPENPKG_2_STABLE_20061018:1.7.4.1 OPENPKG_2_STABLE_20060622:1.7 OPENPKG_2_STABLE:1.7.0.4 OPENPKG_2_STABLE_BP:1.7 OPENPKG_2_5_RELEASE:1.7 OPENPKG_2_5_SOLID:1.7.0.2 OPENPKG_2_5_SOLID_BP:1.7 OPENPKG_2_4_RELEASE:1.6 OPENPKG_2_4_SOLID:1.6.0.2 OPENPKG_2_4_SOLID_BP:1.6 OPENPKG_CW_FP:1.6 OPENPKG_2_3_RELEASE:1.5 OPENPKG_2_3_SOLID:1.5.0.2 OPENPKG_2_3_SOLID_BP:1.5 OPENPKG_2_2_RELEASE:1.1 OPENPKG_2_2_SOLID:1.1.0.4 OPENPKG_2_2_SOLID_BP:1.1 OPENPKG_2_1_RELEASE:1.1 OPENPKG_2_1_SOLID:1.1.0.2 OPENPKG_2_1_SOLID_BP:1.1; locks; strict; comment @# @; 1.8 date 2006.08.24.10.07.28; author rse; state Exp; branches; next 1.7; commitid PYs6anSxh6gq95Kr; 1.7 date 2005.06.21.19.04.14; author rse; state Exp; branches 1.7.4.1; next 1.6; 1.6 date 2005.03.08.11.04.05; author ms; state Exp; branches; next 1.5; 1.5 date 2005.02.16.20.31.18; author rse; state Exp; branches; next 1.4; 1.4 date 2005.02.11.19.21.42; author rse; state Exp; branches; next 1.3; 1.3 date 2005.02.11.08.08.12; author rse; state Exp; branches; next 1.2; 1.2 date 2004.12.06.19.03.37; author rse; state dead; branches; next 1.1; 1.1 date 2004.06.04.08.18.20; author tho; state Exp; branches; next ; 1.7.4.1 date 2006.10.16.14.49.57; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.8 log @finally upgrade to latest version and cleanup packages by removing obsolete hacks @ text @Index: configure --- configure.orig 2006-08-05 20:54:49 +0200 +++ configure 2006-08-24 12:00:28 +0200 @@@@ -16231,6 +16231,7 @@@@ +LIBOBJS="$LIBOBJS regex.$ac_objext" { echo "$as_me:$LINENO: checking for C/C++ restrict keyword" >&5 Index: locate/updatedb.sh --- locate/updatedb.sh.orig 2006-06-14 23:19:51 +0200 +++ locate/updatedb.sh 2006-08-24 12:00:05 +0200 @@@@ -137,6 +137,7 @@@@ : ${LOCATE_DB=@@LOCATE_DB@@} # Directory to hold intermediate files. +if [ ".$TMPDIR" = . ]; then if test -d /var/tmp; then : ${TMPDIR=/var/tmp} elif test -d /usr/tmp; then @@@@ -144,7 +145,7 @@@@ else : ${TMPDIR=/tmp} fi -export TMPDIR +fi # The user to search network directories as. : ${NETUSER=daemon} @ 1.7 log @ops, sorry. The patching was not finished. @ text @d1 11 d13 3 a15 3 --- locate/updatedb.sh.orig 2005-06-19 11:11:59 +0200 +++ locate/updatedb.sh 2005-06-21 20:59:47 +0200 @@@@ -136,6 +136,7 @@@@ d23 1 a23 1 @@@@ -143,7 +144,7 @@@@ @ 1.7.4.1 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 11 Index: configure --- configure.orig 2006-08-05 20:54:49 +0200 +++ configure 2006-08-24 12:00:28 +0200 @@@@ -16231,6 +16231,7 @@@@ +LIBOBJS="$LIBOBJS regex.$ac_objext" { echo "$as_me:$LINENO: checking for C/C++ restrict keyword" >&5 d2 3 a4 3 --- locate/updatedb.sh.orig 2006-06-14 23:19:51 +0200 +++ locate/updatedb.sh 2006-08-24 12:00:05 +0200 @@@@ -137,6 +137,7 @@@@ d12 1 a12 1 @@@@ -144,7 +145,7 @@@@ @ 1.6 log @upgrading package: findutils 4.2.18 -> 4.2.19 @ text @d2 3 a4 3 --- locate/updatedb.sh.orig 2005-01-29 18:34:23 +0100 +++ locate/updatedb.sh 2005-02-11 20:20:27 +0100 @@@@ -108,6 +108,7 @@@@ d12 1 a12 1 @@@@ -115,7 +116,7 @@@@ a20 36 @@@@ -166,7 +167,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 +183,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 +237,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 +253,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 @ 1.5 log @port no non-C99 compilers @ text @a56 15 Index: find/find.c --- find/find.c.orig Wed Feb 16 10:51:08 2005 +++ find/find.c Wed Feb 16 21:30:18 2005 @@@@ -1092,9 +1092,10 @@@@ enum ChdirSymlinkHandling symlink_handling) { int extraflags = following_links() ? O_NOFOLLOW : 0; + int fd; errno = 0; - int fd = open(dest, O_RDONLY|extraflags); + fd = open(dest, O_RDONLY|extraflags); if (fd < 0) { switch (errno) @ 1.4 log @Make sure the TMPDIR is not overwritten in updatedb. Submitted by Bill Campbell. @ text @d57 15 @ 1.3 log @simplify sort and tmpdir hacking; fix su(1) usage under non-Linux systems @ text @d2 20 a21 3 --- 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 @@@@ d30 1 a30 1 @@@@ -182,7 +182,7 @@@@ d39 1 a39 1 @@@@ -236,7 +236,7 @@@@ d48 1 a48 1 @@@@ -252,7 +252,7 @@@@ @ 1.2 log @upgrading package: findutils 4.2.5 -> 4.2.10 @ text @d1 38 a38 5 Index: find/fstype.c --- find/fstype.c.orig 2004-06-03 17:18:01.000000000 +0200 +++ find/fstype.c 2004-06-04 09:52:45.000000000 +0200 @@@@ -343,7 +343,7 @@@@ } a39 6 { -#ifdef HAVE_F_FSTYPENAME_IN_STATFS +#if defined (HAVE_F_FSTYPENAME_IN_STATFS) || defined (__NetBSD__) type = xstrdup (fss.f_fstypename); #else type = fstype_to_string (fss.f_type); @ 1.1 log @how to get fstypename on NetBSD @ text @@