Icinga / icinga-web

Icinga Web 1.x, the old new web interface (EOL 31.12.2018)
22 stars 11 forks source link

[dev.icinga.com #3252] entirely remove jsmin from the source tarball #919

Closed icinga-migration closed 12 years ago

icinga-migration commented 12 years ago

This issue has been migrated from Redmine: https://dev.icinga.com/issues/3252

Created by mfriedrich on 2012-10-06 10:20:13 +00:00

Assignee: jmosshammer Status: Closed (closed on 2012-10-15 08:29:50 +00:00) Target Version: 1.8 Last Update: 2012-10-15 08:29:50 +00:00 (in Redmine)

Icinga Version: 1.7.1
Icinga Web Version: 1.7.1
IDO Version: 1.7.0
OS Version: Debian Wheezy
DB Type: MySQL
DB Version: 5.5
Browser Version: any

JsMin isn't used anywhere and should be wiped entirely, as it contains the license

The Software shall be used for Good, not Evil.

which would make it non-free (see http://lists.alioth.debian.org/pipermail/pkg-nagios-devel/2012-October/006636.html )

http://www.phing.info/docs/guide/stable/chapters/appendixes/AppendixC-OptionalTasks.html

contrib/businessprocess-icinga-cronk/phing/tasks/defaults.properties:jsmin=phing.tasks.ext.jsmin.JsMinTask
contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMin.php: * jsmin.php - PHP implementation of Douglas Crockford's JSMin.
contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMin.php: * This is pretty much a direct port of jsmin.c to PHP with just a few
contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMin.php: * PHP-specific performance tweaks. Also, whereas jsmin.c reads from stdin and
contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMin.php: * same terms as jsmin.c, which has the following license:
contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMin.php: * @package JSMin
contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMin.php: * @copyright 2002 Douglas Crockford  (jsmin.c)
contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMin.php: * @link http://code.google.com/p/jsmin-php/
contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMin.php:class JSMin {
contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMin.php:    $jsmin = new JSMin($js);
contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMin.php:    return $jsmin->min();
contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMin.php:              throw new JSMinException('Unterminated string literal.');
contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMin.php:              throw new JSMinException('Unterminated regular expression '.
contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMin.php:                throw new JSMinException('Unterminated comment.');
contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMin.php:class JSMinException extends Exception {}
contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMinTask.php: *  $Id: JsMinTask.php 526 2009-08-11 12:11:17Z mrook $
contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMinTask.php:require_once 'phing/tasks/ext/jsmin/JsMin.php';
contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMinTask.php: * Requires JSMin which can be found at http://code.google.com/p/jsmin-php/ but
contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMinTask.php: * is bundled with Phing so no additional install of JsMin is required.
contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMinTask.php: * @version $Id: JsMinTask.php 526 2009-08-11 12:11:17Z mrook $
contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMinTask.php:class JsMinTask extends Task
contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMinTask.php:                        file_put_contents($target, JSMin::minify(file_get_contents($fullPath . '/' . $file)));
contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMinTask.php:                    } catch (JSMinException $jsme) {
contrib/businessprocess-icinga-cronk/phing/etc/phing-grammar.rng:                
contrib/businessprocess-icinga-cronk/phing/etc/phing-grammar.rng:        JsMinTask
contrib/businessprocess-icinga-cronk/phing/etc/phing-grammar.rng:    
contrib/businessprocess-icinga-cronk/phing/etc/phing-grammar.rng:        
contrib/businessprocess-icinga-cronk/phing/UPGRADE:  previous versions, such as new tasks (SSH, SCP, JsMin, SVN and many
doc/CHANGELOG-1.x:* Removed jsmin
lib/ext3/pkgs/ext-foundation-debug.js:                        // quoted reversed for jsmin
lib/ext3/ext-all-debug-w-comments.js:                        // quoted reversed for jsmin
lib/ext3/ext-all-debug.js:                        // quoted reversed for jsmin
lib/phing/classes/phing/tasks/defaults.properties:jsmin=phing.tasks.ext.jsmin.JsMinTask
lib/phing/classes/phing/tasks/ext/jsmin/JsMin.php: * jsmin.php - PHP implementation of Douglas Crockford's JSMin.
lib/phing/classes/phing/tasks/ext/jsmin/JsMin.php: * This is pretty much a direct port of jsmin.c to PHP with just a few
lib/phing/classes/phing/tasks/ext/jsmin/JsMin.php: * PHP-specific performance tweaks. Also, whereas jsmin.c reads from stdin and
lib/phing/classes/phing/tasks/ext/jsmin/JsMin.php: * same terms as jsmin.c, which has the following license:
lib/phing/classes/phing/tasks/ext/jsmin/JsMin.php: * @package JSMin
lib/phing/classes/phing/tasks/ext/jsmin/JsMin.php: * @copyright 2002 Douglas Crockford  (jsmin.c)
lib/phing/classes/phing/tasks/ext/jsmin/JsMin.php: * @link http://code.google.com/p/jsmin-php/
lib/phing/classes/phing/tasks/ext/jsmin/JsMin.php:class JSMin {
lib/phing/classes/phing/tasks/ext/jsmin/JsMin.php:    $jsmin = new JSMin($js);
lib/phing/classes/phing/tasks/ext/jsmin/JsMin.php:    return $jsmin->min();
lib/phing/classes/phing/tasks/ext/jsmin/JsMin.php:              throw new JSMinException('Unterminated string literal.');
lib/phing/classes/phing/tasks/ext/jsmin/JsMin.php:              throw new JSMinException('Unterminated regular expression '.
lib/phing/classes/phing/tasks/ext/jsmin/JsMin.php:                throw new JSMinException('Unterminated comment.');
lib/phing/classes/phing/tasks/ext/jsmin/JsMin.php: * @package JSMin
lib/phing/classes/phing/tasks/ext/jsmin/JsMin.php:class JSMinException extends Exception {}
lib/phing/classes/phing/tasks/ext/jsmin/JsMinTask.php: *  $Id: JsMinTask.php 526 2009-08-11 12:11:17Z mrook $
lib/phing/classes/phing/tasks/ext/jsmin/JsMinTask.php:require_once 'phing/tasks/ext/jsmin/JsMin.php';
lib/phing/classes/phing/tasks/ext/jsmin/JsMinTask.php: * Requires JSMin which can be found at http://code.google.com/p/jsmin-php/ but
lib/phing/classes/phing/tasks/ext/jsmin/JsMinTask.php: * is bundled with Phing so no additional install of JsMin is required.
lib/phing/classes/phing/tasks/ext/jsmin/JsMinTask.php: * @version $Id: JsMinTask.php 526 2009-08-11 12:11:17Z mrook $
lib/phing/classes/phing/tasks/ext/jsmin/JsMinTask.php:class JsMinTask extends Task
lib/phing/classes/phing/tasks/ext/jsmin/JsMinTask.php:                        file_put_contents($target, JSMin::minify(file_get_contents($fullPath . '/' . $file)));
lib/phing/classes/phing/tasks/ext/jsmin/JsMinTask.php:                    } catch (JSMinException $jsme) {
lib/phing/docs/phing_guide/book/chapters/appendixes/AppendixC-OptionalTasks.html:               JsMinTask
lib/phing/docs/phing_guide/book/chapters/appendixes/AppendixC-OptionalTasks.html:               The JsMinTask minifies JavaScript files using JsMin. JsMin is
lib/phing/docs/phing_guide/book/chapters/appendixes/AppendixC-OptionalTasks.html:                       href="http://www.crockford.com/javascript/jsmin.html" target="_blank">Douglas
lib/phing/docs/phing_guide/book/chapters/appendixes/AppendixC-OptionalTasks.html:       

<jsMin targetDir="docroot/script/minified" failOnError="false">
lib/phing/docs/phing_guide/book/chapters/appendixes/AppendixC-OptionalTasks.html:</jsMin>
lib/phing/docs/phing_guide/book/toc/ToC.html:
lib/phing/docs/phing_guide/book/toc/ToC.html:           JsMinTask
lib/phing/docs/phing_guide/book/toc/FrameToC.html:
lib/phing/docs/phing_guide/book/toc/FrameToC.html:              JsMinTask
lib/phing/etc/phing-grammar.rng:                
lib/phing/etc/phing-grammar.rng:        JsMinTask
lib/phing/etc/phing-grammar.rng:    
lib/phing/etc/phing-grammar.rng:        
~

i guess this happened a while back already, but not enough?

commit e0d737697d9f11457a3e0527350350add22f5b59
Author: jmosshammer 
Date:   Mon Aug 16 15:01:36 2010 +0200

    * Removed jsmin

diff --git a/app/modules/AppKit/models/SquishFileContainerModel.class.php b/app/modules/AppKit/models/SquishFileContainerModel.class.php
index 307c1ed..af94ed8 100755
--- a/app/modules/AppKit/models/SquishFileContainerModel.class.php
+++ b/app/modules/AppKit/models/SquishFileContainerModel.class.php
@@ -81,7 +81,7 @@ class AppKit_SquishFileContainerModel extends AppKitBaseModel
                        $this->content .= $loader->getContent();
                }

-               $this->content = JSMin::minify($this->content);
+       //      $this->content = JSMin::minify($this->content);

                return null;
        }

Changesets

2012-10-08 08:20:53 +00:00 by jmosshammer 90981125878a65adcacc4f975e4f4f5c198f7470

Removed JSMin due to non free licence appendix (fixes #3252)

2012-10-15 07:12:28 +00:00 by jmosshammer 425533807b312bb918dbda51a5dd64eba3682515

Removed additional jsmin references (fixes #3298, fixes #3294, fixes #3252)

Relations:

icinga-migration commented 12 years ago

Updated by jmosshammer on 2012-10-08 08:50:22 +00:00

Applied in changeset 90981125878a65adcacc4f975e4f4f5c198f7470.

icinga-migration commented 12 years ago

Updated by mfriedrich on 2012-10-13 16:45:33 +00:00

there's still references to jsmin - guess your recent updated to the bpaddon cronk re-added that reference.

furthermore, within #3294 there are some php includes left which break the install.

icinga-migration commented 12 years ago

Updated by jmosshammer on 2012-10-15 08:29:50 +00:00