Browse Source

Update LICENSE to Apache License 2

Toni Fadjukoff 5 years ago
parent
commit
b6eabbd5b9
14 changed files with 379 additions and 20 deletions
  1. 202 0
      LICENSE
  2. 0 1
      LICENSE.txt
  3. 4 0
      NOTICE
  4. 14 0
      amica.py
  5. 14 0
      campusravita.py
  6. 17 0
      cgi-bin/food.cgi
  7. 19 12
      code.html
  8. 16 7
      food.py
  9. 15 0
      juvenes.py
  10. 14 0
      pikante.py
  11. 18 0
      pna.html
  12. 14 0
      pnalib.py
  13. 14 0
      sodexo.py
  14. 18 0
      todo.html

+ 202 - 0
LICENSE View File

@@ -0,0 +1,202 @@
1
+
2
+                                 Apache License
3
+                           Version 2.0, January 2004
4
+                        http://www.apache.org/licenses/
5
+
6
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7
+
8
+   1. Definitions.
9
+
10
+      "License" shall mean the terms and conditions for use, reproduction,
11
+      and distribution as defined by Sections 1 through 9 of this document.
12
+
13
+      "Licensor" shall mean the copyright owner or entity authorized by
14
+      the copyright owner that is granting the License.
15
+
16
+      "Legal Entity" shall mean the union of the acting entity and all
17
+      other entities that control, are controlled by, or are under common
18
+      control with that entity. For the purposes of this definition,
19
+      "control" means (i) the power, direct or indirect, to cause the
20
+      direction or management of such entity, whether by contract or
21
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
22
+      outstanding shares, or (iii) beneficial ownership of such entity.
23
+
24
+      "You" (or "Your") shall mean an individual or Legal Entity
25
+      exercising permissions granted by this License.
26
+
27
+      "Source" form shall mean the preferred form for making modifications,
28
+      including but not limited to software source code, documentation
29
+      source, and configuration files.
30
+
31
+      "Object" form shall mean any form resulting from mechanical
32
+      transformation or translation of a Source form, including but
33
+      not limited to compiled object code, generated documentation,
34
+      and conversions to other media types.
35
+
36
+      "Work" shall mean the work of authorship, whether in Source or
37
+      Object form, made available under the License, as indicated by a
38
+      copyright notice that is included in or attached to the work
39
+      (an example is provided in the Appendix below).
40
+
41
+      "Derivative Works" shall mean any work, whether in Source or Object
42
+      form, that is based on (or derived from) the Work and for which the
43
+      editorial revisions, annotations, elaborations, or other modifications
44
+      represent, as a whole, an original work of authorship. For the purposes
45
+      of this License, Derivative Works shall not include works that remain
46
+      separable from, or merely link (or bind by name) to the interfaces of,
47
+      the Work and Derivative Works thereof.
48
+
49
+      "Contribution" shall mean any work of authorship, including
50
+      the original version of the Work and any modifications or additions
51
+      to that Work or Derivative Works thereof, that is intentionally
52
+      submitted to Licensor for inclusion in the Work by the copyright owner
53
+      or by an individual or Legal Entity authorized to submit on behalf of
54
+      the copyright owner. For the purposes of this definition, "submitted"
55
+      means any form of electronic, verbal, or written communication sent
56
+      to the Licensor or its representatives, including but not limited to
57
+      communication on electronic mailing lists, source code control systems,
58
+      and issue tracking systems that are managed by, or on behalf of, the
59
+      Licensor for the purpose of discussing and improving the Work, but
60
+      excluding communication that is conspicuously marked or otherwise
61
+      designated in writing by the copyright owner as "Not a Contribution."
62
+
63
+      "Contributor" shall mean Licensor and any individual or Legal Entity
64
+      on behalf of whom a Contribution has been received by Licensor and
65
+      subsequently incorporated within the Work.
66
+
67
+   2. Grant of Copyright License. Subject to the terms and conditions of
68
+      this License, each Contributor hereby grants to You a perpetual,
69
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70
+      copyright license to reproduce, prepare Derivative Works of,
71
+      publicly display, publicly perform, sublicense, and distribute the
72
+      Work and such Derivative Works in Source or Object form.
73
+
74
+   3. Grant of Patent License. Subject to the terms and conditions of
75
+      this License, each Contributor hereby grants to You a perpetual,
76
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77
+      (except as stated in this section) patent license to make, have made,
78
+      use, offer to sell, sell, import, and otherwise transfer the Work,
79
+      where such license applies only to those patent claims licensable
80
+      by such Contributor that are necessarily infringed by their
81
+      Contribution(s) alone or by combination of their Contribution(s)
82
+      with the Work to which such Contribution(s) was submitted. If You
83
+      institute patent litigation against any entity (including a
84
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
85
+      or a Contribution incorporated within the Work constitutes direct
86
+      or contributory patent infringement, then any patent licenses
87
+      granted to You under this License for that Work shall terminate
88
+      as of the date such litigation is filed.
89
+
90
+   4. Redistribution. You may reproduce and distribute copies of the
91
+      Work or Derivative Works thereof in any medium, with or without
92
+      modifications, and in Source or Object form, provided that You
93
+      meet the following conditions:
94
+
95
+      (a) You must give any other recipients of the Work or
96
+          Derivative Works a copy of this License; and
97
+
98
+      (b) You must cause any modified files to carry prominent notices
99
+          stating that You changed the files; and
100
+
101
+      (c) You must retain, in the Source form of any Derivative Works
102
+          that You distribute, all copyright, patent, trademark, and
103
+          attribution notices from the Source form of the Work,
104
+          excluding those notices that do not pertain to any part of
105
+          the Derivative Works; and
106
+
107
+      (d) If the Work includes a "NOTICE" text file as part of its
108
+          distribution, then any Derivative Works that You distribute must
109
+          include a readable copy of the attribution notices contained
110
+          within such NOTICE file, excluding those notices that do not
111
+          pertain to any part of the Derivative Works, in at least one
112
+          of the following places: within a NOTICE text file distributed
113
+          as part of the Derivative Works; within the Source form or
114
+          documentation, if provided along with the Derivative Works; or,
115
+          within a display generated by the Derivative Works, if and
116
+          wherever such third-party notices normally appear. The contents
117
+          of the NOTICE file are for informational purposes only and
118
+          do not modify the License. You may add Your own attribution
119
+          notices within Derivative Works that You distribute, alongside
120
+          or as an addendum to the NOTICE text from the Work, provided
121
+          that such additional attribution notices cannot be construed
122
+          as modifying the License.
123
+
124
+      You may add Your own copyright statement to Your modifications and
125
+      may provide additional or different license terms and conditions
126
+      for use, reproduction, or distribution of Your modifications, or
127
+      for any such Derivative Works as a whole, provided Your use,
128
+      reproduction, and distribution of the Work otherwise complies with
129
+      the conditions stated in this License.
130
+
131
+   5. Submission of Contributions. Unless You explicitly state otherwise,
132
+      any Contribution intentionally submitted for inclusion in the Work
133
+      by You to the Licensor shall be under the terms and conditions of
134
+      this License, without any additional terms or conditions.
135
+      Notwithstanding the above, nothing herein shall supersede or modify
136
+      the terms of any separate license agreement you may have executed
137
+      with Licensor regarding such Contributions.
138
+
139
+   6. Trademarks. This License does not grant permission to use the trade
140
+      names, trademarks, service marks, or product names of the Licensor,
141
+      except as required for reasonable and customary use in describing the
142
+      origin of the Work and reproducing the content of the NOTICE file.
143
+
144
+   7. Disclaimer of Warranty. Unless required by applicable law or
145
+      agreed to in writing, Licensor provides the Work (and each
146
+      Contributor provides its Contributions) on an "AS IS" BASIS,
147
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148
+      implied, including, without limitation, any warranties or conditions
149
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150
+      PARTICULAR PURPOSE. You are solely responsible for determining the
151
+      appropriateness of using or redistributing the Work and assume any
152
+      risks associated with Your exercise of permissions under this License.
153
+
154
+   8. Limitation of Liability. In no event and under no legal theory,
155
+      whether in tort (including negligence), contract, or otherwise,
156
+      unless required by applicable law (such as deliberate and grossly
157
+      negligent acts) or agreed to in writing, shall any Contributor be
158
+      liable to You for damages, including any direct, indirect, special,
159
+      incidental, or consequential damages of any character arising as a
160
+      result of this License or out of the use or inability to use the
161
+      Work (including but not limited to damages for loss of goodwill,
162
+      work stoppage, computer failure or malfunction, or any and all
163
+      other commercial damages or losses), even if such Contributor
164
+      has been advised of the possibility of such damages.
165
+
166
+   9. Accepting Warranty or Additional Liability. While redistributing
167
+      the Work or Derivative Works thereof, You may choose to offer,
168
+      and charge a fee for, acceptance of support, warranty, indemnity,
169
+      or other liability obligations and/or rights consistent with this
170
+      License. However, in accepting such obligations, You may act only
171
+      on Your own behalf and on Your sole responsibility, not on behalf
172
+      of any other Contributor, and only if You agree to indemnify,
173
+      defend, and hold each Contributor harmless for any liability
174
+      incurred by, or claims asserted against, such Contributor by reason
175
+      of your accepting any such warranty or additional liability.
176
+
177
+   END OF TERMS AND CONDITIONS
178
+
179
+   APPENDIX: How to apply the Apache License to your work.
180
+
181
+      To apply the Apache License to your work, attach the following
182
+      boilerplate notice, with the fields enclosed by brackets "[]"
183
+      replaced with your own identifying information. (Don't include
184
+      the brackets!)  The text should be enclosed in the appropriate
185
+      comment syntax for the file format. We also recommend that a
186
+      file or class name and description of purpose be included on the
187
+      same "printed page" as the copyright notice for easier
188
+      identification within third-party archives.
189
+
190
+   Copyright 2018 Toni Fadjukoff
191
+
192
+   Licensed under the Apache License, Version 2.0 (the "License");
193
+   you may not use this file except in compliance with the License.
194
+   You may obtain a copy of the License at
195
+
196
+       http://www.apache.org/licenses/LICENSE-2.0
197
+
198
+   Unless required by applicable law or agreed to in writing, software
199
+   distributed under the License is distributed on an "AS IS" BASIS,
200
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201
+   See the License for the specific language governing permissions and
202
+   limitations under the License.

+ 0 - 1
LICENSE.txt View File

@@ -1 +0,0 @@
1
-Public domain code. Use however you like.

+ 4 - 0
NOTICE View File

@@ -0,0 +1,4 @@
1
+pna.fi
2
+Copyright 2011-2018 Toni Fadjukoff
3
+
4
+Perustuu Timo Siirasen rna.fi-sivustoon, joka oli saatavilla 2010 asti osoitteessa http://rna.fi Public Domainina.

+ 14 - 0
amica.py View File

@@ -1,3 +1,17 @@
1
+# Copyright 2018 Toni Fadjukoff. All Rights Reserved.
2
+#
3
+# Licensed under the Apache License, Version 2.0 (the "License");
4
+# you may not use this file except in compliance with the License.
5
+# You may obtain a copy of the License at
6
+#
7
+# http://www.apache.org/licenses/LICENSE-2.0
8
+#
9
+# Unless required by applicable law or agreed to in writing, software
10
+# distributed under the License is distributed on an "AS IS" BASIS,
11
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+# See the License for the specific language governing permissions and
13
+# limitations under the License.
14
+
1 15
 import pnalib
2 16
 import datetime
3 17
 

+ 14 - 0
campusravita.py View File

@@ -1,3 +1,17 @@
1
+# Copyright 2018 Toni Fadjukoff. All Rights Reserved.
2
+#
3
+# Licensed under the Apache License, Version 2.0 (the "License");
4
+# you may not use this file except in compliance with the License.
5
+# You may obtain a copy of the License at
6
+#
7
+# http://www.apache.org/licenses/LICENSE-2.0
8
+#
9
+# Unless required by applicable law or agreed to in writing, software
10
+# distributed under the License is distributed on an "AS IS" BASIS,
11
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+# See the License for the specific language governing permissions and
13
+# limitations under the License.
14
+
1 15
 import pnalib
2 16
 import html.parser
3 17
 import re

+ 17 - 0
cgi-bin/food.cgi View File

@@ -1,4 +1,21 @@
1 1
 #!/usr/bin/env perl
2
+# Copyright 2010 Timo Siiranen.
3
+# Public Domain
4
+
5
+#
6
+# Copyright 2018 Toni Fadjukoff. All Rights Reserved.
7
+#
8
+# Licensed under the Apache License, Version 2.0 (the "License");
9
+# you may not use this file except in compliance with the License.
10
+# You may obtain a copy of the License at
11
+#
12
+# http://www.apache.org/licenses/LICENSE-2.0
13
+#
14
+# Unless required by applicable law or agreed to in writing, software
15
+# distributed under the License is distributed on an "AS IS" BASIS,
16
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17
+# See the License for the specific language governing permissions and
18
+# limitations under the License.
2 19
 
3 20
 use strict;
4 21
 

+ 19 - 12
code.html View File

@@ -1,5 +1,23 @@
1 1
 <?xml version="1.0" encoding="iso-8859-1"?>
2 2
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
+<!--
4
+Copyright 2010 Timo Siiranen.
5
+Public Domain
6
+
7
+Copyright 2018 Toni Fadjukoff. All Rights Reserved.
8
+
9
+Licensed under the Apache License, Version 2.0 (the "License");
10
+you may not use this file except in compliance with the License.
11
+You may obtain a copy of the License at
12
+
13
+http://www.apache.org/licenses/LICENSE-2.0
14
+
15
+Unless required by applicable law or agreed to in writing, software
16
+distributed under the License is distributed on an "AS IS" BASIS,
17
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18
+See the License for the specific language governing permissions and
19
+limitations under the License.
20
+-->
3 21
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fi" lang="fi">
4 22
 <head>
5 23
   <title>Ruokalistat</title>
@@ -9,19 +27,8 @@
9 27
   <h1>Ruokalistakoodit</h1>
10 28
 
11 29
   <p>
12
-    Copyright &copy; 2007-2008 <a href="http://iki.fi/tss/">Timo Sirainen</a>, 2011-2012 Toni Fadjukoff<br />
13
-    Lisenssinä Public Domain, eli tehkää mitä lystää näillä.<br />
30
+    Perustuu <a href="http://iki.fi/tss/">Timo Siraisen</a> ruokalistaparseriin.
14 31
   </p>
15
-  <ul>
16
-    <li><a href="food.pl">food.pl</a> - Pääskripti, testatessa on hyvä asettaa $use_old=1</li>
17
-    <li><a href="juvenes.pl">juvenes.pl</a> - Juveneksen parsinta</li>
18
-    <li><a href="amica.pl">amica.pl</a> - Amican parsinta</li>
19
-    <li><a href="pky.pl">pky.pl</a> - PKY:n parsinta</li>
20
-    <li><a href="sodexo.pl">sodexo.pl</a> - Sodexo:n parsinta</li>
21
-    <li><a href="ruoka.css">ruoka.css</a> - CSS</li>
22
-    <li><a href="ruoka.js">ruoka.js</a> - Javascriptin staattinen osuus</li>
23
-    <li><a href="food.pl">food.cgi</a> - CGI-skripti ruokalistan päivitykseen</li>
24
-  </ul>
25 32
   <p>Katso myös <a href="todo.html">TODO</a> lista.</p>
26 33
   <p><a href="http://git.lamperi.name/pna.git/">Git-repo saatavilla</a></p>
27 34
 </body>

+ 16 - 7
food.py View File

@@ -1,12 +1,21 @@
1 1
 #!/usr/bin/env python3
2 2
 
3
-# Ruokalistaparseri
4
-# Copyright (c) 2016 Toni Fadjukoff
5
-
6
-# Based on food.pl by
7
-# Copyright (c) 2007-2010 Timo Sirainen
8
-#               2011-2016 Toni Fadjukoff
9
-# This is Public Domain
3
+# Copyright 2018 Toni Fadjukoff. All Rights Reserved.
4
+#
5
+# Licensed under the Apache License, Version 2.0 (the "License");
6
+# you may not use this file except in compliance with the License.
7
+# You may obtain a copy of the License at
8
+#
9
+# http://www.apache.org/licenses/LICENSE-2.0
10
+#
11
+# Unless required by applicable law or agreed to in writing, software
12
+# distributed under the License is distributed on an "AS IS" BASIS,
13
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14
+# See the License for the specific language governing permissions and
15
+# limitations under the License.
16
+
17
+# The project is based on original rna.fi
18
+# project by Timo Siiranen before 2007-2010
10 19
 
11 20
 import sys
12 21
 

+ 15 - 0
juvenes.py View File

@@ -1,4 +1,19 @@
1 1
 # encoding: UTF-8
2
+
3
+# Copyright 2018 Toni Fadjukoff. All Rights Reserved.
4
+#
5
+# Licensed under the Apache License, Version 2.0 (the "License");
6
+# you may not use this file except in compliance with the License.
7
+# You may obtain a copy of the License at
8
+#
9
+# http://www.apache.org/licenses/LICENSE-2.0
10
+#
11
+# Unless required by applicable law or agreed to in writing, software
12
+# distributed under the License is distributed on an "AS IS" BASIS,
13
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14
+# See the License for the specific language governing permissions and
15
+# limitations under the License.
16
+
2 17
 import pnalib
3 18
 import datetime
4 19
 import re

+ 14 - 0
pikante.py View File

@@ -1,3 +1,17 @@
1
+# Copyright 2018 Toni Fadjukoff. All Rights Reserved.
2
+#
3
+# Licensed under the Apache License, Version 2.0 (the "License");
4
+# you may not use this file except in compliance with the License.
5
+# You may obtain a copy of the License at
6
+#
7
+# http://www.apache.org/licenses/LICENSE-2.0
8
+#
9
+# Unless required by applicable law or agreed to in writing, software
10
+# distributed under the License is distributed on an "AS IS" BASIS,
11
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+# See the License for the specific language governing permissions and
13
+# limitations under the License.
14
+
1 15
 import pnalib
2 16
 import html.parser
3 17
 # Pikante does not have any student restaurants at the moment

+ 18 - 0
pna.html View File

@@ -1,5 +1,23 @@
1 1
 <?xml version="1.0" encoding="iso-8859-1"?>
2 2
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
+<!--
4
+Copyright 2010 Timo Siiranen.
5
+Public Domain
6
+
7
+Copyright 2018 Toni Fadjukoff. All Rights Reserved.
8
+
9
+Licensed under the Apache License, Version 2.0 (the "License");
10
+you may not use this file except in compliance with the License.
11
+You may obtain a copy of the License at
12
+
13
+http://www.apache.org/licenses/LICENSE-2.0
14
+
15
+Unless required by applicable law or agreed to in writing, software
16
+distributed under the License is distributed on an "AS IS" BASIS,
17
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18
+See the License for the specific language governing permissions and
19
+limitations under the License.
20
+-->
3 21
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fi" lang="fi">
4 22
 <head>
5 23
   <title>PNA</title>

+ 14 - 0
pnalib.py View File

@@ -1,3 +1,17 @@
1
+# Copyright 2018 Toni Fadjukoff. All Rights Reserved.
2
+#
3
+# Licensed under the Apache License, Version 2.0 (the "License");
4
+# you may not use this file except in compliance with the License.
5
+# You may obtain a copy of the License at
6
+#
7
+# http://www.apache.org/licenses/LICENSE-2.0
8
+#
9
+# Unless required by applicable law or agreed to in writing, software
10
+# distributed under the License is distributed on an "AS IS" BASIS,
11
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+# See the License for the specific language governing permissions and
13
+# limitations under the License.
14
+
1 15
 import os.path
2 16
 import urllib.request
3 17
 import urllib.error

+ 14 - 0
sodexo.py View File

@@ -1,3 +1,17 @@
1
+# Copyright 2018 Toni Fadjukoff. All Rights Reserved.
2
+#
3
+# Licensed under the Apache License, Version 2.0 (the "License");
4
+# you may not use this file except in compliance with the License.
5
+# You may obtain a copy of the License at
6
+#
7
+# http://www.apache.org/licenses/LICENSE-2.0
8
+#
9
+# Unless required by applicable law or agreed to in writing, software
10
+# distributed under the License is distributed on an "AS IS" BASIS,
11
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+# See the License for the specific language governing permissions and
13
+# limitations under the License.
14
+
1 15
 import pnalib
2 16
 import datetime
3 17
 

+ 18 - 0
todo.html View File

@@ -1,5 +1,23 @@
1 1
 <?xml version="1.0" encoding="iso-8859-1"?>
2 2
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
+<!--
4
+Copyright 2010 Timo Siiranen.
5
+Public Domain
6
+
7
+Copyright 2018 Toni Fadjukoff. All Rights Reserved.
8
+
9
+Licensed under the Apache License, Version 2.0 (the "License");
10
+you may not use this file except in compliance with the License.
11
+You may obtain a copy of the License at
12
+
13
+http://www.apache.org/licenses/LICENSE-2.0
14
+
15
+Unless required by applicable law or agreed to in writing, software
16
+distributed under the License is distributed on an "AS IS" BASIS,
17
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18
+See the License for the specific language governing permissions and
19
+limitations under the License.
20
+-->
3 21
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fi" lang="fi">
4 22
 <head>
5 23
   <title>TODO</title>