--- argus-client-2.0.6.fixes.1.orig/man/man5/ragator.5 +++ argus-client-2.0.6.fixes.1/man/man5/ragator.5 @@ -10,7 +10,7 @@ .\" CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .\" -.TH RAGATOR.CONF 1 "14 November 2001" +.TH RAGATOR.CONF 5 "14 November 2001" .SH NAME \fBragator.conf\fP \- \fBragator\fP flow model definitions. .SH COPYRIGHT --- argus-client-2.0.6.fixes.1.orig/man/man5/rarc.5 +++ argus-client-2.0.6.fixes.1/man/man5/rarc.5 @@ -10,7 +10,7 @@ .\" CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .\" -.TH RARC 1 "07 November 2000" +.TH RARC 5 "07 November 2000" .SH NAME \fBrarc\fP \- \fBra\fP client resource file. .SH SYNOPSIS --- argus-client-2.0.6.fixes.1.orig/man/man5/ranonymize.5 +++ argus-client-2.0.6.fixes.1/man/man5/ranonymize.5 @@ -10,7 +10,7 @@ .\" CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .\" -.TH RANONYMIZE.CONF 1 "14 November 2001" +.TH RANONYMIZE.CONF 5 "14 November 2001" .SH NAME \fBranonymize.conf\fP \- \fBranonymize(1)\fP configuration file. .SH COPYRIGHT --- argus-client-2.0.6.fixes.1.orig/confdefs.h +++ argus-client-2.0.6.fixes.1/confdefs.h @@ -0,0 +1 @@ + --- argus-client-2.0.6.fixes.1.orig/debian/dirs +++ argus-client-2.0.6.fixes.1/debian/dirs @@ -0,0 +1 @@ +usr/share/lintian/overrides --- argus-client-2.0.6.fixes.1.orig/debian/control +++ argus-client-2.0.6.fixes.1/debian/control @@ -0,0 +1,25 @@ +Source: argus-client +Section: net +Priority: optional +Maintainer: Andrew Pollock +Standards-Version: 3.6.1 +Build-depends: bison, flex, debhelper, devscripts, autotools-dev, libncurses5-dev, dpatch + +Package: argus-client +Architecture: any +Recommends: argus-server +Depends: ${shlibs:Depends} +Suggests: librrds-perl +Description: IP network transaction auditing tool + argus is a network transaction auditing tool that allows the user + to easily classify connections using tcpdump(1) compliant expressions. + Argus runs as an application level daemon, promiscuously reading network + datagrams from a specified interface, and generates network traffic audit + records for the network activity that it encounters. + Auditing records can be used to ensure that access control policies are + being enforced, identify network problems such as denial of service attacks + and more. + . + This package contains the client programs for the argus server. + Please see the package argus-server for the appropriate server. + --- argus-client-2.0.6.fixes.1.orig/debian/rules +++ argus-client-2.0.6.fixes.1/debian/rules @@ -0,0 +1,197 @@ +#!/usr/bin/make -f + +SHELL=/bin/bash + +PACKAGE = argus-client + +include /usr/share/dpatch/dpatch.make + +CFLAGS = -Wall -g +INSTALL = install +INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644 +INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 +INSTALL_SCRIPT = $(INSTALL) -p -o root -g root -m 755 +INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755 + +OLDSUB=./config/config.sub +OLDGUESS=./config/config.guess + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +CFLAGS += -O0 +else +CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) +INSTALL_PROGRAM += -s +endif + +tmp = debian/tmp +sysconfdir = etc +docdir = usr/share/doc +mandir = usr/share/man +sbindir = usr/sbin +bindir = usr/bin + +define checkdir + test -f include/argus.h +endef + +# The autotools target adds forced build-time dependencies on +# autotools-dev (for /usr/share/misc/config.*) and devscripts (for dch) +# It's also a .PHONY make target. +autotools: + chmod u+x $(OLDSUB) + chmod u+x $(OLDGUESS) + OLDDATESUB=`$(OLDSUB) -t 2>/dev/null | tr -d -` ;\ + OLDDATEGUESS=`$(OLDGUESS) -t 2>/dev/null | tr -d -` ;\ + NEWDATESUB=`/usr/share/misc/config.sub -t | tr -d -` ;\ + NEWDATEGUESS=`/usr/share/misc/config.guess -t | tr -d -` ;\ + if [ -z $$OLDDATEGUESS ]; then \ + OLDDATEGUESS=0 ;\ + fi ;\ + if [ -z $$OLDDATESUB ]; then \ + OLDDATESUB=0 ;\ + fi ;\ + if [ $$OLDDATESUB -lt $$NEWDATESUB -o \ + $$OLDDATEGUESS -lt $$NEWDATEGUESS ]; then \ + dch -a -p "GNU config automated update: config.sub\ + ($$OLDDATESUB to $$NEWDATESUB), config.guess\ + ($$OLDDATEGUESS to $$NEWDATEGUESS)" ;\ + cp -f /usr/share/misc/config.sub $(OLDSUB) ;\ + cp -f /usr/share/misc/config.guess $(OLDGUESS) ;\ + echo WARNING: GNU config scripts updated from master copies 1>&2 ;\ + fi + +clean: unpatch checkroot + test -f debian/control + rm -f build-stamp + rm -rf $(tmp) $(tmp-ALT) debian/substvars debian/files *.orig */*.orig *~ */*~ + -$(MAKE) -f Makefile.in realclean ALLDIRS="clients common server" + +checkroot: + test root = "`whoami`" || (echo Need root privelages; exit 1) + +build: patch config.status + dh_installdirs + test -e debian/control + $(MAKE) + +config.status: + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib \ + --exec-prefix=/usr \ + --sbindir=/usr/sbin \ + --bindir=/usr/bin \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --includedir=/usr/include + + + +binary-indep: build + $(checkroot) + +binary-arch: checkroot build + # + # Generate argus-client package. + # + + $(INSTALL_DIR) $(tmp)/$(sysconfdir) + $(INSTALL_DIR) $(tmp)/DEBIAN + $(INSTALL_DIR) $(tmp)/$(bindir) + $(INSTALL_DIR) $(tmp)/{$(mandir),$(bindir)} + $(INSTALL_DIR) $(tmp)/$(mandir)/{man1,man5} + $(INSTALL_DIR) $(tmp)/$(docdir)/$(PACKAGE)/{examples,html} + + # + # Install documentation. + # + + $(INSTALL_FILE) doc/{HOW-TO,FAQ} \ + $(tmp)/$(docdir)/$(PACKAGE) + cp -a support/* $(tmp)/$(docdir)/$(PACKAGE)/examples + chmod 644 $(tmp)/$(docdir)/$(PACKAGE)/examples/* + chmod 755 $(tmp)/$(docdir)/$(PACKAGE)/examples/{Xml,Config,Tools,Archive,System} + chmod 644 $(tmp)/$(docdir)/$(PACKAGE)/examples/README + chmod 644 $(tmp)/$(docdir)/$(PACKAGE)/examples/Config/policy.conf + $(INSTALL_FILE) man/man5/ra* $(tmp)/$(mandir)/man5 + $(INSTALL_FILE) man/man1/ra* $(tmp)/$(mandir)/man1 + $(INSTALL_FILE) debian/README.Debian \ + $(tmp)/$(docdir)/$(PACKAGE)/README.Debian + $(INSTALL_FILE) debian/copyright \ + $(tmp)/$(docdir)/$(PACKAGE)/copyright + $(INSTALL_FILE) doc/CHANGES "$(tmp)/$(docdir)/$(PACKAGE)" + $(INSTALL_FILE) CREDITS "$(tmp)/$(docdir)/$(PACKAGE)" + $(INSTALL_FILE) ChangeLog \ + $(tmp)/$(docdir)/$(PACKAGE)/changelog + $(INSTALL_FILE) debian/changelog \ + $(tmp)/$(docdir)/$(PACKAGE)/changelog.Debian + $(INSTALL_FILE) doc/html/man/ra* \ + $(tmp)/$(docdir)/$(PACKAGE)/html + chown -R root:root $(tmp)/$(docdir)/$(PACKAGE) + + # + # Install special files. + # + + #install --mode=644 debian/ra.conf $(tmp)/$(sysconfdir) + $(INSTALL_FILE) debian/ra.conf $(tmp)/$(sysconfdir) + $(INSTALL_FILE) debian/conffiles $(tmp)/DEBIAN/conffiles + + # ragraph is a Perl script and won't take kindly to being stripped + $(INSTALL) -p -o root -g root -m 755 bin/ragraph $(tmp)/$(bindir) + rm bin/ragraph + + # + # Install binaries. + # + $(INSTALL_PROGRAM) bin/*ra* $(tmp)/$(bindir) + + # + # Compress manpages and changelog. + # + + gzip -9f $(tmp)/$(mandir)/man5/* + gzip -9f $(tmp)/$(mandir)/man1/* + gzip -9f $(tmp)/$(docdir)/$(PACKAGE)/changelog* + + # + # Install lintian override + # + + $(INSTALL_FILE) debian/lintian \ + $(tmp)/usr/share/lintian/overrides/argus-client + + + # + # Compress stuff + # + + dh_compress + + dh_fixperms + + # + # Generate MD5 checksums + # + + dh_md5sums + + + # + # Build binary package. + # + + dpkg-shlibdeps $(tmp)/$(bindir)/* + dpkg-gencontrol -ips -p$(PACKAGE) -P$(tmp) + dpkg --build $(tmp) .. + + +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false + +binary: binary-indep binary-arch + + + --- argus-client-2.0.6.fixes.1.orig/debian/conffiles +++ argus-client-2.0.6.fixes.1/debian/conffiles @@ -0,0 +1 @@ +/etc/ra.conf --- argus-client-2.0.6.fixes.1.orig/debian/changelog +++ argus-client-2.0.6.fixes.1/debian/changelog @@ -0,0 +1,179 @@ +argus-client (2.0.6.fixes.1-3) unstable; urgency=low + + * Applied patch from Xavier Renaut to make ragraph generate PNG graphs + (closes: #350584) + + -- Andrew Pollock Wed, 22 Feb 2006 15:30:07 -0800 + +argus-client (2.0.6.fixes.1-2) unstable; urgency=low + + * Add dpatch functionality + * Applied patch from Andreas Jochens to remove static declaration of + ArgusNetMask in gencode.c and fix FTBFS on amd64/gcc-4.0 (closes: #285465) + + -- Andrew Pollock Wed, 5 Jan 2005 10:50:48 +1100 + +argus-client (2.0.6.fixes.1-1) unstable; urgency=low + + * New upstream release + * The "Can we get it into Sarge before it releases?" release + + -- Andrew Pollock Mon, 16 Aug 2004 11:14:36 +1000 + +argus-client (2.0.6.beta.47-1) unstable; urgency=low + + * New upstream release + * debian/control: bumped Standards-Version (no changes) + * debian/rules: temporarily removed dependency on autotools in clean target + because I don't like what it's doing to my changelogs + * debian/control: Add libncurses5-dev to build dependencies + + -- Andrew Pollock Wed, 26 May 2004 15:29:10 +1000 + +argus-client (2.0.6.beta.46-3) unstable; urgency=low + + * debian/ra.conf: Removed ALL obsolete directives (really closes: #208705) + + -- Andrew Pollock Tue, 9 Sep 2003 09:19:07 +1000 + +argus-client (2.0.6.beta.46-2) unstable; urgency=low + + * debian/ra.conf: Removed obsolete directives + + -- Andrew Pollock Thu, 4 Sep 2003 11:17:23 +1000 + +argus-client (2.0.6.beta.46-1) unstable; urgency=low + + * New upstream release + + -- Andrew Pollock Wed, 3 Sep 2003 14:42:20 +1000 + +argus-client (2.0.6.beta.44-1) unstable; urgency=low + + * New upstream release + * GNU config automated update: config.sub (20021130 to 20030717), + config.guess (20021130 to 20030702) + + -- Andrew Pollock Tue, 26 Aug 2003 14:45:12 +1000 + +argus-client (2.0.6.beta.43-2) unstable; urgency=low + + * debian/control: added autotools-dev and devscripts to Build-Depends + * debian/rules: added target to update autotools files automatically + * GNU config automated update: config.sub (20020905 to 20030717), + config.guess (20020903 to 20030702) + + -- root Wed, 20 Aug 2003 16:16:22 +1000 + +argus-client (2.0.6.beta.43-1) unstable; urgency=low + + * New upstream release + + -- Andrew Pollock Wed, 20 Aug 2003 12:52:43 +1000 + +argus-client (2.0.6.beta.41-2) unstable; urgency=low + + * Bumped Standards-Version + + -- Andrew Pollock Sat, 16 Aug 2003 12:30:04 +1000 + +argus-client (2.0.6.beta.41-1) unstable; urgency=low + + * New upstream release + + -- Andrew Pollock Fri, 11 Jul 2003 09:29:30 +1000 + +argus-client (2.0.6.beta.40-2) unstable; urgency=low + + * Bumped Standards-Version + + -- Andrew Pollock Mon, 16 Jun 2003 07:58:07 +1000 + +argus-client (2.0.6.beta.40-1) unstable; urgency=low + + * New upstream release + + -- Andrew Pollock Sun, 15 Jun 2003 16:40:12 +1000 + +argus-client (2.0.6.beta.39-1) unstable; urgency=low + + * New upstream release + + -- Andrew Pollock Tue, 1 Apr 2003 16:00:14 +1000 + +argus-client (2.0.6.beta.38-4) private; urgency=low + + * Removed all debhelper references from debian/rules for NM T&S + + -- Andrew Pollock Sat, 8 Mar 2003 08:37:23 +1100 + +argus-client (2.0.6.beta.38-3) unstable; urgency=low + + * Generate the MD5 sums *after* you compress the stuff in /usr/share/doc! + + -- Andrew Pollock Mon, 3 Mar 2003 22:38:22 +1100 + +argus-client (2.0.6.beta.38-2) unstable; urgency=low + + * Removed symlinks to undocumented.7 for nonexistant manpages + * Removed unnecessary prerm + * Reworked debian/rules to be more 3.5.8 policy (11.1) compliant + + -- Andrew Pollock Sun, 2 Mar 2003 16:41:13 +1100 + +argus-client (2.0.6.beta.38-1) unstable; urgency=low + + * New upstream release + + -- Andrew Pollock Fri, 10 Jan 2003 21:22:22 +1100 + +argus-client (2.0.6.beta.37-0) unstable; urgency=low + + * New upstream release + * Should now build properly on mipsel + + -- Andrew Pollock Fri, 25 Oct 2002 10:25:53 +1000 + +argus-client (2.0.6.beta.35-2) unstable; urgency=low + + * Fixed up Build-Depends + + -- Andrew Pollock Thu, 17 Oct 2002 23:53:45 +1000 + +argus-client (2.0.6.beta.35-1) private; urgency=low + + * Incorporated a patch to ramon from upstream maintainer + + -- Andrew Pollock Wed, 16 Oct 2002 13:24:00 +1000 + +argus-client (2.0.6.beta.35-0) unstable; urgency=low + + * New upstream release + + -- Andrew Pollock Wed, 16 Oct 2002 01:15:00 +1000 + +argus-client (2.0.2.alpha.17-0) unstable; urgency=low + + * New Maintainer (closes: #163006) + * New upstream release (closes: #162224) + * Suggests librrds-perl (closes: #147615) + + -- Andrew Pollock Wed, 02 Oct 2002 23:05:57 +1000 + +argus-client (2.0.2.alpha.9-3) unstable; urgency=low + + * Changed contact address. + + -- Yotam Rubin Wed, 22 May 2002 16:16:04 +0300 + +argus-client (2.0.2.alpha.9-2) unstable; urgency=low + + * Fixed build problem on alpha. + + -- Yotam Rubin Wed, 12 Dec 2001 03:07:42 +0200 + +argus-client (2.0.2.alpha.9-1) unstable; urgency=low + + * Forked from the argus source package due to upstream reorganization. + + -- Yotam Rubin Fri, 12 Jan 2001 13:21:45 +0200 --- argus-client-2.0.6.fixes.1.orig/debian/lintian +++ argus-client-2.0.6.fixes.1/debian/lintian @@ -0,0 +1 @@ +argus-client: bad-distribution-in-changes-file private --- argus-client-2.0.6.fixes.1.orig/debian/TODO.Debian +++ argus-client-2.0.6.fixes.1/debian/TODO.Debian @@ -0,0 +1,3 @@ +* Put one of those "there is no manpage" manpages in for ragraph, ragrep, rahistogram, rahosts, rapolicy, rarpwatch, raseq, rasrvstats and ratop. I think this should close #147613 + +* File an upstream bug regarding the lack of a flowfile manpage --- argus-client-2.0.6.fixes.1.orig/debian/README.Debian +++ argus-client-2.0.6.fixes.1/debian/README.Debian @@ -0,0 +1,6 @@ +argus-client package for Debian +------------------------------- + +This package contains utilities used to parse argus' audit records. +/usr/share/doc/argus-client/examples contains some useful examples that +may be used in a cron script. --- argus-client-2.0.6.fixes.1.orig/debian/patches/01_ragraph_use_png.dpatch +++ argus-client-2.0.6.fixes.1/debian/patches/01_ragraph_use_png.dpatch @@ -0,0 +1,95 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_ragraph_use_png.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch from Xavier Renaut to fix #350584 and make ragraph use PNG + +@DPATCH@ +diff -urNad argus-client-2.0.6.fixes.1~/ragraph/ragraph.pl argus-client-2.0.6.fixes.1/ragraph/ragraph.pl +--- argus-client-2.0.6.fixes.1~/ragraph/ragraph.pl 2003-12-05 08:47:17.000000000 -0800 ++++ argus-client-2.0.6.fixes.1/ragraph/ragraph.pl 2006-02-22 15:28:55.735911614 -0800 +@@ -29,7 +29,7 @@ + + my $tmpfile = tmpnam(); + my $RRD = $tmpfile.".rrd"; +-my $GIF = "ragraph.gif"; ++my $PNG = "ragraph.png"; + my @arglist = (); + + my $title = ""; +@@ -97,7 +97,7 @@ + s/^-upper// && do { $upper = shift (@ARGV); next ARG; }; + s/^-lower// && do { $lower = shift (@ARGV); next ARG; }; + s/^-title// && do { $title = shift (@ARGV); next ARG; }; +- s/^-w// && do { $GIF = shift (@ARGV); next ARG; }; ++ s/^-w// && do { $PNG = shift (@ARGV); next ARG; }; + s/^-N// && do { $num = shift (@ARGV); next ARG; }; + /^-H/ && do { $histo++; }; + s/\(/\\\(/ && do { ; }; +@@ -106,11 +106,22 @@ + $arglist[@arglist + 0] = $arg; + } + ++print "DEBUG: RagraphProcessArgusData\n"; + RagraphProcessArgusData (); ++ ++print "DEBUG: RagraphReadInitialValue\n"; + RagraphReadInitialValues ($tmpfile); ++ ++print "DEBUG: RagraphGenerateRRDParameters\n"; + RagraphGenerateRRDParameters ($tmpfile); ++ ++print "DEBUG: RagraphGenerateRRD\n"; + RagraphGenerateRRD (); +-RagraphGenerateGIF (); ++ ++print "DEBUG: RagraphGeneratePNG\n"; ++RagraphGeneratePNG (); ++ ++print "DEBUG: RagraphCleanUp\n"; + RagraphCleanUp (); + + exit; +@@ -152,6 +163,7 @@ + @args = ("rahistogram -p6 -G -s lasttime ", @arglist, "> $tmpfile"); + } + ++ print "EXEC: @args\n"; + my $input = `@args`; + } + +@@ -715,15 +727,15 @@ + } + + +-sub RagraphGenerateGIF { +- my @rrd_gifs = ($RRD, $GIF); ++sub RagraphGeneratePNG { ++ my @rrd_pngs = ($RRD, $PNG); + + my @rrd_args = ( + "--base", "1000", + "--vertical-label", $xaxisstr, + "--start", $START, + "--end", $END, +- "--interlace", "--imgformat","GIF", ++ "--interlace", "--imgformat","PNG", + ); + + if ($title) { +@@ -758,11 +770,11 @@ + + push @rrd_args, @line_args; + +- while (@rrd_gifs) { +- my $RRD = shift(@rrd_gifs); +- my $GIF = shift(@rrd_gifs); ++ while (@rrd_pngs) { ++ my $RRD = shift(@rrd_pngs); ++ my $PNG = shift(@rrd_pngs); + +- my ($graphret,$xs,$ys) = RRDs::graph $GIF, @rrd_args; ++ my ($graphret,$xs,$ys) = RRDs::graph $PNG, @rrd_args; + + if ($ERROR = RRDs::error) { + print "ERROR: $ERROR\n"; --- argus-client-2.0.6.fixes.1.orig/debian/patches/00list +++ argus-client-2.0.6.fixes.1/debian/patches/00list @@ -0,0 +1,2 @@ +00_gencode_amd64_285465 +01_ragraph_use_png --- argus-client-2.0.6.fixes.1.orig/debian/patches/00_gencode_amd64_285465.dpatch +++ argus-client-2.0.6.fixes.1/debian/patches/00_gencode_amd64_285465.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 00_gencode_amd64_285465.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes FTBFS #285465 on AMD64. + +@DPATCH@ +diff -urNad argus-client-2.0.6.fixes.1/common/gencode.c /tmp/dpep.MCZNLM/argus-client-2.0.6.fixes.1/common/gencode.c +--- argus-client-2.0.6.fixes.1/common/gencode.c 2004-04-27 02:30:23.000000000 +1000 ++++ /tmp/dpep.MCZNLM/argus-client-2.0.6.fixes.1/common/gencode.c 2005-01-05 10:48:38.000000000 +1100 +@@ -232,7 +232,7 @@ + #include + #include + +-static u_int ArgusNetMask; ++u_int ArgusNetMask; + static int snaplen; + + int --- argus-client-2.0.6.fixes.1.orig/debian/copyright +++ argus-client-2.0.6.fixes.1/debian/copyright @@ -0,0 +1,232 @@ +This package was Debianized by Andrew Pollock +from sources obtained from: + +and previously maintained by Yotam Rubin + + + + QoSient Public License + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS +QOSIENT PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR +DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF +THIS AGREEMENT. + + +1. DEFINITIONS + +"Contribution" means: + + a. in the case of QoSient ("QoSient"), the Original Program, and + + b. in the case of each Contributor, + + i. changes to the Program, and + + ii. additions to the Program; + + where such changes and/or additions to the Program originate + from and are distributed by that particular Contributor. + +A Contribution 'originates' from a Contributor if it was added +to the Program by such Contributor itself or anyone acting on such +Contributor's behalf. + +Contributions do not include additions to the Program which: (i) are +separate modules of software distributed in conjunction with the Program +under their own license agreement, and (ii) are not derivative works of +the Program. + +"Contributor" means QoSient LLC ("QoSient") and any other entity that +distributes the Program. "Original Program" means the original version +of the software accompanying this Agreement as released by QoSient, +including source code, object code and documentation, if any. + +"Program" means the Original Program and Contributions. + +"Recipient" means anyone who receives the Program under this Agreement, +including all Contributors. + + +2. GRANT OF RIGHTS + + a. Subject to the terms of this Agreement, each Contributor hereby +grants Recipient a non-exclusive, worldwide, royalty-free copyright license +to reproduce, prepare derivative works of, publicly display, publicly perform, +distribute and sublicense the Contribution of such Contributor, if any, and +such derivative works, in source code and object code form. + + b. Recipient understands that although each Contributor grants the +licenses to its Contributions set forth herein, no assurances are provided +by any Contributor that the Program does not infringe the patent or other +intellectual property rights of any other entity. Each Contributor disclaims +any liability to Recipient for claims brought by any other entity based on +infringement of intellectual property rights or otherwise. As a condition to +exercising the rights and licenses granted hereunder, each Recipient hereby +assumes sole responsibility to secure any other intellectual property rights +needed, if any. For example, if a third party patent license is required to +allow Recipient to distribute the Program, it is Recipient's responsibility +to acquire that license before distributing the Program. + + c. Each Contributor represents that to its knowledge it has sufficient +copyright rights in its Contribution, if any, to grant the copyright license +set forth in this Agreement. + + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under +its own license agreement, provided that: + + a. it complies with the terms and conditions of this Agreement; and + + b. its license agreement: + i. effectively disclaims on behalf of all Contributors all warranties + and conditions, express and implied, including warranties or + conditions of title and non-infringement, and implied warranties + or conditions of merchantability and fitness for a particular purpose; + + ii. effectively excludes on behalf of all Contributors all liability + for damages, including direct, indirect, special, incidental + and consequential damages, such as lost profits; + + iii. states that any provisions which differ from this Agreement + are offered by that Contributor alone and not by any other party; + and + + iv. states that source code for the Program is available from such + Contributor, and informs licensees how to obtain it in a + reasonable manner on or through a medium customarily used for + software exchange. + +When the Program is made available in source code form: + a. it must be made available under this Agreement; and + + b. a copy of this Agreement must be included with each copy +of the Program. + + +Each Contributor must include the following in a conspicuous location +in the Program: + + Copyright (C) 2000 QoSient, LLC. All Rights Reserved. + +In addition, each Contributor must identify itself as the originator of +its Contribution, if any, in a manner that reasonably allows subsequent +Recipients to identify the originator of the Contribution. + + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor +who includes the Program in a commercial product offering should do so in a +manner which does not create potential liability for other Contributors. +Therefore, if a Contributor includes the Program in a commercial product +offering, such Contributor ("Commercial Contributor") hereby agrees to +defend and indemnify every other Contributor ("Indemnified Contributor") +against any losses, damages and costs (collectively "Losses") arising from +claims, lawsuits and other legal actions brought by a third party against +the Indemnified Contributor to the extent caused by the acts or omissions +of such Commercial Contributor in connection with its distribution of the +Program in a commercial product offering. + +The obligations in this section do not apply to any claims or Losses relating +to any actual or alleged intellectual property infringement. + +In order to qualify, an Indemnified Contributor must: + + a) promptly notify the Commercial Contributor in writing of such claim, and + + b) allow the Commercial Contributor to control, and cooperate with the +Commercial Contributor in, the defense and any related settlement negotiations. +The Indemnified Contributor may participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If that +Commercial Contributor then makes performance claims, or offers warranties related +to Product X, those performance claims and warranties are such Commercial +Contributor's responsibility alone. Under this section, the Commercial Contributor +would have to defend claims against the other Contributors related to +those performance claims and warranties, and if a court requires any other +Contributor to pay any damages as a result, the Commercial Contributor must +pay those damages. + + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS +PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY +WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR +FITNESS FOR A PARTICULAR PURPOSE. + +Each Recipient is solely responsible for determining the appropriateness of +using and distributing the Program and assumes all risks associated with +its exercise of rights under this Agreement, including but not limited to +the risks and costs of program errors, compliance with applicable laws, +damage to or loss of data, programs or equipment, and unavailability or +interruption of operations. + + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT +NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR +TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF +THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS +GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this Agreement, and without further action +by the parties hereto, such provision shall be reformed to the minimum +extent necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against a Contributor with respect +to a patent applicable to software (including a cross-claim or counterclaim +in a lawsuit), then any patent licenses granted by that Contributor to +such Recipient under this Agreement shall terminate as of the date such +litigation is filed. In addition, if Recipient institutes patent litigation +against any entity (including a cross-claim or counterclaim in a lawsuit) +alleging that the Program itself (excluding combinations of the Program +with other software or hardware) infringes such Recipient's patent(s), +then such Recipient's rights granted under Section 2(b) shall terminate +as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails +to comply with any of the material terms or conditions of this Agreement +and does not cure such failure in a reasonable period of time after becoming +aware of such noncompliance. If all Recipient's rights under this Agreement +terminate, Recipient agrees to cease use and distribution of the Program +as soon as reasonably practicable. However, Recipient's obligations under +this Agreement and any licenses granted by Recipient relating to the Program +shall continue and survive. + +QoSient may publish new versions (including revisions) of this Agreement from +time to time. Each new version of the Agreement will be given a distinguishing +version number. The Program (including Contributions) may always be distributed +subject to the version of the Agreement under which it was received. In addition, +after a new version of the Agreement is published, Contributor may elect to +distribute the Program (including its Contributions) under the new version. + +No one other than QoSient has the right to modify this Agreement. Except as +expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights +or licenses to the intellectual property of any Contributor under this Agreement, +whether expressly, by implication, estoppel or otherwise. All rights in +the Program not expressly granted under this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and the +intellectual property laws of the United States of America. No party to this +Agreement will bring a legal action under this Agreement more than one year +after the cause of action arose. Each party waives its rights to a jury trial +in any resulting litigation. + --- argus-client-2.0.6.fixes.1.orig/debian/ra.conf +++ argus-client-2.0.6.fixes.1/debian/ra.conf @@ -0,0 +1,342 @@ +# +# Copyright (c) 2000 QoSient, LLC +# All rights reserved. +# +# Permission to use, copy, modify, and distribute this software and +# its documentation for any purpose and without fee is hereby granted, +# provided that the above copyright notice appear in all copies and +# that both that copyright notice and this permission notice appear +# in supporting documentation, and that the name of QoSient not +# be used in advertising or publicity pertaining to distribution of +# the software without specific, written prior permission. +# +# QOSIENT, LLC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +# SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +# FITNESS, IN NO EVENT SHALL QOSIENT, LLC BE LIABLE FOR ANY +# SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER +# RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF +# CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# +# +# Example .rarc +# +# Ra* clients will open this file if its in the users HOME directory, +# or in the $ARGUSHOME directory, and parse it to set common configuration +# options. All of these values will be overriden by those options +# set on the command line, or in the file specified using the -f option. +# +# Values can be quoted to make string denotation easier, however, the +# parser does not require that string values be quoted. To support this, +# the parse will remove '\"' characters from input strings, so do not +# use this character in strings themselves. +# +# Values specified as "" will be treated as a NULL string, and the parser +# will ignore the variable setting. + + +# +# All ra* clients can attach to a remote server, and collect argus data +# in real time. This variable can be a name or a dot notation IP address. +# Setting this variable can have bothersome side effects when using ra* +# programs for reasons other than reading from a remote server. In +# particular, with this variable set, ra* clients will not read from +# stdin without explicitly indicating "-r -" on the commandline. +# Use this option with some care. +# +# Commandline equivalent -S +# + +#RA_ARGUS_SERVER=localhost + + +# All ra* clients can read Cicso Netflow records directly from Cisco +# routers. Specifying this value will alert the ra* client to open +# a UDP based socket listening for data from this name or address. +# +# Commandline equivalent -C +# + +#RA_CISCONETFLOW_SOURCE=no + + +# Whether the remote data source is an Argus Server or a Cisco router, +# the port number that will be used to bind to is specified using this +# variable. For Argus Servers, the default is 561, the "experimental +# monitor" port. For Cisco Netflow records, the default is 9995. +# +# Commandline equivalent -P +# + +RA_ARGUS_SERVERPORT=561 + + +# When argus is compiled with SASL support, ra* clients may be +# required to authenticate to the argus server before the argus +# will accept the connection. This variable will allow one to +# set the user and authorization id's, if needed. Although +# not recommended you can provide a password through the +# RA_AUTH_PASS variable. The format for this variable is: +# +# RA_USER_AUTH="user_id/authorization_id" +# +# Commandline equivalent -U +# + +RA_USER_AUTH="" +RA_AUTH_PASS="" + + +# All ra* clients can support writing its output as Argus Records into +# a file. Stdout can be specified using "-". +# +# Commandline equivalent -w +# + +RA_OUTPUT_FILE="" + + +# All ra* clients can support filtering its input based on a time +# range. The format is: +# timeSpecification[-timeSpecification] +# +# where the format of a timeSpecification can be one of these: +# [mm/dd[/yy].]hh[:mm[:ss]] +# mm/dd[/yy] +# +# Commandline equivalent -t +# + +RA_TIMERANGE="" + + +# All ra* clients can support running for a number of seconds, +# while attached to a remote source of argus data. This is a type +# of polling. The default is zero (0), which means run indefinately. +# +# Commandline equivalent -T +# + +RA_RUN_TIME=0 + + +# Most ra* clients are designed to print argus records out in ASCII, +# with each client supporting its own output formats. For ra() like +# clients, this variable will generate column headers as labels. +# The number is the number of lines between repeated header output. +# Setting this value to zero (0) will cause the labels to be printed +# once. If you don't want labels, then comment this line out or +# delete it. +# +# Commandline equivalent -L +# + +#RA_PRINT_LABELS=0 + + +# Most ra* clients are designed to print argus records out in ASCII, +# with each client supporting its own output formats. For ra() like +# clients, this variable can overide the default field delimiter, +# which are variable spans of space (' '), to be any character. +# The most common are expected to be '\t' for tabs, and ',' for +# comma separated fields. +# +# No Commandline equivalent +# + +RA_FIELD_DELIMITER='' + + +# +# For ra() like clients, this variable will printout Summary data +# for the client session, at the termination of the program. +# +# Commandline equivalent -a +# + +RA_PRINT_SUMMARY=no + + +#OBSOLETE## +#OBSOLETE## For ra() like clients, this variable will printout the Argus ID +#OBSOLETE## that generated the flow record. +#OBSOLETE## +#OBSOLETE## Commandline equivalent -i +#OBSOLETE## +#OBSOLETE# +#OBSOLETE#RA_PRINT_ARGUSID=no +#OBSOLETE# + +#OBSOLETE## +#OBSOLETE## +#OBSOLETE## For ra() like clients, this variable will printout the MAC +#OBSOLETE## addresses involved in the flow record, if the information +#OBSOLETE## is available. +#OBSOLETE## +#OBSOLETE## Commandline equivalent -m +#OBSOLETE## +#OBSOLETE# +#OBSOLETE#RA_PRINT_MACADDRS=no + +#OBSOLETE## +#OBSOLETE## For ra() like clients, this variable will print the extended +#OBSOLETE## state and protocol indicators. +#OBSOLETE## +#OBSOLETE## Commandline equivalent -I +#OBSOLETE## +#OBSOLETE# +#OBSOLETE#RA_PRINT_INDICATORS=yes + +# +# For ra() like clients, this variable will suppress resolving +# hostnames, and print the dot notation IP address, or ':' notation +# ethernet address. There is a huge performance impact with +# name lookup, so the default is to not resolve hostnames. +# +# Commandline equivalent -n +# + +RA_PRINT_HOSTNAMES=no + + +#OBSOLETE## For ra() like clients, this variable will include the packet and +#OBSOLETE## byte counts in the output format. +#OBSOLETE## +#OBSOLETE## Commandline equivalent -c +#OBSOLETE## +#OBSOLETE# +#OBSOLETE#RA_PRINT_COUNTS=yes + + +# +# For ra() like clients, this variable will include the response +# data that is provided by Argus. This is protocol and state +# specific. +# +# Commandline equivalent -R +# + +RA_PRINT_RESPONSE_DATA=no + + +# For ra() like clients, this variable will force the timestamp +# to be in Unix time format, which is an integer representing the +# number of elapsed seconds since the epoch. +# +# Commandline equivalent -u +# + +RA_PRINT_UNIX_TIME=no + + +# For ra() like clients, this variable is used to override the +# time format of the timestamp. This string must conform to +# the format specified in strftime(). Malformed strings can +# generate fatal errors, so be careful with this one. +# +# No Commandline equivalent +# + +RA_TIME_FORMAT="%m-%d-%y %T" + +# For those of us that prefer European dates... +#RA_TIME_FORMAT="%d-%m-%y %T" + + +#OBSOLETE## For ra() like clients, this variable is used to modify the +#OBSOLETE## reported time. This determines if the transaction start +#OBSOLETE## time will be displayed or not. +#OBSOLETE## +#OBSOLETE## No Commandline equivalent +#OBSOLETE## +#OBSOLETE# +#OBSOLETE#RA_PRINT_STARTIME=yes + + +#OBSOLETE## For ra() like clients, this variable is used to modify the +#OBSOLETE## reported time. This determines if the transaction last +#OBSOLETE## time will be displayed or not. +#OBSOLETE## +#OBSOLETE## Commandline equivalent -l +#OBSOLETE## +#OBSOLETE# +#OBSOLETE#RA_PRINT_LASTIME=no + + +#OBSOLETE## For ra() like clients, this variable is used to modify the +#OBSOLETE## reported time. This determines if the transaction duration +#OBSOLETE## time will be printed or not. +#OBSOLETE## +#OBSOLETE## Commandline equivalent -g +#OBSOLETE## +#OBSOLETE# +#OBSOLETE#RA_PRINT_DURATION=yes + + +# For ra() like clients, this variable is used to specify the +# number of decimal places that will be printed as the fractional +# part of the time. Argus collects usec precision, and so a +# maximum value of 6 is supported. To not print the fractional +# part, specify the value zero (0). +# +# Commandline equivalent -p + +RA_USEC_PRECISION=6 + + +# Argus can capture user data. This variable specifies the number +# of bytes that will be printed. The default is zero (0). +# The format is the same as that for the -d option of ra(). +# num | 's' | 'd' | 's':'d' +# +# Examples are: +# 32, s64, d8, s32:d16 +# +# Commandline equivalent -d +# +#RA_PRINT_USERDATA=0 + + +# Argus can capture user data. When printing out the user data +# contents, using tools such as raxml(), the type of encoding +# can be specified here. Supported values are "Ascii", or "Encode64". +# +# Commandline equivalent -e +# + +RA_USERDATA_ENCODE=Ascii + + +# If compiled to support this option, ra* clients are capable +# of generating a lot of use [full | less | whatever] debug +# information. The default value is zero (0). +# +# Commandline equivalent -D +# + +RA_DEBUG_LEVEL=0 + + +# You can provide a filter expression here, if you like. +# It should be limited to 2K in length. The default is to +# not filter. +# +# No Commandline equivalent +# + +RA_FILTER="" + + +# When you intend to print hostnames and port service names +# rather than the numbers, these variables will help to +# avoid truncating of hostnames, and provide pretty printing +# with tools such as ra(), ragator() and rasort(). +# These values are simple suggestions. +# +# No Commandline equivalent +# + + +RA_HOST_FIELD_LENGTH=28 +RA_PORT_FIELD_LENGTH=10 + --- argus-client-2.0.6.fixes.1.orig/config/config.guess +++ argus-client-2.0.6.fixes.1/config/config.guess @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2002-11-30' +timestamp='2003-07-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -98,14 +98,18 @@ # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. -# This shell variable is my proudest work .. or something. --bje +# Portable tmp directory creation inspired by the Autoconf team. -set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ; -(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old) - || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ; -dummy=$tmpdir/dummy ; -files="$dummy.c $dummy.o $dummy.rel $dummy" ; -trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ; +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in ,,) echo "int x;" > $dummy.c ; for c in cc gcc c89 c99 ; do @@ -113,15 +117,13 @@ CC_FOR_BUILD="$c"; break ; fi ; done ; - rm -f $files ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; -unset files' +esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -238,68 +240,52 @@ if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` fi + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - eval $set_cc_for_build - cat <$dummy.s - .data -\$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - - .text - .globl main - .align 4 - .ent main -main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null - if test "$?" = 0 ; then - case `$dummy` in - 0-0) - UNAME_MACHINE="alpha" - ;; - 1-0) - UNAME_MACHINE="alphaev5" - ;; - 1-1) - UNAME_MACHINE="alphaev56" - ;; - 1-101) - UNAME_MACHINE="alphapca56" - ;; - 2-303) - UNAME_MACHINE="alphaev6" - ;; - 2-307) - UNAME_MACHINE="alphaev67" - ;; - 2-1307) - UNAME_MACHINE="alphaev68" - ;; - 3-1307) - UNAME_MACHINE="alphaev7" - ;; - esac - fi - rm -f $dummy.s $dummy && rmdir $tmpdir echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; + Alpha*:OpenVMS:*:*) + echo alpha-hp-vms + exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -338,6 +324,9 @@ NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit 0 ;; DRS?6000:UNIX_SV:4.2*:7*) case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7 && exit 0 ;; @@ -450,8 +439,7 @@ EOF $CC_FOR_BUILD -o $dummy $dummy.c \ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + && exit 0 echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; Motorola:PowerMAX_OS:*:*) @@ -535,8 +523,7 @@ exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 @@ -635,10 +622,20 @@ } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy && rmdir $tmpdir + test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + # avoid double evaluation of $set_cc_for_build + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; ia64:HP-UX:*:*) @@ -672,8 +669,7 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) @@ -731,15 +727,15 @@ CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY*T3D:*:*:*) - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; + *:UNICOS/mp:*:*) + echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` @@ -755,7 +751,7 @@ *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; - *:FreeBSD:*:*) + *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) # Determine whether the default compiler uses glibc. eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -767,8 +763,10 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} + # GNU/FreeBSD systems have a "k" prefix to indicate we are using + # FreeBSD's kernel, but not the complete OS. + case ${LIBC} in gnu) kernel_only='k' ;; esac + echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -779,8 +777,8 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; - x86:Interix*:3*) - echo i586-pc-interix3 + x86:Interix*:[34]*) + echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' exit 0 ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks @@ -809,6 +807,9 @@ arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -832,7 +833,6 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - rm -f $dummy.c && rmdir $tmpdir test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; mips64:Linux:*:*) @@ -852,7 +852,6 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - rm -f $dummy.c && rmdir $tmpdir test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; ppc:Linux:*:*) @@ -889,6 +888,9 @@ s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit 0 ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -948,7 +950,6 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; @@ -1048,7 +1049,7 @@ exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0) + 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -1146,7 +1147,11 @@ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) - echo `uname -p`-apple-darwin${UNAME_RELEASE} + case `uname -p` in + *86) UNAME_PROCESSOR=i686 ;; + powerpc) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` @@ -1200,6 +1205,9 @@ *:ITS:*:*) echo pdp10-unknown-its exit 0 ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1320,8 +1328,7 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 -rm -f $dummy.c $dummy && rmdir $tmpdir +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. --- argus-client-2.0.6.fixes.1.orig/config/config.sub +++ argus-client-2.0.6.fixes.1/config/config.sub @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2002-11-30' +timestamp='2003-07-17' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -118,7 +118,7 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -228,13 +228,14 @@ | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | clipper \ + | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ - | ip2k \ + | ip2k | iq2000 \ | m32r | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ @@ -245,21 +246,23 @@ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | msp430 \ | ns16k | ns32k \ | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ | strongarm \ - | tahoe | thumb | tic80 | tron \ + | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ | x86 | xscale | xstormy16 | xtensa \ @@ -294,7 +297,7 @@ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ @@ -302,7 +305,7 @@ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ + | ip2k-* | iq2000-* \ | m32r-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ @@ -315,21 +318,25 @@ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39 | mipstx39el \ - | none-* | np1-* | ns16k-* | ns32k-* \ + | mipstx39-* | mipstx39el-* \ + | msp430-* \ + | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ @@ -367,6 +374,9 @@ basic_machine=a29k-none os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -716,6 +726,10 @@ np1) basic_machine=np1-gould ;; + nv1) + basic_machine=nv1-cray + os=-unicosmp + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -758,18 +772,24 @@ pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; - pentiumii | pentium2) + pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; + pentium4) + basic_machine=i786-pc + ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumii-* | pentium2-*) + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pn) basic_machine=pn-gould ;; @@ -828,6 +848,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent ;; @@ -835,6 +859,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh64) + basic_machine=sh64-unknown + ;; sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks @@ -901,10 +928,6 @@ basic_machine=i386-sequent os=-dynix ;; - t3d) - basic_machine=alpha-cray - os=-unicos - ;; t3e) basic_machine=alphaev5-cray os=-unicos @@ -913,14 +936,18 @@ basic_machine=t90-cray os=-unicos ;; - tic4x | c4x*) - basic_machine=tic4x-unknown - os=-coff - ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -1023,7 +1050,7 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele) + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sh64) @@ -1102,7 +1129,7 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ + | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ @@ -1114,7 +1141,7 @@ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1223,6 +1250,12 @@ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; -none) ;; *) @@ -1254,6 +1287,9 @@ arm*-semi) os=-aout ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20