File seccheck-2.0_update-datafiles-regexfix-bug51004.diff of Package seccheck.import5707

diff -ru seccheck-2.0.orig/security-daily.sh seccheck-2.0/security-daily.sh
--- seccheck-2.0.orig/security-daily.sh	2005-07-27 14:51:58.000000000 +0200
+++ seccheck-2.0/security-daily.sh	2005-07-27 16:35:53.000000000 +0200
@@ -134,7 +134,7 @@
                 next;
         if (NF != 4)
                 printf("Line %d has the wrong number of fields.\n", NR+1);
-        if ($1 !~ /^[A-za-z0-9][A-za-z0-9_-]*$/)
+        if ($1 !~ /^[A-Za-z0-9][A-Za-z0-9_-]*$/)
                 printf("Group %s has non-alphanumeric characters.\n", $1);
         if (length($1) > 32)
                 printf("Group %s has more than 32 characters.\n", $1);
diff -ru seccheck-2.0.orig/security-weekly.sh seccheck-2.0/security-weekly.sh
--- seccheck-2.0.orig/security-weekly.sh	2005-07-27 16:07:41.000000000 +0200
+++ seccheck-2.0/security-weekly.sh	2005-07-27 16:45:44.000000000 +0200
@@ -95,9 +95,8 @@
 if [ -s "$OUT" ] ; then
     printf "\nThe following files are suid/sgid:\n"
     cat "$OUT"
-    mv "$SEC_DATA/sbit.new" "$SEC_DATA/sbit"
 fi
-rm -f "$SEC_DATA/sbit.new"
+mv "$SEC_DATA/sbit.new" "$SEC_DATA/sbit"
 
 # writeable executable check
 ( nice -n 1 find $MNT \( -perm -30 -o -perm -3 \) -mount -type f | sort | xargs ls -cdl --time-style=long-iso -- > "$SEC_DATA/write-bin.new" ) 2> /dev/null
@@ -106,9 +105,8 @@
 if [ -s "$OUT" ] ; then
     printf "\nThe following program executables are group/world writeable:\n"
     cat "$OUT"
-    mv "$SEC_DATA/write-bin.new" "$SEC_DATA/write-bin"
 fi
-rm -f "$SEC_DATA/write-bin.new"
+mv "$SEC_DATA/write-bin.new" "$SEC_DATA/write-bin"
 
 # world writable check
 ( nice -n 1 find $MNT -perm -2 \( -type f -o -type d \) -not -perm -01000 -mount | sort > "$SEC_DATA/write.new" ) 2> /dev/null
@@ -117,9 +115,8 @@
 if [ -s "$OUT" ] ; then
     printf "\nThe following files/directories are world writeable and not sticky:\n"
     cat "$OUT"
-    mv "$SEC_DATA/write.new" "$SEC_DATA/write"
 fi
-rm -f "$SEC_DATA/write.new"
+mv "$SEC_DATA/write.new" "$SEC_DATA/write"
 
 # md5 check
 nice -n 1 rpm -Va 2> /dev/null | grep '^..5' > "$SEC_DATA/rpm-md5.new"
@@ -128,11 +125,12 @@
 if [ -s "$OUT" ] ; then
     printf "\nThe following programs have got a different md5 checksum since last week:\n"
     cat "$OUT"
-    mv "$SEC_DATA/rpm-md5.new" "$SEC_DATA/rpm-md5"
 fi
-rm -f "$SEC_DATA/rpm-md5.new"
+mv "$SEC_DATA/rpm-md5.new" "$SEC_DATA/rpm-md5"
 
 # device check
+# warning: bug #51004 ls output depends on root's locale and may be less
+# then 10 tokens!
 ( nice -n 1 find $MNT -type c -or -type b -mount | xargs ls -cdl -- | \
 	awk '{print $1 " \t" $3 " \t" $4 " \t" $5 " \t" $6 " \t" $10}' | sort +5 \
 	> "$SEC_DATA/devices.new" ) 2> /dev/null
@@ -141,9 +139,8 @@
 if [ -s "$OUT" ] ; then
     printf "\nThe following devices were added:\n"
     cat "$OUT"
-    mv "$SEC_DATA/devices.new" "$SEC_DATA/devices"
 fi
-rm -f "$SEC_DATA/devices.new"
+mv "$SEC_DATA/devices.new" "$SEC_DATA/devices"
 
 ####
 #