From 58e85981d8e735ac7247ce4e6c0f0731f75a6fdf Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Mon, 14 Jun 2021 16:35:18 +0200 Subject: [PATCH 01/17] 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 02/17] 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 03/17] - 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 04/17] - 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 05/17] 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 06/17] 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 07/17] 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 08/17] 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 09/17] 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 10/17] 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 11/17] 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 12/17] 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 13/17] 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 14/17] 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 15/17] 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 16/17] 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 17/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild