--- httperf-0.9.0.orig/debian/changelog +++ httperf-0.9.0/debian/changelog @@ -0,0 +1,97 @@ +httperf (0.9.0-2build1) oneiric; urgency=low + + * Rebuild for OpenSSL 1.0.0. + + -- Colin Watson Tue, 17 May 2011 11:16:06 +0100 + +httperf (0.9.0-2) unstable; urgency=low + + * Changing Maintainer Name + * Adding Vcs-Headers to debian/control + * Improve debian/copyright + * Add ${misc:Depends} to depends + * Add debian/README.source + * Bump standards to 3.8.3 (no further changes needed) + + -- Alexander Reichle-Schmehl Mon, 18 Jan 2010 21:26:25 +0100 + +httperf (0.9.0-1) unstable; urgency=low + + * New maintainer (Closes: #483481) + * New upstream release + * Added watchfile + * Moved to quilt + * Transformed and updated debian/patches-old/01_man_page_hyphens_patch.dpatch + to debian/patches/fix-manpage-formating + + -- Alexander Schmehl Sat, 31 May 2008 17:17:52 +0200 + +httperf (0.8-8) unstable; urgency=low + + * Updated to Standards-Version 3.7.3 (no changes needed). + * Updated to debhelper compatibility level 5. + * Update maintainer email address. + * debian/control: Switch Homepage to be a proper control field. + * Make lintian happy with proper distclean call + + -- Roberto C. Sanchez Sat, 5 Jan 2008 11:32:00 -0500 + +httperf (0.8-7) unstable; urgency=low + + * Migrated all differences between upstream and the Debian package from + the .diff.gz over to dpatch. + * Ensure that differences in config.status and config.guess are no longer + bloating the .diff.gz. + + -- Roberto C. Sanchez Sat, 11 Mar 2006 11:49:41 -0500 + +httperf (0.8-6) unstable; urgency=low + + * Updated the URL in the package description. Thanks to "The Anarcat" for + pointing out the mistake. (Closes: #321264) + + -- Roberto C. Sanchez Fri, 5 Aug 2005 17:12:53 -0400 + +httperf (0.8-5) unstable; urgency=low + + * Fix incorrect bug closure in changelog of version 0.8-2. Thanks to Anibal + Monsalve Salazar for pointing this out. + + -- Roberto C. Sanchez Mon, 18 Jul 2005 19:10:20 -0400 + +httperf (0.8-4) unstable; urgency=low + + * Updated to Standards-Version 3.6.2. + * Added license exception to copyright file. The upstream maintainers and + developers have provided an exception to the GPL that allows linking + against OpenSSL. + + -- Roberto C. Sanchez Tue, 12 Jul 2005 15:20:26 -0400 + +httperf (0.8-3) unstable; urgency=low + + * New version to force upload of .orig.tar.gz. This is a result of the + moving the package from non-US to main. + + -- Roberto C. Sanchez Tue, 7 Jun 2005 23:38:27 -0400 + +httperf (0.8-2) unstable; urgency=low + + * New maintainer. + * Moved from non-US to section web in main (Closes: #170060). + * Build against new libssl in Sid (Closes: #215277). + * Updated copyright file. + * Added patch to correct lintian warnings on the man page. + * Added a watch file. + + -- Roberto C. Sanchez Tue, 7 Jun 2005 19:48:47 -0400 + +httperf (0.8-1) unstable; urgency=low + + * Initial Release (CLoses: #85914). + + -- Luca - De Whiskey's - De Vitis Sun, 22 Jul 2001 22:32:30 +0200 + +Local variables: +mode: debian-changelog +End: --- httperf-0.9.0.orig/debian/rules +++ httperf-0.9.0/debian/rules @@ -0,0 +1,95 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +export DH_VERBOSE=1 + +# These are used for cross-compiling and for saving the configure script +# # from having to guess our platform (since we know it already) +# DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +# DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + +include /usr/share/quilt/quilt.make + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +configure: configure-stamp +configure-stamp: patch + dh_testdir + cp -a /usr/share/misc/config.sub /usr/share/misc/config.guess . + ./configure --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir +#ifneq "$(wildcard /usr/share/misc/config.sub)" "" +# cp -f /usr/share/misc/config.sub config.sub +#endif +#ifneq "$(wildcard /usr/share/misc/config.guess)" "" +# cp -f /usr/share/misc/config.guess config.guess +#endif + $(MAKE) + touch build-stamp + +clean: unpatch clean-unpatched +clean-unpatched: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + -rm -f config.sub config.guess + [ ! -f Makefile ] || $(MAKE) clean + [ ! -f Makefile ] || $(MAKE) distclean + rm -f Makefile + rm -f stat/Makefile + rm -f lib/Makefile + rm -f gen/Makefile + rm -f config.cache + rm -f config.status + rm -f config.h + rm -f config.log + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) install \ + prefix=$(CURDIR)/debian/httperf/usr \ + bindir=$(CURDIR)/debian/httperf/usr/bin + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installmanpages + dh_installchangelogs ChangeLog + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- httperf-0.9.0.orig/debian/watch +++ httperf-0.9.0/debian/watch @@ -0,0 +1,9 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +ftp://ftp.hpl.hp.com/pub/httperf/httperf-([\d\.]*)\.tar\.gz debian uupdate --- httperf-0.9.0.orig/debian/README.source +++ httperf-0.9.0/debian/README.source @@ -0,0 +1,2 @@ +This package uses quilt for patch management, for more information see +the file /usr/share/doc/quilt/README.source in the quilt package. --- httperf-0.9.0.orig/debian/compat +++ httperf-0.9.0/debian/compat @@ -0,0 +1 @@ +5 --- httperf-0.9.0.orig/debian/control +++ httperf-0.9.0/debian/control @@ -0,0 +1,20 @@ +Source: httperf +Section: web +Priority: optional +Maintainer: Alexander Reichle-Schmehl +Homepage: http://www.hpl.hp.com/research/linux/httperf/ +Build-Depends: debhelper (>= 5), quilt, libssl-dev, autotools-dev +Standards-Version: 3.8.3 +Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/httperf/trunk/ +Vcs-Browser: http://svn.debian.org/viewsvn/collab-maint/deb-maint/httperf/ + + +Package: httperf +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: An HTTP server performance tester + httperf is a tool to measure web server performance. It speaks the HTTP + protocol both in its HTTP/1.0 and HTTP/1.1 flavors and offers a variety of + workload generators. While running, it keeps track of a number of performance + metrics that are summarized in the form of statistics that are printed at + the end of a test run. --- httperf-0.9.0.orig/debian/dirs +++ httperf-0.9.0/debian/dirs @@ -0,0 +1 @@ +usr/bin --- httperf-0.9.0.orig/debian/copyright +++ httperf-0.9.0/debian/copyright @@ -0,0 +1,34 @@ +This package was debianized by Luca - De Whiskey's - De Vitis on +Sun, 22 Jul 2001 22:32:30 +0200. It is currently maintained by Alexander Reichle-Schmehl +. + +It was downloaded from ftp://ftp.hpl.hp.com/pub/httperf/ + +Copyright Holder: Copyright (c) 2000 David Mosberger + +License: + +You are free to distribute this software under the terms of +the GNU General Public License version 2 of the License, or +(at your option) any later version. +On Debian systems, the complete text of the GNU General Public +License can be found in the file `/usr/share/common-licenses/GPL-2'. + +Additionally, the below exception was provided by Martin Arlitt, the +upstream maintainer of httperf: + +"In addition, as a special exception, the copyright holders give +permission to link the code of this work with the OpenSSL project's +"OpenSSL" library (or with modified versions of it that use the same +license as the "OpenSSL" library), and distribute linked combinations +including the two. You must obey the GNU General Public License in +all respects for all of the code used other than "OpenSSL". If you +modify this file, you may extend this exception to your version of the +file, but you are not obligated to do so. If you do not wish to do +so, delete this exception statement from your version." + +The complete thread of discussion regarding this issue is in the debian-legal +list archives: + +http://lists.debian.org/debian-legal/2005/06/msg00396.html +http://lists.debian.org/debian-legal/2005/07/msg00040.html --- httperf-0.9.0.orig/debian/docs +++ httperf-0.9.0/debian/docs @@ -0,0 +1,4 @@ +AUTHORS +NEWS +README +TODO --- httperf-0.9.0.orig/debian/patches/01_man_page_hyphens_patch.dpatch +++ httperf-0.9.0/debian/patches/01_man_page_hyphens_patch.dpatch @@ -0,0 +1,100 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_man_page_hyphens_patch.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix lintian warnings for hyphens in man pages + +@DPATCH@ + +diff -uNr httperf-0.8.orig/httperf.man httperf-0.8/httperf.man +--- httperf-0.8.orig/httperf.man 2005-06-07 19:44:18.240675789 -0400 ++++ httperf-0.8/httperf.man 2005-06-07 19:44:50.687793387 -0400 +@@ -87,31 +87,31 @@ + + .SH EXAMPLES + .TP +-httperf --hog --server www ++httperf \-\-hog \-\-server www + This command causes + .B httperf + to create a connection to host www, send a request for the root + document (http://www/), receive the reply, close the connection, and + then print some performance statistics. + .TP +-httperf --hog --server www --num-conn 100 --ra 10 --timeout 5 ++httperf \-\-hog \-\-server www \-\-num\-conn 100 \-\-ra 10 \-\-timeout 5 + Like above, except that a total of 100 connections are created and + that connections are created at a fixed rate of 10 per second. Note +-that option ``--rate'' has been abbreviated to ``--ra''. ++that option ``\-\-rate'' has been abbreviated to ``\-\-ra''. + .TP +-httperf --hog --server=www --wsess=10,5,2 --rate 1 --timeout 5 ++httperf \-\-hog \-\-server=www \-\-wsess=10,5,2 \-\-rate 1 \-\-timeout 5 + Causes + .B httperf + to generate a total of 10 sessions at a rate of 1 session per second. + Each session consists of 5 calls that are spaced out by 2 seconds. + .TP +-httperf --hog --server=www --wsess=10,5,2 --rate=1 --timeout=5 --ssl ++httperf \-\-hog \-\-server=www \-\-wsess=10,5,2 \-\-rate=1 \-\-timeout=5 \-\-ssl + Like above, except that + .B httperf + contacts server www via SSL at port 443 (the default port for SSL + connections). + .TP +-httperf --hog --server www --wsess=10,5,2 --rate=1 --timeout=5 --ssl --ssl-ciphers=EXP-RC4-MD5:EXP-RC2-CBC-MD5 --ssl-no-reuse --http-version=1.0 ++httperf \-\-hog \-\-server www \-\-wsess=10,5,2 \-\-rate=1 \-\-timeout=5 \-\-ssl \-\-ssl\-ciphers=EXP\-RC4\-MD5:EXP\-RC2\-CBC\-MD5 \-\-ssl\-no\-reuse \-\-http\-version=1.0 + Like above, except that + .B httperf + will inform the server that it can only select from two cipher suites +@@ -145,7 +145,7 @@ + as an additional request header. It is necessary to specify the + terminating carriage-return/line-feed sequence explicitly. This can + be done by using the escape sequence ``\\n''. This makes it possible +-to include multiple request headers. For example, ``--add-header ++to include multiple request headers. For example, ``\-\-add\-header + "Referer: foo\\nAuth: secret\\n"'' would add two request headers + (``Referer'' and ``Auth'') to each request. Other supported escape + sequences are ``\\r'' (carriage-return), ``\\a'' (line-feed), ``\\\\'' +@@ -454,7 +454,7 @@ + .B httperf + supports only one cookie per session. If a second cookie is received, + the new cookie overwrites the existing one and a warning message is +-printed if ``--debug 1'' is on. ++printed if ``\-\-debug 1'' is on. + .TP + .B --ssl + Specifies that all communication between +@@ -928,7 +928,7 @@ + reply fits into a single TCP segment. + + The next line, labeled ``Reply size'' contains statistics on the +-average size of the replies---all numbers are in reported bytes. ++average size of the replies\-\-\-all numbers are in reported bytes. + Specifically, the line lists the average length of reply headers, the + content, and footers (HTTP/1.1 uses footers to realize the ``chunked'' + transfer encoding). For convenience, the average total number of +@@ -940,7 +940,7 @@ + + The final line in this section is a histogram of the major status + codes received in the replies from the server. The major status code +-is the ``hundreds''-digit of the full HTTP status code. In the ++is the ``hundreds''\-digit of the full HTTP status code. In the + example, all 29,997 replies had a major status code of 2. It's a good + guess that all status codes were ``200 OK'' but the information in the + histogram is not detailed enough to allow distinguishing status codes +@@ -1137,7 +1137,7 @@ + timeouts (5-10 seconds) are preferable. + + It is important to keep in mind that timeouts do not guarantee that a +-client can sustain a particular offered load---there are many other ++client can sustain a particular offered load\-\-\-there are many other + potential resource bottlenecks. For example, in some cases the client + machine may simply run out of CPU time. To ensure that a given test + really measured the server's capabilities and not the client's, it is +@@ -1160,4 +1160,4 @@ + .PP + The user-interface definitely could be improved. A simple workload + description language might be more suitable than the dozens of little +-command-line options the tool has right now. ++command\-line options the tool has right now. --- httperf-0.9.0.orig/debian/patches/fix-manpage-formating +++ httperf-0.9.0/debian/patches/fix-manpage-formating @@ -0,0 +1,91 @@ +--- a/man/httperf.1 ++++ b/man/httperf.1 +@@ -87,31 +87,31 @@ processes as possible both on the client + + .SH EXAMPLES + .TP +-httperf --hog --server www ++httperf \-\-hog \-\-server www + This command causes + .B httperf + to create a connection to host www, send a request for the root + document (http://www/), receive the reply, close the connection, and + then print some performance statistics. + .TP +-httperf --hog --server www --num-conn 100 --ra 10 --timeout 5 ++httperf \-\-hog \-\-server www \-\-num\-conn 100 \-\-ra 10 \-\-timeout 5 + Like above, except that a total of 100 connections are created and + that connections are created at a fixed rate of 10 per second. Note +-that option ``--rate'' has been abbreviated to ``--ra''. ++that option ``\-\-rate'' has been abbreviated to ``\-\-ra''. + .TP +-httperf --hog --server=www --wsess=10,5,2 --rate 1 --timeout 5 ++httperf \-\-hog \-\-server=www \-\-wsess=10,5,2 \-\-rate 1 \-\-timeout 5 + Causes + .B httperf + to generate a total of 10 sessions at a rate of 1 session per second. + Each session consists of 5 calls that are spaced out by 2 seconds. + .TP +-httperf --hog --server=www --wsess=10,5,2 --rate=1 --timeout=5 --ssl ++httperf \-\-hog \-\-server=www \-\-wsess=10,5,2 \-\-rate=1 \-\-timeout=5 \-\-ssl + Like above, except that + .B httperf + contacts server www via SSL at port 443 (the default port for SSL + connections). + .TP +-httperf --hog --server www --wsess=10,5,2 --rate=1 --timeout=5 --ssl --ssl-ciphers=EXP-RC4-MD5:EXP-RC2-CBC-MD5 --ssl-no-reuse --http-version=1.0 ++httperf \-\-hog \-\-server www \-\-wsess=10,5,2 \-\-rate=1 \-\-timeout=5 \-\-ssl \-\-ssl\-ciphers=EXP\-RC4\-MD5:EXP\-RC2\-CBC\-MD5 \-\-ssl\-no\-reuse \-\-http\-version=1.0 + Like above, except that + .B httperf + will inform the server that it can only select from two cipher suites +@@ -145,7 +145,7 @@ Specifies to include string + as an additional request header. It is necessary to specify the + terminating carriage-return/line-feed sequence explicitly. This can + be done by using the escape sequence ``\\n''. This makes it possible +-to include multiple request headers. For example, ``--add-header ++to include multiple request headers. For example, ``\-\-add\-header + "Referer: foo\\nAuth: secret\\n"'' would add two request headers + (``Referer'' and ``Auth'') to each request. Other supported escape + sequences are ``\\r'' (carriage-return), ``\\a'' (line-feed), ``\\\\'' +@@ -455,7 +455,7 @@ will include this cookie as well. At pr + .B httperf + supports only one cookie per session. If a second cookie is received, + the new cookie overwrites the existing one and a warning message is +-printed if ``--debug 1'' is on. ++printed if ``\-\-debug 1'' is on. + .TP + .B --ssl + Specifies that all communication between +@@ -929,7 +929,7 @@ be measured, so it shows up as zero. Th + reply fits into a single TCP segment. + + The next line, labeled ``Reply size'' contains statistics on the +-average size of the replies---all numbers are in reported bytes. ++average size of the replies\-\-\-all numbers are in reported bytes. + Specifically, the line lists the average length of reply headers, the + content, and footers (HTTP/1.1 uses footers to realize the ``chunked'' + transfer encoding). For convenience, the average total number of +@@ -941,7 +941,7 @@ average. + + The final line in this section is a histogram of the major status + codes received in the replies from the server. The major status code +-is the ``hundreds''-digit of the full HTTP status code. In the ++is the ``hundreds''\-digit of the full HTTP status code. In the + example, all 29,997 replies had a major status code of 2. It's a good + guess that all status codes were ``200 OK'' but the information in the + histogram is not detailed enough to allow distinguishing status codes +@@ -1138,7 +1138,7 @@ rate. A timeout as short as one second + timeouts (5-10 seconds) are preferable. + + It is important to keep in mind that timeouts do not guarantee that a +-client can sustain a particular offered load---there are many other ++client can sustain a particular offered load\-\-\-there are many other + potential resource bottlenecks. For example, in some cases the client + machine may simply run out of CPU time. To ensure that a given test + really measured the server's capabilities and not the client's, it is +@@ -1161,4 +1161,4 @@ prey to measuring client-performance ins + .PP + The user-interface definitely could be improved. A simple workload + description language might be more suitable than the dozens of little +-command-line options the tool has right now. ++command\-line options the tool has right now. --- httperf-0.9.0.orig/debian/patches/series +++ httperf-0.9.0/debian/patches/series @@ -0,0 +1 @@ +fix-manpage-formating --- httperf-0.9.0.orig/debian/patches/00list +++ httperf-0.9.0/debian/patches/00list @@ -0,0 +1 @@ +01_man_page_hyphens_patch.dpatch