this updates net/samba to version 3.0.25b. please see
http://www.samba.org/samba/history/samba-3.0.25b.html
for full release information.
comments? ok?
Index: net/samba/Makefile
===================================================================
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.84
diff -u -r1.84 Makefile
--- net/samba/Makefile 4 Jun 2007 16:19:13 -0000 1.84
+++ net/samba/Makefile 1 Jul 2007 09:50:26 -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.25a
-PKGNAME-main= ${DISTNAME}p1
+DISTNAME= samba-3.0.25b
+PKGNAME-main= ${DISTNAME}
FULLPKGNAME-docs= ${DISTNAME:S/-/-docs-/}
SHARED_LIBS= smbclient 1.0 \
msrpc 1.0
Index: net/samba/distinfo
===================================================================
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- net/samba/distinfo 28 May 2007 20:03:01 -0000 1.8
+++ net/samba/distinfo 1 Jul 2007 09:50:26 -0000
@@ -1,5 +1,5 @@
-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
+MD5 (samba-3.0.25b.tar.gz) = 5Jeaaqbxjw42uswlyrewLQ==
+RMD160 (samba-3.0.25b.tar.gz) = p9HZs4/NwNXC/V3auWJKGOVU/4E=
+SHA1 (samba-3.0.25b.tar.gz) = lsFqEQakJpX6cnFo2L61n36G9yY=
+SHA256 (samba-3.0.25b.tar.gz) = 3FB02crWaebFH3yMDUDPmx/hLhodtSvReT7XY6cOh6I=
+SIZE (samba-3.0.25b.tar.gz) = 18160223
Index: net/samba/patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-Makefile_in,v
retrieving revision 1.8
diff -u -r1.8 patch-Makefile_in
--- net/samba/patches/patch-Makefile_in 28 May 2007 20:03:01 -0000 1.8
+++ net/samba/patches/patch-Makefile_in 1 Jul 2007 09:50:26 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.8 2007/05/28 20:03:01 mbalmer Exp $
---- Makefile.in.orig Wed Apr 25 11:39:00 2007
-+++ Makefile.in Thu May 17 10:17:30 2007
+--- Makefile.in.orig Tue Jun 19 19:11:39 2007
++++ Makefile.in Sun Jul 1 11:22:09 2007
@@ -109,11 +109,13 @@ LOCKDIR = @lockdir@
# the directory where pid files go
PIDDIR = @piddir@
@@ -44,7 +44,7 @@
bin/libmsrpc.a: proto_exists $(CAC_OBJ)
@echo Linking libmsrpc non-shared library $@
-@@ -1618,14 +1618,14 @@ installswat: installdirs installmsg
+@@ -1623,14 +1623,14 @@ installswat: installdirs installmsg
installclientlib: installdirs libsmbclient
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR)
$(LIBDIR)
Index:
net/samba/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.1
diff -u -r1.1 patch-docs_htmldocs_Samba3_Developers_Guide_pwencrypt_html
---
net/samba/patches/patch-docs_htmldocs_Samba3_Developers_Guide_pwencrypt_html
13 Oct 2005 21:00:38 -0000 1.1
+++
net/samba/patches/patch-docs_htmldocs_Samba3_Developers_Guide_pwencrypt_html
1 Jul 2007 09:50:26 -0000
@@ -1,19 +1,24 @@
---- ../docs/htmldocs/Samba3-Developers-Guide/pwencrypt.html.orig Fri Aug
19 20:01:27 2005
-+++ ../docs/htmldocs/Samba3-Developers-Guide/pwencrypt.html Sat Aug 20
06:17:25 2005
-@@ -51,12 +51,12 @@
+--- ../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 @@
++
+ <html><head><meta http-equiv="Content-Type" content="text/html;
charset=ISO-8859-1"><title>Chapter 13. LanMan and NT Password
Encryption</title><link rel="stylesheet" href="samba.css" type="text/css"><meta
name="generator" content="DocBook XSL Stylesheets V1.71.0"><link rel="start"
href="index.html" title="SAMBA Developers Guide"><link rel="up"
href="pt03.html" title="Part III. Samba Subsystems"><link rel="prev"
href="wins.html" title="Chapter 12. Samba WINS Internals"><link rel="next"
href="pt04.html" title="Part IV. Debugging and tracing"></head><body
bgcolor="white" text="black" link="#0000FF" vlink="#840084"
alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation
header"><tr><th colspan="3" align="center">Chapter 13. LanMan and NT Password
Encryption</th></tr><tr><td width="20%" align="left"><a accesskey="p"
href="wins.html">Prev</a> </td><th width="60%" align="center">Part III. Samba
Subsystems</th><td width="20%" align="right"> <a accesskey="n"
href="pt04.html">Next</a></td></tr></table><hr></div><div class="chapter"
lang="en"><div class="titlepage"><div><div><h2 class="title"><a
name="pwencrypt"></a>Chapter 13. LanMan and NT Password
Encryption</h2></div><div><div class="author"><h3 class="author"><span
class="firstname">Jeremy</span> <span class="surname">Allison</span></h3><div
class="affiliation"><span class="orgname">Samba Team<br></span><div
class="address"><p><br>
+ <code class="email"><<a href="mailto:[EMAIL
PROTECTED]">[EMAIL PROTECTED]</a>></code><br>
+ </p></div></div></div></div><div><p class="pubdate">19
Apr 1999</p></div></div></div><div class="toc"><p><b>Table of
Contents</b></p><dl><dt><span class="sect1"><a
href="pwencrypt.html#id325949">Introduction</a></span></dt><dt><span
class="sect1"><a href="pwencrypt.html#id325966">How does it
work?</a></span></dt><dt><span class="sect1"><a
href="pwencrypt.html#id326031">The smbpasswd
file</a></span></dt></dl></div><div class="sect1" lang="en"><div
class="titlepage"><div><div><h2 class="title" style="clear: both"><a
name="id325949"></a>Introduction</h2></div></div></div><p>With the development
of LanManager and Windows NT
+@@ -51,12 +52,12 @@
containing this 16 byte value must be kept. To minimise problems with
these two password files, getting out of sync, the UNIX <code
class="filename">
/etc/passwd</code> and the <code class="filename">smbpasswd</code>
file,
-- a utility, <span><strong
class="command">mksmbpasswd.sh</strong></span>, is provided to generate
-+ a utility, <span><strong class="command">mksmbpasswd</strong></span>,
is provided to generate
+- a utility, <code class="literal">mksmbpasswd.sh</code>, is provided to
generate
++ a utility, <code class="literal">mksmbpasswd</code>, is provided to
generate
a smbpasswd file from a UNIX <code class="filename">/etc/passwd</code>
file.
</p><p>To generate the smbpasswd file from your <code
class="filename">/etc/passwd
- </code> file use the following command:</p><p><code class="prompt">$
</code><strong class="userinput"><code>cat /etc/passwd | mksmbpasswd.sh
- > /usr/local/samba/private/smbpasswd</code></strong></p><p>If you
are running on a system that uses NIS, use</p><p><code class="prompt">$
</code><strong class="userinput"><code>ypcat passwd | mksmbpasswd.sh
-- > /usr/local/samba/private/smbpasswd</code></strong></p><p>The
<span><strong class="command">mksmbpasswd.sh</strong></span> program is found
in
+- > /usr/local/samba/private/smbpasswd</code></strong></p><p>The <code
class="literal">mksmbpasswd.sh</code> program is found in
+ </code> file use the following command:</p><p><code class="prompt">$
</code><strong class="userinput"><code>cat /etc/passwd | mksmbpasswd
+ > /usr/local/samba/private/smbpasswd</code></strong></p><p>If you
are running on a system that uses NIS, use</p><p><code class="prompt">$
</code><strong class="userinput"><code>ypcat passwd | mksmbpasswd
-+ > /usr/local/samba/private/smbpasswd</code></strong></p><p>The
<span><strong class="command">mksmbpasswd</strong></span> program is found in
++ > /usr/local/samba/private/smbpasswd</code></strong></p><p>The <code
class="literal">mksmbpasswd</code> program is found in
the Samba source directory. By default, the smbpasswd file is
stored in :</p><p><code
class="filename">/usr/local/samba/private/smbpasswd</code></p><p>The owner of
the <code class="filename">/usr/local/samba/private/</code>
directory should be set to root, and the permissions on it should
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.4
diff -u -r1.4 patch-docs_manpages_swat_8
--- net/samba/patches/patch-docs_manpages_swat_8 3 Jun 2007 16:54:36
-0000 1.4
+++ net/samba/patches/patch-docs_manpages_swat_8 1 Jul 2007 09:50:26
-0000
@@ -1,5 +1,5 @@
---- ../docs/manpages/swat.8.orig Fri May 11 04:02:07 2007
-+++ ../docs/manpages/swat.8 Thu May 17 10:21:36 2007
+--- ../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.
@@ -9,18 +9,18 @@
-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
--\fBmake install \fR
+-make install
-to install the
--\fBswat\fR
+-swat
-binary and the various help files and images. A default install would put
these in:
-.TP 3n
--•
+-\(bu
-/usr/local/samba/sbin/swat
-.TP 3n
--•
+-\(bu
-/usr/local/samba/swat/images/*
-.TP 3n
--•
+-\(bu
-/usr/local/samba/swat/help/*
.SS "Inetd Installation"
.PP
@@ -29,8 +29,8 @@
\fI/etc/inetd.conf\fR
you should add a line like this:
.PP
--\fBswat stream tcp nowait.400 root /usr/local/samba/sbin/swat swat\fR
-+\fBswat stream tcp nowait.400 root !!LOCALBASE!!/libexec/swat swat\fR
+-swat stream tcp nowait.400 root /usr/local/samba/sbin/swat swat
++swat stream tcp nowait.400 root !!LOCALBASE!!/libexec/swat swat
.PP
Once you have edited
\fI/etc/services\fR
Index: net/samba/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/samba/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -r1.3 PLIST-main
--- net/samba/pkg/PLIST-main 28 May 2007 20:03:01 -0000 1.3
+++ net/samba/pkg/PLIST-main 1 Jul 2007 09:50:26 -0000
@@ -110,8 +110,10 @@
@sample ${SYSCONFDIR}/samba/
share/examples/samba/smb.conf.default
@sample ${SYSCONFDIR}/samba/smb.conf
[EMAIL PROTECTED] share/nls/pl_PL.ISO_8859-2/
share/swat/
share/swat/help/
+share/swat/help/Samba3-Developers-Guide/pr01.html
share/swat/help/welcome-no-samba-doc.html
share/swat/images/
share/swat/images/globals.gif
