[hamradio-commits] [direwolf] 05/09: Refreshed patches

[Iain R. Learmonth]

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

irl pushed a commit to branch master
in repository direwolf.

commit 6f7efa0956867cc9fed5afcea1a4eb857877af56
Author: Iain R. Learmonth <irl at debian.org>
Date:   Fri Aug 25 21:37:18 2017 +0100

    Refreshed patches
---
 debian/patches/fix_documentation_path.patch |  4 ++--
 debian/patches/fix_hardening-no-relro.patch | 14 +-------------
 debian/patches/fix_spelling.patch           | 10 +++++-----
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/debian/patches/fix_documentation_path.patch b/debian/patches/fix_documentation_path.patch
index 84da3aa..d5bd431 100644
--- a/debian/patches/fix_documentation_path.patch
+++ b/debian/patches/fix_documentation_path.patch
@@ -4,12 +4,12 @@ Last-Update: 2014-09-08
 
 --- a/direwolf.c
 +++ b/direwolf.c
-@@ -1103,7 +1103,7 @@
+@@ -1238,7 +1238,7 @@
    
  #if __WIN32__
  #else
 -	dw_printf ("Complete documentation can be found in /usr/local/share/doc/direwolf.\n");
-+	dw_printf ("Complete documentation can be found in /usr/share/doc/direwolf.\n");
++	dw_printf ("Complete documentation can be found online at https://github.com/wb2osz/direwolf/tree/master/doc/.\n");
  #endif
  	exit (EXIT_FAILURE);
  }
diff --git a/debian/patches/fix_hardening-no-relro.patch b/debian/patches/fix_hardening-no-relro.patch
index 0de47de..5c3dd9a 100644
--- a/debian/patches/fix_hardening-no-relro.patch
+++ b/debian/patches/fix_hardening-no-relro.patch
@@ -4,19 +4,7 @@ Last-Update: 2014-09-08
 
 --- a/Makefile.linux
 +++ b/Makefile.linux
-@@ -12,9 +12,9 @@
- 	@echo " "
- 
- CC := gcc
--CFLAGS := -O3 -pthread -Igeotranz
-+CFLAGS += -O3 -pthread -Igeotranz
- 
--LDFLAGS := -lm -lpthread -lrt
-+LDFLAGS += -lm -lpthread -lrt
- 
- 
- 
-@@ -338,13 +338,13 @@
+@@ -402,13 +402,13 @@
  # Multiple AGWPE network or serial port clients to test TNCs side by side.
  
  aclients : aclients.c ax25_pad.c fcs_calc.c textcolor.o misc.a
diff --git a/debian/patches/fix_spelling.patch b/debian/patches/fix_spelling.patch
index 7381a07..38ae9a9 100644
--- a/debian/patches/fix_spelling.patch
+++ b/debian/patches/fix_spelling.patch
@@ -4,7 +4,7 @@ Last-Update: 2015-02-05
 
 --- a/config.c
 +++ b/config.c
-@@ -4299,7 +4299,7 @@
+@@ -4898,7 +4898,7 @@
  	  }
  	  else {
  	    text_color_set(DW_COLOR_ERROR);
@@ -15,7 +15,7 @@ Last-Update: 2015-02-05
  
 --- a/man1/direwolf.1
 +++ b/man1/direwolf.1
-@@ -133,13 +133,13 @@
+@@ -135,13 +135,13 @@
  direwolf can listen over a UDP port with options like this:
  .RS
  .P
@@ -116,9 +116,9 @@ Last-Update: 2015-02-05
  If  you  simply  fed  this  into decode_aprs, it would complain about the 
 --- a/decode_aprs.c
 +++ b/decode_aprs.c
-@@ -1417,7 +1417,7 @@
+@@ -1461,7 +1461,7 @@
   *
-  * Outputs:	??? TBD
+  *		A->g_message_number	Message number if any.  Required for ack/rej.
   *
 - * Description:	An APRS message is a text string with a specifed addressee.
 + * Description:	An APRS message is a text string with a specified addressee.
@@ -127,7 +127,7 @@ Last-Update: 2015-02-05
   *		and replies with acknowledgement or rejection.
 --- a/gen_packets.c
 +++ b/gen_packets.c
-@@ -374,7 +374,7 @@
+@@ -446,7 +446,7 @@
  
          if (strlen(output_file) == 0) {
            text_color_set(DW_COLOR_ERROR); 

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