[PATCH] gnu: libextractor: Update to 1.10.

  • Done
  • quality assurance status badge
Details
2 participants
  • Ludovic Courtès
  • Michael Rohleder
Owner
unassigned
Submitted by
Michael Rohleder
Severity
normal
M
M
Michael Rohleder wrote on 26 Jul 2020 02:25
(address . guix-patches@gnu.org)
87h7tv5dhi.fsf@rohleder.de
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:
...
=================================================
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)
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) ;)
Attachment: 0001-gnu-libextractor-Update-to-1.10.patch
--
The German opposite of 'umfahren' (running something over)
is 'umfahren' (drive around something).
Good luck mastering this language.
-----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-----

L
L
Ludovic Courtès wrote on 26 Jul 2020 18:05
(name . Michael Rohleder)(address . mike@rohleder.de)(address . 42542@debbugs.gnu.org)
87pn8i2rel.fsf@gnu.org
Hello!

Michael Rohleder <mike@rohleder.de> skribis:

Toggle quote (29 lines)
> 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:
>
> ...
> =================================================
> 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)

Does upstream libextractor have a fix for that? It would seem that the
new exiv2 rounds that geolocation meta data.

I’m not comfortable using an older exiv2 version, because this is code
that’s potentially given untrusted input, so it would be nicer if we
could fix this test!

Thanks,
Ludo’.
M
M
Michael Rohleder wrote on 27 Jul 2020 04:07
(name . Ludovic Courtès)(address . ludo@gnu.org)(address . 42542@debbugs.gnu.org)
875za9k8w9.fsf@rohleder.de
Hey Lodo!

Thank you for reviewing!

Ludovic Courtès <ludo@gnu.org> writes:
Toggle quote (7 lines)
> Does upstream libextractor have a fix for that? It would seem that the
> new exiv2 rounds that geolocation meta data.
>
> I’m not comfortable using an older exiv2 version, because this is code
> that’s 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:

I added a substitute for the exiv2 test as a workaround and try to
contact the upstream developer.
Attachment: 0001-gnu-libextractor-Update-to-1.10.patch
-----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-----

M
M
Michael Rohleder wrote on 28 Jul 2020 03:16
(address . 42542@debbugs.gnu.org)
875za8igln.fsf@rohleder.de
This patch fixes that gnunet-gtk doesnt build and is based on the
previous patch.
* gnu/packages/gnunet.scm (gnunet-gtk): Update to 0.13.1.
---
gnu/packages/gnunet.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 467e51db5f..d572d868ef 100644
--- 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")
- (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
- "08a43ayv1rhajdklfcv78w2h76jfaz64kgp5krqgj1w1sq8xm6fb"))))
+ "1zdzgq16h77w6ybwg3lqjsjr965np6iqvncqvkbj07glqd4wss0j"))))
(arguments
`(#:configure-flags
(list "--with-libunique"
--
2.27.0
--
There are two types of hard drives: those that have failed, and those that will.
-----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-----

L
L
Ludovic Courtès wrote on 28 Jul 2020 23:54
(name . Michael Rohleder)(address . mike@rohleder.de)(address . 42542-done@debbugs.gnu.org)
87ft9bs3t8.fsf@gnu.org
Hi,

Michael Rohleder <mike@rohleder.de> skribis:

Toggle quote (20 lines)
> Yes, exiv2 0.27.3 rounds the gps geolocation to ints, see:
> https://github.com/Exiv2/exiv2/pull/1107/commits/db1be4ae8e1077949fcb6a960e93069d6a41b395#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’.
Closed
?