update to v5.12.1

3 files changed, 68 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3a9cd6bac3fa..e8dfa6a6057d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,33 @@
 pkgbase = metview
 	pkgdesc = ECMWF interactive meteorological application
-	pkgver = 5.8.1
+	pkgver = 5.12.1
 	pkgrel = 1
 	url = https://software.ecmwf.int/wiki/display/METV/Metview
 	arch = i686
 	arch = x86_64
 	groups = science
 	license = APACHE
-	makedepends = emos>=4.0.5
+	makedepends = boost
+	makedepends = cmake
 	makedepends = rpcsvc-proto
-	depends = magics++>=4.0.0
-	depends = mksh
-	depends = openmotif
-	depends = netcdf-cxx-legacy
-	depends = eccodes
-	depends = qt5-webkit
-	depends = libxpm
-	depends = libtirpc
+	makedepends = gcc-fortran
 	depends = cgal
-	source = https://software.ecmwf.int/wiki/download/attachments/3964985/Metview-5.8.1-Source.tar.gz
-	md5sums = d48ac4cbd881a13dc240c2c0066eeb38
+	depends = lapack
+	depends = magics++>=4.5.0
+	depends = qt5-svg
+	depends = qt5-xmlpatterns
+	depends = snappy
+	source = https://software.ecmwf.int/wiki/download/attachments/3964985/Metview-5.12.1-Source.tar.gz
+	source = rpc.patch
+	source = blas.patch
+	source = gfortran.patch
+	source = string.patch
+	source = format_security.patch
+	sha256sums = 3999bc2ca908943077752e8229ab46ddc4815583e35c877098c6a38433014de6
+	sha256sums = abd2f612ca08e9d2a7c288ab0d5512777411f9e6c6077e9b1ac62d4a444345a2
+	sha256sums = c80aed03a542364af5ff177a49e04052d017f992f9139300249be31466170096
+	sha256sums = a86a2a0c8c7a52c38f2c37d2366d0ff22beabf81723f8c6f9696a1743221c3f0
+	sha256sums = 8e698feb27bb8c23f8db58f03c481d810ae14cbffde3860e33c6b0a6c328dfd4
+	sha256sums = 55d0b927bf1af2ab7a31400cf72f77fc13d2bc047ce4b3c30463a6d3a40f01ed
 
 pkgname = metview
-
diff --git a/PKGBUILD b/PKGBUILD
index b21d3ff6ea68..78a8bb2b37ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Antonio Cervone <ant.cervone@gmail.com>
 
 pkgname=metview
-pkgver=5.11.0
+pkgver=5.12.1
 pkgrel=1
 pkgdesc="ECMWF interactive meteorological application"
 arch=(i686 x86_64)
@@ -21,14 +21,17 @@ source=(https://software.ecmwf.int/wiki/download/attachments/3964985/Metview-${p
         rpc.patch
         blas.patch
         gfortran.patch
-        string.patch)
+        string.patch
+        format_security.patch)
+
 
 noextract=()
-sha256sums=('766e3dd36e17bdb32624ea2bdbaa8e5e77cdb25c44ff5dee5a1544e55c9c1476'
+sha256sums=('3999bc2ca908943077752e8229ab46ddc4815583e35c877098c6a38433014de6'
             'abd2f612ca08e9d2a7c288ab0d5512777411f9e6c6077e9b1ac62d4a444345a2'
             'c80aed03a542364af5ff177a49e04052d017f992f9139300249be31466170096'
             'a86a2a0c8c7a52c38f2c37d2366d0ff22beabf81723f8c6f9696a1743221c3f0'
-            '8e698feb27bb8c23f8db58f03c481d810ae14cbffde3860e33c6b0a6c328dfd4')
+            '8e698feb27bb8c23f8db58f03c481d810ae14cbffde3860e33c6b0a6c328dfd4'
+            '55d0b927bf1af2ab7a31400cf72f77fc13d2bc047ce4b3c30463a6d3a40f01ed')
 
 prepare() {
   cd Metview-${pkgver}-Source
@@ -36,6 +39,7 @@ prepare() {
   patch --forward --strip=1 --input=$srcdir/blas.patch
   patch --forward --strip=1 --input=$srcdir/gfortran.patch
   patch --forward --strip=1 --input=$srcdir/string.patch
+  patch --forward --strip=1 --input=$srcdir/format_security.patch
 }
 
 build() {
diff --git a/format_security.patch b/format_security.patch
new file mode 100644
index 000000000000..55dc459bfd64
--- /dev/null
+++ b/format_security.patch
@@ -0,0 +1,39 @@
+diff -u -r Metview-5.12.0-Source-orig/metview/src/Macro/mvector.cc Metview-5.12.0-Source/metview/src/Macro/mvector.cc
+--- Metview-5.12.0-Source-orig/metview/src/Macro/mvector.cc	2021-05-28 14:08:01.975699414 +0200
++++ Metview-5.12.0-Source/metview/src/Macro/mvector.cc	2021-05-28 14:08:25.042614971 +0200
+@@ -19,7 +19,7 @@
+ /*
+ 
+   To do:  (o = to do, * = done)
+-  
++
+     * allow nil & vector
+     * allow vector & vector
+     * vector op vector
+@@ -687,7 +687,7 @@
+     sprintf(typeBuffer, "%-10s", CArray::stringFromValuesType(values->type()).c_str());
+ 
+     fprintf(f, "METVIEW_VECTOR");
+-    fprintf(f, typeBuffer);
++    fprintf(f, "%s", typeBuffer);
+ 
+     int size = values->count();
+     fwrite(&size, sizeof(int), 1, f);  // write the number of values
+@@ -1231,7 +1231,7 @@
+ /*
+ class VectorProductFunction : public Function {
+ public:
+-	VectorProductFunction(char *n) : Function(n,2,tvector,tvector) 
++	VectorProductFunction(char *n) : Function(n,2,tvector,tvector)
+ 	{info = "Vector product";};
+ 	virtual Value Execute(int arity,Value *arg);
+ };
+@@ -1254,7 +1254,7 @@
+ 
+ 	for(int i=0;i<a->Count();i++)
+ 		;
+-		
++
+ 	return Value(c);
+ }
+ */