7141061 Update to samba 3.6.3
authorJiri Sasek <Jiri.Sasek@Sun.COM>
Fri, 06 Apr 2012 05:53:13 -0700
changeset 761 3518078b68c4
parent 760 c73130bfdec1
child 762 d87f60e41094
7141061 Update to samba 3.6.3 7125870 Update Solaris 10 Samba to 3.6.0 or later for SMB2 support 7123009 MS-Windows clients can't rename files on ZFS with 119757-20, (Samba 3.5.8) 7127671 smbd panics/crashes with 'Type mismatch: name[NULL] expected[struct server_security_state]' 7159316 Userland:components/samba/samba/samba-license contain the old SVR4-packaging "copyright" info.
components/samba/samba/Makefile
components/samba/samba/patches/ace4-synchronize.patch
components/samba/samba/patches/vfs_shadow_copy2.c.patch
components/samba/samba/samba-license
components/samba/samba/samba.p5m
--- a/components/samba/samba/Makefile	Thu Apr 05 08:48:42 2012 -0700
+++ b/components/samba/samba/Makefile	Fri Apr 06 05:53:13 2012 -0700
@@ -20,16 +20,16 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		samba
-COMPONENT_VERSION=	3.5.12
+COMPONENT_VERSION=	3.6.3
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://www.samba.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH=	sha1:cce0a391b4468a716dda2315a56271a785990c54
+COMPONENT_ARCHIVE_HASH=	sha1:430a1e13fe20c17e2808035c863eb5e77685c89b
 COMPONENT_ARCHIVE_URL=	http://us1.samba.org/samba/ftp/stable/$(COMPONENT_ARCHIVE)
 
 COMPONENT_NAME_1=		docbook-xsl
@@ -141,30 +141,31 @@
 
 CONFIGURE_LIBDIR.32 = /usr/lib/samba
 CONFIGURE_LIBDIR.64 = /usr/lib/samba/$(MACH64)
-CONFIGURE_OPTIONS += --includedir=/usr/include/samba
-CONFIGURE_OPTIONS += --sysconfdir=/etc/samba
-CONFIGURE_OPTIONS += --with-configdir=/etc/samba
-CONFIGURE_OPTIONS += --with-privatedir=/etc/samba/private
-CONFIGURE_OPTIONS += --with-swatdir=/usr/share/samba/swat
-CONFIGURE_OPTIONS += --localstatedir=/var/samba
-CONFIGURE_OPTIONS += --with-lockdir=/var/samba/locks
-CONFIGURE_OPTIONS += --with-piddir=/var/samba/locks
-CONFIGURE_OPTIONS += --with-logfilebase=/var/samba/log
-CONFIGURE_OPTIONS += --enable-shared=yes
-CONFIGURE_OPTIONS += --enable-static=no
-CONFIGURE_OPTIONS += --with-static-modules=
+CONFIGURE_OPTIONS +=	--includedir=/usr/include/samba
+CONFIGURE_OPTIONS +=	--sysconfdir=/etc/samba
+CONFIGURE_OPTIONS +=	--with-configdir=/etc/samba
+CONFIGURE_OPTIONS +=	--with-privatedir=/etc/samba/private
+CONFIGURE_OPTIONS +=	--with-swatdir=/usr/share/samba/swat
+CONFIGURE_OPTIONS +=	--localstatedir=/var/samba
+CONFIGURE_OPTIONS +=	--with-lockdir=/var/samba/locks
+CONFIGURE_OPTIONS +=	--with-piddir=/var/samba/locks
+CONFIGURE_OPTIONS +=	--with-logfilebase=/var/samba/log
+CONFIGURE_OPTIONS +=	--enable-shared=yes
+CONFIGURE_OPTIONS +=	--enable-static=no
+CONFIGURE_OPTIONS +=	--with-static-modules=vfs_solarisacl
 CONFIGURE_OPTIONS.32 += --with-shared-modules=vfs_zfsacl,vfs_samfs,vfs_prealloc,vfs_cacheprime,vfs_commit,idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex
 CONFIGURE_OPTIONS.64 += --with-shared-modules=
-CONFIGURE_OPTIONS += --with-readline
-CONFIGURE_OPTIONS += --enable-cups
-CONFIGURE_OPTIONS += --with-aio-support
-CONFIGURE_OPTIONS += --with-acl-support
-CONFIGURE_OPTIONS += --with-ads
-CONFIGURE_OPTIONS += --with-ldap
-CONFIGURE_OPTIONS += --with-automount
-CONFIGURE_OPTIONS += --with-dnsupdate
-CONFIGURE_OPTIONS += --with-pam
-CONFIGURE_OPTIONS += --with-winbind
+CONFIGURE_OPTIONS +=	--with-readline
+CONFIGURE_OPTIONS +=	--enable-cups
+CONFIGURE_OPTIONS +=	--with-aio-support
+CONFIGURE_OPTIONS +=	--with-acl-support
+CONFIGURE_OPTIONS +=	--with-ads
+CONFIGURE_OPTIONS +=	--with-ldap
+CONFIGURE_OPTIONS +=	--with-automount
+CONFIGURE_OPTIONS +=	--with-dnsupdate=no
+CONFIGURE_OPTIONS +=	--with-pam
+CONFIGURE_OPTIONS +=	--with-winbind
+
 CONFIGURE_OPTIONS += 	LD="$(LD)"
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS.32 +=	CPPFLAGS="$(CPPFLAGS) -I$(BUILD_DIR)/libsam-LGPL/include"
@@ -204,7 +205,7 @@
 	   $(BUILD_DIR)/$(MACH32)/examples/smb.conf.default
 
 # Samba targets
-$(BUILD_32): COMPONENT_BUILD_TARGETS = showlayout everything
+$(BUILD_32): COMPONENT_BUILD_TARGETS = showlayout all libsmbclient modules smbtorture
 $(BUILD_64): COMPONENT_BUILD_TARGETS = showlayout nss_modules pam_modules pam_smbpass wins pam_winbind
 $(INSTALL_32): COMPONENT_INSTALL_TARGETS = showlayout install-everything
 $(INSTALL_64): COMPONENT_INSTALL_TARGETS = showlayout installpammodules
--- a/components/samba/samba/patches/ace4-synchronize.patch	Thu Apr 05 08:48:42 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-7011577 Impossible to rename a file on a ZFS filesystem when installing 146364-01 (Samba 3.5.5)
-Fix bug #7909 - map SYNCHRONIZE acl permission statically in zfs_acl vfs module.
-
-diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
-index 1913946..e2f9fe3 100644
---- a/source3/modules/nfs4_acls.c
-+++ b/source3/modules/nfs4_acls.c
-@@ -280,7 +280,9 @@ static bool smbacl4_nfs42win(TALLOC_CTX *mem_ctx, SMB4ACL_T *theacl, /* in */
- 		DEBUG(10, ("mapped ace flags: 0x%x => 0x%x\n",
- 		      ace->aceFlags, mapped_ace_flags));
- 
--		mask = ace->aceMask;
-+		/* Windows clients expect SYNC on acls to
-+		   correctly allow rename. See bug #7909. */
-+		mask = ace->aceMask | SMB_ACE4_SYNCHRONIZE;
- 		init_sec_ace(&nt_ace_list[good_aces++], &sid,
- 			ace->aceType, mask,
- 			mapped_ace_flags);
-diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c
-index 98c9bcf..8a2c378 100644
---- a/source3/modules/vfs_zfsacl.c
-+++ b/source3/modules/vfs_zfsacl.c
-@@ -124,6 +124,9 @@ static bool zfs_process_smbacl(files_struct *fsp, SMB4ACL_T *smbacl)
- 		acebuf[i].a_type        = aceprop->aceType;
- 		acebuf[i].a_flags       = aceprop->aceFlags;
- 		acebuf[i].a_access_mask = aceprop->aceMask;
-+		/* SYNC on acls is a no-op on ZFS.
-+		   See bug #7909. */
-+		acebuf[i].a_access_mask &= ~SMB_ACE4_SYNCHRONIZE;
- 		acebuf[i].a_who         = aceprop->who.id;
- 		if(aceprop->flags & SMB_ACE4_ID_SPECIAL) {
- 			switch(aceprop->who.special_id) {
--- a/components/samba/samba/patches/vfs_shadow_copy2.c.patch	Thu Apr 05 08:48:42 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-7011579 Request to add shadow_copy2 in the next Samba patch or Solaris Samba package
-s3: Replace shadow_copy2 with a new implementation
-
-X-Git-Url: http://gitweb.samba.org/?p=samba.git;a=blobdiff_plain;f=source3%2Fmodules%2Fvfs_shadow_copy2.c;h=2777907a57da081118e8d11f846f6a33f9095a1d;hp=0393f309692b139f74c2460d2bdc27f8352bf50a;hb=HEAD;hpb=cf74a4857c051b43b1f6a06b714a93a65e8a1f90
-
-diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c
-index 0393f30..2777907 100644
---- a/source3/modules/vfs_shadow_copy2.c
-+++ b/source3/modules/vfs_shadow_copy2.c
-@@ -250,8 +250,8 @@ static const char *shadow_copy2_normalise_path(TALLOC_CTX *mem_ctx, const char *
- } while (0)
- 
- #define _SHADOW2_NEXT_SMB_FNAME(op, args, rtype, eret, extra) do { \
--		const char *gmt_start; \
--		if (shadow_copy2_match_name(smb_fname->base_name, &gmt_start)) {	\
-+	const char *gmt_start; \
-+	if (shadow_copy2_match_name(smb_fname->base_name, &gmt_start)) { \
- 		char *name2; \
- 		char *smb_base_name_tmp = NULL; \
- 		rtype ret; \
-@@ -535,6 +535,10 @@ static int shadow_copy2_rename(vfs_handle_struct *handle,
- 			       const struct smb_filename *smb_fname_src,
- 			       const struct smb_filename *smb_fname_dst)
- {
-+	if (shadow_copy2_match_name(smb_fname_src->base_name, NULL)) {
-+		errno = EXDEV;
-+		return -1;
-+	}
- 	SHADOW2_NEXT2_SMB_FNAME(RENAME,
- 				(handle, smb_fname_src, smb_fname_dst));
- }
--- a/components/samba/samba/samba-license	Thu Apr 05 08:48:42 2012 -0700
+++ b/components/samba/samba/samba-license	Fri Apr 06 05:53:13 2012 -0700
@@ -1,736 +1,9 @@
-Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 
 This package may include technology which may be subject to one or more
 of the following additional notices:
 
-Samba 3.5.12
-Oracle Internal Tracking Number 7077
-
-                        GNU GENERAL PUBLIC LICENSE
-                          Version 3, 29 June 2007
-
-    Copyright (C) 2007 Free Software Foundation, Inc._http://fsf.org/_.
-    Everyone is permitted to copy and distribute verbatim copies
-    of this license document, but changing it is not allowed.
-
-                               Preamble
-
-     The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-     The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-     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
-them 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.
-
-     To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-     For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  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.
-
-     Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-     For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-     Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-     Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-     The precise terms and conditions for copying, distribution and
-modification follow.
-
-                          TERMS AND CONDITIONS
-
-     0. Definitions.
-
-     "This License" refers to version 3 of the GNU General Public License.
-
-     "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-     "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-     To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-     A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-     To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-     To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-     An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-     1. Source Code.
-
-     The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-     A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-     The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-     The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-     The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-     The Corresponding Source for a work in source code form is that
-same work.
-
-     2. Basic Permissions.
-
-     All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-     You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-     Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-     3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-     No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-     When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-     4. Conveying Verbatim Copies.
-
-     You may convey 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;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-     You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-     5. Conveying Modified Source Versions.
-
-     You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-       a) The work must carry prominent notices stating that you modified
-       it, and giving a relevant date.
-
-       b) The work must carry prominent notices stating that it is
-       released under this License and any conditions added under section
-       7.  This requirement modifies the requirement in section 4 to
-       "keep intact all notices".
-
-       c) You must license the entire work, as a whole, under this
-       License to anyone who comes into possession of a copy.  This
-       License will therefore apply, along with any applicable section 7
-       additional terms, to the whole of the work, and all its parts,
-       regardless of how they are packaged.  This License gives no
-       permission to license the work in any other way, but it does not
-       invalidate such permission if you have separately received it.
-
-       d) If the work has interactive user interfaces, each must display
-       Appropriate Legal Notices; however, if the Program has interactive
-       interfaces that do not display Appropriate Legal Notices, your
-       work need not make them do so.
-
-     A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-     6. Conveying Non-Source Forms.
-
-     You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-       a) Convey the object code in, or embodied in, a physical product
-       (including a physical distribution medium), accompanied by the
-       Corresponding Source fixed on a durable physical medium
-       customarily used for software interchange.
-
-       b) Convey the object code in, or embodied in, a physical product
-       (including a physical distribution medium), accompanied by a
-       written offer, valid for at least three years and valid for as
-       long as you offer spare parts or customer support for that product
-       model, to give anyone who possesses the object code either (1) a
-       copy of the Corresponding Source for all the software in the
-       product that is covered by this License, on a durable physical
-       medium customarily used for software interchange, for a price no
-       more than your reasonable cost of physically performing this
-       conveying of source, or (2) access to copy the
-       Corresponding Source from a network server at no charge.
-
-       c) Convey individual copies of the object code with a copy of the
-       written offer to provide the Corresponding Source.  This
-       alternative is allowed only occasionally and non-commercially, and
-       only if you received the object code with such an offer, in accord
-       with subsection 6b.
-
-       d) Convey the object code by offering access from a designated
-       place (gratis or for a charge), and offer equivalent access to the
-       Corresponding Source in the same way through the same place at no
-       further charge.  You need not require recipients to copy the
-       Corresponding Source along with the object code.  If the place to
-       copy the object code is a network server, the Corresponding Source
-       may be on a different server (operated by you or a third party)
-       that supports equivalent copying facilities, provided you maintain
-       clear directions next to the object code saying where to find the
-       Corresponding Source.  Regardless of what server hosts the
-       Corresponding Source, you remain obligated to ensure that it is
-       available for as long as needed to satisfy these requirements.
-
-       e) Convey the object code using peer-to-peer transmission, provided
-       you inform other peers where the object code and Corresponding
-       Source of the work are being offered to the general public at no
-       charge under subsection 6d.
-
-     A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-     A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-     "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-     If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-     The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-     Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-     7. Additional Terms.
-
-     "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-     When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-     Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-       a) Disclaiming warranty or limiting liability differently from the
-       terms of sections 15 and 16 of this License; or
-
-       b) Requiring preservation of specified reasonable legal notices or
-       author attributions in that material or in the Appropriate Legal
-       Notices displayed by works containing it; or
-
-       c) Prohibiting misrepresentation of the origin of that material, or
-       requiring that modified versions of such material be marked in
-       reasonable ways as different from the original version; or
-
-       d) Limiting the use for publicity purposes of names of licensors or
-       authors of the material; or
-
-       e) Declining to grant rights under trademark law for use of some
-       trade names, trademarks, or service marks; or
-
-       f) Requiring indemnification of licensors and authors of that
-       material by anyone who conveys the material (or modified versions of
-       it) with contractual assumptions of liability to the recipient, for
-       any liability that these contractual assumptions directly impose on
-       those licensors and authors.
-
-     All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-     If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-     Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-     8. Termination.
-
-     You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-     However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-     Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-     Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-     9. Acceptance Not Required for Having Copies.
-
-     You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-     10. Automatic Licensing of Downstream Recipients.
-
-     Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-     An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-     You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-     11. Patents.
-
-     A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-     A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-     Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-     In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-     If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-     If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-     A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-     Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-     12. No Surrender of Others' Freedom.
-
-     If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-     13. Use with the GNU Affero General Public License.
-
-     Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-     14. Revised Versions of this License.
-
-     The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-     Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-     If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-     Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-     15. Disclaimer of Warranty.
-
-     THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-     16. Limitation of Liability.
-
-     IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-     17. Interpretation of Sections 15 and 16.
-
-     If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                        END OF TERMS AND CONDITIONS
-
-               How to Apply These Terms to Your New Programs
-
-     If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-     To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
-       Copyright (C)
-
-       This program is free software: you can redistribute it and/or modify
-       it under the terms of the GNU General Public License as published by
-       the Free Software Foundation, either version 3 of the License, or
-       (at your option) any later version.
-
-       This program is distributed in the hope that it will be useful,
-       but WITHOUT ANY WARRANTY; without even the implied warranty of
-       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-       GNU General Public License for more details.
-
-       You should have received a copy of the GNU General Public License
-       along with this program.  If not, see_http://www.gnu.org/licenses/_.
-
-Also add information on how to contact you by electronic and paper mail.
-
-     If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-         Copyright (C)
-       This program comes with ABSOLUTELY NO WARRANTY; for details type
-`show w'.
-       This is free software, and you are welcome to redistribute it
-       under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-     You should also get your employer (if you work as a programmer) or
-school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-_http://www.gnu.org/licenses/_.
-
-     The GNU General Public License does not permit incorporating your
-program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-_http://www.gnu.org/philosophy/why-not-lgpl.html_.
-
---------------------------------------------------------------------
-
-Written Offer to Provide Certain Source Code
-
-The Oracle software and/or hardware you have received may contain or
-include certain portions that are licensed under license terms provided
-by third parties not associated with Oracle. For binaries that you
-receive from Oracle that are licensed under any version of the GNU
-General Public License (GPL) or the GNU LGPL, you can receive a complete
-machine-readable copy of the source code by sending a written request to:
-
-Oracle America, Inc.
-
-Attn: Associate General Counsel,
-
-Development and Engineering Legal
-
-500 Oracle Parkway, 7th Floor
-
-Redwood Shores, CA 94065
-
-
-
-Your request should include (i) the name of the covered binary, (ii) the
-version number of the Oracle product containing the covered binary,
-(iii) your name, (iv) your company name (if applicable) and (v) your
-return mailing and email address (if available).
-
-We may charge you a nominal fee to cover the cost of the media and
-distribution.
-
-Your request must be sent within three (3) years of the date you
-received the GPL or LGPL covered code.
-
-
-
-
-
--- 
-
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-
-================================================================================
+Samba 3.6.3
+Oracle Internal Tracking Number 8187
 
                         GNU GENERAL PUBLIC LICENSE
                           Version 3, 29 June 2007
@@ -1449,1456 +722,3 @@
 
 
 -- 
-
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-
-================================================================================
-
-                        GNU GENERAL PUBLIC LICENSE
-                          Version 3, 29 June 2007
-
-    Copyright (C) 2007 Free Software Foundation, Inc._http://fsf.org/_.
-    Everyone is permitted to copy and distribute verbatim copies
-    of this license document, but changing it is not allowed.
-
-                               Preamble
-
-     The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-     The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-     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
-them 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.
-
-     To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-     For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  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.
-
-     Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-     For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-     Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-     Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-     The precise terms and conditions for copying, distribution and
-modification follow.
-
-                          TERMS AND CONDITIONS
-
-     0. Definitions.
-
-     "This License" refers to version 3 of the GNU General Public License.
-
-     "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-     "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-     To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-     A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-     To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-     To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-     An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-     1. Source Code.
-
-     The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-     A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-     The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-     The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-     The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-     The Corresponding Source for a work in source code form is that
-same work.
-
-     2. Basic Permissions.
-
-     All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-     You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-     Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-     3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-     No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-     When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-     4. Conveying Verbatim Copies.
-
-     You may convey 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;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-     You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-     5. Conveying Modified Source Versions.
-
-     You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-       a) The work must carry prominent notices stating that you modified
-       it, and giving a relevant date.
-
-       b) The work must carry prominent notices stating that it is
-       released under this License and any conditions added under section
-       7.  This requirement modifies the requirement in section 4 to
-       "keep intact all notices".
-
-       c) You must license the entire work, as a whole, under this
-       License to anyone who comes into possession of a copy.  This
-       License will therefore apply, along with any applicable section 7
-       additional terms, to the whole of the work, and all its parts,
-       regardless of how they are packaged.  This License gives no
-       permission to license the work in any other way, but it does not
-       invalidate such permission if you have separately received it.
-
-       d) If the work has interactive user interfaces, each must display
-       Appropriate Legal Notices; however, if the Program has interactive
-       interfaces that do not display Appropriate Legal Notices, your
-       work need not make them do so.
-
-     A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-     6. Conveying Non-Source Forms.
-
-     You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-       a) Convey the object code in, or embodied in, a physical product
-       (including a physical distribution medium), accompanied by the
-       Corresponding Source fixed on a durable physical medium
-       customarily used for software interchange.
-
-       b) Convey the object code in, or embodied in, a physical product
-       (including a physical distribution medium), accompanied by a
-       written offer, valid for at least three years and valid for as
-       long as you offer spare parts or customer support for that product
-       model, to give anyone who possesses the object code either (1) a
-       copy of the Corresponding Source for all the software in the
-       product that is covered by this License, on a durable physical
-       medium customarily used for software interchange, for a price no
-       more than your reasonable cost of physically performing this
-       conveying of source, or (2) access to copy the
-       Corresponding Source from a network server at no charge.
-
-       c) Convey individual copies of the object code with a copy of the
-       written offer to provide the Corresponding Source.  This
-       alternative is allowed only occasionally and non-commercially, and
-       only if you received the object code with such an offer, in accord
-       with subsection 6b.
-
-       d) Convey the object code by offering access from a designated
-       place (gratis or for a charge), and offer equivalent access to the
-       Corresponding Source in the same way through the same place at no
-       further charge.  You need not require recipients to copy the
-       Corresponding Source along with the object code.  If the place to
-       copy the object code is a network server, the Corresponding Source
-       may be on a different server (operated by you or a third party)
-       that supports equivalent copying facilities, provided you maintain
-       clear directions next to the object code saying where to find the
-       Corresponding Source.  Regardless of what server hosts the
-       Corresponding Source, you remain obligated to ensure that it is
-       available for as long as needed to satisfy these requirements.
-
-       e) Convey the object code using peer-to-peer transmission, provided
-       you inform other peers where the object code and Corresponding
-       Source of the work are being offered to the general public at no
-       charge under subsection 6d.
-
-     A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-     A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-     "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-     If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-     The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-     Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-     7. Additional Terms.
-
-     "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-     When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-     Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-       a) Disclaiming warranty or limiting liability differently from the
-       terms of sections 15 and 16 of this License; or
-
-       b) Requiring preservation of specified reasonable legal notices or
-       author attributions in that material or in the Appropriate Legal
-       Notices displayed by works containing it; or
-
-       c) Prohibiting misrepresentation of the origin of that material, or
-       requiring that modified versions of such material be marked in
-       reasonable ways as different from the original version; or
-
-       d) Limiting the use for publicity purposes of names of licensors or
-       authors of the material; or
-
-       e) Declining to grant rights under trademark law for use of some
-       trade names, trademarks, or service marks; or
-
-       f) Requiring indemnification of licensors and authors of that
-       material by anyone who conveys the material (or modified versions of
-       it) with contractual assumptions of liability to the recipient, for
-       any liability that these contractual assumptions directly impose on
-       those licensors and authors.
-
-     All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-     If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-     Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-     8. Termination.
-
-     You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-     However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-     Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-     Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-     9. Acceptance Not Required for Having Copies.
-
-     You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-     10. Automatic Licensing of Downstream Recipients.
-
-     Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-     An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-     You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-     11. Patents.
-
-     A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-     A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-     Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-     In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-     If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-     If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-     A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-     Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-     12. No Surrender of Others' Freedom.
-
-     If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-     13. Use with the GNU Affero General Public License.
-
-     Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-     14. Revised Versions of this License.
-
-     The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-     Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-     If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-     Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-     15. Disclaimer of Warranty.
-
-     THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-     16. Limitation of Liability.
-
-     IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-     17. Interpretation of Sections 15 and 16.
-
-     If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                        END OF TERMS AND CONDITIONS
-
-               How to Apply These Terms to Your New Programs
-
-     If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-     To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
-       Copyright (C)
-
-       This program is free software: you can redistribute it and/or modify
-       it under the terms of the GNU General Public License as published by
-       the Free Software Foundation, either version 3 of the License, or
-       (at your option) any later version.
-
-       This program is distributed in the hope that it will be useful,
-       but WITHOUT ANY WARRANTY; without even the implied warranty of
-       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-       GNU General Public License for more details.
-
-       You should have received a copy of the GNU General Public License
-       along with this program.  If not, see_http://www.gnu.org/licenses/_.
-
-Also add information on how to contact you by electronic and paper mail.
-
-     If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-         Copyright (C)
-       This program comes with ABSOLUTELY NO WARRANTY; for details type
-`show w'.
-       This is free software, and you are welcome to redistribute it
-       under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-     You should also get your employer (if you work as a programmer) or
-school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-_http://www.gnu.org/licenses/_.
-
-     The GNU General Public License does not permit incorporating your
-program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-_http://www.gnu.org/philosophy/why-not-lgpl.html_.
-
---------------------------------------------------------------------
-
-Written Offer to Provide Certain Source Code
-
-The Oracle software and/or hardware you have received may contain or
-include certain portions that are licensed under license terms provided
-by third parties not associated with Oracle. For binaries that you
-receive from Oracle that are licensed under any version of the GNU
-General Public License (GPL) or the GNU LGPL, you can receive a complete
-machine-readable copy of the source code by sending a written request to:
-
-Oracle America, Inc.
-
-Attn: Associate General Counsel,
-
-Development and Engineering Legal
-
-500 Oracle Parkway, 7th Floor
-
-Redwood Shores, CA 94065
-
-
-
-Your request should include (i) the name of the covered binary, (ii) the
-version number of the Oracle product containing the covered binary,
-(iii) your name, (iv) your company name (if applicable) and (v) your
-return mailing and email address (if available).
-
-We may charge you a nominal fee to cover the cost of the media and
-distribution.
-
-Your request must be sent within three (3) years of the date you
-received the GPL or LGPL covered code.
-
-
-
-
-
--- 
-
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-
-================================================================================
-
-                        GNU GENERAL PUBLIC LICENSE
-                          Version 3, 29 June 2007
-
-    Copyright (C) 2007 Free Software Foundation, Inc._http://fsf.org/_.
-    Everyone is permitted to copy and distribute verbatim copies
-    of this license document, but changing it is not allowed.
-
-                               Preamble
-
-     The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-     The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-     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
-them 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.
-
-     To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-     For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  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.
-
-     Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-     For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-     Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-     Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-     The precise terms and conditions for copying, distribution and
-modification follow.
-
-                          TERMS AND CONDITIONS
-
-     0. Definitions.
-
-     "This License" refers to version 3 of the GNU General Public License.
-
-     "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-     "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-     To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-     A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-     To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-     To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-     An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-     1. Source Code.
-
-     The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-     A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-     The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-     The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-     The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-     The Corresponding Source for a work in source code form is that
-same work.
-
-     2. Basic Permissions.
-
-     All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-     You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-     Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-     3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-     No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-     When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-     4. Conveying Verbatim Copies.
-
-     You may convey 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;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-     You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-     5. Conveying Modified Source Versions.
-
-     You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-       a) The work must carry prominent notices stating that you modified
-       it, and giving a relevant date.
-
-       b) The work must carry prominent notices stating that it is
-       released under this License and any conditions added under section
-       7.  This requirement modifies the requirement in section 4 to
-       "keep intact all notices".
-
-       c) You must license the entire work, as a whole, under this
-       License to anyone who comes into possession of a copy.  This
-       License will therefore apply, along with any applicable section 7
-       additional terms, to the whole of the work, and all its parts,
-       regardless of how they are packaged.  This License gives no
-       permission to license the work in any other way, but it does not
-       invalidate such permission if you have separately received it.
-
-       d) If the work has interactive user interfaces, each must display
-       Appropriate Legal Notices; however, if the Program has interactive
-       interfaces that do not display Appropriate Legal Notices, your
-       work need not make them do so.
-
-     A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-     6. Conveying Non-Source Forms.
-
-     You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-       a) Convey the object code in, or embodied in, a physical product
-       (including a physical distribution medium), accompanied by the
-       Corresponding Source fixed on a durable physical medium
-       customarily used for software interchange.
-
-       b) Convey the object code in, or embodied in, a physical product
-       (including a physical distribution medium), accompanied by a
-       written offer, valid for at least three years and valid for as
-       long as you offer spare parts or customer support for that product
-       model, to give anyone who possesses the object code either (1) a
-       copy of the Corresponding Source for all the software in the
-       product that is covered by this License, on a durable physical
-       medium customarily used for software interchange, for a price no
-       more than your reasonable cost of physically performing this
-       conveying of source, or (2) access to copy the
-       Corresponding Source from a network server at no charge.
-
-       c) Convey individual copies of the object code with a copy of the
-       written offer to provide the Corresponding Source.  This
-       alternative is allowed only occasionally and non-commercially, and
-       only if you received the object code with such an offer, in accord
-       with subsection 6b.
-
-       d) Convey the object code by offering access from a designated
-       place (gratis or for a charge), and offer equivalent access to the
-       Corresponding Source in the same way through the same place at no
-       further charge.  You need not require recipients to copy the
-       Corresponding Source along with the object code.  If the place to
-       copy the object code is a network server, the Corresponding Source
-       may be on a different server (operated by you or a third party)
-       that supports equivalent copying facilities, provided you maintain
-       clear directions next to the object code saying where to find the
-       Corresponding Source.  Regardless of what server hosts the
-       Corresponding Source, you remain obligated to ensure that it is
-       available for as long as needed to satisfy these requirements.
-
-       e) Convey the object code using peer-to-peer transmission, provided
-       you inform other peers where the object code and Corresponding
-       Source of the work are being offered to the general public at no
-       charge under subsection 6d.
-
-     A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-     A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-     "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-     If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-     The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-     Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-     7. Additional Terms.
-
-     "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-     When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-     Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-       a) Disclaiming warranty or limiting liability differently from the
-       terms of sections 15 and 16 of this License; or
-
-       b) Requiring preservation of specified reasonable legal notices or
-       author attributions in that material or in the Appropriate Legal
-       Notices displayed by works containing it; or
-
-       c) Prohibiting misrepresentation of the origin of that material, or
-       requiring that modified versions of such material be marked in
-       reasonable ways as different from the original version; or
-
-       d) Limiting the use for publicity purposes of names of licensors or
-       authors of the material; or
-
-       e) Declining to grant rights under trademark law for use of some
-       trade names, trademarks, or service marks; or
-
-       f) Requiring indemnification of licensors and authors of that
-       material by anyone who conveys the material (or modified versions of
-       it) with contractual assumptions of liability to the recipient, for
-       any liability that these contractual assumptions directly impose on
-       those licensors and authors.
-
-     All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-     If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-     Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-     8. Termination.
-
-     You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-     However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-     Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-     Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-     9. Acceptance Not Required for Having Copies.
-
-     You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-     10. Automatic Licensing of Downstream Recipients.
-
-     Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-     An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-     You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-     11. Patents.
-
-     A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-     A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-     Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-     In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-     If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-     If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-     A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-     Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-     12. No Surrender of Others' Freedom.
-
-     If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-     13. Use with the GNU Affero General Public License.
-
-     Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-     14. Revised Versions of this License.
-
-     The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-     Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-     If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-     Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-     15. Disclaimer of Warranty.
-
-     THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-     16. Limitation of Liability.
-
-     IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-     17. Interpretation of Sections 15 and 16.
-
-     If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                        END OF TERMS AND CONDITIONS
-
-               How to Apply These Terms to Your New Programs
-
-     If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-     To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
-       Copyright (C)
-
-       This program is free software: you can redistribute it and/or modify
-       it under the terms of the GNU General Public License as published by
-       the Free Software Foundation, either version 3 of the License, or
-       (at your option) any later version.
-
-       This program is distributed in the hope that it will be useful,
-       but WITHOUT ANY WARRANTY; without even the implied warranty of
-       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-       GNU General Public License for more details.
-
-       You should have received a copy of the GNU General Public License
-       along with this program.  If not, see_http://www.gnu.org/licenses/_.
-
-Also add information on how to contact you by electronic and paper mail.
-
-     If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-         Copyright (C)
-       This program comes with ABSOLUTELY NO WARRANTY; for details type
-`show w'.
-       This is free software, and you are welcome to redistribute it
-       under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-     You should also get your employer (if you work as a programmer) or
-school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-_http://www.gnu.org/licenses/_.
-
-     The GNU General Public License does not permit incorporating your
-program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-_http://www.gnu.org/philosophy/why-not-lgpl.html_.
-
---------------------------------------------------------------------
-
-Written Offer to Provide Certain Source Code
-
-The Oracle software and/or hardware you have received may contain or
-include certain portions that are licensed under license terms provided
-by third parties not associated with Oracle. For binaries that you
-receive from Oracle that are licensed under any version of the GNU
-General Public License (GPL) or the GNU LGPL, you can receive a complete
-machine-readable copy of the source code by sending a written request to:
-
-Oracle America, Inc.
-
-Attn: Associate General Counsel,
-
-Development and Engineering Legal
-
-500 Oracle Parkway, 7th Floor
-
-Redwood Shores, CA 94065
-
-
-
-Your request should include (i) the name of the covered binary, (ii) the
-version number of the Oracle product containing the covered binary,
-(iii) your name, (iv) your company name (if applicable) and (v) your
-return mailing and email address (if available).
-
-We may charge you a nominal fee to cover the cost of the media and
-distribution.
-
-Your request must be sent within three (3) years of the date you
-received the GPL or LGPL covered code.
-
-
-
-
-
--- 
-
--- a/components/samba/samba/samba.p5m	Thu Apr 05 08:48:42 2012 -0700
+++ b/components/samba/samba/samba.p5m	Fri Apr 06 05:53:13 2012 -0700
@@ -164,12 +164,6 @@
      restart_fmri=svc:/system/manifest-import:default
 file path=usr/bin/eventlogadm
 file path=usr/bin/findsmb
-file path=usr/bin/ldbadd
-file path=usr/bin/ldbdel
-file path=usr/bin/ldbedit
-file path=usr/bin/ldbmodify
-file path=usr/bin/ldbrename
-file path=usr/bin/ldbsearch
 file path=usr/bin/net
 file path=usr/bin/nmblookup
 file path=usr/bin/ntlm_auth
@@ -185,10 +179,12 @@
 file usr/bin/profiles path=usr/bin/smbprofiles
 file path=usr/bin/smbspool
 file path=usr/bin/smbstatus
+file path=usr/bin/smbta-util
 file path=usr/bin/smbtar
 file path=usr/bin/smbtree
 file path=usr/bin/tdbbackup
 file path=usr/bin/tdbdump
+file path=usr/bin/tdbrestore
 file path=usr/bin/tdbtool
 file path=usr/bin/testparm
 file path=usr/bin/wbinfo
@@ -198,7 +194,6 @@
 file usr/include/smb_share_modes.h path=usr/include/samba/smb_share_modes.h
 file usr/include/talloc.h path=usr/include/samba/talloc.h
 file usr/include/tdb.h path=usr/include/samba/tdb.h
-file usr/include/wbc_async.h path=usr/include/samba/wbc_async.h
 file usr/include/wbclient.h path=usr/include/samba/wbclient.h
 # nsswitch modules
 file build/$(MACH32)/nsswitch/libnss_winbind.so path=usr/lib/nss_winbind.so.1
@@ -215,6 +210,7 @@
 file path=usr/lib/samba/charset/CP850.so
 file path=usr/lib/samba/idmap/ad.so
 file path=usr/lib/samba/idmap/adex.so
+file path=usr/lib/samba/idmap/autorid.so
 file path=usr/lib/samba/idmap/hash.so
 file path=usr/lib/samba/idmap/ldap.so
 file path=usr/lib/samba/idmap/rid.so
@@ -224,9 +220,9 @@
 file path=usr/lib/samba/libnetapi.so.0
 file path=usr/lib/samba/libsmbclient.so.0
 file path=usr/lib/samba/libsmbsharemodes.so.0
-file path=usr/lib/samba/libtalloc.so.2
-file build/$(MACH64)/source3/bin/libtalloc.so.2 path=usr/lib/samba/$(MACH64)/libtalloc.so.1
-file path=usr/lib/samba/libtdb.so.1
+file path=usr/lib/samba/libtalloc.so.2.0.5
+file build/$(MACH64)/source3/bin/libtalloc.so.2 path=usr/lib/samba/$(MACH64)/libtalloc.so.2
+file path=usr/lib/samba/libtdb.so.1.2.9
 file build/$(MACH64)/source3/bin/libtdb.so.1 path=usr/lib/samba/$(MACH64)/libtdb.so.1
 file path=usr/lib/samba/libwbclient.so.0
 file build/$(MACH64)/source3/bin/libwbclient.so.0 path=usr/lib/samba/$(MACH64)/libwbclient.so.0
@@ -234,8 +230,7 @@
 file path=usr/lib/samba/nl.msg
 file path=usr/lib/samba/pl.msg
 file path=usr/lib/samba/ru.msg
-file build/$(MACH32)/source3/bin/smbtorture path=usr/lib/samba/smbtorture \
-    mode=0555
+file build/$(MACH32)/source3/bin/smbtorture path=usr/lib/samba/smbtorture mode=0555
 file path=usr/lib/samba/tr.msg
 file path=usr/lib/samba/upcase.dat
 file path=usr/lib/samba/valid.dat
@@ -246,6 +241,7 @@
 file path=usr/lib/samba/vfs/cap.so
 file path=usr/lib/samba/vfs/catia.so
 file path=usr/lib/samba/vfs/commit.so
+file path=usr/lib/samba/vfs/crossrename.so
 file path=usr/lib/samba/vfs/default_quota.so
 file path=usr/lib/samba/vfs/dirsort.so
 file path=usr/lib/samba/vfs/expand_msdfs.so
@@ -267,6 +263,7 @@
 file path=usr/lib/samba/vfs/streams_depot.so
 file path=usr/lib/samba/vfs/streams_xattr.so
 file path=usr/lib/samba/vfs/syncops.so
+file path=usr/lib/samba/vfs/time_audit.so
 file path=usr/lib/samba/vfs/xattr_tdb.so
 file path=usr/lib/samba/vfs/zfsacl.so
 # PAM modules
@@ -302,12 +299,6 @@
 file path=usr/share/locale/zh_CN/LC_MESSAGES/pam_winbind.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/pam_winbind.mo
 file path=usr/share/man/man1/findsmb.1
-file path=usr/share/man/man1/ldbadd.1
-file path=usr/share/man/man1/ldbdel.1
-file path=usr/share/man/man1/ldbedit.1
-file path=usr/share/man/man1/ldbmodify.1
-file path=usr/share/man/man1/ldbrename.1
-file path=usr/share/man/man1/ldbsearch.1
 file path=usr/share/man/man1/log2pcap.1
 file path=usr/share/man/man1/nmblookup.1
 file path=usr/share/man/man1/ntlm_auth.1
@@ -336,13 +327,13 @@
 file path=usr/share/man/man8/eventlogadm.8
 file path=usr/share/man/man8/idmap_ad.8
 file path=usr/share/man/man8/idmap_adex.8
+file path=usr/share/man/man8/idmap_autorid.8
 file path=usr/share/man/man8/idmap_hash.8
 file path=usr/share/man/man8/idmap_ldap.8
 file path=usr/share/man/man8/idmap_nss.8
 file path=usr/share/man/man8/idmap_rid.8
 file path=usr/share/man/man8/idmap_tdb.8
 file path=usr/share/man/man8/idmap_tdb2.8
-file path=usr/share/man/man8/mount.cifs.8
 file path=usr/share/man/man8/net.8
 file path=usr/share/man/man8/nmbd.8
 file path=usr/share/man/man8/pam_winbind.8
@@ -350,11 +341,11 @@
 file path=usr/share/man/man8/smbd.8
 file path=usr/share/man/man8/smbpasswd.8
 file path=usr/share/man/man8/smbspool.8
+file path=usr/share/man/man8/smbta-util.8
 file path=usr/share/man/man8/swat.8
 file path=usr/share/man/man8/tdbbackup.8
 file path=usr/share/man/man8/tdbdump.8
 file path=usr/share/man/man8/tdbtool.8
-file path=usr/share/man/man8/umount.cifs.8
 file path=usr/share/man/man8/vfs_acl_tdb.8
 file path=usr/share/man/man8/vfs_acl_xattr.8
 file path=usr/share/man/man8/vfs_audit.8
@@ -362,6 +353,7 @@
 file path=usr/share/man/man8/vfs_cap.8
 file path=usr/share/man/man8/vfs_catia.8
 file path=usr/share/man/man8/vfs_commit.8
+file path=usr/share/man/man8/vfs_crossrename.8
 file path=usr/share/man/man8/vfs_default_quota.8
 file path=usr/share/man/man8/vfs_dirsort.8
 file path=usr/share/man/man8/vfs_extd_audit.8
@@ -382,6 +374,7 @@
 file path=usr/share/man/man8/vfs_smb_traffic_analyzer.8
 file path=usr/share/man/man8/vfs_streams_depot.8
 file path=usr/share/man/man8/vfs_streams_xattr.8
+file path=usr/share/man/man8/vfs_time_audit.8
 file path=usr/share/man/man8/vfs_xattr_tdb.8
 file path=usr/share/man/man8/winbindd.8
 file path=usr/share/samba/swat/help/Samba3-ByExample/Big500users.html
@@ -497,11 +490,11 @@
 file path=usr/share/samba/swat/help/Samba3-HOWTO/unicode.html
 file path=usr/share/samba/swat/help/Samba3-HOWTO/upgrading-to-3.0.html
 file path=usr/share/samba/swat/help/Samba3-HOWTO/winbind.html
-file path=usr/share/samba/swat/help/manpages/cifs.upcall.8.html
 file path=usr/share/samba/swat/help/manpages/eventlogadm.8.html
 file path=usr/share/samba/swat/help/manpages/findsmb.1.html
 file path=usr/share/samba/swat/help/manpages/idmap_ad.8.html
 file path=usr/share/samba/swat/help/manpages/idmap_adex.8.html
+file path=usr/share/samba/swat/help/manpages/idmap_autorid.8.html
 file path=usr/share/samba/swat/help/manpages/idmap_hash.8.html
 file path=usr/share/samba/swat/help/manpages/idmap_ldap.8.html
 file path=usr/share/samba/swat/help/manpages/idmap_nss.8.html
@@ -509,17 +502,9 @@
 file path=usr/share/samba/swat/help/manpages/idmap_tdb.8.html
 file path=usr/share/samba/swat/help/manpages/idmap_tdb2.8.html
 file path=usr/share/samba/swat/help/manpages/index.html
-file path=usr/share/samba/swat/help/manpages/ldb.3.html
-file path=usr/share/samba/swat/help/manpages/ldbadd.1.html
-file path=usr/share/samba/swat/help/manpages/ldbdel.1.html
-file path=usr/share/samba/swat/help/manpages/ldbedit.1.html
-file path=usr/share/samba/swat/help/manpages/ldbmodify.1.html
-file path=usr/share/samba/swat/help/manpages/ldbrename.1.html
-file path=usr/share/samba/swat/help/manpages/ldbsearch.1.html
 file path=usr/share/samba/swat/help/manpages/libsmbclient.7.html
 file path=usr/share/samba/swat/help/manpages/lmhosts.5.html
 file path=usr/share/samba/swat/help/manpages/log2pcap.1.html
-file path=usr/share/samba/swat/help/manpages/mount.cifs.8.html
 file path=usr/share/samba/swat/help/manpages/net.8.html
 file path=usr/share/samba/swat/help/manpages/nmbd.8.html
 file path=usr/share/samba/swat/help/manpages/nmblookup.1.html
@@ -543,6 +528,7 @@
 file path=usr/share/samba/swat/help/manpages/smbpasswd.8.html
 file path=usr/share/samba/swat/help/manpages/smbspool.8.html
 file path=usr/share/samba/swat/help/manpages/smbstatus.1.html
+file path=usr/share/samba/swat/help/manpages/smbta-util.8.html
 file path=usr/share/samba/swat/help/manpages/smbtar.1.html
 file path=usr/share/samba/swat/help/manpages/smbtree.1.html
 file path=usr/share/samba/swat/help/manpages/swat.8.html
@@ -550,14 +536,15 @@
 file path=usr/share/samba/swat/help/manpages/tdbdump.8.html
 file path=usr/share/samba/swat/help/manpages/tdbtool.8.html
 file path=usr/share/samba/swat/help/manpages/testparm.1.html
-file path=usr/share/samba/swat/help/manpages/umount.cifs.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_acl_tdb.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_acl_xattr.8.html
+file path=usr/share/samba/swat/help/manpages/vfs_aio_fork.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_audit.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_cacheprime.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_cap.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_catia.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_commit.8.html
+file path=usr/share/samba/swat/help/manpages/vfs_crossrename.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_default_quota.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_dirsort.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_extd_audit.8.html
@@ -578,6 +565,7 @@
 file path=usr/share/samba/swat/help/manpages/vfs_smb_traffic_analyzer.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_streams_depot.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_streams_xattr.8.html
+file path=usr/share/samba/swat/help/manpages/vfs_time_audit.8.html
 file path=usr/share/samba/swat/help/manpages/vfs_xattr_tdb.8.html
 file path=usr/share/samba/swat/help/manpages/vfstest.1.html
 file path=usr/share/samba/swat/help/manpages/wbinfo.1.html
@@ -616,10 +604,13 @@
 link path=usr/lib/samba/libnetapi.so target=libnetapi.so.0
 link path=usr/lib/samba/libsmbclient.so target=libsmbclient.so.0
 link path=usr/lib/samba/libsmbsharemodes.so target=libsmbsharemodes.so.0
+link path=usr/lib/samba/libtalloc.so.2 target=libtalloc.so.2.0.5
 link path=usr/lib/samba/libtalloc.so target=libtalloc.so.2
+link path=usr/lib/samba/libtdb.so.1 target=libtdb.so.1.2.9
 link path=usr/lib/samba/libtdb.so target=libtdb.so.1
 link path=usr/lib/samba/libwbclient.so target=libwbclient.so.0
-link path=usr/lib/samba/$(MACH64)/libtalloc.so target=libtalloc.so.1
+link path=usr/lib/samba/$(MACH64)/libtalloc.so.1 target=libtalloc.so.2
+link path=usr/lib/samba/$(MACH64)/libtalloc.so target=libtalloc.so.2
 link path=usr/lib/samba/$(MACH64)/libtdb.so target=libtdb.so.1
 link path=usr/lib/samba/$(MACH64)/libwbclient.so target=libwbclient.so.0
 link path=usr/lib/samba/nss_info/adex.so target=../idmap/adex.so