diff mbox series

[meta-oe] mosh: upgrade 1.3.2 -> 1.4.0

Message ID 1667809704-30790-3-git-send-email-wangmy@fujitsu.com
State Under Review
Headers show
Series [meta-oe] mosh: upgrade 1.3.2 -> 1.4.0 | expand

Commit Message

Mingyu Wang (Fujitsu) Nov. 7, 2022, 8:28 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-Fix-building-with-libc.patch
removed since it's included in 1.4.0

Changelog:
https://github.com/mobile-shell/mosh/releases/tag/mosh-1.4.0

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../mosh/0001-Fix-building-with-libc.patch    | 24 -------------------
 .../mosh/{mosh_1.3.2.bb => mosh_1.4.0.bb}     |  7 ++----
 2 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/mosh/mosh/0001-Fix-building-with-libc.patch
 rename meta-oe/recipes-connectivity/mosh/{mosh_1.3.2.bb => mosh_1.4.0.bb} (87%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-connectivity/mosh/mosh/0001-Fix-building-with-libc.patch b/meta-oe/recipes-connectivity/mosh/mosh/0001-Fix-building-with-libc.patch
deleted file mode 100644
index 100ede17b..000000000
--- a/meta-oe/recipes-connectivity/mosh/mosh/0001-Fix-building-with-libc.patch
+++ /dev/null
@@ -1,24 +0,0 @@ 
-From efa9e49714b30d7d9128946a2504c93e10d109b5 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 29 Jan 2019 12:20:03 -0800
-Subject: [PATCH] Fix building with libc++
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/network/network.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/network/network.cc b/src/network/network.cc
-index 26da603..e480853 100644
---- a/src/network/network.cc
-+++ b/src/network/network.cc
-@@ -335,7 +335,7 @@ bool Connection::try_bind( const char *addr, int port_low, int port_high )
-       }
-     }
- 
--    if ( bind( sock(), &local_addr.sa, local_addr_len ) == 0 ) {
-+    if ( ::bind( sock(), &local_addr.sa, local_addr_len ) == 0 ) {
-       set_MTU( local_addr.sa.sa_family );
-       return true;
-     } else if ( i == search_high ) { /* last port to search */
diff --git a/meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb b/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb
similarity index 87%
rename from meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb
rename to meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb
index b4b5aa78a..4537a0941 100644
--- a/meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb
+++ b/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb
@@ -14,11 +14,8 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 DEPENDS = "protobuf-native protobuf ncurses zlib libio-pty-perl openssl libutempter"
 
-SRC_URI = "http://mosh.mit.edu/mosh-${PV}.tar.gz \
-           file://0001-Fix-building-with-libc.patch \
-           "
-SRC_URI[md5sum] = "5122f4d2b973ab7c38dcdac8c35cb61e"
-SRC_URI[sha256sum] = "da600573dfa827d88ce114e0fed30210689381bbdcff543c931e4d6a2e851216"
+SRC_URI = "http://mosh.mit.edu/mosh-${PV}.tar.gz"
+SRC_URI[sha256sum] = "872e4b134e5df29c8933dff12350785054d2fd2839b5ae6b5587b14db1465ddd"
 
 inherit autotools pkgconfig