summaryrefslogtreecommitdiffstats
path: root/network/guacamole-server/uuid.patch
diff options
context:
space:
mode:
Diffstat (limited to 'network/guacamole-server/uuid.patch')
-rw-r--r--network/guacamole-server/uuid.patch22
1 files changed, 12 insertions, 10 deletions
diff --git a/network/guacamole-server/uuid.patch b/network/guacamole-server/uuid.patch
index e3c165ee31..5cf2cdc928 100644
--- a/network/guacamole-server/uuid.patch
+++ b/network/guacamole-server/uuid.patch
@@ -1,6 +1,7 @@
---- guacamole-server-0.9.8/configure.ac 2015-09-04 17:36:05.000000000 -0700
-+++ guacamole-server-0.9.8.new/configure.ac 2015-11-27 16:36:00.229847035 -0800
-@@ -68,19 +68,25 @@
+diff -Naur guacamole-server-20170526_9ee224f.orig/configure.ac guacamole-server-20170526_9ee224f/configure.ac
+--- guacamole-server-20170526_9ee224f.orig/configure.ac 2017-05-27 03:11:06.000000000 +0200
++++ guacamole-server-20170526_9ee224f/configure.ac 2017-06-03 20:57:20.384944765 +0200
+@@ -65,19 +65,25 @@
# OSSP UUID
AC_CHECK_LIB([ossp-uuid], [uuid_make], [UUID_LIBS=-lossp-uuid],
@@ -30,9 +31,10 @@
# 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 @@
+diff -Naur guacamole-server-20170526_9ee224f.orig/src/libguac/id.c guacamole-server-20170526_9ee224f/src/libguac/id.c
+--- guacamole-server-20170526_9ee224f.orig/src/libguac/id.c 2017-05-27 03:11:06.000000000 +0200
++++ guacamole-server-20170526_9ee224f/src/libguac/id.c 2017-06-03 21:00:54.701957689 +0200
+@@ -25,7 +25,7 @@
#ifdef HAVE_OSSP_UUID_H
#include <ossp/uuid.h>
#else
@@ -40,8 +42,8 @@
+#include <uuid/uuid.h>
#endif
- #include <stdarg.h>
-@@ -170,8 +170,8 @@
+ #include <stdlib.h>
+@@ -34,8 +34,8 @@
char* buffer;
char* identifier;
@@ -51,7 +53,7 @@
uuid_t* uuid;
/* Attempt to create UUID object */
-@@ -211,6 +211,21 @@
+@@ -75,6 +75,21 @@
}
uuid_destroy(uuid);
@@ -71,5 +73,5 @@
+ uuid_unparse (uuid, identifier);
+#endif
- buffer[0] = '$';
+ buffer[0] = prefix;
buffer[UUID_LEN_STR + 1] = '\0';