From: Gottox <Gottox@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] libsigsegv: update to 2.13.
Date: Thu, 22 Apr 2021 07:52:40 +0200 [thread overview]
Message-ID: <20210422055240.cIB0ZCYfB9FhannX_CWPG0kpAd7kE36sH0npq-9-p0s@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-30413@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 323 bytes --]
There is an updated pull request by Gottox against master on the void-packages repository
https://github.com/Gottox/void-packages libsigsegv-2.13
https://github.com/void-linux/void-packages/pull/30413
libsigsegv: update to 2.13.
A patch file from https://github.com/void-linux/void-packages/pull/30413.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libsigsegv-2.13-30413.patch --]
[-- Type: text/x-diff, Size: 7890 bytes --]
From 90fc5ac9cdeac5f0200f4322a7c350b05da05536 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 20:28:52 +0200
Subject: [PATCH] libsigsegv: update to 2.13.
* remove post_configure hook. It builds fine without it.
* add upstream patch to fix tests. See bug [1]. Fixed with [2]
[1] https://bugs.gnunet.org/view.php?id=6613
[2] https://git.gnunet.org/libextractor.git/commit/?id=7a6a7f54d1f27c6b3520fe8cffebeebc6c272ca0
---
.../patches/fix-tests-from-upstream.patch | 173 ++++++++++++++++++
| 2 +-
srcpkgs/libsigsegv/template | 16 +-
3 files changed, 176 insertions(+), 15 deletions(-)
create mode 100644 srcpkgs/libextractor/patches/fix-tests-from-upstream.patch
diff --git a/srcpkgs/libextractor/patches/fix-tests-from-upstream.patch b/srcpkgs/libextractor/patches/fix-tests-from-upstream.patch
new file mode 100644
index 000000000000..c44b972f2e97
--- /dev/null
+++ b/srcpkgs/libextractor/patches/fix-tests-from-upstream.patch
@@ -0,0 +1,173 @@
+Imported from https://git.gnunet.org/libextractor.git/commit/?id=7a6a7f54d1f27c6b3520fe8cffebeebc6c272ca0
+
+* Removed changes in changelog.
+
+From 7a6a7f54d1f27c6b3520fe8cffebeebc6c272ca0 Mon Sep 17 00:00:00 2001
+From: Christian Grothoff <christian@grothoff.org>
+Date: Thu, 29 Oct 2020 21:22:05 +0100
+Subject: fix #6613
+
+---
+ ChangeLog | 9 ++++++--
+ src/plugins/fuzz_default.sh | 17 ++++++++++++---
+ src/plugins/test_exiv2.c | 14 +++++++------
+ src/plugins/test_lib.c | 50 +++++++++++++++++++++++++++++++++++++--------
+ src/plugins/test_lib.h | 5 +++++
+ 5 files changed, 75 insertions(+), 20 deletions(-)
+
+diff --git a/src/plugins/fuzz_default.sh b/src/plugins/fuzz_default.sh
+index 8b64539..67292cf 100755
+--- a/src/plugins/fuzz_default.sh
++++ b/src/plugins/fuzz_default.sh
+@@ -14,6 +14,17 @@ then
+ bindir="$bindir/bin"
+ fi
+
++if test -x `which zzuf`
++then
++ exit 77
++fi
++
++if test -x `which timeout`
++then
++ TIMEOUT=timeout 15
++else
++ TIMEOUT=""
++fi
+
+ for file in $testdatadir/test*
+ do
+@@ -26,11 +37,11 @@ do
+ do
+ echo "file $file seed $seed"
+ zzuf -c -s $seed cat "$file" > "$tmpfile"
+- if ! "$bindir/extract" -i "$tmpfile" > /dev/null
++ if ! "$TIMEOUT $bindir/extract" -i "$tmpfile" > /dev/null
+ then
+ echo "$tmpfile with seed $seed failed"
+- mv $tmpfile $tmpfile.keep
+- ret=1
++ mv $tmpfile $tmpfile.keep
++ ret=1
+ fi
+ seed=`expr $seed + 1`
+ done
+diff --git a/src/plugins/test_exiv2.c b/src/plugins/test_exiv2.c
+index e4e5319..f3dae0a 100644
+--- a/src/plugins/test_exiv2.c
++++ b/src/plugins/test_exiv2.c
+@@ -49,9 +49,10 @@ main (int argc, char *argv[])
+ EXTRACTOR_METATYPE_GPS_LATITUDE,
+ EXTRACTOR_METAFORMAT_UTF8,
+ "text/plain",
+- "28deg 8' 17.585\" ",
+- strlen ("28deg 8' 17.585\" ") + 1,
+- 0
++ "28deg 8' (18|17.585)\" ?",
++ strlen ("28deg 8' (18|17.585)\" ?") + 1,
++ 0,
++ .regex = 1
+ },
+ {
+ EXTRACTOR_METATYPE_GPS_LONGITUDE_REF,
+@@ -65,9 +66,10 @@ main (int argc, char *argv[])
+ EXTRACTOR_METATYPE_GPS_LONGITUDE,
+ EXTRACTOR_METAFORMAT_UTF8,
+ "text/plain",
+- "14deg 14' 21.713\" ",
+- strlen ("14deg 14' 21.713\" ") + 1,
+- 0
++ "14deg 14' (22|21.713)\" ?",
++ strlen ("14deg 14' (22|21.713)\" ?"),
++ 0,
++ .regex = 1
+ },
+ {
+ EXTRACTOR_METATYPE_CAMERA_MAKE,
+diff --git a/src/plugins/test_lib.c b/src/plugins/test_lib.c
+index efbe2cf..97d4dc5 100644
+--- a/src/plugins/test_lib.c
++++ b/src/plugins/test_lib.c
+@@ -24,7 +24,8 @@
+ */
+ #include "platform.h"
+ #include "test_lib.h"
+-
++#include <sys/types.h>
++#include <regex.h>
+
+ /**
+ * Function that libextractor calls for each
+@@ -57,14 +58,45 @@ process_replies (void *cls,
+ (sd[i].type != type) ||
+ (sd[i].format != format) )
+ continue;
+- if ( (EXTRACTOR_METAFORMAT_BINARY != format) &&
+- ( (sd[i].data_len != data_len) ||
+- (0 != memcmp (sd[i].data, data, data_len)) ) )
+- continue;
+- if ( (EXTRACTOR_METAFORMAT_BINARY == format) &&
+- ( (sd[i].data_len > data_len) ||
+- (0 != memcmp (sd[i].data, data, sd[i].data_len)) ) )
+- continue;
++ if ( (sd[i].regex) &&
++ (EXTRACTOR_METAFORMAT_BINARY != format) )
++ {
++ regex_t re;
++ regmatch_t match;
++
++ if (0 !=
++ regcomp (&re,
++ sd[i].data,
++ REG_EXTENDED))
++ {
++ fprintf (stderr,
++ "Not a valid regex: %s\n",
++ sd[i].data);
++ abort ();
++ }
++ if ( ('\0' != data[data_len - 1]) ||
++ (0 != regexec (&re,
++ data,
++ 1,
++ &match,
++ 0)) )
++ {
++ regfree (&re);
++ continue;
++ }
++ regfree (&re);
++ }
++ else
++ {
++ if ( (EXTRACTOR_METAFORMAT_BINARY != format) &&
++ ( (sd[i].data_len != data_len) ||
++ (0 != memcmp (sd[i].data, data, data_len)) ) )
++ continue;
++ if ( (EXTRACTOR_METAFORMAT_BINARY == format) &&
++ ( (sd[i].data_len > data_len) ||
++ (0 != memcmp (sd[i].data, data, sd[i].data_len)) ) )
++ continue;
++ }
+
+ if (NULL != sd[i].data_mime_type)
+ {
+diff --git a/src/plugins/test_lib.h b/src/plugins/test_lib.h
+index 9400314..cea36fc 100644
+--- a/src/plugins/test_lib.h
++++ b/src/plugins/test_lib.h
+@@ -63,6 +63,11 @@ struct SolutionData
+ * terminate the list.
+ */
+ int solved;
++
++ /**
++ * Treat solution as a regex that must match.
++ */
++ int regex;
+ };
+
+
+--
+cgit v1.2.1
+
--git a/srcpkgs/libextractor/template b/srcpkgs/libextractor/template
index bd7af6f78dec..62541fcc7792 100644
--- a/srcpkgs/libextractor/template
+++ b/srcpkgs/libextractor/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config"
#FIXME: Build without gsf support for now, ole2_extractor.c causes GCC sigfault
makedepends="zlib-devel bzip2-devel exiv2-devel tiff-devel libpng-devel
libjpeg-turbo-devel libvorbis-devel libflac-devel giflib-devel libmpeg2-devel
- ffmpeg-devel gtk+3-devel libltdl-devel libarchive-devel file-devel"
+ ffmpeg-devel gtk+3-devel libltdl-devel libarchive-devel file-devel libgsf-devel"
short_desc="Library used to extract meta data from files"
maintainer="Martin Riese <grauehaare@gmx.de>"
license="GPL-3.0-or-later"
diff --git a/srcpkgs/libsigsegv/template b/srcpkgs/libsigsegv/template
index 13352c58bc46..fa3087e531b6 100644
--- a/srcpkgs/libsigsegv/template
+++ b/srcpkgs/libsigsegv/template
@@ -1,6 +1,6 @@
# Template file for 'libsigsegv'
pkgname=libsigsegv
-version=2.12
+version=2.13
revision=1
build_style=gnu-configure
short_desc="Handling page faults in user mode"
@@ -8,21 +8,9 @@ maintainer="Martin Riese <grauehaare@gmx.de>"
license="GPL-2"
homepage="https://www.gnu.org/software/libsigsegv/"
distfiles="https://ftpmirror.gnu.org/libsigsegv/libsigsegv-${version}.tar.gz"
-checksum=3ae1af359eebaa4ffc5896a1aee3568c052c99879316a1ab57f8fe1789c390b6
+checksum=be78ee4176b05f7c75ff03298d84874db90f4b6c9d5503f0da1226b3a3c48119
configure_args="--enable-shared"
-post_configure() {
- case "$XBPS_TARGET_MACHINE" in
- arm*-musl)
- # Avoid double include of signal.h
- sed -e "s;#define HAVE_SYS_SIGNAL_H 1;#undef HAVE_SYS_SIGNAL_H;" \
- -i ${wrksrc}/config.h
- # struct sigcontext already defined through sigsegv.h
- sed -e "s;#include <asm/sigcontext.h>;;" \
- -i ${wrksrc}/src/fault-linux-arm-old.h
- ;;
- esac
-}
libsigsegv-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
next prev parent reply other threads:[~2021-04-22 5:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-21 18:28 [PR PATCH] " Gottox
2021-04-21 18:32 ` [PR REVIEW] " ericonr
2021-04-21 18:33 ` ericonr
2021-04-22 5:31 ` [PR PATCH] [Updated] " Gottox
2021-04-22 5:33 ` [PR REVIEW] " Gottox
2021-04-22 5:34 ` [PR PATCH] [Updated] " Gottox
2021-04-22 5:52 ` Gottox [this message]
2021-04-22 5:56 ` Gottox
2021-04-22 6:05 ` Gottox
2022-05-18 2:09 ` github-actions
2022-06-02 2:13 ` [PR PATCH] [Closed]: " github-actions
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=20210422055240.cIB0ZCYfB9FhannX_CWPG0kpAd7kE36sH0npq-9-p0s@z \
--to=gottox@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).