summaryrefslogtreecommitdiffstats
path: root/network/wsdd2
diff options
context:
space:
mode:
Diffstat (limited to 'network/wsdd2')
-rw-r--r--network/wsdd2/README19
-rw-r--r--network/wsdd2/rc.wsdd22
-rw-r--r--network/wsdd2/slack-desc12
-rw-r--r--network/wsdd2/wsdd2.SlackBuild29
-rw-r--r--network/wsdd2/wsdd2.info10
-rw-r--r--network/wsdd2/wsdd2.patch11
6 files changed, 55 insertions, 28 deletions
diff --git a/network/wsdd2/README b/network/wsdd2/README
index f5e8736ab7..d164e3196a 100644
--- a/network/wsdd2/README
+++ b/network/wsdd2/README
@@ -1,19 +1,21 @@
-wsdd2 (WSD/LLMNR Descovery/Name Service Daemon)
+wsdd2 (WSD/LLMNR Discovery/Name Service Daemon)
-Provides samba share descovery for clients who don't support netbios
+Provides samba share discovery for clients who don't support netbios
or are running ip6 (which netbios does not support).
-Effectively this allows modern windows computers to find samba
-shares, and allows you to avoid smb1/smb2 for which there are many
-exploits in the wild. This is based on the NETGEAR implimentation.
+This is based on the NETGEAR implimentation.
NOTE: make sure you allow local ip6 connections in your samba config
otherwise there will be no shares found. if you use "hosts allow"
-then add fc00::/7 fe80::/64 ::1
+in smb.conf then add fc00::/7 fe80::/64 ::1
to the list of your local ip4 addresses so that local ip6 pcs can
use your shares.
-NOTE2: make sure ports 5357 (tcp) and 3702 (udp) are open if you
-are using a firewall.
+NOTE2: The following ports/addresses also need to be open if you are
+using a firewall:
+tcp port 3702 (unicast), and
+udp ports 3702 ( multicast on ports 239.255.255.250 / ff02::c )
+tcp port 5355 (unicast), and
+udp on ports 224.0.0.252 / ff02::1:3 (multicast)
to get wsdd2 to run automatically on startup add the following lines
in /etc/rc.d/rc.local
@@ -26,6 +28,7 @@ fi
and to stop it on shutdown, add the following to
samba section in /etc/rc.d/rc.local_shutdown
+#stop wsdd2 daemon
if [ -x /etc/rc.d/rc.wsdd2 ]; then
/etc/rc.d/rc.wsdd2 stop
fi
diff --git a/network/wsdd2/rc.wsdd2 b/network/wsdd2/rc.wsdd2
index 594e1faab5..1fcf58f995 100644
--- a/network/wsdd2/rc.wsdd2
+++ b/network/wsdd2/rc.wsdd2
@@ -6,7 +6,7 @@
#
# To make wsdd2 start automatically at boot make sure this
# file is executable, and add the following entry to rc.local
-# after the samba test (uncommented)
+# (uncommented)
# if [ -x /etc/rc.d/rc.wsdd2 ]; then
# /etc/rc.d/rc.wsdd2 start
diff --git a/network/wsdd2/slack-desc b/network/wsdd2/slack-desc
index 31fade9c60..41cfbcc117 100644
--- a/network/wsdd2/slack-desc
+++ b/network/wsdd2/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
-wsdd2: wsdd2 (WSD/LLMNR Descovery/Name Service Daemon)
+wsdd2: wsdd2 (WSD/LLMNR Discovery/Name Service Daemon)
wsdd2:
wsdd2: Provides samba share browsing for clients who don't support netbios
wsdd2: or are running ip6 (which netbios does not support).
-wsdd2: Effectively this allows modern windows computers to find samba
-wsdd2: shares, and allows you to avoid smb1/smb2 for which there are many
-wsdd2: exploits in the wild. This is based on the NETGEAR implimentation.
+wsdd2: This is based on the NETGEAR implimentation.
wsdd2:
-wsdd2: Don't forget to allow local ip6 connections in your smb.conf file.
+wsdd2: Don't forget to allow local ip6 connections in your smb.conf file,
+wsdd2: specifically, fc00::/7 fe80::/64 ::1
+wsdd2: Also in your firewall, make sure ports 3702 and 5355 are open.
wsdd2:
-wsdd2: Home Page https://github/Andy2244/wsdd2
+wsdd2: Home Page https://github.com/Netgear/wsdd2
diff --git a/network/wsdd2/wsdd2.SlackBuild b/network/wsdd2/wsdd2.SlackBuild
index deff03a691..072cf3d55d 100644
--- a/network/wsdd2/wsdd2.SlackBuild
+++ b/network/wsdd2/wsdd2.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for wsdd2
-# Copyright 2020 Tim Dickson Scotland
+# Copyright 2020,2022 Tim Dickson Scotland
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
+
PRGNAM=wsdd2
-VERSION=${VERSION:-1.8.3.2}
+VERSION=${VERSION:-1.8.7}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
esac
fi
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+ exit 0
+fi
+
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
@@ -71,12 +81,15 @@ find -L . \
#we are going to have to fix Makefile as we don't want systemd stuff
sed -i "/systemd/d" Makefile
-make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
-make install DESTDIR=$PKG MANINSTALLDIR="usr/man" INSTALLPREFIX="usr"
+#patch the source to remove generally useless warning
+# ie. warning about missing (entirely optional) parameters in smb.conf
+patch wsdd2.c <${CWD}/wsdd2.patch
+#note: hopefully upstream will fix this. https://github.com/Netgear/wsdd2/issues/39
+make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
+make install debug_W=-1 debug_L=-1 DESTDIR=$PKG MANDIR="/usr/man" INSTALLPREFIX="usr"
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
@@ -95,5 +108,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/wsdd2/wsdd2.info b/network/wsdd2/wsdd2.info
index 1fbfb16814..a839c31ffe 100644
--- a/network/wsdd2/wsdd2.info
+++ b/network/wsdd2/wsdd2.info
@@ -1,10 +1,10 @@
PRGNAM="wsdd2"
-VERSION="1.8.3.2"
-HOMEPAGE="https://github.com/Andy2244/wsdd2"
-DOWNLOAD="https://github.com/Andy2244/wsdd2/archive/1.8.3.2/wsdd2-1.8.3.2.tar.gz"
-MD5SUM="6ddc3411776bf102309f8edcde34115a"
+VERSION="1.8.7"
+HOMEPAGE="https://github.com/Netgear/wsdd2"
+DOWNLOAD="https://github.com/Netgear/wsdd2/archive/1.8.7/wsdd2-1.8.7.tar.gz"
+MD5SUM="6f59c63f07c8f42f05469d8020c0a604"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="%README%"
+REQUIRES=""
MAINTAINER="Tim Dickson"
EMAIL="dickson.tim@googlemail.com"
diff --git a/network/wsdd2/wsdd2.patch b/network/wsdd2/wsdd2.patch
new file mode 100644
index 0000000000..aec9c4baaa
--- /dev/null
+++ b/network/wsdd2/wsdd2.patch
@@ -0,0 +1,11 @@
+--- wsdd2.c 2021-08-09 20:22:46.000000000 +0100
++++ wsdd2u.c 2022-04-22 11:22:12.125000000 +0100
+@@ -601,7 +601,7 @@
+
+ char buf[PAGE_SIZE];
+ if (!fgets(buf, sizeof(buf), pp) || !buf[0] || buf[0] == '\n') {
+- DEBUG(0, W, "cannot read %s from testparm", name);
++ DEBUG(1, W, "cannot read %s from testparm", name);
+ result = strdup(_default);
+ } else { // trim whitespace
+ char *p;
generated by cgit v1.2.3 (git 2.32.0) at 2024-05-20 10:38:51 +0200