Package: tiger
Version: 1:3.2.1-29
Followup-For: Bug #369501
Thanks Adam,
I was indeed eager to go to bed when doing the patch
;-)
but there is one more that slipped through : sub/check_link which is
used in find_files
here is the latest patch that include everything (hopefully !)
PS : my command to search them all is :
$ dpkg -L tiger |xargs grep ' +'|grep -i sort
--
Cyril Chaboisseau
diff -ur usr/lib/tiger/scripts.orig/check_group
usr/lib/tiger/scripts/check_group
--- usr/lib/tiger/scripts.orig/check_group 2006-04-25 23:10:51.000000000
+0200
+++ usr/lib/tiger/scripts/check_group 2006-06-08 03:01:19.000000000 +0200
@@ -92,7 +92,7 @@
do
src1=`$CAT $group1.src`
$SORT $group1 > $WORKDIR/g1name.$$
- $SORT -t: +2 -3 $group1 > $WORKDIR/g1gid.$$
+ $SORT -t: -k 3,3 $group1 > $WORKDIR/g1gid.$$
$AWK -F: '{print $1}' $WORKDIR/g1name.$$ |
$UNIQ -d |
@@ -123,7 +123,7 @@
src2=`$CAT $group2.src`
$SORT $group2 > $WORKDIR/g2name.$$
- $SORT -t: +2 -3 $group2 > $WORKDIR/g2gid.$$
+ $SORT -t: -k 3,3 $group2 > $WORKDIR/g2gid.$$
$JOIN -t: -o 1.1 1.3 2.3 $WORKDIR/g1name.$$ $WORKDIR/g2name.$$ |
{
IFS=:
diff -ur usr/lib/tiger/scripts.orig/check_inetd
usr/lib/tiger/scripts/check_inetd
--- usr/lib/tiger/scripts.orig/check_inetd 2006-04-25 23:10:51.000000000
+0200
+++ usr/lib/tiger/scripts/check_inetd 2006-06-08 03:02:20.000000000 +0200
@@ -236,11 +236,11 @@
$AWK '$6 != "internal" {print}' $infile |
$SORT > $WORKDIR/inet1.$$
# TODO: Consider this change done by ARSC:
-# $SORT +5 -6 > $WORKDIR/inet1.$$
+# $SORT -k 6,6 > $WORKDIR/inet1.$$
$AWK '$6 != "internal" {print}' $INETDFILE |
$SORT |
# TODO: Consider this change done by ARSC:
-# $SORT +5 -6 |
+# $SORT -k 6,6 |
$JOIN -j 1 -o 1.1 2.1 1.6 - $WORKDIR/inet1.$$ |
while read expservice currservice prog
do
diff -ur usr/lib/tiger/scripts.orig/check_passwd
usr/lib/tiger/scripts/check_passwd
--- usr/lib/tiger/scripts.orig/check_passwd 2006-04-25 23:10:51.000000000
+0200
+++ usr/lib/tiger/scripts/check_passwd 2006-06-08 03:02:59.000000000 +0200
@@ -197,7 +197,7 @@
$SORT $passwd2 > $WORKDIR/p2name.$$
- $SORT -t: +2 -3 $passwd2 > $WORKDIR/p2uid.$$
+ $SORT -t: -k 3,3 $passwd2 > $WORKDIR/p2uid.$$
$JOIN -t: -o 1.1 1.3 2.3 $WORKDIR/p1name.$$ $WORKDIR/p2name.$$ |
{
IFS=:
@@ -254,7 +254,7 @@
check_passwd_entries
$SORT $passwd_set > $WORKDIR/p1name.$$
- $SORT -t: +2 -3 $passwd_set > $WORKDIR/p1uid.$$
+ $SORT -t: -k 3,3 $passwd_set > $WORKDIR/p1uid.$$
# Check for duplicate usernames.
$AWK -F: '{print $1}' $WORKDIR/p1name.$$ |
diff -ur usr/lib/tiger/scripts.orig/check_passwdformat
usr/lib/tiger/scripts/check_passwdformat
--- usr/lib/tiger/scripts.orig/check_passwdformat 2006-04-25
23:10:51.000000000 +0200
+++ usr/lib/tiger/scripts/check_passwdformat 2006-06-09 14:45:55.000000000
+0200
@@ -154,7 +154,7 @@
message WARN pass001w "" "File $PW has duplicate user names"
$COLUMN "$OUT"
fi
-$AWK -F: '{ print $1 " " $3 }' $PW | $SORT -n +1 | $TEE ${TMPFILE}-1 |
+$AWK -F: '{ print $1 " " $3 }' $PW | $SORT -n -k 2 | $TEE ${TMPFILE}-1 |
$UNIQ -d -f 1 | $AWK '{ print $2 }' > ${TMPFILE}-2
if [ -s "${TMPFILE}-2" ] ; then
message WARN pass002w "" "File $PW has duplicate user ids:"
diff -ur usr/lib/tiger/scripts.orig/sub/check_links
usr/lib/tiger/scripts/sub/check_links
--- usr/lib/tiger/scripts.orig/sub/check_links 2006-04-25 23:10:37.000000000
+0200
+++ usr/lib/tiger/scripts/sub/check_links 2006-06-09 14:45:40.000000000
+0200
@@ -49,7 +49,7 @@
haveallfiles WORKDIR || exit 1
$REALPATH < $file |
-$SORT +1 > $WORKDIR/link.tmp.$$
+$SORT -k 2 > $WORKDIR/link.tmp.$$
$GREP -v '^#' $FILE_ACL |
$SORT |
