[tinyows] 04/06: Add patches from upstream git repository.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Mon Apr 27 11:35:40 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository tinyows.
commit fca118d626ec23a1072e48ff2cd14d2de0e84c61
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Apr 27 12:58:35 2015 +0200
Add patches from upstream git repository.
---
debian/changelog | 1 +
...quence-attribute-in-addition-to-pkey-to-l.patch | 83 ++++++++++++++++++++++
...-for-postgis-version-2.1-in-demo-installe.patch | 23 ++++++
debian/patches/0001-Fix-76.patch | 23 ++++++
...Fix-feature-ids-in-JSON-GetFeature-output.patch | 23 ++++++
...ct-inversion-of-axis-order-for-projected-.patch | 33 +++++++++
debian/patches/0001-Fix-wrong-comment.patch | 30 ++++++++
...orce-to-be-upper-case-in-service-response.patch | 27 +++++++
...ey-and-pkey_sequence-attrs-in-layer_flush.patch | 30 ++++++++
.../0001-Unable-to-deal-with-NS-prefix.patch | 32 +++++++++
...ess-and-errorfull-ASCII-char-for-XML-outp.patch | 22 ++++++
debian/patches/0001-fix-68.patch | 22 ++++++
.../0001-fix-forgottent-copy-on-id_column.patch | 21 ++++++
...fix-wrong-ows-ServiceTypeVersion-sequence.patch | 29 ++++++++
debian/patches/series | 13 ++++
15 files changed, 412 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 1b81ef6..21b6a4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ tinyows (1.1.0-6) UNRELEASED; urgency=medium
* Update my email to @debian.org address.
* Update Vcs-Browser URL to use cgit instead of gitweb.
* Bump Standards-Version to 3.9.6, no changes.
+ * Add patches from upstream git repository.
-- Bas Couwenberg <sebastic at debian.org> Fri, 28 Nov 2014 21:11:36 +0100
diff --git a/debian/patches/0001-Add-pkey_sequence-attribute-in-addition-to-pkey-to-l.patch b/debian/patches/0001-Add-pkey_sequence-attribute-in-addition-to-pkey-to-l.patch
new file mode 100644
index 0000000..e390e84
--- /dev/null
+++ b/debian/patches/0001-Add-pkey_sequence-attribute-in-addition-to-pkey-to-l.patch
@@ -0,0 +1,83 @@
+From c23f99093304c92a261fca266eb0457c6100a779 Mon Sep 17 00:00:00 2001
+From: Timur Sufiev <t.sufiev at acti.ru>
+Date: Mon, 19 Nov 2012 16:12:48 +0400
+Subject: Add "pkey_sequence" attribute (in addition to "pkey") to layer
+ config.
+Origin: https://github.com/mapserver/tinyows/commit/c23f99093304c92a261fca266eb0457c6100a779
+
+In order to insert new feature into layer based on PostgreSQL view,
+"pkey" attribute is not enough: one should be able to deduce sequence
+name using pg_get_serial_sequence() function, which returns empty row
+for views. Fix this by adding "pkey_sequence" attribute.
+---
+ src/ows/ows_config.c | 10 ++++++++++
+ src/ows/ows_layer.c | 2 ++
+ src/ows/ows_storage.c | 8 ++++++--
+ src/ows_struct.h | 1 +
+ 4 files changed, 19 insertions(+), 2 deletions(-)
+
+--- a/src/ows/ows_config.c
++++ b/src/ows/ows_config.c
+@@ -567,6 +567,16 @@ static void ows_parse_config_layer(ows *
+ buffer_copy(layer->pkey, layer->parent->pkey);
+ }
+
++ a = xmlTextReaderGetAttribute(r, (xmlChar *) "pkey_sequence");
++ if (a) {
++ layer->pkey_sequence = buffer_init();
++ buffer_add_str(layer->pkey_sequence, (char *) a);
++ xmlFree(a);
++ } else if (layer->parent && layer->parent->pkey_sequence) {
++ layer->pkey_sequence = buffer_init();
++ buffer_copy(layer->pkey_sequence, layer->parent->pkey_sequence);
++ }
++
+ if (layer->name && layer->ns_uri) {
+ buffer_add_head(layer->name, ':');
+ buffer_add_head_str(layer->name, layer->ns_uri->buf);
+--- a/src/ows/ows_layer.c
++++ b/src/ows/ows_layer.c
+@@ -534,6 +534,7 @@ ows_layer *ows_layer_init()
+ l->exclude_items = NULL;
+ l->include_items = NULL;
+ l->pkey = NULL;
++ l->pkey_sequence = NULL;
+ l->ns_prefix = buffer_init();
+ l->ns_uri = buffer_init();
+ l->storage = ows_layer_storage_init();
+@@ -564,6 +565,7 @@ void ows_layer_free(ows_layer * l)
+ if (l->exclude_items) list_free(l->exclude_items);
+ if (l->include_items) list_free(l->include_items);
+ if (l->pkey) buffer_free(l->pkey);
++ if (l->pkey_sequence) buffer_free(l->pkey_sequence);
+
+ free(l);
+ l = NULL;
+--- a/src/ows/ows_storage.c
++++ b/src/ows/ows_storage.c
+@@ -268,9 +268,13 @@ static void ows_storage_fill_pkey(ows *
+ /* Even if no sequence found, this function return an empty row
+ * so we must check that result string returned > 0 char
+ */
+- if (PQntuples(res) == 1 && strlen((char *) PQgetvalue(res, 0, 0)) > 0) {
++ if ( l->pkey_sequence ||
++ (PQntuples(res) == 1 && strlen((char *) PQgetvalue(res, 0, 0)) > 0) ) {
+ l->storage->pkey_sequence = buffer_init();
+- buffer_add_str(l->storage->pkey_sequence, PQgetvalue(res, 0, 0));
++ if ( l->pkey_sequence )
++ buffer_copy(l->storage->pkey_sequence, l->pkey_sequence);
++ else
++ buffer_add_str(l->storage->pkey_sequence, PQgetvalue(res, 0, 0));
+ }
+
+ buffer_empty(sql);
+--- a/src/ows_struct.h
++++ b/src/ows_struct.h
+@@ -179,6 +179,7 @@ typedef struct Ows_layer {
+ list * exclude_items;
+ list * include_items;
+ buffer * pkey;
++ buffer * pkey_sequence;
+ list * gml_ns;
+ buffer * ns_prefix;
+ buffer * ns_uri;
diff --git a/debian/patches/0001-Add-support-for-postgis-version-2.1-in-demo-installe.patch b/debian/patches/0001-Add-support-for-postgis-version-2.1-in-demo-installe.patch
new file mode 100644
index 0000000..b901742
--- /dev/null
+++ b/debian/patches/0001-Add-support-for-postgis-version-2.1-in-demo-installe.patch
@@ -0,0 +1,23 @@
+From 8dda8ee852bd3da5d2b8830a655b653630ba571d Mon Sep 17 00:00:00 2001
+From: Bas Couwenberg <sebastic at xs4all.nl>
+Date: Sun, 7 Sep 2014 16:57:22 +0200
+Subject: Add support for postgis version 2.1 in demo installer.
+Origin: https://github.com/mapserver/tinyows/commit/8dda8ee852bd3da5d2b8830a655b653630ba571d
+
+---
+ demo/install.sh.in | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/demo/install.sh.in
++++ b/demo/install.sh.in
+@@ -9,7 +9,9 @@ PGUSER=postgres
+ SHP2PGSQL=@SHP2PGSQL@
+ DB=tinyows_demo
+
+-if [ -d @POSTGIS_SHARE@/contrib/postgis-2.0 ]; then
++if [ -d @POSTGIS_SHARE@/contrib/postgis-2.1 ]; then
++ PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1
++elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.0 ]; then
+ PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
+ elif [ -d @POSTGIS_SHARE@/contrib/postgis-1.5 ]; then
+ PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5
diff --git a/debian/patches/0001-Fix-76.patch b/debian/patches/0001-Fix-76.patch
new file mode 100644
index 0000000..586b7a6
--- /dev/null
+++ b/debian/patches/0001-Fix-76.patch
@@ -0,0 +1,23 @@
+From f593a4355fb627e1b86bb46fac30c104badbac28 Mon Sep 17 00:00:00 2001
+From: Olivier Courtin <olivier.courtin at oslandia.com>
+Date: Thu, 9 Apr 2015 23:41:11 +0200
+Subject: Fix #76
+Origin: https://github.com/mapserver/tinyows/commit/f593a4355fb627e1b86bb46fac30c104badbac28
+Bug: https://github.com/mapserver/tinyows/issues/76
+
+---
+ src/wfs/wfs_get_feature.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/src/wfs/wfs_get_feature.c
++++ b/src/wfs/wfs_get_feature.c
+@@ -806,7 +806,8 @@ static void wfs_geojson_display_results(
+
+ prop_table = ows_psql_describe_table(o, ll->value);
+ first_row = true;
+- buffer_copy(id_name, ows_psql_id_column(o, ll->value));
++ if(ows_psql_id_column(o, ll->value)) /* CAUTION: pkey could be NULL ! */
++ buffer_copy(id_name, ows_psql_id_column(o, ll->value));
+ number = -1;
+ if (id_name && id_name->use)
+ number = PQfnumber(res, id_name->buf);
diff --git a/debian/patches/0001-Fix-feature-ids-in-JSON-GetFeature-output.patch b/debian/patches/0001-Fix-feature-ids-in-JSON-GetFeature-output.patch
new file mode 100644
index 0000000..e45420b
--- /dev/null
+++ b/debian/patches/0001-Fix-feature-ids-in-JSON-GetFeature-output.patch
@@ -0,0 +1,23 @@
+From 14d75ad64a5988007fc4d747aba06ad15833a9ec Mon Sep 17 00:00:00 2001
+From: Timur Sufiev <t.sufiev at acti.ru>
+Date: Tue, 20 Nov 2012 16:04:42 +0400
+Subject: Fix feature ids in JSON GetFeature output.
+Origin: https://github.com/mapserver/tinyows/commit/14d75ad64a5988007fc4d747aba06ad15833a9ec
+
+Produce '<layer_name>.<object_integer_id>' as feature ids
+instead of '<namespace-uri>:<layer_name>.<object_integer_id>'.
+---
+ src/wfs/wfs_get_feature.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/wfs/wfs_get_feature.c
++++ b/src/wfs/wfs_get_feature.c
+@@ -822,7 +822,7 @@ static void wfs_geojson_display_results(
+
+ if ( number >= 0 ) {
+ buffer_add_str(id_name, "\"id\": \"");
+- buffer_copy(id_name, ll->value);
++ buffer_copy(id_name, ows_layer_no_uri(o->layers, ll->value));
+ buffer_add_str(id_name, ".");
+ buffer_add_str(id_name, PQgetvalue(res, i, number));
+ buffer_add_str(id_name, "\", ");
diff --git a/debian/patches/0001-Fix-incorrect-inversion-of-axis-order-for-projected-.patch b/debian/patches/0001-Fix-incorrect-inversion-of-axis-order-for-projected-.patch
new file mode 100644
index 0000000..34c85f2
--- /dev/null
+++ b/debian/patches/0001-Fix-incorrect-inversion-of-axis-order-for-projected-.patch
@@ -0,0 +1,33 @@
+From eb56faef4c7de10afd4f202ddd528642b7e82721 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault at mines-paris.org>
+Date: Sat, 28 Jun 2014 23:11:51 +0200
+Subject: Fix incorrect inversion of axis order for projected SRS
+Origin: https://github.com/mapserver/tinyows/commit/eb56faef4c7de10afd4f202ddd528642b7e82721
+
+This fixes https://github.com/rouault/tinyows/commit/0bf86230a4f9485231bf3a7fedb038b57b8714a7
+
+Projected SRS with easting-northing order always end up with AXIS["something",NORTH]]
+---
+ src/ows/ows_srs.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/src/ows/ows_srs.c
++++ b/src/ows/ows_srs.c
+@@ -134,7 +134,7 @@ bool ows_srs_set(ows * o, ows_srs * c, c
+
+ sql = buffer_init();
+ buffer_add_str(sql, "SELECT srid, position('+units=m ' in proj4text)");
+- buffer_add_str(sql, ", (position('AXIS[\"X\",NORTH]]' in srtext) + position('AXIS[\"Easting\",EAST]]' in srtext))");
++ buffer_add_str(sql, ", (position('AXIS[\"X\",NORTH]]' in srtext) + position('AXIS[\"Northing\",NORTH]]' in srtext))");
+ buffer_add_str(sql, " FROM spatial_ref_sys WHERE auth_name='");
+ buffer_copy(sql, auth_name);
+ buffer_add_str(sql, "' AND auth_srid=");
+@@ -216,7 +216,7 @@ bool ows_srs_set_from_srid(ows * o, ows_
+ sql = buffer_init();
+ buffer_add_str(sql, "SELECT auth_name, auth_srid, ");
+ buffer_add_str(sql, "position('+units=m ' in proj4text), ");
+- buffer_add_str(sql, "(position('AXIS[\"X\",NORTH]]' in srtext) + position('AXIS[\"Easting\",EAST]]' in srtext)) ");
++ buffer_add_str(sql, "(position('AXIS[\"X\",NORTH]]' in srtext) + position('AXIS[\"Northing\",NORTH]]' in srtext)) ");
+ buffer_add_str(sql, "FROM spatial_ref_sys WHERE srid = '");
+ buffer_add_int(sql, srid);
+ buffer_add_str(sql, "'");
diff --git a/debian/patches/0001-Fix-wrong-comment.patch b/debian/patches/0001-Fix-wrong-comment.patch
new file mode 100644
index 0000000..795f348
--- /dev/null
+++ b/debian/patches/0001-Fix-wrong-comment.patch
@@ -0,0 +1,30 @@
+From ce068ffb644348b83b9e64f5b9b9e851efab6451 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault at mines-paris.org>
+Date: Sat, 28 Jun 2014 23:20:40 +0200
+Subject: Fix wrong comment
+Origin: https://github.com/mapserver/tinyows/commit/ce068ffb644348b83b9e64f5b9b9e851efab6451
+
+---
+ src/ows/ows_srs.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/src/ows/ows_srs.c
++++ b/src/ows/ows_srs.c
+@@ -161,7 +161,7 @@ bool ows_srs_set(ows * o, ows_srs * c, c
+ else
+ c->is_degree = false;
+
+- /* Is northing-easting SRID ? */
++ /* Is easting-northing SRID ? */
+ if (atoi(PQgetvalue(res, 0, 2)) != 0)
+ c->is_eastern_axis = true;
+
+@@ -240,7 +240,7 @@ bool ows_srs_set_from_srid(ows * o, ows_
+ else
+ s->is_degree = false;
+
+- /* Is northing-easting SRID ? */
++ /* Is easting-northing SRID ? */
+ if (atoi(PQgetvalue(res, 0, 3)) != 0)
+ s->is_eastern_axis = true;
+
diff --git a/debian/patches/0001-Force-to-be-upper-case-in-service-response.patch b/debian/patches/0001-Force-to-be-upper-case-in-service-response.patch
new file mode 100644
index 0000000..c40ac99
--- /dev/null
+++ b/debian/patches/0001-Force-to-be-upper-case-in-service-response.patch
@@ -0,0 +1,27 @@
+From 52e3662c198e94cac6a7ab1319a48cedde769c91 Mon Sep 17 00:00:00 2001
+From: root <root at NEW-PERRINE-001.(none)>
+Date: Mon, 29 Sep 2014 20:02:01 +0200
+Subject: Force to be upper case in service response
+Origin: https://github.com/mapserver/tinyows/commit/52e3662c198e94cac6a7ab1319a48cedde769c91
+
+---
+ src/ows/ows_metadata.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/src/ows/ows_metadata.c
++++ b/src/ows/ows_metadata.c
+@@ -158,10 +158,14 @@ void ows_metadata_fill(ows * o, array *
+ /* Initialize supported versions from service type */
+ if (o->metadata->type) {
+ if (buffer_case_cmp(o->metadata->type, "WFS")) {
++ buffer_free(o->metadata->type);
++ o->metadata->type = buffer_from_str("WFS");
+ o->metadata->versions = list_init();
+ list_add_str(o->metadata->versions, "1.0.0");
+ list_add_str(o->metadata->versions, "1.1.0");
+ } else if (buffer_case_cmp(o->metadata->type, "WMS")) {
++ buffer_free(o->metadata->type);
++ o->metadata->type = buffer_from_str("WMS");
+ o->metadata->versions = list_init();
+ list_add_str(o->metadata->versions, "1.1.0");
+ list_add_str(o->metadata->versions, "1.3.0");
diff --git a/debian/patches/0001-Support-pkey-and-pkey_sequence-attrs-in-layer_flush.patch b/debian/patches/0001-Support-pkey-and-pkey_sequence-attrs-in-layer_flush.patch
new file mode 100644
index 0000000..17f7923
--- /dev/null
+++ b/debian/patches/0001-Support-pkey-and-pkey_sequence-attrs-in-layer_flush.patch
@@ -0,0 +1,30 @@
+From dc1a8198860a8f1bc7afbed71c967dc36cfa5d00 Mon Sep 17 00:00:00 2001
+From: Timur Sufiev <t.sufiev at acti.ru>
+Date: Tue, 20 Nov 2012 17:02:18 +0400
+Subject: Support pkey and pkey_sequence attrs in layer_flush.
+Origin: https://github.com/mapserver/tinyows/commit/dc1a8198860a8f1bc7afbed71c967dc36cfa5d00
+
+---
+ src/ows/ows_layer.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+--- a/src/ows/ows_layer.c
++++ b/src/ows/ows_layer.c
+@@ -669,5 +669,17 @@ void ows_layer_flush(ows_layer * l, FILE
+ list_flush(l->include_items, output);
+ fprintf(output, "\n");
+ }
++
++ if(l->pkey) {
++ fprintf(output, "pkey: ");
++ list_flush(l->pkey, output);
++ fprintf(output, "\n");
++ }
++
++ if(l->pkey_sequence) {
++ fprintf(output, "pkey_sequence: ");
++ list_flush(l->pkey_sequence, output);
++ fprintf(output, "\n");
++ }
+ }
+ #endif
diff --git a/debian/patches/0001-Unable-to-deal-with-NS-prefix.patch b/debian/patches/0001-Unable-to-deal-with-NS-prefix.patch
new file mode 100644
index 0000000..0f9956a
--- /dev/null
+++ b/debian/patches/0001-Unable-to-deal-with-NS-prefix.patch
@@ -0,0 +1,32 @@
+From 11ab43ea3cd9323241ce0044a3833c55d303de93 Mon Sep 17 00:00:00 2001
+From: Olivier Courtin <olivier.courtin at oslandia.com>
+Date: Mon, 1 Sep 2014 14:36:58 +0200
+Subject: Unable to deal with NS prefix
+Origin: https://github.com/mapserver/tinyows/commit/11ab43ea3cd9323241ce0044a3833c55d303de93
+
+---
+ src/wfs/wfs_request.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/src/wfs/wfs_request.c
++++ b/src/wfs/wfs_request.c
+@@ -253,7 +253,7 @@ static list *wfs_request_check_typename(
+ */
+ static list *wfs_request_check_fid(ows * o, wfs_request * wr, list * layer_name)
+ {
+- list *fe;
++ list *fe, *ff;
+ mlist *f;
+ buffer *b, *layer;
+ list_node *ln, *ln_tpn;
+@@ -302,7 +302,9 @@ static list *wfs_request_check_fid(ows *
+ return NULL;
+ }
+
+- layer = ows_layer_no_uri_to_uri(o->layers, fe->last->value);
++ ff = list_split(':', fe->last->value, false);
++ layer = ows_layer_no_uri_to_uri(o->layers, ff->last->value);
++ list_free(ff);
+
+ /* If typename is NULL, fill the layer name list */
+ if (!wr->typename && !in_list(layer_name, layer))
diff --git a/debian/patches/0001-filter-useless-and-errorfull-ASCII-char-for-XML-outp.patch b/debian/patches/0001-filter-useless-and-errorfull-ASCII-char-for-XML-outp.patch
new file mode 100644
index 0000000..5f5c7a6
--- /dev/null
+++ b/debian/patches/0001-filter-useless-and-errorfull-ASCII-char-for-XML-outp.patch
@@ -0,0 +1,22 @@
+From fe7599dbf5d6dd952adf261cd0d4753969f1a5db Mon Sep 17 00:00:00 2001
+From: Olivier Courtin <olivier.courtin at oslandia.com>
+Date: Wed, 12 Nov 2014 09:34:41 +0000
+Subject: filter useless (and errorfull) ASCII char for XML output
+Origin: https://github.com/mapserver/tinyows/commit/fe7599dbf5d6dd952adf261cd0d4753969f1a5db
+
+---
+ src/struct/buffer.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/src/struct/buffer.c
++++ b/src/struct/buffer.c
+@@ -502,6 +502,9 @@ buffer *buffer_encode_xml_entities_str(c
+ buf = buffer_init();
+
+ for( /* empty */ ; *str ; str++) {
++
++ if ((int) *str < 32 && (*str != '\n' && *str != '\r' && *str != ' ')) break;
++
+ switch(*str) {
+ case '&':
+ buffer_add_str(buf, "&");
diff --git a/debian/patches/0001-fix-68.patch b/debian/patches/0001-fix-68.patch
new file mode 100644
index 0000000..dad4c22
--- /dev/null
+++ b/debian/patches/0001-fix-68.patch
@@ -0,0 +1,22 @@
+From 8c7dc7206b50346c36e28048dc3d3800c45ad916 Mon Sep 17 00:00:00 2001
+From: Peter Hopfgartner <peter.hopfgartner at r3-gis.com>
+Date: Thu, 13 Nov 2014 13:32:01 +0100
+Subject: fix #68
+Origin: https://github.com/mapserver/tinyows/commit/8c7dc7206b50346c36e28048dc3d3800c45ad916
+Bug: https://github.com/mapserver/tinyows/issues/68
+
+---
+ src/ows/ows_storage.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/ows/ows_storage.c
++++ b/src/ows/ows_storage.c
+@@ -192,7 +192,7 @@ static void ows_storage_fill_pkey(ows *
+ sql = buffer_init();
+
+ buffer_add_str(sql, "SELECT c.column_name FROM information_schema.constraint_column_usage c, pg_namespace n ");
+- buffer_add_str(sql, "WHERE n.nspname = '");
++ buffer_add_str(sql, "WHERE c.table_schema=n.nspname AND n.nspname = '");
+ buffer_copy(sql, l->storage->schema);
+ buffer_add_str(sql, "' AND c.table_name = '");
+ buffer_copy(sql, l->storage->table);
diff --git a/debian/patches/0001-fix-forgottent-copy-on-id_column.patch b/debian/patches/0001-fix-forgottent-copy-on-id_column.patch
new file mode 100644
index 0000000..f718ad8
--- /dev/null
+++ b/debian/patches/0001-fix-forgottent-copy-on-id_column.patch
@@ -0,0 +1,21 @@
+From e5cca8943f44d50e2295d7a3b48265a657689797 Mon Sep 17 00:00:00 2001
+From: Olivier Courtin <olivier.courtin at oslandia.com>
+Date: Tue, 9 Sep 2014 06:03:23 +0200
+Subject: fix forgottent copy on id_column
+Origin: https://github.com/mapserver/tinyows/commit/e5cca8943f44d50e2295d7a3b48265a657689797
+
+---
+ src/wfs/wfs_get_feature.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/wfs/wfs_get_feature.c
++++ b/src/wfs/wfs_get_feature.c
+@@ -806,7 +806,7 @@ static void wfs_geojson_display_results(
+
+ prop_table = ows_psql_describe_table(o, ll->value);
+ first_row = true;
+- id_name = ows_psql_id_column(o, ll->value);
++ buffer_copy(id_name, ows_psql_id_column(o, ll->value));
+ number = -1;
+ if (id_name && id_name->use)
+ number = PQfnumber(res, id_name->buf);
diff --git a/debian/patches/0001-fix-wrong-ows-ServiceTypeVersion-sequence.patch b/debian/patches/0001-fix-wrong-ows-ServiceTypeVersion-sequence.patch
new file mode 100644
index 0000000..dc40c05
--- /dev/null
+++ b/debian/patches/0001-fix-wrong-ows-ServiceTypeVersion-sequence.patch
@@ -0,0 +1,29 @@
+From fb7fc0cc7c97fec9854851f55e946164cd213fa4 Mon Sep 17 00:00:00 2001
+From: root <root at new-perrine.(none)>
+Date: Wed, 6 Aug 2014 23:51:32 +0200
+Subject: fix wrong ows:ServiceTypeVersion sequence
+Origin: https://github.com/mapserver/tinyows/commit/fb7fc0cc7c97fec9854851f55e946164cd213fa4
+
+---
+ src/ows/ows_get_capabilities.c | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+--- a/src/ows/ows_get_capabilities.c
++++ b/src/ows/ows_get_capabilities.c
+@@ -131,14 +131,9 @@ void ows_service_identification(const ow
+ }
+
+ fprintf(o->output, " <ows:ServiceType>%s</ows:ServiceType>\n", o->metadata->type->buf);
+- fprintf(o->output, " <ows:ServiceTypeVersion>");
++ for (ln = o->metadata->versions->first ; ln ; ln = ln->next)
++ fprintf(o->output, " <ows:ServiceTypeVersion>%s</ows:ServiceTypeVersion>\n", ln->value->buf);
+
+- for (ln = o->metadata->versions->first ; ln ; ln = ln->next) {
+- fprintf(o->output, "%s", ln->value->buf);
+- if (ln->next) fprintf(o->output, ",");
+- }
+-
+- fprintf(o->output, "</ows:ServiceTypeVersion>\n");
+
+ if (o->metadata->fees)
+ fprintf(o->output, " <ows:Fees>%s</ows:Fees>\n", o->metadata->fees->buf);
diff --git a/debian/patches/series b/debian/patches/series
index 546b139..7ea74fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,16 @@
drop-config.log.patch
buffer_copy.patch
liborder.patch
+0001-Fix-feature-ids-in-JSON-GetFeature-output.patch
+0001-Add-pkey_sequence-attribute-in-addition-to-pkey-to-l.patch
+0001-Support-pkey-and-pkey_sequence-attrs-in-layer_flush.patch
+0001-Fix-incorrect-inversion-of-axis-order-for-projected-.patch
+0001-Fix-wrong-comment.patch
+0001-fix-wrong-ows-ServiceTypeVersion-sequence.patch
+0001-Unable-to-deal-with-NS-prefix.patch
+0001-Add-support-for-postgis-version-2.1-in-demo-installe.patch
+0001-fix-forgottent-copy-on-id_column.patch
+0001-Force-to-be-upper-case-in-service-response.patch
+0001-filter-useless-and-errorfull-ASCII-char-for-XML-outp.patch
+0001-fix-68.patch
+0001-Fix-76.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/tinyows.git
More information about the Pkg-grass-devel
mailing list