-
Notifications
You must be signed in to change notification settings - Fork 561
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
81fb40a
commit 765baf8
Showing
6 changed files
with
125 additions
and
57 deletions.
There are no files selected for viewing
31 changes: 31 additions & 0 deletions
31
SPECS-EXTENDED/recode/0001-src-task.c-only-close-input-stream-when-we-opened-it.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
From 80516f601ce5f1cee44848615dffe4252f2d205f Mon Sep 17 00:00:00 2001 | ||
From: Reuben Thomas <[email protected]> | ||
Date: Fri, 17 Feb 2023 12:52:19 +0000 | ||
Subject: [PATCH] src/task.c: only close input stream when we opened it (fix | ||
#48) | ||
|
||
Thanks to Remi Collet for the bug report and fix. | ||
--- | ||
src/task.c | 5 +++-- | ||
1 file changed, 3 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/src/task.c b/src/task.c | ||
index 2977a03..e302858 100644 | ||
--- a/src/task.c | ||
+++ b/src/task.c | ||
@@ -353,9 +353,10 @@ recode_perform_task (RECODE_TASK task) | ||
SUBTASK_RETURN (subtask); | ||
} | ||
|
||
- /* Close the input file. */ | ||
+ /* Close the input file when we opened it. */ | ||
|
||
- if (subtask->input.file) | ||
+ if (subtask->input.file && subtask->input.name && | ||
+ subtask->input.name[0]) | ||
fclose (subtask->input.file); | ||
} | ||
#endif | ||
-- | ||
2.39.1 | ||
|
40 changes: 0 additions & 40 deletions
40
SPECS-EXTENDED/recode/recode-3.7.1-Rename-coliding-hash-functions.patch
This file was deleted.
Oops, something went wrong.
15 changes: 15 additions & 0 deletions
15
SPECS-EXTENDED/recode/recode-3.7.13-Rename-coliding-hash-functions.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
diff -ur a/lib/hash.h b/lib/hash.h | ||
--- a/lib/hash.h 2023-01-04 23:06:45.000000000 +0100 | ||
+++ b/lib/hash.h 2023-01-17 13:04:05.200398680 +0100 | ||
@@ -24,6 +24,11 @@ | ||
#ifndef HASH_H_ | ||
# define HASH_H_ | ||
|
||
+#define hash_lookup recode_hash_lookup | ||
+#define hash_delete recode_hash_delete | ||
+#define hash_free recode_hash_free | ||
+#define hash_insert recode_hash_insert | ||
+ | ||
# include <stdio.h> | ||
|
||
# ifdef __cplusplus |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
{ | ||
"Signatures": { | ||
"recode-3.7.7.tar.gz": "0946f63b706719e6aa74ea5c0c2276c265ca1ced2cb44e05f2b5654c0e7f38fb" | ||
"recode-3.7.14.tar.gz": "786aafd544851a2b13b0a377eac1500f820ce62615ccc2e630b501e7743b9f33" | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,6 @@ | ||
Vendor: Microsoft Corporation | ||
Distribution: Azure Linux | ||
Name: recode | ||
Version: 3.7.7 | ||
Release: 2%{?dist} | ||
Version: 3.7.14 | ||
Release: 7%{?dist} | ||
Summary: Conversion between character sets and surfaces | ||
# COPYING: GPLv3 text | ||
# COPYING-LIB: LGPLv3 text | ||
|
@@ -52,11 +50,16 @@ Summary: Conversion between character sets and surfaces | |
# tests/Makefile.am: GPLv3+ | ||
# tests/Makefile.in: FSFULLR and GPLv3+ | ||
# tests/Recode.pyx: GPLv3+ | ||
License: GPLv3+ and LGPLv3+ and BSD and OFSFDL | ||
License: GPL-3.0-or-later AND LGPL-3.0-or-later AND BSD-2-Clause AND LicenseRef-OFSFDL | ||
Vendor: Microsoft Corporation | ||
Distribution: Azure Linux | ||
URL: https://github.com/rrthomas/recode | ||
Source: %{url}/releases/download/v%{version}/recode-%{version}.tar.gz | ||
# Make internal hash function identifiers unique | ||
Patch0: recode-3.7.1-Rename-coliding-hash-functions.patch | ||
Patch: recode-3.7.13-Rename-coliding-hash-functions.patch | ||
# https://github.com/rrthomas/recode/issues/48 | ||
Patch: 0001-src-task.c-only-close-input-stream-when-we-opened-it.patch | ||
|
||
|
||
BuildRequires: autoconf | ||
BuildRequires: automake | ||
BuildRequires: coreutils | ||
|
@@ -70,6 +73,7 @@ BuildRequires: texinfo | |
# Tests: | ||
BuildRequires: python3-Cython | ||
BuildRequires: python3-devel >= 3.7.5 | ||
BuildRequires: python3-setuptools | ||
|
||
%description | ||
The recode tool and library convert files between character sets and surfaces. | ||
|
@@ -81,15 +85,14 @@ character or falls back on an approximations. | |
%package devel | ||
Summary: Header files for development using recode library | ||
# Header files are LGPLv3+ | ||
License: LGPLv3+ | ||
License: LGPL-3.0-or-later | ||
Requires: %{name}%{?_isa} = %{version}-%{release} | ||
|
||
%description devel | ||
This package provides the header files for a recode library. | ||
|
||
%prep | ||
%setup -q | ||
%patch 0 -p1 | ||
%autosetup -p1 -n %{name}-%{version} | ||
autoreconf -fi | ||
|
||
%build | ||
|
@@ -132,15 +135,74 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la | |
%{_includedir}/* | ||
|
||
%changelog | ||
* Fri Oct 15 2021 Pawel Winogrodzki <[email protected]> - 3.7.7-2 | ||
- Initial CBL-Mariner import from Fedora 32 (license: MIT). | ||
* Tue Dec 17 2024 Akhila Guruju <[email protected]> - 3.7.14-7 | ||
- Initial Azure Linux import from Fedora 41 (license: MIT). | ||
- License verified. | ||
|
||
* Fri Jul 19 2024 Fedora Release Engineering <[email protected]> - 3.7.14-6 | ||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild | ||
|
||
* Wed Jul 17 2024 Miroslav Suchý <[email protected]> - 3.7.14-5 | ||
- convert license to SPDX | ||
|
||
* Fri Jan 26 2024 Fedora Release Engineering <[email protected]> - 3.7.14-4 | ||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild | ||
|
||
* Mon Jan 22 2024 Fedora Release Engineering <[email protected]> - 3.7.14-3 | ||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild | ||
|
||
* Fri Jul 21 2023 Fedora Release Engineering <[email protected]> - 3.7.14-2 | ||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild | ||
|
||
* Wed Feb 22 2023 Ondrej Pohorelsky <[email protected]> - 3.7.14-1 | ||
- 3.7.14 bump | ||
- Adds upstream patch to prevent double free | ||
- Require python3-setuptools unconditionaly | ||
- Resolves: rhbz#2170818, rhbz#2166136 | ||
|
||
* Tue Jan 17 2023 Ondrej Pohorelsky <[email protected]> - 3.7.13-1 | ||
- 3.7.13 bump | ||
- Resolves: rhbz#2158811 | ||
|
||
* Thu Oct 27 2022 Ondrej Pohorelsky <[email protected]> - 3.7.12-3 | ||
- Adds BuildRequire for Python 3.12 | ||
|
||
* Sat Jul 23 2022 Fedora Release Engineering <[email protected]> - 3.7.12-2 | ||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild | ||
|
||
* Mon Feb 21 2022 Ondrej Pohorelsky <[email protected]> - 3.7.12-1 | ||
- 3.7.12 bump | ||
- Resolves: rhbz#2055897 | ||
|
||
* Tue Feb 08 2022 Ondrej Pohorelsky <[email protected]> - 3.7.11-1 | ||
- 3.7.11 bump | ||
- Resolves: rhbz#2043834 | ||
|
||
* Fri Jan 21 2022 Fedora Release Engineering <[email protected]> - 3.7.9-3 | ||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild | ||
|
||
* Fri Jul 23 2021 Fedora Release Engineering <[email protected]> - 3.7.9-2 | ||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild | ||
|
||
* Tue Jun 08 2021 Ondrej Pohorelsky <[email protected]> - 3.7.9-1 | ||
- 3.7.9 bump | ||
- Resolves: rhbz#1967383 | ||
|
||
* Wed Jan 27 2021 Fedora Release Engineering <[email protected]> - 3.7.8-2 | ||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild | ||
|
||
* Thu Nov 12 2020 Ondrej Pohorelsky <[email protected]> - 3.7.8-1 | ||
- 3.7.8 bump | ||
|
||
* Thu Jul 30 2020 Petr Pisar <[email protected]> - 3.7.7-1 | ||
- 3.7.7 bump | ||
|
||
* Wed Jul 29 2020 Petr Pisar <[email protected]> - 3.7.6-3 | ||
* Wed Jul 29 2020 Petr Pisar <[email protected]> - 3.7.6-4 | ||
- Correct a description | ||
|
||
* Wed Jul 29 2020 Fedora Release Engineering <[email protected]> - 3.7.6-3 | ||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild | ||
|
||
* Thu Jan 30 2020 Fedora Release Engineering <[email protected]> - 3.7.6-2 | ||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters