svn commit: r537061 - in head/net/py-wsdd: . files
Hiroki Tagato
tagattie at FreeBSD.org
Sat May 30 08:28:30 UTC 2020
Author: tagattie
Date: Sat May 30 08:28:29 2020
New Revision: 537061
URL: https://svnweb.freebsd.org/changeset/ports/537061
Log:
Add patch to correctly set wsdd_group in rc.d script
PR: 246457
Submitted by: Yasuhiro KIMURA <yasu at utahime.org>
Approved by: hiroo.ono+freebsd at gmail.com (maintainer), mentors (implicit)
Added:
head/net/py-wsdd/files/
head/net/py-wsdd/files/patch-etc_rc.d_wsdd (contents, props changed)
Modified:
head/net/py-wsdd/Makefile
Modified: head/net/py-wsdd/Makefile
==============================================================================
--- head/net/py-wsdd/Makefile Sat May 30 08:22:05 2020 (r537060)
+++ head/net/py-wsdd/Makefile Sat May 30 08:28:29 2020 (r537061)
@@ -3,6 +3,7 @@
PORTNAME= wsdd
DISTVERSIONPREFIX= v
DISTVERSION= 0.5
+PORTREVISION= 1
CATEGORIES= net python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Added: head/net/py-wsdd/files/patch-etc_rc.d_wsdd
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/py-wsdd/files/patch-etc_rc.d_wsdd Sat May 30 08:28:29 2020 (r537061)
@@ -0,0 +1,19 @@
+--- etc/rc.d/wsdd.orig 2019-12-16 13:40:38 UTC
++++ etc/rc.d/wsdd
+@@ -9,14 +9,11 @@
+
+ name=wsdd
+ rcvar=wsdd_enable
+-wsdd_group=""
++wsdd_group=$(/usr/local/bin/testparm -s --parameter-name workgroup 2>/dev/null)
+
+-if which testparm >/dev/null 2>/dev/null; then
+- wsdd_group=$(testparm -s --parameter-name workgroup 2>/dev/null)
+-fi
++: ${wsdd_smb_config_file="/usr/local/etc/smb4.conf"}
+
+ # try to manually extract workgroup from samba configuration if testparm failed
+-wsdd_smb_config_file="/usr/local/etc/smb.conf"
+ if [ -z "$wsdd_group" ] && [ -r $wsdd_smb_config_file ]; then
+ wsdd_group="$(grep -i '^[[:space:]]*workgroup[[:space:]]*=' $wsdd_smb_config_file | cut -f2 -d= | tr -d '[:blank:]')"
+ fi
More information about the svn-ports-all
mailing list