diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index b30cddb..a1f75db 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /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-getaddrinfo.patch b/babeltrace-getaddrinfo.patch deleted file mode 100644 index d77a024..0000000 --- a/babeltrace-getaddrinfo.patch +++ /dev/null @@ -1,106 +0,0 @@ -*** 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 e7712d4..30f042d 100644 --- a/babeltrace.spec +++ b/babeltrace.spec @@ -1,14 +1,14 @@ Name: babeltrace -Version: 1.5.11 -Release: 16%{?dist} +Version: 1.5.8 +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 +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 -Patch0: babeltrace-getaddrinfo.patch +Patch0: python39.patch BuildRequires: bison >= 2.4 BuildRequires: flex >= 2.5.35 @@ -16,12 +16,11 @@ 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} @@ -117,75 +116,6 @@ 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* Tue Jun 13 2023 Python Maint - 1.5.11-4 -- Rebuilt for Python 3.12 - -* Mon May 30 2023 Keith Seitz -- Update license expression. - -* 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 - -* 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) - -* 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 - -* 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 - * Wed Jul 21 2021 Fedora Release Engineering - 1.5.8-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index a1a0c2c..0000000 --- a/gating.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- !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-* -decision_context: osci_compose_gate -rules: - - !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} diff --git a/plans/ci.fmf b/plans/ci.fmf deleted file mode 100644 index 3fd3ab7..0000000 --- a/plans/ci.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: CI Gating Plan -discover: - how: fmf -execute: - how: tmt 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 + + diff --git a/sources b/sources index 98e182a..072190d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (babeltrace-1.5.11.tar.bz2) = a3158bb9d0306c1cab6ac3d16ba542605ad60b13ecb10fe740a3b95168f0ead87d31483a06d49a15341f7ef6def16765d9a6045f40a60cd8b94070d979c0c3d1 -SHA512 (babeltrace-1.5.11.tar.bz2.asc) = 63b662d53b57f70793e6729c74d9a78a09789f3846589835de87baae423b793b0d7ed7c0e66b118d61e52c5775710b0e7b07b337eb69f6fcc1b382abaf047924 +SHA512 (babeltrace-1.5.8.tar.bz2) = 827749ae8507efd433bb97ef668628837a3ff15b5be5097af5621d46055c6f10401da0be1f9d9f843a96c8c307b33745e04284d166e275e03b7ddb0a7dd57e96 +SHA512 (babeltrace-1.5.8.tar.bz2.asc) = 6e0802a1541029086f2003526a801b43d361d1586893f8d193cc95b3a20e86c0da4141b81c641b4902f7c3c0ecd5e6ab94f3a5a83ae64917c4628feec48931d4 diff --git a/tests/README b/tests/README deleted file mode 100644 index 9ad59d4..0000000 --- a/tests/README +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 54ce8b2..0000000 --- a/tests/Regression/testsuite/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# 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 deleted file mode 100644 index f3f68b0..0000000 --- a/tests/Regression/testsuite/PURPOSE +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 5102283..0000000 --- a/tests/Regression/testsuite/main.fmf +++ /dev/null @@ -1,24 +0,0 @@ -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 deleted file mode 100755 index 0ae6a3a..0000000 --- a/tests/Regression/testsuite/runtest.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/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}-*-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