Control: tags 925782 + pending Dear maintainer,
I've prepared an NMU for mp3check (versioned as 0.8.7-3.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer or cancel the NMU. Regards, David Polverari.
diff -Nru mp3check-0.8.7/debian/changelog mp3check-0.8.7/debian/changelog --- mp3check-0.8.7/debian/changelog 2018-12-22 18:33:01.000000000 -0500 +++ mp3check-0.8.7/debian/changelog 2020-06-11 00:33:53.000000000 -0500 @@ -1,3 +1,12 @@ +mp3check (0.8.7-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches/60_bts925782_ftbfs_with_gcc_9.patch: added to fix FTBFS + with GCC-9. Thanks to Joachim Reichel <joachim.reic...@gmx.de>. (Closes: + #925782) + + -- David da Silva Polverari <david.polver...@gmail.com> Thu, 11 Jun 2020 00:33:53 -0500 + mp3check (0.8.7-3) unstable; urgency=medium [ Helmut Grohne ] diff -Nru mp3check-0.8.7/debian/patches/60_bts925782_ftbfs_with_gcc_9.patch mp3check-0.8.7/debian/patches/60_bts925782_ftbfs_with_gcc_9.patch --- mp3check-0.8.7/debian/patches/60_bts925782_ftbfs_with_gcc_9.patch 1969-12-31 19:00:00.000000000 -0500 +++ mp3check-0.8.7/debian/patches/60_bts925782_ftbfs_with_gcc_9.patch 2020-06-11 00:33:53.000000000 -0500 @@ -0,0 +1,50 @@ +Description: fix FTBFS with GCC-9 +Author: Joachim Reichel <joachim.reic...@gmx.de> +Bug-Debian: https://bugs.debian.org/925782 +Last-Update: 2019-09-01 + +--- a/texception.h ++++ b/texception.h +@@ -38,10 +38,10 @@ + + #define TExceptionN(n) public: virtual const char *name() const { return #n; } + #define TExceptionM(m) public: virtual const char *message() const { return m; } +-#define TExceptionM1(m,a) public: virtual const char *message() const { char *buf; asprintf(&buf, m, a); return buf; } +-#define TExceptionM2(m,a,b) public: virtual const char *message() const { char *buf; asprintf(&buf, m, a,b); return buf; } +-#define TExceptionM3(m,a,b,c) public: virtual const char *message() const { char *buf; asprintf(&buf, m, a,b,c); return buf; } +-#define TExceptionM4(m,a,b,c,d) public: virtual const char *message() const { char *buf; asprintf(&buf, m, a,b,c,d); return buf; } ++#define TExceptionM1(m,a) public: virtual const char *message() const { char *buf; int result = asprintf(&buf, m, a); return result != -1 ? buf : "asprintf failure"; } ++#define TExceptionM2(m,a,b) public: virtual const char *message() const { char *buf; int result = asprintf(&buf, m, a,b); return result != -1 ? buf : "asprintf failure"; } ++#define TExceptionM3(m,a,b,c) public: virtual const char *message() const { char *buf; int result = asprintf(&buf, m, a,b,c); return result != -1 ? buf : "asprintf failure"; } ++#define TExceptionM4(m,a,b,c,d) public: virtual const char *message() const { char *buf; int result = asprintf(&buf, m, a,b,c,d); return result != -1 ? buf : "asprintf failure"; } + + // base class of all exceptions + class TException { +--- a/tstring.cc ++++ b/tstring.cc +@@ -111,7 +111,7 @@ + tstring::Rep *tstring::Rep::create(size_t tmem) { + size_t m = sizeof(Rep) << 1; + while((m - 1 - sizeof(Rep)) < tmem) m <<= 1; +- Rep *p = new (m - 1 - sizeof(Rep)) Rep; ++ Rep *p = new (/*tag*/ true, m - 1 - sizeof(Rep)) Rep; + p->mem = m - 1 - sizeof(Rep); p->ref = 1; p->vulnerable = false; + return p; + } +--- a/tstring.h ++++ b/tstring.h +@@ -71,9 +71,12 @@ + + // static methods + // operator new for this class +- static void * operator new (size_t size, size_t tmem) { ++ // add a tag parameter to ensure that the signature of the delete operator does not collide with the (void*,size_t) overload ++ static void * operator new (size_t size, bool /*tag*/, size_t tmem) { + return ::operator new (size + tmem + 1);} +- static void operator delete (void *p, size_t) { ++ static void operator delete (void *p, bool /*tag*/, size_t) { ++ ::operator delete (p); } ++ static void operator delete (void *p) { + ::operator delete (p); } + + // create a new representation diff -Nru mp3check-0.8.7/debian/patches/series mp3check-0.8.7/debian/patches/series --- mp3check-0.8.7/debian/patches/series 2018-12-22 18:33:01.000000000 -0500 +++ mp3check-0.8.7/debian/patches/series 2020-06-11 00:12:11.000000000 -0500 @@ -4,3 +4,4 @@ 30_hardening.patch 40_bts726068_remove_truncated_last_frame.patch nostrip.patch +60_bts925782_ftbfs_with_gcc_9.patch
