On Fri, Jul 04, 2008 at 03:03:44AM -0400, Brad wrote:
> An update to Samba 3.0.30. A whole bunch of bug fixes and a
> security issue fixed in the last two releases, CVE-2008-1105.

Stuart noticed a mistake with a path in the swat man page that
crept in when I had to manually re-apply the diff. He also moved
the port over to using SUBST_CMD.

(This is being reposted to ports@ for anyone that might be
testing/using this.)


Index: Makefile
===================================================================
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.91
diff -u -p -r1.91 Makefile
--- Makefile    13 May 2008 11:34:12 -0000      1.91
+++ Makefile    5 Jul 2008 21:29:27 -0000
@@ -3,8 +3,8 @@
 COMMENT-main=  SMB and CIFS client and server for UNIX
 COMMENT-docs=  documentation and examples for samba
 
-DISTNAME=              samba-3.0.28
-PKGNAME-main=          ${DISTNAME}p1
+DISTNAME=              samba-3.0.30
+PKGNAME-main=          ${DISTNAME}
 FULLPKGNAME-docs=      ${DISTNAME:S/-/-docs-/}
 SHARED_LIBS=           smbclient       1.0 \
                        msrpc           1.0
@@ -15,7 +15,7 @@ HOMEPAGE=     http://www.samba.org/
 
 MAINTAINER=    Marc Balmer <[EMAIL PROTECTED]>
 
-# GPL
+# GPLv2+
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM=        Yes
@@ -111,13 +111,11 @@ SAMBA_DOCS=${WRKSRC}/../README \
 SAMPLE_CONFIG= ${PREFIX}/share/examples/samba/smb.conf.default
 
 pre-configure:
-       @perl -pi -e 's,!!SYSCONFDIR!!,${SYSCONFDIR},g;' \
-               -e 's,!!LOCALBASE!!,${LOCALBASE},g' \
-               ${WRKSRC}/../docs/manpages/swat.8
+       @${SUBST_CMD} ${WRKSRC}/../docs/manpages/swat.8
 
 post-extract:
-       cp ${FILESDIR}/krb5-config ${WRKDIR}/bin
-       chmod a+x ${WRKDIR}/bin/krb5-config
+       @cp ${FILESDIR}/krb5-config ${WRKDIR}/bin
+       @chmod a+x ${WRKDIR}/bin/krb5-config
 
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/samba/pdf
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo    14 Dec 2007 08:53:27 -0000      1.10
+++ distinfo    3 Jul 2008 08:17:50 -0000
@@ -1,5 +1,5 @@
-MD5 (samba-3.0.28.tar.gz) = h2HNfAKDPZWfvr1PaYlQdQ==
-RMD160 (samba-3.0.28.tar.gz) = gWtXv/MKloxWvgxoZObqnxiYFzc=
-SHA1 (samba-3.0.28.tar.gz) = T8rYE0+JoSOiVBON4KzkoTmTsAc=
-SHA256 (samba-3.0.28.tar.gz) = 3K+SE7n3x0mzRiFK4hgIzTNpR8cWk7Tsoa9vA3cl2Y4=
-SIZE (samba-3.0.28.tar.gz) = 18159912
+MD5 (samba-3.0.30.tar.gz) = 1kfsHzRBT6hpH3RTbczPtQ==
+RMD160 (samba-3.0.30.tar.gz) = SfL3cpTNq218qduHh1XbI4Tol8w=
+SHA1 (samba-3.0.30.tar.gz) = YJxgLZoX6gWVT8n8Ahz9lSJ+rvs=
+SHA256 (samba-3.0.30.tar.gz) = oXidO4lqqyWiDEN/Aou1a8TehlXajm9eenQ5Isgo+lM=
+SIZE (samba-3.0.30.tar.gz) = 20510081
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-Makefile_in,v
retrieving revision 1.10
diff -u -p -r1.10 patch-Makefile_in
--- patches/patch-Makefile_in   8 Aug 2007 14:18:00 -0000       1.10
+++ patches/patch-Makefile_in   4 Jul 2008 04:36:21 -0000
@@ -1,15 +1,15 @@
 $OpenBSD: patch-Makefile_in,v 1.10 2007/08/08 14:18:00 mbalmer Exp $
---- Makefile.in.orig   Tue Jun 19 19:11:39 2007
-+++ Makefile.in        Mon Aug  6 11:33:35 2007
+--- Makefile.in.orig   Wed May 28 08:41:11 2008
++++ Makefile.in        Fri Jul  4 00:36:10 2008
 @@ -109,11 +109,13 @@ LOCKDIR = @lockdir@
  # the directory where pid files go
  PIDDIR = @piddir@
  
 -LIBSMBCLIENT=bin/libsmbclient.a @LIBSMBCLIENT_SHARED@
- LIBSMBCLIENT_MAJOR=0
- LIBSMBCLIENT_MINOR=1
 +LIBSMBCLIENT=bin/libsmbclient.a \
 +      @[EMAIL PROTECTED](LIBsmbclient_VERSION)
+ LIBSMBCLIENT_MAJOR=0
+ LIBSMBCLIENT_MINOR=1
  
 -LIBMSRPC=bin/libmsrpc.a @LIBMSRPC_SHARED@
 +LIBMSRPC=bin/libmsrpc.a \
Index: patches/patch-WHATSNEW_txt
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-WHATSNEW_txt,v
retrieving revision 1.1
diff -u -p -r1.1 patch-WHATSNEW_txt
--- patches/patch-WHATSNEW_txt  3 Apr 2005 11:20:38 -0000       1.1
+++ patches/patch-WHATSNEW_txt  4 Jul 2008 02:26:31 -0000
@@ -1,3 +1,4 @@
+$OpenBSD$
 --- ../WHATSNEW.txt.orig       Fri Feb  4 05:13:54 2005
 +++ ../WHATSNEW.txt    Sun Feb  6 11:33:01 2005
 @@ -8,6 +8,9 @@
Index: patches/patch-docs_htmldocs_Samba3_Developers_Guide_pwencrypt_html
===================================================================
RCS file: 
/cvs/ports/net/samba/patches/patch-docs_htmldocs_Samba3_Developers_Guide_pwencrypt_html,v
retrieving revision 1.2
diff -u -p -r1.2 patch-docs_htmldocs_Samba3_Developers_Guide_pwencrypt_html
--- patches/patch-docs_htmldocs_Samba3_Developers_Guide_pwencrypt_html  2 Jul 
2007 21:56:57 -0000       1.2
+++ patches/patch-docs_htmldocs_Samba3_Developers_Guide_pwencrypt_html  4 Jul 
2008 02:26:48 -0000
@@ -1,3 +1,4 @@
+$OpenBSD$
 --- ../docs/htmldocs/Samba3-Developers-Guide/pwencrypt.html.orig       Tue Jun 
19 10:07:36 2007
 +++ ../docs/htmldocs/Samba3-Developers-Guide/pwencrypt.html    Sun Jul  1 
11:39:04 2007
 @@ -1,3 +1,4 @@
Index: patches/patch-docs_manpages_swat_8
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-docs_manpages_swat_8,v
retrieving revision 1.5
diff -u -p -r1.5 patch-docs_manpages_swat_8
--- patches/patch-docs_manpages_swat_8  2 Jul 2007 21:56:57 -0000       1.5
+++ patches/patch-docs_manpages_swat_8  5 Jul 2008 22:21:32 -0000
@@ -1,54 +1,80 @@
---- ../docs/manpages/swat.8.orig       Tue Jun 19 10:03:04 2007
-+++ ../docs/manpages/swat.8    Sun Jul  1 11:37:49 2007
-@@ -111,24 +111,6 @@
- .RS 3n
- Print a summary of command line options.
+$OpenBSD$
+--- ../docs/manpages/swat.8.orig       Thu Jul  3 22:20:31 2008
++++ ../docs/manpages/swat.8    Thu Jul  3 22:22:36 2008
+@@ -103,49 +103,6 @@ will be appended (e\.g\. log\.smbclient, log\.smbd, et
+ .RS 4
+ 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.
+-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\.
 -.PP
 -After you compile SWAT you need to run
 -make install
 -to install the
 -swat
--binary and the various help files and images. A default install would put 
these in:
--.TP 3n
--\(bu
+-binary and the various help files and images\. A default install would put 
these in:
+-.sp
+-.RS 4
+-.ie n \{\
+-\h'-04'\(bu\h'+03'\c
+-.\}
+-.el \{\
+-.sp -1
+-.IP \(bu 2.3
+-.\}
 -/usr/local/samba/sbin/swat
--.TP 3n
--\(bu
+-.RE
+-.sp
+-.RS 4
+-.ie n \{\
+-\h'-04'\(bu\h'+03'\c
+-.\}
+-.el \{\
+-.sp -1
+-.IP \(bu 2.3
+-.\}
 -/usr/local/samba/swat/images/*
--.TP 3n
--\(bu
+-.RE
+-.sp
+-.RS 4
+-.ie n \{\
+-\h'-04'\(bu\h'+03'\c
+-.\}
+-.el \{\
+-.sp -1
+-.IP \(bu 2.3
+-.\}
 -/usr/local/samba/swat/help/*
+-.sp
+-.RE
  .SS "Inetd Installation"
  .PP
  You need to edit your
-@@ -156,7 +138,7 @@
- \fI/etc/inetd.conf\fR
+@@ -173,7 +130,7 @@ In
+ \fI/etc/inetd\.conf\fR
  you should add a line like this:
  .PP
--swat stream tcp nowait.400 root /usr/local/samba/sbin/swat swat
-+swat stream tcp nowait.400 root !!LOCALBASE!!/libexec/swat swat
+-swat stream tcp nowait\.400 root /usr/local/samba/sbin/swat swat
++swat stream tcp nowait\.400 root ${PREFIX}/libexec/swat swat
  .PP
  Once you have edited
  \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).
+@@ -199,14 +156,12 @@ This file must contain suitable startup information fo
+ This file must contain a mapping of service name (e\.g\., swat) to service 
port (e\.g\., 901) and protocol type (e\.g\., tcp)\.
  .RE
  .PP
--\fI/usr/local/samba/lib/smb.conf\fR
-+\fI!!SYSCONFDIR!!/samba/smb.conf\fR
- .RS 3n
+-\fI/usr/local/samba/lib/smb\.conf\fR
++\fI${SYSCONFDIR}/samba/smb\.conf\fR
+ .RS 4
  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
--\fI /usr/samba/lib/smb.conf\fR
+-server configuration file that swat edits\. Other common places that systems 
install this file are
+-\fI /usr/samba/lib/smb\.conf\fR
 -and
--\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.
+-\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
Index: patches/patch-lib_iconv.c
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-lib_iconv.c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-lib_iconv.c
--- patches/patch-lib_iconv.c   14 Dec 2007 08:53:27 -0000      1.1
+++ patches/patch-lib_iconv.c   4 Jul 2008 02:27:02 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-lib_iconv.c,v 1.1 2007/12/14 08:53:27 mbalmer Exp $
---- lib/iconv.c.orig   Tue Jun  5 01:45:05 2007
-+++ lib/iconv.c        Tue Jun  5 01:46:09 2007
-@@ -137,7 +137,7 @@
+--- lib/iconv.c.orig   Wed May 28 08:41:11 2008
++++ lib/iconv.c        Thu Jul  3 04:19:09 2008
+@@ -137,7 +137,7 @@ static size_t sys_iconv(void *cd, 
                        char **outbuf, size_t *outbytesleft)
  {
        size_t ret = iconv((iconv_t)cd, 
Index: patches/patch-smbd_chgpasswd_c
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-smbd_chgpasswd_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-smbd_chgpasswd_c
--- patches/patch-smbd_chgpasswd_c      6 Apr 2007 14:20:35 -0000       1.3
+++ patches/patch-smbd_chgpasswd_c      4 Jul 2008 00:56:31 -0000
@@ -1,12 +1,12 @@
 $OpenBSD: patch-smbd_chgpasswd_c,v 1.3 2007/04/06 14:20:35 ajacoutot Exp $
---- smbd/chgpasswd.c.orig      Sun Feb  4 19:59:13 2007
-+++ smbd/chgpasswd.c   Fri Apr  6 14:46:58 2007
-@@ -222,7 +222,7 @@ static int dochild(int master, const char *slavedev, c
+--- smbd/chgpasswd.c.orig      Wed May 28 08:41:11 2008
++++ smbd/chgpasswd.c   Thu Jul  3 05:06:29 2008
+@@ -228,7 +228,7 @@ static int dochild(int master, const char *slavedev, c
               passwordprogram));
  
        /* execl() password-change application */
--      if (execl("/bin/sh", "sh", "-c", passwordprogram, NULL) < 0)
-+      if (execl("/bin/sh", "sh", "-c", passwordprogram, (void *)NULL) < 0)
+-      if (execle("/bin/sh", "sh", "-c", passwordprogram, NULL, eptrs) < 0)
++      if (execle("/bin/sh", "sh", "-c", passwordprogram, (void *)NULL, eptrs) 
< 0)
        {
                DEBUG(3, ("Bad status returned from %s\n", passwordprogram));
                return (False);
Index: pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/net/samba/pkg/PLIST-docs,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST-docs
--- pkg/PLIST-docs      25 Oct 2007 09:46:44 -0000      1.8
+++ pkg/PLIST-docs      4 Jul 2008 02:48:13 -0000
@@ -34,55 +34,6 @@ share/examples/samba/LDAP/samba-schema.I
 share/examples/samba/LDAP/samba.schema
 share/examples/samba/LDAP/samba.schema.at.IBM-DS
 share/examples/samba/LDAP/samba.schema.oc.IBM-DS
-share/examples/samba/LDAP/smbldap-tools-0.9.2/
-share/examples/samba/LDAP/smbldap-tools-0.9.2/CONTRIBUTORS
-share/examples/samba/LDAP/smbldap-tools-0.9.2/COPYING
-share/examples/samba/LDAP/smbldap-tools-0.9.2/ChangeLog
-share/examples/samba/LDAP/smbldap-tools-0.9.2/FILES
-share/examples/samba/LDAP/smbldap-tools-0.9.2/INFRA
-share/examples/samba/LDAP/smbldap-tools-0.9.2/INSTALL
-share/examples/samba/LDAP/smbldap-tools-0.9.2/Makefile
-share/examples/samba/LDAP/smbldap-tools-0.9.2/README
-share/examples/samba/LDAP/smbldap-tools-0.9.2/TODO
-share/examples/samba/LDAP/smbldap-tools-0.9.2/configure.pl
-share/examples/samba/LDAP/smbldap-tools-0.9.2/doc/
-share/examples/samba/LDAP/smbldap-tools-0.9.2/doc/html/
-share/examples/samba/LDAP/smbldap-tools-0.9.2/doc/html/contents_motif.gif
-share/examples/samba/LDAP/smbldap-tools-0.9.2/doc/html/index.html
-share/examples/samba/LDAP/smbldap-tools-0.9.2/doc/html/next_motif.gif
-share/examples/samba/LDAP/smbldap-tools-0.9.2/doc/html/previous_motif.gif
-share/examples/samba/LDAP/smbldap-tools-0.9.2/doc/html/smbldap-tools.html
-share/examples/samba/LDAP/smbldap-tools-0.9.2/doc/html/smbldap-tools001.html
-share/examples/samba/LDAP/smbldap-tools-0.9.2/doc/html/smbldap-tools002.html
-share/examples/samba/LDAP/smbldap-tools-0.9.2/doc/html/smbldap-tools003.html
-share/examples/samba/LDAP/smbldap-tools-0.9.2/doc/html/smbldap-tools004.html
-share/examples/samba/LDAP/smbldap-tools-0.9.2/doc/html/smbldap-tools005.html
-share/examples/samba/LDAP/smbldap-tools-0.9.2/doc/html/smbldap-tools006.html
-share/examples/samba/LDAP/smbldap-tools-0.9.2/doc/html/smbldap-tools007.html
-share/examples/samba/LDAP/smbldap-tools-0.9.2/doc/html/smbldap-tools008.html
-share/examples/samba/LDAP/smbldap-tools-0.9.2/doc/html/smbldap-tools009.html
-share/examples/samba/LDAP/smbldap-tools-0.9.2/doc/html/smbldap-tools010.html
-share/examples/samba/LDAP/smbldap-tools-0.9.2/doc/smbldap-migrate-pwdump-accounts
-share/examples/samba/LDAP/smbldap-tools-0.9.2/doc/smbldap-migrate-pwdump-groups
-share/examples/samba/LDAP/smbldap-tools-0.9.2/doc/smbldap-migrate-unix-accounts
-share/examples/samba/LDAP/smbldap-tools-0.9.2/doc/smbldap-migrate-unix-groups
-share/examples/samba/LDAP/smbldap-tools-0.9.2/doc/smbldap-tools.pdf
-share/examples/samba/LDAP/smbldap-tools-0.9.2/smb.conf
-share/examples/samba/LDAP/smbldap-tools-0.9.2/smbldap-groupadd
-share/examples/samba/LDAP/smbldap-tools-0.9.2/smbldap-groupdel
-share/examples/samba/LDAP/smbldap-tools-0.9.2/smbldap-groupmod
-share/examples/samba/LDAP/smbldap-tools-0.9.2/smbldap-groupshow
-share/examples/samba/LDAP/smbldap-tools-0.9.2/smbldap-passwd
-share/examples/samba/LDAP/smbldap-tools-0.9.2/smbldap-populate
-share/examples/samba/LDAP/smbldap-tools-0.9.2/smbldap-tools.spec
-share/examples/samba/LDAP/smbldap-tools-0.9.2/smbldap-useradd
-share/examples/samba/LDAP/smbldap-tools-0.9.2/smbldap-userdel
-share/examples/samba/LDAP/smbldap-tools-0.9.2/smbldap-userinfo
-share/examples/samba/LDAP/smbldap-tools-0.9.2/smbldap-usermod
-share/examples/samba/LDAP/smbldap-tools-0.9.2/smbldap-usershow
-share/examples/samba/LDAP/smbldap-tools-0.9.2/smbldap.conf
-share/examples/samba/LDAP/smbldap-tools-0.9.2/smbldap_bind.conf
-share/examples/samba/LDAP/smbldap-tools-0.9.2/smbldap_tools.pm
 share/examples/samba/README
 share/examples/samba/VFS/
 share/examples/samba/VFS/Makefile.in
@@ -300,10 +251,10 @@ share/swat/help/Samba3-ByExample/DomApps
 share/swat/help/Samba3-ByExample/ExNetworks.html
 share/swat/help/Samba3-ByExample/HA.html
 share/swat/help/Samba3-ByExample/RefSection.html
+share/swat/help/Samba3-ByExample/apa.html
 share/swat/help/Samba3-ByExample/appendix.html
 share/swat/help/Samba3-ByExample/ch14.html
 share/swat/help/Samba3-ByExample/go01.html
-share/swat/help/Samba3-ByExample/gpl.html
 share/swat/help/Samba3-ByExample/happy.html
 share/swat/help/Samba3-ByExample/images/
 share/swat/help/Samba3-ByExample/images/AccountingNetwork.png
@@ -409,6 +360,7 @@ share/swat/help/Samba3-HOWTO/ServerType.
 share/swat/help/Samba3-HOWTO/StandAloneServer.html
 share/swat/help/Samba3-HOWTO/TOSHpreface.html
 share/swat/help/Samba3-HOWTO/VFS.html
+share/swat/help/Samba3-HOWTO/apa.html
 share/swat/help/Samba3-HOWTO/bugreport.html
 share/swat/help/Samba3-HOWTO/cfgsmarts.html
 share/swat/help/Samba3-HOWTO/ch-ldap-tls.html
@@ -418,7 +370,6 @@ share/swat/help/Samba3-HOWTO/compiling.h
 share/swat/help/Samba3-HOWTO/diagnosis.html
 share/swat/help/Samba3-HOWTO/domain-member.html
 share/swat/help/Samba3-HOWTO/go01.html
-share/swat/help/Samba3-HOWTO/gpl.html
 share/swat/help/Samba3-HOWTO/groupmapping.html
 share/swat/help/Samba3-HOWTO/idmapper.html
 share/swat/help/Samba3-HOWTO/images/
@@ -565,6 +516,7 @@ share/swat/help/manpages/vfs_readahead.8
 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/vfs_xattr_tdb.8.html
 share/swat/help/manpages/vfstest.1.html
 share/swat/help/manpages/wbinfo.1.html
 share/swat/help/manpages/winbindd.8.html
@@ -591,168 +543,3 @@ share/swat/help/welcome.html
 @comment share/swat/lang/tr/images/viewconfig.gif
 @comment share/swat/lang/tr/include/
 @comment share/swat/lang/tr/js/
-share/swat/using_samba/
-share/swat/using_samba/appa.html
-share/swat/using_samba/appb.html
-share/swat/using_samba/appc.html
-share/swat/using_samba/appd.html
-share/swat/using_samba/appe.html
-share/swat/using_samba/appf.html
-share/swat/using_samba/appg.html
-share/swat/using_samba/ch00.html
-share/swat/using_samba/ch01.html
-share/swat/using_samba/ch02.html
-share/swat/using_samba/ch03.html
-share/swat/using_samba/ch04.html
-share/swat/using_samba/ch05.html
-share/swat/using_samba/ch06.html
-share/swat/using_samba/ch07.html
-share/swat/using_samba/ch08.html
-share/swat/using_samba/ch09.html
-share/swat/using_samba/ch10.html
-share/swat/using_samba/ch11.html
-share/swat/using_samba/ch12.html
-share/swat/using_samba/figs/
-share/swat/using_samba/figs/sam2_0101.gif
-share/swat/using_samba/figs/sam2_0102.gif
-share/swat/using_samba/figs/sam2_0103.gif
-share/swat/using_samba/figs/sam2_0104.gif
-share/swat/using_samba/figs/sam2_0105.gif
-share/swat/using_samba/figs/sam2_0106.gif
-share/swat/using_samba/figs/sam2_0107.gif
-share/swat/using_samba/figs/sam2_0108.gif
-share/swat/using_samba/figs/sam2_0109.gif
-share/swat/using_samba/figs/sam2_0110.gif
-share/swat/using_samba/figs/sam2_0111.gif
-share/swat/using_samba/figs/sam2_0112.gif
-share/swat/using_samba/figs/sam2_0113.gif
-share/swat/using_samba/figs/sam2_0114.gif
-share/swat/using_samba/figs/sam2_0201.gif
-share/swat/using_samba/figs/sam2_0202.gif
-share/swat/using_samba/figs/sam2_0203.gif
-share/swat/using_samba/figs/sam2_0204.gif
-share/swat/using_samba/figs/sam2_0301.gif
-share/swat/using_samba/figs/sam2_0302.gif
-share/swat/using_samba/figs/sam2_0303.gif
-share/swat/using_samba/figs/sam2_0304.gif
-share/swat/using_samba/figs/sam2_0305.gif
-share/swat/using_samba/figs/sam2_0306.gif
-share/swat/using_samba/figs/sam2_0307.gif
-share/swat/using_samba/figs/sam2_0308.gif
-share/swat/using_samba/figs/sam2_0309.gif
-share/swat/using_samba/figs/sam2_0310.gif
-share/swat/using_samba/figs/sam2_0311.gif
-share/swat/using_samba/figs/sam2_0312.gif
-share/swat/using_samba/figs/sam2_0313.gif
-share/swat/using_samba/figs/sam2_0314.gif
-share/swat/using_samba/figs/sam2_0315.gif
-share/swat/using_samba/figs/sam2_0316.gif
-share/swat/using_samba/figs/sam2_0317.gif
-share/swat/using_samba/figs/sam2_0318.gif
-share/swat/using_samba/figs/sam2_0319.gif
-share/swat/using_samba/figs/sam2_0320.gif
-share/swat/using_samba/figs/sam2_0321.gif
-share/swat/using_samba/figs/sam2_0322.gif
-share/swat/using_samba/figs/sam2_0323.gif
-share/swat/using_samba/figs/sam2_0324.gif
-share/swat/using_samba/figs/sam2_0325.gif
-share/swat/using_samba/figs/sam2_0326.gif
-share/swat/using_samba/figs/sam2_0327.gif
-share/swat/using_samba/figs/sam2_0328.gif
-share/swat/using_samba/figs/sam2_0329.gif
-share/swat/using_samba/figs/sam2_0330.gif
-share/swat/using_samba/figs/sam2_0331.gif
-share/swat/using_samba/figs/sam2_0332.gif
-share/swat/using_samba/figs/sam2_0333.gif
-share/swat/using_samba/figs/sam2_0334.gif
-share/swat/using_samba/figs/sam2_0335.gif
-share/swat/using_samba/figs/sam2_0336.gif
-share/swat/using_samba/figs/sam2_0337.gif
-share/swat/using_samba/figs/sam2_0338.gif
-share/swat/using_samba/figs/sam2_0339.gif
-share/swat/using_samba/figs/sam2_0340.gif
-share/swat/using_samba/figs/sam2_0341.gif
-share/swat/using_samba/figs/sam2_0342.gif
-share/swat/using_samba/figs/sam2_0343.gif
-share/swat/using_samba/figs/sam2_0344.gif
-share/swat/using_samba/figs/sam2_0345.gif
-share/swat/using_samba/figs/sam2_0346.gif
-share/swat/using_samba/figs/sam2_0347.gif
-share/swat/using_samba/figs/sam2_0348.gif
-share/swat/using_samba/figs/sam2_0349.gif
-share/swat/using_samba/figs/sam2_0350.gif
-share/swat/using_samba/figs/sam2_0351.gif
-share/swat/using_samba/figs/sam2_0352.gif
-share/swat/using_samba/figs/sam2_0353.gif
-share/swat/using_samba/figs/sam2_0354.gif
-share/swat/using_samba/figs/sam2_0355.gif
-share/swat/using_samba/figs/sam2_0356.gif
-share/swat/using_samba/figs/sam2_0357.gif
-share/swat/using_samba/figs/sam2_0358.gif
-share/swat/using_samba/figs/sam2_0359.gif
-share/swat/using_samba/figs/sam2_0360.gif
-share/swat/using_samba/figs/sam2_0361.gif
-share/swat/using_samba/figs/sam2_0401.gif
-share/swat/using_samba/figs/sam2_0402.gif
-share/swat/using_samba/figs/sam2_0403.gif
-share/swat/using_samba/figs/sam2_0404.gif
-share/swat/using_samba/figs/sam2_0405.gif
-share/swat/using_samba/figs/sam2_0406.gif
-share/swat/using_samba/figs/sam2_0407.gif
-share/swat/using_samba/figs/sam2_0408.gif
-share/swat/using_samba/figs/sam2_0409.gif
-share/swat/using_samba/figs/sam2_0410.gif
-share/swat/using_samba/figs/sam2_0411.gif
-share/swat/using_samba/figs/sam2_0412.gif
-share/swat/using_samba/figs/sam2_0413.gif
-share/swat/using_samba/figs/sam2_0414.gif
-share/swat/using_samba/figs/sam2_0415.gif
-share/swat/using_samba/figs/sam2_0416.gif
-share/swat/using_samba/figs/sam2_0417.gif
-share/swat/using_samba/figs/sam2_0501.gif
-share/swat/using_samba/figs/sam2_0502.gif
-share/swat/using_samba/figs/sam2_0503.gif
-share/swat/using_samba/figs/sam2_0504.gif
-share/swat/using_samba/figs/sam2_0505.gif
-share/swat/using_samba/figs/sam2_0506.gif
-share/swat/using_samba/figs/sam2_0507.gif
-share/swat/using_samba/figs/sam2_0508.gif
-share/swat/using_samba/figs/sam2_0601.gif
-share/swat/using_samba/figs/sam2_0602.gif
-share/swat/using_samba/figs/sam2_0603.gif
-share/swat/using_samba/figs/sam2_0604.gif
-share/swat/using_samba/figs/sam2_0605.gif
-share/swat/using_samba/figs/sam2_0701.gif
-share/swat/using_samba/figs/sam2_0801.gif
-share/swat/using_samba/figs/sam2_0802.gif
-share/swat/using_samba/figs/sam2_0803.gif
-share/swat/using_samba/figs/sam2_0804.gif
-share/swat/using_samba/figs/sam2_0805.gif
-share/swat/using_samba/figs/sam2_0806.gif
-share/swat/using_samba/figs/sam2_0807.gif
-share/swat/using_samba/figs/sam2_0808.gif
-share/swat/using_samba/figs/sam2_0809.gif
-share/swat/using_samba/figs/sam2_0810.gif
-share/swat/using_samba/figs/sam2_0811.gif
-share/swat/using_samba/figs/sam2_0901.gif
-share/swat/using_samba/figs/sam2_0902.gif
-share/swat/using_samba/figs/sam2_0903.gif
-share/swat/using_samba/figs/sam2_1001.gif
-share/swat/using_samba/figs/sam2_1002.gif
-share/swat/using_samba/figs/sam2_1003.gif
-share/swat/using_samba/figs/sam2_1004.gif
-share/swat/using_samba/figs/sam2_1005.gif
-share/swat/using_samba/figs/sam2_1006.gif
-share/swat/using_samba/figs/sam2_1101.gif
-share/swat/using_samba/figs/sam2_1102.gif
-share/swat/using_samba/figs/sam2_af01.gif
-share/swat/using_samba/figs/sam2_af02.gif
-share/swat/using_samba/figs/sam2_af03.gif
-share/swat/using_samba/figs/sam2_af04.gif
-share/swat/using_samba/figs/sam2_af05.gif
-share/swat/using_samba/figs/sam2_af06.gif
-share/swat/using_samba/figs/sam2_af07.gif
-share/swat/using_samba/inx.html
-share/swat/using_samba/samba2_s.gif
-share/swat/using_samba/samba2_xs.gif
-share/swat/using_samba/toc.html
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/samba/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST-main
--- pkg/PLIST-main      14 Dec 2007 08:53:27 -0000      1.6
+++ pkg/PLIST-main      4 Jul 2008 02:46:46 -0000
@@ -1,28 +1,28 @@
 @comment $OpenBSD: PLIST-main,v 1.6 2007/12/14 08:53:27 mbalmer Exp $
 @pkgpath ${BASE_PKGPATH}
-bin/eventlogadm
[EMAIL PROTECTED] bin/eventlogadm
 bin/findsmb
 bin/mksmbpasswd
-bin/net
-bin/nmblookup
-bin/ntlm_auth
-bin/pdbedit
-bin/profiles
-bin/rpcclient
-bin/smbcacls
-bin/smbclient
-bin/smbcontrol
-bin/smbcquotas
-bin/smbget
-bin/smbpasswd
-bin/smbspool
-bin/smbstatus
[EMAIL PROTECTED] bin/net
[EMAIL PROTECTED] bin/nmblookup
[EMAIL PROTECTED] bin/ntlm_auth
[EMAIL PROTECTED] bin/pdbedit
[EMAIL PROTECTED] bin/profiles
[EMAIL PROTECTED] bin/rpcclient
[EMAIL PROTECTED] bin/smbcacls
[EMAIL PROTECTED] bin/smbclient
[EMAIL PROTECTED] bin/smbcontrol
[EMAIL PROTECTED] bin/smbcquotas
[EMAIL PROTECTED] bin/smbget
[EMAIL PROTECTED] bin/smbpasswd
[EMAIL PROTECTED] bin/smbspool
[EMAIL PROTECTED] bin/smbstatus
 bin/smbtar
-bin/smbtree
-bin/tdbbackup
-bin/tdbdump
-bin/tdbtool
-bin/testparm
[EMAIL PROTECTED] bin/smbtree
[EMAIL PROTECTED] bin/tdbbackup
[EMAIL PROTECTED] bin/tdbdump
[EMAIL PROTECTED] bin/tdbtool
[EMAIL PROTECTED] bin/testparm
 include/libmsrpc.h
 include/libsmbclient.h
 lib/samba/
@@ -43,9 +43,9 @@ lib/samba/rpc/
 lib/samba/tr.msg
 lib/samba/upcase.dat
 lib/samba/valid.dat
-libexec/nmbd
-libexec/smbd
-libexec/swat
[EMAIL PROTECTED] libexec/nmbd
[EMAIL PROTECTED] libexec/smbd
[EMAIL PROTECTED] libexec/swat
 @man man/man1/findsmb.1
 @man man/man1/log2pcap.1
 @man man/man1/nmblookup.1
@@ -105,6 +105,7 @@ libexec/swat
 @man man/man8/vfs_readonly.8
 @man man/man8/vfs_recycle.8
 @man man/man8/vfs_shadow_copy.8
[EMAIL PROTECTED] man/man8/vfs_xattr_tdb.8
 @man man/man8/winbindd.8
 share/examples/samba/
 @sample ${SYSCONFDIR}/samba/

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Reply via email to