Niklas Poslovski
2023-10-08 a66e25175968bc66f1185422ccbdaf5671450125
mosh: Rebuild after protobuf update and switch to OpenSSL 3.1

1 files deleted
1 files added
2 files modified
704 ■■■■■ changed files
components/shell/mosh/Makefile 12 ●●●●● patch | view | raw | blame | history
components/shell/mosh/mosh.license 674 ●●●●● patch | view | raw | blame | history
components/shell/mosh/patches/cxx14.patch 15 ●●●●● patch | view | raw | blame | history
components/shell/mosh/pkg5 3 ●●●● patch | view | raw | blame | history
components/shell/mosh/Makefile
@@ -19,14 +19,14 @@
# CDDL HEADER END
#
# Copyright (c) 2015, Predrag Zecevic. All rights reserved.
# Copyright (c) 2023, Niklas Poslovski
#
BUILD_BITS=            64
USE_OPENSSL11=        yes
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        mosh
COMPONENT_VERSION=    1.4.0
COMPONENT_REVISION= 1
COMPONENT_REVISION= 2
COMPONENT_SUMMARY=    Mosh (mobile shell) - Remote terminal application that allows roaming, supports intermittent connectivity, and provides intelligent local echo and line editing of user keystrokes (replacement for SSH).
COMPONENT_PROJECT_URL=    https://mosh.org
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
@@ -36,6 +36,7 @@
COMPONENT_FMRI=    service/network/$(COMPONENT_NAME)
COMPONENT_CLASSIFICATION=System/Security
COMPONENT_LICENSE=      GPLv3+
COMPONENT_LICENSE_FILE= COPYING
TEST_TARGET=        $(NO_TESTS)
include $(WS_MAKE_RULES)/common.mk
@@ -51,15 +52,16 @@
CONFIGURE_OPTIONS+=    --with-utempter
# Manually added build dependencies
REQUIRED_PACKAGES += utility/bash-completion
REQUIRED_PACKAGES += utility/bash-completion
# Auto-generated dependencies
REQUIRED_PACKAGES += $(GCC_RUNTIME_PKG)
REQUIRED_PACKAGES += $(GXX_RUNTIME_PKG)
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += library/c++/abseil-cpp
REQUIRED_PACKAGES += library/c++/protobuf
REQUIRED_PACKAGES += library/ncurses
REQUIRED_PACKAGES += library/security/openssl-11
REQUIRED_PACKAGES += library/security/openssl-31
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/libutempter
components/shell/mosh/mosh.license
File was deleted
components/shell/mosh/patches/cxx14.patch
New file
@@ -0,0 +1,15 @@
diff -Nru mosh-1.4.0.orig/configure.ac mosh-1.4.0/configure.ac
--- mosh-1.4.0.orig/configure.ac    2022-10-27 03:18:11.000000000 +0200
+++ mosh-1.4.0/configure.ac    2023-10-08 11:06:17.722772504 +0200
@@ -22,9 +22,9 @@
 # automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-# Protobuf 3.6+ requires C++11.
+# Protobuf 3.6+ requires C++14.
 AS_IF([pkg-config --atleast-version 3.6.0 protobuf],
-  [AX_CXX_COMPILE_STDCXX([11])])
+  [AX_CXX_COMPILE_STDCXX([14])])
 WARNING_CXXFLAGS=""
 PICKY_CXXFLAGS=""
components/shell/mosh/pkg5
@@ -1,9 +1,10 @@
{
    "dependencies": [
        "SUNWcs",
        "library/c++/abseil-cpp",
        "library/c++/protobuf",
        "library/ncurses",
        "library/security/openssl-11",
        "library/security/openssl-31",
        "library/zlib",
        "system/library",
        "system/library/g++-10-runtime",