Hello community, here is the log from the commit of package netcdf for openSUSE:Factory checked in at 2013-05-16 16:14:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netcdf (Old) and /work/SRC/openSUSE:Factory/.netcdf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netcdf" Changes: -------- --- /work/SRC/openSUSE:Factory/netcdf/netcdf.changes 2012-07-30 09:26:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.netcdf.new/netcdf.changes 2013-05-16 16:14:28.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Oct 16 13:21:13 CEST 2012 - p...@suse.de + +- Copy Changes from the release notes to here for the updates to 4.2.1 + and 4.2.1.1 + +------------------------------------------------------------------- +Sun Aug 5 13:09:20 UTC 2012 - ocef...@gmail.com + +- Update to 4.2.1.1: + * Fix DAP performance bug remotely accessing large files (> 2GiB). + * Properly escape special characters in CDL output from ncdump for + netCDF-4 string data. + +------------------------------------------------------------------- @@ -4,3 +18,10 @@ -- Update to 4.2.1 -- Rebase pkgconfig patch -- Drop fflags patch, upstream now calls nf-config +- Update to 4.2.1: + * Add a specific NC_MMAP mode flag to modify behavior of NC_DISKLESS. + * Changed the file protections for NC_DISKLESS created files to 0666. + * Fixed ncdump to report error when an unsupported option is specified. + * Fixed documentation of CDL char constants in Users Guide and ncgen + man page. + * Fixed memory leak detected by valgrind in one of the HDF5 tests. + + For further changes pleaase see the file RELEASE_NOTES in + /usr/share/doc/packages/netcdf Old: ---- netcdf-4.2.1.tar.bz2 New: ---- netcdf-4.2.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netcdf.spec ++++++ --- /var/tmp/diff_new_pack.ZOhHyz/_old 2013-05-16 16:14:29.000000000 +0200 +++ /var/tmp/diff_new_pack.ZOhHyz/_new 2013-05-16 16:14:29.000000000 +0200 @@ -22,7 +22,7 @@ Summary: Libraries for the Unidata network Common Data Form License: SUSE-NetCDF Group: System/Libraries -Version: 4.2.1 +Version: 4.2.1.1 Release: 0 Url: http://www.unidata.ucar.edu/software/netcdf/ Source: %{name}-%{version}.tar.bz2 ++++++ netcdf-4.2.1.tar.bz2 -> netcdf-4.2.1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netcdf-4.2.1/INSTALL new/netcdf-4.2.1.1/INSTALL --- old/netcdf-4.2.1/INSTALL 2012-07-19 13:47:22.000000000 +0200 +++ new/netcdf-4.2.1.1/INSTALL 2012-08-03 22:12:23.000000000 +0200 @@ -2,7 +2,7 @@ ********************************************* This document is for getting and building the netCDF C library and -utilities, version 4.2.1. Other libraries that depend on the netCDF C +utilities, version 4.2.1.1. Other libraries that depend on the netCDF C library, such as the Fortran and C++ libraries, are available as separate distributions that can be built and installed after the C library is successfully installed. The netCDF-Java library is also a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netcdf-4.2.1/RELEASE_NOTES new/netcdf-4.2.1.1/RELEASE_NOTES --- old/netcdf-4.2.1/RELEASE_NOTES 2012-07-19 13:47:22.000000000 +0200 +++ new/netcdf-4.2.1.1/RELEASE_NOTES 2012-08-03 22:12:23.000000000 +0200 @@ -6,6 +6,15 @@ VERSION COMMENTS ------- -------- +4.2.1.1 Released 2012-08-03 + + Patched libdap2/ncdap3.c to fix DAP performance bug + remotely accessing large files (> 2GiB). + + Patched ncdump/dumplib.c to properly escape special + characters in CDL output from ncdump for netCDF-4 + string data. + 4.2.1 Released 2012-07-18 Added a specific NC_MMAP mode flag to modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netcdf-4.2.1/configure new/netcdf-4.2.1.1/configure --- old/netcdf-4.2.1/configure 2012-07-19 13:47:30.000000000 +0200 +++ new/netcdf-4.2.1.1/configure 2012-08-03 22:12:31.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Id: configure.ac,v 1.450 2010/05/28 19:42:47 dmh Exp . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for netCDF 4.2.1. +# Generated by GNU Autoconf 2.68 for netCDF 4.2.1.1. # # Report bugs to <support-net...@unidata.ucar.edu>. # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='netCDF' PACKAGE_TARNAME='netcdf' -PACKAGE_VERSION='4.2.1' -PACKAGE_STRING='netCDF 4.2.1' +PACKAGE_VERSION='4.2.1.1' +PACKAGE_STRING='netCDF 4.2.1.1' PACKAGE_BUGREPORT='support-net...@unidata.ucar.edu' PACKAGE_URL='' @@ -1410,7 +1410,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures netCDF 4.2.1 to adapt to many kinds of systems. +\`configure' configures netCDF 4.2.1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1481,7 +1481,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of netCDF 4.2.1:";; + short | recursive ) echo "Configuration of netCDF 4.2.1.1:";; esac cat <<\_ACEOF @@ -1666,7 +1666,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -netCDF configure 4.2.1 +netCDF configure 4.2.1.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2370,7 +2370,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by netCDF $as_me 4.2.1, which was +It was created by netCDF $as_me 4.2.1.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2724,11 +2724,11 @@ # Create the VERSION file, which contains the package version from # AC_INIT. -echo -n 4.2.1>VERSION +echo -n 4.2.1.1>VERSION -{ $as_echo "$as_me:${as_lineno-$LINENO}: netCDF 4.2.1" >&5 -$as_echo "$as_me: netCDF 4.2.1" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: netCDF 4.2.1.1" >&5 +$as_echo "$as_me: netCDF 4.2.1.1" >&6;} # Keep libtool macros in an m4 directory. @@ -3318,7 +3318,7 @@ # Define the identity of the package. PACKAGE='netcdf' - VERSION='4.2.1' + VERSION='4.2.1.1' cat >>confdefs.h <<_ACEOF @@ -17585,7 +17585,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by netCDF $as_me 4.2.1, which was +This file was extended by netCDF $as_me 4.2.1.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17651,7 +17651,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -netCDF config.status 4.2.1 +netCDF config.status 4.2.1.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netcdf-4.2.1/configure.ac new/netcdf-4.2.1.1/configure.ac --- old/netcdf-4.2.1/configure.ac 2012-07-19 13:47:22.000000000 +0200 +++ new/netcdf-4.2.1.1/configure.ac 2012-08-03 22:12:23.000000000 +0200 @@ -15,7 +15,7 @@ AC_PREREQ([2.59]) # Initialize with name, version, and support email address. -AC_INIT([netCDF], [4.2.1], [support-net...@unidata.ucar.edu]) +AC_INIT([netCDF], [4.2.1.1], [support-net...@unidata.ucar.edu]) # Create the VERSION file, which contains the package version from # AC_INIT. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netcdf-4.2.1/libdap2/ncdap3.c new/netcdf-4.2.1.1/libdap2/ncdap3.c --- old/netcdf-4.2.1/libdap2/ncdap3.c 2012-07-19 13:47:22.000000000 +0200 +++ new/netcdf-4.2.1.1/libdap2/ncdap3.c 2012-08-03 22:12:23.000000000 +0200 @@ -326,7 +326,7 @@ if(ncstatus != NC_NOERR) return THROW(ncstatus); dapcomm = (NCDAPCOMMON*)drno->dispatchdata; - ncstatus = nc_close(drno->substrate); + ncstatus = nc_abort(drno->substrate); /* remove ourselves from NClist */ del_from_NCList(drno); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netcdf-4.2.1/libdap2/ncdap3a.c new/netcdf-4.2.1.1/libdap2/ncdap3a.c --- old/netcdf-4.2.1/libdap2/ncdap3a.c 2012-07-19 13:47:22.000000000 +0200 +++ new/netcdf-4.2.1.1/libdap2/ncdap3a.c 2012-08-03 22:12:23.000000000 +0200 @@ -427,7 +427,7 @@ NClist* path = NULL; CDFnode* var = NULL; - ASSERT(seq->nctype = NC_Sequence); + ASSERT(seq->nctype == NC_Sequence); computeseqcountconstraints3r(dapcomm,seq,&var); ASSERT((var != NULL)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netcdf-4.2.1/man4/install.doc new/netcdf-4.2.1.1/man4/install.doc --- old/netcdf-4.2.1/man4/install.doc 2012-07-19 13:47:17.000000000 +0200 +++ new/netcdf-4.2.1.1/man4/install.doc 2012-08-03 22:12:20.000000000 +0200 @@ -2,7 +2,7 @@ Documentation for getting and building netCDF This document is for getting and building the netCDF C library and -utilities, version 4.2.1. Other libraries that depend on the netCDF C +utilities, version 4.2.1.1. Other libraries that depend on the netCDF C library, such as the Fortran and C++ libraries, are available as separate distributions that can be built and installed after the C library is successfully installed. The netCDF-Java library is also a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netcdf-4.2.1/ncdump/dumplib.c new/netcdf-4.2.1.1/ncdump/dumplib.c --- old/netcdf-4.2.1/ncdump/dumplib.c 2012-07-19 13:47:20.000000000 +0200 +++ new/netcdf-4.2.1.1/ncdump/dumplib.c 2012-08-03 22:12:22.000000000 +0200 @@ -934,11 +934,66 @@ size_t slen; char *sout; int res; + int iel; + const char *cp; + char *sp; + unsigned char uc; - slen = 3 + strlen(((char **)valp)[0]); /* need "'s around string */ + cp = ((char **)valp)[0]; + slen = 3 + 5 * strlen(cp); /* need "'s around string, and extra space to escape control characters */ sout = emalloc(slen); - res = snprintf(sout, slen, "\"%s\"", ((char **)valp)[0]); - assert(res > 0); + sp = sout; + *sp++ = '"' ; + while(*cp) { + switch (uc = *cp++ & 0377) { + case '\b': + *sp++ = '\\'; + *sp++ = 'b' ; + break; + case '\f': + *sp++ = '\\'; + *sp++ = 'f'; + break; + case '\n': + *sp++ = '\\'; + *sp++ = 'n'; + break; + case '\r': + *sp++ = '\\'; + *sp++ = 'r'; + break; + case '\t': + *sp++ = '\\'; + *sp++ = 't'; + break; + case '\v': + *sp++ = '\\'; + *sp++ = 'n'; + break; + case '\\': + *sp++ = '\\'; + *sp++ = '\\'; + break; + case '\'': + *sp++ = '\\'; + *sp++ = '\''; + break; + case '\"': + *sp++ = '\\'; + *sp++ = '\"'; + break; + default: + if (iscntrl(uc)) { + snprintf(sp,3,"\\%03o",uc); + sp += 4; + } + else + *sp++ = uc; + break; + } + } + *sp++ = '"' ; + *sp++ = '\0' ; sbuf_cpy(sfbf, sout); free(sout); return sbuf_len(sfbf); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netcdf-4.2.1/ncdump/ref_tst_string_data.cdl new/netcdf-4.2.1.1/ncdump/ref_tst_string_data.cdl --- old/netcdf-4.2.1/ncdump/ref_tst_string_data.cdl 2012-07-19 13:47:20.000000000 +0200 +++ new/netcdf-4.2.1.1/ncdump/ref_tst_string_data.cdl 2012-08-03 22:12:22.000000000 +0200 @@ -7,5 +7,5 @@ data: description = "first string", "second string", "third string", _, - "last string" ; + "last \n\"string\"" ; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netcdf-4.2.1/ncdump/tst_string_data.c new/netcdf-4.2.1.1/ncdump/tst_string_data.c --- old/netcdf-4.2.1/ncdump/tst_string_data.c 2012-07-19 13:47:20.000000000 +0200 +++ new/netcdf-4.2.1.1/ncdump/tst_string_data.c 2012-08-03 22:12:22.000000000 +0200 @@ -30,7 +30,7 @@ int var_dims[VAR4_RANK]; const char *desc_data[DIM4_LEN] = { - "first string", "second string", "third string", "", "last string" + "first string", "second string", "third string", "", "last \n\"string\"" }; const char *missing_val[ATT4_LEN] = {""}; char *strings_in[DIM4_LEN]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netcdf-4.2.1/nctest/Makefile.am new/netcdf-4.2.1.1/nctest/Makefile.am --- old/netcdf-4.2.1/nctest/Makefile.am 2012-07-19 13:47:21.000000000 +0200 +++ new/netcdf-4.2.1.1/nctest/Makefile.am 2012-08-03 22:12:22.000000000 +0200 @@ -16,7 +16,7 @@ # generated in a pressurized chamber that exactly simulated the # atmosphere on the surface of Mars. EXTRA_DIST = ref_nctest_classic.nc ref_nctest_64bit_offset.nc \ -compare_test_files.sh +compare_test_files.sh run_valgrind_tests.sh CLEANFILES = nctest_classic.nc nctest_64bit_offset.nc \ nctest_netcdf4.nc test2.nc temp.tmp tst_*.nc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netcdf-4.2.1/nctest/Makefile.in new/netcdf-4.2.1.1/nctest/Makefile.in --- old/netcdf-4.2.1/nctest/Makefile.in 2012-07-19 13:47:33.000000000 +0200 +++ new/netcdf-4.2.1.1/nctest/Makefile.in 2012-08-03 22:12:34.000000000 +0200 @@ -247,7 +247,7 @@ # generated in a pressurized chamber that exactly simulated the # atmosphere on the surface of Mars. EXTRA_DIST = ref_nctest_classic.nc ref_nctest_64bit_offset.nc \ -compare_test_files.sh +compare_test_files.sh run_valgrind_tests.sh CLEANFILES = nctest_classic.nc nctest_64bit_offset.nc \ nctest_netcdf4.nc test2.nc temp.tmp tst_*.nc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netcdf-4.2.1/nctest/run_valgrind_tests.sh new/netcdf-4.2.1.1/nctest/run_valgrind_tests.sh --- old/netcdf-4.2.1/nctest/run_valgrind_tests.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/netcdf-4.2.1.1/nctest/run_valgrind_tests.sh 2012-08-03 22:12:22.000000000 +0200 @@ -0,0 +1,25 @@ +#!/bin/sh + +# This shell runs the tests with valgrind. + +# $Id: run_valgrind_tests.sh,v 1.9 2010/01/26 20:24:18 ed Exp $ + +set -e +echo "" +echo "Testing programs with valgrind..." + +# These are my test programs. +list='nctest tst_rename' + +# These don't work yet: tst_fills tst_xplatform2 tst_interops6 tst_strings + +for tst in $list; do + echo "" + cmd1="valgrind -q --error-exitcode=2 --leak-check=full ./$tst" + echo "$cmd1:" + $cmd1 +done + +echo "SUCCESS!!!" + +exit 0 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
