jengelh/mapserver
SHA256
1
0
Fork 0
forked from pool/mapserver
Code Pull Requests Activity

fix for < 12.1

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=87
This commit is contained in:
Dirk Stoecker 2011-11-23 16:39:36 +00:00 committed by Git OBS Bridge
parent 9696c06074
commit 547cae2a98
5 changed files with 261 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mapserver-5.4.1_buildchecks.patch
View File

@ -1,12 +0,0 @@
diff -ur mapserver-5.4.1/mapscript/java/Makefile.in mapserver-5.4.1_new/mapscript/java/Makefile.in
--- mapserver-5.4.1/mapscript/java/Makefile.in 2009-07-02 13:04:17.000000000 +0200
+++ mapserver-5.4.1_new/mapscript/java/Makefile.in 2008-01-10 15:48:35.000000000 +0100
@@ -211,7 +211,7 @@
# Java Stuff
#
JAVADOC=javadoc
-JAVAC=javac
+JAVAC=javac -target 1.5 -source 1.5
JAVA=java
JAR=jar
JAVA_INCLUDE=-I${JAVA_HOME}/include -I${JAVA_HOME}/include/@OS_INCLUDE_DIR@

15
mapserver-6.0.1_buildfix.patch Normal file
View File

@ -0,0 +1,15 @@
diff -ur mapserver-6.0.1/mapogr.cpp mapserver-6.0.1f/mapogr.cpp
--- mapserver-6.0.1/mapogr.cpp 2011-07-12 15:06:14.000000000 +0200
+++ mapserver-6.0.1f/mapogr.cpp 2011-11-23 16:06:53.000000000 +0100
@@ -3719,9 +3719,9 @@
msSetError(MS_MISCERR, "OGR support is not available.",
"msOGREscapeSQLParam()");
- return NULL;
-
#endif /* USE_OGR */
+
+ return NULL;
}

242
mapserver.changes Normal file
View File

@ -0,0 +1,242 @@
-------------------------------------------------------------------
Wed Nov 23 15:09:01 UTC 2011 - opensuse@dstoecker.de
- fix build
Fri Sep 30 00:00:00 UTC 2011 - stephan.holl@intevation.de
-------------------------------------------------------------------
- updated to new upstream version of mapserver 6.0.1 (see
http://trac.osgeo.org/mapserver/browser/tags/rel-6-0-1/mapserver/HISTORY.TXT
for a detailed description of the changes.
Fri May 27 00:00:00 UTC 2011 - stephan.holl@intevation.de
-------------------------------------------------------------------
- included the patch from #3877 to make it build
Mon May 16 00:00:00 UTC 2011 - stephan.holl@intevation.de
-------------------------------------------------------------------
- updated to new upstream version of mapserver 6.0.0 (see
http://trac.osgeo.org/mapserver/browser/tags/rel-6-0-0/mapserver/HISTORY.TXT
for a detailed description of the changes.
Fri May 06 00:00:00 UTC 2011 - stephan.holl@intevation.de
-------------------------------------------------------------------
- updated with new upstream release 6.0.0-rc2
Sat Apr 30 00:00:00 UTC 2011 - tzotsos@opensuse.org
-------------------------------------------------------------------
- updated with new upstream release 6.0.0-rc1.
Sun Apr 24 00:00:00 UTC 2011 - tzotsos@opensuse.org
-------------------------------------------------------------------
- updated with new upstream release 6.0.0-beta7.
Thu Apr 14 00:00:00 UTC 2011 - stephan.holl@intevation.de
-------------------------------------------------------------------
- updated with new upstream release 6.0.0-beta6.
Thu Apr 07 00:00:00 UTC 2011 - stephan.holl@intevation.de
-------------------------------------------------------------------
- updated with new upstream release 6.0.0-beta5; in the meanwhile
python-support was repaired by someone else (dstoecker, adrianSuSE).
Kudos to them.
Fri Mar 11 00:00:00 UTC 2011 - stephan.holl@intevation.de
-------------------------------------------------------------------
- updated with new upstream release 6.0.0-beta1
Sun Feb 27 00:00:00 UTC 2011 - tzotsos@opensuse.org
-------------------------------------------------------------------
- fixed python package
Mon Jan 24 00:00:00 UTC 2011 - stephan.holl@intevation.de
-------------------------------------------------------------------
- added bug3525_verbose_output.patch to make EXCEPTIONS-output more
verbose
Tue Jan 18 00:00:00 UTC 2011 - stephan.holl@intevation.de
-------------------------------------------------------------------
- udated to new upstream version of mapserver 5.6.6(see
http://trac.osgeo.org/mapserver/browser/tags/rel-5-6-6/mapserver/HISTORY.TXT
for a detailed description of the changes.
- removed patch for bug #3525 since this is already included in upstreams
version 5.6.5
Tue Jan 11 00:00:00 UTC 2011 - stephan.holl@intevation.de
-------------------------------------------------------------------
- added upstream-patch for mapserver bug #3525 to work reliably with WMS
1.3.0 and FCGI-mode
Mon Dec 06 00:00:00 UTC 2010 - stephan.holl@intevation.de
-------------------------------------------------------------------
- added --with-experimental-png-compile-flag
Wed Oct 13 00:00:00 UTC 2010 - stephan.holl@intevation.de
-------------------------------------------------------------------
- added a patch to hide layers from GetCapabilitites-Output. Use
Metadataentry 'OWS_HIDDEN_LAYER' 'true' inside your layer
- added Fastcgi-Support
Tue Aug 10 00:00:00 UTC 2010 - stephan.holl@intevation.de
-------------------------------------------------------------------
- updated to new upstream version of mapserver 5.6.5(see
http://trac.osgeo.org/mapserver/browser/tags/rel-5-6-5/mapserver/HISTORY.TXT
for a detailed description of the changes.
Fri Mar 08 00:00:00 UTC 2010 - stephan.holl@intevation.de
-------------------------------------------------------------------
- updated to new upstream version of mapserver 5.6.3(see
http://trac.osgeo.org/mapserver/browser/tags/rel-5-6-3/mapserver/HISTORY.TXT
for a detailed description of the changes.
Mon Jan 11 00:00:00 UTC 2010 - stephan.holl@intevation.de
-------------------------------------------------------------------
- updated to new upstream version of mapserver 5.6.1(see
http://trac.osgeo.org/mapserver/browser/tags/rel-5-6-1/mapserver/HISTORY.TXT
for a detailed description of the changes.
Wed Dec 16 00:00:00 UTC 2009 - stephan.holl@intevation.de
-------------------------------------------------------------------
- updated to new upstream version of mapserver 5.6.0
(see http://trac.osgeo.org/mapserver/browser/tags/rel-5-6-0/mapserver/HISTORY.TXT
for a detailed description of the changes.
Wed May 06 00:00:00 UTC 2009 - stephan.holl@intevation.de
-------------------------------------------------------------------
- updated to new upstream version of mapserver 5.4.0
(see http://trac.osgeo.org/mapserver/browser/tags/rel-5-4-0/mapserver/HISTORY.TXT
for a detailed description of the changes.
- This release fixes several security vulnerabilities:
http://trac.osgeo.org/mapserver/ticket/2939
http://trac.osgeo.org/mapserver/ticket/2941
http://trac.osgeo.org/mapserver/ticket/2942
http://trac.osgeo.org/mapserver/ticket/2943
http://trac.osgeo.org/mapserver/ticket/2944
- tweaked the specfile for the new relase a little
- make java using version 1.5 also for OpenSuSE 11.0
Wed Dec 04 00:00:00 UTC 2008 - stephan.holl@intevation.de
-------------------------------------------------------------------
- updated to new upstream release of mapserver 5.2.1
(see http://trac.osgeo.org/mapserver/browser/tags/rel-5-2-1/mapserver/HISTORY.TXT
for a detailed description of the changes
Wed Oct 22 00:00:00 UTC 2008 - stephan.holl@intevation.de
-------------------------------------------------------------------
- removed --with-tiff-option based on a hint from Andreas Hirner.
See http://n2.nabble.com/Re:-unable-to-read-TIF-with-mapserver-5.3dev-td738238.html
for more information
Tue Aug 28 00:00:00 UTC 2008 - stephan.holl@intevation.de
-------------------------------------------------------------------
- changed path of mapscript-module
- added dependency of apache2_mod-php5 to php-mapserver
Tue Aug 26 00:00:00 UTC 2008 - stephan.holl@intevation.de
-------------------------------------------------------------------
- updated to build on SLE_10 x32-plattforms
- updated path to php_mapscript.so
- updated path to mapserv
- added legend, scalebar
* Sun Mar 16 2008 Otto Dassau 5.0.2
- adapted to compile on openSUSE build service
- java and python is not build included
Tue Feb 19 00:00:00 UTC 2008 - rel-eng@fedoraproject.org
-------------------------------------------------------------------
- Autorebuild for GCC 4.3
Sat Feb 9 00:00:00 UTC 2008 - devrim@commandprompt.com
-------------------------------------------------------------------
- Update to 5.0.2
Sat Jan 5 00:00:00 UTC 2008 - devrim@commandprompt.com
-------------------------------------------------------------------
- Update BR for java-devel, per Patrice Dumas
Fri Jan 4 00:00:00 UTC 2008 - devrim@commandprompt.com
-------------------------------------------------------------------
- Update to 5.0.0
- Removed patch0, since it is already in upstream.
- Updated BRs
Thu Dec 06 00:00:00 UTC 2007 - rel-eng@fedoraproject.org
-------------------------------------------------------------------
- Rebuild for deps
Thu Aug 30 00:00:00 UTC 2007 - oliver@linux-kernel.at
-------------------------------------------------------------------
- Add fix to include libmapserver (in some places), instead of
libmap, that doesn't exist (anymore)
Thu Aug 30 00:00:00 UTC 2007 - oliver@linux-kernel.at
-------------------------------------------------------------------
- Update to fix bz#256561, CVE-2007-4542
Fri May 11 00:00:00 UTC 2007 - cbalint@redhat.com
-------------------------------------------------------------------
- update require list properly.
Thu May 10 00:00:00 UTC 2007 - cbalint@redhat.com
-------------------------------------------------------------------
- use macros if possible in spec
Thu May 10 00:00:00 UTC 2007 - cbalint@redhat.com
-------------------------------------------------------------------
- further fixups for inclusion
Thu May 10 00:00:00 UTC 2007 - cbalint@redhat.com
-------------------------------------------------------------------
- new upsream tarball (bugfix)
- further fixups for inclusion
Tue Apr 24 00:00:00 UTC 2007 - cbalint@redhat.com
-------------------------------------------------------------------
- further fixups for inclusion
- enable java
Fri Mar 16 00:00:00 UTC 2007 - cbalint@redhat.com
-------------------------------------------------------------------
- add docs
Fri Mar 16 00:00:00 UTC 2007 - cbalint@redhat.com
-------------------------------------------------------------------
- first package

147
mapserver.spec
View File

@ -7,12 +7,10 @@ Group: Applications/GIS
Source: %{name}-%{fileversion}.tar.gz Source: %{name}-%{fileversion}.tar.gz
Url: http://www.mapserver.org Url: http://www.mapserver.org
Summary: Environment for building spatially-enabled internet applications Summary: Environment for building spatially-enabled internet applications
Packager: Stephan Holl <stephan.holl@intevation.de>
Requires: php Requires: php
Requires: postgresql Requires: postgresql
Requires: mysql Requires: mysql
Requires: FastCGI Requires: FastCGI
#Requires: libexpat
Requires: python Requires: python
Requires: apache2 Requires: apache2
%if 0%{?suse_version} != 1010 %if 0%{?suse_version} != 1010
@ -62,9 +60,7 @@ BuildRequires: krb5-devel
%endif %endif
BuildRequires: libgcj-devel BuildRequires: libgcj-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Patch0: mapserver-5.4.1_buildchecks.patch Patch: mapserver-6.0.1_buildfix.patch
Patch1: patch_3877-r11714.patch
#Patch2: bug3525_verbose_output.patch
%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
%define _cgibindir /srv/www/cgi-bin %define _cgibindir /srv/www/cgi-bin
@ -89,6 +85,7 @@ The PHP/Mapscript extension provides full map customization capabilities within
Summary: Perl/Mapscript map making extensions to Perl Summary: Perl/Mapscript map making extensions to Perl
Group: Development/Languages Group: Development/Languages
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: perl-base
%description perl %description perl
The Perl/Mapscript extension provides full map customization capabilities The Perl/Mapscript extension provides full map customization capabilities
@ -98,6 +95,7 @@ within the Perl programming language.
Summary: Python/Mapscript map making extensions to Python Summary: Python/Mapscript map making extensions to Python
Group: Development/Languages Group: Development/Languages
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: python-base
%description python %description python
The Python/Mapscript extension provides full map customization capabilities The Python/Mapscript extension provides full map customization capabilities
@ -114,26 +112,9 @@ within the Java programming language.
%prep %prep
%setup -q -n %{name}-%{fileversion} %setup -q -n %{name}-%{fileversion}
%patch0 -p1 %patch -p1
%patch1 -p1
#%patch2 -p1
# fix spurious perm bits
chmod -x tests/home.png
chmod -x mappluginlayer.c
chmod -x mapscript/php/mapscript_i.c
chmod -x mapscript/php/Makefile.in
chmod -x mapscript/php/Makefile.vc
chmod -x mapscript/php/php_mapscript.*
chmod -x mapscript/python/examples/*.py
chmod -x mapscript/perl/examples/*.pl
chmod -x mapscript/php/README.WIN32
%build %build
# fix gdal lookup
%{__sed} -i.libs -e 's|`\$GDAL_CONFIG --dep-libs`||' configure
%configure \ %configure \
--with-gd \ --with-gd \
--with-zlib \ --with-zlib \
@ -163,12 +144,6 @@ chmod -x mapscript/php/README.WIN32
--with-threads \ --with-threads \
--disable-runpath --disable-runpath
## Dirty Hack: Strip out the faulty referenced -lpgport from Makefiles in
## order to make the linking succeed. pg_config progagates it, but it is
## not available on suse-systems.
## TODO: Send a patch to postgresql-packagers!
find . -name Makefile -exec sed -i 's/ -lpgport//' {} \;
## WARNING !!! ## WARNING !!!
# using %{?_smp_mflags} may break build # using %{?_smp_mflags} may break build
@ -289,117 +264,3 @@ rm -rf %{buildroot}
%{_javadir}/*.jar %{_javadir}/*.jar
%changelog %changelog
* Fri Sep 30 2011 Stephan Holl <stephan.holl@intevation.de> 6.0.1
- updated to new upstream version of mapserver 6.0.1 (see
http://trac.osgeo.org/mapserver/browser/tags/rel-6-0-1/mapserver/HISTORY.TXT for a detailed description of the changes.
* Fri May 27 2011 Stephan Holl <stephan.holl@intevation.de> 6.0.0
- included the patch from #3877 to make it build
* Mon May 16 2011 Stephan Holl <stephan.holl@intevation.de> 6.0.0
- updated to new upstream version of mapserver 6.0.0 (see
http://trac.osgeo.org/mapserver/browser/tags/rel-6-0-0/mapserver/HISTORY.TXT for a detailed description of the changes.
* Fri May 06 2011 Stephan Holl <stephan.holl@intevation.de> 6.0.0-rc2
- updated with new upstream release 6.0.0-rc2
* Sat Apr 30 2011 Angelos Tzotsos <tzotsos@opensuse.org> 6.0.0-rc1
- updated with new upstream release 6.0.0-rc1.
* Sun Apr 24 2011 Angelos Tzotsos <tzotsos@opensuse.org> 6.0.0-beta7
- updated with new upstream release 6.0.0-beta7.
* Thu Apr 14 2011 Stephan Holl <stephan.holl@intevation.de> 6.0.0-beta6
- updated with new upstream release 6.0.0-beta6.
* Thu Apr 07 2011 Stephan Holl <stephan.holl@intevation.de> 6.0.0-beta5
- updated with new upstream release 6.0.0-beta5; in the meanwhile
python-support was repaired by someone else (dstoecker, adrianSuSE).
Kudos to them.
* Fri Mar 11 2011 Stephan Holl <stephan.holl@intevation.de> 6.0.0-beta1
- updated with new upstream release 6.0.0-beta1
* Sun Feb 27 2011 Angelos Tzotsos <tzotsos@opensuse.org> 5.6.6
- fixed python package
* Mon Jan 24 2011 Stephan Holl <stephan.holl@intevation.de> 5.6.6
- added bug3525_verbose_output.patch to make EXCEPTIONS-output more
verbose
* Tue Jan 18 2011 Stephan Holl <stephan.holl@intevation.de> 5.6.6
- udated to new upstream version of mapserver 5.6.6(see
http://trac.osgeo.org/mapserver/browser/tags/rel-5-6-6/mapserver/HISTORY.TXT
for a detailed description of the changes.
- removed patch for bug #3525 since this is already included in upstreams
version 5.6.5
* Tue Jan 11 2011 Stephan Holl <stephan.holl@intevation.de> 5.6.5
- added upstream-patch for mapserver bug #3525 to work reliably with WMS
1.3.0 and FCGI-mode
* Mon Dec 06 2010 Stephan Holl <stephan.holl@intevation.de> 5.6.5
- added --with-experimental-png-compile-flag
* Wed Oct 13 2010 Stephan Holl <stephan.holl@intevation.de> 5.6.5
- added a patch to hide layers from GetCapabilitites-Output. Use
Metadataentry 'OWS_HIDDEN_LAYER' 'true' inside your layer
- added Fastcgi-Support
* Tue Aug 10 2010 Stephan Holl <stephan.holl@intevation.de> 5.6.5
- updated to new upstream version of mapserver 5.6.5(see
http://trac.osgeo.org/mapserver/browser/tags/rel-5-6-5/mapserver/HISTORY.TXT
for a detailed description of the changes.
* Fri Mar 08 2010 Stephan Holl <stephan.holl@intevation.de> 5.6.3
- updated to new upstream version of mapserver 5.6.3(see
http://trac.osgeo.org/mapserver/browser/tags/rel-5-6-3/mapserver/HISTORY.TXT
for a detailed description of the changes.
* Mon Jan 11 2010 Stephan Holl <stephan.holl@intevation.de> 5.6.1
- updated to new upstream version of mapserver 5.6.1(see
http://trac.osgeo.org/mapserver/browser/tags/rel-5-6-1/mapserver/HISTORY.TXT
for a detailed description of the changes.
* Wed Dec 16 2009 Stephan Holl <stephan.holl@intevation.de> 5.6.0
- updated to new upstream version of mapserver 5.6.0 (see http://trac.osgeo.org/mapserver/browser/tags/rel-5-6-0/mapserver/HISTORY.TXT for a detailed description of the changes.
* Wed May 06 2009 Stephan Holl <stephan.holl@intevation.de> 5.4.0
- updated to new upstream version of mapserver 5.4.0 (see http://trac.osgeo.org/mapserver/browser/tags/rel-5-4-0/mapserver/HISTORY.TXT for a detailed description of the changes.
- This release fixes several security vulnerabilities:
http://trac.osgeo.org/mapserver/ticket/2939
http://trac.osgeo.org/mapserver/ticket/2941
http://trac.osgeo.org/mapserver/ticket/2942
http://trac.osgeo.org/mapserver/ticket/2943
http://trac.osgeo.org/mapserver/ticket/2944
- tweaked the specfile for the new relase a little
- make java using version 1.5 also for OpenSuSE 11.0
* Wed Dec 04 2008 Stephan Holl <stephan.holl@intevation.de> 5.2.1
- updated to new upstream release of mapserver 5.2.1 (see http://trac.osgeo.org/mapserver/browser/tags/rel-5-2-1/mapserver/HISTORY.TXT for a detailed description of the changes
* Wed Oct 22 2008 Stephan Holl <stephan.holl@intevation.de> 5.2.0
- removed --with-tiff-option based on a hint from Andreas Hirner. See http://n2.nabble.com/Re:-unable-to-read-TIF-with-mapserver-5.3dev-td738238.html for more information
* Tue Aug 28 2008 Stephan Holl <stephan.holl@intevation.de> 5.2.0
- changed path of mapscript-module
- added dependency of apache2_mod-php5 to php-mapserver
* Tue Aug 26 2008 Stephan Holl <stephan.holl@intevation.de> 5.2.0
- updated to build on SLE_10 x32-plattforms
- updated path to php_mapscript.so
- updated path to mapserv
- added legend, scalebar
* Sun Mar 16 2008 Otto Dassau 5.0.2
- adapted to compile on openSUSE build service
- java and python is not build included
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 5.0.2-2
- Autorebuild for GCC 4.3
* Sat Feb 9 2008 Devrim GUNDUZ <devrim@commandprompt.com> - 5.0.2-1
- Update to 5.0.2
* Sat Jan 5 2008 Devrim GUNDUZ <devrim@commandprompt.com> - 5.0.0-2
- Update BR for java-devel, per Patrice Dumas
* Fri Jan 4 2008 Devrim GUNDUZ <devrim@commandprompt.com> - 5.0.0-1
- Update to 5.0.0
- Removed patch0, since it is already in upstream.
- Updated BRs
* Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> - 4.10.3-3
- Rebuild for deps
* Thu Aug 30 2007 Oliver Falk <oliver@linux-kernel.at> 4.10.3-2
- Add fix to include libmapserver (in some places), instead of
libmap, that doesn't exist (anymore)
* Thu Aug 30 2007 Oliver Falk <oliver@linux-kernel.at> 4.10.3-1
- Update to fix bz#256561, CVE-2007-4542
* Fri May 11 2007 Balint Cristian <cbalint@redhat.com> 4.10.2-4
- update require list properly.
* Thu May 10 2007 Balint Cristian <cbalint@redhat.com> 4.10.2-3
- use macros if possible in spec
* Thu May 10 2007 Balint Cristian <cbalint@redhat.com> 4.10.2-2
- further fixups for inclusion
* Thu May 10 2007 Balint Cristian <cbalint@redhat.com> 4.10.2-1
- new upsream tarball (bugfix)
- further fixups for inclusion
* Tue Apr 24 2007 Balint Cristian <cbalint@redhat.com> 4.10.1-3
- further fixups for inclusion
- enable java
* Fri Mar 16 2007 Balint Cristian <cbalint@redhat.com> 4.10.1-2
- add docs
* Fri Mar 16 2007 Balint Cristian <cbalint@redhat.com> 4.10.1-1
- first package

12
patch_3877-r11714.patch
View File

@ -1,12 +0,0 @@
diff -urNad a/mapunion.c a/mapunion.c.orig
--- a/mapunion.c 2011-05-31 08:51:45.691271866 +0200
+++ a/mapunion.c.orig 2011-05-31 08:51:35.083376517 +0200
@@ -240,7 +240,7 @@
}
/* clean up expression tokens */
-void msUnionLayerFreeExpressionTokens(layerObj *layer)
+int msUnionLayerFreeExpressionTokens(layerObj *layer)
{
int i,j;
freeExpressionTokens(&(layer->filter));