Compare commits
No commits in common. "c10s" and "c9s" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,3 +1 @@
|
||||
/foma-0fa48db.tar.gz
|
||||
/foma-b44022c.tar.gz
|
||||
/foma-dfe1ccb.tar.gz
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
Fix BOM_codes initializer
|
||||
|
||||
Future compilers will reject the current initializer:
|
||||
|
||||
io.c:1002:7: error: initialization of ‘char’ from ‘void *’ makes integer from pointer without a cast
|
||||
1002 | { NULL, 0, NULL },
|
||||
| ^~~~
|
||||
io.c:1002:16: error: initialization of ‘char’ from ‘void *’ makes integer from pointer without a cast
|
||||
1002 | { NULL, 0, NULL },
|
||||
| ^~~~
|
||||
io.c:996:26: warning: missing braces around initializer [-Wmissing-braces]
|
||||
996 | static BOM BOM_codes[] = {
|
||||
| ^
|
||||
io.c:996:26: warning: missing braces around initializer [-Wmissing-braces]
|
||||
|
||||
The reason is that NULL is usually a pointer constant, which is not a
|
||||
valid expression for a character.
|
||||
|
||||
Submitted upstream: <https://github.com/mhulden/foma/pull/151>
|
||||
|
||||
diff --git a/foma/io.c b/foma/io.c
|
||||
index 5f6644419080df49..8fcaecb9c113758a 100644
|
||||
--- a/foma/io.c
|
||||
+++ b/foma/io.c
|
||||
@@ -999,7 +999,7 @@ static BOM BOM_codes[] = {
|
||||
{ { 0x00, 0x00, 0xFE, 0xFF }, 4, "UTF-32BE" },
|
||||
{ { 0xFF, 0xFE }, 2, "UTF16-LE" },
|
||||
{ { 0xFE, 0xFF }, 2, "UTF16-BE" },
|
||||
- { NULL, 0, NULL },
|
||||
+ { { 0, } , 0, NULL },
|
||||
};
|
||||
|
||||
BOM *check_BOM(char *buffer) {
|
||||
59
foma.spec
59
foma.spec
@ -1,18 +1,18 @@
|
||||
# Upstream changed its licensing to ASL 2.0 after releasing 0.9.18.
|
||||
# I have decided to use the newest upstream code from September 2020 because
|
||||
# in addition to many other fixes it fixes the build on Fedora.
|
||||
%global commit0 dfe1ccb1055af99be0232a26520d247b5fe093bc
|
||||
%global commit0 b44022c7d9d347dc7392aabbf72c82e558767675
|
||||
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
|
||||
%global snapshotdate 20210601
|
||||
%global snapshotdate 20200928
|
||||
|
||||
%global libname libfoma
|
||||
|
||||
Name: foma
|
||||
Version: 0.10.0
|
||||
Version: 0.9.18
|
||||
Release: 0.13.%{snapshotdate}git%{shortcommit0}%{?dist}
|
||||
Summary: Xerox-compatible finite-state compiler
|
||||
|
||||
License: Apache-2.0
|
||||
License: ASL 2.0
|
||||
URL: https://github.com/mhulden/foma
|
||||
Source0: https://github.com/mhulden/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz
|
||||
|
||||
@ -26,8 +26,7 @@ Source0: https://github.com/mhulden/%{name}/archive/%{commit0}.tar.gz#/%{
|
||||
# the linker when building the shared library. For discussion on a similar
|
||||
# issue, see https://lists.debian.org/debian-devel/2016/05/msg00302.html
|
||||
Patch0: foma-harden-build-fedora.patch
|
||||
Patch1: foma-c99.patch
|
||||
Patch2: foma-avoid-deprecated-inet-functions.patch
|
||||
Patch1: foma-avoid-deprecated-inet-functions.patch
|
||||
|
||||
BuildRequires: gcc zlib-devel readline-devel flex bison
|
||||
BuildRequires: make
|
||||
@ -97,7 +96,7 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';'
|
||||
%license foma/COPYING
|
||||
%doc foma/README
|
||||
%{_libdir}/%{libname}.so.0
|
||||
%{_libdir}/%{libname}.so.0.10.0
|
||||
%{_libdir}/%{libname}.so.0.9.18
|
||||
|
||||
%files -n %{libname}-devel
|
||||
%{_includedir}/*.h
|
||||
@ -106,47 +105,15 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';'
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.10.0-0.13.20210601gitdfe1ccb
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
Resolves: RHEL-64018
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.9.18-0.13.20200928gitb44022c
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Thu Jul 11 2024 Mike FABIAN <mfabian@redhat.com> - 0.10.0-0.12.20210601gitdfe1ccb
|
||||
- Resolves: RHELMISC-6017 Add patch to avoid using deprecated inet_* functions.
|
||||
* Thu Jun 10 2021 Mike FABIAN <mfabian@redhat.com> - 0.9.18-0.12.20200928gitb44022c
|
||||
- Add patch to avoid using deprecated inet_* functions. Related: rhbz#1966963
|
||||
|
||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.10.0-0.11.20210601gitdfe1ccb
|
||||
- Bump release for June 2024 mass rebuild
|
||||
|
||||
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-0.10.20210601gitdfe1ccb
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-0.9.20210601gitdfe1ccb
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Thu Jan 04 2024 Florian Weimer <fweimer@redhat.com> - 0.10.0-0.8.20210601gitdfe1ccb
|
||||
- Fix C compatibility issue
|
||||
|
||||
* Mon Aug 21 2023 Parag Nemade <pnemade AT fedoraproject DOT org> - 0.10.0-0.7.20210601gitdfe1ccb
|
||||
- Migrate to SPDX license expression
|
||||
|
||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-0.6.20210601gitdfe1ccb
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-0.5.20210601gitdfe1ccb
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-0.4.20210601gitdfe1ccb
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-0.3.20210601gitdfe1ccb
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-0.2.20210601gitdfe1ccb
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Sun Jul 11 2021 Ville-Pekka Vainio <vpvainio AT iki.fi> - 0.10.0-0.1.20210601gitdfe1ccb
|
||||
- Upstream "release" 0.10.0
|
||||
- The release has not been made into a tarball yet
|
||||
- Fixes bugs, including segfaults, so I'm using the git checkout in Fedora
|
||||
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0.9.18-0.11.20200928gitb44022c
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18-0.10.20200928gitb44022c
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-10
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (foma-dfe1ccb.tar.gz) = aaaa53be9fabbc54ef3d20f2b72a0dbb24b835dfb13626f4cc2c50e0a073d4f1d23006c1999f0696ff5126e98b194ba30d40f61d3c95aac6ba96815482ebf993
|
||||
SHA512 (foma-b44022c.tar.gz) = da7e6c108843a521a348a2903cf357ac5b08501325f45accc45544edbc21edd2c3feef774fa8a0bd0e8e58ccaac3ad73a9446a7014eb8f44fd3ebe45ffd55b31
|
||||
|
||||
Loading…
Reference in New Issue
Block a user