[hamradio-commits] [ax25-tools] 02/09: Import Debian changes 0.0.10-rc4-1

Dave Hibberd hibby-guest at moszumanska.debian.org
Mon Oct 30 00:12:13 UTC 2017


This is an automated email from the git hooks/post-receive script.

hibby-guest pushed a commit to branch master
in repository ax25-tools.

commit fb746baf9ccb63ea11761e63fc30c30fc9153c36
Author: Colin Tuckley <colint at debian.org>
Date:   Thu Sep 3 12:21:10 2015 +0100

    Import Debian changes 0.0.10-rc4-1
    
    ax25-tools (0.0.10-rc4-1) unstable; urgency=medium
    
      * New upstream version.
      * Add watch file from irl (Closes: #781597)
      * Bump Standards Version to 3.9.6.
      * Bump debian/compat to 9.
      * Add Homepage field to debian/control
      * Fix various spelling errors
    
    ax25-tools (0.0.10-rc2+cvs20120204-4) unstable; urgency=medium
    
      * Bump Standards Version to 3.9.5.
      * Replace 'restrict' with 'route_restrict' (Closes: #689322)
        since "restrict" is a keyword in C99.
      * Explicitly use /bin/bash in rose/rsusers.sh (Closes: #690626)
      * Fix several minor Lintian warnings.
    
    ax25-tools (0.0.10-rc2+cvs20120204-3) unstable; urgency=low
    
      * Fix "FTBFS: dh_movefiles: debian/ax25-tools/usr/sbin/xfhdlcchpar not
        found (supposed to put it in ax25-xtools)" <explain what you changed
        and why> (Closes: #665236)
    
    ax25-tools (0.0.10-rc2+cvs20120204-2) unstable; urgency=low
    
      * Fix "kissnetd broken with PTYs" fixed in the new upstream (Closes: #603169)
      * Fix "beacon crashes if the length of the destination exceeds 20"
        fixed in the new upstream (Closes: #568290)
      * Fix FTBFS by adding chmod +x configure to debian/rules
    
    ax25-tools (0.0.10-rc2+cvs20120204-1) unstable; urgency=low
    
      * new upstream
    
    ax25-tools (0.0.8-13.2) unstable; urgency=medium
    
      * Non-maintainer upload.
      * ax25/beacon.c: fix possible privilege escalation CVE-2011-2910
        Closes: #638198.
    
    ax25-tools (0.0.8-13.1) unstable; urgency=low
    
      * Retiring - remove myself from the uploaders list.
    
    ax25-tools (0.0.8-13) unstable; urgency=low
    
      * Fix broken and bash-specific rsusers program (/usr/sbin/rsusers)
      * Bump standards-revision to 3.7.3
      * Remove unnecessary linking to libGL and libXi
    
    ax25-tools (0.0.8-12) unstable; urgency=low
    
      * Add missing bracket around and if clause, file dmascc/dmascc_cfg.c.
        Closes: #394926.
      * Various lintian fixes, rename rsusers.sh to rsusers.
    
    ax25-tools (0.0.8-11) unstable; urgency=low
    
      * Remove build-dep on autoconf, automake and don't autoreconf
        at build time, just at development time (closes: #376639)
      * Added libxt-dev build-dep to ensure that X is discovered at
        configure time
    
    ax25-tools (0.0.8-10) unstable; urgency=low
    
      * Change build-dep on xlibs-dev to individual libraries
    
    ax25-tools (0.0.8-9) unstable; urgency=low
    
      * Rebuild against libfltk1.1 (rather than libfltk1.1c102)
      * Update standards-revision to 3.6.2
      * Update to debhelper 4
      * Rewrite short descriptions in debian/control
    
    ax25-tools (0.0.8-8) unstable; urgency=low
    
      * Change localstatedir to '/var', so node can find mheard.dat.
    
    ax25-tools (0.0.8-7) unstable; urgency=low
    
      * Changed maintainer to debian-hams at lists.debian.org
      * Changed uploaders to Jaime Robles <jaime at debian.org>,
         Joop Stakenborg <pa3aba at debian.org>,
         Patrick Ouellette <pouelle at debian.org>,
         Hamish Moffatt <hamish at debian.org>,
         Ramakrishnan Muthukrishnan <rkrishnan at debian.org>
      * Fixed lintian warnings about copyright file reference
      * Added reference to original source (a25.sf.net) to copyright file
    
    ax25-tools (0.0.8-6) unstable; urgency=low
    
      * Accepting/closing prior NMU fixes.  Fixed typo in last changelog
      * causing it to appear to be an NMU. Priority change to 'extra'
      * to match overrides.  Closes: #170116, #200997, #229303
    
    ax25-tools (0.0.8-5) unstable; urgency=low
    
      * Moved soundmodem.h into source; no longer in kernel sources
      * (patch from neroden at twcny.rr.com) Closes: #229303
    
    ax25-tools (0.0.8-4.1) unstable; urgency=low
    
      * Non-maintainer upload. BSP.
      * Recompile in order to solve dependency problems. Closes: #200997
      * Fix autoconf/compiler warnings.
    
    ax25-tools (0.0.8-4) unstable; urgency=low
    
      * linked with libax25-0.0.11
    
    ax25-tools (0.0.8-3) unstable; urgency=low
    
      * new debian maintainer (me)
      * loosen dependency: automake1.7 --> automake
    
    ax25-tools (0.0.8-2.1) unstable; urgency=low
    
      * NMU
      * Updated xlib6g-dev to xlibs-dev in Build-Depends.  Closes: #170116.
      * Updated to libfltk1.1-dev to allow compilation with g++ 3.2.
      * Several autoconf/automake updates needed.
    
    ax25-tools (0.0.8-2) unstable; urgency=low
    
      * added /etc/ax25/nrbroadcast to conffiles (closes: #97453)
      * updated build depends (closes: #101419)
      * added autoconf to build depends
    
    ax25-tools (0.0.8-1) unstable; urgency=low
    
      * New upstream release
      * New maintainer (closes: #89331)
    
    ax25-tools (0.0.6-2) frozen unstable; urgency=low
    
      * fixed build-depends: closes: #82258
    
    ax25-tools (0.0.6-1) frozen unstable; urgency=low
    
      * New upstream source
      * Upped standards version and have build-depends Closes: #70175
      * ttylink.8 fixed in upstream Closes: #53583
      * rip98.conf -> rip98d.conf Closes: #53654
      * var directory is now /var/lib/ax25
    
    ax25-tools (0.0.5-2) frozen unstable; urgency=low
    
      * Added some tests to fix i386isms Closes: #55552
    
    ax25-tools (0.0.5-1) unstable; urgency=low
    
      * New upstream version
    
    ax25-tools (0.0.4-1) unstable; urgency=low
    
      * New upstream version Closes: #41832
    
    ax25-tools (0.0.3-1) unstable; urgency=low
    
      * New upstream version
    
    ax25-tools (0.0.2-1) unstable; urgency=low
    
      * Initial Release.
---
 debian/ax25-tools.dirs                    |   4 +
 debian/ax25-tools.docs                    |   3 +
 debian/ax25-xtools.files                  |   6 +
 debian/ax25-xtools.undocumented           |   4 +
 debian/changelog                          | 223 ++++++++++++++++++++++++++++++
 debian/compat                             |   1 +
 debian/control                            |  33 +++++
 debian/copyright                          |   9 ++
 debian/init.d                             | 116 ++++++++++++++++
 debian/patches/01-spelling-fixes.patch    | 191 +++++++++++++++++++++++++
 debian/patches/02-ptsname-prototype.patch |  90 ++++++++++++
 debian/patches/03-string_literal.patch    |  75 ++++++++++
 debian/patches/series                     |   3 +
 debian/rules                              |  10 ++
 debian/source/format                      |   1 +
 debian/watch                              |   3 +
 16 files changed, 772 insertions(+)

diff --git a/debian/ax25-tools.dirs b/debian/ax25-tools.dirs
new file mode 100644
index 0000000..27b652a
--- /dev/null
+++ b/debian/ax25-tools.dirs
@@ -0,0 +1,4 @@
+usr/bin
+usr/sbin
+var/ax25
+var/ax25/mheard
diff --git a/debian/ax25-tools.docs b/debian/ax25-tools.docs
new file mode 100644
index 0000000..9bdd99c
--- /dev/null
+++ b/debian/ax25-tools.docs
@@ -0,0 +1,3 @@
+INSTALL
+NEWS
+README
diff --git a/debian/ax25-xtools.files b/debian/ax25-xtools.files
new file mode 100644
index 0000000..4d88f00
--- /dev/null
+++ b/debian/ax25-xtools.files
@@ -0,0 +1,6 @@
+usr/sbin/xfhdlcchpar
+usr/sbin/xfhdlcst
+usr/sbin/xfsmdiag
+usr/sbin/xfsmmixer
+usr/bin/smdiag
+usr/share/man/man8/smdiag.8
diff --git a/debian/ax25-xtools.undocumented b/debian/ax25-xtools.undocumented
new file mode 100644
index 0000000..e5b2b97
--- /dev/null
+++ b/debian/ax25-xtools.undocumented
@@ -0,0 +1,4 @@
+xfhdlcchpar.8
+xfhdlcst.8
+xfsmdiag.8
+xfsmmixer.8
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..4359f63
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,223 @@
+ax25-tools (0.0.10-rc4-1) unstable; urgency=medium
+
+  * New upstream version.
+  * Add watch file from irl (Closes: #781597)
+  * Bump Standards Version to 3.9.6.
+  * Bump debian/compat to 9.
+  * Add Homepage field to debian/control
+  * Fix various spelling errors
+
+ -- Colin Tuckley <colint at debian.org>  Thu, 03 Sep 2015 12:21:10 +0100
+
+ax25-tools (0.0.10-rc2+cvs20120204-4) unstable; urgency=medium
+
+  * Bump Standards Version to 3.9.5.
+  * Replace 'restrict' with 'route_restrict' (Closes: #689322)
+    since "restrict" is a keyword in C99.
+  * Explicitly use /bin/bash in rose/rsusers.sh (Closes: #690626)
+  * Fix several minor Lintian warnings.
+
+ -- Colin Tuckley <colint at debian.org>  Mon, 08 Sep 2014 18:08:30 +0100
+
+ax25-tools (0.0.10-rc2+cvs20120204-3) unstable; urgency=low
+
+  * Fix "FTBFS: dh_movefiles: debian/ax25-tools/usr/sbin/xfhdlcchpar not
+    found (supposed to put it in ax25-xtools)" <explain what you changed
+    and why> (Closes: #665236)
+
+ -- Patrick Ouellette <pouelle at debian.org>  Mon, 09 Apr 2012 12:01:16 -0400
+
+ax25-tools (0.0.10-rc2+cvs20120204-2) unstable; urgency=low
+
+  * Fix "kissnetd broken with PTYs" fixed in the new upstream (Closes: #603169)
+  * Fix "beacon crashes if the length of the destination exceeds 20"
+    fixed in the new upstream (Closes: #568290)
+  * Fix FTBFS by adding chmod +x configure to debian/rules
+
+ -- Patrick Ouellette <pouelle at debian.org>  Sun, 26 Feb 2012 20:53:44 -0500
+
+ax25-tools (0.0.10-rc2+cvs20120204-1) unstable; urgency=low
+
+  * new upstream
+
+ -- Patrick Ouellette <pouelle at debian.org>  Sat, 04 Feb 2012 22:14:52 -0500
+
+ax25-tools (0.0.8-13.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * ax25/beacon.c: fix possible privilege escalation CVE-2011-2910
+    Closes: #638198.
+
+ -- Luk Claes <luk at debian.org>  Sun, 01 Jan 2012 15:13:41 +0100
+
+ax25-tools (0.0.8-13.1) unstable; urgency=low
+
+  * Retiring - remove myself from the uploaders list.
+
+ -- Joop Stakenborg <pa3aba at debian.org>  Tue, 10 Nov 2009 10:12:01 +0000
+
+ax25-tools (0.0.8-13) unstable; urgency=low
+
+  * Fix broken and bash-specific rsusers program (/usr/sbin/rsusers)
+  * Bump standards-revision to 3.7.3
+  * Remove unnecessary linking to libGL and libXi
+
+ -- Hamish Moffatt <hamish at debian.org>  Wed, 30 Jan 2008 23:04:38 +1100
+
+ax25-tools (0.0.8-12) unstable; urgency=low
+
+  * Add missing bracket around and if clause, file dmascc/dmascc_cfg.c.
+    Closes: #394926.
+  * Various lintian fixes, rename rsusers.sh to rsusers.
+
+ -- Joop Stakenborg <pa3aba at debian.org>  Mon, 12 Nov 2007 19:31:34 +0100
+
+ax25-tools (0.0.8-11) unstable; urgency=low
+
+  * Remove build-dep on autoconf, automake and don't autoreconf
+    at build time, just at development time (closes: #376639)
+  * Added libxt-dev build-dep to ensure that X is discovered at
+    configure time
+
+ -- Hamish Moffatt <hamish at debian.org>  Tue,  4 Jul 2006 20:12:20 +1000
+
+ax25-tools (0.0.8-10) unstable; urgency=low
+
+  * Change build-dep on xlibs-dev to individual libraries
+
+ -- Hamish Moffatt <hamish at debian.org>  Sun,  8 Jan 2006 14:06:40 +1100
+
+ax25-tools (0.0.8-9) unstable; urgency=low
+
+  * Rebuild against libfltk1.1 (rather than libfltk1.1c102)
+  * Update standards-revision to 3.6.2
+  * Update to debhelper 4
+  * Rewrite short descriptions in debian/control
+
+ -- Hamish Moffatt <hamish at debian.org>  Sat, 10 Sep 2005 23:28:08 +0000
+
+ax25-tools (0.0.8-8) unstable; urgency=low
+
+  * Change localstatedir to '/var', so node can find mheard.dat.
+
+ -- Joop Stakenborg <pa3aba at debian.org>  Mon, 11 Jul 2005 21:30:11 +0200
+
+ax25-tools (0.0.8-7) unstable; urgency=low
+
+  * Changed maintainer to debian-hams at lists.debian.org
+  * Changed uploaders to Jaime Robles <jaime at debian.org>,
+     Joop Stakenborg <pa3aba at debian.org>,
+     Patrick Ouellette <pouelle at debian.org>,
+     Hamish Moffatt <hamish at debian.org>,
+     Ramakrishnan Muthukrishnan <rkrishnan at debian.org>
+  * Fixed lintian warnings about copyright file reference
+  * Added reference to original source (a25.sf.net) to copyright file
+
+ -- Patrick Ouellette <pouelle at debian.org>  Thu, 14 Apr 2005 14:03:24 -0400
+
+ax25-tools (0.0.8-6) unstable; urgency=low
+
+  * Accepting/closing prior NMU fixes.  Fixed typo in last changelog
+  * causing it to appear to be an NMU. Priority change to 'extra'
+  * to match overrides.  Closes: #170116, #200997, #229303
+
+ -- Bruce Walker <w1bw at debian.org>  Tue,  2 Mar 2004 11:06:15 -0500
+
+ax25-tools (0.0.8-5) unstable; urgency=low
+
+  * Moved soundmodem.h into source; no longer in kernel sources
+  * (patch from neroden at twcny.rr.com) Closes: #229303
+
+ -- Bruce Walker <w1bw at debian.org>  Tue,  2 Mar 2004 10:01:06 -0500
+
+ax25-tools (0.0.8-4.1) unstable; urgency=low
+
+  * Non-maintainer upload. BSP.
+  * Recompile in order to solve dependency problems. Closes: #200997
+  * Fix autoconf/compiler warnings.
+
+ -- Guus Sliepen <guus at debian.org>  Tue, 26 Aug 2003 21:51:26 +0200
+
+ax25-tools (0.0.8-4) unstable; urgency=low
+
+  * linked with libax25-0.0.11
+
+ -- Bruce Walker <w1bw at debian.org>  Wed, 23 Apr 2003 16:58:47 -0400
+
+ax25-tools (0.0.8-3) unstable; urgency=low
+
+  * new debian maintainer (me)
+  * loosen dependency: automake1.7 --> automake
+
+ -- Bruce Walker <w1bw at debian.org>  Tue,  8 Apr 2003 16:11:55 -0400
+
+ax25-tools (0.0.8-2.1) unstable; urgency=low
+
+  * NMU
+  * Updated xlib6g-dev to xlibs-dev in Build-Depends.  Closes: #170116.
+  * Updated to libfltk1.1-dev to allow compilation with g++ 3.2.
+  * Several autoconf/automake updates needed.
+
+ -- Daniel Schepler <schepler at debian.org>  Fri, 14 Mar 2003 22:07:57 -0800
+
+ax25-tools (0.0.8-2) unstable; urgency=low
+
+  * added /etc/ax25/nrbroadcast to conffiles (closes: #97453)
+  * updated build depends (closes: #101419)
+  * added autoconf to build depends
+
+ -- Patrick Ouellette <pouelle at debian.org>  Sat, 22 Dec 2001 23:07:26 -0500
+
+ax25-tools (0.0.8-1) unstable; urgency=low
+
+  * New upstream release
+  * New maintainer (closes: #89331)
+
+ -- Patrick Ouellette <pouelle at debian.org>  Thu, 24 May 2001 22:19:55 -0500
+
+ax25-tools (0.0.6-2) frozen unstable; urgency=low
+
+  * fixed build-depends: closes: #82258
+
+ -- Craig Small <csmall at debian.org>  Tue, 27 Feb 2001 16:14:37 +1100
+
+ax25-tools (0.0.6-1) frozen unstable; urgency=low
+
+  * New upstream source
+  * Upped standards version and have build-depends Closes: #70175
+  * ttylink.8 fixed in upstream Closes: #53583
+  * rip98.conf -> rip98d.conf Closes: #53654
+  * var directory is now /var/lib/ax25
+
+ -- Craig Small <csmall at debian.org>  Thu, 26 Oct 2000 09:17:36 +1100
+
+ax25-tools (0.0.5-2) frozen unstable; urgency=low
+
+  * Added some tests to fix i386isms Closes: #55552
+
+ -- Craig Small <csmall at debian.org>  Thu, 20 Jan 2000 16:09:10 +1100
+
+ax25-tools (0.0.5-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Craig Small <csmall at debian.org>  Mon, 23 Aug 1999 12:52:14 +1000
+
+ax25-tools (0.0.4-1) unstable; urgency=low
+
+  * New upstream version Closes: #41832
+
+ -- Craig Small <csmall at debian.org>  Tue, 10 Aug 1999 12:11:57 +1000
+
+ax25-tools (0.0.3-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Craig Small <csmall at debian.org>  Thu,  8 Jul 1999 14:03:17 +1000
+
+ax25-tools (0.0.2-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Craig Small <csmall at debian.org>  Fri,  4 Jun 1999 14:28:59 +1000
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..b5478d1
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,33 @@
+Source: ax25-tools
+Section: hamradio
+Priority: optional
+Homepage: http://www.linux-ax25.org/wiki/Main_Page
+Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
+Uploaders: Patrick Ouellette <pouelle at debian.org>, Colin Tuckley <colint at debian.org>, Dave Hibberd <d at vehibberd.com>
+Build-Depends: debhelper (>= 9) , libncurses5-dev, zlib1g-dev, libfltk1.3-dev, libxext-dev, libx11-dev, libax25-dev, libxt-dev, libxi-dev, libice-dev, libsm-dev, libgl1-mesa-dev
+Standards-Version: 3.9.6
+
+Package: ax25-tools
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflicts: ax25-utils
+Replaces: ax25-utils
+Suggests: talkd, ax25-apps
+Description: tools for AX.25 interface configuration
+ These are hamradio specific tools for setting up and configuring hamradio
+ ports that use AX.25 Net/ROM or ROSE network protocols.
+ .
+ This package is created separately for those who do not want to install tools
+ that need X to run.
+
+Package: ax25-xtools
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflicts: ax25-utils
+Suggests: talkd, ax25-apps, ax25-tools
+Description: tools for AX.25 interface configuration -- X11-based
+ These are hamradio specific tools for setting up and configuring hamradio
+ ports that use AX.25 Net/ROM or ROSE network protocols.
+ .
+ This package is created separately for those who want to install tools
+ that need X to run.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..797a38b
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,9 @@
+This package was debianized by Craig Small <csmall at debian.org> on
+Fri,  4 Jun 1999 14:28:59 +1000.
+
+Original source may me found at ax25.sf.net
+
+Copyright 2003 Jonathan Naylor, Tomi Manninen, Jean-Paul ROUBELAT, Alan Cox
+
+A copy of the GPL can be found in /usr/share/common-licenses/GPL
+
diff --git a/debian/init.d b/debian/init.d
new file mode 100644
index 0000000..2b6bc76
--- /dev/null
+++ b/debian/init.d
@@ -0,0 +1,116 @@
+#! /bin/sh
+#
+# skeleton	example file to build /etc/init.d/ scripts.
+#		This file should be used to construct scripts for /etc/init.d.
+#
+#		Written by Miquel van Smoorenburg <miquels at cistron.nl>.
+#		Modified for Debian GNU/Linux
+#		by Ian Murdock <imurdock at gnu.ai.mit.edu>.
+#
+# Version:	@(#)skeleton  1.8  03-Mar-1998  miquels at cistron.nl
+#
+# This file was automatically customized by dh-make on Fri,  4 Jun 1999 14:28:59 +1000
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+
+set -e
+
+case "$1" in
+  start)
+	echo -n "Starting ax25-tools: "
+	start-stop-daemon --start --quiet --pidfile /var/run/mheardd.pid \
+		--exec /usr/sbin/mheardd
+	echo -n " mheardd"
+	start-stop-daemon --start --quiet --pidfile /var/run/ax25d.pid \
+		--exec /usr/sbin/ax25d
+	echo -n " ax25d"
+	if [ -f /proc/net/nr ]
+	then
+	  start-stop-daemon --start --quiet --pidfile /var/run/netromd \
+	  	--exec /usr/sbin/netromd
+	  echo "."
+	  if [ -f /var/ax25/nodesave.data ]
+	  then
+	    echo -n "Restoring saved netrom nodes"
+	    . /var/ax25/nodesave.data
+	    rm -f /var/ax25/nodesave.data
+	    echo "."
+	  fi
+	else
+	  echo "."
+	fi
+	;;
+  stop)
+	echo -n "Stopping ax25-tools: "
+	start-stop-daemon --stop --quiet --pidfile /var/run/mheardd.pid \
+		--exec /usr/sbin/mheardd
+	echo -n " mheardd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/ax25d.pid \
+		--exec /usr/sbin/ax25d
+	echo -n " ax25d"
+	if [ -f /proc/net/nr ]
+	then
+	  start-stop-daemon --stop --quiet --pidfile /var/run/netromd \
+	  	--exec /usr/sbin/netromd
+	  echo " netromd."
+	  echo -n "Saving netrom nodes"
+	  /usr/sbin/nodesave /var/ax25/nodesave.data
+	  echo "."
+	else
+	  echo "."
+	fi
+	;;
+  #reload)
+	#
+	#	If the daemon can reload its config files on the fly
+	#	for example by sending it SIGHUP, do it here.
+	#
+	#	If the daemon responds to changes in its config file
+	#	directly anyway, make this a do-nothing entry.
+	#
+	# echo "Reloading $DESC configuration files."
+	# start-stop-daemon --stop --signal 1 --quiet --pidfile \
+	#	/var/run/$NAME.pid --exec $DAEMON
+  #;;
+  restart|force-reload)
+	#
+	#	If the "reload" option is implemented, move the "force-reload"
+	#	option to the "reload" entry above. If not, "force-reload" is
+	#	just the same as "restart".
+	#
+	echo -n "Restarting ax25-tools: "
+	start-stop-daemon --stop --quiet --pidfile /var/run/mheardd.pid \
+		--exec /usr/sbin/mheardd
+	start-stop-daemon --stop --quiet --pidfile /var/run/ax25d.pid \
+		--exec /usr/sbin/ax25d
+	if [ -f /proc/net/nr ]
+	then
+	  start-stop-daemon --stop --quiet --pidfile /var/run/netromd \
+	  	--exec /usr/sbin/netromd
+	fi
+	sleep 1
+	start-stop-daemon --start --quiet --pidfile /var/run/mheardd.pid \
+		--exec /usr/sbin/mheardd
+	echo -n " mheardd"
+	start-stop-daemon --start --quiet --pidfile /var/run/ax25d.pid \
+		--exec /usr/sbin/ax25d
+	echo -n " ax25d"
+	if [ -f /proc/net/nr ]
+	then
+	  start-stop-daemon --start --quiet --pidfile /var/run/netromd \
+	  	--exec /usr/sbin/netromd
+	  echo "netromd."
+	else
+	  echo "."
+	fi
+	;;
+  *)
+	N=/etc/init.d/ax25-tools
+	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+	echo "Usage: $N {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/debian/patches/01-spelling-fixes.patch b/debian/patches/01-spelling-fixes.patch
new file mode 100644
index 0000000..02a2913
--- /dev/null
+++ b/debian/patches/01-spelling-fixes.patch
@@ -0,0 +1,191 @@
+Fix spelling errors
+Author: colint at debian.org
+
+--- a/ax25/axgetput/axgetput.c
++++ b/ax25/axgetput/axgetput.c
+@@ -167,7 +167,7 @@
+   if (mode % 2) {
+     fprintf(stderr, "  filename is usually got from the remote side by the protocol\n");
+     fprintf(stderr, "  but can be forced if you like to ignore this.\n");
+-    fprintf(stderr, "  filename should be ommitted if output is sent to a pipe\n.");
++    fprintf(stderr, "  filename should be omitted if output is sent to a pipe\n.");
+   } else {
+     fprintf(stderr, "  -b value is the blocksize (framelen) of the transmitted data\n");
+     fprintf(stderr, "     default %d, which is a useful choice for ampr ax25.\n", BLOCKSIZ_DEFAULT);
+--- a/hdlcutil/sethdlc.8
++++ b/hdlcutil/sethdlc.8
+@@ -94,7 +94,7 @@
+ .TP
+ .B \-d
+ Trace DCD, PTT and other status information on stdout. \fBsethdlc\fP
+-displays two times per second a line containing these informations.
++displays two times per second a line containing this information.
+ .TP
+ .B \-h
+ Display an overview of the available command line parameters and exit.
+@@ -116,7 +116,7 @@
+ .SH PARAMETERS
+ The following parameters can be assigned to a soundcard radio modem port.
+ 
+-All numerical parameter values are assumed to be in decimal unless preceeded by "0x".
++All numerical parameter values are assumed to be in decimal unless preceded by "0x".
+ 
+ The
+ .B mode
+--- a/kiss/kissattach.8
++++ b/kiss/kissattach.8
+@@ -22,7 +22,7 @@
+ TNC attached, although it could be a pseudo tty or a KISS port emulator such as
+ an SCC card. Kissattach supports BSD-style pseudo-terminals as well as
+ the Unix98 pty's. If the tty argument is "/dev/ptmx", then Unix98 behaviour
+-will automaticaly take effekt. With Unix98 pty's, the slave tty name
++will automatically take effekt. With Unix98 pty's, the slave tty name
+ could not be forseen. That's why kissattach will print the corresponding slave
+ pty name as a separate line on stdout.
+ .LP
+--- a/kiss/mkiss.8
++++ b/kiss/mkiss.8
+@@ -32,7 +32,7 @@
+ by some other method.
+ .sp 1
+ If the pty argument is "/dev/ptmx", then Unix98 behaviour
+-will automaticaly take effekt. With Unix98 pty's, the slave pty name
++will automatically take effekt. With Unix98 pty's, the slave pty name
+ could not be forseen. That's why mkiss will print the corresponding slave
+ pty name as a separate line on stdout.
+ .sp 1
+--- a/ax25/ax25d.conf.5
++++ b/ax25/ax25d.conf.5
+@@ -206,7 +206,7 @@
+ .sp 1
+ The
+ .B peer
+-argument is dependant upon whether AX.25, NET/ROM or Rose is being used. There are
++argument is dependent upon whether AX.25, NET/ROM or Rose is being used. There are
+ five formats of this argument:
+ .sp 1
+ .RS
+@@ -259,7 +259,7 @@
+ .sp 1
+ ax25d can now honour AX.25 TCP/IP mode-VC connections in a special way.
+ Therefore, a new port specific option "parameters_extAX25" is available, with
+-the following options, which are seperated by space.
++the following options, which are separated by space.
+ .TP 5
+ parameters_extAX25
+ VC-debug
+--- a/ax25/mheardd.8
++++ b/ax25/mheardd.8
+@@ -30,7 +30,7 @@
+ .TP 10
+ .BI "\-p [!]port1[,port2,..]"
+ With -p, you instruct mheardd to only listen on specified ax25 ports. 
+-You may give more ports, seperated by ','.
++You may give more ports, separated by ','.
+ If you introduce the port(s) by a leading '!', then mheardd will listen
+ on all ports except those you specified.
+ .TP 10
+--- a/kiss/kissnetd.8
++++ b/kiss/kissnetd.8
+@@ -13,7 +13,7 @@
+ .SH OPTIONS
+ .TP 10
+ .BI "\-p num"
+-Automaticaly allocate num Unix98 slave pty's via /dev/ptmx.
++Automatically allocate num Unix98 slave pty's via /dev/ptmx.
+ These are written to stdout and could be parsed by your startup scripts.
+ "kissnetd -p 3" is an comfortable alternative to "kissnetd /dev/ptmx /dev/ptmx /dev/ptmx".
+ .TP 10
+--- a/user_call/README.user_call
++++ b/user_call/README.user_call
+@@ -28,7 +28,7 @@
+ 
+ The <remote address> for netrom_call may be of two forms, either the remote
+ node callsign, or a combination of the remote node alias and remote node
+-callsign seperated by a ':'. Netrom_call only connects to the remote
++callsign separated by a ':'. Netrom_call only connects to the remote
+ callisgn, the full address is sent to the local user for information.
+ 
+ The <remote callsign> for rose_call is the "service" at the remote Rose
+--- a/ax25/axctl.8
++++ b/ax25/axctl.8
+@@ -16,7 +16,7 @@
+ Many of the options are similar to those found in
+ .B axparms
+ and perform the same function. Only one parameter may be changed on each
+-invokation of
++invocation of
+ .B axctl.
+ .SH OPTIONS
+ .TP 20
+--- a/ax25/ax25.4
++++ b/ax25/ax25.4
+@@ -35,7 +35,7 @@
+ AX.25 has some unusual properties. Notably in a multi-user system an AX.25
+ address is often associated with a user, and some users may not have such an
+ association. a set of ioctl calls are provided to manage an association
+-table, and in addition the superuser may use an arbitary callsign by binding
++table, and in addition the superuser may use an arbitrary callsign by binding
+ to the callsign desired and specifying the port to use as a first digipeated
+ hop.
+ .LP 
+--- a/ax25/axgetput/axgetput.1
++++ b/ax25/axgetput/axgetput.1
+@@ -47,11 +47,11 @@
+ "protocol" is the "#BIN" standard known from packet radio mailboxes.
+ 
+ .B bput
+-does it the other way round: with this comand, the user may upload a
++does it the other way round: with this command, the user may upload a
+ file to this computer.
+ 
+ The #BIN protocol provides a CRC consistency check after the file is
+-transfered. The transfer of the file modification time is part of the
++transferred. The transfer of the file modification time is part of the
+ #BIN protocol.
+ 
+ .LP
+--- a/rose/rsuplnk.8
++++ b/rose/rsuplnk.8
+@@ -47,7 +47,7 @@
+ .SH OPTIONS
+ .TP 8
+ .BI \-q
+-Supresses the messages generated by
++Suppresses the messages generated by
+ .B rsuplnk
+ when making the connection.
+ .SH FILES
+--- a/ax25/mheard.1
++++ b/ax25/mheard.1
+@@ -40,7 +40,7 @@
+ .RE
+ .TP 13
+ .BI \-n
+-Supress the displaying of titles.
++Suppress the displaying of titles.
+ .TP 13
+ .BI "\-o cfpt"
+ Sets the ordering of the information displayed. The meanings of the
+--- a/ax25/access.c
++++ b/ax25/access.c
+@@ -272,7 +272,7 @@
+ 				write_ax25(buf, strlen(buf), 1);
+ 				sprintf(buf, "        with unique passwords (which may be changed).\r");
+ 				write_ax25(buf, strlen(buf), 1);
+-				sprintf(buf, "        Please edit ~/.%s, and enable your prefered authentication type;\r", PWFILE);
++				sprintf(buf, "        Please edit ~/.%s, and enable your preferred authentication type;\r", PWFILE);
+ 				write_ax25(buf, strlen(buf), 1);
+ 				sprintf(buf, "        MD5 is recommended.\r");
+ 				write_ax25(buf, strlen(buf), 1);
+--- a/tcpip/ttylinkd.c
++++ b/tcpip/ttylinkd.c
+@@ -427,7 +427,7 @@
+ 	buf[2] = '\0';
+ 	if (write(skt, buf, 3) != 3)
+ 	{
+-		printf("Connnection lost\n");
++		printf("Connection lost\n");
+ 		close(skt);
+ 		close(ctl_skt);
+ 		return 0;
diff --git a/debian/patches/02-ptsname-prototype.patch b/debian/patches/02-ptsname-prototype.patch
new file mode 100644
index 0000000..72fec7c
--- /dev/null
+++ b/debian/patches/02-ptsname-prototype.patch
@@ -0,0 +1,90 @@
+Description: Fix ptsname bug by defining the relevant macros to their required
+values so ptsname's prototype is declared.  
+Author: James Clarke <jrtc27 at debian.org> 
+Last-Update: 2017-10-12
+
+
+--- a/kiss/kissattach.c
++++ b/kiss/kissattach.c
+@@ -1,5 +1,6 @@
++#define _DEFAULT_SOURCE
++#define _XOPEN_SOURCE 500
+ #include <stdio.h>
+-#define __USE_XOPEN
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+--- a/kiss/kissnetd.c
++++ b/kiss/kissnetd.c
+@@ -9,8 +9,9 @@
+  * F1OAT 960804 - Frederic RIBLE
+  */
+  
++#define _DEFAULT_SOURCE
++#define _XOPEN_SOURCE 500
+ #include <stdio.h>
+-#define __USE_XOPEN
+ #include <stdlib.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+--- a/kiss/mkiss.c
++++ b/kiss/mkiss.c
+@@ -37,8 +37,9 @@
+  * 1.08 xx/xx/99 Tom Mazouch - Adjustable poll interval
+  */
+ 
++#define _DEFAULT_SOURCE
++#define _XOPEN_SOURCE 500
+ #include <stdio.h>
+-#define __USE_XOPEN
+ #include <string.h>
+ #include <errno.h>
+ #include <stdlib.h>
+--- a/kiss/net2kiss.c
++++ b/kiss/net2kiss.c
+@@ -30,8 +30,9 @@
+ 
+ /*****************************************************************************/
+ 
++#define _DEFAULT_SOURCE
++#define _XOPEN_SOURCE 500
+ #include <stdio.h>
+-#define __USE_XOPEN
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+--- a/6pack/m6pack.c
++++ b/6pack/m6pack.c
+@@ -33,8 +33,9 @@
+  *********************************************************************
+  */
+ 
++#define _DEFAULT_SOURCE
++#define _XOPEN_SOURCE 500
+ #include <stdio.h>
+-#define __USE_XOPEN
+ #include <string.h>
+ #include <errno.h>
+ #include <stdlib.h>
+@@ -444,18 +445,18 @@
+ 			return 1;
+ 		case ':':
+ 		case '?':
+-			fprintf(stderr, usage_string);
++			fprintf(stderr, "%s", usage_string);
+ 			return 1;
+ 		}
+ 	}
+ 
+ 	if ((argc - optind) < 2 && ptmxdevices == 0) {
+-		fprintf(stderr, usage_string);
++		fprintf(stderr, "%s", usage_string);
+ 		return 1;
+ 	}
+ 
+ 	if ((argc - optind) < 1 && ptmxdevices > 0) {
+-		fprintf(stderr, usage_string);
++		fprintf(stderr, "%s", usage_string);
+ 		return 1;
+ 	}
+ 
diff --git a/debian/patches/03-string_literal.patch b/debian/patches/03-string_literal.patch
new file mode 100644
index 0000000..e868a7b
--- /dev/null
+++ b/debian/patches/03-string_literal.patch
@@ -0,0 +1,75 @@
+--- a/ax25/axparms.c
++++ b/ax25/axparms.c
+@@ -139,7 +139,7 @@
+ 			return 1;
+ 		}
+ 		while (fgets(routebuf,80,fp))
+-			printf(routebuf);
++			printf("%s", routebuf);
+ 		puts("");
+ 	}
+ 
+--- a/kiss/mkiss.c
++++ b/kiss/mkiss.c
+@@ -467,18 +467,18 @@
+ 			return 1;
+ 		case ':':
+ 		case '?':
+-			fprintf(stderr, usage_string);
++			fprintf(stderr, "%s",  usage_string);
+ 			return 1;
+ 		}
+ 	}
+ 
+ 	if ((argc - optind) < 2 && ptmxdevices == 0) {
+-		fprintf(stderr, usage_string);
++		fprintf(stderr, "%s", usage_string);
+ 		return 1;
+ 	}
+ 
+ 	if ((argc - optind) < 1 && ptmxdevices > 0) {
+-		fprintf(stderr, usage_string);
++		fprintf(stderr, "%s", usage_string);
+ 		return 1;
+ 	}
+ 
+--- a/netrom/nrparms.c
++++ b/netrom/nrparms.c
+@@ -210,7 +210,7 @@
+ 	
+ 	if (strncmp(argv[1], "-n", 2) == 0) {
+ 		if (argc < 9) {
+-			fprintf(stderr, nodes_usage);
++			fprintf(stderr, "%s", nodes_usage);
+ 			close(s);
+ 			return 1;
+ 		}
+@@ -221,7 +221,7 @@
+ 
+ 	if (strncmp(argv[1], "-r", 2) == 0) {
+ 		if (argc < 6) {
+-			fprintf(stderr, routes_usage);
++			fprintf(stderr, "%s", routes_usage);
+ 			close(s);
+ 			return 1;
+ 		}
+--- a/rose/rsparms.c
++++ b/rose/rsparms.c
+@@ -68,7 +68,7 @@
+ 	int args;
+ 
+ 	if (argc < 3) {
+-		fprintf(stderr, nodes_usage);
++		fprintf(stderr, "%s", nodes_usage);
+ 		exit(1);
+ 	}
+ 
+@@ -114,7 +114,7 @@
+ 	}
+ 
+ 	if (argc < 6) {
+-		fprintf(stderr, nodes_usage);
++		fprintf(stderr, "%s", nodes_usage);
+ 		exit(1);
+ 	}
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1d57312
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+03-string_literal.patch
+01-spelling-fixes.patch
+02-ptsname-prototype.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..0a6f3a5
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,10 @@
+#!/usr/bin/make -f
+
+#export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export DH_VERBOSE=1
+
+%:
+	dh $@
+
+# Collapse upstream changes file into single file
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..549b3d3
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+http://www.linux-ax25.org/pub/ax25-tools/ax25-tools-(\d.*)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/ax25-tools.git



More information about the pkg-hamradio-commits mailing list