From dad86b663bdabd8b2f259782251a35fa3926e336 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Dec 19 2013 19:13:17 +0000 Subject: Update to 4.3.9 - Fix build with -Werror=format-security --- diff --git a/.gitignore b/.gitignore index 2e4d317..6df191d 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ nco-4.0.2.tar.gz /nco-4.3.5.tar.gz /nco-4.3.6.tar.gz /nco-4.3.7.tar.gz +/nco-4.3.9.tar.gz diff --git a/nco-format.patch b/nco-format.patch new file mode 100644 index 0000000..9be00f7 --- /dev/null +++ b/nco-format.patch @@ -0,0 +1,12 @@ +diff -up nco-4.3.9/src/nco++/ncoGrammer.g.format nco-4.3.9/src/nco++/ncoGrammer.g +--- nco-4.3.9/src/nco++/ncoGrammer.g.format 2013-10-21 21:03:55.000000000 -0600 ++++ nco-4.3.9/src/nco++/ncoGrammer.g 2013-12-03 16:45:22.028754156 -0700 +@@ -1293,7 +1293,7 @@ static std::vector lpp_vtr; + prn_sng=strdup(pstr->getText().c_str()); + (void)sng_ascii_trn(prn_sng); + +- fprintf(stdout,prn_sng); ++ fprintf(stdout,"%s",prn_sng); + prn_sng=(char*)nco_free(prn_sng); + } + } diff --git a/nco.spec b/nco.spec index 3331962..c0aff59 100644 --- a/nco.spec +++ b/nco.spec @@ -1,6 +1,6 @@ Name: nco -Version: 4.3.7 -Release: 2%{?dist} +Version: 4.3.9 +Release: 1%{?dist} Summary: Suite of programs for manipulating NetCDF/HDF4 files Group: Applications/Engineering License: GPLv3 @@ -12,6 +12,9 @@ Patch0: nco-4.0.3-install_C_headers.patch #Patch out variables from in.cdl that earlier versioins of netcdf complain about Patch1: nco-4.0.5-fillvalue.patch %endif +# Fix build with -Werror=format-security +# https://bugzilla.redhat.com/show_bug.cgi?id=1037212 +Patch2: nco-format.patch BuildRequires: bison, flex, gawk BuildRequires: netcdf-devel @@ -64,6 +67,7 @@ This package contains the NCO static libs. %if 0%{?rhel} && 0%{?rhel} <= 5 %patch1 -p1 -b .fillvalue %endif +%patch2 -p1 -b .format %build %if 0%{?rhel} && 0%{?rhel} <= 5 @@ -121,6 +125,10 @@ fi %{_libdir}/libnco*.a %changelog +* Thu Dec 19 2013 Orion Poplawski 4.3.9-1 +- Update to 4.3.9 +- Fix build with -Werror=format-security + * Tue Oct 22 2013 Orion Poplawski 4.3.7-2 - No need to build docs - Drop BR version requirement for netcdf-devel, all up to date diff --git a/sources b/sources index 8edb581..3cf8c90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cb28d164dd3118690daadbdc7e952cce nco-4.3.7.tar.gz +8f50e8b3fcec77e568d48ba452b69c47 nco-4.3.9.tar.gz