From 55fdfae23a5a80d40ffa97c7db3d3da8794dcd8151a16522c20f882716d06386 Mon Sep 17 00:00:00 2001
From: Herbert Graeber <herbert@graeber-clan.de>
Date: Fri, 1 Jul 2022 14:46:31 +0000
Subject: [PATCH] Accepting request 986075 from home:hgraeber:branches:network

Include ws-discovery-udp service from firewalld 1.0 as part of wsdd.xml, to restrict port 3702 to multicast use.

OBS-URL: https://build.opensuse.org/request/show/986075
OBS-URL: https://build.opensuse.org/package/show/network/wsdd?expand=0&rev=23
---
 ws-discovery-udp.xml |  7 +++++++
 wsdd.changes         |  5 +++++
 wsdd.spec            | 11 ++++++++++-
 wsdd.xml             |  2 +-
 4 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 ws-discovery-udp.xml

diff --git a/ws-discovery-udp.xml b/ws-discovery-udp.xml
new file mode 100644
index 0000000..eaa7636
--- /dev/null
+++ b/ws-discovery-udp.xml
@@ -0,0 +1,7 @@
+<?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.changes b/wsdd.changes
index 934c14f..291d3d2 100644
--- a/wsdd.changes
+++ b/wsdd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jun 29 20:07:14 UTC 2022 - Herbert Graeber <herbert@graeber-clan.de>
+
+- Include ws-discovey-udp service from firewalld 1.0 as part of wsdd.xml
+
 -------------------------------------------------------------------
 Thu Feb 24 16:36:40 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
 
diff --git a/wsdd.spec b/wsdd.spec
index 77623a2..dc6d010 100644
--- a/wsdd.spec
+++ b/wsdd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package wsdd
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,6 +29,9 @@ Source3:        %{name}.xml
 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:  python3
@@ -61,6 +64,9 @@ install -m 755 -D %{SOURCE1} %{buildroot}%{_libexecdir}/wsdd-init.sh
 mkdir -p %{buildroot}%{_unitdir}
 sed 's#@LIBEXECDIR@#%{_libexecdir}#' %{SOURCE2} >%{buildroot}%{_unitdir}/wsdd.service
 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 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.wsdd
 install -m 755 -d %{buildroot}%{_sbindir}
 ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
@@ -98,6 +104,9 @@ 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
 %{_fillupdir}/sysconfig.%{name}
 %{_sysusersdir}/%{name}-user.conf
 %dir %attr(0755,wsdd,wsdd) %ghost /run/%{name}
diff --git a/wsdd.xml b/wsdd.xml
index e3bf98f..6a9dd21 100644
--- a/wsdd.xml
+++ b/wsdd.xml
@@ -3,5 +3,5 @@
   <short>wsdd</short>
   <description>Web Service Discovery</description>
   <port protocol="tcp" port="5357"/>
-  <port protocol="udp" port="3702"/>
+  <include service="ws-discovery-udp"/>
 </service>