* [PR PATCH] libextractor: update to 1.10
@ 2020-11-18 22:44 ndowens
2020-11-18 23:23 ` [PR PATCH] [Updated] " ndowens
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: ndowens @ 2020-11-18 22:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 409 bytes --]
There is a new pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages libextractor
https://github.com/void-linux/void-packages/pull/26493
libextractor: update to 1.10
Update for CVE-2019-15531
Oddly SONAME went down, changed to what xbps reported it to be
A patch file from https://github.com/void-linux/void-packages/pull/26493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libextractor-26493.patch --]
[-- Type: text/x-diff, Size: 6956 bytes --]
From f5eaeb065506f13e62d54b20d3b017c0168d4c60 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Wed, 18 Nov 2020 16:42:42 -0600
Subject: [PATCH 1/2] gnunet: revbump for libextractor
---
common/shlibs | 2 ++
srcpkgs/gnunet/template | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/common/shlibs b/common/shlibs
index 9a576f18d0f..d38fe2ebe7b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1743,6 +1743,8 @@ liblensfun.so.1 lensfun-0.3.2_1
libmitlm.so.1 mitlm-0.4.2_1
libextractor.so.3 libextractor-1.1_1
libextractor_common.so.1 libextractor-1.1_1
+libextractor.so.2 libextractor-1.10_1
+libextractor_common.so.1 libextractor-1.10_1
libpano13.so.3 libpano13-2.9.19_1
libubsan.so.1 libsanitizer-8.2.0_1
libtsan.so.0 libsanitizer-6.3.0_1
diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d..a8a6dabe66b 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
# Template file for 'gnunet'
pkgname=gnunet
version=0.12.2
-revision=3
+revision=4
build_style=gnu-configure
conf_files="/etc/gnunet/gnunet.conf"
hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"
From baff71c6a9fcd7830c834326055fce306e62fcb4 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Wed, 18 Nov 2020 16:33:42 -0600
Subject: [PATCH 2/2] libextractor: update to 1.10
Update for CVE-2019-15531
---
common/shlibs | 2 +
srcpkgs/libextractor/patches/exiv-0.27.patch | 127 -------------------
srcpkgs/libextractor/template | 6 +-
3 files changed, 5 insertions(+), 130 deletions(-)
delete mode 100644 srcpkgs/libextractor/patches/exiv-0.27.patch
diff --git a/common/shlibs b/common/shlibs
index d38fe2ebe7b..e619365bf8e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1745,6 +1745,8 @@ libextractor.so.3 libextractor-1.1_1
libextractor_common.so.1 libextractor-1.1_1
libextractor.so.2 libextractor-1.10_1
libextractor_common.so.1 libextractor-1.10_1
+libextractor.so.2 libextractor-1.10_1
+libextractor_common.so.2 libextractor-1.10_1
libpano13.so.3 libpano13-2.9.19_1
libubsan.so.1 libsanitizer-8.2.0_1
libtsan.so.0 libsanitizer-6.3.0_1
diff --git a/srcpkgs/libextractor/patches/exiv-0.27.patch b/srcpkgs/libextractor/patches/exiv-0.27.patch
deleted file mode 100644
index cfdb6426408..00000000000
--- a/srcpkgs/libextractor/patches/exiv-0.27.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From bbe21db4bf8face03adf0efd2eb18540582cb5ba Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 30 Dec 2018 00:46:57 +0100
-Subject: [PATCH] Fix build with exiv2-0.27
-
----
- src/plugins/exiv2_extractor.cc | 35 +++++++++++++++++++++++++++-------
- 1 file changed, 28 insertions(+), 7 deletions(-)
-
-diff --git a/src/plugins/exiv2_extractor.cc b/src/plugins/exiv2_extractor.cc
-index 8741d40..ef402a8 100644
---- a/src/plugins/exiv2_extractor.cc
-+++ b/src/plugins/exiv2_extractor.cc
-@@ -27,10 +27,7 @@
- #include <cassert>
- #include <cstring>
- #include <math.h>
--#include <exiv2/exif.hpp>
--#include <exiv2/error.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/futils.hpp>
-+#include <exiv2/exiv2.hpp>
-
- /**
- * Enable debugging to get error messages.
-@@ -180,7 +177,7 @@ public:
- *
- * @return -1 on error
- */
--#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
-+#if EXIV2_TEST_VERSION(0,26,0)
- virtual size_t size (void) const;
- #else
- virtual long int size (void) const;
-@@ -316,7 +313,11 @@ ExtractorIO::getb ()
- const unsigned char *r;
-
- if (1 != ec->read (ec->cls, &data, 1))
-+#if EXIV2_TEST_VERSION(0,27,0)
-+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- r = (const unsigned char *) data;
- return *r;
- }
-@@ -371,7 +372,11 @@ ExtractorIO::putb (Exiv2::byte data)
- void
- ExtractorIO::transfer (Exiv2::BasicIo& src)
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
-
-
-@@ -416,7 +421,11 @@ ExtractorIO::seek (long offset,
- Exiv2::byte *
- ExtractorIO::mmap (bool isWritable)
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
-
-
-@@ -449,7 +458,7 @@ ExtractorIO::tell (void) const
- *
- * @return -1 on error
- */
--#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
-+#if EXIV2_TEST_VERSION(0,26,0)
- size_t
- #else
- long int
-@@ -504,7 +513,11 @@ ExtractorIO::eof () const
- std::string
- ExtractorIO::path () const
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
-
-
-@@ -517,7 +530,11 @@ ExtractorIO::path () const
- std::wstring
- ExtractorIO::wpath () const
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
- #endif
-
-@@ -531,7 +548,11 @@ Exiv2::BasicIo::AutoPtr
- ExtractorIO::temporary () const
- {
- fprintf (stderr, "throwing temporary error\n");
-+#if EXIV2_TEST_VERSION(0,27,0)
-+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
-
-
-@@ -697,7 +718,7 @@ EXTRACTOR_exiv2_extract_method (struct EXTRACTOR_ExtractContext *ec)
- {
- try
- {
--#if EXIV2_MAKE_VERSION(0,23,0) <= EXIV2_VERSION
-+#if !EXIV2_TEST_VERSION(0,24,0)
- Exiv2::LogMsg::setLevel (Exiv2::LogMsg::mute);
- #endif
- std::auto_ptr<Exiv2::BasicIo> eio(new ExtractorIO (ec));
---
-2.20.1
-
diff --git a/srcpkgs/libextractor/template b/srcpkgs/libextractor/template
index bd7af6f78de..9e2c898b2b6 100644
--- a/srcpkgs/libextractor/template
+++ b/srcpkgs/libextractor/template
@@ -1,6 +1,6 @@
# Template file for 'libextractor'
pkgname=libextractor
-version=1.9
+version=1.10
revision=1
build_style=gnu-configure
configure_args="--disable-static"
@@ -14,11 +14,11 @@ maintainer="Martin Riese <grauehaare@gmx.de>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/libextractor/"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=f08f257d26c5e9b503f068d6753c8e55cb76f47f73a81da6ed2bba3de3fee2ff
+checksum=9eed11b5ddc7c929ba112c50de8cfaa379f1d99a0c8e064101775837cf432357
patch_args="-Np1"
post_install() {
- sed -i "s|\(-specs=.*hardened-ld\)||g" ${DESTDIR}/usr/lib/pkgconfig/libextractor.pc
+ vsed -i "s|\(-specs=.*hardened-ld\)||g" ${DESTDIR}/usr/lib/pkgconfig/libextractor.pc
}
libextractor-devel_package() {
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] libextractor: update to 1.10
2020-11-18 22:44 [PR PATCH] libextractor: update to 1.10 ndowens
@ 2020-11-18 23:23 ` ndowens
2020-11-20 23:49 ` ndowens
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ndowens @ 2020-11-18 23:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 411 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages libextractor
https://github.com/void-linux/void-packages/pull/26493
libextractor: update to 1.10
Fix for CVE-2019-15531
Oddly SONAME went down, changed to what xbps reported it to be
A patch file from https://github.com/void-linux/void-packages/pull/26493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libextractor-26493.patch --]
[-- Type: text/x-diff, Size: 6531 bytes --]
From 9c42a43d9284b61dfef38818e1a7c12f8dc5da03 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Wed, 18 Nov 2020 16:42:42 -0600
Subject: [PATCH 1/2] gnunet: revbump for libextractor
---
srcpkgs/gnunet/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d..a8a6dabe66b 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
# Template file for 'gnunet'
pkgname=gnunet
version=0.12.2
-revision=3
+revision=4
build_style=gnu-configure
conf_files="/etc/gnunet/gnunet.conf"
hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"
From 3e1b87c2f3900b1d3b27eea419b281bf7bbefe0f Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Wed, 18 Nov 2020 16:33:42 -0600
Subject: [PATCH 2/2] libextractor: update to 1.10
Update for CVE-2019-15531
---
common/shlibs | 4 +-
srcpkgs/libextractor/patches/exiv-0.27.patch | 127 -------------------
srcpkgs/libextractor/template | 6 +-
3 files changed, 5 insertions(+), 132 deletions(-)
delete mode 100644 srcpkgs/libextractor/patches/exiv-0.27.patch
diff --git a/common/shlibs b/common/shlibs
index 9a576f18d0f..e489f106245 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1741,8 +1741,8 @@ libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
liblensfun.so.1 lensfun-0.3.2_1
libmitlm.so.1 mitlm-0.4.2_1
-libextractor.so.3 libextractor-1.1_1
-libextractor_common.so.1 libextractor-1.1_1
+libextractor.so.2 libextractor-1.10_1
+libextractor_common.so.1 libextractor-1.10_1
libpano13.so.3 libpano13-2.9.19_1
libubsan.so.1 libsanitizer-8.2.0_1
libtsan.so.0 libsanitizer-6.3.0_1
diff --git a/srcpkgs/libextractor/patches/exiv-0.27.patch b/srcpkgs/libextractor/patches/exiv-0.27.patch
deleted file mode 100644
index cfdb6426408..00000000000
--- a/srcpkgs/libextractor/patches/exiv-0.27.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From bbe21db4bf8face03adf0efd2eb18540582cb5ba Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 30 Dec 2018 00:46:57 +0100
-Subject: [PATCH] Fix build with exiv2-0.27
-
----
- src/plugins/exiv2_extractor.cc | 35 +++++++++++++++++++++++++++-------
- 1 file changed, 28 insertions(+), 7 deletions(-)
-
-diff --git a/src/plugins/exiv2_extractor.cc b/src/plugins/exiv2_extractor.cc
-index 8741d40..ef402a8 100644
---- a/src/plugins/exiv2_extractor.cc
-+++ b/src/plugins/exiv2_extractor.cc
-@@ -27,10 +27,7 @@
- #include <cassert>
- #include <cstring>
- #include <math.h>
--#include <exiv2/exif.hpp>
--#include <exiv2/error.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/futils.hpp>
-+#include <exiv2/exiv2.hpp>
-
- /**
- * Enable debugging to get error messages.
-@@ -180,7 +177,7 @@ public:
- *
- * @return -1 on error
- */
--#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
-+#if EXIV2_TEST_VERSION(0,26,0)
- virtual size_t size (void) const;
- #else
- virtual long int size (void) const;
-@@ -316,7 +313,11 @@ ExtractorIO::getb ()
- const unsigned char *r;
-
- if (1 != ec->read (ec->cls, &data, 1))
-+#if EXIV2_TEST_VERSION(0,27,0)
-+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- r = (const unsigned char *) data;
- return *r;
- }
-@@ -371,7 +372,11 @@ ExtractorIO::putb (Exiv2::byte data)
- void
- ExtractorIO::transfer (Exiv2::BasicIo& src)
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
-
-
-@@ -416,7 +421,11 @@ ExtractorIO::seek (long offset,
- Exiv2::byte *
- ExtractorIO::mmap (bool isWritable)
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
-
-
-@@ -449,7 +458,7 @@ ExtractorIO::tell (void) const
- *
- * @return -1 on error
- */
--#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
-+#if EXIV2_TEST_VERSION(0,26,0)
- size_t
- #else
- long int
-@@ -504,7 +513,11 @@ ExtractorIO::eof () const
- std::string
- ExtractorIO::path () const
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
-
-
-@@ -517,7 +530,11 @@ ExtractorIO::path () const
- std::wstring
- ExtractorIO::wpath () const
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
- #endif
-
-@@ -531,7 +548,11 @@ Exiv2::BasicIo::AutoPtr
- ExtractorIO::temporary () const
- {
- fprintf (stderr, "throwing temporary error\n");
-+#if EXIV2_TEST_VERSION(0,27,0)
-+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
-
-
-@@ -697,7 +718,7 @@ EXTRACTOR_exiv2_extract_method (struct EXTRACTOR_ExtractContext *ec)
- {
- try
- {
--#if EXIV2_MAKE_VERSION(0,23,0) <= EXIV2_VERSION
-+#if !EXIV2_TEST_VERSION(0,24,0)
- Exiv2::LogMsg::setLevel (Exiv2::LogMsg::mute);
- #endif
- std::auto_ptr<Exiv2::BasicIo> eio(new ExtractorIO (ec));
---
-2.20.1
-
diff --git a/srcpkgs/libextractor/template b/srcpkgs/libextractor/template
index bd7af6f78de..9e2c898b2b6 100644
--- a/srcpkgs/libextractor/template
+++ b/srcpkgs/libextractor/template
@@ -1,6 +1,6 @@
# Template file for 'libextractor'
pkgname=libextractor
-version=1.9
+version=1.10
revision=1
build_style=gnu-configure
configure_args="--disable-static"
@@ -14,11 +14,11 @@ maintainer="Martin Riese <grauehaare@gmx.de>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/libextractor/"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=f08f257d26c5e9b503f068d6753c8e55cb76f47f73a81da6ed2bba3de3fee2ff
+checksum=9eed11b5ddc7c929ba112c50de8cfaa379f1d99a0c8e064101775837cf432357
patch_args="-Np1"
post_install() {
- sed -i "s|\(-specs=.*hardened-ld\)||g" ${DESTDIR}/usr/lib/pkgconfig/libextractor.pc
+ vsed -i "s|\(-specs=.*hardened-ld\)||g" ${DESTDIR}/usr/lib/pkgconfig/libextractor.pc
}
libextractor-devel_package() {
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] libextractor: update to 1.10
2020-11-18 22:44 [PR PATCH] libextractor: update to 1.10 ndowens
2020-11-18 23:23 ` [PR PATCH] [Updated] " ndowens
@ 2020-11-20 23:49 ` ndowens
2020-12-18 17:25 ` ericonr
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ndowens @ 2020-11-20 23:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 411 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages libextractor
https://github.com/void-linux/void-packages/pull/26493
libextractor: update to 1.10
Fix for CVE-2019-15531
Oddly SONAME went down, changed to what xbps reported it to be
A patch file from https://github.com/void-linux/void-packages/pull/26493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libextractor-26493.patch --]
[-- Type: text/x-diff, Size: 6531 bytes --]
From 927e7869190c6d704ade8b784951a76e8134555f Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Wed, 18 Nov 2020 16:42:42 -0600
Subject: [PATCH 1/2] gnunet: revbump for libextractor
---
srcpkgs/gnunet/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d..a8a6dabe66b 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
# Template file for 'gnunet'
pkgname=gnunet
version=0.12.2
-revision=3
+revision=4
build_style=gnu-configure
conf_files="/etc/gnunet/gnunet.conf"
hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"
From 7ace5e5e561b9aa1221d1f96f688acf4154abf7d Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Wed, 18 Nov 2020 16:33:42 -0600
Subject: [PATCH 2/2] libextractor: update to 1.10
Update for CVE-2019-15531
---
common/shlibs | 4 +-
srcpkgs/libextractor/patches/exiv-0.27.patch | 127 -------------------
srcpkgs/libextractor/template | 6 +-
3 files changed, 5 insertions(+), 132 deletions(-)
delete mode 100644 srcpkgs/libextractor/patches/exiv-0.27.patch
diff --git a/common/shlibs b/common/shlibs
index e7c727838ab..1a5394b6091 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1741,8 +1741,8 @@ libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
liblensfun.so.1 lensfun-0.3.2_1
libmitlm.so.1 mitlm-0.4.2_1
-libextractor.so.3 libextractor-1.1_1
-libextractor_common.so.1 libextractor-1.1_1
+libextractor.so.2 libextractor-1.10_1
+libextractor_common.so.1 libextractor-1.10_1
libpano13.so.3 libpano13-2.9.19_1
libubsan.so.1 libsanitizer-8.2.0_1
libtsan.so.0 libsanitizer-6.3.0_1
diff --git a/srcpkgs/libextractor/patches/exiv-0.27.patch b/srcpkgs/libextractor/patches/exiv-0.27.patch
deleted file mode 100644
index cfdb6426408..00000000000
--- a/srcpkgs/libextractor/patches/exiv-0.27.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From bbe21db4bf8face03adf0efd2eb18540582cb5ba Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 30 Dec 2018 00:46:57 +0100
-Subject: [PATCH] Fix build with exiv2-0.27
-
----
- src/plugins/exiv2_extractor.cc | 35 +++++++++++++++++++++++++++-------
- 1 file changed, 28 insertions(+), 7 deletions(-)
-
-diff --git a/src/plugins/exiv2_extractor.cc b/src/plugins/exiv2_extractor.cc
-index 8741d40..ef402a8 100644
---- a/src/plugins/exiv2_extractor.cc
-+++ b/src/plugins/exiv2_extractor.cc
-@@ -27,10 +27,7 @@
- #include <cassert>
- #include <cstring>
- #include <math.h>
--#include <exiv2/exif.hpp>
--#include <exiv2/error.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/futils.hpp>
-+#include <exiv2/exiv2.hpp>
-
- /**
- * Enable debugging to get error messages.
-@@ -180,7 +177,7 @@ public:
- *
- * @return -1 on error
- */
--#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
-+#if EXIV2_TEST_VERSION(0,26,0)
- virtual size_t size (void) const;
- #else
- virtual long int size (void) const;
-@@ -316,7 +313,11 @@ ExtractorIO::getb ()
- const unsigned char *r;
-
- if (1 != ec->read (ec->cls, &data, 1))
-+#if EXIV2_TEST_VERSION(0,27,0)
-+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- r = (const unsigned char *) data;
- return *r;
- }
-@@ -371,7 +372,11 @@ ExtractorIO::putb (Exiv2::byte data)
- void
- ExtractorIO::transfer (Exiv2::BasicIo& src)
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
-
-
-@@ -416,7 +421,11 @@ ExtractorIO::seek (long offset,
- Exiv2::byte *
- ExtractorIO::mmap (bool isWritable)
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
-
-
-@@ -449,7 +458,7 @@ ExtractorIO::tell (void) const
- *
- * @return -1 on error
- */
--#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
-+#if EXIV2_TEST_VERSION(0,26,0)
- size_t
- #else
- long int
-@@ -504,7 +513,11 @@ ExtractorIO::eof () const
- std::string
- ExtractorIO::path () const
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
-
-
-@@ -517,7 +530,11 @@ ExtractorIO::path () const
- std::wstring
- ExtractorIO::wpath () const
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
- #endif
-
-@@ -531,7 +548,11 @@ Exiv2::BasicIo::AutoPtr
- ExtractorIO::temporary () const
- {
- fprintf (stderr, "throwing temporary error\n");
-+#if EXIV2_TEST_VERSION(0,27,0)
-+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
-
-
-@@ -697,7 +718,7 @@ EXTRACTOR_exiv2_extract_method (struct EXTRACTOR_ExtractContext *ec)
- {
- try
- {
--#if EXIV2_MAKE_VERSION(0,23,0) <= EXIV2_VERSION
-+#if !EXIV2_TEST_VERSION(0,24,0)
- Exiv2::LogMsg::setLevel (Exiv2::LogMsg::mute);
- #endif
- std::auto_ptr<Exiv2::BasicIo> eio(new ExtractorIO (ec));
---
-2.20.1
-
diff --git a/srcpkgs/libextractor/template b/srcpkgs/libextractor/template
index bd7af6f78de..9e2c898b2b6 100644
--- a/srcpkgs/libextractor/template
+++ b/srcpkgs/libextractor/template
@@ -1,6 +1,6 @@
# Template file for 'libextractor'
pkgname=libextractor
-version=1.9
+version=1.10
revision=1
build_style=gnu-configure
configure_args="--disable-static"
@@ -14,11 +14,11 @@ maintainer="Martin Riese <grauehaare@gmx.de>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/libextractor/"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=f08f257d26c5e9b503f068d6753c8e55cb76f47f73a81da6ed2bba3de3fee2ff
+checksum=9eed11b5ddc7c929ba112c50de8cfaa379f1d99a0c8e064101775837cf432357
patch_args="-Np1"
post_install() {
- sed -i "s|\(-specs=.*hardened-ld\)||g" ${DESTDIR}/usr/lib/pkgconfig/libextractor.pc
+ vsed -i "s|\(-specs=.*hardened-ld\)||g" ${DESTDIR}/usr/lib/pkgconfig/libextractor.pc
}
libextractor-devel_package() {
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: libextractor: update to 1.10
2020-11-18 22:44 [PR PATCH] libextractor: update to 1.10 ndowens
2020-11-18 23:23 ` [PR PATCH] [Updated] " ndowens
2020-11-20 23:49 ` ndowens
@ 2020-12-18 17:25 ` ericonr
2021-04-22 0:25 ` ericonr
2021-04-22 0:25 ` [PR PATCH] [Closed]: " ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2020-12-18 17:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 192 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26493#issuecomment-748217258
Comment:
That honestly looks like a mistake from the devs...
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: libextractor: update to 1.10
2020-11-18 22:44 [PR PATCH] libextractor: update to 1.10 ndowens
` (2 preceding siblings ...)
2020-12-18 17:25 ` ericonr
@ 2021-04-22 0:25 ` ericonr
2021-04-22 0:25 ` [PR PATCH] [Closed]: " ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-04-22 0:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 161 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26493#issuecomment-824449744
Comment:
Superseded by #30412
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Closed]: libextractor: update to 1.10
2020-11-18 22:44 [PR PATCH] libextractor: update to 1.10 ndowens
` (3 preceding siblings ...)
2021-04-22 0:25 ` ericonr
@ 2021-04-22 0:25 ` ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-04-22 0:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
There's a closed pull request on the void-packages repository
libextractor: update to 1.10
https://github.com/void-linux/void-packages/pull/26493
Description:
Fix for CVE-2019-15531
Oddly SONAME went down, changed to what xbps reported it to be
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-04-22 0:25 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-18 22:44 [PR PATCH] libextractor: update to 1.10 ndowens
2020-11-18 23:23 ` [PR PATCH] [Updated] " ndowens
2020-11-20 23:49 ` ndowens
2020-12-18 17:25 ` ericonr
2021-04-22 0:25 ` ericonr
2021-04-22 0:25 ` [PR PATCH] [Closed]: " ericonr
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).