From 367ab3778eb855f223abffe978560180501b2c21 Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Tue, 11 Jun 2024 12:56:22 +0200 Subject: [PATCH 01/17] Include stdlib.h for atoi. --- src/ows/ows_config.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ows/ows_config.c b/src/ows/ows_config.c index 9bdf6053..ba4ea975 100644 --- a/src/ows/ows_config.c +++ b/src/ows/ows_config.c @@ -22,6 +22,7 @@ #include +#include #include #include #include From a3487a50a74055481eac9ec5f0e5379a0e3ab24d Mon Sep 17 00:00:00 2001 From: Jeff McKenna Date: Wed, 31 Jul 2024 10:11:46 -0300 Subject: [PATCH 02/17] handle upcoming PostGIS 3.5 in demo --- demo/install.sh.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/demo/install.sh.in b/demo/install.sh.in index 54411a85..d5032f6f 100755 --- a/demo/install.sh.in +++ b/demo/install.sh.in @@ -11,8 +11,10 @@ PGUSER=postgres SHP2PGSQL=@SHP2PGSQL@ DB=tinyows_demo -if [ -d /usr/local/pgsql/share/contrib/postgis-3.4 ]; then - PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.4 +if [ -d /usr/local/pgsql/share/contrib/postgis-3.5 ]; then + PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.5 +elif [ -d /usr/local/pgsql/share/contrib/postgis-3.4 ]; then + PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.4 elif [ -d /usr/local/pgsql/share/contrib/postgis-3.3 ]; then PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.3 elif [ -d /usr/local/pgsql/share/contrib/postgis-3.2 ]; then From fe2e525c1ad3a63251cdb680851fb68767f85d3f Mon Sep 17 00:00:00 2001 From: Jeff McKenna Date: Wed, 31 Jul 2024 11:12:42 -0300 Subject: [PATCH 03/17] update for 1.2.2 release --- NEWS.md | 3 +++ README.md | 2 +- VERSION.md | 2 +- doc/Doxyfile | 2 +- src/ows_define.h.in | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/NEWS.md b/NEWS.md index 397d4c5c..295f02b3 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,6 @@ +1.2.2 (2024-07-31) *in memory of Olivier Courtin* + - Include stdlib.h for atoi ([#105](https://github.com/MapServer/tinyows/pull/105)) (Bas Couwenberg) + 1.2.1 (2024-05-17) *in memory of Olivier Courtin* - Fix JSON encoding ([#100](https://github.com/MapServer/tinyows/pull/100)) (Kévin Dubuc) - Use stdbool.h instead of custom definitions ([#99](https://github.com/MapServer/tinyows/pull/99)) (Bas Couwenberg) diff --git a/README.md b/README.md index 41e2c887..375b4b32 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ All code must meet the following rules : Code dynamically linked with the following other librairies: - PostgreSQL -- libxml 2.9.x +- libxml2 - flex ## Credits diff --git a/VERSION.md b/VERSION.md index 6085e946..23aa8390 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -1.2.1 +1.2.2 diff --git a/doc/Doxyfile b/doc/Doxyfile index 04c607ac..8b668102 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -23,7 +23,7 @@ PROJECT_NAME = tinyows # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.2.1 +PROJECT_NUMBER = 1.2.2 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/src/ows_define.h.in b/src/ows_define.h.in index 30da8bac..7566f61b 100644 --- a/src/ows_define.h.in +++ b/src/ows_define.h.in @@ -28,7 +28,7 @@ #define OWS_DEBUG #endif -#define TINYOWS_VERSION "1.2.1" +#define TINYOWS_VERSION "1.2.2" #define TINYOWS_FCGI @USE_FCGI@ #define OWS_CONFIG_FILE_PATH "/etc/tinyows.xml" From c48e0e22cce5b9d2e3357a5894c7695aafefd6b3 Mon Sep 17 00:00:00 2001 From: Jeff McKenna Date: Mon, 10 Mar 2025 11:18:27 -0300 Subject: [PATCH 04/17] update license year --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index fffa6015..6d34f487 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) <2007-2024> +Copyright (c) <2007-2025> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 27ecde71c686320b1bcc79fa65ad83d7676e3f4d Mon Sep 17 00:00:00 2001 From: Jeff McKenna Date: Thu, 13 Mar 2025 17:03:32 -0300 Subject: [PATCH 05/17] ci: upgrade to Ubuntu 24.04 --- .github/workflows/linux.sh | 8 ++++---- .github/workflows/linux.yml | 2 +- demo/install.sh.in | 28 +++++++++++++++++++--------- test/wfs_100/install_wfs_100.sh.in | 30 ++++++++++++++++++++---------- test/wfs_110/install_wfs_110.sh.in | 12 +++++++++++- 5 files changed, 55 insertions(+), 25 deletions(-) diff --git a/.github/workflows/linux.sh b/.github/workflows/linux.sh index 90e2887b..642f38dc 100755 --- a/.github/workflows/linux.sh +++ b/.github/workflows/linux.sh @@ -7,7 +7,7 @@ apt-get update DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ gcc libxml2-dev libpq-dev libfcgi-dev \ autoconf make flex libfl-dev \ - postgresql-12 postgresql-client postgis postgresql-12-postgis-3 postgresql-12-postgis-3-scripts \ + postgresql-16 postgresql-client postgis postgresql-16-postgis-3 postgresql-16-postgis-3-scripts \ wget ca-certificates patch valgrind cd "${WORK_DIR}" @@ -16,9 +16,9 @@ CFLAGS="-Werror" ./configure make make install -cp /etc/postgresql/12/main/pg_hba.conf /etc/postgresql/12/main/pg_hba.conf.bak -echo "local all postgres trust" | cat - /etc/postgresql/12/main/pg_hba.conf.bak > /etc/postgresql/12/main/pg_hba.conf -echo "host all all 127.0.0.1/32 trust" | cat - /etc/postgresql/12/main/pg_hba.conf.bak > /etc/postgresql/12/main/pg_hba.conf +cp /etc/postgresql/16/main/pg_hba.conf /etc/postgresql/16/main/pg_hba.conf.bak +echo "local all postgres trust" | cat - /etc/postgresql/16/main/pg_hba.conf.bak > /etc/postgresql/16/main/pg_hba.conf +echo "host all all 127.0.0.1/32 trust" | cat - /etc/postgresql/16/main/pg_hba.conf.bak > /etc/postgresql/16/main/pg_hba.conf /etc/init.d/postgresql start rm -f /etc/tinyows.xml diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 5ee53972..83125717 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -12,4 +12,4 @@ jobs: uses: actions/checkout@v4 - name: Build - run: docker run --rm -e WORK_DIR=$PWD -v $PWD:$PWD ubuntu:20.04 $PWD/.github/workflows/linux.sh + run: docker run --rm -e WORK_DIR=$PWD -v $PWD:$PWD ubuntu:24.04 $PWD/.github/workflows/linux.sh diff --git a/demo/install.sh.in b/demo/install.sh.in index d5032f6f..cd34c949 100755 --- a/demo/install.sh.in +++ b/demo/install.sh.in @@ -21,24 +21,34 @@ elif [ -d /usr/local/pgsql/share/contrib/postgis-3.2 ]; then PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.2 elif [ -d /usr/local/pgsql/share/contrib/postgis-3.1 ]; then PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.1 +elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.5 ]; then + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.5 +elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.4 ]; then + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.4 +elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.3 ]; then + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.3 +elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.2 ]; then + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.2 +elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.1 ]; then + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.1 elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0 + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.5 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5 + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.4 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4 + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.3 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3 + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.2 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.2 + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.2 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.1 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1 + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.0 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0 + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0 elif [ -d @POSTGIS_SHARE@/contrib/postgis-1.5 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5 + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5 else - echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1 + echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1 fi echo "Create Spatial Database: $DB" diff --git a/test/wfs_100/install_wfs_100.sh.in b/test/wfs_100/install_wfs_100.sh.in index 840b7423..eecd64cb 100755 --- a/test/wfs_100/install_wfs_100.sh.in +++ b/test/wfs_100/install_wfs_100.sh.in @@ -10,24 +10,34 @@ PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0 PGUSER=postgres DB=tinyows_test -if [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0 +if [ -d @POSTGIS_SHARE@/contrib/postgis-3.5 ]; then + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.5 +elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.4 ]; then + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.4 +elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.3 ]; then + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.3 +elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.2 ]; then + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.2 +elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.1 ]; then + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.1 +elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.5 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5 + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.4 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4 + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.3 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3 + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.2 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.2 + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.2 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.1 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1 + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.0 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0 + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0 elif [ -d @POSTGIS_SHARE@/contrib/postgis-1.5 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5 + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5 else - echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1 + echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1 fi echo "Create Spatial Database: $DB" diff --git a/test/wfs_110/install_wfs_110.sh.in b/test/wfs_110/install_wfs_110.sh.in index aaddd413..63e8b71e 100755 --- a/test/wfs_110/install_wfs_110.sh.in +++ b/test/wfs_110/install_wfs_110.sh.in @@ -10,7 +10,17 @@ PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0 PGUSER=postgres DB=tinyows_test -if [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then +if [ -d @POSTGIS_SHARE@/contrib/postgis-3.5 ]; then + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.5 +elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.4 ]; then + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.4 +elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.3 ]; then + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.3 +elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.2 ]; then + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.2 +elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.1 ]; then + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.1 +elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.5 ]; then PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5 From 52c8c93008d7bf870f7ecf19ca33f4440d9f9cb6 Mon Sep 17 00:00:00 2001 From: Jeff McKenna Date: Thu, 13 Mar 2025 17:14:08 -0300 Subject: [PATCH 06/17] ci: upgrade to Ubuntu 24.04 --- test/wfs_110/install_wfs_110.sh.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/wfs_110/install_wfs_110.sh.in b/test/wfs_110/install_wfs_110.sh.in index 63e8b71e..2a7bcbcc 100755 --- a/test/wfs_110/install_wfs_110.sh.in +++ b/test/wfs_110/install_wfs_110.sh.in @@ -21,23 +21,23 @@ elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.2 ]; then elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.1 ]; then PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.1 elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0 + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.5 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5 + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.4 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4 + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.3 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3 + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.2 ]; then PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.2 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.1 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1 + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.0 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0 + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0 elif [ -d @POSTGIS_SHARE@/contrib/postgis-1.5 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5 + PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5 else - echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1 + echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1 fi echo "Create Spatial Database: $DB" From 72f08f6be98ec18a683d7deef8613b78c8232450 Mon Sep 17 00:00:00 2001 From: Jeff McKenna Date: Thu, 13 Mar 2025 17:15:01 -0300 Subject: [PATCH 07/17] add linefeed check action --- .github/workflows/check-crlf.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/check-crlf.yml diff --git a/.github/workflows/check-crlf.yml b/.github/workflows/check-crlf.yml new file mode 100644 index 00000000..96c8e49a --- /dev/null +++ b/.github/workflows/check-crlf.yml @@ -0,0 +1,20 @@ +# check for Windows CRLF in files +# homepage: https://github.com/marketplace/actions/check-crlf + +name: Check CRLF + +on: [push, pull_request] + +jobs: + Check-CRLF: + name: verify that only LF linefeeds are used + runs-on: ubuntu-latest + + steps: + - name: Checkout repository contents + uses: actions/checkout@v4 + + - name: Use action to check for CRLF endings + uses: erclu/check-crlf@v1.2.0 + with: # ignore directories containing *.csv & data + exclude: /demo/ \ No newline at end of file From 5d46702a475e9763096cd4800ae36f084f6ba507 Mon Sep 17 00:00:00 2001 From: Jeff McKenna Date: Thu, 13 Mar 2025 17:17:58 -0300 Subject: [PATCH 08/17] add linefeed check action --- .github/workflows/check-crlf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-crlf.yml b/.github/workflows/check-crlf.yml index 96c8e49a..4ab83e39 100644 --- a/.github/workflows/check-crlf.yml +++ b/.github/workflows/check-crlf.yml @@ -17,4 +17,4 @@ jobs: - name: Use action to check for CRLF endings uses: erclu/check-crlf@v1.2.0 with: # ignore directories containing *.csv & data - exclude: /demo/ \ No newline at end of file + exclude: /demo/ /ms4w/ /test/ Makefile.vc \ No newline at end of file From b779f84994f7365c5fb9036385d82b11973347c6 Mon Sep 17 00:00:00 2001 From: Jeff McKenna Date: Fri, 14 Mar 2025 09:28:01 -0300 Subject: [PATCH 09/17] ci: upgrade to Ubuntu 24.04 --- demo/tests/expected/wfs10_describe.txt | 2 +- demo/tests/expected/wfs11_describe.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/tests/expected/wfs10_describe.txt b/demo/tests/expected/wfs10_describe.txt index 2520c207..5f4b3404 100644 --- a/demo/tests/expected/wfs10_describe.txt +++ b/demo/tests/expected/wfs10_describe.txt @@ -21,7 +21,7 @@ Content-Type: text/xml; subtype=gml/2.1.2; - + diff --git a/demo/tests/expected/wfs11_describe.txt b/demo/tests/expected/wfs11_describe.txt index 558730cd..fb213caa 100644 --- a/demo/tests/expected/wfs11_describe.txt +++ b/demo/tests/expected/wfs11_describe.txt @@ -21,7 +21,7 @@ Content-Type: text/xml; subtype=gml/3.1.1; - + From 5fc4848a0ddf55842254d5ce3f4e1b934baf7a48 Mon Sep 17 00:00:00 2001 From: Jeff McKenna Date: Fri, 23 May 2025 11:15:19 -0300 Subject: [PATCH 10/17] add badges --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 375b4b32..8b13bb99 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # TinyOWS +[![Build TinyOWS on Linux Status](https://github.com/MapServer/tinyows/actions/workflows/linux.yml/badge.svg)](https://github.com/MapServer/tinyows/actions?query=workflow%3A%22Linux%20Build%22%20branch%3Amain) +[![Release](https://img.shields.io/github/v/release/MapServer/tinyows)](https://github.com/MapServer/tinyows/releases) + TinyOWS is a simple WFS-T server based on PostGIS spatial database. ## Documentation Home From 8cf43fb0eb2749282a0b9b9d6c4ca38609d65994 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Aug 2025 06:33:57 +0000 Subject: [PATCH 11/17] Bump actions/checkout from 4 to 5 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/check-crlf.yml | 2 +- .github/workflows/linux.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-crlf.yml b/.github/workflows/check-crlf.yml index 4ab83e39..b80cd65c 100644 --- a/.github/workflows/check-crlf.yml +++ b/.github/workflows/check-crlf.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout repository contents - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Use action to check for CRLF endings uses: erclu/check-crlf@v1.2.0 diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 83125717..dba6df86 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -9,7 +9,7 @@ jobs: if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')" steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Build run: docker run --rm -e WORK_DIR=$PWD -v $PWD:$PWD ubuntu:24.04 $PWD/.github/workflows/linux.sh From 3e8a3fe21db49b47f2d3c8a56974bc22ec059dc7 Mon Sep 17 00:00:00 2001 From: Jeff McKenna Date: Mon, 18 Aug 2025 07:33:00 -0300 Subject: [PATCH 12/17] bump Check CRLF action --- .github/workflows/check-crlf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-crlf.yml b/.github/workflows/check-crlf.yml index b80cd65c..ef4976f5 100644 --- a/.github/workflows/check-crlf.yml +++ b/.github/workflows/check-crlf.yml @@ -15,6 +15,6 @@ jobs: uses: actions/checkout@v5 - name: Use action to check for CRLF endings - uses: erclu/check-crlf@v1.2.0 + uses: erclu/check-crlf@master with: # ignore directories containing *.csv & data exclude: /demo/ /ms4w/ /test/ Makefile.vc \ No newline at end of file From 51c62e5be1951c278fa01f334bf2563d29fa110e Mon Sep 17 00:00:00 2001 From: Jeff McKenna Date: Tue, 30 Sep 2025 09:17:03 -0300 Subject: [PATCH 13/17] add IRC workflow --- .github/workflows/irc_notify.yml | 46 ++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .github/workflows/irc_notify.yml diff --git a/.github/workflows/irc_notify.yml b/.github/workflows/irc_notify.yml new file mode 100644 index 00000000..be8ab28b --- /dev/null +++ b/.github/workflows/irc_notify.yml @@ -0,0 +1,46 @@ +# send build notifications to the #mapserver-docs IRC channel +# homepage: https://github.com/marketplace/actions/notify-irc + +name: "IRC Push Notification" +on: + push: + branches: + - main + pull_request: + branches: + - main + +jobs: + irc_notify: + runs-on: ubuntu-latest + #if: github.repository == 'MapServer/tinyows' + steps: + - name: irc push + uses: rectalogic/notify-irc@v2 + if: github.event_name == 'push' + with: + channel: "#tinyows" + server: "irc.libera.chat" + nickname: tinyows-github-notifier + message: | + ${{ github.actor }} pushed ${{ github.event.ref }} ${{ github.event.compare }} + ${{ join(github.event.commits.*.message) }} + - name: irc pull request + uses: rectalogic/notify-irc@v2 + if: github.event_name == 'pull_request' + with: + channel: "#tinyows" + server: "irc.libera.chat" + nickname: tinyows-github-notifier + message: | + ${{ github.actor }} opened PR ${{ github.event.pull_request.html_url }} + ${{ github.event.pull_request.title }} + - name: irc tag created + uses: rectalogic/notify-irc@v2 + if: github.event_name == 'create' && github.event.ref_type == 'tag' + with: + channel: "#tinyows" + server: "irc.libera.chat" + nickname: tinyows-github-notifier + message: | + ${{ github.actor }} tagged ${{ github.repository }} ${{ github.event.ref }} From 8df8a3d89641323d5af97f96372ca3efaff397df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Nov 2025 04:11:18 +0000 Subject: [PATCH 14/17] Bump actions/checkout from 5 to 6 Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/check-crlf.yml | 2 +- .github/workflows/linux.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-crlf.yml b/.github/workflows/check-crlf.yml index ef4976f5..42f358a2 100644 --- a/.github/workflows/check-crlf.yml +++ b/.github/workflows/check-crlf.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout repository contents - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Use action to check for CRLF endings uses: erclu/check-crlf@master diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index dba6df86..7a106ed9 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -9,7 +9,7 @@ jobs: if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')" steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Build run: docker run --rm -e WORK_DIR=$PWD -v $PWD:$PWD ubuntu:24.04 $PWD/.github/workflows/linux.sh From 4a2cfb42ba621adca4f95618f4883399fa70c0b9 Mon Sep 17 00:00:00 2001 From: Jeff McKenna Date: Sat, 13 Dec 2025 15:10:08 -0400 Subject: [PATCH 15/17] handle PostGIS 3.6 in demo --- demo/install.sh.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/demo/install.sh.in b/demo/install.sh.in index cd34c949..43a2d354 100755 --- a/demo/install.sh.in +++ b/demo/install.sh.in @@ -11,7 +11,9 @@ PGUSER=postgres SHP2PGSQL=@SHP2PGSQL@ DB=tinyows_demo -if [ -d /usr/local/pgsql/share/contrib/postgis-3.5 ]; then +if [ -d /usr/local/pgsql/share/contrib/postgis-3.6 ]; then + PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.6 +elif [ -d /usr/local/pgsql/share/contrib/postgis-3.5 ]; then PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.5 elif [ -d /usr/local/pgsql/share/contrib/postgis-3.4 ]; then PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.4 From bf8523aff6aec4cd768fa03c3828c8d97e7681ea Mon Sep 17 00:00:00 2001 From: Jeff McKenna Date: Tue, 6 Jan 2026 15:33:58 -0400 Subject: [PATCH 16/17] update license year --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 6d34f487..7fb92b43 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) <2007-2025> +Copyright (c) <2007-2026> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From a866276fc8ac23b8c6932bbea749e341eb7d9826 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jun 2026 04:52:52 +0000 Subject: [PATCH 17/17] Bump actions/checkout from 6 to 7 Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/check-crlf.yml | 2 +- .github/workflows/linux.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-crlf.yml b/.github/workflows/check-crlf.yml index 42f358a2..965f7cbe 100644 --- a/.github/workflows/check-crlf.yml +++ b/.github/workflows/check-crlf.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout repository contents - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Use action to check for CRLF endings uses: erclu/check-crlf@master diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 7a106ed9..e0784970 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -9,7 +9,7 @@ jobs: if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')" steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Build run: docker run --rm -e WORK_DIR=$PWD -v $PWD:$PWD ubuntu:24.04 $PWD/.github/workflows/linux.sh