From 0ec4e212377010efa01bf628474c4218fc0197fe Mon Sep 17 00:00:00 2001 From: Peter Haag Date: Fri, 29 Dec 2017 16:52:49 +0100 Subject: [PATCH] Remove unneeded files --- non-dist/TJ-Work-Notes | 7 -- non-dist/install-sh | 251 ----------------------------------------- non-dist/make-dist | 15 --- non-dist/mkinstalldirs | 40 ------- non-dist/test.sh | 95 ---------------- 5 files changed, 408 deletions(-) delete mode 100644 non-dist/TJ-Work-Notes delete mode 100755 non-dist/install-sh delete mode 100644 non-dist/make-dist delete mode 100755 non-dist/mkinstalldirs delete mode 100755 non-dist/test.sh diff --git a/non-dist/TJ-Work-Notes b/non-dist/TJ-Work-Notes deleted file mode 100644 index 8ed6b5c..0000000 --- a/non-dist/TJ-Work-Notes +++ /dev/null @@ -1,7 +0,0 @@ - -Redo built system to automake. -Why? To replace custom Makefile(.in) with autogenerated ones that handled more build cases - most notablebly out of source tree build and distribution builds (eg to make debs and rpms) -* Fix yyac usage to generate seperate .c and .h files -* All headers have multi-include protection -* Started rearranging files into a directory structure \ No newline at end of file diff --git a/non-dist/install-sh b/non-dist/install-sh deleted file mode 100755 index e9de238..0000000 --- a/non-dist/install-sh +++ /dev/null @@ -1,251 +0,0 @@ -#!/bin/sh -# -# install - install a program, script, or datafile -# This comes from X11R5 (mit/util/scripts/install.sh). -# -# Copyright 1991 by the Massachusetts Institute of Technology -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, 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 M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -transformbasename="" -transform_arg="" -instcmd="$mvprog" -chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd="$cpprog" - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd="$stripprog" - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "install: no input file specified" - exit 1 -else - true -fi - -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d $dst ]; then - instcmd=: - chmodcmd="" - else - instcmd=mkdir - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f $src -o -d $src ] - then - true - else - echo "install: $src does not exist" - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "install: no destination specified" - exit 1 - else - true - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d $dst ] - then - dst="$dst"/`basename $src` - else - true - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' -' -IFS="${IFS-${defaultIFS}}" - -oIFS="${IFS}" -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" - -pathcomp='' - -while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" - shift - - if [ ! -d "${pathcomp}" ] ; - then - $mkdirprog "${pathcomp}" - else - true - fi - - pathcomp="${pathcomp}/" -done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd $dst && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi -else - -# If we're going to rename the final executable, determine the name now. - - if [ x"$transformarg" = x ] - then - dstfile=`basename $dst` - else - dstfile=`basename $dst $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename $dst` - else - true - fi - -# Make a temp file name in the proper directory. - - dsttmp=$dstdir/#inst.$$# - -# Move or copy the file name to the temp name - - $doit $instcmd $src $dsttmp && - - trap "rm -f ${dsttmp}" 0 && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && - -# Now rename the file to the real destination. - - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile - -fi && - - -exit 0 diff --git a/non-dist/make-dist b/non-dist/make-dist deleted file mode 100644 index 0c388c5..0000000 --- a/non-dist/make-dist +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -VERSION=`perl -ne 'if ( m#nfdump_version\s+=\s+"(.+)"# ) { print "$1"; }' version.h` - -if [ "x${VERSION}" = "x" ]; then - echo "Can't extract version" - exit -fi - -echo Creating Version $VERSION - -mkdir nfdump-${VERSION} -/bin/cp `cat distfiles` nfdump-${VERSION} -tar zcf nfdump-${VERSION}.tar.gz nfdump-${VERSION} -rm -rf nfdump-${VERSION} diff --git a/non-dist/mkinstalldirs b/non-dist/mkinstalldirs deleted file mode 100755 index 351cfb7..0000000 --- a/non-dist/mkinstalldirs +++ /dev/null @@ -1,40 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman -# Created: 1993-05-16 -# Public domain - -# $Id: mkinstalldirs 15 2004-12-20 12:43:36Z peter $ - -errstatus=0 - -for file -do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift - - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case "$pathcomp" in - -* ) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - fi - fi - - pathcomp="$pathcomp/" - done -done - -exit $errstatus - -# mkinstalldirs ends here diff --git a/non-dist/test.sh b/non-dist/test.sh deleted file mode 100755 index 4569ef1..0000000 --- a/non-dist/test.sh +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/sh -# This file is part of the nfdump project. -# -# Copyright (c) 2004, SWITCH - Teleinformatikdienste fuer Lehre und Forschung -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# * Neither the name of SWITCH nor the names of its contributors may be -# used to endorse or promote products derived from this software without -# specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -# $Author: peter $ -# -# $Id: test.sh 100 2008-08-15 11:36:21Z peter $ -# -# $LastChangedRevision: 100 $ -# -# - -set -e - -# run filter and type tests -./nftest - -# Check for correct output -./nfgen | ./nfdump -q -o raw > test1.out -diff -u nfdump.test.out test1.out - -# compressed flow test -./nfgen | ./nfdump -z -q -w test.flows -./nfdump -q -r test.flows -o raw > test2.out -diff -u nfdump.test.out test2.out - -# uncompressed flow test -rm -f test.flows test2.out -./nfgen | ./nfdump -q -w test.flows -./nfdump -q -r test.flows -o raw > test2.out -diff -u nfdump.test.out test2.out - -rm -r test1.out test2.out - -# create tmp dir for flow replay -if [ -d tmp ]; then - rm -f tmp/* - rmdir tmp -fi -mkdir tmp - -# Start nfcapd on localhost and replay flows -echo -echo -n Starting nfcapd ... -./nfcapd -p 65530 -l tmp -D -P tmp/pidfile -T '*' -sleep 1 -echo done. -echo -n Replay flows ... -./nfreplay -r test.flows -v9 -H 127.0.0.1 -p 65530 -echo done. -sleep 1 - -echo -n Terminate nfcapd ... -kill -TERM `cat tmp/pidfile`; -sleep 1 -echo done. - -if [ -f tmp/pidfile ]; then - echo nfcapd does not terminate - exit -fi - -./nfdump -q -o raw -r tmp/nfcapd.* > test3.out -diff -u nfdump.test.out test3.out - -rm test.flows test3.out tmp/nfcapd.* -rmdir tmp - -echo All tests successful.