Control: tags 996905 + patch
Control: tags 996905 + pending

Dear maintainer,

Daniel Gröber has prepared an NMU for pms (versioned as 0.42-1.1) and
I've uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.


-- 
 .''`.  https://info.comodo.priv.at -- Debian Developer https://www.debian.org
 : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D  85FA BB3A 6801 8649 AA06
 `. `'  Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe
   `-   
diff -Nru pms-0.42/debian/changelog pms-0.42/debian/changelog
--- pms-0.42/debian/changelog	2013-08-11 22:46:48.000000000 +0200
+++ pms-0.42/debian/changelog	2023-07-05 23:17:35.000000000 +0200
@@ -1,3 +1,14 @@
+pms (0.42-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: error: format not a string literal and no format arguments
+    [-Werror=format-security]" by selectively demoting -Wformat-security to
+    warning (Closes: #996905)
+  * Fix time() undeclared error when building with gcc-12
+  * Upgrade debhelper compat to 11 and fix related lintian warnings
+
+ -- Daniel Gröber <d...@darkboxed.org>  Wed, 05 Jul 2023 23:17:35 +0200
+
 pms (0.42-1) unstable; urgency=low
 
   * New upstream release (Closes: #612192).
diff -Nru pms-0.42/debian/compat pms-0.42/debian/compat
--- pms-0.42/debian/compat	2013-08-11 21:14:52.000000000 +0200
+++ pms-0.42/debian/compat	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-9
diff -Nru pms-0.42/debian/control pms-0.42/debian/control
--- pms-0.42/debian/control	2013-08-11 22:40:45.000000000 +0200
+++ pms-0.42/debian/control	2023-07-05 23:17:35.000000000 +0200
@@ -1,9 +1,10 @@
 Source: pms
 Section: sound
-Priority: extra
+Priority: optional
 Maintainer: Alejandro Garrido Mota <garridom...@gmail.com>
-Build-Depends: debhelper (>= 9), gettext, gettext-base, libgettextpo0, libncurses5-dev,
-               libmpd-dev, libncursesw5-dev, libglib2.0-dev, gnulib, libboost-regex-dev
+Build-Depends: debhelper-compat (= 11),
+               gettext, gettext-base, libgettextpo0, libncurses-dev,
+               libmpd-dev, libglib2.0-dev, gnulib, libboost-regex-dev
 Standards-Version: 3.9.4
 Homepage: http://pms.sourceforge.net
 
diff -Nru pms-0.42/debian/patches/Fix-autotools-errors.patch pms-0.42/debian/patches/Fix-autotools-errors.patch
--- pms-0.42/debian/patches/Fix-autotools-errors.patch	1970-01-01 01:00:00.000000000 +0100
+++ pms-0.42/debian/patches/Fix-autotools-errors.patch	2023-07-05 23:17:35.000000000 +0200
@@ -0,0 +1,24 @@
+Description: Fix autotools errors
+Author: Daniel Gröber <d...@darkboxed.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,7 +13,7 @@ AC_ARG_ENABLE([regex],
+        esac])
+ 
+ AC_PREFIX_PROGRAM(man)
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
++AM_INIT_AUTOMAKE([-Wall -Werror subdir-objects foreign])
+ AC_PROG_CXX
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_FILES([Makefile po/Makefile.in])
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,7 +3,7 @@ man_MANS = pms.1
+ EXTRA_pms_SOURCES = src/action.h src/color.h src/command.h src/config.h src/conn.h src/display.h src/input.h src/list.h src/song.h src/types.h src/libmpdclient.h src/i18n.h src/topbar.h src/pms.h src/settings.h src/field.h src/mycurses.h src/mediator.h src/message.h src/filter.h
+ EXTRA_DIST = config.rpath m4/ChangeLog  pms.1 po
+ pms_SOURCES = src/action.cpp src/color.cpp src/command.cpp src/config.cpp src/conn.cpp src/display.cpp src/input.cpp src/list.cpp src/pms.cpp src/song.cpp src/libmpdclient.c src/field.cpp src/settings.cpp src/mediator.cpp src/message.cpp
+-CXXFLAGS += \
++AM_CXXFLAGS = \
+ 	@GLIB_CFLAGS@ \
+ 	-DLOCALE_DIR=\""$(datadir)/locale"\"
+ 
diff -Nru pms-0.42/debian/patches/Fix-missing-ctime-include.patch pms-0.42/debian/patches/Fix-missing-ctime-include.patch
--- pms-0.42/debian/patches/Fix-missing-ctime-include.patch	1970-01-01 01:00:00.000000000 +0100
+++ pms-0.42/debian/patches/Fix-missing-ctime-include.patch	2023-07-05 23:17:35.000000000 +0200
@@ -0,0 +1,13 @@
+Description: Fix missing <ctime> include
+ Newer gcc version must have moved stuff around
+Author: Daniel Gröber <d...@darkboxed.org>
+--- a/src/message.cpp
++++ b/src/message.cpp
+@@ -23,6 +23,7 @@
+ 
+ 
+ #include <cstdarg>
++#include <ctime>
+ #include <stdio.h>
+ #include "message.h"
+ 
diff -Nru pms-0.42/debian/patches/Ignore-format-security-FP.patch pms-0.42/debian/patches/Ignore-format-security-FP.patch
--- pms-0.42/debian/patches/Ignore-format-security-FP.patch	1970-01-01 01:00:00.000000000 +0100
+++ pms-0.42/debian/patches/Ignore-format-security-FP.patch	2023-07-05 23:17:35.000000000 +0200
@@ -0,0 +1,47 @@
+Description: Ignore -Wformat-security false positive
+ I don't see a reasonable way to rewrite this code without triggering this
+ warning since the dynamic format string being used here is controlled by the
+ user in the rc file.
+Author: Daniel Gröber <d...@darkboxed.org>
+--- a/src/display.cpp
++++ b/src/display.cpp
+@@ -1700,6 +1700,7 @@ void colprint(pms_window * w, int y, int
+ 			{
+ 				fmt += 2;
+ 				output = "%%";
++#pragma GCC diagnostic warning "-Wformat-security"
+ 				wprintw(w->h(), _(output.c_str()));
+ 				continue;
+ 			}
+@@ -1734,6 +1735,7 @@ void colprint(pms_window * w, int y, int
+ 					parse = false;
+ 					i = va_arg(ap, int);
+ 					sprintf(buf, "%d", i);
++#pragma GCC diagnostic warning "-Wformat-security"
+ 					wprintw(w->h(), _(buf));
+ 					printlen += strlen(buf);
+ 					i = 0;
+@@ -1742,6 +1744,7 @@ void colprint(pms_window * w, int y, int
+ 					parse = false;
+ 					f = va_arg(ap, double);
+ 					sprintf(buf, "%f", f);
++#pragma GCC diagnostic warning "-Wformat-security"
+ 					wprintw(w->h(), _(buf));
+ 					printlen += strlen(buf);
+ 					break;
+@@ -1753,6 +1756,7 @@ void colprint(pms_window * w, int y, int
+ 						output = output.substr(0, (maxlen - printlen - 1));
+ 					}
+ 					sprintf(buf, "%s", output.c_str());
++#pragma GCC diagnostic warning "-Wformat-security"
+ 					wprintw(w->h(), _(buf));
+ 					printlen += strlen(buf);
+ 					break;
+@@ -1787,6 +1791,7 @@ void colprint(pms_window * w, int y, int
+ 		else
+ 		{
+ 			output = *fmt;
++#pragma GCC diagnostic warning "-Wformat-security"
+ 			wprintw(w->h(), _(output.c_str()));
+ 			++printlen;
+ 		}
diff -Nru pms-0.42/debian/patches/series pms-0.42/debian/patches/series
--- pms-0.42/debian/patches/series	2013-08-11 17:45:21.000000000 +0200
+++ pms-0.42/debian/patches/series	2023-07-05 23:17:35.000000000 +0200
@@ -1 +1,4 @@
 translations_errors.diff
+Fix-autotools-errors.patch
+Ignore-format-security-FP.patch
+Fix-missing-ctime-include.patch
diff -Nru pms-0.42/debian/source/options pms-0.42/debian/source/options
--- pms-0.42/debian/source/options	1970-01-01 01:00:00.000000000 +0100
+++ pms-0.42/debian/source/options	2023-07-05 23:17:35.000000000 +0200
@@ -0,0 +1,2 @@
+# Don't store changes on autogenerated files
+extend-diff-ignore = "(^|/)(config\.sub|config\.guess|Makefile(\.in)?|install-sh|configure|depcomp|missing|aclocal\.m4|config\.h\.in)$"

Attachment: signature.asc
Description: Digital Signature

Reply via email to