[Git][debian-gis-team/tinyows][master] 6 commits: New upstream version 1.2.1
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Sat May 25 06:26:11 BST 2024
Bas Couwenberg pushed to branch master at Debian GIS Project / tinyows
Commits:
6509b7bb by Bas Couwenberg at 2024-05-25T07:14:44+02:00
New upstream version 1.2.1
- - - - -
a5aa0aa4 by Bas Couwenberg at 2024-05-25T07:14:53+02:00
Update upstream source from tag 'upstream/1.2.1'
Update to upstream version '1.2.1'
with Debian dir a7a2116099ab9033352500a2387cc1d841c17cba
- - - - -
5388848e by Bas Couwenberg at 2024-05-25T07:15:17+02:00
New upstream release.
- - - - -
d1212eeb by Bas Couwenberg at 2024-05-25T07:18:19+02:00
Drop patches, included/applied upstream.
- - - - -
5bc1c61c by Bas Couwenberg at 2024-05-25T07:22:11+02:00
Update NEWS filename.
- - - - -
bf975cc2 by Bas Couwenberg at 2024-05-25T07:22:11+02:00
Set distribution to unstable.
- - - - -
22 changed files:
- + .github/dependabot.yml
- .github/workflows/linux.yml
- LICENSE → LICENSE.md
- Makefile.in
- NEWS → NEWS.md
- − VERSION
- + VERSION.md
- debian/changelog
- debian/copyright
- − debian/patches/buffer_copy.patch
- − debian/patches/liborder.patch
- − debian/patches/series
- − debian/patches/stdbool.patch
- debian/rules
- demo/install.sh.in
- doc/Doxyfile
- src/fe/fe_logical_ops.c
- src/mapfile/mapfile.c
- src/mapfile/mapfile.l
- src/ows_define.h.in
- src/ows_struct.h
- src/wfs/wfs_get_feature.c
Changes:
=====================================
.github/dependabot.yml
=====================================
@@ -0,0 +1,8 @@
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+ - package-ecosystem: "github-actions" # See documentation for possible values
+ directory: "/" # Location of package manifests
+ schedule:
+ interval: "weekly"
=====================================
.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 at v2
+ uses: actions/checkout at v4
- name: Build
run: docker run --rm -e WORK_DIR=$PWD -v $PWD:$PWD ubuntu:20.04 $PWD/.github/workflows/linux.sh
=====================================
LICENSE → LICENSE.md
=====================================
@@ -1,4 +1,4 @@
-Copyright (c) <2007-2021> <Barbara Philippot - Olivier Courtin>
+Copyright (c) <2007-2024> <Barbara Philippot - Olivier Courtin>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
=====================================
Makefile.in
=====================================
@@ -25,7 +25,7 @@ GIT_FLAGS=@GIT_FLAGS@
SRC=src/fe/fe_comparison_ops.c src/fe/fe_error.c src/fe/fe_filter.c src/fe/fe_filter_capabilities.c src/fe/fe_function.c src/fe/fe_logical_ops.c src/fe/fe_spatial_ops.c src/mapfile/mapfile.c src/ows/ows_bbox.c src/ows/ows.c src/ows/ows_config.c src/ows/ows_error.c src/ows/ows_geobbox.c src/ows/ows_get_capabilities.c src/ows/ows_layer.c src/ows/ows_metadata.c src/ows/ows_psql.c src/ows/ows_request.c src/ows/ows_srs.c src/ows/ows_storage.c src/ows/ows_version.c src/struct/alist.c src/struct/array.c src/struct/buffer.c src/struct/cgi_request.c src/struct/list.c src/struct/mlist.c src/struct/regexp.c src/wfs/wfs_describe.c src/wfs/wfs_error.c src/wfs/wfs_get_capabilities.c src/wfs/wfs_get_feature.c src/wfs/wfs_request.c src/wfs/wfs_transaction.c src/ows/ows_libxml.c
all:
- $(CC) -o tinyows $(SRC) $(XMLFLAGS) $(CFLAGS) $(PGFLAGS) $(FCGIFLAGS) $(GIT_FLAGS) -lfl
+ $(CC) $(CFLAGS) $(POSTGIS_INC) $(XML2_INC) $(FCGI_INC) $(SVN_FLAGS) $(SRC) -o tinyows -lfl $(POSTGIS_LIB) $(XML2_LIB) $(FCGI_LIB)
@rm -rf tinyows.dSYM
flex:
=====================================
NEWS → NEWS.md
=====================================
@@ -1,3 +1,8 @@
+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)
+ - Handle check when using TINYOWS_MAPFILE ([#97](https://github.com/MapServer/tinyows/pull/97)) (Jeff McKenna)
+
1.2.0 (2021-06-11) *in memory of Olivier Courtin*
- Fix custom types conversion (Vincent Mora)
- Add support for geometry-less tables (Even Rouault)
=====================================
VERSION deleted
=====================================
@@ -1 +0,0 @@
-1.2.0
=====================================
VERSION.md
=====================================
@@ -0,0 +1 @@
+1.2.1
=====================================
debian/changelog
=====================================
@@ -1,12 +1,15 @@
-tinyows (1.2.0-3) UNRELEASED; urgency=medium
+tinyows (1.2.1-1) unstable; urgency=medium
+ * New upstream release.
* Bump Standards-Version to 4.6.2, no changes.
* Add Rules-Requires-Root to control file.
* Bump debhelper compat to 13.
* Remove generated files in clean target.
* Enable Salsa CI.
+ * Drop patches, included/applied upstream.
+ * Update NEWS filename.
- -- Bas Couwenberg <sebastic at debian.org> Tue, 21 Jun 2022 07:23:49 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 25 May 2024 07:18:21 +0200
tinyows (1.2.0-2) unstable; urgency=medium
=====================================
debian/copyright
=====================================
@@ -6,7 +6,7 @@ Disclaimer: The package is in non-free because it contains OGC schemas which
limit modification via the terms of the Document Notice.
Files: *
-Copyright: 2007-2021, Barbara Philippot - Olivier Courtin
+Copyright: 2007-2024, Barbara Philippot - Olivier Courtin
License: MIT/X11
Files: schema/ows/1.0.0/*
=====================================
debian/patches/buffer_copy.patch deleted
=====================================
@@ -1,39 +0,0 @@
-Description: Fix for buffer_copy when loading config from mapfile.
-Author: Pirmin Kalberer <pi_deb at sourcepole.ch>
-Origin: https://github.com/mapserver/tinyows/issues/58#issue-11806824
-Bug: https://github.com/mapserver/tinyows/issues/58
-
---- a/src/mapfile/mapfile.l
-+++ b/src/mapfile/mapfile.l
-@@ -539,12 +539,14 @@ static void end_layer()
- buffer_add_str(map_l->storage->schema, "public");
- if (!map_is_dump) map_l->retrievable=map_l->writable = false;
-
-+ map_l->name_prefix = buffer_init();
- buffer_copy(map_l->name_prefix, map_l->name);
- if (map_l->ns_prefix->use) {
- buffer_add_head(map_l->name_prefix, ':');
- buffer_add_head_str(map_l->name_prefix, map_l->ns_prefix->buf);
- }
-
-+ map_l->name_no_uri = buffer_init();
- buffer_copy(map_l->name_no_uri, map_l->name);
- if (map_l->ns_uri->use) {
- buffer_add_head(map_l->name, ':');
---- a/src/mapfile/mapfile.c
-+++ b/src/mapfile/mapfile.c
-@@ -1588,12 +1588,14 @@ static void end_layer()
- buffer_add_str(map_l->storage->schema, "public");
- if (!map_is_dump) map_l->retrievable=map_l->writable = false;
-
-+ map_l->name_prefix = buffer_init();
- buffer_copy(map_l->name_prefix, map_l->name);
- if (map_l->ns_prefix->use) {
- buffer_add_head(map_l->name_prefix, ':');
- buffer_add_head_str(map_l->name_prefix, map_l->ns_prefix->buf);
- }
-
-+ map_l->name_no_uri = buffer_init();
- buffer_copy(map_l->name_no_uri, map_l->name);
- if (map_l->ns_uri->use) {
- buffer_add_head(map_l->name, ':');
=====================================
debian/patches/liborder.patch deleted
=====================================
@@ -1,15 +0,0 @@
-Description: Fix compiler flag order.
-Author: Pirmin Kalberer <pi_deb at sourcepole.ch>
-Forwarded: https://lists.osgeo.org/pipermail/mapserver-dev/2021-June/016499.html
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -25,7 +25,7 @@ GIT_FLAGS=@GIT_FLAGS@
- SRC=src/fe/fe_comparison_ops.c src/fe/fe_error.c src/fe/fe_filter.c src/fe/fe_filter_capabilities.c src/fe/fe_function.c src/fe/fe_logical_ops.c src/fe/fe_spatial_ops.c src/mapfile/mapfile.c src/ows/ows_bbox.c src/ows/ows.c src/ows/ows_config.c src/ows/ows_error.c src/ows/ows_geobbox.c src/ows/ows_get_capabilities.c src/ows/ows_layer.c src/ows/ows_metadata.c src/ows/ows_psql.c src/ows/ows_request.c src/ows/ows_srs.c src/ows/ows_storage.c src/ows/ows_version.c src/struct/alist.c src/struct/array.c src/struct/buffer.c src/struct/cgi_request.c src/struct/list.c src/struct/mlist.c src/struct/regexp.c src/wfs/wfs_describe.c src/wfs/wfs_error.c src/wfs/wfs_get_capabilities.c src/wfs/wfs_get_feature.c src/wfs/wfs_request.c src/wfs/wfs_transaction.c src/ows/ows_libxml.c
-
- all:
-- $(CC) -o tinyows $(SRC) $(XMLFLAGS) $(CFLAGS) $(PGFLAGS) $(FCGIFLAGS) $(GIT_FLAGS) -lfl
-+ $(CC) $(CFLAGS) $(POSTGIS_INC) $(XML2_INC) $(FCGI_INC) $(SVN_FLAGS) $(SRC) -o tinyows -lfl $(POSTGIS_LIB) $(XML2_LIB) $(FCGI_LIB)
- @rm -rf tinyows.dSYM
-
- flex:
=====================================
debian/patches/series deleted
=====================================
@@ -1,3 +0,0 @@
-buffer_copy.patch
-liborder.patch
-stdbool.patch
=====================================
debian/patches/stdbool.patch deleted
=====================================
@@ -1,57 +0,0 @@
-Description: Use stdbool.h instead of custom definitions.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug-Debian: https://bugs.debian.org/1012231
-Bug: https://github.com/MapServer/tinyows/issues/98
-Forwarded: https://github.com/MapServer/tinyows/pull/99
-Applied-Upstream: https://github.com/MapServer/tinyows/commit/c300090e3726597b0475e058cd94e65e81864a26
-
---- a/src/ows_struct.h
-+++ b/src/ows_struct.h
-@@ -24,18 +24,12 @@
- #ifndef OWS_STRUCT_H
- #define OWS_STRUCT_H
-
-+#include <stdbool.h>
- #include <stdio.h> /* FILE prototype */
-
-
- /* ========= Structures ========= */
-
--enum Bool {
-- false,
-- true
--};
--
--typedef enum Bool bool;
--
- #define BUFFER_SIZE_INIT 256
-
- typedef struct Buffer {
---- a/src/fe/fe_logical_ops.c
-+++ b/src/fe/fe_logical_ops.c
-@@ -21,6 +21,7 @@
- */
-
-
-+#include <stdbool.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -101,7 +102,7 @@ static buffer *fe_unary_logical_op(ows *
- assert(n);
-
- buffer_add_str(fe->sql, "not(");
-- fe->in_not++;
-+ fe->in_not = true;
-
- n = n->children;
- while (n->type != XML_ELEMENT_NODE) n = n->next;
-@@ -112,7 +113,7 @@ static buffer *fe_unary_logical_op(ows *
- else if (fe_is_comparison_op((char *) n->name)) fe->sql = fe_comparison_op(o, typename, fe, n);
-
- buffer_add_str(fe->sql, ")");
-- fe->in_not--;
-+ fe->in_not = false;
-
- return fe->sql;
- }
=====================================
debian/rules
=====================================
@@ -36,4 +36,4 @@ override_dh_auto_install:
rm -f $(CURDIR)/debian/tinyows/usr/share/tinyows/schema/LICENSE
override_dh_installchangelogs:
- dh_installchangelogs NEWS
+ dh_installchangelogs NEWS.md
=====================================
demo/install.sh.in
=====================================
@@ -11,7 +11,15 @@ PGUSER=postgres
SHP2PGSQL=@SHP2PGSQL@
DB=tinyows_demo
-if [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then
+if [ -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
+ 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.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
=====================================
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.0
+PROJECT_NUMBER = 1.2.1
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
=====================================
src/fe/fe_logical_ops.c
=====================================
@@ -21,6 +21,7 @@
*/
+#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -101,7 +102,7 @@ static buffer *fe_unary_logical_op(ows * o, buffer * typename, filter_encoding *
assert(n);
buffer_add_str(fe->sql, "not(");
- fe->in_not++;
+ fe->in_not = true;
n = n->children;
while (n->type != XML_ELEMENT_NODE) n = n->next;
@@ -112,7 +113,7 @@ static buffer *fe_unary_logical_op(ows * o, buffer * typename, filter_encoding *
else if (fe_is_comparison_op((char *) n->name)) fe->sql = fe_comparison_op(o, typename, fe, n);
buffer_add_str(fe->sql, ")");
- fe->in_not--;
+ fe->in_not = false;
return fe->sql;
}
=====================================
src/mapfile/mapfile.c
=====================================
@@ -1588,12 +1588,14 @@ static void end_layer()
buffer_add_str(map_l->storage->schema, "public");
if (!map_is_dump) map_l->retrievable=map_l->writable = false;
+ map_l->name_prefix = buffer_init();
buffer_copy(map_l->name_prefix, map_l->name);
if (map_l->ns_prefix->use) {
buffer_add_head(map_l->name_prefix, ':');
buffer_add_head_str(map_l->name_prefix, map_l->ns_prefix->buf);
}
+ map_l->name_no_uri = buffer_init();
buffer_copy(map_l->name_no_uri, map_l->name);
if (map_l->ns_uri->use) {
buffer_add_head(map_l->name, ':');
=====================================
src/mapfile/mapfile.l
=====================================
@@ -538,13 +538,15 @@ static void end_layer()
if (!map_l->storage->schema->use)
buffer_add_str(map_l->storage->schema, "public");
if (!map_is_dump) map_l->retrievable=map_l->writable = false;
-
+
+ map_l->name_prefix = buffer_init();
buffer_copy(map_l->name_prefix, map_l->name);
if (map_l->ns_prefix->use) {
buffer_add_head(map_l->name_prefix, ':');
buffer_add_head_str(map_l->name_prefix, map_l->ns_prefix->buf);
}
+ map_l->name_no_uri = buffer_init();
buffer_copy(map_l->name_no_uri, map_l->name);
if (map_l->ns_uri->use) {
buffer_add_head(map_l->name, ':');
=====================================
src/ows_define.h.in
=====================================
@@ -28,7 +28,7 @@
#define OWS_DEBUG
#endif
-#define TINYOWS_VERSION "1.2.0"
+#define TINYOWS_VERSION "1.2.1"
#define TINYOWS_FCGI @USE_FCGI@
#define OWS_CONFIG_FILE_PATH "/etc/tinyows.xml"
=====================================
src/ows_struct.h
=====================================
@@ -24,18 +24,12 @@
#ifndef OWS_STRUCT_H
#define OWS_STRUCT_H
+#include <stdbool.h>
#include <stdio.h> /* FILE prototype */
/* ========= Structures ========= */
-enum Bool {
- false,
- true
-};
-
-typedef enum Bool bool;
-
#define BUFFER_SIZE_INIT 256
typedef struct Buffer {
=====================================
src/wfs/wfs_get_feature.c
=====================================
@@ -545,13 +545,9 @@ static buffer *wfs_retrieve_sql_request_select(ows * o, wfs_request * wr, buffer
}
/* Columns are written in quotation marks */
else {
- if (wr->format == WFS_GEOJSON)
- buffer_add_str(select, "to_json(");
buffer_add_str(select, "\"");
buffer_copy(select, an->key);
buffer_add_str(select, "\"");
- if (wr->format == WFS_GEOJSON)
- buffer_add_str(select, ")");
}
if (an->next) buffer_add_str(select, ",");
@@ -857,10 +853,11 @@ static void wfs_geojson_display_results(ows * o, wfs_request * wr, mlist * reque
else buffer_add_str(prop, ", \"");
buffer_copy(prop, an->key);
- buffer_add_str(prop, "\": ");
+ buffer_add_str(prop, "\": \"");
value_enc = buffer_encode_json_str(PQgetvalue(res, i, j));
buffer_copy(prop, value_enc);
buffer_free(value_enc);
+ buffer_add(prop, '"');
}
}
View it on GitLab: https://salsa.debian.org/debian-gis-team/tinyows/-/compare/8892460ad8fadb51941778e1fa23d3fb7a126358...bf975cc256984ee6cad14ea0967c5a977755d66c
--
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/debian-gis-team/tinyows/-/compare/8892460ad8fadb51941778e1fa23d3fb7a126358...bf975cc256984ee6cad14ea0967c5a977755d66c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20240525/5455986e/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list