sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

Fixing Debian-specific patches so they apply cleanly.

Browse Source 
(This used to be commit da0f18cb7be8aa9a9f990507b107e10ce3fadebb)
This commit is contained in:
Eloy Paris 2003-06-06 20:31:18 +00:00
parent f5c21fc365
commit c2547dcc48
2 changed files with 69 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
packaging/Debian/debian/patches/documentation.patch
View File

@ -17,79 +17,6 @@ diff -uNr samba-2.999+3.0.alpha21.orig/docs/htmldocs/using_samba/ch06_05.html sa
domain logons = yes
security = user </pre></div><DIV CLASS="sect3">
diff -uNr samba-2.999+3.0.alpha21.orig/docs/manpages/swat.8 samba-2.999+3.0.alpha21/docs/manpages/swat.8
--- samba-2.999+3.0.alpha21.orig/docs/manpages/swat.8 2002-11-26 20:54:13.000000000 -0600
+++ samba-2.999+3.0.alpha21/docs/manpages/swat.8 2002-12-16 23:15:46.000000000 -0600
@@ -42,19 +42,26 @@
server. \fR
.SH "INSTALLATION"
.PP
+\fBDebian-specific Note\fR: all these steps have already been done for
+you. However, by default, swat is not enabled. This has been done for
+security reasons. To enable swat you need to edit /etc/inetd.conf,
+uncomment the swat entry (usually at the end of the file), and then
+restart inetd.
+.PP
After you compile SWAT you need to run \fBmake install
\fR to install the \fBswat\fR binary
-and the various help files and images. A default install would put
-these in:
+and the various help files and images. Under \fBDebian\fR, these
+files are in (please note that these locations are different than the
+default location):
.TP 0.2i
\(bu
-/usr/local/samba/bin/swat
+/usr/sbin/*
.TP 0.2i
\(bu
-/usr/local/samba/swat/images/*
+/usr/share/samba/swat/images/*
.TP 0.2i
\(bu
-/usr/local/samba/swat/help/*
+/usr/share/samba/swat/help/*
.SS "INETD INSTALLATION"
.PP
You need to edit your \fI/etc/inetd.conf
@@ -62,7 +69,7 @@
to enable SWAT to be launched via \fBinetd\fR.
.PP
In \fI/etc/services\fR you need to
-add a line like this:
+add a line like this (not needed for Debian):
.PP
\fBswat 901/tcp\fR
.PP
@@ -76,10 +83,11 @@
\fBinetd\fR daemon).
.PP
In \fI/etc/inetd.conf\fR you should
-add a line like this:
+add a line like this (not needed for Debian, the postinst script takes
+care of this):
.PP
\fBswat stream tcp nowait.400 root
-/usr/local/samba/bin/swat swat\fR
+/usr/sbin/swat swat\fR
.PP
One you have edited \fI/etc/services\fR
and \fI/etc/inetd.conf\fR you need to send a
@@ -105,11 +113,10 @@
(e.g., swat) to service port (e.g., 901) and protocol type
(e.g., tcp).
.TP
-\fB\fI/usr/local/samba/lib/smb.conf\fB\fR
+\fB\fI/etc/samba/smb.conf\fB\fR
This is the default location of the \fIsmb.conf(5)
-\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
+\fRserver configuration file that swat edits.
+This file describes all the services the server
is to make available to clients.
.SH "WARNINGS"
.PP
--- samba-2.2.2.cvs20020120.orig/swat/README
+++ samba-2.2.2.cvs20020120/swat/README
@@ -1,3 +1,11 @@
@ -104,3 +31,71 @@ diff -uNr samba-2.999+3.0.alpha21.orig/docs/manpages/swat.8 samba-2.999+3.0.alph
This is a brief description of how to install and use the Samba Web
Administration Tool on your machine.
--- samba_3_0/docs/manpages/swat.8.orig 2003-06-06 16:16:24.000000000 -0400
+++ samba_3_0/docs/manpages/swat.8 2003-06-06 16:25:13.000000000 -0400
@@ -89,6 +89,13 @@
.SH "INSTALLATION"
.PP
+\fBDebian-specific Note\fR: all these steps have already been done for
+you. However, by default, swat is not enabled. This has been done for
+security reasons. To enable swat you need to edit /etc/inetd.conf,
+uncomment the swat entry (usually at the end of the file), and then
+restart inetd.
+
+.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\&.
.PP
@@ -96,15 +103,15 @@
.TP 3
\(bu
-/usr/local/samba/bin/swat
+/usr/sbin/swat
.TP
\(bu
-/usr/local/samba/swat/images/*
+/usr/share/samba/swat/images/*
.TP
\(bu
-/usr/local/samba/swat/help/*
+/usr/share/samba/swat/help/*
.LP
@@ -114,7 +121,7 @@
You need to edit your \fI/etc/inetd\&.conf \fR and \fI/etc/services\fR to enable SWAT to be launched via \fBinetd\fR\&.
.PP
-In \fI/etc/services\fR you need to add a line like this:
+In \fI/etc/services\fR you need to add a line like this (not needed for Debian):
.PP
\fBswat 901/tcp\fR
@@ -126,10 +133,10 @@
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\fBinetd\fR daemon)\&.
.PP
-In \fI/etc/inetd\&.conf\fR you should add a line like this:
+In \fI/etc/inetd\&.conf\fR you should add a line like this (not needed for Debian since the maintainer scripts do it. You need to uncomment the line, though, because it is added commented out for security reasons):
.PP
-\fBswat stream tcp nowait.400 root /usr/local/samba/bin/swat swat\fR
+\fBswat stream tcp nowait.400 root /usr/sbin/swat swat\fR
.PP
One you have edited \fI/etc/services\fR and \fI/etc/inetd\&.conf\fR you need to send a HUP signal to inetd\&. To do this use \fBkill -1 PID \fR where PID is the process ID of the inetd daemon\&.
@@ -155,8 +162,8 @@
.TP
-\fI/usr/local/samba/lib/smb\&.conf\fR
-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 and \fI/etc/smb\&.conf \fR\&. This file describes all the services the server is to make available to clients\&.
+\fI/etc/samba/smb\&.conf\fR
+This is the default location of the \fBsmb.conf\fR(5) server configuration file that swat edits\&. This file describes all the services the server is to make available to clients\&.
.SH "WARNINGS"

2
packaging/Debian/debian/patches/fhs.patch
View File

@ -335,7 +335,7 @@ diff -uNr samba-3.0alpha23.orig/source/param/loadparm.c samba-3.0alpha23/source/
char *szLockDir;
char *szPidDir;
char *szRootdir;
@@ -1052,8 +1055,13 @@
@@ -1055,8 +1058,13 @@
{"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE},
{"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},