smbd/nmbd no longer start if samba_enable="YES" is the only parameter set. Fix: Revert the patch on samba.in will restore things. The patch has moved the defaulting of nmbd_enable/smbd_enable to YES if not set and samba_enabled is YES. It has been moved to where, to after where nmbd_enable/smbd_enable are defaulted to NO if not set. How-To-Repeat: Update to 3.6.20, and /usr/local/etc/rc.d/samba won't stop or start smbd/nmbd anymore.
Responsible Changed From-To: freebsd-ports-bugs->timur Over to maintainer (via the GNATS Auto Assign Tool)
Author: timur Date: Sun Nov 17 22:16:16 2013 New Revision: 334130 URL: http://svnweb.freebsd.org/changeset/ports/334130 Log: Attempt to fix broken init script. Hope, this time it's OK :) PR: 184037 Modified: head/net/samba36/Makefile head/net/samba36/files/samba.in Modified: head/net/samba36/Makefile ============================================================================== --- head/net/samba36/Makefile Sun Nov 17 22:09:53 2013 (r334129) +++ head/net/samba36/Makefile Sun Nov 17 22:16:16 2013 (r334130) @@ -2,7 +2,7 @@ PORTNAME= ${SAMBA_BASENAME}36 PORTVERSION= 3.6.20 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= net MASTER_SITES= ${MASTER_SITE_SAMBA} MASTER_SITE_SUBDIR= samba samba/stable samba/pre Modified: head/net/samba36/files/samba.in ============================================================================== --- head/net/samba36/files/samba.in Sun Nov 17 22:09:53 2013 (r334129) +++ head/net/samba36/files/samba.in Sun Nov 17 22:16:16 2013 (r334130) @@ -164,6 +164,11 @@ samba_config_init() { fi # Defaults samba_enable=${samba_enable:=NO} + # Setup dependent variables + if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then + nmbd_enable=${nmbd_enable=YES} + smbd_enable=${smbd_enable=YES} + fi nmbd_enable=${nmbd_enable:=NO} smbd_enable=${smbd_enable:=NO} %%WINBIND%% # Winbindd @@ -175,11 +180,6 @@ samba_config_init() { %%WINBIND%% fi %%WINBIND%% winbindd_enable=${winbindd_enable:=NO} %%WINBIND%% fi - # Setup dependent variables - if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then - nmbd_enable=${nmbd_enable=YES} - smbd_enable=${smbd_enable=YES} - fi } # Load configuration variables _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, with minor changes. Thanks!