From fe21e2c355ec485104d0c753564308ca320942fd82a43f41d4b81b0bf8fafb92 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Fri, 6 Mar 2020 08:12:07 +0000 Subject: [PATCH 1/2] Accepting request 781961 from home:darix:branches:devel:libraries:c_c++ - Update to version 3.1 OBS-URL: https://build.opensuse.org/request/show/781961 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/mxml?expand=0&rev=21 --- mxml-2.11.tar.gz | 3 --- mxml-3.1.tar.gz | 3 +++ mxml-3.1.tar.gz.sig | Bin 0 -> 566 bytes mxml.changes | 46 ++++++++++++++++++++++++++++++++++++++++++++ mxml.spec | 17 ++++++++-------- 5 files changed, 57 insertions(+), 12 deletions(-) delete mode 100644 mxml-2.11.tar.gz create mode 100644 mxml-3.1.tar.gz create mode 100644 mxml-3.1.tar.gz.sig diff --git a/mxml-2.11.tar.gz b/mxml-2.11.tar.gz deleted file mode 100644 index 654ea2e..0000000 --- a/mxml-2.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d3dfe661e50908fe41aef9b97ba6f7f158cab5208515c6be9f5bc9daf032329 -size 9166624 diff --git a/mxml-3.1.tar.gz b/mxml-3.1.tar.gz new file mode 100644 index 0000000..1cc0c5c --- /dev/null +++ b/mxml-3.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ac8d252f62f9dc2b2004518c70d2da313bdfcd92b8350e215f46064a34b52fc +size 9268821 diff --git a/mxml-3.1.tar.gz.sig b/mxml-3.1.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..8b3b00eec43e83d2698f69c1f57829bdab889be6174fa6078ab7f5c6771134ed GIT binary patch literal 566 zcmV-60?GY}0y6{v0SW*e79j+LRAgogXlkoAR10sJm06%Cfmu}r0$pcEVgL#W5Sf)( zpeKP@RjDrz`2qIax!pSoA1YqojDW8v^7_W1r7&r;*3`UBJF@KS*`sj~;_&w$gW@p1 zVNE#UiltW^ZcrwPEPLjYnsb3?MQ3S6*jp|RCc83^HaS%6vHj`KJfYzQA3mRtpU4no zD1vu`QIsxp<7l<+I@W;pQ|LF!W3TWDnQm2 z@L#0*Wg(?hkRhMQ!;ueYn35ITJIW9H9-#7NISj%8^7z%-xmn1Bwl@EaQo~>bY^+bi zU1>q%w5!G7VS*f6r@_|Rm%L*%H6&7h<3D}ju{`kJ;kqo0`wq^_XoKZ}X|j*%n0g;7 zX?QvpRrVZ-oNcvAI^m{A)1rqyA0z4qI`e5HjZ<});*7B4_PC1t)|czSi>G|Fa7miL z1O}%)e{W-wYzERRFF!l$NlX((YijLZ$XKNNgCZd;=j|>dYSs?~)7o<~;YLH`?+n*&Orye2LJM0ZiEzh+Uk^LkVP&!D)R9b7 zIaxx&^3WazI3$BzW)R>tS@KY`%Rio}0b{a+aHsXKU@b-qr!OU^2yXA(eC8>ywKW0= z!ukems$z6q5$>y}0O$P9O>O5PCSTWtN`||c7nzi0&_3J%c&8(RV1O_Alw!QF)CaaB E8G57<*#H0l literal 0 HcmV?d00001 diff --git a/mxml.changes b/mxml.changes index 7a42a0d..eab3d2c 100644 --- a/mxml.changes +++ b/mxml.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +Thu Mar 5 23:39:46 UTC 2020 - Marcus Rueckert + +- Update to version 3.1 + - The mxmlLoad* functions now print an error when the XML does + not start with < and no parent node is supplied (Issue #256, + Issue #259) + - Fixed an issue with “make install” trying to install old files + (Issue #257) + - Fixed some DSO installation issues on Linux. +- Changes from 3.0 + - Changed the license to Apache 2.0 with exceptions (Issue #239) + - All of the internal node structures are now moved out of the + public header (Issue #240) + - Fixed a potential buffer overflow when writing floating point + data (Issue #233) + - Moved mxmldoc to a new codedoc project whose focus is on + generating code documentation (Issue #235, Issue #236, Issue + #237) + - Error messages now include the line number of the error (Issue + #230) + - The mxmlSetCDATA, mxmlSetElement, mxmlSetOpaque, + mxmlSetOpaquef, mxmlSetText, and mxmlSetTextf functions caused + a use-after-free bug if the value came from the same node + (Issue #241) + - The mxmlSetOpaquef and mxmlSetTextf functions did not work + (Issue #244) + - The _mxml_strdupf function did not work on Windows (Issue #245) +- Changes from 2.12 + - Added yet more documentation about using MXML_OPAQUE_CALLBACK + when you want to get full strings for inline text instead of + separated words (Issue #190) + - No longer build documentation sets on macOS since Xcode no + longer supports them (Issue #198) + - Updated the va_copy macro for use with BCC (Issue #211) + - The mxmlNewCDATA and mxmlSetCDATA functions incorrectly added + the XML trailer “]]” to the string (Issue #216) + - Cross-compiling failed on install (Issue #218) + - Fixed a crash bug in the mxmlWrite functions (Issue #228) + - The mxmlWrite functions no longer write the siblings of the + passed node (Issue #228) + - Updated the markdown and ZIP container libraries used for + mxmldoc. +- remove mxmldoc binaries and man pages +- enable threading support + ------------------------------------------------------------------- Sun Jul 15 13:11:50 UTC 2018 - antoine.belvire@opensuse.org diff --git a/mxml.spec b/mxml.spec index c64bac9..01e6e70 100644 --- a/mxml.spec +++ b/mxml.spec @@ -1,7 +1,7 @@ # # spec file for package mxml # -# Copyright (c) 2018 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,18 +12,21 @@ # 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: mxml -Version: 2.11 +Version: 3.1 Release: 0 Summary: Small XML Parsing Library -License: LGPL-2.1-or-later +# The Mini-XML library is licensed under the Apache License Version 2.0 with an +# exception to allow linking against GPL2/LGPL2-only software. +License: Apache-2.0 Group: Development/Libraries/C and C++ URL: https://www.msweet.org/mxml Source: https://github.com/michaelrsweet/mxml/archive/v%{version}/%{name}-%{version}.tar.gz +Source2: https://github.com/michaelrsweet/mxml/archive/v%{version}/%{name}-%{version}.tar.gz.sig Source1: baselibs.conf BuildRequires: pkgconfig @@ -76,7 +79,7 @@ This package holds the HTML documentation for mxml. %setup -q %build -%configure --enable-shared --with-docdir=%{_docdir}/%{name} +%configure --enable-threads --enable-shared --with-docdir=%{_docdir}/%{name} make %{?_smp_mflags} %install @@ -86,10 +89,6 @@ rm -v %{buildroot}%{_libdir}/libmxml.a %post -n %{library_name} -p /sbin/ldconfig %postun -n %{library_name} -p /sbin/ldconfig -%files -%{_bindir}/mxmldoc -%{_mandir}/man1/mxmldoc.1%{?ext_man} - %files -n %{library_name} %{_libdir}/libmxml.so.1* From 916d7eed18b04b4fe849e7cfb086d0809ab2e550f26f52eb9a7a1114ec4ebc47 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Sat, 7 Mar 2020 13:28:10 +0000 Subject: [PATCH 2/2] - Add keyring - Fix source URLs to point to actual releases OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/mxml?expand=0&rev=22 --- mxml.changes | 6 ++++++ mxml.keyring | Bin 0 -> 2275 bytes mxml.spec | 11 ++++++----- 3 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 mxml.keyring diff --git a/mxml.changes b/mxml.changes index eab3d2c..6273c04 100644 --- a/mxml.changes +++ b/mxml.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Mar 7 13:14:37 UTC 2020 - Adam Majer + +- Add keyring +- Fix source URLs to point to actual releases + ------------------------------------------------------------------- Thu Mar 5 23:39:46 UTC 2020 - Marcus Rueckert diff --git a/mxml.keyring b/mxml.keyring new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..f237df500323d054f91f039c08000c21286592df71fa8bdad1c95f10ccb15709 GIT binary patch literal 2275 zcmajfc{~#i1IKY2GPkuE<=PxcqzAc=GS`@)Lat$Dx#o!6vYeykHcW1F<)~O{Bs{GQ+Ic|Fg6&%dA7>-*pL^`-&^xm@s^QveZ;DkIP8I19z)MEY9A z#DJ2+;}xf?YAMnlq_f${Mkyt^cs^2auN|LY^OCi(s+#D6^?65+@TFRM%V`zs-JW2W zIvB9VGQ;Ql7jTB(S5>2UyLjw+LVX-sDpG2*o|O&X{!#n=I6e)%HQ^RI_8R$Sz0QT) zsOm;RC;~`kuDnrK#1p4xA`3NGF_JO~$Du$lW^do99#B{LbGjiEY17IxV4#-*?R=*o`p9>BwL5h4}wV87Lz{nmf*oTg%!vl*W?Z=1fy zqQ0V;N)g6Sr7(0E5~yv$KCo(&Parm^fu#c>7JO+w*2c@`@!RlWm>jCS+{lJ2pBdZG z6zK9GQ%iRV#^q$HpU6&SVa5)qeDw!hdDpP+?oM~@i2)U z@@j_LM|=PvKG=4<$La($-+1wdASLHs^DFm5gOGdULBEoV7Y_oEwMh|rBqD94T8J(M zz*qMyD|?}z(fUZ`E$)nn1<}AcAWr>^6*ry(4B!CJl`+28eQQy zPz_NH{VQDb4#4>mRIdjG7^MO2xgY>O4kH+XE6LvL2EUJAgO)vi5S8Lwt{Cs^zzzKC zT0jX-ZeE@gnLFJ4ydWMJbi51)>WF+~Pm*g9HBgJ>FrBAZUuEDks<&6~)dm@dJHM-TP5 z&MJa(h;l)rU z&s4IkJ!h|snf%duAYL>Z@E*GH$nN5zT;kB1^wG98Otm!iv`USzGj1Lf*izt25z$H-OC-i8-*xNOz9Dl=cJr))%o3WfipIw;gmPinKFfk=}e z$snUoQlnW#W|Juet~SZGKc^%~{NN`as#AzaeQuv{wml+w_oc$Zmw-^evEqWNhA|!o zN7!H+6!`Jx9Jc{%A13x@rK@F#&&Rd)R_pAdch|A%+@bvOH^WStLX~n4;bE4~C661J zIQk_tL|EN$Nu!iJS~)>gu{OeXQ00HkJ~O=Lc<23O-Uj2pCXFBNn>U6`)E(b)w>8E; z$VE&Rb59rMENp3NsTtdWZ^Dn)xkT*r?^iyqAGex_lGJOQ#wD0f8XSf;TIuvMeh4u0 z3Sw5oX2z4gW&7ui=_38i1drx{re`$nbt4|D=%jnF<_DD4I>?q`6=5g7)4jtSB=KG0 zwK3OwT_ADkc0JXNmmhX6rtR?cJ@N5nh%-pgB8_s`c5Y^Y4#czN#!7sjx8q%RknQd4 z@hb|$PO=eb`o$k~olyC*wFh~}_u0REla`1nV13502(U}3)E**r$@ zGlAz&pXhSlBI(f5mS%?qW{%cbHl+SiRZ zy(1QDuMQnd@BC)wW#kMrGErMCdhylT#y~SNgx~8)rsvYtL|NF5#9-r=$}d9uufyc% zDlezX*ZpA~urD!k$jf=qIQ*xh)&b{Rpf9Y_Qq~M@rB~MWkIcBCkSUR1a?Ta8&xf4t z(FGfRXB`=Bo%-ii2p2t!#JuNwyaLUp3Dm^ef18vBG~g2d7c-~+4>JOPGxNWkfU<>; z;KXYOytb_w2c-8nq~QG$ag9gIM`bg@THeUW4SyS|gJfm3&xXPJ!R-JG&wsi*#Hj>+ zsNNJn+oU{SRger={B5EOCmN*_=vkcKeO(de*)l?B;2hT5^3U zjd09AiP@F4?bKb>lD(vhwjUHSOxV)kcR*;CF@yWb0@}>{toB)sD2b87YYRJZvw}U* zSg{n|q*7rw$+uedKX<*9croB13$iXqJ|I)r3N!i+s(8@)`9iye3E0O>Qf34=A|b{QngdlH6>ybs9DhpYQ4 uY)u?9IGf!I35Y6c0b!!Hf6kIWt(q5)&+F#-S-V`Ql8i&paH!Iv@IL_rCn!t+ literal 0 HcmV?d00001 diff --git a/mxml.spec b/mxml.spec index 01e6e70..cfdae8e 100644 --- a/mxml.spec +++ b/mxml.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%define library_name libmxml1 Name: mxml Version: 3.1 @@ -25,9 +26,11 @@ Summary: Small XML Parsing Library License: Apache-2.0 Group: Development/Libraries/C and C++ URL: https://www.msweet.org/mxml -Source: https://github.com/michaelrsweet/mxml/archive/v%{version}/%{name}-%{version}.tar.gz -Source2: https://github.com/michaelrsweet/mxml/archive/v%{version}/%{name}-%{version}.tar.gz.sig -Source1: baselibs.conf +Source: https://github.com/michaelrsweet/mxml/releases/download/v%{version}/mxml-%{version}.tar.gz +Source1: https://github.com/michaelrsweet/mxml/releases/download/v%{version}/mxml-%{version}.tar.gz.sig +# key from https://www.msweet.org/pgp.html +Source2: mxml.keyring +Source10: baselibs.conf BuildRequires: pkgconfig %description @@ -37,8 +40,6 @@ nonstandard libraries. This package holds the commandline tools for mxml. -%define library_name libmxml1 - %package -n %{library_name} Summary: Shared library for mxml Group: System/Libraries