Control: tags 925712 + patch
Control: tags 925712 + pending
Dear maintainer,
I've prepared an NMU for hexcurse (versioned as 1.58-1.2) and
uploaded it to mentors for sponsoring. Please feel free to tell me if I
should remove it.
--
Regards
Sudip
diff -Nru hexcurse-1.58/debian/changelog hexcurse-1.58/debian/changelog
--- hexcurse-1.58/debian/changelog 2017-08-17 18:32:55.000000000 +0100
+++ hexcurse-1.58/debian/changelog 2020-03-29 19:36:45.000000000 +0100
@@ -1,3 +1,10 @@
+hexcurse (1.58-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix ftbfs with GCC. (Closes: #925712)
+
+ -- Sudip Mukherjee <sudipm.mukher...@gmail.com> Sun, 29 Mar 2020 19:36:45
+0100
+
hexcurse (1.58-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru hexcurse-1.58/debian/patches/fix_ftbfs.patch
hexcurse-1.58/debian/patches/fix_ftbfs.patch
--- hexcurse-1.58/debian/patches/fix_ftbfs.patch 1970-01-01
01:00:00.000000000 +0100
+++ hexcurse-1.58/debian/patches/fix_ftbfs.patch 2020-03-29
19:36:45.000000000 +0100
@@ -0,0 +1,30 @@
+Description: Fix ftbfs with GCC-9
+
+Author: Sudip Mukherjee <sudipm.mukher...@gmail.com>
+
+---
+
+--- hexcurse-1.58.orig/src/acceptch.c
++++ hexcurse-1.58/src/acceptch.c
+@@ -427,7 +427,7 @@ int wacceptch(WINS *win, off_t len, char
+ bzero(SearchStr, 13);
+ strcat(SearchStr, "(");
+ if (strlen(temp) <= 10)
+- strncat(SearchStr, temp, strlen(temp));
++ strcat(SearchStr, temp);
+ else
+ {
+ strncat(SearchStr, temp, 7);
+@@ -466,8 +466,10 @@ int wacceptch(WINS *win, off_t len, char
+ if (tmpstr[0] != '\0' ) /* enter was hit so */
+ { /* don't change temp */
+ bzero(temp, 81);
+- strncpy(temp, tmpstr, (strlen(tmpstr) > 80)
+- ? 80 : strlen(tmpstr));
++ if (strlen(tmpstr) > 80)
++ strncpy(temp, tmpstr, 80);
++ else
++ strcpy(temp,tmpstr);
+ }
+
+ val = 0;
diff -Nru hexcurse-1.58/debian/patches/series
hexcurse-1.58/debian/patches/series
--- hexcurse-1.58/debian/patches/series 2017-08-17 18:32:55.000000000 +0100
+++ hexcurse-1.58/debian/patches/series 2020-03-29 19:36:45.000000000 +0100
@@ -2,3 +2,4 @@
0002-Manpage-fix.patch
0001-explicitly-mark-fallthrough-case.patch
0001-fix-format-truncation-error-with-GCC-7.patch
+fix_ftbfs.patch
