New upstream version 1.58~rc1 upstream/1.58_rc1

4 files changed, 26 insertions, 7 deletions

diff --git a/src/c-siphash/.github/workflows/ci.yml b/src/c-siphash/.github/workflows/ci.yml
index 00bca960..92d40131 100644
--- a/src/c-siphash/.github/workflows/ci.yml
+++ b/src/c-siphash/.github/workflows/ci.yml
@@ -1,10 +1,15 @@
-name: Continuous Integration
+name: "Continuous Integration"
 
 on:
-  push:
   pull_request:
-  schedule:
-  - cron:  '0 0 * * *'
+  push:
+    branches-ignore: ["pr/**"]
+    tags: ["**"]
+  workflow_dispatch:
+
+defaults:
+  run:
+    shell: "bash"
 
 jobs:
   ci-linux:
diff --git a/src/c-siphash/NEWS.md b/src/c-siphash/NEWS.md
index a0227c04..0b9e272d 100644
--- a/src/c-siphash/NEWS.md
+++ b/src/c-siphash/NEWS.md
@@ -1,5 +1,19 @@
 # c-siphash - Streaming-capable SipHash Implementation
 
+## CHANGES WITH 1.1.0:
+
+        * Support MacOS and Windows builds.
+
+        * Support SipHash variants other than SipHash24 by parameterizing
+          the N and M variables of SipHash.
+
+        * Update the c-stdaux dependency to provide the new build variables
+          and thus allow linking through pkg-config.
+
+        Contributions from: Daniele Nicolodi, David Rheinsberg
+
+        - Dußlingen, 2023-12-12
+
 ## CHANGES WITH 1.0.0:
 
         * Initial release of c-siphash.
diff --git a/src/c-siphash/meson.build b/src/c-siphash/meson.build
index ffcb6a76..08389d97 100644
--- a/src/c-siphash/meson.build
+++ b/src/c-siphash/meson.build
@@ -6,14 +6,14 @@ project(
         ],
         license: 'Apache',
         meson_version: '>=0.60.0',
-        version: '1.0.0',
+        version: '1.1.0',
 )
 major = meson.project_version().split('.')[0]
 project_description = 'Streaming-capable SipHash Implementation'
 
 mod_pkgconfig = import('pkgconfig')
 
-dep_cstdaux = dependency('libcstdaux-1')
+dep_cstdaux = dependency('libcstdaux-1', version: '>=1.5.0')
 add_project_arguments(dep_cstdaux.get_variable('cflags').split(' '), language: 'c')
 
 subdir('src')
diff --git a/src/c-siphash/src/meson.build b/src/c-siphash/src/meson.build
index f2cc1864..1d322ce3 100644
--- a/src/c-siphash/src/meson.build
+++ b/src/c-siphash/src/meson.build
@@ -20,7 +20,7 @@ libcsiphash_both = both_libraries(
         ],
         dependencies: libcsiphash_deps,
         install: not meson.is_subproject(),
-        link_args: dep_cstdaux.get_variable('version-scripts') == 'yes' ? [
+        link_args: dep_cstdaux.get_variable('version_scripts') == 'yes' ? [
                 '-Wl,--version-script=@0@'.format(libcsiphash_symfile),
         ] : [],
         link_depends: libcsiphash_symfile,