[hamradio-commits] [aprsdigi] 05/08: Imported Debian patch 3.5.1-1
Iain Learmonth
irl-guest at moszumanska.debian.org
Sat Jul 4 16:36:19 UTC 2015
This is an automated email from the git hooks/post-receive script.
irl-guest pushed a commit to branch master
in repository aprsdigi.
commit a09dac505b9c52f72e39e7e3dcbc182058fa7b2b
Merge: 08023b6 4b8e96b
Author: Colin Tuckley <colint at debian.org>
Date: Sun Sep 7 11:54:21 2014 +0100
Imported Debian patch 3.5.1-1
ChangeLog | 3 +
Makefile.am | 4 +-
Makefile.in | 836 ++--
NEWS | 31 +-
README | 24 +-
TODO | 48 +-
aclocal.m4 | 1261 +++---
aprsbeacon.service | 15 +
aprsdigi.c | 16 +-
aprsdigi.init | 138 +
aprsdigi.logrotate | 8 +
aprsdigi.service | 16 +
aprsdigi.spec | 67 +-
aprsdigi.spec.in | 94 +
aprsmon.c | 6 +-
aprsshm.c | 2 +
configure | 8277 +++++++++++++++++++++++-------------
configure.in | 3 +-
debian/aprsdigi.substvars | 1 -
debian/changelog | 13 +
debian/compat | 2 +-
debian/control | 8 +-
debian/copyright | 2 +-
debian/patches/aprsd-title.patch | 27 +
debian/patches/ax25-includes.patch | 75 +
debian/patches/man-fix.patch | 137 +
debian/patches/series | 4 +
debian/patches/spelling-fix.patch | 22 +
debian/rules | 10 +-
debian/source/format | 1 +
debian/watch | 4 +
examples/README.examples | 55 +
examples/aprsdigi-fc17.ks | 145 +
examples/aprsdigi.conf | 7 +
examples/axports | 1 +
libax25ext.c | 1 +
testmcast.c | 4 +-
testparse.c | 4 +-
38 files changed, 7475 insertions(+), 3897 deletions(-)
diff --cc debian/changelog
index 42f3e2e,0000000..55c2a9e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,63 -1,0 +1,76 @@@
++aprsdigi (3.5.1-1) unstable; urgency=medium
++
++ * New Upstream Version.
++ * Bump Standards Version.
++ * Ack the NMU.
++ * Add debian/watch, thanks bartm.
++ * Add man2html-base to build depends
++ * Fix aprsd title strings, patch from Iain <g7iii at g7iii.net>
++ (Closes: #360344)
++ * Minor man page corrections.
++
++ -- Colin Tuckley <colint at debian.org> Sun, 07 Sep 2014 11:54:21 +0100
++
+aprsdigi (2.4.4-3.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * include linux/ax25.h instead of netax25/* (Closes: #664932).
+
+ -- Luk Claes <luk at debian.org> Fri, 08 Jun 2012 23:23:13 +0200
+
+aprsdigi (2.4.4-3.1) unstable; urgency=low
+
+ * Retiring - remove myself from the uploaders list.
+
+ -- Joop Stakenborg <pa3aba at debian.org> Sun, 08 Nov 2009 18:41:56 +0000
+
+aprsdigi (2.4.4-3) unstable; urgency=low
+
+ * Fix new logic error in debian/rules clean target
+
+ -- Hamish Moffatt <hamish at debian.org> Thu, 18 Oct 2007 23:56:02 +1000
+
+aprsdigi (2.4.4-2) unstable; urgency=low
+
+ * Donate package to debian-hams team.
+ * General cleanup.
+
+ -- Hamish Moffatt <hamish at debian.org> Thu, 18 Oct 2007 23:45:07 +1000
+
+aprsdigi (2.4.4-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Hamish Moffatt <hamish at debian.org> Sat, 20 Aug 2005 01:19:14 +1000
+
+aprsdigi (2.0-0pre3.5) unstable; urgency=low
+
+ * Upgrade to debhelper 4 and rebuild to remove /usr/doc cruft
+ * Add copyright statement in debian/copyright (closes: #302935)
+
+ -- Hamish Moffatt <hamish at debian.org> Tue, 16 Aug 2005 07:55:16 +1000
+
+aprsdigi (2.0-0pre3.4) unstable; urgency=low
+
+ * Updated sources for latest changes to libax25-dev
+
+ -- Hamish Moffatt <hamish at debian.org> Wed, 19 Sep 2001 00:22:43 +1000
+
+aprsdigi (2.0-0pre3.3) unstable; urgency=low
+
+ * Recompiled with correct version of libax25 (closes: #74183)
+
+ -- Hamish Moffatt <hamish at debian.org> Sat, 7 Oct 2000 11:52:27 +1100
+
+aprsdigi (2.0-0pre3.2) unstable; urgency=low
+
+ * Updated copyright file to include upstream author information
+
+ -- Hamish Moffatt <hamish at debian.org> Sun, 16 Apr 2000 22:27:40 +1000
+
+aprsdigi (2.0-0pre3.1) unstable; urgency=low
+
+ * Initial upload
+
+ -- Hamish Moffatt <hamish at debian.org> Thu, 13 Apr 2000 21:42:00 +1000
+
diff --cc debian/compat
index b8626c4,0000000..7ed6ff8
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 4
++5
diff --cc debian/control
index e70cab5,0000000..8db744d
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,17 -1,0 +1,17 @@@
+Source: aprsdigi
+Section: hamradio
+Priority: optional
+Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
- Uploaders: Jaime Robles <jaime at debian.org>, Patrick Ouellette <pouelle at debian.org>, Hamish Moffatt <hamish at debian.org>
- Standards-Version: 3.7.2
- Build-Depends: libax25-dev, debhelper (>= 4)
++Uploaders: Jaime Robles <jaime at debian.org>, Patrick Ouellette <pouelle at debian.org>, Hamish Moffatt <hamish at debian.org>, Colin Tuckley <colint at debian.org>
++Standards-Version: 3.9.5
++Build-Depends: libax25-dev, debhelper (>= 4), man2html-base
+Homepage: http://aprsdigi.sourceforge.net/
+
+Package: aprsdigi
+Architecture: any
- Depends: ${shlibs:Depends}
++Depends: ${misc:Depends}, ${shlibs:Depends}
+Suggests: ax25-tools, xastir, aprsd
+Description: digipeater for APRS
+ aprsdigi is a repeater for the Automatic Position Reporting System, APRS.
+ It also includes aprsmon, a one-way gateway to APRS on TCP/IP.
+
diff --cc debian/copyright
index ee3cf0c,0000000..bb5af17
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,15 -1,0 +1,15 @@@
+
+This is the Debian GNU/Linux package of aprsdigi. aprsdigi was written
+by Alan Crosswell N2YGK <n2ygk at weca.org>. Original sources were obtained
+from
+ http://www.cloud9.net/~alan/ham/aprs/
+
+aprsdigi is Copyright (c) 1996,1997,1999 Alan Crosswell, n2ygk at weca.org.
+
+This package was created by Hamish Moffatt <hamish at debian.org>.
+Some source changes were made for use with the current version
+of the libax25 library.
+
+aprsdigi is licensed under the GPL (GNU General Public License).
- See /usr/share/common-licenses/GPL for the full text of this license.
++See /usr/share/common-licenses/GPL-2 for the full text of this license.
+
diff --cc debian/patches/aprsd-title.patch
index 0000000,0000000..84d362e
new file mode 100644
--- /dev/null
+++ b/debian/patches/aprsd-title.patch
@@@ -1,0 -1,0 +1,27 @@@
++Fix problem with non sensible title strings
++Author: Iain g7iii at g7iii.net
++--- a/aprsmon.c
+++++ b/aprsmon.c
++@@ -186,6 +186,7 @@
++ uname(&me);
++ printf("aprsmon>JAVA:javaMSG :Linux APRS server (%s-%s by Alan Crosswell, N2YGK) on %s running %s %s\r\n",
++ PACKAGE, VERSION, me.nodename, me.sysname, me.release);
+++ printf("# %s\r\n",title);
++ #ifdef USE_SHM
++ (void) shm_slave(stdout,infofile);
++ #endif
++--- a/aprsmon.8
+++++ b/aprsmon.8
++@@ -55,7 +55,11 @@
++ .BI "-t title"
++ Sets the
++ .I javAPRS
++-title string. Default is "Live data from Linux."
+++or
+++.I aprsd
+++title string. Default is "Live data from Linux." For use with aprsd the
+++format must be something like "aprsmon v2.4.4 padd padb." pada and padb
+++can be anything, and are ignored but you *must* have 4 words in all.
++ .TP 10
++ .BI "-i infofile"
++ .I Infofile
diff --cc debian/patches/ax25-includes.patch
index 0000000,0000000..3a5e1f5
new file mode 100644
--- /dev/null
+++ b/debian/patches/ax25-includes.patch
@@@ -1,0 -1,0 +1,75 @@@
++Fix ax25 header file include problems
++--- a/aprsdigi.c
+++++ b/aprsdigi.c
++@@ -55,9 +55,7 @@
++ #include <time.h>
++ #include <signal.h>
++ #include <errno.h>
++-#include <netax25/ax25.h>
++-#include <netax25/axlib.h>
++-#include <netax25/axconfig.h>
+++#include <linux/ax25.h>
++ #ifndef AX25_MTU
++ #define AX25_MTU 256
++ #endif
++--- a/libax25ext.c
+++++ b/libax25ext.c
++@@ -9,7 +9,6 @@
++
++ #include <netax25/ax25.h>
++ #include <netrose/rose.h>
++-#include <netax25/axlib.h>
++ #include "libax25ext.h"
++ #include <string.h>
++
++--- a/aprsmon.c
+++++ b/aprsmon.c
++@@ -61,9 +61,7 @@
++ #include <time.h>
++ #include <signal.h>
++
++-#include <netax25/ax25.h>
++-#include <netax25/axlib.h>
++-#include <netax25/axconfig.h>
+++#include <linux/ax25.h>
++
++ #ifndef HAVE_LIBAX25_EXTENSIONS
++ #include "libax25ext.h"
++--- a/aprsshm.c
+++++ b/aprsshm.c
++@@ -44,9 +44,6 @@
++ #include <ctype.h>
++ #include <time.h>
++
++-#include <netax25/ax25.h>
++-
++-#include <netax25/axconfig.h>
++ #include "aprsshm.h"
++
++ #define MAXPPM 10
++--- a/testmcast.c
+++++ b/testmcast.c
++@@ -16,9 +16,7 @@
++ #include <time.h>
++ #include <signal.h>
++ #include <errno.h>
++-#include <netax25/ax25.h>
++-#include <netax25/axlib.h>
++-#include <netax25/axconfig.h>
+++#include <linux/ax25.h>
++ #ifndef AX25_MTU
++ #define AX25_MTU 256
++ #endif
++--- a/testparse.c
+++++ b/testparse.c
++@@ -16,9 +16,7 @@
++ #include <time.h>
++ #include <signal.h>
++ #include <errno.h>
++-#include <netax25/ax25.h>
++-#include <netax25/axlib.h>
++-#include <netax25/axconfig.h>
+++#include <linux/ax25.h>
++ #include <netdb.h>
++ #include "libax25ext.h"
++ static void print_it(FILE *f,
diff --cc debian/patches/man-fix.patch
index 0000000,0000000..3b68994
new file mode 100644
--- /dev/null
+++ b/debian/patches/man-fix.patch
@@@ -1,0 -1,0 +1,137 @@@
++Fix minor errors in man page formatting.
++Author: Colin colint at debian.org
++--- a/aprsmon.8
+++++ b/aprsmon.8
++@@ -11,7 +11,7 @@
++ listen(1).
++ .LP
++ .B Aprsmon
++-collects (-m)
+++collects (\-m)
++ or displays standard AX.25 UI text frames in a format similar
++ to that output by a standard TNC in "Monitor ON" mode and is intended
++ to be used with programs like javAPRS which wish to see a TNC data
++@@ -69,7 +69,7 @@
++ this.
++ .sp
++ .nf
++-aprsmon -a -m&
+++aprsmon \-a \-m&
++ .fi
++ .sp
++ Add an entry into /etc/services with the port number you
++@@ -82,7 +82,7 @@
++ Add an entry into /etc/inetd.conf for this service:
++ .sp
++ .nf
++-aprs stream tcp nowait root /usr/sbin/aprsmon aprsmon -a
+++aprs stream tcp nowait root /usr/sbin/aprsmon aprsmon \-a
++ .fi
++ .sp
++ To test, simply "telnet localhost aprs". To use with javAPRS,
++@@ -140,7 +140,7 @@
++ E - TAPR Mic-Encoder
++ T - Kenwood TH-D7
++ .fi
++-.RP
+++.sp
++ .TP 10
++ .BI m
++ is the status message number, and
++@@ -158,7 +158,7 @@
++ 6 - PRIORITY..
++ 7 - EMERGENCY.
++ .fi
++-.RP
+++.sp
++ .TP 10
++ .BI aaa,bbb,ccc,ddd,eee,fff
++ are the values of the telemetry channels.
++--- a/aprsdigi.8
+++++ b/aprsdigi.8
++@@ -80,7 +80,7 @@
++ .TP 10
++ .BI "\-D \--kill_dupes"
++ Suppress Duplicate packets. Remembers
++-duplicate packets for the number of seconds given by the -k option and
+++duplicate packets for the number of seconds given by the \-k option and
++ will not repeat them more than once. This reduces conjestion caused
++ when several digipeaters that share a common flooding alias (e.g. WIDE)
++ have overlapping footprints, causing geometric duplication
++@@ -107,11 +107,11 @@
++ .TP 10
++ .BI "\-f \--flood"
++ Set flooding alias. Use \(lq-f WIDE\(rq to enable WIDEn-n flooding.
++-Use -f multiple times to define several flooding aliases.
+++Use \-f multiple times to define several flooding aliases.
++ .TP 10
++ .BI "\-F \--trace"
++ Set flooding trace callsign. Use \(lq-F TRACE\(rq to enable TRACE and
++-TRACEn-n flooding. Use -F multiple times to define several trace aliases.
+++TRACEn-n flooding. Use \-F multiple times to define several trace aliases.
++ .TP 10
++ .BI "\-k \--keep secs"
++ Remember old packets for this long for duplicate packet detection.
++@@ -437,37 +437,37 @@
++ all the features. Comments to the right describe each feature.
++ .nf
++ aprsdigi \\
++- --verbose \\ # verbose
++- --north "N2YGK-2 WB2ZII WA2YSM-14" \\ # North digi path
++- --south "N2YGK-3 WB2ZII WA2JNF-4" \\ # South ...
++- --east "N2YGK-3 WB2ZII KD1LY" \\ # East ...
++- --west "N2YGK-2 WB2ZII N2MH-15" \\ # West ...
++- --flood "WIDE" \\ # WIDEn-n flooding
++- --trace "TRACE" \\ # TRACEn-n tracing
++- --kill_dupes \\ # kill dupes
++- --kill_loops \\ # kill loops
++- --mice_xlate \\ # do Mic-E translation
++- --subst_mycall \\ # do callsign substituton
++- --tag " via 147.06 (WB2ZII/R)" \\ # add this tag to rec'd pkts
++- --nobud "ax25:NOCALL" \\ # ignore pkts from NOCALL
++- --dupe udp:233.0.14.100 \\ # dupe everything heard
++- --int ax25:sm0:RELAY,WIDE,TRACE \\ # ax25 soundmodem intf
++- --nomice_xlate \\ # turn off Mic-E translation
++- --x1j4_xlate \\ # do X1J4 translation
++- --nosubst_mycall \\ # turn off callsign subst.
++- --tag - \\ # clear the tag
++- --int ax25:ax0:RELAY,WIDE,FOO,TRACE \\ # ax25 ax0 intf.
++- --bud - \\ # clear the budlist
++- --bud ip:128.59.39.150/32 \\ # allow only from this IP host
++- --int udp:233.0.14.99/12345/16:N2YGK-4,RELAY,WIDE,TRACE \\ # multicast
++- --int udp:233.0.14.100/12345/16:N2YGK-5 # to this mcast group
+++ \-\-verbose \\ # verbose
+++ \-\-north "N2YGK-2 WB2ZII WA2YSM-14" \\ # North digi path
+++ \-\-south "N2YGK-3 WB2ZII WA2JNF-4" \\ # South ...
+++ \-\-east "N2YGK-3 WB2ZII KD1LY" \\ # East ...
+++ \-\-west "N2YGK-2 WB2ZII N2MH-15" \\ # West ...
+++ \-\-flood "WIDE" \\ # WIDEn-n flooding
+++ \-\-trace "TRACE" \\ # TRACEn-n tracing
+++ \-\-kill_dupes \\ # kill dupes
+++ \-\-kill_loops \\ # kill loops
+++ \-\-mice_xlate \\ # do Mic-E translation
+++ \-\-subst_mycall \\ # do callsign substituton
+++ \-\-tag " via 147.06 (WB2ZII/R)" \\ # add this tag to rec'd pkts
+++ \-\-nobud "ax25:NOCALL" \\ # ignore pkts from NOCALL
+++ \-\-dupe udp:233.0.14.100 \\ # dupe everything heard
+++ \-\-int ax25:sm0:RELAY,WIDE,TRACE \\ # ax25 soundmodem intf
+++ \-\-nomice_xlate \\ # turn off Mic-E translation
+++ \-\-x1j4_xlate \\ # do X1J4 translation
+++ \-\-nosubst_mycall \\ # turn off callsign subst.
+++ \-\-tag - \\ # clear the tag
+++ \-\-int ax25:ax0:RELAY,WIDE,FOO,TRACE \\ # ax25 ax0 intf.
+++ \-\-bud - \\ # clear the budlist
+++ \-\-bud ip:128.59.39.150/32 \\ # allow only from this IP host
+++ \-\-int udp:233.0.14.99/12345/16:N2YGK-4,RELAY,WIDE,TRACE \\ # multicast
+++ \-\-int udp:233.0.14.100/12345/16:N2YGK-5 # to this mcast group
++
++ opening UDP socket on 233.0.14.99/12345/16
++ UDP address info: family 2 type 2 proto 17 next 0x0
++ Linux APRS(tm) digipeater
++ Copyright (c) 1996,1997,1999,2001,2002,2003 Alan Crosswell, n2ygk at weca.org
++ Version: aprsdigi aprsdigi-2.4.3
++-This is free software covered under the GNU Public License.
+++This is free software covered under the GNU General Public License.
++ There is no warranty. See the file COPYING for details.
++
++ # configuration:
diff --cc debian/patches/series
index 0000000,0000000..36bfab7
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,4 @@@
++ax25-includes.patch
++man-fix.patch
++aprsd-title.patch
++spelling-fix.patch
diff --cc debian/patches/spelling-fix.patch
index 0000000,0000000..003fba4
new file mode 100644
--- /dev/null
+++ b/debian/patches/spelling-fix.patch
@@@ -1,0 -1,0 +1,22 @@@
++Fix spelling errors
++Author Colin colint at debian.org
++--- a/aprsdigi.c
+++++ b/aprsdigi.c
++@@ -1697,7 +1697,7 @@
++ fprintf(stderr," -0 | --no3rdparty -- perform transparent tunneling (default)\n");
++ fprintf(stderr," -o r (R) | --[no]rx -- do (not) mark interface receive-only\n");
++ fprintf(stderr," -o t (T) | --[no]tx -- do (not) mark interface transmit-only\n");
++- fprintf(stderr," -o s (S) | --[no]txsame -- do (not) supress retransmission on RX intf.\n");
+++ fprintf(stderr," -o s (S) | --[no]txsame -- do (not) suppress retransmission on RX intf.\n");
++ fprintf(stderr," -i | --idinterval -- seconds between ID transmissions\n");
++ fprintf(stderr," (Use \"-i 0\" to disable IDs)\n");
++ fprintf(stderr," -t | --tag -- tag text to add to received packets\n");
++@@ -2077,7 +2077,7 @@
++
++ printf("Linux APRS(tm) digipeater\n%s\n",copyr);
++ printf("Version: aprsdigi %s-%s\n",PACKAGE,VERSION);
++- printf("This is free software covered under the GNU Public License.\n");
+++ printf("This is free software covered under the GNU General Public License.\n");
++ printf("There is no warranty. See the file COPYING for details.\n\n");
++
++ config_print(stdout);
diff --cc debian/rules
index c9a1165,0000000..412a65b
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,46 -1,0 +1,50 @@@
+#!/usr/bin/make -f
+
- build:
++build: build-arch build-indep
++build-arch: build-stamp
++build-indep: build-stamp
++build-stamp:
+ dh_testdir
+ ./configure --prefix=/usr
+ $(MAKE)
+ touch build
+
+clean:
+ dh_testdir
+ -rm -f build
+ [ ! -f Makefile ] || $(MAKE) distclean
+ -rm -f `find . -name "*~"`
+ -rm -rf debian/aprsdigi debian/files* core debian/substvars
++ -rm -rf debian/aprsdigi.substvars *.html
++ dh_clean
+
+binary-indep: build
+ dh_testdir
+ dh_testroot
+# There are no architecture-independent files to be uploaded
+# generated by this package. If there were any they would be
+# made here.
+
+binary-arch: build
+ dh_testdir
+ dh_clean
+ dh_installdirs
+ $(MAKE) install DESTDIR=`pwd`/debian/aprsdigi/
- mv debian/aprsdigi/usr/man debian/aprsdigi/usr/share
+
+ dh_installdocs README AUTHORS TODO NEWS
+ dh_installman aprsdigi.8 aprsmon.8
+ dh_installchangelogs
+ dh_strip
+ dh_compress
+ dh_fixperms
++ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
- dh_makeshlibs
+ dh_md5sums
+ dh_builddeb
+
+# Below here is fairly generic really
+
+binary: binary-indep binary-arch
+
diff --cc debian/source/format
index 0000000,0000000..163aaf8
new file mode 100644
--- /dev/null
+++ b/debian/source/format
@@@ -1,0 -1,0 +1,1 @@@
++3.0 (quilt)
diff --cc debian/watch
index 0000000,0000000..4fb9171
new file mode 100644
--- /dev/null
+++ b/debian/watch
@@@ -1,0 -1,0 +1,4 @@@
++version=3
++opts=filenamemangle=s/\S*download=//g \
++https://qa.debian.org/cgi-bin/fakeupstream.cgi?upstream=sf/aprsdigi/aprsdigi \
++.*=aprsdigi(?:[_\-]v?|)(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/aprsdigi.git
More information about the pkg-hamradio-commits
mailing list