diff --git a/.gitignore b/.gitignore index 79706dd..1064cf7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,4 @@ /wsdd-0.6.4.tar.gz /wsdd-0.7.0.tar.gz /wsdd-0.7.1.tar.gz -/c4a5f346bbb22777a8f66b0d6c6ef899f6d6cc74.patch +/wsdd-0.8.tar.gz diff --git a/Modify-systemd-service-for-Fedora.patch b/Modify-systemd-service-for-Fedora.patch new file mode 100644 index 0000000..763a583 --- /dev/null +++ b/Modify-systemd-service-for-Fedora.patch @@ -0,0 +1,48 @@ +From 716ab555a99350e60a11066f912df65a0bb01c35 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy +Date: Wed, 17 Apr 2024 12:50:08 +0200 +Subject: [PATCH] Modify systemd service for Fedora + +Those changes are needed to honor Fedora package guidelines and for +backward compatibility. +--- + etc/systemd/wsdd.defaults | 2 +- + etc/systemd/wsdd.service | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/etc/systemd/wsdd.defaults b/etc/systemd/wsdd.defaults +index 3c8373e..518fe6f 100644 +--- a/etc/systemd/wsdd.defaults ++++ b/etc/systemd/wsdd.defaults +@@ -2,4 +2,4 @@ + # Use, e.g., "-i eth0" to restrict operations to a specific interface + # Refer to the wsdd(8) man page for details + +-WSDD_PARAMS="" ++OPTIONS="" +diff --git a/etc/systemd/wsdd.service b/etc/systemd/wsdd.service +index eea4670..a6d20c6 100644 +--- a/etc/systemd/wsdd.service ++++ b/etc/systemd/wsdd.service +@@ -7,15 +7,15 @@ Wants=network-online.target + ; It makes sense to have Samba running when wsdd starts, but is not required. + ; Thus, the next to lines are disabled and use BindsTo only. + ; One may also add any of these services to After for stronger binding. +-;BindsTo=smb.service ++BindsTo=smb.service + ;BindsTo=samba.service + + [Service] + Type=simple +-EnvironmentFile=/etc/default/wsdd ++EnvironmentFile=-/etc/sysconfig/wsdd + ; The service is put into an empty runtime directory chroot, + ; i.e. the runtime directory which usually resides under /run +-ExecStart=/usr/bin/wsdd --shortlog --chroot=/run/wsdd $WSDD_PARAMS ++ExecStart=/usr/bin/wsdd --shortlog --chroot=/run/wsdd $OPTIONS + DynamicUser=yes + User=wsdd + Group=wsdd +-- +2.44.0 + diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..3334bd2 --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = fedora epel diff --git a/sources b/sources index 5d04c86..d171d39 100644 --- a/sources +++ b/sources @@ -1,6 +1 @@ -SHA512 (wsdd.xml) = 36def332798589dde0a5c514f64812f888208e18b8ccd163f1e1ab80fd81838c9b6c900f5e4d1a45ace571b1effa16182ad8116c7bdd836a4c8cf36f49bd863e -SHA512 (wsdd-http.xml) = 6238be4d37eaeb412ce87f67cd6fa19af3a3dea25c1a23537eff6955eaf7bcce399a13d845107b65a3c4bb0bc89d4bf372570742aa5ed0b2f7ecfd0598c1a23e -SHA512 (wsdd.service) = a72cc7dd883773e48c785a019da5f904a0d6adb85e9fe623275612ee4a59275df46c8af9a11643dd61e6205079e94fd8358617fca30c68b0249f8973615713bc -SHA512 (wsdd.sysconfig) = 87738cd4c05cf7f18119bb02c684717e6ba056843e102ef6a95a7d38af3faec720790117e8b651d6af512d17507a2fff37f0486575cffc90cd69943c475c8048 -SHA512 (wsdd-0.7.1.tar.gz) = 3d65fd5d5b4bd6ff37409e07301e082ffd2bb5df184cc12730e2cb2d36ebef030c6121b515af9c7eca59562e73414c7da6f7a6cd1b05c3bb27745e402cd7f684 -SHA512 (c4a5f346bbb22777a8f66b0d6c6ef899f6d6cc74.patch) = c62db956545545faf889398bff6429817f1d23ca9d76095870251cc434675ca869f777a2d0b95f18781ffdd40d069e838b5bf712b8f02a7fa157a2939658e190 +SHA512 (wsdd-0.8.tar.gz) = e3e5164f9ebe39c979456169bf1b0c6c4cd974792f08fa4dfab9c313fba88ae1208a8112db09c3655719b4e26bfc2616f844f17d2a245132c2f5b22e978e3c20 diff --git a/wsdd.spec b/wsdd.spec index 9c961f1..b843d1a 100644 --- a/wsdd.spec +++ b/wsdd.spec @@ -1,19 +1,15 @@ Name: wsdd -Version: 0.7.1 -Release: 2%{?dist} +Version: 0.8 +Release: 7%{?dist} Summary: Web Services Dynamic Discovery host daemon License: MIT URL: https://github.com/christgau/wsdd Source0: https://github.com/christgau/wsdd/archive/v%{version}/wsdd-%{version}.tar.gz -Source1: wsdd.service -Source2: wsdd.xml -Source3: wsdd-http.xml -Source4: wsdd.sysconfig -# https://github.com/christgau/wsdd/issues/149 -Patch: c4a5f346bbb22777a8f66b0d6c6ef899f6d6cc74.patch + +Patch: Modify-systemd-service-for-Fedora.patch + BuildArch: noarch BuildRequires: systemd -Requires(pre): shadow-utils %description @@ -27,20 +23,21 @@ like Windows. %install -install -pDm644 %{S:1} %{buildroot}%{_unitdir}/wsdd.service -install -pDm644 %{S:2} %{buildroot}%{_usr}/lib/firewalld/services/wsdd.xml -install -pDm644 %{S:3} %{buildroot}%{_usr}/lib/firewalld/services/wsdd-http.xml -install -pDm644 %{S:4} %{buildroot}%{_sysconfdir}/sysconfig/wsdd +install -pDm644 etc/firewalld/services/wsdd.xml %{buildroot}%{_usr}/lib/firewalld/services/wsdd.xml +install -pDm644 etc/firewalld/services/wsdd-http.xml %{buildroot}%{_usr}/lib/firewalld/services/wsdd-http.xml +install -pDm644 etc/systemd/wsdd.defaults %{buildroot}%{_sysconfdir}/sysconfig/wsdd +install -pDm644 etc/systemd/wsdd.service %{buildroot}%{_unitdir}/wsdd.service install -pDm644 man/wsdd.8 %{buildroot}%{_mandir}/man8/wsdd.8 install -pDm755 src/wsdd.py %{buildroot}%{_bindir}/wsdd +# Create a sysusers.d config file +cat >wsdd.sysusers.conf </dev/null || groupadd -r wsdd -getent passwd wsdd >/dev/null || \ - useradd -r -g wsdd -d / -s /sbin/nologin \ - -c "%{summary}" wsdd -exit 0 %post %systemd_post wsdd.service @@ -60,15 +57,52 @@ exit 0 %{_mandir}/man8/wsdd.8* %license LICENSE %doc AUTHORS README.md +%{_sysusersdir}/wsdd.conf %changelog -* Sun Dec 17 2023 Sam P - 0.7.1-2 -- Reverted EPEL7 compatibility breaking changes +* Fri Jul 17 2026 Fedora Release Engineering - 0.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 0.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 0.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 0.8-4 +- Add sysusers.d config file to allow rpm to create users/groups automatically + +* Sun Jan 19 2025 Fedora Release Engineering - 0.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 0.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Apr 17 2024 Ondrej Holy - 0.8.0-1 +- Update to 0.8 + +* Fri Feb 16 2024 Ondrej Holy - 0.7.1-3 +- Fix backward compatibility (#2254986) + +* Sat Jan 27 2024 Fedora Release Engineering - 0.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild * Fri Oct 06 2023 Ondrej Holy - 0.7.1-1 - Update to 0.7.1. +* Sat Jul 22 2023 Fedora Release Engineering - 0.7.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 0.7.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 0.7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 0.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Dec 03 2021 survient@fedoraproject.org - 0.7.0-1 - Latest upstream release.