network/guacamole-server: Updated for version 0.9.14.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

6 files changed, 36 insertions, 25 deletions

diff --git a/network/guacamole-server/README b/network/guacamole-server/README
index 61d82a5c18..b3edeadb9b 100644
--- a/network/guacamole-server/README
+++ b/network/guacamole-server/README
@@ -6,5 +6,4 @@ a common C library, libguac, which all other native components
 depend on, as well as separate libraries for each supported
 protocol, and guacd, the heart of Guacamole.
 
-The dependency for the libraries of freerdp and libtelnet are optional,
-as Slackware by default has libvncserver and libssh2 installed.
+libwebp is an optional dependency.
diff --git a/network/guacamole-server/guacamole-server.SlackBuild b/network/guacamole-server/guacamole-server.SlackBuild
index 29c6bd95a5..769094b7e5 100644
--- a/network/guacamole-server/guacamole-server.SlackBuild
+++ b/network/guacamole-server/guacamole-server.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for guacamole-server
 
-# Copyright 2015 Zhu Qun-Ying
+# Copyright 2015-2018 Zhu Qun-Ying
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=guacamole-server
-VERSION=${VERSION:-0.9.9}
+VERSION=${VERSION:-0.9.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -35,6 +35,7 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+SRC_DIR=$PRGNAM-$VERSION
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -59,9 +60,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $SRC_DIR
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+cd $SRC_DIR
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -70,7 +71,9 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # use system uuid library from util-linux instead of OSSP uuid
-patch -p1 < $CWD/uuid.patch
+for file in $CWD/patch/* ; do
+    patch -p1 < $file
+done
 autoreconf -fi
 
 CFLAGS="$SLKCFLAGS" \
@@ -93,7 +96,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README LICENSE ChangeLog AUTHORS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README LICENSE NOTICE CONTRIBUTING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/guacamole-server/guacamole-server.info b/network/guacamole-server/guacamole-server.info
index f89b6155c4..395ceb56f6 100644
--- a/network/guacamole-server/guacamole-server.info
+++ b/network/guacamole-server/guacamole-server.info
@@ -1,10 +1,10 @@
 PRGNAM="guacamole-server"
-VERSION="0.9.9"
-HOMEPAGE="http://guac-dev.org"
-DOWNLOAD="http://sourceforge.net/projects/guacamole/files/current/source/guacamole-server-0.9.9.tar.gz"
-MD5SUM="cce818bfcba35fe0456b45d988118893"
+VERSION="0.9.14"
+HOMEPAGE="http://guacamole.apache.org/"
+DOWNLOAD="https://github.com/apache/guacamole-server/archive/0.9.14/guacamole-server-0.9.14.tar.gz"
+MD5SUM="8ebee8740813db1f49d8aa9f0f02a89d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libwebp libtelnet"
+REQUIRES="libtelnet freerdp"
 MAINTAINER="Zhu Qun-Ying"
 EMAIL="zhu.qunying@gmail.com"
diff --git a/network/guacamole-server/patch/typescript.patch b/network/guacamole-server/patch/typescript.patch
new file mode 100644
index 0000000000..02785b4ce8
--- /dev/null
+++ b/network/guacamole-server/patch/typescript.patch
@@ -0,0 +1,11 @@
+--- guacamole-server-0.9.14/src/terminal/terminal/typescript.h	2018-01-01 13:23:37.000000000 -0800
++++ guacamole-server-0.9.14-new/src/terminal/terminal/typescript.h	2018-01-26 17:11:22.180187667 -0800
+@@ -97,7 +97,7 @@
+      * The full path to the file which will contain the timing information for
+      * this typescript.
+      */
+-    char timing_filename[GUAC_TERMINAL_TYPESCRIPT_MAX_NAME_LENGTH];
++    char timing_filename[GUAC_TERMINAL_TYPESCRIPT_MAX_NAME_LENGTH + sizeof(GUAC_TERMINAL_TYPESCRIPT_TIMING_SUFFIX) + 1];
+ 
+     /**
+      * The file descriptor of the file into which raw terminal output should be
diff --git a/network/guacamole-server/uuid.patch b/network/guacamole-server/patch/uuid.patch
index e3c165ee31..9107ab2e92 100644
--- a/network/guacamole-server/uuid.patch
+++ b/network/guacamole-server/patch/uuid.patch
@@ -30,9 +30,9 @@
  
  # cunit
  AC_CHECK_LIB([cunit], [CU_run_test], [CUNIT_LIBS=-lcunit])
---- guacamole-server-0.9.8/src/libguac/client.c	2015-09-04 17:36:05.000000000 -0700
-+++ guacamole-server-0.9.8.new/src/libguac/client.c	2015-11-27 16:36:00.230847035 -0800
-@@ -39,7 +39,7 @@
+--- incubator-guacamole-server-0.9.10-incubating/src/libguac/id.c	2016-12-18 10:44:24.000000000 -0800
++++ incubator-guacamole-server-0.9.10-incubating.new/src/libguac/id.c	2017-01-20 14:48:45.273476934 -0800
+@@ -25,7 +25,7 @@
  #ifdef HAVE_OSSP_UUID_H
  #include <ossp/uuid.h>
  #else
@@ -40,18 +40,16 @@
 +#include <uuid/uuid.h>
  #endif
  
- #include <stdarg.h>
-@@ -170,8 +170,8 @@
+ #include <stdlib.h>
+@@ -34,6 +34,7 @@
  
      char* buffer;
      char* identifier;
 +#ifdef HAVE_OSSP_UUID_H
      size_t identifier_length;
--
-     uuid_t* uuid;
  
-     /* Attempt to create UUID object */
-@@ -211,6 +211,21 @@
+     uuid_t* uuid;
+@@ -75,6 +76,21 @@
      }
  
      uuid_destroy(uuid);
@@ -71,5 +69,5 @@
 +    uuid_unparse (uuid, identifier);
 +#endif
  
-     buffer[0] = '$';
+     buffer[0] = prefix;
      buffer[UUID_LEN_STR + 1] = '\0';
diff --git a/network/guacamole-server/slack-desc b/network/guacamole-server/slack-desc
index ac9687ca8f..3d4e42ab20 100644
--- a/network/guacamole-server/slack-desc
+++ b/network/guacamole-server/slack-desc
@@ -5,7 +5,7 @@
 # You must make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':' except on otherwise blank lines.
 
-                |-----handy-ruler------------------------------------------------------|
+		|-----handy-ruler------------------------------------------------------|
 guacamole-server: guacamole-server (Guacamole server)
 guacamole-server:
 guacamole-server: guacamole-server contains all the native, server-side
@@ -15,5 +15,5 @@ guacamole-server: other native components depend on, as well as separate
 guacamole-server: libraries for each supported protocol, and guacd, the heart
 guacamole-server: of Guacamole.
 guacamole-server:
-guacamole-server: http://guac-dev.org
+guacamole-server: http://guacamole.apache.org/
 guacamole-server: