diff --git a/ws-discovery-udp.xml b/ws-discovery-udp.xml
deleted file mode 100644
index eaa7636..0000000
--- a/ws-discovery-udp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- WS-Discovery (UDP)
- Web Services Dynamic Discovery (WS-Discovery) is a technical specification that defines a multicast discovery protocol to locate services on a local network.
-
-
-
diff --git a/wsdd-0.7.1.tar.xz b/wsdd-0.7.1.tar.xz
deleted file mode 100644
index 0bcd9d5..0000000
--- a/wsdd-0.7.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:deb4e647c7dbcaace8a88100db83b9a80fa0f67b9490c04c76db2b142d4457a4
-size 35921
diff --git a/wsdd-0.8.tar.xz b/wsdd-0.8.tar.xz
new file mode 100644
index 0000000..ddff9b3
--- /dev/null
+++ b/wsdd-0.8.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:175b997518073ea82c95dadea50a0f01ffa4ff292cbb84b5e64f82e7e6c94fc9
+size 40455
diff --git a/wsdd-init.sh b/wsdd-init.sh
index 75a8c9b..4920e5f 100644
--- a/wsdd-init.sh
+++ b/wsdd-init.sh
@@ -19,8 +19,7 @@ fi
WSDD_INTERFACE_ARGS=""
if [ "${WSDD_INTERFACES}" != "" ]; then
- for intf in "${WSDD_INTERFACES[@]}"; do
- echo ${intf}
+ for intf in ${WSDD_INTERFACES}; do
WSDD_INTERFACE_ARGS="${WSDD_INTERFACE_ARGS} -i \"${intf}\""
done
fi
diff --git a/wsdd.changes b/wsdd.changes
index ff75e64..01fcb4c 100644
--- a/wsdd.changes
+++ b/wsdd.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Sun Mar 31 14:32:53 UTC 2024 - Herbert Graeber
+
+- Update to version 0.8
+ * Configuration files for firewalld added
+ * Show device type and allow filtering in API's list command
+ * Add option --metadata-timeout to set the timeout for the HTTP-based
+ metadata exchange
+ * The employed UUID is now read from /etc/{machine-id,hostid} before
+ falling by back to the UUID derivation from the host name.
+ * Handle addresses with zone id by ignoring the interface part
+ * Do not crash with asyncio future error when non-existing interface is
+ provided
+- Remove some bashism from wsdd-init.sh
+- Use the unmodified service files from wsdd for Leap 15.5 and below, else
+ reuse ws-discovery-udp service from firewalld
+
-------------------------------------------------------------------
Fri Feb 23 10:39:43 UTC 2024 - pgajdos@suse.com
diff --git a/wsdd.spec b/wsdd.spec
index 729cdcd..bd32b8f 100644
--- a/wsdd.spec
+++ b/wsdd.spec
@@ -17,7 +17,7 @@
Name: wsdd
-Version: 0.7.1
+Version: 0.8
Release: 0
Summary: A Web Service Discovery host daemon
License: MIT
@@ -25,13 +25,12 @@ URL: https://github.com/christgau/wsdd
Source: https://github.com/christgau/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.xz
Source1: %{name}-init.sh
Source2: %{name}.service.in
+%if 0%{suse_version} >= 1599
Source3: %{name}.xml
+%endif
Source4: sysconfig.%{name}
Source5: %{name}.conf
Source6: %{name}-user.conf
-%if 0%{suse_version} < 1599
-Source7: ws-discovery-udp.xml
-%endif
Patch1: %{name}-shebang.patch
BuildRequires: firewall-macros
BuildRequires: python-rpm-macros
@@ -69,10 +68,12 @@ install -m 644 -D man/wsdd.8 %{buildroot}/%{_mandir}/man8/wsdd.8
install -m 755 -D %{SOURCE1} %{buildroot}%{_libexecdir}/wsdd-init.sh
mkdir -p %{buildroot}%{_unitdir}
sed 's#@LIBEXECDIR@#%{_libexecdir}#' %{SOURCE2} >%{buildroot}%{_unitdir}/wsdd.service
+%if 0%{?sle_version} < 150600
+install -m 644 -D etc/firewalld/services/wsdd.xml %{buildroot}%{_prefix}/lib/firewalld/services/wsdd.xml
+%else
install -m 644 -D %{SOURCE3} %{buildroot}%{_prefix}/lib/firewalld/services/wsdd.xml
-%if 0%{suse_version} < 1599
-install -m 644 -D %{SOURCE7} %{buildroot}%{_prefix}/lib/firewalld/services/ws-discovery-udp.xml
%endif
+install -m 644 -D etc/firewalld/services/wsdd-http.xml %{buildroot}%{_prefix}/lib/firewalld/services/wsdd-http.xml
install -m 644 -D %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.wsdd
install -m 755 -d %{buildroot}%{_sbindir}
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
@@ -84,6 +85,8 @@ mkdir -p %{buildroot}%{_sysusersdir}
install -m 0644 %{SOURCE6} %{buildroot}%{_sysusersdir}/
%python3_fix_shebang
+%check
+
%pre -f %{name}.pre
%service_add_pre wsdd.service
@@ -111,9 +114,7 @@ install -m 0644 %{SOURCE6} %{buildroot}%{_sysusersdir}/
%dir %{_prefix}/lib/firewalld
%dir %{_prefix}/lib/firewalld/services
%{_prefix}/lib/firewalld/services/wsdd.xml
-%if 0%{suse_version} < 1599
-%{_prefix}/lib/firewalld/services/ws-discovery-udp.xml
-%endif
+%{_prefix}/lib/firewalld/services/wsdd-http.xml
%{_fillupdir}/sysconfig.%{name}
%{_sysusersdir}/%{name}-user.conf
%dir %attr(0755,wsdd,wsdd) %ghost /run/%{name}
diff --git a/wsdd.xml b/wsdd.xml
index 6a9dd21..0bc96e1 100644
--- a/wsdd.xml
+++ b/wsdd.xml
@@ -2,6 +2,6 @@
wsdd
Web Service Discovery
-
+