Skip to content

Commit

Permalink
net/tcpview: Regenerate patches
Browse files Browse the repository at this point in the history
Regenerate patches using makepatch.
  • Loading branch information
cschuber committed Feb 15, 2023
1 parent e66cede commit b4c6b87
Show file tree
Hide file tree
Showing 33 changed files with 447 additions and 395 deletions.
23 changes: 23 additions & 0 deletions net/tcpview/files/patch-DOC_INSTALL.binaries
@@ -0,0 +1,23 @@
--- DOC/INSTALL.binaries.orig 1993-04-22 21:58:49 UTC
+++ DOC/INSTALL.binaries
@@ -2,9 +2,9 @@ Installing Tcpview
Installing Tcpview

1. Create a directory for the tcpview support files. I use
-/usr/local/tcpview. Create /usr/local/tcpview/filters for the filters.
+/usr/local/lib/tcpview. Create /usr/local/lib/tcpview/filters for the filters.
Copy BGP, generic, and telnet from bin to the filters directory. Copy
-manuf and hosts to /usr/local/tcpview. Edit the last two files as
+manuf and hosts to /usr/local/lib/tcpview. Edit the last two files as
needed.

2. Edit a copy of the tcpview resource file, which is DOC/Tcpview. Change
@@ -21,7 +21,7 @@ using the first one found: the environmental variable
a copy of MOSY, download the UW-CMU SNMP package on ftp.cac.washington.edu.
Tcpdump and tcpview will search for the mib file in the following locations,
using the first one found: the environmental variable "MIBFILE", ./mib.txt,
-and /usr/local/mib/mib.txt.
+and /usr/local/lib/tcpview/mib/mib.txt.

5. If you are running on an Ultrix system, you will have to run pfconfig
before you can capture any data. On a Sun system, you should make
57 changes: 57 additions & 0 deletions net/tcpview/files/patch-DOC_Tcpview
@@ -0,0 +1,57 @@
--- DOC/Tcpview.orig 1993-03-29 23:26:25 UTC
+++ DOC/Tcpview
@@ -1,18 +1,22 @@
+*.foreground: brown
+*.background: ivory2
+
+
! These are the fonts used in the summary window. For best results, choose
! fixed fonts where the second font is exactly the same size as the first, only
! BOLD
-*FontList: courier12=chset1, courB12=chset2
+!*FontList: courier12=chset1, courB12=chset2
!
! This is the directory that contains the external protocol filters
-! default is /usr/local/tcpview/filters
-!Tcpview.filters: /usr/staff/martinh/tcp/filters
+! default is /usr/local/lib/tcpview/filters
+Tcpview.filters: /usr/local/lib/tcpview/filters
!
! Print Command. Default is "lpr"
-Tcpview.printcommand: enscript -2r
+Tcpview.printcommand: lpr
!
! set the height and width of the initial window
! There are no defaults
-Tcpview.height: 800
+Tcpview.height: 465
Tcpview.width: 600
!
! this sets the number of visible items in each pane
@@ -23,11 +27,11 @@ Tcpview.pane*visibleItemCount: 10
!
! Full pathnames for files containing manufacturer id's, ethernet numbers,
! and tcp/udp service mappings. See sample files for format.
-! Defaults are /usr/local/tcpview/manuf, /usr/local/tcpview/hosts,
+! Defaults are /usr/local/lib/tcpview/manuf, /usr/local/lib/tcpview/hosts,
! and /etc/services
-!Tcpview.manuf: /usr/local/sniffer/manuf
-!Tcpview.hostnames: /usr/local/sniffer/ethers
-!Tcpview.services: /usr/local/sniffer/services
+Tcpview.manuf: /usr/local/lib/tcpview/manuf
+Tcpview.hostnames: /usr/local/lib/tcpview/hosts
+Tcpview.services: /etc/services

! Lookup (using DNS) names of hosts not on your local subnet
! default is true. If 'false', IP numbers will be used on foreign hosts.
@@ -85,10 +89,3 @@ Tcpview.maxbytes: 1520
! 4 - Print Relative times
!
!Tcpview.time: 4
-
-
-
-
-
-
-
17 changes: 17 additions & 0 deletions net/tcpview/files/patch-DOC_tcpview.1
@@ -0,0 +1,17 @@
--- DOC/tcpview.1.orig 1993-03-25 20:41:02 UTC
+++ DOC/tcpview.1
@@ -234,11 +234,11 @@ configuration variables. The configuration files are
.RS
\fIResource name\fP \fIDefault\fP
.PP
-Tcpview.hostnames: /usr/local/tcpview/ethers
+Tcpview.hostnames: /usr/local/lib/tcpview/ethers
.PP
-Tcpview.manuf: /usr/local/tcpview/manuf
+Tcpview.manuf: /usr/local/lib/tcpview/manuf
.PP
-Tcpview.services: /etc/services
+Tcpview.services: /etc/services
.PP
The hostnames file contains DLC-to-name mappings. It is in the same format
as \fISniffer\fP name files.
22 changes: 11 additions & 11 deletions net/tcpview/files/patch-Makefile
@@ -1,5 +1,5 @@
--- Makefile.orig 1993-04-22 14:40:24.000000000 -0700
+++ Makefile 2014-05-29 22:43:08.670436162 -0700
--- Makefile.orig 1993-04-22 21:40:24 UTC
+++ Makefile
@@ -21,17 +21,16 @@
# @(#) $Header: /usr/staff/martinh/tcpview/RCS/Makefile,v 1.3 1992/11/17 21:59:47 martinh Exp martinh $ (UW)

Expand All @@ -22,7 +22,7 @@

# These are for the Sun4 version
#CCOPT = -O2 -Bstatic
@@ -41,20 +40,20 @@
@@ -41,20 +40,20 @@ XLIB= -lXm -lXt -lX11
XLIB= -lXm -lXt -lX11

# The installed binary is owned by this group.
Expand Down Expand Up @@ -51,7 +51,7 @@

# Standard CFLAGS
STANDARD_CFLAGS = $(CCOPT) $(DEFINES) $(INCLUDES)
@@ -70,7 +69,7 @@
@@ -70,7 +69,7 @@ STANDARD_CFLAGS = $(CCOPT) $(DEFINES) $(INCLUDES)
#tahoe-bsd#CFLAGS = $(STANDARD_CFLAGS)
#vax-bsd#CFLAGS = $(STANDARD_CFLAGS)
#vax-ultrix#
Expand All @@ -60,7 +60,7 @@
#mips-irix#CFLAGS = $(STANDARD_CFLAGS) -D_BSD_COMPAT

SUBDIRS = hp300-bsd mips-ultrix sun?-sunos? sun4-bsd tahoe-bsd vax-bsd \
@@ -92,7 +91,8 @@
@@ -92,7 +91,8 @@ OS=`./ostype`
# Also, gcc does not remove the .o before forking 'as', which can be a
# problem if you don't own the file but can write to the directory.
.c.o:
Expand All @@ -70,7 +70,7 @@

# List all C source files here

@@ -189,7 +189,7 @@
@@ -189,7 +189,7 @@ tcpview: $(TCPVIEW_OBJ)
$(CC) $(CFLAGS) -o $@ $(TCPDUMP_OBJ) $(LIB)

tcpview: $(TCPVIEW_OBJ)
Expand All @@ -79,7 +79,7 @@

tcpslice: $(TCPSLICE_OBJ)
$(CC) $(CFLAGS) -o $@ $(TCPSLICE_OBJ)
@@ -209,12 +209,12 @@
@@ -209,12 +209,12 @@ submake: force
-@dir=$(MD)-$(OS)-tcpdump; \
if [ ! -d $$dir ]; then ${MAKE} ${MFLAGS} config1; fi; \
set -x; \
Expand All @@ -95,7 +95,7 @@

# N.B.- symbolic links are used in the subdirectory rather than VPATH
# because at least one Sun cc compiler puts the .o in the wrong place
@@ -239,7 +239,7 @@
@@ -239,7 +239,7 @@ config1:
ln -s ../net $$dir/net; \
sed -e "/^all:/d" -e "s/^#$$dir#//" Makefile >$$dir/Makefile; \
chmod ug+w $$dir/Makefile; \
Expand All @@ -104,7 +104,7 @@

config2:
-@md=$(MD); os=$(OS); dir=$$md-$$os-tcpview; list=; \
@@ -258,23 +258,24 @@
@@ -258,23 +258,24 @@ config2:
ln -s ../TCPVIEW_VERSION $$dir/TCPVIEW_VERSION; \
sed -e "/^all:/d" -e "s/^#$$dir#//" Makefile >$$dir/Makefile; \
chmod ug+w $$dir/Makefile; \
Expand Down Expand Up @@ -133,7 +133,7 @@
sed 's/.*/char tcpview_version[] = "&";/' TCPVIEW_VERSION >> version.c
set `sed 's/\([0-9]*\)\.\([0-9]*\).*/\1 \2/' VERSION` ; \
{ echo '#define VERSION_MAJOR' $$1 ; \
@@ -287,22 +288,20 @@
@@ -287,22 +288,20 @@ install: force
install: force
-mkdir -p $(TCPVIEW_DIR)
-mkdir -p $(FILTER_DIR)
Expand Down Expand Up @@ -169,7 +169,7 @@

lint: force
lint -hbxn $(CSRC) | \
@@ -367,8 +366,3 @@
@@ -367,8 +366,3 @@ depend2: force
-../mkdep $(DEFINES) $(INCLUDES) $(TCPVIEW_CSRC) \
tcpgram.c tcplex.c
rm -f $(GEN)
Expand Down

0 comments on commit b4c6b87

Please sign in to comment.