From dcb0f21471c33e036e19dd6da12f00a2f742debf Mon Sep 17 00:00:00 2001 From: factory-maintainer <> Date: Apr 10 2024 15:54:20 +0000 Subject: Update wsdd to version 0.8 / rev 13 via SR 1166627 https://build.opensuse.org/request/show/1166627 by user factory-maintainer + anag+factory Automatic submission by obs-autosubmit --- diff --git a/.files b/.files index cf9421f..49263b6 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 5a02bba..ffb26fc 100644 --- a/.rev +++ b/.rev @@ -95,4 +95,12 @@ <comment></comment> <requestid>1150031</requestid> </revision> + <revision rev="13" vrev="1"> + <srcmd5>a251affae2013b904be067e00529a5ad</srcmd5> + <version>0.8</version> + <time>1712764123</time> + <user>anag+factory</user> + <comment>Automatic submission by obs-autosubmit</comment> + <requestid>1166627</requestid> + </revision> </revisionlist> diff --git a/ws-discovery-udp.xml b/ws-discovery-udp.xml deleted file mode 100644 index f712ae8..0000000 --- a/ws-discovery-udp.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<service> - <short>WS-Discovery (UDP)</short> - <description>Web Services Dynamic Discovery (WS-Discovery) is a technical specification that defines a multicast discovery protocol to locate services on a local network.</description> - <port protocol="udp" port="3702"/> - <destination ipv4="239.255.255.250" ipv6="ff02::c"/> -</service> diff --git a/wsdd-0.7.1.tar.xz b/wsdd-0.7.1.tar.xz deleted file mode 120000 index 9a2d9d6..0000000 --- a/wsdd-0.7.1.tar.xz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafkreig6wttepr63zkworkebadnyhonib6qpm64usdaey5w3fmkc2rcxuq \ No newline at end of file diff --git a/wsdd-0.8.tar.xz b/wsdd-0.8.tar.xz new file mode 120000 index 0000000..5101fa9 --- /dev/null +++ b/wsdd-0.8.tar.xz @@ -0,0 +1 @@ +/ipfs/bafkreiaxlomxkgahh2uczfo232squdyb76sp6kjmxocllzspqlt6nskpze \ No newline at end of file diff --git a/wsdd-init.sh b/wsdd-init.sh index a677691..0a317aa 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 e279382..07da92d 100644 --- a/wsdd.changes +++ b/wsdd.changes @@ -1,4 +1,26 @@ ------------------------------------------------------------------- +Wed Apr 3 10:52:13 UTC 2024 - Herbert Graeber <herbert@graeber-clan.de> + +- Fix build for SLE_15 + +------------------------------------------------------------------- +Sun Mar 31 14:32:53 UTC 2024 - Herbert Graeber <herbert@graeber-clan.de> + +- 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 - remove dependency on /usr/bin/python3 using diff --git a/wsdd.spec b/wsdd.spec index a4365fb..3a329af 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} @@ -82,7 +83,9 @@ mkdir -p %{buildroot}/run/wsdd mkdir -p %{buildroot}%{_localstatedir}/lib/wsdd mkdir -p %{buildroot}%{_sysusersdir} install -m 0644 %{SOURCE6} %{buildroot}%{_sysusersdir}/ -%python3_fix_shebang +%?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 435b32a..3437616 100644 --- a/wsdd.xml +++ b/wsdd.xml @@ -2,6 +2,6 @@ <service> <short>wsdd</short> <description>Web Service Discovery</description> - <port protocol="tcp" port="5357"/> + <include service="wsdd-http"/> <include service="ws-discovery-udp"/> </service>