diff options
Diffstat (limited to 'packaging/Debian/debian/patches')
| -rw-r--r-- | packaging/Debian/debian/patches/documentation.patch | 16 | ||||
| -rw-r--r-- | packaging/Debian/debian/patches/fhs.patch | 50 | ||||
| -rw-r--r-- | packaging/Debian/debian/patches/installswat.sh.patch | 83 | ||||
| -rw-r--r-- | packaging/Debian/debian/patches/samba.patch | 75 | ||||
| -rw-r--r-- | packaging/Debian/debian/patches/smbstatus-locking.patch | 2 |
5 files changed, 64 insertions, 162 deletions
diff --git a/packaging/Debian/debian/patches/documentation.patch b/packaging/Debian/debian/patches/documentation.patch index c5e66232f9..922b93f990 100644 --- a/packaging/Debian/debian/patches/documentation.patch +++ b/packaging/Debian/debian/patches/documentation.patch @@ -1,6 +1,6 @@ --- 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 @@ +@@ -91,6 +91,13 @@ .SH "INSTALLATION" .PP @@ -14,7 +14,7 @@ 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 @@ +@@ -98,15 +105,15 @@ .TP 3 \(bu @@ -33,7 +33,7 @@ .LP -@@ -114,7 +121,7 @@ +@@ -116,7 +123,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 @@ -42,7 +42,7 @@ .PP \fBswat 901/tcp\fR -@@ -126,10 +133,10 @@ +@@ -128,10 +135,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 @@ -50,17 +50,17 @@ +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/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 @@ + 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\&. +@@ -157,8 +164,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\&. +-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\&. diff --git a/packaging/Debian/debian/patches/fhs.patch b/packaging/Debian/debian/patches/fhs.patch index 652641216b..2ea7d96103 100644 --- a/packaging/Debian/debian/patches/fhs.patch +++ b/packaging/Debian/debian/patches/fhs.patch @@ -1,15 +1,7 @@ diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makefile.in --- samba-3.0.0beta2.orig/source/Makefile.in 2003-07-02 23:26:46.000000000 -0500 +++ samba-3.0.0beta2/source/Makefile.in 2003-07-02 23:19:46.000000000 -0500 -@@ -67,6 +67,7 @@ - CONFIGDIR = @configdir@ - VARDIR = @localstatedir@ - MANDIR = @mandir@ -+DATADIR = @datadir@ - - # The permissions to give the executables - INSTALLPERMS = 0755 -@@ -90,6 +91,13 @@ +@@ -92,6 +93,13 @@ # the directory where lock files go LOCKDIR = @lockdir@ @@ -23,7 +15,7 @@ diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makef # the directory where pid files go PIDDIR = @piddir@ # man pages language(s) -@@ -114,7 +122,7 @@ +@@ -116,7 +124,7 @@ PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\" PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \ -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@SHLIBEXT@\" @@ -32,7 +24,7 @@ diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makef PATH_FLAGS = $(PATH_FLAGS6) $(PASSWD_FLAGS) # Note that all executable programs now provide for an optional executable suffix. -@@ -1203,7 +1211,7 @@ +@@ -1234,7 +1242,7 @@ @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS) installdat: installdirs @@ -41,16 +33,16 @@ diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makef installswat: installdirs @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir) -diff -uNr samba-3.0.0beta2.orig/source/configure.in samba-3.0.0beta2/source/configure.in ---- samba-3.0.0beta2.orig/source/configure.in 2003-07-02 23:26:47.000000000 -0500 -+++ samba-3.0.0beta2/source/configure.in 2003-07-02 23:19:02.000000000 -0500 -@@ -17,18 +17,25 @@ +--- samba-3.0.1/source/configure.in.orig 2003-12-17 11:05:40.000000000 -0500 ++++ samba-3.0.1/source/configure.in 2003-12-17 11:05:42.000000000 -0500 +@@ -17,19 +17,26 @@ AC_ARG_WITH(fhs, [ --with-fhs Use FHS-compliant paths (default=no)], configdir="${sysconfdir}/samba" -- lockdir="\${VARDIR}/cache/samba" +- lockdir="\${VARDIR}/lib/samba" + lockdir="\${VARDIR}/run/samba" - piddir="\${VARDIR}/run/samba" + piddir="\${VARDIR}/run" + mandir="\${prefix}/share/man" logfilebase="\${VARDIR}/log/samba" privatedir="\${CONFIGDIR}/private" libdir="\${prefix}/lib/samba" @@ -73,7 +65,7 @@ diff -uNr samba-3.0.0beta2.orig/source/configure.in samba-3.0.0beta2/source/conf ################################################# # set private directory location -@@ -134,6 +141,9 @@ +@@ -154,6 +161,9 @@ AC_SUBST(swatdir) AC_SUBST(bindir) AC_SUBST(sbindir) @@ -159,7 +151,7 @@ diff -uNr samba-3.0.0beta2.orig/source/include/dynconfig.h samba-3.0.0beta2/sour diff -uNr samba-3.0.0beta2.orig/source/intl/lang_tdb.c samba-3.0.0beta2/source/intl/lang_tdb.c --- samba-3.0.0beta2.orig/source/intl/lang_tdb.c 2003-07-02 23:26:47.000000000 -0500 +++ samba-3.0.0beta2/source/intl/lang_tdb.c 2003-07-02 23:19:02.000000000 -0500 -@@ -123,7 +123,7 @@ +@@ -128,7 +128,7 @@ /* if no lang then we don't translate */ if (!lang) return True; @@ -168,7 +160,7 @@ diff -uNr samba-3.0.0beta2.orig/source/intl/lang_tdb.c samba-3.0.0beta2/source/i if (stat(msg_path, &st) != 0) { /* the msg file isn't available */ free(msg_path); -@@ -131,7 +131,7 @@ +@@ -136,7 +136,7 @@ } @@ -192,7 +184,7 @@ diff -uNr samba-3.0.0beta2.orig/source/lib/account_pol.c samba-3.0.0beta2/source diff -uNr samba-3.0.0beta2.orig/source/lib/util.c samba-3.0.0beta2/source/lib/util.c --- samba-3.0.0beta2.orig/source/lib/util.c 2003-07-02 23:26:47.000000000 -0500 +++ samba-3.0.0beta2/source/lib/util.c 2003-07-02 23:19:02.000000000 -0500 -@@ -2190,6 +2190,61 @@ +@@ -2195,6 +2195,61 @@ } /** @@ -311,7 +303,7 @@ diff -uNr samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c samba-3.0.0beta2/ pstrcat(fname,SERVER_LIST); --- samba-3.0.0rc2/source/nmbd/nmbd_winsserver.c.orig 2003-08-28 17:42:44.000000000 -0400 +++ samba-3.0.0rc2/source/nmbd/nmbd_winsserver.c 2003-08-31 08:09:11.000000000 -0400 -@@ -228,7 +228,7 @@ +@@ -234,7 +234,7 @@ add_samba_names_to_subnet(wins_server_subnet); @@ -320,7 +312,7 @@ diff -uNr samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c samba-3.0.0beta2/ DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n", WINS_LIST, strerror(errno) )); return True; -@@ -1759,7 +1759,7 @@ +@@ -1765,7 +1765,7 @@ } } @@ -332,7 +324,7 @@ diff -uNr samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c samba-3.0.0beta2/ diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_cache.c samba-3.0.0beta2/source/nsswitch/winbindd_cache.c --- samba-3.0.0beta2.orig/source/nsswitch/winbindd_cache.c 2003-07-02 23:26:47.000000000 -0500 +++ samba-3.0.0beta2/source/nsswitch/winbindd_cache.c 2003-07-02 23:19:02.000000000 -0500 -@@ -56,7 +56,7 @@ +@@ -57,7 +57,7 @@ if (opt_nocache) return; @@ -344,7 +336,7 @@ diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_cache.c samba-3.0.0beta diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_util.c samba-3.0.0beta2/source/nsswitch/winbindd_util.c --- samba-3.0.0beta2.orig/source/nsswitch/winbindd_util.c 2003-07-01 15:44:25.000000000 -0500 +++ samba-3.0.0beta2/source/nsswitch/winbindd_util.c 2003-07-02 23:19:02.000000000 -0500 -@@ -813,7 +813,7 @@ +@@ -874,7 +874,7 @@ SMB_STRUCT_STAT stbuf; TDB_CONTEXT *idmap_tdb; @@ -410,7 +402,7 @@ diff -uNr samba-3.0.0beta2.orig/source/passdb/privileges.c samba-3.0.0beta2/sour diff -uNr samba-3.0.0beta2.orig/source/passdb/secrets.c samba-3.0.0beta2/source/passdb/secrets.c --- samba-3.0.0beta2.orig/source/passdb/secrets.c 2003-07-02 23:26:47.000000000 -0500 +++ samba-3.0.0beta2/source/passdb/secrets.c 2003-07-02 23:19:02.000000000 -0500 -@@ -37,8 +37,7 @@ +@@ -38,8 +38,7 @@ if (tdb) return True; @@ -461,7 +453,7 @@ diff -uNr samba-3.0.0beta2.orig/source/printing/nt_printing.c samba-3.0.0beta2/s diff -uNr samba-3.0.0beta2.orig/source/printing/printing.c samba-3.0.0beta2/source/printing/printing.c --- samba-3.0.0beta2.orig/source/printing/printing.c 2003-07-02 23:26:47.000000000 -0500 +++ samba-3.0.0beta2/source/printing/printing.c 2003-07-02 23:19:02.000000000 -0500 -@@ -174,8 +174,8 @@ +@@ -175,8 +175,8 @@ if (local_pid == sys_getpid()) return True; @@ -475,7 +467,7 @@ diff -uNr samba-3.0.0beta2.orig/source/printing/printing.c samba-3.0.0beta2/sour diff -uNr samba-3.0.0beta2.orig/source/printing/printing_db.c samba-3.0.0beta2/source/printing/printing_db.c --- samba-3.0.0beta2.orig/source/printing/printing_db.c 2003-07-02 23:26:47.000000000 -0500 +++ samba-3.0.0beta2/source/printing/printing_db.c 2003-07-02 23:19:02.000000000 -0500 -@@ -86,7 +86,7 @@ +@@ -87,7 +87,7 @@ DLIST_ADD(print_db_head, p); } @@ -535,7 +527,7 @@ diff -uNr samba-3.0.0beta2.orig/source/sam/idmap_tdb.c samba-3.0.0beta2/source/s diff -uNr samba-3.0.0beta2.orig/source/smbd/lanman.c samba-3.0.0beta2/source/smbd/lanman.c --- samba-3.0.0beta2.orig/source/smbd/lanman.c 2003-07-02 23:26:47.000000000 -0500 +++ samba-3.0.0beta2/source/smbd/lanman.c 2003-07-02 23:19:02.000000000 -0500 -@@ -966,9 +966,9 @@ +@@ -970,9 +970,9 @@ BOOL local_list_only; int i; diff --git a/packaging/Debian/debian/patches/installswat.sh.patch b/packaging/Debian/debian/patches/installswat.sh.patch index b425e3bef7..a2b1cf8f43 100644 --- a/packaging/Debian/debian/patches/installswat.sh.patch +++ b/packaging/Debian/debian/patches/installswat.sh.patch @@ -1,76 +1,15 @@ ---- samba_3_0/source/script/installswat.sh.orig 2003-08-28 18:03:10.000000000 -0400 -+++ samba_3_0/source/script/installswat.sh 2003-08-28 18:11:14.000000000 -0400 -@@ -9,7 +9,7 @@ - echo Installing the Samba Web Administration Tool +--- samba-3.0.1/source/script/installswat.sh.orig 2004-01-13 13:43:42.000000000 -0500 ++++ samba-3.0.1/source/script/installswat.sh 2004-01-13 12:56:49.000000000 -0500 +@@ -85,7 +85,11 @@ - LANGS=". `cd $SRCDIR../swat/; /bin/echo lang/??`" --echo Installing langs are `cd $SRCDIR../swat/lang/; /bin/echo ??` -+echo Installing the following additional langs: `cd $SRCDIR../swat/lang/; /bin/echo ??` - - for ln in $LANGS; do - SWATLANGDIR=$SWATDIR/$ln -@@ -23,21 +23,17 @@ - fi - fi - done --done -- --# Install images --for ln in $LANGS; do - --for f in $SRCDIR../swat/$ln/images/*.gif; do -+ # Install images -+ for f in $SRCDIR../swat/$ln/images/*.gif; do - FNAME=$SWATDIR/$ln/images/`basename $f` - echo $FNAME - cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges? - chmod 0644 $FNAME --done -- --# Install html help -+ done - --for f in $SRCDIR../swat/$ln/help/*.html; do -+ # Install html help -+ for f in $SRCDIR../swat/$ln/help/*.html; do - FNAME=$SWATDIR/$ln/help/`basename $f` - echo $FNAME - if [ "x$BOOKDIR" = "x" ]; then -@@ -49,26 +45,24 @@ - cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges? - rm -f $f - chmod 0644 $FNAME --done -- --# Install html documentation -- --for f in $SRCDIR../docs/htmldocs/*.html; do -- FNAME=$SWATDIR/help/`basename $f` -- echo $FNAME -- cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges? -- chmod 0644 $FNAME --done -- --# Install "server-side" includes -+ done + # Install Using Samba book (but only if it is there) --for f in $SRCDIR../swat/$ln/include/*.html; do -+ # Install "server-side" includes -+ for f in $SRCDIR../swat/$ln/include/*.html; do - FNAME=$SWATDIR/$ln/include/`basename $f` - echo $FNAME - cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges? - chmod 0644 $FNAME -+ done -+ - done +-if [ "x$BOOKDIR" != "x" -a -f $SRCDIR../docs/htmldocs/using_samba/toc.html ]; then ++# Under Debian we don't actually install the book. The book is part of ++# the samba-doc package, so we just provide a symlink that points to ++# where the book is actually installed. The symlink is created in ++# debian/rules. ++if /bin/false; then -+# Install html documentation -+for f in $SRCDIR../docs/htmldocs/*.html; do -+ FNAME=$SWATDIR/help/`basename $f` -+ echo $FNAME -+ ln -s ../../../doc/samba-doc/htmldocs/`basename $f` $FNAME || echo Cannot install $FNAME. Does $USER have privileges? -+ chmod 0644 $FNAME - done + # Create directories - # Install Using Samba book (but only if it is there) diff --git a/packaging/Debian/debian/patches/samba.patch b/packaging/Debian/debian/patches/samba.patch index 8707ec517b..06d436408f 100644 --- a/packaging/Debian/debian/patches/samba.patch +++ b/packaging/Debian/debian/patches/samba.patch @@ -28,66 +28,37 @@ diff -uNr samba-3.0.0beta1.orig/source/client/smbmount.c samba-3.0.0beta1/source } strupper_m(username); } -diff -uNr samba-3.0.0beta1.orig/source/script/installbin.sh samba-3.0.0beta1/source/script/installbin.sh ---- samba-3.0.0beta1.orig/source/script/installbin.sh 2002-04-22 13:16:20.000000000 -0500 -+++ samba-3.0.0beta1/source/script/installbin.sh 2003-06-30 20:12:22.000000000 -0500 -@@ -22,9 +22,11 @@ +diff -uNr samba-3.0.0beta1.orig/source/web/diagnose.c samba-3.0.0beta1/source/web/diagnose.c +--- samba-3.0.0beta1.orig/source/web/diagnose.c 2003-06-07 12:57:41.000000000 -0500 ++++ samba-3.0.0beta1/source/web/diagnose.c 2003-06-30 20:12:22.000000000 -0500 +@@ -66,6 +66,7 @@ + static struct cli_state cli; + extern struct in_addr loopback_ip; + ++ loopback_ip.s_addr = htonl((127 << 24) + 1); + if (!cli_initialise(&cli)) + return False; + +--- samba-3.0.1/source/script/installbin.sh.orig 2003-10-10 14:08:36.000000000 -0400 ++++ samba-3.0.1/source/script/installbin.sh 2003-12-17 10:51:45.000000000 -0500 +@@ -24,12 +24,14 @@ chmod $INSTALLPERMS $BINDIR/$p2 # this is a special case, mount needs this in a specific location - if [ $p2 = smbmount ]; then -- ln -sf $BINDIR/$p2 /sbin/mount.smbfs +- if [ ! -d $DESTDIR/sbin ]; then +- mkdir $DESTDIR/sbin +- fi +- ln -sf $BINDIR/$p2 $DESTDIR/sbin/mount.smbfs - fi +# Commented out for the Debian Samba package. We take care of this -+# important symlink in debian/rules. (peloy@debian.org) ++# important symlink in debian/rules. (peloy@debian.org) +# if [ $p2 = smbmount ]; then -+# ln -sf $BINDIR/$p2 /sbin/mount.smbfs ++# if [ ! -d $DESTDIR/sbin ]; then ++# mkdir $DESTDIR/sbin ++# fi ++# ln -sf $BINDIR/$p2 $DESTDIR/sbin/mount.smbfs +# fi done -diff -uNr samba-3.0.0beta1.orig/source/smbd/service.c samba-3.0.0beta1/source/smbd/service.c ---- samba-3.0.0beta1.orig/source/smbd/service.c 2003-06-07 12:57:39.000000000 -0500 -+++ samba-3.0.0beta1/source/smbd/service.c 2003-06-30 20:12:57.000000000 -0500 -@@ -887,6 +887,9 @@ - file_close_conn(conn); - dptr_closecnum(conn); - -+ /* make sure we leave the directory available for unmount */ -+ vfs_ChDir(conn, "/"); -+ - /* execute any "postexec = " line */ - if (*lp_postexec(SNUM(conn)) && - change_to_user(conn, vuid)) { -@@ -906,8 +909,5 @@ - smbrun(cmd,NULL); - } - -- /* make sure we leave the directory available for unmount */ -- vfs_ChDir(conn, "/"); -- - conn_free(conn); - } -diff -uNr samba-3.0.0beta1.orig/source/smbwrapper/smbsh.c samba-3.0.0beta1/source/smbwrapper/smbsh.c ---- samba-3.0.0beta1.orig/source/smbwrapper/smbsh.c 2003-06-07 12:57:40.000000000 -0500 -+++ samba-3.0.0beta1/source/smbwrapper/smbsh.c 2003-06-30 20:12:22.000000000 -0500 -@@ -36,7 +36,7 @@ - int main(int argc, char *argv[]) - { - char *p, *u; -- const char *libd = dyn_BINDIR; -+ const char *libd = dyn_LIBDIR; - pstring line, wd; - int opt; - extern char *optarg; -diff -uNr samba-3.0.0beta1.orig/source/web/diagnose.c samba-3.0.0beta1/source/web/diagnose.c ---- samba-3.0.0beta1.orig/source/web/diagnose.c 2003-06-07 12:57:41.000000000 -0500 -+++ samba-3.0.0beta1/source/web/diagnose.c 2003-06-30 20:12:22.000000000 -0500 -@@ -70,6 +70,7 @@ - static struct cli_state cli; - extern struct in_addr loopback_ip; - -+ loopback_ip.s_addr = htonl((127 << 24) + 1); - if (!cli_initialise(&cli)) - return False; - diff --git a/packaging/Debian/debian/patches/smbstatus-locking.patch b/packaging/Debian/debian/patches/smbstatus-locking.patch index d37896a369..50072c5c26 100644 --- a/packaging/Debian/debian/patches/smbstatus-locking.patch +++ b/packaging/Debian/debian/patches/smbstatus-locking.patch @@ -1,7 +1,7 @@ diff -uNr samba-2.999+3.0.alpha21.orig/source/utils/status.c samba-2.999+3.0.alpha21/source/utils/status.c --- samba-2.999+3.0.alpha21.orig/source/utils/status.c 2002-11-26 20:54:22.000000000 -0600 +++ samba-2.999+3.0.alpha21/source/utils/status.c 2002-12-16 23:37:14.000000000 -0600 -@@ -630,6 +630,16 @@ +@@ -667,6 +667,16 @@ if (!shares_only) { int ret; |