Control: tags 897813 + patch
Control: tags 897813 + pending

Dear maintainer,

I've prepared an NMU for mosh (versioned as 1.3.2-2.1) and uploaded
it to DELAYED/14. Please feel free to tell me if I should cancel it.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

diff -Nru mosh-1.3.2/debian/changelog mosh-1.3.2/debian/changelog
--- mosh-1.3.2/debian/changelog	2017-08-25 01:04:25.000000000 +0300
+++ mosh-1.3.2/debian/changelog	2018-08-08 20:45:44.000000000 +0300
@@ -1,3 +1,11 @@
+mosh (1.3.2-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add upstream fix for FTBFS with gcc 8, thanks to Reiner Herrmann.
+    (Closes: #897813)
+
+ -- Adrian Bunk <b...@debian.org>  Wed, 08 Aug 2018 20:45:44 +0300
+
 mosh (1.3.2-2) unstable; urgency=medium
 
   * Fix "mosh FTBFS with gcc 7" <remove default constructors>
diff -Nru mosh-1.3.2/debian/patches/0001-Fix-gcc8-snprintf-truncation-warning.patch mosh-1.3.2/debian/patches/0001-Fix-gcc8-snprintf-truncation-warning.patch
--- mosh-1.3.2/debian/patches/0001-Fix-gcc8-snprintf-truncation-warning.patch	1970-01-01 02:00:00.000000000 +0200
+++ mosh-1.3.2/debian/patches/0001-Fix-gcc8-snprintf-truncation-warning.patch	2018-08-08 20:45:44.000000000 +0300
@@ -0,0 +1,24 @@
+From 2a5b5410b2a96d656544803809de109f474901f2 Mon Sep 17 00:00:00 2001
+From: John Hood <cg...@glup.org>
+Date: Wed, 11 Apr 2018 18:10:59 -0400
+Subject: Fix gcc8 snprintf truncation warning.
+
+---
+ src/frontend/mosh-server.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/frontend/mosh-server.cc b/src/frontend/mosh-server.cc
+index 7918c74..567252f 100644
+--- a/src/frontend/mosh-server.cc
++++ b/src/frontend/mosh-server.cc
+@@ -764,8 +764,8 @@ static void serve( int host_fd, Terminal
+ 	      throw NetworkException( std::string( "serve: getnameinfo: " ) + gai_strerror( errcode ), 0 );
+ 	    }
+ 
+-	    char tmp[ 64 ];
+-	    snprintf( tmp, 64, "%s via mosh [%d]", host, getpid() );
++	    char tmp[ 64 + NI_MAXHOST ];
++	    snprintf( tmp, 64 + NI_MAXHOST, "%s via mosh [%d]", host, getpid() );
+ 	    utempter_add_record( host_fd, tmp );
+ 
+ 	    connected_utmp = true;
diff -Nru mosh-1.3.2/debian/patches/series mosh-1.3.2/debian/patches/series
--- mosh-1.3.2/debian/patches/series	2017-08-25 01:04:25.000000000 +0300
+++ mosh-1.3.2/debian/patches/series	2018-08-08 20:45:44.000000000 +0300
@@ -1 +1,2 @@
 0001-Fix-Debian-GCC7-FTBFS-remove-default-constructors.patch
+0001-Fix-gcc8-snprintf-truncation-warning.patch

Reply via email to