[Pkg-running-devel] [garmin-forerunner-tools] 01/06: Include Ubuntu patches to avoid segfaults on 64-bit architectures Thanks to Steve Langasek. Closes: #819410

[Christian Perrier]

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

bubulle pushed a commit to branch master
in repository garmin-forerunner-tools.

commit c6d5e0e0cdede14664f2dfe0d4444114998eabdd
Author: Christian Perrier <bubulle at debian.org>
Date:   Mon Mar 28 18:52:50 2016 +0200

    Include Ubuntu patches to avoid segfaults on 64-bit architectures Thanks to Steve Langasek. Closes: #819410
---
 debian/changelog                  |  13 +++++
 debian/patches/missing-prototypes | 106 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |   1 +
 debian/rules                      |   4 +-
 4 files changed, 122 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b971432..c69957a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+garmin-forerunner-tools (0.10repacked-8) UNRELEASED; urgency=medium
+
+  * Include Ubuntu patches to avoid segfaults on 64-bit architectures
+    Thanks to Steve Langasek. Closes: #819410
+    * debian/patches/missing-prototypes: include missing headers to ensure
+      proper declarations.
+    * fix debian/rules dependencies to not make config.status depend on
+      'configure' target, a file that will be removed in debian/rules
+      clean.
+    * fix clean target to not fail.* 
+
+ -- Christian Perrier <bubulle at debian.org>  Mon, 28 Mar 2016 18:50:11 +0200
+
 garmin-forerunner-tools (0.10repacked-7) unstable; urgency=medium
 
   * garmin-forerunner-tools includes <usb.h>, it should depends on
diff --git a/debian/patches/missing-prototypes b/debian/patches/missing-prototypes
new file mode 100644
index 0000000..fbedbbb
--- /dev/null
+++ b/debian/patches/missing-prototypes
@@ -0,0 +1,106 @@
+Description: include missing headers to ensure proper declarations
+ garmin-forerunner-tools uses several standard C functions without including
+ the proper headers needed to pick up their declarations.  Some of these
+ functions return pointers.  Failure to include the headers means the
+ return type is assumed to be an int, which means the pointer is implicitly
+ cast to an int, losing data on 64-bit architectures.
+Author: Steve Langasek <steve.langasek at ubuntu.com>
+
+Index: garmin-forerunner-tools-0.10repacked/src/usb_comm.c
+===================================================================
+--- garmin-forerunner-tools-0.10repacked.orig/src/usb_comm.c
++++ garmin-forerunner-tools-0.10repacked/src/usb_comm.c
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>
++#include <stdlib.h>
+ #include <libusb.h>
+ #include "garmin.h"
+ 
+Index: garmin-forerunner-tools-0.10repacked/src/unpack.c
+===================================================================
+--- garmin-forerunner-tools-0.10repacked.orig/src/unpack.c
++++ garmin-forerunner-tools-0.10repacked/src/unpack.c
+@@ -22,6 +22,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
+ #include "garmin.h"
+Index: garmin-forerunner-tools-0.10repacked/src/pack.c
+===================================================================
+--- garmin-forerunner-tools-0.10repacked.orig/src/pack.c
++++ garmin-forerunner-tools-0.10repacked/src/pack.c
+@@ -23,6 +23,8 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <string.h>
++#include <stdlib.h>
++#include <unistd.h>
+ #include "garmin.h"
+ 
+ 
+Index: garmin-forerunner-tools-0.10repacked/src/run.c
+===================================================================
+--- garmin-forerunner-tools-0.10repacked.orig/src/run.c
++++ garmin-forerunner-tools-0.10repacked/src/run.c
+@@ -18,6 +18,8 @@
+ */
+ 
+ #include "config.h"
++#include <stdlib.h>
++#include <unistd.h>
+ #include <time.h>
+ #include <string.h>
+ #include <errno.h>
+Index: garmin-forerunner-tools-0.10repacked/src/garmin_get_info.c
+===================================================================
+--- garmin-forerunner-tools-0.10repacked.orig/src/garmin_get_info.c
++++ garmin-forerunner-tools-0.10repacked/src/garmin_get_info.c
+@@ -19,6 +19,7 @@
+ 
+ #include "config.h"
+ #include <stdio.h>
++#include <unistd.h>
+ #include "garmin.h"
+ 
+ 
+Index: garmin-forerunner-tools-0.10repacked/src/garmin_gmap.c
+===================================================================
+--- garmin-forerunner-tools-0.10repacked.orig/src/garmin_gmap.c
++++ garmin-forerunner-tools-0.10repacked/src/garmin_gmap.c
+@@ -20,6 +20,7 @@
+ #include "config.h"
+ #include <math.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "garmin.h"
+ 
+ 
+Index: garmin-forerunner-tools-0.10repacked/src/garmin_gchart.c
+===================================================================
+--- garmin-forerunner-tools-0.10repacked.orig/src/garmin_gchart.c
++++ garmin-forerunner-tools-0.10repacked/src/garmin_gchart.c
+@@ -2,6 +2,7 @@
+ #include <math.h>
+ #include <float.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include "garmin.h"
+ 
+Index: garmin-forerunner-tools-0.10repacked/src/garmin_gpx.c
+===================================================================
+--- garmin-forerunner-tools-0.10repacked.orig/src/garmin_gpx.c
++++ garmin-forerunner-tools-0.10repacked/src/garmin_gpx.c
+@@ -20,6 +20,7 @@
+ #include "config.h"
+ #include <math.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <time.h>
+ #include "garmin.h"
diff --git a/debian/patches/series b/debian/patches/series
index 4272b6b..3cb823c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ exit_on_unpack_failure
 gcc4.8
 python_dir_from_upstream.patch
 libusb-1.0.patch
+missing-prototypes
diff --git a/debian/rules b/debian/rules
index e73bd90..12e9713 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 INSTALLDIR = $(CURDIR)/debian/garmin-forerunner-tools
 
-config.status: configure
+config.status:
 	dh_testdir
 	dh_autoreconf
 	./configure --host=$(DEB_HOST_GNU_TYPE) \
@@ -39,7 +39,7 @@ clean:
 	rm -f build-stamp 
 	[ ! -e Makefile ] || $(MAKE) distclean
 	dh_autoreconf_clean
-	-rm config.status config.log Makefile
+	rm -f config.status config.log Makefile
 	dh_clean 
 
 install: build

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-running/garmin-forerunner-tools.git