From 625d87cec5fa71ab3170ebca614335ccab12621a Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Sep 13 2021 22:20:06 +0000 Subject: Import libwmf-0.2.12-6.el9 in CloudSIG xena --- diff --git a/.libwmf.metadata b/.libwmf.metadata index 1bfef49..1395b8f 100644 --- a/.libwmf.metadata +++ b/.libwmf.metadata @@ -1 +1 @@ -b63f95da60db128f53ca61c2941f1c07c820d02f SOURCES/v0.2.9.tar.gz +490a26175ad667fbc0c009d390bf56644919bed6 SOURCES/v0.2.12.tar.gz diff --git a/SPECS/libwmf.spec b/SPECS/libwmf.spec index c72b546..09b63e3 100644 --- a/SPECS/libwmf.spec +++ b/SPECS/libwmf.spec @@ -1,8 +1,7 @@ Summary: Windows MetaFile Library Name: libwmf -Version: 0.2.9 -Release: 8%{?dist} -Group: System Environment/Libraries +Version: 0.2.12 +Release: 6%{?dist} #libwmf is under the LGPLv2+, however... #1. The tarball contains an old version of the urw-fonts under GPL+. # Those fonts are not installed @@ -12,8 +11,7 @@ License: LGPLv2+ and GPLv2+ and GPL+ Source: https://github.com/caolanm/libwmf/archive/v%{version}.tar.gz URL: https://github.com/caolanm/libwmf -Patch0: covscan.patch -Patch1: 0001-merge-in-fixes-for-libgd-CVE-2019-6978.patch +Provides: bundled(gd) = 2.0.0 Requires: urw-fonts Requires: %{name}-lite = %{version}-%{release} @@ -23,20 +21,19 @@ Requires: gdk-pixbuf2%{?_isa} >= 2.31.5-2.fc24 BuildRequires: gtk2-devel, libtool, libxml2-devel, libpng-devel BuildRequires: libjpeg-devel, libXt-devel, libX11-devel, dos2unix, libtool +BuildRequires: make %description A library for reading and converting Windows MetaFile vector graphics (WMF). %package lite Summary: Windows Metafile parser library -Group: System Environment/Libraries %description lite A library for parsing Windows MetaFile vector graphics (WMF). %package devel Summary: Support files necessary to compile applications with libwmf -Group: Development/Libraries Requires: libwmf = %{version}-%{release} Requires: gtk2-devel, libxml2-devel, libjpeg-devel @@ -46,17 +43,15 @@ using libwmf. %prep %setup -q -%patch0 -p1 -b .covscan -%patch1 -p1 -b .CVE-2019-6978 f=README ; iconv -f iso-8859-2 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f %build autoreconf -i -f -Ipatches %configure --with-libxml2 --disable-static --disable-dependency-tracking --with-gsfontdir=/usr/share/fonts/urw-base35 -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +%make_install find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' rm -rf $RPM_BUILD_ROOT%{_includedir}/libwmf/gd @@ -67,16 +62,11 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/libwmf/fonts/*afm rm -rf $RPM_BUILD_ROOT%{_datadir}/libwmf/fonts/*t1 sed -i $RPM_BUILD_ROOT%{_datadir}/libwmf/fonts/fontmap -e 's#libwmf/fonts#fonts/urw-base35#g' -%post -p /sbin/ldconfig - -%post lite -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%postun lite -p /sbin/ldconfig +%ldconfig_scriptlets +%ldconfig_scriptlets lite %files -%{_libdir}/libwmf-*.so.* +%{_libdir}/libwmf-0.2.so.7* %{_libdir}/gdk-pixbuf-2.0/*/loaders/*.so %{_bindir}/wmf2svg %{_bindir}/wmf2gd @@ -87,8 +77,9 @@ sed -i $RPM_BUILD_ROOT%{_datadir}/libwmf/fonts/fontmap -e 's#libwmf/fonts#fonts/ %{_datadir}/libwmf/ %files lite -%doc AUTHORS COPYING README -%{_libdir}/libwmflite-*.so.* +%doc AUTHORS README +%license COPYING +%{_libdir}/libwmflite-0.2.so.7* %files devel %doc doc/*.html @@ -96,28 +87,48 @@ sed -i $RPM_BUILD_ROOT%{_datadir}/libwmf/fonts/fontmap -e 's#libwmf/fonts#fonts/ %doc doc/*.gif %doc doc/html %doc doc/caolan -%{_libdir}/*.so +%{_libdir}/libwmf*.so %{_libdir}/pkgconfig/libwmf.pc -%{_includedir}/libwmf +%{_includedir}/libwmf/ %{_bindir}/libwmf-config %changelog -* Wed Aug 14 2019 Caolán McNamara - 0.2.9-8 -- Related: rhbz1717799 fix clang warning +* Tue May 18 2021 Caolán McNamara - 0.2.12-6 +- document that libwmf bundles a modified old copy of gd 2.0.1 + https://fedoraproject.org/wiki/Bundled_Libraries#Requirement_if_you_bundle + +* Tue Jan 26 2021 Fedora Release Engineering - 0.2.12-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.2.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 0.2.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild -* Wed Aug 14 2019 Caolán McNamara - 0.2.9-7 -- Related: rhbz1717799 bump n-v-r +* Thu Jul 25 2019 Fedora Release Engineering - 0.2.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild -* Wed Mar 06 2019 Caolán McNamara - 0.2.9-6 -- Related: rhbz1679006 bump n-v-r +* Fri Feb 01 2019 Caolán McNamara - 0.2.12-1 +- Related: rhbz#1671392/rhbz#1671621 unwanted soname bump -* Tue Feb 26 2019 Caolán McNamara - 0.2.9-5 -- Resolves: rhbz1679006 libgd CVE-2019-6978 +* Fri Feb 01 2019 Rex Dieter - 0.2.11-2 +- track library sonames so bumps aren't a surprise +- use %%make_build %%make_install macros -* Fri Aug 10 2018 Caolán McNamara - 0.2.9-4 +* Thu Jan 31 2019 Caolán McNamara - 0.2.11-1 +- Resolves: rhbz#1671392 CVE-2019-6978 latest version + +* Fri Aug 10 2018 Caolán McNamara - 0.2.10-1 +- latest version + +* Fri Aug 10 2018 Caolán McNamara - 0.2.9-5 - Related: rhbz#1602602 fix more clang warnings +* Fri Aug 10 2018 Igor Gnatenko - 0.2.9-4 +- Switch to %%ldconfig_scriptlets + * Fri Aug 10 2018 Caolán McNamara - 0.2.9-3 - Related: rhbz#1602602 fix more clang warnings @@ -128,6 +139,15 @@ sed -i $RPM_BUILD_ROOT%{_datadir}/libwmf/fonts/fontmap -e 's#libwmf/fonts#fonts/ - Resolves: rhbz#1602602 new version with covscan warnings fixed - all cve fixes merged to that new upstream +* Wed Aug 08 2018 Caolán McNamara - 0.2.8.4-56 +- Resolves: rhbz#1595490 make libwmf work again with recent urw-fonts + +* Fri Jul 13 2018 Fedora Release Engineering - 0.2.8.4-55 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 0.2.8.4-54 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Sep 12 2017 Caolán McNamara - 0.2.8.4-53 - Resolves: rhbz#1489844 CVE-2017-6362 remove afflicted but unused function