[Pkg-samba-maint] r3222 - trunk/samba/debian/patches
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Tue Jan 12 21:38:17 UTC 2010
Author: bubulle
Date: 2010-01-12 21:38:16 +0000 (Tue, 12 Jan 2010)
New Revision: 3222
Modified:
trunk/samba/debian/patches/adapt_machine_creation_script.patch
trunk/samba/debian/patches/documentation.patch
Log:
Adapt to the slightly new format of manpages in 3.4.4
Modified: trunk/samba/debian/patches/adapt_machine_creation_script.patch
===================================================================
--- trunk/samba/debian/patches/adapt_machine_creation_script.patch 2010-01-12 21:37:01 UTC (rev 3221)
+++ trunk/samba/debian/patches/adapt_machine_creation_script.patch 2010-01-12 21:38:16 UTC (rev 3222)
@@ -3,16 +3,16 @@
Bug-Debian: http://bugs.debian.org/346234
Forwarded: not-needed
-Index: b/docs/manpages/smb.conf.5
+Index: samba/docs/manpages/smb.conf.5
===================================================================
---- a/docs/manpages/smb.conf.5 2009-11-08 15:54:27.000000000 +0100
-+++ b/docs/manpages/smb.conf.5 2009-11-08 15:55:35.000000000 +0100
-@@ -1153,8 +1153,8 @@
+--- samba.orig/docs/manpages/smb.conf.5
++++ samba/docs/manpages/smb.conf.5
+@@ -877,8 +877,8 @@
Default:
- \fI\fIadd machine script\fR\fR\fI = \fR\fI\FC\F[]\fR\fI \fR
+ \fI\fIadd machine script\fR\fR\fI = \fR\fI\fR\fI \fR
.sp
-Example:
--\fI\fIadd machine script\fR\fR\fI = \fR\fI\FC/usr/sbin/adduser \-n \-g machines \-c Machine \-d /var/lib/nobody \-s /bin/false %u\F[]\fR\fI \fR
+-\fI\fIadd machine script\fR\fR\fI = \fR\fI/usr/sbin/adduser \-n \-g machines \-c Machine \-d /var/lib/nobody \-s /bin/false %u\fR\fI \fR
+Example for Debian:
+\fI\fIadd machine script\fR\fR\fI = \fR\fI\FC/usr/sbin/adduser \-\-disabled-password \-\-ingroup machines \-\-gecos Machine \-\-home /var/lib/samba \-\-shell /bin/false %u\F[]\fR\fI \fR
.RE
Modified: trunk/samba/debian/patches/documentation.patch
===================================================================
--- trunk/samba/debian/patches/documentation.patch 2010-01-12 21:37:01 UTC (rev 3221)
+++ trunk/samba/debian/patches/documentation.patch 2010-01-12 21:38:16 UTC (rev 3222)
@@ -2,11 +2,11 @@
Author: Christian Perrier <bubulle at debian.org>
Forwarded: not-needed
-Index: b/docs/manpages/swat.8
+Index: samba/docs/manpages/swat.8
===================================================================
---- a/docs/manpages/swat.8 2009-11-08 15:54:28.000000000 +0100
-+++ b/docs/manpages/swat.8 2009-11-08 15:55:33.000000000 +0100
-@@ -261,85 +261,6 @@
+--- samba.orig/docs/manpages/swat.8
++++ samba/docs/manpages/swat.8
+@@ -111,85 +111,6 @@
.RS 4
Print a summary of command line options\&.
.RE
@@ -15,9 +15,9 @@
-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
--\FCmake install \F[]
+-make install
-to install the
--\FCswat\F[]
+-swat
-binary and the various help files and images\&. A default install would put these in:
-.sp
-.RS 4
@@ -56,210 +56,210 @@
-.SS "Inetd Installation"
-.PP
-You need to edit your
--\FC/etc/inetd\&.conf \F[]
+-/etc/inetd\&.conf
-and
--\FC/etc/services\F[]
+-/etc/services
-to enable SWAT to be launched via
--\FCinetd\F[]\&.
+-inetd\&.
-.PP
-In
--\FC/etc/services\F[]
+-/etc/services
-you need to add a line like this:
-.PP
--\FCswat 901/tcp\F[]
+-swat 901/tcp
-.PP
-Note for NIS/YP and LDAP users \- you may need to rebuild the NIS service maps rather than alter your local
--\FC /etc/services\F[]
+-/etc/services
-file\&.
-.PP
-the choice of port number isn\'t really important except that it should be less than 1024 and not currently used (using a number above 1024 presents an obscure security hole depending on the implementation details of your
--\FCinetd\F[]
+-inetd
-daemon)\&.
-.PP
-In
--\FC/etc/inetd\&.conf\F[]
+-/etc/inetd\&.conf
-you should add a line like this:
-.PP
--\FCswat stream tcp nowait\&.400 root /usr/local/samba/sbin/swat swat\F[]
+-swat stream tcp nowait\&.400 root /usr/local/samba/sbin/swat swat
-.PP
-Once you have edited
--\FC/etc/services\F[]
+-/etc/services
-and
--\FC/etc/inetd\&.conf\F[]
+-/etc/inetd\&.conf
-you need to send a HUP signal to inetd\&. To do this use
--\FCkill \-1 PID \F[]
+-kill \-1 PID
-where PID is the process ID of the inetd daemon\&.
.SH "LAUNCHING"
.PP
To launch SWAT just run your favorite web browser and point it at "http://localhost:901/"\&.
-@@ -357,14 +278,11 @@
+@@ -207,14 +128,11 @@
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
--\FC/usr/local/samba/lib/smb\&.conf\F[]
-+\FC/etc/samba/smb\&.conf\F[]
+-/usr/local/samba/lib/smb\&.conf
++/etc/samba/smb\&.conf
.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
--\FC /usr/samba/lib/smb\&.conf\F[]
+-/usr/samba/lib/smb\&.conf
-and
--\FC/etc/smb\&.conf \F[]\&. This file describes all the services the server is to make available to clients\&.
+-/etc/smb\&.conf\&. 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: b/docs/manpages/nmbd.8
+Index: samba/docs/manpages/nmbd.8
===================================================================
---- a/docs/manpages/nmbd.8 2009-11-08 15:54:28.000000000 +0100
-+++ b/docs/manpages/nmbd.8 2009-11-08 15:55:33.000000000 +0100
-@@ -265,10 +265,7 @@
+--- samba.orig/docs/manpages/nmbd.8
++++ samba/docs/manpages/nmbd.8
+@@ -115,10 +115,7 @@
to answer any name queries\&. Adding a line to this file affects name NetBIOS resolution from this host
\fIONLY\fR\&.
.sp
-The default path to this file is compiled into Samba as part of the build process\&. Common defaults are
--\FC/usr/local/samba/lib/lmhosts\F[],
--\FC/usr/samba/lib/lmhosts\F[]
+-/usr/local/samba/lib/lmhosts,
+-/usr/samba/lib/lmhosts
-or
+The default path to this file is
- \FC/etc/samba/lmhosts\F[]\&. See the
+ /etc/samba/lmhosts\&. See the
\fBlmhosts\fR(5)
man page for details on the contents of this file\&.
-@@ -337,14 +334,11 @@
- \FCinetd\F[], this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
+@@ -187,14 +184,11 @@
+ inetd, this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
.RE
.PP
--\FC/usr/local/samba/lib/smb\&.conf\F[]
-+\FC/etc/samba/smb\&.conf\F[]
+-/usr/local/samba/lib/smb\&.conf
++/etc/samba/smb\&.conf
.RS 4
This is the default location of the
\fBsmb.conf\fR(5)
-server configuration file\&. Other common places that systems install this file are
--\FC/usr/samba/lib/smb\&.conf\F[]
+-/usr/samba/lib/smb\&.conf
-and
--\FC/etc/samba/smb\&.conf\F[]\&.
+-/etc/samba/smb\&.conf\&.
+server configuration file\&.
.sp
When run as a WINS server (see the
\m[blue]\fBwins support\fR\m[]
-@@ -388,10 +382,8 @@
+@@ -238,10 +232,8 @@
will accept SIGHUP, which will cause it to dump out its namelists into the file
- \FCnamelist\&.debug \F[]
+ namelist\&.debug
in the
--\FC/usr/local/samba/var/locks\F[]
+-/usr/local/samba/var/locks
-directory (or the
--\FCvar/locks\F[]
+-var/locks
-directory configured under wherever Samba was configured to install itself)\&. This will also cause
-+\FC/var/run/samba\F[]
++/var/run/samba
+directory\&. This will also cause
- \FCnmbd\F[]
+ nmbd
to dump out its server database in the
- \FClog\&.nmb\F[]
-Index: b/docs/manpages/smbd.8
+ log\&.nmb
+Index: samba/docs/manpages/smbd.8
===================================================================
---- a/docs/manpages/smbd.8 2009-11-08 15:54:28.000000000 +0100
-+++ b/docs/manpages/smbd.8 2009-11-08 15:55:33.000000000 +0100
-@@ -319,14 +319,11 @@
- \FCinetd\F[], this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
+--- samba.orig/docs/manpages/smbd.8
++++ samba/docs/manpages/smbd.8
+@@ -169,14 +169,11 @@
+ inetd, this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
.RE
.PP
--\FC/usr/local/samba/lib/smb\&.conf\F[]
-+\FC/etc/samba/smb\&.conf\F[]
+-/usr/local/samba/lib/smb\&.conf
++/etc/samba/smb\&.conf
.RS 4
This is the default location of the
\fBsmb.conf\fR(5)
-server configuration file\&. Other common places that systems install this file are
--\FC/usr/samba/lib/smb\&.conf\F[]
+-/usr/samba/lib/smb\&.conf
-and
--\FC/etc/samba/smb\&.conf\F[]\&.
+-/etc/samba/smb\&.conf\&.
+server configuration file\&.
.sp
This file describes all the services the server is to make available to clients\&. See
\fBsmb.conf\fR(5)
-Index: b/docs/manpages/lmhosts.5
+Index: samba/docs/manpages/lmhosts.5
===================================================================
---- a/docs/manpages/lmhosts.5 2009-11-08 15:54:28.000000000 +0100
-+++ b/docs/manpages/lmhosts.5 2009-11-08 15:55:33.000000000 +0100
-@@ -257,10 +257,8 @@
+--- samba.orig/docs/manpages/lmhosts.5
++++ samba/docs/manpages/lmhosts.5
+@@ -95,10 +95,8 @@
file\&.
.SH "FILES"
.PP
-lmhosts is loaded from the configuration directory\&. This is usually
--\FC/etc/samba\F[]
+-/etc/samba
-or
--\FC/usr/local/samba/lib\F[]\&.
+-/usr/local/samba/lib\&.
+lmhosts is loaded from the configuration directory\&. This is
-+\FC/etc/samba\F[]\&.
++/etc/samba\&.
.SH "VERSION"
.PP
This man page is correct for version 3 of the Samba suite\&.
-Index: b/docs/manpages/ntlm_auth.1
+Index: samba/docs/manpages/ntlm_auth.1
===================================================================
---- a/docs/manpages/ntlm_auth.1 2009-11-08 15:54:28.000000000 +0100
-+++ b/docs/manpages/ntlm_auth.1 2009-11-08 15:55:33.000000000 +0100
-@@ -193,7 +193,7 @@
+--- samba.orig/docs/manpages/ntlm_auth.1
++++ samba/docs/manpages/ntlm_auth.1
+@@ -43,7 +43,7 @@
Some of these commands also require access to the directory
- \FCwinbindd_privileged\F[]
+ winbindd_privileged
in
--\FC$LOCKDIR\F[]\&. This should be done either by running this command as root or providing group access to the
-+\FC/var/run/samba\F[]\&. This should be done either by running this command as root or providing group access to the
- \FCwinbindd_privileged\F[]
+-$LOCKDIR\&. This should be done either by running this command as root or providing group access to the
++/var/run/samba\&. This should be done either by running this command as root or providing group access to the
+ winbindd_privileged
directory\&. For security reasons, this directory should not be world\-accessable\&.
.SH "OPTIONS"
-@@ -219,7 +219,7 @@
+@@ -69,7 +69,7 @@
Requires access to the directory
- \FCwinbindd_privileged\F[]
+ winbindd_privileged
in
--\FC$LOCKDIR\F[]\&. The protocol used is described here:
-+\FC/var/run/samba\F[]\&. The protocol used is described here:
+-$LOCKDIR\&. The protocol used is described here:
++/var/run/samba\&. The protocol used is described here:
http://devel\&.squid\-cache\&.org/ntlm/squid_helper_protocol\&.html\&. This protocol has been extended to allow the NTLMSSP Negotiate packet to be included as an argument to the
- \FCYR\F[]
+ YR
command\&. (Thus avoiding loss of information in the protocol exchange)\&.
-@@ -242,7 +242,7 @@
+@@ -92,7 +92,7 @@
Requires access to the directory
- \FCwinbindd_privileged\F[]
+ winbindd_privileged
in
--\FC$LOCKDIR\F[]\&.
-+\FC/var/run/samba\F[]\&.
+-$LOCKDIR\&.
++/var/run/samba\&.
.RE
.PP
gss\-spnego\-client
-Index: b/docs/manpages/tdbbackup.8
+Index: samba/docs/manpages/tdbbackup.8
===================================================================
---- a/docs/manpages/tdbbackup.8 2009-11-08 15:54:28.000000000 +0100
-+++ b/docs/manpages/tdbbackup.8 2009-11-08 15:55:33.000000000 +0100
-@@ -227,7 +227,7 @@
+--- samba.orig/docs/manpages/tdbbackup.8
++++ samba/docs/manpages/tdbbackup.8
+@@ -77,7 +77,7 @@
.\}
- \FCsecrets\&.tdb\F[]
+ secrets\&.tdb
-\- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba\&.
+\- usual location is in the /var/lib/samba directory\&.
.RE
.sp
.RS 4
-@@ -240,7 +240,7 @@
+@@ -90,7 +90,7 @@
.\}
- \FCpassdb\&.tdb\F[]
+ passdb\&.tdb
-\- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba\&.
+\- usual location is in the /var/lib/samba directory\&.
.RE
.sp
.RS 4
-@@ -253,7 +253,7 @@
+@@ -103,7 +103,7 @@
.\}
- \FC*\&.tdb\F[]
+ *\&.tdb
-located in the /usr/local/samba/var directory or on some systems in the /var/cache or /var/lib/samba directories\&.
+located in the /var/lib/samba and /var/run/samba directories\&.
.SH "VERSION"
.PP
This man page is correct for version 3 of the Samba suite\&.
-Index: b/docs/manpages/winbindd.8
+Index: samba/docs/manpages/winbindd.8
===================================================================
---- a/docs/manpages/winbindd.8 2009-11-08 15:54:28.000000000 +0100
-+++ b/docs/manpages/winbindd.8 2009-11-08 15:55:33.000000000 +0100
-@@ -771,16 +771,16 @@
+--- samba.orig/docs/manpages/winbindd.8
++++ samba/docs/manpages/winbindd.8
+@@ -549,16 +549,16 @@
file are owned by root\&.
.RE
.PP
@@ -267,20 +267,20 @@
+/var/run/samba/winbindd_privileged/pipe
.RS 4
The UNIX pipe over which \'privileged\' clients communicate with the
- \FCwinbindd\F[]
+ winbindd
program\&. For security reasons, access to some winbindd functions \- like those needed by the
- \FCntlm_auth\F[]
+ ntlm_auth
-utility \- is restricted\&. By default, only users in the \'root\' group will get this access, however the administrator may change the group permissions on $LOCKDIR/winbindd_privileged to allow programs like \'squid\' to use ntlm_auth\&. Note that the winbind client will only attempt to connect to the winbindd daemon if both the
--\FC$LOCKDIR/winbindd_privileged\F[]
+-$LOCKDIR/winbindd_privileged
+utility \- is restricted\&. By default, only users in the \'root\' group will get this access, however the administrator may change the group permissions on /var/run/samba/winbindd_privileged to allow programs like \'squid\' to use ntlm_auth\&. Note that the winbind client will only attempt to connect to the winbindd daemon if both the
-+\FC/var/run/samba/winbindd_privileged\F[]
++/var/run/samba/winbindd_privileged
directory and
--\FC$LOCKDIR/winbindd_privileged/pipe\F[]
-+\FC/var/run/samba/winbindd_privileged/pipe\F[]
+-$LOCKDIR/winbindd_privileged/pipe
++/var/run/samba/winbindd_privileged/pipe
file are owned by root\&.
.RE
.PP
-@@ -789,15 +789,12 @@
+@@ -567,15 +567,12 @@
Implementation of name service switch library\&.
.RE
.PP
@@ -290,7 +290,7 @@
-Storage for the Windows NT rid to UNIX user/group id mapping\&. The lock directory is specified when Samba is initially compiled using the
-\fI\-\-with\-lockdir\fR
-option\&. This directory is by default
--\FC/usr/local/samba/var/locks \F[]\&.
+-/usr/local/samba/var/locks\&.
+Storage for the Windows NT rid to UNIX user/group id mapping\&.
.RE
.PP
More information about the Pkg-samba-maint
mailing list