gthumb: update to 3.10.2.
By ericonr: - clean up outdated CVE patch (upstream fixed in a different way, so patch still applied).= - add patch for build order - move INSTALL.msg to README.voidlinux Closes: #28757 [via git-merge-pr]
This commit is contained in:
parent
07c4520cef
commit
2c731b0634
|
@ -0,0 +1,15 @@
|
|||
diff --git a/gthumb/meson.build b/gthumb/meson.build
|
||||
index 64c93578..c348af81 100644
|
||||
--- gthumb/meson.build
|
||||
+++ gthumb/meson.build
|
||||
@@ -311,6 +311,7 @@ gthumb_exe = executable('gthumb',
|
||||
],
|
||||
dependencies : [
|
||||
common_deps,
|
||||
+ gthumb_h_dep,
|
||||
jpeg_deps,
|
||||
authors_dep,
|
||||
use_exiv2 ? exiv2_dep : [],
|
||||
--
|
||||
GitLab
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
Description: CVE-2018-18718
|
||||
An issue was discovered in gThumb through 3.6.2. There is a
|
||||
double-free vulnerability in the add_themes_from_dir method in
|
||||
dlg-contact-sheet.c because of two successive calls of g_free,
|
||||
each of which frees the same buffer.
|
||||
Thanks Tianjun Wu - https://gitlab.gnome.org/leoaccount
|
||||
https://gitlab.gnome.org/GNOME/gthumb/issues/18
|
||||
Author: Herbert Parentes Fortes Neto <hpfn@debian.org>
|
||||
Last-Update: 2018-10-30
|
||||
Index: gthumb/extensions/contact_sheet/dlg-contact-sheet.c
|
||||
===================================================================
|
||||
--- extensions/contact_sheet/dlg-contact-sheet.c
|
||||
+++ extensions/contact_sheet/dlg-contact-sheet.c
|
||||
@@ -352,6 +352,7 @@ add_themes_from_dir (DialogData *data,
|
||||
if (! g_key_file_load_from_data (key_file, buffer, size, G_KEY_FILE_NONE, NULL)) {
|
||||
g_key_file_free (key_file);
|
||||
g_free (buffer);
|
||||
+ buffer = NULL;
|
||||
g_object_unref (file);
|
||||
g_object_unref (file_info);
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'gthumb'
|
||||
pkgname=gthumb
|
||||
version=3.10.0
|
||||
version=3.10.2
|
||||
revision=1
|
||||
build_style=meson
|
||||
hostmakedepends="gettext pkg-config itstool glib-devel"
|
||||
|
@ -14,7 +14,7 @@ maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
|
|||
license="GPL-2.0-or-later"
|
||||
homepage="http://live.gnome.org/gthumb"
|
||||
distfiles="${GNOME_SITE}/gthumb/${version%.*}/gthumb-${version}.tar.xz"
|
||||
checksum=3e71f8395a01acfc80af4126fca99d99e7b227aed750bafd64734f08c9edec48
|
||||
checksum=fdeae42818378f9b3cab00604eeeb5b7c0a7a5ecfe69de08b993867746435c93
|
||||
|
||||
LDFLAGS="-fPIC"
|
||||
|
||||
|
@ -24,6 +24,10 @@ desc_option_clutter="Enable clutter (for slideshows)"
|
|||
desc_option_soup="Enable webservices"
|
||||
build_options_default="clutter gstreamer soup"
|
||||
|
||||
post_install() {
|
||||
vdoc $FILESDIR/README.voidlinux
|
||||
}
|
||||
|
||||
gthumb-devel_package() {
|
||||
short_desc+=" - development files"
|
||||
depends="${sourcepkg}>=${version}_${revision}"
|
||||
|
|
Loading…
Reference in New Issue