1
0
forked from pool/mapserver
Dirk Stoecker 2022-03-08 11:44:11 +00:00 committed by Git OBS Bridge
parent 0bab8b1045
commit 11953a5530
5 changed files with 65 additions and 22 deletions

View File

@ -1,8 +1,7 @@
Index: mapscript/python/CMakeLists.txt
===================================================================
--- mapscript/python/CMakeLists.txt.orig 2020-07-31 19:11:56.000000000 +0200
+++ mapscript/python/CMakeLists.txt 2020-09-05 14:44:10.142799065 +0200
@@ -146,7 +146,7 @@ install(
diff -Nur mapserver-7.6.3/mapscript/python/CMakeLists.txt new/mapscript/python/CMakeLists.txt
--- mapserver-7.6.3/mapscript/python/CMakeLists.txt 2021-04-30 23:26:25.000000000 +0200
+++ new/mapscript/python/CMakeLists.txt 2021-05-31 20:53:16.269084059 +0200
@@ -146,7 +146,7 @@
endif()
execute_process(

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:36768819f28024312f76a791085f3731d2cc451f7f0c9015c91c12b3929fe179
size 2715806

3
mapserver-7.6.4.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b46c884bc42bd49873806a05325872e4418fc34e97824d4e13d398e86ea474ac
size 2718735

View File

@ -1,3 +1,46 @@
-------------------------------------------------------------------
Thu Nov 11 16:38:03 UTC 2021 - Boris Manojlovic <boris@steki.net>
- update to release 7.6.4
* PostGIS: fix ST_Intersects() with collections with PostGIS < 2.5.
Fixes https://github.com/MapServer/MapServer/pull/6355#issuecomment-877290417 (Even Rouault) : 3e42e35
* Check if sizeunits is not set to pixels (Patrik Sylve) : 3688004
* Change legend symbol scale factor when SIZEUNITS is set to METERS (Patrik Sylve) : 39a4ead
* spatialindex for sqlite sources in filter (Wouter Visscher) : 955d14e
* Make sure requested class with mode=legendicon is not negative. ( #6357 ) (Steve Lime) : 0901b57
* Updates to CONTRIBUTING.md (Jeff McKenna) : ee6297a
* PostGIS: fix ST_Intersects() with bounding box that is a point (follow-up of fixes #6181 , fixes #6230 )
(fixes https://github.com/MapServer/MapServer/pull/6347#issuecomment-870002856) (Even Rouault) : 44d5d9c
* WMS: make attribute color binding work with FILTER vendor parameter (fixes #6200 ) (Even Rouault) : 1a98ac7
* msQueryByFeatures(): avoid potential segfault when reslut set is empty (Even Rouault) : 98ad83a
* PostGIS: use ST_Intersects instead of && for bounding box (fixes #6181 , fixes #6230 ) (Even Rouault) : e2ef155
* check_single_font(): use quotation mark when msGetGlyphIndex() fails to retrieve the glyph (Even Rouault) : 53ee29e
* msGetGlyphByIndex() / msGetGlyphOutline(): tweak debug/error messages (Even Rouault) : 0bbf943
* When a font is missing a glyph we try to fallback to using a question mark (Krister Wicksell) : cf4756e
* WFS: fix paging with GPKG/Spatialite datasources and non-point geometries (fixes #6325 ) (Even Rouault) : ce8dc4d
* Fix querymap failure for polygon layers with labels only (no styles) ( #6262 ) (Tamas Szekeres) : 782ee8b
* mapxbase: validate nHeadLen (Max Kellermann) : ee5d5de
* mapshape, mapxbase: fix several memory leaks in error code paths (Max Kellermann) : 5e4c504
* mapshape: validate numshapes (Max Kellermann) : b5c0e29
* mapshape: remove useless null terminator (Max Kellermann) : 9755395
-------------------------------------------------------------------
Mon May 31 18:33:59 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
- Update to 7.6.3
* Security: Address flaw in CGI mapfile loading that makes it
possible to bypass security controls ( CVE-2021-32062 )
* Fix most of remaining Coverity scan warnings with high priority
* Use CPLSetConfigOption/CPLGetConfigOption for some
CGI/FastCGI-related env vars.
* Require url-based symbol values to be pre-defined.
* Improved initial check on generating reference maps,
avoid crash with label styles
* Fix resource leak and pointObj initialization errors.
- Enable python
- Refresh mapserver-7.6.1-fix_python_install_path.patch
-------------------------------------------------------------------
Mon Feb 1 13:20:37 UTC 2021 - Jan Engelhardt <jengelh@inai.de>

View File

@ -1,7 +1,7 @@
#
# spec file for package mapserver
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2014 Ioda-Net Sàrl, Charmoille, Switzerland. Bruno Friedmann (tigerfoot)
# Copyright (c) 2015 Angelos Tzotsos (kalxas)
#
@ -14,15 +14,14 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%bcond_with python
%bcond_with ruby
#
# define python for future reference
%define _with_python 1
%bcond_without python
%define libname libmapserver2
%define _cgibindir /srv/www/cgi-bin
%if 0%{?suse_version} >= 1500
@ -32,12 +31,12 @@
%endif
Name: mapserver
Version: 7.6.2
Version: 7.6.4
Release: 0
Summary: Environment for building spatially-enabled internet applications
License: MIT
Group: Productivity/Networking/Web/Servers
Url: https://www.mapserver.org/
URL: https://www.mapserver.org/
Source: https://download.osgeo.org/mapserver/%{name}-%{version}.tar.gz
Source9: %{name}-rpmlintrc
# PATCH-FIX-UPSTREAM mapserver-7.6.1-fix_python_install_path.patch fixing python installation path badly defaulting to arch independent location
@ -74,8 +73,8 @@ BuildRequires: postgresql-devel >= 9.1
%if 0%{?suse_version} >= 1500
BuildRequires: postgresql-server-devel >= 9.1
%endif
BuildRequires: proj
BuildRequires: libprotobuf-c-devel
BuildRequires: proj
BuildRequires: protobuf-c
BuildRequires: readline-devel
BuildRequires: rpm
@ -101,7 +100,9 @@ Group: System/Libraries
Mapserver library for mapserver or mapscript module. you need this lib to run mapserver
or any of the mapscript module (php, java, python, ruby)
# We don't require apache2_mod-php5 users could have php5 running
# We don't require apache2_mod-php5 users could have php5 running
# with other modes (cgi, php-fpm etc)
%package -n php-mapscript
@ -201,8 +202,7 @@ against the C Mapserver library.
%prep
%setup -q -n %{name}-%{version}
%global _default_patch_fuzz 5
%patch0 -p0
%patch0 -p1
%build
mkdir build
@ -243,7 +243,7 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DWITH_MYSQL=TRUE \
-DWITH_PERL=TRUE \
-DCUSTOM_PERL_SITE_ARCH_DIR="%{perl_vendorarch}" \
-DWITH_PHP=TRUE \
-DWITH_PHPNG=TRUE \
-DWITH_POSTGIS=TRUE \
-DWITH_PROJ=TRUE \
-DUSE_PROJ=TRUE \
@ -287,7 +287,7 @@ mkdir -p %{buildroot}/%{_bindir}
mkdir -p %{buildroot}%{python_sitearch}/
mkdir -p %{buildroot}/%{_includedir}/%{name}
#Comment this look a bit wired to be useful sub-dir should also needed
# agg, etc
# agg, etc
cp *.h %{buildroot}/%{_includedir}/%{name}/
# fix some exec bits essentially on examples to make rpmlint happy
@ -350,7 +350,8 @@ rm -rf %{buildroot}%{_docdir}/%{name}-%{version}/tests/vera
%doc mapscript/php/README
%doc mapscript/php/examples
%config(noreplace) %{_sysconfdir}/%{php_name}/conf.d/mapscript.ini
%{_libdir}/%{php_name}/extensions/php_mapscript.so*
%{_libdir}/%{php_name}/extensions/mapscript.php
%{_libdir}/%{php_name}/extensions/php_mapscriptng.so*
%files -n perl-mapscript
%doc mapscript/perl/examples