Browse Source

Update test for changes in newer tang versions

Christoph Biedl 1 year ago
parent
commit
2ccc489ab9

+ 1 - 1
debian/patches/debian/2020-12-28.install-in-usr-lib-nagios.patch

@@ -8,7 +8,7 @@ Forwarded: not-needed
 
 --- a/meson.build
 +++ b/meson.build
-@@ -75,7 +75,7 @@
+@@ -70,7 +70,7 @@
  endif
  
  executable('check_tang', 'tang.c',

+ 41 - 0
debian/patches/for-upstream/2021-01-10.adjust-for-new-tang-version.patch

@@ -0,0 +1,41 @@
+Subject: Update for newer tang versions
+Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
+Date: 2021-01-10
+Bug: https://github.com/latchset/nagios-tang/pull/4
+
+--- a/meson.build
++++ b/meson.build
+@@ -40,13 +40,8 @@
+   '/usr/libexec/tangd-keygen',
+   '/usr/local/libexec/tangd-keygen',
+ ], required: false)
+-updt = find_program([
+-  join_paths(libexecdir, 'tangd-update'),
+-  '/usr/libexec/tangd-update',
+-  '/usr/local/libexec/tangd-update',
+-], required: false)
+ 
+-if tang.found() and kgen.found() and updt.found() and actv.found()
++if tang.found() and kgen.found() and actv.found()
+   env = environment()
+   env.append('PATH',
+     meson.current_build_dir(),
+--- a/tang
++++ b/tang
+@@ -28,15 +28,13 @@
+ 
+ export TMP=`mktemp -d`
+ mkdir -p $TMP/db
+-mkdir -p $TMP/cache
+ 
+ # Generate the server keys
+ tangd-keygen $TMP/db
+-tangd-update $TMP/db $TMP/cache
+ 
+ # Start the server
+ port=`shuf -i 1024-65536 -n 1`
+-systemd-socket-activate --inet -l 127.0.0.1:$port -a $VALGRIND tangd $TMP/cache &
++systemd-socket-activate --inet -l 127.0.0.1:$port -a $VALGRIND tangd $TMP/db &
+ export PID=$!
+ sleep 0.5
+ 

+ 1 - 0
debian/patches/series

@@ -1,6 +1,7 @@
 # patches for upstream
 for-upstream/2020-12-28.use-asciidoctor-to-build-manpages.patch
 for-upstream/2020-12-28.install-as-check-tang.patch
+for-upstream/2021-01-10.adjust-for-new-tang-version.patch
 
 # patches for Debian only
 debian/2020-12-28.install-in-usr-lib-nagios.patch