Merge pull request #331731 from imincik/mapserver-8.2.1

mapserver: 8.0.1 -> 8.2.1

pkgs/by-name/ma/mapserver/package.nix

@@ -1,29 +1,53 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
-, cairo, curl, fcgi, freetype, fribidi, gdal, geos, giflib, harfbuzz
-, libjpeg, libpng, librsvg, libxml2, postgresql, proj, protobufc, zlib
-, withPython ? true, swig, python3
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+
+  withPython ? true,
+
+  cairo,
+  cmake,
+  curl,
+  fcgi,
+  freetype,
+  fribidi,
+  gdal,
+  geos,
+  giflib,
+  harfbuzz,
+  libjpeg,
+  libpng,
+  librsvg,
+  libxml2,
+  pkg-config,
+  postgresql,
+  proj,
+  protobufc,
+  python3,
+  swig,
+  zlib,
 }:
 
 stdenv.mkDerivation rec {
   pname = "mapserver";
-  version = "8.0.1";
+  version = "8.2.1";
 
   src = fetchFromGitHub {
     owner = "MapServer";
     repo = "MapServer";
     rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}";
-    sha256 = "sha256-fAf4kOe/6bQW0i46+EZbD/6iWI2Bjkn2no6XeR/+mg4=";
+    sha256 = "sha256-kZEDC89yoQP0ma5avp6r+Hz8JMpErGlBVQkhlHO6UFw=";
   };
 
-  patches = [
-    # drop this patch for version 8.0.2
-    ./fix-build-w-libxml2-12.patch
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ] ++ lib.optionals withPython [ swig python3.pkgs.setuptools ];
+  nativeBuildInputs =
+    [
+      cmake
+      pkg-config
+    ]
+    ++ lib.optionals withPython [
+      swig
+      python3.pkgs.setuptools
+    ];
 
   buildInputs = [
     cairo
@@ -38,7 +62,7 @@ stdenv.mkDerivation rec {
     libjpeg
     libpng
     librsvg
-    libxml2
+    (libxml2.override { enableHttp = true; })
     postgresql
     proj
     protobufc

pkgs/servers/geospatial/mapserver/fix-build-w-libxml2-12.patch

@@ -1,39 +0,0 @@
-diff --git a/mapows.c b/mapows.c
-index f141a7b..5a94ecb 100644
---- a/mapows.c
-+++ b/mapows.c
-@@ -168,7 +168,7 @@ static int msOWSPreParseRequest(cgiRequestObj *request,
- #endif
-     if (ows_request->document == NULL
-         || (root = xmlDocGetRootElement(ows_request->document)) == NULL) {
--      xmlErrorPtr error = xmlGetLastError();
-+      const xmlError *error = xmlGetLastError();
-       msSetError(MS_OWSERR, "XML parsing error: %s",
-                  "msOWSPreParseRequest()", error->message);
-       return MS_FAILURE;
-diff --git a/mapwcs.cpp b/mapwcs.cpp
-index 70e63b8..19afa79 100644
---- a/mapwcs.cpp
-+++ b/mapwcs.cpp
-@@ -362,7 +362,7 @@ static int msWCSParseRequest(cgiRequestObj *request, wcsParamsObj *params, mapOb
-     /* parse to DOM-Structure and get root element */
-     if((doc = xmlParseMemory(request->postrequest, strlen(request->postrequest)))
-         == NULL) {
--      xmlErrorPtr error = xmlGetLastError();
-+      const xmlError *error = xmlGetLastError();
-       msSetError(MS_WCSERR, "XML parsing error: %s",
-                  "msWCSParseRequest()", error->message);
-       return MS_FAILURE;
-diff --git a/mapwcs20.cpp b/mapwcs20.cpp
-index b35e803..2431bdc 100644
---- a/mapwcs20.cpp
-+++ b/mapwcs20.cpp
-@@ -1446,7 +1446,7 @@ int msWCSParseRequest20(mapObj *map,
- 
-     /* parse to DOM-Structure and get root element */
-     if(doc == NULL) {
--      xmlErrorPtr error = xmlGetLastError();
-+      const xmlError *error = xmlGetLastError();
-       msSetError(MS_WCSERR, "XML parsing error: %s",
-                  "msWCSParseRequest20()", error->message);
-       return MS_FAILURE;

pkgs/top-level/all-packages.nix

@@ -26181,8 +26181,6 @@ with pkgs;
 
   mapproxy = callPackage ../servers/geospatial/mapproxy { };
 
-  mapserver = callPackage ../servers/geospatial/mapserver { };
-
   martin = callPackage ../servers/geospatial/martin {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };