diff --git a/libguac/doc/Doxyfile b/doc/Doxyfile similarity index 100% rename from libguac/doc/Doxyfile rename to doc/Doxyfile diff --git a/guacd/AUTHORS b/guacd/AUTHORS deleted file mode 100644 index 517d7a79..00000000 --- a/guacd/AUTHORS +++ /dev/null @@ -1 +0,0 @@ -Michael Jumper diff --git a/guacd/ChangeLog b/guacd/ChangeLog deleted file mode 100644 index 4323aed3..00000000 --- a/guacd/ChangeLog +++ /dev/null @@ -1,40 +0,0 @@ -2012-10-22 Michael Jumper - - * Migrate function naming to 0.7.0 - * Fix log message ordering - * Add size preamble instruction handling - * Handle audio/video preamble instructions with stubs - -2012-09-10 Alex Bligh - - * Fix daemonization (ticket #178, Debian bug #685637) - -2012-05-24 Michael Jumper - - * Update README and manpage - -2012-05-23 David Pham-Van - - * Add foreground option to daemon - -2012-05-04 Michael Jumper - - * Migrated to libguac 0.6.0 - * Add manpage and LICENSE to source .tar.gz - * Restrict addresses used for binding - * Improve logging - * Log messages to both syslog and STDERR - -2011-12-11 Michael Jumper - - * Migrated daemon functions from libguac to guacd - * Improved logging - * Updated to match naming conventions - * Removed forced sleep between message handles (much faster) - * Added manpage - * Added -b option for specifying bind address - -2011-02-28 Michael Jumper - - * Initial release - diff --git a/guacd/LICENSE b/guacd/LICENSE deleted file mode 100644 index 7714141d..00000000 --- a/guacd/LICENSE +++ /dev/null @@ -1,470 +0,0 @@ - MOZILLA PUBLIC LICENSE - Version 1.1 - - --------------- - -1. Definitions. - - 1.0.1. "Commercial Use" means distribution or otherwise making the - Covered Code available to a third party. - - 1.1. "Contributor" means each entity that creates or contributes to - the creation of Modifications. - - 1.2. "Contributor Version" means the combination of the Original - Code, prior Modifications used by a Contributor, and the Modifications - made by that particular Contributor. - - 1.3. "Covered Code" means the Original Code or Modifications or the - combination of the Original Code and Modifications, in each case - including portions thereof. - - 1.4. "Electronic Distribution Mechanism" means a mechanism generally - accepted in the software development community for the electronic - transfer of data. - - 1.5. "Executable" means Covered Code in any form other than Source - Code. - - 1.6. "Initial Developer" means the individual or entity identified - as the Initial Developer in the Source Code notice required by Exhibit - A. - - 1.7. "Larger Work" means a work which combines Covered Code or - portions thereof with code not governed by the terms of this License. - - 1.8. "License" means this document. - - 1.8.1. "Licensable" means having the right to grant, to the maximum - extent possible, whether at the time of the initial grant or - subsequently acquired, any and all of the rights conveyed herein. - - 1.9. "Modifications" means any addition to or deletion from the - substance or structure of either the Original Code or any previous - Modifications. When Covered Code is released as a series of files, a - Modification is: - A. Any addition to or deletion from the contents of a file - containing Original Code or previous Modifications. - - B. Any new file that contains any part of the Original Code or - previous Modifications. - - 1.10. "Original Code" means Source Code of computer software code - which is described in the Source Code notice required by Exhibit A as - Original Code, and which, at the time of its release under this - License is not already Covered Code governed by this License. - - 1.10.1. "Patent Claims" means any patent claim(s), now owned or - hereafter acquired, including without limitation, method, process, - and apparatus claims, in any patent Licensable by grantor. - - 1.11. "Source Code" means the preferred form of the Covered Code for - making modifications to it, including all modules it contains, plus - any associated interface definition files, scripts used to control - compilation and installation of an Executable, or source code - differential comparisons against either the Original Code or another - well known, available Covered Code of the Contributor's choice. The - Source Code can be in a compressed or archival form, provided the - appropriate decompression or de-archiving software is widely available - for no charge. - - 1.12. "You" (or "Your") means an individual or a legal entity - exercising rights under, and complying with all of the terms of, this - License or a future version of this License issued under Section 6.1. - For legal entities, "You" includes any entity which controls, is - controlled by, or is under common control with You. For purposes of - this definition, "control" means (a) the power, direct or indirect, - to cause the direction or management of such entity, whether by - contract or otherwise, or (b) ownership of more than fifty percent - (50%) of the outstanding shares or beneficial ownership of such - entity. - -2. Source Code License. - - 2.1. The Initial Developer Grant. - The Initial Developer hereby grants You a world-wide, royalty-free, - non-exclusive license, subject to third party intellectual property - claims: - (a) under intellectual property rights (other than patent or - trademark) Licensable by Initial Developer to use, reproduce, - modify, display, perform, sublicense and distribute the Original - Code (or portions thereof) with or without Modifications, and/or - as part of a Larger Work; and - - (b) under Patents Claims infringed by the making, using or - selling of Original Code, to make, have made, use, practice, - sell, and offer for sale, and/or otherwise dispose of the - Original Code (or portions thereof). - - (c) the licenses granted in this Section 2.1(a) and (b) are - effective on the date Initial Developer first distributes - Original Code under the terms of this License. - - (d) Notwithstanding Section 2.1(b) above, no patent license is - granted: 1) for code that You delete from the Original Code; 2) - separate from the Original Code; or 3) for infringements caused - by: i) the modification of the Original Code or ii) the - combination of the Original Code with other software or devices. - - 2.2. Contributor Grant. - Subject to third party intellectual property claims, each Contributor - hereby grants You a world-wide, royalty-free, non-exclusive license - - (a) under intellectual property rights (other than patent or - trademark) Licensable by Contributor, to use, reproduce, modify, - display, perform, sublicense and distribute the Modifications - created by such Contributor (or portions thereof) either on an - unmodified basis, with other Modifications, as Covered Code - and/or as part of a Larger Work; and - - (b) under Patent Claims infringed by the making, using, or - selling of Modifications made by that Contributor either alone - and/or in combination with its Contributor Version (or portions - of such combination), to make, use, sell, offer for sale, have - made, and/or otherwise dispose of: 1) Modifications made by that - Contributor (or portions thereof); and 2) the combination of - Modifications made by that Contributor with its Contributor - Version (or portions of such combination). - - (c) the licenses granted in Sections 2.2(a) and 2.2(b) are - effective on the date Contributor first makes Commercial Use of - the Covered Code. - - (d) Notwithstanding Section 2.2(b) above, no patent license is - granted: 1) for any code that Contributor has deleted from the - Contributor Version; 2) separate from the Contributor Version; - 3) for infringements caused by: i) third party modifications of - Contributor Version or ii) the combination of Modifications made - by that Contributor with other software (except as part of the - Contributor Version) or other devices; or 4) under Patent Claims - infringed by Covered Code in the absence of Modifications made by - that Contributor. - -3. Distribution Obligations. - - 3.1. Application of License. - The Modifications which You create or to which You contribute are - governed by the terms of this License, including without limitation - Section 2.2. The Source Code version of Covered Code may be - distributed only under the terms of this License or a future version - of this License released under Section 6.1, and You must include a - copy of this License with every copy of the Source Code You - distribute. You may not offer or impose any terms on any Source Code - version that alters or restricts the applicable version of this - License or the recipients' rights hereunder. However, You may include - an additional document offering the additional rights described in - Section 3.5. - - 3.2. Availability of Source Code. - Any Modification which You create or to which You contribute must be - made available in Source Code form under the terms of this License - either on the same media as an Executable version or via an accepted - Electronic Distribution Mechanism to anyone to whom you made an - Executable version available; and if made available via Electronic - Distribution Mechanism, must remain available for at least twelve (12) - months after the date it initially became available, or at least six - (6) months after a subsequent version of that particular Modification - has been made available to such recipients. You are responsible for - ensuring that the Source Code version remains available even if the - Electronic Distribution Mechanism is maintained by a third party. - - 3.3. Description of Modifications. - You must cause all Covered Code to which You contribute to contain a - file documenting the changes You made to create that Covered Code and - the date of any change. You must include a prominent statement that - the Modification is derived, directly or indirectly, from Original - Code provided by the Initial Developer and including the name of the - Initial Developer in (a) the Source Code, and (b) in any notice in an - Executable version or related documentation in which You describe the - origin or ownership of the Covered Code. - - 3.4. Intellectual Property Matters - (a) Third Party Claims. - If Contributor has knowledge that a license under a third party's - intellectual property rights is required to exercise the rights - granted by such Contributor under Sections 2.1 or 2.2, - Contributor must include a text file with the Source Code - distribution titled "LEGAL" which describes the claim and the - party making the claim in sufficient detail that a recipient will - know whom to contact. If Contributor obtains such knowledge after - the Modification is made available as described in Section 3.2, - Contributor shall promptly modify the LEGAL file in all copies - Contributor makes available thereafter and shall take other steps - (such as notifying appropriate mailing lists or newsgroups) - reasonably calculated to inform those who received the Covered - Code that new knowledge has been obtained. - - (b) Contributor APIs. - If Contributor's Modifications include an application programming - interface and Contributor has knowledge of patent licenses which - are reasonably necessary to implement that API, Contributor must - also include this information in the LEGAL file. - - (c) Representations. - Contributor represents that, except as disclosed pursuant to - Section 3.4(a) above, Contributor believes that Contributor's - Modifications are Contributor's original creation(s) and/or - Contributor has sufficient rights to grant the rights conveyed by - this License. - - 3.5. Required Notices. - You must duplicate the notice in Exhibit A in each file of the Source - Code. If it is not possible to put such notice in a particular Source - Code file due to its structure, then You must include such notice in a - location (such as a relevant directory) where a user would be likely - to look for such a notice. If You created one or more Modification(s) - You may add your name as a Contributor to the notice described in - Exhibit A. You must also duplicate this License in any documentation - for the Source Code where You describe recipients' rights or ownership - rights relating to Covered Code. You may choose to offer, and to - charge a fee for, warranty, support, indemnity or liability - obligations to one or more recipients of Covered Code. However, You - may do so only on Your own behalf, and not on behalf of the Initial - Developer or any Contributor. You must make it absolutely clear than - any such warranty, support, indemnity or liability obligation is - offered by You alone, and You hereby agree to indemnify the Initial - Developer and every Contributor for any liability incurred by the - Initial Developer or such Contributor as a result of warranty, - support, indemnity or liability terms You offer. - - 3.6. Distribution of Executable Versions. - You may distribute Covered Code in Executable form only if the - requirements of Section 3.1-3.5 have been met for that Covered Code, - and if You include a notice stating that the Source Code version of - the Covered Code is available under the terms of this License, - including a description of how and where You have fulfilled the - obligations of Section 3.2. The notice must be conspicuously included - in any notice in an Executable version, related documentation or - collateral in which You describe recipients' rights relating to the - Covered Code. You may distribute the Executable version of Covered - Code or ownership rights under a license of Your choice, which may - contain terms different from this License, provided that You are in - compliance with the terms of this License and that the license for the - Executable version does not attempt to limit or alter the recipient's - rights in the Source Code version from the rights set forth in this - License. If You distribute the Executable version under a different - license You must make it absolutely clear that any terms which differ - from this License are offered by You alone, not by the Initial - Developer or any Contributor. You hereby agree to indemnify the - Initial Developer and every Contributor for any liability incurred by - the Initial Developer or such Contributor as a result of any such - terms You offer. - - 3.7. Larger Works. - You may create a Larger Work by combining Covered Code with other code - not governed by the terms of this License and distribute the Larger - Work as a single product. In such a case, You must make sure the - requirements of this License are fulfilled for the Covered Code. - -4. Inability to Comply Due to Statute or Regulation. - - If it is impossible for You to comply with any of the terms of this - License with respect to some or all of the Covered Code due to - statute, judicial order, or regulation then You must: (a) comply with - the terms of this License to the maximum extent possible; and (b) - describe the limitations and the code they affect. Such description - must be included in the LEGAL file described in Section 3.4 and must - be included with all distributions of the Source Code. Except to the - extent prohibited by statute or regulation, such description must be - sufficiently detailed for a recipient of ordinary skill to be able to - understand it. - -5. Application of this License. - - This License applies to code to which the Initial Developer has - attached the notice in Exhibit A and to related Covered Code. - -6. Versions of the License. - - 6.1. New Versions. - Netscape Communications Corporation ("Netscape") may publish revised - and/or new versions of the License from time to time. Each version - will be given a distinguishing version number. - - 6.2. Effect of New Versions. - Once Covered Code has been published under a particular version of the - License, You may always continue to use it under the terms of that - version. You may also choose to use such Covered Code under the terms - of any subsequent version of the License published by Netscape. No one - other than Netscape has the right to modify the terms applicable to - Covered Code created under this License. - - 6.3. Derivative Works. - If You create or use a modified version of this License (which you may - only do in order to apply it to code which is not already Covered Code - governed by this License), You must (a) rename Your license so that - the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", - "MPL", "NPL" or any confusingly similar phrase do not appear in your - license (except to note that your license differs from this License) - and (b) otherwise make it clear that Your version of the license - contains terms which differ from the Mozilla Public License and - Netscape Public License. (Filling in the name of the Initial - Developer, Original Code or Contributor in the notice described in - Exhibit A shall not of themselves be deemed to be modifications of - this License.) - -7. DISCLAIMER OF WARRANTY. - - COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, - WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF - DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. - THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE - IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, - YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE - COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER - OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF - ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -8. TERMINATION. - - 8.1. This License and the rights granted hereunder will terminate - automatically if You fail to comply with terms herein and fail to cure - such breach within 30 days of becoming aware of the breach. All - sublicenses to the Covered Code which are properly granted shall - survive any termination of this License. Provisions which, by their - nature, must remain in effect beyond the termination of this License - shall survive. - - 8.2. If You initiate litigation by asserting a patent infringement - claim (excluding declatory judgment actions) against Initial Developer - or a Contributor (the Initial Developer or Contributor against whom - You file such action is referred to as "Participant") alleging that: - - (a) such Participant's Contributor Version directly or indirectly - infringes any patent, then any and all rights granted by such - Participant to You under Sections 2.1 and/or 2.2 of this License - shall, upon 60 days notice from Participant terminate prospectively, - unless if within 60 days after receipt of notice You either: (i) - agree in writing to pay Participant a mutually agreeable reasonable - royalty for Your past and future use of Modifications made by such - Participant, or (ii) withdraw Your litigation claim with respect to - the Contributor Version against such Participant. If within 60 days - of notice, a reasonable royalty and payment arrangement are not - mutually agreed upon in writing by the parties or the litigation claim - is not withdrawn, the rights granted by Participant to You under - Sections 2.1 and/or 2.2 automatically terminate at the expiration of - the 60 day notice period specified above. - - (b) any software, hardware, or device, other than such Participant's - Contributor Version, directly or indirectly infringes any patent, then - any rights granted to You by such Participant under Sections 2.1(b) - and 2.2(b) are revoked effective as of the date You first made, used, - sold, distributed, or had made, Modifications made by that - Participant. - - 8.3. If You assert a patent infringement claim against Participant - alleging that such Participant's Contributor Version directly or - indirectly infringes any patent where such claim is resolved (such as - by license or settlement) prior to the initiation of patent - infringement litigation, then the reasonable value of the licenses - granted by such Participant under Sections 2.1 or 2.2 shall be taken - into account in determining the amount or value of any payment or - license. - - 8.4. In the event of termination under Sections 8.1 or 8.2 above, - all end user license agreements (excluding distributors and resellers) - which have been validly granted by You or any distributor hereunder - prior to termination shall survive termination. - -9. LIMITATION OF LIABILITY. - - UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT - (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL - DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, - OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR - ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY - CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, - WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER - COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN - INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF - LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY - RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW - PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE - EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO - THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. - -10. U.S. GOVERNMENT END USERS. - - The Covered Code is a "commercial item," as that term is defined in - 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer - software" and "commercial computer software documentation," as such - terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 - C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), - all U.S. Government End Users acquire Covered Code with only those - rights set forth herein. - -11. MISCELLANEOUS. - - This License represents the complete agreement concerning subject - matter hereof. If any provision of this License is held to be - unenforceable, such provision shall be reformed only to the extent - necessary to make it enforceable. This License shall be governed by - California law provisions (except to the extent applicable law, if - any, provides otherwise), excluding its conflict-of-law provisions. - With respect to disputes in which at least one party is a citizen of, - or an entity chartered or registered to do business in the United - States of America, any litigation relating to this License shall be - subject to the jurisdiction of the Federal Courts of the Northern - District of California, with venue lying in Santa Clara County, - California, with the losing party responsible for costs, including - without limitation, court costs and reasonable attorneys' fees and - expenses. The application of the United Nations Convention on - Contracts for the International Sale of Goods is expressly excluded. - Any law or regulation which provides that the language of a contract - shall be construed against the drafter shall not apply to this - License. - -12. RESPONSIBILITY FOR CLAIMS. - - As between Initial Developer and the Contributors, each party is - responsible for claims and damages arising, directly or indirectly, - out of its utilization of rights under this License and You agree to - work with Initial Developer and Contributors to distribute such - responsibility on an equitable basis. Nothing herein is intended or - shall be deemed to constitute any admission of liability. - -13. MULTIPLE-LICENSED CODE. - - Initial Developer may designate portions of the Covered Code as - "Multiple-Licensed". "Multiple-Licensed" means that the Initial - Developer permits you to utilize portions of the Covered Code under - Your choice of the NPL or the alternative licenses, if any, specified - by the Initial Developer in the file described in Exhibit A. - -EXHIBIT A -Mozilla Public License. - - ``The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. - - The Original Code is ______________________________________. - - The Initial Developer of the Original Code is ________________________. - Portions created by ______________________ are Copyright (C) ______ - _______________________. All Rights Reserved. - - Contributor(s): ______________________________________. - - Alternatively, the contents of this file may be used under the terms - of the _____ license (the "[___] License"), in which case the - provisions of [______] License are applicable instead of those - above. If you wish to allow use of your version of this file only - under the terms of the [____] License and not to allow others to use - your version of this file under the MPL, indicate your decision by - deleting the provisions above and replace them with the notice and - other provisions required by the [___] License. If you do not delete - the provisions above, a recipient may use your version of this file - under either the MPL or the [___] License." - - [NOTE: The text of this Exhibit A may differ slightly from the text of - the notices in the Source Code files of the Original Code. You should - use the text of this Exhibit A rather than the text found in the - Original Code Source Code for Your Modifications.] - diff --git a/guacd/README b/guacd/README deleted file mode 100644 index f82ad1b3..00000000 --- a/guacd/README +++ /dev/null @@ -1,120 +0,0 @@ - ------------------------------------------------------------- - About this README ------------------------------------------------------------- - -This README is intended to provide quick and to-the-point documentation for -technical users intending to compile parts of Guacamole themselves. - -Distribution-specific packages are available from the files section of the main -project page: - - http://sourceforge.net/projects/guacamole/files/ - -Distribution-specific documentation is provided on the Guacamole wiki: - - http://guac-dev.org/ - - ------------------------------------------------------------- - What is guacd? ------------------------------------------------------------- - -guacd is the Guacamole proxy daemon used by the Guacamole web application and -framework. As JavaScript cannot handle binary protocols (like VNC and remote -desktop) efficiently, a new test-based protocol was developed which would -contain a common superset of the operations needed for efficient remote -desktop access, but would be easy for JavaScript programs to process. guacd -is the proxy which translates between arbitrary protocols and the Guacamole -protocol. - - ------------------------------------------------------------- - Compiling and installing guacd ------------------------------------------------------------- - -Please note that distribution-specific pre-compiled packages are available from -the files section of the main project site: - - http://sourceforge.net/projects/guacamole/files/ - -guacd is built using the popular GNU Automake, and thus provides the standard -configure script. Before compiling, you need to have compiled and installed -libguac, the core Guacamole library. This is available from the main Guacamole -site at http://guac-dev.org/. - -1) Run configure - - $ ./configure - - Assuming all dependencies have been installed, this should succeed without - errors. If you wish to install the init script as well, you need to specify - the location where your system init scripts are located (typically - /etc/init.d): - - $ ./configure --with-init-dir=/etc/init.d - - Running configure in this manner will cause the "make install" step to - install an init script to the specified directory, which you can then - activate using the service management mechanism provided by your - distribution). - -2) Run make - - $ make - - guacd will now compile. - -3) Install (as root) - - # make install - - guacd will install to your /usr/local/sbin directory by default. You can - change the install location by using the --prefix option for configure. - - ------------------------------------------------------------- - Running guacd ------------------------------------------------------------- - -If you installed the init script during compile and install, you should be -able to start guacd through the service management utilities provided by -your distribution (if any) or by running the init script directly (as root): - - # /etc/init.d/guacd start - -Root access is needed to write the pidfile /var/run/guacd.pid. You can also run -guacd itself directly without the init script (as any user): - - $ guacd - -guacd currently takes four command-line options: - - -b HOST - - Changes the host or address that guacd listens on. - - -l PORT - - Changes the port that guacd listens on (the default is port 4822). - - -p PIDFILE - - Causes guacd to write the PID of the daemon process to the specified - file. This is useful for init scripts and is used by the provided init - script. - - -f - Causes guacd to run in the foreground, rather than automatically - forking into the background. - - ------------------------------------------------------------- - Reporting problems ------------------------------------------------------------- - -Please report any bugs encountered by opening a new ticket at the Trac system -hosted at: - - http://guac-dev.rg/trac/ - diff --git a/guacd/configure.ac b/guacd/configure.ac deleted file mode 100644 index 8a42c312..00000000 --- a/guacd/configure.ac +++ /dev/null @@ -1,80 +0,0 @@ -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is guacd. -# -# The Initial Developer of the Original Code is -# Michael Jumper. -# Portions created by the Initial Developer are Copyright (C) 2010 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -AC_PREREQ([2.61]) -AC_INIT([guacd], [0.7.0]) -AM_INIT_AUTOMAKE([-Wall -Werror foreign]) - -LT_PREREQ([2.2]) -LT_INIT([dlopen]) - -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_SRCDIR([src/client.c]) - -# Programs -AC_PROG_CC -AC_PROG_CC_C99 - -# Libraries -AC_CHECK_LIB([pthread], [pthread_create]) - -# If bundled copy of libguac found, use that -if test -d "$srcdir/../libguac" -then - AC_SUBST([LIBGUAC_LTLIB], '$(top_builddir)/../libguac/src/libguac.la') - AC_SUBST([LIBGUAC_INCLUDE], '-I$(top_srcdir)/../libguac/include') -else - AC_CHECK_LIB([guac], [guac_client_plugin_open]) -fi - -# Functions -AC_FUNC_MALLOC -AC_CHECK_FUNCS([memset socket strerror fork]) - -# Headers -AC_CHECK_HEADERS([netinet/in.h stdlib.h string.h sys/socket.h syslog.h unistd.h]) - -# Options -AC_ARG_WITH(init_dir, - [AS_HELP_STRING([--with-init-dir=], - [install an init script to the given directory]) - ],init_dir=$withval) -AC_SUBST(init_dir) - -# Done -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT - diff --git a/init.d/guacd b/init.d/guacd new file mode 100755 index 00000000..c5a1ae17 --- /dev/null +++ b/init.d/guacd @@ -0,0 +1,162 @@ +#!/bin/sh + +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is guacd. +# +# The Initial Developer of the Original Code is +# Michael Jumper. +# Portions created by the Initial Developer are Copyright (C) 2010 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +# guacd +# +# chkconfig: 2345 20 80 +# description: Guacamole proxy daemon + +### BEGIN INIT INFO +# Provides: guacd +# Required-Start: $network $syslog +# Required-Stop: $network $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Guacamole proxy daemon +# Description: The Guacamole proxy daemon, required to translate remote desktop protocols into the text-based Guacamole protocol used by the JavaScript application. +### END INIT INFO + +prog="guacd" +exec="/usr/local/sbin/$prog" +pidfile="/var/run/$prog.pid" + +# Returns PID of currently running process, if any +getpid() { + + if [ -f "$pidfile" ] + then + + read PID < "$pidfile" + + # If pidfile contains PID and PID is valid + if [ -n "$PID" ] && ps "$PID" > /dev/null 2>&1 + then + echo "$PID" + return 0 + fi + + fi + + # pidfile/pid not found, or process is dead + return 1 + +} + +start() { + [ -x $exec ] || exit 5 + echo -n "Starting $prog: " + + getpid > /dev/null || $exec -p "$pidfile" + retval=$? + + case "$retval" in + 0) + echo "SUCCESS" + ;; + *) + echo "FAIL" + ;; + esac + + return $retval +} + +stop() { + echo -n "Stopping $prog: " + + PID=`getpid` + retval=$? + + case "$retval" in + 0) + if kill $PID > /dev/null 2>&1 + then + echo "SUCCESS" + return 0 + fi + + echo "FAIL" + return 1 + ;; + *) + echo "SUCCESS (not running)" + return 0 + ;; + esac + +} + +restart() { + stop && start +} + +force_reload() { + restart +} + +status() { + + PID=`getpid` + retval=$? + + case "$retval" in + 0) + echo "$prog is running with PID=$PID." + ;; + *) + echo "$prog is not running." + ;; + esac + + return $retval + +} + +case "$1" in + start|stop|status|restart|force-reload) + $1 + ;; + try-restart) + status && restart + ;; + *) + echo "Usage: $0 {start|stop|status|restart|try-restart|force-reload}" + exit 2 +esac +exit $? + diff --git a/guacd/init.d/guacd.in b/init.d/guacd.in similarity index 100% rename from guacd/init.d/guacd.in rename to init.d/guacd.in diff --git a/libguac/AUTHORS b/libguac/AUTHORS deleted file mode 100644 index 517d7a79..00000000 --- a/libguac/AUTHORS +++ /dev/null @@ -1 +0,0 @@ -Michael Jumper diff --git a/libguac/ChangeLog b/libguac/ChangeLog deleted file mode 100644 index ca912d39..00000000 --- a/libguac/ChangeLog +++ /dev/null @@ -1,55 +0,0 @@ -2012-10-25 Michael Jumper - - * Implement video instruction - * Implement chunked write versions of audio/video functions - -2012-10-24 Michael Jumper - - * Implement audio instruction - -2012-10-22 Michael Jumper - - * Implement protocol nesting (via "nest" instruction) - * Add size events - * Add guac_client_info structure to be populated during handshake - -2012-07-23 Michael Jumper - - * Add unit tests for Unicode in protocol - * Fix handling of Unicode (UTF-8) characters in protocol - -2012-05-23 David Pham-Van - - * Corrected padding in base64 encoding - -2012-05-04 Michael Jumper - - * Buffer/layer allocation and pooling fixes - * Automatic PNG palletization - * Fix error reporting - * Add log handlers for guac_client_plugin_get_client() - * Add layer and drawing instructions - * Reorganized source - * Raster operations - * Cacheable cursors - -2011-12-11 Michael Jumper - - * Added functions for alloc/free of layers and buffers - * Added "clip" instruction - * New, more efficient instruction format - * Fixed guac_write_base64 to match docs - * Added guac_error for error reporting and logging - * Consistent naming conventions - * Migrated daemon-specific functionality to guacd - * Made private members of structs private (using double-underscore prefix) - -2011-03-14 Michael Jumper - - * Lag control ("sync" message) - * Automatic message handle frequency limiting - -2011-02-28 Michael Jumper - - * Initial release - diff --git a/libguac/LICENSE b/libguac/LICENSE deleted file mode 100644 index 7714141d..00000000 --- a/libguac/LICENSE +++ /dev/null @@ -1,470 +0,0 @@ - MOZILLA PUBLIC LICENSE - Version 1.1 - - --------------- - -1. Definitions. - - 1.0.1. "Commercial Use" means distribution or otherwise making the - Covered Code available to a third party. - - 1.1. "Contributor" means each entity that creates or contributes to - the creation of Modifications. - - 1.2. "Contributor Version" means the combination of the Original - Code, prior Modifications used by a Contributor, and the Modifications - made by that particular Contributor. - - 1.3. "Covered Code" means the Original Code or Modifications or the - combination of the Original Code and Modifications, in each case - including portions thereof. - - 1.4. "Electronic Distribution Mechanism" means a mechanism generally - accepted in the software development community for the electronic - transfer of data. - - 1.5. "Executable" means Covered Code in any form other than Source - Code. - - 1.6. "Initial Developer" means the individual or entity identified - as the Initial Developer in the Source Code notice required by Exhibit - A. - - 1.7. "Larger Work" means a work which combines Covered Code or - portions thereof with code not governed by the terms of this License. - - 1.8. "License" means this document. - - 1.8.1. "Licensable" means having the right to grant, to the maximum - extent possible, whether at the time of the initial grant or - subsequently acquired, any and all of the rights conveyed herein. - - 1.9. "Modifications" means any addition to or deletion from the - substance or structure of either the Original Code or any previous - Modifications. When Covered Code is released as a series of files, a - Modification is: - A. Any addition to or deletion from the contents of a file - containing Original Code or previous Modifications. - - B. Any new file that contains any part of the Original Code or - previous Modifications. - - 1.10. "Original Code" means Source Code of computer software code - which is described in the Source Code notice required by Exhibit A as - Original Code, and which, at the time of its release under this - License is not already Covered Code governed by this License. - - 1.10.1. "Patent Claims" means any patent claim(s), now owned or - hereafter acquired, including without limitation, method, process, - and apparatus claims, in any patent Licensable by grantor. - - 1.11. "Source Code" means the preferred form of the Covered Code for - making modifications to it, including all modules it contains, plus - any associated interface definition files, scripts used to control - compilation and installation of an Executable, or source code - differential comparisons against either the Original Code or another - well known, available Covered Code of the Contributor's choice. The - Source Code can be in a compressed or archival form, provided the - appropriate decompression or de-archiving software is widely available - for no charge. - - 1.12. "You" (or "Your") means an individual or a legal entity - exercising rights under, and complying with all of the terms of, this - License or a future version of this License issued under Section 6.1. - For legal entities, "You" includes any entity which controls, is - controlled by, or is under common control with You. For purposes of - this definition, "control" means (a) the power, direct or indirect, - to cause the direction or management of such entity, whether by - contract or otherwise, or (b) ownership of more than fifty percent - (50%) of the outstanding shares or beneficial ownership of such - entity. - -2. Source Code License. - - 2.1. The Initial Developer Grant. - The Initial Developer hereby grants You a world-wide, royalty-free, - non-exclusive license, subject to third party intellectual property - claims: - (a) under intellectual property rights (other than patent or - trademark) Licensable by Initial Developer to use, reproduce, - modify, display, perform, sublicense and distribute the Original - Code (or portions thereof) with or without Modifications, and/or - as part of a Larger Work; and - - (b) under Patents Claims infringed by the making, using or - selling of Original Code, to make, have made, use, practice, - sell, and offer for sale, and/or otherwise dispose of the - Original Code (or portions thereof). - - (c) the licenses granted in this Section 2.1(a) and (b) are - effective on the date Initial Developer first distributes - Original Code under the terms of this License. - - (d) Notwithstanding Section 2.1(b) above, no patent license is - granted: 1) for code that You delete from the Original Code; 2) - separate from the Original Code; or 3) for infringements caused - by: i) the modification of the Original Code or ii) the - combination of the Original Code with other software or devices. - - 2.2. Contributor Grant. - Subject to third party intellectual property claims, each Contributor - hereby grants You a world-wide, royalty-free, non-exclusive license - - (a) under intellectual property rights (other than patent or - trademark) Licensable by Contributor, to use, reproduce, modify, - display, perform, sublicense and distribute the Modifications - created by such Contributor (or portions thereof) either on an - unmodified basis, with other Modifications, as Covered Code - and/or as part of a Larger Work; and - - (b) under Patent Claims infringed by the making, using, or - selling of Modifications made by that Contributor either alone - and/or in combination with its Contributor Version (or portions - of such combination), to make, use, sell, offer for sale, have - made, and/or otherwise dispose of: 1) Modifications made by that - Contributor (or portions thereof); and 2) the combination of - Modifications made by that Contributor with its Contributor - Version (or portions of such combination). - - (c) the licenses granted in Sections 2.2(a) and 2.2(b) are - effective on the date Contributor first makes Commercial Use of - the Covered Code. - - (d) Notwithstanding Section 2.2(b) above, no patent license is - granted: 1) for any code that Contributor has deleted from the - Contributor Version; 2) separate from the Contributor Version; - 3) for infringements caused by: i) third party modifications of - Contributor Version or ii) the combination of Modifications made - by that Contributor with other software (except as part of the - Contributor Version) or other devices; or 4) under Patent Claims - infringed by Covered Code in the absence of Modifications made by - that Contributor. - -3. Distribution Obligations. - - 3.1. Application of License. - The Modifications which You create or to which You contribute are - governed by the terms of this License, including without limitation - Section 2.2. The Source Code version of Covered Code may be - distributed only under the terms of this License or a future version - of this License released under Section 6.1, and You must include a - copy of this License with every copy of the Source Code You - distribute. You may not offer or impose any terms on any Source Code - version that alters or restricts the applicable version of this - License or the recipients' rights hereunder. However, You may include - an additional document offering the additional rights described in - Section 3.5. - - 3.2. Availability of Source Code. - Any Modification which You create or to which You contribute must be - made available in Source Code form under the terms of this License - either on the same media as an Executable version or via an accepted - Electronic Distribution Mechanism to anyone to whom you made an - Executable version available; and if made available via Electronic - Distribution Mechanism, must remain available for at least twelve (12) - months after the date it initially became available, or at least six - (6) months after a subsequent version of that particular Modification - has been made available to such recipients. You are responsible for - ensuring that the Source Code version remains available even if the - Electronic Distribution Mechanism is maintained by a third party. - - 3.3. Description of Modifications. - You must cause all Covered Code to which You contribute to contain a - file documenting the changes You made to create that Covered Code and - the date of any change. You must include a prominent statement that - the Modification is derived, directly or indirectly, from Original - Code provided by the Initial Developer and including the name of the - Initial Developer in (a) the Source Code, and (b) in any notice in an - Executable version or related documentation in which You describe the - origin or ownership of the Covered Code. - - 3.4. Intellectual Property Matters - (a) Third Party Claims. - If Contributor has knowledge that a license under a third party's - intellectual property rights is required to exercise the rights - granted by such Contributor under Sections 2.1 or 2.2, - Contributor must include a text file with the Source Code - distribution titled "LEGAL" which describes the claim and the - party making the claim in sufficient detail that a recipient will - know whom to contact. If Contributor obtains such knowledge after - the Modification is made available as described in Section 3.2, - Contributor shall promptly modify the LEGAL file in all copies - Contributor makes available thereafter and shall take other steps - (such as notifying appropriate mailing lists or newsgroups) - reasonably calculated to inform those who received the Covered - Code that new knowledge has been obtained. - - (b) Contributor APIs. - If Contributor's Modifications include an application programming - interface and Contributor has knowledge of patent licenses which - are reasonably necessary to implement that API, Contributor must - also include this information in the LEGAL file. - - (c) Representations. - Contributor represents that, except as disclosed pursuant to - Section 3.4(a) above, Contributor believes that Contributor's - Modifications are Contributor's original creation(s) and/or - Contributor has sufficient rights to grant the rights conveyed by - this License. - - 3.5. Required Notices. - You must duplicate the notice in Exhibit A in each file of the Source - Code. If it is not possible to put such notice in a particular Source - Code file due to its structure, then You must include such notice in a - location (such as a relevant directory) where a user would be likely - to look for such a notice. If You created one or more Modification(s) - You may add your name as a Contributor to the notice described in - Exhibit A. You must also duplicate this License in any documentation - for the Source Code where You describe recipients' rights or ownership - rights relating to Covered Code. You may choose to offer, and to - charge a fee for, warranty, support, indemnity or liability - obligations to one or more recipients of Covered Code. However, You - may do so only on Your own behalf, and not on behalf of the Initial - Developer or any Contributor. You must make it absolutely clear than - any such warranty, support, indemnity or liability obligation is - offered by You alone, and You hereby agree to indemnify the Initial - Developer and every Contributor for any liability incurred by the - Initial Developer or such Contributor as a result of warranty, - support, indemnity or liability terms You offer. - - 3.6. Distribution of Executable Versions. - You may distribute Covered Code in Executable form only if the - requirements of Section 3.1-3.5 have been met for that Covered Code, - and if You include a notice stating that the Source Code version of - the Covered Code is available under the terms of this License, - including a description of how and where You have fulfilled the - obligations of Section 3.2. The notice must be conspicuously included - in any notice in an Executable version, related documentation or - collateral in which You describe recipients' rights relating to the - Covered Code. You may distribute the Executable version of Covered - Code or ownership rights under a license of Your choice, which may - contain terms different from this License, provided that You are in - compliance with the terms of this License and that the license for the - Executable version does not attempt to limit or alter the recipient's - rights in the Source Code version from the rights set forth in this - License. If You distribute the Executable version under a different - license You must make it absolutely clear that any terms which differ - from this License are offered by You alone, not by the Initial - Developer or any Contributor. You hereby agree to indemnify the - Initial Developer and every Contributor for any liability incurred by - the Initial Developer or such Contributor as a result of any such - terms You offer. - - 3.7. Larger Works. - You may create a Larger Work by combining Covered Code with other code - not governed by the terms of this License and distribute the Larger - Work as a single product. In such a case, You must make sure the - requirements of this License are fulfilled for the Covered Code. - -4. Inability to Comply Due to Statute or Regulation. - - If it is impossible for You to comply with any of the terms of this - License with respect to some or all of the Covered Code due to - statute, judicial order, or regulation then You must: (a) comply with - the terms of this License to the maximum extent possible; and (b) - describe the limitations and the code they affect. Such description - must be included in the LEGAL file described in Section 3.4 and must - be included with all distributions of the Source Code. Except to the - extent prohibited by statute or regulation, such description must be - sufficiently detailed for a recipient of ordinary skill to be able to - understand it. - -5. Application of this License. - - This License applies to code to which the Initial Developer has - attached the notice in Exhibit A and to related Covered Code. - -6. Versions of the License. - - 6.1. New Versions. - Netscape Communications Corporation ("Netscape") may publish revised - and/or new versions of the License from time to time. Each version - will be given a distinguishing version number. - - 6.2. Effect of New Versions. - Once Covered Code has been published under a particular version of the - License, You may always continue to use it under the terms of that - version. You may also choose to use such Covered Code under the terms - of any subsequent version of the License published by Netscape. No one - other than Netscape has the right to modify the terms applicable to - Covered Code created under this License. - - 6.3. Derivative Works. - If You create or use a modified version of this License (which you may - only do in order to apply it to code which is not already Covered Code - governed by this License), You must (a) rename Your license so that - the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", - "MPL", "NPL" or any confusingly similar phrase do not appear in your - license (except to note that your license differs from this License) - and (b) otherwise make it clear that Your version of the license - contains terms which differ from the Mozilla Public License and - Netscape Public License. (Filling in the name of the Initial - Developer, Original Code or Contributor in the notice described in - Exhibit A shall not of themselves be deemed to be modifications of - this License.) - -7. DISCLAIMER OF WARRANTY. - - COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, - WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF - DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. - THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE - IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, - YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE - COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER - OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF - ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -8. TERMINATION. - - 8.1. This License and the rights granted hereunder will terminate - automatically if You fail to comply with terms herein and fail to cure - such breach within 30 days of becoming aware of the breach. All - sublicenses to the Covered Code which are properly granted shall - survive any termination of this License. Provisions which, by their - nature, must remain in effect beyond the termination of this License - shall survive. - - 8.2. If You initiate litigation by asserting a patent infringement - claim (excluding declatory judgment actions) against Initial Developer - or a Contributor (the Initial Developer or Contributor against whom - You file such action is referred to as "Participant") alleging that: - - (a) such Participant's Contributor Version directly or indirectly - infringes any patent, then any and all rights granted by such - Participant to You under Sections 2.1 and/or 2.2 of this License - shall, upon 60 days notice from Participant terminate prospectively, - unless if within 60 days after receipt of notice You either: (i) - agree in writing to pay Participant a mutually agreeable reasonable - royalty for Your past and future use of Modifications made by such - Participant, or (ii) withdraw Your litigation claim with respect to - the Contributor Version against such Participant. If within 60 days - of notice, a reasonable royalty and payment arrangement are not - mutually agreed upon in writing by the parties or the litigation claim - is not withdrawn, the rights granted by Participant to You under - Sections 2.1 and/or 2.2 automatically terminate at the expiration of - the 60 day notice period specified above. - - (b) any software, hardware, or device, other than such Participant's - Contributor Version, directly or indirectly infringes any patent, then - any rights granted to You by such Participant under Sections 2.1(b) - and 2.2(b) are revoked effective as of the date You first made, used, - sold, distributed, or had made, Modifications made by that - Participant. - - 8.3. If You assert a patent infringement claim against Participant - alleging that such Participant's Contributor Version directly or - indirectly infringes any patent where such claim is resolved (such as - by license or settlement) prior to the initiation of patent - infringement litigation, then the reasonable value of the licenses - granted by such Participant under Sections 2.1 or 2.2 shall be taken - into account in determining the amount or value of any payment or - license. - - 8.4. In the event of termination under Sections 8.1 or 8.2 above, - all end user license agreements (excluding distributors and resellers) - which have been validly granted by You or any distributor hereunder - prior to termination shall survive termination. - -9. LIMITATION OF LIABILITY. - - UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT - (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL - DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, - OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR - ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY - CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, - WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER - COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN - INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF - LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY - RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW - PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE - EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO - THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. - -10. U.S. GOVERNMENT END USERS. - - The Covered Code is a "commercial item," as that term is defined in - 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer - software" and "commercial computer software documentation," as such - terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 - C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), - all U.S. Government End Users acquire Covered Code with only those - rights set forth herein. - -11. MISCELLANEOUS. - - This License represents the complete agreement concerning subject - matter hereof. If any provision of this License is held to be - unenforceable, such provision shall be reformed only to the extent - necessary to make it enforceable. This License shall be governed by - California law provisions (except to the extent applicable law, if - any, provides otherwise), excluding its conflict-of-law provisions. - With respect to disputes in which at least one party is a citizen of, - or an entity chartered or registered to do business in the United - States of America, any litigation relating to this License shall be - subject to the jurisdiction of the Federal Courts of the Northern - District of California, with venue lying in Santa Clara County, - California, with the losing party responsible for costs, including - without limitation, court costs and reasonable attorneys' fees and - expenses. The application of the United Nations Convention on - Contracts for the International Sale of Goods is expressly excluded. - Any law or regulation which provides that the language of a contract - shall be construed against the drafter shall not apply to this - License. - -12. RESPONSIBILITY FOR CLAIMS. - - As between Initial Developer and the Contributors, each party is - responsible for claims and damages arising, directly or indirectly, - out of its utilization of rights under this License and You agree to - work with Initial Developer and Contributors to distribute such - responsibility on an equitable basis. Nothing herein is intended or - shall be deemed to constitute any admission of liability. - -13. MULTIPLE-LICENSED CODE. - - Initial Developer may designate portions of the Covered Code as - "Multiple-Licensed". "Multiple-Licensed" means that the Initial - Developer permits you to utilize portions of the Covered Code under - Your choice of the NPL or the alternative licenses, if any, specified - by the Initial Developer in the file described in Exhibit A. - -EXHIBIT A -Mozilla Public License. - - ``The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. - - The Original Code is ______________________________________. - - The Initial Developer of the Original Code is ________________________. - Portions created by ______________________ are Copyright (C) ______ - _______________________. All Rights Reserved. - - Contributor(s): ______________________________________. - - Alternatively, the contents of this file may be used under the terms - of the _____ license (the "[___] License"), in which case the - provisions of [______] License are applicable instead of those - above. If you wish to allow use of your version of this file only - under the terms of the [____] License and not to allow others to use - your version of this file under the MPL, indicate your decision by - deleting the provisions above and replace them with the notice and - other provisions required by the [___] License. If you do not delete - the provisions above, a recipient may use your version of this file - under either the MPL or the [___] License." - - [NOTE: The text of this Exhibit A may differ slightly from the text of - the notices in the Source Code files of the Original Code. You should - use the text of this Exhibit A rather than the text found in the - Original Code Source Code for Your Modifications.] - diff --git a/libguac/README b/libguac/README deleted file mode 100644 index 01ec4065..00000000 --- a/libguac/README +++ /dev/null @@ -1,79 +0,0 @@ - ------------------------------------------------------------- - About this README ------------------------------------------------------------- - -This README is intended to provide quick and to-the-point documentation for -technical users intending to compile parts of Guacamole themselves. - -Distribution-specific packages are available from the files section of the main -project page: - - http://sourceforge.net/projects/guacamole/files/ - -Distribution-specific documentation is provided on the Guacamole wiki: - - http://guac-dev.org/ - - ------------------------------------------------------------- - What is libguac? ------------------------------------------------------------- - -libguac is the core library for guacd (the Guacamole proxy) and any protocol -support plugins for guacd. - -libguac provides efficient buffered I/O of text and base64 data, as well as -somewhat abstracted functions for sending Guacamole instructions. - - ------------------------------------------------------------- - Compiling and installing libguac ------------------------------------------------------------- - -Please note that distribution-specific pre-compiled packages are available from -the files section of the main project site: - - http://sourceforge.net/projects/guacamole/files/ - -libguac is built using the popular GNU Automake, and thus provides the standard -configure script. - -1) Run configure - - $ ./configure - - Assuming all dependencies have been installed, this should succeed without - errors. - -2) Run make - - $ make - - libguac will now compile. - -3) Install (as root) - - # make install - - libguac will install to your /usr/local/lib directory by default. You can - change the install location by using the --prefix option for configure. - - Several header files will also be installed to - /usr/local/include/guacamole. - - You will need to run ldconfig (as root) so that the library can be found - when guacd is run: - - # ldconfig - - ------------------------------------------------------------- - Reporting problems ------------------------------------------------------------- - -Please report any bugs encountered by opening a new ticket at the Trac system -hosted at: - - http://guac-dev.org/trac/ - diff --git a/libguac/configure.ac b/libguac/configure.ac deleted file mode 100644 index 414f175d..00000000 --- a/libguac/configure.ac +++ /dev/null @@ -1,83 +0,0 @@ -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is libguac. -# -# The Initial Developer of the Original Code is -# Michael Jumper. -# Portions created by the Initial Developer are Copyright (C) 2010 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -AC_PREREQ([2.61]) -AC_INIT([libguac], [0.7.0]) -AM_INIT_AUTOMAKE([-Wall -Werror foreign]) - -LT_PREREQ([2.2]) -LT_INIT([dlopen]) - -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_SRCDIR([src/protocol.c]) - -# Programs -AC_PROG_CC -AC_PROG_CC_C99 -AC_PROG_LIBTOOL - -# Headers -AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/socket.h time.h sys/time.h syslog.h unistd.h cairo/cairo.h pngstruct.h]) - -# Source characteristics -AC_DEFINE([_POSIX_C_SOURCE], [199309L], [Uses POSIX APIs]) -AC_DEFINE([_BSD_SOURCE], [], [Uses BSD APIs]) - -# Libraries -AC_CHECK_LIB([dl], [dlopen],, AC_MSG_ERROR("libdl is required for loading client plugins")) -AC_CHECK_LIB([png], [png_write_png],, AC_MSG_ERROR("libpng is required for writing png messages")) -AC_CHECK_LIB([cairo], [cairo_create],, AC_MSG_ERROR("cairo is required for drawing instructions")) -AC_CHECK_LIB([pthread], [pthread_create]) -AC_CHECK_LIB([wsock32], [main]) - -# Library functions -AC_FUNC_MALLOC -AC_FUNC_REALLOC -AC_CHECK_FUNCS([clock_gettime gettimeofday memmove memset select strdup png_get_io_ptr nanosleep]) - -# Typedefs -AC_TYPE_SIZE_T -AC_TYPE_SSIZE_T - -# Unit tests -AC_CHECK_LIB([cunit], [CU_run_test], [CUNIT_LIBS=-lcunit]) -AC_SUBST(CUNIT_LIBS) - -AC_CONFIG_FILES([Makefile - src/Makefile - tests/Makefile]) -AC_OUTPUT - diff --git a/libguac/m4/README b/libguac/m4/README deleted file mode 100644 index c9c9cbc4..00000000 --- a/libguac/m4/README +++ /dev/null @@ -1,12 +0,0 @@ -This file exists such that the m4/ directory will be created when cloning the -git repository. - -The m4/ directory is not directly used by this project, but libtoolize -populates this directory with files, recommending that the directory be -included in the macro search path for aclocal. - -Because autoreconf runs aclocal before libtoolize, this directory will not -exist when autoreconf is run, triggering an error from aclocal. - -Creating this directory (and keeping this file in it as a placeholder) -prevents this error. diff --git a/libguac/src/Makefile.am b/libguac/src/Makefile.am deleted file mode 100644 index 4cf625f8..00000000 --- a/libguac/src/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is libguac. -# -# The Initial Developer of the Original Code is -# Michael Jumper. -# Portions created by the Initial Developer are Copyright (C) 2010 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -AUTOMAKE_OPTIONS = foreign -ACLOCAL_AMFLAGS = -I m4 -AM_CFLAGS = -Werror -Wall -pedantic -I../include/guacamole -I../include/_private - -libguacincdir = $(includedir)/guacamole -libguacinc_HEADERS = \ - ../include/guacamole/client.h \ - ../include/guacamole/error.h \ - ../include/guacamole/hash.h \ - ../include/guacamole/instruction.h \ - ../include/guacamole/layer.h \ - ../include/guacamole/plugin.h \ - ../include/guacamole/pool.h \ - ../include/guacamole/protocol.h \ - ../include/guacamole/socket.h \ - ../include/guacamole/stream.h \ - ../include/guacamole/timestamp.h - -noinst_HEADERS = \ - ../include/_private/client-handlers.h \ - ../include/_private/palette.h \ - ../include/_private/unicode.h - -libguac_la_SOURCES = \ - client.c \ - client-handlers.c \ - error.c \ - hash.c \ - instruction.c \ - palette.c \ - plugin.c \ - pool.c \ - protocol.c \ - socket.c \ - socket-fd.c \ - socket-nest.c \ - timestamp.c \ - unicode.c - -lib_LTLIBRARIES = libguac.la -libguac_la_LDFLAGS = -version-info 4:0:0 - diff --git a/guacd/man/guacd.8 b/man/guacd.8 similarity index 100% rename from guacd/man/guacd.8 rename to man/guacd.8 diff --git a/protocols/rdp/AUTHORS b/protocols/rdp/AUTHORS deleted file mode 100644 index e62be891..00000000 --- a/protocols/rdp/AUTHORS +++ /dev/null @@ -1,6 +0,0 @@ -Michael Jumper -Matt Hortman -Jocelyn Delalande -David Lechevalier -Alexandre Devely -Laurent Meunier diff --git a/protocols/rdp/ChangeLog b/protocols/rdp/ChangeLog deleted file mode 100644 index f789140f..00000000 --- a/protocols/rdp/ChangeLog +++ /dev/null @@ -1,49 +0,0 @@ -2013-05-09 Michael Jumper - - * Merge contributed keymaps for French and German. - -2012-12-25 Michael Jumper - - * Console arguments (fixes #227) - -2012-12-13 Michael Jumper - - * Implement PATBLT fallback (fixes #238) - -2012-11-22 Michael Jumper - - * Add disable-audio option (fixes #221) - -2012-11-02 Michael Jumper - - * Added sound support (fixes #32) - -2012-10-22 Michael Jumper - - * Use guac_client_info to choose optimal size if size not overridden - -2012-08-31 Laurent Meunier - - * Use configured color depth - -2012-08-11 Michael Jumper - - * Fix m4/ autoreconf error - -2012-05-23 David Pham-Van - - * Add SetNull and SetDefault handlers (fixes #148) - -2012-05-04 Michael Jumper - - * Removed Alt-code fallback mode - * Added embedded default mouse pointer - -2012-05-15 Jocelyn Delalande - - * Unicode keyboard events - -2012-05-04 Michael Jumper - - * Initial release - diff --git a/protocols/rdp/LICENSE b/protocols/rdp/LICENSE deleted file mode 100644 index 7714141d..00000000 --- a/protocols/rdp/LICENSE +++ /dev/null @@ -1,470 +0,0 @@ - MOZILLA PUBLIC LICENSE - Version 1.1 - - --------------- - -1. Definitions. - - 1.0.1. "Commercial Use" means distribution or otherwise making the - Covered Code available to a third party. - - 1.1. "Contributor" means each entity that creates or contributes to - the creation of Modifications. - - 1.2. "Contributor Version" means the combination of the Original - Code, prior Modifications used by a Contributor, and the Modifications - made by that particular Contributor. - - 1.3. "Covered Code" means the Original Code or Modifications or the - combination of the Original Code and Modifications, in each case - including portions thereof. - - 1.4. "Electronic Distribution Mechanism" means a mechanism generally - accepted in the software development community for the electronic - transfer of data. - - 1.5. "Executable" means Covered Code in any form other than Source - Code. - - 1.6. "Initial Developer" means the individual or entity identified - as the Initial Developer in the Source Code notice required by Exhibit - A. - - 1.7. "Larger Work" means a work which combines Covered Code or - portions thereof with code not governed by the terms of this License. - - 1.8. "License" means this document. - - 1.8.1. "Licensable" means having the right to grant, to the maximum - extent possible, whether at the time of the initial grant or - subsequently acquired, any and all of the rights conveyed herein. - - 1.9. "Modifications" means any addition to or deletion from the - substance or structure of either the Original Code or any previous - Modifications. When Covered Code is released as a series of files, a - Modification is: - A. Any addition to or deletion from the contents of a file - containing Original Code or previous Modifications. - - B. Any new file that contains any part of the Original Code or - previous Modifications. - - 1.10. "Original Code" means Source Code of computer software code - which is described in the Source Code notice required by Exhibit A as - Original Code, and which, at the time of its release under this - License is not already Covered Code governed by this License. - - 1.10.1. "Patent Claims" means any patent claim(s), now owned or - hereafter acquired, including without limitation, method, process, - and apparatus claims, in any patent Licensable by grantor. - - 1.11. "Source Code" means the preferred form of the Covered Code for - making modifications to it, including all modules it contains, plus - any associated interface definition files, scripts used to control - compilation and installation of an Executable, or source code - differential comparisons against either the Original Code or another - well known, available Covered Code of the Contributor's choice. The - Source Code can be in a compressed or archival form, provided the - appropriate decompression or de-archiving software is widely available - for no charge. - - 1.12. "You" (or "Your") means an individual or a legal entity - exercising rights under, and complying with all of the terms of, this - License or a future version of this License issued under Section 6.1. - For legal entities, "You" includes any entity which controls, is - controlled by, or is under common control with You. For purposes of - this definition, "control" means (a) the power, direct or indirect, - to cause the direction or management of such entity, whether by - contract or otherwise, or (b) ownership of more than fifty percent - (50%) of the outstanding shares or beneficial ownership of such - entity. - -2. Source Code License. - - 2.1. The Initial Developer Grant. - The Initial Developer hereby grants You a world-wide, royalty-free, - non-exclusive license, subject to third party intellectual property - claims: - (a) under intellectual property rights (other than patent or - trademark) Licensable by Initial Developer to use, reproduce, - modify, display, perform, sublicense and distribute the Original - Code (or portions thereof) with or without Modifications, and/or - as part of a Larger Work; and - - (b) under Patents Claims infringed by the making, using or - selling of Original Code, to make, have made, use, practice, - sell, and offer for sale, and/or otherwise dispose of the - Original Code (or portions thereof). - - (c) the licenses granted in this Section 2.1(a) and (b) are - effective on the date Initial Developer first distributes - Original Code under the terms of this License. - - (d) Notwithstanding Section 2.1(b) above, no patent license is - granted: 1) for code that You delete from the Original Code; 2) - separate from the Original Code; or 3) for infringements caused - by: i) the modification of the Original Code or ii) the - combination of the Original Code with other software or devices. - - 2.2. Contributor Grant. - Subject to third party intellectual property claims, each Contributor - hereby grants You a world-wide, royalty-free, non-exclusive license - - (a) under intellectual property rights (other than patent or - trademark) Licensable by Contributor, to use, reproduce, modify, - display, perform, sublicense and distribute the Modifications - created by such Contributor (or portions thereof) either on an - unmodified basis, with other Modifications, as Covered Code - and/or as part of a Larger Work; and - - (b) under Patent Claims infringed by the making, using, or - selling of Modifications made by that Contributor either alone - and/or in combination with its Contributor Version (or portions - of such combination), to make, use, sell, offer for sale, have - made, and/or otherwise dispose of: 1) Modifications made by that - Contributor (or portions thereof); and 2) the combination of - Modifications made by that Contributor with its Contributor - Version (or portions of such combination). - - (c) the licenses granted in Sections 2.2(a) and 2.2(b) are - effective on the date Contributor first makes Commercial Use of - the Covered Code. - - (d) Notwithstanding Section 2.2(b) above, no patent license is - granted: 1) for any code that Contributor has deleted from the - Contributor Version; 2) separate from the Contributor Version; - 3) for infringements caused by: i) third party modifications of - Contributor Version or ii) the combination of Modifications made - by that Contributor with other software (except as part of the - Contributor Version) or other devices; or 4) under Patent Claims - infringed by Covered Code in the absence of Modifications made by - that Contributor. - -3. Distribution Obligations. - - 3.1. Application of License. - The Modifications which You create or to which You contribute are - governed by the terms of this License, including without limitation - Section 2.2. The Source Code version of Covered Code may be - distributed only under the terms of this License or a future version - of this License released under Section 6.1, and You must include a - copy of this License with every copy of the Source Code You - distribute. You may not offer or impose any terms on any Source Code - version that alters or restricts the applicable version of this - License or the recipients' rights hereunder. However, You may include - an additional document offering the additional rights described in - Section 3.5. - - 3.2. Availability of Source Code. - Any Modification which You create or to which You contribute must be - made available in Source Code form under the terms of this License - either on the same media as an Executable version or via an accepted - Electronic Distribution Mechanism to anyone to whom you made an - Executable version available; and if made available via Electronic - Distribution Mechanism, must remain available for at least twelve (12) - months after the date it initially became available, or at least six - (6) months after a subsequent version of that particular Modification - has been made available to such recipients. You are responsible for - ensuring that the Source Code version remains available even if the - Electronic Distribution Mechanism is maintained by a third party. - - 3.3. Description of Modifications. - You must cause all Covered Code to which You contribute to contain a - file documenting the changes You made to create that Covered Code and - the date of any change. You must include a prominent statement that - the Modification is derived, directly or indirectly, from Original - Code provided by the Initial Developer and including the name of the - Initial Developer in (a) the Source Code, and (b) in any notice in an - Executable version or related documentation in which You describe the - origin or ownership of the Covered Code. - - 3.4. Intellectual Property Matters - (a) Third Party Claims. - If Contributor has knowledge that a license under a third party's - intellectual property rights is required to exercise the rights - granted by such Contributor under Sections 2.1 or 2.2, - Contributor must include a text file with the Source Code - distribution titled "LEGAL" which describes the claim and the - party making the claim in sufficient detail that a recipient will - know whom to contact. If Contributor obtains such knowledge after - the Modification is made available as described in Section 3.2, - Contributor shall promptly modify the LEGAL file in all copies - Contributor makes available thereafter and shall take other steps - (such as notifying appropriate mailing lists or newsgroups) - reasonably calculated to inform those who received the Covered - Code that new knowledge has been obtained. - - (b) Contributor APIs. - If Contributor's Modifications include an application programming - interface and Contributor has knowledge of patent licenses which - are reasonably necessary to implement that API, Contributor must - also include this information in the LEGAL file. - - (c) Representations. - Contributor represents that, except as disclosed pursuant to - Section 3.4(a) above, Contributor believes that Contributor's - Modifications are Contributor's original creation(s) and/or - Contributor has sufficient rights to grant the rights conveyed by - this License. - - 3.5. Required Notices. - You must duplicate the notice in Exhibit A in each file of the Source - Code. If it is not possible to put such notice in a particular Source - Code file due to its structure, then You must include such notice in a - location (such as a relevant directory) where a user would be likely - to look for such a notice. If You created one or more Modification(s) - You may add your name as a Contributor to the notice described in - Exhibit A. You must also duplicate this License in any documentation - for the Source Code where You describe recipients' rights or ownership - rights relating to Covered Code. You may choose to offer, and to - charge a fee for, warranty, support, indemnity or liability - obligations to one or more recipients of Covered Code. However, You - may do so only on Your own behalf, and not on behalf of the Initial - Developer or any Contributor. You must make it absolutely clear than - any such warranty, support, indemnity or liability obligation is - offered by You alone, and You hereby agree to indemnify the Initial - Developer and every Contributor for any liability incurred by the - Initial Developer or such Contributor as a result of warranty, - support, indemnity or liability terms You offer. - - 3.6. Distribution of Executable Versions. - You may distribute Covered Code in Executable form only if the - requirements of Section 3.1-3.5 have been met for that Covered Code, - and if You include a notice stating that the Source Code version of - the Covered Code is available under the terms of this License, - including a description of how and where You have fulfilled the - obligations of Section 3.2. The notice must be conspicuously included - in any notice in an Executable version, related documentation or - collateral in which You describe recipients' rights relating to the - Covered Code. You may distribute the Executable version of Covered - Code or ownership rights under a license of Your choice, which may - contain terms different from this License, provided that You are in - compliance with the terms of this License and that the license for the - Executable version does not attempt to limit or alter the recipient's - rights in the Source Code version from the rights set forth in this - License. If You distribute the Executable version under a different - license You must make it absolutely clear that any terms which differ - from this License are offered by You alone, not by the Initial - Developer or any Contributor. You hereby agree to indemnify the - Initial Developer and every Contributor for any liability incurred by - the Initial Developer or such Contributor as a result of any such - terms You offer. - - 3.7. Larger Works. - You may create a Larger Work by combining Covered Code with other code - not governed by the terms of this License and distribute the Larger - Work as a single product. In such a case, You must make sure the - requirements of this License are fulfilled for the Covered Code. - -4. Inability to Comply Due to Statute or Regulation. - - If it is impossible for You to comply with any of the terms of this - License with respect to some or all of the Covered Code due to - statute, judicial order, or regulation then You must: (a) comply with - the terms of this License to the maximum extent possible; and (b) - describe the limitations and the code they affect. Such description - must be included in the LEGAL file described in Section 3.4 and must - be included with all distributions of the Source Code. Except to the - extent prohibited by statute or regulation, such description must be - sufficiently detailed for a recipient of ordinary skill to be able to - understand it. - -5. Application of this License. - - This License applies to code to which the Initial Developer has - attached the notice in Exhibit A and to related Covered Code. - -6. Versions of the License. - - 6.1. New Versions. - Netscape Communications Corporation ("Netscape") may publish revised - and/or new versions of the License from time to time. Each version - will be given a distinguishing version number. - - 6.2. Effect of New Versions. - Once Covered Code has been published under a particular version of the - License, You may always continue to use it under the terms of that - version. You may also choose to use such Covered Code under the terms - of any subsequent version of the License published by Netscape. No one - other than Netscape has the right to modify the terms applicable to - Covered Code created under this License. - - 6.3. Derivative Works. - If You create or use a modified version of this License (which you may - only do in order to apply it to code which is not already Covered Code - governed by this License), You must (a) rename Your license so that - the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", - "MPL", "NPL" or any confusingly similar phrase do not appear in your - license (except to note that your license differs from this License) - and (b) otherwise make it clear that Your version of the license - contains terms which differ from the Mozilla Public License and - Netscape Public License. (Filling in the name of the Initial - Developer, Original Code or Contributor in the notice described in - Exhibit A shall not of themselves be deemed to be modifications of - this License.) - -7. DISCLAIMER OF WARRANTY. - - COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, - WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF - DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. - THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE - IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, - YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE - COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER - OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF - ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -8. TERMINATION. - - 8.1. This License and the rights granted hereunder will terminate - automatically if You fail to comply with terms herein and fail to cure - such breach within 30 days of becoming aware of the breach. All - sublicenses to the Covered Code which are properly granted shall - survive any termination of this License. Provisions which, by their - nature, must remain in effect beyond the termination of this License - shall survive. - - 8.2. If You initiate litigation by asserting a patent infringement - claim (excluding declatory judgment actions) against Initial Developer - or a Contributor (the Initial Developer or Contributor against whom - You file such action is referred to as "Participant") alleging that: - - (a) such Participant's Contributor Version directly or indirectly - infringes any patent, then any and all rights granted by such - Participant to You under Sections 2.1 and/or 2.2 of this License - shall, upon 60 days notice from Participant terminate prospectively, - unless if within 60 days after receipt of notice You either: (i) - agree in writing to pay Participant a mutually agreeable reasonable - royalty for Your past and future use of Modifications made by such - Participant, or (ii) withdraw Your litigation claim with respect to - the Contributor Version against such Participant. If within 60 days - of notice, a reasonable royalty and payment arrangement are not - mutually agreed upon in writing by the parties or the litigation claim - is not withdrawn, the rights granted by Participant to You under - Sections 2.1 and/or 2.2 automatically terminate at the expiration of - the 60 day notice period specified above. - - (b) any software, hardware, or device, other than such Participant's - Contributor Version, directly or indirectly infringes any patent, then - any rights granted to You by such Participant under Sections 2.1(b) - and 2.2(b) are revoked effective as of the date You first made, used, - sold, distributed, or had made, Modifications made by that - Participant. - - 8.3. If You assert a patent infringement claim against Participant - alleging that such Participant's Contributor Version directly or - indirectly infringes any patent where such claim is resolved (such as - by license or settlement) prior to the initiation of patent - infringement litigation, then the reasonable value of the licenses - granted by such Participant under Sections 2.1 or 2.2 shall be taken - into account in determining the amount or value of any payment or - license. - - 8.4. In the event of termination under Sections 8.1 or 8.2 above, - all end user license agreements (excluding distributors and resellers) - which have been validly granted by You or any distributor hereunder - prior to termination shall survive termination. - -9. LIMITATION OF LIABILITY. - - UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT - (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL - DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, - OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR - ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY - CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, - WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER - COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN - INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF - LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY - RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW - PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE - EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO - THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. - -10. U.S. GOVERNMENT END USERS. - - The Covered Code is a "commercial item," as that term is defined in - 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer - software" and "commercial computer software documentation," as such - terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 - C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), - all U.S. Government End Users acquire Covered Code with only those - rights set forth herein. - -11. MISCELLANEOUS. - - This License represents the complete agreement concerning subject - matter hereof. If any provision of this License is held to be - unenforceable, such provision shall be reformed only to the extent - necessary to make it enforceable. This License shall be governed by - California law provisions (except to the extent applicable law, if - any, provides otherwise), excluding its conflict-of-law provisions. - With respect to disputes in which at least one party is a citizen of, - or an entity chartered or registered to do business in the United - States of America, any litigation relating to this License shall be - subject to the jurisdiction of the Federal Courts of the Northern - District of California, with venue lying in Santa Clara County, - California, with the losing party responsible for costs, including - without limitation, court costs and reasonable attorneys' fees and - expenses. The application of the United Nations Convention on - Contracts for the International Sale of Goods is expressly excluded. - Any law or regulation which provides that the language of a contract - shall be construed against the drafter shall not apply to this - License. - -12. RESPONSIBILITY FOR CLAIMS. - - As between Initial Developer and the Contributors, each party is - responsible for claims and damages arising, directly or indirectly, - out of its utilization of rights under this License and You agree to - work with Initial Developer and Contributors to distribute such - responsibility on an equitable basis. Nothing herein is intended or - shall be deemed to constitute any admission of liability. - -13. MULTIPLE-LICENSED CODE. - - Initial Developer may designate portions of the Covered Code as - "Multiple-Licensed". "Multiple-Licensed" means that the Initial - Developer permits you to utilize portions of the Covered Code under - Your choice of the NPL or the alternative licenses, if any, specified - by the Initial Developer in the file described in Exhibit A. - -EXHIBIT A -Mozilla Public License. - - ``The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. - - The Original Code is ______________________________________. - - The Initial Developer of the Original Code is ________________________. - Portions created by ______________________ are Copyright (C) ______ - _______________________. All Rights Reserved. - - Contributor(s): ______________________________________. - - Alternatively, the contents of this file may be used under the terms - of the _____ license (the "[___] License"), in which case the - provisions of [______] License are applicable instead of those - above. If you wish to allow use of your version of this file only - under the terms of the [____] License and not to allow others to use - your version of this file under the MPL, indicate your decision by - deleting the provisions above and replace them with the notice and - other provisions required by the [___] License. If you do not delete - the provisions above, a recipient may use your version of this file - under either the MPL or the [___] License." - - [NOTE: The text of this Exhibit A may differ slightly from the text of - the notices in the Source Code files of the Original Code. You should - use the text of this Exhibit A rather than the text found in the - Original Code Source Code for Your Modifications.] - diff --git a/protocols/rdp/README b/protocols/rdp/README deleted file mode 100644 index 84629d07..00000000 --- a/protocols/rdp/README +++ /dev/null @@ -1,75 +0,0 @@ - ------------------------------------------------------------- - About this README ------------------------------------------------------------- - -This README is intended to provide quick and to-the-point documentation for -technical users intending to compile parts of Guacamole themselves. - -Distribution-specific packages are available from the files section of the main -project page: - - http://sourceforge.net/projects/guacamole/files/ - -Distribution-specific documentation is provided on the Guacamole wiki: - - http://guac-dev.org/ - - ------------------------------------------------------------- - What is libguac-client-rdp? ------------------------------------------------------------- - -libguac-client-rdp is a protocol support plugin for the Guacamole proxy (guacd) -which provides support for RDP, the proprietary remote desktop protocol used -by Windows Remote Deskop / Terminal Services, via the libfreerdp library. - - ------------------------------------------------------------- - Compiling and installing libguac-client-rdp ------------------------------------------------------------- - -Please note that distribution-specific pre-compiled packages are available from -the files section of the main project site: - - http://sourceforge.net/projects/guacamole/files/ - -libguac-client-rdp is built using the popular GNU Automake, and thus provides -the standard configure script. - -1) Run configure - - $ ./configure - - Assuming all dependencies have been installed, this should succeed without - errors. - -2) Run make - - $ make - - libguac-client-rdp will now compile. - -3) Install (as root) - - # make install - - libguac-client-rdp will install to your /usr/local/lib directory by default. - You can change the install location by using the --prefix option for - configure. - - You will need to run ldconfig (as root) so that guacd can find the library - when needed: - - # ldconfig - - ------------------------------------------------------------- - Reporting problems ------------------------------------------------------------- - -Please report any bugs encountered by opening a new ticket at the Trac system -hosted at: - - http://guac-dev.org/trac/ - diff --git a/protocols/rdp/configure.ac b/protocols/rdp/configure.ac deleted file mode 100644 index 937b675f..00000000 --- a/protocols/rdp/configure.ac +++ /dev/null @@ -1,102 +0,0 @@ -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is libguac-client-rdp. -# -# The Initial Developer of the Original Code is -# Michael Jumper. -# Portions created by the Initial Developer are Copyright (C) 2011 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -AC_PREREQ([2.61]) -AC_INIT([libguac-client-rdp], [0.7.4]) -AM_INIT_AUTOMAKE([-Wall -Werror foreign]) - -LT_PREREQ([2.2]) -LT_INIT([dlopen]) - -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_SRCDIR([src/client.c]) - -# Programs -AC_PROG_CC -AC_PROG_CC_C99 -AC_PROG_LIBTOOL - -# Libraries -AC_CHECK_LIB([pthread], [pthread_mutex_init],, AC_MSG_ERROR("libpthread is required")) -AC_CHECK_LIB([cairo], [cairo_create],, AC_MSG_ERROR("cairo is required for drawing instructions")) -AC_CHECK_LIB([freerdp-cache], [glyph_cache_register_callbacks],, AC_MSG_ERROR("libfreerdp-cache is required (part of FreeRDP)")) -AC_CHECK_LIB([freerdp-core], [freerdp_new],, AC_MSG_ERROR("libfreerdp-core is required (part of FreeRDP)")) -AC_CHECK_LIB([freerdp-channels], [freerdp_channels_new],, AC_MSG_ERROR("libfreerdp-channels is required (part of FreeRDP)")) -AC_CHECK_LIB([freerdp-utils], [xzalloc],, AC_MSG_ERROR("libfreerdp-utils is required (part of FreeRDP)")) -AC_CHECK_LIB([freerdp-codec], [freerdp_image_convert],, AC_MSG_ERROR("libfreerdp-codec is required (part of FreeRDP)")) - - -# If bundled copy of libguac found, use that -if test -d "$srcdir/../../libguac" -then - AC_SUBST([LIBGUAC_LTLIB], '$(top_builddir)/../../libguac/src/libguac.la') - AC_SUBST([LIBGUAC_INCLUDE], '-I$(top_srcdir)/../../libguac/include') -else - AC_CHECK_LIB([guac], [guac_client_plugin_open]) -fi - -have_vorbisenc=yes -AC_CHECK_HEADER(vorbis/vorbisenc.h,, [have_vorbisenc=no]) -AC_CHECK_LIB([vorbisenc], [vorbis_encode_init],, [have_vorbisenc=no]) -AM_CONDITIONAL([ENABLE_OGG], [test "x${have_vorbisenc}" = "xyes"]) - -if test "x${have_vorbisenc}" = "xno" -then - AC_MSG_WARN([ - -------------------------------------------- - Unable to find libvorbisenc. - Sound will not be encoded with Ogg Vorbis. - --------------------------------------------]) -else - AC_DEFINE([ENABLE_OGG]) -fi - -# Functions -AC_FUNC_MALLOC -AC_CHECK_FUNCS([memset socket strerror fork]) - -# Headers -AC_CHECK_HEADERS([freerdp/locale/keyboard.h freerdp/kbd/layouts.h]) - -# Check for FreeRDP version-specific features -AC_CHECK_MEMBERS([rdpPointer.SetDefault, rdpPointer.SetNull], - [], [], - [[#include ]]) - -# Done -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT - diff --git a/protocols/rdp/m4/README b/protocols/rdp/m4/README deleted file mode 100644 index c9c9cbc4..00000000 --- a/protocols/rdp/m4/README +++ /dev/null @@ -1,12 +0,0 @@ -This file exists such that the m4/ directory will be created when cloning the -git repository. - -The m4/ directory is not directly used by this project, but libtoolize -populates this directory with files, recommending that the directory be -included in the macro search path for aclocal. - -Because autoreconf runs aclocal before libtoolize, this directory will not -exist when autoreconf is run, triggering an error from aclocal. - -Creating this directory (and keeping this file in it as a placeholder) -prevents this error. diff --git a/protocols/spice/AUTHORS b/protocols/spice/AUTHORS deleted file mode 100644 index b2d2718d..00000000 --- a/protocols/spice/AUTHORS +++ /dev/null @@ -1 +0,0 @@ -Michael Jumper diff --git a/protocols/spice/ChangeLog b/protocols/spice/ChangeLog deleted file mode 100644 index 8b137891..00000000 --- a/protocols/spice/ChangeLog +++ /dev/null @@ -1 +0,0 @@ - diff --git a/protocols/spice/LICENSE b/protocols/spice/LICENSE deleted file mode 100644 index 7714141d..00000000 --- a/protocols/spice/LICENSE +++ /dev/null @@ -1,470 +0,0 @@ - MOZILLA PUBLIC LICENSE - Version 1.1 - - --------------- - -1. Definitions. - - 1.0.1. "Commercial Use" means distribution or otherwise making the - Covered Code available to a third party. - - 1.1. "Contributor" means each entity that creates or contributes to - the creation of Modifications. - - 1.2. "Contributor Version" means the combination of the Original - Code, prior Modifications used by a Contributor, and the Modifications - made by that particular Contributor. - - 1.3. "Covered Code" means the Original Code or Modifications or the - combination of the Original Code and Modifications, in each case - including portions thereof. - - 1.4. "Electronic Distribution Mechanism" means a mechanism generally - accepted in the software development community for the electronic - transfer of data. - - 1.5. "Executable" means Covered Code in any form other than Source - Code. - - 1.6. "Initial Developer" means the individual or entity identified - as the Initial Developer in the Source Code notice required by Exhibit - A. - - 1.7. "Larger Work" means a work which combines Covered Code or - portions thereof with code not governed by the terms of this License. - - 1.8. "License" means this document. - - 1.8.1. "Licensable" means having the right to grant, to the maximum - extent possible, whether at the time of the initial grant or - subsequently acquired, any and all of the rights conveyed herein. - - 1.9. "Modifications" means any addition to or deletion from the - substance or structure of either the Original Code or any previous - Modifications. When Covered Code is released as a series of files, a - Modification is: - A. Any addition to or deletion from the contents of a file - containing Original Code or previous Modifications. - - B. Any new file that contains any part of the Original Code or - previous Modifications. - - 1.10. "Original Code" means Source Code of computer software code - which is described in the Source Code notice required by Exhibit A as - Original Code, and which, at the time of its release under this - License is not already Covered Code governed by this License. - - 1.10.1. "Patent Claims" means any patent claim(s), now owned or - hereafter acquired, including without limitation, method, process, - and apparatus claims, in any patent Licensable by grantor. - - 1.11. "Source Code" means the preferred form of the Covered Code for - making modifications to it, including all modules it contains, plus - any associated interface definition files, scripts used to control - compilation and installation of an Executable, or source code - differential comparisons against either the Original Code or another - well known, available Covered Code of the Contributor's choice. The - Source Code can be in a compressed or archival form, provided the - appropriate decompression or de-archiving software is widely available - for no charge. - - 1.12. "You" (or "Your") means an individual or a legal entity - exercising rights under, and complying with all of the terms of, this - License or a future version of this License issued under Section 6.1. - For legal entities, "You" includes any entity which controls, is - controlled by, or is under common control with You. For purposes of - this definition, "control" means (a) the power, direct or indirect, - to cause the direction or management of such entity, whether by - contract or otherwise, or (b) ownership of more than fifty percent - (50%) of the outstanding shares or beneficial ownership of such - entity. - -2. Source Code License. - - 2.1. The Initial Developer Grant. - The Initial Developer hereby grants You a world-wide, royalty-free, - non-exclusive license, subject to third party intellectual property - claims: - (a) under intellectual property rights (other than patent or - trademark) Licensable by Initial Developer to use, reproduce, - modify, display, perform, sublicense and distribute the Original - Code (or portions thereof) with or without Modifications, and/or - as part of a Larger Work; and - - (b) under Patents Claims infringed by the making, using or - selling of Original Code, to make, have made, use, practice, - sell, and offer for sale, and/or otherwise dispose of the - Original Code (or portions thereof). - - (c) the licenses granted in this Section 2.1(a) and (b) are - effective on the date Initial Developer first distributes - Original Code under the terms of this License. - - (d) Notwithstanding Section 2.1(b) above, no patent license is - granted: 1) for code that You delete from the Original Code; 2) - separate from the Original Code; or 3) for infringements caused - by: i) the modification of the Original Code or ii) the - combination of the Original Code with other software or devices. - - 2.2. Contributor Grant. - Subject to third party intellectual property claims, each Contributor - hereby grants You a world-wide, royalty-free, non-exclusive license - - (a) under intellectual property rights (other than patent or - trademark) Licensable by Contributor, to use, reproduce, modify, - display, perform, sublicense and distribute the Modifications - created by such Contributor (or portions thereof) either on an - unmodified basis, with other Modifications, as Covered Code - and/or as part of a Larger Work; and - - (b) under Patent Claims infringed by the making, using, or - selling of Modifications made by that Contributor either alone - and/or in combination with its Contributor Version (or portions - of such combination), to make, use, sell, offer for sale, have - made, and/or otherwise dispose of: 1) Modifications made by that - Contributor (or portions thereof); and 2) the combination of - Modifications made by that Contributor with its Contributor - Version (or portions of such combination). - - (c) the licenses granted in Sections 2.2(a) and 2.2(b) are - effective on the date Contributor first makes Commercial Use of - the Covered Code. - - (d) Notwithstanding Section 2.2(b) above, no patent license is - granted: 1) for any code that Contributor has deleted from the - Contributor Version; 2) separate from the Contributor Version; - 3) for infringements caused by: i) third party modifications of - Contributor Version or ii) the combination of Modifications made - by that Contributor with other software (except as part of the - Contributor Version) or other devices; or 4) under Patent Claims - infringed by Covered Code in the absence of Modifications made by - that Contributor. - -3. Distribution Obligations. - - 3.1. Application of License. - The Modifications which You create or to which You contribute are - governed by the terms of this License, including without limitation - Section 2.2. The Source Code version of Covered Code may be - distributed only under the terms of this License or a future version - of this License released under Section 6.1, and You must include a - copy of this License with every copy of the Source Code You - distribute. You may not offer or impose any terms on any Source Code - version that alters or restricts the applicable version of this - License or the recipients' rights hereunder. However, You may include - an additional document offering the additional rights described in - Section 3.5. - - 3.2. Availability of Source Code. - Any Modification which You create or to which You contribute must be - made available in Source Code form under the terms of this License - either on the same media as an Executable version or via an accepted - Electronic Distribution Mechanism to anyone to whom you made an - Executable version available; and if made available via Electronic - Distribution Mechanism, must remain available for at least twelve (12) - months after the date it initially became available, or at least six - (6) months after a subsequent version of that particular Modification - has been made available to such recipients. You are responsible for - ensuring that the Source Code version remains available even if the - Electronic Distribution Mechanism is maintained by a third party. - - 3.3. Description of Modifications. - You must cause all Covered Code to which You contribute to contain a - file documenting the changes You made to create that Covered Code and - the date of any change. You must include a prominent statement that - the Modification is derived, directly or indirectly, from Original - Code provided by the Initial Developer and including the name of the - Initial Developer in (a) the Source Code, and (b) in any notice in an - Executable version or related documentation in which You describe the - origin or ownership of the Covered Code. - - 3.4. Intellectual Property Matters - (a) Third Party Claims. - If Contributor has knowledge that a license under a third party's - intellectual property rights is required to exercise the rights - granted by such Contributor under Sections 2.1 or 2.2, - Contributor must include a text file with the Source Code - distribution titled "LEGAL" which describes the claim and the - party making the claim in sufficient detail that a recipient will - know whom to contact. If Contributor obtains such knowledge after - the Modification is made available as described in Section 3.2, - Contributor shall promptly modify the LEGAL file in all copies - Contributor makes available thereafter and shall take other steps - (such as notifying appropriate mailing lists or newsgroups) - reasonably calculated to inform those who received the Covered - Code that new knowledge has been obtained. - - (b) Contributor APIs. - If Contributor's Modifications include an application programming - interface and Contributor has knowledge of patent licenses which - are reasonably necessary to implement that API, Contributor must - also include this information in the LEGAL file. - - (c) Representations. - Contributor represents that, except as disclosed pursuant to - Section 3.4(a) above, Contributor believes that Contributor's - Modifications are Contributor's original creation(s) and/or - Contributor has sufficient rights to grant the rights conveyed by - this License. - - 3.5. Required Notices. - You must duplicate the notice in Exhibit A in each file of the Source - Code. If it is not possible to put such notice in a particular Source - Code file due to its structure, then You must include such notice in a - location (such as a relevant directory) where a user would be likely - to look for such a notice. If You created one or more Modification(s) - You may add your name as a Contributor to the notice described in - Exhibit A. You must also duplicate this License in any documentation - for the Source Code where You describe recipients' rights or ownership - rights relating to Covered Code. You may choose to offer, and to - charge a fee for, warranty, support, indemnity or liability - obligations to one or more recipients of Covered Code. However, You - may do so only on Your own behalf, and not on behalf of the Initial - Developer or any Contributor. You must make it absolutely clear than - any such warranty, support, indemnity or liability obligation is - offered by You alone, and You hereby agree to indemnify the Initial - Developer and every Contributor for any liability incurred by the - Initial Developer or such Contributor as a result of warranty, - support, indemnity or liability terms You offer. - - 3.6. Distribution of Executable Versions. - You may distribute Covered Code in Executable form only if the - requirements of Section 3.1-3.5 have been met for that Covered Code, - and if You include a notice stating that the Source Code version of - the Covered Code is available under the terms of this License, - including a description of how and where You have fulfilled the - obligations of Section 3.2. The notice must be conspicuously included - in any notice in an Executable version, related documentation or - collateral in which You describe recipients' rights relating to the - Covered Code. You may distribute the Executable version of Covered - Code or ownership rights under a license of Your choice, which may - contain terms different from this License, provided that You are in - compliance with the terms of this License and that the license for the - Executable version does not attempt to limit or alter the recipient's - rights in the Source Code version from the rights set forth in this - License. If You distribute the Executable version under a different - license You must make it absolutely clear that any terms which differ - from this License are offered by You alone, not by the Initial - Developer or any Contributor. You hereby agree to indemnify the - Initial Developer and every Contributor for any liability incurred by - the Initial Developer or such Contributor as a result of any such - terms You offer. - - 3.7. Larger Works. - You may create a Larger Work by combining Covered Code with other code - not governed by the terms of this License and distribute the Larger - Work as a single product. In such a case, You must make sure the - requirements of this License are fulfilled for the Covered Code. - -4. Inability to Comply Due to Statute or Regulation. - - If it is impossible for You to comply with any of the terms of this - License with respect to some or all of the Covered Code due to - statute, judicial order, or regulation then You must: (a) comply with - the terms of this License to the maximum extent possible; and (b) - describe the limitations and the code they affect. Such description - must be included in the LEGAL file described in Section 3.4 and must - be included with all distributions of the Source Code. Except to the - extent prohibited by statute or regulation, such description must be - sufficiently detailed for a recipient of ordinary skill to be able to - understand it. - -5. Application of this License. - - This License applies to code to which the Initial Developer has - attached the notice in Exhibit A and to related Covered Code. - -6. Versions of the License. - - 6.1. New Versions. - Netscape Communications Corporation ("Netscape") may publish revised - and/or new versions of the License from time to time. Each version - will be given a distinguishing version number. - - 6.2. Effect of New Versions. - Once Covered Code has been published under a particular version of the - License, You may always continue to use it under the terms of that - version. You may also choose to use such Covered Code under the terms - of any subsequent version of the License published by Netscape. No one - other than Netscape has the right to modify the terms applicable to - Covered Code created under this License. - - 6.3. Derivative Works. - If You create or use a modified version of this License (which you may - only do in order to apply it to code which is not already Covered Code - governed by this License), You must (a) rename Your license so that - the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", - "MPL", "NPL" or any confusingly similar phrase do not appear in your - license (except to note that your license differs from this License) - and (b) otherwise make it clear that Your version of the license - contains terms which differ from the Mozilla Public License and - Netscape Public License. (Filling in the name of the Initial - Developer, Original Code or Contributor in the notice described in - Exhibit A shall not of themselves be deemed to be modifications of - this License.) - -7. DISCLAIMER OF WARRANTY. - - COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, - WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF - DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. - THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE - IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, - YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE - COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER - OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF - ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -8. TERMINATION. - - 8.1. This License and the rights granted hereunder will terminate - automatically if You fail to comply with terms herein and fail to cure - such breach within 30 days of becoming aware of the breach. All - sublicenses to the Covered Code which are properly granted shall - survive any termination of this License. Provisions which, by their - nature, must remain in effect beyond the termination of this License - shall survive. - - 8.2. If You initiate litigation by asserting a patent infringement - claim (excluding declatory judgment actions) against Initial Developer - or a Contributor (the Initial Developer or Contributor against whom - You file such action is referred to as "Participant") alleging that: - - (a) such Participant's Contributor Version directly or indirectly - infringes any patent, then any and all rights granted by such - Participant to You under Sections 2.1 and/or 2.2 of this License - shall, upon 60 days notice from Participant terminate prospectively, - unless if within 60 days after receipt of notice You either: (i) - agree in writing to pay Participant a mutually agreeable reasonable - royalty for Your past and future use of Modifications made by such - Participant, or (ii) withdraw Your litigation claim with respect to - the Contributor Version against such Participant. If within 60 days - of notice, a reasonable royalty and payment arrangement are not - mutually agreed upon in writing by the parties or the litigation claim - is not withdrawn, the rights granted by Participant to You under - Sections 2.1 and/or 2.2 automatically terminate at the expiration of - the 60 day notice period specified above. - - (b) any software, hardware, or device, other than such Participant's - Contributor Version, directly or indirectly infringes any patent, then - any rights granted to You by such Participant under Sections 2.1(b) - and 2.2(b) are revoked effective as of the date You first made, used, - sold, distributed, or had made, Modifications made by that - Participant. - - 8.3. If You assert a patent infringement claim against Participant - alleging that such Participant's Contributor Version directly or - indirectly infringes any patent where such claim is resolved (such as - by license or settlement) prior to the initiation of patent - infringement litigation, then the reasonable value of the licenses - granted by such Participant under Sections 2.1 or 2.2 shall be taken - into account in determining the amount or value of any payment or - license. - - 8.4. In the event of termination under Sections 8.1 or 8.2 above, - all end user license agreements (excluding distributors and resellers) - which have been validly granted by You or any distributor hereunder - prior to termination shall survive termination. - -9. LIMITATION OF LIABILITY. - - UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT - (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL - DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, - OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR - ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY - CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, - WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER - COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN - INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF - LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY - RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW - PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE - EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO - THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. - -10. U.S. GOVERNMENT END USERS. - - The Covered Code is a "commercial item," as that term is defined in - 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer - software" and "commercial computer software documentation," as such - terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 - C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), - all U.S. Government End Users acquire Covered Code with only those - rights set forth herein. - -11. MISCELLANEOUS. - - This License represents the complete agreement concerning subject - matter hereof. If any provision of this License is held to be - unenforceable, such provision shall be reformed only to the extent - necessary to make it enforceable. This License shall be governed by - California law provisions (except to the extent applicable law, if - any, provides otherwise), excluding its conflict-of-law provisions. - With respect to disputes in which at least one party is a citizen of, - or an entity chartered or registered to do business in the United - States of America, any litigation relating to this License shall be - subject to the jurisdiction of the Federal Courts of the Northern - District of California, with venue lying in Santa Clara County, - California, with the losing party responsible for costs, including - without limitation, court costs and reasonable attorneys' fees and - expenses. The application of the United Nations Convention on - Contracts for the International Sale of Goods is expressly excluded. - Any law or regulation which provides that the language of a contract - shall be construed against the drafter shall not apply to this - License. - -12. RESPONSIBILITY FOR CLAIMS. - - As between Initial Developer and the Contributors, each party is - responsible for claims and damages arising, directly or indirectly, - out of its utilization of rights under this License and You agree to - work with Initial Developer and Contributors to distribute such - responsibility on an equitable basis. Nothing herein is intended or - shall be deemed to constitute any admission of liability. - -13. MULTIPLE-LICENSED CODE. - - Initial Developer may designate portions of the Covered Code as - "Multiple-Licensed". "Multiple-Licensed" means that the Initial - Developer permits you to utilize portions of the Covered Code under - Your choice of the NPL or the alternative licenses, if any, specified - by the Initial Developer in the file described in Exhibit A. - -EXHIBIT A -Mozilla Public License. - - ``The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. - - The Original Code is ______________________________________. - - The Initial Developer of the Original Code is ________________________. - Portions created by ______________________ are Copyright (C) ______ - _______________________. All Rights Reserved. - - Contributor(s): ______________________________________. - - Alternatively, the contents of this file may be used under the terms - of the _____ license (the "[___] License"), in which case the - provisions of [______] License are applicable instead of those - above. If you wish to allow use of your version of this file only - under the terms of the [____] License and not to allow others to use - your version of this file under the MPL, indicate your decision by - deleting the provisions above and replace them with the notice and - other provisions required by the [___] License. If you do not delete - the provisions above, a recipient may use your version of this file - under either the MPL or the [___] License." - - [NOTE: The text of this Exhibit A may differ slightly from the text of - the notices in the Source Code files of the Original Code. You should - use the text of this Exhibit A rather than the text found in the - Original Code Source Code for Your Modifications.] - diff --git a/protocols/spice/README b/protocols/spice/README deleted file mode 100644 index 193196a0..00000000 --- a/protocols/spice/README +++ /dev/null @@ -1,76 +0,0 @@ - ------------------------------------------------------------- - About this README ------------------------------------------------------------- - -This README is intended to provide quick and to-the-point documentation for -technical users intending to compile parts of Guacamole themselves. - -Distribution-specific packages are available from the files section of the main -project page: - - http://sourceforge.net/projects/guacamole/files/ - -Distribution-specific documentation is provided on the Guacamole wiki: - - http://guac-dev.org/ - - ------------------------------------------------------------- - What is libguac-client-spice? ------------------------------------------------------------- - -libguac-client-spice is a protocol support plugin for the Guacamole proxy (guacd) -which provides support for SPICE, a remote desktop protocol mainly used by KVM -for exposing displays of virtual machines remotely, though other SPICE servers -have been written which allow a normal desktop to be served. - - ------------------------------------------------------------- - Compiling and installing libguac-client-spice ------------------------------------------------------------- - -Please note that distribution-specific pre-compiled packages are available from -the files section of the main project site: - - http://sourceforge.net/projects/guacamole/files/ - -libguac-client-spice is built using the popular GNU Automake, and thus provides -the standard configure script. - -1) Run configure - - $ ./configure - - Assuming all dependencies have been installed, this should succeed without - errors. - -2) Run make - - $ make - - libguac-client-spice will now compile. - -3) Install (as root) - - # make install - - libguac-client-spice will install to your /usr/local/lib directory by default. - You can change the install location by using the --prefix option for - configure. - - You will need to run ldconfig (as root) so that guacd can find the library - when needed: - - # ldconfig - - ------------------------------------------------------------- - Reporting problems ------------------------------------------------------------- - -Please report any bugs encountered by opening a new ticket at the Trac system -hosted at: - - http://guac-dev.org/trac/ - diff --git a/protocols/spice/configure.ac b/protocols/spice/configure.ac deleted file mode 100644 index 59b77287..00000000 --- a/protocols/spice/configure.ac +++ /dev/null @@ -1,73 +0,0 @@ -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is libguac-client-spice. -# -# The Initial Developer of the Original Code is -# Michael Jumper. -# Portions created by the Initial Developer are Copyright (C) 2011 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -AC_PREREQ([2.61]) -AC_INIT([libguac-client-spice], [0.8.0]) -AM_INIT_AUTOMAKE([-Wall -Werror foreign]) - -LT_PREREQ([2.2]) -LT_INIT([dlopen]) - -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_SRCDIR([src/client.c]) - -# Programs -AC_PROG_CC -AC_PROG_CC_C99 -AC_PROG_LIBTOOL - -# Libraries -AC_CHECK_LIB([pthread], [pthread_create]) -AC_CHECK_LIB([cairo], [cairo_create],, AC_MSG_ERROR("cairo is required for drawing instructions")) -PKG_CHECK_MODULES([SPICE_CLIENT_GLIB], [spice-client-glib-2.0]) -PKG_CHECK_MODULES([GLIB], [glib-2.0]) - -# If bundled copy of libguac found, use that -if test -d "$srcdir/../../libguac" -then - AC_SUBST([LIBGUAC_LTLIB], '$(top_builddir)/../../libguac/src/libguac.la') - AC_SUBST([LIBGUAC_INCLUDE], '-I$(top_srcdir)/../../libguac/include') -else - AC_CHECK_LIB([guac], [guac_client_plugin_open]) -fi - -# Functions -AC_FUNC_MALLOC - -# Done -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT - diff --git a/protocols/spice/m4/README b/protocols/spice/m4/README deleted file mode 100644 index c9c9cbc4..00000000 --- a/protocols/spice/m4/README +++ /dev/null @@ -1,12 +0,0 @@ -This file exists such that the m4/ directory will be created when cloning the -git repository. - -The m4/ directory is not directly used by this project, but libtoolize -populates this directory with files, recommending that the directory be -included in the macro search path for aclocal. - -Because autoreconf runs aclocal before libtoolize, this directory will not -exist when autoreconf is run, triggering an error from aclocal. - -Creating this directory (and keeping this file in it as a placeholder) -prevents this error. diff --git a/protocols/ssh/AUTHORS b/protocols/ssh/AUTHORS deleted file mode 100644 index 517d7a79..00000000 --- a/protocols/ssh/AUTHORS +++ /dev/null @@ -1 +0,0 @@ -Michael Jumper diff --git a/protocols/ssh/ChangeLog b/protocols/ssh/ChangeLog deleted file mode 100644 index 8b137891..00000000 --- a/protocols/ssh/ChangeLog +++ /dev/null @@ -1 +0,0 @@ - diff --git a/protocols/ssh/LICENSE b/protocols/ssh/LICENSE deleted file mode 100644 index 7714141d..00000000 --- a/protocols/ssh/LICENSE +++ /dev/null @@ -1,470 +0,0 @@ - MOZILLA PUBLIC LICENSE - Version 1.1 - - --------------- - -1. Definitions. - - 1.0.1. "Commercial Use" means distribution or otherwise making the - Covered Code available to a third party. - - 1.1. "Contributor" means each entity that creates or contributes to - the creation of Modifications. - - 1.2. "Contributor Version" means the combination of the Original - Code, prior Modifications used by a Contributor, and the Modifications - made by that particular Contributor. - - 1.3. "Covered Code" means the Original Code or Modifications or the - combination of the Original Code and Modifications, in each case - including portions thereof. - - 1.4. "Electronic Distribution Mechanism" means a mechanism generally - accepted in the software development community for the electronic - transfer of data. - - 1.5. "Executable" means Covered Code in any form other than Source - Code. - - 1.6. "Initial Developer" means the individual or entity identified - as the Initial Developer in the Source Code notice required by Exhibit - A. - - 1.7. "Larger Work" means a work which combines Covered Code or - portions thereof with code not governed by the terms of this License. - - 1.8. "License" means this document. - - 1.8.1. "Licensable" means having the right to grant, to the maximum - extent possible, whether at the time of the initial grant or - subsequently acquired, any and all of the rights conveyed herein. - - 1.9. "Modifications" means any addition to or deletion from the - substance or structure of either the Original Code or any previous - Modifications. When Covered Code is released as a series of files, a - Modification is: - A. Any addition to or deletion from the contents of a file - containing Original Code or previous Modifications. - - B. Any new file that contains any part of the Original Code or - previous Modifications. - - 1.10. "Original Code" means Source Code of computer software code - which is described in the Source Code notice required by Exhibit A as - Original Code, and which, at the time of its release under this - License is not already Covered Code governed by this License. - - 1.10.1. "Patent Claims" means any patent claim(s), now owned or - hereafter acquired, including without limitation, method, process, - and apparatus claims, in any patent Licensable by grantor. - - 1.11. "Source Code" means the preferred form of the Covered Code for - making modifications to it, including all modules it contains, plus - any associated interface definition files, scripts used to control - compilation and installation of an Executable, or source code - differential comparisons against either the Original Code or another - well known, available Covered Code of the Contributor's choice. The - Source Code can be in a compressed or archival form, provided the - appropriate decompression or de-archiving software is widely available - for no charge. - - 1.12. "You" (or "Your") means an individual or a legal entity - exercising rights under, and complying with all of the terms of, this - License or a future version of this License issued under Section 6.1. - For legal entities, "You" includes any entity which controls, is - controlled by, or is under common control with You. For purposes of - this definition, "control" means (a) the power, direct or indirect, - to cause the direction or management of such entity, whether by - contract or otherwise, or (b) ownership of more than fifty percent - (50%) of the outstanding shares or beneficial ownership of such - entity. - -2. Source Code License. - - 2.1. The Initial Developer Grant. - The Initial Developer hereby grants You a world-wide, royalty-free, - non-exclusive license, subject to third party intellectual property - claims: - (a) under intellectual property rights (other than patent or - trademark) Licensable by Initial Developer to use, reproduce, - modify, display, perform, sublicense and distribute the Original - Code (or portions thereof) with or without Modifications, and/or - as part of a Larger Work; and - - (b) under Patents Claims infringed by the making, using or - selling of Original Code, to make, have made, use, practice, - sell, and offer for sale, and/or otherwise dispose of the - Original Code (or portions thereof). - - (c) the licenses granted in this Section 2.1(a) and (b) are - effective on the date Initial Developer first distributes - Original Code under the terms of this License. - - (d) Notwithstanding Section 2.1(b) above, no patent license is - granted: 1) for code that You delete from the Original Code; 2) - separate from the Original Code; or 3) for infringements caused - by: i) the modification of the Original Code or ii) the - combination of the Original Code with other software or devices. - - 2.2. Contributor Grant. - Subject to third party intellectual property claims, each Contributor - hereby grants You a world-wide, royalty-free, non-exclusive license - - (a) under intellectual property rights (other than patent or - trademark) Licensable by Contributor, to use, reproduce, modify, - display, perform, sublicense and distribute the Modifications - created by such Contributor (or portions thereof) either on an - unmodified basis, with other Modifications, as Covered Code - and/or as part of a Larger Work; and - - (b) under Patent Claims infringed by the making, using, or - selling of Modifications made by that Contributor either alone - and/or in combination with its Contributor Version (or portions - of such combination), to make, use, sell, offer for sale, have - made, and/or otherwise dispose of: 1) Modifications made by that - Contributor (or portions thereof); and 2) the combination of - Modifications made by that Contributor with its Contributor - Version (or portions of such combination). - - (c) the licenses granted in Sections 2.2(a) and 2.2(b) are - effective on the date Contributor first makes Commercial Use of - the Covered Code. - - (d) Notwithstanding Section 2.2(b) above, no patent license is - granted: 1) for any code that Contributor has deleted from the - Contributor Version; 2) separate from the Contributor Version; - 3) for infringements caused by: i) third party modifications of - Contributor Version or ii) the combination of Modifications made - by that Contributor with other software (except as part of the - Contributor Version) or other devices; or 4) under Patent Claims - infringed by Covered Code in the absence of Modifications made by - that Contributor. - -3. Distribution Obligations. - - 3.1. Application of License. - The Modifications which You create or to which You contribute are - governed by the terms of this License, including without limitation - Section 2.2. The Source Code version of Covered Code may be - distributed only under the terms of this License or a future version - of this License released under Section 6.1, and You must include a - copy of this License with every copy of the Source Code You - distribute. You may not offer or impose any terms on any Source Code - version that alters or restricts the applicable version of this - License or the recipients' rights hereunder. However, You may include - an additional document offering the additional rights described in - Section 3.5. - - 3.2. Availability of Source Code. - Any Modification which You create or to which You contribute must be - made available in Source Code form under the terms of this License - either on the same media as an Executable version or via an accepted - Electronic Distribution Mechanism to anyone to whom you made an - Executable version available; and if made available via Electronic - Distribution Mechanism, must remain available for at least twelve (12) - months after the date it initially became available, or at least six - (6) months after a subsequent version of that particular Modification - has been made available to such recipients. You are responsible for - ensuring that the Source Code version remains available even if the - Electronic Distribution Mechanism is maintained by a third party. - - 3.3. Description of Modifications. - You must cause all Covered Code to which You contribute to contain a - file documenting the changes You made to create that Covered Code and - the date of any change. You must include a prominent statement that - the Modification is derived, directly or indirectly, from Original - Code provided by the Initial Developer and including the name of the - Initial Developer in (a) the Source Code, and (b) in any notice in an - Executable version or related documentation in which You describe the - origin or ownership of the Covered Code. - - 3.4. Intellectual Property Matters - (a) Third Party Claims. - If Contributor has knowledge that a license under a third party's - intellectual property rights is required to exercise the rights - granted by such Contributor under Sections 2.1 or 2.2, - Contributor must include a text file with the Source Code - distribution titled "LEGAL" which describes the claim and the - party making the claim in sufficient detail that a recipient will - know whom to contact. If Contributor obtains such knowledge after - the Modification is made available as described in Section 3.2, - Contributor shall promptly modify the LEGAL file in all copies - Contributor makes available thereafter and shall take other steps - (such as notifying appropriate mailing lists or newsgroups) - reasonably calculated to inform those who received the Covered - Code that new knowledge has been obtained. - - (b) Contributor APIs. - If Contributor's Modifications include an application programming - interface and Contributor has knowledge of patent licenses which - are reasonably necessary to implement that API, Contributor must - also include this information in the LEGAL file. - - (c) Representations. - Contributor represents that, except as disclosed pursuant to - Section 3.4(a) above, Contributor believes that Contributor's - Modifications are Contributor's original creation(s) and/or - Contributor has sufficient rights to grant the rights conveyed by - this License. - - 3.5. Required Notices. - You must duplicate the notice in Exhibit A in each file of the Source - Code. If it is not possible to put such notice in a particular Source - Code file due to its structure, then You must include such notice in a - location (such as a relevant directory) where a user would be likely - to look for such a notice. If You created one or more Modification(s) - You may add your name as a Contributor to the notice described in - Exhibit A. You must also duplicate this License in any documentation - for the Source Code where You describe recipients' rights or ownership - rights relating to Covered Code. You may choose to offer, and to - charge a fee for, warranty, support, indemnity or liability - obligations to one or more recipients of Covered Code. However, You - may do so only on Your own behalf, and not on behalf of the Initial - Developer or any Contributor. You must make it absolutely clear than - any such warranty, support, indemnity or liability obligation is - offered by You alone, and You hereby agree to indemnify the Initial - Developer and every Contributor for any liability incurred by the - Initial Developer or such Contributor as a result of warranty, - support, indemnity or liability terms You offer. - - 3.6. Distribution of Executable Versions. - You may distribute Covered Code in Executable form only if the - requirements of Section 3.1-3.5 have been met for that Covered Code, - and if You include a notice stating that the Source Code version of - the Covered Code is available under the terms of this License, - including a description of how and where You have fulfilled the - obligations of Section 3.2. The notice must be conspicuously included - in any notice in an Executable version, related documentation or - collateral in which You describe recipients' rights relating to the - Covered Code. You may distribute the Executable version of Covered - Code or ownership rights under a license of Your choice, which may - contain terms different from this License, provided that You are in - compliance with the terms of this License and that the license for the - Executable version does not attempt to limit or alter the recipient's - rights in the Source Code version from the rights set forth in this - License. If You distribute the Executable version under a different - license You must make it absolutely clear that any terms which differ - from this License are offered by You alone, not by the Initial - Developer or any Contributor. You hereby agree to indemnify the - Initial Developer and every Contributor for any liability incurred by - the Initial Developer or such Contributor as a result of any such - terms You offer. - - 3.7. Larger Works. - You may create a Larger Work by combining Covered Code with other code - not governed by the terms of this License and distribute the Larger - Work as a single product. In such a case, You must make sure the - requirements of this License are fulfilled for the Covered Code. - -4. Inability to Comply Due to Statute or Regulation. - - If it is impossible for You to comply with any of the terms of this - License with respect to some or all of the Covered Code due to - statute, judicial order, or regulation then You must: (a) comply with - the terms of this License to the maximum extent possible; and (b) - describe the limitations and the code they affect. Such description - must be included in the LEGAL file described in Section 3.4 and must - be included with all distributions of the Source Code. Except to the - extent prohibited by statute or regulation, such description must be - sufficiently detailed for a recipient of ordinary skill to be able to - understand it. - -5. Application of this License. - - This License applies to code to which the Initial Developer has - attached the notice in Exhibit A and to related Covered Code. - -6. Versions of the License. - - 6.1. New Versions. - Netscape Communications Corporation ("Netscape") may publish revised - and/or new versions of the License from time to time. Each version - will be given a distinguishing version number. - - 6.2. Effect of New Versions. - Once Covered Code has been published under a particular version of the - License, You may always continue to use it under the terms of that - version. You may also choose to use such Covered Code under the terms - of any subsequent version of the License published by Netscape. No one - other than Netscape has the right to modify the terms applicable to - Covered Code created under this License. - - 6.3. Derivative Works. - If You create or use a modified version of this License (which you may - only do in order to apply it to code which is not already Covered Code - governed by this License), You must (a) rename Your license so that - the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", - "MPL", "NPL" or any confusingly similar phrase do not appear in your - license (except to note that your license differs from this License) - and (b) otherwise make it clear that Your version of the license - contains terms which differ from the Mozilla Public License and - Netscape Public License. (Filling in the name of the Initial - Developer, Original Code or Contributor in the notice described in - Exhibit A shall not of themselves be deemed to be modifications of - this License.) - -7. DISCLAIMER OF WARRANTY. - - COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, - WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF - DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. - THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE - IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, - YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE - COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER - OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF - ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -8. TERMINATION. - - 8.1. This License and the rights granted hereunder will terminate - automatically if You fail to comply with terms herein and fail to cure - such breach within 30 days of becoming aware of the breach. All - sublicenses to the Covered Code which are properly granted shall - survive any termination of this License. Provisions which, by their - nature, must remain in effect beyond the termination of this License - shall survive. - - 8.2. If You initiate litigation by asserting a patent infringement - claim (excluding declatory judgment actions) against Initial Developer - or a Contributor (the Initial Developer or Contributor against whom - You file such action is referred to as "Participant") alleging that: - - (a) such Participant's Contributor Version directly or indirectly - infringes any patent, then any and all rights granted by such - Participant to You under Sections 2.1 and/or 2.2 of this License - shall, upon 60 days notice from Participant terminate prospectively, - unless if within 60 days after receipt of notice You either: (i) - agree in writing to pay Participant a mutually agreeable reasonable - royalty for Your past and future use of Modifications made by such - Participant, or (ii) withdraw Your litigation claim with respect to - the Contributor Version against such Participant. If within 60 days - of notice, a reasonable royalty and payment arrangement are not - mutually agreed upon in writing by the parties or the litigation claim - is not withdrawn, the rights granted by Participant to You under - Sections 2.1 and/or 2.2 automatically terminate at the expiration of - the 60 day notice period specified above. - - (b) any software, hardware, or device, other than such Participant's - Contributor Version, directly or indirectly infringes any patent, then - any rights granted to You by such Participant under Sections 2.1(b) - and 2.2(b) are revoked effective as of the date You first made, used, - sold, distributed, or had made, Modifications made by that - Participant. - - 8.3. If You assert a patent infringement claim against Participant - alleging that such Participant's Contributor Version directly or - indirectly infringes any patent where such claim is resolved (such as - by license or settlement) prior to the initiation of patent - infringement litigation, then the reasonable value of the licenses - granted by such Participant under Sections 2.1 or 2.2 shall be taken - into account in determining the amount or value of any payment or - license. - - 8.4. In the event of termination under Sections 8.1 or 8.2 above, - all end user license agreements (excluding distributors and resellers) - which have been validly granted by You or any distributor hereunder - prior to termination shall survive termination. - -9. LIMITATION OF LIABILITY. - - UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT - (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL - DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, - OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR - ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY - CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, - WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER - COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN - INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF - LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY - RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW - PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE - EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO - THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. - -10. U.S. GOVERNMENT END USERS. - - The Covered Code is a "commercial item," as that term is defined in - 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer - software" and "commercial computer software documentation," as such - terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 - C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), - all U.S. Government End Users acquire Covered Code with only those - rights set forth herein. - -11. MISCELLANEOUS. - - This License represents the complete agreement concerning subject - matter hereof. If any provision of this License is held to be - unenforceable, such provision shall be reformed only to the extent - necessary to make it enforceable. This License shall be governed by - California law provisions (except to the extent applicable law, if - any, provides otherwise), excluding its conflict-of-law provisions. - With respect to disputes in which at least one party is a citizen of, - or an entity chartered or registered to do business in the United - States of America, any litigation relating to this License shall be - subject to the jurisdiction of the Federal Courts of the Northern - District of California, with venue lying in Santa Clara County, - California, with the losing party responsible for costs, including - without limitation, court costs and reasonable attorneys' fees and - expenses. The application of the United Nations Convention on - Contracts for the International Sale of Goods is expressly excluded. - Any law or regulation which provides that the language of a contract - shall be construed against the drafter shall not apply to this - License. - -12. RESPONSIBILITY FOR CLAIMS. - - As between Initial Developer and the Contributors, each party is - responsible for claims and damages arising, directly or indirectly, - out of its utilization of rights under this License and You agree to - work with Initial Developer and Contributors to distribute such - responsibility on an equitable basis. Nothing herein is intended or - shall be deemed to constitute any admission of liability. - -13. MULTIPLE-LICENSED CODE. - - Initial Developer may designate portions of the Covered Code as - "Multiple-Licensed". "Multiple-Licensed" means that the Initial - Developer permits you to utilize portions of the Covered Code under - Your choice of the NPL or the alternative licenses, if any, specified - by the Initial Developer in the file described in Exhibit A. - -EXHIBIT A -Mozilla Public License. - - ``The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. - - The Original Code is ______________________________________. - - The Initial Developer of the Original Code is ________________________. - Portions created by ______________________ are Copyright (C) ______ - _______________________. All Rights Reserved. - - Contributor(s): ______________________________________. - - Alternatively, the contents of this file may be used under the terms - of the _____ license (the "[___] License"), in which case the - provisions of [______] License are applicable instead of those - above. If you wish to allow use of your version of this file only - under the terms of the [____] License and not to allow others to use - your version of this file under the MPL, indicate your decision by - deleting the provisions above and replace them with the notice and - other provisions required by the [___] License. If you do not delete - the provisions above, a recipient may use your version of this file - under either the MPL or the [___] License." - - [NOTE: The text of this Exhibit A may differ slightly from the text of - the notices in the Source Code files of the Original Code. You should - use the text of this Exhibit A rather than the text found in the - Original Code Source Code for Your Modifications.] - diff --git a/protocols/ssh/README b/protocols/ssh/README deleted file mode 100644 index f2514ec9..00000000 --- a/protocols/ssh/README +++ /dev/null @@ -1,74 +0,0 @@ - ------------------------------------------------------------- - About this README ------------------------------------------------------------- - -This README is intended to provide quick and to-the-point documentation for -technical users intending to compile parts of Guacamole themselves. - -Distribution-specific packages are available from the files section of the main -project page: - - http://sourceforge.net/projects/guacamole/files/ - -Distribution-specific documentation is provided on the Guacamole wiki: - - http://guac-dev.org/ - - ------------------------------------------------------------- - What is libguac-client-ssh? ------------------------------------------------------------- - -libguac-client-ssh is a protocol support plugin for the Guacamole proxy (guacd) -which provides support for SSH, the secure shell. - - ------------------------------------------------------------- - Compiling and installing libguac-client-ssh ------------------------------------------------------------- - -Please note that distribution-specific pre-compiled packages are available from -the files section of the main project site: - - http://sourceforge.net/projects/guacamole/files/ - -libguac-client-ssh is built using the popular GNU Automake, and thus provides -the standard configure script. - -1) Run configure - - $ ./configure - - Assuming all dependencies have been installed, this should succeed without - errors. - -2) Run make - - $ make - - libguac-client-ssh will now compile. - -3) Install (as root) - - # make install - - libguac-client-ssh will install to your /usr/local/lib directory by default. - You can change the install location by using the --prefix option for - configure. - - You will need to run ldconfig (as root) so that guacd can find the library - when needed: - - # ldconfig - - ------------------------------------------------------------- - Reporting problems ------------------------------------------------------------- - -Please report any bugs encountered by opening a new ticket at the Trac system -hosted at: - - http://guac-dev.org/trac/ - diff --git a/protocols/ssh/configure.ac b/protocols/ssh/configure.ac deleted file mode 100644 index 4364ba01..00000000 --- a/protocols/ssh/configure.ac +++ /dev/null @@ -1,78 +0,0 @@ -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is libguac-client-ssh. -# -# The Initial Developer of the Original Code is -# Michael Jumper. -# Portions created by the Initial Developer are Copyright (C) 2011 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -AC_PREREQ([2.61]) -AC_INIT([libguac-client-ssh], [0.8.0]) -AM_INIT_AUTOMAKE([-Wall -Werror foreign]) - -LT_PREREQ([2.2]) -LT_INIT([dlopen]) - -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_SRCDIR([src/client.c]) - -# Programs -AC_PROG_CC -AC_PROG_CC_C99 -AC_PROG_LIBTOOL - -# Libraries -AC_CHECK_LIB([pthread], [pthread_create]) -AC_CHECK_LIB([cairo], [cairo_create],, AC_MSG_ERROR("cairo is required for drawing instructions")) -AC_CHECK_LIB([ssh], [ssh_new],, AC_MSG_ERROR("libssh is required")) -PKG_CHECK_MODULES([PANGO], pango); -PKG_CHECK_MODULES([PANGOCAIRO], pangocairo); - -# If bundled copy of libguac found, use that -if test -d "$srcdir/../../libguac" -then - AC_SUBST([LIBGUAC_LTLIB], '$(top_builddir)/../../libguac/src/libguac.la') - AC_SUBST([LIBGUAC_INCLUDE], '-I$(top_srcdir)/../../libguac/include') -else - AC_CHECK_LIB([guac], [guac_client_plugin_open]) -fi - -# Functions -AC_FUNC_MALLOC -AC_CHECK_FUNCS([memset socket strerror fork]) -AC_CHECK_FUNC(ssh_channel_close, AC_DEFINE(HAVE_SSH_CHANNEL_CLOSE)) -AC_CHECK_FUNC(ssh_channel_send_eof, AC_DEFINE(HAVE_SSH_CHANNEL_SEND_EOF)) -AC_CHECK_FUNC(ssh_channel_free, AC_DEFINE(HAVE_SSH_CHANNEL_FREE)) - -# Done -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT - diff --git a/protocols/ssh/m4/README b/protocols/ssh/m4/README deleted file mode 100644 index c9c9cbc4..00000000 --- a/protocols/ssh/m4/README +++ /dev/null @@ -1,12 +0,0 @@ -This file exists such that the m4/ directory will be created when cloning the -git repository. - -The m4/ directory is not directly used by this project, but libtoolize -populates this directory with files, recommending that the directory be -included in the macro search path for aclocal. - -Because autoreconf runs aclocal before libtoolize, this directory will not -exist when autoreconf is run, triggering an error from aclocal. - -Creating this directory (and keeping this file in it as a placeholder) -prevents this error. diff --git a/protocols/vnc/AUTHORS b/protocols/vnc/AUTHORS deleted file mode 100644 index 9a0f2591..00000000 --- a/protocols/vnc/AUTHORS +++ /dev/null @@ -1,3 +0,0 @@ -Michael Jumper -James Muehlner -Saul Gio Perez diff --git a/protocols/vnc/ChangeLog b/protocols/vnc/ChangeLog deleted file mode 100644 index 920258f1..00000000 --- a/protocols/vnc/ChangeLog +++ /dev/null @@ -1,31 +0,0 @@ -2013-05-23 James Muehlner - - * convert() should return NULL only on malloc failure (fixes #313) - -2013-02-07 Saul Gio Perez - - * Implement color-depth parameter (fixes #272) - -2012-10-15 Michael Jumper - - * Fix m4/ autoreconf error - -2011-05-04 Michael Jumper - - * Migrated to 0.6.0 version of libguac API - * Ensure LICENSE is included in source .tar.gz - * Add swap-red-blue parameter - -2011-12-11 Michael Jumper - - * Migrated to 0.5.0 version of libguac API - -2011-03-13 Michael Jumper - - * Support for framebuffer resizing - * "encodings" argument - -2011-02-28 Michael Jumper - - * Initial release - diff --git a/protocols/vnc/LICENSE b/protocols/vnc/LICENSE deleted file mode 100644 index 7714141d..00000000 --- a/protocols/vnc/LICENSE +++ /dev/null @@ -1,470 +0,0 @@ - MOZILLA PUBLIC LICENSE - Version 1.1 - - --------------- - -1. Definitions. - - 1.0.1. "Commercial Use" means distribution or otherwise making the - Covered Code available to a third party. - - 1.1. "Contributor" means each entity that creates or contributes to - the creation of Modifications. - - 1.2. "Contributor Version" means the combination of the Original - Code, prior Modifications used by a Contributor, and the Modifications - made by that particular Contributor. - - 1.3. "Covered Code" means the Original Code or Modifications or the - combination of the Original Code and Modifications, in each case - including portions thereof. - - 1.4. "Electronic Distribution Mechanism" means a mechanism generally - accepted in the software development community for the electronic - transfer of data. - - 1.5. "Executable" means Covered Code in any form other than Source - Code. - - 1.6. "Initial Developer" means the individual or entity identified - as the Initial Developer in the Source Code notice required by Exhibit - A. - - 1.7. "Larger Work" means a work which combines Covered Code or - portions thereof with code not governed by the terms of this License. - - 1.8. "License" means this document. - - 1.8.1. "Licensable" means having the right to grant, to the maximum - extent possible, whether at the time of the initial grant or - subsequently acquired, any and all of the rights conveyed herein. - - 1.9. "Modifications" means any addition to or deletion from the - substance or structure of either the Original Code or any previous - Modifications. When Covered Code is released as a series of files, a - Modification is: - A. Any addition to or deletion from the contents of a file - containing Original Code or previous Modifications. - - B. Any new file that contains any part of the Original Code or - previous Modifications. - - 1.10. "Original Code" means Source Code of computer software code - which is described in the Source Code notice required by Exhibit A as - Original Code, and which, at the time of its release under this - License is not already Covered Code governed by this License. - - 1.10.1. "Patent Claims" means any patent claim(s), now owned or - hereafter acquired, including without limitation, method, process, - and apparatus claims, in any patent Licensable by grantor. - - 1.11. "Source Code" means the preferred form of the Covered Code for - making modifications to it, including all modules it contains, plus - any associated interface definition files, scripts used to control - compilation and installation of an Executable, or source code - differential comparisons against either the Original Code or another - well known, available Covered Code of the Contributor's choice. The - Source Code can be in a compressed or archival form, provided the - appropriate decompression or de-archiving software is widely available - for no charge. - - 1.12. "You" (or "Your") means an individual or a legal entity - exercising rights under, and complying with all of the terms of, this - License or a future version of this License issued under Section 6.1. - For legal entities, "You" includes any entity which controls, is - controlled by, or is under common control with You. For purposes of - this definition, "control" means (a) the power, direct or indirect, - to cause the direction or management of such entity, whether by - contract or otherwise, or (b) ownership of more than fifty percent - (50%) of the outstanding shares or beneficial ownership of such - entity. - -2. Source Code License. - - 2.1. The Initial Developer Grant. - The Initial Developer hereby grants You a world-wide, royalty-free, - non-exclusive license, subject to third party intellectual property - claims: - (a) under intellectual property rights (other than patent or - trademark) Licensable by Initial Developer to use, reproduce, - modify, display, perform, sublicense and distribute the Original - Code (or portions thereof) with or without Modifications, and/or - as part of a Larger Work; and - - (b) under Patents Claims infringed by the making, using or - selling of Original Code, to make, have made, use, practice, - sell, and offer for sale, and/or otherwise dispose of the - Original Code (or portions thereof). - - (c) the licenses granted in this Section 2.1(a) and (b) are - effective on the date Initial Developer first distributes - Original Code under the terms of this License. - - (d) Notwithstanding Section 2.1(b) above, no patent license is - granted: 1) for code that You delete from the Original Code; 2) - separate from the Original Code; or 3) for infringements caused - by: i) the modification of the Original Code or ii) the - combination of the Original Code with other software or devices. - - 2.2. Contributor Grant. - Subject to third party intellectual property claims, each Contributor - hereby grants You a world-wide, royalty-free, non-exclusive license - - (a) under intellectual property rights (other than patent or - trademark) Licensable by Contributor, to use, reproduce, modify, - display, perform, sublicense and distribute the Modifications - created by such Contributor (or portions thereof) either on an - unmodified basis, with other Modifications, as Covered Code - and/or as part of a Larger Work; and - - (b) under Patent Claims infringed by the making, using, or - selling of Modifications made by that Contributor either alone - and/or in combination with its Contributor Version (or portions - of such combination), to make, use, sell, offer for sale, have - made, and/or otherwise dispose of: 1) Modifications made by that - Contributor (or portions thereof); and 2) the combination of - Modifications made by that Contributor with its Contributor - Version (or portions of such combination). - - (c) the licenses granted in Sections 2.2(a) and 2.2(b) are - effective on the date Contributor first makes Commercial Use of - the Covered Code. - - (d) Notwithstanding Section 2.2(b) above, no patent license is - granted: 1) for any code that Contributor has deleted from the - Contributor Version; 2) separate from the Contributor Version; - 3) for infringements caused by: i) third party modifications of - Contributor Version or ii) the combination of Modifications made - by that Contributor with other software (except as part of the - Contributor Version) or other devices; or 4) under Patent Claims - infringed by Covered Code in the absence of Modifications made by - that Contributor. - -3. Distribution Obligations. - - 3.1. Application of License. - The Modifications which You create or to which You contribute are - governed by the terms of this License, including without limitation - Section 2.2. The Source Code version of Covered Code may be - distributed only under the terms of this License or a future version - of this License released under Section 6.1, and You must include a - copy of this License with every copy of the Source Code You - distribute. You may not offer or impose any terms on any Source Code - version that alters or restricts the applicable version of this - License or the recipients' rights hereunder. However, You may include - an additional document offering the additional rights described in - Section 3.5. - - 3.2. Availability of Source Code. - Any Modification which You create or to which You contribute must be - made available in Source Code form under the terms of this License - either on the same media as an Executable version or via an accepted - Electronic Distribution Mechanism to anyone to whom you made an - Executable version available; and if made available via Electronic - Distribution Mechanism, must remain available for at least twelve (12) - months after the date it initially became available, or at least six - (6) months after a subsequent version of that particular Modification - has been made available to such recipients. You are responsible for - ensuring that the Source Code version remains available even if the - Electronic Distribution Mechanism is maintained by a third party. - - 3.3. Description of Modifications. - You must cause all Covered Code to which You contribute to contain a - file documenting the changes You made to create that Covered Code and - the date of any change. You must include a prominent statement that - the Modification is derived, directly or indirectly, from Original - Code provided by the Initial Developer and including the name of the - Initial Developer in (a) the Source Code, and (b) in any notice in an - Executable version or related documentation in which You describe the - origin or ownership of the Covered Code. - - 3.4. Intellectual Property Matters - (a) Third Party Claims. - If Contributor has knowledge that a license under a third party's - intellectual property rights is required to exercise the rights - granted by such Contributor under Sections 2.1 or 2.2, - Contributor must include a text file with the Source Code - distribution titled "LEGAL" which describes the claim and the - party making the claim in sufficient detail that a recipient will - know whom to contact. If Contributor obtains such knowledge after - the Modification is made available as described in Section 3.2, - Contributor shall promptly modify the LEGAL file in all copies - Contributor makes available thereafter and shall take other steps - (such as notifying appropriate mailing lists or newsgroups) - reasonably calculated to inform those who received the Covered - Code that new knowledge has been obtained. - - (b) Contributor APIs. - If Contributor's Modifications include an application programming - interface and Contributor has knowledge of patent licenses which - are reasonably necessary to implement that API, Contributor must - also include this information in the LEGAL file. - - (c) Representations. - Contributor represents that, except as disclosed pursuant to - Section 3.4(a) above, Contributor believes that Contributor's - Modifications are Contributor's original creation(s) and/or - Contributor has sufficient rights to grant the rights conveyed by - this License. - - 3.5. Required Notices. - You must duplicate the notice in Exhibit A in each file of the Source - Code. If it is not possible to put such notice in a particular Source - Code file due to its structure, then You must include such notice in a - location (such as a relevant directory) where a user would be likely - to look for such a notice. If You created one or more Modification(s) - You may add your name as a Contributor to the notice described in - Exhibit A. You must also duplicate this License in any documentation - for the Source Code where You describe recipients' rights or ownership - rights relating to Covered Code. You may choose to offer, and to - charge a fee for, warranty, support, indemnity or liability - obligations to one or more recipients of Covered Code. However, You - may do so only on Your own behalf, and not on behalf of the Initial - Developer or any Contributor. You must make it absolutely clear than - any such warranty, support, indemnity or liability obligation is - offered by You alone, and You hereby agree to indemnify the Initial - Developer and every Contributor for any liability incurred by the - Initial Developer or such Contributor as a result of warranty, - support, indemnity or liability terms You offer. - - 3.6. Distribution of Executable Versions. - You may distribute Covered Code in Executable form only if the - requirements of Section 3.1-3.5 have been met for that Covered Code, - and if You include a notice stating that the Source Code version of - the Covered Code is available under the terms of this License, - including a description of how and where You have fulfilled the - obligations of Section 3.2. The notice must be conspicuously included - in any notice in an Executable version, related documentation or - collateral in which You describe recipients' rights relating to the - Covered Code. You may distribute the Executable version of Covered - Code or ownership rights under a license of Your choice, which may - contain terms different from this License, provided that You are in - compliance with the terms of this License and that the license for the - Executable version does not attempt to limit or alter the recipient's - rights in the Source Code version from the rights set forth in this - License. If You distribute the Executable version under a different - license You must make it absolutely clear that any terms which differ - from this License are offered by You alone, not by the Initial - Developer or any Contributor. You hereby agree to indemnify the - Initial Developer and every Contributor for any liability incurred by - the Initial Developer or such Contributor as a result of any such - terms You offer. - - 3.7. Larger Works. - You may create a Larger Work by combining Covered Code with other code - not governed by the terms of this License and distribute the Larger - Work as a single product. In such a case, You must make sure the - requirements of this License are fulfilled for the Covered Code. - -4. Inability to Comply Due to Statute or Regulation. - - If it is impossible for You to comply with any of the terms of this - License with respect to some or all of the Covered Code due to - statute, judicial order, or regulation then You must: (a) comply with - the terms of this License to the maximum extent possible; and (b) - describe the limitations and the code they affect. Such description - must be included in the LEGAL file described in Section 3.4 and must - be included with all distributions of the Source Code. Except to the - extent prohibited by statute or regulation, such description must be - sufficiently detailed for a recipient of ordinary skill to be able to - understand it. - -5. Application of this License. - - This License applies to code to which the Initial Developer has - attached the notice in Exhibit A and to related Covered Code. - -6. Versions of the License. - - 6.1. New Versions. - Netscape Communications Corporation ("Netscape") may publish revised - and/or new versions of the License from time to time. Each version - will be given a distinguishing version number. - - 6.2. Effect of New Versions. - Once Covered Code has been published under a particular version of the - License, You may always continue to use it under the terms of that - version. You may also choose to use such Covered Code under the terms - of any subsequent version of the License published by Netscape. No one - other than Netscape has the right to modify the terms applicable to - Covered Code created under this License. - - 6.3. Derivative Works. - If You create or use a modified version of this License (which you may - only do in order to apply it to code which is not already Covered Code - governed by this License), You must (a) rename Your license so that - the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", - "MPL", "NPL" or any confusingly similar phrase do not appear in your - license (except to note that your license differs from this License) - and (b) otherwise make it clear that Your version of the license - contains terms which differ from the Mozilla Public License and - Netscape Public License. (Filling in the name of the Initial - Developer, Original Code or Contributor in the notice described in - Exhibit A shall not of themselves be deemed to be modifications of - this License.) - -7. DISCLAIMER OF WARRANTY. - - COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, - WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF - DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. - THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE - IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, - YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE - COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER - OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF - ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -8. TERMINATION. - - 8.1. This License and the rights granted hereunder will terminate - automatically if You fail to comply with terms herein and fail to cure - such breach within 30 days of becoming aware of the breach. All - sublicenses to the Covered Code which are properly granted shall - survive any termination of this License. Provisions which, by their - nature, must remain in effect beyond the termination of this License - shall survive. - - 8.2. If You initiate litigation by asserting a patent infringement - claim (excluding declatory judgment actions) against Initial Developer - or a Contributor (the Initial Developer or Contributor against whom - You file such action is referred to as "Participant") alleging that: - - (a) such Participant's Contributor Version directly or indirectly - infringes any patent, then any and all rights granted by such - Participant to You under Sections 2.1 and/or 2.2 of this License - shall, upon 60 days notice from Participant terminate prospectively, - unless if within 60 days after receipt of notice You either: (i) - agree in writing to pay Participant a mutually agreeable reasonable - royalty for Your past and future use of Modifications made by such - Participant, or (ii) withdraw Your litigation claim with respect to - the Contributor Version against such Participant. If within 60 days - of notice, a reasonable royalty and payment arrangement are not - mutually agreed upon in writing by the parties or the litigation claim - is not withdrawn, the rights granted by Participant to You under - Sections 2.1 and/or 2.2 automatically terminate at the expiration of - the 60 day notice period specified above. - - (b) any software, hardware, or device, other than such Participant's - Contributor Version, directly or indirectly infringes any patent, then - any rights granted to You by such Participant under Sections 2.1(b) - and 2.2(b) are revoked effective as of the date You first made, used, - sold, distributed, or had made, Modifications made by that - Participant. - - 8.3. If You assert a patent infringement claim against Participant - alleging that such Participant's Contributor Version directly or - indirectly infringes any patent where such claim is resolved (such as - by license or settlement) prior to the initiation of patent - infringement litigation, then the reasonable value of the licenses - granted by such Participant under Sections 2.1 or 2.2 shall be taken - into account in determining the amount or value of any payment or - license. - - 8.4. In the event of termination under Sections 8.1 or 8.2 above, - all end user license agreements (excluding distributors and resellers) - which have been validly granted by You or any distributor hereunder - prior to termination shall survive termination. - -9. LIMITATION OF LIABILITY. - - UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT - (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL - DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, - OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR - ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY - CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, - WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER - COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN - INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF - LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY - RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW - PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE - EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO - THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. - -10. U.S. GOVERNMENT END USERS. - - The Covered Code is a "commercial item," as that term is defined in - 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer - software" and "commercial computer software documentation," as such - terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 - C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), - all U.S. Government End Users acquire Covered Code with only those - rights set forth herein. - -11. MISCELLANEOUS. - - This License represents the complete agreement concerning subject - matter hereof. If any provision of this License is held to be - unenforceable, such provision shall be reformed only to the extent - necessary to make it enforceable. This License shall be governed by - California law provisions (except to the extent applicable law, if - any, provides otherwise), excluding its conflict-of-law provisions. - With respect to disputes in which at least one party is a citizen of, - or an entity chartered or registered to do business in the United - States of America, any litigation relating to this License shall be - subject to the jurisdiction of the Federal Courts of the Northern - District of California, with venue lying in Santa Clara County, - California, with the losing party responsible for costs, including - without limitation, court costs and reasonable attorneys' fees and - expenses. The application of the United Nations Convention on - Contracts for the International Sale of Goods is expressly excluded. - Any law or regulation which provides that the language of a contract - shall be construed against the drafter shall not apply to this - License. - -12. RESPONSIBILITY FOR CLAIMS. - - As between Initial Developer and the Contributors, each party is - responsible for claims and damages arising, directly or indirectly, - out of its utilization of rights under this License and You agree to - work with Initial Developer and Contributors to distribute such - responsibility on an equitable basis. Nothing herein is intended or - shall be deemed to constitute any admission of liability. - -13. MULTIPLE-LICENSED CODE. - - Initial Developer may designate portions of the Covered Code as - "Multiple-Licensed". "Multiple-Licensed" means that the Initial - Developer permits you to utilize portions of the Covered Code under - Your choice of the NPL or the alternative licenses, if any, specified - by the Initial Developer in the file described in Exhibit A. - -EXHIBIT A -Mozilla Public License. - - ``The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. - - The Original Code is ______________________________________. - - The Initial Developer of the Original Code is ________________________. - Portions created by ______________________ are Copyright (C) ______ - _______________________. All Rights Reserved. - - Contributor(s): ______________________________________. - - Alternatively, the contents of this file may be used under the terms - of the _____ license (the "[___] License"), in which case the - provisions of [______] License are applicable instead of those - above. If you wish to allow use of your version of this file only - under the terms of the [____] License and not to allow others to use - your version of this file under the MPL, indicate your decision by - deleting the provisions above and replace them with the notice and - other provisions required by the [___] License. If you do not delete - the provisions above, a recipient may use your version of this file - under either the MPL or the [___] License." - - [NOTE: The text of this Exhibit A may differ slightly from the text of - the notices in the Source Code files of the Original Code. You should - use the text of this Exhibit A rather than the text found in the - Original Code Source Code for Your Modifications.] - diff --git a/protocols/vnc/README b/protocols/vnc/README deleted file mode 100644 index bc664b7d..00000000 --- a/protocols/vnc/README +++ /dev/null @@ -1,75 +0,0 @@ - ------------------------------------------------------------- - About this README ------------------------------------------------------------- - -This README is intended to provide quick and to-the-point documentation for -technical users intending to compile parts of Guacamole themselves. - -Distribution-specific packages are available from the files section of the main -project page: - - http://sourceforge.net/projects/guacamole/files/ - -Distribution-specific documentation is provided on the Guacamole wiki: - - http://guac-dev.org/ - - ------------------------------------------------------------- - What is libguac-client-vnc? ------------------------------------------------------------- - -libguac-client-vnc is a protocol support plugin for the Guacamole proxy (guacd) -which provides support for VNC via the libvncclient library (part of -libvncserver). - - ------------------------------------------------------------- - Compiling and installing libguac-client-vnc ------------------------------------------------------------- - -Please note that distribution-specific pre-compiled packages are available from -the files section of the main project site: - - http://sourceforge.net/projects/guacamole/files/ - -libguac-client-vnc is built using the popular GNU Automake, and thus provides -the standard configure script. - -1) Run configure - - $ ./configure - - Assuming all dependencies have been installed, this should succeed without - errors. - -2) Run make - - $ make - - libguac-client-vnc will now compile. - -3) Install (as root) - - # make install - - libguac-client-vnc will install to your /usr/local/lib directory by default. - You can change the install location by using the --prefix option for - configure. - - You will need to run ldconfig (as root) so that guacd can find the library - when needed: - - # ldconfig - - ------------------------------------------------------------- - Reporting problems ------------------------------------------------------------- - -Please report any bugs encountered by opening a new ticket at the Trac system -hosted at: - - http://guac-dev.org/trac/ - diff --git a/protocols/vnc/configure.ac b/protocols/vnc/configure.ac deleted file mode 100644 index e9e5e299..00000000 --- a/protocols/vnc/configure.ac +++ /dev/null @@ -1,76 +0,0 @@ -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is libguac-client-vnc. -# -# The Initial Developer of the Original Code is -# Michael Jumper. -# Portions created by the Initial Developer are Copyright (C) 2010 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -AC_PREREQ([2.61]) -AC_INIT([libguac-client-vnc], [0.7.2]) -AM_INIT_AUTOMAKE([-Wall -Werror foreign]) - -LT_PREREQ([2.2]) -LT_INIT([dlopen]) - -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_SRCDIR([src/client.c]) - -# Programs -AC_PROG_CC -AC_PROG_CC_C99 -AC_PROG_LIBTOOL - -# Libraries -AC_CHECK_LIB([pthread], [pthread_create]) -AC_CHECK_LIB([cairo], [cairo_create],, AC_MSG_ERROR("cairo is required for drawing instructions")) -AC_CHECK_LIB([vncclient], [rfbInitClient],, AC_MSG_ERROR("libvncclient is required")) - -# If bundled copy of libguac found, use that -if test -d "$srcdir/../../libguac" -then - AC_SUBST([LIBGUAC_LTLIB], '$(top_builddir)/../../libguac/src/libguac.la') - AC_SUBST([LIBGUAC_INCLUDE], '-I$(top_srcdir)/../../libguac/include') -else - AC_CHECK_LIB([guac], [guac_client_plugin_open]) -fi - -# Functions -AC_FUNC_MALLOC -AC_CHECK_FUNCS([memset socket strerror fork]) - -# Headers -AC_CHECK_HEADERS([stdlib.h string.h syslog.h iconv.h]) - -# Done -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT - diff --git a/protocols/vnc/m4/README b/protocols/vnc/m4/README deleted file mode 100644 index c9c9cbc4..00000000 --- a/protocols/vnc/m4/README +++ /dev/null @@ -1,12 +0,0 @@ -This file exists such that the m4/ directory will be created when cloning the -git repository. - -The m4/ directory is not directly used by this project, but libtoolize -populates this directory with files, recommending that the directory be -included in the macro search path for aclocal. - -Because autoreconf runs aclocal before libtoolize, this directory will not -exist when autoreconf is run, triggering an error from aclocal. - -Creating this directory (and keeping this file in it as a placeholder) -prevents this error. diff --git a/guacd/.gitignore b/src/guacd/.gitignore similarity index 100% rename from guacd/.gitignore rename to src/guacd/.gitignore diff --git a/guacd/Makefile.am b/src/guacd/Makefile.am similarity index 100% rename from guacd/Makefile.am rename to src/guacd/Makefile.am diff --git a/guacd/src/client.c b/src/guacd/client.c similarity index 100% rename from guacd/src/client.c rename to src/guacd/client.c diff --git a/guacd/include/client.h b/src/guacd/client.h similarity index 100% rename from guacd/include/client.h rename to src/guacd/client.h diff --git a/guacd/src/daemon.c b/src/guacd/daemon.c similarity index 100% rename from guacd/src/daemon.c rename to src/guacd/daemon.c diff --git a/guacd/src/log.c b/src/guacd/log.c similarity index 100% rename from guacd/src/log.c rename to src/guacd/log.c diff --git a/guacd/include/log.h b/src/guacd/log.h similarity index 100% rename from guacd/include/log.h rename to src/guacd/log.h diff --git a/libguac/.gitignore b/src/libguac/.gitignore similarity index 100% rename from libguac/.gitignore rename to src/libguac/.gitignore diff --git a/libguac/Makefile.am b/src/libguac/Makefile.am similarity index 100% rename from libguac/Makefile.am rename to src/libguac/Makefile.am diff --git a/libguac/src/client-handlers.c b/src/libguac/client-handlers.c similarity index 100% rename from libguac/src/client-handlers.c rename to src/libguac/client-handlers.c diff --git a/libguac/include/_private/client-handlers.h b/src/libguac/client-handlers.h similarity index 100% rename from libguac/include/_private/client-handlers.h rename to src/libguac/client-handlers.h diff --git a/libguac/src/client.c b/src/libguac/client.c similarity index 100% rename from libguac/src/client.c rename to src/libguac/client.c diff --git a/libguac/src/error.c b/src/libguac/error.c similarity index 100% rename from libguac/src/error.c rename to src/libguac/error.c diff --git a/libguac/include/guacamole/client.h b/src/libguac/guacamole/client.h similarity index 100% rename from libguac/include/guacamole/client.h rename to src/libguac/guacamole/client.h diff --git a/libguac/include/guacamole/error.h b/src/libguac/guacamole/error.h similarity index 100% rename from libguac/include/guacamole/error.h rename to src/libguac/guacamole/error.h diff --git a/libguac/include/guacamole/hash.h b/src/libguac/guacamole/hash.h similarity index 100% rename from libguac/include/guacamole/hash.h rename to src/libguac/guacamole/hash.h diff --git a/libguac/include/guacamole/instruction.h b/src/libguac/guacamole/instruction.h similarity index 100% rename from libguac/include/guacamole/instruction.h rename to src/libguac/guacamole/instruction.h diff --git a/libguac/include/guacamole/layer.h b/src/libguac/guacamole/layer.h similarity index 100% rename from libguac/include/guacamole/layer.h rename to src/libguac/guacamole/layer.h diff --git a/libguac/include/guacamole/plugin.h b/src/libguac/guacamole/plugin.h similarity index 100% rename from libguac/include/guacamole/plugin.h rename to src/libguac/guacamole/plugin.h diff --git a/libguac/include/guacamole/pool.h b/src/libguac/guacamole/pool.h similarity index 100% rename from libguac/include/guacamole/pool.h rename to src/libguac/guacamole/pool.h diff --git a/libguac/include/guacamole/protocol.h b/src/libguac/guacamole/protocol.h similarity index 100% rename from libguac/include/guacamole/protocol.h rename to src/libguac/guacamole/protocol.h diff --git a/libguac/include/guacamole/socket.h b/src/libguac/guacamole/socket.h similarity index 100% rename from libguac/include/guacamole/socket.h rename to src/libguac/guacamole/socket.h diff --git a/libguac/include/guacamole/stream.h b/src/libguac/guacamole/stream.h similarity index 100% rename from libguac/include/guacamole/stream.h rename to src/libguac/guacamole/stream.h diff --git a/libguac/include/guacamole/timestamp.h b/src/libguac/guacamole/timestamp.h similarity index 100% rename from libguac/include/guacamole/timestamp.h rename to src/libguac/guacamole/timestamp.h diff --git a/libguac/src/hash.c b/src/libguac/hash.c similarity index 100% rename from libguac/src/hash.c rename to src/libguac/hash.c diff --git a/libguac/src/instruction.c b/src/libguac/instruction.c similarity index 100% rename from libguac/src/instruction.c rename to src/libguac/instruction.c diff --git a/libguac/src/palette.c b/src/libguac/palette.c similarity index 100% rename from libguac/src/palette.c rename to src/libguac/palette.c diff --git a/libguac/include/_private/palette.h b/src/libguac/palette.h similarity index 100% rename from libguac/include/_private/palette.h rename to src/libguac/palette.h diff --git a/libguac/src/plugin.c b/src/libguac/plugin.c similarity index 100% rename from libguac/src/plugin.c rename to src/libguac/plugin.c diff --git a/libguac/src/pool.c b/src/libguac/pool.c similarity index 100% rename from libguac/src/pool.c rename to src/libguac/pool.c diff --git a/libguac/src/protocol.c b/src/libguac/protocol.c similarity index 100% rename from libguac/src/protocol.c rename to src/libguac/protocol.c diff --git a/libguac/src/socket-fd.c b/src/libguac/socket-fd.c similarity index 100% rename from libguac/src/socket-fd.c rename to src/libguac/socket-fd.c diff --git a/libguac/src/socket-nest.c b/src/libguac/socket-nest.c similarity index 100% rename from libguac/src/socket-nest.c rename to src/libguac/socket-nest.c diff --git a/libguac/src/socket.c b/src/libguac/socket.c similarity index 100% rename from libguac/src/socket.c rename to src/libguac/socket.c diff --git a/libguac/src/timestamp.c b/src/libguac/timestamp.c similarity index 100% rename from libguac/src/timestamp.c rename to src/libguac/timestamp.c diff --git a/libguac/src/unicode.c b/src/libguac/unicode.c similarity index 100% rename from libguac/src/unicode.c rename to src/libguac/unicode.c diff --git a/libguac/include/_private/unicode.h b/src/libguac/unicode.h similarity index 100% rename from libguac/include/_private/unicode.h rename to src/libguac/unicode.h diff --git a/protocols/rdp/.gitignore b/src/protocols/rdp/.gitignore similarity index 100% rename from protocols/rdp/.gitignore rename to src/protocols/rdp/.gitignore diff --git a/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am similarity index 100% rename from protocols/rdp/Makefile.am rename to src/protocols/rdp/Makefile.am diff --git a/protocols/rdp/src/audio.c b/src/protocols/rdp/audio.c similarity index 100% rename from protocols/rdp/src/audio.c rename to src/protocols/rdp/audio.c diff --git a/protocols/rdp/include/audio.h b/src/protocols/rdp/audio.h similarity index 100% rename from protocols/rdp/include/audio.h rename to src/protocols/rdp/audio.h diff --git a/protocols/rdp/src/client.c b/src/protocols/rdp/client.c similarity index 100% rename from protocols/rdp/src/client.c rename to src/protocols/rdp/client.c diff --git a/protocols/rdp/include/client.h b/src/protocols/rdp/client.h similarity index 100% rename from protocols/rdp/include/client.h rename to src/protocols/rdp/client.h diff --git a/protocols/rdp/include/config.h b/src/protocols/rdp/config.h similarity index 100% rename from protocols/rdp/include/config.h rename to src/protocols/rdp/config.h diff --git a/protocols/rdp/src/default_pointer.c b/src/protocols/rdp/default_pointer.c similarity index 100% rename from protocols/rdp/src/default_pointer.c rename to src/protocols/rdp/default_pointer.c diff --git a/protocols/rdp/include/default_pointer.h b/src/protocols/rdp/default_pointer.h similarity index 100% rename from protocols/rdp/include/default_pointer.h rename to src/protocols/rdp/default_pointer.h diff --git a/protocols/rdp/src/guac_handlers.c b/src/protocols/rdp/guac_handlers.c similarity index 100% rename from protocols/rdp/src/guac_handlers.c rename to src/protocols/rdp/guac_handlers.c diff --git a/protocols/rdp/include/guac_handlers.h b/src/protocols/rdp/guac_handlers.h similarity index 100% rename from protocols/rdp/include/guac_handlers.h rename to src/protocols/rdp/guac_handlers.h diff --git a/protocols/rdp/guac_rdpsnd/messages.c b/src/protocols/rdp/guac_rdpsnd/messages.c similarity index 100% rename from protocols/rdp/guac_rdpsnd/messages.c rename to src/protocols/rdp/guac_rdpsnd/messages.c diff --git a/protocols/rdp/guac_rdpsnd/messages.h b/src/protocols/rdp/guac_rdpsnd/messages.h similarity index 100% rename from protocols/rdp/guac_rdpsnd/messages.h rename to src/protocols/rdp/guac_rdpsnd/messages.h diff --git a/protocols/rdp/guac_rdpsnd/service.c b/src/protocols/rdp/guac_rdpsnd/service.c similarity index 100% rename from protocols/rdp/guac_rdpsnd/service.c rename to src/protocols/rdp/guac_rdpsnd/service.c diff --git a/protocols/rdp/guac_rdpsnd/service.h b/src/protocols/rdp/guac_rdpsnd/service.h similarity index 100% rename from protocols/rdp/guac_rdpsnd/service.h rename to src/protocols/rdp/guac_rdpsnd/service.h diff --git a/protocols/rdp/src/ogg_encoder.c b/src/protocols/rdp/ogg_encoder.c similarity index 100% rename from protocols/rdp/src/ogg_encoder.c rename to src/protocols/rdp/ogg_encoder.c diff --git a/protocols/rdp/include/ogg_encoder.h b/src/protocols/rdp/ogg_encoder.h similarity index 100% rename from protocols/rdp/include/ogg_encoder.h rename to src/protocols/rdp/ogg_encoder.h diff --git a/protocols/rdp/src/rdp_bitmap.c b/src/protocols/rdp/rdp_bitmap.c similarity index 100% rename from protocols/rdp/src/rdp_bitmap.c rename to src/protocols/rdp/rdp_bitmap.c diff --git a/protocols/rdp/include/rdp_bitmap.h b/src/protocols/rdp/rdp_bitmap.h similarity index 100% rename from protocols/rdp/include/rdp_bitmap.h rename to src/protocols/rdp/rdp_bitmap.h diff --git a/protocols/rdp/src/rdp_cliprdr.c b/src/protocols/rdp/rdp_cliprdr.c similarity index 100% rename from protocols/rdp/src/rdp_cliprdr.c rename to src/protocols/rdp/rdp_cliprdr.c diff --git a/protocols/rdp/include/rdp_cliprdr.h b/src/protocols/rdp/rdp_cliprdr.h similarity index 100% rename from protocols/rdp/include/rdp_cliprdr.h rename to src/protocols/rdp/rdp_cliprdr.h diff --git a/protocols/rdp/src/rdp_gdi.c b/src/protocols/rdp/rdp_gdi.c similarity index 100% rename from protocols/rdp/src/rdp_gdi.c rename to src/protocols/rdp/rdp_gdi.c diff --git a/protocols/rdp/include/rdp_gdi.h b/src/protocols/rdp/rdp_gdi.h similarity index 100% rename from protocols/rdp/include/rdp_gdi.h rename to src/protocols/rdp/rdp_gdi.h diff --git a/protocols/rdp/src/rdp_glyph.c b/src/protocols/rdp/rdp_glyph.c similarity index 100% rename from protocols/rdp/src/rdp_glyph.c rename to src/protocols/rdp/rdp_glyph.c diff --git a/protocols/rdp/include/rdp_glyph.h b/src/protocols/rdp/rdp_glyph.h similarity index 100% rename from protocols/rdp/include/rdp_glyph.h rename to src/protocols/rdp/rdp_glyph.h diff --git a/protocols/rdp/src/rdp_keymap.c b/src/protocols/rdp/rdp_keymap.c similarity index 100% rename from protocols/rdp/src/rdp_keymap.c rename to src/protocols/rdp/rdp_keymap.c diff --git a/protocols/rdp/include/rdp_keymap.h b/src/protocols/rdp/rdp_keymap.h similarity index 100% rename from protocols/rdp/include/rdp_keymap.h rename to src/protocols/rdp/rdp_keymap.h diff --git a/protocols/rdp/src/rdp_keymap_base.c b/src/protocols/rdp/rdp_keymap_base.c similarity index 100% rename from protocols/rdp/src/rdp_keymap_base.c rename to src/protocols/rdp/rdp_keymap_base.c diff --git a/protocols/rdp/src/rdp_keymap_de_de.c b/src/protocols/rdp/rdp_keymap_de_de.c similarity index 100% rename from protocols/rdp/src/rdp_keymap_de_de.c rename to src/protocols/rdp/rdp_keymap_de_de.c diff --git a/protocols/rdp/src/rdp_keymap_en_us.c b/src/protocols/rdp/rdp_keymap_en_us.c similarity index 100% rename from protocols/rdp/src/rdp_keymap_en_us.c rename to src/protocols/rdp/rdp_keymap_en_us.c diff --git a/protocols/rdp/src/rdp_keymap_failsafe.c b/src/protocols/rdp/rdp_keymap_failsafe.c similarity index 100% rename from protocols/rdp/src/rdp_keymap_failsafe.c rename to src/protocols/rdp/rdp_keymap_failsafe.c diff --git a/protocols/rdp/src/rdp_keymap_fr_fr.c b/src/protocols/rdp/rdp_keymap_fr_fr.c similarity index 100% rename from protocols/rdp/src/rdp_keymap_fr_fr.c rename to src/protocols/rdp/rdp_keymap_fr_fr.c diff --git a/protocols/rdp/src/rdp_pointer.c b/src/protocols/rdp/rdp_pointer.c similarity index 100% rename from protocols/rdp/src/rdp_pointer.c rename to src/protocols/rdp/rdp_pointer.c diff --git a/protocols/rdp/include/rdp_pointer.h b/src/protocols/rdp/rdp_pointer.h similarity index 100% rename from protocols/rdp/include/rdp_pointer.h rename to src/protocols/rdp/rdp_pointer.h diff --git a/protocols/rdp/src/wav_encoder.c b/src/protocols/rdp/wav_encoder.c similarity index 100% rename from protocols/rdp/src/wav_encoder.c rename to src/protocols/rdp/wav_encoder.c diff --git a/protocols/rdp/include/wav_encoder.h b/src/protocols/rdp/wav_encoder.h similarity index 100% rename from protocols/rdp/include/wav_encoder.h rename to src/protocols/rdp/wav_encoder.h diff --git a/protocols/spice/.gitignore b/src/protocols/spice/.gitignore similarity index 100% rename from protocols/spice/.gitignore rename to src/protocols/spice/.gitignore diff --git a/protocols/spice/Makefile.am b/src/protocols/spice/Makefile.am similarity index 100% rename from protocols/spice/Makefile.am rename to src/protocols/spice/Makefile.am diff --git a/protocols/spice/src/client.c b/src/protocols/spice/client.c similarity index 100% rename from protocols/spice/src/client.c rename to src/protocols/spice/client.c diff --git a/protocols/spice/include/client.h b/src/protocols/spice/client.h similarity index 100% rename from protocols/spice/include/client.h rename to src/protocols/spice/client.h diff --git a/protocols/spice/src/guac_handlers.c b/src/protocols/spice/guac_handlers.c similarity index 100% rename from protocols/spice/src/guac_handlers.c rename to src/protocols/spice/guac_handlers.c diff --git a/protocols/spice/include/guac_handlers.h b/src/protocols/spice/guac_handlers.h similarity index 100% rename from protocols/spice/include/guac_handlers.h rename to src/protocols/spice/guac_handlers.h diff --git a/protocols/ssh/.gitignore b/src/protocols/ssh/.gitignore similarity index 100% rename from protocols/ssh/.gitignore rename to src/protocols/ssh/.gitignore diff --git a/protocols/ssh/Makefile.am b/src/protocols/ssh/Makefile.am similarity index 100% rename from protocols/ssh/Makefile.am rename to src/protocols/ssh/Makefile.am diff --git a/protocols/ssh/src/blank.c b/src/protocols/ssh/blank.c similarity index 100% rename from protocols/ssh/src/blank.c rename to src/protocols/ssh/blank.c diff --git a/protocols/ssh/include/blank.h b/src/protocols/ssh/blank.h similarity index 100% rename from protocols/ssh/include/blank.h rename to src/protocols/ssh/blank.h diff --git a/protocols/ssh/src/buffer.c b/src/protocols/ssh/buffer.c similarity index 100% rename from protocols/ssh/src/buffer.c rename to src/protocols/ssh/buffer.c diff --git a/protocols/ssh/include/buffer.h b/src/protocols/ssh/buffer.h similarity index 100% rename from protocols/ssh/include/buffer.h rename to src/protocols/ssh/buffer.h diff --git a/protocols/ssh/src/char_mappings.c b/src/protocols/ssh/char_mappings.c similarity index 100% rename from protocols/ssh/src/char_mappings.c rename to src/protocols/ssh/char_mappings.c diff --git a/protocols/ssh/include/char_mappings.h b/src/protocols/ssh/char_mappings.h similarity index 100% rename from protocols/ssh/include/char_mappings.h rename to src/protocols/ssh/char_mappings.h diff --git a/protocols/ssh/src/client.c b/src/protocols/ssh/client.c similarity index 100% rename from protocols/ssh/src/client.c rename to src/protocols/ssh/client.c diff --git a/protocols/ssh/include/client.h b/src/protocols/ssh/client.h similarity index 100% rename from protocols/ssh/include/client.h rename to src/protocols/ssh/client.h diff --git a/protocols/ssh/src/common.c b/src/protocols/ssh/common.c similarity index 100% rename from protocols/ssh/src/common.c rename to src/protocols/ssh/common.c diff --git a/protocols/ssh/include/common.h b/src/protocols/ssh/common.h similarity index 100% rename from protocols/ssh/include/common.h rename to src/protocols/ssh/common.h diff --git a/protocols/ssh/src/cursor.c b/src/protocols/ssh/cursor.c similarity index 100% rename from protocols/ssh/src/cursor.c rename to src/protocols/ssh/cursor.c diff --git a/protocols/ssh/include/cursor.h b/src/protocols/ssh/cursor.h similarity index 100% rename from protocols/ssh/include/cursor.h rename to src/protocols/ssh/cursor.h diff --git a/protocols/ssh/src/display.c b/src/protocols/ssh/display.c similarity index 100% rename from protocols/ssh/src/display.c rename to src/protocols/ssh/display.c diff --git a/protocols/ssh/include/display.h b/src/protocols/ssh/display.h similarity index 100% rename from protocols/ssh/include/display.h rename to src/protocols/ssh/display.h diff --git a/protocols/ssh/src/guac_handlers.c b/src/protocols/ssh/guac_handlers.c similarity index 100% rename from protocols/ssh/src/guac_handlers.c rename to src/protocols/ssh/guac_handlers.c diff --git a/protocols/ssh/include/guac_handlers.h b/src/protocols/ssh/guac_handlers.h similarity index 100% rename from protocols/ssh/include/guac_handlers.h rename to src/protocols/ssh/guac_handlers.h diff --git a/protocols/ssh/src/ibar.c b/src/protocols/ssh/ibar.c similarity index 100% rename from protocols/ssh/src/ibar.c rename to src/protocols/ssh/ibar.c diff --git a/protocols/ssh/include/ibar.h b/src/protocols/ssh/ibar.h similarity index 100% rename from protocols/ssh/include/ibar.h rename to src/protocols/ssh/ibar.h diff --git a/protocols/ssh/include/libssh_compat.h b/src/protocols/ssh/libssh_compat.h similarity index 100% rename from protocols/ssh/include/libssh_compat.h rename to src/protocols/ssh/libssh_compat.h diff --git a/protocols/ssh/src/ssh_client.c b/src/protocols/ssh/ssh_client.c similarity index 100% rename from protocols/ssh/src/ssh_client.c rename to src/protocols/ssh/ssh_client.c diff --git a/protocols/ssh/include/ssh_client.h b/src/protocols/ssh/ssh_client.h similarity index 100% rename from protocols/ssh/include/ssh_client.h rename to src/protocols/ssh/ssh_client.h diff --git a/protocols/ssh/src/terminal.c b/src/protocols/ssh/terminal.c similarity index 100% rename from protocols/ssh/src/terminal.c rename to src/protocols/ssh/terminal.c diff --git a/protocols/ssh/include/terminal.h b/src/protocols/ssh/terminal.h similarity index 100% rename from protocols/ssh/include/terminal.h rename to src/protocols/ssh/terminal.h diff --git a/protocols/ssh/src/terminal_handlers.c b/src/protocols/ssh/terminal_handlers.c similarity index 100% rename from protocols/ssh/src/terminal_handlers.c rename to src/protocols/ssh/terminal_handlers.c diff --git a/protocols/ssh/include/terminal_handlers.h b/src/protocols/ssh/terminal_handlers.h similarity index 100% rename from protocols/ssh/include/terminal_handlers.h rename to src/protocols/ssh/terminal_handlers.h diff --git a/protocols/ssh/include/types.h b/src/protocols/ssh/types.h similarity index 100% rename from protocols/ssh/include/types.h rename to src/protocols/ssh/types.h diff --git a/protocols/vnc/.gitignore b/src/protocols/vnc/.gitignore similarity index 100% rename from protocols/vnc/.gitignore rename to src/protocols/vnc/.gitignore diff --git a/protocols/vnc/Makefile.am b/src/protocols/vnc/Makefile.am similarity index 100% rename from protocols/vnc/Makefile.am rename to src/protocols/vnc/Makefile.am diff --git a/protocols/vnc/src/client.c b/src/protocols/vnc/client.c similarity index 100% rename from protocols/vnc/src/client.c rename to src/protocols/vnc/client.c diff --git a/protocols/vnc/include/client.h b/src/protocols/vnc/client.h similarity index 100% rename from protocols/vnc/include/client.h rename to src/protocols/vnc/client.h diff --git a/protocols/vnc/src/convert.c b/src/protocols/vnc/convert.c similarity index 100% rename from protocols/vnc/src/convert.c rename to src/protocols/vnc/convert.c diff --git a/protocols/vnc/include/convert.h b/src/protocols/vnc/convert.h similarity index 100% rename from protocols/vnc/include/convert.h rename to src/protocols/vnc/convert.h diff --git a/protocols/vnc/src/guac_handlers.c b/src/protocols/vnc/guac_handlers.c similarity index 100% rename from protocols/vnc/src/guac_handlers.c rename to src/protocols/vnc/guac_handlers.c diff --git a/protocols/vnc/include/guac_handlers.h b/src/protocols/vnc/guac_handlers.h similarity index 100% rename from protocols/vnc/include/guac_handlers.h rename to src/protocols/vnc/guac_handlers.h diff --git a/protocols/vnc/src/vnc_handlers.c b/src/protocols/vnc/vnc_handlers.c similarity index 100% rename from protocols/vnc/src/vnc_handlers.c rename to src/protocols/vnc/vnc_handlers.c diff --git a/protocols/vnc/include/vnc_handlers.h b/src/protocols/vnc/vnc_handlers.h similarity index 100% rename from protocols/vnc/include/vnc_handlers.h rename to src/protocols/vnc/vnc_handlers.h diff --git a/libguac/tests/Makefile.am b/tests/Makefile.am similarity index 100% rename from libguac/tests/Makefile.am rename to tests/Makefile.am diff --git a/libguac/tests/client/buffer_pool.c b/tests/client/buffer_pool.c similarity index 100% rename from libguac/tests/client/buffer_pool.c rename to tests/client/buffer_pool.c diff --git a/libguac/tests/client/client_suite.c b/tests/client/client_suite.c similarity index 100% rename from libguac/tests/client/client_suite.c rename to tests/client/client_suite.c diff --git a/libguac/tests/client/client_suite.h b/tests/client/client_suite.h similarity index 100% rename from libguac/tests/client/client_suite.h rename to tests/client/client_suite.h diff --git a/libguac/tests/client/layer_pool.c b/tests/client/layer_pool.c similarity index 100% rename from libguac/tests/client/layer_pool.c rename to tests/client/layer_pool.c diff --git a/libguac/tests/protocol/instruction_read.c b/tests/protocol/instruction_read.c similarity index 100% rename from libguac/tests/protocol/instruction_read.c rename to tests/protocol/instruction_read.c diff --git a/libguac/tests/protocol/instruction_write.c b/tests/protocol/instruction_write.c similarity index 100% rename from libguac/tests/protocol/instruction_write.c rename to tests/protocol/instruction_write.c diff --git a/libguac/tests/protocol/nest_write.c b/tests/protocol/nest_write.c similarity index 100% rename from libguac/tests/protocol/nest_write.c rename to tests/protocol/nest_write.c diff --git a/libguac/tests/protocol/suite.c b/tests/protocol/suite.c similarity index 100% rename from libguac/tests/protocol/suite.c rename to tests/protocol/suite.c diff --git a/libguac/tests/protocol/suite.h b/tests/protocol/suite.h similarity index 100% rename from libguac/tests/protocol/suite.h rename to tests/protocol/suite.h diff --git a/libguac/tests/test_libguac.c b/tests/test_libguac.c similarity index 100% rename from libguac/tests/test_libguac.c rename to tests/test_libguac.c diff --git a/libguac/tests/util/guac_pool.c b/tests/util/guac_pool.c similarity index 100% rename from libguac/tests/util/guac_pool.c rename to tests/util/guac_pool.c diff --git a/libguac/tests/util/util_suite.c b/tests/util/util_suite.c similarity index 100% rename from libguac/tests/util/util_suite.c rename to tests/util/util_suite.c diff --git a/libguac/tests/util/util_suite.h b/tests/util/util_suite.h similarity index 100% rename from libguac/tests/util/util_suite.h rename to tests/util/util_suite.h