diff --git a/.gitignore b/.gitignore index d88a1a1..de49294 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,6 @@ wgrib.c.v1.8.1.0b /wgrib.c.v1.8.1.2b /wgrib.c.v1.8.1.2c /wgrib.c.v1.8.2 +/wgrib.c.v1.8.3 +/wgrib.c.v1.8.4 +/wgrib.c.v1.8.5 diff --git a/Changes b/Changes index 8e4ffa3..ea4f58a 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,6 @@ +v1.8.3 5/23 ECMWF introduced a new ec_stream (1122). This stream uses the same + convention as 1033 and 1035 for denoting the perturbation number. + thanks S Villaume (ECMWF) v1.8.2 3/17 old code only checked grib header (Sec 0) to find grib message, assumed grib message is valid. new code will reject grib message (no error message) if the message wants to be bigger than the message length. This fixes diff --git a/changelog b/changelog new file mode 100644 index 0000000..1bb1529 --- /dev/null +++ b/changelog @@ -0,0 +1,174 @@ +* Fri Jul 17 2026 Fedora Release Engineering - 1.8.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 1.8.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 1.8.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 1.8.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Sep 19 2024 Orion Poplawski - 1.8.5-4 +- Use SPDX license tag + +* Sat Jul 20 2024 Fedora Release Engineering - 1.8.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 1.8.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Sep 11 2023 Orion Poplawski - 1.8.5-1 +- Update to 1.8.5 + +* Mon Sep 11 2023 Orion Poplawski - 1.8.4-1 +- Update to 1.8.4 + +* Sat Jul 22 2023 Fedora Release Engineering - 1.8.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jun 02 2023 Orion Poplawski - 1.8.3-2 +- Add ldflags to build for proper hardening + +* Fri May 26 2023 Orion Poplawski - 1.8.3-1 +- Update to 1.8.3 + +* Fri Feb 17 2023 Florian Weimer - 1.8.2-10 +- Add missing #include for C99 compatibility + +* Sat Jan 21 2023 Fedora Release Engineering - 1.8.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.8.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 1.8.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.8.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 1.8.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.8.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 1.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 1.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Apr 9 2019 Orion Poplawski - 1.8.2-1 +- Update to 1.8.2 + +* Sun Feb 03 2019 Fedora Release Engineering - 1.8.1.2c-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 20 2018 Orion Poplawski - 1.8.1.2c-11 +- Add BR gcc + +* Sat Jul 14 2018 Fedora Release Engineering - 1.8.1.2c-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.8.1.2c-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 1.8.1.2c-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.8.1.2c-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.8.1.2c-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 1.8.1.2c-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.8.1.2c-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 1.8.1.2c-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 1.8.1.2c-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Nov 15 2013 - Orion Poplawski - 1.8.1.2c-1 +- Update to 1.8.1.2c + +* Wed Oct 16 2013 - Orion Poplawski - 1.8.1.2b-1 +- Update to 1.8.1.2b + +* Sun Aug 04 2013 Fedora Release Engineering - 1.8.1.2a-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 1.8.1.2a-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 1.8.1.2a-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 1.8.1.2a-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Jul 29 2011 - Orion Poplawski - 1.8.1.2a-1 +- Update to 1.8.1.2a + +* Thu May 26 2011 - Orion Poplawski - 1.8.1.0h-1 +- Update to 1.8.1.0h + +* Mon Feb 07 2011 Fedora Release Engineering - 1.8.1.0d-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Oct 2 2010 - Orion Poplawski - 1.8.1.0d-1 +- Update to 1.8.1.0d + +* Mon May 17 2010 - Orion Poplawski - 1.8.1.0b-1 +- Update to 1.8.1.0b + +* Tue Mar 30 2010 - Orion Poplawski - 1.8.0.13f-1 +- Update to 1.8.0.13f + +* Wed Feb 24 2010 - Orion Poplawski - 1.8.0.13e-1 +- Update to 1.8.0.13e + +* Thu Sep 24 2009 - Orion Poplawski - 1.8.0.13d-1 +- Update to 1.8.0.13d + +* Mon Aug 24 2009 - Orion Poplawski - 1.8.0.13b-1 +- Update to 1.8.0.13b + +* Mon Jul 27 2009 Fedora Release Engineering - 1.8.0.12u-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 1.8.0.12u-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Sep 4 2008 - Orion Poplawski - 1.8.0.12u-1 +- Update to 1.8.0.12u + +* Fri Feb 8 2008 - Orion Poplawski - 1.8.0.12q-1 +- Update to 1.8.0.12q + +* Thu Aug 23 2007 - Orion Poplawski - 1.8.0.12o-2 +- Rebuild for BuildID + +* Wed Aug 8 2007 - Orion Poplawski - 1.8.0.12o-1 +- Update to 1.8.0.12o + +* Tue Dec 5 2006 - Orion Poplawski - 1.8.0.12g-2 +- Compile testbin with -lm, needed on x86_64 + +* Fri Nov 17 2006 - Orion Poplawski - 1.8.0.12g-1 +- Update to 1.8.0.12g +- Ship testbin.c, testbin.f, and lang.grb for local testing + +* Thu Nov 16 2006 - Orion Poplawski - 1.8.0.12b-2 +- Add check + +* Wed Nov 15 2006 - Orion Poplawski - 1.8.0.12b-1 +- Initial version diff --git a/sources b/sources index 504f991..191b22c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wgrib.c.v1.8.2) = 021fbdea44f9deb6bd91684234cf1e448bb6eae9f5d641ca8face822ba5b8263948c29086f04345892dac6bf4602bba20f8d4b19783778ebce1e8f6d5629ccc4 +SHA512 (wgrib.c.v1.8.5) = c7c851e608fb46e467d68540dab03d5991f6f20129d3c70075c9eb4ea1fd0a0101fe56b9358a0e96c869e4dc65c28c5e07dd1bf81b745ab369fa3ea957a380be diff --git a/testbin.c.patch b/testbin.c.patch deleted file mode 100644 index fa881c3..0000000 --- a/testbin.c.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- testbin.c.orig 2006-11-16 11:30:23.000000000 -0700 -+++ testbin.c 2006-11-16 11:29:49.000000000 -0700 -@@ -55,4 +55,5 @@ - if (j % dy == 0) putchar('\n'); - } - printf("should see continents -- if you do, it works\n"); -+ exit(0); - } diff --git a/wgrib-c99.patch b/wgrib-c99.patch new file mode 100644 index 0000000..5121d8c --- /dev/null +++ b/wgrib-c99.patch @@ -0,0 +1,20 @@ +diff -up ./testbin.c.c99 ./testbin.c +--- ./testbin.c.c99 2023-05-25 20:35:37.836859284 -0600 ++++ ./testbin.c 2023-05-25 20:41:27.615727850 -0600 +@@ -1,3 +1,4 @@ ++#include + #include + #include + #define nx 192 +diff -up ./testbin.c.c99 ./testbin.c +--- ./testbin.c.c99 2023-05-25 20:44:31.571380482 -0600 ++++ ./testbin.c 2023-05-25 20:45:41.341058038 -0600 +@@ -9,7 +9,7 @@ + /* if the default integer is 16 bit then */ + /* #define INT long int */ + +-void main() { ++int main() { + FILE *in; + float land[nx]; + INT header; diff --git a/wgrib.spec b/wgrib.spec index 14cb94c..60a8a67 100644 --- a/wgrib.spec +++ b/wgrib.spec @@ -1,27 +1,29 @@ Name: wgrib -Version: 1.8.2 -Release: 4%{?dist} +Version: 1.8.5 +Release: %autorelease Summary: Manipulate, inventory and decode GRIB files -License: Public Domain -URL: http://www.cpc.ncep.noaa.gov/products/wesley/wgrib.html -Source0: ftp://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/wgrib.c.v%{version} -Source1: ftp://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/Changes -Source2: ftp://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/NOTICE -Source3: ftp://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/double_prec.txt -Source4: ftp://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/formats.txt -Source5: ftp://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/formats_update.txt -Source6: ftp://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/grib2ieee.txt -Source7: ftp://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/misc.txt -Source8: ftp://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/porting.txt -Source9: ftp://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/usertables.txt -Source10: ftp://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/tricks.wgrib -Source11: ftp://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/land.grb -Source12: ftp://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/testbin.c -Source13: ftp://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/testbin.f +License: LicenseRef-Fedora-Public-Domain +URL: https://www.cpc.ncep.noaa.gov/products/wesley/wgrib.html +Source0: https://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/wgrib.c.v%{version} +Source1: https://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/Changes +Source2: https://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/NOTICE +Source3: https://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/double_prec.txt +Source4: https://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/formats.txt +Source5: https://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/formats_update.txt +Source6: https://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/grib2ieee.txt +Source7: https://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/misc.txt +Source8: https://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/porting.txt +Source9: https://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/usertables.txt +Source10: https://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/tricks.wgrib +Source11: https://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/land.grb +Source12: https://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/testbin.c +Source13: https://ftp.cpc.ncep.noaa.gov/wd51we/wgrib/testbin.f Source14: testbin.out -Patch1: testbin.c.patch +# Include and set int return for main() for C99 compliance +Patch0: wgrib-c99.patch BuildRequires: gcc +ExcludeArch: %{ix86} %description @@ -44,22 +46,21 @@ cp %SOURCE10 . cp %SOURCE11 . cp %SOURCE12 . cp %SOURCE13 . -%patch1 -p0 +%patch -P0 -p0 -b .c99 %build -gcc $RPM_OPT_FLAGS -o wgrib wgrib.c +gcc %{build_cflags} %{build_ldflags} -o wgrib wgrib.c %install -rm -rf $RPM_BUILD_ROOT install -d -m 755 $RPM_BUILD_ROOT%{_bindir} install -m 755 wgrib $RPM_BUILD_ROOT%{_bindir}/ %check ./wgrib land.grb -d 1 -gcc $RPM_OPT_FLAGS -o testbin testbin.c -lm +gcc %{build_cflags} %{build_ldflags} -o testbin testbin.c -lm ./testbin > testbin.out && diff %SOURCE14 testbin.out @@ -70,123 +71,4 @@ gcc $RPM_OPT_FLAGS -o testbin testbin.c -lm %changelog -* Wed Jul 29 2020 Fedora Release Engineering - 1.8.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 1.8.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 1.8.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Apr 9 2019 Orion Poplawski - 1.8.2-1 -- Update to 1.8.2 - -* Sun Feb 03 2019 Fedora Release Engineering - 1.8.1.2c-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 20 2018 Orion Poplawski - 1.8.1.2c-11 -- Add BR gcc - -* Sat Jul 14 2018 Fedora Release Engineering - 1.8.1.2c-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.8.1.2c-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.8.1.2c-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.8.1.2c-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.8.1.2c-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 1.8.1.2c-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.8.1.2c-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 1.8.1.2c-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.8.1.2c-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Nov 15 2013 - Orion Poplawski - 1.8.1.2c-1 -- Update to 1.8.1.2c - -* Wed Oct 16 2013 - Orion Poplawski - 1.8.1.2b-1 -- Update to 1.8.1.2b - -* Sun Aug 04 2013 Fedora Release Engineering - 1.8.1.2a-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 1.8.1.2a-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 1.8.1.2a-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 1.8.1.2a-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Jul 29 2011 - Orion Poplawski - 1.8.1.2a-1 -- Update to 1.8.1.2a - -* Thu May 26 2011 - Orion Poplawski - 1.8.1.0h-1 -- Update to 1.8.1.0h - -* Mon Feb 07 2011 Fedora Release Engineering - 1.8.1.0d-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Oct 2 2010 - Orion Poplawski - 1.8.1.0d-1 -- Update to 1.8.1.0d - -* Mon May 17 2010 - Orion Poplawski - 1.8.1.0b-1 -- Update to 1.8.1.0b - -* Tue Mar 30 2010 - Orion Poplawski - 1.8.0.13f-1 -- Update to 1.8.0.13f - -* Wed Feb 24 2010 - Orion Poplawski - 1.8.0.13e-1 -- Update to 1.8.0.13e - -* Thu Sep 24 2009 - Orion Poplawski - 1.8.0.13d-1 -- Update to 1.8.0.13d - -* Mon Aug 24 2009 - Orion Poplawski - 1.8.0.13b-1 -- Update to 1.8.0.13b - -* Mon Jul 27 2009 Fedora Release Engineering - 1.8.0.12u-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 1.8.0.12u-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Sep 4 2008 - Orion Poplawski - 1.8.0.12u-1 -- Update to 1.8.0.12u - -* Fri Feb 8 2008 - Orion Poplawski - 1.8.0.12q-1 -- Update to 1.8.0.12q - -* Thu Aug 23 2007 - Orion Poplawski - 1.8.0.12o-2 -- Rebuild for BuildID - -* Wed Aug 8 2007 - Orion Poplawski - 1.8.0.12o-1 -- Update to 1.8.0.12o - -* Tue Dec 5 2006 - Orion Poplawski - 1.8.0.12g-2 -- Compile testbin with -lm, needed on x86_64 - -* Fri Nov 17 2006 - Orion Poplawski - 1.8.0.12g-1 -- Update to 1.8.0.12g -- Ship testbin.c, testbin.f, and lang.grb for local testing - -* Thu Nov 16 2006 - Orion Poplawski - 1.8.0.12b-2 -- Add check - -* Wed Nov 15 2006 - Orion Poplawski - 1.8.0.12b-1 -- Initial version +%autochangelog