Samba update to 3.0.25a

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

Samba update to 3.0.25a

Marc Balmer-2
this updates samba to 3.0.25a.

comments?  ok?

Index: net/samba/Makefile
===================================================================
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.81
diff -u -r1.81 Makefile
--- net/samba/Makefile 6 Apr 2007 14:20:35 -0000 1.81
+++ net/samba/Makefile 28 May 2007 18:46:20 -0000
@@ -3,11 +3,11 @@
 COMMENT-main= "SMB and CIFS client and server for UNIX"
 COMMENT-docs= "documentation and examples for samba"
 
-DISTNAME= samba-3.0.24
-PKGNAME-main= ${DISTNAME}p1
+DISTNAME= samba-3.0.25a
+PKGNAME-main= ${DISTNAME}
 FULLPKGNAME-docs= ${DISTNAME:S/-/-docs-/}
-SHARED_LIBS= smbclient 0.3 \
- msrpc 0.2
+SHARED_LIBS= smbclient 1.0 \
+ msrpc 1.0
 
 CATEGORIES= net
 
@@ -43,8 +43,7 @@
 SUBST_VARS=     CONFDIR LOCALBASE SYSCONFDIR
 
 SEPARATE_BUILD= concurrent
-AUTOCONF_VERSION= 2.59
-CONFIGURE_STYLE= autoconf
+CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS= --localstatedir="/var" \
  --sbindir="${PREFIX}/libexec" \
  --with-configdir="${CONFDIR}" \
Index: net/samba/distinfo
===================================================================
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- net/samba/distinfo 5 Apr 2007 16:20:15 -0000 1.7
+++ net/samba/distinfo 28 May 2007 18:46:20 -0000
@@ -1,5 +1,5 @@
-MD5 (samba-3.0.24.tar.gz) = iSc/Z6bYBny77O+qE3RxUw==
-RMD160 (samba-3.0.24.tar.gz) = 8gjcpkXQehlRaeAFpQ+0xIeSVOs=
-SHA1 (samba-3.0.24.tar.gz) = IWAgtYq8oZG4FG92+YqL2jUI/NM=
-SHA256 (samba-3.0.24.tar.gz) = xOjeNCb7vO5/M49c8JBSy9+aNq5jiu7soQSY741TQ+I=
-SIZE (samba-3.0.24.tar.gz) = 17708128
+MD5 (samba-3.0.25a.tar.gz) = y9M7tdkEzNiilKQBl0N0XQ==
+RMD160 (samba-3.0.25a.tar.gz) = 3yQybK2NuF8UOIMSCkahnG8UAQ4=
+SHA1 (samba-3.0.25a.tar.gz) = 5UfppmuRoNAMzOwhZK1eKyl9fKg=
+SHA256 (samba-3.0.25a.tar.gz) = EvT6cLUTFSC1jztiRQouME3WPv4lMpBaB2DH8RowhHA=
+SIZE (samba-3.0.25a.tar.gz) = 18145636
Index: net/samba/patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-Makefile_in,v
retrieving revision 1.7
diff -u -r1.7 patch-Makefile_in
--- net/samba/patches/patch-Makefile_in 6 Apr 2007 14:20:35 -0000 1.7
+++ net/samba/patches/patch-Makefile_in 28 May 2007 18:46:20 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Makefile_in,v 1.7 2007/04/06 14:20:35 ajacoutot Exp $
---- Makefile.in.orig Sun Feb  4 19:59:28 2007
-+++ Makefile.in Fri Apr  6 14:47:46 2007
-@@ -103,11 +103,13 @@ LOCKDIR = @lockdir@
+--- Makefile.in.orig Wed Apr 25 11:39:00 2007
++++ Makefile.in Thu May 17 10:17:30 2007
+@@ -109,11 +109,13 @@ LOCKDIR = @lockdir@
  # the directory where pid files go
  PIDDIR = @piddir@
 
@@ -17,34 +17,34 @@
  LIBMSRPC_MAJOR=0
  LIBMSRPC_MINOR=1
 
-@@ -1099,11 +1101,10 @@ bin/smbwrapper.@SHLIBEXT@: $(PICOBJS) bin/.dummy
- $(KRB5LIBS) $(LDAP_LIBS) \
- @SONAMEFLAG@`basename $@`
+@@ -1152,11 +1154,10 @@ bin/libaddns.a: proto_exists $(LIBADDNS_OBJ)
+ @echo Linking libaddns non-shared library $@
+ @-$(AR) -rc $@ $(LIBADDNS_OBJ)
 
--bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS)
-+bin/libsmbclient.@SHLIBEXT@.$(LIBsmbclient_VERSION): $(LIBSMBCLIENT_PICOBJS)
+-bin/libsmbclient.@SHLIBEXT@: proto_exists $(LIBSMBCLIENT_OBJ)
++bin/libsmbclient.@SHLIBEXT@.$(LIBsmbclient_VERSION): proto_exists $(LIBSMBCLIENT_OBJ)
  @echo Linking libsmbclient shared library $@
- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \
-- $(KRB5LIBS) $(LDAP_LIBS) \
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_OBJ) $(LIBS) \
+- $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
 - @SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
-+ $(KRB5LIBS) $(LDAP_LIBS)
++ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
 
- bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS)
+ bin/libsmbclient.a: proto_exists $(LIBSMBCLIENT_OBJ)
  @echo Linking libsmbclient non-shared library $@
-@@ -1119,10 +1120,9 @@ bin/libsmbsharemodes.a: $(LIBSMBSHAREMODES_PICOBJS)
+@@ -1172,10 +1173,9 @@ bin/libsmbsharemodes.a: proto_exists $(LIBSMBSHAREMODE
  @echo Linking libsmbsharemodes non-shared library $@
- @-$(AR) -rc $@ $(LIBSMBSHAREMODES_PICOBJS)
+ @-$(AR) -rc $@ $(LIBSMBSHAREMODES_OBJ)
 
--bin/libmsrpc.@SHLIBEXT@: $(CAC_PICOBJS)
-+bin/libmsrpc.@SHLIBEXT@.$(LIBmsrpc_VERSION): $(CAC_PICOBJS)
+-bin/libmsrpc.@SHLIBEXT@: proto_exists $(CAC_OBJ)
++bin/libmsrpc.@SHLIBEXT@.$(LIBmsrpc_VERSION): proto_exists $(CAC_OBJ)
  @echo Linking libmsrpc shared library $@
-- @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_PICOBJS) $(LDFLAGS) $(LIBS) \
+- @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_OBJ) $(LIBS) \
 - @SONAMEFLAG@`basename $@`.$(LIBMSRPC_MAJOR)
-+ @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_PICOBJS) $(LDFLAGS) $(LIBS)
++ @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_OBJ) $(LIBS)
 
- bin/libmsrpc.a: $(CAC_PICOBJS)
+ bin/libmsrpc.a: proto_exists $(CAC_OBJ)
  @echo Linking libmsrpc non-shared library $@
-@@ -1478,14 +1478,14 @@ installswat: installdirs installmsg
+@@ -1618,14 +1618,14 @@ installswat: installdirs installmsg
 
  installclientlib: installdirs libsmbclient
  @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(LIBDIR)
Index: net/samba/patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-configure_in,v
retrieving revision 1.11
diff -u -r1.11 patch-configure_in
--- net/samba/patches/patch-configure_in 6 Apr 2007 14:20:35 -0000 1.11
+++ net/samba/patches/patch-configure_in 28 May 2007 18:46:20 -0000
@@ -1,10 +1,10 @@
 $OpenBSD: patch-configure_in,v 1.11 2007/04/06 14:20:35 ajacoutot Exp $
---- configure.in.orig Sun Feb  4 19:59:28 2007
-+++ configure.in Fri Apr  6 14:47:46 2007
-@@ -1706,6 +1706,7 @@ if test "$enable_shared" = "yes"; then
+--- configure.in.orig Fri May 11 00:09:38 2007
++++ configure.in Thu May 17 10:34:13 2007
+@@ -1727,6 +1727,7 @@ SHLIBEXT="so"
  DYNEXP="-Wl,-Bdynamic"
  SONAMEFLAG="-Wl,-soname,"
- PICFLAGS="-fPIC"
+ PICFLAG="-fPIC"
 + SHLIBEXT="so"
  AC_DEFINE(STAT_ST_BLOCKSIZE,512,[The size of a block])
  AC_DEFINE(BROKEN_GETGRNAM,1,[Does getgrnam work correctly])
Index: net/samba/patches/patch-docs_manpages_swat_8
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-docs_manpages_swat_8,v
retrieving revision 1.2
diff -u -r1.2 patch-docs_manpages_swat_8
--- net/samba/patches/patch-docs_manpages_swat_8 6 Apr 2007 14:20:35 -0000 1.2
+++ net/samba/patches/patch-docs_manpages_swat_8 28 May 2007 18:46:20 -0000
@@ -1,9 +1,9 @@
---- ../docs/manpages/swat.8.orig Fri Jan 12 11:03:28 2007
-+++ ../docs/manpages/swat.8 Fri Jan 12 11:04:46 2007
-@@ -95,26 +95,6 @@
- .TP 3n
- -h|--help
+--- ../docs/manpages/swat.8.orig Fri May 11 04:02:07 2007
++++ ../docs/manpages/swat.8 Thu May 17 10:21:36 2007
+@@ -111,24 +111,6 @@
+ .RS 3n
  Print a summary of command line options.
+ .RE
 -.SH "INSTALLATION"
 -.PP
 -Swat is included as binary package with most distributions. The package manager in this case takes care of the installation and configuration. This section is only for those who have compiled swat from scratch.
@@ -22,12 +22,10 @@
 -.TP 3n
 -•
 -/usr/local/samba/swat/help/*
--.sp
--.RE
  .SS "Inetd Installation"
  .PP
  You need to edit your
-@@ -142,7 +122,7 @@
+@@ -156,7 +138,7 @@
  \fI/etc/inetd.conf\fR
  you should add a line like this:
  .PP
@@ -36,12 +34,13 @@
  .PP
  Once you have edited
  \fI/etc/services\fR
-@@ -165,13 +145,11 @@
- \fI/etc/services\fR
+@@ -182,14 +164,12 @@
  This file must contain a mapping of service name (e.g., swat) to service port (e.g., 901) and protocol type (e.g., tcp).
- .TP 3n
+ .RE
+ .PP
 -\fI/usr/local/samba/lib/smb.conf\fR
-+\fI!!SYSCONFDIR!!/samba/smb.conf\fR
++\fI!!SYSCONFDIR!!/samba/lib/smb.conf\fR
+ .RS 3n
  This is the default location of the
  \fBsmb.conf\fR(5)
 -server configuration file that swat edits. Other common places that systems install this file are
@@ -50,6 +49,6 @@
 -\fI/etc/smb.conf \fR. This file describes all the services the server is to make available to clients.
 +server configuration file that swat edits.
 +This file describes all the services the server is to make available to clients.
+ .RE
  .SH "WARNINGS"
  .PP
- \fBswat\fR
Index: net/samba/patches/patch-lib_smbrun_c
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-lib_smbrun_c,v
retrieving revision 1.4
diff -u -r1.4 patch-lib_smbrun_c
--- net/samba/patches/patch-lib_smbrun_c 6 Apr 2007 14:20:35 -0000 1.4
+++ net/samba/patches/patch-lib_smbrun_c 28 May 2007 18:46:20 -0000
@@ -1,21 +1,21 @@
 $OpenBSD: patch-lib_smbrun_c,v 1.4 2007/04/06 14:20:35 ajacoutot Exp $
---- lib/smbrun.c.orig Thu Apr 20 04:29:23 2006
-+++ lib/smbrun.c Fri Apr  6 14:46:58 2007
-@@ -173,7 +173,7 @@ int smbrun(const char *cmd, int *outfd)
+--- lib/smbrun.c.orig Fri May 11 04:32:55 2007
++++ lib/smbrun.c Thu May 17 10:22:53 2007
+@@ -178,7 +178,7 @@ static int smbrun_internal(const char *cmd, int *outfd
+ if (!newcmd) {
+ exit(82);
+ }
+- execl("/bin/sh","sh","-c",newcmd,NULL);  
++ execl("/bin/sh","sh","-c",newcmd,(void *)NULL);  
  }
- #endif
-
-- execl("/bin/sh","sh","-c",cmd,NULL);  
-+ execl("/bin/sh","sh","-c",cmd,(void *)NULL);  
 
  /* not reached */
- exit(82);
-@@ -301,7 +301,7 @@ int smbrunsecret(const char *cmd, const char *secret)
+@@ -324,7 +324,7 @@ int smbrunsecret(const char *cmd, const char *secret)
  }
  #endif
 
 - execl("/bin/sh", "sh", "-c", cmd, NULL);  
 + execl("/bin/sh", "sh", "-c", cmd, (void *)NULL);  
-
+
  /* not reached */
  exit(82);
Index: net/samba/pkg/PFRAG.shared-main
===================================================================
RCS file: /cvs/ports/net/samba/pkg/PFRAG.shared-main,v
retrieving revision 1.1
diff -u -r1.1 PFRAG.shared-main
--- net/samba/pkg/PFRAG.shared-main 25 Nov 2006 13:00:41 -0000 1.1
+++ net/samba/pkg/PFRAG.shared-main 28 May 2007 18:46:20 -0000
@@ -7,6 +7,7 @@
 lib/samba/charset/CP850.so
 @lib lib/samba/libmsrpc.so.${LIBmsrpc_VERSION}
 @lib lib/samba/libsmbclient.so.${LIBsmbclient_VERSION}
+lib/samba/libsmbsharemodes.so
 lib/samba/vfs/
 lib/samba/vfs/audit.so
 lib/samba/vfs/cap.so
@@ -16,6 +17,7 @@
 lib/samba/vfs/fake_perms.so
 lib/samba/vfs/full_audit.so
 lib/samba/vfs/netatalk.so
+lib/samba/vfs/readahead.so
 lib/samba/vfs/readonly.so
 lib/samba/vfs/recycle.so
 lib/samba/vfs/shadow_copy.so
Index: net/samba/pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/net/samba/pkg/PLIST-docs,v
retrieving revision 1.6
diff -u -r1.6 PLIST-docs
--- net/samba/pkg/PLIST-docs 3 Oct 2006 14:07:10 -0000 1.6
+++ net/samba/pkg/PLIST-docs 28 May 2007 18:46:20 -0000
@@ -170,6 +170,7 @@
 share/examples/samba/libsmbclient/smbwrapper/wrapper.c
 share/examples/samba/libsmbclient/smbwrapper/wrapper.h
 share/examples/samba/libsmbclient/testacl.c
+share/examples/samba/libsmbclient/testacl2.c
 share/examples/samba/libsmbclient/testbrowse.c
 share/examples/samba/libsmbclient/testbrowse2.c
 share/examples/samba/libsmbclient/testchmod.c
@@ -192,6 +193,7 @@
 share/examples/samba/misc/
 share/examples/samba/misc/adssearch.pl
 share/examples/samba/misc/check_multiple_LDAP_entries.pl
+share/examples/samba/misc/cldap.pl
 share/examples/samba/misc/extra_smbstatus
 share/examples/samba/misc/swat.pl
 share/examples/samba/misc/wall.perl
@@ -201,6 +203,30 @@
 share/examples/samba/nss/wbtest.c
 share/examples/samba/pam_winbind/
 share/examples/samba/pam_winbind/pam_winbind.conf
+share/examples/samba/pcap2nbench/
+share/examples/samba/pcap2nbench/COPYING
+share/examples/samba/pcap2nbench/Makefile
+share/examples/samba/pcap2nbench/README
+share/examples/samba/pcap2nbench/closerequest.cpp
+share/examples/samba/pcap2nbench/closerequest.hpp
+share/examples/samba/pcap2nbench/ethernet.cpp
+share/examples/samba/pcap2nbench/ethernet.hpp
+share/examples/samba/pcap2nbench/ip.cpp
+share/examples/samba/pcap2nbench/ip.hpp
+share/examples/samba/pcap2nbench/main.cpp
+share/examples/samba/pcap2nbench/ntcreateandxrequest.cpp
+share/examples/samba/pcap2nbench/ntcreateandxrequest.hpp
+share/examples/samba/pcap2nbench/ntcreateandxresponse.cpp
+share/examples/samba/pcap2nbench/ntcreateandxresponse.hpp
+share/examples/samba/pcap2nbench/readandxrequest.cpp
+share/examples/samba/pcap2nbench/readandxrequest.hpp
+share/examples/samba/pcap2nbench/readandxresponse.hpp
+share/examples/samba/pcap2nbench/smb.cpp
+share/examples/samba/pcap2nbench/smb.hpp
+share/examples/samba/pcap2nbench/tcp.cpp
+share/examples/samba/pcap2nbench/tcp.hpp
+share/examples/samba/pcap2nbench/writeandxrequest.cpp
+share/examples/samba/pcap2nbench/writeandxrequest.hpp
 share/examples/samba/pdb/
 share/examples/samba/pdb/Makefile
 share/examples/samba/pdb/README
@@ -476,7 +502,13 @@
 share/swat/help/Samba3-HOWTO/upgrading-to-3.0.html
 share/swat/help/Samba3-HOWTO/winbind.html
 share/swat/help/manpages/
+share/swat/help/manpages/eventlogadm.8.html
 share/swat/help/manpages/findsmb.1.html
+share/swat/help/manpages/idmap_ad.8.html
+share/swat/help/manpages/idmap_ldap.8.html
+share/swat/help/manpages/idmap_nss.8.html
+share/swat/help/manpages/idmap_rid.8.html
+share/swat/help/manpages/idmap_tdb.8.html
 share/swat/help/manpages/index.html
 share/swat/help/manpages/libsmbclient.7.html
 share/swat/help/manpages/lmhosts.5.html
@@ -512,8 +544,26 @@
 share/swat/help/manpages/swat.8.html
 share/swat/help/manpages/tdbbackup.8.html
 share/swat/help/manpages/tdbdump.8.html
+share/swat/help/manpages/tdbtool.8.html
 share/swat/help/manpages/testparm.1.html
 share/swat/help/manpages/umount.cifs.8.html
+share/swat/help/manpages/vfs_audit.8.html
+share/swat/help/manpages/vfs_cacheprime.8.html
+share/swat/help/manpages/vfs_cap.8.html
+share/swat/help/manpages/vfs_catia.8.html
+share/swat/help/manpages/vfs_commit.8.html
+share/swat/help/manpages/vfs_default_quota.8.html
+share/swat/help/manpages/vfs_extd_audit.8.html
+share/swat/help/manpages/vfs_fake_perms.8.html
+share/swat/help/manpages/vfs_full_audit.8.html
+share/swat/help/manpages/vfs_gpfs.8.html
+share/swat/help/manpages/vfs_netatalk.8.html
+share/swat/help/manpages/vfs_notify_fam.8.html
+share/swat/help/manpages/vfs_prealloc.8.html
+share/swat/help/manpages/vfs_readahead.8.html
+share/swat/help/manpages/vfs_readonly.8.html
+share/swat/help/manpages/vfs_recycle.8.html
+share/swat/help/manpages/vfs_shadow_copy.8.html
 share/swat/help/manpages/vfstest.1.html
 share/swat/help/manpages/wbinfo.1.html
 share/swat/help/manpages/winbindd.8.html
Index: net/samba/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/samba/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -r1.2 PLIST-main
--- net/samba/pkg/PLIST-main 14 Dec 2006 09:07:56 -0000 1.2
+++ net/samba/pkg/PLIST-main 28 May 2007 18:46:20 -0000
@@ -29,12 +29,14 @@
 lib/samba/auth/
 lib/samba/de.msg
 lib/samba/en.msg
+lib/samba/fi.msg
 lib/samba/fr.msg
 lib/samba/idmap/
 lib/samba/it.msg
 lib/samba/ja.msg
 lib/samba/lowcase.dat
 lib/samba/nl.msg
+lib/samba/nss_info/
 lib/samba/pdb/
 lib/samba/pl.msg
 lib/samba/rpc/
@@ -68,20 +70,41 @@
 @man man/man7/libsmbclient.7
 @man man/man7/pam_winbind.7
 @man man/man7/samba.7
+@man man/man8/eventlogadm.8
+@man man/man8/idmap_ad.8
+@man man/man8/idmap_ldap.8
+@man man/man8/idmap_nss.8
+@man man/man8/idmap_rid.8
+@man man/man8/idmap_tdb.8
 @man man/man8/mount.cifs.8
 @man man/man8/net.8
 @man man/man8/nmbd.8
 @man man/man8/pdbedit.8
 @man man/man8/smbd.8
-@man man/man8/smbmnt.8
-@man man/man8/smbmount.8
 @man man/man8/smbpasswd.8
 @man man/man8/smbspool.8
-@man man/man8/smbumount.8
 @man man/man8/swat.8
 @man man/man8/tdbbackup.8
 @man man/man8/tdbdump.8
+@man man/man8/tdbtool.8
 @man man/man8/umount.cifs.8
+@man man/man8/vfs_audit.8
+@man man/man8/vfs_cacheprime.8
+@man man/man8/vfs_cap.8
+@man man/man8/vfs_catia.8
+@man man/man8/vfs_commit.8
+@man man/man8/vfs_default_quota.8
+@man man/man8/vfs_extd_audit.8
+@man man/man8/vfs_fake_perms.8
+@man man/man8/vfs_full_audit.8
+@man man/man8/vfs_gpfs.8
+@man man/man8/vfs_netatalk.8
+@man man/man8/vfs_notify_fam.8
+@man man/man8/vfs_prealloc.8
+@man man/man8/vfs_readahead.8
+@man man/man8/vfs_readonly.8
+@man man/man8/vfs_recycle.8
+@man man/man8/vfs_shadow_copy.8
 @man man/man8/winbindd.8
 share/examples/samba/
 @sample ${SYSCONFDIR}/samba/

Reply | Threaded
Open this post in threaded view
|

Re: Samba update to 3.0.25a

Brad Smith-14
On Mon, 28 May 2007 20:49:01 +0200
Marc Balmer <[hidden email]> wrote:

> this updates samba to 3.0.25a.
>
> comments?  ok?

The patch patch-configure_in can be garbage collected. The rest looks
fine.


> Index: net/samba/Makefile
> ===================================================================
> RCS file: /cvs/ports/net/samba/Makefile,v
> retrieving revision 1.81
> diff -u -r1.81 Makefile
> --- net/samba/Makefile 6 Apr 2007 14:20:35 -0000 1.81
> +++ net/samba/Makefile 28 May 2007 18:46:20 -0000
> @@ -3,11 +3,11 @@
>  COMMENT-main= "SMB and CIFS client and server for UNIX"
>  COMMENT-docs= "documentation and examples for samba"
>  
> -DISTNAME= samba-3.0.24
> -PKGNAME-main= ${DISTNAME}p1
> +DISTNAME= samba-3.0.25a
> +PKGNAME-main= ${DISTNAME}
>  FULLPKGNAME-docs= ${DISTNAME:S/-/-docs-/}
> -SHARED_LIBS= smbclient 0.3 \
> - msrpc 0.2
> +SHARED_LIBS= smbclient 1.0 \
> + msrpc 1.0
>  
>  CATEGORIES= net
>  
> @@ -43,8 +43,7 @@
>  SUBST_VARS=     CONFDIR LOCALBASE SYSCONFDIR
>  
>  SEPARATE_BUILD= concurrent
> -AUTOCONF_VERSION= 2.59
> -CONFIGURE_STYLE= autoconf
> +CONFIGURE_STYLE= gnu
>  CONFIGURE_ARGS= --localstatedir="/var" \
>   --sbindir="${PREFIX}/libexec" \
>   --with-configdir="${CONFDIR}" \
> Index: net/samba/distinfo
> ===================================================================
> RCS file: /cvs/ports/net/samba/distinfo,v
> retrieving revision 1.7
> diff -u -r1.7 distinfo
> --- net/samba/distinfo 5 Apr 2007 16:20:15 -0000 1.7
> +++ net/samba/distinfo 28 May 2007 18:46:20 -0000
> @@ -1,5 +1,5 @@
> -MD5 (samba-3.0.24.tar.gz) = iSc/Z6bYBny77O+qE3RxUw==
> -RMD160 (samba-3.0.24.tar.gz) = 8gjcpkXQehlRaeAFpQ+0xIeSVOs=
> -SHA1 (samba-3.0.24.tar.gz) = IWAgtYq8oZG4FG92+YqL2jUI/NM=
> -SHA256 (samba-3.0.24.tar.gz) = xOjeNCb7vO5/M49c8JBSy9+aNq5jiu7soQSY741TQ+I=
> -SIZE (samba-3.0.24.tar.gz) = 17708128
> +MD5 (samba-3.0.25a.tar.gz) = y9M7tdkEzNiilKQBl0N0XQ==
> +RMD160 (samba-3.0.25a.tar.gz) = 3yQybK2NuF8UOIMSCkahnG8UAQ4=
> +SHA1 (samba-3.0.25a.tar.gz) = 5UfppmuRoNAMzOwhZK1eKyl9fKg=
> +SHA256 (samba-3.0.25a.tar.gz) = EvT6cLUTFSC1jztiRQouME3WPv4lMpBaB2DH8RowhHA=
> +SIZE (samba-3.0.25a.tar.gz) = 18145636
> Index: net/samba/patches/patch-Makefile_in
> ===================================================================
> RCS file: /cvs/ports/net/samba/patches/patch-Makefile_in,v
> retrieving revision 1.7
> diff -u -r1.7 patch-Makefile_in
> --- net/samba/patches/patch-Makefile_in 6 Apr 2007 14:20:35 -0000 1.7
> +++ net/samba/patches/patch-Makefile_in 28 May 2007 18:46:20 -0000
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-Makefile_in,v 1.7 2007/04/06 14:20:35 ajacoutot Exp $
> ---- Makefile.in.orig Sun Feb  4 19:59:28 2007
> -+++ Makefile.in Fri Apr  6 14:47:46 2007
> -@@ -103,11 +103,13 @@ LOCKDIR = @lockdir@
> +--- Makefile.in.orig Wed Apr 25 11:39:00 2007
> ++++ Makefile.in Thu May 17 10:17:30 2007
> +@@ -109,11 +109,13 @@ LOCKDIR = @lockdir@
>   # the directory where pid files go
>   PIDDIR = @piddir@
>  
> @@ -17,34 +17,34 @@
>   LIBMSRPC_MAJOR=0
>   LIBMSRPC_MINOR=1
>  
> -@@ -1099,11 +1101,10 @@ bin/smbwrapper.@SHLIBEXT@: $(PICOBJS) bin/.dummy
> - $(KRB5LIBS) $(LDAP_LIBS) \
> - @SONAMEFLAG@`basename $@`
> +@@ -1152,11 +1154,10 @@ bin/libaddns.a: proto_exists $(LIBADDNS_OBJ)
> + @echo Linking libaddns non-shared library $@
> + @-$(AR) -rc $@ $(LIBADDNS_OBJ)
>  
> --bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS)
> -+bin/libsmbclient.@SHLIBEXT@.$(LIBsmbclient_VERSION): $(LIBSMBCLIENT_PICOBJS)
> +-bin/libsmbclient.@SHLIBEXT@: proto_exists $(LIBSMBCLIENT_OBJ)
> ++bin/libsmbclient.@SHLIBEXT@.$(LIBsmbclient_VERSION): proto_exists $(LIBSMBCLIENT_OBJ)
>   @echo Linking libsmbclient shared library $@
> - @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \
> -- $(KRB5LIBS) $(LDAP_LIBS) \
> + @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_OBJ) $(LIBS) \
> +- $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
>  - @SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
> -+ $(KRB5LIBS) $(LDAP_LIBS)
> ++ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
>  
> - bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS)
> + bin/libsmbclient.a: proto_exists $(LIBSMBCLIENT_OBJ)
>   @echo Linking libsmbclient non-shared library $@
> -@@ -1119,10 +1120,9 @@ bin/libsmbsharemodes.a: $(LIBSMBSHAREMODES_PICOBJS)
> +@@ -1172,10 +1173,9 @@ bin/libsmbsharemodes.a: proto_exists $(LIBSMBSHAREMODE
>   @echo Linking libsmbsharemodes non-shared library $@
> - @-$(AR) -rc $@ $(LIBSMBSHAREMODES_PICOBJS)
> + @-$(AR) -rc $@ $(LIBSMBSHAREMODES_OBJ)
>  
> --bin/libmsrpc.@SHLIBEXT@: $(CAC_PICOBJS)
> -+bin/libmsrpc.@SHLIBEXT@.$(LIBmsrpc_VERSION): $(CAC_PICOBJS)
> +-bin/libmsrpc.@SHLIBEXT@: proto_exists $(CAC_OBJ)
> ++bin/libmsrpc.@SHLIBEXT@.$(LIBmsrpc_VERSION): proto_exists $(CAC_OBJ)
>   @echo Linking libmsrpc shared library $@
> -- @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_PICOBJS) $(LDFLAGS) $(LIBS) \
> +- @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_OBJ) $(LIBS) \
>  - @SONAMEFLAG@`basename $@`.$(LIBMSRPC_MAJOR)
> -+ @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_PICOBJS) $(LDFLAGS) $(LIBS)
> ++ @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_OBJ) $(LIBS)
>  
> - bin/libmsrpc.a: $(CAC_PICOBJS)
> + bin/libmsrpc.a: proto_exists $(CAC_OBJ)
>   @echo Linking libmsrpc non-shared library $@
> -@@ -1478,14 +1478,14 @@ installswat: installdirs installmsg
> +@@ -1618,14 +1618,14 @@ installswat: installdirs installmsg
>  
>   installclientlib: installdirs libsmbclient
>   @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(LIBDIR)
> Index: net/samba/patches/patch-configure_in
> ===================================================================
> RCS file: /cvs/ports/net/samba/patches/patch-configure_in,v
> retrieving revision 1.11
> diff -u -r1.11 patch-configure_in
> --- net/samba/patches/patch-configure_in 6 Apr 2007 14:20:35 -0000 1.11
> +++ net/samba/patches/patch-configure_in 28 May 2007 18:46:20 -0000
> @@ -1,10 +1,10 @@
>  $OpenBSD: patch-configure_in,v 1.11 2007/04/06 14:20:35 ajacoutot Exp $
> ---- configure.in.orig Sun Feb  4 19:59:28 2007
> -+++ configure.in Fri Apr  6 14:47:46 2007
> -@@ -1706,6 +1706,7 @@ if test "$enable_shared" = "yes"; then
> +--- configure.in.orig Fri May 11 00:09:38 2007
> ++++ configure.in Thu May 17 10:34:13 2007
> +@@ -1727,6 +1727,7 @@ SHLIBEXT="so"
>   DYNEXP="-Wl,-Bdynamic"
>   SONAMEFLAG="-Wl,-soname,"
> - PICFLAGS="-fPIC"
> + PICFLAG="-fPIC"
>  + SHLIBEXT="so"
>   AC_DEFINE(STAT_ST_BLOCKSIZE,512,[The size of a block])
>   AC_DEFINE(BROKEN_GETGRNAM,1,[Does getgrnam work correctly])
> Index: net/samba/patches/patch-docs_manpages_swat_8
> ===================================================================
> RCS file: /cvs/ports/net/samba/patches/patch-docs_manpages_swat_8,v
> retrieving revision 1.2
> diff -u -r1.2 patch-docs_manpages_swat_8
> --- net/samba/patches/patch-docs_manpages_swat_8 6 Apr 2007 14:20:35 -0000 1.2
> +++ net/samba/patches/patch-docs_manpages_swat_8 28 May 2007 18:46:20 -0000
> @@ -1,9 +1,9 @@
> ---- ../docs/manpages/swat.8.orig Fri Jan 12 11:03:28 2007
> -+++ ../docs/manpages/swat.8 Fri Jan 12 11:04:46 2007
> -@@ -95,26 +95,6 @@
> - .TP 3n
> - -h|--help
> +--- ../docs/manpages/swat.8.orig Fri May 11 04:02:07 2007
> ++++ ../docs/manpages/swat.8 Thu May 17 10:21:36 2007
> +@@ -111,24 +111,6 @@
> + .RS 3n
>   Print a summary of command line options.
> + .RE
>  -.SH "INSTALLATION"
>  -.PP
>  -Swat is included as binary package with most distributions. The package manager in this case takes care of the installation and configuration. This section is only for those who have compiled swat from scratch.
> @@ -22,12 +22,10 @@
>  -.TP 3n
>  -&#8226;
>  -/usr/local/samba/swat/help/*
> --.sp
> --.RE
>   .SS "Inetd Installation"
>   .PP
>   You need to edit your
> -@@ -142,7 +122,7 @@
> +@@ -156,7 +138,7 @@
>   \fI/etc/inetd.conf\fR
>   you should add a line like this:
>   .PP
> @@ -36,12 +34,13 @@
>   .PP
>   Once you have edited
>   \fI/etc/services\fR
> -@@ -165,13 +145,11 @@
> - \fI/etc/services\fR
> +@@ -182,14 +164,12 @@
>   This file must contain a mapping of service name (e.g., swat) to service port (e.g., 901) and protocol type (e.g., tcp).
> - .TP 3n
> + .RE
> + .PP
>  -\fI/usr/local/samba/lib/smb.conf\fR
> -+\fI!!SYSCONFDIR!!/samba/smb.conf\fR
> ++\fI!!SYSCONFDIR!!/samba/lib/smb.conf\fR
> + .RS 3n
>   This is the default location of the
>   \fBsmb.conf\fR(5)
>  -server configuration file that swat edits. Other common places that systems install this file are
> @@ -50,6 +49,6 @@
>  -\fI/etc/smb.conf \fR. This file describes all the services the server is to make available to clients.
>  +server configuration file that swat edits.
>  +This file describes all the services the server is to make available to clients.
> + .RE
>   .SH "WARNINGS"
>   .PP
> - \fBswat\fR
> Index: net/samba/patches/patch-lib_smbrun_c
> ===================================================================
> RCS file: /cvs/ports/net/samba/patches/patch-lib_smbrun_c,v
> retrieving revision 1.4
> diff -u -r1.4 patch-lib_smbrun_c
> --- net/samba/patches/patch-lib_smbrun_c 6 Apr 2007 14:20:35 -0000 1.4
> +++ net/samba/patches/patch-lib_smbrun_c 28 May 2007 18:46:20 -0000
> @@ -1,21 +1,21 @@
>  $OpenBSD: patch-lib_smbrun_c,v 1.4 2007/04/06 14:20:35 ajacoutot Exp $
> ---- lib/smbrun.c.orig Thu Apr 20 04:29:23 2006
> -+++ lib/smbrun.c Fri Apr  6 14:46:58 2007
> -@@ -173,7 +173,7 @@ int smbrun(const char *cmd, int *outfd)
> +--- lib/smbrun.c.orig Fri May 11 04:32:55 2007
> ++++ lib/smbrun.c Thu May 17 10:22:53 2007
> +@@ -178,7 +178,7 @@ static int smbrun_internal(const char *cmd, int *outfd
> + if (!newcmd) {
> + exit(82);
> + }
> +- execl("/bin/sh","sh","-c",newcmd,NULL);  
> ++ execl("/bin/sh","sh","-c",newcmd,(void *)NULL);  
>   }
> - #endif
> -
> -- execl("/bin/sh","sh","-c",cmd,NULL);  
> -+ execl("/bin/sh","sh","-c",cmd,(void *)NULL);  
>  
>   /* not reached */
> - exit(82);
> -@@ -301,7 +301,7 @@ int smbrunsecret(const char *cmd, const char *secret)
> +@@ -324,7 +324,7 @@ int smbrunsecret(const char *cmd, const char *secret)
>   }
>   #endif
>  
>  - execl("/bin/sh", "sh", "-c", cmd, NULL);  
>  + execl("/bin/sh", "sh", "-c", cmd, (void *)NULL);  
> -
> +
>   /* not reached */
>   exit(82);
> Index: net/samba/pkg/PFRAG.shared-main
> ===================================================================
> RCS file: /cvs/ports/net/samba/pkg/PFRAG.shared-main,v
> retrieving revision 1.1
> diff -u -r1.1 PFRAG.shared-main
> --- net/samba/pkg/PFRAG.shared-main 25 Nov 2006 13:00:41 -0000 1.1
> +++ net/samba/pkg/PFRAG.shared-main 28 May 2007 18:46:20 -0000
> @@ -7,6 +7,7 @@
>  lib/samba/charset/CP850.so
>  @lib lib/samba/libmsrpc.so.${LIBmsrpc_VERSION}
>  @lib lib/samba/libsmbclient.so.${LIBsmbclient_VERSION}
> +lib/samba/libsmbsharemodes.so
>  lib/samba/vfs/
>  lib/samba/vfs/audit.so
>  lib/samba/vfs/cap.so
> @@ -16,6 +17,7 @@
>  lib/samba/vfs/fake_perms.so
>  lib/samba/vfs/full_audit.so
>  lib/samba/vfs/netatalk.so
> +lib/samba/vfs/readahead.so
>  lib/samba/vfs/readonly.so
>  lib/samba/vfs/recycle.so
>  lib/samba/vfs/shadow_copy.so
> Index: net/samba/pkg/PLIST-docs
> ===================================================================
> RCS file: /cvs/ports/net/samba/pkg/PLIST-docs,v
> retrieving revision 1.6
> diff -u -r1.6 PLIST-docs
> --- net/samba/pkg/PLIST-docs 3 Oct 2006 14:07:10 -0000 1.6
> +++ net/samba/pkg/PLIST-docs 28 May 2007 18:46:20 -0000
> @@ -170,6 +170,7 @@
>  share/examples/samba/libsmbclient/smbwrapper/wrapper.c
>  share/examples/samba/libsmbclient/smbwrapper/wrapper.h
>  share/examples/samba/libsmbclient/testacl.c
> +share/examples/samba/libsmbclient/testacl2.c
>  share/examples/samba/libsmbclient/testbrowse.c
>  share/examples/samba/libsmbclient/testbrowse2.c
>  share/examples/samba/libsmbclient/testchmod.c
> @@ -192,6 +193,7 @@
>  share/examples/samba/misc/
>  share/examples/samba/misc/adssearch.pl
>  share/examples/samba/misc/check_multiple_LDAP_entries.pl
> +share/examples/samba/misc/cldap.pl
>  share/examples/samba/misc/extra_smbstatus
>  share/examples/samba/misc/swat.pl
>  share/examples/samba/misc/wall.perl
> @@ -201,6 +203,30 @@
>  share/examples/samba/nss/wbtest.c
>  share/examples/samba/pam_winbind/
>  share/examples/samba/pam_winbind/pam_winbind.conf
> +share/examples/samba/pcap2nbench/
> +share/examples/samba/pcap2nbench/COPYING
> +share/examples/samba/pcap2nbench/Makefile
> +share/examples/samba/pcap2nbench/README
> +share/examples/samba/pcap2nbench/closerequest.cpp
> +share/examples/samba/pcap2nbench/closerequest.hpp
> +share/examples/samba/pcap2nbench/ethernet.cpp
> +share/examples/samba/pcap2nbench/ethernet.hpp
> +share/examples/samba/pcap2nbench/ip.cpp
> +share/examples/samba/pcap2nbench/ip.hpp
> +share/examples/samba/pcap2nbench/main.cpp
> +share/examples/samba/pcap2nbench/ntcreateandxrequest.cpp
> +share/examples/samba/pcap2nbench/ntcreateandxrequest.hpp
> +share/examples/samba/pcap2nbench/ntcreateandxresponse.cpp
> +share/examples/samba/pcap2nbench/ntcreateandxresponse.hpp
> +share/examples/samba/pcap2nbench/readandxrequest.cpp
> +share/examples/samba/pcap2nbench/readandxrequest.hpp
> +share/examples/samba/pcap2nbench/readandxresponse.hpp
> +share/examples/samba/pcap2nbench/smb.cpp
> +share/examples/samba/pcap2nbench/smb.hpp
> +share/examples/samba/pcap2nbench/tcp.cpp
> +share/examples/samba/pcap2nbench/tcp.hpp
> +share/examples/samba/pcap2nbench/writeandxrequest.cpp
> +share/examples/samba/pcap2nbench/writeandxrequest.hpp
>  share/examples/samba/pdb/
>  share/examples/samba/pdb/Makefile
>  share/examples/samba/pdb/README
> @@ -476,7 +502,13 @@
>  share/swat/help/Samba3-HOWTO/upgrading-to-3.0.html
>  share/swat/help/Samba3-HOWTO/winbind.html
>  share/swat/help/manpages/
> +share/swat/help/manpages/eventlogadm.8.html
>  share/swat/help/manpages/findsmb.1.html
> +share/swat/help/manpages/idmap_ad.8.html
> +share/swat/help/manpages/idmap_ldap.8.html
> +share/swat/help/manpages/idmap_nss.8.html
> +share/swat/help/manpages/idmap_rid.8.html
> +share/swat/help/manpages/idmap_tdb.8.html
>  share/swat/help/manpages/index.html
>  share/swat/help/manpages/libsmbclient.7.html
>  share/swat/help/manpages/lmhosts.5.html
> @@ -512,8 +544,26 @@
>  share/swat/help/manpages/swat.8.html
>  share/swat/help/manpages/tdbbackup.8.html
>  share/swat/help/manpages/tdbdump.8.html
> +share/swat/help/manpages/tdbtool.8.html
>  share/swat/help/manpages/testparm.1.html
>  share/swat/help/manpages/umount.cifs.8.html
> +share/swat/help/manpages/vfs_audit.8.html
> +share/swat/help/manpages/vfs_cacheprime.8.html
> +share/swat/help/manpages/vfs_cap.8.html
> +share/swat/help/manpages/vfs_catia.8.html
> +share/swat/help/manpages/vfs_commit.8.html
> +share/swat/help/manpages/vfs_default_quota.8.html
> +share/swat/help/manpages/vfs_extd_audit.8.html
> +share/swat/help/manpages/vfs_fake_perms.8.html
> +share/swat/help/manpages/vfs_full_audit.8.html
> +share/swat/help/manpages/vfs_gpfs.8.html
> +share/swat/help/manpages/vfs_netatalk.8.html
> +share/swat/help/manpages/vfs_notify_fam.8.html
> +share/swat/help/manpages/vfs_prealloc.8.html
> +share/swat/help/manpages/vfs_readahead.8.html
> +share/swat/help/manpages/vfs_readonly.8.html
> +share/swat/help/manpages/vfs_recycle.8.html
> +share/swat/help/manpages/vfs_shadow_copy.8.html
>  share/swat/help/manpages/vfstest.1.html
>  share/swat/help/manpages/wbinfo.1.html
>  share/swat/help/manpages/winbindd.8.html
> Index: net/samba/pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/net/samba/pkg/PLIST-main,v
> retrieving revision 1.2
> diff -u -r1.2 PLIST-main
> --- net/samba/pkg/PLIST-main 14 Dec 2006 09:07:56 -0000 1.2
> +++ net/samba/pkg/PLIST-main 28 May 2007 18:46:20 -0000
> @@ -29,12 +29,14 @@
>  lib/samba/auth/
>  lib/samba/de.msg
>  lib/samba/en.msg
> +lib/samba/fi.msg
>  lib/samba/fr.msg
>  lib/samba/idmap/
>  lib/samba/it.msg
>  lib/samba/ja.msg
>  lib/samba/lowcase.dat
>  lib/samba/nl.msg
> +lib/samba/nss_info/
>  lib/samba/pdb/
>  lib/samba/pl.msg
>  lib/samba/rpc/
> @@ -68,20 +70,41 @@
>  @man man/man7/libsmbclient.7
>  @man man/man7/pam_winbind.7
>  @man man/man7/samba.7
> +@man man/man8/eventlogadm.8
> +@man man/man8/idmap_ad.8
> +@man man/man8/idmap_ldap.8
> +@man man/man8/idmap_nss.8
> +@man man/man8/idmap_rid.8
> +@man man/man8/idmap_tdb.8
>  @man man/man8/mount.cifs.8
>  @man man/man8/net.8
>  @man man/man8/nmbd.8
>  @man man/man8/pdbedit.8
>  @man man/man8/smbd.8
> -@man man/man8/smbmnt.8
> -@man man/man8/smbmount.8
>  @man man/man8/smbpasswd.8
>  @man man/man8/smbspool.8
> -@man man/man8/smbumount.8
>  @man man/man8/swat.8
>  @man man/man8/tdbbackup.8
>  @man man/man8/tdbdump.8
> +@man man/man8/tdbtool.8
>  @man man/man8/umount.cifs.8
> +@man man/man8/vfs_audit.8
> +@man man/man8/vfs_cacheprime.8
> +@man man/man8/vfs_cap.8
> +@man man/man8/vfs_catia.8
> +@man man/man8/vfs_commit.8
> +@man man/man8/vfs_default_quota.8
> +@man man/man8/vfs_extd_audit.8
> +@man man/man8/vfs_fake_perms.8
> +@man man/man8/vfs_full_audit.8
> +@man man/man8/vfs_gpfs.8
> +@man man/man8/vfs_netatalk.8
> +@man man/man8/vfs_notify_fam.8
> +@man man/man8/vfs_prealloc.8
> +@man man/man8/vfs_readahead.8
> +@man man/man8/vfs_readonly.8
> +@man man/man8/vfs_recycle.8
> +@man man/man8/vfs_shadow_copy.8
>  @man man/man8/winbindd.8
>  share/examples/samba/
>  @sample ${SYSCONFDIR}/samba/
>
>
> !DSPAM:2,465b2a4c9102068023194!
>
>