Skip to content

Commit e408bec

Browse files
Upgrade: recode version to 3.7.14 (#11514)
1 parent 34aae08 commit e408bec

6 files changed

Lines changed: 127 additions & 59 deletions
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
From 80516f601ce5f1cee44848615dffe4252f2d205f Mon Sep 17 00:00:00 2001
2+
From: Reuben Thomas <rrt@sc3d.org>
3+
Date: Fri, 17 Feb 2023 12:52:19 +0000
4+
Subject: [PATCH] src/task.c: only close input stream when we opened it (fix
5+
#48)
6+
7+
Thanks to Remi Collet for the bug report and fix.
8+
---
9+
src/task.c | 5 +++--
10+
1 file changed, 3 insertions(+), 2 deletions(-)
11+
12+
diff --git a/src/task.c b/src/task.c
13+
index 2977a03..e302858 100644
14+
--- a/src/task.c
15+
+++ b/src/task.c
16+
@@ -353,9 +353,10 @@ recode_perform_task (RECODE_TASK task)
17+
SUBTASK_RETURN (subtask);
18+
}
19+
20+
- /* Close the input file. */
21+
+ /* Close the input file when we opened it. */
22+
23+
- if (subtask->input.file)
24+
+ if (subtask->input.file && subtask->input.name &&
25+
+ subtask->input.name[0])
26+
fclose (subtask->input.file);
27+
}
28+
#endif
29+
--
30+
2.39.1
31+

SPECS-EXTENDED/recode/recode-3.7.1-Rename-coliding-hash-functions.patch

Lines changed: 0 additions & 40 deletions
This file was deleted.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
diff -ur a/lib/hash.h b/lib/hash.h
2+
--- a/lib/hash.h 2023-01-04 23:06:45.000000000 +0100
3+
+++ b/lib/hash.h 2023-01-17 13:04:05.200398680 +0100
4+
@@ -24,6 +24,11 @@
5+
#ifndef HASH_H_
6+
# define HASH_H_
7+
8+
+#define hash_lookup recode_hash_lookup
9+
+#define hash_delete recode_hash_delete
10+
+#define hash_free recode_hash_free
11+
+#define hash_insert recode_hash_insert
12+
+
13+
# include <stdio.h>
14+
15+
# ifdef __cplusplus
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"recode-3.7.7.tar.gz": "0946f63b706719e6aa74ea5c0c2276c265ca1ced2cb44e05f2b5654c0e7f38fb"
3+
"recode-3.7.14.tar.gz": "786aafd544851a2b13b0a377eac1500f820ce62615ccc2e630b501e7743b9f33"
44
}
5-
}
5+
}

SPECS-EXTENDED/recode/recode.spec

Lines changed: 77 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
Vendor: Microsoft Corporation
2-
Distribution: Azure Linux
31
Name: recode
4-
Version: 3.7.7
5-
Release: 2%{?dist}
2+
Version: 3.7.14
3+
Release: 7%{?dist}
64
Summary: Conversion between character sets and surfaces
75
# COPYING: GPLv3 text
86
# COPYING-LIB: LGPLv3 text
@@ -52,11 +50,15 @@ Summary: Conversion between character sets and surfaces
5250
# tests/Makefile.am: GPLv3+
5351
# tests/Makefile.in: FSFULLR and GPLv3+
5452
# tests/Recode.pyx: GPLv3+
55-
License: GPLv3+ and LGPLv3+ and BSD and OFSFDL
56-
URL: https://github.com/rrthomas/recode
57-
Source: %{url}/releases/download/v%{version}/recode-%{version}.tar.gz
58-
# Make internal hash function identifiers unique
59-
Patch0: recode-3.7.1-Rename-coliding-hash-functions.patch
53+
License: GPL-3.0-or-later AND LGPL-3.0-or-later AND BSD-2-Clause AND LicenseRef-OFSFDL
54+
Vendor: Microsoft Corporation
55+
Distribution: Azure Linux
56+
URL: https://github.com/rrthomas/recode
57+
Source: %{url}/releases/download/v%{version}/recode-%{version}.tar.gz
58+
Patch0: recode-3.7.13-Rename-coliding-hash-functions.patch
59+
# https://github.com/rrthomas/recode/issues/48
60+
Patch1: 0001-src-task.c-only-close-input-stream-when-we-opened-it.patch
61+
6062
BuildRequires: autoconf
6163
BuildRequires: automake
6264
BuildRequires: coreutils
@@ -70,6 +72,7 @@ BuildRequires: texinfo
7072
# Tests:
7173
BuildRequires: python3-Cython
7274
BuildRequires: python3-devel >= 3.7.5
75+
BuildRequires: python3-setuptools
7376

7477
%description
7578
The recode tool and library convert files between character sets and surfaces.
@@ -81,15 +84,14 @@ character or falls back on an approximations.
8184
%package devel
8285
Summary: Header files for development using recode library
8386
# Header files are LGPLv3+
84-
License: LGPLv3+
87+
License: LGPL-3.0-or-later
8588
Requires: %{name}%{?_isa} = %{version}-%{release}
8689

8790
%description devel
8891
This package provides the header files for a recode library.
8992

9093
%prep
91-
%setup -q
92-
%patch 0 -p1
94+
%autosetup -p1 -n %{name}-%{version}
9395
autoreconf -fi
9496

9597
%build
@@ -132,15 +134,74 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
132134
%{_includedir}/*
133135

134136
%changelog
135-
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 3.7.7-2
136-
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
137+
* Tue Dec 17 2024 Akhila Guruju <v-guakhila@microsoft.com> - 3.7.14-7
138+
- Initial Azure Linux import from Fedora 41 (license: MIT).
139+
- License verified.
140+
141+
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.14-6
142+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
143+
144+
* Wed Jul 17 2024 Miroslav Suchý <msuchy@redhat.com> - 3.7.14-5
145+
- convert license to SPDX
146+
147+
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.14-4
148+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
149+
150+
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.14-3
151+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
152+
153+
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.14-2
154+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
155+
156+
* Wed Feb 22 2023 Ondrej Pohorelsky <opohorel@redhat.com> - 3.7.14-1
157+
- 3.7.14 bump
158+
- Adds upstream patch to prevent double free
159+
- Require python3-setuptools unconditionaly
160+
- Resolves: rhbz#2170818, rhbz#2166136
161+
162+
* Tue Jan 17 2023 Ondrej Pohorelsky <opohorel@redhat.com> - 3.7.13-1
163+
- 3.7.13 bump
164+
- Resolves: rhbz#2158811
165+
166+
* Thu Oct 27 2022 Ondrej Pohorelsky <opohorel@redhat.com> - 3.7.12-3
167+
- Adds BuildRequire for Python 3.12
168+
169+
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.12-2
170+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
171+
172+
* Mon Feb 21 2022 Ondrej Pohorelsky <opohorel@redhat.com> - 3.7.12-1
173+
- 3.7.12 bump
174+
- Resolves: rhbz#2055897
175+
176+
* Tue Feb 08 2022 Ondrej Pohorelsky <opohorel@redhat.com> - 3.7.11-1
177+
- 3.7.11 bump
178+
- Resolves: rhbz#2043834
179+
180+
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.9-3
181+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
182+
183+
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.9-2
184+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
185+
186+
* Tue Jun 08 2021 Ondrej Pohorelsky <opohorel@redhat.com> - 3.7.9-1
187+
- 3.7.9 bump
188+
- Resolves: rhbz#1967383
189+
190+
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.8-2
191+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
192+
193+
* Thu Nov 12 2020 Ondrej Pohorelsky <opohorel@redhat.com> - 3.7.8-1
194+
- 3.7.8 bump
137195

138196
* Thu Jul 30 2020 Petr Pisar <ppisar@redhat.com> - 3.7.7-1
139197
- 3.7.7 bump
140198

141-
* Wed Jul 29 2020 Petr Pisar <ppisar@redhat.com> - 3.7.6-3
199+
* Wed Jul 29 2020 Petr Pisar <ppisar@redhat.com> - 3.7.6-4
142200
- Correct a description
143201

202+
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.6-3
203+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
204+
144205
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.6-2
145206
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
146207

@@ -327,3 +388,4 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
327388

328389
* Tue Nov 13 2001 Than Ngo <than@redhat.com> 3.6-1
329390
- initial RPM for 8.0
391+

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25733,8 +25733,8 @@
2573325733
"type": "other",
2573425734
"other": {
2573525735
"name": "recode",
25736-
"version": "3.7.7",
25737-
"downloadUrl": "https://github.com/rrthomas/recode/releases/download/v3.7.7/recode-3.7.7.tar.gz"
25736+
"version": "3.7.14",
25737+
"downloadUrl": "https://github.com/rrthomas/recode/releases/download/v3.7.14/recode-3.7.14.tar.gz"
2573825738
}
2573925739
}
2574025740
},

0 commit comments

Comments
 (0)