From 7c19d517d63de438634052a0c23f5f2634201aa32ab96c5f415bc0d4c6ba0fbd Mon Sep 17 00:00:00 2001 From: Pedro Monreal Gonzalez Date: Tue, 6 Apr 2021 07:58:20 +0000 Subject: [PATCH 1/2] Accepting request 883120 from home:dirkmueller:Factory - update to 2.3.0: * When calling XML_ParseBuffer without a prior successful call to XML_GetBuffer as a user, no longer trigger undefined behavior (by adding an integer to a NULL pointer) but rather return XML_STATUS_ERROR and set the error code to (new) code XML_ERROR_NO_BUFFER. Found by UBSan (UndefinedBehaviorSanitizer) of Clang 11 (but not Clang 9). * xmlwf: Exit status 2 was used for both: - malformed input files (documented) and - invalid command-line arguments (undocumented). case of invalid command-line arguments now has its own exit status 4, resolving the ambiguity. * Other changes OBS-URL: https://build.opensuse.org/request/show/883120 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/expat?expand=0&rev=85 --- expat-2.2.10.tar.xz | 3 --- expat-2.2.10.tar.xz.asc | 16 ---------------- expat-2.3.0.tar.xz | 3 +++ expat-2.3.0.tar.xz.asc | 16 ++++++++++++++++ expat.changes | 17 +++++++++++++++++ expat.spec | 20 +++++++++++--------- 6 files changed, 47 insertions(+), 28 deletions(-) delete mode 100644 expat-2.2.10.tar.xz delete mode 100644 expat-2.2.10.tar.xz.asc create mode 100644 expat-2.3.0.tar.xz create mode 100644 expat-2.3.0.tar.xz.asc diff --git a/expat-2.2.10.tar.xz b/expat-2.2.10.tar.xz deleted file mode 100644 index 8c01456..0000000 --- a/expat-2.2.10.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5dfe538f8b5b63f03e98edac520d7d9a6a4d22e482e5c96d4d06fcc5485c25f2 -size 425432 diff --git a/expat-2.2.10.tar.xz.asc b/expat-2.2.10.tar.xz.asc deleted file mode 100644 index 39f06f9..0000000 --- a/expat-2.2.10.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEy43nCpDPv2w79cxWliYqz/vTrsYFAl94mw0ACgkQliYqz/vT -rsYQ5w/8C0VsyGGpgyBQ22rNPNXDqTf1p33505RxzLsbBh8r6XH6KD+Le2DVBMdB -VE5Bo5nbAsQxh9Rno9a3XxYfS4Ayn0hRodYJVQ3ewFMJZet75sPzVNq5OmpQeDHR -rU/yCOJBcX1IV+rotJXot7U/nMVtwA+vfNPpdfPk5apEVekJjPNBFgeE6mrsRYiv -2pBA3U/J5vStJJr7z95jcyjDi4A5Pus4DX/RYIA7SUuo6fcXqDnfTVR628y51Htb -2dP8Xf3OsVWNmqA/FKFXhnKhS/HfrYMKNRtjQ7SW2i6E07HhdBD3PMoJQldqIGNg -bYHkj9CcF5HHHbeia6NK5eOMW9IZHiwvkEiO9EM9/UBD4jcUqY86k2HG1ahVSTe/ -lFZwz0RIIN0TeaM10j4fMu+QdkUi/6k7jDggRfikhPt1qrHHZxWvnX+CQP6mO5Zx -MCFtlXe31/jpqaNVgyENLli0UJq2TuLdQsq03vwhZap4c0BSa9Y0XUJlQK6vcg+M -w+eGzF3AA/oC+HKrPAOCZTUxp0jK+BbI8mvSe5rv9m535Sy/55CngmNvpHSRuRWA -jFOXRMGDG9uO44mTz9wG7R7i7daGcxTGr91cA144YyXICv7j3HfzcrZ4PKZ4TI8u -aumYAdrEx6DQoH4YDfEoLSXn5P1JVXJE1Nq1wO5vcs9TELruT6U= -=8lxt ------END PGP SIGNATURE----- diff --git a/expat-2.3.0.tar.xz b/expat-2.3.0.tar.xz new file mode 100644 index 0000000..fdc98c9 --- /dev/null +++ b/expat-2.3.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:caa34f99b6e3bcea8502507eb6549a0a84510b244a748dfb287271b2d47467a9 +size 433508 diff --git a/expat-2.3.0.tar.xz.asc b/expat-2.3.0.tar.xz.asc new file mode 100644 index 0000000..6c32fa9 --- /dev/null +++ b/expat-2.3.0.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEy43nCpDPv2w79cxWliYqz/vTrsYFAmBb2eIACgkQliYqz/vT +rsZ1hw//RPMDuqOoVHnbIByIkT5un1oWwdMLTmLFoTfHZCVruPK8RZ44f7eyxGRn +UeLuP+MFxVrco2ZE7DbdpPkVLTWD7rRwZmi5vcGT+V78KK9H+d21lMAGZHlupSqk +Y3O2Ofj6s8Twq6q4P6UOetldpsaj58gJTwNAuklv4jFlmjppohwhxRiwvofcyuom +3gbY11Mzr36oKi0phDhmMUFx/aeG6SogZsgDAlKS+GCqqwPUtUrA6GRGPJQIswzz +2bsw9xAKhAdKtZRFx9DrW9l/fGsZ64xHkg3Z9CHq54cHpuX4ahmhjdQM1ieyHCHs +NuXO0vPPy6miaWq8Yd6l1Oo7FpTNsnZ5gmpNt1KchWTrc4BeGtFY39o4zhccf0AZ +rh1sEauxbcoo5bi0w8u1WCLKFudLvijZG78dqXn8jyVEd526PmLnluQcF8q+wfiU +Ak2tvAmqklL+B4roJj9HC/GwOYPRwBPH6p9naRprAtAyS12yy+28DDYATJemyC0T +FlrKRpv2JbpGDmMBB/z/8fJoJnlPnPkyzZdOrkwgryPR/sqaOEv/3SNcoN4BC7jT +0rbrVc93zz9i+vVTuNRrBcoiY/nkdOSPmLN4AGGt3pkhuZFA0D2Bz2E3KG4AAb+x +DeOQkAQShx7J+FY5HA4oXlQ4/rtukhAojqe4gb6THiEY1p7CLDY= +=Is1u +-----END PGP SIGNATURE----- diff --git a/expat.changes b/expat.changes index 85ddd99..5705e01 100644 --- a/expat.changes +++ b/expat.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue Apr 6 02:16:20 UTC 2021 - Dirk Müller + +- update to 2.3.0: + * When calling XML_ParseBuffer without a prior successful call to + XML_GetBuffer as a user, no longer trigger undefined behavior + (by adding an integer to a NULL pointer) but rather return + XML_STATUS_ERROR and set the error code to (new) code + XML_ERROR_NO_BUFFER. Found by UBSan (UndefinedBehaviorSanitizer) + of Clang 11 (but not Clang 9). + * xmlwf: Exit status 2 was used for both: + - malformed input files (documented) and + - invalid command-line arguments (undocumented). + case of invalid command-line arguments now + has its own exit status 4, resolving the ambiguity. + * Other changes + ------------------------------------------------------------------- Sun Oct 4 19:19:55 UTC 2020 - Pedro Monreal diff --git a/expat.spec b/expat.spec index 21ae52d..fa03926 100644 --- a/expat.spec +++ b/expat.spec @@ -1,7 +1,7 @@ # # spec file for package expat # -# Copyright (c) 2020 SUSE LLC +# 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 @@ -16,9 +16,9 @@ # -%global unversion 2_2_10 +%global unversion 2_3_0 Name: expat -Version: 2.2.10 +Version: 2.3.0 Release: 0 Summary: XML Parser Toolkit License: MIT @@ -28,6 +28,7 @@ Source0: https://github.com/libexpat/libexpat/releases/download/R_%{unver Source1: %{name}faq.html Source2: baselibs.conf Source3: https://github.com/libexpat/libexpat/releases/download/R_%{unversion}/expat-%{version}.tar.xz.asc +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: pkgconfig @@ -72,12 +73,12 @@ rm -f examples/*.dsp --docdir="%{_docdir}/%{name}" \ --disable-static %if 0%{?do_profiling} - make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}" - make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}" LDFLAGS="%{optflags} %{cflags_profile_generate}" check - make %{?_smp_mflags} clean - make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_feedback}" + %make_build CFLAGS="%{optflags} %{cflags_profile_generate}" + %make_build CFLAGS="%{optflags} %{cflags_profile_generate}" LDFLAGS="%{optflags} %{cflags_profile_generate}" check + %make_build clean + %make_build CFLAGS="%{optflags} %{cflags_profile_feedback}" %else - make %{?_smp_mflags} CFLAGS="%{optflags}" + %make_build CFLAGS="%{optflags}" %endif %install @@ -87,7 +88,7 @@ find %{buildroot} -type f -name "*.la" -delete -print chmod 0644 examples/elements.c %check -make %{?_smp_mflags} check +%make_build check %post -n libexpat1 -p /sbin/ldconfig %postun -n libexpat1 -p /sbin/ldconfig @@ -109,5 +110,6 @@ make %{?_smp_mflags} check %{_includedir}/* %{_libdir}/libexpat.so %{_libdir}/pkgconfig/expat.pc +%{_libdir}/cmake/expat-%{version} %changelog From 5e06527d3aca6787e384be450b633a72190deeb5cb1dcb62e8e60f6009a46e77 Mon Sep 17 00:00:00 2001 From: Pedro Monreal Gonzalez Date: Tue, 13 Apr 2021 09:38:16 +0000 Subject: [PATCH 2/2] Accepting request 884837 from home:dimstar:Factory - Do not BuildRequire cmake: expat is part of the distro bootstrap cycle and any additional dependency makes the ring larger. In this case here, cmake was even only used to own a directory. OBS-URL: https://build.opensuse.org/request/show/884837 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/expat?expand=0&rev=86 --- expat.changes | 7 +++++++ expat.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/expat.changes b/expat.changes index 5705e01..31980ec 100644 --- a/expat.changes +++ b/expat.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 13 06:04:38 UTC 2021 - Dominique Leuenberger + +- Do not BuildRequire cmake: expat is part of the distro bootstrap + cycle and any additional dependency makes the ring larger. In + this case here, cmake was even only used to own a directory. + ------------------------------------------------------------------- Tue Apr 6 02:16:20 UTC 2021 - Dirk Müller diff --git a/expat.spec b/expat.spec index fa03926..148a92e 100644 --- a/expat.spec +++ b/expat.spec @@ -28,7 +28,6 @@ Source0: https://github.com/libexpat/libexpat/releases/download/R_%{unver Source1: %{name}faq.html Source2: baselibs.conf Source3: https://github.com/libexpat/libexpat/releases/download/R_%{unversion}/expat-%{version}.tar.xz.asc -BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: pkgconfig @@ -110,6 +109,7 @@ chmod 0644 examples/elements.c %{_includedir}/* %{_libdir}/libexpat.so %{_libdir}/pkgconfig/expat.pc +%dir %{_libdir}/cmake %{_libdir}/cmake/expat-%{version} %changelog