diff options
| author | Nicholas Guriev <guriev-ns@ya.ru> | 2022-05-28 10:01:51 +0300 |
|---|---|---|
| committer | Alex Chernyakhovsky <achernya@mit.edu> | 2022-05-30 21:23:58 -0400 |
| commit | 71fede3e28b54b3b8a2559b7a4f926997bb0c0a3 (patch) | |
| tree | d45360e97fa5dee0ba03a4f5a9d71ec270257f62 | |
| parent | aaa956fcae6c400f8b20469e823204ac5e73c48f (diff) | |
Import Debian changes 1.3.2-2.2debian-1.3.2
mosh (1.3.2-2.2) unstable; urgency=medium
.
* Non-maintainer upload.
* Lower warning level to distcheck to solve build against OpenSSL 3.0 with
permitted deprecated declarations. (Closes: #1005718)
.
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)
| -rw-r--r-- | debian/changelog | 16 | ||||
| -rw-r--r-- | debian/patches/0001-Fix-gcc8-snprintf-truncation-warning.patch | 24 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 2 |
4 files changed, 42 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 48c5fba..e6fc440 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +mosh (1.3.2-2.2) unstable; urgency=medium + + * Non-maintainer upload. + * Lower warning level to distcheck to solve build against OpenSSL 3.0 with + permitted deprecated declarations. (Closes: #1005718) + + -- Nicholas Guriev <guriev-ns@ya.ru> Sat, 28 May 2022 10:01:51 +0300 + +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 <bunk@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 --git a/debian/patches/0001-Fix-gcc8-snprintf-truncation-warning.patch b/debian/patches/0001-Fix-gcc8-snprintf-truncation-warning.patch new file mode 100644 index 0000000..1566647 --- /dev/null +++ b/debian/patches/0001-Fix-gcc8-snprintf-truncation-warning.patch @@ -0,0 +1,24 @@ +From 2a5b5410b2a96d656544803809de109f474901f2 Mon Sep 17 00:00:00 2001 +From: John Hood <cgull@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 --git a/debian/patches/series b/debian/patches/series index 0fda2d8..5a3b262 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-Fix-Debian-GCC7-FTBFS-remove-default-constructors.patch +0001-Fix-gcc8-snprintf-truncation-warning.patch diff --git a/debian/rules b/debian/rules index dbfe544..c60543e 100755 --- a/debian/rules +++ b/debian/rules @@ -22,7 +22,7 @@ override_dh_auto_configure: --disable-silent-rules \ --enable-ufw \ --enable-completion \ - --enable-compile-warnings=error + --enable-compile-warnings=distcheck override_dh_perl: # mosh only uses Perl modules in perl-base. |