Bug#793020: jessie-pu: package fusiondirectory/1.0.8.2-5+deb8u1
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu
Dear release team,
The fusiondirectory package in jessie (1.0.8.2-5) pulls in Javascript
files from the same webserver that are located outside the base path of
fusiondirectory. This behavious is suboptimal, as you need quite some
effort to configure Apache2 (or other httpd).
+ * debian/fusiondirectory.links:
+ + Add symlinks for prototype and scripaculous shared javascript libraries.
+ * debian/patches:
+ + Add 2005_relative-path-to-js.patch. Access javascript libraries via a path
+ relative to FusionDirectory's base path (Closes: #786864, #782531).
The proposed approach (upstream has been informed) now is to symlink
those Javascript files into the PHP code tree of fusiondirectory and
pull-in those files via relative URLs (like already done for GOsa²).
Please consider allowing this change to be uploaded to jessie-pu.
light+love
Mike
-- System Information:
Debian Release: 8.1
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'proposed-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru fusiondirectory-1.0.8.2/debian/changelog fusiondirectory-1.0.8.2/debian/changelog
--- fusiondirectory-1.0.8.2/debian/changelog 2015-07-20 15:52:17.000000000 +0200
+++ fusiondirectory-1.0.8.2/debian/changelog 2015-07-20 15:56:48.000000000 +0200
@@ -1,3 +1,13 @@
+fusiondirectory (1.0.8.2-5+deb8u1) jessie-proposed-updates; urgency=medium
+
+ * debian/fusiondirectory.links:
+ + Add symlinks for prototype and scripaculous shared javascript libraries.
+ * debian/patches:
+ + Add 2005_relative-path-to-js.patch. Access javascript libraries via a path
+ relative to FusionDirectory's base path (Closes: #786864, #782531).
+
+ -- Mike Gabriel <sunweaver@debian.org> Mon, 20 Jul 2015 15:47:22 +0200
+
fusiondirectory (1.0.8.2-5) unstable; urgency=medium
* debian/patches:
diff -Nru fusiondirectory-1.0.8.2/debian/fusiondirectory.links fusiondirectory-1.0.8.2/debian/fusiondirectory.links
--- fusiondirectory-1.0.8.2/debian/fusiondirectory.links 1970-01-01 01:00:00.000000000 +0100
+++ fusiondirectory-1.0.8.2/debian/fusiondirectory.links 2015-07-20 15:52:36.000000000 +0200
@@ -0,0 +1,2 @@
+usr/share/javascript/prototype usr/share/fusiondirectory/html/javascript/prototype
+usr/share/javascript/scriptaculous usr/share/fusiondirectory/html/javascript/scriptaculous
diff -Nru fusiondirectory-1.0.8.2/debian/patches/2005_relative-path-to-js.patch fusiondirectory-1.0.8.2/debian/patches/2005_relative-path-to-js.patch
--- fusiondirectory-1.0.8.2/debian/patches/2005_relative-path-to-js.patch 1970-01-01 01:00:00.000000000 +0100
+++ fusiondirectory-1.0.8.2/debian/patches/2005_relative-path-to-js.patch 2015-07-20 15:52:36.000000000 +0200
@@ -0,0 +1,37 @@
+Description: javascript libs should be referenced relative to the bash path of a FusionDirectory installation
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+--- a/core/ihtml/themes/default/headers.tpl
++++ b/core/ihtml/themes/default/headers.tpl
+@@ -15,14 +15,14 @@
+
+ <link rel="shortcut icon" href="favicon.ico"/>
+
+- <script src="/javascript/prototype/prototype.js" type="text/javascript"></script>
++ <script src="javascript/prototype/prototype.js" type="text/javascript"></script>
+ <script src="include/fusiondirectory.js" type="text/javascript"></script>
+ {if $usePrototype == 'true'}
+- <script src="/javascript/scriptaculous/scriptaculous.js" type="text/javascript"></script>
+- <script src="/javascript/scriptaculous/builder.js" type="text/javascript"></script>
+- <script src="/javascript/scriptaculous/effects.js" type="text/javascript"></script>
+- <script src="/javascript/scriptaculous/dragdrop.js" type="text/javascript"></script>
+- <script src="/javascript/scriptaculous/controls.js" type="text/javascript"></script>
++ <script src="javascript/scriptaculous/scriptaculous.js" type="text/javascript"></script>
++ <script src="javascript/scriptaculous/builder.js" type="text/javascript"></script>
++ <script src="javascript/scriptaculous/effects.js" type="text/javascript"></script>
++ <script src="javascript/scriptaculous/dragdrop.js" type="text/javascript"></script>
++ <script src="javascript/scriptaculous/controls.js" type="text/javascript"></script>
+ <script src="include/pulldown.js" type="text/javascript"></script>
+ <script src="include/datepicker.js" type="text/javascript"></script>
+ {/if}
+--- a/core/ihtml/themes/default/password.tpl
++++ b/core/ihtml/themes/default/password.tpl
+@@ -12,7 +12,7 @@
+ <style type="text/css">@import url('themes/default/password-style.css');</style>
+ <link rel="shortcut icon" href="favicon.ico">
+
+- <script src="/javascript/prototype/prototype.js" type="text/javascript"></script>
++ <script src="javascript/prototype/prototype.js" type="text/javascript"></script>
+ <script src="include/fusiondirectory.js" type="text/javascript"></script>
+ <script src="include/pwdStrength.js" type="text/javascript"></script>
+ </head>
diff -Nru fusiondirectory-1.0.8.2/debian/patches/series fusiondirectory-1.0.8.2/debian/patches/series
--- fusiondirectory-1.0.8.2/debian/patches/series 2015-07-20 15:52:17.000000000 +0200
+++ fusiondirectory-1.0.8.2/debian/patches/series 2015-07-20 15:56:25.000000000 +0200
@@ -6,3 +6,4 @@
2002_fusiondirectory-headers.patch
2003_fusiondirectory-password.patch
2004_fusiondirectory-setup.patch
+2005_relative-path-to-js.patch
Reply to: