Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libwmf for openSUSE:Factory checked in at 2021-05-13 22:18:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libwmf (Old) and /work/SRC/openSUSE:Factory/.libwmf.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libwmf" Thu May 13 22:18:12 2021 rev:37 rq:892219 version:0.2.12 Changes: -------- --- /work/SRC/openSUSE:Factory/libwmf/libwmf.changes 2018-05-17 18:03:32.611994833 +0200 +++ /work/SRC/openSUSE:Factory/.libwmf.new.2988/libwmf.changes 2021-05-13 22:18:17.935639183 +0200 @@ -1,0 +2,31 @@ +Sat May 8 09:25:41 UTC 2021 - Dirk M??ller <dmuel...@suse.com> + +- update to 0.2.12: + * upstream changed to fork from Fedora: https://github.com/caolanm/libwmf + * fix abi + * merge in fixes for libgd CVE-2019-6978 + * release with coverity, clang and shellcheck fixes + * Seeing as wvware.sourceforge.net seems to be dead, but libwmf is still in + use and has had a bunch of security bugs reported against, and I've a + history with libwmf, I'll call this libwmf 0.2.9 and merge in my (Red Hat) + fixes. +- drop libwmf-0.2.8.4-ia64.patch, libwmf-0.2.8.4-config.patch: obsolete +- drop libwmf-0.2.8.4-overflow-CVE-2006-3376.patch: upstream via + https://github.com/caolanm/libwmf/commit/b9cc022c8d7dd8c557e2dae5681c2d344237b4f9 +- drop libwmf-0.2.8.4-CVE-2015-0848.patch: part of + https://github.com/caolanm/libwmf/commit/879d6bffa6dd21b8c0e9ec3b5aa31b6ae090ef83 +- drop libwmf-0.2.8.4-badrle.patch: part of + https://github.com/caolanm/libwmf/commit/879d6bffa6dd21b8c0e9ec3b5aa31b6ae090ef83 +- drop libwmf-0.2.8.4-CVE-2015-4696.patch: upstream via + https://github.com/caolanm/libwmf/commit/f47cbdf96838c2daa7b8e489f59e62371d33352a +- drop libwmf-0.2.8.4-CVE-2015-4695.patch: upstream via + https://github.com/caolanm/libwmf/commit/b5ae5d1f3bbddf051a5c9dd01897bd835817f013 +- drop reproducible.patch: differently done upstream +- drop use-pkg-config-for-freetype.patch: obsolete + +------------------------------------------------------------------- +Mon Aug 24 14:20:00 UTC 2020 - Callum Farmer <callumjfarme...@gmail.com> + +- Fixes for %_libexecdir changing to /usr/libexec (bsc#1174075) + +------------------------------------------------------------------- Old: ---- libwmf-0.2.8.4-CVE-2015-0848.patch libwmf-0.2.8.4-CVE-2015-4695.patch libwmf-0.2.8.4-CVE-2015-4696.patch libwmf-0.2.8.4-badrle.patch libwmf-0.2.8.4-config.patch libwmf-0.2.8.4-ia64.patch libwmf-0.2.8.4-overflow-CVE-2006-3376.patch libwmf-0.2.8.4.tar.gz reproducible.patch use-pkg-config-for-freetype.patch New: ---- v0.2.12.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libwmf.spec ++++++ --- /var/tmp/diff_new_pack.jABAiY/_old 2021-05-13 22:18:18.743636101 +0200 +++ /var/tmp/diff_new_pack.jABAiY/_new 2021-05-13 22:18:18.747636085 +0200 @@ -1,7 +1,7 @@ # # spec file for package libwmf # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,47 +12,36 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define lname libwmf-0_2-7 Name: libwmf -Version: 0.2.8.4 +Version: 0.2.12 Release: 0 Summary: Utilities for Displaying and Converting Metafile Images License: LGPL-2.1-or-later Group: Productivity/Graphics/Other -Url: http://wvWare.sourceforge.net/ -Source: http://downloads.sourceforge.net/project/wvware/%{name}/%{version}/%{name}-%{version}.tar.gz +URL: https://github.com/caolanm/libwmf +Source: https://github.com/caolanm/libwmf/archive/v%{version}.tar.gz Source2: baselibs.conf -Patch0: libwmf-0.2.8.4-ia64.patch Patch1: libwmf-0.2.8.4-fix.patch -Patch2: libwmf-0.2.8.4-config.patch -Patch3: libwmf-0.2.8.4-overflow-CVE-2006-3376.patch Patch4: libwmf-0.2.8.4-gd_libpng.patch Patch5: libwmf-0.2.8.4-bnc495842.patch -Patch6: libwmf-0.2.8.4-CVE-2015-0848.patch -Patch7: libwmf-0.2.8.4-badrle.patch -Patch8: libwmf-0.2.8.4-CVE-2015-4696.patch -Patch9: libwmf-0.2.8.4-CVE-2015-4695.patch -Patch10: reproducible.patch -Patch11: use-pkg-config-for-freetype.patch -BuildRequires: autoconf -BuildRequires: automake BuildRequires: gd-devel BuildRequires: gtk2-devel BuildRequires: libjpeg-devel BuildRequires: libtiff-devel BuildRequires: libtool BuildRequires: libxml2-devel +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: xorg-x11-proto-devel BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xt) Provides: mswordvw:%{_bindir}/wmftopng Provides: wv:%{_bindir}/wmftopng -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This library interprets metafile images and can either display them @@ -89,8 +78,8 @@ Requires: pkgconfig(x11) Requires: pkgconfig(xproto) Requires: pkgconfig(zlib) -Provides: mswordvd:%{_libexecdir}/libwmf.a -Provides: wv-devel:%{_libexecdir}/libwmf.a +Provides: mswordvd:%{_prefix}/lib/libwmf.a +Provides: wv-devel:%{_prefix}/lib/libwmf.a %description devel The libwmf-devel package contains the header files and static libraries @@ -107,80 +96,47 @@ %prep %setup -q -%patch0 -%patch1 -%patch2 -%patch3 -%patch4 -%patch5 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 +%autopatch -p0 %build -# Patch11 modifies configure.ac -autoreconf -fi -%configure --disable-static --prefix=%{_prefix} $RPM_ARCH-suse-linux --enable-magick --libdir=%{_libdir} -make %{?_smp_mflags} +%configure \ + --disable-static \ + --enable-magick \ + $RPM_ARCH-suse-linux +%make_build %install -mkdir -p %{buildroot}%{_includedir}/libwmf -make DESTDIR=%{buildroot} \ - wmfdocdir=%{_defaultdocdir}/libwmf \ - wmfonedocdir=%{_defaultdocdir}/libwmf/caolan \ - install +%make_install wmfdocdir=%{_defaultdocdir}/libwmf \ + wmfonedocdir=%{_defaultdocdir}/libwmf/caolan find %{buildroot} -type f -name "*.la" -delete -print -cp AUTHORS COPYING CREDITS ChangeLog README TODO %{buildroot}/%{_defaultdocdir}/libwmf %post -n %{lname} -p /sbin/ldconfig - %postun -n %{lname} -p /sbin/ldconfig %files tools -%defattr(-,root,root) +%license COPYING +%doc AUTHORS CREDITS README TODO %{_bindir}/libwmf-fontmap %{_bindir}/wmf2eps %{_bindir}/wmf2fig %{_bindir}/wmf2gd -#/usr/bin/wmf2magick -#/usr/bin/wmf2plot %{_bindir}/wmf2svg %{_bindir}/wmf2x -# -# %{_datadir}/libwmf -# -%dir %{_defaultdocdir}/libwmf -%doc %{_defaultdocdir}/libwmf/AUTHORS -%doc %{_defaultdocdir}/libwmf/COPYING -%doc %{_defaultdocdir}/libwmf/CREDITS -%doc %{_defaultdocdir}/libwmf/ChangeLog -%doc %{_defaultdocdir}/libwmf/README -%doc %{_defaultdocdir}/libwmf/TODO %files -n %{lname} -%defattr(-,root,root) %{_libdir}/libwmf*-0.2.so.7* %files gnome -%defattr(-,root,root) -%dir %{_libdir}/gtk-*/*/loaders -%{_libdir}/gtk-*/*/loaders/*.so +%{_libdir}/gdk-pixbuf-*/*/loaders/*.so %files devel -%defattr(-,root,root) +%doc doc/caolan +%doc doc/html +%doc doc/*.{html,png,gif} %{_bindir}/libwmf-config %{_includedir}/libwmf %{_libdir}/libwmf*.so -%dir %{_libdir}/gtk-*/*/loaders -# -%doc %{_defaultdocdir}/libwmf/*.html -%doc %{_defaultdocdir}/libwmf/*.png -%doc %{_defaultdocdir}/libwmf/*.gif -%doc %{_defaultdocdir}/libwmf/caolan -%doc %{_defaultdocdir}/libwmf/html +%{_libdir}/pkgconfig/libwmf.pc %changelog ++++++ libwmf-0.2.8.4-bnc495842.patch ++++++ --- /var/tmp/diff_new_pack.jABAiY/_old 2021-05-13 22:18:18.779635963 +0200 +++ /var/tmp/diff_new_pack.jABAiY/_new 2021-05-13 22:18:18.779635963 +0200 @@ -1,10 +1,12 @@ ---- src/extra/gd/gd_clip.c +Index: src/extra/gd/gd_clip.c +=================================================================== +--- src/extra/gd/gd_clip.c.orig +++ src/extra/gd/gd_clip.c -@@ -69,6 +69,7 @@ +@@ -69,6 +69,7 @@ void gdClipSetAdd(gdImagePtr im,gdClipRe if (im->clip->count == im->clip->max) { more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle)); if (more == 0) return; + im->clip->list = more; im->clip->max += 8; + im->clip->list = more; } - im->clip->list[im->clip->count] = (*rect); ++++++ libwmf-0.2.8.4-fix.patch ++++++ --- /var/tmp/diff_new_pack.jABAiY/_old 2021-05-13 22:18:18.791635917 +0200 +++ /var/tmp/diff_new_pack.jABAiY/_new 2021-05-13 22:18:18.791635917 +0200 @@ -1,6 +1,8 @@ ---- src/api.c +Index: src/api.c +=================================================================== +--- src/api.c.orig +++ src/api.c -@@ -156,6 +156,12 @@ +@@ -156,6 +156,12 @@ wmf_error_t wmf_lite_create (wmfAPI** AP } API->write_data = 0; @@ -13,10 +15,11 @@ API->MetaHeader.pmh = &(API->PlaceableMetaHeader); API->MetaHeader.wmfheader = &(API->Head); - ---- src/extra/gd/gd.c +Index: src/extra/gd/gd.c +=================================================================== +--- src/extra/gd/gd.c.orig +++ src/extra/gd/gd.c -@@ -784,6 +784,7 @@ +@@ -810,6 +810,7 @@ gdImageTileApply (gdImagePtr im, int x, } else { @@ -24,27 +27,15 @@ /* Allow for transparency */ if (p != gdImageGetTransparent (im->tile)) { - ---- src/extra/gd/gd.h +Index: src/extra/gd/gd.h +=================================================================== +--- src/extra/gd/gd.h.orig +++ src/extra/gd/gd.h -@@ -21,6 +21,7 @@ - * documentation. */ - - #include <stdlib.h> -+#include <string.h> +@@ -22,6 +22,7 @@ extern "C" { /* stdio is needed for file I/O. */ #include <stdio.h> - ---- src/player/record.h -+++ src/player/record.h -@@ -96,6 +96,7 @@ - new_record.function = record->function; - new_record.size = 0; - new_record.parameter = 0; -+ new_record.position = 0; - - if (index > record->size) - { WMF_ERROR (API,"Bad record - unexpectedly short!"); ++#include <string.h> + #include <gd_io.h> + #include <gd_clip.h> -
