[hamradio-commits] [ax25-tools] 05/09: Updates for tidiness, changelog

[Dave Hibberd]

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

hibby-guest pushed a commit to branch master
in repository ax25-tools.

commit 5cc01f1b6f56e7ce1dfa65d1a82a275eaec709c7
Author: hibby <d at vehibberd.com>
Date:   Sun Oct 29 23:16:32 2017 +0000

    Updates for tidiness, changelog
---
 .gitignore                                |  1 +
 .pc/.quilt_patches                        |  1 +
 .pc/.quilt_series                         |  1 +
 .pc/.version                              |  1 +
 debian/changelog                          |  7 ++++++-
 debian/patches/02-ptsname-prototype.patch | 21 ---------------------
 debian/patches/03-string_literal.patch    | 24 ++++++++++++++++++++++++
 7 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..224e7f0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc/
diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
new file mode 100644
index 0000000..6857a8d
--- /dev/null
+++ b/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
new file mode 100644
index 0000000..c206706
--- /dev/null
+++ b/.pc/.quilt_series
@@ -0,0 +1 @@
+series
diff --git a/.pc/.version b/.pc/.version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/debian/changelog b/debian/changelog
index c36653a..ba0522a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 ax25-tools (0.0.10-rc4-2) UNRELEASED; urgency=medium
 
-  * Something
+  * Add patch 02-ptsname-prototype.patch to fix segfault at runtime
+    - Closes: #878322
+  * Adds standards 4.1.1 and dh compat 10
+  * New debian/rules to enable hardening
+  * New patch 03-string_literal.patch
+  	- Clears -Werrors errors due to passing string literals 
 
  -- Dave Hibberd <d at vehibberd.com>  Sun, 29 Oct 2017 22:45:00 +0000
 
diff --git a/debian/patches/02-ptsname-prototype.patch b/debian/patches/02-ptsname-prototype.patch
index 72fec7c..183aad5 100644
--- a/debian/patches/02-ptsname-prototype.patch
+++ b/debian/patches/02-ptsname-prototype.patch
@@ -66,25 +66,4 @@ Last-Update: 2017-10-12
  #include <string.h>
  #include <errno.h>
  #include <stdlib.h>
-@@ -444,18 +445,18 @@
- 			return 1;
- 		case ':':
- 		case '?':
--			fprintf(stderr, usage_string);
-+			fprintf(stderr, "%s", usage_string);
- 			return 1;
- 		}
- 	}
- 
- 	if ((argc - optind) < 2 && ptmxdevices == 0) {
--		fprintf(stderr, usage_string);
-+		fprintf(stderr, "%s", usage_string);
- 		return 1;
- 	}
- 
- 	if ((argc - optind) < 1 && ptmxdevices > 0) {
--		fprintf(stderr, usage_string);
-+		fprintf(stderr, "%s", usage_string);
- 		return 1;
- 	}
  
diff --git a/debian/patches/03-string_literal.patch b/debian/patches/03-string_literal.patch
index e868a7b..b8c263c 100644
--- a/debian/patches/03-string_literal.patch
+++ b/debian/patches/03-string_literal.patch
@@ -73,3 +73,27 @@
  		exit(1);
  	}
  
+--- a/6pack/m6pack.c
++++ b/6pack/m6pack.c
+@@ -444,18 +444,18 @@
+ 			return 1;
+ 		case ':':
+ 		case '?':
+-			fprintf(stderr, usage_string);
++			fprintf(stderr, "%s", usage_string);
+ 			return 1;
+ 		}
+ 	}
+ 
+ 	if ((argc - optind) < 2 && ptmxdevices == 0) {
+-		fprintf(stderr, usage_string);
++		fprintf(stderr, "%s", usage_string);
+ 		return 1;
+ 	}
+ 
+ 	if ((argc - optind) < 1 && ptmxdevices > 0) {
+-		fprintf(stderr, usage_string);
++		fprintf(stderr, "%s", usage_string);
+ 		return 1;
+ 	}
+ 

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