[hamradio-commits] [aprx] 02/02: Import Debian patch 2.08.svn593+dfsg-2
Dave Hibberd
hibby-guest at moszumanska.debian.org
Sat Jan 21 23:59:21 UTC 2017
This is an automated email from the git hooks/post-receive script.
hibby-guest pushed a commit to branch master
in repository aprx.
commit 6a1bc9ec27e4f65d0e296548c5cae5b73605ff54
Author: Colin Tuckley <colint at debian.org>
Date: Tue Aug 18 16:38:40 2015 +0100
Import Debian patch 2.08.svn593+dfsg-2
---
debian/aprx.init | 11 +-
.../{aprx/etc/logrotate.d/aprx => aprx.logrotate} | 0
debian/aprx.postinst.debhelper | 15 --
debian/aprx.postrm.debhelper | 5 -
debian/aprx.prerm.debhelper | 9 --
debian/aprx.substvars | 1 -
debian/aprx/DEBIAN/conffiles | 5 -
debian/aprx/DEBIAN/control | 19 ---
debian/aprx/DEBIAN/md5sums | 13 --
debian/aprx/DEBIAN/postinst | 17 ---
debian/aprx/DEBIAN/postrm | 7 -
debian/aprx/DEBIAN/prerm | 11 --
debian/aprx/etc/apparmor.d/sbin.aprx | 17 ---
debian/aprx/etc/default/aprx | 10 --
debian/aprx/etc/init.d/aprx | 155 ---------------------
debian/aprx/usr/sbin/aprx | Bin 454267 -> 0 bytes
debian/aprx/usr/sbin/aprx-stat | Bin 29954 -> 0 bytes
debian/aprx/usr/share/doc/aprx/LICENSE | 27 ----
debian/aprx/usr/share/doc/aprx/PROTOCOLS.gz | Bin 3521 -> 0 bytes
debian/aprx/usr/share/doc/aprx/README | 86 ------------
debian/aprx/usr/share/doc/aprx/ROADMAP | 26 ----
debian/aprx/usr/share/doc/aprx/TODO.gz | Bin 2186 -> 0 bytes
.../aprx/usr/share/doc/aprx/aprx-complex.conf.gz | Bin 7003 -> 0 bytes
debian/aprx/usr/share/doc/aprx/aprx-manual.pdf.gz | Bin 465580 -> 0 bytes
debian/aprx/usr/share/doc/aprx/aprx.conf.gz | Bin 5375 -> 0 bytes
debian/aprx/usr/share/doc/aprx/copyright | 1 -
debian/aprx/usr/share/man/man8/aprx-stat.8.gz | Bin 2507 -> 0 bytes
debian/aprx/usr/share/man/man8/aprx.8.gz | Bin 15564 -> 0 bytes
debian/changelog | 49 ++++++-
debian/compat | 2 +-
debian/control | 10 +-
debian/copyright | 80 ++++++++++-
debian/docs | 1 -
debian/files | 1 -
debian/patches/01-man-page.patch | 27 ++++
debian/patches/02-reproducible-build.patch | 15 ++
debian/patches/series | 2 +
debian/rules | 108 ++++----------
debian/source/format | 1 +
debian/source/lintian-overrides | 2 +
debian/watch | 2 +
41 files changed, 217 insertions(+), 518 deletions(-)
diff --git a/debian/aprx.init b/debian/aprx.init
index 0043822..a802dac 100644
--- a/debian/aprx.init
+++ b/debian/aprx.init
@@ -1,8 +1,8 @@
#! /bin/sh
### BEGIN INIT INFO
# Provides: aprx
-# Required-Start: $syslog $local_fs
-# Required-Stop: $syslog $local_fs
+# Required-Start: $syslog $local_fs $remote_fs
+# Required-Stop: $syslog $local_fs $remote_fs
# Should-Start: ax25ifs
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
@@ -20,6 +20,7 @@ DAEMON=/usr/sbin/$NAME
DAEMON_ARGS=""
PIDFILE=/var/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
+STARTAPRX="no"
# Exit if the package is not installed
[ -x "$DAEMON" ] || exit 0
@@ -96,6 +97,12 @@ do_reload() {
case "$1" in
start)
+ # If STARTAPRX="no", aprx is disabled and init script should exit
+ if [ "$STARTAPRX" = "no" ]; then
+ echo "Not starting aprx; daemon disabled in /etc/default/aprx."
+ log_warning_msg "Not starting aprx; daemon disabled in /etc/default/aprx."
+ exit 0
+ fi
[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
do_start
case "$?" in
diff --git a/debian/aprx/etc/logrotate.d/aprx b/debian/aprx.logrotate
similarity index 100%
rename from debian/aprx/etc/logrotate.d/aprx
rename to debian/aprx.logrotate
diff --git a/debian/aprx.postinst.debhelper b/debian/aprx.postinst.debhelper
deleted file mode 100644
index d9381e4..0000000
--- a/debian/aprx.postinst.debhelper
+++ /dev/null
@@ -1,15 +0,0 @@
-# Automatically added by dh_installinit
-if [ -x "/etc/init.d/aprx" ]; then
- update-rc.d aprx defaults >/dev/null
- if [ -n "$2" ]; then
- _dh_action=restart
- else
- _dh_action=start
- fi
- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d aprx $_dh_action || exit $?
- else
- /etc/init.d/aprx $_dh_action || exit $?
- fi
-fi
-# End automatically added section
diff --git a/debian/aprx.postrm.debhelper b/debian/aprx.postrm.debhelper
deleted file mode 100644
index bc814dd..0000000
--- a/debian/aprx.postrm.debhelper
+++ /dev/null
@@ -1,5 +0,0 @@
-# Automatically added by dh_installinit
-if [ "$1" = "purge" ] ; then
- update-rc.d aprx remove >/dev/null || exit $?
-fi
-# End automatically added section
diff --git a/debian/aprx.prerm.debhelper b/debian/aprx.prerm.debhelper
deleted file mode 100644
index 0e93bb5..0000000
--- a/debian/aprx.prerm.debhelper
+++ /dev/null
@@ -1,9 +0,0 @@
-# Automatically added by dh_installinit
-if [ -x "/etc/init.d/aprx" ] && [ "$1" = remove ]; then
- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d aprx stop || exit $?
- else
- /etc/init.d/aprx stop || exit $?
- fi
-fi
-# End automatically added section
diff --git a/debian/aprx.substvars b/debian/aprx.substvars
deleted file mode 100644
index 36e5a58..0000000
--- a/debian/aprx.substvars
+++ /dev/null
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.7-1)
diff --git a/debian/aprx/DEBIAN/conffiles b/debian/aprx/DEBIAN/conffiles
deleted file mode 100644
index 4c1c3ce..0000000
--- a/debian/aprx/DEBIAN/conffiles
+++ /dev/null
@@ -1,5 +0,0 @@
-/etc/apparmor.d/sbin.aprx
-/etc/aprx.conf
-/etc/logrotate.d/aprx
-/etc/default/aprx
-/etc/init.d/aprx
diff --git a/debian/aprx/DEBIAN/control b/debian/aprx/DEBIAN/control
deleted file mode 100644
index b739b92..0000000
--- a/debian/aprx/DEBIAN/control
+++ /dev/null
@@ -1,19 +0,0 @@
-Package: aprx
-Version: 2.08.580-1
-Architecture: i386
-Maintainer: HAM APRX release maintenance <aprx at ham>
-Installed-Size: 1048
-Depends: libc6 (>= 2.7-1), openssl
-Section: hamradio
-Priority: extra
-Description: APRS Digipeater and iGate
- Aprx is an APRS specific Digipeater and iGate.
- It supports multiple KISS-TNCs on serial ports and listening
- to any kernel AX.25 network interfaces.
- .
- Additional features include a built-in "erlang-monitor" to analyze
- activity level of radio channels.
- .
- This software requires a valid (and unique) ham radio callsign to
- operate fully and is therefore useful mainly for licensed radio
- amateurs.
diff --git a/debian/aprx/DEBIAN/md5sums b/debian/aprx/DEBIAN/md5sums
deleted file mode 100644
index 282a406..0000000
--- a/debian/aprx/DEBIAN/md5sums
+++ /dev/null
@@ -1,13 +0,0 @@
-7c2a0786fee7fee92b86115088853a62 usr/sbin/aprx
-d6a98f1bbd799491f9559fc43e8bf7f6 usr/sbin/aprx-stat
-a9d04507f86642315745ba8f0e76df32 usr/share/man/man8/aprx.8.gz
-9cf04acfcca16e1c5791bcd395052b27 usr/share/man/man8/aprx-stat.8.gz
-673c8ba180344e2d5c22bb75f99809ae usr/share/doc/aprx/README
-09890d56e7d42c48f4bafcff6366b304 usr/share/doc/aprx/LICENSE
-6a4c523ff4e1adba1aaf0b8d3325fb08 usr/share/doc/aprx/ROADMAP
-c994b2fce146b8ef5cda6678ca45b6f2 usr/share/doc/aprx/copyright
-261f41ba62cd3667fa45400cb41c92f9 usr/share/doc/aprx/TODO.gz
-70e5e4e805429add4c0fd5958722e6b3 usr/share/doc/aprx/PROTOCOLS.gz
-5105fa38a3b4f732baea02a62b5c6eb9 usr/share/doc/aprx/aprx.conf.gz
-02cd7c464362015dd31ea4c5e0d8fe2b usr/share/doc/aprx/aprx-complex.conf.gz
-4823ba66d187982a7570635cbed33a79 usr/share/doc/aprx/aprx-manual.pdf.gz
diff --git a/debian/aprx/DEBIAN/postinst b/debian/aprx/DEBIAN/postinst
deleted file mode 100755
index d0406f7..0000000
--- a/debian/aprx/DEBIAN/postinst
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-set -e
-# Automatically added by dh_installinit
-if [ -x "/etc/init.d/aprx" ]; then
- update-rc.d aprx defaults >/dev/null
- if [ -n "$2" ]; then
- _dh_action=restart
- else
- _dh_action=start
- fi
- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d aprx $_dh_action || exit $?
- else
- /etc/init.d/aprx $_dh_action || exit $?
- fi
-fi
-# End automatically added section
diff --git a/debian/aprx/DEBIAN/postrm b/debian/aprx/DEBIAN/postrm
deleted file mode 100755
index 4dd5333..0000000
--- a/debian/aprx/DEBIAN/postrm
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-# Automatically added by dh_installinit
-if [ "$1" = "purge" ] ; then
- update-rc.d aprx remove >/dev/null || exit $?
-fi
-# End automatically added section
diff --git a/debian/aprx/DEBIAN/prerm b/debian/aprx/DEBIAN/prerm
deleted file mode 100755
index f96d6f9..0000000
--- a/debian/aprx/DEBIAN/prerm
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-set -e
-# Automatically added by dh_installinit
-if [ -x "/etc/init.d/aprx" ] && [ "$1" = remove ]; then
- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d aprx stop || exit $?
- else
- /etc/init.d/aprx stop || exit $?
- fi
-fi
-# End automatically added section
diff --git a/debian/aprx/etc/apparmor.d/sbin.aprx b/debian/aprx/etc/apparmor.d/sbin.aprx
deleted file mode 100644
index 00b878f..0000000
--- a/debian/aprx/etc/apparmor.d/sbin.aprx
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <tunables/global>
-
-/sbin/aprx {
- #include <abstractions/base>
- #include <abstractions/nameservice>
-
-
- capability setgid,
- capability setuid,
- capability sys_chroot,
-
-
- /etc/aprx.conf r,
- owner /var/run/aprx.pid rwk,
- owner /var/run/aprx.state rwk,
- owner /var/log/aprx/* rwk,
-}
diff --git a/debian/aprx/etc/default/aprx b/debian/aprx/etc/default/aprx
deleted file mode 100644
index 8fe2c08..0000000
--- a/debian/aprx/etc/default/aprx
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# STARTAPRX: start aprx on boot. Should be set to "yes" once you have
-# configured aprx.
-#
-STARTAPRX="no"
-
-#
-# Additional options that are passed to the Daemon.
-#
-DAEMON_OPTS=""
diff --git a/debian/aprx/etc/init.d/aprx b/debian/aprx/etc/init.d/aprx
deleted file mode 100755
index 0043822..0000000
--- a/debian/aprx/etc/init.d/aprx
+++ /dev/null
@@ -1,155 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: aprx
-# Required-Start: $syslog $local_fs
-# Required-Stop: $syslog $local_fs
-# Should-Start: ax25ifs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: start and stop aprx
-# Description: Monitor and gateway radio amateur APRS radio network datagrams
-### END INIT INFO
-
-# Do NOT "set -e"
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="aprx igate"
-NAME=aprx
-DAEMON=/usr/sbin/$NAME
-DAEMON_ARGS=""
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
- # Return
- # 0 if daemon has been started
- # 1 if daemon was already running
- # 2 if daemon could not be started
- start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
- || return 1
- start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
- $DAEMON_ARGS \
- || return 2
- # Add code here, if necessary, that waits for the process to be ready
- # to handle requests from services started subsequently which depend
- # on this one. As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
- # Return
- # 0 if daemon has been stopped
- # 1 if daemon was already stopped
- # 2 if daemon could not be stopped
- # other if a failure occurred
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
- RETVAL="$?"
- [ "$RETVAL" = 2 ] && return 2
- # Wait for children to finish too if this is a daemon that forks
- # and if the daemon is only ever run from this initscript.
- # If the above conditions are not satisfied then add some other code
- # that waits for the process to drop all resources that could be
- # needed by services started subsequently. A last resort is to
- # sleep for some time.
- start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
- [ "$?" = 2 ] && return 2
- # Many daemons don't delete their pidfiles when they exit.
- rm -f $PIDFILE
- return "$RETVAL"
-}
-
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
- #
- # If the daemon can reload its configuration without
- # restarting (for example, when it is sent a SIGHUP),
- # then implement that here.
- #
- start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
- return 0
-}
-
-case "$1" in
- start)
- [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
- do_start
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- stop)
- [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
- ;;
- #reload|force-reload)
- #
- # If do_reload() is not implemented then leave this commented out
- # and leave 'force-reload' as an alias for 'restart'.
- #
- #log_daemon_msg "Reloading $DESC" "$NAME"
- #do_reload
- #log_end_msg $?
- #;;
- restart|force-reload)
- #
- # If the "reload" option is implemented then remove the
- # 'force-reload' alias
- #
- log_daemon_msg "Restarting $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1)
- do_start
- case "$?" in
- 0) log_end_msg 0 ;;
- 1) log_end_msg 1 ;; # Old process is still running
- *) log_end_msg 1 ;; # Failed to start
- esac
- ;;
- *)
- # Failed to stop
- log_end_msg 1
- ;;
- esac
- ;;
- *)
- #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
- exit 3
- ;;
-esac
-
-:
diff --git a/debian/aprx/usr/sbin/aprx b/debian/aprx/usr/sbin/aprx
deleted file mode 100755
index b078b09..0000000
Binary files a/debian/aprx/usr/sbin/aprx and /dev/null differ
diff --git a/debian/aprx/usr/sbin/aprx-stat b/debian/aprx/usr/sbin/aprx-stat
deleted file mode 100755
index bd8f3bb..0000000
Binary files a/debian/aprx/usr/sbin/aprx-stat and /dev/null differ
diff --git a/debian/aprx/usr/share/doc/aprx/LICENSE b/debian/aprx/usr/share/doc/aprx/LICENSE
deleted file mode 100644
index db21adc..0000000
--- a/debian/aprx/usr/share/doc/aprx/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2007-2014, Matti Aarnio
-
-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 Matti Aarnio 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.
diff --git a/debian/aprx/usr/share/doc/aprx/PROTOCOLS.gz b/debian/aprx/usr/share/doc/aprx/PROTOCOLS.gz
deleted file mode 100644
index a623c2d..0000000
Binary files a/debian/aprx/usr/share/doc/aprx/PROTOCOLS.gz and /dev/null differ
diff --git a/debian/aprx/usr/share/doc/aprx/README b/debian/aprx/usr/share/doc/aprx/README
deleted file mode 100644
index 8c130bc..0000000
--- a/debian/aprx/usr/share/doc/aprx/README
+++ /dev/null
@@ -1,86 +0,0 @@
-
- APRX v2.08
-
-A multitalented APRS / DPRS / APRSIS "i-gate" with following properties:
-
- Config file (-f option) default is: /etc/aprx.conf
- Other runtime options are: -v, -d, -h/-? (verbout, debug and help)
-
- - Rx-IGate functionality works correctly
- - Tx-IGate functionality works correctly
-
- - Can do APRS New-N and generic AX.25 node digipeater functionality
- with transmitters
-
- - Has same-channel Viscous Digipeater functionality to not to digipeat
- at all, if during initial wait period the packet is heard again.
-
- - Has cross-interface Viscous Digipeater functionality to not to digipeat,
- if during the initial wait period the packet is heard on destination
- interface at least once, and at least once from other sources.
-
- - Can receive data from multiple receivers/modems on local machine
- serial ports, both classical and USB.
-
- - Can receive data from remote TCP stream connectable serial ports
- over the internet.
-
- - Understands on serial ports (local and remote TCP ones):
- - several KISS protocol variants, checksummed variants preferred
- - TNC2 debug style text (Rx-iGate receive only.)
- - D-STAR data side-channel "D-PRS"
-
- - Connects with one callsign-ssid pair to APRS-IS core for all
- received radio ports (the "mycall" parameter), but reports
- receiving radio port at each Rx-iGated packet
-
- - Knows that messages with following tokens in VIA fields of the
- path are not to be relayed into network:
- RFONLY, NOGATE, TCPIP, TCPXX
-
- - Knows that following source address prefixes are bogus and thus
- to be junked at Rx-iGate:
- WIDE, RELAY, TRACE, TCPIP, TCPXX, NOCALL, N0CALL
- (Actually these are string prefixes, so any WIDE*-* will block, etc.)
-
- - Has integrated D-PRS -> APRS/APRSIS Rx-iGate.
- Can even do D-PRS -> APRS RF conversion.
- This is experimental quality for "GPS" packets, the "GPS-A" is OK.
-
- - Does not require machine to have AX.25 protocol support internally!
-
- - On Linux machine with kernel internal AX.25 protocol support, does
- listen on internal AX.25 network in promiscuous form, and requires
- to be running as root to do that. Does not fail to start in case
- the port fails to open (running as non-root.)
-
- - Built-in "erlang-monitor" actually counts bytes per time interval
- (1 min, 10 min, and 20 min) on each receiving interface, including
- all that feed internal AX.25 network.
-
- - Telemetry reported erlang data is sent out every 20 minutes, and
- contains summarized data from 10 minute round-robin memory arrays.
- These are _not_ sent at exact 10 minutes of wall-clock, but exact
- 20 minutes from previous telemetry reporting, and first one is sent
- 20 minutes after program start.
-
- - Telemetry reported erlang data can be sent also over APRS radio
- port, but only for ports with valid AX.25 callsigns. See aprx-manual.pdf
-
- - The netbeacons are distributed timewise more evenly around the interval,
- and even the interval length is varied at random in between 20 and 30
- minutes. Number of netbeacons are unlimited, but their minimum transmit
- interval is 3 seconds making the amount of beacons sendable in 20 minutes
- to be: 20*60/3 = 400. All will be sent, but the cycle will just take
- longer.
-
- - Source code is at SVN repository: http://repo.ham.fi/svn/aprx
- - A Wiki page of this package: http://wiki.ham.fi/Aprx.en
- - A google-group for Aprx: http://groups.google.com/group/aprx-software
-
- - This program is also compilable as "EMBEDDED" target without
- any statistics buffer required at the system disk (or RAM-disk).
- See the INSTALL file.
-
-
-by Matti Aarnio - OH2MQK - oh2mqk-at-sral-fi - 2007-2014
diff --git a/debian/aprx/usr/share/doc/aprx/ROADMAP b/debian/aprx/usr/share/doc/aprx/ROADMAP
deleted file mode 100644
index 95f70c4..0000000
--- a/debian/aprx/usr/share/doc/aprx/ROADMAP
+++ /dev/null
@@ -1,26 +0,0 @@
- Aprx Roadmap and Future Directions
-
-
-Version 1
- - APRS Rx-only iGate - Complete, working
- - channel activity monitoring and telemetry - Complete, working
-
-
-Version 2
- - Digipeater - Working
- - Analyze and detect station distance - Working
- - Radio beacons - Working
- - Bidirection (Rx/Tx) APRS iGate - Working
- - DPRS->APRS GW - Working
-
-Version 2+
-
- - Port to ucLinux - Planned (pthread OK)
-
- - Port to Windows
-
- - Automated coverage statistics analyzer, and
- reporting it via digi node identity beacons.
- "ALOHA circles"
-
- - Automated coverage plotting
diff --git a/debian/aprx/usr/share/doc/aprx/TODO.gz b/debian/aprx/usr/share/doc/aprx/TODO.gz
deleted file mode 100644
index 848a682..0000000
Binary files a/debian/aprx/usr/share/doc/aprx/TODO.gz and /dev/null differ
diff --git a/debian/aprx/usr/share/doc/aprx/aprx-complex.conf.gz b/debian/aprx/usr/share/doc/aprx/aprx-complex.conf.gz
deleted file mode 100644
index 331afe6..0000000
Binary files a/debian/aprx/usr/share/doc/aprx/aprx-complex.conf.gz and /dev/null differ
diff --git a/debian/aprx/usr/share/doc/aprx/aprx-manual.pdf.gz b/debian/aprx/usr/share/doc/aprx/aprx-manual.pdf.gz
deleted file mode 100644
index 238586e..0000000
Binary files a/debian/aprx/usr/share/doc/aprx/aprx-manual.pdf.gz and /dev/null differ
diff --git a/debian/aprx/usr/share/doc/aprx/aprx.conf.gz b/debian/aprx/usr/share/doc/aprx/aprx.conf.gz
deleted file mode 100644
index 3a2c225..0000000
Binary files a/debian/aprx/usr/share/doc/aprx/aprx.conf.gz and /dev/null differ
diff --git a/debian/aprx/usr/share/doc/aprx/copyright b/debian/aprx/usr/share/doc/aprx/copyright
deleted file mode 100644
index 322cb19..0000000
--- a/debian/aprx/usr/share/doc/aprx/copyright
+++ /dev/null
@@ -1 +0,0 @@
-See LICENSE.
diff --git a/debian/aprx/usr/share/man/man8/aprx-stat.8.gz b/debian/aprx/usr/share/man/man8/aprx-stat.8.gz
deleted file mode 100644
index 0bf6968..0000000
Binary files a/debian/aprx/usr/share/man/man8/aprx-stat.8.gz and /dev/null differ
diff --git a/debian/aprx/usr/share/man/man8/aprx.8.gz b/debian/aprx/usr/share/man/man8/aprx.8.gz
deleted file mode 100644
index 4d3b82c..0000000
Binary files a/debian/aprx/usr/share/man/man8/aprx.8.gz and /dev/null differ
diff --git a/debian/changelog b/debian/changelog
index 3b6a4a0..974495f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,57 @@
+aprx (2.08.svn593+dfsg-2) unstable; urgency=medium
+
+ * remove timezone-varying timestamps from the generated manpages
+ fixes "reproducible builds" (Closes: #795441)
+
+ -- Colin Tuckley <colint at debian.org> Tue, 18 Aug 2015 16:38:40 +0100
+
+aprx (2.08.svn593+dfsg-1) unstable; urgency=medium
+
+ * Remove firmware directory since no licence or sources
+ * Add licences for ssl.* to debian/copyright (Closes: #794819)
+
+ -- Colin Tuckley <colint at debian.org> Tue, 11 Aug 2015 17:55:20 +0100
+
+aprx (2.08.svn593-1) unstable; urgency=medium
+
+ [ Christopher Knadle ]
+ * See main ChangeLog.
+ * Upstream snapshot from 2014-04-06
+ * original source:
+ removed files:
+ build-stamp (empty)
+ configure-stamp (empty)
+ f4fxl-core (unnecessazry binary with no corresponding source)
+ fixed these via "dpkg-source --commit", but the binary with
+ no corresponding source requires creating a -dfsg source
+ tarball if this is to be released into Debian proper
+ * debian/copyright: updated for copyright format 1.0
+ (Previously simply said "See license.")
+ * debian/compat: updated from 5 to 9
+ * debian/control:
+ Maintainer: fixed broken email address:
+ <aprx at ham> to <aprx at ham.net>
+ Standards-Version: updated from 3.7.2 to 3.9.6
+ * debian/rules: update to use 'dh' with overrides and hardening
+ * debian/aprx.init: add code to disable starting aprx if STARTAPRX="no"
+ is set in /etc/default/aprx.
+
+ [ Colin Tuckley ]
+ * Add Homepage field to debian/control
+ * Fix minor Lintian warnings in man pages
+ * Add $remote_fs to Required-Start & Required-Stop
+
+ -- Colin Tuckley <colint at debian.org> Sun, 14 Jun 2015 20:24:20 +0100
+
aprx (2.08.593-1) unstable; urgency=low
* See main ChangeLog.
- -- aprx maintainer <arpx at ham> Sun, 06 Apr 2014 02:06:07 +0300
+ -- aprx maintainer <arpx at ham.net> Sun, 06 Apr 2014 02:06:07 +0300
aprx (0.0.0-1) unstable; urgency=low
* Initial debianization.
- -- Kimmo Jukarainen <oh3gnu at ham> Thu, 3 Jan 2008 20:35:29 +0200
+ -- Kimmo Jukarainen <oh3gnu at ham.net> Thu, 3 Jan 2008 20:35:29 +0200
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 139e156..059adb2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,15 @@
Source: aprx
Section: hamradio
Priority: extra
-Maintainer: HAM APRX release maintenance <aprx at ham>
-Build-Depends: debhelper (>= 4), libssl-dev
-Standards-Version: 3.7.2
+Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
+Uploaders: Chris Knadle <Chris.Knadle at coredump.us>, Colin Tuckley <colint at debian.org>
+Build-Depends: debhelper (>= 9), libssl-dev
+Standards-Version: 3.9.6
+Homepage: http://ham.zmailer.org/oh2mqk/aprx/wiki-Aprx-en.html
Package: aprx
Architecture: any
-Depends: ${shlibs:Depends}, openssl
+Depends: ${shlibs:Depends}, ${misc:Depends}, openssl
Description: APRS Digipeater and iGate
Aprx is an APRS specific Digipeater and iGate.
It supports multiple KISS-TNCs on serial ports and listening
diff --git a/debian/copyright b/debian/copyright
index 322cb19..9d463f1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1 +1,79 @@
-See LICENSE.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: aprx
+Source: http://ham.zmailer.org/oh2mqk/aprx/
+
+Files: *
+Copyright: 2007-2014 Matti Aarnio, OH2MQK, <oh2mqk at sral.fi>
+License: BSD-3-Clause
+
+Files: debian/*
+Copyright: 2014 Christopher Knadle <Chris.Knadle at coredump.us>
+License: BSD-3-Clause
+
+License: BSD-3-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. 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.
+ 3. Neither the name of the University 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 HOLDERS 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.
+
+Files: ssl.*
+Copyright: 2002-2013 Igor Sysoev and 2011-2013 Nginx, Inc.
+License: BSD like 2-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. 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.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ .
+ Copyright: 1996 - 2013, Daniel Stenberg, <daniel at haxx.se>
+ License: CURL like
+ Permission to use, copy, modify, and distribute this software for any purpose
+ with or without fee is hereby granted, provided that the above copyright
+ notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
+ NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+ OR OTHER DEALINGS IN THE SOFTWARE.
+ .
+ Except as contained in this notice, the name of a copyright holder shall not
+ be used in advertising or otherwise to promote the sale, use or other dealings
+ in this Software without prior written authorization of the copyright holder.
+
diff --git a/debian/docs b/debian/docs
index 1a08e42..0a4d690 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,7 +1,6 @@
README
TODO
PROTOCOLS
-LICENSE
ROADMAP
aprx.conf
aprx-complex.conf
diff --git a/debian/files b/debian/files
deleted file mode 100644
index 0d9a581..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-aprx_2.08.580-1_i386.deb hamradio extra
diff --git a/debian/patches/01-man-page.patch b/debian/patches/01-man-page.patch
new file mode 100644
index 0000000..fb7092b
--- /dev/null
+++ b/debian/patches/01-man-page.patch
@@ -0,0 +1,27 @@
+Fix hyphen/minus in man page
+Author: Colin Tuckley <colint at debian.org>
+--- a/aprx.8.in
++++ b/aprx.8.in
+@@ -1,5 +1,4 @@
+ .TH aprx 8 "@DATEVERSION@"
+-.LO 8
+ .SH NAME
+ .B Aprx-2
+ \- An APRS iGate application with integrated Digipeater.
+@@ -329,7 +328,7 @@
+ # Unique code for your callsign to allow transmitting packets
+ # into the APRS-IS.
+ #
+-passcode -1
++passcode \-1
+
+
+
+--- a/aprx-stat.8.in
++++ b/aprx-stat.8.in
+@@ -1,5 +1,4 @@
+ .TH aprx\-stat 8 "@DATEVERSION@"
+-.LO 8
+ .SH NAME
+ .B aprx\-stat
+ \- statistics utility for
diff --git a/debian/patches/02-reproducible-build.patch b/debian/patches/02-reproducible-build.patch
new file mode 100644
index 0000000..31210ec
--- /dev/null
+++ b/debian/patches/02-reproducible-build.patch
@@ -0,0 +1,15 @@
+remove timezone-varying timestamps from the generated manpages
+Author: Chris Lamb <lamby at debian.org>
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -56,8 +56,8 @@
+ # SVNVERSION_CMD:=$(shell which svnversion)
+ # SVNVERSION:=$(shell if ${SVNVERSION_CMD} > /dev/null 2>&1 \&\& test -x ${SVNVERSION_CMD} -a \( -d .svn -o -d ../.svn -o -d ../../.svn \) ; then ${SVNVERSION_CMD} | tee SVNVERSION ; else cat SVNVERSION; fi)
+
+-DATE:=$(shell date +"%Y %B %d")
+-RFCDATE:=$(shell date +"%a, %d %b %Y %H:%M:%S %z")
++DATE:=$(shell LC_ALL=C date --utc --date="$(SOURCE_DATE_EPOCH)" +"%Y %B %d")
++RFCDATE:=$(shell LC_ALL=C date --utc --date="$(SOURCE_DATE_EPOCH)" +"%a, %d %b %Y %H:%M:%S %z")
+
+ DEFS= -DAPRXVERSION="\"@VERSION_STRING at r$(SVNVERSION)\"" \
+ -DVARRUN="\"$(VARRUN)\"" -DVARLOG="\"$(VARLOG)\"" \
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a0d4284
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01-man-page.patch
+02-reproducible-build.patch
diff --git a/debian/rules b/debian/rules
index 8ce7c56..5fbc5d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,96 +1,40 @@
#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#DH_VERBOSE = 1
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/default.mk
-CFLAGS = -Wall -g
+# see FEATURE AREAS in dpkg-buildflags(1)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
+# package maintainers to append LDFLAGS
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
- ./configure --with-pthread --sbindir=/usr/sbin --sysconfdir=/etc \
- --localstatedir=/var --mandir=/usr/share/man \
- CC="gcc" \
- CFLAGS="${CFLAGS}" \
- AFLAGS="${CFLAGS} --noexecstack" \
- LDFLAGS="${CFLAGS} -z noexecstack"
- touch configure-stamp
+# main packaging script
+%:
+ dh $@
-build: build-stamp
+override_dh_auto_configure:
+ dh_auto_configure -- --with-pthread --sbindir=/usr/sbin \
+ --sysconfdir=/etc --localstatedir=/var \
+ --mandir=/usr/share/man
-build-stamp: configure-stamp
- dh_testdir
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -vf ./test ./aprx-complex.conf Makefile
- # Add here commands to compile the package.
- $(MAKE)
- #docbook-to-man debian/aprx.sgml > aprx.1
-
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- -$(MAKE) clean
- rm -f debian/aprx.logrotate
-
- dh_clean
+override_dh_installinit:
+ dh_installinit --restart-after-upgrade
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
+override_dh_installdirs:
dh_installdirs
-
- # Add here commands to install the package into debian/aprx.
$(MAKE) DESTDIR=$(CURDIR)/debian/aprx logrotate.aprx install
cp logrotate.aprx debian/aprx.logrotate
install -m 644 apparmor.aprx $(CURDIR)/debian/aprx/etc/apparmor.d/sbin.aprx
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
-# dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
-# dh_install
-# dh_installmenu
-# dh_installdebconf
- dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_python
- dh_installinit --restart-after-upgrade
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
-# dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
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/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..9aa28f9
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+# Upstream does not sign the source, override watch-may-check-gpg-sig warning
+aprx source: debian-watch-may-check-gpg-signature
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..1a13422
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://ham.zmailer.org/oh2mqk/aprx/aprx-(.*)\.(.*)\.tar.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/aprx.git
More information about the pkg-hamradio-commits
mailing list