rpms/ax25-apps/F-7 ax25-apps-0.0.6-nongenericnames.patch, NONE, 1.1 ax25-apps.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Robert 'Bob' Jensen (bjensen) fedora-extras-commits at redhat.com
Tue Feb 19 22:58:42 UTC 2008


Author: bjensen

Update of /cvs/pkgs/rpms/ax25-apps/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22968

Modified Files:
	.cvsignore sources 
Added Files:
	ax25-apps-0.0.6-nongenericnames.patch ax25-apps.spec 
Log Message:

Committing in ax24-apps for F7.

Modified Files:
 	.cvsignore Makefile sources 
Added Files:
 	ax25-apps-0.0.6-nongenericnames.patch ax25-apps.spec 


ax25-apps-0.0.6-nongenericnames.patch:

--- NEW FILE ax25-apps-0.0.6-nongenericnames.patch ---
diff -uNr ax25-apps-0.0.6.orig/call/axcall.1 ax25-apps-0.0.6/call/axcall.1
--- ax25-apps-0.0.6.orig/call/axcall.1	1970-01-01 01:00:00.000000000 +0100
+++ ax25-apps-0.0.6/call/axcall.1	2007-12-06 09:25:11.000000000 +0100
@@ -0,0 +1,178 @@
+.TH AXCALL 1 "27 August 1996" Linux "Linux Programmer's Manual"
+.SH NAME
+axcall \- make an AX.25, NET/ROM or Rose connection.
+.SH SYNOPSIS
+For AX.25
+.br
+.B axcall [-b l|e] [-d] [-h] [-m s|e] [-p paclen] [-r] [-t] [-v] [-w window] port callsign [[via] digipeaters.....]
+.sp 1
+For NET/ROM
+.br
+.B axcall [-d] [-h] [-p paclen] [-r] [-t] [-v] port callsign
+.sp 1
+For Rose
+.br
+.B axcall [-d] [-h] [-r] [-t] [-v] port callsign address [[via] digipeater]
+.br
+.SH DESCRIPTION
+.LP
+.B Axcall
+is the general purpose AX.25, NET/ROM and Rose connection program. As is normal
+in AX.25 it runs entirely in line mode. All CR/LF translation is done
+transparently. The program provides ASCII, YAPP, YAPP-C and 7+ file
+transfer facilities. Some of the options are only valid in AX.25 mode,
+the program will quietly ignore them if given in NET/ROM mode or in Rose
+mode.
+.LP
+This version of
+.B axcall
+incorporates many changes that include a much improved user interface. The
+port name is mandatory and is the name of the port which the connection will
+be made on. The port name may be either an AX.25, a NET/ROM port or a Rose
+port,
+.B axcall
+will determine which automatically.
+.LP
+When using NET/ROM the use of digipeaters is meaningless and is not
+supported. However when using Rose up to one digipeater may be specified, as
+well as the Rose address of the distant node and the callsign of the remote
+station. The Rose address must be ten digits long and it must exist in the
+Rose node tables. For Rose connects to work
+.B axparms
+must have been used to set a callsign/uid mapping for the userid in use.
+.SH OPTIONS
+.TP 10
+.BI "\-b l|e"
+Sets the method of backoff to use with AX.25 connections. The default is
+taken from the port specification, but can be overridden by this option.
+Valid values are
+.B l
+for linear backoff, and
+.B e
+for exponential backoff.
+.TP 10
+.BI \-d
+Turn on socket level debugging.
+.TP 10
+.BI \-h
+Selects Slave mode.
+.TP 10
+.BI "\-m s|e"
+Sets the AX.25 mode to use. The default is taken from the port
+specification, but can be overridden by this option. Valid values are
+.B s
+for normal (modulus 8) AX.25 operation, or
+.B e
+for extended (modulus 128) AX.25 operation.
+.TP 10
+.BI "\-p paclen"
+Specify a specific maximum amount of data to be sent in each AX.25 packet. 
+.TP 10
+.BI \-r
+Selects Raw mode.
+.TP 10
+.BI \-t
+Selects Talk mode.
+.TP 10
+.BI \-v
+Display the version.
+.TP 10
+.BI "\-w window"
+Specify a specific AX.25 window for this connection. Only valid in AX.25 mode.
+.LP
+The axcall program interprets lines beginning with a '~' specially.
+The following '~' escapes are available.
+.TP 16
+.BI ~?
+List escapes
+.TP 16
+.BI ~~
+A ~ symbol
+.TP 16
+.BI ~.
+Close connection
+.TP 16
+.BI "~! [command]"
+Run a command
+.TP 16
+.BI ~0
+Change to Raw mode
+.TP 16
+.BI ~1
+Change to Slave mode
+.TP 16
+.BI ~2
+Change to Talk mode
+.TP 16
+.BI ~a
+Start a file transfer (Autobin)
+.TP 16
+.BI ~b
+Start a file transfer (Binary)
+.TP 16
+.BI ~c
+Close the logfile
+.TP 16
+.BI ~h
+List escapes
+.TP 16
+.BI "~o [filename]"
+Open a logfile (default 'logfile.txt')
+.TP 16
+.BI ~r
+Reconnect to remote station
+.TP 16
+.BI ~s
+Stop an upload
+.TP 16
+.BI "~u [filename]"
+Upload a file (ASCII upload)
+.TP 16
+.BI "~yu [filename]"
+Upload a file (YAPP upload)
+.TP 16
+.BI "~yd [filename]"
+Download a file (YAPP download)
+.TP 16
+.BI ~z
+Suspend program
+.LP
+The program provides no terminal emulation features. These are left
+up to the console facilities of the terminal in use. The program is 
+however '8 bit clean'.
+.SH FILES
+.nf
+/proc/net/nr_nodes
+.br
+/proc/net/rose_nodes
+.br
+/etc/ax25/axports
+.br
+/etc/ax25/nrports
+.br
+/etc/ax25/rsports
+.fi
+.SH "SEE ALSO"
+.BR axlisten (1),
+.BR mheard (1),
+.BR ax25 (4),
+.BR netrom (4),
+.BR rose (4),
+.BR axports (5),
+.BR nrports (5),
+.BR rsports (5),
+.BR axparms (8),
+.BR nrparms (8),
+.BR rsparms (8).
+.SH AUTHORS
+.nf
+Alexander Tietzel DG6XA <TIETZE_A at etech.fh-hamburg.de>
+.br
+Joerg Reuter DL1BKE <jreuter at poboxes.com>
+.br
+Alan Cox GW4PTS <alan at cymru.net>
+.br
+Jonathan Naylor G4KLX <g4klx at g4klx.demon.co.uk>
+.br
+Steve Henson G6IXS <shenson at nyx.cs.du.edu>
+.fi
diff -uNr ax25-apps-0.0.6.orig/call/call.c ax25-apps-0.0.6/call/call.c
--- ax25-apps-0.0.6.orig/call/call.c	2007-12-06 09:24:43.000000000 +0100
+++ ax25-apps-0.0.6/call/call.c	2007-12-06 09:25:16.000000000 +0100
@@ -160,7 +160,7 @@
 
 	if ((fp = fopen(PROC_NR_NODES_FILE, "r")) == NULL) {
 		fprintf(stderr,
-			"call: NET/ROM not included in the kernel\n");
+			"axcall: NET/ROM not included in the kernel\n");
 		return -1;
 	}
 	fgets(buffer, 100, fp);
@@ -180,7 +180,7 @@
 
 	fclose(fp);
 
-	fprintf(stderr, "call: NET/ROM callsign or alias not found\n");
+	fprintf(stderr, "axcall: NET/ROM callsign or alias not found\n");
 
 	return -1;
 }
@@ -200,7 +200,7 @@
 	case AF_ROSE:
 		if (address[0] == NULL || address[1] == NULL) {
 			fprintf(stderr,
-				"call: too few arguments for Rose\n");
+				"axcall: too few arguments for Rose\n");
 			return (-1);
 		}
 		if ((fd = socket(AF_ROSE, SOCK_SEQPACKET, 0)) < 0) {
@@ -212,7 +212,7 @@
 	case AF_NETROM:
 		if (address[0] == NULL) {
 			fprintf(stderr,
-				"call: too few arguments for NET/ROM\n");
+				"axcall: too few arguments for NET/ROM\n");
 			return (-1);
 		}
 		if ((fd = socket(AF_NETROM, SOCK_SEQPACKET, 0)) < 0) {
@@ -227,7 +227,7 @@
 	case AF_AX25:
 		if (address[0] == NULL) {
 			fprintf(stderr,
-				"call: too few arguments for AX.25\n");
+				"axcall: too few arguments for AX.25\n");
 			return (-1);
 		}
 		if ((fd = socket(AF_AX25, SOCK_SEQPACKET, 0)) < 0) {
@@ -314,7 +314,7 @@
 			if (strcasecmp(address[2], "VIA") == 0) {
 				if (address[3] == NULL) {
 					fprintf(stderr,
-						"call: callsign must follow 'via'\n");
+						"axcall: callsign must follow 'via'\n");
 					close(fd);
 					return (-1);
 				}
@@ -2058,7 +2058,7 @@
 		case 'b':
 			if (*optarg != 'e' && *optarg != 'l') {
 				fprintf(stderr,
-					"call: invalid argument for option '-b'\n");
+					"axcall: invalid argument for option '-b'\n");
 				return 1;
 			}
 			backoff = *optarg == 'e';
@@ -2072,7 +2072,7 @@
 		case 'm':
 			if (*optarg != 's' && *optarg != 'e') {
 				fprintf(stderr,
-					"call: invalid argument for option '-m'\n");
+					"axcall: invalid argument for option '-m'\n");
 				return 1;
 			}
 			ax25mode = *optarg == 'e';
@@ -2080,12 +2080,12 @@
 		case 'p':
 			if ((paclen = atoi(optarg)) == 0) {
 				fprintf(stderr,
-					"call: option '-p' requires a numeric argument\n");
+					"axcall: option '-p' requires a numeric argument\n");
 				return 1;
 			}
 			if (paclen < 1 || paclen > 500) {
 				fprintf(stderr,
-					"call: paclen must be between 1 and 500\n");
+					"axcall: paclen must be between 1 and 500\n");
 				return 1;
 			}
 			break;
@@ -2096,24 +2096,24 @@
 			mode = TALKMODE;
 			break;
 		case 'v':
-			printf("call: %s\n", VERSION);
+			printf("axcall: %s\n", VERSION);
 			return 0;
 		case 'w':
 			if ((window = atoi(optarg)) == 0) {
 				fprintf(stderr,
-					"call: option '-w' requires a numeric argument\n");
+					"axcall: option '-w' requires a numeric argument\n");
 				return 1;
 			}
 			if (ax25mode) {
 				if (window < 1 || window > 63) {
 					fprintf(stderr,
-						"call: window must be between 1 and 63 frames\n");
+						"axcall: window must be between 1 and 63 frames\n");
 					return 1;
 				}
 			} else {
 				if (window < 1 || window > 7) {
 					fprintf(stderr,
-						"call: window must be between 1 and 7 frames\n");
+						"axcall: window must be between 1 and 7 frames\n");
 					return 1;
 				}
 			}
@@ -2121,20 +2121,20 @@
 		case '?':
 		case ':':
 			fprintf(stderr,
-				"usage: call [-b l|e] [-d] [-h] [-m s|e] [-p paclen] [-r] [-t] [-v] [-w window] port callsign [[via] digipeaters...]\n");
+				"usage: axcall [-b l|e] [-d] [-h] [-m s|e] [-p paclen] [-r] [-t] [-v] [-w window] port callsign [[via] digipeaters...]\n");
 			return 1;
 		}
 	}
 
 	if (optind == argc || optind == argc - 1) {
 		fprintf(stderr,
-			"usage: call [-b l|e] [-d] [-h] [-m s|e] [-p paclen] [-r] [-t] [-v] [-w window] port callsign [[via] digipeaters...]\n");
+			"usage: axcall [-b l|e] [-d] [-h] [-m s|e] [-p paclen] [-r] [-t] [-v] [-w window] port callsign [[via] digipeaters...]\n");
 		return 1;
 	}
 	port = argv[optind];
 
 	if (ax25_config_load_ports() == 0) {
-		fprintf(stderr, "call: no AX.25 port data configured\n");
+		fprintf(stderr, "axcall: no AX.25 port data configured\n");
 		return 1;
 	}
 	if (ax25_config_get_addr(port) == NULL) {
@@ -2145,7 +2145,7 @@
 
 			if (rs_config_get_addr(port) == NULL) {
 				fprintf(stderr,
-					"call: invalid port setting\n");
+					"axcall: invalid port setting\n");
 				return 1;
 			} else {
 				af_mode = AF_ROSE;
diff -uNr ax25-apps-0.0.6.orig/call/listen.1 ax25-apps-0.0.6/call/listen.1
--- ax25-apps-0.0.6.orig/call/listen.1	1970-01-01 01:00:00.000000000 +0100
+++ ax25-apps-0.0.6/call/listen.1	2007-12-06 09:28:20.000000000 +0100
@@ -0,0 +1,89 @@
+.TH LISTEN 1 "27 August 1996" Linux "Linux Programmer's Manual"
+.SH NAME
+listen \- monitor AX.25 traffic
+.SH SYNOPSIS
+.B listen [-8] [-a] [-c] [-h] [-i] [-p port] [-r] [-t] [-v]
+.SH DESCRIPTION
+.LP
+.B Listen
+uses SOCK_PACKET facilities to provide a network monitor of all AX.25
+traffic heard by the system. Since KISS is implicitly promiscuous no
+special driver configurations are needed.
+.LP
+This version displays standard AX.25, PE1CHL extended AX.25, NET/ROM, Rose, ARP,
+IP, ICMP, TCP and UDP. It also displays IP, TCP, ICMP, TCP and UDP
+encapsulated within NET/ROM frames. The program also displays AX.25 and IP
+encapsulated within an IP frame, but see RFC1326 for reasons not to do so.
+.LP
+.B Listen
+makes an attempt at decoding some of the more common routing protocols. RSPF
+and RIP (both \(lqnormal\(rq and G8BPQs RIP98) are traced. JNOS style
+NET/ROM node polls are also displayed.
+.LP
+.B Listen
+can use colors to make the output more readable. The ncurses library is used
+to accomplish this. 
+.B Color support defaults to being disabled,
+and the 
+.BR -c
+parameter is used to enable it.
+.SH OPTIONS
+.TP 10
+.BI \-8
+Indicates that the terminal is capable of printing 8-bit characters. This 
+parameter is required for the -i parameter to work.
+.TP 10
+.BI \-a
+Allow for the monitoring of outgoing frames as well as incoming ones.
+.TP 10
+.BI \-c
+Enable color support.
+.TP 10
+.BI \-h
+Dump the data portion of the packet in both hexadecimal and ASCII. The
+default is to display data as ASCII only.
+.TP 10
+.BI \-i
+Map IBM codepage 437 characters 128-158 to their ISO-Latin-1 equivalents.
+This is a hack for scandinavian users. This parameter is only valid
+when used with the -8 and -c parameters.
+.TP 10
+.BI "\-p port"
+Monitor only those frames received on a particular port, by default all
+AX.25 devices are monitored.
+.TP 10
+.BI \-r
+Dump the data portion in a "readable" fashion, which is more suitable
+for tracing plaintext AX.25 traffic. CR-LF conversion is done.
+.TP 10
+.BI \-t
+Displays a timestamp with each packet received.
+.TP 10
+.BI \-v
+Display the version.
+.SH FILES
+/etc/ax25/axports
+.SH "SEE ALSO"
+.BR call (1),
+.BR mheard (1),
+.BR beacon (1),
+.BR ax25 (4),
+.BR netrom (4),
+.BR rose (4),
+.BR kissattach (8).
+.LP
+.SH BUGS
+.B Listen
+does not validate the checksums of frames that support them (ie IP),
+therefore corrupt frames will be displayed with bogus values. The MSS
+of a TCP frame that contains that option is not displayed.
+.SH AUTHORS
+.nf
+Alan Cox GW4PTS <alan at cymru.net>
+.br
+Jonathan Naylor G4KLX <g4klx at g4klx.demon.co.uk>
+.br
+Phil Karn KA9Q <karn at qualcomm.com>
+.br
+Heikki Hannikainen OH7LZB <hessu at pspt.fi>
+.fi
diff -uNr ax25-apps-0.0.6.orig/call/Makefile.am ax25-apps-0.0.6/call/Makefile.am
--- ax25-apps-0.0.6.orig/call/Makefile.am	2007-12-06 09:24:43.000000000 +0100
+++ ax25-apps-0.0.6/call/Makefile.am	2007-12-06 09:25:21.000000000 +0100
@@ -5,15 +5,15 @@
 	$(mkinstalldirs) $(DESTDIR)$(etcdir)
 
 
-bin_PROGRAMS = call
+bin_PROGRAMS = axcall
 
-man_MANS = call.1
+man_MANS = axcall.1
 
 EXTRA_DIST = $(man_MANS)
 
-call_LDADD = $(NCURSES_LIB) $(AX25_LIB)
+axcall_LDADD = $(NCURSES_LIB) $(AX25_LIB)
 
-call_SOURCES =		\
+axcall_SOURCES =		\
 	call.c		\
 	call.h		\
 	menu.c		\
diff -uNr ax25-apps-0.0.6.orig/listen/axlisten.1 ax25-apps-0.0.6/listen/axlisten.1
--- ax25-apps-0.0.6.orig/listen/axlisten.1	1970-01-01 01:00:00.000000000 +0100
+++ ax25-apps-0.0.6/listen/axlisten.1	2007-12-06 09:25:39.000000000 +0100
@@ -0,0 +1,89 @@
+.TH AXLISTEN 1 "27 August 1996" Linux "Linux Programmer's Manual"
+.SH NAME
+axlisten \- monitor AX.25 traffic
+.SH SYNOPSIS
+.B axlisten [-8] [-a] [-c] [-h] [-i] [-p port] [-r] [-t] [-v]
+.SH DESCRIPTION
+.LP
+.B Axlisten
+uses SOCK_PACKET facilities to provide a network monitor of all AX.25
+traffic heard by the system. Since KISS is implicitly promiscuous no
+special driver configurations are needed.
+.LP
+This version displays standard AX.25, PE1CHL extended AX.25, NET/ROM, Rose, ARP,
+IP, ICMP, TCP and UDP. It also displays IP, TCP, ICMP, TCP and UDP
+encapsulated within NET/ROM frames. The program also displays AX.25 and IP
+encapsulated within an IP frame, but see RFC1326 for reasons not to do so.
+.LP
+.B Axlisten
+makes an attempt at decoding some of the more common routing protocols. RSPF
+and RIP (both \(lqnormal\(rq and G8BPQs RIP98) are traced. JNOS style
+NET/ROM node polls are also displayed.
+.LP
+.B Axlisten
+can use colors to make the output more readable. The ncurses library is used
+to accomplish this. 
+.B Color support defaults to being disabled,
+and the 
+.BR -c
+parameter is used to enable it.
+.SH OPTIONS
+.TP 10
+.BI \-8
+Indicates that the terminal is capable of printing 8-bit characters. This 
+parameter is required for the -i parameter to work.
+.TP 10
+.BI \-a
+Allow for the monitoring of outgoing frames as well as incoming ones.
+.TP 10
+.BI \-c
+Enable color support.
+.TP 10
+.BI \-h
+Dump the data portion of the packet in both hexadecimal and ASCII. The
+default is to display data as ASCII only.
+.TP 10
+.BI \-i
+Map IBM codepage 437 characters 128-158 to their ISO-Latin-1 equivalents.
+This is a hack for scandinavian users. This parameter is only valid
+when used with the -8 and -c parameters.
+.TP 10
+.BI "\-p port"
+Monitor only those frames received on a particular port, by default all
+AX.25 devices are monitored.
+.TP 10
+.BI \-r
+Dump the data portion in a "readable" fashion, which is more suitable
+for tracing plaintext AX.25 traffic. CR-LF conversion is done.
+.TP 10
+.BI \-t
+Displays a timestamp with each packet received.
+.TP 10
+.BI \-v
+Display the version.
+.SH FILES
+/etc/ax25/axports
+.SH "SEE ALSO"
+.BR axcall (1),
+.BR mheard (1),
+.BR beacon (1),
+.BR ax25 (4),
+.BR netrom (4),
+.BR rose (4),
+.BR kissattach (8).
+.LP
+.SH BUGS
+.B Axlisten
+does not validate the checksums of frames that support them (ie IP),
+therefore corrupt frames will be displayed with bogus values. The MSS
+of a TCP frame that contains that option is not displayed.
+.SH AUTHORS
+.nf
+Alan Cox GW4PTS <alan at cymru.net>
+.br
+Jonathan Naylor G4KLX <g4klx at g4klx.demon.co.uk>
+.br
+Phil Karn KA9Q <karn at qualcomm.com>
+.br
+Heikki Hannikainen OH7LZB <hessu at pspt.fi>
+.fi
diff -uNr ax25-apps-0.0.6.orig/listen/listen.1 ax25-apps-0.0.6/listen/listen.1
--- ax25-apps-0.0.6.orig/listen/listen.1	2007-12-06 09:24:43.000000000 +0100
+++ ax25-apps-0.0.6/listen/listen.1	1970-01-01 01:00:00.000000000 +0100
@@ -1,89 +0,0 @@
-.TH LISTEN 1 "27 August 1996" Linux "Linux Programmer's Manual"
-.SH NAME
-listen \- monitor AX.25 traffic
-.SH SYNOPSIS
-.B listen [-8] [-a] [-c] [-h] [-i] [-p port] [-r] [-t] [-v]
-.SH DESCRIPTION
-.LP
-.B Listen
-uses SOCK_PACKET facilities to provide a network monitor of all AX.25
-traffic heard by the system. Since KISS is implicitly promiscuous no
-special driver configurations are needed.
-.LP
-This version displays standard AX.25, PE1CHL extended AX.25, NET/ROM, Rose, ARP,
-IP, ICMP, TCP and UDP. It also displays IP, TCP, ICMP, TCP and UDP
-encapsulated within NET/ROM frames. The program also displays AX.25 and IP
-encapsulated within an IP frame, but see RFC1326 for reasons not to do so.
-.LP
-.B Listen
-makes an attempt at decoding some of the more common routing protocols. RSPF
-and RIP (both \(lqnormal\(rq and G8BPQs RIP98) are traced. JNOS style
-NET/ROM node polls are also displayed.
-.LP
-.B Listen
-can use colors to make the output more readable. The ncurses library is used
-to accomplish this. 
-.B Color support defaults to being disabled,
-and the 
-.BR -c
-parameter is used to enable it.
-.SH OPTIONS
-.TP 10
-.BI \-8
-Indicates that the terminal is capable of printing 8-bit characters. This 
-parameter is required for the -i parameter to work.
-.TP 10
-.BI \-a
-Allow for the monitoring of outgoing frames as well as incoming ones.
-.TP 10
-.BI \-c
-Enable color support.
-.TP 10
-.BI \-h
-Dump the data portion of the packet in both hexadecimal and ASCII. The
-default is to display data as ASCII only.
-.TP 10
-.BI \-i
-Map IBM codepage 437 characters 128-158 to their ISO-Latin-1 equivalents.
-This is a hack for scandinavian users. This parameter is only valid
-when used with the -8 and -c parameters.
-.TP 10
-.BI "\-p port"
-Monitor only those frames received on a particular port, by default all
-AX.25 devices are monitored.
-.TP 10
-.BI \-r
-Dump the data portion in a "readable" fashion, which is more suitable
-for tracing plaintext AX.25 traffic. CR-LF conversion is done.
-.TP 10
-.BI \-t
-Displays a timestamp with each packet received.
-.TP 10
-.BI \-v
-Display the version.
-.SH FILES
-/etc/ax25/axports
-.SH "SEE ALSO"
-.BR call (1),
-.BR mheard (1),
-.BR beacon (1),
-.BR ax25 (4),
-.BR netrom (4),
-.BR rose (4),
-.BR kissattach (8).
-.LP
-.SH BUGS
-.B Listen
-does not validate the checksums of frames that support them (ie IP),
-therefore corrupt frames will be displayed with bogus values. The MSS
-of a TCP frame that contains that option is not displayed.
-.SH AUTHORS
-.nf
-Alan Cox GW4PTS <alan at cymru.net>
-.br
-Jonathan Naylor G4KLX <g4klx at g4klx.demon.co.uk>
-.br
-Phil Karn KA9Q <karn at qualcomm.com>
-.br
-Heikki Hannikainen OH7LZB <hessu at pspt.fi>
-.fi
diff -uNr ax25-apps-0.0.6.orig/listen/listen.c ax25-apps-0.0.6/listen/listen.c
--- ax25-apps-0.0.6.orig/listen/listen.c	2007-12-06 09:24:43.000000000 +0100
+++ ax25-apps-0.0.6/listen/listen.c	2007-12-06 09:25:44.000000000 +0100
@@ -98,25 +98,25 @@
 			timestamp = 1;
 			break;
 		case 'v':
-			printf("listen: %s\n", VERSION);
+			printf("axlisten: %s\n", VERSION);
 			return 0;
 		case ':':
 			fprintf(stderr,
-				"listen: option -p needs a port name\n");
+				"axlisten: option -p needs a port name\n");
 			return 1;
 		case '?':
 			fprintf(stderr,
-				"Usage: listen [-8] [-a] [-c] [-h] [-i] [-p port] [-r] [-t] [-v]\n");
+				"Usage: axlisten [-8] [-a] [-c] [-h] [-i] [-p port] [-r] [-t] [-v]\n");
 			return 1;
 		}
 	}
 
 	if (ax25_config_load_ports() == 0)
-		fprintf(stderr, "listen: no AX.25 port data configured\n");
+		fprintf(stderr, "axlisten: no AX.25 port data configured\n");
 
 	if (port != NULL) {
 		if ((dev = ax25_config_get_dev(port)) == NULL) {
-			fprintf(stderr, "listen: invalid port name - %s\n",
+			fprintf(stderr, "axlisten: invalid port name - %s\n",
 				port);
 			return 1;
 		}
diff -uNr ax25-apps-0.0.6.orig/listen/Makefile.am ax25-apps-0.0.6/listen/Makefile.am
--- ax25-apps-0.0.6.orig/listen/Makefile.am	2007-12-06 09:24:43.000000000 +0100
+++ ax25-apps-0.0.6/listen/Makefile.am	2007-12-06 09:25:48.000000000 +0100
@@ -1,15 +1,15 @@
 
 installconf:
 
-bin_PROGRAMS = listen
+bin_PROGRAMS = axlisten
 
-man_MANS = listen.1
+man_MANS = axlisten.1
 
 EXTRA_DIST = $(man_MANS) 
 
 LDADD = $(AX25_LIB) $(NCURSES_LIB)
 
-listen_SOURCES = 	\
+axlisten_SOURCES = 	\
 	listen.c	\
 	listen.h	\
 	kissdump.c	\


--- NEW FILE ax25-apps.spec ---
Name:           ax25-apps
Version:        0.0.6
Release:        2%{?dist}
Summary:        AX.25 ham radio applications

Group:          Applications/Communications
#ax25ipd is BSD licensed, rest is GPLv2+
License:        GPLv2+ and BSD
URL:            http://ax25.sourceforge.net/
Source0:        http://downloads.sourceforge.net/ax25/%{name}-%{version}.tar.gz
#listen and call are too generic names, rename to axlisten and axcall in all instances, thanks debian maintainers
Patch0:         %{name}-%{version}-nongenericnames.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  autoconf automake14 libtool
BuildRequires:  libax25-devel, ncurses-devel       

%description
This package provides specific user applications for hamradio that use AX.25 
Net/ROM or ROSE network protocols:

 * axcall: a general purpose AX.25, NET/ROM and ROSE connection program.
 * axlisten: a network monitor of all AX.25 traffic heard by the system.
 * ax25ipd: an RFC1226 compliant daemon which provides encapsulation of
   AX.25 traffic over IP.
 * ax25mond: retransmits data received from sockets into an AX.25 monitor
   socket.


%prep
%setup -q
%patch0 -p1


%build
#the patch requires rebuilding of makefiles and such
aclocal-1.4; autoconf; automake-1.4
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

#don't include these twice
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}

# Fix the encoding on the doc files to be UTF-8
recode()
{
        iconv -f "$2" -t utf-8 < "$1" > "${1}_"
        mv -f "${1}_" "$1"
}
recode AUTHORS iso-8859-15


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%doc ax25ipd/COPYING.ax25ipd ax25ipd/HISTORY.ax25ipd ax25ipd/README.ax25ipd
%doc ax25rtd/TODO.ax25rtd ax25rtd/README.ax25rtd
%{_bindir}/*
%{_sbindir}/*
%{_mandir}/man?/*

%changelog
* Sat Feb 16 2008 Robert 'Bob' Jensen <bob at bobjensen.com> 0.0.6-2
- Submit for review
* Thu Dec 06 2007 Sindre Pedersen Bjørdal <foolish at guezz.net> 0.0.6-1
- Initial Build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ax25-apps/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Feb 2008 17:40:12 -0000	1.1
+++ .cvsignore	19 Feb 2008 22:58:06 -0000	1.2
@@ -0,0 +1 @@
+ax25-apps-0.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ax25-apps/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Feb 2008 17:40:12 -0000	1.1
+++ sources	19 Feb 2008 22:58:06 -0000	1.2
@@ -0,0 +1 @@
+47d9a775890f3694cf47659423a69ae5  ax25-apps-0.0.6.tar.gz




More information about the fedora-extras-commits mailing list