[PR PATCH] Fix qbittorrent crash on musl

[PR PATCH] Fix qbittorrent crash on musl

[ericonr]

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

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

https://github.com/ericonr/void-packages boost-fix
https://github.com/void-linux/void-packages/pull/39154

Fix qbittorrent crash on musl
- boost: fix segfault in asio+align module.
- libtorrent-rasterbar: rebuild to fix segfault.

<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From a8741c7190b8998c5081737f1bf6074c91fd5761 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 7 Sep 2022 17:32:19 -0300
Subject: [PATCH 1/2] boost: fix segfault in asio+align module.

---
 srcpkgs/boost/patches/align.patch | 49 +++++++++++++++++++++++++++++++
 srcpkgs/boost/template            |  2 +-
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/boost/patches/align.patch

diff --git a/srcpkgs/boost/patches/align.patch b/srcpkgs/boost/patches/align.patch
new file mode 100644
index 000000000000..bc4ff316ded4
--- /dev/null
+++ b/srcpkgs/boost/patches/align.patch
@@ -0,0 +1,49 @@
+This code is wrong and uses feature test macros to determine whether something
+is available; FTMs shouldn't be in user code outside of top level #define's.
+
+This lead to an issue on musl where libtorrent-rasterbar was including this
+header (via boost asio) from two different places, and segfaulting due to
+mismatched implementations -- one's the posix one using posix_memalign, the
+other one's the generic one that stores a pointer to itself.
+
+posix_memalign is always available and should always be used, so we force that.
+
+diff --git a/boost/align/aligned_alloc.hpp b/boost/align/aligned_alloc.hpp
+index 1d81a13..a441645 100644
+--- a/boost/align/aligned_alloc.hpp
++++ b/boost/align/aligned_alloc.hpp
+@@ -14,34 +14,6 @@ Distributed under the Boost Software License, Version 1.0.
+ #include <unistd.h>
+ #endif
+ 
+-#if defined(__APPLE__) || defined(__APPLE_CC__) || defined(macintosh)
+-#include <AvailabilityMacros.h>
+-#endif
+-
+-#if defined(BOOST_ALIGN_USE_ALIGN)
+-#include <boost/align/detail/aligned_alloc.hpp>
+-#elif defined(BOOST_ALIGN_USE_NEW)
+-#include <boost/align/detail/aligned_alloc_new.hpp>
+-#elif defined(_MSC_VER) && !defined(UNDER_CE)
+-#include <boost/align/detail/aligned_alloc_msvc.hpp>
+-#elif defined(__MINGW32__) && (__MSVCRT_VERSION__ >= 0x0700)
+-#include <boost/align/detail/aligned_alloc_msvc.hpp>
+-#elif defined(__MINGW32__)
+-#include <boost/align/detail/aligned_alloc_mingw.hpp>
+-#elif MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+-#include <boost/align/detail/aligned_alloc_posix.hpp>
+-#elif MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+-#include <boost/align/detail/aligned_alloc_macos.hpp>
+-#elif defined(__ANDROID__)
+-#include <boost/align/detail/aligned_alloc_android.hpp>
+-#elif defined(__SunOS_5_11) || defined(__SunOS_5_12)
+ #include <boost/align/detail/aligned_alloc_posix.hpp>
+-#elif defined(sun) || defined(__sun)
+-#include <boost/align/detail/aligned_alloc_sunos.hpp>
+-#elif (_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600)
+-#include <boost/align/detail/aligned_alloc_posix.hpp>
+-#else
+-#include <boost/align/detail/aligned_alloc.hpp>
+-#endif
+ 
+ #endif
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 0d103e335b52..ef383d7f85ed 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.80.0
-revision=1
+revision=2
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config"
 makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel

From 67d4f3ca885fb05c2a99c88aaadb9778947aa826 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 7 Sep 2022 17:34:19 -0300
Subject: [PATCH 2/2] libtorrent-rasterbar: rebuild to fix segfault.

Since asio is a header-only library, we need to rebuild its dependents.
---
 srcpkgs/libtorrent-rasterbar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 52377b39eca4..135d89b9c85a 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,7 +2,7 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.17
-revision=1
+revision=2
 build_style=cmake
 configure_args="DCMAKE_CXX_STANDARD=14 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"

Re: Fix qbittorrent crash on musl

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/39154#issuecomment-1239846016

Comment:
I opened a PR because I'm not sure if there's any other package using asio that needs to be rebuilt.

Re: [PR REVIEW] Fix qbittorrent crash on musl

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/39154#discussion_r965425361

Comment:
Please don't patch this, add `-D_POSIX_C_SOURCE=201112L` instead, or alternately, patch only last 2 legs.
The diff looks like you're removing all legs but SunOS.

Re: [PR REVIEW] Fix qbittorrent crash on musl

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/39154#discussion_r965425628

Comment:
Or `#error` in the last leg

Re: [PR REVIEW] Fix qbittorrent crash on musl

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/39154#discussion_r965452708

Comment:
I don't want to fix this with a define in CXXFLAGS because it requires fixing in all packages that use the library, instead of a single fix in the library.

If I manage to rework the patch to look like the posix version is the one being kept or add a comment making that clear and that it's because, as a distro, we know where these headers are being used, would it be okay for you?

Re: [PR REVIEW] Fix qbittorrent crash on musl

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/39154#discussion_r965452939

Comment:
I guess reworking the last fallback to just include the posix version would be equivalent, and I'd be okay with it.

Re: [PR PATCH] [Updated] Fix qbittorrent crash on musl

[ericonr]

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

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

https://github.com/ericonr/void-packages boost-fix
https://github.com/void-linux/void-packages/pull/39154

Fix qbittorrent crash on musl
- boost: fix segfault in asio+align module.
- libtorrent-rasterbar: rebuild to fix segfault.

<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 06d3b4b7138cabe411a51bf79f90889193aae017 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 7 Sep 2022 17:32:19 -0300
Subject: [PATCH 1/2] boost: fix segfault in asio+align module.

---
 srcpkgs/boost/patches/align.patch | 28 ++++++++++++++++++++++++++++
 srcpkgs/boost/template            |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/boost/patches/align.patch

diff --git a/srcpkgs/boost/patches/align.patch b/srcpkgs/boost/patches/align.patch
new file mode 100644
index 000000000000..e3de2159cf6e
--- /dev/null
+++ b/srcpkgs/boost/patches/align.patch
@@ -0,0 +1,28 @@
+This code is wrong and uses feature test macros to determine whether something
+is available; FTMs shouldn't be in user code outside of top level #define's.
+
+This lead to an issue on musl where libtorrent-rasterbar was including this
+header (via boost asio) from two different places, and segfaulting due to
+mismatched implementations -- one's the posix one using posix_memalign, the
+other one's the generic one that stores a pointer to itself.
+
+posix_memalign is always available on the libcs we support and should always be
+used, so we force that. We still leave applications with the option of forcing
+boost specific behavior, if they really want it.
+
+diff --git a/boost/align/aligned_alloc.hpp b/boost/align/aligned_alloc.hpp
+index 1d81a13..f2b5137 100644
+--- a/boost/align/aligned_alloc.hpp
++++ b/boost/align/aligned_alloc.hpp
+@@ -38,10 +38,8 @@ Distributed under the Boost Software License, Version 1.0.
+ #include <boost/align/detail/aligned_alloc_posix.hpp>
+ #elif defined(sun) || defined(__sun)
+ #include <boost/align/detail/aligned_alloc_sunos.hpp>
+-#elif (_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600)
+-#include <boost/align/detail/aligned_alloc_posix.hpp>
+ #else
+-#include <boost/align/detail/aligned_alloc.hpp>
++#include <boost/align/detail/aligned_alloc_posix.hpp>
+ #endif
+ 
+ #endif
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 0d103e335b52..ef383d7f85ed 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.80.0
-revision=1
+revision=2
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config"
 makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel

From 93f57033f43927af037047d7fb111699ff7aae39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 7 Sep 2022 17:34:19 -0300
Subject: [PATCH 2/2] libtorrent-rasterbar: rebuild to fix segfault.

Since asio is a header-only library, we need to rebuild its dependents.
---
 srcpkgs/libtorrent-rasterbar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 52377b39eca4..135d89b9c85a 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,7 +2,7 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.17
-revision=1
+revision=2
 build_style=cmake
 configure_args="DCMAKE_CXX_STANDARD=14 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"

Re: [PR REVIEW] Fix qbittorrent crash on musl

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/39154#discussion_r965524818

Comment:
We may need to:
```cpp
#ifndef _POSIX_C_SOURCE
#define _POSIX_C_SOURCE 200112L
#endif
```

Just in case the `boost/align/detail/aligned_alloc_posix.hpp` needs something only available when that macro is defined?

Re: [PR REVIEW] Fix qbittorrent crash on musl

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/39154#discussion_r965524818

Comment:
We may need to:
```cpp
#ifndef _POSIX_C_SOURCE
#define _POSIX_C_SOURCE 200112L
#elif _POSIX_C_SOURCE < 200112L
#undef _POSIX_C_SOURCE
#define _POSIX_C_SOURCE 200112L
#endif
```

Just in case the `boost/align/detail/aligned_alloc_posix.hpp` needs something only available when that macro is defined?

Don't know if `_POSIX_C_SOURCE < 200112L` is a good idea, though.

Re: [PR PATCH] [Updated] Fix qbittorrent crash on musl

[sgn]

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

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

https://github.com/ericonr/void-packages boost-fix
https://github.com/void-linux/void-packages/pull/39154

Fix qbittorrent crash on musl
- boost: fix segfault in asio+align module.
- libtorrent-rasterbar: rebuild to fix segfault.

<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 06d3b4b7138cabe411a51bf79f90889193aae017 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 7 Sep 2022 17:32:19 -0300
Subject: [PATCH 1/3] boost: fix segfault in asio+align module.

---
 srcpkgs/boost/patches/align.patch | 28 ++++++++++++++++++++++++++++
 srcpkgs/boost/template            |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/boost/patches/align.patch

diff --git a/srcpkgs/boost/patches/align.patch b/srcpkgs/boost/patches/align.patch
new file mode 100644
index 000000000000..e3de2159cf6e
--- /dev/null
+++ b/srcpkgs/boost/patches/align.patch
@@ -0,0 +1,28 @@
+This code is wrong and uses feature test macros to determine whether something
+is available; FTMs shouldn't be in user code outside of top level #define's.
+
+This lead to an issue on musl where libtorrent-rasterbar was including this
+header (via boost asio) from two different places, and segfaulting due to
+mismatched implementations -- one's the posix one using posix_memalign, the
+other one's the generic one that stores a pointer to itself.
+
+posix_memalign is always available on the libcs we support and should always be
+used, so we force that. We still leave applications with the option of forcing
+boost specific behavior, if they really want it.
+
+diff --git a/boost/align/aligned_alloc.hpp b/boost/align/aligned_alloc.hpp
+index 1d81a13..f2b5137 100644
+--- a/boost/align/aligned_alloc.hpp
++++ b/boost/align/aligned_alloc.hpp
+@@ -38,10 +38,8 @@ Distributed under the Boost Software License, Version 1.0.
+ #include <boost/align/detail/aligned_alloc_posix.hpp>
+ #elif defined(sun) || defined(__sun)
+ #include <boost/align/detail/aligned_alloc_sunos.hpp>
+-#elif (_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600)
+-#include <boost/align/detail/aligned_alloc_posix.hpp>
+ #else
+-#include <boost/align/detail/aligned_alloc.hpp>
++#include <boost/align/detail/aligned_alloc_posix.hpp>
+ #endif
+ 
+ #endif
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 0d103e335b52..ef383d7f85ed 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.80.0
-revision=1
+revision=2
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config"
 makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel

From 93f57033f43927af037047d7fb111699ff7aae39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 7 Sep 2022 17:34:19 -0300
Subject: [PATCH 2/3] libtorrent-rasterbar: rebuild to fix segfault.

Since asio is a header-only library, we need to rebuild its dependents.
---
 srcpkgs/libtorrent-rasterbar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 52377b39eca4..135d89b9c85a 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,7 +2,7 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.17
-revision=1
+revision=2
 build_style=cmake
 configure_args="DCMAKE_CXX_STANDARD=14 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"

From 58b4da4968dbfd556a4c0ae9b732e9820154c9bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 9 Sep 2022 08:54:11 +0700
Subject: [PATCH 3/3] fixup! boost: fix segfault in asio+align module.

---
 srcpkgs/boost/patches/align.patch | 38 +++++++++++++++++--------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/boost/patches/align.patch b/srcpkgs/boost/patches/align.patch
index e3de2159cf6e..99e4fb2a1c5e 100644
--- a/srcpkgs/boost/patches/align.patch
+++ b/srcpkgs/boost/patches/align.patch
@@ -1,5 +1,6 @@
-This code is wrong and uses feature test macros to determine whether something
-is available; FTMs shouldn't be in user code outside of top level #define's.
+boost/align/aligned_alloc.hpp is wrong, it uses feature test macros to
+determine whether something is available;
+FTMs shouldn't be in user code outside of top level #define's.
 
 This lead to an issue on musl where libtorrent-rasterbar was including this
 header (via boost asio) from two different places, and segfaulting due to
@@ -10,19 +11,22 @@ posix_memalign is always available on the libcs we support and should always be
 used, so we force that. We still leave applications with the option of forcing
 boost specific behavior, if they really want it.
 
-diff --git a/boost/align/aligned_alloc.hpp b/boost/align/aligned_alloc.hpp
-index 1d81a13..f2b5137 100644
---- a/boost/align/aligned_alloc.hpp
-+++ b/boost/align/aligned_alloc.hpp
-@@ -38,10 +38,8 @@ Distributed under the Boost Software License, Version 1.0.
- #include <boost/align/detail/aligned_alloc_posix.hpp>
- #elif defined(sun) || defined(__sun)
- #include <boost/align/detail/aligned_alloc_sunos.hpp>
--#elif (_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600)
--#include <boost/align/detail/aligned_alloc_posix.hpp>
- #else
--#include <boost/align/detail/aligned_alloc.hpp>
-+#include <boost/align/detail/aligned_alloc_posix.hpp>
- #endif
+Instead of patching only boost/align/aligned_alloc.hpp, which fix the
+bug if boost::asio is used, but may keep other boost's code use feature tests
+macro, now or later, let's patch boost/config.hpp to always define
+_XOPEN_SOURCE instead.
+
+--- a/boost/config.hpp
++++ b/boost/config.hpp
+@@ -17,6 +17,11 @@
+ #ifndef BOOST_CONFIG_HPP
+ #define BOOST_CONFIG_HPP
  
- #endif
++#ifdef __linux__
+++/* for features.h, which will define _XOPEN_SOURCE or _POSIX_C_SOURCE */
++#include <features.h>
++#endif
++
+ // if we don't have a user config, then use the default location:
+ #if !defined(BOOST_USER_CONFIG) && !defined(BOOST_NO_USER_CONFIG)
+ #  define BOOST_USER_CONFIG <boost/config/user.hpp>

Re: [PR PATCH] [Updated] Fix qbittorrent crash on musl

[sgn]

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

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

https://github.com/ericonr/void-packages boost-fix
https://github.com/void-linux/void-packages/pull/39154

Fix qbittorrent crash on musl
- boost: fix segfault in asio+align module.
- libtorrent-rasterbar: rebuild to fix segfault.

<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 06d3b4b7138cabe411a51bf79f90889193aae017 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 7 Sep 2022 17:32:19 -0300
Subject: [PATCH 1/4] boost: fix segfault in asio+align module.

---
 srcpkgs/boost/patches/align.patch | 28 ++++++++++++++++++++++++++++
 srcpkgs/boost/template            |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/boost/patches/align.patch

diff --git a/srcpkgs/boost/patches/align.patch b/srcpkgs/boost/patches/align.patch
new file mode 100644
index 000000000000..e3de2159cf6e
--- /dev/null
+++ b/srcpkgs/boost/patches/align.patch
@@ -0,0 +1,28 @@
+This code is wrong and uses feature test macros to determine whether something
+is available; FTMs shouldn't be in user code outside of top level #define's.
+
+This lead to an issue on musl where libtorrent-rasterbar was including this
+header (via boost asio) from two different places, and segfaulting due to
+mismatched implementations -- one's the posix one using posix_memalign, the
+other one's the generic one that stores a pointer to itself.
+
+posix_memalign is always available on the libcs we support and should always be
+used, so we force that. We still leave applications with the option of forcing
+boost specific behavior, if they really want it.
+
+diff --git a/boost/align/aligned_alloc.hpp b/boost/align/aligned_alloc.hpp
+index 1d81a13..f2b5137 100644
+--- a/boost/align/aligned_alloc.hpp
++++ b/boost/align/aligned_alloc.hpp
+@@ -38,10 +38,8 @@ Distributed under the Boost Software License, Version 1.0.
+ #include <boost/align/detail/aligned_alloc_posix.hpp>
+ #elif defined(sun) || defined(__sun)
+ #include <boost/align/detail/aligned_alloc_sunos.hpp>
+-#elif (_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600)
+-#include <boost/align/detail/aligned_alloc_posix.hpp>
+ #else
+-#include <boost/align/detail/aligned_alloc.hpp>
++#include <boost/align/detail/aligned_alloc_posix.hpp>
+ #endif
+ 
+ #endif
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 0d103e335b52..ef383d7f85ed 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.80.0
-revision=1
+revision=2
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config"
 makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel

From 93f57033f43927af037047d7fb111699ff7aae39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 7 Sep 2022 17:34:19 -0300
Subject: [PATCH 2/4] libtorrent-rasterbar: rebuild to fix segfault.

Since asio is a header-only library, we need to rebuild its dependents.
---
 srcpkgs/libtorrent-rasterbar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 52377b39eca4..135d89b9c85a 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,7 +2,7 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.17
-revision=1
+revision=2
 build_style=cmake
 configure_args="DCMAKE_CXX_STANDARD=14 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"

From 58b4da4968dbfd556a4c0ae9b732e9820154c9bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 9 Sep 2022 08:54:11 +0700
Subject: [PATCH 3/4] fixup! boost: fix segfault in asio+align module.

---
 srcpkgs/boost/patches/align.patch | 38 +++++++++++++++++--------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/boost/patches/align.patch b/srcpkgs/boost/patches/align.patch
index e3de2159cf6e..99e4fb2a1c5e 100644
--- a/srcpkgs/boost/patches/align.patch
+++ b/srcpkgs/boost/patches/align.patch
@@ -1,5 +1,6 @@
-This code is wrong and uses feature test macros to determine whether something
-is available; FTMs shouldn't be in user code outside of top level #define's.
+boost/align/aligned_alloc.hpp is wrong, it uses feature test macros to
+determine whether something is available;
+FTMs shouldn't be in user code outside of top level #define's.
 
 This lead to an issue on musl where libtorrent-rasterbar was including this
 header (via boost asio) from two different places, and segfaulting due to
@@ -10,19 +11,22 @@ posix_memalign is always available on the libcs we support and should always be
 used, so we force that. We still leave applications with the option of forcing
 boost specific behavior, if they really want it.
 
-diff --git a/boost/align/aligned_alloc.hpp b/boost/align/aligned_alloc.hpp
-index 1d81a13..f2b5137 100644
---- a/boost/align/aligned_alloc.hpp
-+++ b/boost/align/aligned_alloc.hpp
-@@ -38,10 +38,8 @@ Distributed under the Boost Software License, Version 1.0.
- #include <boost/align/detail/aligned_alloc_posix.hpp>
- #elif defined(sun) || defined(__sun)
- #include <boost/align/detail/aligned_alloc_sunos.hpp>
--#elif (_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600)
--#include <boost/align/detail/aligned_alloc_posix.hpp>
- #else
--#include <boost/align/detail/aligned_alloc.hpp>
-+#include <boost/align/detail/aligned_alloc_posix.hpp>
- #endif
+Instead of patching only boost/align/aligned_alloc.hpp, which fix the
+bug if boost::asio is used, but may keep other boost's code use feature tests
+macro, now or later, let's patch boost/config.hpp to always define
+_XOPEN_SOURCE instead.
+
+--- a/boost/config.hpp
++++ b/boost/config.hpp
+@@ -17,6 +17,11 @@
+ #ifndef BOOST_CONFIG_HPP
+ #define BOOST_CONFIG_HPP
  
- #endif
++#ifdef __linux__
+++/* for features.h, which will define _XOPEN_SOURCE or _POSIX_C_SOURCE */
++#include <features.h>
++#endif
++
+ // if we don't have a user config, then use the default location:
+ #if !defined(BOOST_USER_CONFIG) && !defined(BOOST_NO_USER_CONFIG)
+ #  define BOOST_USER_CONFIG <boost/config/user.hpp>

From 5880f7b12c9c9d38f717105cf652b5a7a46f2ce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 9 Sep 2022 08:56:41 +0700
Subject: [PATCH 4/4] fixup! fixup! boost: fix segfault in asio+align module.

---
 .../boost/{patches/align.patch => feature-test-macros.patch}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename srcpkgs/boost/{patches/align.patch => feature-test-macros.patch} (94%)

diff --git a/srcpkgs/boost/patches/align.patch b/srcpkgs/boost/feature-test-macros.patch
similarity index 94%
rename from srcpkgs/boost/patches/align.patch
rename to srcpkgs/boost/feature-test-macros.patch
index 99e4fb2a1c5e..d674cd903e66 100644
--- a/srcpkgs/boost/patches/align.patch
+++ b/srcpkgs/boost/feature-test-macros.patch
@@ -23,7 +23,7 @@ _XOPEN_SOURCE instead.
  #define BOOST_CONFIG_HPP
  
 +#ifdef __linux__
-++/* for features.h, which will define _XOPEN_SOURCE or _POSIX_C_SOURCE */
+++/* for _XOPEN_SOURCE and/or _POSIX_C_SOURCE */
 +#include <features.h>
 +#endif
 +

Re: [PR REVIEW] Fix qbittorrent crash on musl

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/39154#discussion_r966555806

Comment:
I think it's better to `#include <features.h>` in `boost/config.hpp`. Just in case other headers (now or later) decide to use feature test macros.

Re: [PR PATCH] [Updated] Fix qbittorrent crash on musl

[sgn]

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

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

https://github.com/ericonr/void-packages boost-fix
https://github.com/void-linux/void-packages/pull/39154

Fix qbittorrent crash on musl
- boost: fix segfault in asio+align module.
- libtorrent-rasterbar: rebuild to fix segfault.

<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 06d3b4b7138cabe411a51bf79f90889193aae017 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 7 Sep 2022 17:32:19 -0300
Subject: [PATCH 1/5] boost: fix segfault in asio+align module.

---
 srcpkgs/boost/patches/align.patch | 28 ++++++++++++++++++++++++++++
 srcpkgs/boost/template            |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/boost/patches/align.patch

diff --git a/srcpkgs/boost/patches/align.patch b/srcpkgs/boost/patches/align.patch
new file mode 100644
index 000000000000..e3de2159cf6e
--- /dev/null
+++ b/srcpkgs/boost/patches/align.patch
@@ -0,0 +1,28 @@
+This code is wrong and uses feature test macros to determine whether something
+is available; FTMs shouldn't be in user code outside of top level #define's.
+
+This lead to an issue on musl where libtorrent-rasterbar was including this
+header (via boost asio) from two different places, and segfaulting due to
+mismatched implementations -- one's the posix one using posix_memalign, the
+other one's the generic one that stores a pointer to itself.
+
+posix_memalign is always available on the libcs we support and should always be
+used, so we force that. We still leave applications with the option of forcing
+boost specific behavior, if they really want it.
+
+diff --git a/boost/align/aligned_alloc.hpp b/boost/align/aligned_alloc.hpp
+index 1d81a13..f2b5137 100644
+--- a/boost/align/aligned_alloc.hpp
++++ b/boost/align/aligned_alloc.hpp
+@@ -38,10 +38,8 @@ Distributed under the Boost Software License, Version 1.0.
+ #include <boost/align/detail/aligned_alloc_posix.hpp>
+ #elif defined(sun) || defined(__sun)
+ #include <boost/align/detail/aligned_alloc_sunos.hpp>
+-#elif (_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600)
+-#include <boost/align/detail/aligned_alloc_posix.hpp>
+ #else
+-#include <boost/align/detail/aligned_alloc.hpp>
++#include <boost/align/detail/aligned_alloc_posix.hpp>
+ #endif
+ 
+ #endif
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 0d103e335b52..ef383d7f85ed 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.80.0
-revision=1
+revision=2
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config"
 makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel

From 93f57033f43927af037047d7fb111699ff7aae39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 7 Sep 2022 17:34:19 -0300
Subject: [PATCH 2/5] libtorrent-rasterbar: rebuild to fix segfault.

Since asio is a header-only library, we need to rebuild its dependents.
---
 srcpkgs/libtorrent-rasterbar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 52377b39eca4..135d89b9c85a 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,7 +2,7 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.17
-revision=1
+revision=2
 build_style=cmake
 configure_args="DCMAKE_CXX_STANDARD=14 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"

From 58b4da4968dbfd556a4c0ae9b732e9820154c9bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 9 Sep 2022 08:54:11 +0700
Subject: [PATCH 3/5] fixup! boost: fix segfault in asio+align module.

---
 srcpkgs/boost/patches/align.patch | 38 +++++++++++++++++--------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/boost/patches/align.patch b/srcpkgs/boost/patches/align.patch
index e3de2159cf6e..99e4fb2a1c5e 100644
--- a/srcpkgs/boost/patches/align.patch
+++ b/srcpkgs/boost/patches/align.patch
@@ -1,5 +1,6 @@
-This code is wrong and uses feature test macros to determine whether something
-is available; FTMs shouldn't be in user code outside of top level #define's.
+boost/align/aligned_alloc.hpp is wrong, it uses feature test macros to
+determine whether something is available;
+FTMs shouldn't be in user code outside of top level #define's.
 
 This lead to an issue on musl where libtorrent-rasterbar was including this
 header (via boost asio) from two different places, and segfaulting due to
@@ -10,19 +11,22 @@ posix_memalign is always available on the libcs we support and should always be
 used, so we force that. We still leave applications with the option of forcing
 boost specific behavior, if they really want it.
 
-diff --git a/boost/align/aligned_alloc.hpp b/boost/align/aligned_alloc.hpp
-index 1d81a13..f2b5137 100644
---- a/boost/align/aligned_alloc.hpp
-+++ b/boost/align/aligned_alloc.hpp
-@@ -38,10 +38,8 @@ Distributed under the Boost Software License, Version 1.0.
- #include <boost/align/detail/aligned_alloc_posix.hpp>
- #elif defined(sun) || defined(__sun)
- #include <boost/align/detail/aligned_alloc_sunos.hpp>
--#elif (_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600)
--#include <boost/align/detail/aligned_alloc_posix.hpp>
- #else
--#include <boost/align/detail/aligned_alloc.hpp>
-+#include <boost/align/detail/aligned_alloc_posix.hpp>
- #endif
+Instead of patching only boost/align/aligned_alloc.hpp, which fix the
+bug if boost::asio is used, but may keep other boost's code use feature tests
+macro, now or later, let's patch boost/config.hpp to always define
+_XOPEN_SOURCE instead.
+
+--- a/boost/config.hpp
++++ b/boost/config.hpp
+@@ -17,6 +17,11 @@
+ #ifndef BOOST_CONFIG_HPP
+ #define BOOST_CONFIG_HPP
  
- #endif
++#ifdef __linux__
+++/* for features.h, which will define _XOPEN_SOURCE or _POSIX_C_SOURCE */
++#include <features.h>
++#endif
++
+ // if we don't have a user config, then use the default location:
+ #if !defined(BOOST_USER_CONFIG) && !defined(BOOST_NO_USER_CONFIG)
+ #  define BOOST_USER_CONFIG <boost/config/user.hpp>

From 5880f7b12c9c9d38f717105cf652b5a7a46f2ce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 9 Sep 2022 08:56:41 +0700
Subject: [PATCH 4/5] fixup! fixup! boost: fix segfault in asio+align module.

---
 .../boost/{patches/align.patch => feature-test-macros.patch}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename srcpkgs/boost/{patches/align.patch => feature-test-macros.patch} (94%)

diff --git a/srcpkgs/boost/patches/align.patch b/srcpkgs/boost/feature-test-macros.patch
similarity index 94%
rename from srcpkgs/boost/patches/align.patch
rename to srcpkgs/boost/feature-test-macros.patch
index 99e4fb2a1c5e..d674cd903e66 100644
--- a/srcpkgs/boost/patches/align.patch
+++ b/srcpkgs/boost/feature-test-macros.patch
@@ -23,7 +23,7 @@ _XOPEN_SOURCE instead.
  #define BOOST_CONFIG_HPP
  
 +#ifdef __linux__
-++/* for features.h, which will define _XOPEN_SOURCE or _POSIX_C_SOURCE */
+++/* for _XOPEN_SOURCE and/or _POSIX_C_SOURCE */
 +#include <features.h>
 +#endif
 +

From 0bbad84e2fd16ffd1bf28ab237dcdf356002f4fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 9 Sep 2022 13:34:15 +0700
Subject: [PATCH 5/5] fixup! fixup! fixup! boost: fix segfault in asio+align
 module.

---
 srcpkgs/boost/{ => patches}/feature-test-macros.patch | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename srcpkgs/boost/{ => patches}/feature-test-macros.patch (100%)

diff --git a/srcpkgs/boost/feature-test-macros.patch b/srcpkgs/boost/patches/feature-test-macros.patch
similarity index 100%
rename from srcpkgs/boost/feature-test-macros.patch
rename to srcpkgs/boost/patches/feature-test-macros.patch

Re: [PR PATCH] [Updated] Fix qbittorrent crash on musl

[sgn]

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

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

https://github.com/ericonr/void-packages boost-fix
https://github.com/void-linux/void-packages/pull/39154

Fix qbittorrent crash on musl
- boost: fix segfault in asio+align module.
- libtorrent-rasterbar: rebuild to fix segfault.

<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 06d3b4b7138cabe411a51bf79f90889193aae017 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 7 Sep 2022 17:32:19 -0300
Subject: [PATCH 1/6] boost: fix segfault in asio+align module.

---
 srcpkgs/boost/patches/align.patch | 28 ++++++++++++++++++++++++++++
 srcpkgs/boost/template            |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/boost/patches/align.patch

diff --git a/srcpkgs/boost/patches/align.patch b/srcpkgs/boost/patches/align.patch
new file mode 100644
index 000000000000..e3de2159cf6e
--- /dev/null
+++ b/srcpkgs/boost/patches/align.patch
@@ -0,0 +1,28 @@
+This code is wrong and uses feature test macros to determine whether something
+is available; FTMs shouldn't be in user code outside of top level #define's.
+
+This lead to an issue on musl where libtorrent-rasterbar was including this
+header (via boost asio) from two different places, and segfaulting due to
+mismatched implementations -- one's the posix one using posix_memalign, the
+other one's the generic one that stores a pointer to itself.
+
+posix_memalign is always available on the libcs we support and should always be
+used, so we force that. We still leave applications with the option of forcing
+boost specific behavior, if they really want it.
+
+diff --git a/boost/align/aligned_alloc.hpp b/boost/align/aligned_alloc.hpp
+index 1d81a13..f2b5137 100644
+--- a/boost/align/aligned_alloc.hpp
++++ b/boost/align/aligned_alloc.hpp
+@@ -38,10 +38,8 @@ Distributed under the Boost Software License, Version 1.0.
+ #include <boost/align/detail/aligned_alloc_posix.hpp>
+ #elif defined(sun) || defined(__sun)
+ #include <boost/align/detail/aligned_alloc_sunos.hpp>
+-#elif (_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600)
+-#include <boost/align/detail/aligned_alloc_posix.hpp>
+ #else
+-#include <boost/align/detail/aligned_alloc.hpp>
++#include <boost/align/detail/aligned_alloc_posix.hpp>
+ #endif
+ 
+ #endif
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 0d103e335b52..ef383d7f85ed 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.80.0
-revision=1
+revision=2
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config"
 makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel

From 93f57033f43927af037047d7fb111699ff7aae39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 7 Sep 2022 17:34:19 -0300
Subject: [PATCH 2/6] libtorrent-rasterbar: rebuild to fix segfault.

Since asio is a header-only library, we need to rebuild its dependents.
---
 srcpkgs/libtorrent-rasterbar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 52377b39eca4..135d89b9c85a 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,7 +2,7 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.17
-revision=1
+revision=2
 build_style=cmake
 configure_args="DCMAKE_CXX_STANDARD=14 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"

From 58b4da4968dbfd556a4c0ae9b732e9820154c9bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 9 Sep 2022 08:54:11 +0700
Subject: [PATCH 3/6] fixup! boost: fix segfault in asio+align module.

---
 srcpkgs/boost/patches/align.patch | 38 +++++++++++++++++--------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/boost/patches/align.patch b/srcpkgs/boost/patches/align.patch
index e3de2159cf6e..99e4fb2a1c5e 100644
--- a/srcpkgs/boost/patches/align.patch
+++ b/srcpkgs/boost/patches/align.patch
@@ -1,5 +1,6 @@
-This code is wrong and uses feature test macros to determine whether something
-is available; FTMs shouldn't be in user code outside of top level #define's.
+boost/align/aligned_alloc.hpp is wrong, it uses feature test macros to
+determine whether something is available;
+FTMs shouldn't be in user code outside of top level #define's.
 
 This lead to an issue on musl where libtorrent-rasterbar was including this
 header (via boost asio) from two different places, and segfaulting due to
@@ -10,19 +11,22 @@ posix_memalign is always available on the libcs we support and should always be
 used, so we force that. We still leave applications with the option of forcing
 boost specific behavior, if they really want it.
 
-diff --git a/boost/align/aligned_alloc.hpp b/boost/align/aligned_alloc.hpp
-index 1d81a13..f2b5137 100644
---- a/boost/align/aligned_alloc.hpp
-+++ b/boost/align/aligned_alloc.hpp
-@@ -38,10 +38,8 @@ Distributed under the Boost Software License, Version 1.0.
- #include <boost/align/detail/aligned_alloc_posix.hpp>
- #elif defined(sun) || defined(__sun)
- #include <boost/align/detail/aligned_alloc_sunos.hpp>
--#elif (_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600)
--#include <boost/align/detail/aligned_alloc_posix.hpp>
- #else
--#include <boost/align/detail/aligned_alloc.hpp>
-+#include <boost/align/detail/aligned_alloc_posix.hpp>
- #endif
+Instead of patching only boost/align/aligned_alloc.hpp, which fix the
+bug if boost::asio is used, but may keep other boost's code use feature tests
+macro, now or later, let's patch boost/config.hpp to always define
+_XOPEN_SOURCE instead.
+
+--- a/boost/config.hpp
++++ b/boost/config.hpp
+@@ -17,6 +17,11 @@
+ #ifndef BOOST_CONFIG_HPP
+ #define BOOST_CONFIG_HPP
  
- #endif
++#ifdef __linux__
+++/* for features.h, which will define _XOPEN_SOURCE or _POSIX_C_SOURCE */
++#include <features.h>
++#endif
++
+ // if we don't have a user config, then use the default location:
+ #if !defined(BOOST_USER_CONFIG) && !defined(BOOST_NO_USER_CONFIG)
+ #  define BOOST_USER_CONFIG <boost/config/user.hpp>

From 5880f7b12c9c9d38f717105cf652b5a7a46f2ce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 9 Sep 2022 08:56:41 +0700
Subject: [PATCH 4/6] fixup! fixup! boost: fix segfault in asio+align module.

---
 .../boost/{patches/align.patch => feature-test-macros.patch}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename srcpkgs/boost/{patches/align.patch => feature-test-macros.patch} (94%)

diff --git a/srcpkgs/boost/patches/align.patch b/srcpkgs/boost/feature-test-macros.patch
similarity index 94%
rename from srcpkgs/boost/patches/align.patch
rename to srcpkgs/boost/feature-test-macros.patch
index 99e4fb2a1c5e..d674cd903e66 100644
--- a/srcpkgs/boost/patches/align.patch
+++ b/srcpkgs/boost/feature-test-macros.patch
@@ -23,7 +23,7 @@ _XOPEN_SOURCE instead.
  #define BOOST_CONFIG_HPP
  
 +#ifdef __linux__
-++/* for features.h, which will define _XOPEN_SOURCE or _POSIX_C_SOURCE */
+++/* for _XOPEN_SOURCE and/or _POSIX_C_SOURCE */
 +#include <features.h>
 +#endif
 +

From 0bbad84e2fd16ffd1bf28ab237dcdf356002f4fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 9 Sep 2022 13:34:15 +0700
Subject: [PATCH 5/6] fixup! fixup! fixup! boost: fix segfault in asio+align
 module.

---
 srcpkgs/boost/{ => patches}/feature-test-macros.patch | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename srcpkgs/boost/{ => patches}/feature-test-macros.patch (100%)

diff --git a/srcpkgs/boost/feature-test-macros.patch b/srcpkgs/boost/patches/feature-test-macros.patch
similarity index 100%
rename from srcpkgs/boost/feature-test-macros.patch
rename to srcpkgs/boost/patches/feature-test-macros.patch

From f4da22690fd59ae4eb9dbc06749947b8c924da39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 9 Sep 2022 13:34:34 +0700
Subject: [PATCH 6/6] fixup! fixup! fixup! fixup! boost: fix segfault in
 asio+align module.

---
 srcpkgs/boost/patches/feature-test-macros.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boost/patches/feature-test-macros.patch b/srcpkgs/boost/patches/feature-test-macros.patch
index d674cd903e66..14849a248703 100644
--- a/srcpkgs/boost/patches/feature-test-macros.patch
+++ b/srcpkgs/boost/patches/feature-test-macros.patch
@@ -23,7 +23,7 @@ _XOPEN_SOURCE instead.
  #define BOOST_CONFIG_HPP
  
 +#ifdef __linux__
-++/* for _XOPEN_SOURCE and/or _POSIX_C_SOURCE */
++/* for _XOPEN_SOURCE and/or _POSIX_C_SOURCE */
 +#include <features.h>
 +#endif
 +

Re: [PR PATCH] [Updated] Fix qbittorrent crash on musl

[sgn]

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

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

https://github.com/ericonr/void-packages boost-fix
https://github.com/void-linux/void-packages/pull/39154

Fix qbittorrent crash on musl
- boost: fix segfault in asio+align module.
- libtorrent-rasterbar: rebuild to fix segfault.

<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 5df7a377f7350ab70a0ec19a998d7edf66a07b26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 11 Sep 2022 23:28:08 +0700
Subject: [PATCH 1/3] boost: fix segfault in asio+align module.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reported-by: Érico Nogueira <erico.erc@gmail.com>
---
 .../boost/patches/feature-test-macros.patch   | 32 +++++++++++++++++++
 srcpkgs/boost/template                        |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/boost/patches/feature-test-macros.patch

diff --git a/srcpkgs/boost/patches/feature-test-macros.patch b/srcpkgs/boost/patches/feature-test-macros.patch
new file mode 100644
index 000000000000..14849a248703
--- /dev/null
+++ b/srcpkgs/boost/patches/feature-test-macros.patch
@@ -0,0 +1,32 @@
+boost/align/aligned_alloc.hpp is wrong, it uses feature test macros to
+determine whether something is available;
+FTMs shouldn't be in user code outside of top level #define's.
+
+This lead to an issue on musl where libtorrent-rasterbar was including this
+header (via boost asio) from two different places, and segfaulting due to
+mismatched implementations -- one's the posix one using posix_memalign, the
+other one's the generic one that stores a pointer to itself.
+
+posix_memalign is always available on the libcs we support and should always be
+used, so we force that. We still leave applications with the option of forcing
+boost specific behavior, if they really want it.
+
+Instead of patching only boost/align/aligned_alloc.hpp, which fix the
+bug if boost::asio is used, but may keep other boost's code use feature tests
+macro, now or later, let's patch boost/config.hpp to always define
+_XOPEN_SOURCE instead.
+
+--- a/boost/config.hpp
++++ b/boost/config.hpp
+@@ -17,6 +17,11 @@
+ #ifndef BOOST_CONFIG_HPP
+ #define BOOST_CONFIG_HPP
+ 
++#ifdef __linux__
++/* for _XOPEN_SOURCE and/or _POSIX_C_SOURCE */
++#include <features.h>
++#endif
++
+ // if we don't have a user config, then use the default location:
+ #if !defined(BOOST_USER_CONFIG) && !defined(BOOST_NO_USER_CONFIG)
+ #  define BOOST_USER_CONFIG <boost/config/user.hpp>
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 57ad72b545f9..e47bd7d251b5 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.80.0
-revision=1
+revision=2
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config"
 makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel

From 7e3b1d2296479337542298abd38eecaa20a189c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 7 Sep 2022 17:34:19 -0300
Subject: [PATCH 2/3] libtorrent-rasterbar: rebuild to fix segfault.

Since asio is a header-only library, we need to rebuild its dependents.
---
 common/shlibs                         | 2 +-
 srcpkgs/libtorrent-rasterbar/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index fe0fe43e281c..ae39d4551d59 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2094,7 +2094,7 @@ libldns.so.3 libldns-1.7.1_4
 libopenjpeg.so.5 libopenjpeg-1.5.2_1
 liboping.so.0 liboping-1.8.0_1
 libloudmouth-1.so.0 loudmouth-1.5.3_12
-libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.17_1
+libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.17_2
 libcapstone.so.4 capstone-4.0_1
 libhavege.so.2 libhaveged-1.9.11_1
 libnih.so.1 libnih-1.0.3_1
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 52377b39eca4..135d89b9c85a 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,7 +2,7 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.17
-revision=1
+revision=2
 build_style=cmake
 configure_args="DCMAKE_CXX_STANDARD=14 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"

From e9061f9c114123b9ebd0d55aa84464f220fcb2e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 11 Sep 2022 23:31:01 +0700
Subject: [PATCH 3/3] qbittorrent: rebuild for boost-asio fix

---
 srcpkgs/qbittorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 67e6b94edc53..e8e96200b845 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.4.3.1
-revision=2
+revision=3
 create_wrksrc=yes
 build_style=gnu-configure
 build_helper=qmake

Re: [PR PATCH] [Merged]: Fix qbittorrent crash on musl

[sgn]

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

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

Fix qbittorrent crash on musl
https://github.com/void-linux/void-packages/pull/39154

Description:
- boost: fix segfault in asio+align module.
- libtorrent-rasterbar: rebuild to fix segfault.

<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->