2.9-1 release for testing

This commit is contained in:
Dave Hibberd 2018-12-27 16:20:56 +00:00
parent 15267df7ec
commit c63e53bba9
10 changed files with 36 additions and 57 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.pc/

16
debian/changelog vendored
View File

@ -1,11 +1,21 @@
uronode (2.8.1-2) UNRELEASED; urgency=medium
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> Sat, 10 Feb 2018 19:41:57 +0000
-- Dave Hibberd <d@vehibberd.com> Thu, 27 Dec 2018 16:19:08 +0000
uronode (2.8.1-1) unstable; urgency=medium

2
debian/control vendored
View File

@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Hamradio Maintainers <debian-hams@lists.debian.org>
Uploaders: Dave Hibberd <d@vehibberd.com>
Build-Depends: debhelper (>= 11), libax25-dev
Standards-Version: 4.1.3
Standards-Version: 4.3.0.1
Vcs-Browser: https://salsa.debian.org/debian-hamradio-team/uronode
Vcs-Git: https://salsa.debian.org/debian-hamradio-team/uronode.git
Homepage: http://uronode.sourceforge.net/

2
debian/copyright vendored
View File

@ -1,4 +1,4 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: uronode
Source: http://sourceforge.net/projects/uronode/files/uronode-2.3.1.tar.gz/download

View File

@ -1,15 +0,0 @@
Description: Fix Lintian binary spelling errors
Author: Dave Hibberd <d@vehibberd.com>
Last-Update: 2017-08-22
--- a/flexd.c
+++ b/flexd.c
@@ -413,7 +413,7 @@
printf("FlexD version %s.\n\r", VERSION);
printf("Copywrite (c) 2000-2003 by Roy PE1RJA and Stefano IZ5AWZ\n\r");
printf("Copywrite (c) 2003 - present by Brian Rogers - N1URO.\n\r");
- printf("FlexD is free sofware and you are welcome to redistribute it\n\r");
+ printf("FlexD is free software and you are welcome to redistribute it\n\r");
printf("under the terms of GNU General Public Licence as published\n\r");
printf("by Free Software Foundation; either version 2 of the License, or\n\r");
printf("(at your option) any later version.\n\r");

View File

@ -1,10 +1,10 @@
Description: Update the folders in which Uronode is installed
Author: Dave Hibberd <d@vehibberd.com>
Last-Update: 2017-01-21
Last-Update: 2018-12-27
--- a/configure
+++ b/configure
@@ -20,13 +20,13 @@
@@ -14,13 +14,13 @@
_sleep 2
make distclean > make.debug

View File

@ -1,6 +1,6 @@
Description: Install files to temporary directory for packaging
Author: Dave Hibberd <d@vehibberd.com>
Last-Update: 2018-02-10
Last-Update: 2018-12-27
--- a/Makefile.include.in
+++ b/Makefile.include.in
@ -27,7 +27,7 @@ Last-Update: 2018-02-10
+ZLIB = @ZLIB@
--- a/configure
+++ b/configure
@@ -26,7 +26,7 @@
@@ -20,7 +20,7 @@
[ "$LIB_DIR" ] || LIB_DIR=/usr/lib
[ "$DATA_DIR" ] || DATA_DIR=/usr/share
[ "$MAN_DIR" ] || MAN_DIR=/usr/share/man

15
debian/patches/multiarch-libc.patch vendored Normal file
View File

@ -0,0 +1,15 @@
Description: Stop Uronode hard-coding location of net/if.h
Author: Helmut Grohne <helmut@subdivi.de>
Last-Update: 2018-12-27
--- a/axdigi.c
+++ b/axdigi.c
@@ -21,7 +21,7 @@
* 12th June 1997.
*/
-#include </usr/include/net/if.h>
+#include <net/if.h>
#include <linux/if_ether.h>
#include <netinet/in.h>
#include <sys/ioctl.h>

View File

@ -1,33 +0,0 @@
Description: Prevent installation of gzipped manpages, they have been moved to the debian folder and unzipped
Author: Dave Hibberd <d@vehibberd.com>
Last-Update: 2015-09-07
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,7 +24,7 @@
.c.o:
$(CC) $(CFLAGS) -c $<
-install: installbin installman installhelp installconf
+install: installbin installhelp installconf
install -m 755 -D -d $(VAR_DIR)
install -m 755 -D -d $(VAR_DIR)/node
install -m 644 -p etc/loggedin $(VAR_DIR)/node
@@ -53,16 +53,7 @@
install -m 600 -p etc/uronode.routes $(ETC_DIR)
install -m 600 -p etc/flexd.conf $(ETC_DIR)
-installman:
- install -m 755 -D -d $(MAN_DIR)/man1 $(MAN_DIR)/man5 $(MAN_DIR)/man8
- install -m 644 -p man/nodeusers.1.gz $(MAN_DIR)/man1
- install -m 644 -p man/uronode.conf.5.gz $(MAN_DIR)/man5
- install -m 644 -p man/uronode.perms.5.gz $(MAN_DIR)/man5
- install -m 644 -p man/flexd.conf.5.gz $(MAN_DIR)/man5
- install -m 644 -p man/uronode.8.gz $(MAN_DIR)/man8
- install -m 644 -p man/axdigi.8.gz $(MAN_DIR)/man8
-
-upgrade: installman
+upgrade:
install -m 755 -p uronode $(SBIN_DIR)
install -m 755 -p nodeusers $(SBIN_DIR)
install -m 755 -p flexd $(SBIN_DIR)

View File

@ -1,3 +1,4 @@
multiarch-libc.patch
non-interactive-install.patch
hardening
folder-update