Compare commits

..

No commits in common. "hibbian/latest" and "upstream" have entirely different histories.

19 changed files with 0 additions and 480 deletions

10
debian/NEWS vendored
View File

@ -1,10 +0,0 @@
uronode (2.13-1) unstable; urgency=medium
From this version on, upstream have changed running files from /var/ax25/ to
/var/lib/ax25. It is recommended by upstream to migrate your current
/var/ax25/node/* files to /var/lib/ax25/node/* after upgrade.
If you do not do this, your help files, ROSE directory and user logs shall
be considered fresh and reset, with all users being treated as if they are
new and connecting for the first time.
-- Dave Hibberd <d@vehibberd.com> Wed, 27 Jan 2021 21:33:36 +0000

View File

@ -1,2 +0,0 @@
Manpages from upstream have been patched out due to being supplied as
gzipped files. They have been unzipped and moved to debian/manpages.

177
debian/changelog vendored
View File

@ -1,177 +0,0 @@
uronode (2.15-3~hibbian+2) bookworm-hibbian-unstable; urgency=medium
* Bring the twists back in...
-- Dave Hibberd <hibby@debian.org> Mon, 26 Aug 2024 21:23:29 +0100
uronode (2.15-3~hibbian+1) bookworm-hibbian-unstable; urgency=medium
* Rebuild for hibbian
-- Dave Hibberd <hibby@debian.org> Mon, 26 Aug 2024 21:04:30 +0100
uronode (2.15-3) unstable; urgency=medium
* Patching mheardd.dat location
- this should fix jh and jl functionality
-- Dave Hibberd <d@vehibberd.com> Tue, 12 Sep 2023 22:37:21 +0100
uronode (2.15-2) unstable; urgency=medium
* Add zlib to control and patch in correct ifdef to configure
* Add netrom MOTD patch
* Standards bump to 4.6.2.0
-- Dave Hibberd <d@vehibberd.com> Tue, 08 Aug 2023 21:48:30 +0100
uronode (2.15-1) unstable; urgency=medium
* New upstream version 2.15
* Standards bump to 4.6.0.1
* Multiple definition patch removed
- Included upstream
-- Dave Hibberd <d@vehibberd.com> Sat, 05 Nov 2022 17:01:31 +0100
uronode (2.13-2) unstable; urgency=medium
* Fix runtime bug introduced by changes in folder-update patch for 2.12-1
-- Dave Hibberd <d@vehibberd.com> Tue, 02 Feb 2021 00:18:52 +0000
uronode (2.13-1) unstable; urgency=medium
* New upstream Update to 2.13
- Patches Refreshed
* Config files now live in /var/lib/ax25
- Cleared lintian override
- Added news file
-- Dave Hibberd <d@vehibberd.com> Wed, 27 Jan 2021 22:33:18 +0000
uronode (2.12-1) unstable; urgency=medium
* Team upload
[ Dave Hibberd ]
* New upstream update to 2.12
- Patches Refreshed
* Removed makefile-install-locations patch
* Fixed lots of patch conflicts and funk
* Added gitlab CI
* Added multiple-definition.patch to build in gcc10
- Closes: #957902
[ tony mancill ]
* Update debian/watch to version 4
* Commit upstream version 2.12 to upstream and pristine-tar branches
* Bump Standards-Version to 4.5.1
* Set Rules-Requires-Root: no in debian/control
* Freshen debian/copyright
* Use debhelper-compat 13
* Use https URL for Homepage in debian/control
-- tony mancill <tmancill@debian.org> Sun, 10 Jan 2021 13:51:11 -0800
uronode (2.10-1) unstable; urgency=medium
* New upstream update
- Patches Refreshed
* Removed multiarch-libc patch, included upstream
-- Dave Hibberd <d@vehibberd.com> Sat, 17 Aug 2019 23:15:37 +0100
uronode (2.9-1) unstable; urgency=medium
* Salsa vcs added
* Architecture changed to linux-any
* Non-Interactive configure patched in
* Upstream bump to 2.9
- Patches Refreshed
* New patch added (Closes: #911491)
- Allow the compiler to choose net/if.h
* Two old patches Removed
- flexd-spelling
- no-install-gz-manpages
* debian/control
- Updated to Standards Version 4.3.0.1
* debian/copyright
- Secure Copyright url added
-- Dave Hibberd <d@vehibberd.com> Thu, 27 Dec 2018 16:19:08 +0000
uronode (2.8.1-1) unstable; urgency=medium
* New Upstream import
- patches refreshed
* debian/control
- Updated to Standards Version 4.1.3
* debian/compat
- Updated to Debhelper 11
-- Dave Hibberd <d@vehibberd.com> Sat, 20 Jan 2018 12:20:19 +0000
uronode (2.7-1) unstable; urgency=medium
* New Upstream import
- Patches refreshed
* debian/patches/hardening
- Updated flags to be included
* debian/patches/install-dir-creation
- Refreshed to accommodate new lines
* debian/patches/flexd-spelling
- Added to fix binary spelling error
* debian/control
- Updated Standards Version to 4.1.1
- Removed zlib1g-dev dependency
-- Dave Hibberd <d@vehibberd.com> Tue, 22 Aug 2017 14:01:16 +0100
uronode (2.6-1) unstable; urgency=medium
* New Upstream import
- Patches refreshed
* debian/control
- Updated Standards version to 3.9.8
* debian/patches/hardening
- Added options for CXXFLAGS and CPPFLAGS
-- Dave Hibberd <d@vehibberd.com> Sat, 21 Jan 2017 15:41:58 +0000
uronode (2.5.1-2) unstable; urgency=medium
* debian/control
- Updated Standards Version to 3.9.7
- Changed VCS-* to secure URIs
* debian/patches/hardening
- patch renamed (previously called remove-cflags)
- patch adds CPPFlags and LDFlags to compiler instructions
* debian/rules
- Exporting hardening=+all to enable fPIE and bindnow
-- Dave Hibberd <d@vehibberd.com> Tue, 05 Apr 2016 01:21:27 +0100
uronode (2.5.1-1) unstable; urgency=medium
* New upstream release
-- Dave Hibberd <d@vehibberd.com> Fri, 01 Apr 2016 16:33:24 +0100
uronode (2.3.1-3) unstable; urgency=medium
* Fix hardcoding temporary install directories into program binaries
-- Dave Hibberd <d@vehibberd.com> Fri, 16 Oct 2015 20:02:02 +0100
uronode (2.3.1-2) unstable; urgency=medium
* Team upload.
* Add Breaks+Replaces for ax25-node. (Closes: #800924)
-- Iain R. Learmonth <irl@debian.org> Mon, 05 Oct 2015 13:28:37 +0100
uronode (2.3.1-1) unstable; urgency=medium
* Initial release. (Closes: #778843)
-- Dave Hibberd <d@vehibberd.com> Thu, 03 Sep 2015 23:37:40 +0100

22
debian/control vendored
View File

@ -1,22 +0,0 @@
Source: uronode
Section: hamradio
Priority: optional
Maintainer: Debian Hamradio Maintainers <debian-hams@lists.debian.org>
Uploaders: Dave Hibberd <d@vehibberd.com>
Build-Depends: debhelper-compat (= 13), libax25-dev, zlib1g-dev
Standards-Version: 4.6.2.0
Vcs-Browser: https://salsa.debian.org/debian-hamradio-team/uronode
Vcs-Git: https://salsa.debian.org/debian-hamradio-team/uronode.git
Homepage: https://uronode.sourceforge.net/
Rules-Requires-Root: no
Package: uronode
Architecture: linux-any
Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks: ax25-node
Replaces: ax25-node
Description: Node front end for AX.25, NET/ROM, Rose and TCP
URONode is a packet radio node front end for amateur radio operators.
It provides a shell modelled after those of LinuxNode, AWZNode and
Flexnode. It is capable of initiating connections to remote stations
and exposing services installed on them to users.

29
debian/copyright vendored
View File

@ -1,29 +0,0 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: uronode
Source: http://sourceforge.net/projects/uronode/files
Files: *
Copyright: (C) 1998-2020 Brian Rodgers N1URO <n1uro@n1uro.ampr.org>
License: GPL-2+
Files: debian/*
Copyright: (C) 2015-2021 Dave Hibberd <d@vehibberd.com>
License: GPL-2+
License: GPL-2+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
.
The GPL License which applies to this package can be found on your Debian
system at /usr/share/common-licenses/GPL-2.

4
debian/gbp.conf vendored
View File

@ -1,4 +0,0 @@
[DEFAULT]
debian-branch = debian/latest
dist = DEP14
pristine-tar = True

View File

@ -1,6 +0,0 @@
include:
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
reprotest:
extends: .test-reprotest-diffoscope

View File

@ -1,61 +0,0 @@
Description: Correct the folders in which Uronode is installed
Author: Dave Hibberd <d@vehibberd.com>
Last-Update: 2021-02-02
--- a/configure
+++ b/configure
@@ -14,13 +14,13 @@
_sleep 2
make distclean > make.debug
-[ "$ETC_DIR" ] || ETC_DIR=/usr/local/etc/ax25
-[ "$SBIN_DIR" ] || SBIN_DIR=/usr/local/sbin
-[ "$BIN_DIR" ] || BIN_DIR=/usr/local/bin
-[ "$LIB_DIR" ] || LIB_DIR=/usr/local/lib
-[ "$DATA_DIR" ] || DATA_DIR=/usr/local/share
-[ "$MAN_DIR" ] || MAN_DIR=/usr/local/share/man
-[ "$VAR_DIR" ] || VAR_DIR=/usr/local/var/lib/ax25
+[ "$ETC_DIR" ] || ETC_DIR=/etc/ax25
+[ "$SBIN_DIR" ] || SBIN_DIR=/usr/sbin
+[ "$BIN_DIR" ] || BIN_DIR=/usr/bin
+[ "$LIB_DIR" ] || LIB_DIR=/usr/lib
+[ "$DATA_DIR" ] || DATA_DIR=/usr/share
+[ "$MAN_DIR" ] || MAN_DIR=/usr/share/man
+[ "$VAR_DIR" ] || VAR_DIR=/var/lib/ax25
echo "Welcome to the configuration utility for URONode. This configure script"
echo "will very simply and easily guide you into installling URONode with as"
--- a/Makefile.include.in
+++ b/Makefile.include.in
@@ -2,12 +2,12 @@
ARCH = @ARCH@
# Paths
-ETC_DIR = @ETC_DIR@
-SBIN_DIR = @SBIN_DIR@
-BIN_DIR = @BIN_DIR@
-LIB_DIR = @LIB_DIR@
-MAN_DIR = @MAN_DIR@
-VAR_DIR = @VAR_DIR@
+ETC_DIR = debian/uronode@ETC_DIR@
+SBIN_DIR = debian/uronode@SBIN_DIR@
+BIN_DIR = debian/uronode@BIN_DIR@
+LIB_DIR = debian/uronode@LIB_DIR@
+MAN_DIR = debian/uronode@MAN_DIR@
+VAR_DIR = debian/uronode@VAR_DIR@
# Is Zlib available?
-ZLIB = @ZLIB@
\ No newline at end of file
+ZLIB = @ZLIB@
--- a/config.h.in
+++ b/config.h.in
@@ -29,7 +29,7 @@
#define FLEXD_PID_FILE "/var/run/flexd.pid"
#define FLEX_GT_FILE "@VAR_DIR@/flex/gateways"
#define FLEX_DST_FILE "@VAR_DIR@/flex/destinations"
-#define DATA_MHEARD_FILE "@VAR_DIR@/mheard/mheard.dat"
+#define DATA_MHEARD_FILE "/var/ax25/mheard/mheard.dat"
#define DATA_NODE_LOGIN_FILE "@VAR_DIR@/node/loggedin"
#define DATA_NODE_HELP_DIR "@VAR_DIR@/node/help/"
#define DATA_NODE_LAST_FILE "@VAR_DIR@/node/lastlog"

View File

@ -1,33 +0,0 @@
Description: Fix Lintian hardening errors caused by flags not being passed to compiler,
use debhelper compiler flags
Author: Dave Hibberd <d@vehibberd.com>
Last-Update: 2017-08-22
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,10 +1,13 @@
all: nodeusers uronode axdigi calibrate @FLEXNET@
CC = gcc
-LD = gcc
+LD = $(CC)
# CFLAGS = -O2 -g -s -Wno-unused-result -Wstrict-prototypes
-CFLAGS = -DUNIX -g3 -DDEBUG
-LDFLAGS =
+# CFLAGS = -DUNIX -g3 -DDEBUG
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
LIBS = -lax25 -lax25io
include Makefile.include
@@ -24,7 +27,7 @@
DIGI_OBJS = $(DIGI_SRC:.c=.o)
CALIBRATE_OBJS = $(CALIBRATE_SRC:.c=.o)
.c.o:
- $(CC) $(CFLAGS) -c $<
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(LDFLAGS) -c $<
install: installbin installman installhelp installconf
install -b -m 755 -D -d $(VAR_DIR)

View File

@ -1,14 +0,0 @@
Description: Create proper SBIN_DIR directory at install time
Author: Dave Hibberd <d@vehibberd.com>
Last-Update: 2018-02-10
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,6 +38,7 @@
install -b -m 644 -p etc/gateways $(VAR_DIR)/flex
installbin: all
+ install -b -m 755 -D -d $(SBIN_DIR)
install -m 755 -s -p uronode $(SBIN_DIR)
install -m 755 -s -p nodeusers $(SBIN_DIR)
install -m 755 -s -p axdigi $(SBIN_DIR)

View File

@ -1,38 +0,0 @@
Description: Add in motd functionality for Netrom
Author: Dave Hibberd <d@vehibberd.com>
Last-Update: 2023-08-07
--- a/node.c
+++ b/node.c
@@ -301,6 +301,11 @@
node_log(LOGLVL_LOGIN, "%s @ %s logged in", User.call, User.ul_name);
#ifdef HAVEMOTD
if (User.ul_type == AF_NETROM) {
+ node_msg("%s - Welcome to %s", VERSION, NodeId);
+ if ((fp = fopen(HAVEMOTD, "r")) != NULL) {
+ while (fgets(buf, 256, fp) != NULL) axio_puts(buf,NodeIo);
+ axio_puts ("\n",NodeIo);
+ }
/* axio_printf(NodeIo, "%s} Welcome.\n", NodeId); */
} else
if ((User.ul_type == AF_INET) || (User.ul_type == AF_INET6)) {
@@ -365,6 +370,8 @@
axio_printf(NodeIo,"\n");
}
}
+ } else {
+ node_prompt();
}
if (check_perms(PERM_ANSI, 0L) != -1) {
/* Not needed from what I see so far. */
--- a/command.c
+++ b/command.c
@@ -137,7 +137,7 @@
}
}
if (User.ul_type == AF_NETROM) {
- axio_printf(NodeIo,"");
+ axio_printf(NodeIo,"%s, thank you for connecting to the %s\nURONode netrom shell. Come back soon, 73!\n",User.call, NodeId);
}
if (User.ul_type == AF_ROSE) {
if (check_perms(PERM_ANSI, 0L) != -1) {

View File

@ -1,28 +0,0 @@
Description: Remove interactive mode from configure, speed up build
Author: Dave Hibberd <d@vehibberd.com>
Last-Update: 2018-02-10
--- a/configure
+++ b/configure
@@ -1,11 +1,5 @@
#!/bin/sh
-echo -n "Use interactive mode? [Y/n]: "; read answer
-if [ "$answer" = "Y" -o "$answer" = "y" -o "$answer" = "" ]
- then NON_INTERACTIVE=0;
- else NON_INTERACTIVE=1;
-fi
-
_sleep()
{
[ "$NON_INTERACTIVE" = 1 ] || sleep "$@"
@@ -122,6 +116,9 @@
if [ $? -ne 1 ]
then
HAVEAX25="#define HAVE_AX25 1"
+ #These have been moved out of tcp-ip so I have an MOTD when I don't build telnet in
+ HAVEMOTD="#define HAVEMOTD"
+ MOTDPATH='"/etc/ax25/uronode.motd"'
fi
#
# echo -n "Include support for the FlexNet protocol ? [Y/n]: "; read answer

View File

@ -1,6 +0,0 @@
netrom-motd.patch
non-interactive-install.patch
hardening
folder-update
install-dir-creation

View File

@ -1,23 +0,0 @@
Description: Fix zlib ifdef to ensure it builds right
Author: Dave Hibberd <d@vehibberd.com>
Last-Update: 2023-08-07
--- a/configure
+++ b/configure
@@ -74,14 +74,14 @@
_sleep 1
echo -n "Checking for the existence of the Zlib headers... "
ZLIB=""
-HAVEZLIB="#undef HAVE_ZLIB"
+HAVEZLIB="#undef HAVE_ZLIB_H"
for zlibdir in /usr/include /usr/local/include
do
if [ -f $zlibdir/zlib.h ]
then
echo $zlibdir/zlib.h
ZLIB="-lz"
- HAVEZLIB="#define HAVE_ZLIB 1"
+ HAVEZLIB="#define HAVE_ZLIB_H 1"
fi
done
if [ -z "$ZLIB" ]

18
debian/rules vendored
View File

@ -1,18 +0,0 @@
#!/usr/bin/make -f
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
export NON_INTERACTIVE=1
%:
dh $@
# Remove things we aren't using in oarc. mheard is a bug awaiting a fix.
override_dh_auto_configure:
dh_auto_configure -- --without-flexnet --without-tcpip --without-rose --without-autorouter
# Collapse upstream changes file into single file
override_dh_auto_build:
cat CHANGES.* > changelog
dh_auto_build

View File

@ -1 +0,0 @@
3.0 (quilt)

5
debian/uronode.docs vendored
View File

@ -1,5 +0,0 @@
BBS.txt
COLORS
FAQ
URONode.his
changelog

View File

@ -1 +0,0 @@

2
debian/watch vendored
View File

@ -1,2 +0,0 @@
version=4
https://sf.net/uronode/uronode-(\d[\d\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))