[Cc'ing tar@debian.org as I probably should have done with the nmudiff. Apologies]

On 2024-04-18, at 21:37:40 +0100, Jeremy Sowden wrote:

Control: tags 1067547 + patch
Control: tags 1067547 + pending

Dear maintainer,

I've prepared an NMU for wmweather+ (versioned as 2.19~alpha+ds-1.1) and
am going to upload it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

I've forked the Salsa repo and pushed the changes to my fork:

https://salsa.debian.org/azazel/wmweather-plus

I note that 2.17-2 and 2.18-1 were not committed to master, and
2.19~alpha+ds-1 wasn't in the repo at all. I merged the older releases
to master and then used gbp-import-dsc to import 2.19~alpha+ds-1. Does
this look all right? May I push?

J.

diff -Nru wmweather+-2.19~alpha+ds/debian/changelog wmweather+-2.19~alpha+ds/debian/changelog
--- wmweather+-2.19~alpha+ds/debian/changelog 2022-09-06 22:02:18.000000000 +0100
+++ wmweather+-2.19~alpha+ds/debian/changelog 2024-04-18 21:14:57.000000000 +0100
@@ -1,3 +1,10 @@
+wmweather+ (2.19~alpha+ds-1.1) UNRELEASED; urgency=medium

I fixed this before uploading.

+
+ * Non-maintainer upload.
+ * d/patches: add patch to fix FTBFS (Closes: #1067547)
+
+ -- Jeremy Sowden <azazel@debian.org> Thu, 18 Apr 2024 21:14:57 +0100
+
wmweather+ (2.19~alpha+ds-1) unstable; urgency=medium

* Bump standards version to 4.6.1.
diff -Nru wmweather+-2.19~alpha+ds/debian/patches/series wmweather+-2.19~alpha+ds/debian/patches/series
--- wmweather+-2.19~alpha+ds/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ wmweather+-2.19~alpha+ds/debian/patches/series 2024-04-18 21:14:57.000000000 +0100
@@ -0,0 +1 @@
+update-snprintf-and-vsnprintf-checks.patch
diff -Nru wmweather+-2.19~alpha+ds/debian/patches/update-snprintf-and-vsnprintf-checks.patch wmweather+-2.19~alpha+ds/debian/patches/update-snprintf-and-vsnprintf-checks.patch
--- wmweather+-2.19~alpha+ds/debian/patches/update-snprintf-and-vsnprintf-checks.patch 1970-01-01 01:00:00.000000000 +0100
+++ wmweather+-2.19~alpha+ds/debian/patches/update-snprintf-and-vsnprintf-checks.patch 2024-04-18 21:14:57.000000000 +0100
@@ -0,0 +1,80 @@
+Description: update snprintf and vsnprintf checks for
+ -Werror=implicit-function-declaration
+ .
+ This is the upstream fix.
+Author: Brad Jorsch <anomie@users.sourceforge.net>
+Last-Update: 2024-03-23
+Forwarded: not-needed
+Applied-upstream: commit:393394818cf4aa9b34071297a6947409cb19d74b +Bug-Debian: https://bugs.debian.org/1067547
+
+---
+ m4/snprintf.m4 | 6 +++---
+ m4/vsnprintf.m4 | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/m4/snprintf.m4 b/m4/snprintf.m4
+index 03567bc5931e..1131e93ce206 100644
+--- a/m4/snprintf.m4
++++ b/m4/snprintf.m4
+@@ -24,7 +24,7 @@ int snprintf(char *str, size_t size, const char *format, ...);
+ #endif
+ ]],
+ [[char foo[]="ABC"; snprintf(foo, 2, "%d", 12);
+-exit((foo[0]=='1' && foo[1]=='\0' && foo[2]=='C')?0:1);]])],
++return ((foo[0]=='1' && foo[1]=='\0' && foo[2]=='C')?0:1);]])],
+ [x_cv_func_snprintf_size=yes],
+ [x_cv_func_snprintf_size=no],
+ [x_cv_func_snprintf_size=no])])
+@@ -52,7 +52,7 @@ AC_CACHE_CHECK([if snprintf return value is sane], x_cv_func_snprintf_retval,
+ int snprintf(char *str, size_t size, const char *format, ...);
+ #endif
+ ]],
+-[[char foo[10]; exit((snprintf(foo, 1, "%d", 9876)==4)?0:1);]])],
++[[char foo[10]; return ((snprintf(foo, 1, "%d", 9876)==4)?0:1);]])],
+ [x_cv_func_snprintf_retval=yes],
+ [x_cv_func_snprintf_retval=no],
+ [x_cv_func_snprintf_retval=no])])
+@@ -79,7 +79,7 @@ AC_CACHE_CHECK([if snprintf(NULL, 0, ...) works], x_cv_func_snprintf_null_ok,
+ int snprintf(char *str, size_t size, const char *format, ...);
+ #endif
+ ]],
+-[int r=snprintf(NULL, 0, "%d", 100); exit((r==3 || r==-1)?0:1);])],
++[int r=snprintf(NULL, 0, "%d", 100); return ((r==3 || r==-1)?0:1);])],
+ [x_cv_func_snprintf_null_ok=yes],
+ [x_cv_func_snprintf_null_ok=no],
+ [x_cv_func_snprintf_null_ok=no])])
+diff --git a/m4/vsnprintf.m4 b/m4/vsnprintf.m4
+index a5de274cfc00..b580f46d2fcc 100644
+--- a/m4/vsnprintf.m4
++++ b/m4/vsnprintf.m4
+@@ -37,7 +37,7 @@ int doit(char *str, size_t size, const char *format, ...){ + }
+ ]],
+ [[char foo[]="ABC"; doit(foo, 2, "%d", 12);
+-exit((foo[0]=='1' && foo[1]=='\0' && foo[2]=='C')?0:1);]])],
++return ((foo[0]=='1' && foo[1]=='\0' && foo[2]=='C')?0:1);]])],
+ [x_cv_func_vsnprintf_size=yes],
+ [x_cv_func_vsnprintf_size=no],
+ [x_cv_func_vsnprintf_size=no])])
+@@ -74,7 +74,7 @@ int doit(char *str, size_t size, const char *format, ...){ + return r;
+ }
+ ]],
+-[[char foo[10]; exit((doit(foo, 1, "%d", 9876)==4)?0:1);]])],
++[[char foo[10]; return ((doit(foo, 1, "%d", 9876)==4)?0:1);]])],
+ [x_cv_func_vsnprintf_retval=yes],
+ [x_cv_func_vsnprintf_retval=no],
+ [x_cv_func_vsnprintf_retval=no])])
+@@ -110,7 +110,7 @@ int doit(char *str, size_t size, const char *format, ...){
+ return r;
+ }
+ ]],
+-[int r=doit(NULL, 0, "%d", 100); exit((r==3 || r==-1)?0:1);])],
++[int r=doit(NULL, 0, "%d", 100); return ((r==3 || r==-1)?0:1);])],
+ [x_cv_func_vsnprintf_null_ok=yes],
+ [x_cv_func_vsnprintf_null_ok=no],
+ [x_cv_func_vsnprintf_null_ok=no])])
+--
+2.43.0
+

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEbB20U2PvQDe9VtUXKYasCr3xBA0FAmYj0BsACgkQKYasCr3x BA2BOA/+IVNLLlUmeKF3KZuw7cCyXrWeZ6Kl4VZRdmaIF6Yt0p6g7XYwl89dM+s3 sRt9210//yf/ItHG/ZZ0vcWctOj2B5hvDzXdLszeDbifKPLUYHL/w/bKZEB4782S WSFc7Pl+2Qxh0Cb+XM4Du0zRfD9AipPTBXftmjSwTrngSZ6ucJKsSm/sV2PqZH27 kJ9AGMPLEwutNI3G4s4pPUXjjNNFjVqsGGfN0/09IF3UYevr/3oeRFg18sw/H3Zg /j2bZt8uGPhCQGL4jUSRxnrrXc/F0fPOwYGVoq+ETgwymP3w35eiY0tG90m3urlf lNxEXYhd8kokny8LcfQVYEkhGy+ZlVoSpIJM3EOcpvb32S1xKti4IlhMjzSQERnN gBAM8olHiTaxzZqdREiWdSfPYnc1v27DB3nQm+1BDQLpMoaYkt/cn9oHD7NdemB9 TmM0NmMRt4SIAE5TSqvQVyGKfOqE7JSfV7ds3dobrdOEz/0k0QpRyDyhERJw5CSU FNHZyBvIRi1uyQPuAUgSJYGnuRrRx8mdrGWNrHR66UkxWgPw03XE47tXa7bA03OH ea/hIAFvmphd0cTaHaJ5ps2kordl/uPsQLZszGUvipE+ezHfgMcL+MvGg2BVQcSo fNQh6t+mCsu9hYH4Ikszr2VQsQjiPWghAU+LiPqhCg1/4VhbTqU=
=7XAN
-----END PGP SIGNATURE-----

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)