From b56fca0aec976039207cea94d422143b80bc50e3 Mon Sep 17 00:00:00 2001 From: Tobias Tangemann Date: Sun, 20 Jan 2019 15:57:55 +0100 Subject: [PATCH 1/3] Minor changes + PKGBUILD for archlinux --- Makefile | 7 ++++--- PKGBUILD | 25 +++++++++++++++++++++++++ wsdd2.service | 7 ++++++- 3 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 PKGBUILD diff --git a/Makefile b/Makefile index 61d359b..22bb571 100644 --- a/Makefile +++ b/Makefile @@ -9,8 +9,9 @@ OBJFILES = wsdd2.o wsd.o llmnr.o HEADERS = wsdd.h wsd.h INSTALLPREFIX ?= $(PREFIX)/usr -SBININSTALLDIR = $(INSTALLPREFIX)/sbin +SBININSTALLDIR = $(INSTALLPREFIX)/bin MANINSTALLDIR = $(INSTALLPREFIX)/share/man +LIBINSTALLDIR = $(INSTALLPREFIX)/lib all: wsdd2 @@ -23,8 +24,8 @@ install: wsdd2 install wsdd2 $(DESTDIR)/$(SBININSTALLDIR) install -d $(DESTDIR)/$(MANINSTALLDIR)/man8 install wsdd2.8 $(DESTDIR)/$(MANINSTALLDIR)/man8/wsdd2.8 - install -d $(DESTDIR)/lib/systemd/system - install -m 0644 wsdd2.service $(DESTDIR)/lib/systemd/system + install -d $(DESTDIR)/$(LIBINSTALLDIR)/systemd/system + install -m 0644 wsdd2.service $(DESTDIR)/$(LIBINSTALLDIR)/systemd/system clean: rm -f wsdd2 $(OBJFILES) diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..386681a --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,25 @@ +pkgname=wsdd2 +pkgver=1.8 +pkgrel=1 +url="" +pkgdesc="WSDD and LLMNR daemon" +arch=('x86_64' 'armv7h') +license=('GPL3') +sources=('wsd.c' + 'wsdd2.8' + 'wsdd.h' + 'llmnr.c' + 'Makefile' + 'wsdd2.c' + 'wsdd2.service' + 'wsd.h') + +build() { + cd .. + make +} + +package() { + cd .. + make DESTDIR="$pkgdir/" install +} diff --git a/wsdd2.service b/wsdd2.service index f4a75a3..9ba168f 100644 --- a/wsdd2.service +++ b/wsdd2.service @@ -1,8 +1,13 @@ [Unit] Description=WSD/LLMNR Discovery/Name Service Daemon -PartOf=smbd.service +PartOf=smb.service [Service] +User=nobody +PrivateTmp=true +PrivateDevices=true +ProtectSystem=strict +ProtectHome=true ExecStart=/usr/sbin/wsdd2 ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure From d4af50f01a1ee64360e73241693c25a083d77cca Mon Sep 17 00:00:00 2001 From: Tobias Tangemann Date: Mon, 18 Feb 2019 00:36:58 +0100 Subject: [PATCH 2/3] Update systemd service file, now using DynmicUser --- wsdd2.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wsdd2.service b/wsdd2.service index 9ba168f..ee3b115 100644 --- a/wsdd2.service +++ b/wsdd2.service @@ -3,7 +3,7 @@ Description=WSD/LLMNR Discovery/Name Service Daemon PartOf=smb.service [Service] -User=nobody +DynamicUser=true PrivateTmp=true PrivateDevices=true ProtectSystem=strict From 1f67e72da305ffcb4dc18ebc08fabe691401be65 Mon Sep 17 00:00:00 2001 From: Tobias Tangemann Date: Mon, 18 Feb 2019 00:38:21 +0100 Subject: [PATCH 3/3] Update release --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 386681a..0a340de 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ pkgname=wsdd2 pkgver=1.8 -pkgrel=1 +pkgrel=2 url="" pkgdesc="WSDD and LLMNR daemon" arch=('x86_64' 'armv7h')