Tidied up hardening options and stopped them being removed, made lintian more quiet

This commit is contained in:
Dave Hibberd 2020-04-20 16:09:28 +01:00
parent 342e0f3fd9
commit 93eaa6a8fb
5 changed files with 42 additions and 18 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
pc/ .pc/

1
debian/changelog vendored
View File

@ -3,6 +3,7 @@ uronode (2.11-1) UNRELEASED; urgency=medium
* New upstream update * New upstream update
- Patches Refreshed - Patches Refreshed
* Removed makefile-install-locations patch * Removed makefile-install-locations patch
* Fixed lots of patch conflicts and funk
* Added gitlab CI * Added gitlab CI
-- Dave Hibberd <d@vehibberd.com> Mon, 20 Apr 2020 03:25:08 +0100 -- Dave Hibberd <d@vehibberd.com> Mon, 20 Apr 2020 03:25:08 +0100

View File

@ -5,9 +5,12 @@ Last-Update: 2017-08-22
--- a/Makefile.in --- a/Makefile.in
+++ b/Makefile.in +++ b/Makefile.in
@@ -3,8 +3,11 @@ @@ -1,10 +1,13 @@
all: nodeusers uronode axdigi calibrate @FLEXNET@
CC = gcc CC = gcc
LD = gcc -LD = gcc
+LD = $(CC)
# CFLAGS = -O2 -g -s -Wno-unused-result -Wstrict-prototypes # CFLAGS = -O2 -g -s -Wno-unused-result -Wstrict-prototypes
-CFLAGS = -DUNIX -g3 -DDEBUG -CFLAGS = -DUNIX -g3 -DDEBUG
-LDFLAGS = -LDFLAGS =

View File

@ -4,21 +4,7 @@ Last-Update: 2018-02-10
--- a/Makefile.in --- a/Makefile.in
+++ b/Makefile.in +++ b/Makefile.in
@@ -3,11 +3,8 @@ @@ -38,6 +38,7 @@
CC = gcc
LD = gcc
# CFLAGS = -O2 -g -s -Wno-unused-result -Wstrict-prototypes
-# 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)
+CFLAGS = -DUNIX -g3 -DDEBUG
+LDFLAGS =
LIBS = -lax25 -lax25io
include Makefile.include
@@ -38,6 +35,7 @@
install -b -m 644 -p etc/gateways $(VAR_DIR)/flex install -b -m 644 -p etc/gateways $(VAR_DIR)/flex
installbin: all installbin: all

34
debian/uronode.lintian-overrides vendored Normal file
View File

@ -0,0 +1,34 @@
uronode: file-in-unusual-dir var/ax25/flex/gateways
uronode: file-in-unusual-dir var/ax25/node/help/bye.hlp
uronode: file-in-unusual-dir var/ax25/node/help/color.hlp
uronode: file-in-unusual-dir var/ax25/node/help/connect.hlp
uronode: file-in-unusual-dir var/ax25/node/help/desti.hlp
uronode: file-in-unusual-dir var/ax25/node/help/escape.hlp
uronode: file-in-unusual-dir var/ax25/node/help/finger.hlp
uronode: file-in-unusual-dir var/ax25/node/help/help.hlp
uronode: file-in-unusual-dir var/ax25/node/help/host.hlp
uronode: file-in-unusual-dir var/ax25/node/help/info.hlp
uronode: file-in-unusual-dir var/ax25/node/help/jheard.hlp
uronode: file-in-unusual-dir var/ax25/node/help/jlong.hlp
uronode: file-in-unusual-dir var/ax25/node/help/links.hlp
uronode: file-in-unusual-dir var/ax25/node/help/mail.hlp
uronode: file-in-unusual-dir var/ax25/node/help/message.hlp
uronode: file-in-unusual-dir var/ax25/node/help/msg.hlp
uronode: file-in-unusual-dir var/ax25/node/help/netstat.hlp
uronode: file-in-unusual-dir var/ax25/node/help/nodes.hlp
uronode: file-in-unusual-dir var/ax25/node/help/ping.hlp
uronode: file-in-unusual-dir var/ax25/node/help/ports.hlp
uronode: file-in-unusual-dir var/ax25/node/help/quit.hlp
uronode: file-in-unusual-dir var/ax25/node/help/rose.hlp
uronode: file-in-unusual-dir var/ax25/node/help/routes.hlp
uronode: file-in-unusual-dir var/ax25/node/help/sessions.hlp
uronode: file-in-unusual-dir var/ax25/node/help/status.hlp
uronode: file-in-unusual-dir var/ax25/node/help/telnet.hlp
uronode: file-in-unusual-dir var/ax25/node/help/users.hlp
uronode: file-in-unusual-dir var/ax25/node/help/version.hlp
uronode: file-in-unusual-dir var/ax25/node/help/who.hlp
uronode: file-in-unusual-dir var/ax25/node/help/zconnect.hlp
uronode: file-in-unusual-dir var/ax25/node/help/ztelnet.hlp
uronode: file-in-unusual-dir var/ax25/node/lastlog
uronode: file-in-unusual-dir var/ax25/node/loggedin