* [PR PATCH] foobillard++: fix segfault on musl
@ 2023-11-05 13:02 hazen2215
2023-12-04 13:17 ` [PR PATCH] [Merged]: " sgn
0 siblings, 1 reply; 2+ messages in thread
From: hazen2215 @ 2023-11-05 13:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1111 bytes --]
There is a new pull request by hazen2215 against master on the void-packages repository
https://github.com/hazen2215/void-packages foobillard++
https://github.com/void-linux/void-packages/pull/47071
foobillard++: fix segfault on musl
fixes #43236
<!-- 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, (x86_64-musl)
A patch file from https://github.com/void-linux/void-packages/pull/47071.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-foobillard++-47071.patch --]
[-- Type: text/x-diff, Size: 1715 bytes --]
From 3d87fa03e51f4041a8b15a4190fe537f4cd9ffa5 Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Sun, 5 Nov 2023 21:50:06 +0900
Subject: [PATCH] foobillard++: fix segfault on musl
fixes #43236
---
srcpkgs/foobillard++/patches/strsound.patch | 19 +++++++++++++++++++
srcpkgs/foobillard++/template | 3 +--
2 files changed, 20 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/foobillard++/patches/strsound.patch
diff --git a/srcpkgs/foobillard++/patches/strsound.patch b/srcpkgs/foobillard++/patches/strsound.patch
new file mode 100644
index 0000000000000..8740492a142fc
--- /dev/null
+++ b/srcpkgs/foobillard++/patches/strsound.patch
@@ -0,0 +1,19 @@
+diff --git a/src/sound_stuff.c b/src/sound_stuff.c
+index 32ffed7..7ed946e 100644
+--- a/src/sound_stuff.c
++++ b/src/sound_stuff.c
+@@ -96,12 +96,12 @@ int strsound ( char s1[] )
+ int i = 0;
+ char s[10];
+ if(strlen(s1) > 4) {
+- strcpy(s,&s[strlen(s)-4]);
++ strcpy(s,&s1[strlen(s1)-4]);
+ while (s[i]) {
+ s[i] = toupper(s[i]);
+ ++i;
+ }
+- if(strcmp(s,".MP3") || strcmp(s,".OGG")) {
++ if(!strcmp(s,".MP3") || !strcmp(s,".OGG")) {
+ return(1);
+ }
+ }
diff --git a/srcpkgs/foobillard++/template b/srcpkgs/foobillard++/template
index 2071ad3fc3546..07d5ae2f943ce 100644
--- a/srcpkgs/foobillard++/template
+++ b/srcpkgs/foobillard++/template
@@ -1,8 +1,7 @@
# Template file for 'foobillard++'
-# often segfaults at launch on musl, but not marking broken yet
pkgname=foobillard++
version=3.42beta
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--enable-standard"
hostmakedepends="automake pkg-config"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: foobillard++: fix segfault on musl
2023-11-05 13:02 [PR PATCH] foobillard++: fix segfault on musl hazen2215
@ 2023-12-04 13:17 ` sgn
0 siblings, 0 replies; 2+ messages in thread
From: sgn @ 2023-12-04 13:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 951 bytes --]
There's a merged pull request on the void-packages repository
foobillard++: fix segfault on musl
https://github.com/void-linux/void-packages/pull/47071
Description:
fixes #43236
<!-- 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, (x86_64-musl)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-12-04 13:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-05 13:02 [PR PATCH] foobillard++: fix segfault on musl hazen2215
2023-12-04 13:17 ` [PR PATCH] [Merged]: " sgn
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).