From 59db082ec62044e8dd91fe0bd84cb1cf6728e5a03470f3aaea034777e37d9a57 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 28 May 2020 11:06:06 +0000 Subject: [PATCH] Accepting request 809723 from home:jsikes:branches:multimedia:libs Update to resolve some security issues. Have fun! :D OBS-URL: https://build.opensuse.org/request/show/809723 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libEMF?expand=0&rev=21 --- aarch64-support.patch | 95 ------------------------------------------- libEMF-1.0.7.tar.gz | 3 -- libEMF.changes | 8 ++++ libEMF.spec | 42 ++++++++----------- libemf-1.0.12.tar.gz | 3 ++ 5 files changed, 29 insertions(+), 122 deletions(-) delete mode 100644 aarch64-support.patch delete mode 100644 libEMF-1.0.7.tar.gz create mode 100644 libemf-1.0.12.tar.gz diff --git a/aarch64-support.patch b/aarch64-support.patch deleted file mode 100644 index 31f7d84..0000000 --- a/aarch64-support.patch +++ /dev/null @@ -1,95 +0,0 @@ -Index: libEMF-1.0.7/include/libEMF/wine/winnt.h -=================================================================== ---- libEMF-1.0.7.orig/include/libEMF/wine/winnt.h -+++ libEMF-1.0.7/include/libEMF/wine/winnt.h -@@ -57,6 +57,10 @@ - # define WORDS_BIGENDIAN - # define BITFIELDS_BIGENDIAN - # undef ALLOW_UNALIGNED_ACCESS -+#elif defined(__aarch64__) -+# undef WORDS_BIGENDIAN -+# undef BITFIELDS_BIGENDIAN -+# undef ALLOW_UNALIGNED_ACCESS - #elif !defined(RC_INVOKED) - # error Unknown CPU architecture! - #endif -@@ -1425,6 +1429,79 @@ ULONG Cpsr; - - #endif /* __arm__ */ - -+#ifdef __aarch64__ -+ -+/* These definitions are taken directly from wine -+ http://source.winehq.org/git/wine.git/blob_plain/HEAD:/include/winnt.h */ -+ -+/* -+ * FIXME: -+ * -+ * There is not yet an official CONTEXT structure defined for the AArch64 -+ * architecture, so I just made one up. -+ * -+ */ -+ -+#define CONTEXT_ARM64 0x2000000 -+#define CONTEXT_CONTROL (CONTEXT_ARM64 | 0x00000001) -+#define CONTEXT_INTEGER (CONTEXT_ARM64 | 0x00000002) -+#define CONTEXT_FLOATING_POINT (CONTEXT_ARM64 | 0x00000004) -+#define CONTEXT_DEBUG_REGISTERS (CONTEXT_ARM64 | 0x00000008) -+ -+#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER) -+ -+#define EXCEPTION_READ_FAULT 0 -+#define EXCEPTION_WRITE_FAULT 1 -+#define EXCEPTION_EXECUTE_FAULT 8 -+ -+typedef struct _CONTEXT { -+ ULONG ContextFlags; -+ -+ /* This section is specified/returned if the ContextFlags word contains -+ the flag CONTEXT_INTEGER. */ -+ ULONGLONG X0; -+ ULONGLONG X1; -+ ULONGLONG X2; -+ ULONGLONG X3; -+ ULONGLONG X4; -+ ULONGLONG X5; -+ ULONGLONG X6; -+ ULONGLONG X7; -+ ULONGLONG X8; -+ ULONGLONG X9; -+ ULONGLONG X10; -+ ULONGLONG X11; -+ ULONGLONG X12; -+ ULONGLONG X13; -+ ULONGLONG X14; -+ ULONGLONG X15; -+ ULONGLONG X16; -+ ULONGLONG X17; -+ ULONGLONG X18; -+ ULONGLONG X19; -+ ULONGLONG X20; -+ ULONGLONG X21; -+ ULONGLONG X22; -+ ULONGLONG X23; -+ ULONGLONG X24; -+ ULONGLONG X25; -+ ULONGLONG X26; -+ ULONGLONG X27; -+ ULONGLONG X28; -+ ULONGLONG X29; -+ ULONGLONG X30; -+ -+ /* These are selected by CONTEXT_CONTROL */ -+ ULONGLONG Sp; -+ ULONGLONG Pc; -+ ULONGLONG PState; -+ -+ /* These are selected by CONTEXT_FLOATING_POINT */ -+ /* FIXME */ -+} CONTEXT; -+ -+#endif /* __aarch64__ */ -+ - #if !defined(CONTEXT_FULL) && !defined(RC_INVOKED) - #error You need to define a CONTEXT for your CPU - #endif diff --git a/libEMF-1.0.7.tar.gz b/libEMF-1.0.7.tar.gz deleted file mode 100644 index b43427d..0000000 --- a/libEMF-1.0.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f2fd8bb84e345978c7fc45a39e06fc6a44fee867a91ebe83433d3a34348fd21 -size 908973 diff --git a/libEMF.changes b/libEMF.changes index 1d9f7d2..743c151 100644 --- a/libEMF.changes +++ b/libEMF.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed May 27 23:58:38 UTC 2020 - Jason Sikes + +- Upgrade to version 1.0.12 + * Fixes for CVE-2020-11863, CVE-2020-11864, + CVE-2020-11865, and CVE-2020-11866. + * Removed obsoleted aarch64-support.patch + ------------------------------------------------------------------- Fri Sep 4 14:24:02 UTC 2015 - mpluskal@suse.com diff --git a/libEMF.spec b/libEMF.spec index 3d2551d..03b2a95 100644 --- a/libEMF.spec +++ b/libEMF.spec @@ -1,7 +1,7 @@ # # spec file for package libEMF # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,24 +12,22 @@ # 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/ # Name: libEMF -Version: 1.0.7 +Version: 1.0.12 Release: 0 Summary: Library for Manipulation with Enhanced MetaFile (EMF, ECMA-234) -License: LGPL-2.1+ and GPL-2.0+ +License: LGPL-2.1-or-later AND GPL-2.0-or-later Group: System/Libraries -Url: http://libemf.sourceforge.net/ -Source: http://downloads.sourceforge.net/project/libemf/libemf/%{version}/%{name}-%{version}.tar.gz -Patch0: aarch64-support.patch +URL: http://libemf.sourceforge.net/ +Source: http://downloads.sourceforge.net/project/libemf/libemf/%{version}/libemf-%{version}.tar.gz Patch2: ppc64le-support.patch BuildRequires: gcc-c++ -BuildRoot: %{_tmppath}/%{name}-%{version}-build # taken from includes/wine/winnt.h -ExclusiveArch: alpha %arm aarch64 %ix86 mips ppc ppc64 ppc64le sparc s390 s390x x86_64 +ExclusiveArch: alpha %{arm} aarch64 %{ix86} mips ppc ppc64 ppc64le sparc s390 s390x x86_64 %description LibEMF is a C/C++ library that provides a drawing toolkit based on @@ -43,7 +41,7 @@ object. %package -n libEMF1 Summary: Library for manipulation with Enhanced MetaFile (EMF, ECMA-234) -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries %description -n libEMF1 @@ -58,9 +56,9 @@ SO/OO graphics object. %package utils Summary: Library for manipulation with Enhanced MetaFile (EMF, ECMA-234) -License: GPL-2.0+ -Group: Productivity/Graphics/Other # split-provides for upgrade from openSUSE <= 12.1 and SLE <= 11 +License: GPL-2.0-or-later +Group: Productivity/Graphics/Other Provides: %{name}:%{_bindir}/printemf %description utils @@ -75,7 +73,7 @@ SO/OO graphics object. %package devel Summary: Library for manipulation with Enhanced MetaFile (EMF, ECMA-234) -License: LGPL-2.1+ and GPL-2.0+ +License: LGPL-2.1-or-later AND GPL-2.0-or-later Group: Development/Libraries/C and C++ Requires: glibc-devel Requires: libEMF1 = %{version} @@ -91,38 +89,34 @@ SO/OO. The EMF format also has the additional advantage that it can be SO/OO graphics object. %prep -%setup -q -%patch0 -p1 +%setup -q -n libemf-%{version} %patch2 -p1 %build %configure\ --disable-static -make %{?_smp_mflags} +%make_build %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install find %{buildroot} -type f -name "*.la" -delete -print %check -make %{?_smp_mflags} check +%make_build check %post -n libEMF1 -p /sbin/ldconfig - %postun -n libEMF1 -p /sbin/ldconfig %files -n libEMF1 -%defattr(-, root, root) -%doc COPYING.LIB +%license COPYING.LIB %{_libdir}/*.so.* %files utils -%defattr(-, root, root) -%doc AUTHORS COPYING ChangeLog NEWS README +%license COPYING +%doc AUTHORS ChangeLog NEWS README %{_bindir}/* %files devel -%defattr(-, root, root) %doc doc/html %{_includedir}/libEMF %{_libdir}/*.so diff --git a/libemf-1.0.12.tar.gz b/libemf-1.0.12.tar.gz new file mode 100644 index 0000000..b9e67ba --- /dev/null +++ b/libemf-1.0.12.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22e6f70986dc1ff8b85aa94f8ee45dd259034ad6476e42156ccf237e25c4d506 +size 1314880