Bug#786941: marked as done (lmbench: config-run writes and results uses config file in /usr/lib)

Sun, 14 Mar 2021 14:36:16 -0700 

Your message dated Sun, 14 Mar 2021 21:33:44 +0000
with message-id <[email protected]>
and subject line Bug#786941: fixed in lmbench 3.0-a9+debian.1-4
has caused the Debian Bug report #786941,
regarding lmbench: config-run writes and results uses config file in /usr/lib
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
786941: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=786941
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message --- 
Package: lmbench
Version: 3.0-a9-1.1
Severity: important
Tags: patch

Dear Maintainer,

patches/02_paths.dpatch doesn't update config-run and results correctly,
from config-run:
> C=${BINDIR}/bin/$OS/`${SCRIPTSDIR}/config`

which means the config file gets written to /usr/lib/lmbench...

lmbench-run uses a sensible location, so I moved that path into
$BIN_DIR/config, and updated lmbench-run, config-run and results
accordingly.

Please see the attached patch which updates 02_paths.

Sorry about the git noise, but this is too annoying manually (maybe
quilt would be a better option than dpatch?)

Thanks,
~David

-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages lmbench depends on:
ii  gcc                   4:4.9.2-4
ii  libc6                 2.19-18
ii  libc6-dev [libc-dev]  2.19-18
ii  perl                  5.20.2-6

Versions of packages lmbench recommends:
ii  lmbench-doc  3.0-a9-1.1

lmbench suggests no packages.

-- no debconf information

diff --git a/lmbench-run b/lmbench-run
index c699897..fc9b211 100644
--- a/lmbench-run
+++ b/lmbench-run
@@ -10,7 +10,7 @@ SCRIPTSDIR=$BINDIR/scripts
 RESULTSDIR=$DATADIR/results
 SRCDIR=$SHAREDIR/src
 export SHAREDIR DATADIR BINDIR SCRIPTSDIR RESULTSDIR SRCDIR
-CONFIG=$DATADIR/config/`$SCRIPTSDIR/config`
+CONFIG=`$SCRIPTSDIR/config`
 
 runuid=`id -u`
 
diff --git a/patches/02_paths.dpatch b/patches/02_paths.dpatch
index be7a4b9..04b542e 100755
--- a/patches/02_paths.dpatch
+++ b/patches/02_paths.dpatch
@@ -5,9 +5,25 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/config-run lmbench-3.0/lmbench-3.0-a9/scripts/config-run
---- lmbench-3.0~/lmbench-3.0-a9/scripts/config-run	2005-09-04 05:04:28.000000000 -0600
-+++ lmbench-3.0/lmbench-3.0-a9/scripts/config-run	2006-03-21 17:50:36.000000000 -0700
+diff --git a/lmbench-3.0-a9/scripts/config b/lmbench-3.0-a9/scripts/config
+index b58cb60..2a50513 100755
+--- a/lmbench-3.0-a9/scripts/config
++++ b/lmbench-3.0-a9/scripts/config
+@@ -1,7 +1,8 @@
+ #!/bin/sh
++DATADIR=/var/lib/lmbench
+ 
+ UNAME=`uname -n 2>/dev/null`
+ if [ X$UNAME = X ]
+-then	echo CONFIG
+-else	echo CONFIG.$UNAME
++then	echo $DATADIR/config/CONFIG
++else	echo $DATADIR/config/CONFIG.$UNAME
+ fi
+diff --git a/lmbench-3.0-a9/scripts/config-run b/lmbench-3.0-a9/scripts/config-run
+index f620c15..b20252a 100755
+--- a/lmbench-3.0-a9/scripts/config-run
++++ b/lmbench-3.0-a9/scripts/config-run
 @@ -3,7 +3,10 @@
  # Configure parameters for lmbench.
  # %I% %E% %@%
@@ -20,7 +36,7 @@ diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/config-run lmbench-3.0/lmbench-3
  L='====================================================================='
  echo $L; 
  cat<<EOF;
-@@ -36,20 +39,20 @@
+@@ -132,20 +135,20 @@ export LMBENCH_SCHED
  ############################################################################
  echo $L; echo "";
  echo "Hang on, we are calculating your timing granularity."
@@ -47,7 +63,7 @@ diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/config-run lmbench-3.0/lmbench-3
  export LOOP_O
  echo "OK, it looks like your benchmark loop costs $LOOP_O usecs."
  echo ""
-@@ -164,7 +167,7 @@
+@@ -177,7 +180,7 @@ then
  fi
  if [ X$MB = X ]
  then	$ECHON "Probing system for available memory: $ECHOC"
@@ -56,7 +72,7 @@ diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/config-run lmbench-3.0/lmbench-3
  fi
  TOTAL_MEM=$MB
  MB=`echo \( $MB \* 7 \) / 10 | bc 2>/dev/null`
-@@ -192,9 +195,9 @@
+@@ -205,9 +208,9 @@ fi
  # Certain machines tend to barf when you try and bcopy 8MB.
  # Figure out how much we can use.
  echo "Checking to see if you have $MB MB; please wait for a moment..."
@@ -69,7 +85,7 @@ diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/config-run lmbench-3.0/lmbench-3
  if [ `expr $SYNC_MAX \* $MB` -gt `expr $TOTAL_MEM` ]
  then
  	MB=`expr $TOTAL_MEM / $SYNC_MAX`
-@@ -210,8 +213,8 @@
+@@ -223,8 +226,8 @@ then	echo Warning: you have only ${MB}MB available memory.
  fi
  
  echo "Hang on, we are calculating your cache line size."
@@ -80,7 +96,7 @@ diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/config-run lmbench-3.0/lmbench-3
  export LINE_SIZE
  echo "OK, it looks like your cache line is $LINE_SIZE bytes."
  echo ""
-@@ -459,7 +462,7 @@
+@@ -479,7 +482,7 @@ EOF
  	then	
  		for i in $disks
  		do	if [ -r $i ]
@@ -89,7 +105,7 @@ diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/config-run lmbench-3.0/lmbench-3
  				if [ $? -eq 1 ]
  				then	echo "Must be root to run disk benchmarks."
  					echo "Root is needed to flush the buffer cache"
-@@ -564,7 +567,7 @@
+@@ -584,7 +587,7 @@ fi
  echo $L
  echo ""
  echo "Calculating mhz, please wait for a moment..."
@@ -98,7 +114,7 @@ diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/config-run lmbench-3.0/lmbench-3
  cat<<EOF
  I think your CPU mhz is 
  
-@@ -667,11 +670,11 @@
+@@ -687,11 +690,11 @@ case $MAIL in
  		;;
  esac
  
@@ -114,7 +130,7 @@ diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/config-run lmbench-3.0/lmbench-3
  		REUSE=no
  	else	
  		REUSE=view
-@@ -685,7 +688,7 @@
+@@ -705,7 +708,7 @@ then	if [ ! -f ../bin/$OS/$INFO ]
  				;;
  			[Vv]*)	REUSE=view
  				echo $L
@@ -123,7 +139,7 @@ diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/config-run lmbench-3.0/lmbench-3
  				echo $L
  				;;
  	    		*)	REUSE=yes
-@@ -713,7 +716,7 @@
+@@ -733,7 +736,7 @@ EOF
  		then	EDITOR=$TMP
  		fi
  		if [ X$EDITOR != "none" ]
@@ -132,7 +148,7 @@ diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/config-run lmbench-3.0/lmbench-3
  		fi
  	fi
  fi
-@@ -728,9 +731,9 @@
+@@ -748,9 +751,9 @@ Send mail to [email protected] to join the list.
  
  EOF
  
@@ -140,13 +156,14 @@ diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/config-run lmbench-3.0/lmbench-3
 +VERSION=`${SCRIPTSDIR}/version`
  
 -C=../bin/$OS/`../scripts/config`
-+C=${BINDIR}/bin/$OS/`${SCRIPTSDIR}/config`
++C=`${SCRIPTSDIR}/config`
  echo DISKS=\"$DISKS\" > $C
  echo DISK_DESC=\"$DISK_DESC\" >> $C
  echo OUTPUT=$OUTPUT >> $C
-diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/config-scaling lmbench-3.0/lmbench-3.0-a9/scripts/config-scaling
---- lmbench-3.0~/lmbench-3.0-a9/scripts/config-scaling	2005-03-30 02:54:05.000000000 -0700
-+++ lmbench-3.0/lmbench-3.0-a9/scripts/config-scaling	2006-03-21 17:51:13.000000000 -0700
+diff --git a/lmbench-3.0-a9/scripts/config-scaling b/lmbench-3.0-a9/scripts/config-scaling
+index ead00ba..69bcf63 100755
+--- a/lmbench-3.0-a9/scripts/config-scaling
++++ b/lmbench-3.0-a9/scripts/config-scaling
 @@ -7,7 +7,8 @@
  # $Id$
  
@@ -157,9 +174,10 @@ diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/config-scaling lmbench-3.0/lmben
  export PATH
  
  if [ ! -f $1 ]; then exit 1; fi
-diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/do_ctx lmbench-3.0/lmbench-3.0-a9/scripts/do_ctx
---- lmbench-3.0~/lmbench-3.0-a9/scripts/do_ctx	2000-01-31 16:05:45.000000000 -0700
-+++ lmbench-3.0/lmbench-3.0-a9/scripts/do_ctx	2006-03-21 17:51:43.000000000 -0700
+diff --git a/lmbench-3.0-a9/scripts/do_ctx b/lmbench-3.0-a9/scripts/do_ctx
+index 002a6c2..9012745 100755
+--- a/lmbench-3.0-a9/scripts/do_ctx
++++ b/lmbench-3.0-a9/scripts/do_ctx
 @@ -1,7 +1,9 @@
  #!/bin/sh
  
@@ -171,9 +189,10 @@ diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/do_ctx lmbench-3.0/lmbench-3.0-a
  export PATH
  
  if [ X$MB = X ]
-diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/lmbench lmbench-3.0/lmbench-3.0-a9/scripts/lmbench
---- lmbench-3.0~/lmbench-3.0-a9/scripts/lmbench	2005-03-30 02:54:05.000000000 -0700
-+++ lmbench-3.0/lmbench-3.0-a9/scripts/lmbench	2006-03-21 17:52:08.000000000 -0700
+diff --git a/lmbench-3.0-a9/scripts/lmbench b/lmbench-3.0-a9/scripts/lmbench
+index 7a52cb1..9b5d190 100755
+--- a/lmbench-3.0-a9/scripts/lmbench
++++ b/lmbench-3.0-a9/scripts/lmbench
 @@ -7,7 +7,10 @@
  # $Id$
  
@@ -186,7 +205,7 @@ diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/lmbench lmbench-3.0/lmbench-3.0-
  export PATH
  
  if [ -f $1 ]
-@@ -235,14 +238,14 @@
+@@ -237,14 +240,14 @@ fi
  
  date >> ${OUTPUT}
  echo Local networking >> ${OUTPUT}
@@ -204,7 +223,7 @@ diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/lmbench lmbench-3.0/lmbench-3.0-
  sleep 2;
  
  if [ X$BENCHMARK_OS = XYES -o X$BENCHMARK_UDP = XYES ]; then
-@@ -278,19 +281,19 @@
+@@ -280,19 +283,19 @@ bw_tcp -S localhost
  
  if [ X$BENCHMARK_OS = XYES -o X$BENCHMARK_HTTP = XYES ]; then
  	# I want a hot cache number
@@ -228,7 +247,7 @@ diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/lmbench lmbench-3.0/lmbench-3.0-
  	sleep 10
  	echo "[ Networking remote to $remote: `$RSH $remote uname -a` ]" 1>&2
  	if [ X$BENCHMARK_OS = XYES -o X$BENCHMARK_UDP = XYES ]; then
-@@ -325,8 +328,8 @@
+@@ -327,8 +330,8 @@ do
  
  	if [ X$BENCHMARK_OS = XYES -o X$BENCHMARK_HTTP = XYES ]; then
  		# I want a hot cache number
@@ -239,16 +258,17 @@ diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/lmbench lmbench-3.0/lmbench-3.0-
  	fi
  	lat_http -S $remote 8008
  
-diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/os lmbench-3.0/lmbench-3.0-a9/scripts/os
---- lmbench-3.0~/lmbench-3.0-a9/scripts/os	2005-01-03 02:02:33.000000000 -0700
-+++ lmbench-3.0/lmbench-3.0-a9/scripts/os	2006-03-21 17:52:43.000000000 -0700
+diff --git a/lmbench-3.0-a9/scripts/os b/lmbench-3.0-a9/scripts/os
+index 31c1bcf..c47780a 100755
+--- a/lmbench-3.0-a9/scripts/os
++++ b/lmbench-3.0-a9/scripts/os
 @@ -1,4 +1,5 @@
  #!/bin/sh
 +SCRIPTSDIR=${SCRIPTSDIR:-../scripts}
  
- if [ "X$OS" != "X" ] && echo "$OS" | grep -q '`'
+ if [ "X$OS" != "X" ] && echo "$OS" | grep '`' > /dev/null
  then
-@@ -10,8 +11,8 @@
+@@ -10,8 +11,8 @@ then	OS=bloat-os
      MACHINE=`uname -m | sed -e 's/ //g' | sed -e 's?/?-?g'`
      SYSTEM=`uname -s | sed -e 's/ //g' | sed -e 's?/?-?g'`
      OS="${MACHINE}-${SYSTEM}"
@@ -259,9 +279,10 @@ diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/os lmbench-3.0/lmbench-3.0-a9/sc
      fi
      if [ -f ../../scripts/gnu-os ]
      then	OS=`../../scripts/gnu-os | sed s/unknown-//`
-diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/results lmbench-3.0/lmbench-3.0-a9/scripts/results
---- lmbench-3.0~/lmbench-3.0-a9/scripts/results	2003-03-10 01:27:51.000000000 -0700
-+++ lmbench-3.0/lmbench-3.0-a9/scripts/results	2006-03-21 17:57:03.000000000 -0700
+diff --git a/lmbench-3.0-a9/scripts/results b/lmbench-3.0-a9/scripts/results
+index cd07c15..eacde19 100755
+--- a/lmbench-3.0-a9/scripts/results
++++ b/lmbench-3.0-a9/scripts/results
 @@ -1,21 +1,24 @@
  #!/bin/sh
  
@@ -281,12 +302,12 @@ diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/results lmbench-3.0/lmbench-3.0-
  EXT=0
  
 -if [ ! -f "../bin/$OS/$CONFIG" ]
-+if [ ! -f "${BINDIR}/bin/$OS/$CONFIG" ]
++if [ ! -f "$CONFIG" ]
  then	echo "No config file?"
  	exit 1
  fi
 -. ../bin/$OS/$CONFIG
-+. ${BINDIR}/bin/$OS/$CONFIG
++. $CONFIG
  
 -if [ ! -d ../$RESULTS ]
 -then	mkdir -p ../$RESULTS
@@ -295,7 +316,7 @@ diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/results lmbench-3.0/lmbench-3.0-
  fi
  RESULTS=$BASE.$EXT
  while [ -f $RESULTS ]
-@@ -23,17 +26,17 @@
+@@ -23,17 +26,17 @@ do      EXT=`expr $EXT + 1`
  	RESULTS=$BASE.$EXT
  done
  
@@ -316,9 +337,10 @@ diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/results lmbench-3.0/lmbench-3.0-
 +	cat $RESULTS) | mail [email protected] 
  fi
  exit 0
-diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/version lmbench-3.0/lmbench-3.0-a9/scripts/version
---- lmbench-3.0~/lmbench-3.0-a9/scripts/version	2005-09-04 05:04:28.000000000 -0600
-+++ lmbench-3.0/lmbench-3.0-a9/scripts/version	2006-03-21 17:58:27.000000000 -0700
+diff --git a/lmbench-3.0-a9/scripts/version b/lmbench-3.0-a9/scripts/version
+index d55e427..3ecfcf3 100755
+--- a/lmbench-3.0-a9/scripts/version
++++ b/lmbench-3.0-a9/scripts/version
 @@ -1,10 +1,11 @@
  #!/bin/sh

--- End Message ---
--- Begin Message --- 
Source: lmbench
Source-Version: 3.0-a9+debian.1-4
Done: Al Stone <[email protected]>

We believe that the bug you reported is fixed in the latest version of
lmbench, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Al Stone <[email protected]> (supplier of updated lmbench package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Sun, 14 Mar 2021 15:07:59 -0600
Source: lmbench
Architecture: source
Version: 3.0-a9+debian.1-4
Distribution: unstable
Urgency: medium
Maintainer: Al Stone <[email protected]>
Changed-By: Al Stone <[email protected]>
Closes: 786941 902609
Changes:
 lmbench (3.0-a9+debian.1-4) unstable; urgency=medium
 .
   * Remove use of dpatch, move to default quilt usage
   * Fix up config path (Closes: #786941)
   * Use size_t not int to avoid overflow (Closes: #902609)
   * Add in Vcs-Git field to debian/control
   * Fix usage of ${perl:Depends}
   * Update Standards-Version
   * Fix lintian warnings about perl shebang, debhelper levels, native
     language encoding, lack of debug symbols, and extra white space
Checksums-Sha1:
 7380fcb178f2dd484db6d1b51b9261e684297c3f 1958 lmbench_3.0-a9+debian.1-4.dsc
 a75ea12780ba38bd52210b59a7d140c5a62c3dff 15504 
lmbench_3.0-a9+debian.1-4.debian.tar.xz
 f44e1ee34b85b429498180e110c1f619aacae141 5888 
lmbench_3.0-a9+debian.1-4_source.buildinfo
Checksums-Sha256:
 044bddfff8d1f7c898464ed817eb07b6089d597aeb6887e533798578dbad74a7 1958 
lmbench_3.0-a9+debian.1-4.dsc
 1f7e728ecc1f6d3ab0bf9ded5b30ef1558fbec8f1ed706a405d2259084f4b85e 15504 
lmbench_3.0-a9+debian.1-4.debian.tar.xz
 51e5b33c1865ff5c9e4cdb49f68bb600cdc177c24192779f57120f21cf3f7743 5888 
lmbench_3.0-a9+debian.1-4_source.buildinfo
Files:
 ab81510c65057ca6178b92254ae2b57a 1958 non-free/admin optional 
lmbench_3.0-a9+debian.1-4.dsc
 299840e9c34e49c669f1bc8698d8ee41 15504 non-free/admin optional 
lmbench_3.0-a9+debian.1-4.debian.tar.xz
 f55759c1527532c21bc7387d45e0d5b7 5888 non-free/admin optional 
lmbench_3.0-a9+debian.1-4_source.buildinfo

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEiclaKI7ZGQ+4GJLWUwywAtdhsWwFAmBOfC0ACgkQUwywAtdh
sWx3oxAAvMhzjKE7LKbs5KooI9bMVqWWz0G6hTt0/bq9V1udfqMAELRiZVvZh2+4
sF8umqT1TPbkYXbsZJzrXEpjDadjIgRT0G9x5Kfvrd4VEK+CUrbEy4yuK6GtoGKV
l2nwj19DBEgPoZTjmD90yAn3mR3FdqnhF1K3/iaaXLs7TWAy/w+gCyAHVQfLSPBu
39uQNE2ui8eOhTFmo3AyrSaoQT8vCZo1NRTBioxi6LTVDVqN9Yn/IV0q+1PEcTME
cXs9+Nsx0NG0fPid7oiYmv/jgxiDgtHS+G0DFJl3Z7M0WYWCcrvx+53g/BO7QRFd
mXxmLsdIs6UXyde9z68/YeXskIvSyET6w3mkZO5IJbOR55R0UKNEboTLmd7c4dGx
vkHtzvmtlIMBbvgUG3rffTn6jIM2/sYzBiXLcBOxw8p62NGC9we7ll94NxYV+87c
BM3kW//0oFnMgdUXODoocUNtM7TBuUKSxHDyzGgQoCznYUikScIiBxmtOojcuCPy
gerbNu8huiyYwMauqdj3IQl2MjGVui8Km6PrlYzNqike6DIxxsa/WHDrBWOZOcZo
46h283NbF3AVAPawiN/J9lYe0rTNssgy8E55P433ivM6ijIL/l6G2Ddq1nS/bMhO
v56oU2pRl1OGMOz0JQQq7mN7tzO5moddXWEm+sWy9H9pryRPrCw=
=ih8n
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to