[csw-devel] SF.net SVN: gar:[20230] csw/mgar/pkg/mosh/trunk

[dmichelsen at users.sourceforge.net]

Revision: 20230
          http://gar.svn.sourceforge.net/gar/?rev=20230&view=rev
Author:   dmichelsen
Date:     2013-01-28 08:50:09 +0000 (Mon, 28 Jan 2013)
Log Message:
-----------
mosh/trunk: Update to 1.2.3

Modified Paths:
--------------
    csw/mgar/pkg/mosh/trunk/Makefile
    csw/mgar/pkg/mosh/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/mosh/trunk/files/0001-Add-missing-include.patch

Modified: csw/mgar/pkg/mosh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mosh/trunk/Makefile	2013-01-28 08:21:11 UTC (rev 20229)
+++ csw/mgar/pkg/mosh/trunk/Makefile	2013-01-28 08:50:09 UTC (rev 20230)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = mosh
-VERSION = 1.1.3
+VERSION = 1.2.3
 GARTYPE = v2
 
 DESCRIPTION = Mobile shell
@@ -13,11 +13,13 @@
 #PATCHFILES += 0001-Test-on-inttypes.h-in-addition-to-stdint.h-and-don-t.patch
 #PATCHFILES += 0002-Various-Solaris-fixes.patch
 
-PATCHFILES += 0001-Hack-around-so-it-compiles-on-Solaris.patch
-PATCHFILES += 0001-Do-not-use-libutil.patch
+#PATCHFILES += 0001-Hack-around-so-it-compiles-on-Solaris.patch
+#PATCHFILES += 0001-Do-not-use-libutil.patch
 
 # Functions betoh64 from http://licq.sourcearchive.com/documentation/1.3.8/licq__byteorder_8h-source.html
 
+PATCHFILES += 0001-Add-missing-include.patch
+
 BUILD_DEP_PKGS += CSWboost-gcc-dev
 BUILD_DEP_PKGS += CSWprotobuf-gxx-dev
 
@@ -28,6 +30,8 @@
 RUNTIME_DEP_PKGS_CSWmosh += CSWlibprotobuf7-gxx
 RUNTIME_DEP_PKGS_CSWmosh += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWmosh += CSWlibz1
+RUNTIME_DEP_PKGS_CSWmosh += CSWlibssp0
+RUNTIME_DEP_PKGS_CSWmosh += CSWlibssl1-0-0
 
 # Needed by mosh perl script
 RUNTIME_DEP_PKGS_CSWmosh += CSWpm-io-tty
@@ -44,7 +48,7 @@
 GARCOMPILER = GCC4
 
 # See https://forums.oracle.com/forums/thread.jspa?threadID=2019232
-EXTRA_CPPFLAGS += -D__aligned__=aligned
+#EXTRA_CPPFLAGS += -D__aligned__=aligned
 
 EXTRA_CONFIGURE_EXPORTS += PROTOC
 CONFIGURE_ENV_PROTOC = $(prefix)/gxx/bin/protoc
@@ -52,11 +56,11 @@
 EXTRA_INC += $(prefix)/gxx/include
 EXTRA_LIB += $(prefix)/gxx/lib
 
-EXTRA_LINKER_FLAGS += -lsocket -lnsl
+#EXTRA_LINKER_FLAGS += -lsocket -lnsl
 
 include gar/category.mk
 
-post-patch-modulated:
+xxxpost-patch-modulated:
 	-cd $(WORKSRC) && /opt/csw/bin/autoreconf -fi
 	@# These are generated protobuf files, regenerate later
 	-cd $(WORKSRC)/src/protobufs && rm -f *.cc *.h

Modified: csw/mgar/pkg/mosh/trunk/checksums
===================================================================
--- csw/mgar/pkg/mosh/trunk/checksums	2013-01-28 08:21:11 UTC (rev 20229)
+++ csw/mgar/pkg/mosh/trunk/checksums	2013-01-28 08:50:09 UTC (rev 20230)
@@ -1 +1 @@
-de507695b6f67523bc81596f97220a9a  mosh-1.1.3.tar.gz
+39c20391c84e639fcb51581c56cee762  mosh-1.2.3.tar.gz

Added: csw/mgar/pkg/mosh/trunk/files/0001-Add-missing-include.patch
===================================================================
--- csw/mgar/pkg/mosh/trunk/files/0001-Add-missing-include.patch	                        (rev 0)
+++ csw/mgar/pkg/mosh/trunk/files/0001-Add-missing-include.patch	2013-01-28 08:50:09 UTC (rev 20230)
@@ -0,0 +1,24 @@
+From 6cd8c0b45a4ae3ebad473ca00156b74cbff8b1a8 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 28 Jan 2013 09:21:19 +0100
+Subject: [PATCH] Add missing include
+
+---
+ src/frontend/mosh-client.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/frontend/mosh-client.cc b/src/frontend/mosh-client.cc
+index a9644e3..cc9d6a0 100644
+--- a/src/frontend/mosh-client.cc
++++ b/src/frontend/mosh-client.cc
+@@ -41,6 +41,7 @@
+ #include "locale_utils.h"
+ 
+ /* these need to be included last because of conflicting defines */
++#include <sys/termio.h>
+ #include <curses.h>
+ #include <term.h>
+ 
+-- 
+1.8.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.