From unknown Thu Jun 19 14:17:05 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#42542 <42542@debbugs.gnu.org> To: bug#42542 <42542@debbugs.gnu.org> Subject: Status: [PATCH] gnu: libextractor: Update to 1.10. Reply-To: bug#42542 <42542@debbugs.gnu.org> Date: Thu, 19 Jun 2025 21:17:05 +0000 retitle 42542 [PATCH] gnu: libextractor: Update to 1.10. reassign 42542 guix-patches submitter 42542 Michael Rohleder severity 42542 normal tag 42542 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 25 20:26:00 2020 Received: (at submit) by debbugs.gnu.org; 26 Jul 2020 00:26:00 +0000 Received: from localhost ([127.0.0.1]:51367 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jzUUE-0008Fi-1M for submit@debbugs.gnu.org; Sat, 25 Jul 2020 20:26:00 -0400 Received: from lists.gnu.org ([209.51.188.17]:56100) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jzUU9-0008FZ-GI for submit@debbugs.gnu.org; Sat, 25 Jul 2020 20:25:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzUU9-0004yT-97 for guix-patches@gnu.org; Sat, 25 Jul 2020 20:25:49 -0400 Received: from wp224.webpack.hosteurope.de ([2a01:488:42:1000:50ed:84e7::]:41234) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzUU3-0001WP-Ph for guix-patches@gnu.org; Sat, 25 Jul 2020 20:25:48 -0400 Received: from www.rohleder.de ([37.61.204.227]); authenticated by wp224.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1jzUTy-0000ID-AC; Sun, 26 Jul 2020 02:25:38 +0200 Received: from [192.168.1.3] (helo=micha) by www.rohleder.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1jzUTw-0003zT-Kg for guix-patches@gnu.org; Sun, 26 Jul 2020 02:25:37 +0200 From: Michael Rohleder To: guix-patches@gnu.org Subject: [PATCH] gnu: libextractor: Update to 1.10. X-PGP-Fingerprint: 755E 2DE5 D0D5 85C5 2E78 2830 7C7A FFBE FEF2 CB25 X-PGP-Key: https://www.rohleder.de/~mike/pgpkey.asc Date: Sun, 26 Jul 2020 02:25:29 +0200 Message-ID: <87h7tv5dhi.fsf@rohleder.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-bounce-key: webpack.hosteurope.de;mike@rohleder.de;1595723143;8e4c754e; X-HE-SMSGID: 1jzUTy-0000ID-AC Received-SPF: permerror client-ip=2a01:488:42:1000:50ed:84e7::; envelope-from=mike@rohleder.de; helo=wp224.webpack.hosteurope.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/25 20:25:38 X-ACL-Warn: Detected OS = ??? X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, HEXHASH_WORD=1, SPF_HELO_NONE=0.001, T_SPF_PERMERROR=0.01, URIBL_BLOCKED=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Dear guix, After reading about the exciting dkgpg pkg, I wanted to try gnunet the other day and noticed that libextractor doesnt build, because of some test failures in exiv2 tests: --=-=-= Content-Type: text/plain Content-Disposition: inline ... ================================================= libextractor 1.9: src/plugins/test-suite.log ================================================== # TOTAL: 29 # PASS: 28 # SKIP: 0 # XFAIL: 0 # FAIL: 1 # XPASS: 0 # ERROR: 0 .. contents:: :depth: 2 FAIL: test_exiv2 ================ Warning: Directory Pentax, entry 0x0004: Data area exceeds data buffer, ignoring it. Got additional meta data of type 38 and format 1 with value `28deg 8' 18"' from plugin `exiv2' Got additional meta data of type 40 and format 1 with value `14deg 14' 22"' from plugin `exiv2' Did not get expected meta data of type 38 and format 1 with value `28deg 8' 17.585" ' from plugin `exiv2' Did not get expected meta data of type 40 and format 1 with value `14deg 14' 21.713" ' from plugin `exiv2' FAIL test_exiv2 (exit status: 1) --=-=-= Content-Type: text/plain It seems, commit 630b75f76a did broke something here. But because we also have exiv2-0.26, I think we could use that and drop the patch for exiv2-0.27 (which would not only needs to be modified if libextractor changes, but also if exiv2 changes?!). I removed tidy-html, because its not realy recognized by configure (also in 1.9, I think) and the configure-flag "--with-tidy" was dropped in 1.10. giflib on the other hand seems to work in 1.10, tests are ok and the libs for it is generated. I am not sure if its ok to do all this in one patch, I think I could also make 2 or 3 patches (fix build, update to 1.10, update inputs or so), but I hope the intention is clear (and gnunet builds, which it does) ;) --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-libextractor-Update-to-1.10.patch Content-Transfer-Encoding: quoted-printable Content-Description: [PATCH] gnu: libextractor: Update to 1.10. * gnu/packages/gnunet.scm (libextractor): Update to 1.10. [inputs]: commit 630b75f76a broke exiv2 test, so build with exiv2-0.26. [inputs]: added giflib, removed tidy-html * gnu/packages/patches/libextractor-exiv2.patch removed. * gnu/local.mk: remove libextractor-exiv2.patch. =2D-- gnu/local.mk | 1 - gnu/packages/gnunet.scm | 17 +-- gnu/packages/patches/libextractor-exiv2.patch | 124 ------------------ 3 files changed, 7 insertions(+), 135 deletions(-) delete mode 100644 gnu/packages/patches/libextractor-exiv2.patch diff --git a/gnu/local.mk b/gnu/local.mk index f2a7b6b984..5c92db2e05 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1207,7 +1207,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/libbonobo-activation-test-race.patch \ %D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \ %D%/packages/patches/libdrm-realpath-virtio.patch \ =2D %D%/packages/patches/libextractor-exiv2.patch \ %D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ %D%/packages/patches/libgnome-encoding.patch \ diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 979dadbe2e..77dc71a958 100644 =2D-- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -10,6 +10,7 @@ ;;; Copyright =C2=A9 2018 Alex Vong ;;; Copyright =C2=A9 2019 Brett Gilio ;;; Copyright =C2=A9 2020 Tanguy Le Carrour +;;; Copyright =C2=A9 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -73,31 +74,30 @@ (define-public libextractor (package (name "libextractor") =2D (version "1.9") + (version "1.10") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libextractor/libextractor-" version ".tar.gz")) (sha256 (base32 =2D "1zz2zvikvfibxnk1va3kgzs7djsmiqy7bmk8y01vbsf54ryjb3zh")) =2D (patches (search-patches "libextractor-exiv2.patch")))) + "0mr38g7kfn3p050hd3hckbcz2yd3za6dwl1c26x2kjf7vnsi3vcy")))) (build-system gnu-build-system) ;; WARNING: Checks require /dev/shm to be in the build chroot, especial= ly ;; not to be a symbolic link to /run/shm. ;; FIXME: ;; The following dependencies are all optional, but should be ;; available for maximum coverage: =2D ;; * libmagic (file) ;; * librpm (rpm) ; investigate failure =2D ;; * libgif (giflib) ; investigate failure + ;; * libtidy-html (tidy-html) ; investigate failure (inputs =2D `(("exiv2" ,exiv2) + `(("exiv2" ,exiv2-0.26) ("bzip2" ,bzip2) ("flac" ,flac) ("ffmpeg" ,ffmpeg) ("file" ,file) ;libmagic, for the MIME plu= g-in ("glib" ,glib) + ("giflib" ,giflib) ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) ("gtk+" ,gtk+) @@ -108,7 +108,6 @@ ("libmpeg2" ,libmpeg2) ("libmp4v2" ,libmp4v2) ("libsmf" ,libsmf) =2D ("tidy-html" ,tidy-html) ("libogg" ,libogg) ("libtiff" ,libtiff) ("libvorbis" ,libvorbis) @@ -120,9 +119,7 @@ (arguments `(#:configure-flags (list (string-append "--with-ltdl=3D" =2D (assoc-ref %build-inputs "libltdl")) =2D (string-append "--with-tidy=3D" =2D (assoc-ref %build-inputs "tidy-html"))) + (assoc-ref %build-inputs "libltdl"))) #:parallel-tests? #f #:phases (modify-phases %standard-phases diff --git a/gnu/packages/patches/libextractor-exiv2.patch b/gnu/packages/p= atches/libextractor-exiv2.patch deleted file mode 100644 index b92fef3ca1..0000000000 =2D-- a/gnu/packages/patches/libextractor-exiv2.patch +++ /dev/null @@ -1,124 +0,0 @@ =2DThis patch allows us to build libextractor against exiv2 0.27.x. =2DAdapted from this upstream commit: =2D =2D commit 1ecee9a47717e36cb8a3925d011d1a6de11d631c =2D Author: Christian Grothoff =2D Date: Mon Jul 29 17:58:18 2019 +0200 =2D =2D importing patch from Gentoo/AS to address exiv2 build issue (#5820) =2D =2Ddiff --git a/src/plugins/exiv2_extractor.cc b/src/plugins/exiv2_extracto= r.cc =2Dindex 8741d40..ef402a8 100644 =2D--- a/src/plugins/exiv2_extractor.cc =2D+++ b/src/plugins/exiv2_extractor.cc =2D@@ -27,10 +27,7 @@ =2D #include =2D #include =2D #include =2D-#include =2D-#include =2D-#include =2D-#include =2D+#include =2D=20 =2D /** =2D * Enable debugging to get error messages. =2D@@ -180,7 +177,7 @@ public: =2D * =2D * @return -1 on error =2D */ =2D-#if EXIV2_VERSION >=3D EXIV2_MAKE_VERSION(0,26,0) =2D+#if EXIV2_TEST_VERSION(0,26,0) =2D virtual size_t size (void) const; =2D #else =2D virtual long int size (void) const; =2D@@ -316,7 +313,11 @@ ExtractorIO::getb () =2D const unsigned char *r; =2D=20 =2D if (1 !=3D ec->read (ec->cls, &data, 1)) =2D+#if EXIV2_TEST_VERSION(0,27,0) =2D+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFail= ed); =2D+#else =2D throw Exiv2::BasicError (42 /* error code */); =2D+#endif =2D r =3D (const unsigned char *) data; =2D return *r; =2D } =2D@@ -371,7 +372,11 @@ ExtractorIO::putb (Exiv2::byte data) =2D void =2D ExtractorIO::transfer (Exiv2::BasicIo& src) =2D { =2D+#if EXIV2_TEST_VERSION(0,27,0) =2D+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFail= ed); =2D+#else =2D throw Exiv2::BasicError (42 /* error code */); =2D+#endif =2D } =2D=20 =2D=20 =2D@@ -416,7 +421,11 @@ ExtractorIO::seek (long offset, =2D Exiv2::byte * =2D ExtractorIO::mmap (bool isWritable) =2D { =2D+#if EXIV2_TEST_VERSION(0,27,0) =2D+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFail= ed); =2D+#else =2D throw Exiv2::BasicError (42 /* error code */); =2D+#endif =2D } =2D=20 =2D=20 =2D@@ -449,7 +458,7 @@ ExtractorIO::tell (void) const =2D * =2D * @return -1 on error =2D */ =2D-#if EXIV2_VERSION >=3D EXIV2_MAKE_VERSION(0,26,0) =2D+#if EXIV2_TEST_VERSION(0,26,0) =2D size_t =2D #else =2D long int =2D@@ -504,7 +513,11 @@ ExtractorIO::eof () const =2D std::string =2D ExtractorIO::path () const =2D { =2D+#if EXIV2_TEST_VERSION(0,27,0) =2D+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFail= ed); =2D+#else =2D throw Exiv2::BasicError (42 /* error code */); =2D+#endif =2D } =2D=20 =2D=20 =2D@@ -517,7 +530,11 @@ ExtractorIO::path () const =2D std::wstring =2D ExtractorIO::wpath () const =2D { =2D+#if EXIV2_TEST_VERSION(0,27,0) =2D+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFail= ed); =2D+#else =2D throw Exiv2::BasicError (42 /* error code */); =2D+#endif =2D } =2D #endif =2D=20 =2D@@ -531,7 +548,11 @@ Exiv2::BasicIo::AutoPtr =2D ExtractorIO::temporary () const =2D { =2D fprintf (stderr, "throwing temporary error\n"); =2D+#if EXIV2_TEST_VERSION(0,27,0) =2D+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFail= ed); =2D+#else =2D throw Exiv2::BasicError (42 /* error code */); =2D+#endif =2D } =2D=20 =2D=20 =2D@@ -697,7 +718,7 @@ EXTRACTOR_exiv2_extract_method (struct EXTRACTOR_Ext= ractContext *ec) =2D { =2D try =2D { =2D-#if EXIV2_MAKE_VERSION(0,23,0) <=3D EXIV2_VERSION =2D+#if !EXIV2_TEST_VERSION(0,24,0) =2D Exiv2::LogMsg::setLevel (Exiv2::LogMsg::mute); =2D #endif =2D std::auto_ptr eio(new ExtractorIO (ec)); =2D-=20 2.27.0 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable =2D-=20 The German opposite of 'umfahren' (running something over) is 'umfahren' (drive around something). Good luck mastering this language. --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEdV4t5dDVhcUueCgwfHr/vv7yyyUFAl8czXkACgkQfHr/vv7y yyVfDQf/SbgsYBPqwrXmDtFs6kBqAXQXT4yu6BmhfKPurIC2lS93ilyx/GebbwFN e5ToEQ/4uRQOj9HCfqtp2V0iKEv9kLLkxFJbWcFIGJ/VnmTL8S4GYlIGIfxUPdqD mvYOjCkQxot7hQZJJM/OXz/ziS9c9NjSM6f4gsytNyTvwxfF9I2G4OUmZYWARUFr rydk9+fFzx92I2YjuCwm/ReP6ahBDszkmaKIfaMsEIPAt/oFE8+zmSqkNbIteD/A ohDNnOVBOZeemH0H1eSzYmxX+s570Xjv0qcjsPfmccP2178l0jWS7xHQdOBzzUda 7nzhN9jrfJIhn3QjHglLHn/EMv1wEA== =Rbg8 -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 26 12:05:39 2020 Received: (at 42542) by debbugs.gnu.org; 26 Jul 2020 16:05:39 +0000 Received: from localhost ([127.0.0.1]:53327 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jzj9f-00027l-9v for submit@debbugs.gnu.org; Sun, 26 Jul 2020 12:05:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54176) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jzj9c-00027X-B6 for 42542@debbugs.gnu.org; Sun, 26 Jul 2020 12:05:37 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:36872) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzj9W-0007ba-TP; Sun, 26 Jul 2020 12:05:30 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=35482 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jzj9Q-0006DH-4o; Sun, 26 Jul 2020 12:05:25 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Michael Rohleder Subject: Re: [bug#42542] [PATCH] gnu: libextractor: Update to 1.10. References: <87h7tv5dhi.fsf@rohleder.de> Date: Sun, 26 Jul 2020 18:05:22 +0200 In-Reply-To: <87h7tv5dhi.fsf@rohleder.de> (Michael Rohleder's message of "Sun, 26 Jul 2020 02:25:29 +0200") Message-ID: <87pn8i2rel.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 42542 Cc: 42542@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello! Michael Rohleder skribis: > After reading about the exciting dkgpg pkg, I wanted to try gnunet the > other day and noticed that libextractor doesnt build, because of some > test failures in exiv2 tests: > > ... > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > libextractor 1.9: src/plugins/test-suite.log > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > > # TOTAL: 29 > # PASS: 28 > # SKIP: 0 > # XFAIL: 0 > # FAIL: 1 > # XPASS: 0 > # ERROR: 0 > > .. contents:: :depth: 2 > > FAIL: test_exiv2 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > > Warning: Directory Pentax, entry 0x0004: Data area exceeds data buffer, i= gnoring it. > Got additional meta data of type 38 and format 1 with value `28deg 8' 18"= ' from plugin `exiv2' > Got additional meta data of type 40 and format 1 with value `14deg 14' 22= "' from plugin `exiv2' > Did not get expected meta data of type 38 and format 1 with value `28deg = 8' 17.585" ' from plugin `exiv2' > Did not get expected meta data of type 40 and format 1 with value `14deg = 14' 21.713" ' from plugin `exiv2' > FAIL test_exiv2 (exit status: 1) Does upstream libextractor have a fix for that? It would seem that the new exiv2 rounds that geolocation meta data. I=E2=80=99m not comfortable using an older exiv2 version, because this is c= ode that=E2=80=99s potentially given untrusted input, so it would be nicer if we could fix this test! Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 26 22:08:11 2020 Received: (at 42542) by debbugs.gnu.org; 27 Jul 2020 02:08:11 +0000 Received: from localhost ([127.0.0.1]:53656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jzsYg-00087z-C6 for submit@debbugs.gnu.org; Sun, 26 Jul 2020 22:08:11 -0400 Received: from wp224.webpack.hosteurope.de ([80.237.132.231]:44970) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jzsYa-00087T-Qt for 42542@debbugs.gnu.org; Sun, 26 Jul 2020 22:08:04 -0400 Received: from www.rohleder.de ([37.61.204.227]); authenticated by wp224.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1jzsYY-0003w4-LC; Mon, 27 Jul 2020 04:07:58 +0200 Received: from [192.168.1.3] (helo=micha) by www.rohleder.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1jzsYW-0003m6-PW; Mon, 27 Jul 2020 04:07:58 +0200 From: Michael Rohleder To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#42542] [PATCH] gnu: libextractor: Update to 1.10. References: <87h7tv5dhi.fsf@rohleder.de> <87pn8i2rel.fsf@gnu.org> X-PGP-Fingerprint: 755E 2DE5 D0D5 85C5 2E78 2830 7C7A FFBE FEF2 CB25 X-PGP-Key: https://www.rohleder.de/~mike/pgpkey.asc Date: Mon, 27 Jul 2020 04:07:50 +0200 In-Reply-To: <87pn8i2rel.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Sun, 26 Jul 2020 18:05:22 +0200") Message-ID: <875za9k8w9.fsf@rohleder.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-bounce-key: webpack.hosteurope.de;mike@rohleder.de;1595815680;d5512839; X-HE-SMSGID: 1jzsYY-0003w4-LC X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42542 Cc: 42542@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hey Lodo! Thank you for reviewing! Ludovic Court=C3=A8s writes: > Does upstream libextractor have a fix for that? It would seem that the > new exiv2 rounds that geolocation meta data. > > I=E2=80=99m not comfortable using an older exiv2 version, because this is= code > that=E2=80=99s potentially given untrusted input, so it would be nicer if= we > could fix this test! Yes, exiv2 0.27.3 rounds the gps geolocation to ints, see: https://github.com/Exiv2/exiv2/pull/1107/commits/db1be4ae8e1077949fcb6a960e= 93069d6a41b395#diff-f3f55183ccbe956c720c86e61f708d9f I added a substitute for the exiv2 test as a workaround and try to contact the upstream developer. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-libextractor-Update-to-1.10.patch Content-Transfer-Encoding: quoted-printable Content-Description: [PATCH] gnu: libextractor: Update to 1.10 * gnu/packages/gnunet.scm (libextractor): Update to 1.10. [inputs]: exiv2 update to 0.27.3 (commit 630b75f76a) rounds gps coordinates to integer, so fixed the test. [inputs]: added giflib, removed tidy-html * gnu/packages/patches/libextractor-exiv2.patch removed, because its included upstream. * gnu/local.mk: remove libextractor-exiv2.patch. =2D-- gnu/local.mk | 1 - gnu/packages/gnunet.scm | 23 ++-- gnu/packages/patches/libextractor-exiv2.patch | 124 ------------------ 3 files changed, 14 insertions(+), 134 deletions(-) delete mode 100644 gnu/packages/patches/libextractor-exiv2.patch diff --git a/gnu/local.mk b/gnu/local.mk index ef6533bd8d..f4d09a65c1 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1197,7 +1197,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/libbonobo-activation-test-race.patch \ %D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \ %D%/packages/patches/libdrm-realpath-virtio.patch \ =2D %D%/packages/patches/libextractor-exiv2.patch \ %D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ %D%/packages/patches/libgnome-encoding.patch \ diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 979dadbe2e..8b1b0711a0 100644 =2D-- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -10,6 +10,7 @@ ;;; Copyright =C2=A9 2018 Alex Vong ;;; Copyright =C2=A9 2019 Brett Gilio ;;; Copyright =C2=A9 2020 Tanguy Le Carrour +;;; Copyright =C2=A9 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -73,24 +74,22 @@ (define-public libextractor (package (name "libextractor") =2D (version "1.9") + (version "1.10") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libextractor/libextractor-" version ".tar.gz")) (sha256 (base32 =2D "1zz2zvikvfibxnk1va3kgzs7djsmiqy7bmk8y01vbsf54ryjb3zh")) =2D (patches (search-patches "libextractor-exiv2.patch")))) + "0mr38g7kfn3p050hd3hckbcz2yd3za6dwl1c26x2kjf7vnsi3vcy")))) (build-system gnu-build-system) ;; WARNING: Checks require /dev/shm to be in the build chroot, especial= ly ;; not to be a symbolic link to /run/shm. ;; FIXME: ;; The following dependencies are all optional, but should be ;; available for maximum coverage: =2D ;; * libmagic (file) ;; * librpm (rpm) ; investigate failure =2D ;; * libgif (giflib) ; investigate failure + ;; * libtidy-html (tidy-html) ; investigate failure (inputs `(("exiv2" ,exiv2) ("bzip2" ,bzip2) @@ -98,6 +97,7 @@ ("ffmpeg" ,ffmpeg) ("file" ,file) ;libmagic, for the MIME plu= g-in ("glib" ,glib) + ("giflib" ,giflib) ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) ("gtk+" ,gtk+) @@ -108,7 +108,6 @@ ("libmpeg2" ,libmpeg2) ("libmp4v2" ,libmp4v2) ("libsmf" ,libsmf) =2D ("tidy-html" ,tidy-html) ("libogg" ,libogg) ("libtiff" ,libtiff) ("libvorbis" ,libvorbis) @@ -120,12 +119,18 @@ (arguments `(#:configure-flags (list (string-append "--with-ltdl=3D" =2D (assoc-ref %build-inputs "libltdl")) =2D (string-append "--with-tidy=3D" =2D (assoc-ref %build-inputs "tidy-html"))) + (assoc-ref %build-inputs "libltdl"))) #:parallel-tests? #f #:phases (modify-phases %standard-phases + (add-after 'configure 'fix-exiv2-tests + ;; exiv2>=3D0.27.3 rounds geolocation + ;; https://github.com/Exiv2/exiv2/pull/1107/commits/db1be4ae8e10= 77949fcb6a960e93069d6a41b395#diff-f3f55183ccbe956c720c86e61f708d9f + (lambda _ + (substitute* "src/plugins/test_exiv2.c" + (("17.585\\\\\" ") "18\\\"") + (("21.713\\\\\" ") "22\\\"")) + #t)) (add-after 'install 'move-static-libraries (lambda* (#:key outputs #:allow-other-keys) ;; Move static libraries to the "static" output. diff --git a/gnu/packages/patches/libextractor-exiv2.patch b/gnu/packages/p= atches/libextractor-exiv2.patch deleted file mode 100644 index b92fef3ca1..0000000000 =2D-- a/gnu/packages/patches/libextractor-exiv2.patch +++ /dev/null @@ -1,124 +0,0 @@ =2DThis patch allows us to build libextractor against exiv2 0.27.x. =2DAdapted from this upstream commit: =2D =2D commit 1ecee9a47717e36cb8a3925d011d1a6de11d631c =2D Author: Christian Grothoff =2D Date: Mon Jul 29 17:58:18 2019 +0200 =2D =2D importing patch from Gentoo/AS to address exiv2 build issue (#5820) =2D =2Ddiff --git a/src/plugins/exiv2_extractor.cc b/src/plugins/exiv2_extracto= r.cc =2Dindex 8741d40..ef402a8 100644 =2D--- a/src/plugins/exiv2_extractor.cc =2D+++ b/src/plugins/exiv2_extractor.cc =2D@@ -27,10 +27,7 @@ =2D #include =2D #include =2D #include =2D-#include =2D-#include =2D-#include =2D-#include =2D+#include =2D=20 =2D /** =2D * Enable debugging to get error messages. =2D@@ -180,7 +177,7 @@ public: =2D * =2D * @return -1 on error =2D */ =2D-#if EXIV2_VERSION >=3D EXIV2_MAKE_VERSION(0,26,0) =2D+#if EXIV2_TEST_VERSION(0,26,0) =2D virtual size_t size (void) const; =2D #else =2D virtual long int size (void) const; =2D@@ -316,7 +313,11 @@ ExtractorIO::getb () =2D const unsigned char *r; =2D=20 =2D if (1 !=3D ec->read (ec->cls, &data, 1)) =2D+#if EXIV2_TEST_VERSION(0,27,0) =2D+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFail= ed); =2D+#else =2D throw Exiv2::BasicError (42 /* error code */); =2D+#endif =2D r =3D (const unsigned char *) data; =2D return *r; =2D } =2D@@ -371,7 +372,11 @@ ExtractorIO::putb (Exiv2::byte data) =2D void =2D ExtractorIO::transfer (Exiv2::BasicIo& src) =2D { =2D+#if EXIV2_TEST_VERSION(0,27,0) =2D+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFail= ed); =2D+#else =2D throw Exiv2::BasicError (42 /* error code */); =2D+#endif =2D } =2D=20 =2D=20 =2D@@ -416,7 +421,11 @@ ExtractorIO::seek (long offset, =2D Exiv2::byte * =2D ExtractorIO::mmap (bool isWritable) =2D { =2D+#if EXIV2_TEST_VERSION(0,27,0) =2D+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFail= ed); =2D+#else =2D throw Exiv2::BasicError (42 /* error code */); =2D+#endif =2D } =2D=20 =2D=20 =2D@@ -449,7 +458,7 @@ ExtractorIO::tell (void) const =2D * =2D * @return -1 on error =2D */ =2D-#if EXIV2_VERSION >=3D EXIV2_MAKE_VERSION(0,26,0) =2D+#if EXIV2_TEST_VERSION(0,26,0) =2D size_t =2D #else =2D long int =2D@@ -504,7 +513,11 @@ ExtractorIO::eof () const =2D std::string =2D ExtractorIO::path () const =2D { =2D+#if EXIV2_TEST_VERSION(0,27,0) =2D+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFail= ed); =2D+#else =2D throw Exiv2::BasicError (42 /* error code */); =2D+#endif =2D } =2D=20 =2D=20 =2D@@ -517,7 +530,11 @@ ExtractorIO::path () const =2D std::wstring =2D ExtractorIO::wpath () const =2D { =2D+#if EXIV2_TEST_VERSION(0,27,0) =2D+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFail= ed); =2D+#else =2D throw Exiv2::BasicError (42 /* error code */); =2D+#endif =2D } =2D #endif =2D=20 =2D@@ -531,7 +548,11 @@ Exiv2::BasicIo::AutoPtr =2D ExtractorIO::temporary () const =2D { =2D fprintf (stderr, "throwing temporary error\n"); =2D+#if EXIV2_TEST_VERSION(0,27,0) =2D+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFail= ed); =2D+#else =2D throw Exiv2::BasicError (42 /* error code */); =2D+#endif =2D } =2D=20 =2D=20 =2D@@ -697,7 +718,7 @@ EXTRACTOR_exiv2_extract_method (struct EXTRACTOR_Ext= ractContext *ec) =2D { =2D try =2D { =2D-#if EXIV2_MAKE_VERSION(0,23,0) <=3D EXIV2_VERSION =2D+#if !EXIV2_TEST_VERSION(0,24,0) =2D Exiv2::LogMsg::setLevel (Exiv2::LogMsg::mute); =2D #endif =2D std::auto_ptr eio(new ExtractorIO (ec)); =2D-=20 2.27.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEdV4t5dDVhcUueCgwfHr/vv7yyyUFAl8eNvYACgkQfHr/vv7y yyV8Zwf+Ifs4IxYcx30GrttyXl5Lzts6Xf1zGofnO45SkRn5hVsB5g3/M47/9Qm6 G8ElywJ/y2zhDhPVsWXx2gxL5fC6lwI5UBdhhmE73v3eNXytHGXXGNpCb0T+dIS3 urBPQgIKd7l0hPfpZReFGTtm8YGJ89tY8amZzUlp7dYjLozFEUEbUhwH+anVZnCn HbZ1yJybPWnLyAtLHaK8szE0ZZIGoY5qkn+NjFT0DQcF7TYM9JrxIE1OE2YAZjYh YhE73wku/U3SJ5HGVPMUfZp3isesStJ/fEc4ZTwkAY5RrdIqawA9YS+dJZLB3gil Rd1OduwIyWOrfLQBulMfYoc6HbZXyQ== =yApx -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 27 21:16:51 2020 Received: (at 42542) by debbugs.gnu.org; 28 Jul 2020 01:16:51 +0000 Received: from localhost ([127.0.0.1]:56101 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0EEd-0000rx-Gd for submit@debbugs.gnu.org; Mon, 27 Jul 2020 21:16:51 -0400 Received: from wp224.webpack.hosteurope.de ([80.237.132.231]:49014) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0EEZ-0000rj-By for 42542@debbugs.gnu.org; Mon, 27 Jul 2020 21:16:49 -0400 Received: from www.rohleder.de ([37.61.204.227]); authenticated by wp224.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1k0EEX-00019R-Ca; Tue, 28 Jul 2020 03:16:45 +0200 Received: from [192.168.1.3] (helo=micha) by www.rohleder.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1k0EEW-0007ir-3a for 42542@debbugs.gnu.org; Tue, 28 Jul 2020 03:16:44 +0200 From: Michael Rohleder To: 42542@debbugs.gnu.org Subject: Re: [bug#42542] [PATCH] gnu: libextractor: Update to 1.10. References: <87h7tv5dhi.fsf@rohleder.de> <87pn8i2rel.fsf@gnu.org> <875za9k8w9.fsf@rohleder.de> X-PGP-Fingerprint: 755E 2DE5 D0D5 85C5 2E78 2830 7C7A FFBE FEF2 CB25 X-PGP-Key: https://www.rohleder.de/~mike/pgpkey.asc Date: Tue, 28 Jul 2020 03:16:36 +0200 In-Reply-To: <875za9k8w9.fsf@rohleder.de> (Michael Rohleder's message of "Mon, 27 Jul 2020 04:07:50 +0200") Message-ID: <875za8igln.fsf@rohleder.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-bounce-key: webpack.hosteurope.de;mike@rohleder.de;1595899007;cff23364; X-HE-SMSGID: 1k0EEX-00019R-Ca X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42542 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain This patch fixes that gnunet-gtk doesnt build and is based on the previous patch. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-gnunet-gtk-Update-to-0.13.1.patch Content-Transfer-Encoding: quoted-printable Content-Description: [PATCH] gnu: gnunet-gtk: Update to 0.13.1 * gnu/packages/gnunet.scm (gnunet-gtk): Update to 0.13.1. =2D-- gnu/packages/gnunet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 467e51db5f..d572d868ef 100644 =2D-- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -386,14 +386,14 @@ services.") (define-public gnunet-gtk (package (inherit gnunet) (name "gnunet-gtk") =2D (version "0.12.0") + (version "0.13.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gnunet/gnunet-gtk-" version ".tar.gz")) (sha256 (base32 =2D "08a43ayv1rhajdklfcv78w2h76jfaz64kgp5krqgj1w1sq8xm6fb"))= )) + "1zdzgq16h77w6ybwg3lqjsjr965np6iqvncqvkbj07glqd4wss0j")))) (arguments `(#:configure-flags (list "--with-libunique" =2D-=20 2.27.0 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable =2D-=20 There are two types of hard drives: those that have failed, and those that = will. --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEdV4t5dDVhcUueCgwfHr/vv7yyyUFAl8ffHQACgkQfHr/vv7y yyUxSAgAsbcwvMqWIj4/LTvj32889T9tlYBjCHL4ahIDhxA3ypjUpjOiI8rf2OwZ HR336w2pyUf4QM0w0ky18r7nkVAcYzttQI8eugc8WQ+uR9gEDLGAuBfjwajDh/m8 fbO2jumP/oOa84PGocjwaB4ivH9hGMjRnK0f3VBiSNAzNUCdlcvzJ4dyqiZaIyQA LF+YGxJCVmw2dEtJ4msdiwYeESqcZrfjf+DRBM6gVN8tAM8LNWBk31xjA6KOQj+i Jao0CiECMmNpfdKqt8xXMWPeXw30rh9uC1j/k4IwGCUw+SQJdaa60iRoDLilzPWk AILSmlMEhwDazJHfCEebMj0sqwBg9g== =tTOe -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 28 17:55:22 2020 Received: (at 42542-done) by debbugs.gnu.org; 28 Jul 2020 21:55:22 +0000 Received: from localhost ([127.0.0.1]:59344 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0XZ8-0004XV-C8 for submit@debbugs.gnu.org; Tue, 28 Jul 2020 17:55:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39502) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0XZ2-0004XC-Of for 42542-done@debbugs.gnu.org; Tue, 28 Jul 2020 17:55:17 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33723) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0XYx-0001nE-B8; Tue, 28 Jul 2020 17:55:07 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=48316 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1k0XYs-000242-0R; Tue, 28 Jul 2020 17:55:02 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Michael Rohleder Subject: Re: [bug#42542] [PATCH] gnu: libextractor: Update to 1.10. References: <87h7tv5dhi.fsf@rohleder.de> <87pn8i2rel.fsf@gnu.org> <875za9k8w9.fsf@rohleder.de> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 11 Thermidor an 228 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Tue, 28 Jul 2020 23:54:59 +0200 In-Reply-To: <875za9k8w9.fsf@rohleder.de> (Michael Rohleder's message of "Mon, 27 Jul 2020 04:07:50 +0200") Message-ID: <87ft9bs3t8.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 42542-done Cc: 42542-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Michael Rohleder skribis: > Yes, exiv2 0.27.3 rounds the gps geolocation to ints, see: > https://github.com/Exiv2/exiv2/pull/1107/commits/db1be4ae8e1077949fcb6a96= 0e93069d6a41b395#diff-f3f55183ccbe956c720c86e61f708d9f > > I added a substitute for the exiv2 test as a workaround and try to > contact the upstream developer. > > * gnu/packages/gnunet.scm (libextractor): Update to 1.10. > [inputs]: exiv2 update to 0.27.3 (commit 630b75f76a) rounds gps > coordinates to integer, so fixed the test. > [inputs]: added giflib, removed tidy-html > * gnu/packages/patches/libextractor-exiv2.patch removed, because > its included upstream. > * gnu/local.mk: remove libextractor-exiv2.patch. > --- > gnu/local.mk | 1 - > gnu/packages/gnunet.scm | 23 ++-- > gnu/packages/patches/libextractor-exiv2.patch | 124 ------------------ > 3 files changed, 14 insertions(+), 134 deletions(-) > delete mode 100644 gnu/packages/patches/libextractor-exiv2.patch Perfect. Tweaked the commit log and committed, thank you! Ludo=E2=80=99. From unknown Thu Jun 19 14:17:05 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 26 Aug 2020 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator