[PR PATCH] astroid: apply upstream patch to prevent crashes while adding attachments

[PR PATCH] astroid: apply upstream patch to prevent crashes while adding attachments

[bitmeise]

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

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

https://github.com/bitmeise/void-packages astroid016_attachments
https://github.com/void-linux/void-packages/pull/48355

astroid: apply upstream patch to prevent crashes while adding attachments
This update is applying a non-release upstream patch to prevent crashes while adding attachments.
See astroidmail/astroid/issues/726 for more information.

#### Testing the changes
- I tested the changes in this PR: YES

#### Local build testing
- I built this PR locally for my native architecture, (x68_64-LIBC)

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

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

From 387234e17b21538cc7d7f1a72c27e45db8640337 Mon Sep 17 00:00:00 2001
From: Bitmeise <ameise@bitparlament.de>
Date: Wed, 24 Jan 2024 17:43:27 +0100
Subject: [PATCH] astroid: apply upstream patch to prevent crashes while adding
 attachments

---
 srcpkgs/astroid/patches/attachements.patch | 13 +++++++++++++
 srcpkgs/astroid/template                   |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/astroid/patches/attachements.patch

diff --git a/srcpkgs/astroid/patches/attachements.patch b/srcpkgs/astroid/patches/attachements.patch
new file mode 100644
index 0000000000000..2874e934b4013
--- /dev/null
+++ b/srcpkgs/astroid/patches/attachements.patch
@@ -0,0 +1,13 @@
+diff --git a/src/compose_message.cc b/src/compose_message.cc
+index 189c20f..329481f 100644
+--- a/src/compose_message.cc
++++ b/src/compose_message.cc
+@@ -781,7 +781,7 @@ namespace Astroid {
+ 
+     } else {
+       /* load into byte array */
+-      refptr<Gio::File> fle = Glib::wrap (file, false);
++      refptr<Gio::File> fle = Glib::wrap (file, true);
+       refptr<Gio::FileInputStream> istr = fle->read ();
+ 
+       refptr<Glib::Bytes> b;
diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template
index c56fbbb1ba358..2bd79b3a9420f 100644
--- a/srcpkgs/astroid/template
+++ b/srcpkgs/astroid/template
@@ -1,7 +1,7 @@
 # Template file for 'astroid'
 pkgname=astroid
 version=0.16
-revision=11
+revision=12
 build_style=cmake
 build_helper=gir
 hostmakedepends="pkg-config scdoc protobuf gobject-introspection"

Re: astroid: apply upstream patch to prevent crashes while adding attachments

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/48355#issuecomment-1908778203

Comment:
The patch should probably include the commit hash, you can just copy-paste: https://github.com/astroidmail/astroid/commit/7fd64c41435a2b99fb9e0a5770a83ba30cd11450.patch

Re: astroid: apply upstream patch to prevent crashes while adding attachments

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/48355#issuecomment-1908778203

Comment:
The patch should probably include the commit info, you can just copy-paste: https://github.com/astroidmail/astroid/commit/7fd64c41435a2b99fb9e0a5770a83ba30cd11450.patch

Re: [PR PATCH] [Updated] astroid: apply upstream patch to prevent crashes while adding attachments

[bitmeise]

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

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

https://github.com/bitmeise/void-packages astroid016_attachments
https://github.com/void-linux/void-packages/pull/48355

astroid: apply upstream patch to prevent crashes while adding attachments
This update is applying a non-release upstream patch to prevent crashes while adding attachments.
See astroidmail/astroid/issues/726 for more information.

#### Testing the changes
- I tested the changes in this PR: YES

#### Local build testing
- I built this PR locally for my native architecture, (x68_64-glibc)

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

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

From 387234e17b21538cc7d7f1a72c27e45db8640337 Mon Sep 17 00:00:00 2001
From: Bitmeise <ameise@bitparlament.de>
Date: Wed, 24 Jan 2024 17:43:27 +0100
Subject: [PATCH 1/2] astroid: apply upstream patch to prevent crashes while
 adding attachments

---
 srcpkgs/astroid/patches/attachements.patch | 13 +++++++++++++
 srcpkgs/astroid/template                   |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/astroid/patches/attachements.patch

diff --git a/srcpkgs/astroid/patches/attachements.patch b/srcpkgs/astroid/patches/attachements.patch
new file mode 100644
index 0000000000000..2874e934b4013
--- /dev/null
+++ b/srcpkgs/astroid/patches/attachements.patch
@@ -0,0 +1,13 @@
+diff --git a/src/compose_message.cc b/src/compose_message.cc
+index 189c20f..329481f 100644
+--- a/src/compose_message.cc
++++ b/src/compose_message.cc
+@@ -781,7 +781,7 @@ namespace Astroid {
+ 
+     } else {
+       /* load into byte array */
+-      refptr<Gio::File> fle = Glib::wrap (file, false);
++      refptr<Gio::File> fle = Glib::wrap (file, true);
+       refptr<Gio::FileInputStream> istr = fle->read ();
+ 
+       refptr<Glib::Bytes> b;
diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template
index c56fbbb1ba358..2bd79b3a9420f 100644
--- a/srcpkgs/astroid/template
+++ b/srcpkgs/astroid/template
@@ -1,7 +1,7 @@
 # Template file for 'astroid'
 pkgname=astroid
 version=0.16
-revision=11
+revision=12
 build_style=cmake
 build_helper=gir
 hostmakedepends="pkg-config scdoc protobuf gobject-introspection"

From bc73079ed6dacfe1c03d9d3a60b3bfd1c127d00b Mon Sep 17 00:00:00 2001
From: Bitmeise <ameise@bitparlament.de>
Date: Wed, 24 Jan 2024 21:03:35 +0100
Subject: [PATCH 2/2] add commit info to patch file

---
 srcpkgs/astroid/patches/attachements.patch | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/astroid/patches/attachements.patch b/srcpkgs/astroid/patches/attachements.patch
index 2874e934b4013..e01e274c324c1 100644
--- a/srcpkgs/astroid/patches/attachements.patch
+++ b/srcpkgs/astroid/patches/attachements.patch
@@ -1,5 +1,15 @@
+From 7fd64c41435a2b99fb9e0a5770a83ba30cd11450 Mon Sep 17 00:00:00 2001
+From: "Stephan C. Buchert" <scb@irfu.se>
+Date: Wed, 14 Jun 2023 17:44:05 +0200
+Subject: [PATCH] compose_message: to load as byte array, 'file' must be
+ wrapped with copy.
+
+---
+ src/compose_message.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 diff --git a/src/compose_message.cc b/src/compose_message.cc
-index 189c20f..329481f 100644
+index 189c20f99..329481f40 100644
 --- a/src/compose_message.cc
 +++ b/src/compose_message.cc
 @@ -781,7 +781,7 @@ namespace Astroid {

Re: [PR PATCH] [Updated] astroid: apply upstream patch to prevent crashes while adding attachments

[bitmeise]

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

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

https://github.com/bitmeise/void-packages astroid016_attachments
https://github.com/void-linux/void-packages/pull/48355

astroid: apply upstream patch to prevent crashes while adding attachments
This update is applying a non-release upstream patch to prevent crashes while adding attachments.
See astroidmail/astroid/issues/726 for more information.

#### Testing the changes
- I tested the changes in this PR: YES

#### Local build testing
- I built this PR locally for my native architecture, (x68_64-glibc)

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

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

From b628419bd64f21eafcffee34723d253c1aa0bccd Mon Sep 17 00:00:00 2001
From: Bitmeise <ameise@bitparlament.de>
Date: Wed, 24 Jan 2024 17:43:27 +0100
Subject: [PATCH] astroid: apply upstream patch to prevent crashes while adding
 attachments

---
 srcpkgs/astroid/patches/attachements.patch | 23 ++++++++++++++++++++++
 srcpkgs/astroid/template                   |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/astroid/patches/attachements.patch

diff --git a/srcpkgs/astroid/patches/attachements.patch b/srcpkgs/astroid/patches/attachements.patch
new file mode 100644
index 0000000000000..e01e274c324c1
--- /dev/null
+++ b/srcpkgs/astroid/patches/attachements.patch
@@ -0,0 +1,23 @@
+From 7fd64c41435a2b99fb9e0a5770a83ba30cd11450 Mon Sep 17 00:00:00 2001
+From: "Stephan C. Buchert" <scb@irfu.se>
+Date: Wed, 14 Jun 2023 17:44:05 +0200
+Subject: [PATCH] compose_message: to load as byte array, 'file' must be
+ wrapped with copy.
+
+---
+ src/compose_message.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/compose_message.cc b/src/compose_message.cc
+index 189c20f99..329481f40 100644
+--- a/src/compose_message.cc
++++ b/src/compose_message.cc
+@@ -781,7 +781,7 @@ namespace Astroid {
+ 
+     } else {
+       /* load into byte array */
+-      refptr<Gio::File> fle = Glib::wrap (file, false);
++      refptr<Gio::File> fle = Glib::wrap (file, true);
+       refptr<Gio::FileInputStream> istr = fle->read ();
+ 
+       refptr<Glib::Bytes> b;
diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template
index c56fbbb1ba358..2bd79b3a9420f 100644
--- a/srcpkgs/astroid/template
+++ b/srcpkgs/astroid/template
@@ -1,7 +1,7 @@
 # Template file for 'astroid'
 pkgname=astroid
 version=0.16
-revision=11
+revision=12
 build_style=cmake
 build_helper=gir
 hostmakedepends="pkg-config scdoc protobuf gobject-introspection"

Re: astroid: apply upstream patch to prevent crashes while adding attachments

[bitmeise]

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

New comment by bitmeise on void-packages repository

https://github.com/void-linux/void-packages/pull/48355#issuecomment-1908844042

Comment:
Good point and thanks for the really helpful hint. Noted for the next time.

Re: [PR PATCH] [Merged]: astroid: apply upstream patch to prevent crashes while adding attachments

[classabbyamp]

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

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

astroid: apply upstream patch to prevent crashes while adding attachments
https://github.com/void-linux/void-packages/pull/48355

Description:
This update is applying a non-release upstream patch to prevent crashes while adding attachments.
See astroidmail/astroid/issues/726 for more information.

#### Testing the changes
- I tested the changes in this PR: YES

#### Local build testing
- I built this PR locally for my native architecture, (x68_64-glibc)