Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] matio : update to 1.5.18
@ 2020-10-15  9:06 pandom79
  2020-10-16  3:37 ` [PR PATCH] [Updated] " pandom79
                   ` (10 more replies)
  0 siblings, 11 replies; 12+ messages in thread
From: pandom79 @ 2020-10-15  9:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

There is a new pull request by pandom79 against master on the void-packages repository

https://github.com/pandom79/void-packages matio
https://github.com/void-linux/void-packages/pull/25627

matio : update to 1.5.18
required by hdf5

A patch file from https://github.com/void-linux/void-packages/pull/25627.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-matio-25627.patch --]
[-- Type: text/x-diff, Size: 1575 bytes --]

From a31356c898de8cb52c888de0b242fa60b6d1fa1c Mon Sep 17 00:00:00 2001
From: Domenico Panella <domenico@VoidDomenico.localdomain>
Date: Thu, 15 Oct 2020 11:05:07 +0200
Subject: [PATCH] matio : update to 1.5.18

---
 common/shlibs          | 2 +-
 srcpkgs/matio/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e50e44f1246..234b7feb89d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3967,7 +3967,7 @@ libhidrd_opt.so.0 hidrd-0.2.0_1
 libhidrd_strm.so.0 hidrd-0.2.0_1
 libhidrd_fmt.so.0 hidrd-0.2.0_1
 libjcat.so.1 libjcat-0.1.2_1
-libmatio.so.9 matio-1.5.17_2
+libmatio.so.11 matio-1.5.18_1
 libportal.so.0 libportal-0.3_1
 libvips.so.42 libvips-8.9.2_1
 libvips-cpp.so.42 libvips-8.9.2_1
diff --git a/srcpkgs/matio/template b/srcpkgs/matio/template
index 63d059701b6..63b39685e29 100644
--- a/srcpkgs/matio/template
+++ b/srcpkgs/matio/template
@@ -1,7 +1,7 @@
 # Template file for 'matio'
 pkgname=matio
-version=1.5.17
-revision=2
+version=1.5.18
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="libtool"
@@ -11,7 +11,7 @@ maintainer="Florian Eich <flrn@nrmncr.net>"
 license="BSD-2-Clause"
 homepage="https://github.com/tbeu/matio"
 distfiles="https://github.com/tbeu/matio/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=5e455527d370ab297c4abe5a2ab4d599c93ac7c1a0c85d841cc5c22f8221c400
+checksum=5fad71a63a854d821cc6f4e8c84da837149dd5fb57e1e2baeffd85fa0f28fe25
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" ac_cv_va_copy=C99"

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] matio : update to 1.5.18
  2020-10-15  9:06 [PR PATCH] matio : update to 1.5.18 pandom79
@ 2020-10-16  3:37 ` pandom79
  2020-10-16  3:38 ` pandom79
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: pandom79 @ 2020-10-16  3:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 330 bytes --]

There is an updated pull request by pandom79 against master on the void-packages repository

https://github.com/pandom79/void-packages matio
https://github.com/void-linux/void-packages/pull/25627

matio : update to 1.5.18
required by hdf5

A patch file from https://github.com/void-linux/void-packages/pull/25627.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-matio-25627.patch --]
[-- Type: text/x-diff, Size: 4098 bytes --]

From a31356c898de8cb52c888de0b242fa60b6d1fa1c Mon Sep 17 00:00:00 2001
From: Domenico Panella <domenico@VoidDomenico.localdomain>
Date: Thu, 15 Oct 2020 11:05:07 +0200
Subject: [PATCH 1/2] matio : update to 1.5.18

---
 common/shlibs          | 2 +-
 srcpkgs/matio/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e50e44f1246..234b7feb89d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3967,7 +3967,7 @@ libhidrd_opt.so.0 hidrd-0.2.0_1
 libhidrd_strm.so.0 hidrd-0.2.0_1
 libhidrd_fmt.so.0 hidrd-0.2.0_1
 libjcat.so.1 libjcat-0.1.2_1
-libmatio.so.9 matio-1.5.17_2
+libmatio.so.11 matio-1.5.18_1
 libportal.so.0 libportal-0.3_1
 libvips.so.42 libvips-8.9.2_1
 libvips-cpp.so.42 libvips-8.9.2_1
diff --git a/srcpkgs/matio/template b/srcpkgs/matio/template
index 63d059701b6..63b39685e29 100644
--- a/srcpkgs/matio/template
+++ b/srcpkgs/matio/template
@@ -1,7 +1,7 @@
 # Template file for 'matio'
 pkgname=matio
-version=1.5.17
-revision=2
+version=1.5.18
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="libtool"
@@ -11,7 +11,7 @@ maintainer="Florian Eich <flrn@nrmncr.net>"
 license="BSD-2-Clause"
 homepage="https://github.com/tbeu/matio"
 distfiles="https://github.com/tbeu/matio/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=5e455527d370ab297c4abe5a2ab4d599c93ac7c1a0c85d841cc5c22f8221c400
+checksum=5fad71a63a854d821cc6f4e8c84da837149dd5fb57e1e2baeffd85fa0f28fe25
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" ac_cv_va_copy=C99"

From d548f13f6c94c22bbecffbcb04d5541618894a6f Mon Sep 17 00:00:00 2001
From: Domenico Panella <pandom79@gmail.com>
Date: Fri, 16 Oct 2020 05:37:31 +0200
Subject: [PATCH 2/2] Update: delete patch

---
 srcpkgs/matio/patches/CVE-2019-20020.patch | 45 ----------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 srcpkgs/matio/patches/CVE-2019-20020.patch

diff --git a/srcpkgs/matio/patches/CVE-2019-20020.patch b/srcpkgs/matio/patches/CVE-2019-20020.patch
deleted file mode 100644
index f86cee5ec1a..00000000000
--- a/srcpkgs/matio/patches/CVE-2019-20020.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 8138e767bf6df7cccf1664f3a854e596628fdb2d Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Sat, 28 Dec 2019 18:25:58 -0600
-Subject: [PATCH] matio: CVE-2019-20020 patch
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- src/mat5.c | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/src/mat5.c b/src/mat5.c
-index abdb351..776f233 100644
---- src/mat5.c
-+++ src/mat5.c
-@@ -980,10 +980,26 @@ ReadNextCell( mat_t *mat, matvar_t *matvar )
-                 /* Rank and Dimension */
-                 if ( uncomp_buf[0] == MAT_T_INT32 ) {
-                     int j;
-+                    size_t size;
-                     cells[i]->rank = uncomp_buf[1];
-                     nbytes -= cells[i]->rank;
-                     cells[i]->rank /= 4;
--                    cells[i]->dims = (size_t*)malloc(cells[i]->rank*sizeof(*cells[i]->dims));
-+                    if ( 0 == do_clean && cells[i]->rank > 13 ) {
-+                        int rank = cells[i]->rank;
-+                        cells[i]->rank = 0;
-+                        Mat_Critical("%d is not a valid rank", rank);
-+                        continue;
-+                    }
-+                    err = SafeMul(&size, cells[i]->rank, sizeof(*cells[i]->dims));
-+                    if ( err ) {
-+                        if ( do_clean )
-+                            free(dims);
-+                        Mat_VarFree(cells[i]);
-+                        cells[i] = NULL;
-+                        Mat_Critical("Integer multiplication overflow");
-+                        continue;
-+                    }
-+                    cells[i]->dims = (size_t*)malloc(size);
-                     if ( mat->byteswap ) {
-                         for ( j = 0; j < cells[i]->rank; j++ )
-                             cells[i]->dims[j] = Mat_uint32Swap(dims + j);
--- 
-2.24.1
-

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] matio : update to 1.5.18
  2020-10-15  9:06 [PR PATCH] matio : update to 1.5.18 pandom79
  2020-10-16  3:37 ` [PR PATCH] [Updated] " pandom79
@ 2020-10-16  3:38 ` pandom79
  2020-10-17  7:32 ` pandom79
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: pandom79 @ 2020-10-16  3:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 330 bytes --]

There is an updated pull request by pandom79 against master on the void-packages repository

https://github.com/pandom79/void-packages matio
https://github.com/void-linux/void-packages/pull/25627

matio : update to 1.5.18
required by hdf5

A patch file from https://github.com/void-linux/void-packages/pull/25627.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-matio-25627.patch --]
[-- Type: text/x-diff, Size: 3899 bytes --]

From d3afe39dd7e3d64e3018b1f9487d8a90c8ccad04 Mon Sep 17 00:00:00 2001
From: Domenico Panella <domenico@VoidDomenico.localdomain>
Date: Thu, 15 Oct 2020 11:05:07 +0200
Subject: [PATCH] matio : update to 1.5.18

---
 common/shlibs                              |  2 +-
 srcpkgs/matio/patches/CVE-2019-20020.patch | 45 ----------------------
 srcpkgs/matio/template                     |  6 +--
 3 files changed, 4 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/matio/patches/CVE-2019-20020.patch

diff --git a/common/shlibs b/common/shlibs
index e50e44f1246..234b7feb89d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3967,7 +3967,7 @@ libhidrd_opt.so.0 hidrd-0.2.0_1
 libhidrd_strm.so.0 hidrd-0.2.0_1
 libhidrd_fmt.so.0 hidrd-0.2.0_1
 libjcat.so.1 libjcat-0.1.2_1
-libmatio.so.9 matio-1.5.17_2
+libmatio.so.11 matio-1.5.18_1
 libportal.so.0 libportal-0.3_1
 libvips.so.42 libvips-8.9.2_1
 libvips-cpp.so.42 libvips-8.9.2_1
diff --git a/srcpkgs/matio/patches/CVE-2019-20020.patch b/srcpkgs/matio/patches/CVE-2019-20020.patch
deleted file mode 100644
index f86cee5ec1a..00000000000
--- a/srcpkgs/matio/patches/CVE-2019-20020.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 8138e767bf6df7cccf1664f3a854e596628fdb2d Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Sat, 28 Dec 2019 18:25:58 -0600
-Subject: [PATCH] matio: CVE-2019-20020 patch
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- src/mat5.c | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/src/mat5.c b/src/mat5.c
-index abdb351..776f233 100644
---- src/mat5.c
-+++ src/mat5.c
-@@ -980,10 +980,26 @@ ReadNextCell( mat_t *mat, matvar_t *matvar )
-                 /* Rank and Dimension */
-                 if ( uncomp_buf[0] == MAT_T_INT32 ) {
-                     int j;
-+                    size_t size;
-                     cells[i]->rank = uncomp_buf[1];
-                     nbytes -= cells[i]->rank;
-                     cells[i]->rank /= 4;
--                    cells[i]->dims = (size_t*)malloc(cells[i]->rank*sizeof(*cells[i]->dims));
-+                    if ( 0 == do_clean && cells[i]->rank > 13 ) {
-+                        int rank = cells[i]->rank;
-+                        cells[i]->rank = 0;
-+                        Mat_Critical("%d is not a valid rank", rank);
-+                        continue;
-+                    }
-+                    err = SafeMul(&size, cells[i]->rank, sizeof(*cells[i]->dims));
-+                    if ( err ) {
-+                        if ( do_clean )
-+                            free(dims);
-+                        Mat_VarFree(cells[i]);
-+                        cells[i] = NULL;
-+                        Mat_Critical("Integer multiplication overflow");
-+                        continue;
-+                    }
-+                    cells[i]->dims = (size_t*)malloc(size);
-                     if ( mat->byteswap ) {
-                         for ( j = 0; j < cells[i]->rank; j++ )
-                             cells[i]->dims[j] = Mat_uint32Swap(dims + j);
--- 
-2.24.1
-
diff --git a/srcpkgs/matio/template b/srcpkgs/matio/template
index 63d059701b6..63b39685e29 100644
--- a/srcpkgs/matio/template
+++ b/srcpkgs/matio/template
@@ -1,7 +1,7 @@
 # Template file for 'matio'
 pkgname=matio
-version=1.5.17
-revision=2
+version=1.5.18
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="libtool"
@@ -11,7 +11,7 @@ maintainer="Florian Eich <flrn@nrmncr.net>"
 license="BSD-2-Clause"
 homepage="https://github.com/tbeu/matio"
 distfiles="https://github.com/tbeu/matio/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=5e455527d370ab297c4abe5a2ab4d599c93ac7c1a0c85d841cc5c22f8221c400
+checksum=5fad71a63a854d821cc6f4e8c84da837149dd5fb57e1e2baeffd85fa0f28fe25
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" ac_cv_va_copy=C99"

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: matio : update to 1.5.18
  2020-10-15  9:06 [PR PATCH] matio : update to 1.5.18 pandom79
  2020-10-16  3:37 ` [PR PATCH] [Updated] " pandom79
  2020-10-16  3:38 ` pandom79
@ 2020-10-17  7:32 ` pandom79
  2020-10-17 12:54 ` pandom79
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: pandom79 @ 2020-10-17  7:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

New comment by pandom79 on void-packages repository

https://github.com/void-linux/void-packages/pull/25627#issuecomment-710767101

Comment:
There is only a probel related x86_64 musl. How to fix it?


^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: matio : update to 1.5.18
  2020-10-15  9:06 [PR PATCH] matio : update to 1.5.18 pandom79
                   ` (2 preceding siblings ...)
  2020-10-17  7:32 ` pandom79
@ 2020-10-17 12:54 ` pandom79
  2020-10-17 15:56 ` ericonr
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: pandom79 @ 2020-10-17 12:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 203 bytes --]

New comment by pandom79 on void-packages repository

https://github.com/void-linux/void-packages/pull/25627#issuecomment-710767101

Comment:
There is only a problem related x86_64 musl. How to fix it?


^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: matio : update to 1.5.18
  2020-10-15  9:06 [PR PATCH] matio : update to 1.5.18 pandom79
                   ` (3 preceding siblings ...)
  2020-10-17 12:54 ` pandom79
@ 2020-10-17 15:56 ` ericonr
  2020-10-17 16:19 ` ericonr
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: ericonr @ 2020-10-17 15:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/25627#issuecomment-711034389

Comment:
Add `musl-legacy-compat` to `makedepends` for musl.

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: matio : update to 1.5.18
  2020-10-15  9:06 [PR PATCH] matio : update to 1.5.18 pandom79
                   ` (4 preceding siblings ...)
  2020-10-17 15:56 ` ericonr
@ 2020-10-17 16:19 ` ericonr
  2020-10-17 16:35 ` [PR PATCH] [Updated] " pandom79
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: ericonr @ 2020-10-17 16:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 196 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/25627#issuecomment-711038405

Comment:
Might want to pull this into the `hdf5` update PR, btw.

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] matio : update to 1.5.18
  2020-10-15  9:06 [PR PATCH] matio : update to 1.5.18 pandom79
                   ` (5 preceding siblings ...)
  2020-10-17 16:19 ` ericonr
@ 2020-10-17 16:35 ` pandom79
  2020-10-17 16:37 ` pandom79
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: pandom79 @ 2020-10-17 16:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 330 bytes --]

There is an updated pull request by pandom79 against master on the void-packages repository

https://github.com/pandom79/void-packages matio
https://github.com/void-linux/void-packages/pull/25627

matio : update to 1.5.18
required by hdf5

A patch file from https://github.com/void-linux/void-packages/pull/25627.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-matio-25627.patch --]
[-- Type: text/x-diff, Size: 4533 bytes --]

From d3afe39dd7e3d64e3018b1f9487d8a90c8ccad04 Mon Sep 17 00:00:00 2001
From: Domenico Panella <domenico@VoidDomenico.localdomain>
Date: Thu, 15 Oct 2020 11:05:07 +0200
Subject: [PATCH 1/2] matio : update to 1.5.18

---
 common/shlibs                              |  2 +-
 srcpkgs/matio/patches/CVE-2019-20020.patch | 45 ----------------------
 srcpkgs/matio/template                     |  6 +--
 3 files changed, 4 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/matio/patches/CVE-2019-20020.patch

diff --git a/common/shlibs b/common/shlibs
index e50e44f1246..234b7feb89d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3967,7 +3967,7 @@ libhidrd_opt.so.0 hidrd-0.2.0_1
 libhidrd_strm.so.0 hidrd-0.2.0_1
 libhidrd_fmt.so.0 hidrd-0.2.0_1
 libjcat.so.1 libjcat-0.1.2_1
-libmatio.so.9 matio-1.5.17_2
+libmatio.so.11 matio-1.5.18_1
 libportal.so.0 libportal-0.3_1
 libvips.so.42 libvips-8.9.2_1
 libvips-cpp.so.42 libvips-8.9.2_1
diff --git a/srcpkgs/matio/patches/CVE-2019-20020.patch b/srcpkgs/matio/patches/CVE-2019-20020.patch
deleted file mode 100644
index f86cee5ec1a..00000000000
--- a/srcpkgs/matio/patches/CVE-2019-20020.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 8138e767bf6df7cccf1664f3a854e596628fdb2d Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Sat, 28 Dec 2019 18:25:58 -0600
-Subject: [PATCH] matio: CVE-2019-20020 patch
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- src/mat5.c | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/src/mat5.c b/src/mat5.c
-index abdb351..776f233 100644
---- src/mat5.c
-+++ src/mat5.c
-@@ -980,10 +980,26 @@ ReadNextCell( mat_t *mat, matvar_t *matvar )
-                 /* Rank and Dimension */
-                 if ( uncomp_buf[0] == MAT_T_INT32 ) {
-                     int j;
-+                    size_t size;
-                     cells[i]->rank = uncomp_buf[1];
-                     nbytes -= cells[i]->rank;
-                     cells[i]->rank /= 4;
--                    cells[i]->dims = (size_t*)malloc(cells[i]->rank*sizeof(*cells[i]->dims));
-+                    if ( 0 == do_clean && cells[i]->rank > 13 ) {
-+                        int rank = cells[i]->rank;
-+                        cells[i]->rank = 0;
-+                        Mat_Critical("%d is not a valid rank", rank);
-+                        continue;
-+                    }
-+                    err = SafeMul(&size, cells[i]->rank, sizeof(*cells[i]->dims));
-+                    if ( err ) {
-+                        if ( do_clean )
-+                            free(dims);
-+                        Mat_VarFree(cells[i]);
-+                        cells[i] = NULL;
-+                        Mat_Critical("Integer multiplication overflow");
-+                        continue;
-+                    }
-+                    cells[i]->dims = (size_t*)malloc(size);
-                     if ( mat->byteswap ) {
-                         for ( j = 0; j < cells[i]->rank; j++ )
-                             cells[i]->dims[j] = Mat_uint32Swap(dims + j);
--- 
-2.24.1
-
diff --git a/srcpkgs/matio/template b/srcpkgs/matio/template
index 63d059701b6..63b39685e29 100644
--- a/srcpkgs/matio/template
+++ b/srcpkgs/matio/template
@@ -1,7 +1,7 @@
 # Template file for 'matio'
 pkgname=matio
-version=1.5.17
-revision=2
+version=1.5.18
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="libtool"
@@ -11,7 +11,7 @@ maintainer="Florian Eich <flrn@nrmncr.net>"
 license="BSD-2-Clause"
 homepage="https://github.com/tbeu/matio"
 distfiles="https://github.com/tbeu/matio/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=5e455527d370ab297c4abe5a2ab4d599c93ac7c1a0c85d841cc5c22f8221c400
+checksum=5fad71a63a854d821cc6f4e8c84da837149dd5fb57e1e2baeffd85fa0f28fe25
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" ac_cv_va_copy=C99"

From 3ea8bf312e5dc1ae7bb33079b4358b87a031162a Mon Sep 17 00:00:00 2001
From: Domenico Panella <pandom79@gmail.com>
Date: Sat, 17 Oct 2020 18:35:21 +0200
Subject: [PATCH 2/2] Update

---
 srcpkgs/matio/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/matio/template b/srcpkgs/matio/template
index 63b39685e29..88a5cadcdf4 100644
--- a/srcpkgs/matio/template
+++ b/srcpkgs/matio/template
@@ -17,6 +17,11 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" ac_cv_va_copy=C99"
 fi
 
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+
 post_install() {
 	vlicense COPYING
 }

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] matio : update to 1.5.18
  2020-10-15  9:06 [PR PATCH] matio : update to 1.5.18 pandom79
                   ` (6 preceding siblings ...)
  2020-10-17 16:35 ` [PR PATCH] [Updated] " pandom79
@ 2020-10-17 16:37 ` pandom79
  2020-10-17 16:38 ` pandom79
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: pandom79 @ 2020-10-17 16:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 330 bytes --]

There is an updated pull request by pandom79 against master on the void-packages repository

https://github.com/pandom79/void-packages matio
https://github.com/void-linux/void-packages/pull/25627

matio : update to 1.5.18
required by hdf5

A patch file from https://github.com/void-linux/void-packages/pull/25627.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-matio-25627.patch --]
[-- Type: text/x-diff, Size: 4589 bytes --]

From d669b46ce1fd513727be1a6e65f46d4c1f00ed20 Mon Sep 17 00:00:00 2001
From: Domenico Panella <domenico@VoidDomenico.localdomain>
Date: Thu, 15 Oct 2020 11:05:07 +0200
Subject: [PATCH 1/2] matio : update to 1.5.18

---
 common/shlibs                              |  2 +-
 srcpkgs/matio/patches/CVE-2019-20020.patch | 45 ----------------------
 srcpkgs/matio/template                     | 11 ++++--
 3 files changed, 9 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/matio/patches/CVE-2019-20020.patch

diff --git a/common/shlibs b/common/shlibs
index e50e44f1246..234b7feb89d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3967,7 +3967,7 @@ libhidrd_opt.so.0 hidrd-0.2.0_1
 libhidrd_strm.so.0 hidrd-0.2.0_1
 libhidrd_fmt.so.0 hidrd-0.2.0_1
 libjcat.so.1 libjcat-0.1.2_1
-libmatio.so.9 matio-1.5.17_2
+libmatio.so.11 matio-1.5.18_1
 libportal.so.0 libportal-0.3_1
 libvips.so.42 libvips-8.9.2_1
 libvips-cpp.so.42 libvips-8.9.2_1
diff --git a/srcpkgs/matio/patches/CVE-2019-20020.patch b/srcpkgs/matio/patches/CVE-2019-20020.patch
deleted file mode 100644
index f86cee5ec1a..00000000000
--- a/srcpkgs/matio/patches/CVE-2019-20020.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 8138e767bf6df7cccf1664f3a854e596628fdb2d Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Sat, 28 Dec 2019 18:25:58 -0600
-Subject: [PATCH] matio: CVE-2019-20020 patch
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- src/mat5.c | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/src/mat5.c b/src/mat5.c
-index abdb351..776f233 100644
---- src/mat5.c
-+++ src/mat5.c
-@@ -980,10 +980,26 @@ ReadNextCell( mat_t *mat, matvar_t *matvar )
-                 /* Rank and Dimension */
-                 if ( uncomp_buf[0] == MAT_T_INT32 ) {
-                     int j;
-+                    size_t size;
-                     cells[i]->rank = uncomp_buf[1];
-                     nbytes -= cells[i]->rank;
-                     cells[i]->rank /= 4;
--                    cells[i]->dims = (size_t*)malloc(cells[i]->rank*sizeof(*cells[i]->dims));
-+                    if ( 0 == do_clean && cells[i]->rank > 13 ) {
-+                        int rank = cells[i]->rank;
-+                        cells[i]->rank = 0;
-+                        Mat_Critical("%d is not a valid rank", rank);
-+                        continue;
-+                    }
-+                    err = SafeMul(&size, cells[i]->rank, sizeof(*cells[i]->dims));
-+                    if ( err ) {
-+                        if ( do_clean )
-+                            free(dims);
-+                        Mat_VarFree(cells[i]);
-+                        cells[i] = NULL;
-+                        Mat_Critical("Integer multiplication overflow");
-+                        continue;
-+                    }
-+                    cells[i]->dims = (size_t*)malloc(size);
-                     if ( mat->byteswap ) {
-                         for ( j = 0; j < cells[i]->rank; j++ )
-                             cells[i]->dims[j] = Mat_uint32Swap(dims + j);
--- 
-2.24.1
-
diff --git a/srcpkgs/matio/template b/srcpkgs/matio/template
index 63d059701b6..88a5cadcdf4 100644
--- a/srcpkgs/matio/template
+++ b/srcpkgs/matio/template
@@ -1,7 +1,7 @@
 # Template file for 'matio'
 pkgname=matio
-version=1.5.17
-revision=2
+version=1.5.18
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="libtool"
@@ -11,12 +11,17 @@ maintainer="Florian Eich <flrn@nrmncr.net>"
 license="BSD-2-Clause"
 homepage="https://github.com/tbeu/matio"
 distfiles="https://github.com/tbeu/matio/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=5e455527d370ab297c4abe5a2ab4d599c93ac7c1a0c85d841cc5c22f8221c400
+checksum=5fad71a63a854d821cc6f4e8c84da837149dd5fb57e1e2baeffd85fa0f28fe25
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" ac_cv_va_copy=C99"
 fi
 
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+
 post_install() {
 	vlicense COPYING
 }

From 2459b40b2307ba804a518c2050e7d5fb182f305e Mon Sep 17 00:00:00 2001
From: Domenico Panella <pandom79@gmail.com>
Date: Sat, 17 Oct 2020 18:37:00 +0200
Subject: [PATCH 2/2] Update

---
 srcpkgs/matio/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/matio/template b/srcpkgs/matio/template
index 88a5cadcdf4..bbaf33c728c 100644
--- a/srcpkgs/matio/template
+++ b/srcpkgs/matio/template
@@ -21,7 +21,6 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" musl-legacy-compat"
 fi
 
-
 post_install() {
 	vlicense COPYING
 }

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] matio : update to 1.5.18
  2020-10-15  9:06 [PR PATCH] matio : update to 1.5.18 pandom79
                   ` (7 preceding siblings ...)
  2020-10-17 16:37 ` pandom79
@ 2020-10-17 16:38 ` pandom79
  2020-10-21 15:39 ` ahesford
  2020-10-21 15:39 ` [PR PATCH] [Closed]: " ahesford
  10 siblings, 0 replies; 12+ messages in thread
From: pandom79 @ 2020-10-17 16:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 330 bytes --]

There is an updated pull request by pandom79 against master on the void-packages repository

https://github.com/pandom79/void-packages matio
https://github.com/void-linux/void-packages/pull/25627

matio : update to 1.5.18
required by hdf5

A patch file from https://github.com/void-linux/void-packages/pull/25627.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-matio-25627.patch --]
[-- Type: text/x-diff, Size: 4033 bytes --]

From 4ee6b4ab02e1be96f561aa0c462f6783dcf84ce5 Mon Sep 17 00:00:00 2001
From: Domenico Panella <domenico@VoidDomenico.localdomain>
Date: Thu, 15 Oct 2020 11:05:07 +0200
Subject: [PATCH] matio : update to 1.5.18

---
 common/shlibs                              |  2 +-
 srcpkgs/matio/patches/CVE-2019-20020.patch | 45 ----------------------
 srcpkgs/matio/template                     | 10 +++--
 3 files changed, 8 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/matio/patches/CVE-2019-20020.patch

diff --git a/common/shlibs b/common/shlibs
index e50e44f1246..234b7feb89d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3967,7 +3967,7 @@ libhidrd_opt.so.0 hidrd-0.2.0_1
 libhidrd_strm.so.0 hidrd-0.2.0_1
 libhidrd_fmt.so.0 hidrd-0.2.0_1
 libjcat.so.1 libjcat-0.1.2_1
-libmatio.so.9 matio-1.5.17_2
+libmatio.so.11 matio-1.5.18_1
 libportal.so.0 libportal-0.3_1
 libvips.so.42 libvips-8.9.2_1
 libvips-cpp.so.42 libvips-8.9.2_1
diff --git a/srcpkgs/matio/patches/CVE-2019-20020.patch b/srcpkgs/matio/patches/CVE-2019-20020.patch
deleted file mode 100644
index f86cee5ec1a..00000000000
--- a/srcpkgs/matio/patches/CVE-2019-20020.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 8138e767bf6df7cccf1664f3a854e596628fdb2d Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Sat, 28 Dec 2019 18:25:58 -0600
-Subject: [PATCH] matio: CVE-2019-20020 patch
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- src/mat5.c | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/src/mat5.c b/src/mat5.c
-index abdb351..776f233 100644
---- src/mat5.c
-+++ src/mat5.c
-@@ -980,10 +980,26 @@ ReadNextCell( mat_t *mat, matvar_t *matvar )
-                 /* Rank and Dimension */
-                 if ( uncomp_buf[0] == MAT_T_INT32 ) {
-                     int j;
-+                    size_t size;
-                     cells[i]->rank = uncomp_buf[1];
-                     nbytes -= cells[i]->rank;
-                     cells[i]->rank /= 4;
--                    cells[i]->dims = (size_t*)malloc(cells[i]->rank*sizeof(*cells[i]->dims));
-+                    if ( 0 == do_clean && cells[i]->rank > 13 ) {
-+                        int rank = cells[i]->rank;
-+                        cells[i]->rank = 0;
-+                        Mat_Critical("%d is not a valid rank", rank);
-+                        continue;
-+                    }
-+                    err = SafeMul(&size, cells[i]->rank, sizeof(*cells[i]->dims));
-+                    if ( err ) {
-+                        if ( do_clean )
-+                            free(dims);
-+                        Mat_VarFree(cells[i]);
-+                        cells[i] = NULL;
-+                        Mat_Critical("Integer multiplication overflow");
-+                        continue;
-+                    }
-+                    cells[i]->dims = (size_t*)malloc(size);
-                     if ( mat->byteswap ) {
-                         for ( j = 0; j < cells[i]->rank; j++ )
-                             cells[i]->dims[j] = Mat_uint32Swap(dims + j);
--- 
-2.24.1
-
diff --git a/srcpkgs/matio/template b/srcpkgs/matio/template
index 63d059701b6..bbaf33c728c 100644
--- a/srcpkgs/matio/template
+++ b/srcpkgs/matio/template
@@ -1,7 +1,7 @@
 # Template file for 'matio'
 pkgname=matio
-version=1.5.17
-revision=2
+version=1.5.18
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="libtool"
@@ -11,12 +11,16 @@ maintainer="Florian Eich <flrn@nrmncr.net>"
 license="BSD-2-Clause"
 homepage="https://github.com/tbeu/matio"
 distfiles="https://github.com/tbeu/matio/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=5e455527d370ab297c4abe5a2ab4d599c93ac7c1a0c85d841cc5c22f8221c400
+checksum=5fad71a63a854d821cc6f4e8c84da837149dd5fb57e1e2baeffd85fa0f28fe25
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" ac_cv_va_copy=C99"
 fi
 
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
 post_install() {
 	vlicense COPYING
 }

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: matio : update to 1.5.18
  2020-10-15  9:06 [PR PATCH] matio : update to 1.5.18 pandom79
                   ` (8 preceding siblings ...)
  2020-10-17 16:38 ` pandom79
@ 2020-10-21 15:39 ` ahesford
  2020-10-21 15:39 ` [PR PATCH] [Closed]: " ahesford
  10 siblings, 0 replies; 12+ messages in thread
From: ahesford @ 2020-10-21 15:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/25627#issuecomment-713667099

Comment:
Please incorporate with #25569 because this must be built *after* `hdf5`.

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Closed]: matio : update to 1.5.18
  2020-10-15  9:06 [PR PATCH] matio : update to 1.5.18 pandom79
                   ` (9 preceding siblings ...)
  2020-10-21 15:39 ` ahesford
@ 2020-10-21 15:39 ` ahesford
  10 siblings, 0 replies; 12+ messages in thread
From: ahesford @ 2020-10-21 15:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 174 bytes --]

There's a closed pull request on the void-packages repository

matio : update to 1.5.18
https://github.com/void-linux/void-packages/pull/25627

Description:
required by hdf5

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2020-10-21 15:39 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-15  9:06 [PR PATCH] matio : update to 1.5.18 pandom79
2020-10-16  3:37 ` [PR PATCH] [Updated] " pandom79
2020-10-16  3:38 ` pandom79
2020-10-17  7:32 ` pandom79
2020-10-17 12:54 ` pandom79
2020-10-17 15:56 ` ericonr
2020-10-17 16:19 ` ericonr
2020-10-17 16:35 ` [PR PATCH] [Updated] " pandom79
2020-10-17 16:37 ` pandom79
2020-10-17 16:38 ` pandom79
2020-10-21 15:39 ` ahesford
2020-10-21 15:39 ` [PR PATCH] [Closed]: " ahesford

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ http://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git