[Debian-iot-packaging] [libb64] 03/03: Import Debian changes 1.2-4

[Thorsten Alteholz]

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

alteholz pushed a commit to branch master
in repository libb64.

commit 7c1fa5e4cb2fd2ba0bdebaa0cbec0368b3aee370
Author: Thorsten Alteholz <debian at alteholz.de>
Date:   Thu Sep 7 18:16:02 2017 +0200

    Import Debian changes 1.2-4
    
    libb64 (1.2-4) unstable; urgency=medium
    
      * new maintainer (Closes: #706894)
      * debian/control: bump standard to 4.1.0 (no changes)
      * debian/control: use dh10
      * debian/rules: add bindnow linker flag
      * add off-by-one.diff (Closes: #801584) (LP: #1501176)
---
 debian/changelog               | 10 ++++++++++
 debian/compat                  |  2 +-
 debian/control                 |  6 +++---
 debian/patches/off-by-one.diff | 15 +++++++++++++++
 debian/patches/series          |  1 +
 debian/rules                   |  2 +-
 6 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 37dd716..9051e9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libb64 (1.2-4) unstable; urgency=medium
+
+  * new maintainer (Closes: #706894)
+  * debian/control: bump standard to 4.1.0 (no changes)
+  * debian/control: use dh10
+  * debian/rules: add bindnow linker flag
+  * add off-by-one.diff (Closes: #801584) (LP: #1501176)
+
+ -- Thorsten Alteholz <debian at alteholz.de>  Thu, 07 Sep 2017 18:16:02 +0200
+
 libb64 (1.2-3) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/compat b/debian/compat
index 7f8f011..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+10
diff --git a/debian/control b/debian/control
index 406580c..4a0bb9c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,11 @@
 Source: libb64
 Section: libs
 Priority: optional
-Maintainer: Jakub Wilk <jwilk at debian.org>
-Build-Depends: debhelper (>= 8.1.3~),
+Maintainer: Thorsten Alteholz <debian at alteholz.de>
+Build-Depends: debhelper (>= 10),
  dpkg-dev (>= 1.16.0~),
  xutils-dev,
-Standards-Version: 3.9.4
+Standards-Version: 4.1.0
 Homepage: http://libb64.sourceforge.net/
 
 Package: libb64-0d
diff --git a/debian/patches/off-by-one.diff b/debian/patches/off-by-one.diff
new file mode 100644
index 0000000..2e50398
--- /dev/null
+++ b/debian/patches/off-by-one.diff
@@ -0,0 +1,15 @@
+Author: William McCall
+Description: Launchpad bug #1501176 reported by William McCall on 2015-09-30
+Index: libb64-1.2/src/cdecode.c
+===================================================================
+--- libb64-1.2.orig/src/cdecode.c	2017-09-07 14:43:43.489227609 +0200
++++ libb64-1.2/src/cdecode.c	2017-09-07 14:43:43.481227249 +0200
+@@ -13,7 +13,7 @@
+ 	static const char decoding_size = sizeof(decoding);
+ 	if (value_in < 43) return -1;
+ 	value_in -= 43;
+-	if (value_in > decoding_size) return -1;
++	if (value_in >= decoding_size) return -1;
+ 	return decoding[(int)value_in];
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index d07a119..f1c704d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ integer-overflows.diff
 bufsiz-as-buffer-size.diff
 static-chars-per-line.diff
 initialize-coder-state.diff
+off-by-one.diff
diff --git a/debian/rules b/debian/rules
index 11a8d82..eac9df8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ libdir = /usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/
 cflags = \
 	 $(shell dpkg-buildflags --get CFLAGS) \
 	 $(shell dpkg-buildflags --get CPPFLAGS)
-ldflags = $(shell dpkg-buildflags --get LDFLAGS)
+ldflags = $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,now
 
 .PHONY: build build-indep build-arch
 build build-arch: build-stamp

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/libb64.git