tdf#140229 neon: update to release 0.31.2

I didn't check all commits, but the most likely fix was "Fix hang
on SSL connection close with IIS (issue #11)". The server from
this bug report is a "Microsoft-IIS/10.0", according to the output
from "curl --dump-header".

Not sure this bug is critical enough to bump the neon dependency
in configure.

Change-Id: I3e20bad1aa732641e6f8a83316e58fc7513186c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113495
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit c974b23ff78dbe11a7b23f7317fdd096ab8cb282)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113523
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

5 files changed, 19 insertions, 12 deletions

diff --git a/configure.ac b/configure.ac
index 962c24516905..57e1f7c0f180 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10598,11 +10598,11 @@ serf)
 neon)
     AC_MSG_RESULT([neon])
     # Check for system neon
-    libo_CHECK_SYSTEM_MODULE([neon],[NEON],[neon >= 0.31.1])
+    libo_CHECK_SYSTEM_MODULE([neon],[NEON],[neon >= 0.31.2])
     if test "$with_system_neon" = "yes"; then
         NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
     else
-        NEON_VERSION=0311
+        NEON_VERSION=0312
     fi
     AC_SUBST(NEON_VERSION)
     ;;
diff --git a/download.lst b/download.lst
index 83063629e3b4..16a74fe081f0 100644
--- a/download.lst
+++ b/download.lst
@@ -213,8 +213,8 @@ export MWAW_VERSION_MICRO := 17
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
 export MYTHES_SHA256SUM := 1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
-export NEON_SHA256SUM := c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d
-export NEON_TARBALL := neon-0.31.1.tar.gz
+export NEON_SHA256SUM := cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678
+export NEON_TARBALL := neon-0.31.2.tar.gz
 export NSS_SHA256SUM := ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45
 export NSS_TARBALL := nss-3.55-with-nspr-4.27.tar.gz
 export ODFGEN_SHA256SUM := 2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2
diff --git a/external/neon/configs/config.h b/external/neon/configs/config.h
index 3f93d1e68132..af8408ad9ad3 100644
--- a/external/neon/configs/config.h
+++ b/external/neon/configs/config.h
@@ -1,4 +1,4 @@
-/* Contents kept in sync with config.h.in from neon 0.31.1 */
+/* Contents kept in sync with config.h.in from neon 0.31.2 */
 
 /* Define if building universal (internal helper macro) */
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
@@ -370,7 +370,7 @@
 #define NEON_IS_LIBRARY 1
 
 /* Define to be the neon version string */
-#define NEON_VERSION "0.31.1"
+#define NEON_VERSION "0.31.2"
 
 /* Define to enable debugging */
 /* #undef NE_DEBUGGING */
@@ -435,7 +435,7 @@
 #define NE_VERSION_MINOR (31)
 
 /* Define to be neon library patch version */
-#define NE_VERSION_PATCH (1)
+#define NE_VERSION_PATCH (2)
 
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "neon@webdav.org"
@@ -444,13 +444,13 @@
 #define PACKAGE_NAME "neon"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "neon 0.31.1"
+#define PACKAGE_STRING "neon 0.31.2"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "neon"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.31.1"
+#define PACKAGE_VERSION "0.31.2"
 
 /* The size of `int', as computed by sizeof. */
 #define SIZEOF_INT 4
diff --git a/solenv/README b/solenv/README
index 68e58e8bc774..b5a730746674 100644
--- a/solenv/README
+++ b/solenv/README
@@ -32,3 +32,10 @@ src/
     useful standard / re-usable component map files for components
     which shouldn't export anything more than a few registration
     symbols.
+
+flatpak-manifest.in
+    This file is used by flatpak/build.sh from the LO dev-tools
+    repository to generate the flatpak package. download.lst is
+    a Makefile snippet, so there seems to be no easy way to use
+    download.lst for the manifest generation (build.sh uses sed),
+    and its information must be kept in sync manually.
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 9d2554da26f8..aababaf988dd 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -357,10 +357,10 @@
                     "dest-filename": "external/tarballs/mdds-1.7.0.tar.bz2"
                 },
                 {
-                    "url": "https://dev-www.libreoffice.org/src/neon-0.31.1.tar.gz",
-                    "sha256": "c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d",
+                    "url": "https://dev-www.libreoffice.org/src/neon-0.31.2.tar.gz",
+                    "sha256": "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678",
                     "type": "file",
-                    "dest-filename": "external/tarballs/neon-0.31.1.tar.gz"
+                    "dest-filename": "external/tarballs/neon-0.31.2.tar.gz"
                 },
                 {
                     "url": "https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz",