Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Jun 2007 00:34:15 GMT
From:      bf<bf2006a@yahoo.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/113395: [PATCH] net/samba-libsmbclient handles options incorrectly
Message-ID:  <200706060034.l560YFKG067440@www.freebsd.org>
Resent-Message-ID: <200706060040.l560e2im039257@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         113395
>Category:       ports
>Synopsis:       [PATCH] net/samba-libsmbclient handles options incorrectly
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 06 00:40:02 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     bf
>Release:        
>Organization:
>Environment:
>Description:
Since libmsrpc and libsmbsharemodes are built by default on platforms that support shared libraries, they must be explicitly disabled if they are not desired.  Currently, the samba-libsmbclient Makefile.inc does not do this.  Also,
there should be a choice of using the popt port libraries as opposed to the bundled popt libraries with the samba-libsmbclient port, just as there is for the samba3 port.  Three files must be patched to make the above changes:






--- samba-libsmbclient/Makefile.orig	Tue Jun  5 20:19:32 2007
+++ samba-libsmbclient/Makefile	Tue Jun  5 20:24:05 2007
@@ -21,8 +21,9 @@
 
 USE_LDCONFIG=		yes
 
-OPTIONS=		ADS		"With Active Directory support" off \
+OPTIONS=		POPT		"With system-wide POPT library" on \	
+			ADS		"With Active Directory support" off \
 			MSRPC		"Build the libmsrpc shared library" off \
-			SHAREMODES	"Build the libsharemods shared library" off
+			SHAREMODES	"Build the libsharemodes shared library" off
 
 .include "${MASTERDIR}/Makefile"










--- samba-libsmbclient/Makefile.inc.orig	Tue Jun  5 19:56:54 2007
+++ samba-libsmbclient/Makefile.inc	Tue Jun  5 20:03:20 2007
@@ -9,6 +9,7 @@
 SAMBA_INSTALL_LIBS+=	libmsrpc
 PLIST_SUB+=		MSRPC=""
 .else
+CONFIGURE_ARGS+=	--without-libmsrpc
 PLIST_SUB+=		MSRPC="@comment "
 .endif
 
@@ -17,6 +18,7 @@
 SAMBA_INSTALL_LIBS+=	libsmbsharemodes
 PLIST_SUB+=		SHAREMODES=""
 .else
+CONFIGURE_ARGS+=	--without-libsmbsharemodes
 PLIST_SUB+=		SHAREMODES="@comment "
 .endif
 










--- samba3/Makefile.orig	Tue Jun  5 19:57:37 2007
+++ samba3/Makefile	Tue Jun  5 20:01:03 2007
@@ -76,7 +76,7 @@
 		DNSUPDATE	"With dynamic DNS update" off \
 		EXP_MODULES	"With experimental modules" off \
 		POPT		"With system-wide POPT library" on \
-		MAX_DEBUG	"With maximum debuging" off \
+		MAX_DEBUG	"With maximum debugging" off \
 		SMBTORTURE	"With smbtorture" off
 .endif
 
@@ -236,18 +236,20 @@
 CONFIGURE_ARGS+=	--without-aio-support
 .endif
 
+# !SAMBA_SUBPORT
+.endif
+
+###
+### Common part for port and it's subports
+###
+
 .if !defined(WITHOUT_POPT)
 LIB_DEPENDS+=		popt.0:${PORTSDIR}/devel/popt
 CONFIGURE_ARGS+=	--without-included-popt
 .else
 CONFIGURE_ARGS+=	--with-included-popt
 .endif
-# !SAMBA_SUBPORT
-.endif
 
-###
-### Common part for port and it's subports
-###
 # For 4.8 - 4.11 combination of Kerberos and OpenLDAP is broken
 # due the conflict between system and OpenSSL port libcrypto libraries
 .if ${OSVERSION} > 470103 && ${OSVERSION} < 500000

>How-To-Repeat:

>Fix:


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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200706060034.l560YFKG067440>