Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package h5utils for openSUSE:Factory checked
in at 2023-02-03 22:05:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/h5utils (Old)
and /work/SRC/openSUSE:Factory/.h5utils.new.4462 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "h5utils"
Fri Feb 3 22:05:32 2023 rev:2 rq:1062670 version:1.13.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/h5utils/h5utils.changes 2018-12-13
19:47:06.484804816 +0100
+++ /work/SRC/openSUSE:Factory/.h5utils.new.4462/h5utils.changes
2023-02-03 22:09:16.924697338 +0100
@@ -1,0 +2,7 @@
+Sat Jan 28 21:26:36 UTC 2023 - Dirk Müller <dmuel...@suse.com>
+
+- update to 1.13.2:
+ * Support relocatable installations by expanding shell metacharacters
+ `~` and environment variables in the colormaps directory (#16).
+
+-------------------------------------------------------------------
Old:
----
h5utils-1.13.1.tar.gz
New:
----
h5utils-1.13.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ h5utils.spec ++++++
--- /var/tmp/diff_new_pack.mgOR55/_old 2023-02-03 22:09:17.276699383 +0100
+++ /var/tmp/diff_new_pack.mgOR55/_new 2023-02-03 22:09:17.280699406 +0100
@@ -1,7 +1,7 @@
#
# spec file for package h5utils
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: h5utils
-Version: 1.13.1
+Version: 1.13.2
Release: 0
Summary: Utilities for Data Conversions from hdf5
License: GPL-2.0-or-later AND MIT
++++++ h5utils-1.13.1.tar.gz -> h5utils-1.13.2.tar.gz ++++++
++++ 8594 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/COPYING new/h5utils-1.13.2/COPYING
--- old/h5utils-1.13.1/COPYING 2018-03-19 21:24:22.000000000 +0100
+++ new/h5utils-1.13.2/COPYING 2023-01-15 21:10:36.000000000 +0100
@@ -1,7 +1,7 @@
#############################################################################
The h5utils package is
- Copyright (c) 1999-2018 by the Massachusetts Institute of Technology
+ Copyright (c) 1999-2023 by the Massachusetts Institute of Technology
#############################################################################
The following license applies to all files in the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/ChangeLog new/h5utils-1.13.2/ChangeLog
--- old/h5utils-1.13.1/ChangeLog 2017-07-18 21:02:39.000000000 +0200
+++ new/h5utils-1.13.2/ChangeLog 2019-01-11 13:35:37.000000000 +0100
@@ -1,2 +1,2 @@
-See https://github.com/stevengj/h5utils for the complete git
+See https://github.com/NanoComp/h5utils for the complete git
history of h5utils.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/Makefile.am new/h5utils-1.13.2/Makefile.am
--- old/h5utils-1.13.1/Makefile.am 2017-07-18 21:02:52.000000000 +0200
+++ new/h5utils-1.13.2/Makefile.am 2023-01-15 21:06:33.000000000 +0100
@@ -46,7 +46,7 @@
h5read.oct: h5read.cc arrayh5.h arrayh5.o
mkoctfile $(DEFS) $(CPPFLAGS) $(srcdir)/h5read.cc $(srcdir)/arrayh5.c
$(LDFLAGS) $(LIBS)
-clean-hook:
+clean-local:
rm -f h5read.oct
nobase_dist_pkgdata_DATA = $(COLORMAPS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/NEWS.md new/h5utils-1.13.2/NEWS.md
--- old/h5utils-1.13.1/NEWS.md 1970-01-01 01:00:00.000000000 +0100
+++ new/h5utils-1.13.2/NEWS.md 2023-01-15 21:09:31.000000000 +0100
@@ -0,0 +1,211 @@
+# Harminv Release Notes
+
+Here, we describe what has changed between releases of the
[h5utils](README.md) package.
+
+## h5utils-1.13.2 ##
+
+*1/15/23*
+
+* Support relocatable installations by expanding shell metacharacters
+ `~` and environment variables in the colormaps directory (#16).
+
+## h5utils-1.13.1 ##
+
+*3/19/18*
+
+* Fixed man page problems (#2 and #3), thanks to Bas Couwenberg.
+
+## h5utils-1.13 ##
+
+*7/18/17*
+
+* Fixed `h5topng` compilation for modern libpng versions. Thanks to
+ Daisuke Fujimura (@fd00 on github) for posting patches.
+
+* Moved hosting to Github and translated documentation to Markdown.
+
+## h5utils 1.12.1 ##
+
+*6/24/09*
+
+* Use `octave-config`, if available, to detect octave-plugin installation path
(thanks to Debian bug report #516453 for suggestion).
+
+## h5utils 1.12 ##
+
+*6/12/09*
+
+* The vertical axis in `h5topng` is now reversed to correspond to what most
people seem to expect: increasing coordinates correspond to "up" and "right" in
the image, rather than "down" and "right" in the image as in previous versions.
+* Fixed failure in `h5tovtk -2`; thanks to Karen Lee for the bug report.
+* Fixed installation of `h5read.oct` for Octave 3.x.
+
+## h5utils 1.11.1 ##
+
+*4/28/08*
+
+* Fixed failure to find colormap files in h5topng 1.11 (due to changes in
autoconf 2.60); thanks to bug report from Jiangjun Zheng.
+
+## h5utils 1.11 ##
+
+*4/24/08*
+
+* h5tovtk no longer reverses the dimensions; thanks to Andreas Wilde for the
suggestion.
+* Fix compilation failure with HDF5 1.8.
+
+## h5utils 1.10.1 ##
+
+*9/20/06*
+
+* Fixed build problem on Cygwin due to missing "`.exe`" extension. Thanks to
Ken Hill for the bug report.
+
+## h5utils 1.10 ##
+
+*9/2/05*
+
+* Added `h4fromh5` utility. (NCSA seems to be no longer shipping the
HDF5/HDF4 conversion tools with the latest HDF5 release.)
+* Added `dkbluered` color map, which is similar to `bluered` but uses a
somewhat wider range of colors.
+
+## h5utils 1.9.1 ##
+
+*8/5/04*
+
+* Fix `h5topng` compilation failure with some non-C99 compilers; thanks to
Maarten van Reeuwijk for the bug report.
+
+## h5utils 1.9 ##
+
+*7/12/04*
+
+* Added new `h5math` utility, which creates and combines HDF5 datasets using a
user-specified mathematical expression. (Requires [GNU
libmatheval](http://www.gnu.org/software/libmatheval/) to be installed.)
+* `h5topng`: Matlab-like `start:end` or `start:step:end` notation for slice
indices, to allow a whole sequence of slices to be output as a sequence of PNG
images.
+* `h5topng`: if contour/overlay dataset does not have same dimensions as
output data, it is periodically "tiled" over the output.
+
+## h5utils 1.8 ##
+
+*5/22/04*
+
+* New `-A` and `-a` options for `h5topng` to allow translucent overlays from
one file onto another (an alternative or complement to the `-C` contour-overlay
option).
+* `h5topng` uses 24-bit direct color by default (use `-8` option for old 8-bit
behavior).
+* `h5topng` uses columns/rows for x/y by default (use `-T` to swap), the
opposite of the old behavior.
+* There is no default `-z 0` slice dimension in `h5topng`/`h5totxt` any more.
You must specify a slice for 3+ dimensional data in `h5topng`. `h5totxt` dumps
the whole data file by default unless one or more slices are specified.
+* Support specifying multiple slice dimensions for 4+ dimensional datasets,
with new `-t` option to indicate final dimension.
+* Slices are also supported now in `h5tovtk` and `h5tov5d`.
+* New `-.` option in `h5totxt` to specify number of significant digits; output
16 digits by default instead of 6, previously.
+
+## h5utils 1.7.2 ##
+
+*7/15/02*
+
+* Fixed C++ compilation problem for `g++` 3.x in `h5read` Octave plugin;
thanks to Josselin Mouette for the patch.
+
+## h5utils 1.7.1 ##
+
+*3/16/02*
+
+* Fixed array overrun in `h5topng` that caused a floating-point exception on
Alphas; thanks to Marin Soljacic for the bug report.
+
+## h5utils 1.7 ##
+
+*3/9/02*
+
+* `h5topng` now supports multiple, user-definable color tables, a number of
which are provided. '''Incompatible change''': the `-c` option now has the
syntax: `-c ''colortable''`. The old behavior corresponds to the included
"`bluered`" colortable, invoked via: `-c bluered`.
+* New `-R` option for `h5topng` to use a consistent color scale for all
specified files.
+* New `-0` option for `h5topng` and `h5totxt` that shifts the origin of the
slice coordinates to the dataset center.
+* Added `h5tovtk` program to output VTK (Visualization ToolKit) data files.
+* Support `-T` (transpose dimensions) option in `h5tov5d`.
+* Fixed bug in `h5topng` that caused extra rows/columns of garbage pixels to
be written at the edges of images when scaling was used.
+* When compiling the h5read Octave plugin, respect the `CPPFLAGS` and
`LDFLAGS` environment variables. Thanks to Max Colice for the bug report.
+* Fixed problem when `--without-h5tov5d` and `--without-h5fromh4` are used.
Thanks to Nikola Ivanov Nikolov for the fix.
+
+## h5utils 1.6 ##
+
+*1/17/01*
+
+* Don't build `h5fromh4` if the superior `h4toh5` tool (from HDF5 1.4) is
present. Also added `--{with,without}-h5fromh4` option to configure to force
whether `h5fromh4` is built.
+
+## h5utils 1.5.1 ##
+
+*12/9/00*
+
+* Support manually disabling Octave plugin support (`configure
--without-octave`) in case of C++ problems.
+* Support Vis5d+ and Debian HDF header file locations.
+
+## h5utils 1.5 ##
+
+*7/9/00*
+
+* Added `h5fromh4` program to convert HDF4 datasets to HDF5 format.
+* Added `-S ''s''` option to `h5topng` as a shortcut for `-X ''s'' -Y ''s''`.
+
+## h5utils 1.4 ##
+
+*5/28/00*
+
+* Added `h5fromtxt` program to convert text input to an HDF5 dataset.
+
+## h5utils 1.3.4 ##
+
+*1/31/00*
+
+* Improved -C contour plotting in h5topng.
+* Fix in `h5topng` man page (thanks to Christoph Becher).
+
+## h5utils 1.3.3 ##
+
+*1/30/00*
+
+* Bug fix in `h5topng` (would sometimes output solid black images). Thanks to
Karl Koch for the bug report.
+
+## h5utils 1.3.2 ##
+
+*1/28/00*
+
+* Added `h5topng -Z` option to center color scale on zero.
+* Now support `h5topng -C ''filename:dataset''`.
+
+## h5utils 1.3.1 ##
+
+*1/27/00*
+
+* Bug fixes in dataset name-handling, especially when using `h5tov5d` to join
multiple datasets into one output file.
+
+## h5utils 1.3 ##
+
+*1/21/00*
+
+* You can now specify individual datasets within a file by using
''filename'':''dataset'' instead of just ''filename'' with `h5topng`,
`h5totxt`, and `h5tov5d`.
+
+## h5utils 1.2.3 ##
+
+*1/20/00*
+
+* Fixed minor bug in '`h5totxt -h`'.
+
+## h5utils 1.2.2 ##
+
+*1/12/00*
+
+* `Makefile` now includes `CPPFLAGS` in the compiler flags, making it easier
to use header files in non-standard locations. (`CPPFLAGS` is the proper place
to put `-I` flags for the configure script.)
+
+## h5utils 1.2.1 ##
+
+*1/1/00*
+
+* Modified `-o` option of `h5tov5d` to join datasets into a single Vis5d file.
+
+## h5utils 1.2 ##
+
+*12/31/99*
+
+* Added h5tov5d program for converting to Vis5d format.
+* Improved installation; `h5read.oct` now goes into the sitewide Octave
plugins directory, and things work correctly when only some of the utilities
are compiled.
+
+## h5utils 1.1 ##
+
+*12/6/99*
+
+* Added `h5totxt` program for exporting 2d slices of HDF5 files to text
suitable for importing into a spreadsheet.
+
+## h5utils 1.0 ##
+
+*11/22/99*
+
+* Initial release.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/README.md new/h5utils-1.13.2/README.md
--- old/h5utils-1.13.1/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/h5utils-1.13.2/README.md 2023-01-15 21:11:18.000000000 +0100
@@ -0,0 +1,76 @@
+
+
+# H5utils
+
+**h5utils** is a set of utilities for visualization and conversion of
scientific data in the free, portable [HDF5
format](http://www.hdfgroup.org/HDF5/).
+
+Besides providing a simple tool for batch visualization as
[PNG](https://en.wikipedia.org/wiki/Portable_Network_Graphics) images, h5utils
also includes programs to convert HDF5 datasets into the formats required by
other free visualization software (e.g. plain text,
[Vis5d](http://www.ssec.wisc.edu/~billh/vis5d.html), and
[VTK](http://public.kitware.com/VTK/)).
+
+This package is developed by [Steven G.
Johnson](http://math.mit.edu/~stevenj/), and is [free
software](http://www.gnu.org/philosophy/free-sw.html) that should easily
install under any Unix-like operating system (*e.g.* GNU/Linux).
+
+# Download and Install
+
+The latest version is h5utils 1.13.1, which can be downloaded in source-code
form at:
+
+*
https://github.com/NanoComp/h5utils/releases/download/1.13.1/h5utils-1.13.1.tar.gz
+
+(Download this `.tar.gz` file rather than cloning the [git
repo](https://github.com/NanoComp/h5utils)
+unless you are a developer, since the git repo requires additional tools to
build as described below.)
+
+What's new in each version is described in the [release notes](NEWS.md) file.
+
+h5utils is free software (a.k.a. [open source](http://www.opensource.org/));
see below for the license and copyright.
+
+## Installation
+
+h5utils is designed for Unix-like operating systems (*e.g.* GNU/Linux). We do
not support Windows directly, although you may be able to install there too
using free packages like [Cygwin](http://cygwin.com/).
+
+You must first download and install [HDF5](http://www.hdfgroup.org/HDF5/), if
it is not already on your system. Also, the programs to convert (see below)
to/from [PNG](http://www.libpng.org/pub/png/),
[Vis5d](http://www.ssec.wisc.edu/~billh/vis5d.html), [GNU
Octave](http://www.octave.org/), and
[HDF(4)](http://www.hdfgroup.org/products/hdf4/) will only be built if the
corresponding libraries/programs are installed. `h5math` will only be built if
[GNU libmatheval](http://www.gnu.org/software/libmatheval/) is installed.
+
+To compile and install the package, you then just type the usual GNU build
commands:
+```
+./configure
+make
+make install
+```
+See `./configure --help` for more options. You can use `make uninstall` to get
rid of all the installed files.
+
+**Github**: If you are using the source [on
github](https://github.com/NanoComp/h5utils) (via `git clone
https://github.com/NanoComp/h5utils`), then you will also need to have [GNU
autoconf, automake, and
libtool](https://en.wikipedia.org/wiki/GNU_Build_System) installed, and run `sh
autogen.sh` (in a Unix shell) to set up things before running `make` above
(`autogen.sh` runs `./configure` for you).
+
+**Note:** if you get a message like `cannot compute sizeof (unsigned long)`
when running `./configure`, it probably means you didn't install the HDF5
library properly: you need to tell the runtime linker where to find it. On
GNU/Linux, make sure there is a line `/usr/local/lib` in `/etc/ld.so.conf` and
run `/sbin/ldconfig` (assuming you installed HDF5 in the default location).
+
+*Note:* if you installed the
[MPI](https://en.wikipedia.org/wiki/Message_Passing_Interface) (parallel)
version of HDF5, you may get an error like `/usr/include/H5public.h:53:20:
error: mpi.h: No such file or directory`. This can be fixed by telling the
compiler where to find the MPI header files, e.g. via: `./configure CC=mpicc`.
+
+# h5utils Programs
+
+The included utilities are:
+
+* **h5totxt** and **h5fromtxt**: convert HDF5 datasets to/from ASCII text
(e.g. comma- or tab-delimited). See the manual pages of
[h5totxt](doc/h5totxt-man.md) and [h5fromtxt](doc/h5fromtxt-man.md) for more
information.
+* **h5topng**: convert 2d slices of HDF5 datasets to PNG images, with a
variety of color tables and other options. See the [h5topng manual
page](doc/h5topng-man.md) for more information. See [Color tables in
h5topng](doc/h5topng-colors.md) for information on the color tables.
+* **h5tov5d**: convert HDF5 datasets to the format used by the free 3d+
visualization tool [Vis5d](http://www.ssec.wisc.edu/~billh/vis5d.html). See the
[manual page](doc/h5tov5d-man.md) for more information. **Note**: to install
h5tov5d you must have first compiled Vis5d, and you must specify
`--with-v5d=dir` to the h5utils `configure` script to specify the location
`dir` of the Vis5d source directory.
+* **h5tovtk**: convert HDF5 datasets to VTK format for use by the free
[Visualization ToolKit](http://public.kitware.com/VTK/) (along with supporting
programs like [MayaVi](http://mayavi.sourceforge.net/)). See the [manual
page](doc/h5tovtk-man.md) for more information.
+* **h5math**: create and combine HDF5 datasets with simple (pointwise)
mathematical expressions. (Requires [GNU
libmatheval](http://www.gnu.org/software/libmatheval/) to be installed.) See
the [manual page](doc/h5math-man.md) for more information.
+* **h5read.oct**: a plug-in for [GNU Octave](http://www.octave.org/) (a
Matlab-like program) to read 2d slices of HDF5 datasets. (Recent versions of
Octave also include native support for HDF5, although it can't read slices like
the `h5read` plug-in.)
+* **h5fromh4** and **h4fromh5**: convert HDF (version 4) datasets to and from
HDF5. These utilities are nowadays somewhat redundant with the
[h4toh5](http://hdfgroup.com/h4toh5/) and `h5toh4` programs provided by NCSA
and the HDF Group (which are no longer bundled with HDF5, however). See the
[h5fromh4](doc/h5fromh4-man.md) and [h4fromh5](doc/h4fromh5-man.md) manual
pages for more information.
+
+To convert HDF5 to [CDF](http://nssdc.gsfc.nasa.gov/cdf/cdf_home.html) format,
see the [hdf5-to-cdf](http://nssdc.gsfc.nasa.gov/cdf/html/FAQ.html#hdf5tocdf)
program.
+
+# License and Copyright
+
+h5utils is Copyright © 1999â2023 Massachusetts Institute of Technology.
+
+*The following [MIT/expat license](https://opensource.org/licenses/MIT)
governs the entire contents of h5utils except for the `h5tov5d.c` file. See
below.*
+
+> Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
+>
+>The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
+>
+>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+
+*The file `h5tov5d.c` and the resulting `h5tov5d` binary are under the
following different license, the [GNU
GPL](http://www.gnu.org/copyleft/gpl.html) since they link with files from the
GPL-covered Vis5d:*
+
+>This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation; either version 2 of the License, or (at your option) any later
version.
+>
+>This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+>
+>You should have received a copy of the GNU General Public License along with
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA. You can also find it on the GNU
web site: http://www.gnu.org/copyleft/gpl.html
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/arrayh4.c new/h5utils-1.13.2/arrayh4.c
--- old/h5utils-1.13.1/arrayh4.c 2017-07-18 20:48:25.000000000 +0200
+++ new/h5utils-1.13.2/arrayh4.c 2023-01-15 21:12:16.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (c) 1999-2017 Massachusetts Institute of Technology
+/* Copyright (c) 1999-2023 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/arrayh4.h new/h5utils-1.13.2/arrayh4.h
--- old/h5utils-1.13.1/arrayh4.h 2017-07-18 20:48:25.000000000 +0200
+++ new/h5utils-1.13.2/arrayh4.h 2023-01-15 21:12:16.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (c) 1999-2017 Massachusetts Institute of Technology
+/* Copyright (c) 1999-2023 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/arrayh5.h new/h5utils-1.13.2/arrayh5.h
--- old/h5utils-1.13.1/arrayh5.h 2017-07-18 20:48:25.000000000 +0200
+++ new/h5utils-1.13.2/arrayh5.h 2023-01-15 21:12:16.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (c) 1999-2017 Massachusetts Institute of Technology
+/* Copyright (c) 1999-2023 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/compile new/h5utils-1.13.2/compile
--- old/h5utils-1.13.1/compile 2015-01-05 23:11:43.000000000 +0100
+++ new/h5utils-1.13.2/compile 2021-10-04 05:23:18.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
# Written by Tom Tromey <tro...@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@
MINGW*)
file_conv=mingw
;;
- CYGWIN*)
+ CYGWIN* | MSYS*)
file_conv=cygwin
;;
*)
@@ -67,7 +67,7 @@
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
- cygwin/*)
+ cygwin/* | msys/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
@@ -255,7 +255,8 @@
echo "compile $scriptversion"
exit $?
;;
- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
@@ -339,9 +340,9 @@
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/config.h.in new/h5utils-1.13.2/config.h.in
--- old/h5utils-1.13.1/config.h.in 2018-03-19 21:23:45.000000000 +0100
+++ new/h5utils-1.13.2/config.h.in 2023-01-15 21:10:01.000000000 +0100
@@ -27,9 +27,6 @@
/* Define to 1 if you have the `m' library (-lm). */
#undef HAVE_LIBM
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
/* Define to 1 if you have the <netinet/in.h> header file. */
#undef HAVE_NETINET_IN_H
@@ -39,6 +36,9 @@
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
@@ -69,6 +69,12 @@
/* [Define if you have the <vis5d+/v5d.h> header file.] */
#undef HAVE_VIS5Dp_V5D_H
+/* Define to 1 if you have the `wordexp' function. */
+#undef HAVE_WORDEXP
+
+/* Define to 1 if you have the <wordexp.h> header file. */
+#undef HAVE_WORDEXP_H
+
/* Name of package */
#undef PACKAGE
@@ -93,7 +99,9 @@
/* The size of `float', as computed by sizeof. */
#undef SIZEOF_FLOAT
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+ required in a freestanding environment). This macro is provided for
+ backward compatibility; new code need not use it. */
#undef STDC_HEADERS
/* Version number of package */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/configure.ac new/h5utils-1.13.2/configure.ac
--- old/h5utils-1.13.1/configure.ac 2018-03-19 21:23:14.000000000 +0100
+++ new/h5utils-1.13.2/configure.ac 2023-01-15 21:09:46.000000000 +0100
@@ -1,5 +1,5 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT(h5utils, 1.13.1, stev...@alum.mit.edu)
+AC_INIT([h5utils],[1.13.2],[stev...@alum.mit.edu])
AM_INIT_AUTOMAKE([foreign silent-rules 1.6])
AM_SILENT_RULES(yes)
AC_CONFIG_SRCDIR([h5topng.c])
@@ -10,9 +10,6 @@
AC_PROG_CC
AM_PROG_CC_C_O
-# Checks for header files.
-AC_HEADER_STDC
-
AC_CHECK_LIB(m, sin)
AC_CHECK_FUNCS(snprintf)
@@ -28,7 +25,7 @@
dnl add gcc warnings, in debug/maintainer mode only
if test "$enable_debug" = yes || test "$USE_MAINTAINER_MODE" = yes; then
- if test $ac_cv_prog_gcc = yes; then
+ if test $ac_cv_c_compiler_gnu = yes; then
CFLAGS="$CFLAGS -Wall -W -Wcast-qual -Wpointer-arith
-Wcast-align -pedantic -Wno-long-long -Wshadow -Wbad-function-cast
-Wwrite-strings -Wstrict-prototypes -Wredundant-decls -Wnested-externs" #
-Wundef -Wconversion -Wmissing-prototypes -Wmissing-declarations
fi
fi
@@ -81,7 +78,7 @@
AC_CHECK_PROG(H5TOH4, h5toh4, h5toh4)
AC_ARG_WITH(hdf4,
- [AC_HELP_STRING([--with-hdf4], [build hdf4 utils even if h4toh5 and
h5toh4 are present])],
+ [AS_HELP_STRING([--with-hdf4],[build hdf4 utils even if h4toh5 and
h5toh4 are present])],
ok=$withval, ok=maybe)
if test "x$ok" = xyes; then
H4TOH5=""
@@ -121,7 +118,7 @@
###########################################################################
-AC_ARG_WITH(octave, [AC_HELP_STRING([--without-octave], [don't compile h5read
Octave plugin])], ok=$withval, ok=yes)
+AC_ARG_WITH(octave, [AS_HELP_STRING([--without-octave],[don't compile h5read
Octave plugin])], ok=$withval, ok=yes)
H5READ=""
OCT_INSTALL_DIR=""
@@ -160,7 +157,7 @@
###########################################################################
-AC_ARG_WITH(v5d, [AC_HELP_STRING([--with-v5d=<dir>], [use Vis5d in <dir> for
h5tov5d])], ok=$withval, ok=yes)
+AC_ARG_WITH(v5d, [AS_HELP_STRING([--with-v5d=<dir>],[use Vis5d in <dir> for
h5tov5d])], ok=$withval, ok=yes)
H5TOV5D=no
V5D_FILES=""
V5D_INCLUDES=""
@@ -198,23 +195,23 @@
AC_CHECK_TYPES([uint16_t, uint32_t])
AC_MSG_CHECKING([for htons])
-AC_TRY_LINK([#if defined(HAVE_ARPA_INET_H)
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#if defined(HAVE_ARPA_INET_H)
#include <arpa/inet.h>
#elif defined(HAVE_NETINET_IN_H)
#include <netinet/in.h>
-#endif], [unsigned short i; htons(i);], [htons=yes
- AC_DEFINE([HAVE_HTONS],1,[Define if you have htons.])], htons=no)
+#endif]], [[unsigned short i; htons(i);]])],[htons=yes
+ AC_DEFINE([HAVE_HTONS],1,[Define if you have htons.])],[htons=no])
AC_MSG_RESULT($htons)
AC_CHECK_SIZEOF(float)
AC_MSG_CHECKING([for htonl])
-AC_TRY_LINK([#if defined(HAVE_ARPA_INET_H)
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#if defined(HAVE_ARPA_INET_H)
#include <arpa/inet.h>
#elif defined(HAVE_NETINET_IN_H)
#include <netinet/in.h>
-#endif], [unsigned long i; htonl(i);], [htonl=yes
- AC_DEFINE([HAVE_HTONL],1,[Define if you have htonl.])], htonl=no)
+#endif]], [[unsigned long i; htonl(i);]])],[htonl=yes
+ AC_DEFINE([HAVE_HTONL],1,[Define if you have htonl.])],[htonl=no])
AC_MSG_RESULT($htonl)
if test "x$htons" != xyes -o "x$htonl" != xyes; then
@@ -235,6 +232,10 @@
AC_DEFINE_UNQUOTED(DATADIR, "$datadir_val", [datadir installation prefix])
AC_SUBST(datadir_val)
+# check for POSIX wordexp function if we need expand ~ etcetera
+AC_CHECK_HEADERS([wordexp.h])
+AC_CHECK_FUNCS(wordexp)
+
###########################################################################
AC_SUBST(MORE_H5UTILS)
AC_SUBST(MORE_H5UTILS_MANS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/copyright.h new/h5utils-1.13.2/copyright.h
--- old/h5utils-1.13.1/copyright.h 2017-07-18 20:48:25.000000000 +0200
+++ new/h5utils-1.13.2/copyright.h 2023-01-15 21:12:16.000000000 +0100
@@ -4,7 +4,7 @@
/* License and copyright string for inclusion in program output: */
#define COPYRIGHT \
-"Copyright (c) 1999-2017 Massachusetts Institute of Technology\n"\
+"Copyright (c) 1999-2023 Massachusetts Institute of Technology\n"\
"\n"\
"Permission is hereby granted, free of charge, to any person obtaining\n"\
"a copy of this software and associated documentation files (the\n"\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/h4fromh5.c new/h5utils-1.13.2/h4fromh5.c
--- old/h5utils-1.13.1/h4fromh5.c 2017-07-18 20:48:25.000000000 +0200
+++ new/h5utils-1.13.2/h4fromh5.c 2023-01-15 21:12:16.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (c) 1999-2017 Massachusetts Institute of Technology
+/* Copyright (c) 1999-2023 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/h5cyl2cart.c new/h5utils-1.13.2/h5cyl2cart.c
--- old/h5utils-1.13.1/h5cyl2cart.c 2017-07-18 20:48:25.000000000 +0200
+++ new/h5utils-1.13.2/h5cyl2cart.c 2023-01-15 21:12:16.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (c) 1999-2017 Massachusetts Institute of Technology
+/* Copyright (c) 1999-2023 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/h5fromh4.c new/h5utils-1.13.2/h5fromh4.c
--- old/h5utils-1.13.1/h5fromh4.c 2017-07-18 20:48:25.000000000 +0200
+++ new/h5utils-1.13.2/h5fromh4.c 2023-01-15 21:12:16.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (c) 1999-2017 Massachusetts Institute of Technology
+/* Copyright (c) 1999-2023 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/h5fromtxt.c new/h5utils-1.13.2/h5fromtxt.c
--- old/h5utils-1.13.1/h5fromtxt.c 2017-07-18 20:48:25.000000000 +0200
+++ new/h5utils-1.13.2/h5fromtxt.c 2023-01-15 21:12:16.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (c) 1999-2017 Massachusetts Institute of Technology
+/* Copyright (c) 1999-2023 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/h5math.c new/h5utils-1.13.2/h5math.c
--- old/h5utils-1.13.1/h5math.c 2017-07-18 20:48:25.000000000 +0200
+++ new/h5utils-1.13.2/h5math.c 2023-01-15 21:12:16.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (c) 1999-2017 Massachusetts Institute of Technology
+/* Copyright (c) 1999-2023 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/h5topng.c new/h5utils-1.13.2/h5topng.c
--- old/h5utils-1.13.1/h5topng.c 2017-07-18 20:48:25.000000000 +0200
+++ new/h5utils-1.13.2/h5topng.c 2023-01-15 21:12:16.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (c) 1999-2017 Massachusetts Institute of Technology
+/* Copyright (c) 1999-2023 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@@ -41,6 +41,25 @@
#define OVERLAY_OPACITY_DEFAULT 0.2
#define CMAP_DIR DATADIR "/" PACKAGE_NAME "/colormaps/"
+#if defined(HAVE_WORDEXP) && defined(HAVE_WORDEXP_H)
+# include <wordexp.h>
+#endif
+
+/* shell expansion on a path, used for CMAP_DIR */
+char *shell_expand(const char *path)
+{
+#if defined(HAVE_WORDEXP) && defined(HAVE_WORDEXP_H)
+ wordexp_t p;
+ char *newpath;
+ wordexp(path, &p, 0);
+ newpath = my_strdup(p.we_wordc == 1 ? p.we_wordv[0] : path);
+ wordfree(&p);
+ return newpath;
+#else
+ return my_strdup(path);
+#endif
+}
+
void usage(FILE *f)
{
fprintf(f, "Usage: h5topng [options] [<filenames>]\n"
@@ -135,21 +154,22 @@
return c;
}
-colormap_t get_cmap(const char *colormap, int invert, double scale_alpha,
- int verbose)
+colormap_t get_cmap(const char *cmap_dir,
+ const char *colormap, int invert, double scale_alpha,
+ int verbose)
{
int i;
colormap_t cmap = {0, NULL};
FILE *cmap_f = NULL;
char *cmap_fname = (char *) malloc(sizeof(char) *
- (strlen(CMAP_DIR)
+ (strlen(cmap_dir)
+ strlen(colormap) + 1));
CHECK(cmap_fname, "out of memory");
if (colormap[0] == '-') {
invert = 1;
colormap++;
}
- strcpy(cmap_fname, CMAP_DIR); strcat(cmap_fname, colormap);
+ strcpy(cmap_fname, cmap_dir); strcat(cmap_fname, colormap);
if (colormap[0] == '.' || colormap[0] == '/'
|| !(cmap_f = fopen(cmap_fname, "r"))) {
free(cmap_fname);
@@ -241,7 +261,7 @@
int islice_min[4] = {0,0,0,0}, islice_max[4] = {0,0,0,0}, islice_step[4]
= {1,1,1,1};
int err;
int nx, ny;
- char *colormap = NULL, *overlay_colormap = NULL;
+ char *colormap = NULL, *overlay_colormap = NULL, *cmap_dir = NULL;
int overlay_invert = 0;
colormap_t cmap = { 0, NULL };
colormap_t overlay_cmap = { 0, NULL };
@@ -259,6 +279,9 @@
colormap = my_strdup(CMAP_DEFAULT);
overlay_colormap = my_strdup(OVERLAY_CMAP_DEFAULT);
+ /* do tilde and $foo expansion on CMAP_DIR */
+ cmap_dir = shell_expand(CMAP_DIR);
+
while ((c = getopt(argc, argv,
"ho:x:y:z:t:0c:m:M:RC:b:d:vX:Y:S:TrZs:Va:A:8")) != -1)
switch (c) {
case 'h':
@@ -372,9 +395,9 @@
CHECK(!overlay_fname || !eight_bit,
"-8 option is not currently supported with -A");
- cmap = get_cmap(colormap, invert, 1.0, verbose);
+ cmap = get_cmap(cmap_dir, colormap, invert, 1.0, verbose);
if (overlay_fname)
- overlay_cmap = get_cmap(overlay_colormap, overlay_invert,
+ overlay_cmap = get_cmap(cmap_dir, overlay_colormap, overlay_invert,
overlay_opacity, verbose);
if (optind == argc) { /* no parameters left */
@@ -592,6 +615,6 @@
if (cmap.rgba != gray_colors)
free(cmap.rgba);
free(colormap);
-
+ free(cmap_dir);
return EXIT_SUCCESS;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/h5totxt.c new/h5utils-1.13.2/h5totxt.c
--- old/h5utils-1.13.1/h5totxt.c 2017-07-18 20:48:25.000000000 +0200
+++ new/h5utils-1.13.2/h5totxt.c 2023-01-15 21:12:16.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (c) 1999-2017 Massachusetts Institute of Technology
+/* Copyright (c) 1999-2023 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/h5tov5d.c new/h5utils-1.13.2/h5tov5d.c
--- old/h5utils-1.13.1/h5tov5d.c 2017-07-18 20:48:25.000000000 +0200
+++ new/h5utils-1.13.2/h5tov5d.c 2023-01-15 21:12:16.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (c) 1999-2017 Massachusetts Institute of Technology
+/* Copyright (c) 1999-2023 Massachusetts Institute of Technology
*
* [ IMPORTANT: Note that the following is DIFFERENT from the license
* for the rest of the h5utils package. ]
@@ -306,7 +306,7 @@
return EXIT_SUCCESS;
case 'V':
printf("h5tov5d " PACKAGE_VERSION " by Steven G. Johnson\n"
- "Copyright (c) 1999-2017 Massachusetts Institute of Technology\n"
+ "Copyright (c) 1999-2023 Massachusetts Institute of Technology\n"
"\n"
"This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/h5tovtk.c new/h5utils-1.13.2/h5tovtk.c
--- old/h5utils-1.13.1/h5tovtk.c 2017-07-18 20:48:25.000000000 +0200
+++ new/h5utils-1.13.2/h5tovtk.c 2023-01-15 21:12:16.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (c) 1999-2017 Massachusetts Institute of Technology
+/* Copyright (c) 1999-2023 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/h5utils.c new/h5utils-1.13.2/h5utils.c
--- old/h5utils-1.13.1/h5utils.c 2017-07-18 20:48:25.000000000 +0200
+++ new/h5utils-1.13.2/h5utils.c 2023-01-15 21:12:16.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (c) 1999-2017 Massachusetts Institute of Technology
+/* Copyright (c) 1999-2023 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@@ -31,10 +31,13 @@
char *my_strdup(const char *s)
{
- char *sd = (char *) malloc(sizeof(char) * (strlen(s) + 1));
- CHECK(sd, "out of memory");
- strcpy(sd, s);
- return sd;
+ if (s) {
+ char *sd = (char *) malloc(sizeof(char) * (strlen(s) + 1));
+ CHECK(sd, "out of memory");
+ strcpy(sd, s);
+ return sd;
+ }
+ return NULL;
}
char *replace_suffix(const char *s, const char *old_suff, const char *new_suff)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/h5utils.h new/h5utils-1.13.2/h5utils.h
--- old/h5utils-1.13.1/h5utils.h 2017-07-18 20:48:25.000000000 +0200
+++ new/h5utils-1.13.2/h5utils.h 2023-01-15 21:12:16.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (c) 1999-2017 Massachusetts Institute of Technology
+/* Copyright (c) 1999-2023 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/missing new/h5utils-1.13.2/missing
--- old/h5utils-1.13.1/missing 2015-01-05 23:11:43.000000000 +0100
+++ new/h5utils-1.13.2/missing 2021-10-04 05:23:18.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@
exit $st
fi
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
program_details ()
{
@@ -207,9 +207,9 @@
exit $st
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/writepng.c new/h5utils-1.13.2/writepng.c
--- old/h5utils-1.13.1/writepng.c 2017-07-18 20:48:25.000000000 +0200
+++ new/h5utils-1.13.2/writepng.c 2023-01-15 21:12:16.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (c) 1999-2017 Massachusetts Institute of Technology
+/* Copyright (c) 1999-2023 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/h5utils-1.13.1/writepng.h new/h5utils-1.13.2/writepng.h
--- old/h5utils-1.13.1/writepng.h 2017-07-18 20:48:25.000000000 +0200
+++ new/h5utils-1.13.2/writepng.h 2023-01-15 21:12:16.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (c) 1999-2017 Massachusetts Institute of Technology
+/* Copyright (c) 1999-2023 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
