Branch: ulab-next-nosound

b0b89df9 2019-03-17 04:27:32 Timothy Pearson
Put Raptor fork back under GPL
M COPYING

COPYING

diff --git a/COPYING b/COPYING
index 08dea94..10b86d5 100644
--- a/COPYING
+++ b/COPYING
@@ -1,176 +1,372 @@
-Apache License, Version 2.0
 
-Version 2.0, January 2004
+special clause for libxrdp and librdp, both based on rdesktop
+these libraries link to openssl
 
-http://www.apache.org/licenses/
+  This software is released under the GNU General Public License
+  (reproduced below) with the additional exemption that compiling,
+  linking, and/or using OpenSSL together with this software is
+  allowed.
 
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+---
 
-1. Definitions.
+special clause for xrdp, that main executable
+for linking with proprietary modules
 
-"License" shall mean the terms and conditions for use, reproduction, and 
-distribution as defined by Sections 1 through 9 of this document.
+  Linking this library statically or dynamically with other modules
+  is making a combined work based on this library. Thus, the terms
+  and conditions of the GNU General Public License cover the whole
+  combination.
 
-"Licensor" shall mean the copyright owner or entity authorized by the 
-copyright owner that is granting the License.
+  As a special exception, the copyright holders of this library
+  give you permission to link this library with independent modules
+  to produce an executable, regardless of the license terms of
+  these independent modules, and to copy and distribute the resulting
+  executable under terms of your choice, provided that you also meet,
+  for each linked independent module, the terms and conditions of the
+  license of that module. An independent module is a module which is
+  not derived from or based on this library. If you modify this
+  library, you may extend this exception to your version of the
+  library, but you are not obliged to do so. If you do not wish
+  to do so, delete this exception statement from your version.
 
-"Legal Entity" shall mean the union of the acting entity and all other 
-entities that control, are controlled by, or are under common control 
-with that entity. For the purposes of this definition, "control" means 
-(i) the power, direct or indirect, to cause the direction or management 
-of such entity, whether by contract or otherwise, or (ii) ownership of 
-fifty percent (50%) or more of the outstanding shares, or 
-(iii) beneficial ownership of such entity.
+---
 
-"You" (or "Your") shall mean an individual or Legal Entity exercising 
-permissions granted by this License.
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
 
-"Source" form shall mean the preferred form for making modifications, 
-including but not limited to software source code, documentation source, 
-and configuration files.
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                          675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-"Object" form shall mean any form resulting from mechanical transformation 
-or translation of a Source form, including but not limited to compiled 
-object code, generated documentation, and conversions to other media types.
+			    Preamble
 
-"Work" shall mean the work of authorship, whether in Source or Object form, 
-made available under the License, as indicated by a copyright notice that is 
-included in or attached to the work (an example is provided in the Appendix below).
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
 
-"Derivative Works" shall mean any work, whether in Source or Object form, 
-that is based on (or derived from) the Work and for which the editorial 
-revisions, annotations, elaborations, or other modifications represent, as a 
-whole, an original work of authorship. For the purposes of this License, 
-Derivative Works shall not include works that remain separable from, or 
-merely link (or bind by name) to the interfaces of, the Work and 
-Derivative Works thereof.
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
 
-"Contribution" shall mean any work of authorship, including the original 
-version of the Work and any modifications or additions to that Work or Derivative 
-Works thereof, that is intentionally submitted to Licensor for inclusion in the 
-Work by the copyright owner or by an individual or Legal Entity authorized to 
-submit on behalf of the copyright owner. For the purposes of this definition, 
-"submitted" means any form of electronic, verbal, or written communication sent 
-to the Licensor or its representatives, including but not limited to 
-communication on electronic mailing lists, source code control systems, and 
-issue tracking systems that are managed by, or on behalf of, the Licensor for 
-the purpose of discussing and improving the Work, but excluding communication 
-that is conspicuously marked or otherwise designated in writing by the copyright 
-owner as "Not a Contribution."
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
 
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf 
-of whom a Contribution has been received by Licensor and subsequently incorporated 
-within the Work.
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
 
-2. Grant of Copyright License. Subject to the terms and conditions of this License, 
-each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, 
-no-charge, royalty-free, irrevocable copyright license to reproduce, prepare 
-Derivative Works of, publicly display, publicly perform, sublicense, and distribute 
-the Work and such Derivative Works in Source or Object form.
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
 
-3. Grant of Patent License. Subject to the terms and conditions of this License, 
-each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, 
-no-charge, royalty-free, irrevocable (except as stated in this section) patent 
-license to make, have made, use, offer to sell, sell, import, and otherwise transfer 
-the Work, where such license applies only to those patent claims licensable by such 
-Contributor that are necessarily infringed by their Contribution(s) alone or by 
-combination of their Contribution(s) with the Work to which such Contribution(s) was 
-submitted. If You institute patent litigation against any entity (including a 
-cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution 
-incorporated within the Work constitutes direct or contributory patent infringement, 
-then any patent licenses granted to You under this License for that Work shall 
-terminate as of the date such litigation is filed.
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
 
-4. Redistribution. You may reproduce and distribute copies of the Work or Derivative 
-Works thereof in any medium, with or without modifications, and in Source or Object 
-form, provided that You meet the following conditions:
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
 
-You must give any other recipients of the Work or Derivative Works a copy of this 
-License; and
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-You must cause any modified files to carry prominent notices stating that You changed 
-the files; and
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
 
-You must retain, in the Source form of any Derivative Works that You distribute, 
-all copyright, patent, trademark, and attribution notices from the Source form of the Work, 
-excluding those notices that do not pertain to any part of the Derivative Works; and
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
 
-If the Work includes a "NOTICE" text file as part of its distribution, then any 
-Derivative Works that You distribute must include a readable copy of the attribution 
-notices contained within such NOTICE file, excluding those notices that do not pertain 
-to any part of the Derivative Works, in at least one of the following places: within a 
-NOTICE text file distributed as part of the Derivative Works; within the Source form or 
-documentation, if provided along with the Derivative Works; or, within a display 
-generated by the Derivative Works, if and wherever such third-party notices normally 
-appear. The contents of the NOTICE file are for informational purposes only and do not 
-modify the License. You may add Your own attribution notices within Derivative Works 
-that You distribute, alongside or as an addendum to the NOTICE text from the Work, 
-provided that such additional attribution notices cannot be construed as modifying 
-the License. You may add Your own copyright statement to Your modifications and may 
-provide additional or different license terms and conditions for use, reproduction, 
-or distribution of Your modifications, or for any such Derivative Works as a whole, 
-provided Your use, reproduction, and distribution of the Work otherwise complies 
-with the conditions stated in this License.
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
 
-5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution 
-intentionally submitted for inclusion in the Work by You to the Licensor shall be under 
-the terms and conditions of this License, without any additional terms or conditions. 
-Notwithstanding the above, nothing herein shall supersede or modify the terms of any 
-separate license agreement you may have executed with Licensor regarding such Contributions.
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
 
-6. Trademarks. This License does not grant permission to use the trade names, trademarks, 
-service marks, or product names of the Licensor, except as required for reasonable and 
-customary use in describing the origin of the Work and reproducing the content of 
-the NOTICE file.
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
 
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, 
-Licensor provides the Work (and each Contributor provides its Contributions) on an 
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, 
-including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, 
-MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for 
-determining the appropriateness of using or redistributing the Work and assume any 
-risks associated with Your exercise of permissions under this License.
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
 
-8. Limitation of Liability. In no event and under no legal theory, whether in tort 
-(including negligence), contract, or otherwise, unless required by applicable law 
-(such as deliberate and grossly negligent acts) or agreed to in writing, shall any 
-Contributor be liable to You for damages, including any direct, indirect, special, 
-incidental, or consequential damages of any character arising as a result of this 
-License or out of the use or inability to use the Work (including but not limited to 
-damages for loss of goodwill, work stoppage, computer failure or malfunction, or any 
** Diff limit reached (max: 250 lines) **
0a3b6129 2019-03-17 04:27:32 Timothy Pearson
Minor modifications for Debian
A debian_configure
M sesman/startwm.sh
** Diff limit reached (max: 250 lines) **
5ee99c5c 2019-03-17 04:27:33 Timothy Pearson
Fix xrdp script on Debian
M instfiles/xrdp.sh
** Diff limit reached (max: 250 lines) **
716ac552 2019-03-17 04:28:13 Timothy Pearson
Add preliminary Raptor session management
A raptorsmiface/Makefile.am
A raptorsmiface/libraptorsmiface.c
A raptorsmiface/libraptorsmiface.h
M Makefile.am
M configure.ac
M sesman/Makefile.am
M sesman/chansrv/Makefile.am
M sesman/chansrv/chansrv.c
M sesman/sesman.ini
M sesman/session.c
M xrdp/Makefile.am
M xrdp/xrdp.ini
M xrdp/xrdp_mm.c
M xrdp/xrdp_types.h
** Diff limit reached (max: 250 lines) **
fd80420d 2019-03-17 04:28:54 Timothy Pearson
Fix a number of problems
System is now mostly stabilized
M common/defines.h
M common/trans.c
M raptorsmiface/libraptorsmiface.c
M raptorsmiface/libraptorsmiface.h
M sesman/chansrv/chansrv.c
M sesman/scp_v0.c
M sesman/scp_v1.c
M sesman/session.c
M xrdp/xrdp_mm.c
M xup/xup.c
** Diff limit reached (max: 250 lines) **
4f438331 2019-03-17 04:28:54 Timothy Pearson
Add server/group mapping
M raptorsmiface/libraptorsmiface.c
M xrdp/xrdp_mm.c
** Diff limit reached (max: 250 lines) **
ee3be60d 2019-03-17 04:28:54 Timothy Pearson
Partially fix immediate exit after login
M xup/xup.c
** Diff limit reached (max: 250 lines) **
03388a2a 2019-03-17 04:28:54 Timothy Pearson
Add hack to support blank cursors for now
M xorg/X11R7.6/rdp/rdpinput.c
M xup/xup.c
** Diff limit reached (max: 250 lines) **
86e0c021 2019-03-17 04:28:54 Timothy Pearson
Update branding
M xrdp/ad24b.bmp
M xrdp/ad256.bmp
M xrdp/xrdp.ini
M xrdp/xrdp24b.bmp
M xrdp/xrdp256.bmp
M xrdp/xrdp_login_wnd.c
M xrdp/xrdp_logo.bmp
** Diff limit reached (max: 250 lines) **
eaf7906d 2019-03-17 04:28:54 Timothy Pearson
Use a black login background
M xrdp/xrdp.ini
M xrdp/xrdp24b.bmp
M xrdp/xrdp256.bmp
** Diff limit reached (max: 250 lines) **
dbf543ef 2019-03-17 04:28:54 Timothy Pearson
Add ability to recover somewhat from a dead master node
M raptorsmiface/libraptorsmiface.c
** Diff limit reached (max: 250 lines) **
6e00f6f8 2019-03-17 04:28:54 Timothy Pearson
Add master node session recovery support
M raptorsmiface/libraptorsmiface.c
M raptorsmiface/libraptorsmiface.h
M sesman/scp_v0.c
M sesman/scp_v1.c
M sesman/session.c
** Diff limit reached (max: 250 lines) **
975bff7d 2019-03-17 04:28:54 Timothy Pearson
Add additional debug statement
M raptorsmiface/libraptorsmiface.c
** Diff limit reached (max: 250 lines) **
e1e88cb6 2019-03-17 04:28:54 Timothy Pearson
Fix merge
M sesman/scp_v0.c
M sesman/session.c
** Diff limit reached (max: 250 lines) **
74e972a6 2019-03-17 04:28:54 Timothy Pearson
Add rudimentary sound support
M raptorsmiface/libraptorsmiface.c
M raptorsmiface/libraptorsmiface.h
M sesman/chansrv/chansrv.c
M sesman/chansrv/clipboard.c
M sesman/chansrv/sound.c
** Diff limit reached (max: 250 lines) **
19a65f44 2019-03-17 04:28:54 Timothy Pearson
Add statistics reporting
M raptorsmiface/libraptorsmiface.c
M raptorsmiface/libraptorsmiface.h
M xrdp/xrdp_types.h
** Diff limit reached (max: 250 lines) **
900cf343 2019-03-17 04:29:19 Timothy Pearson
Add additional statistics reporting
M raptorsmiface/libraptorsmiface.c
M raptorsmiface/libraptorsmiface.h
M xrdp/xrdp.c
** Diff limit reached (max: 250 lines) **
05959ce7 2019-03-17 04:29:19 Timothy Pearson
Add MySQL database skeleton file
A database/mysql/remotelab_sm_database.sql
** Diff limit reached (max: 250 lines) **
50efcc1b 2019-03-17 04:29:19 Timothy Pearson
Add database configuration options to main config file
M raptorsmiface/libraptorsmiface.c
M raptorsmiface/libraptorsmiface.h
** Diff limit reached (max: 250 lines) **
8bc41ead 2019-03-17 04:29:19 Timothy Pearson
Fix non-root-user display server startup failure
Transfer and clean up Kerberos ticket on login and logout
Remove spurious debugging messages
M instfiles/pam.d/xrdp-sesman
M raptorsmiface/libraptorsmiface.c
M sesman/env.c
M xrdp/xrdp_login_wnd.c
** Diff limit reached (max: 250 lines) **
81ef3879 2019-03-17 04:29:19 Timothy Pearson
Fix sporadic xrdp-sesman crash on session initiation
Fix a number of memory leaks
Fix access to freed memory
Fix invalid function return values
M raptorsmiface/libraptorsmiface.c
M raptorsmiface/libraptorsmiface.h
** Diff limit reached (max: 250 lines) **
e12fb079 2019-03-17 04:29:19 Timothy Pearson
Download installation files from correct locations
Keep track of arbiter(s) in use per connection
M raptorsmiface/libraptorsmiface.c
M raptorsmiface/libraptorsmiface.h
** Diff limit reached (max: 250 lines) **
79c83dcc 2019-03-17 04:29:19 Timothy Pearson
Second part of prior commit
M database/mysql/remotelab_sm_database.sql
** Diff limit reached (max: 250 lines) **
fa757d6a 2019-03-17 04:29:19 Timothy Pearson
Update for OpenSSL 1.1
M common/ssl_calls.c
** Diff limit reached (max: 250 lines) **
483d565d 2019-03-17 04:29:19 Timothy Pearson
Update sources to build on ppc64el
A xorg/X11R7.6/libdrm-2.4.26.patch
M xorg/X11R7.6/buildx.sh
** Diff limit reached (max: 250 lines) **
ef61ee36 2019-03-17 04:37:40 Timothy Pearson
Fix endianness checks on ppc64
M common/arch.h
** Diff limit reached (max: 250 lines) **
cc81e51d 2019-03-17 04:37:40 Timothy Pearson
Don't try connecting to remote node if preliminary node allocation has failed for any reason
M sesman/session.c
** Diff limit reached (max: 250 lines) **
d17260a3 2019-03-17 04:37:40 Timothy Pearson
Add debug warning when maximum session limit is hit for a specified user group
M raptorsmiface/libraptorsmiface.c
** Diff limit reached (max: 250 lines) **
235928cc 2019-03-17 04:37:40 Timothy Pearson
Fix a few situations where process output was corrupted with existing uncleard buffer data
This fixes session termination not being marked in the database
M raptorsmiface/libraptorsmiface.c
** Diff limit reached (max: 250 lines) **
6d50b00a 2019-03-17 04:37:40 Timothy Pearson
Fix a couple of additional ppc64 endianness / alignment issues
A xorg/X11R7.6/xorg-server-1.9.3.patch
M common/arch.h
M xorg/X11R7.6/rdp/rdp.h
** Diff limit reached (max: 250 lines) **
5d0ee24e 2019-03-17 04:37:40 Timothy Pearson
Update management network range
M raptorsmiface/libraptorsmiface.h
** Diff limit reached (max: 250 lines) **
49a638e6 2019-03-17 04:37:40 Timothy Pearson
Always show log during connection
M xrdp/xrdp_wm.c
** Diff limit reached (max: 250 lines) **
1f46a949 2019-03-17 04:37:40 Timothy Pearson
Disable SHM access between XUP and Xorg as they are not running on the same machine
M sesman/session.c
M xorg/X11R7.6/rdp/rdpup.c
** Diff limit reached (max: 250 lines) **
daa1a888 2019-03-17 04:37:40 Timothy Pearson
Fix crash when SHM not available
Enhance debug logging of SHM related functions
M common/os_calls.c
M xup/xup.c
** Diff limit reached (max: 250 lines) **