Merge remote-tracking branch 'upstream/master'

3 files changed, 42 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index db89cc1..d0ab5e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,39 @@
+snuffleupagus (0.7.0) UNRELEASED; urgency=medium
+  [ jvoisin ]
+  * PHP8 support
+  * Stacktraces in dumps
+  * The `>` operator skips over functions
+  * PCRE2 is used when possible
+  * The `generate_rules.php` script is now more portable
+  * The strict mode is now disableable
+
+snuffleupagus (0.6.0) UNRELEASED; urgency=medium
+
+  [ jvoisin ]
+  * More constification
+  * Snuffleupagus should now be able to get client's ip addresses in more cases
+  * Documented compatibility with Heroku
+  * Improved logging
+  * Added a couple of tests
+
+  [ wargio ]
+  * allow empty configurations
+
+ -- jvoisin <julien.voisin+snuffleupagus@dustri.org>  Fri, 06 Nov 2020 17:45:00 +0200
+
+snuffleupagus (0.5.1) UNRELEASED; urgency=medium
+
+  [ jvoisin ]
+  * Add support for syslog
+  * Improve OSX support
+  * Improve marginally of php8+ compatibility
+  * Improve php7.4 compatibility
+  * Improve the default ruleset
+  * Improve the documentation
+  * Improve the gitlab CI
+
+ -- jvoisin <julien.voisin+snuffleupagus@dustri.org>  Sat, 20 Jun 2020 12:30:00 +0200
+
 snuffleupagus (0.5.0) UNRELEASED; urgency=medium
 
   [ kkadosh ]
@@ -23,7 +59,7 @@ snuffleupagus (0.4.1) UNRELEASED; urgency=medium
   * Improve and clarify the documentation
   * Add support for PHP7.3
   * Improve the coverage, we have now reached 99% of coverage
-  * Improve the `mb_string` hooking logic 
+  * Improve the `mb_string` hooking logic
   * The script that check uploaded file is now available in PHP
   * Fix segfault on 32-bit for PHP7.3
   * Fix segfault when using `sloppy_comparison` feature with array
@@ -53,11 +89,11 @@ snuffleupagus (0.3.1) UNRELEASED; urgency=medium
 
   * Disable XXE and harden PRNG by default
   * Use SameSite on PHP's session cookie in the default rules
-  * Relax a bit what files can be included in the default rules  
+  * Relax a bit what files can be included in the default rules
   * Add the possibility to ignore files hashes when generating rules
-  * The filename filter is now accepting phar paths  
+  * The filename filter is now accepting phar paths
   * The harden rand_feature is not ignoring parameters anymore in function calls
-  * Fix possible crashes/hangs when using php-fpm's pools  
+  * Fix possible crashes/hangs when using php-fpm's pools
   * Fix an infinite loop on echo hook
   * Fix an issue with filename filter
   * Fix some documentation issues
diff --git a/debian/control b/debian/control
index 51e0b15..6e48b93 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: snuffleupagus
 Priority: optional
 Maintainer: Julien (jvoisin) Voisin <julien.voisin+snuffleupagus@dustri.org>
-Build-Depends: debhelper (>= 9), php7.0-dev | php7.1-dev | php7.2-dev | php7.3-dev | php7.4-dev
+Build-Depends: debhelper (>= 9), php-curl, php-xml, php7.0-dev | php7.1-dev | php7.2-dev | php7.3-dev | php7.4-dev
 Standards-Version: 4.1.3
 Homepage: https://github.com/jvoisin/snuffleupagus
 Section: php
diff --git a/debian/rules b/debian/rules
index 9ca12fb..70965bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,4 +27,5 @@ override_dh_auto_install:
         install -m 644 -o root -g root config/snuffleupagus.ini debian/snuffleupagus/etc/php/$$(/usr/bin/php-config --version | cut -d '.' -f1-2)/mods-available/snuffleupagus.ini
  
 override_dh_auto_test:
+        sed -i "s/\$$ext_params -d display_errors=0 -r/-d display_errors=0 -r/" src/run-tests.php
         TEST_PHP_ARGS="-q" REPORT_EXIST_STATUS=1 make -C src test