Merge lp:~helen-fornazier/shim/trunk into lp:~ubuntu-core-dev/shim/trunk

Proposed by Helen M. Koike Fornazier on 2016-09-15
Status: Merged
Merged at revision: 106
Proposed branch: lp:~helen-fornazier/shim/trunk
Merge into: lp:~ubuntu-core-dev/shim/trunk
Diff against target: 134 lines (+116/-0)
2 files modified
debian/changelog (+6/-0)
debian/copyright (+110/-0)
To merge this branch: bzr merge lp:~helen-fornazier/shim/trunk
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2016-09-15 Pending
Review via email: mp+305841@code.launchpad.net

Description of the change

debian/copyright: add missing OpenSSL license
The shim-signed package was rejected by the Debian FTP team because of this missing license.

To post a comment you must log in.
lp:~helen-fornazier/shim/trunk updated on 2016-09-20
103. By Steve Langasek on 2016-09-19

New upstream release (fix-up commit)

104. By Steve Langasek on 2016-09-19

Merging shared upstream rev into target branch.

105. By Steve Langasek on 2016-09-19

Merge git into history

106. By Helen Koike <email address hidden> on 2016-09-20

[ Helen Koike ]
* debian/copyright: add OpenSSL license
[ Mathieu Trudel-Lapierre ]
* debian/copyright: patches should be BSD, like the rest of the upstream
  code.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-07-26 20:49:50 +0000
3+++ debian/changelog 2016-09-15 14:36:24 +0000
4@@ -1,3 +1,9 @@
5+shim (0.9+1465500757.14a5905-0ubuntu2) yakkety; urgency=medium
6+
7+ * debian/copyright: add OpenSSL license
8+
9+ -- Helen Koike <helen.koike@collabora.com> Wed, 14 Sep 2016 16:34:52 -0300
10+
11 shim (0.9+1465500757.14a5905-0ubuntu1) yakkety; urgency=medium
12
13 * New upstream release.
14
15=== modified file 'debian/copyright'
16--- debian/copyright 2016-07-26 20:48:29 +0000
17+++ debian/copyright 2016-09-15 14:36:24 +0000
18@@ -21,6 +21,116 @@
19 On Debian systems, the complete text of the GNU General
20 Public License can be found in `/usr/share/common-licenses/GPL-2'.
21
22+Files: Cryptlib/OpenSSL/* Cryptlib/Include/openssl/*
23+Copyright: 1998-2016 The OpenSSL Project
24+ 1995-1998 Eric Young (eay@cryptsoft.com)
25+License: OpenSSL and Original-SSLeay
26+ OpenSSL License
27+ ---------------
28+ Redistribution and use in source and binary forms, with or without
29+ modification, are permitted provided that the following conditions
30+ are met:
31+ .
32+ 1. Redistributions of source code must retain the above copyright
33+ notice, this list of conditions and the following disclaimer.
34+ .
35+ 2. Redistributions in binary form must reproduce the above copyright
36+ notice, this list of conditions and the following disclaimer in
37+ the documentation and/or other materials provided with the
38+ distribution.
39+ .
40+ 3. All advertising materials mentioning features or use of this
41+ software must display the following acknowledgment:
42+ "This product includes software developed by the OpenSSL Project
43+ for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
44+ .
45+ 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
46+ endorse or promote products derived from this software without
47+ prior written permission. For written permission, please contact
48+ openssl-core@openssl.org.
49+ .
50+ 5. Products derived from this software may not be called "OpenSSL"
51+ nor may "OpenSSL" appear in their names without prior written
52+ permission of the OpenSSL Project.
53+ .
54+ 6. Redistributions of any form whatsoever must retain the following
55+ acknowledgment:
56+ "This product includes software developed by the OpenSSL Project
57+ for use in the OpenSSL Toolkit (http://www.openssl.org/)"
58+ .
59+ THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
60+ EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
61+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
62+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
63+ ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
64+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
65+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
66+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
67+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
68+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
69+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
70+ OF THE POSSIBILITY OF SUCH DAMAGE.
71+ ====================================================================
72+ .
73+ This product includes cryptographic software written by Eric Young
74+ (eay@cryptsoft.com). This product includes software written by Tim
75+ Hudson (tjh@cryptsoft.com).
76+ .
77+ Original SSLeay License
78+ -----------------------
79+ This package is an SSL implementation written
80+ by Eric Young (eay@cryptsoft.com).
81+ The implementation was written so as to conform with Netscapes SSL.
82+ .
83+ This library is free for commercial and non-commercial use as long as
84+ the following conditions are aheared to. The following conditions
85+ apply to all code found in this distribution, be it the RC4, RSA,
86+ lhash, DES, etc., code; not just the SSL code. The SSL documentation
87+ included with this distribution is covered by the same copyright terms
88+ except that the holder is Tim Hudson (tjh@cryptsoft.com).
89+ .
90+ Copyright remains Eric Young's, and as such any Copyright notices in
91+ the code are not to be removed.
92+ If this package is used in a product, Eric Young should be given attribution
93+ as the author of the parts of the library used.
94+ This can be in the form of a textual message at program startup or
95+ in documentation (online or textual) provided with the package.
96+ .
97+ Redistribution and use in source and binary forms, with or without
98+ modification, are permitted provided that the following conditions
99+ are met:
100+ 1. Redistributions of source code must retain the copyright
101+ notice, this list of conditions and the following disclaimer.
102+ 2. Redistributions in binary form must reproduce the above copyright
103+ notice, this list of conditions and the following disclaimer in the
104+ documentation and/or other materials provided with the distribution.
105+ 3. All advertising materials mentioning features or use of this software
106+ must display the following acknowledgement:
107+ "This product includes cryptographic software written by
108+ Eric Young (eay@cryptsoft.com)"
109+ The word 'cryptographic' can be left out if the rouines from the library
110+ being used are not cryptographic related :-).
111+ 4. If you include any Windows specific code (or a derivative thereof) from
112+ the apps directory (application code) you must include an acknowledgement:
113+ "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
114+ .
115+ THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
116+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
117+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
118+ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
119+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
120+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
121+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
122+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
123+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
124+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
125+ SUCH DAMAGE.
126+ .
127+ The licence and distribution terms for any publically available version or
128+ derivative of this code cannot be changed. i.e. this code cannot simply be
129+ copied and put under another distribution licence
130+ [including the GNU Public Licence.]
131+
132 Files: *
133 Copyright: 2012 Red Hat, Inc
134 2009-2012 Intel Corporation

Subscribers

People subscribed via source and target branches