From 8ac251e0ef81c477c80c8f21085b434cbbc31291 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 19:54:05 +0000 Subject: [PATCH 01/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- libunistring.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libunistring.spec b/libunistring.spec index 747ce72..a6319af 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,6 +1,6 @@ Name: libunistring Version: 0.9.7 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries Summary: GNU Unicode string library License: GPLV2+ or LGPLv3+ @@ -71,6 +71,9 @@ if [ $1 = 0 ]; then fi %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0.9.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 17 2017 Daiki Ueno - 0.9.7-1 - Update to 0.9.7 - Update license to "GPLv2+ or LGPLv2+" From 9389fb70b39590e0b50f0296800cf1bb02f4d0f0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 02:26:30 +0000 Subject: [PATCH 02/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- libunistring.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libunistring.spec b/libunistring.spec index a6319af..655f250 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,6 +1,6 @@ Name: libunistring Version: 0.9.7 -Release: 2%{?dist} +Release: 3%{?dist} Group: System Environment/Libraries Summary: GNU Unicode string library License: GPLV2+ or LGPLv3+ @@ -71,6 +71,9 @@ if [ $1 = 0 ]; then fi %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0.9.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 0.9.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 5e44c88e0ee5ec920d822810d40e36a1bc2e2a0d Mon Sep 17 00:00:00 2001 From: root Date: Mon, 30 Oct 2017 18:58:05 +0200 Subject: [PATCH 03/45] Initial commit, adding .gitignore in master branch --- .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 From a970695ff45f8ba3f235ffdf9e5356c267dcfda7 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 30 Oct 2017 18:59:57 +0200 Subject: [PATCH 04/45] Commit tests fort libunistring to new-tests branch --- README.md | 3 + libunistring-tests/Makefile | 63 +++++++++++++++++++ libunistring-tests/libunistring_test.py | 79 ++++++++++++++++++++++++ libunistring-tests/runtest.sh | 54 ++++++++++++++++ libunistring-tests/test | Bin 0 -> 8896 bytes libunistring-tests/test.c | 37 +++++++++++ tests.yml | 23 +++++++ 7 files changed, 259 insertions(+) create mode 100644 README.md create mode 100644 libunistring-tests/Makefile create mode 100644 libunistring-tests/libunistring_test.py create mode 100644 libunistring-tests/runtest.sh create mode 100755 libunistring-tests/test create mode 100644 libunistring-tests/test.c create mode 100644 tests.yml diff --git a/README.md b/README.md new file mode 100644 index 0000000..fd5c17f --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# libunistring + +This project conatains libunistring i18n testcases diff --git a/libunistring-tests/Makefile b/libunistring-tests/Makefile new file mode 100644 index 0000000..b4a5f93 --- /dev/null +++ b/libunistring-tests/Makefile @@ -0,0 +1,63 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Makefile of /CoreOS/python/libunistring-tests +# Description: Functional tests for libunistring. +# Author: Pooja Yadav +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2015 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=/CoreOS/python/libunistring-tests +export TESTVERSION=1.0 + +BUILT_FILES= + +FILES=$(METADATA) libunistring_test.py Makefile test runtest.sh + +.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) + +include /usr/share/rhts/lib/rhts-make.include + +$(METADATA): Makefile + @echo "Owner: Pooja Yadav " > $(METADATA) + @echo "Name: $(TEST)" >> $(METADATA) + @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) + @echo "Path: $(TEST_DIR)" >> $(METADATA) + @echo "Description: Functional test for the gettext module" >> $(METADATA) + @echo "Type: Sanity" >> $(METADATA) + @echo "TestTime: 5m" >> $(METADATA) + @echo "RunFor: python" >> $(METADATA) + @echo "Requires: python" >> $(METADATA) + @echo "Priority: Normal" >> $(METADATA) + @echo "License: GPLv2" >> $(METADATA) + @echo "Confidential: no" >> $(METADATA) + @echo "Destructive: no" >> $(METADATA) + + rhts-lint $(METADATA) + diff --git a/libunistring-tests/libunistring_test.py b/libunistring-tests/libunistring_test.py new file mode 100644 index 0000000..a9c688e --- /dev/null +++ b/libunistring-tests/libunistring_test.py @@ -0,0 +1,79 @@ +# -*- coding: utf-8 -*- + +import os +import subprocess +import logging + +""" +Creating a result.log file for saving logs +""" +logging.basicConfig(level=logging.INFO) + +logging.info("TEST RESULTS FOR FUNCTION\n\n") + +data = [] + +def create_testfile(): + testfile = subprocess.call("./test 'Bonjour le monde'" , shell=True) + with open("./testfile.in") as fh: + lines = fh.readlines() + global data + data = lines + +def test_utf8(): + """ + Check UTF-8 encoding + """ + try: + conv8 = data[0].strip("\n").decode('utf-8') + conv16 = data[0].strip("\n").decode('utf-16') + if conv8 == ("Bonjour le monde") and conv16 != ("Bonjour le monde"): + logging.info("UTF-8 Conversion Test: SUCCESS") + else: + logging.error("UTF-8 Conversion Test: ERROR") + except UnicodeError: + logging.error("UTF-8 Conversion Test: UnicodeError") + +def test_utf_16(): + """ + Check UTF-16 encoding + """ + try: + conv16 = data[1].strip("\n").decode('utf-16') + conv8 = data[1].strip("\n").decode('utf-8') + if conv16 == ("Bonjour le monde") and conv8 != ("Bonjour le monde"): + logging.info("UTF-16 Conversion Test: SUCCESS") + else: + logging.error("UTF-16 Conversion Test: ERROR") + except UnicodeError: + logging.error("UTF-16 Conversion Test: UnicodeError") + +def test_utf_32(): + """ + Check UTF-32 encoding + """ + try: + conv8 = data[2].strip("\n").decode('utf-8') + conv16= data[2].strip("\n").decode('utf-16') + conv32 = data[2].strip("\n").decode('utf-32') + if conv32 == ("Bonjour le monde") and conv8 and conv16 != ("Bonjour le monde"): + logging.info("UTF-32 Conversion Test: SUCCESS") + else: + logging.error("UTF-32 Conversion Test: ERROR") + except UnicodeError: + logging.error("UTF-32 Conversion Test: UnicodeError") + +def del_testfile(): + try: + subprocess.call(['rm', '-rf', './testfile.in']) + except OSError as e: + logging.error("OSError\n") + + +if __name__ == "__main__": + del_testfile() + create_testfile() + test_utf8() + test_utf_16() + test_utf_32() + diff --git a/libunistring-tests/runtest.sh b/libunistring-tests/runtest.sh new file mode 100644 index 0000000..64e85ac --- /dev/null +++ b/libunistring-tests/runtest.sh @@ -0,0 +1,54 @@ +#!/bin/bash +# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# runtest.sh of /CoreOS/python/libunistring-tests +# Description: Functional tests for libunistring to check i18n features. +# Author: Pooja Yadav +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2010 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# 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, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# Include Beaker environment +. /usr/bin/rhts-environment.sh +. /usr/lib/beakerlib/beakerlib.sh + +PACKAGE="libunistring" + +rlJournalStart + rlPhaseStartSetup + rlAssertRpm $PACKAGE + rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" + rlRun "cp libunistring_test.py test $TmpDir" + rlRun "pushd $TmpDir" + rlPhaseEnd + + rlPhaseStartTest + rlLog "Run libunistring_test.py" + rlRun "python libunistring_test.py" + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -r $TmpDir" 0 "Removing tmp directory" + rlPhaseEnd +rlJournalPrintText +rlJournalEnd + diff --git a/libunistring-tests/test b/libunistring-tests/test new file mode 100755 index 0000000000000000000000000000000000000000..41243b5965254045593f6963a99c44aa3cbd364a GIT binary patch literal 8896 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 +#include +#include +#include +#include +#include +#include + +int +main (int argc, char **argv) +{ + if (argc < 2) { + printf ("Usage: %s \n", argv[0]); + return 1; + } + + size_t len8, len16, len32; + const char newline = '\n'; + + uint8_t *res8 = u8_conv_from_encoding ("ASCII", iconveh_question_mark, argv[1], strlen (argv[1]), NULL, NULL, &len8); + uint16_t *res16 = u16_conv_from_encoding ("ASCII", iconveh_question_mark, argv[1], strlen (argv[1]), NULL, NULL, &len16); + uint32_t *res32 = u32_conv_from_encoding ("ASCII", iconveh_question_mark, argv[1], strlen (argv[1]), NULL, NULL, &len32); + + int fd = open ("testfile.in", O_WRONLY | O_CREAT, S_IRUSR); + + for (int i = 0; i < len8; i++) + write (fd, &res8[i], sizeof (uint8_t)); + write (fd, &newline, 1); + for (int i = 0; i < len16; i++) + write (fd, &res16[i], sizeof (uint16_t)); + write (fd, &newline, 1); + for (int i = 0; i < len32; i++) + write (fd, &res32[i], sizeof (uint32_t)); + + close (fd); +} + diff --git a/tests.yml b/tests.yml new file mode 100644 index 0000000..1b4c3ec --- /dev/null +++ b/tests.yml @@ -0,0 +1,23 @@ +--- + +# Tests for Atomic +- hosts: localhost + tags: + - atomic + roles: + - role: standard-test-beakerlib + tests: + - libunistring-tests + +# Tests for Classic and Container +- hosts: localhost + tags: + - classic + - container + roles: + - role: standard-test-beakerlib + tests: + - libunistring-tests + required_packages: + - libunistring + - libunistring-devel From ff0d975e57bb8fd39aaca665e069458402cca0c0 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Sun, 3 Dec 2017 06:46:11 +0100 Subject: [PATCH 05/45] Update to 0.9.8 --- .gitignore | 1 + libunistring.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 186ae23..5c016f5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ libunistring-0.9.3.tar.gz /libunistring-0.9.4.tar.xz /libunistring-0.9.7.tar.xz +/libunistring-0.9.8.tar.xz diff --git a/libunistring.spec b/libunistring.spec index 655f250..2606072 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,6 +1,6 @@ Name: libunistring -Version: 0.9.7 -Release: 3%{?dist} +Version: 0.9.8 +Release: 1%{?dist} Group: System Environment/Libraries Summary: GNU Unicode string library License: GPLV2+ or LGPLv3+ @@ -71,6 +71,9 @@ if [ $1 = 0 ]; then fi %changelog +* Sat Dec 2 2017 Daiki Ueno - 0.9.8-1 +- Update to 0.9.8 + * Thu Aug 03 2017 Fedora Release Engineering - 0.9.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index a333f66..0ea30a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libunistring-0.9.7.tar.xz) = 52d5240dbf9b483976e980027187484dae6bbc103d44be8f9797832e772cde2ea03fcd27b062c81d42ea9b9f5a21216993695f2435bf8c06e48af916be0475f9 +SHA512 (libunistring-0.9.8.tar.xz) = d4b673d7da3fc122fbc1694a64f9c685f1cfe83592ff427420cb8bbd87169b860740e339c4a8c4b7f72769572eef804fedaa6b607308f243d857209972deb235 From 45cb0aad1f154a0d39b34228fab04e5d4d5836e0 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 3 Feb 2018 18:18:35 +0100 Subject: [PATCH 06/45] Switch to %ldconfig_scriptlets Signed-off-by: Igor Gnatenko --- libunistring.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libunistring.spec b/libunistring.spec index 2606072..d7953c2 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,6 +1,6 @@ Name: libunistring Version: 0.9.8 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries Summary: GNU Unicode string library License: GPLV2+ or LGPLv3+ @@ -58,9 +58,7 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/unistring %{_includedir}/*.h -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %post devel /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : @@ -71,6 +69,9 @@ if [ $1 = 0 ]; then fi %changelog +* Sat Feb 03 2018 Igor Gnatenko - 0.9.8-2 +- Switch to %%ldconfig_scriptlets + * Sat Dec 2 2017 Daiki Ueno - 0.9.8-1 - Update to 0.9.8 From 7af7642b8500217522dee78039517b66b4c34ef0 Mon Sep 17 00:00:00 2001 From: Sergey Turivniy Date: Mon, 5 Feb 2018 18:31:01 +0200 Subject: [PATCH 07/45] Update CI tests using the standard test interface --- tests/README.md | 3 +++ .../libunistring-tests}/Makefile | 0 .../libunistring-tests}/libunistring_test.py | 0 .../libunistring-tests}/runtest.sh | 0 .../libunistring-tests}/test | Bin .../libunistring-tests}/test.c | 0 tests.yml => tests/tests.yml | 0 7 files changed, 3 insertions(+) create mode 100644 tests/README.md rename {libunistring-tests => tests/libunistring-tests}/Makefile (100%) rename {libunistring-tests => tests/libunistring-tests}/libunistring_test.py (100%) rename {libunistring-tests => tests/libunistring-tests}/runtest.sh (100%) rename {libunistring-tests => tests/libunistring-tests}/test (100%) rename {libunistring-tests => tests/libunistring-tests}/test.c (100%) rename tests.yml => tests/tests.yml (100%) diff --git a/tests/README.md b/tests/README.md new file mode 100644 index 0000000..fd5c17f --- /dev/null +++ b/tests/README.md @@ -0,0 +1,3 @@ +# libunistring + +This project conatains libunistring i18n testcases diff --git a/libunistring-tests/Makefile b/tests/libunistring-tests/Makefile similarity index 100% rename from libunistring-tests/Makefile rename to tests/libunistring-tests/Makefile diff --git a/libunistring-tests/libunistring_test.py b/tests/libunistring-tests/libunistring_test.py similarity index 100% rename from libunistring-tests/libunistring_test.py rename to tests/libunistring-tests/libunistring_test.py diff --git a/libunistring-tests/runtest.sh b/tests/libunistring-tests/runtest.sh similarity index 100% rename from libunistring-tests/runtest.sh rename to tests/libunistring-tests/runtest.sh diff --git a/libunistring-tests/test b/tests/libunistring-tests/test similarity index 100% rename from libunistring-tests/test rename to tests/libunistring-tests/test diff --git a/libunistring-tests/test.c b/tests/libunistring-tests/test.c similarity index 100% rename from libunistring-tests/test.c rename to tests/libunistring-tests/test.c diff --git a/tests.yml b/tests/tests.yml similarity index 100% rename from tests.yml rename to tests/tests.yml From ef4784ff6d6ebe6f998690a94b09a18789c5ba9a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 23:35:21 +0000 Subject: [PATCH 08/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libunistring.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libunistring.spec b/libunistring.spec index d7953c2..20272cc 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,6 +1,6 @@ Name: libunistring Version: 0.9.8 -Release: 2%{?dist} +Release: 3%{?dist} Group: System Environment/Libraries Summary: GNU Unicode string library License: GPLV2+ or LGPLv3+ @@ -69,6 +69,9 @@ if [ $1 = 0 ]; then fi %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.9.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Feb 03 2018 Igor Gnatenko - 0.9.8-2 - Switch to %%ldconfig_scriptlets From 593dcde8d492fb06408d23f8c3e5d350c27ca093 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:44:05 +0100 Subject: [PATCH 09/45] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- libunistring.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libunistring.spec b/libunistring.spec index 20272cc..dac028b 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -6,7 +6,6 @@ Summary: GNU Unicode string library License: GPLV2+ or LGPLv3+ Url: http://www.gnu.org/software/libunistring/ Source0: http://ftp.gnu.org/gnu/libunistring/%{name}-%{version}.tar.xz -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires(post): info Requires(preun): info Provides: bundled(gnulib) From 0d9db339b18265b24e54236a0f8a44bcaf4560c5 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 08:17:39 +0100 Subject: [PATCH 10/45] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- libunistring.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/libunistring.spec b/libunistring.spec index dac028b..a117abb 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -39,9 +39,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}.la # Move staged docs so not picked up by %%doc in main package mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} __doc -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) %license COPYING COPYING.LIB From c5e34d68e8af5dee2254c2fcc86c62407e670ec7 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 1 Mar 2018 10:01:50 +0100 Subject: [PATCH 11/45] Update to 0.9.9-1 - Update to upstream 0.9.9 release --- .gitignore | 1 + libunistring.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5c016f5..3d14805 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ libunistring-0.9.3.tar.gz /libunistring-0.9.4.tar.xz /libunistring-0.9.7.tar.xz /libunistring-0.9.8.tar.xz +/libunistring-0.9.9.tar.xz diff --git a/libunistring.spec b/libunistring.spec index a117abb..b1fc273 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,6 +1,7 @@ +# This spec file has been automatically updated +Version: 0.9.9 +Release: 1%{?dist} Name: libunistring -Version: 0.9.8 -Release: 3%{?dist} Group: System Environment/Libraries Summary: GNU Unicode string library License: GPLV2+ or LGPLv3+ @@ -65,6 +66,9 @@ if [ $1 = 0 ]; then fi %changelog +* Thu Mar 01 2018 Daiki Ueno - 0.9.9-1 +- Update to upstream 0.9.9 release + * Wed Feb 07 2018 Fedora Release Engineering - 0.9.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 0ea30a9..14f1ca8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libunistring-0.9.8.tar.xz) = d4b673d7da3fc122fbc1694a64f9c685f1cfe83592ff427420cb8bbd87169b860740e339c4a8c4b7f72769572eef804fedaa6b607308f243d857209972deb235 +SHA512 (libunistring-0.9.9.tar.xz) = c5f3619d0b064c0256dc9326b609cb72871c85102cd67cfc46d85f72b67c564924cd76198c6d6ab60fbf7d6f76ddcb9fbe6c8116f779ca7e24570ae84e31fea8 From 8dcdfc931b5d6c62f6deb2ec8b4ba8269dba9ec3 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 28 May 2018 14:04:02 +0200 Subject: [PATCH 12/45] Update to 0.9.10-1 - Update to upstream 0.9.10 release --- .gitignore | 1 + libunistring.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3d14805..0fc702c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ libunistring-0.9.3.tar.gz /libunistring-0.9.7.tar.xz /libunistring-0.9.8.tar.xz /libunistring-0.9.9.tar.xz +/libunistring-0.9.10.tar.xz diff --git a/libunistring.spec b/libunistring.spec index b1fc273..cdad551 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 0.9.9 +Version: 0.9.10 Release: 1%{?dist} Name: libunistring Group: System Environment/Libraries @@ -66,6 +66,9 @@ if [ $1 = 0 ]; then fi %changelog +* Mon May 28 2018 Daiki Ueno - 0.9.10-1 +- Update to upstream 0.9.10 release + * Thu Mar 01 2018 Daiki Ueno - 0.9.9-1 - Update to upstream 0.9.9 release diff --git a/sources b/sources index 14f1ca8..fdd5713 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libunistring-0.9.9.tar.xz) = c5f3619d0b064c0256dc9326b609cb72871c85102cd67cfc46d85f72b67c564924cd76198c6d6ab60fbf7d6f76ddcb9fbe6c8116f779ca7e24570ae84e31fea8 +SHA512 (libunistring-0.9.10.tar.xz) = 01dcab6e05ea4c33572bf96cc0558bcffbfc0e62fc86410cef06c1597a0073d5750525fe2dee4fdb39c9bd704557fcbab864f9645958108a2e07950bc539fe54 From ed939e4d11ded245ae385c8026221ab169a38bca Mon Sep 17 00:00:00 2001 From: Serhii Turivnyi Date: Tue, 29 May 2018 11:09:56 +0300 Subject: [PATCH 13/45] Fix tests --- tests/libunistring-tests/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/libunistring-tests/Makefile b/tests/libunistring-tests/Makefile index b4a5f93..7cfe531 100644 --- a/tests/libunistring-tests/Makefile +++ b/tests/libunistring-tests/Makefile @@ -42,8 +42,6 @@ build: $(BUILT_FILES) clean: rm -f *~ $(BUILT_FILES) -include /usr/share/rhts/lib/rhts-make.include - $(METADATA): Makefile @echo "Owner: Pooja Yadav " > $(METADATA) @echo "Name: $(TEST)" >> $(METADATA) From d5d008a1c40aa2d0d6ff8dd2177e80c455c3629d Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:48:28 -0500 Subject: [PATCH 14/45] Remove needless use of %defattr --- libunistring.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/libunistring.spec b/libunistring.spec index cdad551..8e97967 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -41,13 +41,11 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}.la mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} __doc %files -%defattr(-,root,root,-) %license COPYING COPYING.LIB %doc AUTHORS NEWS README %{_libdir}/%{name}.so.* %files devel -%defattr(-,root,root,-) %doc HACKING DEPENDENCIES THANKS ChangeLog %doc __doc/* %{_infodir}/%{name}.info* From ca8718061ece932f37331e7a0971f68c39ef107f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 08:58:55 +0000 Subject: [PATCH 15/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libunistring.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libunistring.spec b/libunistring.spec index 8e97967..590d498 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.9.10 -Release: 1%{?dist} +Release: 2%{?dist} Name: libunistring Group: System Environment/Libraries Summary: GNU Unicode string library @@ -64,6 +64,9 @@ if [ $1 = 0 ]; then fi %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.9.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon May 28 2018 Daiki Ueno - 0.9.10-1 - Update to upstream 0.9.10 release From 77ac3924939a636a9032f7140cf5e8258dc260f7 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Fri, 20 Jul 2018 21:38:47 +0200 Subject: [PATCH 16/45] Add "BuildRequires: gcc" --- libunistring.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libunistring.spec b/libunistring.spec index 590d498..aa20dfd 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -7,6 +7,7 @@ Summary: GNU Unicode string library License: GPLV2+ or LGPLv3+ Url: http://www.gnu.org/software/libunistring/ Source0: http://ftp.gnu.org/gnu/libunistring/%{name}-%{version}.tar.xz +BuildRequires: gcc Requires(post): info Requires(preun): info Provides: bundled(gnulib) From c0ed9ff57857ae4957b27041c74f1652641996d6 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 28 Jul 2018 10:24:13 +0200 Subject: [PATCH 17/45] Replace obsolete scriptlets Signed-off-by: Igor Gnatenko --- libunistring.spec | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/libunistring.spec b/libunistring.spec index aa20dfd..88160e7 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.9.10 -Release: 2%{?dist} +Release: 3%{?dist} Name: libunistring Group: System Environment/Libraries Summary: GNU Unicode string library @@ -8,8 +8,6 @@ License: GPLV2+ or LGPLv3+ Url: http://www.gnu.org/software/libunistring/ Source0: http://ftp.gnu.org/gnu/libunistring/%{name}-%{version}.tar.xz BuildRequires: gcc -Requires(post): info -Requires(preun): info Provides: bundled(gnulib) %description @@ -56,15 +54,10 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} __doc %ldconfig_scriptlets -%post devel -/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : - -%preun devel -if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : -fi - %changelog +* Sat Jul 28 2018 Igor Gnatenko - 0.9.10-3 +- Replace obsolete scriptlets + * Fri Jul 13 2018 Fedora Release Engineering - 0.9.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 79860aea6b364567206311a11bb0ac3573f85f6c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 28 Jul 2018 11:07:14 +0200 Subject: [PATCH 18/45] remove binary blob Signed-off-by: Igor Gnatenko --- tests/libunistring-tests/test | Bin 8896 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 tests/libunistring-tests/test diff --git a/tests/libunistring-tests/test b/tests/libunistring-tests/test deleted file mode 100755 index 41243b5965254045593f6963a99c44aa3cbd364a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8896 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 Date: Tue, 31 Jul 2018 15:11:01 +0200 Subject: [PATCH 19/45] Rebuild with fixed binutils --- libunistring.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libunistring.spec b/libunistring.spec index 88160e7..1ac08dc 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.9.10 -Release: 3%{?dist} +Release: 4%{?dist} Name: libunistring Group: System Environment/Libraries Summary: GNU Unicode string library @@ -55,6 +55,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} __doc %ldconfig_scriptlets %changelog +* Tue Jul 31 2018 Florian Weimer - 0.9.10-4 +- Rebuild with fixed binutils + * Sat Jul 28 2018 Igor Gnatenko - 0.9.10-3 - Replace obsolete scriptlets From 1c9aa8fd23cd36005bf170c733ddb43c0d613524 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:52 +0100 Subject: [PATCH 20/45] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- libunistring.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/libunistring.spec b/libunistring.spec index 1ac08dc..2ff48e6 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -2,7 +2,6 @@ Version: 0.9.10 Release: 4%{?dist} Name: libunistring -Group: System Environment/Libraries Summary: GNU Unicode string library License: GPLV2+ or LGPLv3+ Url: http://www.gnu.org/software/libunistring/ @@ -18,7 +17,6 @@ This portable C library implements Unicode string types in three flavours: case folding and regular expressions). %package devel -Group: Development/Libraries Summary: GNU Unicode string library - development files Requires: %{name} = %{version}-%{release} From f598ba2597d4a550a1772a6c79d916236e310c7d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 08:26:42 +0000 Subject: [PATCH 21/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libunistring.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libunistring.spec b/libunistring.spec index 2ff48e6..28b8afc 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.9.10 -Release: 4%{?dist} +Release: 5%{?dist} Name: libunistring Summary: GNU Unicode string library License: GPLV2+ or LGPLv3+ @@ -53,6 +53,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} __doc %ldconfig_scriptlets %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 0.9.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jul 31 2018 Florian Weimer - 0.9.10-4 - Rebuild with fixed binutils From b1a47ba9d48b5afebaf10481b96556cbddfd9f75 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 14:37:13 +0000 Subject: [PATCH 22/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libunistring.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libunistring.spec b/libunistring.spec index 28b8afc..7996c2b 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.9.10 -Release: 5%{?dist} +Release: 6%{?dist} Name: libunistring Summary: GNU Unicode string library License: GPLV2+ or LGPLv3+ @@ -53,6 +53,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} __doc %ldconfig_scriptlets %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.9.10-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 0.9.10-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 0cab0ae6e22ed154eb313c58c464c03675f6740d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 10:39:04 +0000 Subject: [PATCH 23/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libunistring.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libunistring.spec b/libunistring.spec index 7996c2b..d1bd41a 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.9.10 -Release: 6%{?dist} +Release: 7%{?dist} Name: libunistring Summary: GNU Unicode string library License: GPLV2+ or LGPLv3+ @@ -53,6 +53,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} __doc %ldconfig_scriptlets %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 0.9.10-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 0.9.10-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 57e0d0872ff3de09f8d8e4f82b47f95bc2b11810 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 13 Jul 2020 22:40:10 +0000 Subject: [PATCH 24/45] Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- libunistring.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libunistring.spec b/libunistring.spec index d1bd41a..2d0de46 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.9.10 -Release: 7%{?dist} +Release: 8%{?dist} Name: libunistring Summary: GNU Unicode string library License: GPLV2+ or LGPLv3+ @@ -28,10 +28,10 @@ Development files for programs using libunistring. %build %configure --disable-static --disable-rpath -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +%make_install rm -f $RPM_BUILD_ROOT/%{_infodir}/dir rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}.la # Move staged docs so not picked up by %%doc in main package @@ -53,6 +53,10 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} __doc %ldconfig_scriptlets %changelog +* Mon Jul 13 2020 Tom Stellard - 0.9.10-8 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Wed Jan 29 2020 Fedora Release Engineering - 0.9.10-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From f032b0e758036fd5051f54c6f8724e94586333ae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 05:48:14 +0000 Subject: [PATCH 25/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libunistring.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libunistring.spec b/libunistring.spec index 2d0de46..45af817 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.9.10 -Release: 8%{?dist} +Release: 9%{?dist} Name: libunistring Summary: GNU Unicode string library License: GPLV2+ or LGPLv3+ @@ -53,6 +53,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} __doc %ldconfig_scriptlets %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 0.9.10-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 13 2020 Tom Stellard - 0.9.10-8 - Use make macros - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro From d268e290af5b351ee1a348f5b5b25f0012b26eb8 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 5 Jan 2021 02:58:30 +0000 Subject: [PATCH 26/45] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- libunistring.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libunistring.spec b/libunistring.spec index 45af817..b821147 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -7,6 +7,7 @@ License: GPLV2+ or LGPLv3+ Url: http://www.gnu.org/software/libunistring/ Source0: http://ftp.gnu.org/gnu/libunistring/%{name}-%{version}.tar.xz BuildRequires: gcc +BuildRequires: make Provides: bundled(gnulib) %description From af1fe1c9f5d4028e87b89cd078696fb3149c6620 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 18 Jan 2021 01:23:55 +0000 Subject: [PATCH 27/45] Spec file cleanup --- libunistring.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libunistring.spec b/libunistring.spec index b821147..51f5d0b 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -4,8 +4,8 @@ Release: 9%{?dist} Name: libunistring Summary: GNU Unicode string library License: GPLV2+ or LGPLv3+ -Url: http://www.gnu.org/software/libunistring/ -Source0: http://ftp.gnu.org/gnu/libunistring/%{name}-%{version}.tar.xz +URL: https://www.gnu.org/software/libunistring/ +Source0: https://ftp.gnu.org/gnu/libunistring/%{name}-%{version}.tar.xz BuildRequires: gcc BuildRequires: make Provides: bundled(gnulib) @@ -19,7 +19,7 @@ case folding and regular expressions). %package devel Summary: GNU Unicode string library - development files -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Development files for programs using libunistring. @@ -33,8 +33,8 @@ Development files for programs using libunistring. %install %make_install -rm -f $RPM_BUILD_ROOT/%{_infodir}/dir -rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}.la +rm -f $RPM_BUILD_ROOT%{_infodir}/dir +rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.la # Move staged docs so not picked up by %%doc in main package mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} __doc From 09c439fb1e30083644d3c862e58461d707fa5dcf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 18:13:08 +0000 Subject: [PATCH 28/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libunistring.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libunistring.spec b/libunistring.spec index 51f5d0b..1b28039 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.9.10 -Release: 9%{?dist} +Release: 10%{?dist} Name: libunistring Summary: GNU Unicode string library License: GPLV2+ or LGPLv3+ @@ -54,6 +54,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} __doc %ldconfig_scriptlets %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.9.10-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 0.9.10-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 58e85981d8e735ac7247ce4e6c0f0731f75a6fdf Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Mon, 14 Jun 2021 16:35:18 +0200 Subject: [PATCH 29/45] Resolves: rhbz#1938800 Fix memory leak in vasnprint. (Backported from upstream: https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4d288a80bf7ebe29334b9805cdcc70eacb6059c1) - Fix spelling in license GPLV2+ -> GPLv2+ --- fix-memory-leak-in-vasnprintf.patch | 85 +++++++++++++++++++++++++++++ libunistring.spec | 11 +++- 2 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 fix-memory-leak-in-vasnprintf.patch diff --git a/fix-memory-leak-in-vasnprintf.patch b/fix-memory-leak-in-vasnprintf.patch new file mode 100644 index 0000000..66649ba --- /dev/null +++ b/fix-memory-leak-in-vasnprintf.patch @@ -0,0 +1,85 @@ +diff -ru libunistring-0.9.10/lib/vasnprintf.c libunistring-0.9.10.new/lib/vasnprintf.c +--- libunistring-0.9.10/lib/vasnprintf.c 2018-05-25 18:02:16.000000000 +0200 ++++ libunistring-0.9.10.new/lib/vasnprintf.c 2021-06-14 17:06:43.084948649 +0200 +@@ -1864,7 +1864,7 @@ + + /* Ensures that allocated >= needed. Aborts through a jump to + out_of_memory if needed is SIZE_MAX or otherwise too big. */ +-#define ENSURE_ALLOCATION(needed) \ ++#define ENSURE_ALLOCATION_ELSE(needed, oom_statement) \ + if ((needed) > allocated) \ + { \ + size_t memory_size; \ +@@ -1875,17 +1875,19 @@ + allocated = (needed); \ + memory_size = xtimes (allocated, sizeof (DCHAR_T)); \ + if (size_overflow_p (memory_size)) \ +- goto out_of_memory; \ ++ oom_statement \ + if (result == resultbuf || result == NULL) \ + memory = (DCHAR_T *) malloc (memory_size); \ + else \ + memory = (DCHAR_T *) realloc (result, memory_size); \ + if (memory == NULL) \ +- goto out_of_memory; \ ++ oom_statement \ + if (result == resultbuf && length > 0) \ + DCHAR_CPY (memory, result, length); \ + result = memory; \ + } ++#define ENSURE_ALLOCATION(needed) \ ++ ENSURE_ALLOCATION_ELSE((needed), goto out_of_memory; ) + + for (cp = format, i = 0, dp = &d.dir[0]; ; cp = dp->dir_end, i++, dp++) + { +@@ -2137,7 +2139,8 @@ + } + if (converted != result + length) + { +- ENSURE_ALLOCATION (xsum (length, converted_len)); ++ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), ++ { free (converted); goto out_of_memory; }); + DCHAR_CPY (result + length, converted, converted_len); + free (converted); + } +@@ -2263,7 +2266,8 @@ + } + if (converted != result + length) + { +- ENSURE_ALLOCATION (xsum (length, converted_len)); ++ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), ++ { free (converted); goto out_of_memory; }); + DCHAR_CPY (result + length, converted, converted_len); + free (converted); + } +@@ -2389,7 +2393,8 @@ + } + if (converted != result + length) + { +- ENSURE_ALLOCATION (xsum (length, converted_len)); ++ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), ++ { free (converted); goto out_of_memory; }); + DCHAR_CPY (result + length, converted, converted_len); + free (converted); + } +@@ -2914,7 +2919,8 @@ + } + } + # else +- ENSURE_ALLOCATION (xsum (length, tmpdst_len)); ++ ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), ++ { free (tmpdst); goto out_of_memory; }); + DCHAR_CPY (result + length, tmpdst, tmpdst_len); + free (tmpdst); + length += tmpdst_len; +@@ -5368,7 +5374,8 @@ + errno = saved_errno; + return NULL; + } +- ENSURE_ALLOCATION (xsum (length, tmpdst_len)); ++ ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), ++ { free (tmpdst); goto out_of_memory; }); + DCHAR_CPY (result + length, tmpdst, tmpdst_len); + free (tmpdst); + count = tmpdst_len; +libunistring-0.9.10.new/lib のみに存在: vasnprintf.c.orig diff --git a/libunistring.spec b/libunistring.spec index 1b28039..71874ff 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,11 +1,12 @@ # This spec file has been automatically updated Version: 0.9.10 -Release: 10%{?dist} +Release: 11%{?dist} Name: libunistring Summary: GNU Unicode string library -License: GPLV2+ or LGPLv3+ +License: GPLv2+ or LGPLv3+ URL: https://www.gnu.org/software/libunistring/ Source0: https://ftp.gnu.org/gnu/libunistring/%{name}-%{version}.tar.xz +Patch0: fix-memory-leak-in-vasnprintf.patch BuildRequires: gcc BuildRequires: make Provides: bundled(gnulib) @@ -26,6 +27,7 @@ Development files for programs using libunistring. %prep %setup -q +%patch0 -p1 -b .fix-memory-leak-in-vasnprintf %build %configure --disable-static --disable-rpath @@ -54,6 +56,11 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} __doc %ldconfig_scriptlets %changelog +* Mon Jun 14 2021 Mike FABIAN - 0.9.10-12 +- Fix memory leak in vasnprint. Resolves: rhbz#1938800 + (Backported from upstream: https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4d288a80bf7ebe29334b9805cdcc70eacb6059c1) +- Fix spelling in license GPLV2+ -> GPLv2+ + * Tue Jan 26 2021 Fedora Release Engineering - 0.9.10-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From d0203cb590e3d5000dc0a159c5797c26b17d5369 Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Mon, 21 Jun 2021 09:47:56 +0200 Subject: [PATCH 30/45] Related rhbz#1938800: Fix CI tests and convert them to tmt --- .fmf/version | 1 + libunistring.spec | 5 +- plans/basic.fmf | 5 + tests/libunistring-tests/.gitignore | 2 + tests/libunistring-tests/Makefile | 61 ------------- tests/libunistring-tests/libunistring_test.py | 91 +++++++------------ tests/libunistring-tests/main.fmf | 16 ++++ tests/libunistring-tests/runtest.sh | 4 +- tests/libunistring-tests/test.c | 19 ++-- tests/tests.yml | 23 ----- 10 files changed, 75 insertions(+), 152 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/basic.fmf create mode 100644 tests/libunistring-tests/.gitignore delete mode 100644 tests/libunistring-tests/Makefile create mode 100644 tests/libunistring-tests/main.fmf mode change 100644 => 100755 tests/libunistring-tests/runtest.sh delete mode 100644 tests/tests.yml 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/libunistring.spec b/libunistring.spec index 71874ff..9b83e31 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.9.10 -Release: 11%{?dist} +Release: 13%{?dist} Name: libunistring Summary: GNU Unicode string library License: GPLv2+ or LGPLv3+ @@ -56,6 +56,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} __doc %ldconfig_scriptlets %changelog +* Mon Jun 21 2021 Mike FABIAN - 0.9.10-13 +- Related rhbz#1938800: Fix CI tests and convert them to tmt + * Mon Jun 14 2021 Mike FABIAN - 0.9.10-12 - Fix memory leak in vasnprint. Resolves: rhbz#1938800 (Backported from upstream: https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4d288a80bf7ebe29334b9805cdcc70eacb6059c1) diff --git a/plans/basic.fmf b/plans/basic.fmf new file mode 100644 index 0000000..c1627f9 --- /dev/null +++ b/plans/basic.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/tests/libunistring-tests/.gitignore b/tests/libunistring-tests/.gitignore new file mode 100644 index 0000000..3982139 --- /dev/null +++ b/tests/libunistring-tests/.gitignore @@ -0,0 +1,2 @@ +test +testfile.utf* diff --git a/tests/libunistring-tests/Makefile b/tests/libunistring-tests/Makefile deleted file mode 100644 index 7cfe531..0000000 --- a/tests/libunistring-tests/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/python/libunistring-tests -# Description: Functional tests for libunistring. -# Author: Pooja Yadav -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2015 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=/CoreOS/python/libunistring-tests -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) libunistring_test.py Makefile test runtest.sh - -.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) - -$(METADATA): Makefile - @echo "Owner: Pooja Yadav " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Functional test for the gettext module" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 5m" >> $(METADATA) - @echo "RunFor: python" >> $(METADATA) - @echo "Requires: python" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - - rhts-lint $(METADATA) - diff --git a/tests/libunistring-tests/libunistring_test.py b/tests/libunistring-tests/libunistring_test.py index a9c688e..f5ed94d 100644 --- a/tests/libunistring-tests/libunistring_test.py +++ b/tests/libunistring-tests/libunistring_test.py @@ -1,10 +1,11 @@ # -*- coding: utf-8 -*- +import sys import os import subprocess import logging -""" +""" Creating a result.log file for saving logs """ logging.basicConfig(level=logging.INFO) @@ -13,67 +14,45 @@ logging.info("TEST RESULTS FOR FUNCTION\n\n") data = [] -def create_testfile(): - testfile = subprocess.call("./test 'Bonjour le monde'" , shell=True) - with open("./testfile.in") as fh: - lines = fh.readlines() - global data - data = lines +TESTTEXT = 'Viele Grüße\n日本語\n' -def test_utf8(): +def create_testfiles(): + dummy = subprocess.run("./test '" + TESTTEXT + "'", shell=True) + +def test(path='', encoding=''): """ - Check UTF-8 encoding + Read the file at path using the specified encoding and check + whether the TESTTEXT can be read back correctly. """ + logging.info('Testing file %s using encoding %s', path, encoding) try: - conv8 = data[0].strip("\n").decode('utf-8') - conv16 = data[0].strip("\n").decode('utf-16') - if conv8 == ("Bonjour le monde") and conv16 != ("Bonjour le monde"): - logging.info("UTF-8 Conversion Test: SUCCESS") + with open(path, mode='rt', encoding=encoding) as testfile: + text = testfile.read() + logging.info('TESTTEXT="%s", text read ="%s"\n', TESTTEXT, text) + if text == TESTTEXT: + logging.info( + 'testfile: %s testencoding: %s Read test: SUCCESS', + path, encoding) else: - logging.error("UTF-8 Conversion Test: ERROR") + logging.info( + 'testfile: %s testencoding: %s Read test: ERROR', + path, encoding) except UnicodeError: logging.error("UTF-8 Conversion Test: UnicodeError") - -def test_utf_16(): - """ - Check UTF-16 encoding - """ - try: - conv16 = data[1].strip("\n").decode('utf-16') - conv8 = data[1].strip("\n").decode('utf-8') - if conv16 == ("Bonjour le monde") and conv8 != ("Bonjour le monde"): - logging.info("UTF-16 Conversion Test: SUCCESS") - else: - logging.error("UTF-16 Conversion Test: ERROR") - except UnicodeError: - logging.error("UTF-16 Conversion Test: UnicodeError") - -def test_utf_32(): - """ - Check UTF-32 encoding - """ - try: - conv8 = data[2].strip("\n").decode('utf-8') - conv16= data[2].strip("\n").decode('utf-16') - conv32 = data[2].strip("\n").decode('utf-32') - if conv32 == ("Bonjour le monde") and conv8 and conv16 != ("Bonjour le monde"): - logging.info("UTF-32 Conversion Test: SUCCESS") - else: - logging.error("UTF-32 Conversion Test: ERROR") - except UnicodeError: - logging.error("UTF-32 Conversion Test: UnicodeError") - -def del_testfile(): - try: - subprocess.call(['rm', '-rf', './testfile.in']) - except OSError as e: - logging.error("OSError\n") - if __name__ == "__main__": - del_testfile() - create_testfile() - test_utf8() - test_utf_16() - test_utf_32() - + if sys.byteorder == 'little': + endianness = 'le' + else: + endianness = 'be' + testfiles = { + 'testfile.utf-8': 'utf-8', + 'testfile.utf-16': 'utf-16' + endianness, + 'testfile.utf-32': 'utf-32' + endianness, + } + for testfile in testfiles: + if os.path.isfile(testfile): + os.unlink(testfile) + create_testfiles() + for testfile in testfiles: + test(path=testfile, encoding=testfiles[testfile]) diff --git a/tests/libunistring-tests/main.fmf b/tests/libunistring-tests/main.fmf new file mode 100644 index 0000000..124f572 --- /dev/null +++ b/tests/libunistring-tests/main.fmf @@ -0,0 +1,16 @@ +summary: Functional test for the gettext module +contact: Pooja Yadav +component: +- python +require: +- gcc +- make +- libunistring +- libunistring-devel +test: bash runtest.sh +framework: beakerlib +recommend: +- python +duration: 5m +extra-summary: /CoreOS/python/libunistring-tests +extra-task: /CoreOS/python/libunistring-tests diff --git a/tests/libunistring-tests/runtest.sh b/tests/libunistring-tests/runtest.sh old mode 100644 new mode 100755 index 64e85ac..7c38158 --- a/tests/libunistring-tests/runtest.sh +++ b/tests/libunistring-tests/runtest.sh @@ -27,14 +27,14 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Include Beaker environment -. /usr/bin/rhts-environment.sh -. /usr/lib/beakerlib/beakerlib.sh +. /usr/share/beakerlib/beakerlib.sh || exit 1 PACKAGE="libunistring" rlJournalStart rlPhaseStartSetup rlAssertRpm $PACKAGE + rlRun "gcc test.c -lunistring -o test" rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" rlRun "cp libunistring_test.py test $TmpDir" rlRun "pushd $TmpDir" diff --git a/tests/libunistring-tests/test.c b/tests/libunistring-tests/test.c index 5111d51..8186ed8 100644 --- a/tests/libunistring-tests/test.c +++ b/tests/libunistring-tests/test.c @@ -15,23 +15,24 @@ main (int argc, char **argv) } size_t len8, len16, len32; - const char newline = '\n'; - uint8_t *res8 = u8_conv_from_encoding ("ASCII", iconveh_question_mark, argv[1], strlen (argv[1]), NULL, NULL, &len8); - uint16_t *res16 = u16_conv_from_encoding ("ASCII", iconveh_question_mark, argv[1], strlen (argv[1]), NULL, NULL, &len16); - uint32_t *res32 = u32_conv_from_encoding ("ASCII", iconveh_question_mark, argv[1], strlen (argv[1]), NULL, NULL, &len32); - - int fd = open ("testfile.in", O_WRONLY | O_CREAT, S_IRUSR); + uint8_t *res8 = u8_conv_from_encoding ("UTF-8", iconveh_question_mark, argv[1], strlen (argv[1]), NULL, NULL, &len8); + uint16_t *res16 = u16_conv_from_encoding ("UTF-8", iconveh_question_mark, argv[1], strlen (argv[1]), NULL, NULL, &len16); + uint32_t *res32 = u32_conv_from_encoding ("UTF-8", iconveh_question_mark, argv[1], strlen (argv[1]), NULL, NULL, &len32); + int fd = open ("testfile.utf-8", O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); for (int i = 0; i < len8; i++) write (fd, &res8[i], sizeof (uint8_t)); - write (fd, &newline, 1); + close (fd); + + fd = open ("testfile.utf-16", O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); for (int i = 0; i < len16; i++) write (fd, &res16[i], sizeof (uint16_t)); - write (fd, &newline, 1); + close (fd); + + fd = open ("testfile.utf-32", O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); for (int i = 0; i < len32; i++) write (fd, &res32[i], sizeof (uint32_t)); - close (fd); } diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 1b4c3ec..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -# Tests for Atomic -- hosts: localhost - tags: - - atomic - roles: - - role: standard-test-beakerlib - tests: - - libunistring-tests - -# Tests for Classic and Container -- hosts: localhost - tags: - - classic - - container - roles: - - role: standard-test-beakerlib - tests: - - libunistring-tests - required_packages: - - libunistring - - libunistring-devel From 9c1c527bb3b8394d268a5a445aab52031068f2a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 12:37:46 +0000 Subject: [PATCH 31/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libunistring.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libunistring.spec b/libunistring.spec index 9b83e31..f5ec5f2 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.9.10 -Release: 13%{?dist} +Release: 14%{?dist} Name: libunistring Summary: GNU Unicode string library License: GPLv2+ or LGPLv3+ @@ -56,6 +56,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} __doc %ldconfig_scriptlets %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.9.10-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jun 21 2021 Mike FABIAN - 0.9.10-13 - Related rhbz#1938800: Fix CI tests and convert them to tmt From 910caf86b2becba3ac71802915549f658485519c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 17:30:17 +0000 Subject: [PATCH 32/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libunistring.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libunistring.spec b/libunistring.spec index f5ec5f2..4227672 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.9.10 -Release: 14%{?dist} +Release: 15%{?dist} Name: libunistring Summary: GNU Unicode string library License: GPLv2+ or LGPLv3+ @@ -56,6 +56,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} __doc %ldconfig_scriptlets %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.9.10-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 0.9.10-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From d9494a370fd9700ba1e8d9a8019b6aac53a0bc18 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Sun, 23 Jan 2022 10:12:55 +0100 Subject: [PATCH 33/45] Update to upstream 1.0 release Signed-off-by: Daiki Ueno --- .gitignore | 1 + fix-memory-leak-in-vasnprintf.patch | 85 ----------------------------- libunistring.spec | 12 ++-- sources | 2 +- 4 files changed, 9 insertions(+), 91 deletions(-) delete mode 100644 fix-memory-leak-in-vasnprintf.patch diff --git a/.gitignore b/.gitignore index 0fc702c..5ae8508 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ libunistring-0.9.3.tar.gz /libunistring-0.9.8.tar.xz /libunistring-0.9.9.tar.xz /libunistring-0.9.10.tar.xz +/libunistring-1.0.tar.xz diff --git a/fix-memory-leak-in-vasnprintf.patch b/fix-memory-leak-in-vasnprintf.patch deleted file mode 100644 index 66649ba..0000000 --- a/fix-memory-leak-in-vasnprintf.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff -ru libunistring-0.9.10/lib/vasnprintf.c libunistring-0.9.10.new/lib/vasnprintf.c ---- libunistring-0.9.10/lib/vasnprintf.c 2018-05-25 18:02:16.000000000 +0200 -+++ libunistring-0.9.10.new/lib/vasnprintf.c 2021-06-14 17:06:43.084948649 +0200 -@@ -1864,7 +1864,7 @@ - - /* Ensures that allocated >= needed. Aborts through a jump to - out_of_memory if needed is SIZE_MAX or otherwise too big. */ --#define ENSURE_ALLOCATION(needed) \ -+#define ENSURE_ALLOCATION_ELSE(needed, oom_statement) \ - if ((needed) > allocated) \ - { \ - size_t memory_size; \ -@@ -1875,17 +1875,19 @@ - allocated = (needed); \ - memory_size = xtimes (allocated, sizeof (DCHAR_T)); \ - if (size_overflow_p (memory_size)) \ -- goto out_of_memory; \ -+ oom_statement \ - if (result == resultbuf || result == NULL) \ - memory = (DCHAR_T *) malloc (memory_size); \ - else \ - memory = (DCHAR_T *) realloc (result, memory_size); \ - if (memory == NULL) \ -- goto out_of_memory; \ -+ oom_statement \ - if (result == resultbuf && length > 0) \ - DCHAR_CPY (memory, result, length); \ - result = memory; \ - } -+#define ENSURE_ALLOCATION(needed) \ -+ ENSURE_ALLOCATION_ELSE((needed), goto out_of_memory; ) - - for (cp = format, i = 0, dp = &d.dir[0]; ; cp = dp->dir_end, i++, dp++) - { -@@ -2137,7 +2139,8 @@ - } - if (converted != result + length) - { -- ENSURE_ALLOCATION (xsum (length, converted_len)); -+ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), -+ { free (converted); goto out_of_memory; }); - DCHAR_CPY (result + length, converted, converted_len); - free (converted); - } -@@ -2263,7 +2266,8 @@ - } - if (converted != result + length) - { -- ENSURE_ALLOCATION (xsum (length, converted_len)); -+ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), -+ { free (converted); goto out_of_memory; }); - DCHAR_CPY (result + length, converted, converted_len); - free (converted); - } -@@ -2389,7 +2393,8 @@ - } - if (converted != result + length) - { -- ENSURE_ALLOCATION (xsum (length, converted_len)); -+ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), -+ { free (converted); goto out_of_memory; }); - DCHAR_CPY (result + length, converted, converted_len); - free (converted); - } -@@ -2914,7 +2919,8 @@ - } - } - # else -- ENSURE_ALLOCATION (xsum (length, tmpdst_len)); -+ ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), -+ { free (tmpdst); goto out_of_memory; }); - DCHAR_CPY (result + length, tmpdst, tmpdst_len); - free (tmpdst); - length += tmpdst_len; -@@ -5368,7 +5374,8 @@ - errno = saved_errno; - return NULL; - } -- ENSURE_ALLOCATION (xsum (length, tmpdst_len)); -+ ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), -+ { free (tmpdst); goto out_of_memory; }); - DCHAR_CPY (result + length, tmpdst, tmpdst_len); - free (tmpdst); - count = tmpdst_len; -libunistring-0.9.10.new/lib のみに存在: vasnprintf.c.orig diff --git a/libunistring.spec b/libunistring.spec index 4227672..6fd44b1 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,12 +1,11 @@ # This spec file has been automatically updated -Version: 0.9.10 -Release: 15%{?dist} +Version: 1.0 +Release: 1%{?dist} Name: libunistring Summary: GNU Unicode string library License: GPLv2+ or LGPLv3+ URL: https://www.gnu.org/software/libunistring/ Source0: https://ftp.gnu.org/gnu/libunistring/%{name}-%{version}.tar.xz -Patch0: fix-memory-leak-in-vasnprintf.patch BuildRequires: gcc BuildRequires: make Provides: bundled(gnulib) @@ -26,8 +25,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Development files for programs using libunistring. %prep -%setup -q -%patch0 -p1 -b .fix-memory-leak-in-vasnprintf +%autosetup %build %configure --disable-static --disable-rpath @@ -56,6 +54,10 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} __doc %ldconfig_scriptlets %changelog +* Sun Jan 23 2022 Daiki Ueno - 1.0-1 +- Update to upstream 1.0 release +- Switch to %%autosetup + * Thu Jan 20 2022 Fedora Release Engineering - 0.9.10-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index fdd5713..ed526b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libunistring-0.9.10.tar.xz) = 01dcab6e05ea4c33572bf96cc0558bcffbfc0e62fc86410cef06c1597a0073d5750525fe2dee4fdb39c9bd704557fcbab864f9645958108a2e07950bc539fe54 +SHA512 (libunistring-1.0.tar.xz) = 70d5ad82722844dbeacdfcb4d7593358e4a00a9222a98537add4b7f0bf4a2bb503dfb3cd627e52e2a5ca1d3da9e5daf38a6bd521197f92002e11e715fb1662d1 From c7d985bd9b500dd65242a283e0fb294436e32ba8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 19:17:00 +0000 Subject: [PATCH 34/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libunistring.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libunistring.spec b/libunistring.spec index 6fd44b1..02d8878 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 1.0 -Release: 1%{?dist} +Release: 2%{?dist} Name: libunistring Summary: GNU Unicode string library License: GPLv2+ or LGPLv3+ @@ -54,6 +54,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} __doc %ldconfig_scriptlets %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sun Jan 23 2022 Daiki Ueno - 1.0-1 - Update to upstream 1.0 release - Switch to %%autosetup From 4ad603df196ffb19ac1fe7842ed9ab4619823f09 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 8 Dec 2022 16:46:11 +0900 Subject: [PATCH 35/45] Opt in to rpmautospec Signed-off-by: Daiki Ueno --- changelog | 127 ++++++++++++++++++++++++++++++++++++++++++++ libunistring.spec | 130 +--------------------------------------------- 2 files changed, 129 insertions(+), 128 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..9109fb1 --- /dev/null +++ b/changelog @@ -0,0 +1,127 @@ +* Thu Jul 21 2022 Fedora Release Engineering - 1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sun Jan 23 2022 Daiki Ueno - 1.0-1 +- Update to upstream 1.0 release +- Switch to %%autosetup + +* Thu Jan 20 2022 Fedora Release Engineering - 0.9.10-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 0.9.10-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jun 21 2021 Mike FABIAN - 0.9.10-13 +- Related rhbz#1938800: Fix CI tests and convert them to tmt + +* Mon Jun 14 2021 Mike FABIAN - 0.9.10-12 +- Fix memory leak in vasnprint. Resolves: rhbz#1938800 + (Backported from upstream: https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4d288a80bf7ebe29334b9805cdcc70eacb6059c1) +- Fix spelling in license GPLV2+ -> GPLv2+ + +* Tue Jan 26 2021 Fedora Release Engineering - 0.9.10-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.9.10-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 13 2020 Tom Stellard - 0.9.10-8 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + +* Wed Jan 29 2020 Fedora Release Engineering - 0.9.10-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 0.9.10-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 0.9.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jul 31 2018 Florian Weimer - 0.9.10-4 +- Rebuild with fixed binutils + +* Sat Jul 28 2018 Igor Gnatenko - 0.9.10-3 +- Replace obsolete scriptlets + +* Fri Jul 13 2018 Fedora Release Engineering - 0.9.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon May 28 2018 Daiki Ueno - 0.9.10-1 +- Update to upstream 0.9.10 release + +* Thu Mar 01 2018 Daiki Ueno - 0.9.9-1 +- Update to upstream 0.9.9 release + +* Wed Feb 07 2018 Fedora Release Engineering - 0.9.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Feb 03 2018 Igor Gnatenko - 0.9.8-2 +- Switch to %%ldconfig_scriptlets + +* Sat Dec 2 2017 Daiki Ueno - 0.9.8-1 +- Update to 0.9.8 + +* Thu Aug 03 2017 Fedora Release Engineering - 0.9.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0.9.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 17 2017 Daiki Ueno - 0.9.7-1 +- Update to 0.9.7 +- Update license to "GPLv2+ or LGPLv2+" + +* Wed Feb 01 2017 Stephen Gallagher - 0.9.4-4 +- Add missing %%license macro + +* Thu Feb 04 2016 Fedora Release Engineering - 0.9.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 0.9.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Sep 02 2014 Pádraig Brady - 0.9.4-1 +- Latest upstream + +* Sun Aug 17 2014 Fedora Release Engineering - 0.9.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.9.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Aug 29 2013 Pádraig Brady 0.9.3-9 +- Adjust to avoid duplicate docs caused by %%doc macro changes in Fedora 20 + +* Sat Aug 03 2013 Fedora Release Engineering - 0.9.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 0.9.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 0.9.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jun 26 2012 Akira TAGOH - 0.9.3-5 +- Fix a typo in %%preun. (#737638) + +* Tue May 15 2012 Mikolaj Izdebski - 0.9.3-4 +- Add bundled(gnulib) provides + +* Fri Jan 13 2012 Fedora Release Engineering - 0.9.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 0.9.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun May 23 2010 Pádraig Brady 0.9.3-1 +- Update to 0.9.3 + +* Thu Nov 19 2009 Pádraig Brady 0.9.1-3 +- Remove glibc-devel and texinfo build deps + +* Thu Nov 19 2009 Pádraig Brady 0.9.1-2 +- Changes as per initial review by panemade@gmail.com + +* Tue Nov 17 2009 Pádraig Brady 0.9.1-1 +- Initial version diff --git a/libunistring.spec b/libunistring.spec index 02d8878..c2efb75 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 1.0 -Release: 2%{?dist} +Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: libunistring Summary: GNU Unicode string library License: GPLv2+ or LGPLv3+ @@ -54,130 +54,4 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} __doc %ldconfig_scriptlets %changelog -* Thu Jul 21 2022 Fedora Release Engineering - 1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sun Jan 23 2022 Daiki Ueno - 1.0-1 -- Update to upstream 1.0 release -- Switch to %%autosetup - -* Thu Jan 20 2022 Fedora Release Engineering - 0.9.10-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 0.9.10-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jun 21 2021 Mike FABIAN - 0.9.10-13 -- Related rhbz#1938800: Fix CI tests and convert them to tmt - -* Mon Jun 14 2021 Mike FABIAN - 0.9.10-12 -- Fix memory leak in vasnprint. Resolves: rhbz#1938800 - (Backported from upstream: https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4d288a80bf7ebe29334b9805cdcc70eacb6059c1) -- Fix spelling in license GPLV2+ -> GPLv2+ - -* Tue Jan 26 2021 Fedora Release Engineering - 0.9.10-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0.9.10-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 13 2020 Tom Stellard - 0.9.10-8 -- Use make macros -- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro - -* Wed Jan 29 2020 Fedora Release Engineering - 0.9.10-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 0.9.10-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 0.9.10-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jul 31 2018 Florian Weimer - 0.9.10-4 -- Rebuild with fixed binutils - -* Sat Jul 28 2018 Igor Gnatenko - 0.9.10-3 -- Replace obsolete scriptlets - -* Fri Jul 13 2018 Fedora Release Engineering - 0.9.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon May 28 2018 Daiki Ueno - 0.9.10-1 -- Update to upstream 0.9.10 release - -* Thu Mar 01 2018 Daiki Ueno - 0.9.9-1 -- Update to upstream 0.9.9 release - -* Wed Feb 07 2018 Fedora Release Engineering - 0.9.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Feb 03 2018 Igor Gnatenko - 0.9.8-2 -- Switch to %%ldconfig_scriptlets - -* Sat Dec 2 2017 Daiki Ueno - 0.9.8-1 -- Update to 0.9.8 - -* Thu Aug 03 2017 Fedora Release Engineering - 0.9.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.9.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 17 2017 Daiki Ueno - 0.9.7-1 -- Update to 0.9.7 -- Update license to "GPLv2+ or LGPLv2+" - -* Wed Feb 01 2017 Stephen Gallagher - 0.9.4-4 -- Add missing %%license macro - -* Thu Feb 04 2016 Fedora Release Engineering - 0.9.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 0.9.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Sep 02 2014 Pádraig Brady - 0.9.4-1 -- Latest upstream - -* Sun Aug 17 2014 Fedora Release Engineering - 0.9.3-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.9.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Aug 29 2013 Pádraig Brady 0.9.3-9 -- Adjust to avoid duplicate docs caused by %%doc macro changes in Fedora 20 - -* Sat Aug 03 2013 Fedora Release Engineering - 0.9.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 0.9.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 19 2012 Fedora Release Engineering - 0.9.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jun 26 2012 Akira TAGOH - 0.9.3-5 -- Fix a typo in %%preun. (#737638) - -* Tue May 15 2012 Mikolaj Izdebski - 0.9.3-4 -- Add bundled(gnulib) provides - -* Fri Jan 13 2012 Fedora Release Engineering - 0.9.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 0.9.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sun May 23 2010 Pádraig Brady 0.9.3-1 -- Update to 0.9.3 - -* Thu Nov 19 2009 Pádraig Brady 0.9.1-3 -- Remove glibc-devel and texinfo build deps - -* Thu Nov 19 2009 Pádraig Brady 0.9.1-2 -- Changes as per initial review by panemade@gmail.com - -* Tue Nov 17 2009 Pádraig Brady 0.9.1-1 -- Initial version +%autochangelog From bb75ad2c78cd4fc9a6c6c2e4294fa1dd647e0a01 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 8 Dec 2022 16:44:46 +0900 Subject: [PATCH 36/45] Update to upstream 1.1 release Signed-off-by: Daiki Ueno --- .gitignore | 1 + libunistring.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5ae8508..9fba28f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ libunistring-0.9.3.tar.gz /libunistring-0.9.9.tar.xz /libunistring-0.9.10.tar.xz /libunistring-1.0.tar.xz +/libunistring-1.1.tar.xz diff --git a/libunistring.spec b/libunistring.spec index c2efb75..1a5e165 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 1.0 +Version: 1.1 Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: libunistring Summary: GNU Unicode string library diff --git a/sources b/sources index ed526b9..ec47161 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libunistring-1.0.tar.xz) = 70d5ad82722844dbeacdfcb4d7593358e4a00a9222a98537add4b7f0bf4a2bb503dfb3cd627e52e2a5ca1d3da9e5daf38a6bd521197f92002e11e715fb1662d1 +SHA512 (libunistring-1.1.tar.xz) = 01a4267bbd301ea5c389b17ee918ae5b7d645da8b2c6c6f0f004ff2dead9f8e50cda2c6047358890a5fceadc8820ffc5154879193b9bb8970f3fb1fea1f411d6 From 569de0fee30756499756408bb5f68c09b008c15c Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 8 Dec 2022 12:47:08 -0500 Subject: [PATCH 37/45] Specify the soname explicitly This will help prevent accidentally bumping the soname without being aware of it. Signed-off-by: Stephen Gallagher --- libunistring.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libunistring.spec b/libunistring.spec index 1a5e165..00755fc 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -41,7 +41,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} __doc %files %license COPYING COPYING.LIB %doc AUTHORS NEWS README -%{_libdir}/%{name}.so.* +%{_libdir}/%{name}.so.5* %files devel %doc HACKING DEPENDENCIES THANKS ChangeLog From 2a2fc12a7f5acd66671c4d5121716c5da675f066 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 17:42:12 +0000 Subject: [PATCH 38/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 3db58434d8f20b47f21f15e77803ac308854abe6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 12:24:01 +0000 Subject: [PATCH 39/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 40f872b7881a3c410b5dd9b7750418c60a01be2d Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Mon, 21 Aug 2023 11:51:11 +0530 Subject: [PATCH 40/45] Migrate to SPDX license expression --- libunistring.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libunistring.spec b/libunistring.spec index 00755fc..6174759 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -3,7 +3,7 @@ Version: 1.1 Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: libunistring Summary: GNU Unicode string library -License: GPLv2+ or LGPLv3+ +License: GPL-2.0-or-later OR LGPL-3.0-or-later URL: https://www.gnu.org/software/libunistring/ Source0: https://ftp.gnu.org/gnu/libunistring/%{name}-%{version}.tar.xz BuildRequires: gcc From 177b732caf1fb3f5671376ff9c4974e43c68ecfb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 05:36:53 +0000 Subject: [PATCH 41/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 914eb9ba61000fff78b78950a12fa552080884a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 03:50:12 +0000 Subject: [PATCH 42/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 1675915cffdf1600518c4161bfeec947aa3b7439 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 15:21:38 +0000 Subject: [PATCH 43/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From ef034919dc1c1a59732055bd9fa817c9c7c87bff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 20 Jan 2025 08:12:14 +0000 Subject: [PATCH 44/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From af99b2f9c3c0d9d47008ff9927eb941d3630eb3c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 20:30:36 +0000 Subject: [PATCH 45/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild