Merge branch 'develop'

Author: salcock

.github/workflows/deb-build.yaml

@@ -16,10 +16,9 @@ jobs:
          arch:
            - amd64
          target:
-           - "debian:stretch"
            - "debian:buster"
            - "debian:bullseye"
-           - "ubuntu:xenial"
+           - "ubuntu:jammy"
            - "ubuntu:bionic"
            - "ubuntu:focal"
 
@@ -40,7 +39,7 @@ jobs:
           export DIRNAME=`echo ${{ matrix.target }} | tr ':' '_'`
           ./run-tests.sh ${DIRNAME}
       - name: Publish packages to cloudsmith
-        uses: wanduow/action-cloudsmith-upload-packages@v1
+        uses: wandnz/action-cloudsmith-upload-packages@v1.6
         with:
           path: packages/
           repo: ${{ secrets.CLOUDSMITH_OWNER }}/libwandio

.github/workflows/rpm-build.yaml

@@ -18,9 +18,9 @@ jobs:
         target:
           - "centos:7"
           - "fedora:35"
-          - "fedora:34"
-          - "rockylinux:8.5"
-          - "almalinux:8.5"
+          - "fedora:36"
+          - "rockylinux:8.6"
+          - "rockylinux:9.0"
 
 
     steps:
@@ -40,7 +40,7 @@ jobs:
           export DIRNAME=`echo ${{ matrix.target }} | tr ':' '_'`
           ./run-tests-rpm.sh ${DIRNAME}
       - name: Publish packages to cloudsmith
-        uses: wanduow/action-cloudsmith-upload-packages@v1
+        uses: salcock/action-cloudsmith-upload-packages@v1.7
         with:
           path: packages/
           repo: ${{ secrets.CLOUDSMITH_OWNER }}/libwandio

AUTHORS

@@ -2,7 +2,7 @@ The original authors of libwandio were:
  * Perry Lorier
  * Shane Alcock
 
-Libwandio is currently maintained by Shane Alcock <salcock@waikato.ac.nz>.
+Libwandio is currently maintained by Shane Alcock <shane@alcock.co.nz>.
 
 Thanks to Alistair King for numerous contributions (including the entirety
 of the HTTP reader), bug reports and being kind enough to take on the job of

ChangeLog

@@ -1,3 +1,11 @@
+Version 4.2.4
+=============
+ * Debian packaging has been modernised (thanks to Perry Lorier)
+ * Fix curl handle leaking when re-attempting an HTTP request
+ * Fix bug in compression method detection based on the suffix of
+   an output filename
+ * Replace various outdated macros in configure scripts
+
 Version 4.2.3
 =============
 Thanks to Mingwei Zhang for some of the fixes in this release

README

@@ -1,10 +1,10 @@
-WANDIO 4.2.3
+WANDIO 4.2.4
 
 ---------------------------------------------------------------------------
-Copyright (c) 2007-2020 The University of Waikato, Hamilton, New Zealand.
+Copyright (c) 2007-2022 The University of Waikato, Hamilton, New Zealand.
 All rights reserved.
 
-This code has been developed by the University of Waikato WAND
+This code was originally developed by the University of Waikato WAND
 research group. For further information please see http://www.wand.net.nz/.
 ---------------------------------------------------------------------------
 
@@ -26,10 +26,10 @@ WANDIO also improves IO performance by performing compression/decompression in a
 separate thread (if pthreads are available).
 
 Documentation for WANDIO and its included tools can be found at
-https://github.com/wanduow/wandio/wiki
+https://github.com/LibtraceTeam/wandio/wiki
 
 Bugs should be reported by either emailing contact@wand.net.nz or filing
-an issue at https://github.com/wanduow/wandio
+an issue at https://github.com/LibtraceTeam/wandio
 
 It is licensed under the Lesser GNU General Public License (LGPL) version 3.
 Please see the included files COPYING and COPYING.LESSER for details of this

configure.ac

@@ -3,11 +3,11 @@
 # Now you only need to update the version number in two places - below,
 # and in the README
 
-AC_INIT([wandio],[4.2.3],[contact@wand.net.nz],[wandio])
+AC_INIT([wandio],[4.2.4],[shane@alcock.co.nz],[wandio])
 
 WANDIO_MAJOR=4
 WANDIO_MID=2
-WANDIO_MINOR=3
+WANDIO_MINOR=4
 
 # OpenSolaris hides libraries like libncurses in /usr/gnu/lib, which is not
 # searched by default - add it to LDFLAGS so we at least have a chance of
@@ -50,7 +50,7 @@ AC_CACHE_CHECK([whether the C++ compiler works],
 ])
 
 # Put all our automake definitions in config.h
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 
 # Checks for C and C++ compilers
 AC_PROG_CC
@@ -76,7 +76,8 @@ AC_FUNC_REALLOC
 AC_C_CONST
 AC_C_BIGENDIAN
 AC_TYPE_SIZE_T
-AC_HEADER_TIME
+AC_CHECK_HEADERS_ONCE([sys/time.h])
+
 AC_SYS_LARGEFILE
 
 ADD_INCLS=""
@@ -96,7 +97,7 @@ gcc_PURE
 gcc_FORMAT
 
 # Check for libtool
-AC_PROG_LIBTOOL
+LT_INIT
 
 # Checks for library functions.
 AC_PROG_GCC_TRADITIONAL
@@ -106,9 +107,6 @@ AC_PROG_GCC_TRADITIONAL
 
 AC_CHECK_SIZEOF([long int])
 
-
-# Checks for header files.
-AC_HEADER_STDC
 AC_CHECK_HEADERS(stddef.h inttypes.h sys/prctl.h)
 
 # Checks for various "optional" libraries
@@ -124,7 +122,7 @@ fi
 LIBS=
 
 AC_ARG_WITH([bzip2],
-	AC_HELP_STRING([--with-bzip2], [build with support for bzip2 compressed files]))
+	AS_HELP_STRING([--with-bzip2],[build with support for bzip2 compressed files]))
 
 AS_IF([test "x$with_bzip2" != "xno"],
 	[
@@ -145,7 +143,7 @@ AS_IF([test "x$have_bzip" = "xyes"], [
 )
 
 AC_ARG_WITH([zlib],
-	AC_HELP_STRING([--with-zlib], [build with support for zlib compressed files]))
+	AS_HELP_STRING([--with-zlib],[build with support for zlib compressed files]))
 
 AS_IF([test "x$with_zlib" != "xno"],
 	[
@@ -167,7 +165,7 @@ AS_IF([test "x$have_zlib" = "xyes"], [
 )
 
 AC_ARG_WITH([lzo],
-	AC_HELP_STRING([--with-lzo], [build with support for writing lzo compressed files]))
+	AS_HELP_STRING([--with-lzo],[build with support for writing lzo compressed files]))
 
 AS_IF([test "x$with_lzo" != "xno"],
 	[
@@ -189,7 +187,7 @@ AS_IF([test "x$have_lzo" = "xyes"], [
 )
 
 AC_ARG_WITH([lzma],
-	AC_HELP_STRING([--with-lzma], [build with support for lzma compressed files]))
+	AS_HELP_STRING([--with-lzma],[build with support for lzma compressed files]))
 
 AS_IF([test "x$with_lzma" != "xno"],
 	[
@@ -211,7 +209,7 @@ AS_IF([test "x$have_lzma" = "xyes"], [
 )
 
 AC_ARG_WITH([zstd],
-	AC_HELP_STRING([--with-zstd], [build with support for zstd compressed files]))
+	AS_HELP_STRING([--with-zstd],[build with support for zstd compressed files]))
 
 AS_IF([test "x$with_zstd" != "xno"],
 	[
@@ -233,7 +231,7 @@ AS_IF([test "x$have_zstd" = "xyes"], [
 )
 
 AC_ARG_WITH([qatzip],
-	AC_HELP_STRING([--with-qatzip], [build with support for Intel QuickAssist compression]))
+	AS_HELP_STRING([--with-qatzip],[build with support for Intel QuickAssist compression]))
 
 AS_IF([test "x$with_qatzip" != "xno"],
 	[
@@ -255,12 +253,12 @@ AS_IF([test "x$have_qatzip" = "xyes"], [
 )
 
 AC_ARG_WITH([lz4],
-        AC_HELP_STRING([--with-lz4], [build with support for lz4 compressed files]))
+        AS_HELP_STRING([--with-lz4],[build with support for lz4 compressed files]))
 
 AS_IF([test "x$with_lz4" != "xno"],
         [
         AC_CHECK_LIB(lz4, LZ4F_createDecompressionContext, have_lz4f=yes, have_lz4f=no)
-        ], [have_zstd=no])
+        ], [have_lz4f=no])
 
 AS_IF([test "x$have_lz4f" = "xyes"], [
         if test "$ac_cv_lib_lz4_code" != "none required"; then
@@ -291,7 +289,7 @@ AS_IF([test "x$have_lz4f" = "xyes"], [
 )
 
 AC_ARG_WITH([http],
-        AC_HELP_STRING([--with-http], [build with support for reading files over http (using libcurl)]))
+        AS_HELP_STRING([--with-http],[build with support for reading files over http (using libcurl)]))
 
 AS_IF([test "x$with_http" != "xno"],
         [

debian/changelog

@@ -1,5 +1,9 @@
-libwandio1 (4.2.3-2) UNRELEASED; urgency=medium
+libwandio1 (4.2.4-1) unstable; urgency=medium
 
+  * writing: fix bugs with compression method detection based on file
+    suffix.
+  * fix leaking of curl handles when an HTTP download is reset by the
+    remote peer.
   * Trim trailing whitespace.
   * debian/rules: Use dh_prep rather than "dh_clean -k".
   * Use secure URI in Homepage field.
@@ -8,7 +12,7 @@ libwandio1 (4.2.3-2) UNRELEASED; urgency=medium
   * Remove Section on wandio1-tools, Section on libwandio1 that duplicate
     source.
 
- -- Perry Lorier <perry@windy.meta.net.nz>  Sun, 18 Jul 2021 15:36:18 -0000
+ -- Shane Alcock <shane@alcock.co.nz>  Fri, 21 Oct 2022 09:50:18 +1300
 
 libwandio1 (4.2.3-1) unstable; urgency=medium
 

debian/control

@@ -1,14 +1,14 @@
 Source: libwandio1
 Priority: optional
-Maintainer: Shane Alcock <shane.alcock@waikato.ac.nz>
+Maintainer: Shane Alcock <shane@alcock.co.nz>
 Build-Depends: debhelper-compat (= 12),
  dh-autoreconf,
  zlib1g-dev, liblzma-dev, libbz2-dev,
  liblzo2-dev,  libcurl4-openssl-dev, liblz4-dev (>= 0.0~r131),
  libzstd1-dev | libzstd-dev (>= 1)
 Standards-Version: 4.1.3
 Section: libs
-Homepage: https://research.wand.net.nz/software/libwandio.php
+Homepage: https://github.com/LibtraceTeam/wandio
 
 Package: wandio1-tools
 Architecture: any
@@ -24,8 +24,8 @@ Description: example tools for the libwandio library
  tasks where I/O is the limiting factor (most simple trace analysis tasks are
  I/O-limited).
  .
- libwandio is developed by the WAND Network Research Group at Waikato
- University, New Zealand.
+ libwandio was originally developed by the WAND Network Research Group at
+ Waikato University, New Zealand.
 
 Package: libwandio1
 Architecture: any
@@ -37,8 +37,8 @@ Description: multi-threaded file compression and decompression library
  where possible resulting in significant performance gains for tasks where I/O
  is the limiting factor (most simple trace analysis tasks are I/O-limited).
  .
- libwandio is developed by the WAND Network Research Group at Waikato
- University, New Zealand.
+ libwandio was originally developed by the WAND Network Research Group at
+ Waikato University, New Zealand.
 
 Package: libwandio1-dev
 Section: libdevel
@@ -57,5 +57,5 @@ Description: development headers for the libwandio library
  tasks where I/O is the limiting factor (most simple trace analysis tasks are
  I/O-limited).
  .
- libwandio is developed by the WAND Network Research Group at Waikato
- University, New Zealand.
+ libwandio was originally developed by the WAND Network Research Group at
+ Waikato University, New Zealand.

debpkg-setup.sh

@@ -8,6 +8,7 @@ export DEBIAN_FRONTEND=noninteractive
 
 export SOURCENAME=`echo ${GITHUB_REF##*/} | cut -d '-' -f 1`
 
+
 apt-get update
 apt-get install -y equivs devscripts dpkg-dev quilt curl apt-transport-https \
     apt-utils ssl-cert ca-certificates gnupg lsb-release debhelper git \
@@ -18,3 +19,9 @@ curl -1sLf 'https://dl.cloudsmith.io/public/wand/libwandio/cfg/setup/bash.deb.sh
 apt-get update
 apt-get upgrade -y
 
+LSB=`lsb_release -cs`
+if [ "${LSB}" == "bionic" ]; then
+    apt install -y debhelper/${LSB}-backports
+fi
+
+

lib/Makefile.am

@@ -73,5 +73,5 @@ libwandio_la_SOURCES=wandio.c ior-peek.c ior-stdio.c ior-thread.c \
 
 AM_CPPFLAGS = @ADD_INCLS@
 libwandio_la_LIBADD = @LIBWANDIO_LIBS@
-libwandio_la_LDFLAGS=-version-info 6:3:0 @ADD_LDFLAGS@
+libwandio_la_LDFLAGS=-version-info 6:4:0 @ADD_LDFLAGS@