From c0e72a25f32e4916ac5eda8cb47888fd0a200b23 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Sun, 15 May 2022 18:07:23 +0200 Subject: Bump the changelog --- debian/changelog | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 51ca43d..831a0f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,25 @@ +snuffleupagus (0.8.0) UNRELEASED; urgency=low + [ jvoisin ] + * Compatibility with PHP8.1 + * Check for unsupported PHP version + * Backport of Suhosin-ng patches: + * Maximum stack depth/recursion limit + * Maximum length for session id + * $_SERVER strip/encode + * Configuration dump + * Support for conditional rules + * INI settings protection + * Output SP logs to stderr + * Ported Suhosin rules to SP + * Massive simplification of the configuration parser + * Better memory management + * Removal of internal calls to `call_user_func` + * Increased portability of the default rules access different version of PHP + * Start SP as late as possible, to hook as many things as possible + * XML and Session support are now checked at runtime instead of at compile time + + -- jvoisin Sun, 15 Apr 2022 18:00:00 +0200 + snuffleupagus (0.7.1) UNRELEASED; urgency=low [ jvoisin ] * Fixed possible memory-leaks when hooking via regular expressions -- cgit v1.3 From eabdc18da330b7f352e011f7640c94cb1b74b0d3 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Sun, 15 May 2022 18:23:50 +0200 Subject: Fix debian's control file --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 9e313b6..03fa0fd 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: snuffleupagus Priority: optional Maintainer: Julien (jvoisin) Voisin -Build-Depends: debhelper (>= 9), php-curl, php-xml, php7.0-dev | php7.1-dev | php7.2-dev | php7.3-dev | php7.4-dev | php8.0-dev +Build-Depends: debhelper (>= 9), php-curl, php-xml, php7.0-dev | php7.1-dev | php7.2-dev | php7.3-dev | php7.4-dev | php8.0-dev | php8.1-dev Standards-Version: 4.1.3 Homepage: https://github.com/jvoisin/snuffleupagus Section: php -- cgit v1.3 From 2a52388a05bdf4cdde302030cc591aebdbf29998 Mon Sep 17 00:00:00 2001 From: Giovanni Date: Sun, 15 May 2022 22:29:16 +0200 Subject: Build release debs in CI --- .github/workflows/release.yml | 71 +++++++++++++++++++++++++++++++++++++++++++ debian/rules | 4 +++ 2 files changed, 75 insertions(+) create mode 100644 .github/workflows/release.yml (limited to 'debian') diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..6d8d3d7 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,71 @@ +name: Release Builder +on: + push: + branches: + - "release-*" + tags: + - "v*" + pull_request: + branches: + - "release-*" + +jobs: + build-deb: + runs-on: ubuntu-latest + name: ${{ matrix.name }} + container: ${{ matrix.container }} + strategy: + fail-fast: false + matrix: + name: + [ + "debian-buster", + "debian-stretch", + "debian-bullseye", + "debian-sid", + "debian-bookworm", + "ubuntu-bionic", + "ubuntu-focal", + "ubuntu-jammy", + "ubuntu-impish", + ] + include: + - name: debian-buster + container: debian:buster + - name: debian-stretch + container: debian:stretch + - name: debian-bullseye + container: debian:bullseye + - name: debian-sid + container: debian:sid + - name: debian-bookworm + container: debian:bookworm + - name: ubuntu-bionic + container: ubuntu:bionic + - name: ubuntu-focal + container: ubuntu:focal + - name: ubuntu-jammy + container: ubuntu:jammy + - name: ubuntu-impish + container: ubuntu:impish + steps: + - name: Checkout code + uses: actions/checkout@v2 + - name: Set timezone + if: startsWith(matrix.container, 'ubuntu:') + run: ln -snf /usr/share/zoneinfo/Europe/Paris /etc/localtime && echo Europe/Paris > /etc/timezone + - name: Update OS + run: apt-get -qqy update + - name: Install deps + run: DEBIAN_FRONTEND=noninteractive apt-get -qqy --no-install-recommends install fakeroot php-xml php-curl dpkg-dev gcc make libpcre3-dev dh-php php-dev build-essential + - name: Build debs + run: DPKG_SKIP_TESTS=1 dpkg-buildpackage -i -us -uc -tc -I -rfakeroot + - name: Move built debs and rename + run: | + mv -v ../*.deb ./ + ls *.deb | xargs -I % mv -v % ${{ matrix.name }}-% + - name: Upload artifacts + uses: actions/upload-artifact@v3 + with: + name: snuffleupagus-${{ matrix.name }} + path: ./*.deb diff --git a/debian/rules b/debian/rules index 70965bb..40eb4ac 100755 --- a/debian/rules +++ b/debian/rules @@ -27,5 +27,9 @@ 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: +ifeq ($(strip $(DPKG_SKIP_TESTS)),) 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 +else + echo "skip tests" +endif \ No newline at end of file -- cgit v1.3 From 3d206b9ae51680ae6c0f0eee3e11e667d343d3e4 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Mon, 16 May 2022 19:49:18 +0200 Subject: Bump the changelog --- debian/changelog | 7 +++++++ doc/source/changelog.rst | 11 ++++++++++- src/php_snuffleupagus.h | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 831a0f2..3282469 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +snuffleupagus (0.8.1) UNRELEASED; urgency=low + [ jvoisin ] + * Fix the version number + * Fix a test on PHP7 + + -- jvoisin Sun, 16 Apr 2022 19:45:00 +0200 + snuffleupagus (0.8.0) UNRELEASED; urgency=low [ jvoisin ] * Compatibility with PHP8.1 diff --git a/doc/source/changelog.rst b/doc/source/changelog.rst index a69ec20..794afb8 100644 --- a/doc/source/changelog.rst +++ b/doc/source/changelog.rst @@ -1,7 +1,16 @@ Changelog ========= -0.8.0 - `Woolly Mammoth` `__ 2022/05/15 +0.8.1 - `Batyr `__ 2022/05/16 +------------------------------------------------------------------------------------------- + +Bug fixes +^^^^^^^^^ +* Fix the version number +* Fix a test on PHP7 + + +0.8.0 - `Woolly Mammoth `__ 2022/05/15 ----------------------------------------------------------------------------------------------------- New features diff --git a/src/php_snuffleupagus.h b/src/php_snuffleupagus.h index e40b31b..8faaf3a 100644 --- a/src/php_snuffleupagus.h +++ b/src/php_snuffleupagus.h @@ -1,7 +1,7 @@ #ifndef PHP_SNUFFLEUPAGUS_H #define PHP_SNUFFLEUPAGUS_H -#define PHP_SNUFFLEUPAGUS_VERSION "0.9.0" +#define PHP_SNUFFLEUPAGUS_VERSION "0.8.1" #define PHP_SNUFFLEUPAGUS_EXTNAME "snuffleupagus" #define PHP_SNUFFLEUPAGUS_AUTHOR "NBS System & Julien (jvoisin) Voisin & SektionEins GmbH" #define PHP_SNUFFLEUPAGUS_URL "https://github.com/jvoisin/snuffleupagus" -- cgit v1.3 From a1a7d2030f40ce1f880e9944417c6ccbb48a3c13 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Fri, 20 May 2022 22:00:35 +0200 Subject: Bump the changelog --- debian/changelog | 7 +++++++ doc/source/changelog.rst | 9 +++++++++ src/php_snuffleupagus.h | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3282469..034a34d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +snuffleupagus (0.8.2) UNRELEASED; urgency=low + [ jvoisin ] + * Fix compilation when ZTS is used + * Fix a possible infinite loop + + -- jvoisin Sun, 20 Apr 2022 22:00:00 +0200 + snuffleupagus (0.8.1) UNRELEASED; urgency=low [ jvoisin ] * Fix the version number diff --git a/doc/source/changelog.rst b/doc/source/changelog.rst index 4bb0583..a406953 100644 --- a/doc/source/changelog.rst +++ b/doc/source/changelog.rst @@ -1,6 +1,15 @@ Changelog ========= +0.8.2 - `Surus `__ 2022/05/20 +------------------------------------------------------------------------------------------- + +Bug fixes +^^^^^^^^^ +* Fix compilation when ZTS is used +* Fix a possible infinite loop + + 0.8.1 - `Batyr `__ 2022/05/16 ------------------------------------------------------------------------------------------- diff --git a/src/php_snuffleupagus.h b/src/php_snuffleupagus.h index 8faaf3a..97fa0e4 100644 --- a/src/php_snuffleupagus.h +++ b/src/php_snuffleupagus.h @@ -1,7 +1,7 @@ #ifndef PHP_SNUFFLEUPAGUS_H #define PHP_SNUFFLEUPAGUS_H -#define PHP_SNUFFLEUPAGUS_VERSION "0.8.1" +#define PHP_SNUFFLEUPAGUS_VERSION "0.8.2" #define PHP_SNUFFLEUPAGUS_EXTNAME "snuffleupagus" #define PHP_SNUFFLEUPAGUS_AUTHOR "NBS System & Julien (jvoisin) Voisin & SektionEins GmbH" #define PHP_SNUFFLEUPAGUS_URL "https://github.com/jvoisin/snuffleupagus" -- cgit v1.3