Bug#964346: buster-pu: package wav2cdr/2.3.4-2+deb10u1
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu
* Use C99 fixed-size integer types to fix runtime assertion on
64bit architectures other than amd64 and alpha. (Closes: #956927)
* Stop linking to the dead Homepage.
diff -Nru wav2cdr-2.3.4/debian/changelog wav2cdr-2.3.4/debian/changelog
--- wav2cdr-2.3.4/debian/changelog 2017-11-02 12:46:02.000000000 +0200
+++ wav2cdr-2.3.4/debian/changelog 2020-07-05 23:09:10.000000000 +0300
@@ -1,3 +1,12 @@
+wav2cdr (2.3.4-2+deb10u1) buster; urgency=medium
+
+ * QA upload.
+ * Use C99 fixed-size integer types to fix runtime assertion on
+ 64bit architectures other than amd64 and alpha. (Closes: #956927)
+ * Stop linking to the dead Homepage.
+
+ -- Adrian Bunk <bunk@debian.org> Sun, 05 Jul 2020 23:09:10 +0300
+
wav2cdr (2.3.4-2) unstable; urgency=medium
* QA upload.
diff -Nru wav2cdr-2.3.4/debian/control wav2cdr-2.3.4/debian/control
--- wav2cdr-2.3.4/debian/control 2017-11-02 12:46:02.000000000 +0200
+++ wav2cdr-2.3.4/debian/control 2020-07-05 23:09:10.000000000 +0300
@@ -4,7 +4,6 @@
Maintainer: Debian QA Group <packages@qa.debian.org>
Build-Depends: debhelper (>= 10), bsdmainutils, gawk
Standards-Version: 4.1.1
-Homepage: http://volker.dnsalias.net/soft/index.html#wav2cdr
Package: wav2cdr
Architecture: any
diff -Nru wav2cdr-2.3.4/debian/patches/50_fix-inttypes.patch wav2cdr-2.3.4/debian/patches/50_fix-inttypes.patch
--- wav2cdr-2.3.4/debian/patches/50_fix-inttypes.patch 1970-01-01 02:00:00.000000000 +0200
+++ wav2cdr-2.3.4/debian/patches/50_fix-inttypes.patch 2020-07-05 23:09:10.000000000 +0300
@@ -0,0 +1,57 @@
+Description: Use C99 fixed-size integer types
+ This fixes runtime assertion on 64bit architectures
+ other than amd64 and alpha.
+Author: Adrian Bunk <bunk@debian.org>
+Bug-Debian: https://bugs.debian.org/956927
+
+--- wav2cdr-2.3.4.orig/chelp.h
++++ wav2cdr-2.3.4/chelp.h
+@@ -76,6 +76,7 @@ HISTORY:
+ #ifndef CHELP_H
+ #define CHELP_H
+
++#include <stdint.h>
+
+ /* Mnemonics for logical and bit-wise operators
+ */
+@@ -166,32 +167,18 @@ typedef char string;
+ */
+ #ifndef HAS_FIXEDSIZES
+ #define HAS_FIXEDSIZES
+-typedef unsigned char UINT8, byte; /* 8 bits */
+-typedef unsigned short UINT16, dbyte, word; /* 16 bits */
+-#if defined(__alpha) OR defined(__x86_64__)
+- typedef unsigned int UINT32,
++typedef uint8_t UINT8, byte; /* 8 bits */
++typedef uint16_t UINT16, dbyte, word; /* 16 bits */
++typedef uint32_t UINT32,
+ qbyte, dword, lword; /* 32 bits */
+-#else
+- typedef unsigned long UINT32,
+- qbyte, dword, lword; /* 32 bits */
+-#endif
+
+-typedef signed char SINT8; /* 8 bits signed */
+-typedef signed short SINT16; /* 16 bits signed */
+-#if defined(__alpha) OR defined(__x86_64__)
+- typedef signed int SINT32; /* 32 bits signed */
+-#else
+- typedef signed long SINT32; /* 32 bits signed */
+-#endif
++typedef int8_t SINT8; /* 8 bits signed */
++typedef int16_t SINT16; /* 16 bits signed */
++typedef int32_t SINT32; /* 32 bits signed */
+
+ #ifdef ANSIEXT
+-#ifdef __alpha
+- typedef unsigned long UINT64, llword; /* 64 bits */
+- typedef signed long SINT64; /* 64 bits signed */
+-#else
+- typedef unsigned long long UINT64, llword; /* 64 bits */
+- typedef signed long long SINT64; /* 64 bits signed */
+-#endif
++ typedef uint64_t UINT64, llword; /* 64 bits */
++ typedef int64_t SINT64; /* 64 bits signed */
+ #endif
+ /* check the sizes here? then we would depend on limits.h
+ better to require the user to use assert():
diff -Nru wav2cdr-2.3.4/debian/patches/series wav2cdr-2.3.4/debian/patches/series
--- wav2cdr-2.3.4/debian/patches/series 2017-11-02 12:46:02.000000000 +0200
+++ wav2cdr-2.3.4/debian/patches/series 2020-07-05 23:09:10.000000000 +0300
@@ -2,3 +2,4 @@
20_make-uninstall.patch
30_add-GCC-hardening.patch
40_fix-typo.patch
+50_fix-inttypes.patch
Reply to: