Commit c9c0bc7c authored by Markus Frosch's avatar Markus Frosch 📣
Browse files

Use vendored version of HTMLPurifier

parent bb42fbf7
...@@ -8,7 +8,7 @@ Build-Depends: ...@@ -8,7 +8,7 @@ Build-Depends:
bash-completion, bash-completion,
debhelper (>= 9), debhelper (>= 9),
php-cli, php-cli,
php-htmlpurifier (>= 4.3), # php-htmlpurifier (>= 4.3),
node-uglify (>= 2) | yui-compressor, node-source-map | yui-compressor node-uglify (>= 2) | yui-compressor, node-source-map | yui-compressor
Standards-Version: 3.9.8 Standards-Version: 3.9.8
Homepage: https://www.icinga.org Homepage: https://www.icinga.org
...@@ -19,7 +19,7 @@ Package: icingaweb2 ...@@ -19,7 +19,7 @@ Package: icingaweb2
Architecture: all Architecture: all
Depends: Depends:
icingaweb2-common (= ${source:Version}), icingaweb2-common (= ${source:Version}),
php-htmlpurifier (>= 4.3), # php-htmlpurifier (>= 4.3),
# php-dompdf (>= 0.6.1), # php-dompdf (>= 0.6.1),
php-xml, php-xml,
# php-parsedown, # php-parsedown,
......
...@@ -13,8 +13,13 @@ etc/schema usr/share/icingaweb2/etc ...@@ -13,8 +13,13 @@ etc/schema usr/share/icingaweb2/etc
packages/files/public/index.php usr/share/icingaweb2/public packages/files/public/index.php usr/share/icingaweb2/public
debian/icingaweb2.conf etc/apache2/conf-available debian/icingaweb2.conf etc/apache2/conf-available
# TODO: vendor libraries - should be moved to a proper package # vendor libraries - should be used from dependent packages on Debian
# Icinga distribution includes all of them within the package
library/vendor/HTMLPurifier*.php usr/share/icingaweb2/library/vendor
library/vendor/HTMLPurifier/*/ usr/share/icingaweb2/library/vendor/HTMLPurifier
library/vendor/HTMLPurifier/*.php usr/share/icingaweb2/library/vendor/HTMLPurifier
library/vendor/JShrink/*.php usr/share/icingaweb2/library/vendor/JShrink library/vendor/JShrink/*.php usr/share/icingaweb2/library/vendor/JShrink
library/vendor/Parsedown/*.php usr/share/icingaweb2/library/vendor/Parsedown library/vendor/Parsedown/*.php usr/share/icingaweb2/library/vendor/Parsedown
library/vendor/dompdf/{*.php,lib,src} usr/share/icingaweb2/library/vendor/dompdf library/vendor/dompdf/lib usr/share/icingaweb2/library/vendor/dompdf
library/vendor/dompdf/src usr/share/icingaweb2/library/vendor/dompdf
library/vendor/lessphp/*.php usr/share/icingaweb2/library/vendor/lessphp library/vendor/lessphp/*.php usr/share/icingaweb2/library/vendor/lessphp
...@@ -17,7 +17,7 @@ override_dh_install: ...@@ -17,7 +17,7 @@ override_dh_install:
override_dh_auto_test: override_dh_auto_test:
dh_auto_test dh_auto_test
# test if php-htmlpurifier can be loaded # test if php-htmlpurifier can be loaded
php debian/test/php-htmlpurifier.php #php debian/test/php-htmlpurifier.php
override_dh_auto_build: override_dh_auto_build:
dh_auto_build dh_auto_build
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment