aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog3
-rw-r--r--README2
-rw-r--r--configure.ac2
-rw-r--r--data/display_panel/content/display-panel.html2
-rw-r--r--data/licenses/magnet-links.txt3
-rw-r--r--data/licenses/torrents/epl-1.0.txt.torrentbin0 -> 196 bytes
-rw-r--r--data/licenses/torrents/upl-1.0.txt.torrent1
-rw-r--r--data/licenses/upl-1.0.txt19
-rw-r--r--doc/librejs.info43
-rw-r--r--doc/librejs.texi13
-rw-r--r--doc/version.texi4
-rw-r--r--lib/js_checker/license_definitions.js12
-rw-r--r--package.json2
13 files changed, 79 insertions, 27 deletions
diff --git a/ChangeLog b/ChangeLog
index bf9d00b..14fffda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
* Fixed a bug where @license-end was getting ignored
in some cases. Thanks to Micah Cowan for debugging this.
+ * Add the Universal Permissive License to list of recognized
+ licenses. Thanks to Benjamin Przybocki for suggesting it.
+
2015-10-23 Nik Nyby <nikolas@gnu.org>
* Converted LibreJS to use jpm instead of the old add-on
system: cfx. Thanks to Adrian Aichner for helping out
diff --git a/README b/README
index da396f6..7042a41 100644
--- a/README
+++ b/README
@@ -27,6 +27,6 @@ console.debug() statements.
* Then run `make info` to build the docs with gendocs.sh
* `git commit` and `git tag 6.0.4`
* Export a tarball:
- git archive --format=tar.gz --prefix=librejs-6.0.4 6.0.4 >librejs-6.0.4.tar.gz
+ git archive --format=tar.gz --prefix=librejs-6.0.4/ 6.0.4 >librejs-6.0.4.tar.gz
mv librejs-6.0.4.tar.gz ~/releases/librejs-6.0.4/
* Make xpi file: jpm xpi; mv librejs.xpi librejs-6.0.4.xpi
diff --git a/configure.ac b/configure.ac
index 2952cd5..52221bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(librejs, 6.0.10.20151023, [bug-librejs@gnu.org])
+AC_INIT(librejs, 6.0.10, [bug-librejs@gnu.org])
AC_PROG_INSTALL
AC_PATH_PROG([MAKEINFO], makeinfo)
diff --git a/data/display_panel/content/display-panel.html b/data/display_panel/content/display-panel.html
index ec74cd1..276cf30 100644
--- a/data/display_panel/content/display-panel.html
+++ b/data/display_panel/content/display-panel.html
@@ -43,7 +43,7 @@
>gnu.org/software/librejs</a>
</div>
<div>
- <strong>LibreJS 6.0.10.20151023</strong>
+ <strong>LibreJS 6.0.10</strong>
</div>
</div>
diff --git a/data/licenses/magnet-links.txt b/data/licenses/magnet-links.txt
index 9a69a2f..5b79450 100644
--- a/data/licenses/magnet-links.txt
+++ b/data/licenses/magnet-links.txt
@@ -23,6 +23,7 @@ magnet:?xt=urn:btih:2f25cfbac271643d1e41a754034e8daedeb8a281&dn=magnet-links.txt
magnet:?xt=urn:btih:3877d6d54b3accd4bc32f8a48bf32ebc0901502a&dn=mpl-2.0.txt
magnet:?xt=urn:btih:e95b018ef3580986a04669f1b5879592219e2a7a&dn=public-domain.txt
magnet:?xt=urn:btih:5866afca5f37889c0c1fdd108f4922d4fcdb5e3d&dn=unlicense.txt
-magnet:?xt=urn:btih:723febf9f6185544f57f0660a41489c7d6b4931b&dn=wtfpl.txt
+magnet:?xt=urn:btih:478974f4d41c3fa84c4befba25f283527fad107d&dn=upl-1.0.txt
+magnet:?xt=urn:btih:48429d8ae6b908f46e0e6aeabf2130688ef2f93a&dn=wtfpl.txt
magnet:?xt=urn:btih:5305d91886084f776adcf57509a648432709a7c7&dn=x11.txt
magnet:?xt=urn:btih:12f2ec9e8de2a3b0002a33d518d6010cc8ab2ae9&dn=xfree86.txt
diff --git a/data/licenses/torrents/epl-1.0.txt.torrent b/data/licenses/torrents/epl-1.0.txt.torrent
new file mode 100644
index 0000000..69ea56c
--- /dev/null
+++ b/data/licenses/torrents/epl-1.0.txt.torrent
Binary files differ
diff --git a/data/licenses/torrents/upl-1.0.txt.torrent b/data/licenses/torrents/upl-1.0.txt.torrent
new file mode 100644
index 0000000..9b8d461
--- /dev/null
+++ b/data/licenses/torrents/upl-1.0.txt.torrent
@@ -0,0 +1 @@
+d10:created by25:Transmission/2.82 (14160)13:creation datei1445748107e8:encoding5:UTF-84:infod6:lengthi1890e4:name11:upl-1.0.txt12:piece lengthi32768e6:pieces20:^;:p6}0zm7:privatei0eee \ No newline at end of file
diff --git a/data/licenses/upl-1.0.txt b/data/licenses/upl-1.0.txt
new file mode 100644
index 0000000..ce31d2c
--- /dev/null
+++ b/data/licenses/upl-1.0.txt
@@ -0,0 +1,19 @@
+The Universal Permissive License (UPL), Version 1.0
+
+Copyright (c) [year] [copyright holders]
+
+The Universal Permissive License (UPL), Version 1.0
+
+Subject to the condition set forth below, permission is hereby granted to any person obtaining a copy of this software, associated documentation and/or data (collectively the "Software"), free of charge and under any and all copyright rights in the Software, and any and all patent rights owned or freely licensable by each licensor hereunder covering either (i) the unmodified Software as contributed to or provided by such licensor, or (ii) the Larger Works (as defined below), to deal in both
+
+(a) the Software, and
+
+(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if one is included with the Software (each a “Larger Work” to which the Software is contributed by such licensors),
+
+without restriction, including without limitation the rights to copy, create derivative works of, display, perform, and distribute the Software and make, use, sell, offer for sale, import, export, have made, and have sold the Software and the Larger Work(s), and to sublicense the foregoing rights on either these or other terms.
+
+This license is subject to the following condition:
+
+The above copyright notice and either this complete permission notice or at a minimum a reference to the UPL must 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.
diff --git a/doc/librejs.info b/doc/librejs.info
index a2212ff..6812547 100644
--- a/doc/librejs.info
+++ b/doc/librejs.info
@@ -1,9 +1,9 @@
This is librejs.info, produced by makeinfo version 5.2 from
librejs.texi.
-This manual is for GNU LibreJS (version 6.0.10.20151023, 23 October
-2015), a GNU IceCat extension to detect and block nonfree nontrivial
-JavaScript on webpages.
+This manual is for GNU LibreJS (version 6.0.10, 25 October 2015), a GNU
+IceCat extension to detect and block nonfree nontrivial JavaScript on
+webpages.
Copyright (C) 2011 2012 2014 2015 Loic J. Duros
@@ -24,8 +24,7 @@ File: librejs.info, Node: Top, Next: Overview, Up: (dir)
LibreJS
*******
-This manual is for GNU LibreJS (version 6.0.10.20151023, 23 October
-2015).
+This manual is for GNU LibreJS (version 6.0.10, 25 October 2015).
* Menu:
@@ -395,6 +394,12 @@ and label it accordingly.
* Magnet Link:
'magnet:?xt=urn:btih:e95b018ef3580986a04669f1b5879592219e2a7a&dn=public-domain.txt'
+ * Universal Permissive License
+ * Identifier: 'UPL-1.0'
+ * URL: <https://oss.oracle.com/licenses/upl/>
+ * Magnet link:
+ 'magnet:?xt=urn:btih:478974f4d41c3fa84c4befba25f283527fad107d&dn=upl-1.0.txt'
+
* WTFPL
* Identifier: 'WTFPL'
* URL: <http://www.wtfpl.net/txt/copying/>
@@ -620,7 +625,7 @@ Update the version number in:
Then run 'make info' to build the docs with 'gendocs.sh'.
* 'git commit' and 'git tag 6.0.4'
* Export a tarball:
- * 'git archive --format=tar.gz --prefix=librejs-6.0.4 6.0.4
+ * 'git archive --format=tar.gz --prefix=librejs-6.0.4/ 6.0.4
>librejs-6.0.4.tar.gz'
* 'mv librejs-6.0.4.tar.gz ~/releases/librejs-6.0.4/'
* Make xpi file: 'jpm xpi; mv librejs.xpi librejs-6.0.4.xpi'
@@ -1265,18 +1270,18 @@ their use in free software.

Tag Table:
-Node: Top841
-Node: Overview2000
-Node: Disclaimer2847
-Node: Installation3343
-Node: How to Use4189
-Node: JavaScript Detection7431
-Node: Free Licenses Detection10839
-Node: Setting Your JavaScript Free17257
-Node: LibreJS Development Notes24091
-Node: Installation Requirements25433
-Node: LibreJS Internals27040
-Node: Tests28203
-Node: GNU Free Documentation License32710
+Node: Top832
+Node: Overview1982
+Node: Disclaimer2829
+Node: Installation3325
+Node: How to Use4171
+Node: JavaScript Detection7413
+Node: Free Licenses Detection10821
+Node: Setting Your JavaScript Free17471
+Node: LibreJS Development Notes24305
+Node: Installation Requirements25648
+Node: LibreJS Internals27255
+Node: Tests28418
+Node: GNU Free Documentation License32925

End Tag Table
diff --git a/doc/librejs.texi b/doc/librejs.texi
index a951013..c53cf06 100644
--- a/doc/librejs.texi
+++ b/doc/librejs.texi
@@ -506,6 +506,17 @@ Magnet Link: @indicateurl{magnet:?xt=urn:btih:e95b018ef3580986a04669f1b587959221
@end itemize
@item
+Universal Permissive License
+@itemize @bullet
+@item
+Identifier: @samp{UPL-1.0}
+@item
+URL: @url{https://oss.oracle.com/licenses/upl/}
+@item
+Magnet link: @indicateurl{magnet:?xt=urn:btih:478974f4d41c3fa84c4befba25f283527fad107d&dn=upl-1.0.txt}
+@end itemize
+
+@item
WTFPL
@itemize @bullet
@item
@@ -759,7 +770,7 @@ Then run @samp{make info} to build the docs with @file{gendocs.sh}.
Export a tarball:
@itemize @bullet
@item
-@samp{git archive --format=tar.gz --prefix=librejs-6.0.4 6.0.4 >librejs-6.0.4.tar.gz}
+@samp{git archive --format=tar.gz --prefix=librejs-6.0.4/ 6.0.4 >librejs-6.0.4.tar.gz}
@item
@samp{mv librejs-6.0.4.tar.gz ~/releases/librejs-6.0.4/}
@end itemize
diff --git a/doc/version.texi b/doc/version.texi
index 50ca4d4..06b83d5 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 23 October 2015
+@set UPDATED 25 October 2015
@set UPDATED-MONTH October 2015
@set EDITION 2
-@set VERSION 6.0.10.20151023
+@set VERSION 6.0.10
diff --git a/lib/js_checker/license_definitions.js b/lib/js_checker/license_definitions.js
index cf07268..e8aa7f2 100644
--- a/lib/js_checker/license_definitions.js
+++ b/lib/js_checker/license_definitions.js
@@ -177,6 +177,18 @@ exports.licenses = {
licenseFragments: [{text: "Copyright <YEAR> <NAME> 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.", type: type.SHORT}]
},
+ 'UPL': {
+ licenseName: 'Universal Permissive License',
+ identifier: 'UPL-1.0',
+ canonicalUrl: [
+ 'magnet:?xt=urn:btih:5305d91886084f776adcf57509a648432709a7c7&dn=x11.txt'
+ ],
+ licenseFragments: [{
+ text: "The Universal Permissive License (UPL), Version 1.0",
+ type: type.SHORT
+ }]
+ },
+
'X11': {
licenseName: 'X11 License',
identifier: 'X11',
diff --git a/package.json b/package.json
index d8379cb..77d9e1e 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"author": "Loic J. Duros",
"homepage": "https://gnu.org/software/librejs/",
"repository": "http://git.savannah.gnu.org/cgit/librejs.git/",
- "version": "6.0.10rc20151023",
+ "version": "6.0.10",
"title": "GNU LibreJS",
"id": "jid1-KtlZuoiikVfFew@jetpack",
"description": "GNU LibreJS is an add-on for Mozilla-based browsers (IceCat, Firefox, Abrowser, Iceweasel)\n that prevents the execution of nonfree nontrivial JavaScript as described in \"The Javascript Trap\": http://www.gnu.org/philosophy/javascript-trap.html",
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-04 18:32:44 +0000