--- lmbench-3.0-a9.orig/debian/README.Debian +++ lmbench-3.0-a9/debian/README.Debian @@ -0,0 +1,33 @@ +lmbench for Debian +------------------ + +The original sources have been changed in order to work in +pacakged form (they were supposed to work in a single tarball). +Lmbench scripts and binaries have been placed in /usr/lib/lmbench +in order to avoid binary namespace pollution. + +I've tried to change all the scripts in order to break the dependencies +in them: +Results are placed at /var/lib/lmbench/results +Scripts are placed at /usr/share/lmbench/scripts/ +Binaries are placed at /usr/lib/lmbench/ +Temporaries are no longer placed in /usr/tmp but /var/tmp + +Warning: some manpages have been removed from the package due to +overlapping with other binary manpages (they take common names like +'clock', 'timing'). If you wish to consult these manpages, until +this issues are fixed, download the source package and go to the +doc/ subdirectory. + +Warning! Warning!: The lmbench-run wrapper script will not run unless +run by root. However, we have not thoroughly tested lmbench code to +see that it does not contain potential damaging scripts. Be careful +when running the benchmark and, if in doubt, create a user/group +which keeps control of the mentioned directories (ie can write in +them) and run the benchmark as that user. + + -- Javier Fernandez-Sanguino , Tue, 19 Feb 2002 22:01:31 +0100 + +Updates by: + -- Al Stone Sun, 22 Feb 2009 18:20:00 -0700 + --- lmbench-3.0-a9.orig/debian/changelog +++ lmbench-3.0-a9/debian/changelog @@ -0,0 +1,154 @@ +lmbench (3.0-a9-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Do not ship /var/{run,tmp}/lmbench. (Closes: #689897) + * Add Homepage: http://www.bitmover.com/lmbench/ + * Fix typos. (Closes: #626676, #697536, #707013) + + -- Andreas Beckmann Wed, 28 Jan 2015 19:08:15 +0100 + +lmbench (3.0-a9-1) unstable; urgency=low + + * Update to latest upstream (3.0-a9). + * Update to latest Standards-Version. + * Incorporate Ubuntu patch: depend on libc6-dev (LP: #246618) + * Closes: bug#470279 -- replaced all uses of /usr/tmp with /var/tmp + * Closes: bug#496427 -- removed risk of /tmp symlink attacks by moving + all usage of /tmp to /var/tmp/lmbench + + -- Al Stone Sun, 22 Feb 2009 18:20:00 -0700 + +lmbench (3.0-a7-1) unstable; urgency=low + + * Update to latest upstream. + * Update to latest Standards-Version. + + -- Al Stone Sat, 21 Oct 2006 18:29:00 -0600 + +lmbench (3.0-a5-3) unstable; urgency=low + + * Closes: bug#358785 -- missing manpage causes dangling symlinks + * bw_tcp.8 had wrong .TH man header value + + -- Al Stone Sun, 2 Apr 2006 16:48:02 -0600 + +lmbench (3.0-a5-2) unstable; urgency=low + + * Closes: bug#299064 -- remove use of swear word as name of a script + + -- Al Stone Wed, 22 Mar 2006 15:57:17 -0700 + +lmbench (3.0-a5-1) unstable; urgency=low + + * Update to latest source (http://sourceforge.net.projects/lmbench). + * Toss out the old build method (dependent on BitKeeper) and replace + with patches to upstream tarball. + * Update Debian standards version. + * Closes: bug#296594: lmbench-run fails upon saving configuration + * Closes: bug#302662: 'man lmbench' typos: "fundemental" + + -- Al Stone Tue, 21 Mar 2006 23:22:01 -0700 + +lmbench (2.0-patch2-9) unstable; urgency=low + + * Update to latest source. + * Closes: bug#267207 -- sparc binaries are 64-bit; needed to build + and upload on sparc, sparc64 + * Closes: bug#270782 -- clock(8) man page still conflicting; needed + to build and upload for PowerPC + * Closes: bug#271251 -- recent version not available for PowerPC; + needed to build and upload for PowerPC + * Closes: bug#273446 -- typo in Makefile and PPC build failed; fixed, + rebuilt and uploaded + + -- Al Stone Wed, 13 Oct 2004 16:18:45 -0600 + +lmbench (2.0-patch2-8) unstable; urgency=low + + * Actually close #260792 this time -- thinko. + + -- Al Stone Thu, 2 Sep 2004 17:44:12 -0600 + +lmbench (2.0-patch2-7) unstable; urgency=low + + * Verified that source was up-to-date + * Major cleanup on the build and install + * Fixed all of the compilation warnings for ia64 + * Added /usr/share/doc/lmbench-doc to include copies of all man pages + since there are overlaps with other packages that need to be avoided. + * Moved /usr/include/* files to /usr/include/lmbench/* to avoid future + collisions + * Closes: bug#260783 -- collides with plotutils (graph.1.gz) + * Closes: bug#260792 -- collides with util-linux (clock.8.gz) + * Removed bargraph.1.gz from lmbench, put in lmbench-doc to minimize + future collisions + * Removed {hello,flushdisk,memsize}.8.gz from lmbench, put in the + lmbench-doc package to minimize future collisions + + -- Al Stone Thu, 2 Sep 2004 15:08:12 -0600 + +lmbench (2.0-patch2-6) unstable; urgency=low + + * Removed the need to have BitKeeper at all, which should allow us to + build most anywhere + * Cleaned up most of the remaining lintian stuff + * Closes: bug#216883: ITA -- set myself as new maintainer + * Updated Debian standards compliance + + -- Al Stone Tue, 20 Jul 2004 21:36:22 -0600 + +lmbench (2.0-patch2-5) unstable; urgency=low + + * Make the test run use a directory in the package (which is cleaned + afterwards) + * Only call 'bk' on clean if it's available + * Minor lintian fix + + -- Javier Fernandez-Sanguino Pen~a Thu, 10 Jun 2004 01:38:43 +0200 + +lmbench (2.0-patch2-4) unstable; urgency=low + + * Fixed location of results in README.Debian + + -- Javier Fernandez-Sanguino Pen~a Mon, 10 Jun 2002 14:34:31 +0200 + +lmbench (2.0-patch2-3.1) unstable; urgency=low + + * A possible fix for arm contributed by Agustin Martin Domingo + (Closes: #138260). + * Please test this in arm box + - src/Makefile: Changing CFLAGS=-O to CFLAGS=$(OPTIMIZATION) + - debian/rules: using dpkg-architecture to guess target system and set + OPTIMIZATION accordingly. + + -- Javier Fernandez-Sanguino Pen~a Tue, 14 May 2002 19:31:52 +0200 + +lmbench (2.0-patch2-3) unstable; urgency=high + + * Moved to non-free (Closes: #139039) + * Fixed description (Closes: #141148) + * Fixed lmbench-run which pointed users (in the end) to go to /usr + instead of /var (as fixed in -2) (Closes: #138563) + + -- Javier Fernandez-Sanguino Pen~a Fri, 5 Apr 2002 16:46:15 +0200 + +lmbench (2.0-patch2-2) unstable; urgency=medium + + * Added CONFIGDIR and make it point to /var/lib/lmbench/config + * Configuration now saved in $CONFIGDIR (Closes: #137919) + * Results now saved in $RESULTSDIR under /var/... + * Changed --purge so it removes the created files under /var/... + * Created a RUNDIR so that compilation (gnu-os script) is done + there just in case any cruft (tempfiles) are left there. + + -- Javier Fernandez-Sanguino Pen~a Tue, 12 Mar 2002 10:39:16 +0100 + +lmbench (2.0-patch2-1) unstable; urgency=low + + * Initial Release. + * Changed the code so it works in Debian GNU/Linux by placing + all files in /usr/share and adding a wrapper script (lmbench-run) + to run the configuration and result generation + + -- Javier Fernandez-Sanguino Pen~a Tue, 19 Feb 2002 22:01:31 +0100 + --- lmbench-3.0-a9.orig/debian/compat +++ lmbench-3.0-a9/debian/compat @@ -0,0 +1 @@ +4 --- lmbench-3.0-a9.orig/debian/control +++ lmbench-3.0-a9/debian/control @@ -0,0 +1,36 @@ +Source: lmbench +Section: non-free/admin +Priority: optional +Maintainer: Al Stone +Build-Depends: docbook-to-man, debhelper (>> 3.0.0), dpatch +Standards-Version: 3.8.0 +Homepage: http://www.bitmover.com/lmbench/ + +Package: lmbench +Architecture: any +Recommends: lmbench-doc +Depends: gcc, perl, libc6-dev | libc-dev, ${shlibs:Depends} +Description: Utilities to benchmark UNIX systems + Lmbench is a set of utilities to test the performance + of a unix system producing detailed results as well + as providing tools to process them. It includes a series of + micro benchmarks that measure some basic operating + system and hardware metrics: + . + * file reading and summing + * memory bandwidth while reading, writing and copying + * copying data through pipes + * copying data through Unix sockets + * reading data through TCP/IP sockets + +Package: lmbench-doc +Section: non-free/admin +Architecture: all +Description: Documentation for the lmbench benchmark suite + This package provides all the documentation included + in the lmbench benchmark software. This includes: + . + * references to published articles + * presentations made by lmbench authors + * the rebuttal of an article claiming lmbench is flawed + --- lmbench-3.0-a9.orig/debian/copyright +++ lmbench-3.0-a9/debian/copyright @@ -0,0 +1,40 @@ +This package was debianized by +Javier Fernandez-Sanguino on +Tue, 19 Feb 2002 22:01:31 +0100. + +It was downloaded from http://www.bitmover.com/lmbench + +Upstream Authors: +Larry McVoy - Silicon Graphics +Carl Staelin - Hewlett Packard Laboratories + +Copyright (c) 1996-2009, Larry McVoy and Carl Staelin + +Lmbench is distributed under the GNU GPL license, you can +find a copy of this license in a Debian system under the +/usr/share/common-licenses/ directory. + +The authors, however, impose several restrictions (shown +below). Note that these restrictions affect *only* the +distribution of results collected from running lmbench, +and do *not* preclude one from building, modifying or +distributing the lmbench source code or the binaries +resulting from compiling the source code; i.e., the +*results* of running the benchmarks have restrictions, +but the *source code* for lmbench is distributed under +the GPL. + +--------------------------------------------------------------------- +The set of programs and documentation known as "lmbench" are distributed +under the Free Software Foundation's General Public License with the +following additional restrictions (which override any conflicting +restrictions in the GPL): + +1. You may not distribute results in any public forum, in any publication, + or in any other way if you have modified the benchmarks. + +2. You may not distribute the results for a fee of any kind. This includes + web sites which generate revenue from advertising. + +If you have modifications or enhancements that you wish included in +future versions, please mail those to me, Larry McVoy, at lm@bitmover.com. --- lmbench-3.0-a9.orig/debian/info +++ lmbench-3.0-a9/debian/info @@ -0,0 +1 @@ +scripts/SCCS/s.info --- lmbench-3.0-a9.orig/debian/lmbench-doc.dirs +++ lmbench-3.0-a9/debian/lmbench-doc.dirs @@ -0,0 +1,2 @@ +usr/share/doc/lmbench-doc +usr/share/doc/lmbench-doc/man --- lmbench-3.0-a9.orig/debian/lmbench-run +++ lmbench-3.0-a9/debian/lmbench-run @@ -0,0 +1,27 @@ +#!/bin/sh +# Wrapper script for lmbench written for the +# Debian GNU/Linux distribution by +# Javier Fernandez-Sanguino. +# Distributed under the GPL +SHAREDIR=/usr/share/lmbench +DATADIR=/var/lib/lmbench +BINDIR=/usr/lib/lmbench +SCRIPTSDIR=$BINDIR/scripts +RESULTSDIR=$DATADIR/results +SRCDIR=$SHAREDIR/src +export SHAREDIR DATADIR BINDIR SCRIPTSDIR RESULTSDIR SRCDIR +CONFIG=$DATADIR/config/`$SCRIPTSDIR/config` + +runuid=`id -u` + +[ $runuid -gt 0 ] && { + echo "You must run this as the root user" + exit 0 +} +cd $SCRIPTSDIR +[ ! -f $CONFIG ] && ./config-run +./results + +echo "Benchmark run finished...." +echo "Remember you can find the results of the benchmark " +echo "under $RESULTSDIR" --- lmbench-3.0-a9.orig/debian/lmbench-run.sgml +++ lmbench-3.0-a9/debian/lmbench-run.sgml @@ -0,0 +1,119 @@ + manpage.1'. You may view + the manual page with: `docbook-to-man manpage.sgml | nroff -man | + less'. A typical entry in a Makefile or Makefile.am is: + +manpage.1: manpage.sgml + docbook-to-man $< > $@ + --> + Javier"> + Fernandez-Sanguino Peņa"> + + 27th february 27, 2002"> + + 1"> + jfs@computer.org"> + + LMBENCH"> + + + Debian GNU/Linux"> + GNU"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2002 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + run a benchmarking suite for UNIX systems + + + + &dhpackage; + + + + DESCRIPTION + + This manual page documents briefly the + &dhpackage; package . + + This manual page was written for the &debian; distribution + because the original program does not have a manual page. + + &dhpackage; is a wrapper program to run + the lmbench benchmarking suite in Debian GNU/Linux. + Due to the nature of this program you should first check that the + system is in the condition you want to test it and be sure to run + this as the root user. + + &dhpackage; will first configure the + benchmark and adapt it to your system and then run it. The real + programs that make the benchmark are at /usr/share/lmbench/. + + + + OPTIONS + + There are no options used by &dhpackage; + + + + + SEE ALSO + + lmbench (3), lmbench (8) lmbench-results (1). + + + + AUTHOR + + This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). Permission is + granted to copy, distribute and/or modify this document under + the terms of the GNU Free Documentation + License, Version 1.1 or any later version published by the Free + Software Foundation; with no Invariant Sections, no Front-Cover + Texts and no Back-Cover Texts. + + + + + --- lmbench-3.0-a9.orig/debian/lmbench.dirs +++ lmbench-3.0-a9/debian/lmbench.dirs @@ -0,0 +1,15 @@ +usr/bin +usr/include/lmbench +usr/lib +usr/lib/lmbench +usr/lib/lmbench/scripts +usr/share/doc +usr/share/doc/lmbench +usr/share/lmbench +usr/share/lmbench/src +usr/share/man +usr/share/man/man1 +usr/share/man/man3 +usr/share/man/man8 +var/lib/lmbench/config +var/lib/lmbench/results --- lmbench-3.0-a9.orig/debian/patches/00list +++ lmbench-3.0-a9/debian/patches/00list @@ -0,0 +1,9 @@ +# which patches to be applied in what order +01_clean_script_warnings.dpatch +02_paths.dpatch +03_man_pages.dpatch +04_bw_tcp.dpatch +05_no_usr_write.dpatch +06_lmbench3_man.dpatch +07_tmp_symlinks.dpatch +08_defaultfsdir.dpatch --- lmbench-3.0-a9.orig/debian/patches/01_clean_script_warnings.dpatch +++ lmbench-3.0-a9/debian/patches/01_clean_script_warnings.dpatch @@ -0,0 +1,246 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_clean_script_warnings.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/SHIT lmbench-3.0/lmbench-3.0-a9/scripts/SHIT +--- lmbench-3.0~/lmbench-3.0-a9/scripts/SHIT 2000-01-31 16:05:45.000000000 -0700 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/SHIT 2006-03-20 19:27:32.000000000 -0700 +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/env perl + # Go find perl if we are running this as a shell script. + eval 'exec perl -Ssw $0 "$@"' + if 0; +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/allctx lmbench-3.0/lmbench-3.0-a9/scripts/allctx +--- lmbench-3.0~/lmbench-3.0-a9/scripts/allctx 2000-01-31 17:29:31.000000000 -0700 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/allctx 2006-03-20 19:26:45.000000000 -0700 +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/env perl + # Extract the context switching information from lmbench result files. + # Usage: getctx file file.... + # +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/allmem lmbench-3.0/lmbench-3.0-a9/scripts/allmem +--- lmbench-3.0~/lmbench-3.0-a9/scripts/allmem 2000-01-31 17:29:31.000000000 -0700 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/allmem 2006-03-20 19:20:45.000000000 -0700 +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/env perl + # Extract the memory latency graph data from lmbench result files. + # + # Hacked into existence by Larry McVoy (lm@sun.com now lm@sgi.com). +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/bargraph lmbench-3.0/lmbench-3.0-a9/scripts/bargraph +--- lmbench-3.0~/lmbench-3.0-a9/scripts/bargraph 2000-01-31 17:29:31.000000000 -0700 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/bargraph 2006-03-20 19:23:21.000000000 -0700 +@@ -1,3 +1,4 @@ ++#!/usr/bin/env perl + # $Id$ + eval 'exec perl -Ss $0 "$@"' + if 0; +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/bghtml lmbench-3.0/lmbench-3.0-a9/scripts/bghtml +--- lmbench-3.0~/lmbench-3.0-a9/scripts/bghtml 2000-01-31 17:29:31.000000000 -0700 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/bghtml 2006-03-20 19:23:42.000000000 -0700 +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/env perl + # Make HTML files that will point to the right GIF files. + # Usage: bghtml file file file.... + # +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/depend lmbench-3.0/lmbench-3.0-a9/scripts/depend +--- lmbench-3.0~/lmbench-3.0-a9/scripts/depend 2000-01-31 17:29:31.000000000 -0700 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/depend 2006-03-20 19:20:29.000000000 -0700 +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/env perl + # Figure out dependencies for lmbench src. + # + # Hacked into existence by Larry McVoy (lm@sun.com now lm@sgi.com). +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/getbg lmbench-3.0/lmbench-3.0-a9/scripts/getbg +--- lmbench-3.0~/lmbench-3.0-a9/scripts/getbg 2005-09-04 05:04:28.000000000 -0600 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/getbg 2006-03-20 19:25:06.000000000 -0700 +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/env perl + # Extract bargraph data from lmbench results. + # Usage: getbg file file file.... + # +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/getbw lmbench-3.0/lmbench-3.0-a9/scripts/getbw +--- lmbench-3.0~/lmbench-3.0-a9/scripts/getbw 2000-01-31 17:29:31.000000000 -0700 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/getbw 2006-03-20 19:23:02.000000000 -0700 +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/env perl + # Extract the bandwith information. + # Usage: getbw file file.... + # +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/getctx lmbench-3.0/lmbench-3.0-a9/scripts/getctx +--- lmbench-3.0~/lmbench-3.0-a9/scripts/getctx 2005-09-04 05:04:28.000000000 -0600 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/getctx 2006-03-20 19:25:41.000000000 -0700 +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/env perl + # Extract the context switching information from lmbench result files. + # Usage: getctx file file.... + # +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/getdisk lmbench-3.0/lmbench-3.0-a9/scripts/getdisk +--- lmbench-3.0~/lmbench-3.0-a9/scripts/getdisk 2000-01-31 17:29:31.000000000 -0700 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/getdisk 2006-03-20 19:21:57.000000000 -0700 +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/env perl + # Extract the disk graph data from lmbench result files. + # + # Hacked into existence by Larry McVoy +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/getlist lmbench-3.0/lmbench-3.0-a9/scripts/getlist +--- lmbench-3.0~/lmbench-3.0-a9/scripts/getlist 2000-07-26 09:10:01.000000000 -0600 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/getlist 2006-03-20 19:26:49.000000000 -0700 +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/env perl + # Find everything in my results directory that looks like lmbench output. + # + # Hacked into existence by Larry McVoy (lm@bitmover.com) +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/getmax lmbench-3.0/lmbench-3.0-a9/scripts/getmax +--- lmbench-3.0~/lmbench-3.0-a9/scripts/getmax 2000-01-31 17:29:31.000000000 -0700 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/getmax 2006-03-20 19:23:29.000000000 -0700 +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/env perl + # Look at a bunch of bargraph files and figure out the max amongst them all. + # Usage: getmax file file file.... + # +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/getmem lmbench-3.0/lmbench-3.0-a9/scripts/getmem +--- lmbench-3.0~/lmbench-3.0-a9/scripts/getmem 2005-09-04 05:04:28.000000000 -0600 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/getmem 2006-03-20 19:24:13.000000000 -0700 +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/env perl + # Extract the memory latency graph data from lmbench result files. + # + # Hacked into existence by Larry McVoy (lm@sun.com now lm@sgi.com). +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/getpercent lmbench-3.0/lmbench-3.0-a9/scripts/getpercent +--- lmbench-3.0~/lmbench-3.0-a9/scripts/getpercent 2005-09-04 05:04:28.000000000 -0600 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/getpercent 2006-03-20 19:25:45.000000000 -0700 +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/env perl + # Generate an ascii percentage summary from lmbench result files. + # Usage: getpercent file file file... + # +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/getsummary lmbench-3.0/lmbench-3.0-a9/scripts/getsummary +--- lmbench-3.0~/lmbench-3.0-a9/scripts/getsummary 2005-09-04 05:04:28.000000000 -0600 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/getsummary 2006-03-20 19:22:35.000000000 -0700 +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/env perl + # Generate an ascii summary from lmbench result files. + # Usage: getsummary file file file... + # +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/gifs lmbench-3.0/lmbench-3.0-a9/scripts/gifs +--- lmbench-3.0~/lmbench-3.0-a9/scripts/gifs 2000-01-31 17:29:31.000000000 -0700 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/gifs 2006-03-20 19:20:16.000000000 -0700 +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/env perl + # Make HTML files that will point to the right GIF files. + # Usage: bghtml file file file.... + # +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/graph lmbench-3.0/lmbench-3.0-a9/scripts/graph +--- lmbench-3.0~/lmbench-3.0-a9/scripts/graph 2005-09-04 05:04:28.000000000 -0600 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/graph 2006-03-20 19:21:41.000000000 -0700 +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/env perl + # $Id$ + eval "exec perl -Ss $0 $@" + if 0; +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/html-list lmbench-3.0/lmbench-3.0-a9/scripts/html-list +--- lmbench-3.0~/lmbench-3.0-a9/scripts/html-list 2000-01-31 17:29:31.000000000 -0700 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/html-list 2006-03-20 19:22:23.000000000 -0700 +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/env perl + # Take the list of files and turn them into an html file that points + # at their context & mem latency GIFs. + # +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/html-man lmbench-3.0/lmbench-3.0-a9/scripts/html-man +--- lmbench-3.0~/lmbench-3.0-a9/scripts/html-man 2000-01-31 17:29:31.000000000 -0700 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/html-man 2006-03-20 19:25:21.000000000 -0700 +@@ -1,3 +1,4 @@ ++#!/usr/bin/env perl + eval 'exec perl -Ssw $0 "$@"' + if 0; + +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/man2html lmbench-3.0/lmbench-3.0-a9/scripts/man2html +--- lmbench-3.0~/lmbench-3.0-a9/scripts/man2html 2000-01-31 17:29:31.000000000 -0700 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/man2html 2006-03-20 19:22:10.000000000 -0700 +@@ -1,3 +1,4 @@ ++#!/usr/bin/env perl + eval 'exec perl -Ssw $0 "$@"' + if 0; + +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/new2oldctx lmbench-3.0/lmbench-3.0-a9/scripts/new2oldctx +--- lmbench-3.0~/lmbench-3.0-a9/scripts/new2oldctx 2000-01-31 17:29:31.000000000 -0700 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/new2oldctx 2006-03-20 19:24:42.000000000 -0700 +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/env perl + # Convert the new format: + # Context switch of 8 4k processes: 64.17 (60.02 overhead) + # to the old format: +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/opercent lmbench-3.0/lmbench-3.0-a9/scripts/opercent +--- lmbench-3.0~/lmbench-3.0-a9/scripts/opercent 2000-01-31 17:29:31.000000000 -0700 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/opercent 2006-03-20 19:20:57.000000000 -0700 +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/env perl + eval "exec perl -sS $0 $*" + if 0; + +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/percent lmbench-3.0/lmbench-3.0-a9/scripts/percent +--- lmbench-3.0~/lmbench-3.0-a9/scripts/percent 2000-01-31 17:29:31.000000000 -0700 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/percent 2006-03-20 19:26:31.000000000 -0700 +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/env perl + eval "exec perl -sS $0 $*" + if 0; + +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/rccs lmbench-3.0/lmbench-3.0-a9/scripts/rccs +--- lmbench-3.0~/lmbench-3.0-a9/scripts/rccs 2000-01-31 17:29:31.000000000 -0700 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/rccs 2006-03-20 19:24:25.000000000 -0700 +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/env perl + eval 'exec perl -Ssw $0 "$@"' + if 0; + +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/save lmbench-3.0/lmbench-3.0-a9/scripts/save +--- lmbench-3.0~/lmbench-3.0-a9/scripts/save 2000-01-31 17:29:31.000000000 -0700 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/save 2006-03-20 19:25:56.000000000 -0700 +@@ -1,3 +1,4 @@ ++#!/usr/bin/env perl + # Save the input in the specified file if possible. If the file exists, + # add a numeric suffice, i.e., .1, and increment that until the file + # does not exist. Use the first name found as the file to save. +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/stats lmbench-3.0/lmbench-3.0-a9/scripts/stats +--- lmbench-3.0~/lmbench-3.0-a9/scripts/stats 2000-01-31 17:29:31.000000000 -0700 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/stats 2006-03-20 19:21:09.000000000 -0700 +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/env perl + # Convert the Y coordinate to an average + + eval "exec perl -sS $0 $*" +diff -urNad lmbench-3.0~/lmbench-3.0-a9/scripts/statsummary lmbench-3.0/lmbench-3.0-a9/scripts/statsummary +--- lmbench-3.0~/lmbench-3.0-a9/scripts/statsummary 2000-07-26 09:10:01.000000000 -0600 ++++ lmbench-3.0/lmbench-3.0-a9/scripts/statsummary 2006-03-20 19:26:34.000000000 -0700 +@@ -1,4 +1,4 @@ +- ++#!/usr/bin/env perl + # Generate an ascii summary from lmbench result files BY HOSTNAME + # instead of architecture. Sorry, I think of these tools as being + # used to measure and prototype particular named systems, not as --- lmbench-3.0-a9.orig/debian/patches/02_paths.dpatch +++ lmbench-3.0-a9/debian/patches/02_paths.dpatch @@ -0,0 +1,334 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_paths.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## 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 +@@ -3,7 +3,10 @@ + # Configure parameters for lmbench. + # %I% %E% %@% + +-OS=`../scripts/os` ++BINDIR=${BINDIR:-..} ++SCRIPTSDIR=${SCRIPTSDIR:-../scripts} ++ ++OS=`${SCRIPTSDIR}/os` + L='=====================================================================' + echo $L; + cat</dev/null` +@@ -192,9 +195,9 @@ + # 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..." +-MB=`../bin/$OS/memsize $MB` +-MB=`../bin/$OS/memsize $MB` +-MB=`../bin/$OS/memsize $MB` ++MB=`${BINDIR}/bin/$OS/memsize $MB` ++MB=`${BINDIR}/bin/$OS/memsize $MB` ++MB=`${BINDIR}/bin/$OS/memsize $MB` + if [ `expr $SYNC_MAX \* $MB` -gt `expr $TOTAL_MEM` ] + then + MB=`expr $TOTAL_MEM / $SYNC_MAX` +@@ -210,8 +213,8 @@ + fi + + echo "Hang on, we are calculating your cache line size." +-../bin/$OS/msleep 250 +-LINE_SIZE=`../bin/$OS/line -M ${MB}M` ++${BINDIR}/bin/$OS/msleep 250 ++LINE_SIZE=`${BINDIR}/bin/$OS/line -M ${MB}M` + export LINE_SIZE + echo "OK, it looks like your cache line is $LINE_SIZE bytes." + echo "" +@@ -459,7 +462,7 @@ + then + for i in $disks + do if [ -r $i ] +- then ../bin/$OS/flushdisk $i ++ then ${BINDIR}/bin/$OS/flushdisk $i + 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 @@ + echo $L + echo "" + echo "Calculating mhz, please wait for a moment..." +-MHZ=`../bin/$OS/mhz` ++MHZ=`${BINDIR}/bin/$OS/mhz` + cat< $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 +@@ -7,7 +7,8 @@ + # $Id$ + + # Make sure we can find: ./cmd, df, and netstat +-PATH=.:../../scripts:$PATH:/etc:/usr/etc:/sbin:/usr/sbin ++SCRIPTSDIR=${SCRIPTSDIR:-../../scripts} ++PATH=.:${SCRIPTSDIR}:$PATH:/etc:/usr/etc:/sbin:/usr/sbin + 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 +@@ -1,7 +1,9 @@ + #!/bin/sh + + # Make sure we can find: ./cmd, df, and netstat +-PATH=.:$PATH:/etc:/usr/etc:/sbin:/usr/sbin ++BINDIR=${BINDIR:-..} ++SCRIPTSDIR=${SCRIPTSDIR:-../scripts} ++PATH=.:${SCRIPTSDIR}:${BINDIR}/bin/`${SCRIPTSDIR}/os`:$PATH:/etc:/usr/etc:/sbin:/usr/sbin + 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 +@@ -7,7 +7,10 @@ + # $Id$ + + # Make sure we can find: ./cmd, df, and netstat +-PATH=.:../../scripts:$PATH:/etc:/usr/etc:/sbin:/usr/sbin ++BINDIR=${BINDIR:-..} ++SCRIPTSDIR=${SCRIPTSDIR:-../../scripts} ++SRCDIR=${SRCDIR:-../../src} ++PATH=.:${BINDIR}/bin/`${SCRIPTSDIR}/os`:${SCRIPTSDIR}:$PATH:/etc:/usr/etc:/sbin:/usr/sbin + export PATH + + if [ -f $1 ] +@@ -235,14 +238,14 @@ + + date >> ${OUTPUT} + echo Local networking >> ${OUTPUT} +-if [ ! -d ../../src/webpage-lm ] +-then (cd ../../src && tar xf webpage-lm.tar) ++if [ ! -d ${SRCDIR}/webpage-lm ] ++then (cd ${SRCDIR} && tar xf webpage-lm.tar) + sync + sleep 1 + fi + SERVERS="lat_udp lat_tcp lat_rpc lat_connect bw_tcp" + for server in $SERVERS; do $server -s; done +-DOCROOT=../../src/webpage-lm lmhttp 8008 & ++DOCROOT=${SRCDIR}/webpage-lm lmhttp 8008 & + sleep 2; + + if [ X$BENCHMARK_OS = XYES -o X$BENCHMARK_UDP = XYES ]; then +@@ -278,19 +281,19 @@ + + if [ X$BENCHMARK_OS = XYES -o X$BENCHMARK_HTTP = XYES ]; then + # I want a hot cache number +- lat_http localhost 8008 < ../../src/webpage-lm/URLS > /dev/null 2>&1 +- lat_http localhost 8008 < ../../src/webpage-lm/URLS ++ lat_http localhost 8008 < ${SRCDIR}/webpage-lm/URLS > /dev/null 2>&1 ++ lat_http localhost 8008 < ${SRCDIR}/webpage-lm/URLS + fi + lat_http -S localhost 8008 + + for remote in $REMOTE + do + echo Networking to $remote >> ${OUTPUT} +- $RCP $SERVERS lmhttp ../../src/webpage-lm.tar ${remote}:/tmp ++ $RCP $SERVERS lmhttp ${SRCDIR}/webpage-lm.tar ${remote}:/tmp + for server in $SERVERS + do $RSH $remote -n /tmp/$server -s & + done +- $RSH $remote -n 'cd /tmp; tar xf webpage-lm.tar; cd webpage-lm; ../lmhttp 8008' & ++ $RSH $remote -n 'cd /tmp; tar xf webpage-lm.tar; cd webpage-lm; lmhttp 8008' & + 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 @@ + + if [ X$BENCHMARK_OS = XYES -o X$BENCHMARK_HTTP = XYES ]; then + # I want a hot cache number +- lat_http $remote 8008 < ../../src/webpage-lm/URLS > /dev/null 2>&1 +- lat_http $remote 8008 < ../../src/webpage-lm/URLS ++ lat_http $remote 8008 < ${SRCDIR}/webpage-lm/URLS > /dev/null 2>&1 ++ lat_http $remote 8008 < ${SRCDIR}/webpage-lm/URLS + 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 +@@ -1,4 +1,5 @@ + #!/bin/sh ++SCRIPTSDIR=${SCRIPTSDIR:-../scripts} + + if [ "X$OS" != "X" ] && echo "$OS" | grep -q '`' + then +@@ -10,8 +11,8 @@ + 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}" +- if [ -f ../scripts/gnu-os ] +- then OS=`../scripts/gnu-os | sed s/unknown-//` ++ if [ -f ${SCRIPTSDIR}/gnu-os ] ++ then OS=`${SCRIPTSDIR}/gnu-os | sed s/unknown-//` + 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 +@@ -1,21 +1,24 @@ + #!/bin/sh + + # $Id$ ++SCRIPTSDIR=${SCRIPTSDIR:-../scripts} ++BINDIR=${BINDIR:-..} ++RESULTSDIR=${RESULTSDIR:-../results} + +-OS=`../scripts/os` +-CONFIG=`../scripts/config` +-RESULTS=results/$OS +-BASE=../$RESULTS/`uname -n` ++OS=`${SCRIPTSDIR}/os` ++CONFIG=`${SCRIPTSDIR}/config` ++RESULTS=${RESULTSDIR}/$OS ++BASE=$RESULTS/`uname -n` + EXT=0 + +-if [ ! -f "../bin/$OS/$CONFIG" ] ++if [ ! -f "${BINDIR}/bin/$OS/$CONFIG" ] + then echo "No config file?" + exit 1 + fi +-. ../bin/$OS/$CONFIG ++. ${BINDIR}/bin/$OS/$CONFIG + +-if [ ! -d ../$RESULTS ] +-then mkdir -p ../$RESULTS ++if [ ! -d $RESULTS ] ++then mkdir -p $RESULTS + fi + RESULTS=$BASE.$EXT + while [ -f $RESULTS ] +@@ -23,17 +26,17 @@ + RESULTS=$BASE.$EXT + done + +-cd ../bin/$OS ++cd ${BINDIR}/bin/$OS + PATH=.:${PATH}; export PATH + export SYNC_MAX + export OUTPUT +-lmbench $CONFIG 2>../${RESULTS} ++lmbench $CONFIG 2>${RESULTS} + + if [ X$MAIL = Xyes ] + then echo Mailing results + (echo ---- $INFO --- + cat $INFO + echo ---- $RESULTS --- +- cat ../$RESULTS) | mail lmbench3@bitmover.com ++ cat $RESULTS) | mail lmbench3@bitmover.com + 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 +@@ -1,10 +1,11 @@ + #!/bin/sh + + # %W% %@% ++SRCDIR=${SRCDIR:-../src} + + F="no_such_file" + VERSION="3.0-`date '+%Y%m%d'`" +-for f in version.h ../src/version.h src/version.h ++for f in version.h ${SRCDIR}/version.h src/version.h + do + if [ $F = "no_such_file" -a -f $f ] + then --- lmbench-3.0-a9.orig/debian/patches/03_man_pages.dpatch +++ lmbench-3.0-a9/debian/patches/03_man_pages.dpatch @@ -0,0 +1,40 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_man_pages.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad lmbench-3.0~/lmbench-3.0-a9/doc/lat_mmap.8 lmbench-3.0/lmbench-3.0-a9/doc/lat_mmap.8 +--- lmbench-3.0~/lmbench-3.0-a9/doc/lat_mmap.8 2000-10-16 09:14:01.000000000 -0600 ++++ lmbench-3.0/lmbench-3.0-a9/doc/lat_mmap.8 2006-03-21 23:21:13.000000000 -0700 +@@ -18,7 +18,7 @@ + .SH DESCRIPTION + .B lat_mmap + times how fast a mapping can be made and unmade. This is useful because it +-is a fundemental part of processes that use SunOS style shared libraries ++is a fundamental part of processes that use SunOS style shared libraries + (the libraries are mapped in at process start up time and unmapped at + process exit). + .LP +diff -urNad lmbench-3.0~/lmbench-3.0-a9/doc/lmbench.8 lmbench-3.0/lmbench-3.0-a9/doc/lmbench.8 +--- lmbench-3.0~/lmbench-3.0-a9/doc/lmbench.8 2000-10-16 09:14:01.000000000 -0600 ++++ lmbench-3.0/lmbench-3.0-a9/doc/lmbench.8 2006-03-21 23:21:23.000000000 -0700 +@@ -37,7 +37,7 @@ + .I repetitions + is 11. + .SH BANDWIDTH MEASUREMENTS +-Data movement is fundemental to the performance on most computer systems. ++Data movement is fundamental to the performance on most computer systems. + The bandwidth measurements are intended to show how the system can move + data. The results of the bandwidth metrics can be compared but care + must be taken to understand what it is that is being compared. The +@@ -75,7 +75,7 @@ + bw_unix + reading data from a UNIX socket. + .SH LATENCY MEASUREMENTS +-Control messages are also fundemental to the performance on most ++Control messages are also fundamental to the performance on most + computer systems. The latency measurements are intended to show how fast + a system can be told to do some operation. The results of the + latency metrics can be compared to each other --- lmbench-3.0-a9.orig/debian/patches/04_bw_tcp.dpatch +++ lmbench-3.0-a9/debian/patches/04_bw_tcp.dpatch @@ -0,0 +1,17 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_bw_tcp.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad trunk~/lmbench-3.0-a9/doc/bw_tcp.8 trunk/lmbench-3.0-a9/doc/bw_tcp.8 +--- trunk~/lmbench-3.0-a9/doc/bw_tcp.8 2000-10-16 09:14:01.000000000 -0600 ++++ trunk/lmbench-3.0-a9/doc/bw_tcp.8 2006-04-02 17:39:51.000000000 -0600 +@@ -1,5 +1,5 @@ + .\" $Id$ +-.TH BW_TCP 1 "$Date$" "(c)1994 Larry McVoy" "LMBENCH" ++.TH BW_TCP 8 "$Date$" "(c)1994 Larry McVoy" "LMBENCH" + .SH NAME + bw_tcp \- time data movement through TCP/IP sockets + .SH SYNOPSIS --- lmbench-3.0-a9.orig/debian/patches/05_no_usr_write.dpatch +++ lmbench-3.0-a9/debian/patches/05_no_usr_write.dpatch @@ -0,0 +1,85 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_no_usr_write.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad wip.hg~/lmbench-3.0-a9/scripts/build wip.hg/lmbench-3.0-a9/scripts/build +--- wip.hg~/lmbench-3.0-a9/scripts/build 2006-06-27 10:25:18.000000000 -0600 ++++ wip.hg/lmbench-3.0-a9/scripts/build 2009-02-22 20:24:37.000000000 -0700 +@@ -9,7 +9,7 @@ + NULL=/dev/null + + BASE=/tmp/dummy +-for t in /usr/tmp /var/tmp /tmp; do ++for t in /var/tmp /tmp; do + if [ -d $t -a -w $t ] + then BASE=${t}/dummy + break +diff -urNad wip.hg~/lmbench-3.0-a9/scripts/config-run wip.hg/lmbench-3.0-a9/scripts/config-run +--- wip.hg~/lmbench-3.0-a9/scripts/config-run 2006-11-26 13:11:04.000000000 -0700 ++++ wip.hg/lmbench-3.0-a9/scripts/config-run 2009-02-22 20:22:47.000000000 -0700 +@@ -608,7 +608,7 @@ + + + ############################################################################ +-# /usr/tmp? ++# /var/tmp? + ############################################################################ + echo $L + AGAIN=Y +@@ -617,14 +617,14 @@ + cat<= this */ +-#define LOGFILE "/usr/tmp/lmhttp.log" ++#define LOGFILE "/var/tmp/lmbench/lmhttp.log" + + char *buf; + char *bufs[3]; --- lmbench-3.0-a9.orig/debian/patches/06_lmbench3_man.dpatch +++ lmbench-3.0-a9/debian/patches/06_lmbench3_man.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 06_lmbench3_man.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad wip.hg~/lmbench-3.0-a9/doc/lmbench.3 wip.hg/lmbench-3.0-a9/doc/lmbench.3 +--- wip.hg~/lmbench-3.0-a9/doc/lmbench.3 2003-03-09 02:04:20.000000000 -0700 ++++ wip.hg/lmbench-3.0-a9/doc/lmbench.3 2009-02-22 20:50:56.000000000 -0700 +@@ -25,7 +25,7 @@ + .B "void micro(char *s, uint64 n)" + .LP + .B "void nano(char *s, uint64 n)" +-.lP ++.LP + .B "void mb(uint64 bytes)" + .LP + .B "void kb(uint64 bytes)" --- lmbench-3.0-a9.orig/debian/patches/07_tmp_symlinks.dpatch +++ lmbench-3.0-a9/debian/patches/07_tmp_symlinks.dpatch @@ -0,0 +1,109 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 07_tmp_symlinks.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad wip.hg~/lmbench-3.0-a9/src/bench.h wip.hg/lmbench-3.0-a9/src/bench.h +--- wip.hg~/lmbench-3.0-a9/src/bench.h 2006-06-27 10:27:19.000000000 -0600 ++++ wip.hg/lmbench-3.0-a9/src/bench.h 2009-02-22 21:08:19.000000000 -0700 +@@ -119,9 +119,9 @@ + #define VERS (u_long)1 + #endif + +-#define UNIX_CONTROL "/tmp/lmbench.ctl" +-#define UNIX_DATA "/tmp/lmbench.data" +-#define UNIX_LAT "/tmp/lmbench.lat" ++#define UNIX_CONTROL "/var/tmp/lmbench/lmbench.ctl" ++#define UNIX_DATA "/var/tmp/lmbench/lmbench.data" ++#define UNIX_LAT "/var/tmp/lmbench/lmbench.lat" + + /* + * socket send/recv buffer optimizations +diff -urNad wip.hg~/lmbench-3.0-a9/src/lat_fcntl.c wip.hg/lmbench-3.0-a9/src/lat_fcntl.c +--- wip.hg~/lmbench-3.0-a9/src/lat_fcntl.c 2007-05-10 08:17:02.000000000 -0600 ++++ wip.hg/lmbench-3.0-a9/src/lat_fcntl.c 2009-02-22 21:09:05.000000000 -0700 +@@ -102,8 +102,8 @@ + + if (iterations) return; + +- sprintf(state->filename1, "/tmp/lmbench-fcntl%d.1", getpid()); +- sprintf(state->filename2, "/tmp/lmbench-fcntl%d.2", getpid()); ++ sprintf(state->filename1, "/var/tmp/lmbench/lmbench-fcntl%d.1", getpid()); ++ sprintf(state->filename2, "/var/tmp/lmbench/lmbench-fcntl%d.2", getpid()); + state->pid = 0; + state->fd1 = -1; + state->fd2 = -1; +diff -urNad wip.hg~/lmbench-3.0-a9/src/lat_fifo.c wip.hg/lmbench-3.0-a9/src/lat_fifo.c +--- wip.hg~/lmbench-3.0-a9/src/lat_fifo.c 2007-05-10 08:17:02.000000000 -0600 ++++ wip.hg/lmbench-3.0-a9/src/lat_fifo.c 2009-02-22 21:09:23.000000000 -0700 +@@ -12,8 +12,8 @@ + + #include "bench.h" + +-#define F1 "/tmp/lmbench_f1.%d" +-#define F2 "/tmp/lmbench_f2.%d" ++#define F1 "/var/tmp/lmbench/lmbench_f1.%d" ++#define F2 "/var/tmp/lmbench/lmbench_f2.%d" + + void initialize(iter_t iterations, void *cookie); + void cleanup(iter_t iterations, void *cookie); +diff -urNad wip.hg~/lmbench-3.0-a9/src/lat_proc.c wip.hg/lmbench-3.0-a9/src/lat_proc.c +--- wip.hg~/lmbench-3.0-a9/src/lat_proc.c 2007-05-10 08:17:03.000000000 -0600 ++++ wip.hg/lmbench-3.0-a9/src/lat_proc.c 2009-02-22 21:09:50.000000000 -0700 +@@ -17,10 +17,10 @@ + + + #ifdef STATIC +-#define PROG "/tmp/hello-s" ++#define PROG "/var/tmp/lmbench/hello-s" + #define STATIC_PREFIX "Static " + #else +-#define PROG "/tmp/hello" ++#define PROG "/var/tmp/lmbench/hello" + #define STATIC_PREFIX "" + #endif + +diff -urNad wip.hg~/lmbench-3.0-a9/src/lat_unix_connect.c wip.hg/lmbench-3.0-a9/src/lat_unix_connect.c +--- wip.hg~/lmbench-3.0-a9/src/lat_unix_connect.c 2007-05-10 08:17:05.000000000 -0600 ++++ wip.hg/lmbench-3.0-a9/src/lat_unix_connect.c 2009-02-22 21:10:06.000000000 -0700 +@@ -15,7 +15,7 @@ + char *id = "$Id$\n"; + #include "bench.h" + +-#define CONNAME "/tmp/af_unix" ++#define CONNAME "/var/tmp/lmbench/af_unix" + + void server_main(void); + +diff -urNad wip.hg~/lmbench-3.0-a9/src/rhttp.c wip.hg/lmbench-3.0-a9/src/rhttp.c +--- wip.hg~/lmbench-3.0-a9/src/rhttp.c 2000-01-31 16:05:45.000000000 -0700 ++++ wip.hg/lmbench-3.0-a9/src/rhttp.c 2009-02-22 21:03:36.000000000 -0700 +@@ -78,7 +78,7 @@ + if (fork() == 0) { + char name[30]; + +- sprintf(name, "/tmp/rhttp%d", i); ++ sprintf(name, "/var/tmp/lmbench/rhttp%d", i); + creat(name, 0666); + close(2); + dup(1); +@@ -93,7 +93,7 @@ + } + wait(0); + } +- system("cat /tmp/rhttp*; rm /tmp/rhttp*"); ++ system("cat /var/tmp/lmbench/rhttp*; rm /var/tmp/lmbench/rhttp*"); + exit(1); + for (i = 1; i < ac; ++i) { + int fd, n, m = 0; +@@ -103,7 +103,7 @@ + if (!strcmp("-p", av[i])) { + break; + } +- sprintf(buf, "/tmp/http%d", i); ++ sprintf(buf, "/var/tmp/lmbench/http%d", i); + fd = open(buf, 0); + unlink(buf); + /* --- lmbench-3.0-a9.orig/debian/patches/08_defaultfsdir.dpatch +++ lmbench-3.0-a9/debian/patches/08_defaultfsdir.dpatch @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 08_defaultfsdir.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad wip.hg~/lmbench-3.0-a9/scripts/config-run wip.hg/lmbench-3.0-a9/scripts/config-run +--- wip.hg~/lmbench-3.0-a9/scripts/config-run 2009-02-22 22:22:10.000000000 -0700 ++++ wip.hg/lmbench-3.0-a9/scripts/config-run 2009-02-22 22:22:40.000000000 -0700 +@@ -626,13 +626,7 @@ + system. + + EOF +- DEFAULTFSDIR=/var/tmp +- for t in /var/tmp /tmp; do +- if [ -d $t -a -w $t ] +- then DEFAULTFSDIR=$t +- break +- fi +- done ++ DEFAULTFSDIR=/var/tmp/lmbench + echo $ECHON "FSDIR [default $DEFAULTFSDIR]: $ECHOC" + read FSDIR + if [ X$FSDIR = X ] --- lmbench-3.0-a9.orig/debian/prerm +++ lmbench-3.0-a9/debian/prerm @@ -0,0 +1,33 @@ +#! /bin/sh +# prerm script for tiger +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see /usr/doc/packaging-manual/ + +case "$1" in + purge) + find /var/lib/lmbench/ -type f -exec rm -f \{\}\; + find /var/run/lmbench/ -type f -exec rm -f \{\}\; + ;; + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) +# Do nothing + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 0 +esac + +#DEBHELPER# --- lmbench-3.0-a9.orig/debian/rules +++ lmbench-3.0-a9/debian/rules @@ -0,0 +1,161 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 by Joey Hess. +# +# This version is for a hypothetical package that builds an +# architecture-dependant package, as well as an architecture-independent +# package. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +H_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH) +ifeq ($(H_ARCH),arm) +OPTIMIZATION=-O0 +else +OPTIMIZATION=-O +endif + +LMBENCH_VERSION=3.0-a9 + +unpack: unpack-stamp +unpack-stamp: + dh_testdir + tar xvzf lmbench-$(LMBENCH_VERSION).tgz + touch unpack-stamp + +patch: patch-stamp +patch-stamp: unpack + dh_testdir + dpatch apply-all + touch patch-stamp + +configure: configure-stamp +configure-stamp: patch + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + $(MAKE) -C lmbench-$(LMBENCH_VERSION) + docbook-to-man debian/lmbench-run.sgml >debian/lmbench-run.1 + + touch build-stamp + +unpatch: clean unpack + +clean: + dh_testdir + dh_testroot + -rm debian/lmbench-run.1 + -rm -rf run/ + rm -f build-stamp configure-stamp unpack-stamp patch-stamp + rm -rf debian/patched + rm -rf lmbench-$(LMBENCH_VERSION) + dh_clean + rm -f debian/files + +install: DH_OPTIONS= +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + #-- install all the lmbench binaries and such + dh_install -p lmbench --sourcedir=lmbench-$(LMBENCH_VERSION) \ + bin usr/lib/lmbench + dh_install -p lmbench --sourcedir=lmbench-$(LMBENCH_VERSION) \ + results usr/share/lmbench + dh_install -p lmbench --sourcedir=lmbench-$(LMBENCH_VERSION) \ + scripts usr/lib/lmbench + mv debian/lmbench/usr/lib/lmbench/scripts/SHIT \ + debian/lmbench/usr/lib/lmbench/scripts/STUFF + dh_install -p lmbench --sourcedir=lmbench-$(LMBENCH_VERSION) \ + src/webpage-lm.tar usr/share/lmbench/src + install -m 755 debian/lmbench-run \ + $(CURDIR)/debian/lmbench/usr/bin + dh_install -p lmbench debian/lmbench-run.1 usr/share/man/man1 + dh_link usr/share/man/man8/lmbench.8.gz usr/share/man/man8/lmhttp.8.gz + dh_link usr/share/man/man8/lmbench.8.gz usr/share/man/man8/msleep.8.gz + dh_install -p lmbench --sourcedir=lmbench-$(LMBENCH_VERSION) \ + README usr/share/doc/lmbench + chmod -x debian/lmbench/usr/lib/lmbench/scripts/Makefile + chmod -x debian/lmbench/usr/lib/lmbench/scripts/README + chmod -x debian/lmbench/usr/lib/lmbench/scripts/TODO + chmod -x debian/lmbench/usr/lib/lmbench/scripts/info-template + + #-- install the documentation + dh_install -p lmbench-doc --sourcedir=lmbench-$(LMBENCH_VERSION) \ + hbench-REBUTTAL usr/share/doc/lmbench-doc + dh_install -p lmbench-doc --sourcedir=lmbench-$(LMBENCH_VERSION) \ + src/TODO usr/share/doc/lmbench-doc + dh_install -p lmbench-doc --sourcedir=lmbench-$(LMBENCH_VERSION) \ + doc/* usr/share/doc/lmbench-doc + dh_install -p lmbench-doc --sourcedir=lmbench-$(LMBENCH_VERSION) \ + README usr/share/doc/lmbench-doc + + #-- install all the man pages + dh_install -p lmbench --sourcedir=lmbench-$(LMBENCH_VERSION) \ + doc/*.1 usr/share/man/man1 + dh_install -p lmbench --sourcedir=lmbench-$(LMBENCH_VERSION) \ + doc/*.3 usr/share/man/man3 + dh_install -p lmbench --sourcedir=lmbench-$(LMBENCH_VERSION) \ + doc/*.8 usr/share/man/man8 + + #-- but move some that have duplicate names in other packages, + # and put copies of everything in lmbench-doc, just in case + rm -f debian/lmbench/usr/share/man/man1/graph.1 + rm -f debian/lmbench/usr/share/man/man1/rccs.1 + rm -f debian/lmbench/usr/share/man/man8/bargraph.8 + rm -f debian/lmbench/usr/share/man/man8/hello.8 + dh_install -p lmbench-doc --sourcedir=lmbench-$(LMBENCH_VERSION) \ + doc/*.[1-9] usr/share/doc/lmbench-doc/man + gzip debian/lmbench-doc/usr/share/doc/lmbench-doc/man/* + + #-- and then clean up some of the odds and ends + dh_link -p lmbench-doc usr/share/doc/lmbench-doc/man/lmbench.8 \ + usr/share/doc/lmbench-doc/man/hello.8 + dh_link -p lmbench-doc usr/share/doc/lmbench-doc/man/lmbench.8 \ + usr/share/doc/lmbench-doc/man/flushdisk.8 + dh_link -p lmbench-doc usr/share/doc/lmbench-doc/man/lmbench.8 \ + usr/share/doc/lmbench-doc/man/memsize.8 + +# Build architecture-independent files here. +# Pass -i to all debhelper commands in this target to reduce clutter. +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installdocs --sourcedir=lmbench-$(LMBENCH_VERSION) -i + dh_installchangelogs -i + dh_link -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -a + dh_testroot -a + dh_installdocs --sourcedir=lmbench-$(LMBENCH_VERSION) -a + dh_installchangelogs -a + dh_strip -a + dh_link -a + dh_compress -a + dh_fixperms -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure