[pkg-remote-commits] [guacamole-server] 07/10: Refresh patches.
Dominik George
natureshadow-guest at moszumanska.debian.org
Wed Oct 18 10:48:20 UTC 2017
This is an automated email from the git hooks/post-receive script.
natureshadow-guest pushed a commit to branch master
in repository guacamole-server.
commit 2dfa5187b34184464ea12a0e070907f1506409ac
Author: Dominik George <nik at naturalnet.de>
Date: Wed Oct 18 12:46:30 2017 +0200
Refresh patches.
---
debian/changelog | 3 +-
debian/patches/fix-buildsystem.patch | 242 +++++++++--------------------------
debian/patches/fix-lfs.patch | 2 +-
3 files changed, 64 insertions(+), 183 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0367155..414439e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
guacamole-server (0.9.13-1) unstable; urgency=medium
* New upstream version.
+ + Refresh patches.
* Update watch file for Apache incubator. (Closes: #859374)
* Install guacctl. (Closes: #858625)
- -- Dominik George <nik at naturalnet.de> Wed, 18 Oct 2017 12:31:58 +0200
+ -- Dominik George <nik at naturalnet.de> Wed, 18 Oct 2017 12:46:09 +0200
guacamole-server (0.9.9-2) unstable; urgency=medium
diff --git a/debian/patches/fix-buildsystem.patch b/debian/patches/fix-buildsystem.patch
index d5fbfff..33ae5da 100644
--- a/debian/patches/fix-buildsystem.patch
+++ b/debian/patches/fix-buildsystem.patch
@@ -8,16 +8,16 @@ Description: Build system fixes
Author: Dominik George <nik at naturalnet.de>
--- a/configure.ac
+++ b/configure.ac
-@@ -22,7 +22,7 @@
+@@ -19,7 +19,7 @@
AC_PREREQ([2.61])
- AC_INIT([guacamole-server], [0.9.9])
+ AC_INIT([guacamole-server], [0.9.13-incubating])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
AM_SILENT_RULES([yes])
LT_PREREQ([2.2])
-@@ -66,6 +66,11 @@ AC_CHECK_LIB([pthread], [pthread_create]
+@@ -63,6 +63,11 @@ AC_CHECK_LIB([pthread], [pthread_create]
AC_DEFINE([HAVE_LIBPTHREAD],,
[Whether libpthread was found])])
@@ -29,16 +29,16 @@ Author: Dominik George <nik at naturalnet.de>
# OSSP UUID
AC_CHECK_LIB([ossp-uuid], [uuid_make], [UUID_LIBS=-lossp-uuid],
AC_CHECK_LIB([uuid], [uuid_make], [UUID_LIBS=-luuid],
-@@ -163,7 +168,7 @@ then
+@@ -225,7 +230,7 @@ then
have_ssl=yes
AC_CHECK_HEADER(openssl/ssl.h,, [have_ssl=no])
-- AC_CHECK_LIB([ssl], [SSL_CTX_new], [SSL_LIBS="$SSL_LIBS -lssl"], [have_ssl=no])
-+ AC_CHECK_LIB([ssl], [SSL_CTX_new], [SSL_LIBS="$SSL_LIBS -lssl -lcrypto"], [have_ssl=no])
+- AC_CHECK_LIB([ssl], [SSL_CTX_new], [SSL_LIBS="$SSL_LIBS -lssl -lcrypto"], [have_ssl=no])
++ AC_CHECK_LIB([ssl], [SSL_CTX_new], [SSL_LIBS="$SSL_LIBS -lssl"], [have_ssl=no])
if test "x${have_ssl}" = "xno"
then
-@@ -390,9 +395,9 @@ then
+@@ -497,9 +502,9 @@ then
# libfreerdp-core / libfreerdp
AC_CHECK_LIB([freerdp-core], [freerdp_new],
@@ -50,7 +50,7 @@ Author: Dominik George <nik at naturalnet.de>
[AC_MSG_WARN([
--------------------------------------------
Unable to find libfreerdp-core / libfreerdp
-@@ -867,13 +872,14 @@ then
+@@ -1036,13 +1041,14 @@ then
AC_CHECK_LIB([ssh2], [gcry_control],
[AC_CHECK_HEADER(gcrypt.h,
[AC_DEFINE([LIBSSH2_USES_GCRYPT],,
@@ -69,8 +69,8 @@ Author: Dominik George <nik at naturalnet.de>
--- a/src/common-ssh/Makefile.am
+++ b/src/common-ssh/Makefile.am
-@@ -40,15 +40,13 @@ noinst_HEADERS = \
- guac_ssh_user.h
+@@ -41,15 +41,13 @@ noinst_HEADERS = \
+ common-ssh/user.h
libguac_common_ssh_la_CFLAGS = \
- -Werror -Wall -pedantic \
@@ -91,8 +91,8 @@ Author: Dominik George <nik at naturalnet.de>
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
-@@ -50,7 +50,7 @@ libguac_common_la_SOURCES = \
- guac_surface.c
+@@ -57,7 +57,7 @@ libguac_common_la_SOURCES = \
+ surface.c
libguac_common_la_CFLAGS = \
- -Werror -Wall -pedantic \
@@ -102,167 +102,55 @@ Author: Dominik George <nik at naturalnet.de>
libguac_common_la_LIBADD = \
--- a/src/guacd/Makefile.am
+++ b/src/guacd/Makefile.am
-@@ -46,16 +46,14 @@ guacd_SOURCES = \
- log.c
+@@ -47,17 +47,17 @@ guacd_SOURCES = \
+ proc-map.c
guacd_CFLAGS = \
- -Werror -Wall -pedantic \
-+ -Wall \
++ -Werror \
@COMMON_INCLUDE@ \
+ @LIBGUACD_INCLUDE@ \
@LIBGUAC_INCLUDE@
--guacd_LDADD = \
-+guacd_LDADD = \
- @COMMON_LTLIB@ \
+ guacd_LDADD = \
+ @COMMON_LTLIB@ \
+- @LIBGUACD_LTLIB@ \
- @LIBGUAC_LTLIB@
--
--guacd_LDFLAGS = \
-- @PTHREAD_LIBS@ \
++ @LIBGUACD_LTLIB@
+
+ guacd_LDFLAGS = \
+ @LIBGUAC_LTLIB@ \
-+ @PTHREAD_LIBS@ \
+ @PTHREAD_LIBS@ \
@SSL_LIBS@
- EXTRA_DIST = \
--- a/src/libguac/Makefile.am
+++ b/src/libguac/Makefile.am
-@@ -97,17 +97,17 @@ endif
+@@ -101,10 +101,13 @@ endif
libguac_la_CFLAGS = \
- -Werror -Wall -pedantic -Iguacamole
-+ -Wall -Iguacamole
-
--libguac_la_LDFLAGS = \
-- -version-info 11:0:0 \
-- @CAIRO_LIBS@ \
-- @JPEG_LIBS@ \
-- @PNG_LIBS@ \
-- @PTHREAD_LIBS@ \
-- @UUID_LIBS@ \
-- @VORBIS_LIBS@ \
-- @WEBP_LIBS@
-+libguac_la_LDFLAGS = \
-+ -version-info 11:0:0
-
- libguac_la_LIBADD = \
-- @LIBADD_DLOPEN@
-+ @LIBADD_DLOPEN@ \
-+ @CAIRO_LIBS@ \
-+ @JPEG_LIBS@ \
-+ @PNG_LIBS@ \
-+ @PTHREAD_LIBS@ \
-+ @UUID_LIBS@ \
-+ @VORBIS_LIBS@ \
-+ @WEBP_LIBS@
---- a/src/protocols/rdp/Makefile.am
-+++ b/src/protocols/rdp/Makefile.am
-@@ -117,77 +117,80 @@ endif
- #
-
- libguac_client_rdp_la_CFLAGS = \
-- -Werror -Wall -Iinclude \
-+ -Wall -Iinclude \
- @COMMON_INCLUDE@ \
- @COMMON_SSH_INCLUDE@ \
- @LIBGUAC_INCLUDE@
-
- libguac_client_rdp_la_LDFLAGS = \
-- -version-info 0:0:0 \
-- @CAIRO_LIBS@ \
-- @PTHREAD_LIBS@ \
-- @RDP_LIBS@
-+ -version-info 0:0:0
-
--libguac_client_rdp_la_LIBADD = \
-- @COMMON_LTLIB@ \
-- @LIBGUAC_LTLIB@
-+libguac_client_rdp_la_LIBADD = \
-+ @COMMON_LTLIB@ \
-+ @LIBGUAC_LTLIB@ \
-+ @CAIRO_LIBS@ \
-+ @PTHREAD_LIBS@ \
-+ @RDP_LIBS@
-
- #
- # RDPDR
- #
-
- guacdr_cflags = \
-- -Werror -Wall -Iinclude \
-+ -Wall -Iinclude \
- @COMMON_INCLUDE@ \
- @COMMON_SSH_INCLUDE@ \
- @LIBGUAC_INCLUDE@
-
- guacdr_ldflags = \
-- -module -avoid-version -shared \
-- @PTHREAD_LIBS@ \
-- @RDP_LIBS@
-+ -module -avoid-version -shared
-
- guacdr_libadd = \
- @COMMON_LTLIB@ \
-- @LIBGUAC_LTLIB@
-+ @LIBGUAC_LTLIB@ \
-+ @PTHREAD_LIBS@ \
-+ @RDP_LIBS@ \
-+ libguac-client-rdp.la
-
- #
- # RDPSND
- #
++ -Wall -Iguacamole
- guacsnd_cflags = \
-- -Werror -Wall -Iinclude \
-+ -Wall -Iinclude \
- @COMMON_INCLUDE@ \
- @COMMON_SSH_INCLUDE@ \
- @LIBGUAC_INCLUDE@
-
- guacsnd_ldflags = \
-- -module -avoid-version -shared \
-- @PTHREAD_LIBS@ \
-- @RDP_LIBS@
-+ -module -avoid-version -shared
-
- guacsnd_libadd = \
- @COMMON_LTLIB@ \
-- @LIBGUAC_LTLIB@
-+ @LIBGUAC_LTLIB@ \
-+ @PTHREAD_LIBS@ \
-+ @RDP_LIBS@ \
-+ libguac-client-rdp.la
-
- #
- # Static Virtual Channels
- #
-
- guacsvc_cflags = \
-- -Werror -Wall -Iinclude \
-+ -Wall -Iinclude \
- @COMMON_INCLUDE@ \
- @COMMON_SSH_INCLUDE@ \
- @LIBGUAC_INCLUDE@
-
- guacsvc_ldflags = \
-- -module -avoid-version -shared \
-- @PTHREAD_LIBS@ \
-- @RDP_LIBS@
-+ -module -avoid-version -shared
-
- guacsvc_libadd = \
- @COMMON_LTLIB@ \
-- @LIBGUAC_LTLIB@
-+ @LIBGUAC_LTLIB@ \
-+ @PTHREAD_LIBS@ \
-+ @RDP_LIBS@ \
-+ libguac-client-rdp.la
-
- #
- # Optional SFTP support
+ libguac_la_LDFLAGS = \
+- -version-info 14:0:2 \
++ -version-info 14:0:2
++
++libguac_la_LIBADD = \
++ @LIBADD_DLOPEN@ \
+ @CAIRO_LIBS@ \
+ @JPEG_LIBS@ \
+ @PNG_LIBS@ \
+@@ -112,6 +115,3 @@ libguac_la_LDFLAGS = \
+ @UUID_LIBS@ \
+ @VORBIS_LIBS@ \
+ @WEBP_LIBS@
+-
+-libguac_la_LIBADD = \
+- @LIBADD_DLOPEN@
--- a/src/protocols/ssh/Makefile.am
+++ b/src/protocols/ssh/Makefile.am
-@@ -46,7 +46,7 @@ noinst_HEADERS += ssh_agent.h
+@@ -47,7 +47,7 @@ noinst_HEADERS += ssh_agent.h
endif
libguac_client_ssh_la_CFLAGS = \
@@ -271,7 +159,7 @@ Author: Dominik George <nik at naturalnet.de>
@COMMON_SSH_INCLUDE@ \
@LIBGUAC_INCLUDE@ \
@TERMINAL_INCLUDE@
-@@ -55,11 +55,11 @@ libguac_client_ssh_la_LIBADD = \
+@@ -56,11 +56,11 @@ libguac_client_ssh_la_LIBADD = \
@COMMON_LTLIB@ \
@COMMON_SSH_LTLIB@ \
@LIBGUAC_LTLIB@ \
@@ -290,8 +178,8 @@ Author: Dominik George <nik at naturalnet.de>
--- a/src/protocols/telnet/Makefile.am
+++ b/src/protocols/telnet/Makefile.am
-@@ -38,17 +38,17 @@ noinst_HEADERS = \
- telnet_client.h
+@@ -39,17 +39,17 @@ noinst_HEADERS = \
+ user.h
libguac_client_telnet_la_CFLAGS = \
- -Werror -Wall -Iinclude \
@@ -315,20 +203,20 @@ Author: Dominik George <nik at naturalnet.de>
--- a/src/protocols/vnc/Makefile.am
+++ b/src/protocols/vnc/Makefile.am
-@@ -44,20 +44,20 @@ noinst_HEADERS += pulse.h
- endif
+@@ -47,20 +47,20 @@ noinst_HEADERS = \
+ vnc.h
libguac_client_vnc_la_CFLAGS = \
- -Werror -Wall -pedantic -Iinclude \
-+ -Wall -Iinclude \
++ -Wall -Iinclude \
@COMMON_INCLUDE@ \
@COMMON_SSH_INCLUDE@ \
- @LIBGUAC_INCLUDE@
+ @LIBGUAC_INCLUDE@ \
+ @PULSE_INCLUDE@
libguac_client_vnc_la_LDFLAGS = \
- -version-info 0:0:0 \
- @CAIRO_LIBS@ \
-- @PULSE_LIBS@ \
- @VNC_LIBS@
+ -version-info 0:0:0
@@ -336,20 +224,19 @@ Author: Dominik George <nik at naturalnet.de>
@COMMON_LTLIB@ \
- @LIBGUAC_LTLIB@
+ @LIBGUAC_LTLIB@ \
-+ @CAIRO_LIBS@ \
-+ @PULSE_LIBS@ \
-+ @VNC_LIBS@
++ @CAIRO_LIBS@ \
++ @VNC_LIBS@
# Optional SFTP support
if ENABLE_COMMON_SSH
--- a/src/terminal/Makefile.am
+++ b/src/terminal/Makefile.am
-@@ -55,19 +55,17 @@ libguac_terminal_la_SOURCES = \
- terminal_handlers.c
+@@ -46,16 +46,14 @@ libguac_terminal_la_SOURCES = \
+ typescript.c
libguac_terminal_la_CFLAGS = \
-- -Werror -Wall -pedantic \
-+ -Wall \
+- -Werror -Wall \
++ -Wall \
@COMMON_INCLUDE@ \
@LIBGUAC_INCLUDE@ \
@PANGO_CFLAGS@ \
@@ -359,20 +246,13 @@ Author: Dominik George <nik at naturalnet.de>
- @LIBGUAC_LTLIB@
-
-libguac_terminal_la_LDFLAGS = \
-- @CAIRO_LIBS@ \
-- @MATH_LIBS@ \
-- @PANGO_LIBS@ \
-- @PANGOCAIRO_LIBS@ \
-+ @LIBGUAC_LTLIB@ \
-+ @CAIRO_LIBS@ \
-+ @MATH_LIBS@ \
-+ @PANGO_LIBS@ \
-+ @PANGOCAIRO_LIBS@ \
- @PTHREAD_LIBS@
-
++ @LIBGUAC_LTLIB@ \
+ @CAIRO_LIBS@ \
+ @MATH_LIBS@ \
+ @PANGO_LIBS@ \
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
-@@ -52,7 +52,7 @@ test_libguac_SOURCES = \
+@@ -49,7 +49,7 @@ test_libguac_SOURCES = \
util/guac_unicode.c
test_libguac_CFLAGS = \
diff --git a/debian/patches/fix-lfs.patch b/debian/patches/fix-lfs.patch
index 36a29f0..bd6d050 100644
--- a/debian/patches/fix-lfs.patch
+++ b/debian/patches/fix-lfs.patch
@@ -2,7 +2,7 @@
--- a/configure.ac
+++ b/configure.ac
-@@ -41,6 +41,7 @@ AC_CHECK_HEADERS([fcntl.h stdlib.h strin
+@@ -38,6 +38,7 @@ AC_CHECK_HEADERS([fcntl.h stdlib.h strin
# Source characteristics
AC_DEFINE([_XOPEN_SOURCE], [700], [Uses X/Open and POSIX APIs])
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/packages/guacamole-server.git
More information about the pkg-remote-commits
mailing list