ports/86850: [patch] port www/squid builds smb_auth with the wrong path to samba

[Dean M. Phillips]

>Number:         86850
>Category:       ports
>Synopsis:       [patch] port www/squid builds smb_auth with the wrong path to samba
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 03 02:20:14 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Dean M. Phillips
>Release:        FreeBSD 5.4-STABLE #2: Tue Aug  2 19:52:40 CDT 2005
>Organization:
None Whatsoever!
>Environment:
FreeBSD deanstoy 5.4-STABLE FreeBSD 5.4-STABLE #2: Tue Aug  2 19:52:40 CDT 2005     netadmin at deanstoy:/usr/obj/usr/src/sys/DEANSTOY  i386

Port version: squid-2.5.11_1

>Description:
The www/squid autoconfig program does not test for the actual configuration of the net/samba smbclient program.  Instead it hardcodes it to /usr/local/samba, while net/samba installs in /usr/local by default.  Since smb_auth can not execute smbclient, it returns a failure every time denying all users access to the cache.
>How-To-Repeat:
Set up proxy auth using smb_auth as instructed in the port documentation.

>Fix:
This 'fix' is really a bandaid, but it worked for me :)

Replace patch-helpers-basic_auth-SMB-smb_auth.sh with:

*** helpers/basic_auth/SMB/smb_auth.sh.orig	Sun Jan  7 17:36:46 2001
--- helpers/basic_auth/SMB/smb_auth.sh	Sun Oct  2 20:55:30 2005
***************
*** 17,22 ****
--- 17,24 ----
  # along with this program; if not, write to the Free Software
  # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  
+ SAMBAPREFIX=${SAMBAPREFIX:-/usr/local}
+ 
  read DOMAINNAME
  read PASSTHROUGH
  read NMBADDR

Add patch-helpers-basic_auth-SMB-Makefile.am:
*** helpers/basic_auth/SMB/Makefile.am.orig	Sun Oct  2 20:43:34 2005
--- helpers/basic_auth/SMB/Makefile.am	Sun Oct  2 20:44:22 2005
***************
*** 14,20 ****
  ## FIXME: autoconf should test for the samba path.
  
  SMB_AUTH_HELPER	= smb_auth.sh
! SAMBAPREFIX=/usr/local/samba
  SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
  
  libexec_SCRIPTS	= $(SMB_AUTH_HELPER)
--- 14,20 ----
  ## FIXME: autoconf should test for the samba path.
  
  SMB_AUTH_HELPER	= smb_auth.sh
! SAMBAPREFIX=/usr/local
  SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
  
  libexec_SCRIPTS	= $(SMB_AUTH_HELPER)

Add patch-helpers-basic_auth-SMB-Makefile.in:
*** helpers/basic_auth/SMB/Makefile.in.orig	Sun Oct  2 20:43:47 2005
--- helpers/basic_auth/SMB/Makefile.in	Sun Oct  2 20:44:44 2005
***************
*** 129,135 ****
  makesnmplib = @makesnmplib@
  
  SMB_AUTH_HELPER = smb_auth.sh
! SAMBAPREFIX = /usr/local/samba
  SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
  
  libexec_SCRIPTS = $(SMB_AUTH_HELPER)
--- 129,135 ----
  makesnmplib = @makesnmplib@
  
  SMB_AUTH_HELPER = smb_auth.sh
! SAMBAPREFIX = /usr/local
  SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
  
  libexec_SCRIPTS = $(SMB_AUTH_HELPER)

>Release-Note:
>Audit-Trail:
>Unformatted: