ports/85278: Update of net/libsmbclient and net/py-samba to 3.0.20

[Timur I. Bakeyev]

>Number:         85278
>Category:       ports
>Synopsis:       Update of net/libsmbclient and net/py-samba to 3.0.20
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 25 01:40:11 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Timur I. Bakeyev
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:


System: FreeBSD 5.4-STABLE #5: Wed Jun 22 01:05:10 CEST 2005
    root at timur.home.bat.ru:/usr/src/sys/i386/compile/COMMON



>Description:


This is an update for two Samba slave ports, libsmbclient and py-samba to the 3.0.20 version.


>How-To-Repeat:





>Fix:


--- py-samba.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/py-samba/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	7 Feb 2005 05:22:17 -0000	1.4
+++ Makefile	23 Aug 2005 03:07:11 -0000
@@ -35,6 +35,9 @@
 CONFIGURE_ARGS+=	--without-ldapsam
 CONFIGURE_ARGS+=	--without-pam_smbpass
 
+CONFIGURE_ARGS+=	--without-krb5
+CONFIGURE_ARGS+=	--without-ads
+
 do-build:
 	cd ${WRKSRC} && ${MAKE} proto
 	cd ${WRKSRC} && ${MAKE} python_ext
@@ -42,6 +45,7 @@
 post-install:
 	-@${MKDIR} ${EXAMPLESDIR}
 	@${CP} -Rp ${WRKSRC}/python/examples/* ${EXAMPLESDIR}
-	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/scripts/python/* ${EXAMPLESDIR}
+	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/scripts/shares/python/* \
+	    ${EXAMPLESDIR}
 
 .include "${MASTERDIR}/Makefile"
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/py-samba/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist	7 Feb 2005 05:22:17 -0000	1.2
+++ pkg-plist	23 Aug 2005 03:07:36 -0000
@@ -14,6 +14,7 @@
 %%PYTHON_SITELIBDIR%%/samba/winbind.so
 %%PYTHON_SITELIBDIR%%/samba/winreg.so
 %%EXAMPLESDIR%%/SambaConfig.py
+%%EXAMPLESDIR%%/SambaParm.py
 %%EXAMPLESDIR%%/generate_parm_table.py
 %%EXAMPLESDIR%%/modify_samba_config.py
 %%EXAMPLESDIR%%/smbparm.py
--- py-samba.diff ends here ---

--- samba-lib.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/samba-libsmbclient/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- Makefile	22 Apr 2005 08:21:28 -0000	1.19
+++ Makefile	23 Aug 2005 03:08:07 -0000
@@ -33,11 +33,20 @@
 CONFIGURE_ARGS+=	--without-ldapsam
 CONFIGURE_ARGS+=	--without-pam_smbpass
 
+CONFIGURE_ARGS+=	--without-krb5
+CONFIGURE_ARGS+=	--without-ads
+
+MAN8=			libsmbclient.8
+
 do-build:
 	cd ${WRKSRC} && ${MAKE} proto
 	cd ${WRKSRC} && ${MAKE} libsmbclient
 
 do-install:
+	-@${MKDIR} ${MAN8PREFIX}/man/man8
+.for man in ${MAN8}
+	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/${man} ${MAN8PREFIX}/man/man8
+.endfor
 	-@${MKDIR} ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/include/libsmbclient.h ${PREFIX}/include
 	-@${MKDIR} ${PREFIX}/lib
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/samba-libsmbclient/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- pkg-plist	9 May 2004 20:34:40 -0000	1.3
+++ pkg-plist	23 Aug 2005 02:41:00 -0000
@@ -2,10 +2,26 @@
 lib/libsmbclient.a
 lib/libsmbclient.so
 lib/libsmbclient.so.0
+%%EXAMPLESDIR%%/get_auth_data_fn.h
+%%EXAMPLESDIR%%/smbwrapper/Makefile
+%%EXAMPLESDIR%%/smbwrapper/README
+%%EXAMPLESDIR%%/smbwrapper/opendir_smbsh.c
+%%EXAMPLESDIR%%/smbwrapper/select.c
+%%EXAMPLESDIR%%/smbwrapper/smbsh.c
+%%EXAMPLESDIR%%/smbwrapper/smbw.c
+%%EXAMPLESDIR%%/smbwrapper/smbw.h
+%%EXAMPLESDIR%%/smbwrapper/smbw_dir.c
+%%EXAMPLESDIR%%/smbwrapper/smbw_stat.c
+%%EXAMPLESDIR%%/smbwrapper/wrapper.c
+%%EXAMPLESDIR%%/smbwrapper/wrapper.h
 %%EXAMPLESDIR%%/Makefile
 %%EXAMPLESDIR%%/README
 %%EXAMPLESDIR%%/testacl.c
 %%EXAMPLESDIR%%/testbrowse.c
+%%EXAMPLESDIR%%/testchmod.c
 %%EXAMPLESDIR%%/testsmbc.c
+%%EXAMPLESDIR%%/teststat.c
+%%EXAMPLESDIR%%/testutime.c
 %%EXAMPLESDIR%%/tree.c
+ at dirrm %%EXAMPLESDIR%%/smbwrapper
 @dirrm %%EXAMPLESDIR%%
--- samba-lib.diff ends here ---



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