syncing packaging files from 3.0

(This used to be commit ccc2a0d3840f88625cf89d6739320728e830ef87)

49 files changed, 2314 insertions, 891 deletions

diff --git a/packaging/Debian/README b/packaging/Debian/README
index 0a1d68ba37f..40dd3103660 100644
--- a/packaging/Debian/README
+++ b/packaging/Debian/README
@@ -3,9 +3,14 @@ Building Samba Packages for Debian GNU/Linux
 
 Building Debian packages is not as hard as some people might think. The
 following instructions will allow you to build your own Samba Debian
-packages. These instructions, and the files in packaging/Debian/, should
-be current as of Samba 3.0beta3, and should allow you to build Debian
-packages for Debian unstable.
+packages. These instructions, and the files in packaging/Debian/, are
+current as of Samba 3.0.0rc2, and allow you to build Debian packages
+for Debian unstable (so you need some development packages available
+only in Debian unstable.) If you are using something newer than 3.0.0rc2
+you might want to try to follow the instructions to see if patches
+apply cleanly. If some patches don't apply cleanly please e-mail
+samba@packages.debian.org since we might have fixed patches that we have
+not yet integrated into upstream Samba.
 
 We try to maintain as much compatibility with previous releases
 of Debian as possible, so it is possible that the files in
@@ -32,11 +37,11 @@ devscripts, etc.):
   libpam0g-dev
   libreadline4-dev
   libcupsys2-dev
-  libacl1-dev | acl-dev (>= 2.0.0)
+  libacl1-dev, libacl1 (>= 2.2.11-1)
   libkrb5-dev
   libldap2-dev
   po-debconf
-  python-dev (>= 2.2)
+  python2.3-dev
 
   Notes regarding the packages required to build Samba Debian packages:
 
@@ -44,12 +49,12 @@ devscripts, etc.):
     That's fine; the configure script won't detect CUPS support and the
     resulting binaries won't support CUPS.
 
-  * The list above is current as of samba-3.0.0beta3, but it can get
+  * The list above is current as of samba-3.0.0rc2, but it can get
     out of date. The best way to check what packages are required to
     build the samba packages on Debian is to look for the Build-Depends:
     field in the file debian/control.
 
-1) cd samba[-<version>]. For example, "cd samba-3.0.0beta3".
+1) cd samba[-<version>]. For example, "cd samba-3.0.0rc2".
 2) cp -a packaging/Debian/debian/ debian
   It's important that you copy instead of symlink because the build
   tools in Potato have a problem that prevents the build to work with
diff --git a/packaging/Debian/debian/README.build-upstream b/packaging/Debian/debian/README.build-upstream
index 0a1d68ba37f..40dd3103660 100644
--- a/packaging/Debian/debian/README.build-upstream
+++ b/packaging/Debian/debian/README.build-upstream
@@ -3,9 +3,14 @@ Building Samba Packages for Debian GNU/Linux
 
 Building Debian packages is not as hard as some people might think. The
 following instructions will allow you to build your own Samba Debian
-packages. These instructions, and the files in packaging/Debian/, should
-be current as of Samba 3.0beta3, and should allow you to build Debian
-packages for Debian unstable.
+packages. These instructions, and the files in packaging/Debian/, are
+current as of Samba 3.0.0rc2, and allow you to build Debian packages
+for Debian unstable (so you need some development packages available
+only in Debian unstable.) If you are using something newer than 3.0.0rc2
+you might want to try to follow the instructions to see if patches
+apply cleanly. If some patches don't apply cleanly please e-mail
+samba@packages.debian.org since we might have fixed patches that we have
+not yet integrated into upstream Samba.
 
 We try to maintain as much compatibility with previous releases
 of Debian as possible, so it is possible that the files in
@@ -32,11 +37,11 @@ devscripts, etc.):
   libpam0g-dev
   libreadline4-dev
   libcupsys2-dev
-  libacl1-dev | acl-dev (>= 2.0.0)
+  libacl1-dev, libacl1 (>= 2.2.11-1)
   libkrb5-dev
   libldap2-dev
   po-debconf
-  python-dev (>= 2.2)
+  python2.3-dev
 
   Notes regarding the packages required to build Samba Debian packages:
 
@@ -44,12 +49,12 @@ devscripts, etc.):
     That's fine; the configure script won't detect CUPS support and the
     resulting binaries won't support CUPS.
 
-  * The list above is current as of samba-3.0.0beta3, but it can get
+  * The list above is current as of samba-3.0.0rc2, but it can get
     out of date. The best way to check what packages are required to
     build the samba packages on Debian is to look for the Build-Depends:
     field in the file debian/control.
 
-1) cd samba[-<version>]. For example, "cd samba-3.0.0beta3".
+1) cd samba[-<version>]. For example, "cd samba-3.0.0rc2".
 2) cp -a packaging/Debian/debian/ debian
   It's important that you copy instead of symlink because the build
   tools in Potato have a problem that prevents the build to work with
diff --git a/packaging/Debian/debian/changelog b/packaging/Debian/debian/changelog
index a3d27b56d47..e29eeaf9208 100644
--- a/packaging/Debian/debian/changelog
+++ b/packaging/Debian/debian/changelog
@@ -1,11 +1,23 @@
-samba (3.0.0beta3-0.1) unstable; urgency=low
+samba (3.0.0beta2+3.0.0rc3-1) unstable; urgency=low
 
   * Local build.
 
- -- Debian User <somebody@somwhere.net>  Tue, 15 Jul 2003 11:05:39 -0400
+ -- Debian User <user@somewhere.com>  Mon,  8 Sep 2003 13:33:21 -0400
 
-samba (3.0.0beta2-2) unstable; urgency=low
+samba (3.0.0beta2+3.0.0rc2-1) unstable; urgency=low
 
+  * New upstream release.
+  * Incorporate Dutch debconf translations; thanks to Bart Cornelis
+    <cobaco@linux.be>. (closes: #207824)
+  * Link against libgnutls7 instead of libgnutls5. (closes: #208151)
+
+ -- Eloy A. Paris <peloy@debian.org>  Tue,  2 Sep 2003 21:37:13 -0400
+
+samba (3.0.0beta2+3.0.0rc1-1) unstable; urgency=low
+
+  * New upstream version (skipped samba 3.0.0beta3 due to time
+    constraints.) This ugly version number will go away when the final
+    Samba 3.0.0 is released.
   * Drag new unpackaged tools into the packages: smbcquotas (smbclient),
     vfs modules (samba), smbtree(1) manpage (smbclient), tdbbackup(8)
     manpage (samba). (closes: #151158)
@@ -17,8 +29,12 @@ samba (3.0.0beta2-2) unstable; urgency=low
       path (closes: #185439)
     - add support for ${misc:Depends} in control for those packages with
       init scripts
+  * Add versioned dependency on libpam-runtime and change
+    /etc/pam.d/samba to use the new common PAM config blocks.
+  * New python2.3-samba package (old python2.2-samba is no more.)
+    (closes: #206171)
 
- -- Steve Langasek <vorlon@debian.org>  Sat, 12 Jul 2003 19:27:31 -0500
+ -- Eloy A. Paris <peloy@debian.org>  Mon, 25 Aug 2003 17:05:14 -0400
 
 samba (3.0.0beta2-1) unstable; urgency=low
 
@@ -468,7 +484,7 @@ samba (2.2.3a-7) unstable; urgency=medium
     running before the upgrade starts.
   * Tweak the wording of debconf templates.
   * Incorporate debconf translations for French, Spanish and Portuguese;
-    thanks to Carlos Valdivia Yagüe <valyag@hotpop.com> (es),
+    thanks to Carlos Valdivia Yagüe <valyag@hotpop.com> (es),
     Andre Luis Lopes <andrelop@ig.com.br> (pt_BR), and Philippe
     Batailler and Denis Barbier <barbier@debian.org> (fr).
     (closes: #142657, #142659, #141551, #141699, #141682)
diff --git a/packaging/Debian/debian/control b/packaging/Debian/debian/control
index ddbf9e8e3a6..7bfb41b79d9 100644
--- a/packaging/Debian/debian/control
+++ b/packaging/Debian/debian/control
@@ -3,12 +3,12 @@ Section: net
 Priority: optional
 Maintainer: Eloy A. Paris <peloy@debian.org>
 Uploaders: Steve Langasek <vorlon@debian.org>
-Build-Depends: debhelper (>= 4.1.13), libpam0g-dev, libreadline4-dev, libcupsys2-dev, autoconf, libacl1-dev (>= 2.2.11-1), libacl1 (>= 2.2.11-1), libkrb5-dev, libldap2-dev, po-debconf, python-dev (>= 2.2)
+Build-Depends: debhelper (>= 4.1.13), libpam0g-dev, libreadline4-dev, libcupsys2-dev, autoconf, libacl1-dev (>= 2.2.11-1), libacl1 (>= 2.2.11-1), libkrb5-dev, libldap2-dev, po-debconf, python2.3-dev
 Standards-Version: 3.5.10
 
 Package: samba
 Architecture: any
-Depends: samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends}, ${misc:Depends}
+Depends: samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules
 Replaces: samba-common (<= 2.0.5a-2)
 Suggests: samba-doc
 Description: a LanManager-like file and printer server for Unix
@@ -32,7 +32,7 @@ Description: a LanManager-like file and printer server for Unix
   libsmbclient - Shared library that allows applications to talk to SMB servers
   libsmbclient-dev - libsmbclient shared libraries
   winbind: Service to resolve user and group information from Windows NT servers
-  python2.2-samba: Python bindings that allow access to various aspects of Samba
+  python2.3-samba: Python bindings that allow access to various aspects of Samba
  .
  It is possible to install a subset of these packages depending on
  your particular needs. For example, to access other SMB servers you
@@ -175,14 +175,14 @@ Description: service to resolve user and group information from Windows NT serve
  Windows NT server. The service can also provide authentication
  services via an associated PAM module.
 
-Package: python2.2-samba
+Package: python2.3-samba
 Section: python
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, python2.2
+Depends: ${shlibs:Depends}, python2.3
 Description: Python bindings that allow access to various aspects of Samba
  The Samba Python bindings allow you to access various aspects of Samba.
  At the moment their status is "experimental" but they have been reported
  to work well.
  .
- See /usr/share/doc/python2.2-samba/examples for a couple of examples.
+ See /usr/share/doc/python2.3-samba/examples for a couple of examples.
diff --git a/packaging/Debian/debian/patches/VERSION.patch b/packaging/Debian/debian/patches/VERSION.patch
new file mode 100644
index 00000000000..0f5c129c564
--- /dev/null
+++ b/packaging/Debian/debian/patches/VERSION.patch
@@ -0,0 +1,8 @@
+--- samba-3.0.0rc2/source/VERSION.orig	2003-09-02 21:56:11.000000000 -0400
++++ samba-3.0.0rc2/source/VERSION	2003-09-02 21:56:30.000000000 -0400
+@@ -120,4 +120,4 @@
+ # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version()    #
+ #  ->  "CVS 3.0.0rc2-VendorVersion"                    #
+ ########################################################
+-SAMBA_VERSION_VENDOR_SUFFIX=
++SAMBA_VERSION_VENDOR_SUFFIX="Debian"
diff --git a/packaging/Debian/debian/patches/documentation.patch b/packaging/Debian/debian/patches/documentation.patch
index 65f7421ab49..c5e66232f9c 100644
--- a/packaging/Debian/debian/patches/documentation.patch
+++ b/packaging/Debian/debian/patches/documentation.patch
@@ -1,36 +1,3 @@
-diff -uNr samba-2.999+3.0.alpha21.orig/docs/htmldocs/using_samba/ch06_05.html samba-2.999+3.0.alpha21/docs/htmldocs/using_samba/ch06_05.html
---- samba-2.999+3.0.alpha21.orig/docs/htmldocs/using_samba/ch06_05.html	2000-07-30 02:38:29.000000000 -0500
-+++ samba-2.999+3.0.alpha21/docs/htmldocs/using_samba/ch06_05.html	2002-12-16 23:15:46.000000000 -0600
-@@ -102,13 +102,13 @@
- WARNING:</strong> You will need to use at least Samba 2.1 to ensure that PDC functionality for Windows NT clients is present. Prior to Samba 2.1, only limited user authentication for NT clients was present. At the time this book went to press, Samba 2.0.5 was the latest version, but Samba  2.1 was available through CVS download. Instructions on downloading alpha versions of Samba are given in <a href="appe_01.html"><b>Appendix E, <CITE CLASS="appendix">Downloading Samba with CVS</cite></b></a>.</p></blockquote><P CLASS="para">
- As before, you need to ensure that Samba is a primary domain controller for the current workgroup and is using user-level security. However, you must also ensure that Samba is using encrypted passwords. In other words, alter the <CODE CLASS="literal">
- [global]</code> options the previous example to include the <CODE CLASS="literal">
--encrypted</code> <CODE CLASS="literal">
-+encrypt</code> <CODE CLASS="literal">
- passwords</code> <CODE CLASS="literal">
- =</code> <CODE CLASS="literal">
- yes</code> option, as shown here: </p><PRE CLASS="programlisting">
- [global]
- 	workgroup = SIMPLE
--	encrypted passwords = yes
-+	encrypt passwords = yes
- 	domain logons = yes
- 
- 	security = user </pre></div><DIV CLASS="sect3">
---- samba-2.2.2.cvs20020120.orig/swat/README
-+++ samba-2.2.2.cvs20020120/swat/README
-@@ -1,3 +1,11 @@
-+[Debian-specific Note: you can safely skip the installation notes in
-+this document. swat was configured for you when the package was
-+installed. For security reasons, swat is not enabled. To enable it, you
-+need to edit /etc/inetd.conf, uncomment the swat entry, and reload
-+inetd. Please note that the file locations given in this file are not
-+correct for the Debian version of swat. The correct file locations are
-+given in swat's man page.]
-+
- 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 @@
diff --git a/packaging/Debian/debian/patches/fhs.patch b/packaging/Debian/debian/patches/fhs.patch
index b5c7c6c6768..1c90499a835 100644
--- a/packaging/Debian/debian/patches/fhs.patch
+++ b/packaging/Debian/debian/patches/fhs.patch
@@ -1,7 +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
-@@ -68,6 +68,7 @@
+@@ -67,6 +67,7 @@
  CONFIGDIR = @configdir@
  VARDIR = @localstatedir@
  MANDIR = @mandir@
@@ -9,7 +9,7 @@ diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makef
  
  # The permissions to give the executables
  INSTALLPERMS = 0755
-@@ -91,6 +92,13 @@
+@@ -90,6 +91,13 @@
  # the directory where lock files go
  LOCKDIR = @lockdir@
  
@@ -23,7 +23,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)
-@@ -115,7 +123,7 @@
+@@ -114,7 +122,7 @@
  PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\"  -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\"
  PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \
  	      -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@SHLIBEXT@\"
@@ -32,7 +32,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.
-@@ -1123,7 +1131,7 @@
+@@ -1203,7 +1211,7 @@
  	@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS)
  
  installdat: installdirs
@@ -192,7 +192,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
-@@ -2252,6 +2252,61 @@
+@@ -2190,6 +2190,61 @@
  }
  
  /**
@@ -298,38 +298,36 @@ diff -uNr samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c samba-3.0.0beta2/
  				   TDB_DEFAULT, O_RDWR, 0600);
  		if (!tdb) {
  			DEBUG(5, ("netsamlogon_clear_cached_user: failed to open cache\n"));
-diff -uNr samba-3.0.0beta2.orig/source/nmbd/nmbd_serverlistdb.c samba-3.0.0beta2/source/nmbd/nmbd_serverlistdb.c
---- samba-3.0.0beta2.orig/source/nmbd/nmbd_serverlistdb.c	2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/nmbd/nmbd_serverlistdb.c	2003-07-02 23:19:02.000000000 -0500
-@@ -343,7 +343,7 @@
+--- samba_3_0/source/nmbd/nmbd_serverlistdb.c.orig	2003-09-08 10:53:13.000000000 -0400
++++ samba_3_0/source/nmbd/nmbd_serverlistdb.c	2003-09-08 11:22:03.000000000 -0400
+@@ -327,7 +327,7 @@
  
-   updatecount++;
+ 	updatecount++;
      
--  pstrcpy(fname,lp_lockdir());
-+  pstrcpy(fname,dyn_CACHEDIR());
-   trim_string(fname,NULL,"/");
-   pstrcat(fname,"/");
-   pstrcat(fname,SERVER_LIST);
-diff -uNr samba-3.0.0beta2.orig/source/nmbd/nmbd_winsserver.c samba-3.0.0beta2/source/nmbd/nmbd_winsserver.c
---- samba-3.0.0beta2.orig/source/nmbd/nmbd_winsserver.c	2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/nmbd/nmbd_winsserver.c	2003-07-02 23:19:02.000000000 -0500
-@@ -230,7 +230,7 @@
- 
-   add_samba_names_to_subnet(wins_server_subnet);
- 
--  if((fp = x_fopen(lock_path(WINS_LIST),O_RDONLY,0)) == NULL)
-+  if((fp = x_fopen(state_path(WINS_LIST),O_RDONLY,0)) == NULL)
-   {
-     DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n",
-            WINS_LIST, strerror(errno) ));
-@@ -1836,7 +1836,7 @@
- 	  }
-   }
+-	pstrcpy(fname,lp_lockdir());
++	pstrcpy(fname,dyn_CACHEDIR());
+ 	trim_char(fname,'\0' ,'/');
+ 	pstrcat(fname,"/");
+ 	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 @@
+ 
+ 	add_samba_names_to_subnet(wins_server_subnet);
+ 
+-	if((fp = x_fopen(lock_path(WINS_LIST),O_RDONLY,0)) == NULL) {
++	if((fp = x_fopen(state_path(WINS_LIST),O_RDONLY,0)) == NULL) {
+ 		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 @@
+ 		}
+ 	}
  
--  slprintf(fname,sizeof(fname)-1,"%s/%s", lp_lockdir(), WINS_LIST);
-+  slprintf(fname,sizeof(fname)-1,"%s/%s", dyn_STATEDIR(), WINS_LIST);
-   all_string_sub(fname,"//", "/", 0);
-   slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
+-	slprintf(fname,sizeof(fname)-1,"%s/%s", lp_lockdir(), WINS_LIST);
++	slprintf(fname,sizeof(fname)-1,"%s/%s", dyn_STATEDIR(), WINS_LIST);
+ 	all_string_sub(fname,"//", "/", 0);
+ 	slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
  
 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
@@ -346,7 +344,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
-@@ -747,7 +747,7 @@
+@@ -813,7 +813,7 @@
  	SMB_STRUCT_STAT stbuf;
  	TDB_CONTEXT *idmap_tdb;
  
@@ -368,24 +366,24 @@ diff -uNr samba-3.0.0beta2.orig/source/param/loadparm.c samba-3.0.0beta2/source/
  	char *szLockDir;
  	char *szPidDir;
  	char *szRootdir;
-@@ -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},
+@@ -1082,8 +1082,13 @@
+ 	{"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE}, 
+ 	{"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED}, 
+ 	{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED}, 
 +#ifdef FHS_COMPATIBLE
++	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDirStub, NULL, NULL, 0}, 
 +	{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDirStub, NULL, NULL, 0},
-+	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDirStub, NULL, NULL, 0},
 +#else
+ 	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_ADVANCED}, 
  	{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_HIDE}, 
- 	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 +#endif
- 	{"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, 
+ 	{"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED}, 
  #ifdef WITH_UTMP
- 	{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+ 	{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED}, 
 diff -uNr samba-3.0.0beta2.orig/source/passdb/pdb_tdb.c samba-3.0.0beta2/source/passdb/pdb_tdb.c
 --- samba-3.0.0beta2.orig/source/passdb/pdb_tdb.c	2003-07-02 23:26:47.000000000 -0500
 +++ samba-3.0.0beta2/source/passdb/pdb_tdb.c	2003-07-02 23:19:02.000000000 -0500
-@@ -526,10 +526,7 @@
+@@ -501,10 +501,7 @@
  	if (location) {
  		tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, location);
  	} else {
@@ -425,7 +423,7 @@ diff -uNr samba-3.0.0beta2.orig/source/passdb/secrets.c samba-3.0.0beta2/source/
 diff -uNr samba-3.0.0beta2.orig/source/printing/nt_printing.c samba-3.0.0beta2/source/printing/nt_printing.c
 --- samba-3.0.0beta2.orig/source/printing/nt_printing.c	2003-07-02 23:26:47.000000000 -0500
 +++ samba-3.0.0beta2/source/printing/nt_printing.c	2003-07-02 23:19:02.000000000 -0500
-@@ -287,28 +287,28 @@
+@@ -293,28 +293,28 @@
   
  	if (tdb_drivers)
  		tdb_close(tdb_drivers);
@@ -525,7 +523,7 @@ diff -uNr samba-3.0.0beta2.orig/source/rpc_server/srv_srvsvc_nt.c samba-3.0.0bet
 diff -uNr samba-3.0.0beta2.orig/source/sam/idmap_tdb.c samba-3.0.0beta2/source/sam/idmap_tdb.c
 --- samba-3.0.0beta2.orig/source/sam/idmap_tdb.c	2003-07-01 15:44:26.000000000 -0500
 +++ samba-3.0.0beta2/source/sam/idmap_tdb.c	2003-07-02 23:19:02.000000000 -0500
-@@ -495,7 +495,7 @@
+@@ -487,7 +487,7 @@
  	BOOL tdb_is_new = False;
  
  	/* use the old database if present */
@@ -570,14 +568,3 @@ diff -uNr samba-3.0.0beta2.orig/source/wrepld/process.c samba-3.0.0beta2/source/
  	if (!tdb) {
  		DEBUG(2,("send_entry_request: Can't open wins database file %s. Error was %s\n", WINS_LIST, strerror(errno) ));
  		return;
---- samba_3_0/source/nsswitch/winbindd_acct.c.orig	2003-07-15 13:03:59.000000000 -0400
-+++ samba_3_0/source/nsswitch/winbindd_acct.c	2003-07-15 13:04:42.000000000 -0400
-@@ -73,7 +73,7 @@
- 		
- 	/* Nope.  Try to open it */
- 
--	if (!(account_tdb = tdb_open_log(lock_path("winbindd_idmap.tdb"), 0, 
-+	if (!(account_tdb = tdb_open_log(state_path("winbindd_idmap.tdb"), 0, 
- 		TDB_DEFAULT, O_RDWR | O_CREAT, 0600))) 
- 	{
- 		/* last chance -- maybe idmap has already opened it */
diff --git a/packaging/Debian/debian/patches/installswat.sh.patch b/packaging/Debian/debian/patches/installswat.sh.patch
index ff5f23a1cf3..b425e3bef76 100644
--- a/packaging/Debian/debian/patches/installswat.sh.patch
+++ b/packaging/Debian/debian/patches/installswat.sh.patch
@@ -1,5 +1,5 @@
---- samba-3.0alpha23.orig/source/script/installswat.sh	2001-10-17 16:00:14.000000000 -0400
-+++ samba-3.0alpha23/source/script/installswat.sh	2003-04-06 03:18:29.000000000 -0400
+--- 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
  
@@ -36,7 +36,7 @@
        FNAME=$SWATDIR/$ln/help/`basename $f`
        echo $FNAME
        if [ "x$BOOKDIR" = "x" ]; then
-@@ -49,31 +45,31 @@
+@@ -49,26 +45,24 @@
        cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
        rm -f $f
        chmod 0644 $FNAME
@@ -62,23 +62,15 @@
        cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
        chmod 0644 $FNAME
 + done
++
  done
  
 +# 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
++	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
  
- # Install Using Samba book
- 
--if [ "x$BOOKDIR" != "x" ]; then
-+# For Debian we do not install anything here, we just create a symlink
-+#	pointing to /usr/share/doc/samba-doc/htmldocs/using_samba/ in
-+#	debian/rules (peloy@debian.org)
-+if /bin/false; then
- 
-     # Create directories
- 
+ # Install Using Samba book (but only if it is there)
diff --git a/packaging/Debian/debian/patches/krb5-vars.patch b/packaging/Debian/debian/patches/krb5-vars.patch
index 28ee4855d84..d6eadfd91b1 100644
--- a/packaging/Debian/debian/patches/krb5-vars.patch
+++ b/packaging/Debian/debian/patches/krb5-vars.patch
@@ -486,7 +486,7 @@ diff -uNr samba-3.0.0beta2.orig/source/configure.in samba-3.0.0beta2/source/conf
  
    # now check for gssapi headers.  This is also done here to allow for
    # different kerberos include paths
-@@ -2250,62 +2355,45 @@
+@@ -2250,64 +2365,46 @@
  
    ##################################################################
    # we might need the k5crypto and com_err libraries on some systems
@@ -505,19 +505,8 @@ diff -uNr samba-3.0.0beta2.orig/source/configure.in samba-3.0.0beta2/source/conf
  
    # Heimdal checks. On static Heimdal gssapi must be linked before krb5.
 -  AC_CHECK_LIB(gssapi, gss_display_status, [LIBS="$LIBS -lgssapi -lkrb5";
--                 AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])])
 +  AC_CHECK_LIB_EXT(gssapi, KRB5_LIBS, gss_display_status, [KRB5_LIBS="$KRB5_LIBS -lgssapi -lkrb5";
-+				AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])])
-+
-+  ########################################################
-+  # now see if we can find the krb5 libs in standard paths
-+  # or as specified above
-+  AC_CHECK_LIB_EXT(krb5, KRB5_LIBS, krb5_mk_req_extended)
-+
-+  ########################################################
-+  # now see if we can find the gssapi libs in standard paths
-+  AC_CHECK_LIB_EXT(gssapi_krb5, KRB5_LIBS,gss_display_status,[],[],
-+	    AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available]))
+                  AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])])
  
 -  AC_CHECK_LIB(krb5, krb5_set_real_time, 
 -	         [AC_DEFINE(HAVE_KRB5_SET_REAL_TIME,1,
@@ -562,27 +551,41 @@ diff -uNr samba-3.0.0beta2.orig/source/configure.in samba-3.0.0beta2/source/conf
 -  AC_CHECK_LIB(krb5, krb5_free_ktypes, 
 -                [AC_DEFINE(HAVE_KRB5_FREE_KTYPES,1,
 -                   [Whether krb5_free_ktypes is available])])
+-  AC_CHECK_LIB(krb5, krb5_principal_get_comp_string, 
+-                [AC_DEFINE(HAVE_KRB5_PRINCIPAL_GET_COMP_STRING,1,
+-                   [Whether krb5_principal_get_comp_string is available])])
++  ########################################################
++  # now see if we can find the krb5 libs in standard paths
++  # or as specified above
++  AC_CHECK_LIB_EXT(krb5, KRB5_LIBS, krb5_mk_req_extended)
++
++  ########################################################
++  # now see if we can find the gssapi libs in standard paths
++  AC_CHECK_LIB_EXT(gssapi_krb5, KRB5_LIBS,gss_display_status,[],[],
++	   AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available]))
++
 +  AC_CHECK_FUNC_EXT(krb5_set_real_time, $KRB5_LIBS)
 +  AC_CHECK_FUNC_EXT(krb5_set_default_in_tkt_etypes, $KRB5_LIBS)
 +  AC_CHECK_FUNC_EXT(krb5_set_default_tgs_ktypes, $KRB5_LIBS)
 +  AC_CHECK_FUNC_EXT(krb5_principal2salt, $KRB5_LIBS)
 +  AC_CHECK_FUNC_EXT(krb5_use_enctype, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_string_to_key, $KRB5_LIBS) 
++  AC_CHECK_FUNC_EXT(krb5_string_to_key, $KRB5_LIBS)
 +  AC_CHECK_FUNC_EXT(krb5_get_pw_salt, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_string_to_key_salt, $KRB5_LIBS) 
++  AC_CHECK_FUNC_EXT(krb5_string_to_key_salt, $KRB5_LIBS)
 +  AC_CHECK_FUNC_EXT(krb5_auth_con_setkey, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_auth_con_setuseruserkey, $KRB5_LIBS) 
++  AC_CHECK_FUNC_EXT(krb5_auth_con_setuseruserkey, $KRB5_LIBS)
 +  AC_CHECK_FUNC_EXT(krb5_locate_kdc, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_get_permitted_enctypes, $KRB5_LIBS) 
-+  AC_CHECK_FUNC_EXT(krb5_get_default_in_tkt_etypes, $KRB5_LIBS) 
++  AC_CHECK_FUNC_EXT(krb5_get_permitted_enctypes, $KRB5_LIBS)
++  AC_CHECK_FUNC_EXT(krb5_get_default_in_tkt_etypes, $KRB5_LIBS)
 +  AC_CHECK_FUNC_EXT(krb5_free_ktypes, $KRB5_LIBS)
- 
++  AC_CHECK_FUNC_EXT(krb5_principal_get_comp_string, $KRB5_LIBS)
++
 +  LIBS="$LIBS $KRB5_LIBS"
-+  
-   AC_CACHE_CHECK([for addrtype in krb5_address],
-                 samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS,[
-     AC_TRY_COMPILE([#include <krb5.h>],
-@@ -2365,87 +2453,21 @@
++
+   AC_CACHE_CHECK([for the krb5_princ_component macro],
+                 samba_cv_HAVE_KRB5_PRINC_COMPONENT,[
+     AC_TRY_LINK([#include <krb5.h>],
+@@ -2380,87 +2468,21 @@
                [Whether the ENCTYPE_ARCFOUR_HMAC_MD5 key type is available])
    fi
  
diff --git a/packaging/Debian/debian/patches/nmbd-signalling.patch b/packaging/Debian/debian/patches/nmbd-signalling.patch
index c34f7e75fb1..ca04cce3bfa 100644
--- a/packaging/Debian/debian/patches/nmbd-signalling.patch
+++ b/packaging/Debian/debian/patches/nmbd-signalling.patch
@@ -1,20 +1,20 @@
 diff -uNr samba-2.999+3.0.alpha21.orig/source/nmbd/nmbd_subnetdb.c samba-2.999+3.0.alpha21/source/nmbd/nmbd_subnetdb.c
 --- samba-2.999+3.0.alpha21.orig/source/nmbd/nmbd_subnetdb.c	2002-11-26 20:54:19.000000000 -0600
 +++ samba-2.999+3.0.alpha21/source/nmbd/nmbd_subnetdb.c	2002-12-16 23:34:13.000000000 -0600
-@@ -230,12 +230,16 @@
-   extern struct in_addr loopback_ip;
+@@ -214,12 +214,16 @@
+	extern struct in_addr loopback_ip;
  
-   if(num_interfaces == 0) {
-+	  void (*old_handler)(int);
+	if(num_interfaces == 0) {
++		void (*old_handler)(int);
 +
- 	  DEBUG(0,("create_subnets: No local interfaces !\n"));
- 	  DEBUG(0,("create_subnets: Waiting for an interface to appear ...\n"));
-+	  old_handler = CatchSignal( SIGTERM, SIGNAL_CAST SIG_DFL );
- 	  while (iface_count() == 0) {
- 		  sleep(5);
- 		  load_interfaces();
- 	  }
-+	  CatchSignal( SIGTERM, SIGNAL_CAST old_handler );
-   }
+		DEBUG(0,("create_subnets: No local interfaces !\n"));
+		DEBUG(0,("create_subnets: Waiting for an interface to appear ...\n"));
++		old_handler = CatchSignal( SIGTERM, SIGNAL_CAST SIG_DFL );
+		while (iface_count() == 0) {
+			sleep(5);
+			load_interfaces();
+		}
++		CatchSignal( SIGTERM, SIGNAL_CAST old_handler );
+	}
  
-   num_interfaces = iface_count();
+	num_interfaces = iface_count();
diff --git a/packaging/Debian/debian/patches/samba.patch b/packaging/Debian/debian/patches/samba.patch
index bface14166e..2ea25bb3282 100644
--- a/packaging/Debian/debian/patches/samba.patch
+++ b/packaging/Debian/debian/patches/samba.patch
@@ -49,7 +49,7 @@ diff -uNr samba-3.0.0beta1.orig/source/script/installbin.sh samba-3.0.0beta1/sou
 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
-@@ -880,6 +880,9 @@
+@@ -885,6 +885,9 @@
  	file_close_conn(conn);
  	dptr_closecnum(conn);
  
@@ -59,7 +59,7 @@ diff -uNr samba-3.0.0beta1.orig/source/smbd/service.c samba-3.0.0beta1/source/sm
  	/* execute any "postexec = " line */
  	if (*lp_postexec(SNUM(conn)) && 
  	    change_to_user(conn, vuid))  {
-@@ -899,8 +902,5 @@
+@@ -904,8 +907,5 @@
  		smbrun(cmd,NULL);
  	}
  
diff --git a/packaging/Debian/debian/patches/smbclient-tar.patch.unused b/packaging/Debian/debian/patches/smbclient-tar.patch.unused
new file mode 100644
index 00000000000..e2a4c3ce2c0
--- /dev/null
+++ b/packaging/Debian/debian/patches/smbclient-tar.patch.unused
@@ -0,0 +1,43 @@
+diff -uNr samba-3.0.0beta2.orig/source/client/client.c samba-3.0.0beta2/source/client/client.c
+--- samba-3.0.0beta2.orig/source/client/client.c	2003-07-01 22:36:24.000000000 -0500
++++ samba-3.0.0beta2/source/client/client.c	2003-07-06 15:17:36.000000000 -0500
+@@ -2773,6 +2773,7 @@
+ 	int opt;
+ 	pstring query_host;
+ 	BOOL message = False;
++	char* tar_args = NULL;
+ 	extern char tar_type;
+ 	pstring term_code;
+ 	static const char *new_name_resolve_order = NULL;
+@@ -2816,7 +2817,7 @@
+ 			max_protocol = interpret_protocol(poptGetOptArg(pc), max_protocol);
+ 			break;
+ 		case 'T':
+-			if (!tar_parseargs(argc, argv, poptGetOptArg(pc), optind)) {
++			if (!(tar_args = poptGetOptArg(pc))) {
+ 				poptPrintUsage(pc, stderr, 0);
+ 				exit(1);
+ 			}
+@@ -2917,6 +2917,22 @@
+ 		pstrcpy(cmdline_auth_info.password,poptGetArg(pc));  
+ 	}
+ 
++	/* The tar command may take a number of string options; pass
++	   everything we have left to tar_parseargs(). */
++	if (tar_args) {
++		const char **argv2 = poptGetArgs(pc);
++		int argc2 = 0;
++
++		if (argv2) {
++			while (argv2[argc2]) argc2++;
++		}
++		
++		if (!tar_parseargs(argc2, argv2, tar_args, 0)) {
++			poptPrintUsage(pc, stderr, 0);
++			exit(1);
++		}
++	}
++
+ 	init_names();
+ 
+ 	if(new_name_resolve_order)
diff --git a/packaging/Debian/debian/patches/smbstatus-locking.patch b/packaging/Debian/debian/patches/smbstatus-locking.patch
index fe720c8187f..d37896a3699 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
-@@ -635,6 +635,16 @@
+@@ -630,6 +630,16 @@
  	if (!shares_only) {
  		int ret;
  
diff --git a/packaging/Debian/debian/po/es.po b/packaging/Debian/debian/po/es.po
index 1c5854b4801..0d1d1a770de 100644
--- a/packaging/Debian/debian/po/es.po
+++ b/packaging/Debian/debian/po/es.po
@@ -14,14 +14,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Samba for Debian 3.0.0beta2-1\n"
-"POT-Creation-Date: 2003-07-02 21:50-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-30 19:08-0500\n"
 "PO-Revision-Date: 2003-07-02 21:51-0500\n"
 "Last-Translator: Steve Langasek <vorlon@debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #. Description
 #: ../samba-common.templates:3
@@ -39,9 +39,8 @@ msgid ""
 msgstr ""
 "Actualmente hay una opción de \"character set\" en smb.conf.  En Samba 3.0 "
 "esta opción ha sido reemplazado por una opción nueva: \"unix charset\". Por "
-"favor, indique el juego de caracteres que desea usar para esta opción "
-"nueva, que controla cómo Samba interpretará los nombres en el sistema de "
-"ficheros."
+"favor, indique el juego de caracteres que desea usar para esta opción nueva, "
+"que controla cómo Samba interpretará los nombres en el sistema de ficheros."
 
 #. Description
 #: ../samba-common.templates:3
diff --git a/packaging/Debian/debian/po/fr.po b/packaging/Debian/debian/po/fr.po
index 130a92ee115..6be14c19b43 100644
--- a/packaging/Debian/debian/po/fr.po
+++ b/packaging/Debian/debian/po/fr.po
@@ -14,14 +14,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Samba for Debian 3.0.0beta2-1\n"
-"POT-Creation-Date: 2003-07-02 21:50-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-30 19:08-0500\n"
 "PO-Revision-Date: 2003-07-02 21:52-0500\n"
 "Last-Translator: Steve Langasek <vorlon@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #. Description
 #: ../samba-common.templates:3
diff --git a/packaging/Debian/debian/po/nl.po b/packaging/Debian/debian/po/nl.po
new file mode 100644
index 00000000000..61e8742dbb5
--- /dev/null
+++ b/packaging/Debian/debian/po/nl.po
@@ -0,0 +1,302 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: samba\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-30 19:08-0500\n"
+"PO-Revision-Date: 2003-08-30 02:03+0100\n"
+"Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
+"Language-Team: dutch <debian-l10n-dutch@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../samba-common.templates:3
+msgid "Character Set for Unix filesystem"
+msgstr "Karakterset voor Unix bestandsysteem"
+
+#. Description
+#: ../samba-common.templates:3
+msgid ""
+"You currently have a \"character set\" configured in your smb.conf.  In "
+"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"specify the character set you wish to use for theis new option, which "
+"controls how Samba interprets filenames on the file system."
+msgstr ""
+"U heeft momenteel een \"karakterset\" ingesteld in uw smb.conf. In Samba 3.0 "
+"werd deze optie vervangen door een nieuwe \"unix karakterset\" optie. "
+"Gelieve de karakterset die u voor deze nieuwe optie wil gebruiken aan te "
+"geven, deze bepaald hoe Samba de bestandsnamen in het bestandsysteem "
+"interpreteerd."
+
+#. Description
+#: ../samba-common.templates:3
+msgid "If you leave this option blank, your smb.conf will not be changed."
+msgstr ""
+"Uw smb.conf bestand wordt niet aangepast indien u deze optie leeg laat."
+
+#. Description
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
+msgstr "Karakterset voor DOS-clients"
+
+#. Description
+#: ../samba-common.templates:13
+msgid ""
+"You currently have a \"client code page\" set in your smb.conf.  In Samba "
+"3.0, this option is replaced by the option \"dos charset\".  Please specify "
+"the character set you wish to use for this new option.  In most cases, the "
+"default chosen for you will be sufficient.  Note that this option is not "
+"needed to support Windows clients, it is only for DOS clients.  If you leave "
+"this option blank, your smb.conf will not be changed."
+msgstr ""
+"U heeft momenteel een \"client code pagina\" ingesteld in uw smb.conf. In "
+"Samba 3.0 werd deze optie vervangen door de optie \"dos karakterset\". "
+"Gelieve de karakterset die u voor deze nieuwe optie wilt gebruiken aan te "
+"geven. In de meeste gevallen zal het standaard ingevulde antwoord voldoen. "
+"Merk op dat deze optie niet nodig is voor ondersteuning van Windows-clients, "
+"enkel voor DOS-clients. Uw smb.conf wordt niet veranderd wanneer u deze "
+"optie blank laat."
+
+#. Description
+#: ../samba-common.templates:24
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "smb.conf aanpassen om de WINS instellingen van DHCP te gebruiken?"
+
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"Indien uw computer zijn ip-addres informatie van een DHCP-server op het "
+"netwerk haalt, voorziet deze mogelijks ook informatie betreffende de op het "
+"netwerk aanwezige WINS-servers (\"NetBIOS naam servers\").\" Dit vereist een "
+"verandering aan uw smb.conf bestand, opdat de door DHCP doorgegeven WINS "
+"instellingen automatisch gelezen worden van /etc/samba/dhcp.conf."
+
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"You must have the dhcp3-client package installed to take advantage of this "
+"feature."
+msgstr ""
+"U dient het dhcp3-client-pakket geïnstalleert te hebben om van deze optie "
+"gebruik te maken."
+
+#. Description
+#: ../samba-common.templates:37
+msgid "Configure smb.conf through debconf?"
+msgstr "Configuratie in smb.conf met debconf beheren?"
+
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd.) Your current smb.conf contains an 'include' "
+"line or an option that spans multiple lines, which could confuse debconf and "
+"require you to edit your smb.conf by hand to get it working again."
+msgstr ""
+"De resterende Samba configuratie beslaat parameters in /etc/samba/smb.conf, "
+"het configuratiebestand dat gebruikt wordt voor de Samba programmas (nmbd en "
+"smbd). Uw huidige smb.conf bevat een 'include' regel of een optie die "
+"meerdere regels beslaat, dit kan debconf mogelijks in verwarring brenngen. "
+"Indien debconf in verwarring raakt dient u uw smb.conf handmatig aan te "
+"passen om samba terug werkend te krijgen."
+
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"If you don't use debconf to configure smb.conf, you will have to handle any "
+"configuration changes yourself, and will not be able to take advantage of "
+"periodic configuration enhancements.  Therefore, use of debconf is "
+"recommended if possible."
+msgstr ""
+"Indien u geen gebruik maakt van debconf voor het beheer van smb.conf dient u "
+"alle configuratie instellingen zelf te doen, en zult u geen voordeel halen "
+"uit de periodieke configuratie verbeteringen. Het gebruik van debconf wordt "
+"dan ook aangeraden. "
+
+#. Description
+#: ../samba-common.templates:52
+msgid "Workgroup/Domain Name?"
+msgstr "Werkgroep/Domeinnaam?"
+
+#. Description
+#: ../samba-common.templates:52
+msgid ""
+"This controls what workgroup your server will appear to be in when queried "
+"by clients. Note that this parameter also controls the Domain name used with "
+"the security=domain setting."
+msgstr ""
+"Dit bepaald van welke werkgroep uw server deel zal lijken uit te maken bij "
+"het beantwoorden van vragen door clients. Merk op dat deze parameter ook de "
+"domeinnaam die gebruikt wordt voor de security=domein instelling bepaald."
+
+#. Description
+#: ../samba-common.templates:60
+msgid "Use password encryption?"
+msgstr "Wachtwoord versleuteling gebruiken?"
+
+#. Description
+#: ../samba-common.templates:60
+msgid ""
+"Recent Windows clients communicate with SMB servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry. It is recommended that you use encrypted "
+"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
+"and that you set passwords in there for each user using the smbpasswd "
+"command."
+msgstr ""
+"Recente Windows clients maken gebruik van versleutelde wachtwoorden voor de "
+"communicatie met SMB-servers. Indien u onversleutelde tekst  wachtwoorden "
+"wilt gebruiken dient u een parameter te veranderen in de Windows registry. "
+"Het gebruik van versleutelde wachtwoorden wordt aangeraden. Indien u dit "
+"doet zorg er dan voor dat u een geldig /etc/samba/smbpasswd bestand heeft en "
+"dat u de wachtwoorden daar voor elke gebruiker met behulp van smbpasswd "
+"insteld. "
+
+#. Description
+#: ../samba.templates:4
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr "Samba wachtwoord database, /var/lib/samba/passdb.tdb, aanmaken?"
+
+#. Description
+#: ../samba.templates:4
+msgid ""
+"To be compatible with the defaults in most versions of Windows, Samba must "
+"be configured to use encrypted passwords.  This requires user passwords to "
+"be stored in a file separate from /etc/passwd. This file can be created "
+"automatically, but the passwords must be added manually (by you or the user) "
+"by running smbpasswd, and you must arrange to keep it up-to-date in the "
+"future.  If you do not create it, you will have to reconfigure samba (and "
+"probably your client machines) to use plaintext passwords. See /usr/share/"
+"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
+"details."
+msgstr ""
+"Om compatibel te zijn met de standaard instellingen van de meeste "
+"Windowsversies dient Samba gebruik te maken van versleutelde wachtwoorden. "
+"Dit vereist dat de gebruikerswachtwoorden opgeslagen worden in een bestand "
+"dat verschilt van /etc/passwd. Dit bestand kan automatisch aangemaakt "
+"worden, maar de wachtwoorden dienen handmatig (door de gebuiker) toegevoegt "
+"te worden met het smbpasswd commando. U dient dit bestand in de toekomst ook "
+"aktueel te houden. Indien u dit bestand niet aanmaakt zult u samba (en naar "
+"alle waarschijnlijkheid de client machines) moeten herconfigureren zodat "
+"deze onversleutelde wachtwoorden gebruiken. Zie /usr/share/doc/samba-doc/"
+"htmldocs/ENCRYPTION.html uit het samba-doc pakket voor meer details."
+
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr "Samba's log bestanden zijn verhuisd."
+
+#. Description
+#: ../samba.templates:17
+msgid ""
+"Starting with the first packages of Samba 2.2 for Debian the log files for "
+"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
+"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+msgstr ""
+"Vanaf de eerste Debian pakketten vaan Samba versie 2.2 zijn de log bestanden "
+"van beide Samba daemons (nmbd en smbd) opgeslagen in /var/log/samba/. De log "
+"bestanden voor nmbd en smbd zijn, respectievelijk, log.nmbd en log.smbd."
+
+#. Description
+#: ../samba.templates:17
+msgid ""
+"The old log files that were in /var/log/ will be moved to the new location "
+"for you."
+msgstr ""
+"De oude logbestanden in /var/log worden voor u naar de nieuwe locatie "
+"verplaatst."
+
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr "nmbd vanuit inetd draaien wordt niet langer ondersteund"
+
+#. Description
+#: ../samba.templates:28
+msgid ""
+"Your system was previously configured to start nmbd and smbd from inetd.  As "
+"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd.  "
+"If you have modified your /etc/init.d/samba startup script, you may need to "
+"adjust it by hand now so that nmbd will start."
+msgstr ""
+"Uw systeem was geconfigureerd om nmbd en smbd vanuit inetd te starten. Vanaf "
+"versie 2.999+3.0.alpha20-4 kan nmbd niet langer door inetd gestart worden. "
+"Indien u uw /etc/init.d/samba startup-script aangepast had, dient u dit "
+"mogelijks aan te passen opdat nmbd zou starten."
+
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr "daemons, inetd"
+
+#. Description
+#: ../samba.templates:38
+msgid "How do you want to run Samba?"
+msgstr "Hoe wilt u Samba draaien?"
+
+#. Description
+#: ../samba.templates:38
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"De Samba  daemon smbd kan als een normale daemon of via inetd draaien. Als "
+"een daemon is de aangeraden aanpak."
+
+#. Description
+#: ../samba.templates:45
+msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
+msgstr "/etc/samba/smbpasswd verplaatsen naar /var/lib/samba/passdb.tdb?"
+
+#. Description
+#: ../samba.templates:45
+msgid ""
+"Samba 3.0 introduces a newer, more complete SAM database interface which "
+"supersedes the /etc/samba/smbpasswd file.  Would you like your existing "
+"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you?  If you "
+"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
+"here."
+msgstr ""
+"Samba 3.0 introduceert een nieuwe, meer complete SAM databaseinterface die "
+"het /etc/samba/smbpasswd bestand overstijgt. \"Wilt u dat ik uw bestaand "
+"smbpasswd bestand voor u naar /var/lib/samba/passdb.tdb migreer? Indien u "
+"van plan bent om, in plaats hiervan, een ander pdb-backend (e.g. LDAP) te "
+"gebruiken dient u hier 'nee' te antwoorden."
+
+#. Description
+#: ../swat.templates:3
+msgid "Your smb.conf will be re-written!"
+msgstr "Uw smb.conf wordt herschreven!"
+
+#. Description
+#: ../swat.templates:3
+msgid ""
+"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you have a carefully "
+"crafted smb.conf then back it up or don't use SWAT!"
+msgstr ""
+"SWAT zal uw smb.conf bestand herschrijven. Het zal de ingangen anders "
+"schikken en alle comments, include= en copy= opties verwijderen. Als u een, "
+"met veel zorg, handmatig opgebouwd smb.conf bestand heeft, maak dan een "
+"reservekopie of zie van het gebruik van SWAT af! "
diff --git a/packaging/Debian/debian/po/pt_BR.po b/packaging/Debian/debian/po/pt_BR.po
index 63ffd9a9834..2af42a562b9 100644
--- a/packaging/Debian/debian/po/pt_BR.po
+++ b/packaging/Debian/debian/po/pt_BR.po
@@ -14,14 +14,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_3.0.0beta2-1\n"
-"POT-Creation-Date: 2003-07-02 21:50-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-30 19:08-0500\n"
 "PO-Revision-Date: 2003-07-02 21:56-0500\n"
 "Last-Translator: Steve Langasek <vorlon@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #. Description
 #: ../samba-common.templates:3
@@ -39,10 +39,9 @@ msgid ""
 msgstr ""
 "Atualmente existe um \"conjunto de caracteres\" (\"character set\") "
 "configurado em seu arquivo smb.conf. No Samba 3.0, esta opção foi "
-"substituída por uma nova opção, \"unix charset\". Por favor especifique "
-"o conjunto de caracteres a ser usado para essa nova opção, a qual "
-"controla como o Samba interpreta nomes de arquivos no sistema de "
-"arquivos."
+"substituída por uma nova opção, \"unix charset\". Por favor especifique o "
+"conjunto de caracteres a ser usado para essa nova opção, a qual controla "
+"como o Samba interpreta nomes de arquivos no sistema de arquivos."
 
 #. Description
 #: ../samba-common.templates:3
diff --git a/packaging/Debian/debian/po/templates.pot b/packaging/Debian/debian/po/templates.pot
index b636ba2e485..465f4719b0d 100644
--- a/packaging/Debian/debian/po/templates.pot
+++ b/packaging/Debian/debian/po/templates.pot
@@ -15,7 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-07-02 21:50-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-30 19:08-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/packaging/Debian/debian/python2.3-samba.files b/packaging/Debian/debian/python2.3-samba.files
new file mode 100644
index 00000000000..82759d81b89
--- /dev/null
+++ b/packaging/Debian/debian/python2.3-samba.files
@@ -0,0 +1 @@
+usr/lib/python2.3/site-packages/
diff --git a/packaging/Debian/debian/rules b/packaging/Debian/debian/rules
index 0539484089a..a59aebeb9c5 100755
--- a/packaging/Debian/debian/rules
+++ b/packaging/Debian/debian/rules
@@ -41,7 +41,6 @@ endif
 
 DESTDIR=`pwd`/debian/tmp
 SWATDIR=`pwd`/debian/swat
-SAMBABOOK=`pwd`/debian/swat
 
 IVARS = BASEDIR=$(DESTDIR)/usr \
 		prefix=$(DESTDIR)/usr \
@@ -52,7 +51,6 @@ IVARS = BASEDIR=$(DESTDIR)/usr \
 		VARDIR=$(DESTDIR)/var \
 		INCLUDEDIR=$(DESTDIR)/usr/include \
 		SWATDIR=$(SWATDIR)/usr/share/samba/swat \
-		SAMBABOOK=$(SAMBABOOK)/usr/share/samba/swat/using_samba \
 		CODEPAGEDIR=$(DESTDIR)/usr/share/samba/ \
 		PRIVATEDIR=$(DESTDIR)/etc/samba \
 		CONFIGDIR=$(DESTDIR)/etc/samba
@@ -92,7 +90,6 @@ configure-stamp:
 		--with-smbmount \
 		--with-pam \
 		--with-syslog \
-		--with-sambabook \
 		--with-utmp \
 		--with-readline \
 		--with-pam_smbpass \
@@ -103,7 +100,7 @@ configure-stamp:
 		--with-acl-support \
 		--with-tdbsam \
 		--with-ldap \
-		--with-python=python2.2)
+		--with-python=python2.3)
 
 	touch configure-stamp
 
@@ -142,7 +139,7 @@ install: build
 	         $(DESTDIR)/lib/security $(DESTDIR)/sbin \
 	         $(DESTDIR)/usr/lib/cups/backend $(DESTDIR)/usr/share/samba \
 	         $(DESTDIR)/etc/pam.d $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d \
-	         $(DESTDIR)/usr/lib/python2.2/site-packages
+	         $(DESTDIR)/usr/lib/python2.3/site-packages
 
 	# Add here commands to install the package into debian/tmp.
 	$(MAKE) -C source install $(IVARS)
@@ -187,14 +184,6 @@ install: build
 	#	Erich Schubert <debian@vitavonni.de> in #109509):
 	ln -s ../../../bin/smbspool $(DESTDIR)/usr/lib/cups/backend/smb
 
-	# To avoid duplication of a large number of files, the swat package
-	#	does not contain the "Using Samba" book nor the HTML docs.
-	#	Instead, these are provided by the samba-doc package and
-	#	are accessed through symlinks provided in the swat package.
-	#	Here we create the symlink for the book, and the symlinks
-	#	for the HTML files are created by the script installswat.sh.
-	ln -s ../../doc/samba-doc/htmldocs/using_samba $(SAMBABOOK)/usr/share/samba/swat/using_samba
-
 	# Install man pages for files without man pages in the upstream sources
 	install -m 0644 debian/mksmbpasswd.8 $(DESTDIR)/usr/share/man/man8/mksmbpasswd.8
 
@@ -217,7 +206,12 @@ install: build
 	install -m755 debian/samba-common.dhcp $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d/samba
 
 	# Install the Python modules
-	cp source/build/lib.*/samba/*.so $(DESTDIR)/usr/lib/python2.2/site-packages/
+	#
+	# Hmmm... need to figure this out. We have lib.linux-i686-2.2
+	# and lib.linux-i686-2.3 directories. Using only the stuff from
+	# the 2.3 directory for now. peloy.-
+	#cp source/build/lib.*/samba/*.so $(DESTDIR)/usr/lib/python2.3/site-packages/
+	cp source/build/lib.linux-i686-2.3/samba/*.so $(DESTDIR)/usr/lib/python2.3/site-packages/
 
 	dh_movefiles
 
@@ -262,7 +256,7 @@ binary-arch: build install
 	dh_installdebconf
 	dh_installdocs -A debian/README.build
 	# dh_installexamples is not available in Debian Potato...
-	[ -x /usr/bin/dh_installexamples ] && DH_OPTIONS= dh_installexamples -v -ppython2.2-samba source/python/examples/*
+	[ -x /usr/bin/dh_installexamples ] && DH_OPTIONS= dh_installexamples -v -ppython2.3-samba source/python/examples/*
 #	dh_installmenu
 	# dh_installlogrotate is not available in Debian Potato...
 	if [ -x /usr/bin/dh_installlogrotate ]; then \
diff --git a/packaging/Debian/debian/samba-doc.docs b/packaging/Debian/debian/samba-doc.docs
index 68753e54f08..4d2cec2ee22 100644
--- a/packaging/Debian/debian/samba-doc.docs
+++ b/packaging/Debian/debian/samba-doc.docs
@@ -1,9 +1,7 @@
 README
 docs/Samba-HOWTO-Collection.pdf
 docs/THANKS
-docs/announce
 docs/history
-docs/textdocs/
 docs/faq/
 docs/htmldocs/
 docs/Registry/
diff --git a/packaging/Debian/debian/samba.pamd b/packaging/Debian/debian/samba.pamd
index 1a5a14c7089..e2c7a99356d 100644
--- a/packaging/Debian/debian/samba.pamd
+++ b/packaging/Debian/debian/samba.pamd
@@ -1,5 +1,3 @@
-auth 		required	pam_unix.so nullok
-account		required	pam_unix.so
-session		required	pam_unix.so
-password	required	pam_unix.so
-
+@include common-auth
+@include common-account
+@include common-session
diff --git a/packaging/Debian/debian/scripts/patch-source b/packaging/Debian/debian/scripts/patch-source
index aabcbf709cc..a8559b41676 100755
--- a/packaging/Debian/debian/scripts/patch-source
+++ b/packaging/Debian/debian/scripts/patch-source
@@ -4,11 +4,23 @@
 
 for patch in debian/patches/*.patch; do
 	echo '->'`basename $patch`:
-	patch -p1 < $patch
+	patch -p1 --ignore-whitespace < $patch
 done
 
-cat debian/changelog | perl -pi -e '($version) = <STDIN> =~/\((.*)\)/; \
-		s/\".*\"/\"$version for Debian\"/' source/include/version.h
+# This code is currently not used because it creates a long version
+# number string. For now we're sticking to <upstream version>-Debian,
+# as in 3.0.0rc2-Debian. peloy@debian.org.-
+
+# ---- Begin unused code ----
+# Get Debian version number from 1st line of the Debian changelog
+#DEBIAN_VERSION=`sed -n -e '1s/^.*(\(.*\)).*$/\1/p' debian/changelog`
+
+# Insert Debian version number in source/VERSION, which will then be
+# used to create source/include/version.h.
+#TMPFILE=source/VERSION.debian
+#sed -e "s/^\(SAMBA_VERSION_VENDOR_SUFFIX=\).*$/\1\"Debian-${DEBIAN_VERSION}\"/"  source/VERSION > ${TMPFILE}
+#mv -f ${TMPFILE} source/VERSION
+# ---- End unused code ----
 
 # Regenerate configure only if it is older than configure.in
 [ source/configure -ot source/configure.in ] && (cd source && sh ./autogen.sh)
diff --git a/packaging/Debian/debian/scripts/unpatch-source b/packaging/Debian/debian/scripts/unpatch-source
index 0f577d362f2..d3681cfa504 100755
--- a/packaging/Debian/debian/scripts/unpatch-source
+++ b/packaging/Debian/debian/scripts/unpatch-source
@@ -5,10 +5,14 @@
 # We want to reverse the patches in the opposite order we applied
 #	them, hence the 'ls|sort -r'.
 for patch in `ls debian/patches/*.patch | sort -r`; do
-	patch -p1 -R < $patch
+	patch -p1 -R --ignore-whitespace < $patch
 done
 
-perl -pi -e's/-.* for Debian//' source/include/version.h
+# Unused code. See comment in the patch-source script.
+
+#TMPFILE=source/VERSION.debian
+#sed -e "s/^\(SAMBA_VERSION_VENDOR_SUFFIX=\).*$/\1/" source/VERSION > ${TMPFILE}
+#mv -f ${TMPFILE} source/VERSION
 
 # Regenerate configure only if it is older than configure.in
 [ source/configure -ot source/configure.in ] && (cd source && autoheader && autoconf)
diff --git a/packaging/Mandrake/mount.cifs.8 b/packaging/Mandrake/mount.cifs.8
new file mode 100644
index 00000000000..7ab1be305c2
--- /dev/null
+++ b/packaging/Mandrake/mount.cifs.8
@@ -0,0 +1,181 @@
+.\" This manpage has been automatically generated by docbook2man 
+.\" from a DocBook document.  This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
+.\" Please send any bug reports, improvements, comments, patches, 
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.TH "MOUNT.CIFS" "8" "03 August 2002" "" ""
+.SH NAME
+mount.cifs \- mount using the Common Internet File System (CIFS)
+.SH SYNOPSIS
+
+\fBmount.cifs\fR \fBservice\fR \fBmount-point\fR [ \fB-o options\fR] 
+
+.SH "DESCRIPTION"
+.PP
+\fBmount.cifs\fR mounts a Linux CIFS filesystem. It 
+is usually invoked as \fBmount.cifs\fR by
+the \fBmount(8)\fR command when using the 
+"-t cifs" option. This command only works in Linux, and the kernel must
+support the cifs filesystem. The CIFS protocol is the successor to the 
+SMB protocol and is supported by most Windows servers and many other
+commercial servers and Network Attached Storage appliances as well as 
+by the popular Open Source server Samba.
+.PP
+Options to \fBmount.cifs\fR are specified as a comma-separated
+list of key=value pairs. It is possible to send options other
+than those listed here, assuming that cifs supports them. If
+you get mount failures, check your kernel log for errors on
+unknown options.
+.PP
+\fBmount.cifs\fR is a daemon. After mounting it keeps running until
+the mounted cifs is umounted. It will log things that happen
+when in daemon mode using the "machine name" mount.cifs, so
+typically this output will end up in 
+\fIlog.mount.cifs\fR.
+.SH "OPTIONS"
+.TP
+\fBusername=<arg>\fR
+specifies the username to connect as. If
+this is not given, then the environment variable \fB  USER\fR is used. This option can also take the
+form "user%password" or "user/workgroup" or
+"user/workgroup%password" to allow the password and workgroup
+to be specified as part of the username.
+.TP
+\fBpassword=<arg>\fR
+specifies the CIFS password. If this
+option is not given then the environment variable
+\fBPASSWD\fR is used. If it can find
+no password \fBmount.cifs\fR will prompt
+for a passeword, unless the guest option is
+given. 
+
+Note that password which contain the arguement delimiter
+character (i.e. a comma ',') will failed to be parsed correctly
+on the command line.  However, the same password defined
+in the PASSWD environment variable or a credentials file (see
+below) will be read correctly.
+.TP
+\fBcredentials=<filename>\fR
+specifies a file that contains a username
+and/or password. The format of the file is:
+
+
+.nf
+		username = <value>
+		password = <value>
+		
+.fi
+
+This is preferred over having passwords in plaintext in a
+shared file, such as \fI/etc/fstab\fR. Be sure to protect any
+credentials file properly.
+.TP
+\fBuid=<arg>\fR
+sets the uid that will own all files on
+the mounted filesystem.
+It may be specified as either a username or a numeric uid.
+.TP
+\fBgid=<arg>\fR
+sets the gid that will own all files on
+the mounted filesystem.
+It may be specified as either a groupname or a numeric 
+gid. 
+.TP
+\fBport=<arg>\fR
+sets the remote cifs port number. By default 
+port 445 is tried then if no response port 139 is tried.
+.TP
+\fBfmask=<arg>\fR
+sets the file mask. This determines the 
+permissions that remote files have in the local filesystem. 
+The default is based on the current umask. 
+.TP
+\fBdmask=<arg>\fR
+sets the directory mask. This determines the 
+permissions that remote directories have in the local filesystem. 
+The default is based on the current umask. 
+.TP
+\fBdebug=<arg>\fR
+sets the debug level. This is useful for 
+tracking down cifs connection problems. A suggested value to
+start with is 4. If set too high there will be a lot of
+output, possibly hiding the useful output.
+.TP
+\fBip=<arg>\fR
+sets the destination host or IP address.
+.TP
+\fBdomain=<arg>\fR
+sets the domain (workgroup) of the user 
+.TP
+\fBguest\fR
+don't prompt for a password 
+.TP
+\fBro\fR
+mount read-only 
+.TP
+\fBrw\fR
+mount read-write 
+.TP
+\fBiocharset=<arg>\fR
+sets the charset used by the Linux side for codepage
+to charset translations (NLS). Argument should be the
+name of a charset, like iso8859-1. (Note: only kernel
+2.4.0 or later)
+.TP
+\fBcodepage=<arg>\fR
+sets the codepage the server uses. See the iocharset
+option. Example value cp850. (Note: only kernel 2.4.0
+or later)
+.TP
+\fBttl=<arg>\fR
+how long a directory listing is cached in milliseconds
+(also affects visibility of file size and date
+changes). A higher value means that changes on the
+server take longer to be noticed but it can give
+better performance on large directories, especially
+over long distances. Default is 1000ms but something
+like 10000ms (10 seconds) is probably more reasonable
+in many cases.
+(Note: only kernel 2.4.2 or later)
+.SH "ENVIRONMENT VARIABLES"
+.PP
+The variable \fBUSER\fR may contain the username of the
+person using the client.  This information is used only if the
+protocol level is high enough to support session-level
+passwords. The variable can be used to set both username and
+password by using the format username%password.
+.PP
+The variable \fBPASSWD\fR may contain the password of the
+person using the client.  This information is used only if the
+protocol level is high enough to support session-level
+passwords.
+.PP
+The variable \fBPASSWD_FILE\fR may contain the pathname
+of a file to read the password from. A single line of input is
+read and used as the password.
+.SH "BUGS"
+.PP
+Passwords and other options containing , can not be handled.
+For passwords an alternative way of passing them is in a credentials
+file or in the PASSWD environment.
+.PP
+The credentials file does not handle usernames or passwords with
+leading space.
+.PP
+Note that the typical response to a bug report is suggestion
+to try the latest version first. So please try doing that first,
+and always include which versions you use of relevant software
+when reporting bugs (minimum: samba, kernel, distribution)
+.SH "SEE ALSO"
+.PP
+Documentation/filesystems/cifs.txt in the linux kernel
+source tree may contain additional options and information.
+.SH "AUTHOR"
+.PP
+Steve French   
+The syntax and manpage were loosely based on that of smbmount.
+.PP
+The current maintainer of the Linux cifs vfs and the userspace
+tool \fBmount.cifs\fR is Steve French <URL:mailto:sfrench@samba.org>.
+The SAMBA Mailing list <URL:mailto:samba@samba.org>
+is the preferred place to ask questions regarding these programs.
diff --git a/packaging/Mandrake/samba2.spec.tmpl b/packaging/Mandrake/samba2.spec.tmpl
index 5d8e03438eb..c55da187de8 100644
--- a/packaging/Mandrake/samba2.spec.tmpl
+++ b/packaging/Mandrake/samba2.spec.tmpl
@@ -13,7 +13,7 @@
 # cvs should be submitted for inclusion in samba cvs.
 
 %define pkg_name	samba
-%define ver 		3.0.0beta2
+%define ver 		3.0.0beta3
 %define rel 		3mdk
 %define vscanver 	0.3.3beta1
 %define libsmbmajor 	0
@@ -72,17 +72,22 @@
 %define build_scanners	0
 # CUPS supports functionality for 'printcap name = cups' (9.0 and later):
 %define build_cupspc	0
+# releases that have chrpath available in main
+%define build_chrpath	0
 
 # Set defaults for each version
 %if %build_mdk92
 %define build_cupspc	1
+%define build_chrpath	1
 %endif
 
 %if %build_mdk91
 %define build_cupspc	1
+%define build_chrpath	1
 %endif
 
 %if %build_mdk90
+%define build_chrpath	1
 %endif
 
 %if %build_mdk82
@@ -171,6 +176,9 @@
 %define message_bugzilla() %(echo -e -n "Please file bug reports for this package at Mandrake bugzilla \\n(http://qa.mandrakesoft.com) under the product name %{1}")
 %define message_system %(echo -e -n "NOTE: This is a prerelease of samba-%{samba_major}, not intended for production\\n use. Rather these packages are provided, parallel installable\\nwith samba-2.2.x, for testing purposes")
 
+#check gcc version to disable some optimisations on gcc-3.3.1
+%define gcc331 %(gcc -dumpversion|awk '{if ($1>3.3) print 1; else print 0}')
+
 %ifarch alpha
 %define build_expsam xml
 %else
@@ -223,13 +231,12 @@ Source7: README.%{name}-mandrake-rpm
 Source8: samba-vscan-%{vscanver}.tar.bz2
 %endif
 Source10: samba-print-pdf.sh.bz2
+Source11: mount.cifs.8.bz2
 Patch1: smbw.patch.bz2
-Patch2: samba-2.2.0-gawk.patch.bz2
 Patch3: samba-2.2.0-buildroot.patch.bz2
 Patch4: samba-3.0-smbmount-sbin.patch.bz2
 %if !%have_pversion
 # Version specific patches: current version
-Patch100: samba-3.0.0beta2-mandrake-packaging.patch.bz2
 %else
 # Version specific patches: upcoming version
 %endif
@@ -255,6 +262,9 @@ BuildRequires: libldap-devel
 %if %build_ads
 BuildRequires: libldap-devel krb5-devel
 %endif
+%if %build_chrpath
+BuildRequires: chrpath
+%endif
 BuildRoot: %{_tmppath}/%{name}-root
 Prefix: /usr
 Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall
@@ -748,13 +758,11 @@ echo -e "\n%{name}-%{version}-%{release}\n">>%{SOURCE7}
 %endif
 #%patch111 -p1
 %patch1 -p1 -b .smbw
-%patch2 -p1 -b .gawk
 %patch3 -p1 -b .buildroot
 %patch4 -p1 -b .sbin
 # Version specific patches: current version
 %if !%have_pversion
 echo "Applying patches for current version: %{ver}"
-%patch100 -p1 -b .mdk
 %else
 # Version specific patches: upcoming version
 echo "Applying patches for new versions: %{pversion}"
@@ -795,21 +803,27 @@ perl -pi -e 's/^# define SAMBA_VERSION_MAJOR 2/# define SAMBA_VERSION_MAJOR 3/g'
 perl -pi -e 's/%{pkg_name}/%{name}/g' source/auth/pampass.c
 %endif
 
+#remove cvs internal files from docs:
+find docs examples -name '.cvsignore' -exec rm -f {} \;
+
 %build
 #%serverbuild
 (cd source
-CFLAGS="$RPM_OPT_FLAGS"
+CFLAGS=`echo "$RPM_OPT_FLAGS"|sed -e 's/-g//g'`
+%if %gcc331
+#CFLAGS=`echo "$CFLAGS"|sed -e 's/-O2/-Os/g'`
+%endif
 # Don't use --with-fhs now, since it overrides libdir, it sets configdir, 
 # lockdir,piddir logfilebase,privatedir and swatdir
 %configure      --prefix=%{_prefix} \
-                --sysconfdir=/etc/%{name} \
+                --sysconfdir=%{_sysconfdir}/%{name} \
                 --localstatedir=/var \
                 --libdir=%{_libdir}/%{name} \
-                --with-privatedir=/etc/%{name} \
+                --with-privatedir=%{_sysconfdir}/%{name} \
 		--with-lockdir=/var/cache/%{name} \
 		--with-piddir=/var/run/%{name} \
                 --with-swatdir=%{_datadir}/swat%{samba_major} \
-                --with-configdir=/etc/%{name} \
+                --with-configdir=%{_sysconfdir}/%{name} \
 		--with-logfilebase=/var/log/%{name} \
 %if !%build_ads
 		--with-ads=no	\
@@ -846,7 +860,7 @@ perl -pi -e 's/-g //g' Makefile
 %endif
 
 make proto_exists
-%make	all libsmbclient smbfilter wins modules %{!?_without_test: torture debug2html} bin/editreg
+%make	all libsmbclient smbfilter wins modules %{!?_without_test: torture debug2html} bin/editreg client/mount.cifs
 
 
 # Build VFS modules (experimental)
@@ -906,7 +920,7 @@ mkdir -p $RPM_BUILD_ROOT
 chmod a+r docs -R
 
 # Any entries here mean samba makefile is *really* broken:
-mkdir -p $RPM_BUILD_ROOT/etc/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/vfs
 
@@ -917,8 +931,8 @@ install -m755 source/bin/editreg %{buildroot}/%{_bindir}
 
 #need to stay
 mkdir -p $RPM_BUILD_ROOT/sbin
-mkdir -p $RPM_BUILD_ROOT/etc/{logrotate.d,pam.d,xinetd.d}
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{logrotate.d,pam.d,xinetd.d}
+mkdir -p $RPM_BUILD_ROOT/%{_initrddir}
 mkdir -p $RPM_BUILD_ROOT/var/cache/%{name}
 mkdir -p $RPM_BUILD_ROOT/var/log/%{name}
 mkdir -p $RPM_BUILD_ROOT/var/run/%{name}
@@ -975,20 +989,20 @@ done
 
 # Install other stuff
 
-#        install -m644 examples/VFS/recycle/recycle.conf $RPM_BUILD_ROOT/etc/samba/
-        install -m644 packaging/Mandrake/smbusers $RPM_BUILD_ROOT/etc/%{name}/smbusers
+#        install -m644 examples/VFS/recycle/recycle.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/
+        install -m644 packaging/Mandrake/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/smbusers
         install -m755 packaging/Mandrake/smbprint $RPM_BUILD_ROOT/%{_bindir}
         #install -m755 packaging/RedHat/smbadduser $RPM_BUILD_ROOT/usr/bin
         install -m755 packaging/Mandrake/findsmb $RPM_BUILD_ROOT/%{_bindir}
-        install -m755 packaging/Mandrake/smb.init $RPM_BUILD_ROOT/etc/rc.d/init.d/smb%{samba_major}
+        install -m755 packaging/Mandrake/smb.init $RPM_BUILD_ROOT/%{_initrddir}/smb%{samba_major}
         install -m755 packaging/Mandrake/smb.init $RPM_BUILD_ROOT/%{_sbindir}/%{name}
-	install -m755 packaging/Mandrake/winbind.init $RPM_BUILD_ROOT/etc/rc.d/init.d/winbind%{samba_major}
-#	install -m755 packaging/Mandrake/wrepld.init $RPM_BUILD_ROOT/etc/rc.d/init.d/wrepld%{samba_major}
+	install -m755 packaging/Mandrake/winbind.init $RPM_BUILD_ROOT/%{_initrddir}/winbind%{samba_major}
+#	install -m755 packaging/Mandrake/wrepld.init $RPM_BUILD_ROOT/%{_initrddir}/wrepld%{samba_major}
 	install -m755 packaging/Mandrake/winbind.init $RPM_BUILD_ROOT/%{_sbindir}/winbind%{samba_major}
-        install -m644 packaging/Mandrake/samba.pamd $RPM_BUILD_ROOT/etc/pam.d/%{name}
-	install -m644 packaging/Mandrake/system-auth-winbind.pamd $RPM_BUILD_ROOT/etc/pam.d/system-auth-winbind%{samba_major}
+        install -m644 packaging/Mandrake/samba.pamd $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/%{name}
+	install -m644 packaging/Mandrake/system-auth-winbind.pamd $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/system-auth-winbind%{samba_major}
 #
-        install -m644 %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+        install -m644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name}
 #	install -m644 packaging/Mandrake/samba-slapd-include.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/samba-slapd.include
 
 # Install smbldap-tools scripts:
@@ -1018,15 +1032,15 @@ install -m755 examples/LDAP/convertSambaAccount $RPM_BUILD_ROOT/%{_datadir}/%{na
 
 # make a conf file for winbind from the default one:
 	cat packaging/Mandrake/smb.conf|sed -e  's/^;  winbind/  winbind/g;s/^;  obey pam/  obey pam/g; s/^;   printer admin = @"D/   printer admin = @"D/g;s/^;   password server = \*/   password server = \*/g;s/^;  template/  template/g; s/^   security = user/   security = domain/g' > packaging/Mandrake/smb-winbind.conf
-        install -m644 packaging/Mandrake/smb-winbind.conf $RPM_BUILD_ROOT/etc/%{name}/smb-winbind.conf
+        install -m644 packaging/Mandrake/smb-winbind.conf $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/smb-winbind.conf
 
 # Some inline fixes for smb.conf for non-winbind use
-install -m644 packaging/Mandrake/smb.conf $RPM_BUILD_ROOT/etc/%{name}/smb.conf
+install -m644 packaging/Mandrake/smb.conf $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/smb.conf
 cat packaging/Mandrake/smb.conf | \
-sed -e 's/^;   printer admin = @adm/   printer admin = @adm/g' >$RPM_BUILD_ROOT/etc/%{name}/smb.conf
+sed -e 's/^;   printer admin = @adm/   printer admin = @adm/g' >$RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/smb.conf
 %if %build_cupspc
-perl -pi -e 's/printcap name = lpstat/printcap name = cups/g' $RPM_BUILD_ROOT/etc/%{name}/smb.conf
-perl -pi -e 's/printcap name = lpstat/printcap name = cups/g' $RPM_BUILD_ROOT/etc/%{name}/smb-winbind.conf
+perl -pi -e 's/printcap name = lpstat/printcap name = cups/g' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/smb.conf
+perl -pi -e 's/printcap name = lpstat/printcap name = cups/g' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/smb-winbind.conf
 %endif
 
 # Link smbmount to /sbin/mount.smb and /sbin/mount.smbfs
@@ -1035,7 +1049,12 @@ perl -pi -e 's/printcap name = lpstat/printcap name = cups/g' $RPM_BUILD_ROOT/et
         ln -s ..%{_bindir}/smbmount%{samba_major} mount.smb%{samba_major}
         ln -s ..%{_bindir}/smbmount%{samba_major} mount.smbfs%{samba_major}
 )
-        echo 127.0.0.1 localhost > $RPM_BUILD_ROOT/etc/%{name}/lmhosts
+
+#install mount.cifs
+install -m755 source/client/mount.cifs %{buildroot}/sbin
+bzcat %{SOURCE11} > %{buildroot}/%{_mandir}/man8/mount.cifs.8
+
+        echo 127.0.0.1 localhost > $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/lmhosts
 
 # Link smbspool to CUPS (does not require installed CUPS)
 
@@ -1044,8 +1063,8 @@ perl -pi -e 's/printcap name = lpstat/printcap name = cups/g' $RPM_BUILD_ROOT/et
 
 # xinetd support
 
-        mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d
-        install -m644 %{SOURCE3} $RPM_BUILD_ROOT/etc/xinetd.d/swat%{samba_major}
+        mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d
+        install -m644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/swat%{samba_major}
 
 # menu support
 
@@ -1075,6 +1094,10 @@ bzcat %{SOURCE6} > $RPM_BUILD_ROOT%{_miconsdir}/swat%{samba_major}.png
 
 bzcat %{SOURCE10}> $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/print-pdf
 
+%if %build_chrpath
+find %{buildroot}/%{_lib} %{buildroot}/%{_bindir} %{buildroot}/%{_sbindir} %{buildroot}/%{_libdir} -type f -exec chrpath -d {} \;
+%endif
+
 # Fix configs when not building system samba:
 %if !%build_system
 # Work around non-existent but claimed --program-suffix support :-(
@@ -1095,15 +1118,15 @@ for OLD in $FILES; do
 done		
 # Replace paths in config files and init scripts:
 for i in smb winbind;do
-	perl -pi -e 's,/subsys/'$i',/subsys/'$i'%{samba_major},g' $RPM_BUILD_ROOT/etc/rc.d/init.d/${i}%{samba_major}
+	perl -pi -e 's,/subsys/'$i',/subsys/'$i'%{samba_major},g' $RPM_BUILD_ROOT/%{_initrddir}/${i}%{samba_major}
 done
-for i in /etc/%{name}/smb.conf /etc/rc.d/init.d/smb%{samba_major} %{_sbindir}/%{name} /etc/rc.d/init.d/winbind%{samba_major} %{_sbindir}/winbind%{samba_major} /etc/logrotate.d/%{name} /etc/xinetd.d/swat%{samba_major} /etc/rc.d/init.d/wrepld%{samba_major}; do
+for i in %{_sysconfdir}/%{name}/smb.conf %{_initrddir}/smb%{samba_major} %{_sbindir}/%{name} %{_initrddir}/winbind%{samba_major} %{_sbindir}/winbind%{samba_major} /%{_sysconfdir}/logrotate.d/%{name} /%{_sysconfdir}/xinetd.d/swat%{samba_major} %{_initrddir}/wrepld%{samba_major}; do
 	perl -pi -e 's,/%{pkg_name},/%{name},g; s,smbd,%{_sbindir}/smbd%{samba_major},g; s,nmbd,%{_sbindir}/nmbd%{samba_major},g; s,winbindd,%{_sbindir}/winbindd%{samba_major},g; s,/usr/sbin/swat,%{_sbindir}/swat%{samba_major},g;s,wrepld,%{_sbindir}/wrepld%{samba_major},g' $RPM_BUILD_ROOT/$i;
 done
 # Fix pam files
-perl -pi -e 's/winbind/winbind%{samba_major}/g' $RPM_BUILD_ROOT/etc/pam.d/system-auth-winbind%{samba_major}
+perl -pi -e 's/winbind/winbind%{samba_major}/g' $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/system-auth-winbind%{samba_major}
 # Fix xinetd file for swat:
-perl -pi -e 's,/usr/sbin,%{_sbindir},g' $RPM_BUILD_ROOT/etc/xinetd.d/swat%{samba_major}
+perl -pi -e 's,/usr/sbin,%{_sbindir},g' $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/swat%{samba_major}
 %endif
 
 #Clean up unpackaged files:
@@ -1145,12 +1168,12 @@ fi
 
 %post common
 # Basic migration script for pre-2.2.1 users,
-# since smb config moved from /etc to /etc/samba
+# since smb config moved from /etc to %{_sysconfdir}/samba
 
-# Let's create a proper /etc/samba/smbpasswd file
-[ -f /etc/%{name}/smbpasswd ] || {
+# Let's create a proper %{_sysconfdir}/samba/smbpasswd file
+[ -f %{_sysconfdir}/%{name}/smbpasswd ] || {
 	echo "Creating password file for samba..."
-	touch /etc/%{name}/smbpasswd
+	touch %{_sysconfdir}/%{name}/smbpasswd
 }
 
 # And this too, in case we don't have smbd to create it for us
@@ -1159,46 +1182,46 @@ fi
 }
 
 # Let's define the proper paths for config files
-perl -pi -e 's/(\/etc\/)(smb)/\1%{name}\/\2/' /etc/%{name}/smb.conf
+perl -pi -e 's/(\/etc\/)(smb)/\1%{name}\/\2/' %{_sysconfdir}/%{name}/smb.conf
 
 # Let's replace lpstat with cups in older smb.conf:
 %if %build_cupspc
 echo "Updating samba printing configuration if necessary..."
-perl -pi -e 's/= lpstat/= cups/' /etc/%{name}/smb.conf
+perl -pi -e 's/= lpstat/= cups/' %{_sysconfdir}/%{name}/smb.conf
 %endif
 
 # Fix the logrotate.d file from smb and nmb to smbd and nmbd
-if [ -f /etc/logrotate.d/samba ]; then
-        perl -pi -e 's/smb /smbd /' /etc/logrotate.d/samba
-        perl -pi -e 's/nmb /nmbd /' /etc/logrotate.d/samba
+if [ -f %{_sysconfdir}/logrotate.d/samba ]; then
+        perl -pi -e 's/smb /smbd /' %{_sysconfdir}/logrotate.d/samba
+        perl -pi -e 's/nmb /nmbd /' %{_sysconfdir}/logrotate.d/samba
 fi
 
 # And not loose our machine account SID
-[ -f /etc/MACHINE.SID ] && mv -f /etc/MACHINE.SID /etc/%{name}/ ||:
+[ -f %{_sysconfdir}/MACHINE.SID ] && mv -f %{_sysconfdir}/MACHINE.SID %{_sysconfdir}/%{name}/ ||:
 
 %if %build_winbind
 %post winbind
 if [ $1 = 1 ]; then
     /sbin/chkconfig winbind%{samba_major} on
-    cp -af /etc/nsswitch.conf /etc/nsswitch.conf.rpmsave
-    cp -af /etc/nsswitch.conf /etc/nsswitch.conf.rpmtemp
+    cp -af %{_sysconfdir}/nsswitch.conf %{_sysconfdir}/nsswitch.conf.rpmsave
+    cp -af %{_sysconfdir}/nsswitch.conf %{_sysconfdir}/nsswitch.conf.rpmtemp
     for i in passwd group;do
-        grep ^$i /etc/nsswitch.conf |grep -v 'winbind%{samba_major}' >/dev/null
+        grep ^$i %{_sysconfdir}/nsswitch.conf |grep -v 'winbind%{samba_major}' >/dev/null
         if [ $? = 0 ];then
-            echo "Adding a winbind%{samba_major} entry to the $i section of /etc/nsswitch.conf"
-            awk '/^'$i'/ {print $0 " winbind%{samba_major}"};!/^'$i'/ {print}' /etc/nsswitch.conf.rpmtemp >/etc/nsswitch.conf;
-	    cp -af /etc/nsswitch.conf /etc/nsswitch.conf.rpmtemp
+            echo "Adding a winbind%{samba_major} entry to the $i section of %{_sysconfdir}/nsswitch.conf"
+            awk '/^'$i'/ {print $0 " winbind%{samba_major}"};!/^'$i'/ {print}' %{_sysconfdir}/nsswitch.conf.rpmtemp >%{_sysconfdir}/nsswitch.conf;
+	    cp -af %{_sysconfdir}/nsswitch.conf %{_sysconfdir}/nsswitch.conf.rpmtemp
         else
-            echo "$i entry found in /etc/nsswitch.conf"
+            echo "$i entry found in %{_sysconfdir}/nsswitch.conf"
         fi
     done
-    if [ -f /etc/nsswitch.conf.rpmtemp ];then rm -f /etc/nsswitch.conf.rpmtemp;fi
+    if [ -f %{_sysconfdir}/nsswitch.conf.rpmtemp ];then rm -f %{_sysconfdir}/nsswitch.conf.rpmtemp;fi
 fi
 
 %preun winbind
 if [ $1 = 0 ]; then
-	echo "Removing winbind%{samba_major} entries from /etc/nsswitch.conf"
-	perl -pi -e 's/ winbind%{samba_major}//' /etc/nsswitch.conf
+	echo "Removing winbind%{samba_major} entries from %{_sysconfdir}/nsswitch.conf"
+	perl -pi -e 's/ winbind%{samba_major}//' %{_sysconfdir}/nsswitch.conf
 
 	/sbin/chkconfig winbind%{samba_major} reset
 fi
@@ -1207,13 +1230,13 @@ fi
 %if %build_wins
 %post -n nss_wins%{samba_major}
 if [ $1 = 1 ]; then
-    cp -af /etc/nsswitch.conf /etc/nsswitch.conf.rpmsave
-    grep '^hosts' /etc/nsswitch.conf |grep -v 'wins%{samba_major}' >/dev/null
+    cp -af %{_sysconfdir}/nsswitch.conf %{_sysconfdir}/nsswitch.conf.rpmsave
+    grep '^hosts' %{_sysconfdir}/nsswitch.conf |grep -v 'wins%{samba_major}' >/dev/null
     if [ $? = 0 ];then
-        echo "Adding a wins entry to the hosts section of /etc/nsswitch.conf"
-        awk '/^hosts/ {print $0 " wins%{samba_major}"};!/^hosts/ {print}' /etc/nsswitch.conf.rpmsave >/etc/nsswitch.conf;
+        echo "Adding a wins entry to the hosts section of %{_sysconfdir}/nsswitch.conf"
+        awk '/^hosts/ {print $0 " wins%{samba_major}"};!/^hosts/ {print}' %{_sysconfdir}/nsswitch.conf.rpmsave >%{_sysconfdir}/nsswitch.conf;
     else
-        echo "wins entry found in /etc/nsswitch.conf"
+        echo "wins entry found in %{_sysconfdir}/nsswitch.conf"
     fi
 #    else
 #        echo "Upgrade, leaving nsswitch.conf intact"
@@ -1221,10 +1244,10 @@ fi
 
 %preun -n nss_wins%{samba_major}
 if [ $1 = 0 ]; then
-	echo "Removing wins entry from /etc/nsswitch.conf"
-	perl -pi -e 's/ wins%{samba_major}//' /etc/nsswitch.conf
+	echo "Removing wins entry from %{_sysconfdir}/nsswitch.conf"
+	perl -pi -e 's/ wins%{samba_major}//' %{_sysconfdir}/nsswitch.conf
 #else
-#	echo "Leaving /etc/nsswitch.conf intact"
+#	echo "Leaving %{_sysconfdir}/nsswitch.conf intact"
 fi
 %endif %build_wins
 
@@ -1260,8 +1283,8 @@ fi
 %postun swat
 
 # Remove swat entry from xinetd
-if [ $1 = 0 -a -f /etc/xinetd.conf ] ; then
-rm -f /etc/xinetd.d/swat%{samba_major}
+if [ $1 = 0 -a -f %{_sysconfdir}/xinetd.conf ] ; then
+rm -f %{_sysconfdir}/xinetd.d/swat%{samba_major}
 	service xinetd reload &>/dev/null || :
 fi
 
@@ -1280,7 +1303,7 @@ fi
 if [ $1 != 0 ]; then
         [ ! -d /var/lock/samba ] && mkdir -m 0755 /var/lock/samba ||:
         [ ! -d /var/spool/samba ] && mkdir -m 1777 /var/spool/samba ||:
-        [ -f /etc/inetd.conf ] && chmod 644 /etc/services /etc/inetd.conf ||:
+        [ -f %{_sysconfdir}/inetd.conf ] && chmod 644 %{_sysconfdir}/services %{_sysconfdir}/inetd.conf ||:
 fi
 
 %files server
@@ -1302,13 +1325,12 @@ fi
 %{_libdir}/%{name}/vfs/*.so
 %dir %{_libdir}/%{name}/pdb
 
-#/usr/share/swat
-%attr(-,root,root) %config(noreplace) /etc/%{name}/smbusers
-%attr(-,root,root) %config %{_initrddir}/smb%{samba_major}
-#%attr(-,root,root) %config %{_initrddir}/wrepld%{samba_major}
-%attr(-,root,root) %config(noreplace) /etc/logrotate.d/%{name}
-%attr(-,root,root) %config(noreplace) /etc/pam.d/%{name}
-#%attr(-,root,root) %config(noreplace) /etc/%{name}/samba-slapd.include
+%attr(-,root,root) %config(noreplace) %{_sysconfdir}/%{name}/smbusers
+%attr(-,root,root) %config(noreplace) %{_initrddir}/smb%{samba_major}
+#%attr(-,root,root) %config(noreplace) %{_initrddir}/wrepld%{samba_major}
+%attr(-,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%attr(-,root,root) %config(noreplace) %{_sysconfdir}/pam.d/%{name}
+#%attr(-,root,root) %config(noreplace) %{_sysconfdir}/%{name}/samba-slapd.include
 %{_mandir}/man1/smbstatus*.1*
 %{_mandir}/man5/smbpasswd*.5*
 %{_mandir}/man7/samba*.7*
@@ -1319,9 +1341,10 @@ fi
 %{_mandir}/man8/tdbbackup*.8*
 %{_mandir}/man1/profiles*.1*
 %{_mandir}/man1/editreg*.1*
-%attr(775,root,root) %dir %{_localstatedir}/%{name}/netlogon
-%attr(775,root,root) %dir %{_localstatedir}/%{name}/profiles
-%attr(775,root,root) %dir %{_localstatedir}/%{name}/printers
+%attr(775,root,adm) %dir %{_localstatedir}/%{name}/netlogon
+%attr(755,root,root) %dir %{_localstatedir}/%{name}/profiles
+%attr(755,root,root) %dir %{_localstatedir}/%{name}/printers
+%attr(775,root,adm) %dir %{_localstatedir}/%{name}/printers/*
 %attr(1777,root,root) %dir /var/spool/%{name}
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/scripts
@@ -1341,36 +1364,38 @@ fi
 %doc README.%{name}-mandrake-rpm
 %doc docs
 %doc examples
-%doc swat/README
-%attr(-,root,root) %{_datadir}/swat%{samba_major}/using_samba/*
+%attr(-,root,root) %{_datadir}/swat%{samba_major}/using_samba/
 
 %files swat
 %defattr(-,root,root)
-%config(noreplace) /etc/xinetd.d/swat%{samba_major}
+%config(noreplace) %{_sysconfdir}/xinetd.d/swat%{samba_major}
 #%attr(-,root,root) /sbin/*
 %{_sbindir}/swat%{samba_major}
 %{_menudir}/%{name}-swat
 %{_miconsdir}/*.png
 %{_liconsdir}/*.png
 %{_iconsdir}/*.png
-%attr(-,root,root) %{_datadir}/swat%{samba_major}/help/*
-%attr(-,root,root) %{_datadir}/swat%{samba_major}/images/*
-%attr(-,root,root) %{_datadir}/swat%{samba_major}/include/*
+%attr(-,root,root) %{_datadir}/swat%{samba_major}/help/
+%attr(-,root,root) %{_datadir}/swat%{samba_major}/images/
+%attr(-,root,root) %{_datadir}/swat%{samba_major}/include/
 %lang(ja) %{_datadir}/swat%{samba_major}/lang/ja
 %lang(tr) %{_datadir}/swat%{samba_major}/lang/tr
 %{_mandir}/man8/swat*.8*
+%doc swat/README
 
 %files client
 %defattr(-,root,root)
 %ifnarch alpha
 /sbin/mount.smb%{samba_major}
 /sbin/mount.smbfs%{samba_major}
+/sbin/mount.cifs
 %attr(755,root,root) %{_bindir}/smbmount%{samba_major}
 %attr(4755,root,root) %{_bindir}/smbumount%{samba_major}
 %attr(4755,root,root) %{_bindir}/smbmnt%{samba_major}
 %{_mandir}/man8/smbmnt*.8*
 %{_mandir}/man8/smbmount*.8*
 %{_mandir}/man8/smbumount*.8*
+%{_mandir}/man8/mount.cifs*.8*
 %else
 %exclude %{_bindir}/smb*m*nt%{samba_major}
 %exclude %{_mandir}/man8/smb*m*nt*.8*
@@ -1432,6 +1457,7 @@ fi
 %{_mandir}/man1/smbtree*.1*
 %{_mandir}/man1/ntlm_auth*.1*
 %{_mandir}/man7/Samba*.7*
+%dir %{_datadir}/swat%{samba_major}
 
 %if %build_winbind
 %files winbind
@@ -1441,8 +1467,8 @@ fi
 %{_bindir}/wbinfo%{samba_major}
 %attr(755,root,root) /%{_lib}/security/pam_winbind*
 %attr(755,root,root) /%{_lib}/libnss_winbind%{samba_major}*
-%attr(-,root,root) %config /etc/rc.d/init.d/winbind%{samba_major}
-%attr(-,root,root) %config(noreplace) /etc/pam.d/system-auth-winbind*
+%attr(-,root,root) %config(noreplace) %{_initrddir}/winbind%{samba_major}
+%attr(-,root,root) %config(noreplace) %{_sysconfdir}/pam.d/system-auth-winbind*
 %{_mandir}/man8/winbindd*.8*
 %{_mandir}/man1/wbinfo*.1*
 %endif
@@ -1567,6 +1593,19 @@ fi
 %exclude %{_mandir}/man1/smbsh*.1*
 
 %changelog
+* Mon Jul 28 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.0-0.beta3.3mdk
+- Rebuild for kerberos-1.3 on cooker
+- Put printer directories back
+- Add mount.cifs
+- Go back to standard optimisations
+
+* Thu Jul 17 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.0-0.beta3.2mdk
+- beta3
+- remove -g from cflags to avoid large static libraries
+- drop optimisation from O2 to O1 for gcc 3.3.1
+- own some directories for distriblint's benefit
+- use chrpath on distro's that have it to drastically reduce rpmlint score
+
 * Mon Jul 14 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.0-0.beta2.3mdk
 - place non-conditional excludes at the end of files list, to prevent causing
   rpm in Mandrake <=8.2 from segfaulting when processing files.
diff --git a/packaging/README b/packaging/README
index 1cf147f3f9f..74445508e0b 100644
--- a/packaging/README
+++ b/packaging/README
@@ -3,6 +3,7 @@ Date:		November 16, 1998
 Updates:	First Release - 19970819
 		19981116
 		20030329
+		20030905
 ===============================================================================
 
 Note:
@@ -17,19 +18,10 @@ packages for distribution via the official samba ftp sites.
 The files contained here are intended for use only by those wishing to build
 distribution packages and are NOT considered suitable material for anyone who
 wants to just install Samba from the pristine source files contained under
-the ~/source directory.
+the ../source directory.
 
 All contributions / modifications / additions / etc. to the packaging files
-should be sent to samba-patches@samba.org with the subject marked:
-	PACKAGING: [add|mod|contrib] Your subject.
-
-Should you, or anyone you know of, have package build instructions and/or files
-that may be of use to the wider community of Samba users please mail the above
-account with subject:  PACKAGING: [avail] OS xxxxxxxxxx
-where xxxxxxxxxx is the operating system platform that may be contributed.
-
-We will contact the person who is offering to contribute package build details
-to ensure that their contribution can be included in the official Samba sources.
+should be logged in https://bugzilla.samba.org/.
 
 In the event that anyone wishes to contribute package build information please
 indicate in your response how we may access a suitable system to ensure our
@@ -38,9 +30,3 @@ ability to keep the binary distribution itself current with the released source.
 The future of cooperatively developed software such as Samba depends on the
 willingness of all partners to share the fruit of their labours.
 
-If you have a compelling need for binary packages for your platform and it is
-not available from this packaging repository please notify jht@samba.org. We 
-can not guarrantee our ability to satisfy your need, but your feedback may help
-us to find a solution.
-
-- John T.
diff --git a/packaging/RedHat/filter-requires-samba_rh8.sh b/packaging/RedHat/filter-requires-samba_rh8.sh
new file mode 100755
index 00000000000..8428a6ad013
--- /dev/null
+++ b/packaging/RedHat/filter-requires-samba_rh8.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/lib/rpm/find-requires $* | egrep -v '(Net::LDAP|CGI)'
diff --git a/packaging/RedHat/filter-requires-samba_rh9.sh b/packaging/RedHat/filter-requires-samba_rh9.sh
new file mode 100755
index 00000000000..8378523bceb
--- /dev/null
+++ b/packaging/RedHat/filter-requires-samba_rh9.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/lib/rpm/perl.req $* | egrep -v '(Net::LDAP|CGI)'
diff --git a/packaging/RedHat/makerpms.sh.tmpl b/packaging/RedHat/makerpms.sh.tmpl
index dc82033b06a..a37e03a1447 100644
--- a/packaging/RedHat/makerpms.sh.tmpl
+++ b/packaging/RedHat/makerpms.sh.tmpl
@@ -12,16 +12,9 @@
 # Note: Under this directory rpm expects to find the same directories that are under the
 #   /usr/src/redhat directory
 #
-if [ -r ~/.rpmmacros ]; then
-	TOPDIR=`awk '/topdir/ {print $2}' < ~/.rpmmacros`
-	if [ z$TOPDIR != "z" ]; then
-		SPECDIR=${TOPDIR}/SPECS
-		SRCDIR=${TOPDIR}/SOURCES
-	fi
-fi
 
-SPECDIR=${SPECDIR:-/usr/src/redhat/SPECS}
-SRCDIR=${SRCDIR:-/usr/src/redhat/SOURCES}
+SPECDIR=`rpm --eval %_specdir`
+SRCDIR=`rpm --eval %_sourcedir`
 
 # At this point the SPECDIR and SRCDIR vaiables must have a value!
 
@@ -29,28 +22,18 @@ USERID=`id -u`
 GRPID=`id -g`
 VERSION='PVERSION'
 SPECFILE="samba3.spec"
-
 RPMVER=`rpm --version | awk '{print $3}'`
 RPM="rpm"
 echo The RPM Version on this machine is: $RPMVER
 
+##
+## fix the mandir macro
+##
 case $RPMVER in
-    2*)
-       echo Building for RPM v2.x
-       sed -e "s/MANDIR_MACRO/\%\{prefix\}\/man/g" < samba.spec > $SPECFILE
-       ;;
-    3*)
-       echo Building for RPM v3.x
+    [23]*)
        sed -e "s/MANDIR_MACRO/\%\{prefix\}\/man/g" < samba.spec > $SPECFILE
        ;;
-    4.0*)
-       ## catch rpm v4.0.x first
-       echo Building for RPM v4.0
-       sed -e "s/MANDIR_MACRO/\%\{_mandir\}/g" < samba.spec > $SPECFILE
-       ;;
-    4.*)
-       echo Building for RPM v4.1 or later
-       RPM="rpmbuild"
+    4*)
        sed -e "s/MANDIR_MACRO/\%\{_mandir\}/g" < samba.spec > $SPECFILE
        ;;
     *)
@@ -59,16 +42,30 @@ case $RPMVER in
        ;;
 esac
 
+##
+## now catch the right command to build an RPM (defaults ro 'rpm'
+##
+case $RPMVER in
+    4.[12]*)
+       RPM="rpmbuild"
+       ;;
+esac
+
+echo "RPM build command is \"$RPM\""
+
 ( cd ../../source; if [ -f Makefile ]; then make distclean; fi )
 ( cd ../../.. ; chown -R ${USERID}.${GRPID} samba-${VERSION} )
 
 ( cd ../../.. ; tar --exclude=CVS -cf - samba-${VERSION}/. | bzip2 > ${SRCDIR}/samba-${VERSION}.tar.bz2 )
 
-cp -av $SPECFILE ${SPECDIR}
+/bin/cp -p filter-requires-samba_rh8.sh ${SRCDIR}
+/bin/cp -p filter-requires-samba_rh9.sh ${SRCDIR}
+chmod 755 ${SRCDIR}/filter-requires-samba_rh?.sh
+/bin/cp -av $SPECFILE ${SPECDIR}
 
 echo Getting Ready to build release package
 cd ${SPECDIR}
-${RPM} -ba -v --clean --rmsource $SPECFILE
+${RPM} -ba --clean --rmsource $SPECFILE
 
 echo Done.
 
diff --git a/packaging/RedHat/samba.spec.tmpl b/packaging/RedHat/samba.spec.tmpl
index 4c5a480a27e..26e86aa61dd 100644
--- a/packaging/RedHat/samba.spec.tmpl
+++ b/packaging/RedHat/samba.spec.tmpl
@@ -1,3 +1,6 @@
+## grab the major and minor version of rpm 
+%define rpm_version `rpm --version | awk '{print $3}' | awk -F. '{print $1$2}'`
+
 Summary: Samba SMB client and server
 Name: samba
 Version: PVERSION
@@ -5,9 +8,15 @@ Release: PRELEASE
 License: GNU GPL version 2
 Group: Networking
 Source: http://download.samba.org/samba/ftp/samba-%{version}.tar.bz2
+
+# Don't depend on Net::LDAP
+# one filter for RH 8 and one for 9
+Source998: filter-requires-samba_rh8.sh
+Source999: filter-requires-samba_rh9.sh
+
 Packager: Gerald Carter [Samba-Team] <jerry@samba.org>
 Requires: pam >= 0.72 kernel >= 2.2.1 glibc >= 2.1.2
-Prereq: chkconfig fileutils
+Prereq: chkconfig fileutils /sbin/ldconfig
 Provides: samba = %{version}
 Obsoletes: samba-common, samba-client, samba-swat
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -37,6 +46,19 @@ docs directory for implementation details.
 %setup
 
 %build
+
+# Working around perl dependency problem from docs
+# Only > RH 8.0 seems to care here
+
+echo "rpm_version == %{rpm_version}"
+if [ "%{rpm_version}" == "42" ]; then
+   %define __perl_requires %{SOURCE999}
+   echo "%{__perl_requires}"
+elif [ "%{rpm_version}" == "41" ]; then
+   %define __find_requires %{SOURCE998}
+   echo "%{__find_requires}"
+fi
+
 ## Build main Samba source
 cd source
 
@@ -94,7 +116,7 @@ mkdir -p $RPM_BUILD_ROOT%{prefix}/{lib,include}
 # Install standard binary files
 for i in nmblookup smbclient smbpasswd smbstatus testparm testprns \
 	rpcclient smbspool smbcacls smbcontrol wbinfo smbmnt net \
-	smbcacls pdbedit tdbbackup smbtree
+	smbcacls pdbedit tdbbackup smbtree ntlm_auth smbcquotas
 do
 	install -m755 source/bin/$i $RPM_BUILD_ROOT%{prefix}/bin
 done
@@ -123,7 +145,7 @@ make DESTDIR=$RPM_BUILD_ROOT \
 	LIBDIR=%{prefix}/lib/samba \
 	VARDIR=/var \
 	SBINDIR=%{prefix}/sbin \
-	BINDIR=$%{prefix}/bin \
+	BINDIR=%{prefix}/bin \
 	MANDIR=MANDIR_MACRO \
 	SWATDIR=%{prefix}/share/swat \
 	SAMBABOOK=%{prefix}/share/swat/using_samba \
@@ -147,22 +169,7 @@ install -m 755 source/bin/libsmbclient.so $RPM_BUILD_ROOT%{prefix}/lib/
 install -m 755 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{prefix}/lib/
 install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{prefix}/include/
 
-# Install SWAT helper files
-#for i in swat/help/*.html docs/htmldocs/*.html
-#do
-#	install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/help
-#done
-#for i in swat/images/*.gif
-#do
-#	install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/images
-#done
-#for i in swat/include/*.html
-#do
-#	install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/include
-#done
-
 # Install the miscellany
-install -m755 swat/README $RPM_BUILD_ROOT%{prefix}/share/swat/README
 install -m755 packaging/RedHat/smbprint $RPM_BUILD_ROOT%{prefix}/bin
 install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT/etc/rc.d/init.d/smb
 install -m755 packaging/RedHat/winbind.init $RPM_BUILD_ROOT/etc/rc.d/init.d/winbind
@@ -287,15 +294,13 @@ else
 	rm -f /etc/samba/samba.stack
 fi
 
-# Create winbind nss client symlink
-
-if [ -e /lib/libnss_winbind.so ]; then
-	ln -sf /lib/libnss_winbind.so /lib/libnss_winbind.so.2
-fi
+## call ldconfig to create the version symlink for libsmbclient.so
+/sbin/ldconfig
 
 %preun
 if [ $1 = 0 ] ; then
 	/sbin/chkconfig --del smb
+	/sbin/chkconfig --del winbind
 
 	# We want to remove the browse.dat and wins.dat files so they can not interfer with a new version of samba!
 	if [ -e /var/cache/samba/browse.dat ]; then
@@ -366,12 +371,13 @@ if [ $1 = 0 ] ; then
 	fi
 fi
 
+/sbin/ldconfig
+
 %files
 %defattr(-,root,root)
 %doc README COPYING Manifest Read-Manifest-Now
 %doc WHATSNEW.txt Roadmap
 %doc docs
-%doc swat/README
 %doc examples
 %{prefix}/sbin/smbd
 %{prefix}/sbin/nmbd
@@ -399,12 +405,15 @@ fi
 %{prefix}/bin/smbcontrol
 %{prefix}/bin/wbinfo
 %{prefix}/bin/net
+%{prefix}/bin/ntlm_auth
+%{prefix}/bin/smbcquotas
 %{prefix}/bin/smbcacls
 %{prefix}/bin/pdbedit
 %{prefix}/bin/tdbbackup
 %{prefix}/bin/smbtree
 %attr(755,root,root) /lib/libnss_wins.s*
 %attr(755,root,root) %{prefix}/lib/samba/vfs/*.so
+%attr(755,root,root) %{prefix}/lib/samba/charset/*.so
 #%attr(755,root,root) %{prefix}/lib/samba/pdb/*.so
 %attr(755,root,root) %{prefix}/lib/samba/*.dat
 %{prefix}/include/libsmbclient.h
@@ -417,7 +426,6 @@ fi
 %{prefix}/share/swat/lang/*/images/*
 %{prefix}/share/swat/lang/*/include/*.html
 %{prefix}/share/swat/using_samba/*
-%{prefix}/share/swat/README
 %config(noreplace) /etc/samba/lmhosts
 %config(noreplace) /etc/samba/smb.conf
 %config(noreplace) /etc/samba/smbusers
diff --git a/packaging/RedHat/smb.conf b/packaging/RedHat/smb.conf
index 71ff9463884..5786ec5d04a 100644
--- a/packaging/RedHat/smb.conf
+++ b/packaging/RedHat/smb.conf
@@ -66,7 +66,7 @@
 ;  smb passwd file = /etc/samba/smbpasswd
 
 # The following are needed to allow password changing from Windows to
-# update the Linux sytsem password also.
+# update the Linux system password also.
 # NOTE: Use these with 'encrypt passwords' and 'smb passwd file' above.
 # NOTE2: You do NOT need these to allow workstations to change only
 #        the encrypted SMB passwords. They allow the Unix password
diff --git a/packaging/RedHat/smb.init b/packaging/RedHat/smb.init
index f50da2c6b2a..79f4f322d03 100755
--- a/packaging/RedHat/smb.init
+++ b/packaging/RedHat/smb.init
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# chkconfig: 345 91 35
+# chkconfig: 345 81 35
 # description: Starts and stops the Samba smbd and nmbd daemons \
 #	       used to provide SMB network services.
 
diff --git a/packaging/RedHat/winbind.init b/packaging/RedHat/winbind.init
index 17ddbd502b3..1635dca93be 100644
--- a/packaging/RedHat/winbind.init
+++ b/packaging/RedHat/winbind.init
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# chkconfig: 345 81 45
+# chkconfig: 345 91 45
 # description: Starts and stops the Samba winbind daemon to provide \
 # user and group information from a domain controller to linux.
 
@@ -19,16 +19,11 @@ fi
 # Check that networking is up.
 [ ${NETWORKING} = "no" ] && exit 0
 
+CONFIG=/etc/samba/smb.conf
+
 # Check that smb.conf exists.
 [ -f $CONFIG ] || exit 0
 
-RETVAL=0
-
-CONFIG=/usr/local/samba/lib/smb.conf
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/samba/sbin:/usr/local/samba/bin
-export PATH
-
-
 start() {
 	echo -n "Starting Winbind services: "
 	RETVAL=1
diff --git a/packaging/SGI/mkrelease.sh b/packaging/SGI/mkrelease.sh
index 6ba486c673f..89854300aaf 100755
--- a/packaging/SGI/mkrelease.sh
+++ b/packaging/SGI/mkrelease.sh
@@ -114,6 +114,8 @@ if [ $errstat -ne 0 ]; then
   echo "Error $errstat creating samba.idb\n";
   exit $errstat;
 fi
+sort +4 samba.idb > xxx
+mv xxx samba.idb
 
 if [ ! -d bins ]; then
    mkdir bins
diff --git a/packaging/SGI/spec.pl b/packaging/SGI/spec.pl
index 4541eb04ec3..d581db7043f 100755
--- a/packaging/SGI/spec.pl
+++ b/packaging/SGI/spec.pl
@@ -4,15 +4,21 @@
 # information in the version.h file in the source tree
 
 open (VER,'../../source/include/version.h') || die "Unable to open version.h\n";
-($_ = <VER>) =~ s/"//g;
+while ( <VER> ) {
+  chomp;
+  if ( /SAMBA_VERSION_OFFICIAL_STRING/ ) {
+    s/^.*SAMBA_VERSION_OFFICIAL_STRING "//;
+    s/".*$//;
+    $SambaVersion = $_;
+  }
+}
 close (VER);
-@foo = split(' ');
-splice(@foo,0,2);
-$_ = $foo[0];
 
 # create the package name
-$vername = "    id \"Samba Version ".$_."\"\n";
+$vername = "    id \"Samba Version ".$SambaVersion."\"\n";
 
+$_ = $SambaVersion;
+s/^.* //;
 $patch = 0;
 #create the subsystem version numbers
 if (/alpha/) {
diff --git a/packaging/Solaris/makepkg.sh.tmpl b/packaging/Solaris/makepkg.sh.tmpl
new file mode 100755
index 00000000000..55a2da2c6a0
--- /dev/null
+++ b/packaging/Solaris/makepkg.sh.tmpl
@@ -0,0 +1,164 @@
+#!/bin/sh
+#
+# Copyright (C) Shirish A Kalele 2000
+#
+# Builds a Samba package from the samba distribution. 
+# By default, the package will be built to install samba in /usr/local
+# Change the INSTALL_BASE variable to change this: will modify the pkginfo 
+# and samba.server files to point to the new INSTALL_BASE
+#
+INSTALL_BASE=/usr/local
+
+add_dynamic_entries() 
+{
+  # Add the binaries, docs and SWAT files
+
+  echo "#\n# Binaries \n#"
+  cd $DISTR_BASE/source/bin
+  for binfile in *
+  do
+    if [ -f $binfile ]; then
+      echo f none samba/bin/$binfile=source/bin/$binfile 0755 root other
+    fi
+  done
+
+  # Add the scripts to bin/
+  echo "#\n# Scripts \n#"
+  cd $DISTR_BASE/source/script
+  for shfile in *
+  do
+    if [ -f $shfile ]; then
+ 	echo f none samba/bin/$shfile=source/script/$shfile 0755 root other
+    fi
+  done
+
+ # add libraries to /lib for winbind
+  echo "#\n# Libraries \n#"
+    if [ -f $DISTR_BASE/source/nsswitch/libnss_winbind.so ] ; then
+ 	echo f none /usr/lib/libnss_winbind.so=source/nsswitch/libnss_winbind.so 0755 root other
+ 	echo s none /usr/lib/libnss_winbind.so.1=/usr/lib/libnss_winbind.so 0755 root other
+ 	echo s none /usr/lib/libnss_winbind.so.2=/usr/lib/libnss_winbind.so 0755 root other
+ 	echo s none /usr/lib/nss_winbind.so.1=/usr/lib/libnss_winbind.so 0755 root other
+ 	echo s none /usr/lib/nss_winbind.so.2=/usr/lib/libnss_winbind.so 0755 root other
+    fi
+
+  # Add the manpages
+  echo "#\n# man pages \n#"
+  echo d none /usr ? ? ?
+  echo d none /usr/share ? ? ?
+  echo d none /usr/share/man ? ? ?
+
+  # Create directories for man page sections if nonexistent
+  cd $DISTR_BASE/docs/manpages
+  for i in 1 2 3 4 5 6 7 8 9
+  do
+     manpages=`ls *.$i 2>/dev/null`
+     if [ $? -eq 0 ]
+     then
+	echo d none /usr/share/man/man$i ? ? ?
+	for manpage in $manpages 
+	do
+		echo f none /usr/share/man/man${i}/${manpage}=docs/manpages/$manpage 0644 root other
+	done
+     fi
+  done
+
+  echo "#\n# HTML documentation \n#"
+  cd $DISTR_BASE
+  list=`find docs/htmldocs -type d | grep -v "/CVS$"`
+  for docdir in $list
+  do
+    if [ -d $docdir ]; then
+	echo d none samba/$docdir 0755 root other
+    fi
+  done
+
+  list=`find docs/htmldocs -type f | grep -v /CVS/`
+  for htmldoc in $list
+  do
+    if [ -f $htmldoc ]; then
+      echo f none samba/$htmldoc=$htmldoc 0644 root other
+    fi
+  done
+
+  # Create a symbolic link to the Samba book in docs/ for beginners
+  echo 's none samba/docs/samba_book=htmldocs/using_samba'
+
+  echo "#\n# Text Docs \n#"
+  echo d none samba/docs/textdocs 0755 root other
+  cd $DISTR_BASE/docs/textdocs
+  for textdoc in *
+  do 
+    if [ -f $textdoc ]; then
+      echo f none samba/docs/textdocs/$textdoc=docs/textdocs/$textdoc 0644 root other
+    fi
+  done
+  echo "#\n# SWAT \n#"
+  cd $DISTR_BASE
+  list=`find swat -type d | grep -v "/CVS$"`
+  for i in $list
+  do
+    echo "d none samba/$i 0755 root other"
+  done
+  list=`find swat -type f | grep -v /CVS/`
+  for i in $list
+  do
+    echo "f none samba/$i=$i 0644 root other"
+  done
+  echo "#\n# HTML documentation for SWAT\n#"
+  cd $DISTR_BASE/docs/htmldocs
+  for htmldoc in *
+  do
+    if [ -f $htmldoc ]; then
+      echo f none samba/swat/help/$htmldoc=docs/htmldocs/$htmldoc 0644 root other
+    fi
+  done
+
+  echo "#\n# Using Samba Book files for SWAT\n#"
+  cd $DISTR_BASE/docs/htmldocs
+
+# set up a symbolic link instead of duplicating the book tree
+  echo 's none samba/swat/using_samba=../docs/htmldocs/using_samba'
+
+}
+
+if [ $# = 0 ]
+then
+	# Try to guess the distribution base..
+	CURR_DIR=`pwd`
+	DISTR_BASE=`echo $CURR_DIR | sed 's|\(.*\)/packaging.*|\1|'`
+	echo "Assuming Samba distribution is rooted at $DISTR_BASE.."
+else
+	DISTR_BASE=$1
+fi
+
+#
+if [ ! -d $DISTR_BASE ]; then
+	echo "Source build directory $DISTR_BASE does not exist."
+	exit 1
+fi
+
+# Set up the prototype file from prototype.master
+if [ -f prototype ]; then
+	rm prototype
+fi
+
+# Setup version from version.h
+VERSION=PVERSION
+sed -e "s|__VERSION__|$VERSION|" -e "s|__ARCH__|`uname -p`|" -e "s|__BASEDIR__|$INSTALL_BASE|g" pkginfo.master >pkginfo
+
+sed -e "s|__BASEDIR__|$INSTALL_BASE|g" inetd.conf.master >inetd.conf
+sed -e "s|__BASEDIR__|$INSTALL_BASE|g" samba.server.master >samba.server
+
+cp prototype.master prototype
+
+# Add the dynamic part to the prototype file
+(add_dynamic_entries >> prototype)
+
+# Create the package
+pkgmk -o -d /tmp -b $DISTR_BASE -f prototype
+if [ $? = 0 ]
+then
+	pkgtrans /tmp samba.pkg samba
+fi
+echo The samba package is in /tmp
diff --git a/packaging/SuSE/samba-mutual-auth.diff b/packaging/SuSE/samba-mutual-auth.diff
new file mode 100644
index 00000000000..865f91682a3
--- /dev/null
+++ b/packaging/SuSE/samba-mutual-auth.diff
@@ -0,0 +1,247 @@
+--- source/configure.in	22 Feb 2003 12:19:18 -0000	1.409
++++ source/configure.in	24 Feb 2003 06:04:25 -0000
+@@ -627,6 +627,15 @@
+ fi
+ 
+ ############################################
++# support for using Kerberos keytab instead of secrets database
++
++AC_ARG_ENABLE(keytab, 
++[  --enable-keytab         Turn on support for Kerberos keytabs in lieu of secrets DB (default=no)],
++    [if eval "test x$enable_keytab = xyes"; then
++	AC_DEFINE(USE_KEYTAB,1,[Use Kerberos keytab])
++    fi])
++
++############################################
+ # we need dlopen/dlclose/dlsym/dlerror for PAM, the password database plugins and the plugin loading code
+ AC_SEARCH_LIBS(dlopen, [dl])
+ # dlopen/dlclose/dlsym/dlerror will be checked again later and defines will be set then
+--- source/passdb/secrets.c	1 Feb 2003 04:39:15 -0000	1.54
++++ source/passdb/secrets.c	24 Feb 2003 06:04:26 -0000
+@@ -221,6 +221,72 @@
+ 	return True;
+ }
+ 
++#ifdef USE_KEYTAB
++/************************************************************************
++ Read local secret from the keytab
++************************************************************************/
++
++static BOOL secrets_fetch_keytab_password(uint8 ret_pwd[16], time_t *pass_last_set_time)
++{
++	char spn[MAXHOSTNAMELEN + 2], *p;
++	krb5_context context;
++	krb5_error_code ret;
++	krb5_principal princ;
++	krb5_keyblock *key;
++
++	ret = krb5_init_context(&context);
++	if (ret) {
++		DEBUG(1, ("secrets_fetch_keytab_password: failed to initialize Kerberos context\n"));
++		return False;
++	}
++
++	spn[sizeof(spn) - 1] = '\0';
++	if (gethostname(spn, sizeof(spn) - 2) < 0) {
++		DEBUG(1, ("secrets_fetch_keytab_password: could not determine local hostname\n"));
++		krb5_free_context(context);
++		return False;
++	}
++
++	for (p = spn; *p && *p != '.'; p++)
++		*p = toupper(*p);
++	*p++ = '$';
++	*p = '\0';
++
++	ret = krb5_parse_name(context, spn, &princ);
++	if (ret) {
++		DEBUG(1, ("secrets_fetch_keytab_password: failed to parse name %s\n", spn));
++		krb5_free_context(context);
++		return False;
++	}
++
++#ifdef ENCTYPE_ARCFOUR_HMAC
++	ret = krb5_kt_read_service_key(context, NULL, princ, 0, ENCTYPE_ARCFOUR_HMAC, &key);
++#elif defined(HAVE_ENCTYPE_ARCFOUR_HMAC_MD5)
++	ret = krb5_kt_read_service_key(context, NULL, princ, 0, ENCTYPE_ARCFOUR_HMAC_MD5, &key);
++#else
++#error ENCTYPE_ARCFOUR_HMAC or ENCTYPE_ARCFOUR_HMAC_MD5 required for keytab secret storage
++#endif 
++	if (ret) {
++		DEBUG(1, ("secrets_fetch_keytab_password: failed to read secret for %s\n", spn));
++		krb5_free_context(context);
++		return False;
++	}
++	if (key->keyvalue.length != 16) {
++		DEBUG(1, ("secrets_fetch_keytab_password: key is incorrect length\n"));
++		krb5_free_context(context);
++		return False;
++	}
++
++	memcpy(ret_pwd, key->keyvalue.data, key->keyvalue.length);
++	time(pass_last_set_time); /* XXX */
++
++	krb5_free_keyblock(context, key);
++	krb5_free_context(context);
++
++	return True;
++}
++#endif /* USE_KEYTAB */
++
+ /************************************************************************
+  Routine to get the trust account password for a domain.
+  The user of this function must have locked the trust password file using
+@@ -243,6 +309,12 @@
+ 		pass_last_set_time = 0;
+ 		return True;
+ 	}
++
++#ifdef USE_KEYTAB
++	if (is_myworkgroup(domain)) {
++		return secrets_fetch_keytab_password(ret_pwd, pass_last_set_time);
++	}
++#endif /* USE_KEYTAB */
+ 
+ 	if (!(pass = secrets_fetch(trust_keystr(domain), &size))) {
+ 		DEBUG(5, ("secrets_fetch failed!\n"));
+ 
+--- source/libsmb/clikrb5.c	2003-07-02 00:32:55.000000000 +0200
++++ source/libsmb/clikrb5.c	2003-07-02 00:37:22.000000000 +0200
+@@ -316,11 +316,13 @@
+ 	krb5_enctype enc_types[] = {
+ #ifdef ENCTYPE_ARCFOUR_HMAC
+ 		ENCTYPE_ARCFOUR_HMAC,
++#elif defined(HAVE_ENCTYPE_ARCFOUR_HMAC_MD5)
++		ENCTYPE_ARCFOUR_HMAC_MD5,
+ #endif 
+ 		ENCTYPE_DES_CBC_MD5, 
+ 		ENCTYPE_DES_CBC_CRC, 
+ 		ENCTYPE_NULL};
+-	
++	
+ 	retval = krb5_init_context(&context);
+ 	if (retval) {
+ 		DEBUG(1,("krb5_init_context failed (%s)\n", 
+@@ -367,24 +369,26 @@
+ 
+  BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, uint8 session_key[16])
+  {
+-#ifdef ENCTYPE_ARCFOUR_HMAC
+ 	krb5_keyblock *skey;
+-#endif
+ 	BOOL ret = False;
+ 
+ 	memset(session_key, 0, 16);
+ 
+-#ifdef ENCTYPE_ARCFOUR_HMAC
++#if defined(ENCTYPE_ARCFOUR_HMAC) || defined(HAVE_ENCTYPE_ARCFOUR_HMAC_MD5)
+ 	if (krb5_auth_con_getremotesubkey(context, auth_context, &skey) == 0 && skey != NULL) {
+ 		if (KRB5_KEY_TYPE(skey) ==
++# ifdef ENCTYPE_ARCFOUR_HMAC
+ 		    ENCTYPE_ARCFOUR_HMAC
++# else
++		    ENCTYPE_ARCFOUR_HMAC_MD5
++# endif /* ENCTYPE_ARCFOUR_HMAC */
+ 		    && KRB5_KEY_LENGTH(skey) == 16) {
+ 			memcpy(session_key, KRB5_KEY_DATA(skey), KRB5_KEY_LENGTH(skey));
+ 			ret = True;
+ 		}
+ 		krb5_free_keyblock(context, skey);
+ 	}
+-#endif /* ENCTYPE_ARCFOUR_HMAC */
++#endif /* ENCTYPE_ARCFOUR_HMAC || HAVE_ENCTYPE_ARCFOUR_HMAC_MD5 */
+ 
+ 	return ret;
+  }
+@@ -395,5 +399,12 @@
+ 	 DEBUG(0,("NO KERBEROS SUPPORT\n"));
+ 	 return data_blob(NULL, 0);
+  }
++BOOL krb5_get_smb_session_key(krb5_context context, krb5_auth_context ac, uint8 session_key[16])
++ {
++	DEBUG(0,("NO KERBEROS SUPPORT\n"));
++	memset(session_key, 0, 16);
++	return False;
++ }
++ //#endif
+ 
+ #endif
+--- source/libads/kerberos_verify.c	2003-06-28 23:40:55.000000000 +0200
++++ source/libads/kerberos_verify.c	2003-07-02 00:50:13.000000000 +0200
+@@ -38,7 +38,9 @@
+ 	krb5_keytab keytab = NULL;
+ 	krb5_data packet;
+ 	krb5_ticket *tkt = NULL;
+-	int ret, i;
++	int ret;
++#ifndef USE_KEYTAB
++	int i;
+ 	krb5_keyblock * key;
+ 	krb5_principal host_princ;
+ 	char *host_princ_s;
+@@ -46,8 +48,10 @@
+ 	char *password_s;
+ 	krb5_data password;
+ 	krb5_enctype *enctypes = NULL;
++#endif /* USE_KEYTAB */
+ 	BOOL auth_ok = False;
+ 
++#ifndef USE_KEYTAB
+ 	if (!secrets_init()) {
+ 		DEBUG(1,("secrets_init failed\n"));
+ 		return NT_STATUS_LOGON_FAILURE;
+@@ -61,6 +65,7 @@
+ 
+ 	password.data = password_s;
+ 	password.length = strlen(password_s);
++#endif /* USE_KEYTAB */
+ 
+ 	ret = krb5_init_context(&context);
+ 	if (ret) {
+@@ -82,7 +87,16 @@
+ 		DEBUG(1,("krb5_auth_con_init failed (%s)\n", error_message(ret)));
+ 		return NT_STATUS_LOGON_FAILURE;
+ 	}
++#ifdef USE_KEYTAB
++	packet.length = ticket->length;
++	packet.data = (krb5_pointer)ticket->data;
+ 
++	if (!(ret = krb5_rd_req(context, &auth_context, &packet, 
++				NULL, keytab, NULL, &tkt))) {
++		auth_ok = True;
++	}
++
++#else
+ 	fstrcpy(myname, global_myname());
+ 	strlower(myname);
+ 	asprintf(&host_princ_s, "HOST/%s@%s", myname, lp_realm());
+@@ -121,6 +135,9 @@
+ 		}
+ 	}
+ 
++	SAFE_FREE(key);
++#endif /* USE_KEYTAB */
++
+ 	if (!auth_ok) {
+ 		DEBUG(3,("krb5_rd_req with auth failed (%s)\n", 
+ 			 error_message(ret)));
+--- source/Makefile.in	2003-07-01 23:35:49.000000000 +0200
++++ source/Makefile.in	2003-07-02 01:20:09.000000000 +0200
+@@ -806,7 +806,7 @@
+ 
+ bin/pdbedit@EXEEXT@: $(PDBEDIT_OBJ) @BUILD_POPT@ bin/.dummy
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(IDMAP_LIBS) $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(PASSDBLIBS)
++	@$(CC) $(FLAGS) -o $@ $(IDMAP_LIBS) $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(PASSDBLIBS) $(KRB5LIBS)
+ 
+ bin/samtest@EXEEXT@: $(SAMTEST_OBJ) @BUILD_POPT@ bin/.dummy
+ 	@echo Linking $@
+@@ -1062,7 +1062,7 @@
+ 
+ bin/wbinfo@EXEEXT@: $(WBINFO_OBJ) @BUILD_POPT@ bin/.dummy
+ 	@echo Linking $@
+-	@$(LINK) -o $@ $(WBINFO_OBJ) $(LIBS) @POPTLIBS@
++	@$(LINK) -o $@ $(WBINFO_OBJ) $(LIBS) @POPTLIBS@ $(KRB5LIBS)
+ 
+ bin/ntlm_auth@EXEEXT@: $(NTLM_AUTH_OBJ) $(PARAM_OBJ) $(LIB_OBJ) \
+ 		$(UBIQX_OBJ) @BUILD_POPT@ bin/.dummy
diff --git a/packaging/SuSE/samba-vscan-0.3.2b.tar.bz2 b/packaging/SuSE/samba-vscan-0.3.2b.tar.bz2
new file mode 100755
index 00000000000..2680bed82f0
--- /dev/null
+++ b/packaging/SuSE/samba-vscan-0.3.2b.tar.bz2
diff --git a/packaging/SuSE/samba3-3.0.0-Makefiles-heimdal.diff b/packaging/SuSE/samba3-3.0.0-Makefiles-heimdal.diff
new file mode 100644
index 00000000000..13da47e7409
--- /dev/null
+++ b/packaging/SuSE/samba3-3.0.0-Makefiles-heimdal.diff
@@ -0,0 +1,22 @@
+--- examples/pdb/Makefile       Thu Sep  5 02:11:41 2002
++++ examples/pdb/Makefile       Thu Sep  5 02:11:59 2002
+@@ -8,7 +8,7 @@
+ SAMBA_INCL = ../../source/include
+ UBIQX_SRC = ../../source/ubiqx
+ SMBWR_SRC = ../../source/smbwrapper
+-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g
++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g -I/usr/include/heimdal
+ PDB_OBJS = pdb_test.so
+
+ # Default target
+--- examples/VFS/Makefile.in	2003-06-04 15:13:41.000000000 +0200
++++ examples/VFS/Makefile.in	2003-06-04 22:07:03.000000000 +0200
+@@ -7,7 +7,7 @@
+ SAMBA_SOURCE	= @SAMBA_SOURCE@
+ SHLIBEXT	= @SHLIBEXT@
+ OBJEXT		= @OBJEXT@ 
+-FLAGS		=  $(CFLAGS) -Iinclude -I$(SAMBA_SOURCE)/include -I$(SAMBA_SOURCE)/ubiqx -I$(SAMBA_SOURCE)/smbwrapper  -I. $(CPPFLAGS) -I$(SAMBA_SOURCE)
++FLAGS		=  $(CFLAGS) -Iinclude -I$(SAMBA_SOURCE)/include -I$(SAMBA_SOURCE)/ubiqx -I$(SAMBA_SOURCE)/smbwrapper  -I. $(CPPFLAGS) -I$(SAMBA_SOURCE) -I/usr/include/heimdal
+ 
+ 
+ prefix		= @prefix@
diff --git a/packaging/SuSE/samba3-3.0.0-heimdal-06.diff b/packaging/SuSE/samba3-3.0.0-heimdal-06.diff
new file mode 100644
index 00000000000..87dd3e1824c
--- /dev/null
+++ b/packaging/SuSE/samba3-3.0.0-heimdal-06.diff
@@ -0,0 +1,14 @@
+--- source/include/ads.h	2003-06-10 08:51:03.000000000 +0200
++++ source/include/ads.h	2003-06-22 23:14:24.000000000 +0200
+@@ -215,9 +215,11 @@
+ #define ENCTYPE_ARCFOUR_HMAC ENCTYPE_ARCFOUR_HMAC_MD5
+ #endif
+ 
++#if 0
+ /* The older versions of heimdal that don't have this
+    define don't seem to use it anyway.  I'm told they
+    always use a subkey */
+ #ifndef AP_OPTS_USE_SUBKEY
+ #define AP_OPTS_USE_SUBKEY 0
+ #endif
++#endif
diff --git a/packaging/SuSE/samba3-3.0.0-pdb.diff b/packaging/SuSE/samba3-3.0.0-pdb.diff
new file mode 100644
index 00000000000..0c811b57c52
--- /dev/null
+++ b/packaging/SuSE/samba3-3.0.0-pdb.diff
@@ -0,0 +1,13 @@
+--- examples/pdb/pdb_test.c	26 Sep 2002 18:37:54 -0000	1.1.2.3
++++ examples/pdb/pdb_test.c	22 Apr 2003 20:06:31 -0000
+@@ -142,8 +142,6 @@
+ int init_module(void);
+ 
+ int init_module() {
+-	if(smb_register_passdb("testsam", testsam_init, PASSDB_INTERFACE_VERSION))
+-		return 0;
+-
+-	return 1;
++	smb_register_passdb(PASSDB_INTERFACE_VERSION, "testsam", testsam_init);
++	return True;
+ }
diff --git a/packaging/SuSE/samba3-Makefile.diff b/packaging/SuSE/samba3-Makefile.diff
new file mode 100644
index 00000000000..bc1ad142d9f
--- /dev/null
+++ b/packaging/SuSE/samba3-Makefile.diff
@@ -0,0 +1,16 @@
+--- source/Makefile.in	2003-04-23 10:43:06.000000000 +0200
++++ source/Makefile.in	2003-04-23 10:45:39.000000000 +0200
+@@ -673,6 +673,13 @@
+ 	@echo "Using FLAGS = $(FLAGS)"
+ 	@echo "      FLAGS32 = $(FLAGS32)"
+ 	@echo "      LIBS = $(LIBS)"
++	@echo "      TERMLIBS = $(TERMLIBS)"
++	@echo "      PRINTLIBS = $(PRINTLIBS)"
++	@echo "      AUTHLIBS = $(AUTHLIBS)"
++	@echo "      ACLLIBS = $(ACLLIBS)"
++	@echo "      PASSDBLIBS = $(PASSDBLIBS)"
++	@echo "      ADSLIBS = $(ADSLIBS)"
++	@echo "      KRB5LIBS = $(KRB5_LIBS)"
+ 	@echo "      LDSHFLAGS = $(LDSHFLAGS)"
+ 	@echo "      LDFLAGS = $(LDFLAGS)"
+ 
diff --git a/packaging/SuSE/samba3-com_err.diff b/packaging/SuSE/samba3-com_err.diff
new file mode 100644
index 00000000000..c5d04cebe19
--- /dev/null
+++ b/packaging/SuSE/samba3-com_err.diff
@@ -0,0 +1,60 @@
+--- source/libads/kerberos.c	23 Oct 2002 00:02:26 -0000	1.18
++++ source/libads/kerberos.c	1 Jul 2003 21:30:17 -0000
+@@ -126,6 +126,7 @@
+ 		return KRB5_LIBOS_CANTREADPWD;
+ 	}
+ 	
++	initialize_krb5_error_table();
+ 	ret = kerberos_kinit_password(s, ads->auth.password, ads->auth.time_offset);
+ 
+ 	if (ret) {
+--- source/libads/kerberos_verify.c	6 Jun 2003 14:53:22 -0000	1.10.2.1
++++ source/libads/kerberos_verify.c	1 Jul 2003 21:30:17 -0000
+@@ -62,6 +62,7 @@
+ 	password.data = password_s;
+ 	password.length = strlen(password_s);
+ 
++	initialize_krb5_error_table();
+ 	ret = krb5_init_context(&context);
+ 	if (ret) {
+ 		DEBUG(1,("krb5_init_context failed (%s)\n", error_message(ret)));
+--- source/libads/krb5_setpw.c	6 Jun 2003 14:53:22 -0000	1.16.2.1
++++ source/libads/krb5_setpw.c	1 Jul 2003 21:30:17 -0000
+@@ -470,6 +470,7 @@
+ 	krb5_creds creds, *credsp;
+ 	krb5_ccache ccache;
+ 
++	initialize_krb5_error_table();
+ 	ret = krb5_init_context(&context);
+ 	if (ret) {
+ 		DEBUG(1,("Failed to init krb5 context (%s)\n", error_message(ret)));
+@@ -584,6 +585,7 @@
+     krb5_creds creds;
+     char *chpw_princ = NULL, *password;
+ 
++    initialize_krb5_error_table();
+     ret = krb5_init_context(&context);
+     if (ret) {
+ 	DEBUG(1,("Failed to init krb5 context (%s)\n", error_message(ret)));
+--- source/libsmb/clikrb5.c	1 Jul 2003 14:40:37 -0000	1.36.2.2
++++ source/libsmb/clikrb5.c	1 Jul 2003 21:30:20 -0000
+@@ -320,7 +320,8 @@
+ 		ENCTYPE_DES_CBC_MD5, 
+ 		ENCTYPE_DES_CBC_CRC, 
+ 		ENCTYPE_NULL};
+-	
++
++	initialize_krb5_error_table();
+ 	retval = krb5_init_context(&context);
+ 	if (retval) {
+ 		DEBUG(1,("krb5_init_context failed (%s)\n", 
+--- source/utils/net_lookup.c	1 Jul 2003 14:40:47 -0000	1.8.2.1
++++ source/utils/net_lookup.c	1 Jul 2003 21:30:24 -0000
+@@ -177,6 +177,7 @@
+ 	krb5_data realm;
+ 	char **realms;
+ 
++	initialize_krb5_error_table();
+ 	rc = krb5_init_context(&ctx);
+ 	if (rc) {
+ 		DEBUG(1,("krb5_init_context failed (%s)\n", 
diff --git a/packaging/SuSE/samba3-net_ads_password.diff b/packaging/SuSE/samba3-net_ads_password.diff
new file mode 100644
index 00000000000..cc800fb7bfd
--- /dev/null
+++ b/packaging/SuSE/samba3-net_ads_password.diff
@@ -0,0 +1,58 @@
+Index: source/utils/net_ads.c
+===================================================================
+RCS file: /cvsroot/samba/source/utils/net_ads.c,v
+retrieving revision 1.37.2.22
+diff -u -r1.37.2.22 net_ads.c
+--- source/utils/net_ads.c	10 Jun 2003 04:15:55 -0000	1.37.2.22
++++ source/utils/net_ads.c	20 Jun 2003 19:59:36 -0000
+@@ -44,9 +44,9 @@
+ "\n\tdump the machine account details to stdout\n"
+ "\nnet ads lookup"\
+ "\n\tperform a CLDAP search on the server\n"
+-"\nnet ads password <username@realm> -Uadmin_username@realm%%admin_pass"\
++"\nnet ads password <username@realm> <password> -Uadmin_username@realm%%admin_pass"\
+ "\n\tchange a user's password using an admin account"\
+-"\n\t(note: use realm in UPPERCASE)\n"\
++"\n\t(note: use realm in UPPERCASE, prompts if password is obmitted)\n"\
+ "\nnet ads changetrustpw"\
+ "\n\tchange the trust account password of this machine in the AD tree\n"\
+ "\nnet ads printer [info | publish | remove] <printername> <servername>"\
+@@ -909,7 +909,7 @@
+     }
+ 
+     
+-    if (argc != 1) {
++    if (argc < 1) {
+ 	    d_printf("ERROR: You must say which username to change password for\n");
+ 	    return -1;
+     }
+@@ -941,22 +941,24 @@
+ 	    return -1;
+     }
+ 
+-    asprintf(&prompt, "Enter new password for %s:", user);
+-
+-    new_password = getpass(prompt);
++    if (argv[1]) {
++	   new_password = (char *)argv[1];
++    } else {
++	   asprintf(&prompt, "Enter new password for %s:", user);
++	   new_password = getpass(prompt);
++	   free(prompt);
++    }
+ 
+     ret = kerberos_set_password(ads->auth.kdc_server, auth_principal, 
+ 				auth_password, user, new_password, ads->auth.time_offset);
+     if (!ADS_ERR_OK(ret)) {
+ 	d_printf("Password change failed :-( ...\n");
+ 	ads_destroy(&ads);
+-	free(prompt);
+ 	return -1;
+     }
+ 
+     d_printf("Password change for %s completed.\n", user);
+     ads_destroy(&ads);
+-    free(prompt);
+ 
+     return 0;
+ }
diff --git a/packaging/SuSE/samba3-smbwrapper.diff b/packaging/SuSE/samba3-smbwrapper.diff
new file mode 100644
index 00000000000..0f7b391de0d
--- /dev/null
+++ b/packaging/SuSE/samba3-smbwrapper.diff
@@ -0,0 +1,11 @@
+--- source/smbwrapper/smbsh.c.orig	2003-05-04 19:47:39.000000000 +0200
++++ source/smbwrapper/smbsh.c	2003-05-04 19:47:47.000000000 +0200
+@@ -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 --git a/packaging/SuSE/samba3-vscan.diff b/packaging/SuSE/samba3-vscan.diff
new file mode 100644
index 00000000000..330b470af2c
--- /dev/null
+++ b/packaging/SuSE/samba3-vscan.diff
@@ -0,0 +1,269 @@
+--- examples/VFS/samba-vscan-0.3.2b/fprot/Makefile	2003-01-14 00:42:15.000000000 +0100
++++ examples/VFS/samba-vscan-0.3.2b/fprot/Makefile	2003-04-09 20:21:37.000000000 +0200
+@@ -14,7 +14,7 @@
+ SMBWR_SRC = ../../../../source/smbwrapper
+ SMBVS_INCL = ../include
+ SMBVS_GLB = ../global
+-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC 
++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal 
+ VFS_OBJS = vscan-fprotd.so
+ SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c $(SMBVS_GLB)/vscan-fileaccesslog.c vscan-fprotd.c vscan-fprotd_core.c vscan-fprotd.h vscan-fprotd_core.h
+ OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fileaccesslog.lo vscan-fprotd.lo vscan-fprotd_core.lo
+--- examples/VFS/samba-vscan-0.3.2b/fprot/vscan-fprotd.c	2003-02-21 21:37:44.000000000 +0100
++++ examples/VFS/samba-vscan-0.3.2b/fprot/vscan-fprotd.c	2003-04-09 20:25:25.000000000 +0200
+@@ -432,14 +432,14 @@
+ 				rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action);
+ 
+ 				/* add/update file. mark file as infected! */
+-                                lrufiles_add(filepath, stat_buf.st_mtime, TRUE);
++                                lrufiles_add(filepath, stat_buf.st_mtime, True);
+ 
+ 				/* virus found, deny acces */
+ 				errno = EACCES;
+ 				return -1;
+ 			} else if ( retval == 0 ) {
+ 				/* file is clean, add to lrufiles */
+-				lrufiles_add(filepath, stat_buf.st_mtime, FALSE);
++				lrufiles_add(filepath, stat_buf.st_mtime, False);
+ 			}
+ 		}
+ 
+--- examples/VFS/samba-vscan-0.3.2b/fprot/vscan-fprotd_core.c	2003-01-25 18:40:57.000000000 +0100
++++ examples/VFS/samba-vscan-0.3.2b/fprot/vscan-fprotd_core.c	2003-04-09 20:23:31.000000000 +0200
+@@ -110,7 +110,7 @@
+ 	pstring fprotdCommand;	/* the command line to be send to daemon */
+ 	char *str;
+ 	FILE *fpin, *fpout;
+-	bool received_data = FALSE; /* indicates, if any response from deamon was received */
++	bool received_data = False; /* indicates, if any response from deamon was received */
+ 
+ 	/* open stream sockets */
+         fpin = fdopen(sockfd, "r");
+@@ -159,7 +159,7 @@
+ 
+ 	while ( (fgets(recvline, MAXLINE, fpin)) != NULL ) {
+ 
+-		received_data = TRUE;
++		received_data = True;
+ 
+ 		/* ignore the HTTP response header, remove any leading 
+ 		   white spaces */
+--- examples/VFS/samba-vscan-0.3.2b/icap/Makefile	2003-01-30 00:53:02.000000000 +0100
++++ examples/VFS/samba-vscan-0.3.2b/icap/Makefile	2003-04-09 20:21:37.000000000 +0200
+@@ -15,7 +15,7 @@
+ SMBWR_SRC = ../../../../source/smbwrapper
+ SMBVS_INCL = ../include
+ SMBVS_GLB = ../global
+-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC
++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal
+ VFS_OBJS = vscan-icap.so
+ SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c $(SMBVS_GLB)/vscan-fileaccesslog.c vscan-icap.c vscan-icap_core.c vscan-icap.h vscan-icap_core.h
+ OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fileaccesslog.lo vscan-icap.lo vscan-icap_core.lo
+--- examples/VFS/samba-vscan-0.3.2b/icap/vscan-icap.c	2003-02-21 21:37:50.000000000 +0100
++++ examples/VFS/samba-vscan-0.3.2b/icap/vscan-icap.c	2003-04-09 20:32:20.000000000 +0200
+@@ -413,14 +413,14 @@
+                                 rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action);
+ 
+                                /* add/update file. mark file as infected! */
+-                                lrufiles_add(filepath, stat_buf.st_mtime, TRUE);
++                                lrufiles_add(filepath, stat_buf.st_mtime, True);
+ 
+                                 /* virus found, deny acces */
+                                 errno = EACCES;
+                                 return -1;
+ 			} else if ( retval == 0 ) {
+                                 /* file is clean, add to lrufiles */
+-                                lrufiles_add(filepath, stat_buf.st_mtime, FALSE);
++                                lrufiles_add(filepath, stat_buf.st_mtime, False);
+                         }
+                 }
+ 
+--- examples/VFS/samba-vscan-0.3.2b/icap/vscan-icap_core.c	2003-01-15 00:19:18.000000000 +0100
++++ examples/VFS/samba-vscan-0.3.2b/icap/vscan-icap_core.c	2003-04-09 20:30:56.000000000 +0200
+@@ -114,8 +114,8 @@
+         char buf[BUFLEN];
+         char recvline[MAXLINE + 1];
+ 	char *str;
+-       	bool first_line = FALSE; /* first line we've received? */
+-        bool infected = FALSE;	/* an infected found? */
++       	bool first_line = False; /* first line we've received? */
++        bool infected = False;	/* an infected found? */
+ 
+ 
+ 	/* get file length */
+@@ -213,7 +213,7 @@
+ 	/* set line buffering */
+         setvbuf(fpin, (char *)NULL, _IOLBF, 0);
+ 
+-        first_line = TRUE;
++        first_line = True;
+         while ( (fgets(recvline, MAXLINE, fpin)) != NULL ) {
+ 		str = recvline;
+ 		if ( first_line ) {
+@@ -226,7 +226,7 @@
+ 						return(0);
+                                         }
+                                         else if ( strncmp("403", str, 3) == 0 ) {
+-                                                infected = TRUE;
++                                                infected = True;
+                                         } else {
+ 						if ( verbose_file_logging )
+ 							vscan_syslog("ERROR: file %s not found, not readable or an error occured", scan_file);
+@@ -241,7 +241,7 @@
+ 				return(-1);
+                         }
+ 
+-                        first_line = FALSE;
++                        first_line = False;
+                 }
+ 		if ( infected ) {
+ 			if ( strncmp("X-Infection-Found", str, 17) == 0 ) {
+--- examples/VFS/samba-vscan-0.3.2b/include/vscan-global.h	2002-11-25 16:48:10.000000000 +0100
++++ examples/VFS/samba-vscan-0.3.2b/include/vscan-global.h	2003-04-09 20:21:37.000000000 +0200
+@@ -93,7 +93,7 @@
+ */
+ 
+ #ifndef SAMBA_VERSION_MAJOR
+-# define SAMBA_VERSION_MAJOR 2 
++# define SAMBA_VERSION_MAJOR 3 
+ #endif
+ 
+ #ifndef SAMBA_VERSION_MINOR
+--- examples/VFS/samba-vscan-0.3.2b/kaspersky/Makefile	2003-02-20 15:41:32.000000000 +0100
++++ examples/VFS/samba-vscan-0.3.2b/kaspersky/Makefile	2003-04-09 20:21:37.000000000 +0200
+@@ -23,9 +23,9 @@
+ VFS_OBJS = vscan-kavp.so
+ 
+ ifdef USE_DEBUG
+-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC 
++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal
+ else
+-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC
++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal 
+ endif
+ 
+ ifndef USE_KAVPSHAREDLIB
+--- examples/VFS/samba-vscan-0.3.2b/mks/Makefile	2003-01-19 18:09:53.000000000 +0100
++++ examples/VFS/samba-vscan-0.3.2b/mks/Makefile	2003-04-09 20:21:37.000000000 +0200
+@@ -16,10 +16,10 @@
+ SMBWR_SRC = ../../../../source/smbwrapper
+ SMBVS_INCL = ../include
+ SMBVS_GLB = ../global
+-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC 
++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal 
+ 
+ ifdef USE_INCLMKSDLIB
+-CFLAGS=-I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_USE_INCL_MKSD_LIB=1 -fPIC
++CFLAGS=-I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_USE_INCL_MKSD_LIB=1 -fPIC -I/usr/include/heimdal
+ endif
+ 
+ VFS_OBJS = vscan-mksd.so
+--- examples/VFS/samba-vscan-0.3.2b/mks/vscan-mksd.c	2003-02-21 21:37:50.000000000 +0100
++++ examples/VFS/samba-vscan-0.3.2b/mks/vscan-mksd.c	2003-04-09 20:38:16.000000000 +0200
+@@ -393,14 +393,14 @@
+ 				rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action);
+ 
+                                 /* add/update file. mark file as infected! */
+-                                lrufiles_add(filepath, stat_buf.st_mtime, TRUE);
++                                lrufiles_add(filepath, stat_buf.st_mtime, True);
+ 
+ 				/* virus found, deny acces */
+ 				errno = EACCES; 
+ 				return -1;
+                         } else if ( retval == 0 ) {
+                                 /* file is clean, add to lrufiles */
+-                                lrufiles_add(filepath, stat_buf.st_mtime, FALSE);
++                                lrufiles_add(filepath, stat_buf.st_mtime, False);
+ 			}
+ 		}
+ 
+--- examples/VFS/samba-vscan-0.3.2b/openantivirus/Makefile	2003-01-30 00:53:08.000000000 +0100
++++ examples/VFS/samba-vscan-0.3.2b/openantivirus/Makefile	2003-04-09 20:21:37.000000000 +0200
+@@ -15,7 +15,7 @@
+ SMBWR_SRC = ../../../../source/smbwrapper
+ SMBVS_INCL = ../include
+ SMBVS_GLB = ../global
+-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC 
++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal
+ VFS_OBJS = vscan-oav.so
+ SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c $(SMBVS_GLB)/vscan-fileaccesslog.c vscan-oav.c vscan-oav_core.c vscan-oav.h vscan-oav_core.h
+ OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fileaccesslog.lo vscan-oav.lo vscan-oav_core.lo
+--- examples/VFS/samba-vscan-0.3.2b/openantivirus/vscan-oav.c	2003-02-21 21:37:51.000000000 +0100
++++ examples/VFS/samba-vscan-0.3.2b/openantivirus/vscan-oav.c	2003-04-09 20:40:53.000000000 +0200
+@@ -417,14 +417,14 @@
+ 				rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action);
+ 
+                                 /* add/update file. mark file as infected! */
+-                                lrufiles_add(filepath, stat_buf.st_mtime, TRUE);
++                                lrufiles_add(filepath, stat_buf.st_mtime, True);
+ 
+ 				/* virus found, deny acces */
+ 				errno = EACCES; 
+ 				return -1;
+                         } else if ( retval == 0 ) {
+                                 /* file is clean, add to lrufiles */
+-                                lrufiles_add(filepath, stat_buf.st_mtime, FALSE);
++                                lrufiles_add(filepath, stat_buf.st_mtime, False);
+                         }
+ 		}
+ 
+--- examples/VFS/samba-vscan-0.3.2b/sophos/Makefile	2003-01-30 00:53:08.000000000 +0100
++++ examples/VFS/samba-vscan-0.3.2b/sophos/Makefile	2003-04-09 20:21:37.000000000 +0200
+@@ -15,7 +15,7 @@
+ SMBWR_SRC = ../../../../source/smbwrapper
+ SMBVS_INCL = ../include
+ SMBVS_GLB = ../global
+-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC 
++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal
+ VFS_OBJS = vscan-sophos.so
+ SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c $(SMBVS_GLB)/vscan-fileaccesslog.c vscan-sophos.c vscan-sophos_core.c vscan-sophos.h vscan-sophos_core.h
+ OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fileaccesslog.lo vscan-sophos.lo vscan-sophos_core.lo
+--- examples/VFS/samba-vscan-0.3.2b/sophos/vscan-sophos.c	2003-02-21 21:37:51.000000000 +0100
++++ examples/VFS/samba-vscan-0.3.2b/sophos/vscan-sophos.c	2003-04-09 20:43:11.000000000 +0200
+@@ -399,14 +399,14 @@
+ 				rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action);
+ 
+                                 /* add/update file. mark file as infected! */
+-                                lrufiles_add(filepath, stat_buf.st_mtime, TRUE);
++                                lrufiles_add(filepath, stat_buf.st_mtime, True);
+ 
+ 				/* deny access */
+ 				errno = EACCES; 
+ 				return -1;
+                         } else if ( retval == 0 ) {
+                                 /* file is clean, add to lrufiles */
+-                                lrufiles_add(filepath, stat_buf.st_mtime, FALSE);
++                                lrufiles_add(filepath, stat_buf.st_mtime, False);
+                         }
+ 		}
+ 
+--- examples/VFS/samba-vscan-0.3.2b/trend/Makefile	2003-01-30 01:03:38.000000000 +0100
++++ examples/VFS/samba-vscan-0.3.2b/trend/Makefile	2003-04-09 20:21:37.000000000 +0200
+@@ -15,7 +15,7 @@
+ SMBWR_SRC = ../../../../source/smbwrapper
+ SMBVS_INCL = ../include
+ SMBVS_GLB = ../global
+-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC 
++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal
+ VFS_OBJS = vscan-trend.so
+ SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c $(SMBVS_GLB)/vscan-fileaccesslog.c vscan-trend.c vscan-trend_core.c vscan-trend.h vscan-trend_core.h
+ OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fileaccesslog.lo vscan-trend.lo vscan-trend_core.lo
+--- examples/VFS/samba-vscan-0.3.2b/trend/vscan-trend.c	2003-02-21 21:37:52.000000000 +0100
++++ examples/VFS/samba-vscan-0.3.2b/trend/vscan-trend.c	2003-04-09 20:46:07.000000000 +0200
+@@ -409,14 +409,14 @@
+ 				rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action);
+ 
+                                 /* add/update file. mark file as infected! */
+-                                lrufiles_add(filepath, stat_buf.st_mtime, TRUE);
++                                lrufiles_add(filepath, stat_buf.st_mtime, True);
+ 
+ 				/* deny access */
+ 				errno = EACCES; 
+ 				return -1;
+                         } else if ( retval == 0 ) {
+                                 /* file is clean, add to lrufiles */
+-                                lrufiles_add(filepath, stat_buf.st_mtime, FALSE);
++                                lrufiles_add(filepath, stat_buf.st_mtime, False);
+                         }
+ 		}
+ 
diff --git a/packaging/SuSE/samba3.spec b/packaging/SuSE/samba3.spec
index dd2860b801e..1b620e60c25 100644
--- a/packaging/SuSE/samba3.spec
+++ b/packaging/SuSE/samba3.spec
@@ -1,764 +1,765 @@
 #
-# spec file for package samba (Version HEAD) CVS
-# 
-# Copyright (c) 2002 SuSE Linux AG, Nuernberg, Germany.
+# spec file for package samba3 (Version 3.0.0rc1cvs)
+#
+# Copyright (c) 2003 SuSE Linux AG, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-# packaged by Guenther Deschner <gd@suse.de> - work is not finished yet !
-
-# neededforbuild  acl acl-devel attr attr-devel autoconf automake heimdal-devel heimdal-lib libxml2 libxml2-devel mysql-devel mysql-shared openldap2 openldap2-client openldap2-devel openssl openssl-devel popt popt-devel python python-devel readline readline-devel
-# usedforbuild    aaa_base aaa_version acl attr bash bind9-utils bison cpio cpp cyrus-sasl db devs diffutils e2fsprogs file filesystem fileutils fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip kbd less libgcc libstdc++ libxcrypt m4 make man mktemp modutils ncurses ncurses-devel net-tools netcfg pam pam-devel pam-modules patch permissions ps rcs readline sed sendmail sh-utils shadow strace syslogd sysvinit tar texinfo textutils timezone unzip util-linux vim zlib-devel acl-devel attr-devel autoconf automake binutils bzip2 cracklib gcc gdbm gettext heimdal-devel heimdal-lib libtool libxml2 libxml2-devel mysql-devel mysql-shared openldap2 openldap2-client openldap2-devel openssl openssl-devel perl popt popt-devel python python-devel readline-devel rpm zlib
-
-
-Vendor:		SuSE Linux AG, GS Berlin, Germany
-Distribution:	SuSE Linux 8.1 (i386)
-Name:		samba
-Packager:	gd@suse.de
-License:	GPL
-Group:		Productivity/Networking/Samba
-Url:		http://www.samba.org
-Provides:	samba smbfs
-Obsoletes:	samba-classic samba-ldap
-Autoreqprov:	on
-%define         smbwrap 0
-%define		mit_kerberos 0
-%define		heimdal_kerberos 1
-%define		devel 0
-%define         head 0
-%define		python 1
-%define		netatalk 0
-%define		newsam 0
-%define         samba_ver 3.0.0
-Requires:	samba-client = %{samba_ver}
-Version:        3.0.0
-Release:	%(date +%%j)
-Summary:	An SMB file server for Unix
-Source:		%{name}-%{version}.tar.bz2
-Source10:	%{name}-%{version}.files.tar.bz2
-Source50:	http://prdownloads.sourceforge.net/openantivirus/samba-vscan-%{vscan_ver}.tar.bz2
-Patch1:		%{name}-%{version}-pdb.diff
-Patch10:	%{name}-%{version}-net_ads.diff
-Patch22:	%{name}-%{version}-msdfs.diff
-Patch30:	%{name}-%{version}-python.diff
-BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
-%define		DOCDIR %{_defaultdocdir}/%{name}
-%define		SWATDIR %{_datadir}/samba/swat
-%define		vscan_ver 0.3.1
-%define		vscan_modules fprot kaspersky mks openantivirus sophos trend
-Patch51:	%{name}-%{version}-vscan.diff
+# Please submit bugfixes or comments via http://www.suse.de/feedback/
+#
+# Note: The Samba3 tarball should be called: samba3-3.0.0.tar.bz2
+#
 
+# neededforbuild  XFree86-libs autoconf automake cups-devel cups-libs dialog docbook-utils docbook-xsl-stylesheets docbook_4 ed freetype2 ghostscript-fonts-std ghostscript-library ghostscript-x11 glib heimdal heimdal-devel heimdal-lib iso_ent libacl libacl-devel libattr libattr-devel libgimpprint libpng libtiff libxml2 libxml2-devel libxslt mysql-devel mysql-shared openldap2 openldap2-client openldap2-devel openssl openssl-devel popt popt-devel python python-devel readline readline-devel te_etex te_latex te_pdf tetex xmlcharent
+# usedforbuild    aaa_base acl attr bash bind9-utils bison coreutils cpio cpp cvs cyrus-sasl2 db devs diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv kbd less libacl libattr libgcc libstdc++ libxcrypt m4 make man mktemp modutils ncurses ncurses-devel net-tools netcfg pam pam-devel pam-modules patch permissions ps rcs readline sed sendmail shadow strace syslogd sysvinit tar texinfo timezone unzip util-linux vim zlib zlib-devel XFree86-libs autoconf automake binutils bzip2 cracklib cups-devel cups-libs dialog docbook-utils docbook-xsl-stylesheets docbook_4 ed freetype2 gcc gdbm gettext ghostscript-fonts-std ghostscript-library ghostscript-x11 glib heimdal heimdal-devel heimdal-lib iso_ent libacl-devel libattr-devel libgimpprint libpng libtiff libtool libxml2 libxml2-devel libxslt mysql-devel mysql-shared openldap2 openldap2-client openldap2-devel openssl openssl-devel perl popt popt-devel python python-devel readline-devel rpm te_ams te_etex te_latex te_pdf tetex xmlcharent
+
+Name:         samba3
+License:      GPL
+Group:        Productivity/Networking/Samba
+Url:          http://www.samba.org
+Provides:     samba smbfs samba3
+Requires:     samba3-client 
+Obsoletes:    samba-classic samba-ldap
+Autoreqprov:  on
+%define		krb_heimdal_05	0
+%define		new_heimdal	/opt/heimdal
+%define		new_sasl	/opt/sasl
+%define		new_openldap	/opt/openldap
+%define		new_glibc	0
+Version:      3.0.0
+Release:      %(date +%%j)
+%define         head 		0
+%define         samba_ver 3.0.0
+%define		samba_release 	0
+%define		ul_version	0
+%define         suse_ver 820
+%define         python_ver	python2.2
+%if %{suse_ver} > 810
+%define		new_glibc	1
+%endif
+%if %{suse_ver} > 821
+%define         python_ver 	python2.3
+%endif
+%define		make_cifsvfs	1
+%define		make_devel 	0
+%define		make_doc 	0
+%define		make_python 	1
+%define		make_shared_mod	0
+%define		make_smbwrap	1
+# vscan has not yet updated to the new vfs-api
+%define		make_vscan 	0
+%define		make_wrepld 	1
+%define		use_keytab 	0
+Summary:      samba3
+Source:       %{name}-%{version}.tar.bz2
+Source10:     %{name}-%{version}.files.tar.bz2
+Source50:     samba-vscan-%{vscan_ver}.tar.bz2
+Patch1:       %{name}-%{version}-Makefiles-heimdal.diff
+Patch2:       samba-mutual-auth.diff
+Patch29:      %{name}-com_err.diff
+Patch30:      %{name}-%{version}-heimdal-06.diff
+Patch31:      %{name}-%{version}-pdb.diff
+Patch32:      %{name}-net_ads_password.diff
+Patch33:      %{name}-Makefile.diff
+Patch34:      %{name}-smbwrapper.diff
+Patch51:      %{name}-vscan.diff
+BuildRoot:    %{_tmppath}/%{name}-%{version}-build
+%define		DOCDIR 		%{_defaultdocdir}/%{name}
+%define		DOCBOOKDIR 	%{_defaultdocdir}/%{name}/docbook
+%define		SWATDIR 	%{_datadir}/samba/swat
+%define		vscan_ver	0.3.2b
+%define		vscan_modules	fprot icap mks openantivirus sophos trend
+#not pdb_nisplussam
+%define 	pdb_modules	pdb_xml,pdb_mysql,pdb_ldap,pdb_smbpasswd,pdb_tdbsam,pdb_unix,pdb_guest,pdb_nisplussam
+%define		rpc_modules	rpc_lsa,rpc_samr,rpc_reg,rpc_wks,rpc_net,rpc_dfs,rpc_srv,rpc_spoolss
+%define		auth_modules	auth_rhosts,auth_sam,auth_unix,auth_winbind,auth_server,auth_domain,auth_builtin
+%define		vfs_modules	vfs_recycle,vfs_audit,vfs_extd_audit,vfs_netatalk,vfs_fake_perms
+%define		idmap_modules	idmap_winbind,idmap_ldap,idmap_tdb
+%define		charset_modules	charset_weird
 %package client
-Summary:	Samba client utilities
-Autoreqprov:	on
-Requires:	cups-libs
-Obsoletes:	smbclnt samba-classic-client samba-ldap-client
-Group:		Productivity/Networking/Samba
-
+Summary:      samba3-client
+Autoreqprov:  on
+Requires:     cups-libs
+Obsoletes:    smbclnt samba-classic-client samba-ldap-client
+Provides:     samba-client samba3-client
+Group:        Productivity/Networking/Samba
 %package winbind
-Requires:	samba-client samba
-Summary:	Samba Winbind-package
-Autoreqprov:	on
-Group:		Productivity/Networking/Samba
-
+Requires:     samba-client samba
+Summary:      samba3-winbind
+Autoreqprov:  on
+Group:        Productivity/Networking/Samba
 %package utils
-Summary:	Samba Testing Utilities
-Autoreqprov:	on
-Group:		Productivity/Networking/Samba
-
+Summary:      samba3-utils
+Autoreqprov:  on
+Group:        Productivity/Networking/Samba
 %package doc
-Summary:	Samba Documentation
-Autoreqprov:	on
-Group:		Productivity/Networking/Samba
-
+Summary:      samba3-doc
+Autoreqprov:  on
+Group:        Productivity/Networking/Samba
+%package docbook
+Summary:      samba3-docbook
+Autoreqprov:  on
+Group:        Productivity/Networking/Samba
 %package pdb
-Summary:	Samba PDB-Modules
-Autoreqprov:	on
-Group:		Productivity/Networking/Samba
-
-%package vfs
-Summary:	Samba VFS-Modules
-Autoreqprov:	on
-Group:		Productivity/Networking/Samba
-
-%if %{newsam} > 0
-%package sam
-Summary:	Samba SAM-Modules
-Autoreqprov:	on
-Group:		Productivity/Networking/Samba
+Summary:      samba3-pdb
+Autoreqprov:  on
+Group:        Productivity/Networking/Samba
+%if %{make_cifsvfs}
+%package cifsmount
+Summary:      samba3-cifsmount
+Autoreqprov:  on
+Group:        Productivity/Networking/Samba
+Url:          http://us1.samba.org/samba/Linux_CIFS_client.html
 %endif
-
+%if %{make_vscan}
 %package vscan
-Summary:	Samba VFS-Modules for Virusscanners
-Autoreqprov:	on
-Group:		Productivity/Networking/Samba
-Version:	0.3.1
-
+Summary:      samba3-vscan
+Autoreqprov:  on
+Group:        Productivity/Networking/Samba
+Version:      0.3.2a
+Release:      0
+Url:          http://www.openantivirus.org/
+%endif
+%if %{make_wrepld}
+%package wrepld
+Summary:      samba3-wrepld
+Autoreqprov:  on
+Group:        Productivity/Networking/Samba
+%endif
+%if %{make_python}
 %package python
-Summary:	Samba Python-Modules
-Autoreqprov:	on
-Group:		Productivity/Networking/Samba
-
-
-
-
-%changelog
-* Sat Nov 3 2001 - gd@suse.de
-- start
-
-
+Summary:      samba3-python
+Autoreqprov:  on
+Group:        Productivity/Networking/Samba
+%endif
+%package -n libsmbclient
+Summary:      Samba client library
+Autoreqprov:  on
+Group:        System/Libraries
+%package -n libsmbclient-devel
+Summary:      Libraries and header files to develop programs with smbclient support
+Autoreqprov:  on
+Group:        Development/Libraries/C and C++
 %prep
 [ $RPM_BUILD_ROOT = "/" ] && (echo "your buildroot is /" && exit 0) || rm -rf $RPM_BUILD_ROOT
 mkdir $RPM_BUILD_ROOT
-
 %setup -n %{name}-%{samba_ver}
 %setup -T -D -a 50
 cp -ar samba-vscan-%{vscan_ver} examples/VFS/
-
 # untar my configs
 %setup -T -D -a 10
-
-%if %{heimdal_kerberos} > 0
+###########
+### PATCHES
+###########
+# Makefiles-heimdal.diff
 %patch1
+%if %{use_keytab}
+# luke howards keytab-patch
+%patch2
+%endif
+# some com_err fixes
+%patch29
+%if %{suse_ver} > 821
+%patch30
+%endif
+# vscan patch
 %patch51
+# net ads password
+%patch32
+# temp Makefile (show more libs)
+%patch33
+# temp pdb-test.c
+%patch31
+# smbwrapper should use LIBDIR not BINDIR
+%patch34
+#find . -name CVS -print | xargs rm -rf
+#find . -name ".cvsignore" -print | xargs rm -rf
+find . -name "*.gd" -print | xargs rm -rvf
+find . -name "*.orig" -print | xargs rm -rvf
+%if %{ul_version} >= 1
+        echo '#define VERSION "%samba_ver-UL"' > source/include/version.h
+%else
+        echo '#define VERSION "%samba_ver-SuSE"' > source/include/version.h
 %endif
-#%patch10
-#%patch22
-#%patch30
-
-find . -name CVS -print | xargs rm -rf
-find . -name ".cvsignore" -print | xargs rm -rf
-find . -name "'*.gd'" -print | xargs rm -rvf
-find . -name "'*.orig'" -print | xargs rm -rvf
 
 %build %{name}-%{samba_ver}
 %{?suse_update_config:%{suse_update_config -f}}
 cd source
 ./autogen.sh
-libtoolize --force --copy
-autoconf
 export CFLAGS="$RPM_OPT_FLAGS -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE"
+# debugging symbols
+%if %{make_devel}
+export CFLAGS="$RPM_OPT_FLAGS -g -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE"
+%endif
+%if %{krb_heimdal_05} 
+export CFLAGS="$CFLAGS -I./include -I%{new_heimdal}/include "
+export CFLAGS="$CFLAGS -I%{new_openldap}/include "
+export CFLAGS="$CFLAGS -I%{new_sasl}/include "
+export LDFLAGS="$LDFLAGS -Wl,-rpath %{new_heimdal}/lib" 
+export LDFLAGS="$LDFLAGS -Wl,-rpath %{new_openldap}/lib"
+export LDFLAGS="$LDFLAGS -Wl,-rpath %{new_sasl}/lib" 
+%endif
 %ifarch ppc64
 export CFLAGS="$CFLAGS -mminimal-toc"
 %endif
-CONF_OPTS_BASIC="\
-	--prefix=/usr \
-	--libdir=/etc/samba \
+CONF_OPTS="\
+	--enable-cups \
+	--libdir=/usr/lib/samba \
 	--localstatedir=/var/lib/samba \
 	--mandir=%{_mandir} \
+	--prefix=/usr \
 	--sbindir=/usr/sbin \
-	--with-privatedir=/etc/samba \
-	--with-piddir=/var/run/samba \
-	--with-codepagedir=/usr/share/samba/codepages \
-	--with-swatdir=/usr/share/samba/swat \
-	--with-smbmount \
+	--sysconfdir=/etc/samba \
+	--with-acl-support \
 	--with-automount \
-	--enable-cups \
+	--with-configdir=/etc/samba \
+	--with-lockdir=/var/lib/samba \
+	--with-logfilebase=/var/log/samba \
 	--with-msdfs \
-	--with-vfs \
 	--with-pam \
 	--with-pam_smbpass \
+	--with-piddir=/var/run/samba \
+	--with-privatedir=/etc/samba \
+	--with-quotas \
+	--with-smbmount \
+	--with-swatdir=/usr/share/samba/swat \
+	--with-syslog \
 	--with-utmp \
+	--with-vfs \
 	--with-winbind \
 	--with-tdbsam \
-	--with-ldapsam \
-%if %{smbwrap}
+	--with-expsam=xml,mysql \
+	--with-profiling-data \
+%if %{use_keytab}
+	--enable-keytab \
+%endif
+%if %{make_smbwrap}
 	--with-smbwrapper \
 %endif
-	--with-quotas \
-	--with-acl-support \
-	--with-python=python2.2 \
-	--with-syslog \
-"
-CONF_OPTS_HEAD="\
-	--with-sam \
-"
-CONF_OPTS_HEIMDAL_KERBEROS="\
-	--with-krb5impl=heimdal \
-"
-CONF_OPTS_HEIMDAL_51_KERBEROS="\
-	--with-krb5impl=heimdal \
-	--with-krb5includes=/opt/heimdal-0.5.1/include \
-	--with-krb5libs=/opt/heimdal-0.5.1/lib \
-"
-CONF_OPTS_MIT_KERBEROS="\
-	--with-krb5impl=mit \
-	--with-krb5includes=/usr/kerberos/include \
-	--with-krb5libs=/usr/kerberos/lib \
-"
-CONF_OPTS_DEVEL="\
+%if %{make_python}
+	--with-python=%{python_ver} \
+%endif
+%if %{make_shared_mod} 
+	--with-shared-modules=%{pdb_modules},%{rpc_modules} \
+%endif
+%if %{make_devel} 
 	--enable-developer \
 	--enable-krb5developer \
-	--with-profiling-data \
+%endif
 "
-CONF_OPTS="$CONF_OPTS_BASIC"
-%if %{head} > 0
-CONF_OPTS="$CONF_OPTS $CONF_OPTS_HEAD"
-%endif 
-%if %{heimdal_kerberos} > 0
-CONF_OPTS="$CONF_OPTS $CONF_OPTS_HEIMDAL_KERBEROS"
-%endif 
-%if %{mit_kerberos} > 0
-CONF_OPTS="$CONF_OPTS $CONF_OPTS_MIT_KERBEROS"
-%endif 
-%if %{devel} > 0
-CONF_OPTS="$CONF_OPTS $CONF_OPTS_DEVEL"
-%endif 
-
+#	--with-nisplus-home \
+# make sure we have a chance to find the krb5-config-tool
+export PATH="$PATH:/usr/lib/heimdal/bin"
 ./configure $CONF_OPTS
-
-###	--with-ldapsam is now standard!
-###	--with-sendfile-support ---default now
-#	--with-nisplussam \
-#	--with-nisplus_home \
-
-# with the new passdb-code we can finaly compile several passdb-backends
-# and make our choice at runtime. 
-# HEAD and thus alpha21 no longer need this
-#make proto
-
 make \
-	LOCKDIR=/var/lib/samba \
-	LOGFILEBASE=/var/log/samba \
-	SBINDIR=/usr/sbin \
 	all \
 	torture \
 	nsswitch/libnss_wins.so \
 	debug2html \
 	libsmbclient \
-	bin/profiles \
-	everything
-
+	everything \
+	bin/editreg
 # everything = nsswitch smbwrapper smbtorture debug2html smbfilter nsswitch/libnss_wins.so
-
-%if %{newsam} > 0
-make bin/samtest 
-%endif
 make modules 
-
 make -C tdb tdbdump tdbtest tdbtool tdbtorture 
-# tdbbackup is now in main Makefile
-
 make talloctort 
-
-# VFS,PDB and SAM
-EXAMPLEDIRS="pdb"
+%if %{make_wrepld}
+make bin/wrepld
+%endif
+%if %{make_doc}
+pushd `pwd`
+cd ../docs/docbook
+autoconf -f
+./configure
+# gracefully ignore errors...
+make -i manpages html html-single pdf htmlfaq htmlman
+# ps is not necessary, txt neither
+# everything = manpages ps pdf html-single html htmlman txt htmlfaq 
+popd
+%endif
+# make examples in VFS,PDB 
+pushd `pwd`
+cd ../examples/VFS/
+sh -x autogen.sh
+./configure
+popd
+EXAMPLEDIRS="pdb VFS"
 for i in $EXAMPLEDIRS; do make -C ../examples/$i; done
-
+%if %{make_vscan}
 export USE_KAVPSHAREDLIB=0
+export USE_INCLMKSDLIB=1
 for module in %{vscan_modules}; do 
-	make -C ../examples/VFS/%{name}-vscan-%{vscan_ver}/${module}; 
+	make -C ../examples/VFS/samba-vscan-%{vscan_ver}/${module}; 
 done
-
-# tim potters python
-%if %{python} > 0
+%endif
+%if %{make_python}
 make python_ext
 %endif
-
-
+%if %{make_cifsvfs}
+cd client
+export CFLAGS="$RPM_OPT_FLAGS -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE"
+gcc mount.cifs.c -o mount.cifs
+cd ..
+%endif
 
 %install
-
 mkdir -p \
-	$RPM_BUILD_ROOT/usr/{bin,sbin} \
-	$RPM_BUILD_ROOT/usr/share/{man,samba/{scripts,swat}} \
-	$RPM_BUILD_ROOT/usr/lib/samba/{vfs,pdb,sam,vscan} \
-	$RPM_BUILD_ROOT/usr/lib/python2.2/lib-dynload \
-	$RPM_BUILD_ROOT/usr/include \
-	$RPM_BUILD_ROOT/etc/{pam.d,init.d,samba} \
-	$RPM_BUILD_ROOT/var/adm \
-	$RPM_BUILD_ROOT/sbin \
-	$RPM_BUILD_ROOT/lib/security \
 	$RPM_BUILD_ROOT/%{DOCDIR} \
 	$RPM_BUILD_ROOT/%{DOCDIR}-vscan \
-	$RPM_BUILD_ROOT/var/spool/samba \
+	$RPM_BUILD_ROOT/%{DOCDIR}/docbook \
+	$RPM_BUILD_ROOT/etc/{pam.d,init.d,samba} \
+	$RPM_BUILD_ROOT/lib/security \
+	$RPM_BUILD_ROOT/sbin \
+	$RPM_BUILD_ROOT/usr/include \
+	$RPM_BUILD_ROOT/usr/lib/%{python_ver}/lib-dynload \
+	$RPM_BUILD_ROOT/usr/lib/samba/{vfs,pdb,vscan,rpc,auth,charset,idmap} \
+	$RPM_BUILD_ROOT/usr/share/{man,samba/swat} \
+	$RPM_BUILD_ROOT/usr/{bin,sbin} \
+	$RPM_BUILD_ROOT/var/adm \
+	$RPM_BUILD_ROOT/var/lib/samba/{netlogon,drivers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC},profiles} \
 	$RPM_BUILD_ROOT/var/log/samba \
 	$RPM_BUILD_ROOT/var/run/samba \
-	$RPM_BUILD_ROOT/var/lib/samba/{netlogon,drivers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC},profiles}	
-
+	$RPM_BUILD_ROOT/var/spool/samba 
 cd source/
 make install \
-	LIBDIR=$RPM_BUILD_ROOT/etc/samba \
+	LIBDIR=$RPM_BUILD_ROOT/usr/lib/samba \
 	LOGFILEBASE=$RPM_BUILD_ROOT/var/log/samba \
 	CONFIGFILE=$RPM_BUILD_ROOT/etc/samba/smb.conf \
 	LMHOSTSFILE=$RPM_BUILD_ROOT/etc/samba/lmhosts \
 	SWATDIR=$RPM_BUILD_ROOT/usr/share/samba/swat \
 	SBINDIR=$RPM_BUILD_ROOT/usr/sbin \
-	LOCKDIR=$RPM_BUILD_ROOT/var/lock/samba \
-	CODEPAGEDIR=$RPM_BUILD_ROOT/usr/share/samba/codepages \
+	LOCKDIR=$RPM_BUILD_ROOT/var/lib/samba \
 	DRIVERFILE=$RPM_BUILD_ROOT/etc/samba/printers.def \
 	BINDIR=$RPM_BUILD_ROOT/usr/bin \
 	SMB_PASSWD_FILE=$RPM_BUILD_ROOT/etc/samba/smbpasswd \
-	TDB_PASSWD_FILE=$RPM_BUILD_ROOT/etc/samba/smbpasswd.tdb \
 	MANDIR=$RPM_BUILD_ROOT/usr/share/man
+make installmodules \
+	LIBDIR=$RPM_BUILD_ROOT/usr/lib/samba 
 cd ..
-
 # utility scripts
-%if %{head} > 0
+%if %{head}
 scripts="creategroup cvslog.pl scancvslog.pl"
 %else
 scripts="scancvslog.pl"
 %endif
+mkdir -p examples/scripts
 for i in $scripts; do
-	cp -a source/script/$i		$RPM_BUILD_ROOT/usr/share/samba/scripts/
+	cp -a source/script/$i		examples/scripts/
 done
-
-# move the man-pages (ugly lang thing, fixed in alpha16)
-#mv $RPM_BUILD_ROOT/usr/share/man/lang/*	$RPM_BUILD_ROOT/usr/share/man/
-
 # configuration files
+%if %{ul_version} >= 1
+        SUFFIX="UnitedLinux"
+%else
+        SUFFIX="SuSE"
+%endif
+cat smb.conf.vendor | egrep -v '(^$$|^#)' > smb.conf
+mv smb.conf.vendor examples/smb.conf.${SUFFIX}
 install -m 644 smb.conf*	$RPM_BUILD_ROOT/etc/samba/
-install -m 644 shares.conf	$RPM_BUILD_ROOT/etc/samba/
 install -m 644 lmhosts		$RPM_BUILD_ROOT/etc/samba/
+install -m 644 smbusers		$RPM_BUILD_ROOT/etc/samba/
 install -m 600 smbpasswd -o root -g root  $RPM_BUILD_ROOT/etc/samba/
-
+install -m 600 smbfstab -o root -g root  $RPM_BUILD_ROOT/etc/samba/
 # pam
 install -m 644 samba.pamd	$RPM_BUILD_ROOT/etc/pam.d/samba
-
 # sambamount
 ln -sf /usr/bin/smbmount	$RPM_BUILD_ROOT/sbin/mount.smbfs
-
+#cifsmount
+%if %{make_cifsvfs}
+install -m755 source/client/mount.cifs	$RPM_BUILD_ROOT/sbin
+%endif
 # start scripts
 install rc.smb			$RPM_BUILD_ROOT/etc/init.d/smb
 ln -sf ../../etc/init.d/smb	$RPM_BUILD_ROOT/usr/sbin/rcsmb
+install rc.nmb			$RPM_BUILD_ROOT/etc/init.d/nmb
+ln -sf ../../etc/init.d/nmb	$RPM_BUILD_ROOT/usr/sbin/rcnmb
 install rc.smbfs		$RPM_BUILD_ROOT/etc/init.d/smbfs
 ln -sf ../../etc/init.d/smbfs	$RPM_BUILD_ROOT/usr/sbin/rcsmbfs
 install rc.winbind		$RPM_BUILD_ROOT/etc/init.d/winbind
 ln -sf ../../etc/init.d/winbind	$RPM_BUILD_ROOT/usr/sbin/rcwinbind
+%if %{make_wrepld}
 install rc.wrepl		$RPM_BUILD_ROOT/etc/init.d/wrepl
 ln -sf ../../etc/init.d/wrepl	$RPM_BUILD_ROOT/usr/sbin/rcwrepl
-
-#### disabled for 8.0
-### rc.config fragment
-mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
-cp rc.config.samba				$RPM_BUILD_ROOT/var/adm/fillup-templates
-cp rc.config.winbind				$RPM_BUILD_ROOT/var/adm/fillup-templates
-cp rc.config.wrepl				$RPM_BUILD_ROOT/var/adm/fillup-templates
-
+cp -a source/bin/wrepld		$RPM_BUILD_ROOT/usr/sbin/
+%endif
 # libnss_wins.so
-cp source/nsswitch/libnss_wins.so		$RPM_BUILD_ROOT/lib/libnss_wins.so
-ln -sf /lib/libnss_wins.so			$RPM_BUILD_ROOT/lib/libnss_wins.so.2
-
+cp source/nsswitch/libnss_wins.so		$RPM_BUILD_ROOT/lib/libnss_wins.so.2
+ln -sf /lib/libnss_wins.so.2			$RPM_BUILD_ROOT/lib/libnss_wins.so
 # winbind stuff
 cp -a source/nsswitch/pam_winbind.so		$RPM_BUILD_ROOT/lib/security/
-cp -a source/nsswitch/libnss_winbind.so		$RPM_BUILD_ROOT/lib/
+cp -a source/nsswitch/libnss_winbind.so		$RPM_BUILD_ROOT/lib/libnss_winbind.so.2
 cp -a source/bin/winbindd			$RPM_BUILD_ROOT/usr/sbin/
-ln -sf /lib/libnss_winbind.so			$RPM_BUILD_ROOT/lib/libnss_winbind.so.2
-
+ln -s /lib/libnss_winbind.so.2			$RPM_BUILD_ROOT/lib/libnss_winbind.so
 # pam_smbpass
 cp -a source/bin/pam_smbpass.so			$RPM_BUILD_ROOT/lib/security/
-
 # smbfilter
 cp -a source/bin/smbfilter			$RPM_BUILD_ROOT/usr/bin/
-
-
-%{?suse_check}
-
-## install libsmbclient
-install -m0755 source/bin/{libsmbclient.so,libsmbclient.a}	$RPM_BUILD_ROOT/%{_libdir}
-ln -s /usr/lib/libsmbclient.so			$RPM_BUILD_ROOT/%{_libdir}/libsmbclient.so.0
+# editreg
+cp -a source/bin/editreg			$RPM_BUILD_ROOT/usr/bin/
+# install libsmbclient
+install -m0755 source/bin/libsmbclient.a	$RPM_BUILD_ROOT/%{_libdir}
+install -m0755 source/bin/libsmbclient.so	$RPM_BUILD_ROOT/%{_libdir}/libsmbclient.so.0
+ln -s /usr/lib/libsmbclient.so.0		$RPM_BUILD_ROOT/%{_libdir}/libsmbclient.so
 install -m0644 source/include/libsmbclient.h	$RPM_BUILD_ROOT/%{_includedir}
-
+# install nsswitch-headers (for squid, etc.)
+mkdir -p $RPM_BUILD_ROOT/%{_includedir}/samba/nsswitch
+cp source/nsswitch/*.h				$RPM_BUILD_ROOT/%{_includedir}/samba/nsswitch/
 # install smbtorture and other test-programs
 install -m0755 source/bin/smbtorture		$RPM_BUILD_ROOT/usr/bin/
 install -m0755 source/bin/talloctort		$RPM_BUILD_ROOT/usr/bin/
 install -m0755 source/bin/{msgtest,masktest,locktest*}	$RPM_BUILD_ROOT/usr/bin/
 install -m0755 source/bin/{vfstest,nsstest}	$RPM_BUILD_ROOT/usr/bin/
-%if %{head} > 0
-%if %{newsam} > 0
-install -m0755 source/bin/samtest		$RPM_BUILD_ROOT/usr/bin/ 
-%endif
-%endif
-
 # install tdb tools
 install -m0755 source/tdb/{tdbdump,tdbtest,tdbtool,tdbtorture}	$RPM_BUILD_ROOT/usr/bin/
-
-
 # install VFS-modules
-%if %{head} > 0
-install -m0755 source/bin/developer.so		$RPM_BUILD_ROOT/%{_libdir}/samba/vfs/
-#install -m0755 examples/VFS/block/block.so	$RPM_BUILD_ROOT/%{_libdir}/samba/vfs/
-#install -m0755 examples/VFS/skel.so		$RPM_BUILD_ROOT/%{_libdir}/samba/vfs/
-%else
-#install -m0755 examples/VFS/block/block.so	$RPM_BUILD_ROOT/%{_libdir}/samba/vfs/
-#install -m0755 examples/VFS/skel.so		$RPM_BUILD_ROOT/%{_libdir}/samba/vfs/
-%endif
-install -m0755 source/bin/vfs_audit.so		$RPM_BUILD_ROOT/%{_libdir}/samba/vfs/
-install -m0755 source/bin/vfs_extd_audit.so	$RPM_BUILD_ROOT/%{_libdir}/samba/vfs/
-install -m0755 source/bin/vfs_recycle.so	$RPM_BUILD_ROOT/%{_libdir}/samba/vfs/
-%if %{netatalk}
-install -m0755 source/bin/vfs_netatalk.so	$RPM_BUILD_ROOT/%{_libdir}/samba/vfs/
-%endif
-
+install -m0755 examples/VFS/*.so		$RPM_BUILD_ROOT/%{_libdir}/samba/vfs/
 # install PDB-modules
-%if %{head} > 0
-install -m0755 source/bin/xml.so		$RPM_BUILD_ROOT/%{_libdir}/samba/pdb/
-install -m0755 source/bin/mysql.so		$RPM_BUILD_ROOT/%{_libdir}/samba/pdb/
-%else
-install -m0755 source/bin/pdb_xml.so		$RPM_BUILD_ROOT/%{_libdir}/samba/pdb/
-install -m0755 source/bin/pdb_mysql.so		$RPM_BUILD_ROOT/%{_libdir}/samba/pdb/
-%endif
 install -m0755 examples/pdb/pdb_test.so		$RPM_BUILD_ROOT/%{_libdir}/samba/pdb/
-
-# install SAM-modules
-%if %{head} > 0
-%if %{newsam} > 0
-install -m0755 examples/sam/sam_skel.so		$RPM_BUILD_ROOT/%{_libdir}/samba/sam/
-%endif
-%endif
-
+%if %{make_vscan}
 # install VSCAN-vfs-modules
-install -m0755 examples/VFS/%{name}-vscan-%{vscan_ver}/*/*.so	$RPM_BUILD_ROOT/%{_libdir}/samba/vscan/
-
+install -m0755 examples/VFS/samba-vscan-%{vscan_ver}/*/*.so	$RPM_BUILD_ROOT/%{_libdir}/samba/vscan/
+%endif
 # make examples clean
 VFS="$RPM_BUILD_DIR/%{name}-%{samba_ver}/examples/VFS"
-VSCAN="$VFS/%{name}-vscan-%{vscan_ver}"
+VSCAN="$VFS/samba-vscan-%{vscan_ver}"
 PDB="$RPM_BUILD_DIR/%{name}-%{samba_ver}/examples/pdb"
-%if %{head} > 0
-%if %{newsam} > 0
-SAM="$RPM_BUILD_DIR/%{name}-%{samba_ver}/examples/sam"
-%endif
-%endif
-dirs="$PDB $SAM"
+dirs="$PDB $SAM $VFS"
 (for i in $dirs; do make -C $i clean; done)
+%if %{make_vscan}
 (for i in %{vscan_modules}; do make -C $VSCAN/$i clean; done)
-
-%if %{python} > 0
+%endif
 # install python
-cp -a source/build/lib.*/samba 			$RPM_BUILD_ROOT/usr/lib/python2.2/lib-dynload/
+%if %{make_python}
+cp -a source/build/lib.*/samba 			$RPM_BUILD_ROOT/usr/lib/%{python_ver}/lib-dynload/
+find source/python -name CVS -print | xargs rm -rf
+find source/python -name ".cvsignore" -print | xargs rm -rf
 %endif
-
 # whats this ?
 install -m0755 source/bin/debug2html		$RPM_BUILD_ROOT/usr/bin/
-
-%if %{smbwrap}
 # install smbwrapper
+%if %{make_smbwrap}
 install -m0755 source/bin/smbwrapper.so		$RPM_BUILD_ROOT/%{_libdir}/samba/
 install -m0755 source/bin/smbsh		        $RPM_BUILD_ROOT/usr/bin/
 %endif
-
-# finally obsolete with alpha17 makefile
-# install unicode-codepages
-#install -m0755 source/codepages/{lowcase,upcase,valid}.dat	$RPM_BUILD_ROOT/etc/samba/
-
+##############
 # cleanup docs
-rm -rf docs/*.[0-9]
-chmod 644 `find docs examples -type f`
-chmod 755 `find docs examples -type d`
+##############
+#chmod 644 `find docs examples -type f`
+#chmod 755 `find docs examples -type d`
+#find . -name CVS -print | xargs rm -rf
+#find . -name ".cvsignore" -print | xargs rm -rf
 mv COPYING Manifest README Read-Manifest-Now Roadmap WHATSNEW.txt $RPM_BUILD_ROOT/%{DOCDIR}/
 cp source/msdfs/README 		$RPM_BUILD_ROOT/%{DOCDIR}/README.msdfs
-#cp source/nsswitch/README	$RPM_BUILD_ROOT/%{DOCDIR}/README.nsswitch
 cp source/smbwrapper/README 	$RPM_BUILD_ROOT/%{DOCDIR}/README.smbwrapper
+%if %{ul_version} >= 1
+        SUFFIX="UnitedLinux"
+%else
+        SUFFIX="SuSE"
+%endif
+cp README.vendor		${RPM_BUILD_ROOT}/%{DOCDIR}/README.${SUFFIX}
+# pam_smbpass is missing
+cp -a source/pam_smbpass/samples 	examples/pam_smbpass/
+cp -a source/pam_smbpass/{CHANGELOG,INSTALL,README,TODO} examples/pam_smbpass/
+# prepare docbook package
+cp -a docs/docbook/* 		$RPM_BUILD_ROOT/%{DOCBOOKDIR}
+#make -C $RPM_BUILD_ROOT/%{DOCBOOKDIR} clean
+rm -rf $RPM_BUILD_ROOT/%{DOCBOOKDIR}/autom4te.cache 
+rm -rf $RPM_BUILD_ROOT/%{DOCBOOKDIR}/config.*
+# this is empty
+rm -rf docs/yodldocs
+rm -rf examples/VFS/samba-vscan-%{vscan_ver}
+# zip manpages at least
+gzip -f docs/manpages/*.[1-9]
 cp -a docs/*			$RPM_BUILD_ROOT/%{DOCDIR}
 cp -a examples/			$RPM_BUILD_ROOT/%{DOCDIR}
 # save space...
-rm -r \
-	$RPM_BUILD_ROOT/%{SWATDIR}/using_samba 
+rm -r $RPM_BUILD_ROOT/%{SWATDIR}/using_samba 
 ln -s %{DOCDIR}/htmldocs/using_samba $RPM_BUILD_ROOT/%{SWATDIR}
-
+# hm...
+cp $RPM_BUILD_ROOT/%{SWATDIR}/help/welcome.html $RPM_BUILD_ROOT/%{DOCDIR}/htmldocs/
+rm -r $RPM_BUILD_ROOT/%{SWATDIR}/help
+ln -s %{DOCDIR}/htmldocs $RPM_BUILD_ROOT/%{SWATDIR}/help
+# remove cvs
+find $RPM_BUILD_ROOT/%{DOCDIR} -name CVS -print | xargs rm -rf
+find $RPM_BUILD_ROOT/%{DOCDIR} -name ".cvsignore" -print | xargs rm -rf
+# finally build a file-list
+for file in $( find ${RPM_BUILD_ROOT}%{DOCDIR} -maxdepth 1); do
+        # exclude %{DOCDIR} and docbook
+        case "${file#${RPM_BUILD_ROOT}}" in
+                %{DOCDIR}|%{DOCDIR}/docbook) continue ;;
+        esac
+        echo "%doc ${file#${RPM_BUILD_ROOT}}" >> ${RPM_BUILD_DIR}/%{name}-%{samba_ver}/filelist-doc
+done
 
 %post
-###### disabled for 8.1
-###echo "Updating etc/rc.config..."
-##if [ -x bin/fillup ] ; then
-##  bin/fillup -q -d = etc/rc.config var/adm/fillup-templates/rc.config.samba
-##  bin/fillup -q -d = etc/rc.config var/adm/fillup-templates/rc.config.winbind
-##else
-##  echo "ERROR: fillup not found. This should not happen. Please compare"
-##  echo "etc/rc.config and var/adm/fillup-templates/rc.config.samba and"
-##  echo "var/adm/fillup-templates/rc.config.winbind and update by hand."
-##fi
+%{fillup_and_insserv smb}
 mkdir -p $RPM_BUILD_ROOT/var/adm/notify/messages
 cat << EOF > var/adm/notify/messages/samba-notify
 Achtung!
-
 This is %{name}-%{samba_ver}. Please do not run on production systems.
-
 You have been warned.
 EOF
 
-# Initialize runlevel links
-#
-%{fillup_and_insserv smb}
-#sbin/insserv /etc/init.d/smb
-
 %post client
-#sbin/insserv /etc/init.d/smbfs
 %{fillup_and_insserv -fpy smbfs}
 %{fillup_only -ans samba client}
 
+%post winbind
+%{fillup_and_insserv winbind}
+
 %postun
 %{insserv_cleanup}
-#sbin/insserv /etc/init.d/
 
 %postun client
 %{insserv_cleanup}
-#sbin/insserv /etc/init.d/
-
-%post winbind
-%{fillup_and_insserv winbind}
-#sbin/insserv /etc/init.d/winbind
 
 %postun winbind
 %{insserv_cleanup}
-#sbin/insserv /etc/init.d/
 
 %clean
 #make -C source realclean
 
 %files
-%config(noreplace) /etc/samba/smbpasswd
-%config /etc/pam.d/samba
+#/usr/bin/addtosmbpass
+#/usr/bin/convert_smbpasswd
+%dir /etc/samba
+%dir /usr/lib/samba
+%config /etc/init.d/nmb
 %config /etc/init.d/smb
-%config /etc/init.d/wrepl
-#/usr/bin/make_printerdef
-/usr/bin/addtosmbpass
-/usr/bin/convert_smbpasswd
-/usr/bin/ntlm_auth
-/usr/bin/profiles
-/usr/bin/smbfilter
-/usr/bin/smbpasswd
-/usr/bin/smbstatus
-/usr/bin/testparm
-/usr/bin/testprns
-#%doc %{_mandir}/man1/smbrun.1.gz
-%doc %{_mandir}/man1/smbsh.1.gz
+%config /etc/pam.d/samba
+%config(noreplace) /etc/samba/smbpasswd
+%config(noreplace) /etc/samba/smbusers
+%doc %{_mandir}/man1/smbcontrol.1.gz
 %doc %{_mandir}/man1/smbstatus.1.gz
 %doc %{_mandir}/man1/testparm.1.gz
 %doc %{_mandir}/man1/testprns.1.gz
 %doc %{_mandir}/man5/smbpasswd.5.gz
 %doc %{_mandir}/man7/samba.7.gz
 %doc %{_mandir}/man8/nmbd.8.gz
+%doc %{_mandir}/man8/pdbedit.8.gz
 %doc %{_mandir}/man8/smbd.8.gz
 %doc %{_mandir}/man8/smbpasswd.8.gz
 %doc %{_mandir}/man8/swat.8.gz
+%doc %{_mandir}/man8/tdbbackup.8.gz
+%{_includedir}/samba
+/lib/security/pam_smbpass.so
+/usr/bin/pdbedit
+/usr/bin/smbcontrol
+/usr/bin/smbpasswd
+/usr/bin/smbstatus
+/usr/bin/tdbbackup
+/usr/bin/tdbdump  
+/usr/bin/tdbtest  
+/usr/bin/tdbtool  
+/usr/bin/testparm
+/usr/bin/testprns
+/usr/lib/samba/rpc
+/usr/lib/samba/vfs
 /usr/sbin/nmbd
+/usr/sbin/rcnmb
+/usr/sbin/rcsmb
 /usr/sbin/smbd
 /usr/sbin/swat
-/usr/sbin/wrepld
-/usr/sbin/rcsmb
-/usr/sbin/rcwrepl
-#/var/adm/fillup-templates/rc.config.samba
+/usr/share/samba
+/var/lib/samba
 /var/log/samba
-/var/spool/samba
 /var/run/samba
-/var/lib/samba
-/usr/share/samba
-/lib/security/pam_smbpass.so
+/var/spool/samba
 
 %files client
-%config(noreplace) /etc/samba/smb.conf
-%config(noreplace) /etc/samba/lmhosts
-/etc/samba/lowcase.dat
-/etc/samba/upcase.dat
-/etc/samba/valid.dat
 %config /etc/init.d/smbfs
-/usr/sbin/rcsmbfs
+%config(noreplace) /etc/samba/lmhosts
+%config(noreplace) /etc/samba/smb.conf
+%config(noreplace) /etc/samba/smbfstab
+%dir /etc/samba
+%dir /usr/lib/samba
+%doc %{_mandir}/man1/editreg.1.gz
+%doc %{_mandir}/man1/findsmb.1.gz
+%doc %{_mandir}/man1/nmblookup.1.gz
+%doc %{_mandir}/man1/profiles.1.gz
+%doc %{_mandir}/man1/rpcclient.1.gz
+%doc %{_mandir}/man1/smbcacls.1.gz
+%doc %{_mandir}/man1/smbclient.1.gz
+%doc %{_mandir}/man1/smbcquotas.1.gz
+%doc %{_mandir}/man1/smbtar.1.gz
+%doc %{_mandir}/man1/smbtree.1.gz
+%doc %{_mandir}/man5/lmhosts.5.gz
+%doc %{_mandir}/man5/smb.conf.5.gz
+%doc %{_mandir}/man7/Samba.7.gz
+%doc %{_mandir}/man8/net.8.gz
+%doc %{_mandir}/man8/smbmnt.8.gz
+%doc %{_mandir}/man8/smbmount.8.gz
+%doc %{_mandir}/man8/smbspool.8.gz
+%doc %{_mandir}/man8/smbumount.8.gz
 /sbin/mount.smbfs
+/usr/bin/editreg
 /usr/bin/findsmb
 /usr/bin/net
 /usr/bin/nmblookup
-/usr/bin/pdbedit
+/usr/bin/profiles
 /usr/bin/rpcclient
 /usr/bin/smbcacls
-/usr/bin/smbcontrol
 /usr/bin/smbclient
+/usr/bin/smbcquotas
+/usr/bin/smbfilter
 /usr/bin/smbmnt
 /usr/bin/smbmount
-%if %{smbwrap}
-/usr/bin/smbsh
-%endif
-/usr/bin/smbumount
 /usr/bin/smbspool
 /usr/bin/smbtar
 /usr/bin/smbtree
-%doc %{_mandir}/man1/nmblookup.1.gz
-%doc %{_mandir}/man1/rpcclient.1.gz
-%doc %{_mandir}/man1/smbclient.1.gz
-%doc %{_mandir}/man1/smbcacls.1.gz
-%doc %{_mandir}/man1/smbcontrol.1.gz
-%doc %{_mandir}/man1/smbtar.1.gz
-%doc %{_mandir}/man5/lmhosts.5.gz
-%doc %{_mandir}/man5/smb.conf.5.gz
-%doc %{_mandir}/man8/net.8.gz
-%doc %{_mandir}/man8/pdbedit.8.gz
-%doc %{_mandir}/man8/smbmnt.8.gz
-%doc %{_mandir}/man8/smbmount.8.gz
-%doc %{_mandir}/man8/smbspool.8.gz
-%doc %{_mandir}/man8/smbumount.8.gz
-/usr/include/libsmbclient.h
-%if %{smbwrap}
+/usr/bin/smbumount
+/usr/lib/samba/lowcase.dat
+/usr/lib/samba/upcase.dat
+/usr/lib/samba/valid.dat
+/usr/sbin/rcsmbfs
+%if %{make_smbwrap}
+/usr/bin/smbsh
+%doc %{_mandir}/man1/smbsh.1.gz
 /usr/lib/samba/smbwrapper.so
 %endif
-/usr/lib/libsmbclient.a
-/usr/lib/libsmbclient.so
-/usr/lib/libsmbclient.so.0
 
 %files winbind
-%config(noreplace) /etc/samba/smb.conf.winbind
 %config /etc/init.d/winbind
+%config(noreplace) /etc/samba/smb.conf
+%dir /etc/samba
 %doc %{_mandir}/man1/wbinfo.1.gz
 %doc %{_mandir}/man8/winbindd.8.gz
-/usr/bin/wbinfo
-%if %{head} > 0
+%doc %{_mandir}/man1/ntlm_auth.1.gz
+/lib/libnss_winbind.so*
+/lib/libnss_wins.so*
+/lib/security/pam_winbind.so
 /usr/bin/ntlm_auth
-%endif
-/usr/sbin/winbindd
+/usr/bin/wbinfo
 /usr/sbin/rcwinbind
-#/var/adm/fillup-templates/rc.config.winbind
-/lib/security/pam_winbind.so
-/lib/libnss_winbind.so
-/lib/libnss_winbind.so.2
-/lib/libnss_wins.so
-/lib/libnss_wins.so.2
+/usr/sbin/winbindd
 
 %files utils
-/usr/bin/smbtorture
-/usr/bin/msgtest
-/usr/bin/masktest
+%doc %{_mandir}/man1/vfstest.1.gz
+/usr/bin/debug2html
 /usr/bin/locktest
 /usr/bin/locktest2
-/usr/bin/debug2html
+/usr/bin/masktest
+/usr/bin/msgtest
+/usr/bin/nsstest
+/usr/bin/smbtorture
 /usr/bin/talloctort
-/usr/bin/tdbbackup
-/usr/bin/tdbdump  
-/usr/bin/tdbtest  
-/usr/bin/tdbtool  
 /usr/bin/tdbtorture
 /usr/bin/vfstest
-/usr/bin/nsstest
-%if %{head} > 0
-%if %{newsam} > 0
-/usr/bin/samtest
-%endif
-/usr/bin/profiles
-/usr/bin/editreg
-%endif
-%doc %{_mandir}/man1/vfstest.1.gz
 
-%files doc
-%docdir %{DOCDIR}
-%{DOCDIR}
+%files doc -f filelist-doc
+%dir /usr/share/doc/packages/samba3
+
+%files docbook
+%docdir %{DOCBOOKDIR}
+%{DOCBOOKDIR}
+%dir /usr/share/doc/packages/samba3
 
 %files pdb
 /usr/lib/samba/pdb
-%doc examples/pdb/*
-
-%files vfs
-/usr/lib/samba/vfs
-%doc examples/VFS/README*
-%doc examples/VFS/Makefile*
-#doc examples/VFS/audit*
-#%doc examples/VFS/block*
-#doc examples/VFS/netatalk*
-#doc examples/VFS/recycle*
-%doc examples/VFS/skel*
+%doc examples/pdb/{Makefile,README,pdb_test.c}
+%doc examples/pdb/{mysql/mysql.dump,mysql/smb.conf}
+%if %{make_cifsvfs}
 
-%if %{newsam} > 0
-%files sam
-/usr/lib/samba/sam
-%if %{head} > 0
-%doc examples/sam/*
+%files cifsmount
+/sbin/mount.cifs
 %endif
+%if %{make_wrepld}
+
+%files wrepld
+%config /etc/init.d/wrepl
+/usr/sbin/rcwrepl
+/usr/sbin/wrepld
 %endif
+%if %{make_vscan}
 
 %files vscan
 /usr/lib/samba/vscan
-%doc %{name}-vscan-%{vscan_ver}/{AUTHORS,COPYING,ChangeLog,FAQ,NEWS,README,TODO}
-
+%doc samba-vscan-%{vscan_ver}/{AUTHORS,COPYING,ChangeLog,FAQ,NEWS,README,TODO}
+%endif
+%if %{make_python}
 
 %files python
 %doc source/python/README 
-%if %{python} > 0
-/usr/lib/python2.2/lib-dynload/samba
 %doc source/python/examples 
 %doc source/python/gprinterdata
 %doc source/python/gtdbtool
 %doc source/python/gtkdictbrowser.py
-%if %{head} > 0
-%doc source/python/gtkdictbrowser.pyc
-%doc source/python/printerdata.pyc
-%endif
+/usr/lib/%{python_ver}/lib-dynload/samba
 %endif
 
-%description
-Samba is a suite of programs which work together to allow clients to
-access Unix filespace and printers via the SMB protocol (Server Message
-Block). 
-In practice, this means that you can redirect disks and printers to
-Unix disks and printers from LAN Manager clients, Windows for
-Workgroups 3.11 clients, Windows'95 clients, Windows NT clients
-and OS/2 clients. There is
-also a Unix client program supplied as part of the suite which allows
-Unix users to use an ftp-like interface to access filespace and
-printers on any other SMB server.
-Samba includes the following programs (in summary):
-* smbd, the SMB server. This handles actual connections from clients.
-* nmbd, the Netbios name server, which helps clients locate servers.
-* smbclient, the Unix-hosted client program.
-* smbrun, a little 'glue' program to help the server run external
-programs. 
-* testprns, a program to test server access to printers.
-* testparm, a program to test the Samba configuration file for correctness.
-* smb.conf, the Samba configuration file.
-* smbprint, a sample script to allow a Unix host to use smbclient
-to print to an SMB server.
-The suite is supplied with full source and is GPLed.
-This package expects its config file under /etc/smb.conf .
+%files -n libsmbclient
+%{_libdir}/libsmbclient.so.*
 
-Authors:
---------
-    Andrew Tridgell <Andrew.Tridgell@anu.edu.au>
-    Karl Auer <Karl.Auer@anu.edu.au>
-    Jeremy Allison <jeremy@netcom.com>
+%files -n libsmbclient-devel
+%{_includedir}/libsmbclient.h
+%{_libdir}/libsmbclient.a
+%{_libdir}/libsmbclient.so
 
-SuSE series: n
+%description
+samba3
 
 
 %description client
-This package contains all programs, that are needed to act as a samba
-client. This includes also smbmount, of course.
-
-Authors:
---------
-    Andrew Tridgell <Andrew.Tridgell@anu.edu.au>
-    Karl Auer <Karl.Auer@anu.edu.au>
-    Jeremy Allison <jeremy@netcom.com>
-
-SuSE series: n
+samba3-client
 
 
 %description winbind
-This is the winbind-daemon and the wbinfo-tool.
+samba3-winbind
+
 
 %description utils
-Some of the debug-tools for developpers.
-Contains:
-	- debug2html
-	- locktest
-	- locktest2
-	- masktest
-	- msgtest
-	- smbtorture
-	- talloctort
-	- several tdb-tools
+samba3-utils
+
 
 %description doc
-The Samba Documentation.
+samba3-doc
+
+
+%description docbook
+samba3-docbook
 
-%description vfs
-The Samba VFS-Modules.
 
 %description pdb
-The Samba PDB-Modules.
+samba3-pdb
+
+%if %{make_cifsvfs}
+
+%description cifsmount
+samba3-cifsmount
 
-%if %{newsam} > 0
-%description sam
-The Samba SAM-Modules.
 %endif
+%if %{make_vscan}
 
 %description vscan
-The Samba VFS-Modules for Virusscanners.
+samba3-vscan
+
+%endif
+%if %{make_python}
 
 %description python
-The Samba python-Modules.
+samba3-python
+
+%endif
+%if %{make_wrepld}
+
+%description wrepld
+samba3-wrepld
+
+%endif
+
+%description -n libsmbclient
+This package includes the libsmbclient library.
+
+Authors:
+--------
+    The Samba Team <samba@samba.org>
+
+
+%description -n libsmbclient-devel
+This package contains static libraries and header files needed to develop
+programs which make use of the smbclient programming interface.
+
+Authors:
+--------
+    The Samba Team <samba@samba.org>
+
+
diff --git a/packaging/bin/update-pkginfo b/packaging/bin/update-pkginfo
index 8432173cc88..47f3c3c306b 100755
--- a/packaging/bin/update-pkginfo
+++ b/packaging/bin/update-pkginfo
@@ -8,13 +8,9 @@ if [ $# -ne 2 ]; then
     exit 1
 fi
 
-for f in */*/*.tmpl; do
-	f2=`echo $f | sed s/.tmpl//g`
-	echo $f2
-	sed -e s/PVERSION/$VERSION/g -e s/PRELEASE/$RELEASE/g < $f > $f2
-done
-for f in */*.tmpl; do
-	f2=`echo $f | sed s/.tmpl//g`
-	echo $f2
-	sed -e s/PVERSION/$VERSION/g -e s/PRELEASE/$RELEASE/g < $f > $f2
+for f in `du -a | awk '{print $2}' | grep \.tmpl$`; do
+        f2=`echo $f | sed s/.tmpl//g`
+        echo $f2
+        sed -e s/PVERSION/$VERSION/g -e s/PRELEASE/$RELEASE/g < $f > $f2
 done
+