From 6dc8940c23377fc8bef5735e062f4d3c8ff869ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 18:58:38 +0000 Subject: [PATCH 01/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index 2c173a6..3798f7f 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -110,6 +110,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.5.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 1.5.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From c76d072d330b8b1a1041f7a499eddc332f9aff9b Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 24 Jul 2019 16:10:15 -0400 Subject: [PATCH 02/44] New upstream release 1.5.7 --- babeltrace.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/babeltrace.spec b/babeltrace.spec index 3798f7f..8efa7ff 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace -Version: 1.5.6 -Release: 3%{?dist} +Version: 1.5.7 +Release: 1%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -110,6 +110,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Wed Jul 24 2019 Michael Jeanson - 1.5.7-1 +- New upstream release + * Wed Jul 24 2019 Fedora Release Engineering - 1.5.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index cc90387..40db9ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (babeltrace-1.5.6.tar.bz2) = c69f56449ca64751a2b031dec9ae49d207030970beb18fbfda56678b335602a6fb3c60fb05f4e8ac3e1a31cf69ec4bb7c1ceb47db1b94df241300223b3daf6a4 +SHA512 (babeltrace-1.5.7.tar.bz2) = 1cab84b63fd0935574cca8d4c70302a917776e83e738e73aa3ce4070c6d3279556ab665285c932d1b2159115a58cade7cfa9b0416b4a2807e1ce11bb9c7ea8cb From f503c81da904a66dead7724d852afb69418346f6 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 24 Jul 2019 17:55:44 -0400 Subject: [PATCH 03/44] Add GPG source file verification --- .gitignore | 1 + babeltrace.spec | 13 ++++++++++--- ...-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg | Bin 0 -> 2908 bytes sources | 1 + 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg diff --git a/.gitignore b/.gitignore index 1e3e3b3..119a189 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /babeltrace-1.*.tar.bz2 +/babeltrace-1.5.7.tar.bz2.asc diff --git a/babeltrace.spec b/babeltrace.spec index 8efa7ff..eb1fed5 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,10 +1,13 @@ Name: babeltrace Version: 1.5.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace Source0: https://www.efficios.com/files/%{name}/%{name}-%{version}.tar.bz2 +Source1: https://www.efficios.com/files/%{name}/%{name}-%{version}.tar.bz2.asc +# gpg2 --export --export-options export-minimal 7F49314A26E0DE78427680E05F1B2A0789F12B11 > gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg +Source2: gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg BuildRequires: bison >= 2.4 BuildRequires: flex >= 2.5.35 @@ -15,8 +18,8 @@ BuildRequires: python3-devel BuildRequires: swig >= 2.0 BuildRequires: elfutils-devel >= 0.154 BuildRequires: autoconf automake libtool -# For check -BuildRequires: perl-Test-Harness +BuildRequires: gnupg2 + Requires: lib%{name}%{?_isa} = %{version}-%{release} %description @@ -58,6 +61,7 @@ to/from another trace format. %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %setup -q %build @@ -110,6 +114,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Wed Jul 24 2019 Michael Jeanson - 1.5.7-2 +- Add GPG source file verification + * Wed Jul 24 2019 Michael Jeanson - 1.5.7-1 - New upstream release diff --git a/gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg b/gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg new file mode 100644 index 0000000000000000000000000000000000000000..d020f1d50fd8c29303ad1594009c7f7a19113cb0 GIT binary patch literal 2908 zcmb8xcQhM{0>|+TMNqRfLSog95p8WTOO2?#Y7;S2)uL2UrG$!A)ZVkIYRBI5qN)|t z)~Hz{m#eqNJMX^t&U@#)f8P7|_xI z{Kumi&QR8wJ;5@u9mIWvk3{T@zjskLT|Qb>)TqTl7k~IGbYTU-4?MK3nA)C&jlV(H zao}v^Ey&(|=jPFKV`{E4=htR?AEj1LpQwF2>qBfB-yIN&(Etncpv&lg=JIDCh?NjaaRn`53(H)q08S@Zg*B6c|?ZUDGqk zf*Gl|+l0haOHr$ZZ#ABOh$*zvc0nX}dEN%F00F=Tq<&wee_y4qCx%bg*~i%*hj9+z zQ}M$1V|+a^QrLe@>R4ZAPai4Q2fipg$dZZ;2m+{sxWP2^5Ly~A2uOXM76hTAr(y?z zfgm^##1X;HPZh3*)E8b^dZHN^vEs-rPJ=&`V7UUa)AaycfiS_6ZUE>Y%>UY}6`9WH z_$XKuxzRAV zf8veQ1P*Yit`-917B*KKJ5(8kJGHZW|dzW1x2(Uou}}?JkZ7 z)o&`EkGv@mEy)@vxyeJPl(ttQVj?Pg+->0BTQDC2nn-3_n`ZIW zUDMo#Qb1CDgpQ$%rH)I((|W5mVc7Zd6333}w%%d>EA5~#C|qdlX}3z6JB6^!&=kh= z2x9!Xsb#s@GJ`ux13H`e;}iBEY@XU=I3)I>LgOYJwP<1?cG=aXiRw+MY0DulK#;5Q zB8kX20ppF;gf#O9#YaDSUQ+y%Zd(uMmW1T!f7MWfTA&3r+U+8gs2Xnlj}|fR?w+om z4<7xKqs3nw)j-@}>VI(jzcgac{#)Zg95bM@U1i{`--7}A+MvOwxpzZ=)|S+??>NiJ9$|iGKaD*3<4w3bsd-VkeXsg8tCa*d3lLmq-5SAhHOZL>^!$#jbp9>bfZa( z@?v1Ocj|!qs?AFJ2*6pyDdY7~u_+$@!;k_k!-eGc9&nx!BH03NFnoL1$pqwmay$22BzH$AL-*6COThA;I!~hUUW2dG3rED2n27aPRgJJE1&6-#3@>c@*(9eeukY>wIfv`iQiNyODbu zQcPq~PAQCb$>kNumqSiu*Og*ibYy`SgxQbP^sXs_om=Z{PZe@5y{ed+XxfE%1j>)* zWx_VKtnaMqSho}Q{wgIN#7o5q1OXsdKz~0_AZ~{L>=#=;)1^DYRp=Z3NAvKUAh;h#(^XCUC`e)Up}XFyqDmZMW-pI^VZ4{2i7!6}TMFE-oS$AdcdgHhS4{3(i&L_ZMkZeKP1 z%;rPu|8i%c#`a4J^hDEAD@A208op%v7^nGAu0qJ$H=^;j#)G`nVu3uNgC?>$sjU}= zj?Qd-!;X2T-}5|J^DMNRk;kA^>%kAB7sWk;J2txI-?Oabqb6(*Yf^6K%xKRXUEaz! z1iWO-qwM%Ya`?>|6VA~O(eb^bhl>}JXW=7^9Q4fX-Fen}S^KsR%}Pu3+~WJ2$xz1r zoA;L3DC}&f>LERS(&A7$#le;BJoN0{;cL2KUp2-NCBHBIDlw&F7Fn;oAI&YMMX1_D2Mv`^F;i>e1jld9Qb~ag2D8LtHSf=T;~#L~ zy-F@uOtM}jaZ3*tnwI#jUPy)#RZh^BQ`g_sa}8KJD#gk4m3tYBisky=(39OiahvKw z<}2Lb9_5q@ke7{oqPRCns1TiB$8LQ}>*^Ynz^hcs-%6sI8)}<)obLOUo;v@Bh90fWCavq7&!jojeLV4RVGvn> literal 0 HcmV?d00001 diff --git a/sources b/sources index 40db9ba..def08b6 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (babeltrace-1.5.7.tar.bz2.asc) = dbe1ff19cda21a29d65c1b7af2f978de60b93d45884c5a290a2ef373e7aba044851aa943312088db89e4bab0a75b2201844aef619f57a593e761fbebbdcf62d3 SHA512 (babeltrace-1.5.7.tar.bz2) = 1cab84b63fd0935574cca8d4c70302a917776e83e738e73aa3ce4070c6d3279556ab665285c932d1b2159115a58cade7cfa9b0416b4a2807e1ce11bb9c7ea8cb From 81ee4fb7897928535d285936667c1f910e62eb11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 10:10:32 +0200 Subject: [PATCH 04/44] Rebuilt for Python 3.8 --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index eb1fed5..a4a0989 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -114,6 +114,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Mon Aug 19 2019 Miro Hrončok - 1.5.7-3 +- Rebuilt for Python 3.8 + * Wed Jul 24 2019 Michael Jeanson - 1.5.7-2 - Add GPG source file verification From ac486c64a4ac52ea87bfe538302048cb36656910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 13:50:51 +0200 Subject: [PATCH 05/44] Rebuilt for Python 3.8.0rc1 (#1748018) --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index a4a0989..ccab90c 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -114,6 +114,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Thu Oct 03 2019 Miro Hrončok - 1.5.7-4 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Mon Aug 19 2019 Miro Hrončok - 1.5.7-3 - Rebuilt for Python 3.8 From 72a2077bd9fbeac10dc39c2871429e3847434ec3 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 16 Jan 2020 16:37:19 -0500 Subject: [PATCH 06/44] Add Python 3.9 patch --- babeltrace.spec | 8 ++++++-- python39.patch | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 python39.patch diff --git a/babeltrace.spec b/babeltrace.spec index ccab90c..d0bc6e4 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -8,6 +8,7 @@ Source0: https://www.efficios.com/files/%{name}/%{name}-%{version}.tar.bz Source1: https://www.efficios.com/files/%{name}/%{name}-%{version}.tar.bz2.asc # gpg2 --export --export-options export-minimal 7F49314A26E0DE78427680E05F1B2A0789F12B11 > gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg Source2: gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg +Patch0: python39.patch BuildRequires: bison >= 2.4 BuildRequires: flex >= 2.5.35 @@ -62,7 +63,7 @@ to/from another trace format. %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%setup -q +%autosetup -p1 %build # Reinitialize libtool with the fedora version to remove Rpath @@ -114,6 +115,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Thu Jan 16 2020 Michael Jeanson - 1.5.7-5 +- Add Python 3.9 patch + * Thu Oct 03 2019 Miro Hrončok - 1.5.7-4 - Rebuilt for Python 3.8.0rc1 (#1748018) diff --git a/python39.patch b/python39.patch new file mode 100644 index 0000000..4a24bee --- /dev/null +++ b/python39.patch @@ -0,0 +1,19 @@ +diff --git a/bindings/python/babeltrace/babeltrace.i.in b/bindings/python/babeltrace/babeltrace.i.in +index a773e9b3..b3bb53a0 100644 +--- a/bindings/python/babeltrace/babeltrace.i.in ++++ b/bindings/python/babeltrace/babeltrace.i.in +@@ -672,8 +672,8 @@ class CTFScope: + _scopes = [CTFScope.EVENT_FIELDS, CTFScope.EVENT_CONTEXT, CTFScope.STREAM_EVENT_CONTEXT, + CTFScope.STREAM_EVENT_HEADER, CTFScope.STREAM_PACKET_CONTEXT, CTFScope.TRACE_PACKET_HEADER] + +-import collections +-class Event(collections.Mapping): ++import collections.abc ++class Event(collections.abc.Mapping): + """ + This class represents an event from the trace. + It is obtained using the TraceCollection generator functions. +-- +2.17.1 + + From 83537768862154b9fca2b666ee47ad7e07e4e3f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 12:38:31 +0000 Subject: [PATCH 07/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index d0bc6e4..0367c5c 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -115,6 +115,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.5.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jan 16 2020 Michael Jeanson - 1.5.7-5 - Add Python 3.9 patch From 8f0e7b197952088ac592339931486fbdc7b1ff4a Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 12 Feb 2020 14:54:47 -0500 Subject: [PATCH 08/44] New upstream release 1.5.8 --- .gitignore | 1 + babeltrace.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 119a189..a1f75db 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /babeltrace-1.*.tar.bz2 /babeltrace-1.5.7.tar.bz2.asc +/babeltrace-1.5.8.tar.bz2.asc diff --git a/babeltrace.spec b/babeltrace.spec index 0367c5c..f1a4247 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace -Version: 1.5.7 -Release: 6%{?dist} +Version: 1.5.8 +Release: 1%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -115,6 +115,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Thu Jan 16 2020 Michael Jeanson - 1.5.8-1 +- New upstream release + * Tue Jan 28 2020 Fedora Release Engineering - 1.5.7-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index def08b6..072190d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (babeltrace-1.5.7.tar.bz2.asc) = dbe1ff19cda21a29d65c1b7af2f978de60b93d45884c5a290a2ef373e7aba044851aa943312088db89e4bab0a75b2201844aef619f57a593e761fbebbdcf62d3 -SHA512 (babeltrace-1.5.7.tar.bz2) = 1cab84b63fd0935574cca8d4c70302a917776e83e738e73aa3ce4070c6d3279556ab665285c932d1b2159115a58cade7cfa9b0416b4a2807e1ce11bb9c7ea8cb +SHA512 (babeltrace-1.5.8.tar.bz2) = 827749ae8507efd433bb97ef668628837a3ff15b5be5097af5621d46055c6f10401da0be1f9d9f843a96c8c307b33745e04284d166e275e03b7ddb0a7dd57e96 +SHA512 (babeltrace-1.5.8.tar.bz2.asc) = 6e0802a1541029086f2003526a801b43d361d1586893f8d193cc95b3a20e86c0da4141b81c641b4902f7c3c0ecd5e6ab94f3a5a83ae64917c4628feec48931d4 From 1394db47dabf4ea458f5bb50348728c6cde51ff0 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Thu, 21 May 2020 12:44:10 -0600 Subject: [PATCH 09/44] Fix changelog entry to use the right date --- babeltrace.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index f1a4247..07182e6 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -115,7 +115,7 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog -* Thu Jan 16 2020 Michael Jeanson - 1.5.8-1 +* Wed Feb 12 2020 Michael Jeanson - 1.5.8-1 - New upstream release * Tue Jan 28 2020 Fedora Release Engineering - 1.5.7-6 From 5c0f9e7f9547a691a23422a6a99a56f6ae852778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 02:41:21 +0200 Subject: [PATCH 10/44] Rebuilt for Python 3.9 --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index 07182e6..ea807aa 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -115,6 +115,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Tue May 26 2020 Miro Hrončok - 1.5.8-2 +- Rebuilt for Python 3.9 + * Wed Feb 12 2020 Michael Jeanson - 1.5.8-1 - New upstream release From 7db06bbb286ad3ad164b12432d4e01a76e6df51d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:51:05 +0000 Subject: [PATCH 11/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index ea807aa..30c27fd 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -115,6 +115,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.5.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Miro Hrončok - 1.5.8-2 - Rebuilt for Python 3.9 From e68e952d97dcc6f10f4675202e924b70d3dafe46 Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Tue, 27 Oct 2020 09:12:13 -0400 Subject: [PATCH 12/44] Workaround __openat_missing_mode compiler error. (Keith Seitz, RH BZ 1890813) Signed-off-by: Stephen Gallagher --- babeltrace-__openat_missing_mode.patch | 21 +++++++++++++++++++++ babeltrace.spec | 7 ++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 babeltrace-__openat_missing_mode.patch diff --git a/babeltrace-__openat_missing_mode.patch b/babeltrace-__openat_missing_mode.patch new file mode 100644 index 0000000..9542d55 --- /dev/null +++ b/babeltrace-__openat_missing_mode.patch @@ -0,0 +1,21 @@ +--- babeltrace-1.5.8/formats/ctf/ctf.c.orig 2020-10-23 11:45:34.351789250 -0700 ++++ babeltrace-1.5.8/formats/ctf/ctf.c 2020-10-23 12:16:24.236460342 -0700 +@@ -2191,7 +2191,7 @@ + struct stat statbuf; + char *index_name; + +- fd = openat(td->dirfd, path, flags); ++ fd = openat(td->dirfd, path, flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); + if (fd < 0) { + perror("File stream openat()"); + ret = fd; +@@ -2265,7 +2265,8 @@ + goto error_index; + } + } else { +- ret = openat(td->dirfd, index_name, flags); ++ ret = openat(td->dirfd, index_name, flags, ++ S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); + if (ret < 0) { + perror("Index file openat()"); + ret = -1; diff --git a/babeltrace.spec b/babeltrace.spec index 30c27fd..b4ac740 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -9,6 +9,7 @@ Source1: https://www.efficios.com/files/%{name}/%{name}-%{version}.tar.bz # gpg2 --export --export-options export-minimal 7F49314A26E0DE78427680E05F1B2A0789F12B11 > gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg Source2: gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg Patch0: python39.patch +Patch1: babeltrace-__openat_missing_mode.patch BuildRequires: bison >= 2.4 BuildRequires: flex >= 2.5.35 @@ -115,6 +116,10 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Mon Oct 26 2020 Keith Seitz - 1.5.8-4 +- Workaround __openat_missing_mode compiler error. + (Keith Seitz, RH BZ 1890813) + * Mon Jul 27 2020 Fedora Release Engineering - 1.5.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 4202065c301a2b8c8035b20131fa8e6241f8f23c Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Mon, 16 Nov 2020 10:56:28 -0800 Subject: [PATCH 13/44] Remove workaround for 1890813 now that binutils is fixed. --- babeltrace-__openat_missing_mode.patch | 21 --------------------- babeltrace.spec | 6 ++++-- 2 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 babeltrace-__openat_missing_mode.patch diff --git a/babeltrace-__openat_missing_mode.patch b/babeltrace-__openat_missing_mode.patch deleted file mode 100644 index 9542d55..0000000 --- a/babeltrace-__openat_missing_mode.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- babeltrace-1.5.8/formats/ctf/ctf.c.orig 2020-10-23 11:45:34.351789250 -0700 -+++ babeltrace-1.5.8/formats/ctf/ctf.c 2020-10-23 12:16:24.236460342 -0700 -@@ -2191,7 +2191,7 @@ - struct stat statbuf; - char *index_name; - -- fd = openat(td->dirfd, path, flags); -+ fd = openat(td->dirfd, path, flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); - if (fd < 0) { - perror("File stream openat()"); - ret = fd; -@@ -2265,7 +2265,8 @@ - goto error_index; - } - } else { -- ret = openat(td->dirfd, index_name, flags); -+ ret = openat(td->dirfd, index_name, flags, -+ S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); - if (ret < 0) { - perror("Index file openat()"); - ret = -1; diff --git a/babeltrace.spec b/babeltrace.spec index b4ac740..3600b73 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -9,7 +9,6 @@ Source1: https://www.efficios.com/files/%{name}/%{name}-%{version}.tar.bz # gpg2 --export --export-options export-minimal 7F49314A26E0DE78427680E05F1B2A0789F12B11 > gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg Source2: gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg Patch0: python39.patch -Patch1: babeltrace-__openat_missing_mode.patch BuildRequires: bison >= 2.4 BuildRequires: flex >= 2.5.35 @@ -116,6 +115,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Mon Nov 16 2020 Keith Seitz - 1.5.8-5 +- Remove workaround for 1890813 now that binutils is fixed. + * Mon Oct 26 2020 Keith Seitz - 1.5.8-4 - Workaround __openat_missing_mode compiler error. (Keith Seitz, RH BZ 1890813) From a719b515a89d8eee1ffa6566f516a84837214b03 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 17 Dec 2020 02:41:02 +0000 Subject: [PATCH 14/44] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- babeltrace.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/babeltrace.spec b/babeltrace.spec index 3600b73..4625e4f 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -20,6 +20,7 @@ BuildRequires: swig >= 2.0 BuildRequires: elfutils-devel >= 0.154 BuildRequires: autoconf automake libtool BuildRequires: gnupg2 +BuildRequires: make Requires: lib%{name}%{?_isa} = %{version}-%{release} From aedb8bb91f0cfb994e3a15695bbba7ba5831ac46 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:53:24 +0000 Subject: [PATCH 15/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index 4625e4f..3bc90b1 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -116,6 +116,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.5.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Nov 16 2020 Keith Seitz - 1.5.8-5 - Remove workaround for 1890813 now that binutils is fixed. From 6b00399f8cc2a564698474b3a09588cb0a7d4a88 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:00:03 +0200 Subject: [PATCH 16/44] Rebuilt for Python 3.10 --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index 3bc90b1..52b4224 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -116,6 +116,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Fri Jun 04 2021 Python Maint - 1.5.8-7 +- Rebuilt for Python 3.10 + * Tue Jan 26 2021 Fedora Release Engineering - 1.5.8-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From b5eb5c1a56d6a60a730a066988292339fbddf7cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 13:24:43 +0000 Subject: [PATCH 17/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From cbbb8a5029197dbd34cff72178d736a988dd528a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 18:21:02 +0000 Subject: [PATCH 18/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index 52b4224..30f042d 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -116,6 +116,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.5.8-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 1.5.8-7 - Rebuilt for Python 3.10 From 7060569527e2d008b4dbc88d70058982870ea90d Mon Sep 17 00:00:00 2001 From: Jan Kurik Date: Mon, 6 Sep 2021 18:32:11 +0200 Subject: [PATCH 19/44] Intoducing Fedora gating --- .fmf/version | 1 + gating.yaml | 19 ++++++++ plans/ci.fmf | 6 +++ tests/README | 2 + tests/Regression/testsuite/Makefile | 65 +++++++++++++++++++++++++ tests/Regression/testsuite/PURPOSE | 3 ++ tests/Regression/testsuite/main.fmf | 24 ++++++++++ tests/Regression/testsuite/runtest.sh | 68 +++++++++++++++++++++++++++ 8 files changed, 188 insertions(+) create mode 100644 .fmf/version create mode 100644 gating.yaml create mode 100644 plans/ci.fmf create mode 100644 tests/README create mode 100644 tests/Regression/testsuite/Makefile create mode 100644 tests/Regression/testsuite/PURPOSE create mode 100644 tests/Regression/testsuite/main.fmf create mode 100755 tests/Regression/testsuite/runtest.sh diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..ce3cdc1 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,19 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} +--- !Policy +product_versions: + - rhel-8 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} +--- !Policy +product_versions: + - rhel-9 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} diff --git a/plans/ci.fmf b/plans/ci.fmf new file mode 100644 index 0000000..1ad2c12 --- /dev/null +++ b/plans/ci.fmf @@ -0,0 +1,6 @@ +summary: CI Gating Plan +discover: + how: fmf + directory: tests +execute: + how: beakerlib diff --git a/tests/README b/tests/README new file mode 100644 index 0000000..9ad59d4 --- /dev/null +++ b/tests/README @@ -0,0 +1,2 @@ +The test's Makefiles are not used in Fedora CI infrastructure. But are kept here +for backward compatibility with traditional beakerlib test harness in RHEL. diff --git a/tests/Regression/testsuite/Makefile b/tests/Regression/testsuite/Makefile new file mode 100644 index 0000000..54ce8b2 --- /dev/null +++ b/tests/Regression/testsuite/Makefile @@ -0,0 +1,65 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Makefile of /tools/babeltrace/Regression/testsuite +# Description: testsuite +# Author: Martin Cermak +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2019 Red Hat, Inc. +# +# This program is free software: you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export TEST=/tools/babeltrace/Regression/testsuite +export TESTVERSION=1.0 + +BUILT_FILES= + +FILES=$(METADATA) runtest.sh Makefile PURPOSE + +.PHONY: all install download clean + +run: $(FILES) build + ./runtest.sh + +build: $(BUILT_FILES) + test -x runtest.sh || chmod a+x runtest.sh + +clean: + rm -f *~ $(BUILT_FILES) + +requires = babeltrace autoconf automake bison elfutils-devel flex glib2-devel \ +libtool libuuid-devel perl-Test-Harness popt-devel python3-devel rpm-build + +include /usr/share/rhts/lib/rhts-make.include + +$(METADATA): Makefile + @echo "Owner: Martin Cermak " > $(METADATA) + @echo "Name: $(TEST)" >> $(METADATA) + @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) + @echo "Path: $(TEST_DIR)" >> $(METADATA) + @echo "Description: testsuite" >> $(METADATA) + @echo "Type: Regression" >> $(METADATA) + @echo "TestTime: 48h" >> $(METADATA) + @echo "RunFor: babeltrace" >> $(METADATA) + $(foreach package, $(requires), echo "Requires: $(package)" >> $(METADATA);) + @echo "Priority: Normal" >> $(METADATA) + @echo "License: GPLv2+" >> $(METADATA) + @echo "Confidential: no" >> $(METADATA) + @echo "Destructive: no" >> $(METADATA) + @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5 -RHEL6 -RHEL7 -RedHatEnterpriseLinuxAlternateArchitectures7" >> $(METADATA) + + rhts-lint $(METADATA) diff --git a/tests/Regression/testsuite/PURPOSE b/tests/Regression/testsuite/PURPOSE new file mode 100644 index 0000000..f3f68b0 --- /dev/null +++ b/tests/Regression/testsuite/PURPOSE @@ -0,0 +1,3 @@ +PURPOSE of /tools/babeltrace/Regression/testsuite +Description: testsuite +Author: Martin Cermak diff --git a/tests/Regression/testsuite/main.fmf b/tests/Regression/testsuite/main.fmf new file mode 100644 index 0000000..5102283 --- /dev/null +++ b/tests/Regression/testsuite/main.fmf @@ -0,0 +1,24 @@ +summary: testsuite +description: '' +contact: Martin Cermak +component: +- babeltrace +test: ./runtest.sh +framework: beakerlib +recommend: +- babeltrace +- autoconf +- automake +- bison +- elfutils-devel +- flex +- glib2-devel +- libtool +- libuuid-devel +- perl-Test-Harness +- popt-devel +- python3-devel +- rpm-build +duration: 48h +extra-summary: /tools/babeltrace/Regression/testsuite +extra-task: /tools/babeltrace/Regression/testsuite diff --git a/tests/Regression/testsuite/runtest.sh b/tests/Regression/testsuite/runtest.sh new file mode 100755 index 0000000..a032b89 --- /dev/null +++ b/tests/Regression/testsuite/runtest.sh @@ -0,0 +1,68 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# runtest.sh of /tools/babeltrace/Regression/testsuite +# Description: testsuite +# Author: Martin Cermak +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2019 Red Hat, Inc. +# +# This program is free software: you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# Include Beaker environment +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +export PACKAGE="babeltrace" + +rlJournalStart + rlPhaseStartSetup + # babeltrace itself comes from the rhel8 buildroot repo + rlAssertRpm $PACKAGE + rlRun "TMP=\$(mktemp -d)" + rlRun "pushd $TMP" + + rlFetchSrcForInstalled $PACKAGE + rlRun "dnf --nobest builddep -y *src.rpm" + rlRun "rpm --define='_topdir $TMP' -Uvh *src.rpm" + rlRun "rpmbuild --define='_topdir $TMP' -bc SPECS/${PACKAGE}.spec" + rlRun "pushd BUILD/${PACKAGE}-*" + rlPhaseEnd + + rlPhaseStartTest + set -o pipefail + rlRun "make check |& tee test.log" + rlFileSubmit test.log + rlPhaseEnd + + rlPhaseStart FAIL "Double check the test result" + # I didn't see the testsute failing and so I'm not sure if + # make check would return non-zero exitcode in case of failure. + # It almost certainly would. But let's additionally parse + # the log to make sure we'd catch a failure. + rlRun "grep '^PASS:\ ' test.log" + rlRun "grep '^FAIL:\ ' test.log" 1 + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "popd" + rlRun "rm -r $TMP" + rlPhaseEnd +rlJournalPrintText +rlJournalEnd From 938f3b57ef0f1166ef7685b7eb7c2015a742c20b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 22:04:45 +0000 Subject: [PATCH 20/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index 30f042d..dbe9ff8 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.8 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -116,6 +116,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1.5.8-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 1.5.8-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From c2ee112dbfb93cbf160494e8cf13f839ac21ab7a Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Wed, 16 Mar 2022 10:30:15 -0700 Subject: [PATCH 21/44] Use getaddrinfo instead of gethostbyname. --- babeltrace-getaddrinfo.patch | 106 +++++++++++++++++++++++++++++++++++ babeltrace.spec | 6 +- 2 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 babeltrace-getaddrinfo.patch diff --git a/babeltrace-getaddrinfo.patch b/babeltrace-getaddrinfo.patch new file mode 100644 index 0000000..d77a024 --- /dev/null +++ b/babeltrace-getaddrinfo.patch @@ -0,0 +1,106 @@ +*** babeltrace-1.5.8.orig/configure.ac 2021-04-22 09:56:01.645909350 -0700 +--- babeltrace-1.5.8/configure.ac 2021-04-22 10:41:30.537328243 -0700 +*************** AC_CHECK_FUNCS([ \ +*** 102,108 **** + dirfd \ + dup2 \ + ftruncate \ +! gethostbyname \ + gethostname \ + gettimeofday \ + localtime_r \ +--- 102,108 ---- + dirfd \ + dup2 \ + ftruncate \ +! getaddrinfo \ + gethostname \ + gettimeofday \ + localtime_r \ +*** babeltrace-1.5.8.orig/formats/lttng-live/lttng-live-comm.c 2021-04-22 09:56:01.662909278 -0700 +--- babeltrace-1.5.8/formats/lttng-live/lttng-live-comm.c 2021-04-22 11:01:13.166302197 -0700 +*************** ssize_t lttng_live_send(int fd, const vo +*** 111,149 **** + + int lttng_live_connect_viewer(struct lttng_live_ctx *ctx) + { +- struct hostent *host; +- struct sockaddr_in server_addr; + int ret; + + if (lttng_live_should_quit()) { + ret = -1; + goto end; + } + +! host = gethostbyname(ctx->relay_hostname); +! if (!host) { +! fprintf(stderr, "[error] Cannot lookup hostname %s\n", +! ctx->relay_hostname); + goto error; + } + +! if ((ctx->control_sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) { + perror("Socket"); + goto error; + } + +! server_addr.sin_family = AF_INET; +! server_addr.sin_port = htons(ctx->port); +! server_addr.sin_addr = *((struct in_addr *) host->h_addr); +! memset(&(server_addr.sin_zero), 0, 8); +! +! if (connect(ctx->control_sock, (struct sockaddr *) &server_addr, +! sizeof(struct sockaddr)) == -1) { + perror("Connect"); + goto error; + } + + ret = 0; + + end: + return ret; +--- 111,153 ---- + + int lttng_live_connect_viewer(struct lttng_live_ctx *ctx) + { + int ret; ++ struct addrinfo hints, *res; ++ char port[16]; + + if (lttng_live_should_quit()) { + ret = -1; + goto end; + } + +! memset(&hints, 0, sizeof(hints)); +! hints.ai_family = AF_INET; +! hints.ai_socktype = SOCK_STREAM; +! sprintf(port, "%d", ctx->port); +! +! ret = getaddrinfo(ctx->relay_hostname, port, &hints, &res); +! if (ret != 0) { +! fprintf(stderr, "[error] getaddrinfo: %s\n", +! gai_strerror(ret)); + goto error; + } + +! ctx->control_sock = socket(res->ai_family, res->ai_socktype, +! res->ai_protocol); +! if (ctx->control_sock == -1) { + perror("Socket"); ++ freeaddrinfo(res); + goto error; + } + +! if (connect(ctx->control_sock, res->ai_addr, res->ai_addrlen) == -1) { + perror("Connect"); ++ freeaddrinfo(res); + goto error; + } + + ret = 0; ++ freeaddrinfo(res); + + end: + return ret; diff --git a/babeltrace.spec b/babeltrace.spec index dbe9ff8..752dc9b 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.8 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -9,6 +9,7 @@ Source1: https://www.efficios.com/files/%{name}/%{name}-%{version}.tar.bz # gpg2 --export --export-options export-minimal 7F49314A26E0DE78427680E05F1B2A0789F12B11 > gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg Source2: gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg Patch0: python39.patch +Patch1: babeltrace-getaddrinfo.patch BuildRequires: bison >= 2.4 BuildRequires: flex >= 2.5.35 @@ -116,6 +117,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Wed Mar 16 2022 Keith Seitz - 1.5.8-10 +- Use getaddrinfo instead of gethostbyname. + * Wed Jan 19 2022 Fedora Release Engineering - 1.5.8-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From a57e22cd40ccc1d14a3166f2f15615dbdb20fcdc Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 14:57:28 +0200 Subject: [PATCH 22/44] Rebuilt for Python 3.11 --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index 752dc9b..f09f514 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.8 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -117,6 +117,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Mon Jun 13 2022 Python Maint - 1.5.8-11 +- Rebuilt for Python 3.11 + * Wed Mar 16 2022 Keith Seitz - 1.5.8-10 - Use getaddrinfo instead of gethostbyname. From f5b5fb44eeb2037983bafd16d3952d2f31f05671 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 21:42:44 +0000 Subject: [PATCH 23/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index f09f514..a04b7e5 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.8 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -117,6 +117,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.5.8-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 1.5.8-11 - Rebuilt for Python 3.11 From d48452beff87b145c038f070e7182358db04336c Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Thu, 15 Sep 2022 14:11:39 -0700 Subject: [PATCH 24/44] Fix use-after-free error in babeltrace popt-1.19 commit 7182e4618ad5a0186145fc2aa4a98c2229afdfa8 includes a patch to free the memory returned by poptGetArg. This introduced a use-after-free in babeltrace.c:main(). See bug for complete description. Resolves: rhbz#2126067 --- babeltrace-rhbz2126067-use-after-free.patch | 32 +++++++++++++++++++++ babeltrace.spec | 7 ++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 babeltrace-rhbz2126067-use-after-free.patch diff --git a/babeltrace-rhbz2126067-use-after-free.patch b/babeltrace-rhbz2126067-use-after-free.patch new file mode 100644 index 0000000..9835fd7 --- /dev/null +++ b/babeltrace-rhbz2126067-use-after-free.patch @@ -0,0 +1,32 @@ +*** babeltrace-1.5.8/converter/babeltrace.c.orig 2022-09-15 12:36:49.826369817 -0700 +--- babeltrace-1.5.8/converter/babeltrace.c 2022-09-15 13:48:21.642157222 -0700 +*************** static int parse_options(int argc, char +*** 449,455 **** + do { + ipath = poptGetArg(pc); + if (ipath) +! g_ptr_array_add(opt_input_paths, (gpointer) ipath); + } while (ipath); + if (opt_input_paths->len == 0) { + ret = -EINVAL; +--- 449,455 ---- + do { + ipath = poptGetArg(pc); + if (ipath) +! g_ptr_array_add(opt_input_paths, (gpointer) strdup(ipath)); + } while (ipath); + if (opt_input_paths->len == 0) { + ret = -EINVAL; +*************** end: +*** 880,885 **** +--- 880,889 ---- + free(opt_output_path); + free(opt_debug_info_dir); + free(opt_debug_info_target_prefix); ++ for (i = 0; i < opt_input_paths->len; i++) { ++ char *ipath = g_ptr_array_index(opt_input_paths, i); ++ free(ipath); ++ } + g_ptr_array_free(opt_input_paths, TRUE); + if (partial_error) + exit(EXIT_FAILURE); diff --git a/babeltrace.spec b/babeltrace.spec index a04b7e5..52a58f5 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.8 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -10,6 +10,7 @@ Source1: https://www.efficios.com/files/%{name}/%{name}-%{version}.tar.bz Source2: gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg Patch0: python39.patch Patch1: babeltrace-getaddrinfo.patch +Patch2: babeltrace-rhbz2126067-use-after-free.patch BuildRequires: bison >= 2.4 BuildRequires: flex >= 2.5.35 @@ -117,6 +118,10 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Fri Sep 16 2022 Keith Seitz - 1.5.8-13 +- Add use-after-free patch for popt-1.19 update. + (Keith Seitz, RHBZ 2126067) + * Wed Jul 20 2022 Fedora Release Engineering - 1.5.8-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 9eff6a89157ae02de4ffd05b0d223b90865125a5 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 2 Nov 2022 16:07:17 -0400 Subject: [PATCH 25/44] New upstream release 1.5.11 --- .gitignore | 1 + babeltrace-rhbz2126067-use-after-free.patch | 32 --------------------- babeltrace.spec | 16 +++++++---- python39.patch | 19 ------------ sources | 4 +-- 5 files changed, 13 insertions(+), 59 deletions(-) delete mode 100644 babeltrace-rhbz2126067-use-after-free.patch delete mode 100644 python39.patch diff --git a/.gitignore b/.gitignore index a1f75db..b30cddb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /babeltrace-1.*.tar.bz2 /babeltrace-1.5.7.tar.bz2.asc /babeltrace-1.5.8.tar.bz2.asc +/babeltrace-1.5.11.tar.bz2.asc diff --git a/babeltrace-rhbz2126067-use-after-free.patch b/babeltrace-rhbz2126067-use-after-free.patch deleted file mode 100644 index 9835fd7..0000000 --- a/babeltrace-rhbz2126067-use-after-free.patch +++ /dev/null @@ -1,32 +0,0 @@ -*** babeltrace-1.5.8/converter/babeltrace.c.orig 2022-09-15 12:36:49.826369817 -0700 ---- babeltrace-1.5.8/converter/babeltrace.c 2022-09-15 13:48:21.642157222 -0700 -*************** static int parse_options(int argc, char -*** 449,455 **** - do { - ipath = poptGetArg(pc); - if (ipath) -! g_ptr_array_add(opt_input_paths, (gpointer) ipath); - } while (ipath); - if (opt_input_paths->len == 0) { - ret = -EINVAL; ---- 449,455 ---- - do { - ipath = poptGetArg(pc); - if (ipath) -! g_ptr_array_add(opt_input_paths, (gpointer) strdup(ipath)); - } while (ipath); - if (opt_input_paths->len == 0) { - ret = -EINVAL; -*************** end: -*** 880,885 **** ---- 880,889 ---- - free(opt_output_path); - free(opt_debug_info_dir); - free(opt_debug_info_target_prefix); -+ for (i = 0; i < opt_input_paths->len; i++) { -+ char *ipath = g_ptr_array_index(opt_input_paths, i); -+ free(ipath); -+ } - g_ptr_array_free(opt_input_paths, TRUE); - if (partial_error) - exit(EXIT_FAILURE); diff --git a/babeltrace.spec b/babeltrace.spec index 52a58f5..14cde84 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace -Version: 1.5.8 -Release: 13%{?dist} +Version: 1.5.11 +Release: 1%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -8,9 +8,7 @@ Source0: https://www.efficios.com/files/%{name}/%{name}-%{version}.tar.bz Source1: https://www.efficios.com/files/%{name}/%{name}-%{version}.tar.bz2.asc # gpg2 --export --export-options export-minimal 7F49314A26E0DE78427680E05F1B2A0789F12B11 > gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg Source2: gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg -Patch0: python39.patch -Patch1: babeltrace-getaddrinfo.patch -Patch2: babeltrace-rhbz2126067-use-after-free.patch +Patch0: babeltrace-getaddrinfo.patch BuildRequires: bison >= 2.4 BuildRequires: flex >= 2.5.35 @@ -18,11 +16,12 @@ BuildRequires: glib2-devel >= 2.22.0 BuildRequires: libuuid-devel BuildRequires: popt-devel >= 1.13 BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: swig >= 2.0 BuildRequires: elfutils-devel >= 0.154 BuildRequires: autoconf automake libtool BuildRequires: gnupg2 -BuildRequires: make +BuildRequires: make Requires: lib%{name}%{?_isa} = %{version}-%{release} @@ -118,6 +117,11 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Wed Nov 02 2022 Michael Jeanson - 1.5.11-1 +- New upstream release +- Drop patches merged upstream +- Add builddep on python3-setuptools for Python 3.12+ + * Fri Sep 16 2022 Keith Seitz - 1.5.8-13 - Add use-after-free patch for popt-1.19 update. (Keith Seitz, RHBZ 2126067) diff --git a/python39.patch b/python39.patch deleted file mode 100644 index 4a24bee..0000000 --- a/python39.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/bindings/python/babeltrace/babeltrace.i.in b/bindings/python/babeltrace/babeltrace.i.in -index a773e9b3..b3bb53a0 100644 ---- a/bindings/python/babeltrace/babeltrace.i.in -+++ b/bindings/python/babeltrace/babeltrace.i.in -@@ -672,8 +672,8 @@ class CTFScope: - _scopes = [CTFScope.EVENT_FIELDS, CTFScope.EVENT_CONTEXT, CTFScope.STREAM_EVENT_CONTEXT, - CTFScope.STREAM_EVENT_HEADER, CTFScope.STREAM_PACKET_CONTEXT, CTFScope.TRACE_PACKET_HEADER] - --import collections --class Event(collections.Mapping): -+import collections.abc -+class Event(collections.abc.Mapping): - """ - This class represents an event from the trace. - It is obtained using the TraceCollection generator functions. --- -2.17.1 - - diff --git a/sources b/sources index 072190d..98e182a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (babeltrace-1.5.8.tar.bz2) = 827749ae8507efd433bb97ef668628837a3ff15b5be5097af5621d46055c6f10401da0be1f9d9f843a96c8c307b33745e04284d166e275e03b7ddb0a7dd57e96 -SHA512 (babeltrace-1.5.8.tar.bz2.asc) = 6e0802a1541029086f2003526a801b43d361d1586893f8d193cc95b3a20e86c0da4141b81c641b4902f7c3c0ecd5e6ab94f3a5a83ae64917c4628feec48931d4 +SHA512 (babeltrace-1.5.11.tar.bz2) = a3158bb9d0306c1cab6ac3d16ba542605ad60b13ecb10fe740a3b95168f0ead87d31483a06d49a15341f7ef6def16765d9a6045f40a60cd8b94070d979c0c3d1 +SHA512 (babeltrace-1.5.11.tar.bz2.asc) = 63b662d53b57f70793e6729c74d9a78a09789f3846589835de87baae423b793b0d7ed7c0e66b118d61e52c5775710b0e7b07b337eb69f6fcc1b382abaf047924 From 0629fa12a47db48f7f29617466f1ec02eed720cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 22:36:42 +0000 Subject: [PATCH 26/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index 14cde84..4d29d7e 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT and GPLv2 URL: https://www.efficios.com/babeltrace @@ -117,6 +117,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 1.5.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Nov 02 2022 Michael Jeanson - 1.5.11-1 - New upstream release - Drop patches merged upstream From 5dab2931f415ff07bf546ff8e9202456572c84cd Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 8 May 2023 16:30:44 -0400 Subject: [PATCH 27/44] migrated to SPDX license --- babeltrace.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/babeltrace.spec b/babeltrace.spec index 4d29d7e..cd6fec5 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,8 +1,8 @@ Name: babeltrace Version: 1.5.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format -License: MIT and GPLv2 +License: MIT AND GPL-2.0-only URL: https://www.efficios.com/babeltrace Source0: https://www.efficios.com/files/%{name}/%{name}-%{version}.tar.bz2 Source1: https://www.efficios.com/files/%{name}/%{name}-%{version}.tar.bz2.asc @@ -117,6 +117,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Mon May 08 2023 Michael Jeanson - 1.5.11-3 +- migrated to SPDX license + * Wed Jan 18 2023 Fedora Release Engineering - 1.5.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From ea53e33a2e5d2e71aa455ec1b1e89707961c0a3a Mon Sep 17 00:00:00 2001 From: Michal Kolar Date: Wed, 31 May 2023 10:31:44 +0000 Subject: [PATCH 28/44] fix tmt plan setup, "how: beakerlib" is no longer supported --- plans/ci.fmf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plans/ci.fmf b/plans/ci.fmf index 1ad2c12..3fd3ab7 100644 --- a/plans/ci.fmf +++ b/plans/ci.fmf @@ -1,6 +1,5 @@ summary: CI Gating Plan discover: how: fmf - directory: tests execute: - how: beakerlib + how: tmt From 5b368fd7e1b48e17b009d5ec5cb80e99a7bdc218 Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Tue, 30 May 2023 11:19:26 -0700 Subject: [PATCH 29/44] Update missing SPDX licenses According to Fedora Licensing Guidelines, the License: field should now "[enumerate] all licenses covering any code or other material contained in the corresponding binary RPM." Furthermore, "no further analysis as to the 'effective' license should be done." This list of licenses need not include files which "do not end up being compiled or otherwise included in the binary package. Common examples of this are Autoconf scripts and non-bundled test files." Fossology lists the following licenses for this package: 1. MIT Used throughout. Keep. 2. LicenseRef-scancode-fsf-unlimited-no-warranty Makefile.in's and aclocal.m4. Omit. 3. GPL-2.0-only Used in tests/. Omit. 4. GPL-2.0-or-later Used in m4/ and config/. Omit. 5. GPL-3.0-or-later Used in conifg/, m4/, tests/, and the bison-generated parser in formats/ctf/metadata/ctf-parser.[ch]. Keep. [See Bison-exception-2.2 below.] 6. LicenseRef-scancode-autoconf-simple-exception-2.0 Used in aclocal.m4 and config/. Omit. 7. LicenseRef-scancode-autoconf-macro-exception Used only in m4/. Omit. 8. FSFULLR Used in m4/ and aclocal.m4. Omit. 9. FSFAP Used only in m4/. Omit. 10. LicenseRef-scancode-free-unknown In bindings/python/setup.py.in: false identification. Clearly MIT. In config/. Omit. 11. Libtool-exception Used in config/, m4/, and configure. Omit. 12. LGPL-2.1-only From include/babeltrace/list.h. Keep. 13. GPL-1.0-or-later From tests/bin/*/*.in: [False identification.] Omit. 14. LicenseRef-scancode-autoconf-simple-exception Used only in config/. Omit. 15. FSFUL Used in m4/ and configure. Omit. 16. Bison-exception-2.2 See #5. Keep. 17. BSD-4-Clause-UC From */crc32.[ch]. Keep. 18. BSD-2-Clause From tests/utils/tap. Omit. 19. X11 From config/install-sh. Omit. 20. LicenseRef-scancode-public-domain From config/install-sh. Omit. 21. LGPL-2.0-only From tests/ctf-traces/suceed/*/dummystream. Omit. AND together all the keeps EXCEPT Bison-exception-2.2/GPL-3.0-or-later. OR those. [I am not even going to pretend that this is absolutely accurate, but it is closer to the reality of it.] --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index cd6fec5..808b513 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -2,7 +2,7 @@ Name: babeltrace Version: 1.5.11 Release: 3%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format -License: MIT AND GPL-2.0-only +License: MIT AND GPL-3.0-or-later WITH Bison-exception-2.2 AND LGPL-2.1-only AND BSD-4-Clause-UC URL: https://www.efficios.com/babeltrace Source0: https://www.efficios.com/files/%{name}/%{name}-%{version}.tar.bz2 Source1: https://www.efficios.com/files/%{name}/%{name}-%{version}.tar.bz2.asc @@ -117,6 +117,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Mon May 30 2023 Keith Seitz +- Update license expression. + * Mon May 08 2023 Michael Jeanson - 1.5.11-3 - migrated to SPDX license From 8d0b25860bfc4fb609753f2662d9580616453703 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 20:31:58 +0200 Subject: [PATCH 30/44] Rebuilt for Python 3.12 --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index 808b513..fd1ec22 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT AND GPL-3.0-or-later WITH Bison-exception-2.2 AND LGPL-2.1-only AND BSD-4-Clause-UC URL: https://www.efficios.com/babeltrace @@ -117,6 +117,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Tue Jun 13 2023 Python Maint - 1.5.11-4 +- Rebuilt for Python 3.12 + * Mon May 30 2023 Keith Seitz - Update license expression. From bf4107fd35646e755cf14ace17c04ca41fdb0bc7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 14:18:45 +0000 Subject: [PATCH 31/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index fd1ec22..186841f 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.11 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT AND GPL-3.0-or-later WITH Bison-exception-2.2 AND LGPL-2.1-only AND BSD-4-Clause-UC URL: https://www.efficios.com/babeltrace @@ -117,6 +117,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.5.11-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 13 2023 Python Maint - 1.5.11-4 - Rebuilt for Python 3.12 From 13f72944b92d88e3a3ad0338c26b8e7ba84e8925 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 14:06:01 +0000 Subject: [PATCH 32/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index 186841f..382841c 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.11 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT AND GPL-3.0-or-later WITH Bison-exception-2.2 AND LGPL-2.1-only AND BSD-4-Clause-UC URL: https://www.efficios.com/babeltrace @@ -117,6 +117,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.5.11-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 1.5.11-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From a7e6f15e9e04b2d773075456fa51c327579d6bf7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 23 Jan 2024 00:03:19 +0000 Subject: [PATCH 33/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index 382841c..479b030 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.11 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT AND GPL-3.0-or-later WITH Bison-exception-2.2 AND LGPL-2.1-only AND BSD-4-Clause-UC URL: https://www.efficios.com/babeltrace @@ -117,6 +117,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Tue Jan 23 2024 Fedora Release Engineering - 1.5.11-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.5.11-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From c897f1f709679271a19586d5dd346dde98b9f3a7 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 08:38:11 +0200 Subject: [PATCH 34/44] Rebuilt for Python 3.13 --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index 479b030..0a5bb91 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.11 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT AND GPL-3.0-or-later WITH Bison-exception-2.2 AND LGPL-2.1-only AND BSD-4-Clause-UC URL: https://www.efficios.com/babeltrace @@ -117,6 +117,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Fri Jun 07 2024 Python Maint - 1.5.11-8 +- Rebuilt for Python 3.13 + * Tue Jan 23 2024 Fedora Release Engineering - 1.5.11-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 89cc49b5bea88b66e8087d48b8f984e476382aab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 18:00:41 +0000 Subject: [PATCH 35/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index 0a5bb91..47e24cd 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.11 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT AND GPL-3.0-or-later WITH Bison-exception-2.2 AND LGPL-2.1-only AND BSD-4-Clause-UC URL: https://www.efficios.com/babeltrace @@ -117,6 +117,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.5.11-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 07 2024 Python Maint - 1.5.11-8 - Rebuilt for Python 3.13 From c377dc7ece7a2dc00163ad3d8bb58e9beadbe64d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 12:11:45 +0000 Subject: [PATCH 36/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index 47e24cd..eba80d2 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.11 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT AND GPL-3.0-or-later WITH Bison-exception-2.2 AND LGPL-2.1-only AND BSD-4-Clause-UC URL: https://www.efficios.com/babeltrace @@ -117,6 +117,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.5.11-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 1.5.11-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 5c0bc059b13705a9fdd17b9d64058c1afa9b3c69 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 20:10:19 +0200 Subject: [PATCH 37/44] Rebuilt for Python 3.14 --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index eba80d2..93d96c5 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.11 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT AND GPL-3.0-or-later WITH Bison-exception-2.2 AND LGPL-2.1-only AND BSD-4-Clause-UC URL: https://www.efficios.com/babeltrace @@ -117,6 +117,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Mon Jun 02 2025 Python Maint - 1.5.11-11 +- Rebuilt for Python 3.14 + * Thu Jan 16 2025 Fedora Release Engineering - 1.5.11-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From d3e4ab1a2d103bab4b0135654fb088b6607179e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:32:52 +0000 Subject: [PATCH 38/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index 93d96c5..98d3800 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.11 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT AND GPL-3.0-or-later WITH Bison-exception-2.2 AND LGPL-2.1-only AND BSD-4-Clause-UC URL: https://www.efficios.com/babeltrace @@ -117,6 +117,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.5.11-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jun 02 2025 Python Maint - 1.5.11-11 - Rebuilt for Python 3.14 From b94ab8c19309dc25ebc734ef2974aab09abb4dce Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:39:19 +0200 Subject: [PATCH 39/44] Rebuilt for Python 3.14.0rc2 bytecode --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index 98d3800..5f538fa 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.11 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT AND GPL-3.0-or-later WITH Bison-exception-2.2 AND LGPL-2.1-only AND BSD-4-Clause-UC URL: https://www.efficios.com/babeltrace @@ -117,6 +117,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Fri Aug 15 2025 Python Maint - 1.5.11-13 +- Rebuilt for Python 3.14.0rc2 bytecode + * Wed Jul 23 2025 Fedora Release Engineering - 1.5.11-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From cb9c7af41ffe72e2ba7218ad49a21da56d558185 Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Tue, 26 Aug 2025 15:27:12 -0400 Subject: [PATCH 40/44] Fix gating test --- tests/Regression/testsuite/runtest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Regression/testsuite/runtest.sh b/tests/Regression/testsuite/runtest.sh index a032b89..0ae6a3a 100755 --- a/tests/Regression/testsuite/runtest.sh +++ b/tests/Regression/testsuite/runtest.sh @@ -41,7 +41,7 @@ rlJournalStart rlRun "dnf --nobest builddep -y *src.rpm" rlRun "rpm --define='_topdir $TMP' -Uvh *src.rpm" rlRun "rpmbuild --define='_topdir $TMP' -bc SPECS/${PACKAGE}.spec" - rlRun "pushd BUILD/${PACKAGE}-*" + rlRun "pushd BUILD/${PACKAGE}-*-build/${PACKAGE}-*" rlPhaseEnd rlPhaseStartTest From 741ff76747dfb10cdf689c7307d43f139c17724f Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Tue, 26 Aug 2025 15:28:03 -0400 Subject: [PATCH 41/44] New release with test fix --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index 5f538fa..749768c 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.11 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT AND GPL-3.0-or-later WITH Bison-exception-2.2 AND LGPL-2.1-only AND BSD-4-Clause-UC URL: https://www.efficios.com/babeltrace @@ -117,6 +117,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Tue Aug 26 2025 Kienan Stewart - 1.5.11-14 +- Fix regression in gating test + * Fri Aug 15 2025 Python Maint - 1.5.11-13 - Rebuilt for Python 3.14.0rc2 bytecode From 5bd9c987b9906c24db042f3750ecbf11b5e11ff2 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:08:16 +0200 Subject: [PATCH 42/44] Rebuilt for Python 3.14.0rc3 bytecode --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index 749768c..3af581d 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.11 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT AND GPL-3.0-or-later WITH Bison-exception-2.2 AND LGPL-2.1-only AND BSD-4-Clause-UC URL: https://www.efficios.com/babeltrace @@ -117,6 +117,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Fri Sep 19 2025 Python Maint - 1.5.11-15 +- Rebuilt for Python 3.14.0rc3 bytecode + * Tue Aug 26 2025 Kienan Stewart - 1.5.11-14 - Fix regression in gating test From ec9fef3124af9d35b4896cb725119ad281d2701c Mon Sep 17 00:00:00 2001 From: Michal Kolar Date: Mon, 8 Dec 2025 18:52:26 +0000 Subject: [PATCH 43/44] update gating.yaml file --- gating.yaml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/gating.yaml b/gating.yaml index ce3cdc1..a1a0c2c 100644 --- a/gating.yaml +++ b/gating.yaml @@ -7,13 +7,8 @@ rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} --- !Policy product_versions: - - rhel-8 + - rhel-* decision_context: osci_compose_gate rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} ---- !Policy -product_versions: - - rhel-9 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-fast-lane.functional} + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-slow-lane.functional} From 11a1dc16e16c7e53fab829247d41f17698bb0087 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 04:14:55 +0000 Subject: [PATCH 44/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- babeltrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/babeltrace.spec b/babeltrace.spec index 3af581d..e7712d4 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,6 +1,6 @@ Name: babeltrace Version: 1.5.11 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Trace Viewer and Converter, mainly for the Common Trace Format License: MIT AND GPL-3.0-or-later WITH Bison-exception-2.2 AND LGPL-2.1-only AND BSD-4-Clause-UC URL: https://www.efficios.com/babeltrace @@ -117,6 +117,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/std-ext-lib.txt %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 1.5.11-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Sep 19 2025 Python Maint - 1.5.11-15 - Rebuilt for Python 3.14.0rc3 bytecode