[SCM] Debian packaging for OpenSAML branch, debian, updated. upstream/1.1.1-54-g35708fc

Russ Allbery rra at debian.org
Sat Jun 7 20:41:58 UTC 2008


The following commit has been merged in the debian branch:
commit 8ff76e28176beac27569d7d6d4ad1fc4bdd31892
Author: Russ Allbery <rra at debian.org>
Date:   Sat Jun 7 13:40:36 2008 -0700

    Improve and reformat debian/copyright
    
    Rewrite debian/copyright into the new proposed copyright format.  Add an
    explicit copyright and license for W3C schemas.  Add copyright statements
    for the Apache Software Foundation and Parthenon Computing.  Reference
    Apache 2.0 from common-licenses instead of including it.

diff --git a/debian/changelog b/debian/changelog
index 9702842..2bcecb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,12 @@ opensaml (1.1.1-2) UNRELEASED; urgency=low
 
   * Link the library against libdl since it uses dlopen and friends
     directly.  Thanks, Bastian Blank.  (Closes: #485015)
+  * Improve and reformat debian/copyright:
+    - Add an explicit copyright and license for W3C schemas.
+    - Add copyright statements for the Apache Software Foundation and
+      Parthenon Computing.
+    - Reference Apache 2.0 from common-licenses instead of including it.
+    - Use the new proposed copyright format.
 
  -- Russ Allbery <rra at debian.org>  Sat, 07 Jun 2008 13:23:42 -0700
 
diff --git a/debian/copyright b/debian/copyright
index f924322..7b9358c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,308 +1,164 @@
-Original packaging by Quanah Gibson-Mount <quanah at stanford.edu> 2006-03-30
-Packaged for Debian unstable by Russ Allbery <rra at debian.org>   2006-09-19
-
-It was downloaded from:
-
-    <http://shibboleth.internet2.edu/downloads/>
-
-The upstream source has been repackaged to remove .svn directories so that
-Subversion-based build tools will work for the Debian package.
-
-Upstream Author:
-
-    Internet2 <mace-opensaml-users at internet2.edu>
-
-Debian packaging copyright:
-
-    All additions and changes by Quanah Gibson-Mount and Russ Allbery are
-    covered by the following copyright and license:
-
-    Copyright 2006, 2007 Board of Trustees, Leland Stanford Jr. University
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Copyright:
-
-    Copyright 2001-2005 Internet2
-
-    This product includes software developed by the Apache Software
-    Foundation (http://www.apache.org/).
-
-    This product includes software developed by the OpenSSL Project for
-    use in the OpenSSL Toolkit. (http://www.openssl.org/).
-
-    This project uses libraries covered by the Lesser GNU Public License.
-    Source code for these libraries is available on request.
-
-    We also thank Parthenon Computing (http://www.parthcomp.com) for
-    contributing the C++ AuthorizationDecision classes and test suites,
-    and Tom Scavo for donating the original SAML artifact implementation.
-
-License:
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Upstream-Author: Internet2
+Packaged-By: Quanah Gibson-Mount <quanah at stanford.edu>
+Packaged-Date: Fri, 31 Mar 2006 15:30:06 -0800
+Original-Source-Location: http://shibboleth.internet2.edu/downloads/
+
+Files: *
+Copyright: 2001-2005 Internet2
+License: Apache-2.0
+
+Files: saml/SAMLAction.cpp saml/SAMLAuthorization* saml/SAMLDecision.cpp
+ saml/SAMLEvidence.cpp
+Copyright: 2001-2005 Internet2
+           2001-2005 Parthenon Computing
+License: Apache-2.0
+
+Files: saml/SAMLDateTime.*
+Copyright: 2001-2004 The Apache Software Foundation
+License: Apache-2.0
+
+Files: schemas/soap-envelope.xsd
+Copyright: 2001 Martin Gudgin, Developmentor
+ 2001 W3C (Massachusetts Institute of Technology, Institut National de
+ Recherche en Informatique et en Automatique, Keio University) All Rights
+ Reserved. http://www.w3.org/Consortium/Legal/
+License: W3C-Software
+
+Files: schemas/xml.xsd schemas/xmldsig-core-schema.xsd
+Copyright: 2001 W3C (Massachusetts Institute of Technology, Institut
+ National de Recherche en Informatique et en Automatique, Keio University)
+ All Rights Reserved. http://www.w3.org/Consortium/Legal/
+License: W3C-Software
+
+Files: debian/*
+Copyright: 2006, 2007, 2008 Board of Trustees, Leland Stanford Jr.
+ University
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to permit
+ persons to whom the Software is furnished to do so, subject to the
+ following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License.  You may obtain
+ a copy of the License at
+ .
+    http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ License for the specific language governing permissions and limitations
+ under the License.
+ .
+ On Debian systems, the complete text of the Apache 2.0 license can be
+ found in the file /usr/share/common-licenses/Apache-2.0.
+
+License: W3C-Software
+ This W3C work (including software, documents, or other related items) is
+ being provided by the copyright holders under the following license. By
+ obtaining, using and/or copying this work, you (the licensee) agree that
+ you have read, understood, and will comply with the following terms and
+ conditions:
+ .
+ Permission to use, copy, modify, and distribute this software and its
+ documentation, with or without modification, for any purpose and without
+ fee or royalty is hereby granted, provided that you include the following
+ on ALL copies of the software and documentation or portions thereof,
+ including modifications, that you make:
+ .
+ 1. The full text of this NOTICE in a location viewable to users of the
+    redistributed or derivative work.
+ .
+ 2. Any pre-existing intellectual property disclaimers, notices, or terms
+    and conditions. If none exist, a short notice of the following form
+    (hypertext is preferred, text is permitted) should be used within the
+    body of any redistributed or derivative code: "Copyright ©
+    [$date-of-software] World Wide Web Consortium, (Massachusetts
+    Institute of Technology, Institut National de Recherche en
+    Informatique et en Automatique, Keio University). All Rights Reserved.
+    http://www.w3.org/Consortium/Legal/"
+ .
+ 3. Notice of any changes or modifications to the W3C files, including the
+    date changes were made. (We recommend you provide URIs to the location
+    from which the code is derived.)
+ .
+ THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT
+ HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS
+ FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR
+ DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+ TRADEMARKS OR OTHER RIGHTS.
+ .
+ COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+ CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
+ DOCUMENTATION.
+ .
+ The name and trademarks of copyright holders may NOT be used in
+ advertising or publicity pertaining to the software without specific,
+ written prior permission. Title to copyright in this software and any
+ associated documentation will at all times remain with copyright holders.
 
 Patent Status:
 
-    RSA Security Inc. holds patents that they assert cover the OpenSAML
-    1.0 and 1.1 protocols implemented in this library.  They have released
-    the following statement concerning enforcement of those patents
-    (from <http://www.oasis-open.org/committees/security/ipr.php>):
-
-    To: OASIS Executive Director
-    From: Robert P. Nault, Senior Vice President and General Counsel, RSA
-          Security Inc.
-    Date: April 27, 2006
-    Subject: Intellectual Property Rights Statement
-
-    In previous correspondence dated December 6, 2004, January 20, 2003
-    and April 22, 2002, RSA Security Inc. ("RSA") disclosed that it is the
-    assignee of U.S. Patent Nos. 6,085,320 and 6,189,098, both entitled
-    "Client/Server Protocol for Proving Authenticity" and U.S. Patent
-    Nos. 5,922,074 and 6,249,873, both entitled "Method of and Apparatus
-    for Providing Secure Distributed Directory Services and Public Key
-    Infrastructure" (collectively, the "RSA Patents"). At that time, RSA
-    believed that these four patents could be relevant to practicing
-    certain operational modes of the OASIS Security Assertion Markup
-    Language ("SAML") specifications. In the correspondence, RSA offered
-    to grant non-exclusive, royalty-free licenses on a non-discriminatory
-    basis for the RSA Patents.
-
-    In the interest of encouraging deployment of SAML-based technologies,
-    RSA hereby covenants, free of any royalty, that it will not assert any
-    claims in the RSA Patents which may be essential to the SAML standard
-    v1.0, 1.1 and 2.0 (hereinafter "NECESSARY CLAIMS") against any other
-    entity with respect to any implementation conforming to the SAML
-    standard v1.0, 1.1 and/or 2.0. This covenant shall become null and
-    void with respect to any entity that asserts, either directly or
-    indirectly (e.g. through an affiliate), any patent claims or threatens
-    or initiates any patent infringement suit against RSA and/or its
-    subsidiaries or affiliates. The revocation of the covenant shall
-    extend to all prior use by the entity asserting the claim.
-
-    RSA will continue to honor existing license agreements for the RSA
-    Patents and will continue to offer as an option to interested third
-    parties the same licensing arrangement described in our previous
-    correspondence. (The license agreement, along with instructions for
-    obtaining and completing the license, are available on RSA's website
-    www.rsasecurity.com.)
-
-    RSA welcomes comments on this statement and looks forward to further
-    collaboration with OASIS.
+| RSA Security Inc. holds patents that they assert cover the OpenSAML
+| 1.0 and 1.1 protocols implemented in this library.  They have released
+| the following statement concerning enforcement of those patents
+| (from <http://www.oasis-open.org/committees/security/ipr.php>):
+|
+| To: OASIS Executive Director
+| From: Robert P. Nault, Senior Vice President and General Counsel, RSA
+|       Security Inc.
+| Date: April 27, 2006
+| Subject: Intellectual Property Rights Statement
+|
+| In previous correspondence dated December 6, 2004, January 20, 2003
+| and April 22, 2002, RSA Security Inc. ("RSA") disclosed that it is the
+| assignee of U.S. Patent Nos. 6,085,320 and 6,189,098, both entitled
+| "Client/Server Protocol for Proving Authenticity" and U.S. Patent
+| Nos. 5,922,074 and 6,249,873, both entitled "Method of and Apparatus
+| for Providing Secure Distributed Directory Services and Public Key
+| Infrastructure" (collectively, the "RSA Patents"). At that time, RSA
+| believed that these four patents could be relevant to practicing
+| certain operational modes of the OASIS Security Assertion Markup
+| Language ("SAML") specifications. In the correspondence, RSA offered
+| to grant non-exclusive, royalty-free licenses on a non-discriminatory
+| basis for the RSA Patents.
+|
+| In the interest of encouraging deployment of SAML-based technologies,
+| RSA hereby covenants, free of any royalty, that it will not assert any
+| claims in the RSA Patents which may be essential to the SAML standard
+| v1.0, 1.1 and 2.0 (hereinafter "NECESSARY CLAIMS") against any other
+| entity with respect to any implementation conforming to the SAML
+| standard v1.0, 1.1 and/or 2.0. This covenant shall become null and
+| void with respect to any entity that asserts, either directly or
+| indirectly (e.g. through an affiliate), any patent claims or threatens
+| or initiates any patent infringement suit against RSA and/or its
+| subsidiaries or affiliates. The revocation of the covenant shall
+| extend to all prior use by the entity asserting the claim.
+|
+| RSA will continue to honor existing license agreements for the RSA
+| Patents and will continue to offer as an option to interested third
+| parties the same licensing arrangement described in our previous
+| correspondence. (The license agreement, along with instructions for
+| obtaining and completing the license, are available on RSA's website
+| www.rsasecurity.com.)
+|
+| RSA welcomes comments on this statement and looks forward to further
+| collaboration with OASIS.

-- 
Debian packaging for OpenSAML



More information about the Pkg-shibboleth-devel mailing list