Proposed update of mapserver for wheezy
Dear Release Team,
Would you consider the changes for mapserver 6.0.1-4 acceptable for
upload to wheezy proposed-updates?
It acknowledges the NMUs, includes fixes for bugs in the BTS, and fixes
available in the Debian GIS VCS that were not uploaded to unstable in
time for wheezy.
The bugs in question are #663875 (normal) and #709186 (important).
Another fix is cherry picked from the 6.2.1 release, and is part of the
6.2.1-3 version of mapserver currently in testing and unstable.
Regards,
Bas
--
GnuPG: 0xE88D4AF1 (new) / 0x77A975AD (old)
diff -Nru mapserver-6.0.1/debian/changelog mapserver-6.0.1/debian/changelog
--- mapserver-6.0.1/debian/changelog 2012-08-29 17:49:17.000000000 +0200
+++ mapserver-6.0.1/debian/changelog 2013-07-23 23:46:19.000000000 +0200
@@ -1,3 +1,18 @@
+mapserver (6.0.1-4) unstable; urgency=low
+
+ [Francesco Paolo Lovergine]
+ * Fixed typo that prevented AGG use in debian/rules.
+ (closes: #663875)
+ * Migrated to debhelper level 9 and policy bumped to 3.9.3.
+
+ [Bas Couwenberg]
+ * Link executables with -ldl. Thanks Colin Watson for the patch.
+ (closes: #709186)
+ * Cherry pick fix for strict Content-Type matching from v6.2.1:
+ https://github.com/faegi/mapserver/commit/426193cf5f6b34c97cceef2aca4649c604756cd0
+
+ -- Francesco Paolo Lovergine <frankie@debian.org> Wed, 14 Mar 2012 21:43:53 +0100
+
mapserver (6.0.1-3.2) unstable; urgency=low
* Non-maintainer upload.
diff -Nru mapserver-6.0.1/debian/compat mapserver-6.0.1/debian/compat
--- mapserver-6.0.1/debian/compat 2012-03-05 16:09:41.000000000 +0100
+++ mapserver-6.0.1/debian/compat 2013-07-23 23:29:56.000000000 +0200
@@ -1 +1 @@
-8
+9
diff -Nru mapserver-6.0.1/debian/control mapserver-6.0.1/debian/control
--- mapserver-6.0.1/debian/control 2012-08-29 17:48:49.000000000 +0200
+++ mapserver-6.0.1/debian/control 2013-07-23 23:29:56.000000000 +0200
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <frankie@debian.org>, Alan Boudreault <aboudreault@mapgears.com>
-Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 8), libcurl4-gnutls-dev, libpng-dev, zlib1g-dev (>= 1.1.4),
+Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9), libcurl4-gnutls-dev, libpng-dev, zlib1g-dev (>= 1.1.4),
libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>= 2.0.9), libjpeg-dev, libgdal1-dev (>=1.4.0), libproj-dev,
libpq-dev, php5-dev, swig, python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~), libgeos-dev (>= 3.3.1-1~),
ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,
diff -Nru mapserver-6.0.1/debian/patches/contenttype mapserver-6.0.1/debian/patches/contenttype
--- mapserver-6.0.1/debian/patches/contenttype 1970-01-01 01:00:00.000000000 +0100
+++ mapserver-6.0.1/debian/patches/contenttype 2013-07-23 23:51:06.000000000 +0200
@@ -0,0 +1,21 @@
+Description: Fix parsing POST request when Content-Type has an encoding appended.
+Origin: https://github.com/faegi/mapserver/commit/426193cf5f6b34c97cceef2aca4649c604756cd0
+Bug: https://github.com/mapserver/mapserver/pull/4585
+Last-Update 2013-05-09
+--- a/cgiutil.c 2013-05-09 03:05:00.000000000 +0200
++++ b/cgiutil.c 2013-05-09 03:07:25.000000000 +0200
+@@ -166,8 +166,12 @@
+
+ /* if the content_type is application/x-www-form-urlencoded,
+ we have to parse it like the QUERY_STRING variable */
+- if(strcmp(request->contenttype, "application/x-www-form-urlencoded") == 0)
+- {
++ //if(strcmp(request->contenttype, "application/x-www-form-urlencoded") == 0) {
++ /*
++ * Cherry picked fix for strict Content-Type matching from:
++ * https://github.com/faegi/mapserver/commit/426193cf5f6b34c97cceef2aca4649c604756cd0
++ */
++ if(strncmp(request->contenttype, "application/x-www-form-urlencoded", strlen("application/x-www-form-urlencoded")) == 0) {
+ while( data_len > 0 && isspace(post_data[data_len-1]) )
+ post_data[--data_len] = '\0';
+
diff -Nru mapserver-6.0.1/debian/patches/series mapserver-6.0.1/debian/patches/series
--- mapserver-6.0.1/debian/patches/series 2012-05-22 01:31:07.000000000 +0200
+++ mapserver-6.0.1/debian/patches/series 2013-07-23 23:42:03.000000000 +0200
@@ -1,3 +1,4 @@
fixgeos
php54
multiarch-libgd
+contenttype
diff -Nru mapserver-6.0.1/debian/rules mapserver-6.0.1/debian/rules
--- mapserver-6.0.1/debian/rules 2012-08-28 20:29:25.000000000 +0200
+++ mapserver-6.0.1/debian/rules 2013-07-23 23:38:04.000000000 +0200
@@ -48,7 +48,7 @@
--with-threads \
--with-geos \
--with-fastcgi \
- -with-agg \
+ --with-agg \
--with-experimental-png \
--with-cairo
@@ -59,7 +59,7 @@
configure-stamp:
dh_testdir
- ./configure $(COMMON_CONFIG) CFLAGS="$(MS_CFLAGS)" CXXFLAGS="$(MS_CXXFLAGS)"
+ ./configure $(COMMON_CONFIG) CFLAGS="$(MS_CFLAGS)" CXXFLAGS="$(MS_CXXFLAGS)" XTRALIBS=-ldl
touch configure-stamp
@@ -67,7 +67,7 @@
configure-php5-stamp: clean-first-build
dh_testdir
./configure $(COMMON_CONFIG) \
- --with-php=/usr/include/php5 CFLAGS="$(MS_CFLAGS)" CXXFLAGS="$(MS_CXXFLAGS)"
+ --with-php=/usr/include/php5 CFLAGS="$(MS_CFLAGS)" CXXFLAGS="$(MS_CXXFLAGS)" XTRALIBS=-ldl
touch configure-php5-stamp
@@ -236,7 +236,7 @@
binary-arch: install-arch
dh_testdir -a
dh_testroot -a
- dh_install --autodest --list-missing --sourcedir=debian/tmp
+ dh_install --autodest --list-missing
dh_installchangelogs -a HISTORY.TXT
dh_installdocs -a
dh_installexamples -a
Reply to: