Skip to content

Commit 08a867c

Browse files
author
mapolovina
committed
Merge remote-tracking branch 'upstream/main'
2 parents 46355ba + 5fc4848 commit 08a867c

20 files changed

Lines changed: 126 additions & 56 deletions

‎.github/dependabot.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
2+
3+
version: 2
4+
updates:
5+
- package-ecosystem: "github-actions" # See documentation for possible values
6+
directory: "/" # Location of package manifests
7+
schedule:
8+
interval: "weekly"

‎.github/workflows/check-crlf.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# check for Windows CRLF in files
2+
# homepage: https://github.com/marketplace/actions/check-crlf
3+
4+
name: Check CRLF
5+
6+
on: [push, pull_request]
7+
8+
jobs:
9+
Check-CRLF:
10+
name: verify that only LF linefeeds are used
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- name: Checkout repository contents
15+
uses: actions/checkout@v4
16+
17+
- name: Use action to check for CRLF endings
18+
uses: erclu/check-crlf@v1.2.0
19+
with: # ignore directories containing *.csv & data
20+
exclude: /demo/ /ms4w/ /test/ Makefile.vc

‎.github/workflows/linux.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ apt-get update
77
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
88
gcc libxml2-dev libpq-dev libfcgi-dev \
99
autoconf make flex libfl-dev \
10-
postgresql-12 postgresql-client postgis postgresql-12-postgis-3 postgresql-12-postgis-3-scripts \
10+
postgresql-16 postgresql-client postgis postgresql-16-postgis-3 postgresql-16-postgis-3-scripts \
1111
wget ca-certificates patch valgrind
1212

1313
cd "${WORK_DIR}"
@@ -16,9 +16,9 @@ CFLAGS="-Werror" ./configure
1616
make
1717
make install
1818

19-
cp /etc/postgresql/12/main/pg_hba.conf /etc/postgresql/12/main/pg_hba.conf.bak
20-
echo "local all postgres trust" | cat - /etc/postgresql/12/main/pg_hba.conf.bak > /etc/postgresql/12/main/pg_hba.conf
21-
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
19+
cp /etc/postgresql/16/main/pg_hba.conf /etc/postgresql/16/main/pg_hba.conf.bak
20+
echo "local all postgres trust" | cat - /etc/postgresql/16/main/pg_hba.conf.bak > /etc/postgresql/16/main/pg_hba.conf
21+
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
2222
/etc/init.d/postgresql start
2323

2424
rm -f /etc/tinyows.xml

‎.github/workflows/linux.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
1010
steps:
1111
- name: Checkout
12-
uses: actions/checkout@v2
12+
uses: actions/checkout@v4
1313

1414
- name: Build
15-
run: docker run --rm -e WORK_DIR=$PWD -v $PWD:$PWD ubuntu:20.04 $PWD/.github/workflows/linux.sh
15+
run: docker run --rm -e WORK_DIR=$PWD -v $PWD:$PWD ubuntu:24.04 $PWD/.github/workflows/linux.sh

LICENSE renamed to LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) <2007-2021> <Barbara Philippot - Olivier Courtin>
1+
Copyright (c) <2007-2025> <Barbara Philippot - Olivier Courtin>
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

NEWS renamed to NEWS.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
1.2.2 (2024-07-31) *in memory of Olivier Courtin*
2+
- Include stdlib.h for atoi ([#105](https://github.com/MapServer/tinyows/pull/105)) (Bas Couwenberg)
3+
4+
1.2.1 (2024-05-17) *in memory of Olivier Courtin*
5+
- Fix JSON encoding ([#100](https://github.com/MapServer/tinyows/pull/100)) (Kévin Dubuc)
6+
- Use stdbool.h instead of custom definitions ([#99](https://github.com/MapServer/tinyows/pull/99)) (Bas Couwenberg)
7+
- Handle check when using TINYOWS_MAPFILE ([#97](https://github.com/MapServer/tinyows/pull/97)) (Jeff McKenna)
8+
19
1.2.0 (2021-06-11) *in memory of Olivier Courtin*
210
- Fix custom types conversion (Vincent Mora)
311
- Add support for geometry-less tables (Even Rouault)

‎README.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# TinyOWS
22

3+
[![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)
4+
[![Release](https://img.shields.io/github/v/release/MapServer/tinyows)](https://github.com/MapServer/tinyows/releases)
5+
36
TinyOWS is a simple WFS-T server based on PostGIS spatial database.
47

58
## Documentation Home
@@ -25,7 +28,7 @@ All code must meet the following rules :
2528

2629
Code dynamically linked with the following other librairies:
2730
- PostgreSQL
28-
- libxml 2.9.x
31+
- libxml2
2932
- flex
3033

3134
## Credits

‎VERSION‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎VERSION.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.2.2

‎demo/install.sh.in‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,44 @@ PGUSER=postgres
1111
SHP2PGSQL=@SHP2PGSQL@
1212
DB=tinyows_demo
1313

14-
if [ -d /usr/local/pgsql/share/contrib/postgis-3.1 ]; then
14+
if [ -d /usr/local/pgsql/share/contrib/postgis-3.5 ]; then
15+
PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.5
16+
elif [ -d /usr/local/pgsql/share/contrib/postgis-3.4 ]; then
17+
PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.4
18+
elif [ -d /usr/local/pgsql/share/contrib/postgis-3.3 ]; then
19+
PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.3
20+
elif [ -d /usr/local/pgsql/share/contrib/postgis-3.2 ]; then
21+
PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.2
22+
elif [ -d /usr/local/pgsql/share/contrib/postgis-3.1 ]; then
1523
PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.1
24+
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.5 ]; then
25+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.5
26+
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.4 ]; then
27+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.4
28+
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.3 ]; then
29+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.3
30+
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.2 ]; then
31+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.2
32+
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.1 ]; then
33+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.1
1634
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then
17-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0
35+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0
1836
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.5 ]; then
19-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5
37+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5
2038
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.4 ]; then
21-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4
39+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4
2240
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.3 ]; then
23-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3
41+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3
2442
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.2 ]; then
25-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.2
43+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.2
2644
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.1 ]; then
27-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1
45+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1
2846
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.0 ]; then
29-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
47+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
3048
elif [ -d @POSTGIS_SHARE@/contrib/postgis-1.5 ]; then
31-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5
49+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5
3250
else
33-
echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1
51+
echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1
3452
fi
3553

3654
echo "Create Spatial Database: $DB"

0 commit comments

Comments
 (0)