Github messages for voidlinux
 help / color / mirror / Atom feed
From: pandom79 <pandom79@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] matio : update to 1.5.18
Date: Sat, 17 Oct 2020 18:37:26 +0200	[thread overview]
Message-ID: <20201017163726.nTBPhiBjuzZpjO7owLmUh7D0KGSGtsTd9Jev4OeagHo@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25627@inbox.vuxu.org>

[-- 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
 }

  parent reply	other threads:[~2020-10-17 16:37 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-15  9:06 [PR PATCH] " 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 [this message]
2020-10-17 16:38 ` pandom79
2020-10-21 15:39 ` ahesford
2020-10-21 15:39 ` [PR PATCH] [Closed]: " ahesford

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201017163726.nTBPhiBjuzZpjO7owLmUh7D0KGSGtsTd9Jev4OeagHo@z \
    --to=pandom79@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).