Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 19 Feb 2006 09:21:27 +0100
From:      "Timur I. Bakeyev" <timur@gnu.org>
To:        "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org>
Subject:   ports/93553: [MAINTAINER] Update of net/samba-libsmbclient to 3.0.21b
Message-ID:  <1140337287.30527@timur.home.bat.ru>
Resent-Message-ID: <200602190830.k1J8U8fo084148@freefall.freebsd.org>

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

>Number:         93553
>Category:       ports
>Synopsis:       [MAINTAINER] Update of net/samba-libsmbclient to 3.0.21b
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 19 08:30:07 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Timur I. Bakeyev
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
>Environment:


System: FreeBSD 6.0-STABLE #2: Sun Jan  8 03:29:17 CET 2006
    root@timur.home.bat.ru:/usr/src/sys/i386/compile/COMMON



>Description:


Update of a slave samba3 port and a bugfix for PR92619


>How-To-Repeat:





>Fix:


--- samba-libsmbclient.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/samba-libsmbclient/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile	9 Jan 2006 17:04:00 -0000	1.23
+++ Makefile	16 Feb 2006 21:55:50 -0000
@@ -21,60 +21,8 @@
 
 INSTALLS_SHLIB=		yes
 
-# We WANT shared libs
-CONFIGURE_ARGS+=	--with-libsmbclient
-SAMBA_INSTALL_LIBS=	libsmbclient
-
-.if defined(WITH_SHAREMODES)
-CONFIGURE_ARGS+=	--with-libsmbsharemodes
-SAMBA_INSTALL_LIBS+=	libsmbsharemodes
-PLIST_SUB+=		SHAREMODES=""
-.else
-PLIST_SUB+=		SHAREMODES="@comment "
-.endif
-
-.if defined(WITH_MSRPC)
-CONFIGURE_ARGS+=	--with-libmsrpc
-SAMBA_INSTALL_LIBS+=	libmsrpc
-PLIST_SUB+=		MSRPC=""
-.else
-PLIST_SUB+=		MSRPC="@comment "
-.endif
-# Don't check for python presence
-CONFIGURE_ARGS+=	--without-python
-
-MAN7=			libsmbclient.7
-
-do-build:
-	cd ${WRKSRC} && ${MAKE} proto
-	cd ${WRKSRC} && ${MAKE} libsmbclient
-.if defined(WITH_SHAREMODES)
-	cd ${WRKSRC} && ${MAKE} libsmbsharemodes
-.endif
-.if defined(WITH_MSRPC)
-	cd ${WRKSRC} && ${MAKE} cac
-.endif
-
-do-install:
-	-@${MKDIR} ${MAN8PREFIX}/man/man7
-.for man in ${MAN7}
-	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/${man} ${MAN7PREFIX}/man/man7
-.endfor
-	-@${MKDIR} ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/include/libsmbclient.h ${PREFIX}/include
-.if defined(WITH_MSRPC)
-	${INSTALL_DATA} ${WRKSRC}/include/libmsrpc.h ${PREFIX}/include
-.endif
-	-@${MKDIR} ${PREFIX}/lib
-.for lib in ${SAMBA_INSTALL_LIBS}
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${lib}.a ${PREFIX}/lib
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${lib}.so ${PREFIX}/lib/${lib}.so.0
-	${LN} -snf ${lib}.so.0 ${PREFIX}/lib/${lib}.so
-.endfor
-	-@${MKDIR} ${EXAMPLESDIR}
-	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/libsmbclient ${EXAMPLESDIR}
-.if defined(WITH_MSRPC)
-	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/libmsrpc ${EXAMPLESDIR}
-.endif
+OPTIONS=		ADS		"With Active Directory support" off \
+			MSRPC		"Build the libmsrpc shared library" off \
+			SHAREMODES	"Build the libsharemods shared library" off
 
 .include "${MASTERDIR}/Makefile"
Index: Makefile.inc
===================================================================
RCS file: Makefile.inc
diff -N Makefile.inc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile.inc	18 Feb 2006 04:27:15 -0000
@@ -0,0 +1,55 @@
+# Don't check for python presence
+CONFIGURE_ARGS+=	--without-python
+# We WANT shared libs
+CONFIGURE_ARGS+=	--with-libsmbclient
+SAMBA_INSTALL_LIBS=	libsmbclient
+
+.if defined(WITH_MSRPC)
+CONFIGURE_ARGS+=	--with-libmsrpc
+SAMBA_INSTALL_LIBS+=	libmsrpc
+PLIST_SUB+=		MSRPC=""
+.else
+PLIST_SUB+=		MSRPC="@comment "
+.endif
+
+.if defined(WITH_SHAREMODES)
+CONFIGURE_ARGS+=	--with-libsmbsharemodes
+SAMBA_INSTALL_LIBS+=	libsmbsharemodes
+PLIST_SUB+=		SHAREMODES=""
+.else
+PLIST_SUB+=		SHAREMODES="@comment "
+.endif
+
+MAN7=			libsmbclient.7
+
+do-build:
+	cd ${WRKSRC} && ${MAKE} proto
+	cd ${WRKSRC} && ${MAKE} libsmbclient
+.if defined(WITH_MSRPC)
+	cd ${WRKSRC} && ${MAKE} cac
+.endif
+.if defined(WITH_SHAREMODES)
+	cd ${WRKSRC} && ${MAKE} libsmbsharemodes
+.endif
+
+do-install:
+	-@${MKDIR} ${MAN8PREFIX}/man/man7
+.for man in ${MAN7}
+	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/${man} ${MAN7PREFIX}/man/man7
+.endfor
+	-@${MKDIR} ${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/include/libsmbclient.h ${PREFIX}/include
+.if defined(WITH_MSRPC)
+	${INSTALL_DATA} ${WRKSRC}/include/libmsrpc.h ${PREFIX}/include
+.endif
+	-@${MKDIR} ${PREFIX}/lib
+.for lib in ${SAMBA_INSTALL_LIBS}
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${lib}.a ${PREFIX}/lib
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${lib}.so ${PREFIX}/lib/${lib}.so.0
+	${LN} -snf ${lib}.so.0 ${PREFIX}/lib/${lib}.so
+.endfor
+	-@${MKDIR} ${EXAMPLESDIR}
+	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/libsmbclient ${EXAMPLESDIR}
+.if defined(WITH_MSRPC)
+	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/libmsrpc ${EXAMPLESDIR}
+.endif
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/net/samba-libsmbclient/pkg-descr,v
retrieving revision 1.4
diff -u -r1.4 pkg-descr
--- pkg-descr	9 Jan 2006 16:51:54 -0000	1.4
+++ pkg-descr	16 Feb 2006 18:14:58 -0000
@@ -1,4 +1,4 @@
 This is the set of shared libraries from the Samba port. It lets other
-programs to utialize various aspects of the SMB protocol.
+programs to utilize various aspects of the SMB protocol.
 
 WWW: http://www.samba.org/
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/samba-libsmbclient/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- pkg-plist	9 Jan 2006 16:51:54 -0000	1.5
+++ pkg-plist	16 Feb 2006 19:53:47 -0000
@@ -52,6 +52,9 @@
 %%EXAMPLESDIR%%/libsmbclient/get_auth_data_fn.h
 %%EXAMPLESDIR%%/libsmbclient/smbwrapper/Makefile
 %%EXAMPLESDIR%%/libsmbclient/smbwrapper/README
+%%EXAMPLESDIR%%/libsmbclient/smbwrapper/bsd-strlcat.c
+%%EXAMPLESDIR%%/libsmbclient/smbwrapper/bsd-strlcpy.c
+%%EXAMPLESDIR%%/libsmbclient/smbwrapper/bsd-strlfunc.h
 %%EXAMPLESDIR%%/libsmbclient/smbwrapper/opendir_smbsh.c
 %%EXAMPLESDIR%%/libsmbclient/smbwrapper/select.c
 %%EXAMPLESDIR%%/libsmbclient/smbwrapper/smbsh.c
@@ -68,6 +71,7 @@
 %%EXAMPLESDIR%%/libsmbclient/testread.c
 %%EXAMPLESDIR%%/libsmbclient/testsmbc.c
 %%EXAMPLESDIR%%/libsmbclient/teststat.c
+%%EXAMPLESDIR%%/libsmbclient/teststat2.c
 %%EXAMPLESDIR%%/libsmbclient/testutime.c
 %%EXAMPLESDIR%%/libsmbclient/tree.c
 @dirrm %%EXAMPLESDIR%%/libsmbclient/smbwrapper
--- samba-libsmbclient.diff ends here ---



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



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