[debian-edu-commits] debian-edu/ 04/12: Merge tag 'upstream/0.9.9'

Dominik George natureshadow-guest at moszumanska.debian.org
Thu Oct 6 21:11:46 UTC 2016


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 3a838b915a440245da7f04f59fa8d73ac6accb04
Merge: e6588e5 8894ca9
Author: Dominik George <nik at naturalnet.de>
Date:   Fri Jun 3 00:33:30 2016 +0200

    Merge tag 'upstream/0.9.9'
    
    Upstream version 0.9.9

 AUTHORS                                            |    6 +
 LICENSE                                            |  489 +---
 Makefile.am                                        |   84 +-
 Makefile.in                                        |  453 ++--
 README                                             |   25 +-
 aclocal.m4                                         |  742 ++++--
 bin/guacctl                                        |  136 +
 compile                                            |  347 +++
 config.guess                                       |  346 +--
 config.h.in                                        |  298 +++
 config.sub                                         |  114 +-
 configure                                          | 2617 ++++++++++++++++----
 configure.ac                                       |  955 +++++--
 depcomp                                            |  455 ++--
 doc/Doxyfile                                       | 1569 +-----------
 install-sh                                         |   14 +-
 ltmain.sh                                          |   32 +-
 m4/libtool.m4                                      |   73 +-
 missing                                            |  414 ++--
 src/common-ssh/Makefile.am                         |   54 +
 src/common-ssh/Makefile.in                         |  704 ++++++
 src/common-ssh/guac_sftp.c                         |  783 ++++++
 src/common-ssh/guac_sftp.h                         |  182 ++
 src/common-ssh/guac_ssh.c                          |  511 ++++
 src/common-ssh/guac_ssh.h                          |  117 +
 src/common-ssh/guac_ssh_buffer.c                   |  138 ++
 src/common-ssh/guac_ssh_buffer.h                   |  137 +
 src/common-ssh/guac_ssh_key.c                      |  219 ++
 src/common-ssh/guac_ssh_key.h                      |  173 ++
 src/common-ssh/guac_ssh_user.c                     |   85 +
 src/common-ssh/guac_ssh_user.h                     |  111 +
 src/common/Makefile.am                             |   58 +
 src/common/Makefile.in                             |  752 ++++++
 src/common/guac_clipboard.c                        |  113 +
 src/common/guac_clipboard.h                        |  107 +
 src/common/guac_dot_cursor.c                       |   86 +
 src/common/guac_dot_cursor.h                       |   64 +
 src/common/guac_iconv.c                            |  195 ++
 src/common/guac_iconv.h                            |  103 +
 src/common/guac_io.c                               |   71 +
 src/common/guac_io.h                               |   53 +
 src/common/guac_json.c                             |  183 ++
 src/common/guac_json.h                             |  199 ++
 src/common/guac_list.c                             |   84 +
 src/common/guac_list.h                             |  125 +
 src/common/guac_pointer_cursor.c                   |   97 +
 src/common/guac_pointer_cursor.h                   |   64 +
 src/common/guac_rect.c                             |  269 ++
 src/common/guac_rect.h                             |  146 ++
 src/common/guac_string.c                           |   93 +
 src/common/guac_string.h                           |   50 +
 src/common/guac_surface.c                          | 1526 ++++++++++++
 src/common/guac_surface.h                          |  341 +++
 src/guacd/Makefile.am                              |   92 +-
 src/guacd/Makefile.in                              |  550 ++--
 src/guacd/client-map.c                             |  172 ++
 src/guacd/client-map.h                             |   73 +
 src/guacd/client.c                                 |  133 +-
 src/guacd/client.h                                 |   63 +-
 src/guacd/conf-args.c                              |  121 +
 src/guacd/conf-args.h                              |   37 +
 src/guacd/conf-file.c                              |  215 ++
 src/guacd/conf-file.h                              |   88 +
 src/guacd/conf-parse.c                             |  538 ++++
 src/guacd/conf-parse.h                             |   71 +
 src/guacd/daemon.c                                 |  512 ++--
 src/guacd/init.d/guacd.in                          |   47 +-
 src/guacd/log.c                                    |  202 +-
 src/guacd/log.h                                    |  104 +-
 src/guacd/man/guacd.8                              |   27 +-
 src/guacd/man/guacd.conf.5                         |  162 ++
 src/guacd/socket-ssl.c                             |   67 +-
 src/guacd/socket-ssl.h                             |   56 +-
 src/libguac/Makefile.am                            |  131 +-
 src/libguac/Makefile.in                            |  597 +++--
 src/libguac/audio.c                                |  217 +-
 src/libguac/client-handlers.c                      |  347 ++-
 src/libguac/client-handlers.h                      |  109 +-
 src/libguac/client.c                               |  380 ++-
 src/libguac/encode-jpeg.c                          |  271 ++
 src/libguac/encode-jpeg.h                          |   56 +
 src/libguac/encode-png.c                           |  404 +++
 src/libguac/encode-png.h                           |   53 +
 src/libguac/encode-webp.c                          |  261 ++
 src/libguac/encode-webp.h                          |   61 +
 src/libguac/error.c                                |  193 +-
 src/libguac/guacamole/audio-fntypes.h              |   56 +
 src/libguac/guacamole/audio-types.h                |   45 +
 src/libguac/guacamole/audio.h                      |  252 +-
 src/libguac/guacamole/client-constants.h           |  106 +
 src/libguac/guacamole/client-fntypes.h             |  135 +
 src/libguac/guacamole/client-types.h               |   97 +
 src/libguac/guacamole/client.h                     |  644 +++--
 src/libguac/guacamole/error-types.h                |  172 ++
 src/libguac/guacamole/error.h                      |  131 +-
 src/libguac/guacamole/hash.h                       |   60 +-
 src/libguac/guacamole/instruction-constants.h      |   48 +
 src/libguac/guacamole/instruction-types.h          |   68 +
 src/libguac/guacamole/instruction.h                |  118 +-
 src/libguac/guacamole/layer-types.h                |   38 +
 src/libguac/guacamole/layer.h                      |   59 +-
 src/libguac/guacamole/object-types.h               |   38 +
 src/libguac/guacamole/object.h                     |   96 +
 src/libguac/guacamole/plugin-constants.h           |   64 +
 src/libguac/guacamole/plugin-types.h               |   40 +
 src/libguac/guacamole/plugin.h                     |   94 +-
 src/libguac/guacamole/pool-types.h                 |   46 +
 src/libguac/guacamole/pool.h                       |   93 +-
 src/libguac/guacamole/protocol-types.h             |  248 ++
 src/libguac/guacamole/protocol.h                   |  534 ++--
 src/libguac/guacamole/socket-constants.h           |   44 +
 src/libguac/guacamole/socket-fntypes.h             |   86 +
 src/libguac/guacamole/socket-types.h               |   56 +
 src/libguac/guacamole/socket.h                     |  188 +-
 src/libguac/guacamole/stream-types.h               |   38 +
 src/libguac/guacamole/stream.h                     |  130 +-
 src/libguac/guacamole/timestamp-types.h            |   40 +
 src/libguac/guacamole/timestamp.h                  |   68 +-
 src/libguac/guacamole/unicode.h                    |   56 +-
 src/libguac/hash.c                                 |   55 +-
 src/libguac/instruction.c                          |  466 ++--
 src/libguac/ogg_encoder.c                          |  211 --
 src/libguac/ogg_encoder.h                          |   67 -
 src/libguac/palette.c                              |   66 +-
 src/libguac/palette.h                              |   55 +-
 src/libguac/plugin.c                               |   73 +-
 src/libguac/pool.c                                 |   63 +-
 src/libguac/protocol.c                             |  682 ++---
 src/libguac/raw_encoder.c                          |  161 ++
 src/libguac/raw_encoder.h                          |   78 +
 src/libguac/socket-fd.c                            |   74 +-
 src/libguac/socket-nest.c                          |   76 +-
 src/libguac/socket.c                               |  154 +-
 src/libguac/timestamp.c                            |   63 +-
 src/libguac/unicode.c                              |   55 +-
 src/libguac/wav_encoder.c                          |  201 --
 src/libguac/wav_encoder.h                          |  144 --
 src/protocols/rdp/Makefile.am                      |  338 ++-
 src/protocols/rdp/Makefile.in                      | 1354 ++++++++--
 src/protocols/rdp/_generated_keymaps.c             |  680 +++++
 src/protocols/rdp/audio.c                          |  176 --
 src/protocols/rdp/audio.h                          |  212 --
 src/protocols/rdp/client.c                         |  744 ++++--
 src/protocols/rdp/client.h                         |  228 +-
 src/protocols/rdp/compat/client-cliprdr.h          |   53 +-
 src/protocols/rdp/compat/rail.h                    |   42 +
 src/protocols/rdp/compat/winpr-stream.c            |   53 +-
 src/protocols/rdp/compat/winpr-stream.h            |   64 +-
 src/protocols/rdp/compat/winpr-wtypes.h            |   54 +-
 src/protocols/rdp/config.h                         |    0
 src/protocols/rdp/default_pointer.c                |  106 -
 src/protocols/rdp/default_pointer.h                |   76 -
 src/protocols/rdp/guac_handlers.c                  |  238 +-
 src/protocols/rdp/guac_handlers.h                  |   56 +-
 src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages.c   |  532 ++++
 src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages.h   |  132 +
 .../rdp/guac_rdpdr/rdpdr_fs_messages_dir_info.c    |  222 ++
 .../rdp/guac_rdpdr/rdpdr_fs_messages_dir_info.h    |   77 +
 .../rdp/guac_rdpdr/rdpdr_fs_messages_file_info.c   |  291 +++
 .../rdp/guac_rdpdr/rdpdr_fs_messages_file_info.h   |  104 +
 .../rdp/guac_rdpdr/rdpdr_fs_messages_vol_info.c    |  150 ++
 .../rdp/guac_rdpdr/rdpdr_fs_messages_vol_info.h    |   78 +
 src/protocols/rdp/guac_rdpdr/rdpdr_fs_service.c    |  163 ++
 src/protocols/rdp/guac_rdpdr/rdpdr_fs_service.h    |   51 +
 src/protocols/rdp/guac_rdpdr/rdpdr_messages.c      |  110 +-
 src/protocols/rdp/guac_rdpdr/rdpdr_messages.h      |  107 +-
 src/protocols/rdp/guac_rdpdr/rdpdr_printer.c       |  138 +-
 src/protocols/rdp/guac_rdpdr/rdpdr_printer.h       |   70 +-
 src/protocols/rdp/guac_rdpdr/rdpdr_service.c       |  161 +-
 src/protocols/rdp/guac_rdpdr/rdpdr_service.h       |   76 +-
 src/protocols/rdp/guac_rdpsnd/rdpsnd_messages.c    |  289 +--
 src/protocols/rdp/guac_rdpsnd/rdpsnd_messages.h    |  159 +-
 src/protocols/rdp/guac_rdpsnd/rdpsnd_service.c     |   93 +-
 src/protocols/rdp/guac_rdpsnd/rdpsnd_service.h     |   79 +-
 src/protocols/rdp/guac_svc/svc_service.c           |  151 ++
 src/protocols/rdp/guac_svc/svc_service.h           |   80 +
 src/protocols/rdp/keymaps/base.keymap              |   92 +
 src/protocols/rdp/keymaps/de_de_qwertz.keymap      |   67 +
 src/protocols/rdp/keymaps/en_us_qwerty.keymap      |   36 +
 src/protocols/rdp/keymaps/failsafe.keymap          |   26 +
 src/protocols/rdp/keymaps/fr_fr_azerty.keymap      |   56 +
 src/protocols/rdp/keymaps/generate.pl              |  272 ++
 src/protocols/rdp/keymaps/it_it_qwerty.keymap      |   53 +
 src/protocols/rdp/keymaps/sv_se_qwerty.keymap      |   68 +
 src/protocols/rdp/ogg_encoder.c                    |  211 --
 src/protocols/rdp/ogg_encoder.h                    |   67 -
 src/protocols/rdp/rdp_bitmap.c                     |  225 +-
 src/protocols/rdp/rdp_bitmap.h                     |   67 +-
 src/protocols/rdp/rdp_cliprdr.c                    |  252 +-
 src/protocols/rdp/rdp_cliprdr.h                    |   72 +-
 src/protocols/rdp/rdp_color.c                      |   64 +
 src/protocols/rdp/rdp_color.h                      |   42 +
 src/protocols/rdp/rdp_disp.c                       |  178 ++
 src/protocols/rdp/rdp_disp.h                       |  142 ++
 src/protocols/rdp/rdp_fs.c                         |  775 ++++++
 src/protocols/rdp/rdp_fs.h                         |  454 ++++
 src/protocols/rdp/rdp_gdi.c                        |  326 +--
 src/protocols/rdp/rdp_gdi.h                        |  103 +-
 src/protocols/rdp/rdp_glyph.c                      |  189 +-
 src/protocols/rdp/rdp_glyph.h                      |   57 +-
 src/protocols/rdp/rdp_keymap.c                     |   73 +-
 src/protocols/rdp/rdp_keymap.h                     |   93 +-
 src/protocols/rdp/rdp_keymap_base.c                |  220 --
 src/protocols/rdp/rdp_keymap_de_de.c               |  552 -----
 src/protocols/rdp/rdp_keymap_en_us.c               |  442 ----
 src/protocols/rdp/rdp_keymap_failsafe.c            |   63 -
 src/protocols/rdp/rdp_keymap_fr_fr.c               |  560 -----
 src/protocols/rdp/rdp_pointer.c                    |   69 +-
 src/protocols/rdp/rdp_pointer.h                    |   58 +-
 src/protocols/rdp/rdp_rail.c                       |  124 +
 src/protocols/rdp/rdp_rail.h                       |   48 +
 src/protocols/rdp/rdp_settings.c                   |  213 +-
 src/protocols/rdp/rdp_settings.h                   |  184 +-
 src/protocols/rdp/rdp_status.h                     |   69 +
 src/protocols/rdp/rdp_stream.c                     |  571 +++++
 src/protocols/rdp/rdp_stream.h                     |  287 +++
 src/protocols/rdp/rdp_svc.c                        |  155 ++
 src/protocols/rdp/rdp_svc.h                        |  103 +
 src/protocols/rdp/resolution.c                     |   60 +
 src/protocols/rdp/resolution.h                     |   49 +
 src/protocols/rdp/sftp.c                           |   43 +
 src/protocols/rdp/sftp.h                           |   55 +
 src/protocols/rdp/unicode.c                        |   77 +
 src/protocols/rdp/unicode.h                        |   37 +
 src/protocols/rdp/wav_encoder.c                    |  201 --
 src/protocols/rdp/wav_encoder.h                    |  144 --
 src/protocols/ssh/Makefile.am                      |  101 +-
 src/protocols/ssh/Makefile.in                      |  499 ++--
 src/protocols/ssh/blank.c                          |   64 -
 src/protocols/ssh/blank.h                          |   52 -
 src/protocols/ssh/char_mappings.h                  |   63 -
 src/protocols/ssh/client.c                         |  178 +-
 src/protocols/ssh/client.h                         |  143 +-
 src/protocols/ssh/clipboard.c                      |   61 +
 src/protocols/ssh/clipboard.h                      |   49 +
 src/protocols/ssh/common.c                         |  121 -
 src/protocols/ssh/common.h                         |   68 -
 src/protocols/ssh/cursor.c                         |   74 -
 src/protocols/ssh/cursor.h                         |   89 -
 src/protocols/ssh/guac_handlers.c                  |  435 +---
 src/protocols/ssh/guac_handlers.h                  |   56 +-
 src/protocols/ssh/ibar.c                           |  108 -
 src/protocols/ssh/ibar.h                           |   77 -
 src/protocols/ssh/libssh_compat.h                  |   57 -
 src/protocols/ssh/sftp.c                           |   64 +
 src/protocols/ssh/sftp.h                           |   90 +
 src/protocols/ssh/ssh_agent.c                      |  204 ++
 src/protocols/ssh/ssh_agent.h                      |  119 +
 src/protocols/ssh/ssh_client.c                     |  412 +--
 src/protocols/ssh/ssh_client.h                     |   54 +-
 src/protocols/ssh/terminal.c                       |  868 -------
 src/protocols/ssh/terminal_handlers.h              |   54 -
 src/protocols/ssh/types.h                          |  122 -
 src/protocols/telnet/Makefile.am                   |   54 +
 src/protocols/telnet/Makefile.in                   |  752 ++++++
 src/protocols/telnet/client.c                      |  244 ++
 src/protocols/telnet/client.h                      |  122 +
 src/protocols/telnet/clipboard.c                   |   61 +
 src/protocols/telnet/clipboard.h                   |   49 +
 src/protocols/telnet/guac_handlers.c               |  150 ++
 src/protocols/telnet/guac_handlers.h               |   62 +
 src/protocols/telnet/telnet_client.c               |  501 ++++
 src/protocols/telnet/telnet_client.h               |   50 +
 src/protocols/vnc/Makefile.am                      |   86 +-
 src/protocols/vnc/Makefile.in                      |  414 +++-
 src/protocols/vnc/client.c                         |  512 +++-
 src/protocols/vnc/client.h                         |  200 +-
 src/protocols/vnc/clipboard.c                      |   77 +
 src/protocols/vnc/clipboard.h                      |   49 +
 src/protocols/vnc/convert.c                        |  116 -
 src/protocols/vnc/convert.h                        |   53 -
 src/protocols/vnc/guac_handlers.c                  |  156 +-
 src/protocols/vnc/guac_handlers.h                  |   55 +-
 src/protocols/vnc/pulse.c                          |  147 +-
 src/protocols/vnc/pulse.h                          |   54 +-
 src/protocols/vnc/sftp.c                           |   43 +
 src/protocols/vnc/sftp.h                           |   55 +
 src/protocols/vnc/vnc_handlers.c                   |  137 +-
 src/protocols/vnc/vnc_handlers.h                   |   54 +-
 src/terminal/Makefile.am                           |   73 +
 src/terminal/Makefile.in                           |  783 ++++++
 src/terminal/blank.c                               |   51 +
 src/terminal/blank.h                               |   42 +
 src/{protocols/ssh => terminal}/buffer.c           |   76 +-
 src/{protocols/ssh => terminal}/buffer.h           |   58 +-
 src/{protocols/ssh => terminal}/char_mappings.c    |   53 +-
 src/terminal/char_mappings.h                       |   51 +
 src/terminal/common.c                              |  130 +
 src/terminal/common.h                              |   77 +
 src/terminal/cursor.c                              |   61 +
 src/terminal/cursor.h                              |   78 +
 src/{protocols/ssh => terminal}/display.c          |  402 ++-
 src/{protocols/ssh => terminal}/display.h          |  196 +-
 src/terminal/ibar.c                                |   94 +
 src/terminal/ibar.h                                |   65 +
 src/terminal/packet.c                              |   67 +
 src/terminal/packet.h                              |   92 +
 src/terminal/pointer.c                             |   94 +
 src/terminal/pointer.h                             |   68 +
 src/terminal/scrollbar.c                           |  374 +++
 src/terminal/scrollbar.h                           |  342 +++
 src/terminal/terminal.c                            | 1730 +++++++++++++
 src/{protocols/ssh => terminal}/terminal.h         |  337 ++-
 .../ssh => terminal}/terminal_handlers.c           |  180 +-
 src/terminal/terminal_handlers.h                   |   42 +
 src/terminal/types.h                               |  127 +
 test-driver                                        |  139 ++
 tests/Makefile.am                                  |   90 +-
 tests/Makefile.in                                  | 1204 ++++++---
 tests/client/buffer_pool.c                         |   58 +-
 tests/client/client_suite.c                        |   55 +-
 tests/client/client_suite.h                        |   54 +-
 tests/client/layer_pool.c                          |   58 +-
 tests/common/common_suite.c                        |   60 +
 tests/common/common_suite.h                        |   58 +
 tests/common/guac_iconv.c                          |  131 +
 tests/common/guac_rect.c                           |  292 +++
 tests/common/guac_string.c                         |   73 +
 tests/protocol/base64_decode.c                     |   62 +
 tests/protocol/instruction_parse.c                 |   79 +
 tests/protocol/instruction_read.c                  |   61 +-
 tests/protocol/instruction_write.c                 |   65 +-
 tests/protocol/nest_write.c                        |   67 +-
 tests/protocol/suite.c                             |   59 +-
 tests/protocol/suite.h                             |   56 +-
 tests/test_libguac.c                               |   59 +-
 tests/util/guac_pool.c                             |   57 +-
 tests/util/guac_unicode.c                          |   57 +-
 tests/util/util_suite.c                            |   55 +-
 tests/util/util_suite.h                            |   53 +-
 330 files changed, 44963 insertions(+), 18852 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/guacamole-server.git



More information about the debian-edu-commits mailing list