From 7374565f0c738b0a0753dd05328d1a5f45276659 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Mon, 18 Apr 2005 17:46:46 +0000
Subject: r6372: removing outdated Mandrake packaging files and pointing at
 Mandriva cooker (after clearing with Buchan) (This used to be commit
 f8fb342d4371dcbbedd63de84535e8e4dc35ce7a)

---
 packaging/Mandrake/README                          |   11 -
 packaging/Mandrake/README.mandrake                 |  120 +-
 packaging/Mandrake/empty.patch                     |    0
 packaging/Mandrake/findsmb                         |  141 --
 packaging/Mandrake/makerpms-cvs.sh                 |   37 -
 packaging/Mandrake/makerpms.sh.tmpl                |   77 -
 packaging/Mandrake/mount.cifs.8                    |  181 --
 packaging/Mandrake/samba-2.2.0-buildroot.patch     |   15 -
 packaging/Mandrake/samba-3.0-smbmount-sbin.patch   |   11 -
 .../Mandrake/samba-3.0.2a-smbldap-config.patch     |   84 -
 .../samba-3.0.6-revert-libsmbclient-move.patch     |   15 -
 packaging/Mandrake/samba-print-pdf.sh              |  111 -
 packaging/Mandrake/samba-slapd-include.conf        |   15 -
 packaging/Mandrake/samba.log                       |   15 -
 packaging/Mandrake/samba.pamd                      |    5 -
 packaging/Mandrake/samba.xinetd                    |   15 -
 packaging/Mandrake/samba2.spec.tmpl                | 2622 --------------------
 packaging/Mandrake/smb-migrate                     |  197 --
 packaging/Mandrake/smb.conf                        |  532 ----
 packaging/Mandrake/smb.init                        |  100 -
 packaging/Mandrake/smbprint                        |   77 -
 packaging/Mandrake/smbusers                        |    3 -
 packaging/Mandrake/smbw.patch                      |   10 -
 packaging/Mandrake/swat_16.png.bz2                 |  Bin 1142 -> 0 bytes
 packaging/Mandrake/swat_32.png.bz2                 |  Bin 2870 -> 0 bytes
 packaging/Mandrake/swat_48.png.bz2                 |  Bin 5072 -> 0 bytes
 packaging/Mandrake/system-auth-winbind.pamd        |   17 -
 packaging/Mandrake/winbind.init                    |   93 -
 packaging/Mandrake/wrepld.init                     |   93 -
 29 files changed, 3 insertions(+), 4594 deletions(-)
 delete mode 100644 packaging/Mandrake/README
 delete mode 100644 packaging/Mandrake/empty.patch
 delete mode 100755 packaging/Mandrake/findsmb
 delete mode 100644 packaging/Mandrake/makerpms-cvs.sh
 delete mode 100644 packaging/Mandrake/makerpms.sh.tmpl
 delete mode 100644 packaging/Mandrake/mount.cifs.8
 delete mode 100644 packaging/Mandrake/samba-2.2.0-buildroot.patch
 delete mode 100644 packaging/Mandrake/samba-3.0-smbmount-sbin.patch
 delete mode 100644 packaging/Mandrake/samba-3.0.2a-smbldap-config.patch
 delete mode 100644 packaging/Mandrake/samba-3.0.6-revert-libsmbclient-move.patch
 delete mode 100644 packaging/Mandrake/samba-print-pdf.sh
 delete mode 100644 packaging/Mandrake/samba-slapd-include.conf
 delete mode 100644 packaging/Mandrake/samba.log
 delete mode 100644 packaging/Mandrake/samba.pamd
 delete mode 100644 packaging/Mandrake/samba.xinetd
 delete mode 100644 packaging/Mandrake/samba2.spec.tmpl
 delete mode 100644 packaging/Mandrake/smb-migrate
 delete mode 100644 packaging/Mandrake/smb.conf
 delete mode 100755 packaging/Mandrake/smb.init
 delete mode 100755 packaging/Mandrake/smbprint
 delete mode 100644 packaging/Mandrake/smbusers
 delete mode 100644 packaging/Mandrake/smbw.patch
 delete mode 100644 packaging/Mandrake/swat_16.png.bz2
 delete mode 100644 packaging/Mandrake/swat_32.png.bz2
 delete mode 100644 packaging/Mandrake/swat_48.png.bz2
 delete mode 100644 packaging/Mandrake/system-auth-winbind.pamd
 delete mode 100644 packaging/Mandrake/winbind.init
 delete mode 100644 packaging/Mandrake/wrepld.init

(limited to 'packaging')

diff --git a/packaging/Mandrake/README b/packaging/Mandrake/README
deleted file mode 100644
index 5ccfb1d22b..0000000000
--- a/packaging/Mandrake/README
+++ /dev/null
@@ -1,11 +0,0 @@
-Preparation Date: Sat Apr 14 2001
-Preparer:	Gerald Carter <jerry@samba.org>
-
-Instructions:	Preparing Samba Packages for Mandrake Linux 8.x
-===============================================================
-
-We provide support only for current versions of Mandrake Linux.
-
-To produce the RPMS simply type:
-	sh makerpms.sh
-
diff --git a/packaging/Mandrake/README.mandrake b/packaging/Mandrake/README.mandrake
index 83920f238f..a071e577ba 100644
--- a/packaging/Mandrake/README.mandrake
+++ b/packaging/Mandrake/README.mandrake
@@ -1,117 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-The Mandrake samba spec file used for packaging for Mandrake and cooker
-is now also used by the makerpms.sh script, and you can pass any options
-that you would normally pass to rpm via the makerpms.sh script.
-
-Note that only release after 8.1 support passing options using 
-"--with <option>" syntax. The following options are available when
-building with the script:
-
-- --with|--without ldap
-- --with|--without acl
-- --with|--without winbind
-- --with|--without  wins
-- --with vscan
-Using "--with vscan" requires that you place a copy of the samba-vscan
-tarball (coverted to bz2 using bzme) from:
-http://prdownloads.sourceforge.net/openantivirus/samba-vscan-0.2.5a.tar.gz?download in your rpm source directory:
-
-cp samba-vscan-0.2.5a.tar.gz `rpm --eval "%_sourcedir"`
-bzme `rpm --eval "%_sourcedir"`/samba-vscan-0.2.5a.tar.gz
-
-When using "--with vscan" you will probably want to enable a virus scanner
-also:
-- --with fprot
-- --with kaspersky
-- --with mks
-- --with openantivirus
-- --with sophos
-- --with symantec
-- --with trend
-
-You may need to do additional setup for your virus scanner to get this to
-work, please see ../../examples/VFS/<scanner>/INSTALL (after having started
-a build with "sh makerpms.sh --with vscan")
-
-Note that only sophos has been tested with the spec, but the rest should work
-(after the preparation). Reports of working scanners are welcome, and please
-report any that do not work (preferably with a fix :-)).
-
-So, to build ldap-enable RPMs for with antivirus support with sophos, but
-no acl support, use:
-sh makerpms.sh --with ldap --with vscan --with sophos --without acl
-
-The same features can be enabled on Mandrake 7.2/8.0 by editing samba2.spec, 
-and changing the 0 to 1 to enable the option:
-
-%if %build_mdk80
-%define build_acl 0
-%define build_winbind 0
-%define build_wins 0
-%define build_ldap 0
-%endif
-
-Similar sections exist for the virus scanning options.
-
-(If you haven't rebuilt RPMs before, it is suggested that you take a
-brief look through http://www.linux-mandrake.com/howtos/mdk-rpm/,
-specifically sections 3.1 and 3.2)
-
-The defaults for Mandrake 8.1 and 8.2 are shown below:
-%if %build_mdk82
-%define build_acl 1
-%define build_winbind 1
-%define build_wins 1
-%define build_ldap 0
-%endif
-
-%if %build_mdk81
-%define build_acl 1
-%define build_winbind 0
-%define build_wins 0
-%define build_ldap 0
-%endif
-
-Note that building with LDAP support will only allow you to use smbpasswd's
-stored in ldap, not in the local smbpasswd file. From 2.2.5 onwards in the 
-2.2 tree, ldap-enable RPMs now carry an ldap modifier to indicate this (for
-example, samba-server becomes samba-server-ldap).
-
-Building with acl requires that you have the acl development libraries. 
-The libraries are standard on 8.1 and 8.2.
-ACLs can be used on Mandrake 8.0 with the updated kernel (to support XFS)
-if you install the RPMs available at 
-http://ranger.dnsalias.com/mandrake/samba/RPMS/8.0/samba-2.2.1a_xfs/
-
-Note that precompiled binaries of samba are also available on my site:
-http://ranger.dnsalias.com/mandrake/samba
-and that of Sylvestre Taburet:
-http://people.mandrakesoft.com/~staburet/samba/
-
-If you have any problems with these RPMs, please send email to both
-bgmilne@cae.co.za and staburet@mandrakesoft.com
-
-These RPMs are provided as-is, are not official, and can not be 
-supported by Mandrakesoft. However, we will do our best to provide
-reliable and well-packaged RPMS, since we use them on our own servers
-and those of clients.
-
-This file is signed with my gpg key, a copy of my public key is available
-at http://ranger.dnsalias.com/bgmilne.asc. The finger-print for this key 
-follows:
-1024D/60D204A7 2919 E232 5610 A038 87B1 72D6 AC92 BA50 60D2 04A7
-
-Recent posts by me on samba@samba.org have been signed with this key,
-in case you really want to verify who I am to some extent.
-
-Buchan Milne
-18 June 2002
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.0.6 (GNU/Linux)
-
-iD8DBQE9D2h3rJK6UGDSBKcRAhtJAKC0fVkIMETgRxccrwLBcKZKHllCIACeNcZ9
-bxGZSTOHs57ir3wFR+3s0XM=
-=ifKf
------END PGP SIGNATURE-----
+Please note that the current Mandrake RPM spec file
+for Samba and related packages can be found in the Mandrive 
+Cooker (http://www.mandrivalinux.com/en/cookerdevel.php3)
diff --git a/packaging/Mandrake/empty.patch b/packaging/Mandrake/empty.patch
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packaging/Mandrake/findsmb b/packaging/Mandrake/findsmb
deleted file mode 100755
index f70d18dcbd..0000000000
--- a/packaging/Mandrake/findsmb
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/usr/bin/perl
-#
-# Prints info on all smb responding machines on a subnet.
-# This script needs to be run on a machine without nmbd running and be
-# run as root to get correct info from WIN95 clients.
-#
-# syntax:
-#    findsmb [subnet broadcast address]
-#
-# with no agrument it will list machines on the current subnet
-#
-# There will be a "+" in front of the workgroup name for machines that are
-# local master browsers for that workgroup. There will be an "*" in front
-# of the workgroup name for machines that are the domain master browser for
-# that workgroup.
-#
-
-$SAMBABIN = "/usr/bin";
-
-for ($i = 0; $i < 2; $i++) {	# test for -d option and broadcast address
-  $_ = shift;
-  if (m/-d|-D/) {
-    $DEBUG = 1;
-  } else  {
-    if ($_) {
-      $BCAST = "-B $_";
-    }
-  }
-}
-
-sub ipsort			# do numeric sort on last field of IP address
-{
-  @t1 = split(/\./,$a);
-  @t2 = split(/\./,$b);
-  @t1[3] <=> @t2[3];
-}
-
-# look for all machines that respond to a name lookup
-
-open(NMBLOOKUP,"$SAMBABIN/nmblookup $BCAST '*'|") || 
-  die("Can't run nmblookup '*'.\n");
-
-# get rid of all lines that are not a response IP address,
-# strip everything but IP address and sort by last field in address
-
-@ipaddrs = sort ipsort grep(s/ \*<00>.*$//,<NMBLOOKUP>);
-
-# print header info
-
-print "\nIP ADDR         NETBIOS NAME   WORKGROUP/OS/VERSION $BCAST\n";
-print "---------------------------------------------------------------------\n";
-
-foreach $ip (@ipaddrs)		# loop through each IP address found
-{
-  $ip =~ s/\n//;		# strip newline from IP address
-
-# find the netbios names registered by each machine
-
-  open(NMBLOOKUP,"$SAMBABIN/nmblookup -r -A $ip|") || 
-	die("Can't get nmb name list.\n");
-  @nmblookup = <NMBLOOKUP>;
-  close NMBLOOKUP;
-
-# get the first <00> name
-
-  @name = grep(/<00>/,@nmblookup);
-  $_ = @name[0];
-  if ($_) {                     # we have a netbios name
-    if (/GROUP/) {		# is it a group name
-	($name, $aliases, $type, $length, @addresses) = 
-	gethostbyaddr(pack('C4',split('\.',$ip)),2);
-	if (! $name) {			# could not get name
-	    $name = "unknown nis name";
-	}
-    } else {
-	/(.{1,15})\s+<00>\s+/;
-	$name = $1;
-    }
-
-# do an smbclient command on the netbios name.
-
-    open(SMB,"$SAMBABIN/smbclient -N -L $name -I $ip -U% |") ||
-	die("Can't do smbclient command.\n");
-    @smb = <SMB>;
-    close SMB;
-
-    if ($DEBUG) {		# if -d flag print results of nmblookup and smbclient
-      print "===============================================================\n";
-      print @nmblookup;
-      print @smb;
-    }
-
-# look for the OS= string
-
-    @info = grep(/OS=/,@smb);
-    $_ = @info[0];
-    if ($_) {				# we found response
-      s/Domain=|OS=|Server=|\n//g;	# strip out descriptions to make line shorter
-
-    } else {				# no OS= string in response (WIN95 client)
-
-# for WIN95 clients get workgroup name from nmblookup response
-      @name = grep(/<00> - <GROUP>/,@nmblookup);
-      $_ = @name[0];
-      if ($_) {
-        /(.{1,15})\s+<00>\s+/;
-        $_ = "[$1]";
-      } else {
-	$_ = "Unknown Workgroup";
-      }
-    }
-
-# see if machine registered a local master browser name
-    if (grep(/<1d>/,@nmblookup)) {
-      $master = '+';			# indicate local master browser
-      if (grep(/<1b>/,@nmblookup)) {	# how about domain master browser?
-        $master = '*';			# indicate domain master browser
-      }
-    } else {
-      $master = ' ';			# not a browse master
-    }
-
-# line up info in 3 columns
-
-    print "$ip".' 'x(16-length($ip))."$name".' 'x(14-length($name))."$master"."$_\n";
-
-  } else {				# no netbios name found
-# try getting the host name
-    ($name, $aliases, $type, $length, @addresses) = 
-      gethostbyaddr(pack('C4',split('\.',$ip)),2);
-    if (! $name) {			# could not get name
-      $name = "unknown nis name";
-    }
-    if ($DEBUG) {			# if -d flag print results of nmblookup
-      print "===============================================================\n";
-      print @nmblookup;
-    }
-    print "$ip".' 'x(16-length($ip))."$name\n";
-  }
-} 
-
diff --git a/packaging/Mandrake/makerpms-cvs.sh b/packaging/Mandrake/makerpms-cvs.sh
deleted file mode 100644
index 08c4370b31..0000000000
--- a/packaging/Mandrake/makerpms-cvs.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-# makerpms-cvs.sh
-# A quick script to build RPMs from cvs to test packaging
-# Buchan Milne <bgmilne@cae.co.za>
-
-[ $# -lt 1 ] &&  echo "Usage: $0 <Samba version>" && exit 1
-
-VERSION=$1
-RELEASE=0.`date +%Y%m%d`
-shift
-
-# Replace PRELEASE and PVERSION with release number in all files ending with
-# .tmpl
-
-FILES=$(find . -name "*.tmpl" -type f)
-
-for i in $FILES;do 
-	NEW=$(echo $i|sed -e 's/\.tmpl//g'); 
-	cat $i |sed -e 's/PVERSION/'$VERSION'/g; s/PRELEASE/'$RELEASE'/g'> $NEW ;
-done
-
-#Change up three directories, rename directory to samba-$VERSION, change back
-#then run makerpms.sh
-
-
-CURRENT=$(pwd)
-pushd $(dirname $(dirname $(dirname $CURRENT)))
-SAMBA_DIR=$(basename $(dirname $(dirname $CURRENT)))
-mv $SAMBA_DIR samba-$VERSION
-pushd samba-$VERSION/source
-./autogen.sh
-popd
-pushd samba-$VERSION/packaging/Mandrake
-sh makerpms.sh $@
-popd
-mv samba-$VERSION $SAMBA_DIR
-popd
diff --git a/packaging/Mandrake/makerpms.sh.tmpl b/packaging/Mandrake/makerpms.sh.tmpl
deleted file mode 100644
index 5d06e2bbcc..0000000000
--- a/packaging/Mandrake/makerpms.sh.tmpl
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-# Copyright (C) John H Terpstra 1998-2002
-# Updated for RPM 3 by Jochen Wiedmann, joe@ispsoft.de
-# Changed for a generic tar file rebuild by abartlet@pcug.org.au
-# Taken from Red Hat build area by JHT
-# Changed by John H Terpstra to build on RH8.1 - should also work for earlier versions jht@samba.org
-# Changes from Buchan Milne <bgmilne@cae.co.za>
-
-# The following allows environment variables to override the target directories
-#   the alternative is to have a file in your home directory calles .rpmmacros
-#   containing the following:
-#   %_topdir  /home/mylogin/RPM
-#
-
-# rpm --eval should always give a correct answer for this
-SPECDIR=`rpm "$@" --eval "%{_specdir}"`
-SRCDIR=`rpm "$@" --eval "%{_sourcedir}"`
-
-# At this point the (SPECDIR and) SRCDIR vaiables must have a value!
-
-USERID=`id -u`
-GRPID=`id -g`
-VERSION='PVERSION'
-
-RPMVER=`rpm --version | awk '{print $3}'`
-echo The RPM Version on this machine is: $RPMVER
-
-case $RPMVER in
-    2*)
-       echo Building for RPM v2.x
-       sed -e "s/MANDIR_MACRO/\%\{prefix\}\/man/g" < samba2.spec > samba.spec
-       ;;
-    3*)
-       echo Building for RPM v3.x
-       sed -e "s/MANDIR_MACRO/\%\{prefix\}\/man/g" < samba2.spec > samba.spec
-       ;;
-    4*)
-       echo Building for RPM v4.x
-       sed -e "s/MANDIR_MACRO/\%\{_mandir\}/g" < samba2.spec > samba.spec
-       ;;
-    *)
-       echo "Unknown RPM version: `rpm --version`"
-       exit 1
-       ;;
-esac
-
-( cd ../../source; if [ -f Makefile ]; then make distclean; fi )
-( cd ../../.. ; chown -R ${USERID}.${GRPID} samba-${VERSION} )
-echo "Compressing the source as bzip2, may take a while ..."
-( cd ../../.. ; tar --exclude=CVS -cjf ${SRCDIR}/samba-${VERSION}.tar.bz2 samba-${VERSION} )
-
-cp -av samba.spec ${SPECDIR}
-# cp -a *.patch.bz2 *.xpm.bz2 smb.* samba.xinetd samba.log $SRCDIR
-# Prepare to allow straight patches synced from Mandrake cvs:
-# Updating of sources and patches can be done more easily and accurately
-# by using info in the spec file. It won't work for files that use an rpm
-# macro in their name, but that shouldn't be a problem.
-
-SOURCES=`awk '/^Source/ {print $2}' samba.spec |grep -v "%{"`
-PATCHES=`awk  '/^Patch/ {print $2}' samba.spec`
-
-for i in $PATCHES $SOURCES;do
-	# We have two cases to fix, one where it's bzip2'ed
-	# in the spec and not in CVS, one where it's bzip2'ed 
-	# in CVS but not in the spec
-	[ -e $i ] && cp -av $i $SRCDIR
-	i_nobz2=`echo $i|sed -e 's/.bz2$//'`
-	i_bz2=$i.bz2
-	[ -e $i_nobz2 ] && bzip2 -kf $i_nobz2  && mv -fv $i $SRCDIR
-	[ -e $i_bz2 ] && bunzip2 -kf $i_bz2 && mv -fv $i $SRCDIR
-done
-
-echo Getting Ready to build release package
-cd ${SPECDIR}
-rpm -ba -v --clean --rmsource samba.spec $@
-
-echo Done.
diff --git a/packaging/Mandrake/mount.cifs.8 b/packaging/Mandrake/mount.cifs.8
deleted file mode 100644
index 7ab1be305c..0000000000
--- a/packaging/Mandrake/mount.cifs.8
+++ /dev/null
@@ -1,181 +0,0 @@
-.\" 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/samba-2.2.0-buildroot.patch b/packaging/Mandrake/samba-2.2.0-buildroot.patch
deleted file mode 100644
index 72091a13bc..0000000000
--- a/packaging/Mandrake/samba-2.2.0-buildroot.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- samba-2.2.0/source/script/installbin.sh	Fri Jan 12 21:28:02 2001
-+++ samba-2.2.0/source/script/installbin.sh.207	Thu Apr 19 09:40:57 2001
-@@ -33,9 +33,9 @@
-  chmod $INSTALLPERMS $BINDIR/$p2
- 
-  # this is a special case, mount needs this in a specific location
-- if [ $p2 = smbmount ]; then
--   ln -sf $BINDIR/$p2 /sbin/mount.smbfs
-- fi
-+ #if [ $p2 = smbmount ]; then
-+ #  ln -sf $BINDIR/$p2 /sbin/mount.smbfs
-+ #fi
- done
- 
- 
diff --git a/packaging/Mandrake/samba-3.0-smbmount-sbin.patch b/packaging/Mandrake/samba-3.0-smbmount-sbin.patch
deleted file mode 100644
index 586fb3cff9..0000000000
--- a/packaging/Mandrake/samba-3.0-smbmount-sbin.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- samba-3.0alpha1/source/client/smbmount.c.orig	Fri Nov 30 02:29:22 2001
-+++ samba-3.0alpha1/source/client/smbmount.c	Thu Dec  6 00:48:57 2001
-@@ -468,7 +468,7 @@
- 	if (sys_fork() == 0) {
- 		char *smbmnt_path;
- 
--		asprintf(&smbmnt_path, "%s/smbmnt", dyn_BINDIR);
-+		asprintf(&smbmnt_path, "%s/smbmnt", dyn_SBINDIR);
- 		
- 		if (file_exist(smbmnt_path, NULL)) {
- 			execv(smbmnt_path, args);
diff --git a/packaging/Mandrake/samba-3.0.2a-smbldap-config.patch b/packaging/Mandrake/samba-3.0.2a-smbldap-config.patch
deleted file mode 100644
index 73abe817fd..0000000000
--- a/packaging/Mandrake/samba-3.0.2a-smbldap-config.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- samba-3.0.2a/examples/LDAP/smbldap-tools/smbldap_conf.pm.orig	2003-12-10 22:59:17.000000000 +0100
-+++ samba-3.0.2a/examples/LDAP/smbldap-tools/smbldap_conf.pm	2004-03-01 22:59:01.535482375 +0100
-@@ -101,22 +101,22 @@
- 
- # LDAP Suffix
- # Ex: $suffix = "dc=IDEALX,dc=ORG";
--$suffix = "dc=IDEALX,dc=COM";
-+$suffix = "dc=example,dc=com";
- 
- 
- # Where are stored Users
- # Ex: $usersdn = "ou=Users,$suffix"; for ou=Users,dc=IDEALX,dc=ORG
--$usersou = q(_USERS_);
-+$usersou = q(People);
- $usersdn = "ou=$usersou,$suffix";
- 
- # Where are stored Computers
- # Ex: $computersdn = "ou=Computers,$suffix"; for ou=Computers,dc=IDEALX,dc=ORG
--$computersou = q(_COMPUTERS_);
-+$computersou = q(Hosts);
- $computersdn = "ou=$computersou,$suffix";
- 
- # Where are stored Groups
- # Ex $groupsdn = "ou=Groups,$suffix"; for ou=Groups,dc=IDEALX,dc=ORG
--$groupsou = q(_GROUPS_);
-+$groupsou = q(Group);
- $groupsdn = "ou=$groupsou,$suffix";
- 
- # Default scope Used
-@@ -130,7 +130,7 @@
- ############################
- # Bind DN used 
- # Ex: $binddn = "cn=Manager,$suffix"; for cn=Manager,dc=IDEALX,dc=org
--$binddn = "cn=Manager,$suffix";
-+$binddn = "cn=root,$suffix";
- 
- # Bind DN passwd used
- # Ex: $bindpasswd = 'secret'; for 'secret'
-@@ -153,11 +153,11 @@
- # Login defs
- # Default Login Shell
- # Ex: $_userLoginShell = q(/bin/bash);
--$_userLoginShell = q(_LOGINSHELL_);
-+$_userLoginShell = q(/bin/bash);
- 
- # Home directory prefix (without username)
- # Ex: $_userHomePrefix = q(/home/);
--$_userHomePrefix = q(_HOMEPREFIX_);
-+$_userHomePrefix = q(/home);
- 
- # Gecos
- $_userGecos = q(System User);
-@@ -187,19 +187,19 @@
- # Ex: q(\\\\My-PDC-netbios-name\\homes) for \\My-PDC-netbios-name\homes
- # Just comment this if you want to use the smb.conf 'logon home' directive
- # and/or desabling roaming profiles
--$_userSmbHome = q(\\\\_PDCNAME_\\homes);
-+#$_userSmbHome = q(\\\\_PDCNAME_\\homes);
- 
- # The UNC path to profiles locations without the username last extension
- # (will be dynamically prepended)
- # Ex: q(\\\\My-PDC-netbios-name\\profiles\\) for \\My-PDC-netbios-name\profiles
- # Just comment this if you want to use the smb.conf 'logon path' directive
- # and/or desabling roaming profiles
--$_userProfile = q(\\\\_PDCNAME_\\profiles\\);
-+#$_userProfile = q(\\\\_PDCNAME_\\profiles\\);
- 
- # The default Home Drive Letter mapping
- # (will be automatically mapped at logon time if home directory exist)
- # Ex: q(U:) for U:
--$_userHomeDrive = q(_HOMEDRIVE_);
-+#$_userHomeDrive = q(_HOMEDRIVE_);
- 
- # The default user netlogon script name
- # if not used, will be automatically username.cmd
-@@ -216,7 +216,7 @@
- # prefer mkntpwd... most of the time, it's a wise choice :-) 
- $with_smbpasswd = 0;
- $smbpasswd = "/usr/bin/smbpasswd";
--$mk_ntpasswd = "/usr/local/sbin/mkntpwd";
-+$mk_ntpasswd = "/usr/sbin/mkntpwd";
- 
- # those next externals commands are kept fot the migration scripts and
- # for the populate script: this will be updated as soon as possible
diff --git a/packaging/Mandrake/samba-3.0.6-revert-libsmbclient-move.patch b/packaging/Mandrake/samba-3.0.6-revert-libsmbclient-move.patch
deleted file mode 100644
index c50cc2b228..0000000000
--- a/packaging/Mandrake/samba-3.0.6-revert-libsmbclient-move.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- samba-3.0.6/source/Makefile.in~	2004-08-19 15:39:11.000000000 +0200
-+++ samba-3.0.6/source/Makefile.in	2004-08-20 23:22:39.794171905 +0200
-@@ -1319,9 +1319,9 @@
- 	@$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir)
- 
- installclientlib: installdirs libsmbclient
--	@$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)$(LIBDIR)
--	-$(INSTALLCLIENTCMD_SH) bin/libsmbclient.@SHLIBEXT@ $(DESTDIR)$(LIBDIR)
--	-$(INSTALLCLIENTCMD_A) bin/libsmbclient.a $(DESTDIR)$(LIBDIR)
-+	@$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)$(LIBDIR)/../
-+	-$(INSTALLCLIENTCMD_SH) bin/libsmbclient.@SHLIBEXT@ $(DESTDIR)$(LIBDIR)/../
-+	-$(INSTALLCLIENTCMD_A) bin/libsmbclient.a $(DESTDIR)$(LIBDIR)/../
- 	@$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/include
- 	-$(INSTALLCMD) $(srcdir)/include/libsmbclient.h $(DESTDIR)${prefix}/include
- 
diff --git a/packaging/Mandrake/samba-print-pdf.sh b/packaging/Mandrake/samba-print-pdf.sh
deleted file mode 100644
index 973bb4f90e..0000000000
--- a/packaging/Mandrake/samba-print-pdf.sh
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/bash
-# samba-print-pdf
-# This is a script which allows you to set up a virtual printer on samba
-# which will take the file (generated by a postscript filter on windows)
-# and turn it into a PDF, informing the user of where it is when it
-# is done
-#
-# (c) Buchan Milne <bgmilne@cae.co.za> 2002 
-# License: GPLv2
-# Changelog
-# v0.0.6 20030428
-#  - Allow options passed as env. variables from print command
-#  - Inline and simplify sed (use tr) clean script
-#  - Ensure file arrives in PREFIX even if TEMP is used without provided name
-#  - Changes from Joshua M. Schmidlkofer <joshua@imr-net.com> 20030425
-#    - Debugging, adjustments, and corrections.
-#    - Stupid sed sanitizing script. [probably horribly inefficient also]. 
-#    - Temp file usage cleanup.
-# v0.0.5 20020723
-#  - Add support for preset settings
-#  - Allow passing of filename provided by client as final filename
-#
-# Arguments:
-# $1 = file (usually passed with %s from samba)
-# $2 = unix prefix to where to place the file (~%u should work)
-# $3 = windows prefix to the same location (//%L/%u should work)
-# $4 = user/computer to send a notification to (%u or %m)
-# $5 = IP address of client (%I)
-# $6 = Name of destination file without extension (%J)
-# $7 = PDF setting (prepress,print,screen etc)
-#
-# If you want to customise any of the following configuration defaults, 
-# you can place them in the file /etc/samba/print-pdf.conf.
-# If you need to modify anything in this script, please provide me with your
-# changes, preferably in such a way that the changes are configurable.
-
-PS2PDF=ps2pdf13 
-OPTIONS="-dAutoFilterColorImages=false -sColorImageFilter=FlateEncode"
-#Values taken from arguments:
-INPUT=$1
-PREFIX="$2"
-WINBASE=$(echo "$3"|sed -e 's,/,\\\\,g')
-#NAME=`echo "$6"|sed -e 's/[&/:{}\\\[<>$#@*^!?=|]/-/g;s/\]/-/g'`
-NAME=`echo "$6"|tr '[:punct:]' '[-*]'`
-
-# Source config file if it exists:
-CONFFILE=/etc/samba/print-pdf.conf
-[ -e $CONFFILE ] && . $CONFFILE
-
-#Values not taken as arguments, could be set via env. vars (?) or config file
-KEEP_PS=${KEEP_PS=0}
-PERMS=${PERMS=640}
-BASEFILE=${BASEFILE=pdf-service}
-TEMP="${TEMP=$2}"
-UMASK=${UMASK=006}
-
-#Make sure that destination directory exists
-mkdir -p "$PREFIX"
-
-INFILE=$(basename $INPUT)
-
-umask $UMASK
-
-[ -n "$NAME" ] && TEMP="$PREFIX"
-
-#make a temp file to use for the output of the PDF
-OUTPUT=`mktemp -q $TEMP/$BASEFILE-XXXXXX`
-if [ $? -ne 0 ]; then
-	echo "$0: Can't create temp file $TEMP/$OUTPUT, exiting..."
-	exit 1
-fi
-if [ -n "$NAME" ]; then
-	FINALOUTPUT="$PREFIX/$NAME"
-else
-	FINALOUTPUT="$OUTPUT"
-fi
-if [ -n "$7" ]; then
-	OPTIONS="$OPTIONS -dPDFSETTINGS=/${7#pdf-}"
-else
-	OPTIONS="$OPTIONS -dPDFSETTINGS=/default"
-fi
-
-WIN_OUTPUT="$WINBASE\\"`basename "$FINALOUTPUT"`
-#mv "$INPUT" "$INPUT.ps";INPUT="$INPUT.ps"
-
-# create the pdf
-$PS2PDF $OPTIONS "$INPUT" "$OUTPUT.pdf" >/dev/null 2>&1
-mv -f "${OUTPUT}.pdf" "${FINALOUTPUT}".pdf
-
-# Generate a message to send to the user, and deal with the original file:
-MESSAGE=$(echo "Your PDF file has been created as $WIN_OUTPUT.pdf\n")
-
-
-# Cleanup
-if [ $KEEP_PS != 0 ];then
-	mv -f $INPUT "${FINALOUTPUT}".ps
-	MESSAGE=$(echo "$MESSAGE and your postscript file as $WIN_OUTPUT.ps")
-	# Fix permissions on the generated files
-	chmod $PERMS "${FINALOUTPUT}".ps "${FINALOUTPUT}".pdf
-else
-	rm -f $INPUT
-	# Fix permissions on the generated files
-	chmod $PERMS "${FINALOUTPUT}".pdf
-fi
-                                            
-#Remove empty file from mktemp:
-rm -f  $OUTPUT
-
-# Send notification to user
-echo -e $MESSAGE|smbclient -M $4 -I $5 -U "PDF Generator" >/dev/null 2>&1
-
diff --git a/packaging/Mandrake/samba-slapd-include.conf b/packaging/Mandrake/samba-slapd-include.conf
deleted file mode 100644
index 9c065b6f73..0000000000
--- a/packaging/Mandrake/samba-slapd-include.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# You should either include this file into your
-# /etc/openldap/slapd.conf, or add the contents (after editing), inside
-# the db definition your samba server will use.
-
-
-# Index the rid for samba:
-index	rid		eq
-
-
-# Basic samba acl:
-access to attrs=lmPassword,ntPassword
-	by dn="cn=root,dc=mydomain,dc=com" write
-	by dn="uid=root,ou=People,dc=mydomain,dc=com" write
-	by * none
-
diff --git a/packaging/Mandrake/samba.log b/packaging/Mandrake/samba.log
deleted file mode 100644
index 4e8b44b60e..0000000000
--- a/packaging/Mandrake/samba.log
+++ /dev/null
@@ -1,15 +0,0 @@
-/var/log/samba/log.nmb {
-    notifempty
-    missingok
-    postrotate
-	/usr/bin/killall -HUP nmbd
-    endscript
-}
-
-/var/log/samba/log.smb {
-    notifempty
-    missingok
-    postrotate
-	/usr/bin/killall -HUP smbd
-    endscript
-}
diff --git a/packaging/Mandrake/samba.pamd b/packaging/Mandrake/samba.pamd
deleted file mode 100644
index 30912de172..0000000000
--- a/packaging/Mandrake/samba.pamd
+++ /dev/null
@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth       required	/lib/security/pam_nologin.so
-auth       required	/lib/security/pam_stack.so service=system-auth
-account    required	/lib/security/pam_stack.so service=system-auth
-session    required	/lib/security/pam_stack.so service=system-auth
diff --git a/packaging/Mandrake/samba.xinetd b/packaging/Mandrake/samba.xinetd
deleted file mode 100644
index 59910336bb..0000000000
--- a/packaging/Mandrake/samba.xinetd
+++ /dev/null
@@ -1,15 +0,0 @@
-# default: on
-# description: SWAT is the Samba Web Admin Tool. Use swat \
-#	       to configure your Samba server. To use SWAT, \
-#	       connect to port 901 with your favorite web browser.
-service swat
-{
-	port	= 901
-	socket_type	= stream
-	wait 	= no
-	only_from = 127.0.0.1
-	user	= root
-	server	= /usr/sbin/swat
-	log_on_failure	+= USERID
-	disable = no
-}
diff --git a/packaging/Mandrake/samba2.spec.tmpl b/packaging/Mandrake/samba2.spec.tmpl
deleted file mode 100644
index 7b6bc2c49b..0000000000
--- a/packaging/Mandrake/samba2.spec.tmpl
+++ /dev/null
@@ -1,2622 +0,0 @@
-# Note that this file exists in Mandrake packaging cvs (as samba.spec)
-# and samba cvs (as packaging/Mandrake/samba2.spec.tmpl).
-# Keep in mind that any changes should take both locations into account
-# Considerable effort has gone into making this possible, so that only
-# one spec file is maintained, please don't break it.
-# It should be possible, without any changes to this file, to build
-# binary packages on most recent Mandrake releases:
-# 1)from official source releases, using 'cd packaging/Mandrake; sh makerpms.sh'
-# 2)from cvs snapshots, using 'cd packaging/Mandrake; sh makerpms-cvs.sh <ver>'
-# 3)using official source releases and updated Mandrake packaging, by
-#   'rpm -ba samba.spec'
-# As such, any sources or patches used in a build from a samba release or
-# cvs should be submitted for inclusion in samba cvs.
-
-%define pkg_name	samba
-%define ver 		3.0.8
-%define drel		1
-%define	subrel		1
-%define vscanver 	0.3.5
-%define libsmbmajor 	0
-%{?!mdkversion: %define mdkversion %(perl -pe '/(\d+)\.(\d)\.?(\d)?/; $_="$1$2".($3||0)' /etc/mandrake-release)}
-%define rel		%(case `hostname` in (n?.mandrakesoft.com) echo %drel;;(*) echo $[%drel-1].%subrel.$[%mdkversion/10];;esac)mdk
-%{?_with_stable_on_cluster: %define rel %(echo $[%{drel}-1].%subrel.$[%{mdkversion}/10]mdk)}
-%{?_with_official: %define rel %drel}
-
-%{!?lib: %global lib lib}
-%{!?mklibname: %global mklibname(ds) %lib%{1}%{?2:%{2}}%{?3:_%{3}}%{-s:-static}%{-d:-devel}}
-
-%define libname %mklibname smbclient %libsmbmajor
-
-# Version and release replaced by samba-team at release from samba cvs
-%define pversion PVERSION
-%define prelease PRELEASE
-
-#Check to see if p(version|release) has been replaced (1 if replaced)
-%define have_pversion %(if [ "%pversion" = `echo "pversion" |tr '[:lower:]' '[:upper:]'` ];then echo 0; else echo 1; fi)
-%define have_prelease %(if [ "%prelease" = `echo "prelease" |tr '[:lower:]' '[:upper:]'` ];then echo 0; else echo 1; fi)
-
-%if %have_pversion
-%define source_ver 	%{pversion}
-# Don't abort for stupid reasons on builds from tarballs:
-%global	_unpackaged_files_terminate_build	0
-%global	_missing_doc_files_terminate_build	0
-%else
-%define source_ver 	%{ver}
-%endif
-
-# We might have a prerelease:
-%define have_pre %(echo %source_ver|awk '{p=0} /[a-z,A-Z][a-z,A-Z]/ {p=1} {print p}')
-%if %have_pre
-%define pre_ver %(perl -e '$name="%source_ver"; print ($name =~ /(.*?)[a-z]/);')
-%define pre_pre %(echo %source_ver|sed -e 's/%pre_ver//g')
-%endif
-
-# Check to see if we are running a build from a tarball release from samba.org
-# (%have_pversion) If so, disable vscan, unless explicitly requested
-# (--with vscan).
-%define build_vscan 	1
-%if %have_pversion
-%define build_vscan 	0
-%{?_with_vscan: %define build_vscan 1}
-%endif
-
-# We now do detection of the Mandrake release we are building on:
-%define build_mdk82 %(if [ `awk '{print $4}' /etc/mandrake-release` = 8.2 ];then echo 1; else echo 0; fi)
-%define build_mdk81 %(if [ `awk '{print $4}' /etc/mandrake-release` = 8.1 ];then echo 1; else echo 0; fi)
-%define build_mdk80 %(if [ `awk '{print $4}' /etc/mandrake-release` = 8.0 ];then echo 1; else echo 0; fi)
-%define build_mdk72 %(if [ `awk '{print $4}' /etc/mandrake-release` = 7.2 ];then echo 1; else echo 0; fi)
-%define build_non_default 0
-
-# Default options
-%define build_alternatives	0
-%define build_system	0
-%define build_acl 	1
-%define build_winbind 	1
-%define build_wins 	1
-%define build_ldap 	0
-%define build_ads	1
-%define build_scanners	0
-# CUPS supports functionality for 'printcap name = cups' (9.0 and later):
-%define build_cupspc	0
-# %_{pre,postun}_service are provided by rpm-helper in 9.0 and later
-%define have_rpmhelper	1
-
-# Set defaults for each version
-%if %mdkversion >= 1000
-%define build_system	1
-%endif
-
-%if %mdkversion >= 920
-%define build_alternatives	1
-%endif
-
-%if %mdkversion >= 910
-%define build_cupspc	1
-%endif
-
-%if %build_mdk82
-%define have_rpmhelper	0
-%endif
-
-%if %build_mdk81
-%define build_winbind	0
-%define build_wins	0
-%define have_rpmhelper	0
-%endif
-
-%if %build_mdk80
-%define build_acl	0
-%define build_winbind	0
-%define build_wins	0
-%define build_ads	0
-%define have_rpmhelper	1
-%endif
-
-%if %build_mdk72
-%define build_acl	0
-%define build_winbind	0
-%define build_wins	0
-%define build_ads	0
-%define have_rpmhelper	1
-%endif
-
-
-# Allow commandline option overrides (borrowed from Vince's qmail srpm):
-# To use it, do rpm [-ba|--rebuild] --with 'xxx'
-# Check if the rpm was built with the defaults, otherwise we inform the user
-%define build_non_default 0
-%{?_with_system: %global build_system 1}
-%{?_without_system: %global build_system 0}
-%{?_with_acl: %global build_acl 1}
-%{?_with_acl: %global build_non_default 1}
-%{?_without_acl: %global build_acl 0}
-%{?_without_acl: %global build_non_default 1}
-%{?_with_winbind: %global build_winbind 1}
-%{?_with_winbind: %global build_non_default 1}
-%{?_without_winbind: %global build_winbind 0}
-%{?_without_winbind: %global build_non_default 1}
-%{?_with_wins: %global build_wins 1}
-%{?_with_wins: %global build_non_default 1}
-%{?_without_wins: %global build_wins 0}
-%{?_without_wins: %global build_non_default 1}
-%{?_with_ldap: %global build_ldap 1}
-%{?_with_ldap: %global build_non_default 1}
-%{?_without_ldap: %global build_ldap 0}
-%{?_without_ldap: %global build_non_default 1}
-%{?_with_ads: %global build_ads 1}
-%{?_with_ads: %global build_non_default 1}
-%{?_without_ads: %global build_ads 0}
-%{?_without_ads: %global build_non_default 1}
-%{?_with_scanners: %global build_scanners 1}
-%{?_with_scanners: %global build_non_default 1}
-%{?_without_scanners: %global build_scanners 0}
-%{?_without_scanners: %global build_non_default 1}
-%{?_with_vscan: %global build_vscan 1}
-%{?_with_vscan: %global build_non_default 1}
-%{?_without_vscan: %global build_vscan 0}
-%{?_without_vscan: %global build_non_default 1}
-
-# As if that weren't enough, we're going to try building with antivirus
-# support as an option also
-%global build_clamav 	0
-%global build_fprot 	0
-%global build_fsav 	0
-%global build_icap 	0
-%global build_kaspersky 0
-%global build_mks 	0
-%global build_nai 	0
-%global build_openav	0
-%global build_sophos 	0
-%global build_symantec 	0
-%global build_trend	0
-%if %build_vscan
-# These we build by default
-%global build_clamav 	1
-%global build_icap 	1
-%endif
-%if %build_vscan && %build_scanners
-# These scanners are built if scanners are selected
-# symantec requires their library present and must be selected 
-# individually
-%global build_fprot 	1
-%global build_fsav 	1
-%global build_kaspersky 1
-%global build_mks 	1
-%global build_nai 	1
-%global build_openav	1
-%global build_sophos 	1
-%global build_trend 	1
-%endif
-%if %build_vscan
-%{?_with_fprot: %{expand: %%global build_fprot 1}}
-%{?_with_kaspersky: %{expand: %%global build_kaspersky 1}}
-%{?_with_mks: %{expand: %%global build_mks 1}}
-%{?_with_openav: %{expand: %%global build_openav 1}}
-%{?_with_sophos: %{expand: %%global build_sophos 1}}
-#%{?_with_symantec: %{expand: %%global build_symantec 1}}
-%{?_with_trend: %{expand: %%global build_trend 1}}
-%global vscandir samba-vscan-%{vscanver}
-%endif
-%global vfsdir examples.bin/VFS
-
-#Standard texts for descriptions:
-%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: These packages of samba-%{version}, are provided, parallel installable\\nwith samba-2.2.x, to allow easy migration from samba-2.2.x to samba-%{version},\\nbut are not officially supported")
-
-#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}')
-
-#Define sets of binaries that we can use in globs and loops:
-%global commonbin net,ntlm_auth,rpcclient,smbcacls,smbcquotas,smbpasswd,smbtree,testparm,testprns
-
-%global serverbin 	editreg,pdbedit,profiles,smbcontrol,smbstatus,tdbbackup,tdbdump
-%global serversbin nmbd,samba,smbd,mkntpwd
-
-%global clientbin 	findsmb,nmblookup,smbclient,smbmnt,smbmount,smbprint,smbspool,smbtar,smbumount,smbget
-%global client_bin 	mount.cifs
-%global client_sbin 	mount.smb,mount.smbfs
-
-%global testbin 	debug2html,smbtorture,msgtest,masktest,locktest,locktest2,nsstest,vfstest
-
-%ifarch alpha
-%define build_expsam xml
-%else
-%define build_expsam mysql,xml,pgsql
-%endif
-
-#Workaround missing macros in 8.x:
-%{!?perl_vendorlib: %{expand: %%global perl_vendorlib %{perl_sitearch}/../}}
-
-# Determine whether this is the system samba or not.
-%if %build_system
-%define samba_major	%{nil}
-%else
-%define samba_major	3
-%endif
-# alternatives_major is %{nil} if we aren't system and not using alternatives
-%if !%build_system || %build_alternatives
-%define alternative_major 3
-%else
-%define alternative_major %{nil}
-%endif
-
-Summary: Samba SMB server.
-Name: %{pkg_name}%{samba_major}
-
-%if %have_pre
-Version: %{pre_ver}
-%else
-Version: %{source_ver}
-%endif
-
-%if %have_prelease && !%have_pre
-Release: 0.%{prelease}.%{rel}
-%endif
-%if %have_prelease && %have_pre
-Release: 0.%{pre_pre}.%{rel}
-%endif
-%if !%have_prelease && !%have_pre
-Release: %{rel}
-%endif
-%if !%have_prelease && %have_pre
-Release: 0.%{pre_pre}.%{rel}
-%endif
-
-License: GPL
-Group: System/Servers
-Source: ftp://samba.org/pub/samba/samba-%{source_ver}.tar.bz2
-URL:	http://www.samba.org
-Source1: samba.log
-Source3: samba.xinetd
-Source4: swat_48.png.bz2
-Source5: swat_32.png.bz2
-Source6: swat_16.png.bz2
-Source7: README.%{name}-mandrake-rpm
-%if %build_vscan
-Source8: samba-vscan-%{vscanver}.tar.bz2
-%endif
-%if %build_vscan && %mdkversion >= 920
-BuildRequires: file-devel
-%endif
-Source10: samba-print-pdf.sh.bz2
-Source11: smb-migrate.bz2
-Patch1: smbw.patch.bz2
-Patch4: samba-3.0-smbmount-sbin.patch.bz2
-Patch5:	samba-3.0.2a-smbldap-config.patch.bz2
-%if !%have_pversion
-# Version specific patches: current version
-Patch7: samba-3.0.5-lib64.patch.bz2
-Patch9:	samba-3.0.6-smbmount-unixext.patch.bz2
-Patch11: samba-3.0.7-mandrake-packaging.patch.bz2
-%else
-# Version specific patches: upcoming version
-Patch8:	samba-3.0.6-revert-libsmbclient-move.patch.bz2
-%endif
-# Limbo patches (applied to prereleases, but not preleases, ie destined for
-# samba CVS)
-%if %have_pversion && %have_pre
-%endif
-Requires: pam >= 0.64, samba-common = %{version}
-BuildRequires: pam-devel readline-devel libncurses-devel popt-devel
-BuildRequires: libxml2-devel postgresql-devel
-%ifnarch alpha
-BuildRequires: mysql-devel
-%endif
-%if %build_acl
-BuildRequires: libacl-devel
-%endif
-%if %build_mdk72
-BuildRequires: cups-devel
-%else
-BuildRequires: libcups-devel
-%endif
-BuildRequires: libldap-devel
-%if %build_ads
-BuildRequires: libldap-devel krb5-devel
-%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Prefix: /usr
-Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall
-Prereq: fileutils sed /bin/grep
-
-%description
-Samba provides an SMB server which can be used to provide
-network services to SMB (sometimes called "Lan Manager")
-clients, including various versions of MS Windows, OS/2,
-and other Linux machines. Samba also provides some SMB
-clients, which complement the built-in SMB filesystem
-in Linux. Samba uses NetBIOS over TCP/IP (NetBT) protocols
-and does NOT need NetBEUI (Microsoft Raw NetBIOS frame)
-protocol.
-
-Samba-3.0 features working NT Domain Control capability and
-includes the SWAT (Samba Web Administration Tool) that
-allows samba's smb.conf file to be remotely managed using your
-favourite web browser. For the time being this is being
-enabled on TCP port 901 via xinetd. SWAT is now included in
-it's own subpackage, samba-swat.
-
-Please refer to the WHATSNEW.txt document for fixup information.
-This binary release includes encrypted password support.
-
-Please read the smb.conf file and ENCRYPTION.txt in the
-docs directory for implementation details.
-%if %have_pversion
-%message_bugzilla samba3
-%endif 
-%if !%build_system
-%message_system
-%endif
-%if %build_non_default
-WARNING: This RPM was built with command-line options. Please
-see README.%{name}-mandrake-rpm in the documentation for
-more information.
-%endif
-
-%package server
-URL:	http://www.samba.org
-Summary: Samba (SMB) server programs.
-Requires: %{name}-common = %{version}
-%if %have_rpmhelper
-PreReq:		rpm-helper
-%endif
-Group: Networking/Other
-%if %build_system
-Provides: samba
-Obsoletes: samba
-Provides:  samba-server-ldap
-Obsoletes: samba-server-ldap
-Provides:  samba3-server
-Obsoletes: samba3-server
-%else
-#Provides: samba-server
-%endif
-
-%description server
-Samba-server provides a SMB server which can be used to provide
-network services to SMB (sometimes called "Lan Manager")
-clients. Samba uses NetBIOS over TCP/IP (NetBT) protocols
-and does NOT need NetBEUI (Microsoft Raw NetBIOS frame)
-protocol.
-
-Samba-3.0 features working NT Domain Control capability and
-includes the SWAT (Samba Web Administration Tool) that
-allows samba's smb.conf file to be remotely managed using your
-favourite web browser. For the time being this is being
-enabled on TCP port 901 via xinetd. SWAT is now included in
-it's own subpackage, samba-swat.
-
-Please refer to the WHATSNEW.txt document for fixup information.
-This binary release includes encrypted password support.
-
-Please read the smb.conf file and ENCRYPTION.txt in the
-docs directory for implementation details.
-%if %have_pversion
-%message_bugzilla samba3-server
-%endif
-%if !%build_system
-%message_system
-%endif
-
-%package client
-URL:	http://www.samba.org
-Summary: Samba (SMB) client programs.
-Group: Networking/Other
-Requires: %{name}-common = %{version}
-%if %build_alternatives
-#Conflicts:	samba-client < 2.2.8a-9mdk
-%endif
-%if %build_system
-Provides:  samba3-client
-Obsoletes: samba3-client
-Obsoletes: smbfs
-%else
-#Provides: samba-client
-%endif
-%if !%build_system && %build_alternatives
-Provides: samba-client
-%endif
-
-%description client
-Samba-client provides some SMB clients, which complement the built-in
-SMB filesystem in Linux. These allow the accessing of SMB shares, and
-printing to SMB printers.
-%if %have_pversion
-%message_bugzilla samba3-client
-%endif
-%if !%build_system
-%message_system
-%endif
-
-%package common
-URL:	http://www.samba.org
-Summary: Files used by both Samba servers and clients.
-Group: System/Servers
-%if %build_system
-Provides:  samba-common-ldap
-Obsoletes: samba-common-ldap
-Provides:  samba3-common
-Obsoletes: samba3-common
-%else
-#Provides: samba-common
-%endif
-
-%description common
-Samba-common provides files necessary for both the server and client
-packages of Samba.
-%if %have_pversion
-%message_bugzilla samba3-common
-%endif
-%if !%build_system
-%message_system
-%endif
-
-%package doc
-URL:	http://www.samba.org
-Summary: Documentation for Samba servers and clients.
-Group: System/Servers
-Requires: %{name}-common = %{version}
-%if %build_system
-Obsoletes: samba3-doc
-Provides:  samba3-doc
-%else
-#Provides: samba-doc
-%endif
-
-%description doc
-Samba-doc provides documentation files for both the server and client
-packages of Samba.
-%if %have_pversion
-%message_bugzilla samba3-doc
-%endif
-%if !%build_system
-%message_system
-%endif
-
-%package swat
-URL:	http://www.samba.org
-Summary: The Samba Web Administration Tool.
-Requires: %{name}-server = %{version}
-Requires: xinetd
-Group: System/Servers
-%if %build_system
-Provides:  samba-swat-ldap
-Obsoletes: samba-swat-ldap
-Provides:  samba3-swat
-Obsoletes: samba3-swat
-%else
-#Provides: samba-swat
-%endif
-
-%description swat
-SWAT (the Samba Web Administration Tool) allows samba's smb.conf file
-to be remotely managed using your favourite web browser. For the time
-being this is being enabled on TCP port 901 via xinetd. Note that
-SWAT does not use SSL encryption, nor does it preserve comments in
-your smb.conf file. Webmin uses SSL encryption by default, and
-preserves comments in configuration files, even if it does not display
-them, and is therefore the preferred method for remotely managing
-Samba.
-%if %have_pversion
-%message_bugzilla samba3-swat
-%endif
-%if !%build_system
-%message_system
-%endif
-
-%if %build_winbind
-%package winbind
-URL:	http://www.samba.org
-Summary: Samba-winbind daemon, utilities and documentation
-Group: System/Servers
-Requires: %{name}-common = %{version}
-%endif
-%if %build_winbind && !%build_system
-Conflicts: samba-winbind
-%endif
-%if %build_winbind
-%description winbind
-Provides the winbind daemon and testing tools to allow authentication 
-and group/user enumeration from a Windows or Samba domain controller.
-%endif
-%if %have_pversion
-%message_bugzilla samba3-winbind
-%endif
-%if !%build_system
-%message_system
-%endif
-
-%if %build_wins
-%package -n nss_wins%{samba_major}
-URL:	http://www.samba.org
-Summary: Name Service Switch service for WINS
-Group: System/Servers
-Requires: %{name}-common = %{version}
-PreReq: glibc
-%endif
-%if %build_wins && !%build_system
-Conflicts: nss_wins
-%endif
-%if %build_wins
-%description -n nss_wins%{samba_major}
-Provides the libnss_wins shared library which resolves NetBIOS names to 
-IP addresses.
-%endif
-%if %have_pversion
-%message_bugzilla nss_wins3
-%endif
-%if !%build_system
-%message_system
-%endif
-
-%if %{?_with_test:1}%{!?_with_test:0}
-%package test
-URL:	http://www.samba.org
-Summary: Debugging and benchmarking tools for samba
-Group: System/Servers
-Requires: %{name}-common = %{version}
-%endif
-%if %build_system && %{?_with_test:1}%{!?_with_test:0}
-Provides:  samba3-test samba3-debug
-Obsoletes: samba3-test samba3-debug
-%endif
-%if !%build_system && %{?_with_test:1}%{!?_with_test:0}
-Provides: samba-test samba3-debug
-Obsoletes: samba3-debug
-%endif
-%if %{?_with_test:1}%{!?_with_test:0}
-
-%description test
-This package provides tools for benchmarking samba, and debugging
-the correct operation of tools against smb servers.
-%endif
-
-%if %build_system
-%package -n %{libname}
-URL:		http://www.samba.org
-Summary: 	SMB Client Library
-Group:		System/Libraries
-Provides:	libsmbclient
-
-%description -n %{libname}
-This package contains the SMB client library, part of the samba
-suite of networking software, allowing other software to access
-SMB shares.
-%endif
-%if %have_pversion && %build_system
-%message_bugzilla %{libname}
-%endif
-
-%if %build_system
-%package -n %{libname}-devel
-URL:		http://www.samba.org
-Summary: 	SMB Client Library Development files
-Group:		Development/C
-Provides:	libsmbclient-devel
-Requires:       %{libname} = %{version}-%{release}
-
-%description -n %{libname}-devel
-This package contains the development files for the SMB client
-library, part of the samba suite of networking software, allowing
-the development of other software to access SMB shares.
-%endif
-%if %have_pversion && %build_system
-%message_bugzilla %{libname}-devel
-%endif
-
-%if %build_system
-%package -n %{libname}-static-devel
-URL:            http://www.samba.org
-Summary:        SMB Client Static Library Development files
-Group:          System/Libraries
-Provides:       libsmbclient-static-devel = %{version}-%{release}
-Requires:       %{libname}-devel = %{version}-%{release}
-
-%description -n %{libname}-static-devel
-This package contains the static development files for the SMB
-client library, part of the samba suite of networking software,
-allowing the development of other software to access SMB shares.
-%endif
-%if %have_pversion && %build_system
-%message_bugzilla %{libname}-devel
-%endif
-
-#%package passdb-ldap
-#URL:		http://www.samba.org
-#Summary:	Samba password database plugin for LDAP
-#Group:		System/Libraries
-#
-#%description passdb-ldap
-#The passdb-ldap package for samba provides a password database
-#backend allowing samba to store account details in an LDAP
-#database
-#_if %have_pversion
-#_message_bugzilla samba3-passdb-ldap
-#_endif
-#_if !%build_system
-#_message_system
-#_endif
-
-%ifnarch alpha
-%package passdb-mysql
-URL:		http://www.samba.org
-Summary:	Samba password database plugin for MySQL
-Group:		System/Libraries
-Requires:	%{name}-server = %{version}-%{release}
-%endif
-%ifnarch alpha && %build_system
-Obsoletes:	samba3-passdb-mysql 
-Provides:	samba3-passdb-mysql 
-%endif
-%ifnarch alpha
-
-%description passdb-mysql
-The passdb-mysql package for samba provides a password database
-backend allowing samba to store account details in a MySQL
-database
-%endif
-
-#does postgresql build on alpha?
-#ifnarch alpha
-%package passdb-pgsql
-URL:		http://www.samba.org
-Summary:	Samba password database plugin for PostgreSQL
-Group:		System/Libraries
-Requires:	%{name}-server = %{version}-%{release}
-#endif
-#ifnarch alpha && %build_system
-%if %build_system
-Obsoletes:	samba3-passdb-pgsql
-Provides:	samba3-passdb-pgsql
-%endif
-#ifnarch alpha
-
-%description passdb-pgsql
-The passdb-pgsql package for samba provides a password database
-backend allowing samba to store account details in a PostgreSQL
-database
-#endif
-
-%package passdb-xml
-URL:		http://www.samba.org
-Summary:	Samba password database plugin for XML files
-Group:		System/Libraries
-Requires:	%{name}-server = %{version}-%{release}
-%if %build_system
-Obsoletes:	samba3-passdb-xml 
-Provides:	samba3-passdb-xml 
-%endif
-
-%description passdb-xml
-The passdb-xml package for samba provides a password database
-backend allowing samba to store account details in XML files.
-%if %have_pversion
-%message_bugzilla samba3-passdb-xml
-%endif
-%if !%build_system
-%message_system
-%endif
-
-#Antivirus packages:
-%if %build_clamav
-%package vscan-clamav
-Summary: On-access virus scanning for samba using Clam Antivirus
-Group: System/Servers
-Requires: %{name}-server = %{version}
-Provides: %{name}-vscan
-Requires: clamd
-%description vscan-clamav
-A vfs-module for samba to implement on-access scanning using the
-Clam antivirus scanner daemon.
-%endif
-
-%if %build_fprot
-%package vscan-fprot
-Summary: On-access virus scanning for samba using FPROT
-Group: System/Servers
-Requires: %{name}-server = %{version}
-Provides: %{name}-vscan
-%description vscan-fprot
-A vfs-module for samba to implement on-access scanning using the
-FPROT antivirus software (which must be installed to use this).
-%endif
-
-%if %build_fsav
-%package vscan-fsecure
-Summary: On-access virus scanning for samba using F-Secure
-Group: System/Servers
-Requires: %{name}-server = %{version}
-Provides: %{name}-vscan
-%description vscan-fsecure
-A vfs-module for samba to implement on-access scanning using the
-F-Secure antivirus software (which must be installed to use this).
-%endif
-
-%if %build_icap
-%package vscan-icap
-Summary: On-access virus scanning for samba using Clam Antivirus
-Group: System/Servers
-Requires: %{name}-server = %{version}
-Provides: %{name}-icap
-%description vscan-icap
-A vfs-module for samba to implement on-access scanning using
-ICAP-capable antivirus software.
-%endif
-
-%if %build_kaspersky
-%package vscan-kaspersky
-Summary: On-access virus scanning for samba using Kaspersky
-Group: System/Servers
-Requires: %{name}-server = %{version}
-Provides: %{name}-vscan
-%description vscan-kaspersky
-A vfs-module for samba to implement on-access scanning using the
-Kaspersky antivirus software (which must be installed to use this).
-%endif
-
-%if %build_mks
-%package vscan-mks
-Summary: On-access virus scanning for samba using MKS
-Group: System/Servers
-Requires: %{name}-server = %{version}
-Provides: %{name}-vscan
-%description vscan-mks
-A vfs-module for samba to implement on-access scanning using the
-MKS antivirus software (which must be installed to use this).
-%endif
-
-%if %build_nai
-%package vscan-nai
-Summary: On-access virus scanning for samba using NAI McAfee
-Group: System/Servers
-Requires: %{name}-server = %{version}
-Provides: %{name}-vscan
-%description vscan-nai
-A vfs-module for samba to implement on-access scanning using the
-NAI McAfee antivirus software (which must be installed to use this).
-%endif
-
-%if %build_openav
-%package vscan-openav
-Summary: On-access virus scanning for samba using OpenAntivirus
-Group: System/Servers
-Requires: %{name}-server = %{version}
-Provides: %{name}-vscan
-%description vscan-openav
-A vfs-module for samba to implement on-access scanning using the
-OpenAntivirus antivirus software (which must be installed to use this).
-%endif
-
-%if %build_sophos
-%package vscan-sophos
-Summary: On-access virus scanning for samba using Sophos
-Group: System/Servers
-Requires: %{name}-server = %{version}
-Provides: %{name}-vscan
-%description vscan-sophos
-A vfs-module for samba to implement on-access scanning using the
-Sophos antivirus software (which must be installed to use this).
-%endif
-
-%if %build_symantec
-%package vscan-symantec
-Summary: On-access virus scanning for samba using Symantec
-Group: System/Servers
-Requires: %{name}-server = %{version}
-Provides: %{name}-vscan
-Autoreq: 0
-%description vscan-symantec
-A vfs-module for samba to implement on-access scanning using the
-Symantec antivirus software (which must be installed to use this).
-%endif
-
-
-%if %build_trend
-%package vscan-trend
-Summary: On-access virus scanning for samba using Trend
-Group: System/Servers
-Requires: %{name}-server = %{version}
-Provides: %{name}-vscan
-%description vscan-trend
-A vfs-module for samba to implement on-access scanning using the
-Trend antivirus software (which must be installed to use this).
-%endif
-
-%prep
-
-# Allow users to query build options with --with options:
-#%define opt_status(%1)	%(echo %{1})
-%if %{?_with_options:1}%{!?_with_options:0}
-%define opt_status(%{1})	%(if [ %{1} -eq 1 ];then echo enabled;else echo disabled;fi)
-#exit 1
-%{error: }
-%{error:Build options available are:}
-%{error:--with[out] system   Build as the system samba package [or as samba3]}
-%{error:--with[out] acl      Build with support for file ACLs          - %opt_status %build_acl}
-%{error:--with[out] winbind  Build with Winbind support                - %opt_status %build_winbind}
-%{error:--with[out] wins     Build with WINS name resolution support   - %opt_status %build_wins}
-%{error:--with[out] ldap     Build with legacy (samba2) LDAP support   - %opt_status %build_ldap}
-%{error:--with[out] ads      Build with Active Directory support       - %opt_status %build_ads}
-%{error:--with[out] scanners Enable on-access virus scanners           - %opt_status %build_scanners}
-%{error: }
-%else
-%{error: }
-%{error: This rpm has build options available, use --with options to see them}
-%{error: }
-%endif
-
-%if %{?_with_options:1}%{!?_with_options:0} && %build_scanners
-#{error:--with scanners enables the following:%{?build_clamav:clamav,}%{?build_icap:icap,}%{?build_fprot:fprot,}%{?build_mks:mks,}%{?build_openav:openav,}%{?build_sophos:sophos,}%{?build_symantec:symantec,}%{?build_trend:trend}}
-%{error:--with scanners enables the following: clamav,icap,fprot,fsav,mks,nai,openav,sophos,trend}
-%{error: }
-%{error:To enable others (requires development libraries for the scanner):}
-%{error:--with symantec           Enable on-access scanning with Symantec        - %opt_status %build_symantec}
-%{error: }
-%endif
-
-%if %{?_with_options:1}%{!?_with_options:0}
-clear
-exit 1
-%endif
-
-
-%if %build_non_default
-RPM_EXTRA_OPTIONS="\
-%{?_with_system: --with system}\
-%{?_without_system: --without system}\
-%{?_with_acl: --with acl}\
-%{?_without_acl: --without acl}\
-%{?_with_winbind: --with winbind}\
-%{?_without_winbind: --without winbind}\
-%{?_with_wins: --with wins}\
-%{?_without_wins: --without wins}\
-%{?_with_ldap: --with ldap}\
-%{?_without_ldap: --without ldap}\
-%{?_with_ads: --with ads}\
-%{?_without_ads: --without ads}\
-%{?_with_scanners: --with scanners}\
-%{?_without_scanners: --without scanners}\
-"
-echo "Building a non-default rpm with the following command-line arguments:"
-echo "$RPM_EXTRA_OPTIONS"
-echo "This rpm was built with non-default options, thus, to build ">%{SOURCE7}
-echo "an identical rpm, you need to supply the following options">>%{SOURCE7}
-echo "at build time: $RPM_EXTRA_OPTIONS">>%{SOURCE7}
-echo -e "\n%{name}-%{version}-%{release}\n">>%{SOURCE7}
-%else
-echo "This rpm was built with default options">%{SOURCE7}
-echo -e "\n%{name}-%{version}-%{release}\n">>%{SOURCE7}
-%endif
-
-%if %build_vscan
-%setup -q -a 8 -n %{pkg_name}-%{source_ver}
-%else
-%setup -q -n %{pkg_name}-%{source_ver}
-%endif
-#%patch111 -p1
-%patch1 -p1 -b .smbw
-%patch4 -p1 -b .sbin
-%patch5 -p1
-# Version specific patches: current version
-%if !%have_pversion
-echo "Applying patches for current version: %{ver}"
-#%patch7 -p1 -b .lib64
-%patch9 -p1 -b .unixext
-#%patch10 -p1 -b .rpcclient-libs
-%patch11 -p1 -b .mdk
-%else
-# Version specific patches: upcoming version
-echo "Applying patches for new versions: %{pversion}"
-%patch8 -p1 -b .libsmbdir
-%endif
-
-# Limbo patches
-%if %have_pversion && %have_pre
-echo "Appling patches which should only be applied to prereleases"
-%endif
-
-# Fix quota compilation in glibc>2.3
-%if %mdkversion >= 910 && %mdkversion < 1000
-#grep "<linux/quota.h>" source/smbd/quotas.c >/dev/null && \
-perl -pi -e 's@<linux/quota.h>@<sys/quota.h>@' source/smbd/quotas.c
-%endif
-
-cp %{SOURCE7} .
-
-# Make a copy of examples so that we have a clean one for doc:
-cp -a examples examples.bin
-
-%if %build_vscan
-cp -a %{vscandir} %{vfsdir}
-#fix stupid directory names:
-#mv %{vfsdir}/%{vscandir}/openantivirus %{vfsdir}/%{vscandir}/oav
-# Inline replacement of config dir
-for av in clamav fprotd fsav icap kavp mksd mcdaemon oav sophos symantec trend
- do
-	[ -e %{vfsdir}/%{vscandir}/*/vscan-$av.h ] && perl -pi -e \
-	's,^#define PARAMCONF "/etc/samba,#define PARAMCONF "/etc/%{name},' \
-	%{vfsdir}/%{vscandir}/*/vscan-$av.h
-done
-#Inline edit vscan header:
-perl -pi -e 's/^# define SAMBA_VERSION_MAJOR 2/# define SAMBA_VERSION_MAJOR 3/g;s/# define SAMBA_VERSION_MINOR 2/# define SAMBA_VERSION_MINOR 0/g' %{vfsdir}/%{vscandir}/include/vscan-global.h
-%endif
-
-# Edit some files when not building system samba:
-%if !%build_system
-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 {} \;
-
-#make better doc trees:
-chmod -R a+rX examples docs *Manifest* README  Roadmap COPYING
-mkdir -p clean-docs/samba-doc
-cp -a examples docs clean-docs/samba-doc
-mv -f clean-docs/samba-doc/examples/libsmbclient clean-docs/
-rm -Rf clean-docs/samba-doc/docs/{docbook,manpages,htmldocs,using_samba}
-ln -s %{_datadir}/swat%{samba_major}/using_samba/ clean-docs/samba-doc/docs/using_samba
-ln -sf %{_datadir}/swat%{samba_major}/help/ clean-docs/samba-doc/docs/htmldocs
-
-%build
-#%serverbuild
-(cd source
-CFLAGS=`echo "$RPM_OPT_FLAGS"|sed -e 's/-g//g'`
-%if %gcc331
-CFLAGS=`echo "$CFLAGS"|sed -e 's/-O2/-O/g'`
-%endif
-./autogen.sh
-# Don't use --with-fhs now, since it overrides libdir, it sets configdir, 
-# lockdir,piddir logfilebase,privatedir and swatdir
-%configure      --prefix=%{_prefix} \
-                --sysconfdir=%{_sysconfdir}/%{name} \
-                --localstatedir=/var \
-                --with-libdir=%{_libdir}/%{name} \
-                --with-privatedir=%{_sysconfdir}/%{name} \
-		--with-lockdir=/var/cache/%{name} \
-		--with-piddir=/var/run \
-                --with-swatdir=%{_datadir}/swat%{samba_major} \
-                --with-configdir=%{_sysconfdir}/%{name} \
-		--with-logfilebase=/var/log/%{name} \
-%if !%build_ads
-		--with-ads=no	\
-%endif
-                --with-automount \
-                --with-smbmount \
-                --with-pam \
-                --with-pam_smbpass \
-%if %build_ldap
-		--with-ldapsam \
-%endif
-		--with-tdbsam \
-                --with-syslog \
-                --with-quotas \
-                --with-utmp \
-		--with-manpages-langs=en \
-%if %build_acl
-		--with-acl-support      \
-%endif
-		--disable-mysqltest \
-		--with-expsam=%build_expsam \
-		--program-suffix=%{samba_major} 
-#		--with-shared-modules=pdb_ldap,idmap_ldap \
-#		--with-manpages-langs=en,ja,pl	\
-#_if !%build_system
-#                --with-smbwrapper \
-#_endif		
-#		--with-nisplussam \
-#                --with-fhs \
-
-#Fix the make file so we don't create debug information on 9.2
-%if %mdkversion == 920
-perl -pi -e 's/-g //g' Makefile
-%endif
-
-perl -pi -e 's|-Wl,-rpath,%{_libdir}||g;s|-Wl,-rpath -Wl,%{_libdir}||g' Makefile
-
-make proto_exists
-%make all libsmbclient smbfilter wins modules %{?_with_test: torture debug3html bin/log2pcap} bin/editreg bin/smbget client/mount.cifs
-
-)
-
-# Build mkntpasswd in examples/LDAP/ for smbldaptools
-make -C examples.bin/LDAP/smbldap-tools/mkntpwd
-
-%if %build_vscan
-echo -e "\n\nBuild antivirus VFS modules\n\n"
-pushd %{vfsdir}/%{vscandir}
-%configure
-#sed -i -e 's,openantivirus,oav,g' Makefile
-sed -i -e 's,^\(.*clamd socket name.*=\).*,\1 /var/lib/clamav/clamd.socket,g' clamav/vscan-clamav.conf
-make
-popd
-%endif
-
-# Build antivirus vfs objects
-%if %build_symantec
-echo "Building Symantec"
-make -C %{vfsdir}/%{vscandir} symantec
-%endif
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT
-
-#Ensure all docs are readable
-chmod a+r docs -R
-
-# Any entries here mean samba makefile is *really* broken:
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/vfs
-
-(cd source
-make DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir}/%{name} MANDIR=%{_mandir} install installclientlib installmodules)
-
-install -m755 source/bin/{editreg,smbget} %{buildroot}/%{_bindir}
-
-#need to stay
-mkdir -p $RPM_BUILD_ROOT/{sbin,bin}
-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}
-mkdir -p $RPM_BUILD_ROOT/var/spool/%{name}
-mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/%{name}/{netlogon,profiles,printers}
-mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/%{name}/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
-mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/%{name}/codepages/src
-mkdir -p $RPM_BUILD_ROOT/%{_lib}/security
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/vfs
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts
-
-#smbwrapper and pam_winbind not handled by make, pam_smbpass.so doesn't build
-#install -m 755 source/bin/smbwrapper.so $RPM_BUILD_ROOT%{_libdir}/smbwrapper%{samba_major}.so
-install -m 755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass%{samba_major}.so
-install -m 755 source/nsswitch/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so
-
-install -m755 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libdir}/libsmbclient.a
-pushd $RPM_BUILD_ROOT/%{_libdir}
-[ -f libsmbclient.so ] && mv -f libsmbclient.so libsmbclient.so.%{libsmbmajor}
-ln -sf libsmbclient.so.%{libsmbmajor} libsmbclient.so
-popd
-
-# smbsh forgotten
-#install -m 755 source/bin/smbsh $RPM_BUILD_ROOT%{_bindir}/
-
-%if %build_vscan
-%makeinstall_std -C %{vfsdir}/%{vscandir}
-install -m 644 %{vfsdir}/%{vscandir}/*/vscan-*.conf %{buildroot}/%{_sysconfdir}/%{name}
-%endif
-	
-#libnss_* not handled by make:
-# Install the nsswitch library extension file
-for i in wins winbind; do
-  install -m755 source/nsswitch/libnss_${i}.so $RPM_BUILD_ROOT/%{_lib}/libnss_${i}.so
-done
-# Make link for wins and winbind resolvers
-( cd $RPM_BUILD_ROOT/%{_lib}; ln -s libnss_wins.so libnss_wins.so.2; ln -s libnss_winbind.so libnss_winbind.so.2)
-
-%if %{?_with_test:1}%{!?_with_test:0}
-for i in {%{testbin}};do
-  install -m755 source/bin/${i} $RPM_BUILD_ROOT/%{_bindir}/${i}%{samba_major}
-done
-%endif
-
-# Install other stuff
-
-#        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/%{_initrddir}/smb%{samba_major}
-        install -m755 packaging/Mandrake/smb.init $RPM_BUILD_ROOT/%{_sbindir}/%{name}
-	install -m755 packaging/Mandrake/winbind.init $RPM_BUILD_ROOT/%{_initrddir}/winbind
-#	install -m755 packaging/Mandrake/wrepld.init $RPM_BUILD_ROOT/%{_initrddir}/wrepld%{samba_major}
-	install -m755 packaging/Mandrake/winbind.init $RPM_BUILD_ROOT/%{_sbindir}/winbind
-        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
-#
-        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:
-for i in examples/LDAP/smbldap-tools/*.pl; do
-	install -m 750 $i $RPM_BUILD_ROOT/%{_datadir}/%{name}/scripts/
-	ln -s %{_datadir}/%{name}/scripts/`basename $i` $RPM_BUILD_ROOT/%{_bindir}/`basename $i|sed -e 's/\.pl//g'`%{samba_major}
-done
-
-install -m 750 examples/LDAP/smbldap-tools/smbldap_tools.pm $RPM_BUILD_ROOT/%{_datadir}/%{name}/scripts/
-
-# The conf file	
-install -m 640 examples/LDAP/smbldap-tools/smbldap_conf.pm $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
-
-#Fix the smbldap-tools when not system samba:
-%if !%build_system
-perl -pi -e 's/^(use|package)(\s+)smbldap_(\w+);$/${1}${2}smbldap_${3}%{samba_major};/g' \
-%{buildroot}/%{_sysconfdir}/%{name}/smbldap_conf.pm \
-%{buildroot}/%{_datadir}/%{name}/scripts/smbldap*.p?
-perl -pi -e 's,/usr/local/sbin/mkntpwd,/usr/sbin/mkntpwd%{samba_major},g;s,553,421,g' %{buildroot}/%{_sysconfdir}/%{name}/smbldap_conf.pm
-perl -pi -e 's,\$smbldap_conf::SID,\$smbldap_conf3::SID,g' %{buildroot}/%{_datadir}/%{name}/scripts/smbldap*.p?
-%endif
-perl -pi -e 's,/usr/local/sbin/smbldap-passwd.pl,%{_datadir}/%{name}/scripts/smbldap-passwd.pl,g' %{buildroot}/%{_datadir}/%{name}/scripts/smbldap-useradd.pl 
-
-# Link both smbldap*.pm into vendor-perl (any better ideas?)
-mkdir -p %{buildroot}/%{perl_vendorlib}
-ln -s %{_sysconfdir}/%{name}/smbldap_conf.pm $RPM_BUILD_ROOT/%{perl_vendorlib}/smbldap_conf%{samba_major}.pm
-ln -s %{_datadir}/%{name}/scripts/smbldap_tools.pm $RPM_BUILD_ROOT/%{perl_vendorlib}/smbldap_tools%{samba_major}.pm
-#mkntpwd
-install -m750 examples.bin/LDAP/smbldap-tools/mkntpwd/mkntpwd %{buildroot}/%{_sbindir}/mkntpwd%{samba_major}
-
-# Samba smbpasswd migration script:
-install -m755 examples/LDAP/convertSambaAccount $RPM_BUILD_ROOT/%{_datadir}/%{name}/scripts/
-
-# 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/%{_sysconfdir}/%{name}/smb-winbind.conf
-
-# Some inline fixes for smb.conf for non-winbind use
-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/%{_sysconfdir}/%{name}/smb.conf
-%if %build_cupspc
-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
-
-#%if !%build_system
-# Fix script paths in smb.conf
-#perl -pi -e 's,%{_datadir}/samba,%{_datadir}/%{name},g' %{buildroot}/%{_sysconfdir}/%{name}/smb*.conf
-#%endif
-
-
-#install mount.cifs
-install -m755 source/client/mount.cifs %{buildroot}/bin/mount.cifs%{samba_major}
-
-        echo 127.0.0.1 localhost > $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/lmhosts
-
-# Link smbspool to CUPS (does not require installed CUPS)
-
-        mkdir -p $RPM_BUILD_ROOT/%{_libdir}/cups/backend
-        ln -s %{_bindir}/smbspool%{alternative_major} $RPM_BUILD_ROOT/%{_libdir}/cups/backend/smb%{alternative_major}
-
-# xinetd support
-
-        mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d
-        install -m644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/swat%{samba_major}
-
-# menu support
-
-mkdir -p $RPM_BUILD_ROOT%{_menudir}
-cat > $RPM_BUILD_ROOT%{_menudir}/%{name}-swat << EOF
-?package(%{name}-swat):\
-command="gnome-moz-remote http://localhost:901/" \
-needs="gnome" \
-icon="swat%{samba_major}.png" \
-section="Configuration/Networking" \
-title="Samba Configuration (SWAT)" \
-longtitle="The Swat Samba Administration Tool"
-?package(%{name}-swat):\
-command="sh -c '\$BROWSER http://localhost:901/'" \ 
-needs="x11" \
-icon="swat%{samba_major}.png" \
-section="Configuration/Networking" \
-title="Samba Configuration (SWAT)" \
-longtitle="The Swat Samba Administration Tool"
-EOF
-
-mkdir -p $RPM_BUILD_ROOT%{_liconsdir} $RPM_BUILD_ROOT%{_iconsdir} $RPM_BUILD_ROOT%{_miconsdir}
-
-bzcat %{SOURCE4} > $RPM_BUILD_ROOT%{_liconsdir}/swat%{samba_major}.png
-bzcat %{SOURCE5} > $RPM_BUILD_ROOT%{_iconsdir}/swat%{samba_major}.png
-bzcat %{SOURCE6} > $RPM_BUILD_ROOT%{_miconsdir}/swat%{samba_major}.png
-
-bzcat %{SOURCE10}> $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/print-pdf
-bzcat %{SOURCE11}> $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/smb-migrate
-
-# Fix configs when not building system samba:
-
-#Client binaries will have suffixes while we use alternatives, even
-# if we are system samba
-%if !%build_system || %build_alternatives
-for OLD in %{buildroot}/%{_bindir}/{%{clientbin}} %{buildroot}/bin/%{client_bin} %{buildroot}/%{_libdir}/cups/backend/smb
-do
-    NEW=`echo ${OLD}%{alternative_major}`
-    [ -e $OLD ] && mv -f $OLD $NEW
-done
-for OLD in %{buildroot}/%{_mandir}/man?/{%{clientbin}}* %{buildroot}/%{_mandir}/man?/%{client_bin}*
-do
-    if [ -e $OLD ]
-    then
-        BASE=`perl -e '$_="'${OLD}'"; m,(%buildroot)(.*?)(\.[0-9]),;print "$1$2\n";'`
-        EXT=`echo $OLD|sed -e 's,'${BASE}',,g'`
-        NEW=`echo ${BASE}%{alternative_major}${EXT}`
-        mv $OLD $NEW
-    fi
-done		
-%endif
-rm -f %{buildroot}/sbin/mount.smbfs
-# Link smbmount to /sbin/mount.smb and /sbin/mount.smbfs
-#I don't think it's possible for make to do this ...
-(cd $RPM_BUILD_ROOT/sbin
-        ln -s ..%{_bindir}/smbmount%{alternative_major} mount.smb%{alternative_major}
-        ln -s ..%{_bindir}/smbmount%{alternative_major} mount.smbfs%{alternative_major}
-)
-# Server/common binaries are versioned only if not system samba:
-%if !%build_system
-for OLD in %{buildroot}/%{_bindir}/{%{commonbin}} %{buildroot}/%{_bindir}/{%{serverbin}} %{buildroot}/%{_sbindir}/{%{serversbin},swat}
-do
-    NEW=`echo ${OLD}%{alternative_major}`
-    mv $OLD $NEW -f ||:
-done
-# And the man pages too:
-for OLD in %{buildroot}/%{_mandir}/man?/{%{commonbin},%{serverbin},%{serversbin},swat,{%testbin},smb.conf,lmhosts}*
-do
-    if [ -e $OLD ]
-    then
-        BASE=`perl -e '$_="'${OLD}'"; m,(%buildroot)(.*?)(\.[0-9]),;print "$1$2\n";'`
-#        BASE=`perl -e '$name="'${OLD}'"; print "",($name =~ /(.*?)\.[0-9]/), "\n";'`
-	EXT=`echo $OLD|sed -e 's,'${BASE}',,g'`
-	NEW=`echo ${BASE}%{samba_major}${EXT}`
-	mv $OLD $NEW
-    fi
-done		
-# Replace paths in config files and init scripts:
-for i in smb ;do
-	perl -pi -e 's,/subsys/'$i',/subsys/'$i'%{samba_major},g' $RPM_BUILD_ROOT/%{_initrddir}/${i}%{samba_major}
-done
-for i in %{_sysconfdir}/%{name}/smb.conf %{_initrddir}/smb%{samba_major} %{_sbindir}/%{name} %{_initrddir}/winbind /%{_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,/usr/sbin/swat,%{_sbindir}/swat%{samba_major},g;s,wrepld,%{_sbindir}/wrepld%{samba_major},g' $RPM_BUILD_ROOT/$i;
-done
-# Fix xinetd file for swat:
-perl -pi -e 's,/usr/sbin,%{_sbindir},g' $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/swat%{samba_major}
-%endif
-
-#Clean up unpackaged files:
-for i in %{_bindir}/pam_smbpass.so %{_bindir}/smbwrapper.so;do
-rm -f %{buildroot}/$i
-done
-
-# (sb) make a smb.conf.clean we can use for the merge, since an existing
-# smb.conf won't get overwritten
-cp $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/smb.conf $RPM_BUILD_ROOT/%{_datadir}/%{name}/smb.conf.clean
-
-# (sb) leave a README.mdk.conf to explain what has been done
-cat << EOF > $RPM_BUILD_ROOT/%{_datadir}/%{name}/README.mdk.conf
-In order to facilitate upgrading an existing samba install, and merging
-previous configuration data with any new syntax used by samba3, a merge
-script has attempted to combine your local configuration data with the
-new conf file format.  The merged data is in smb.conf, with comments like
-
-	# *** merged from original smb.conf: ***
-
-near the additional entries.  Any local shares should have been appended to
-smb.conf.  A log of what took place should be in: 
-
-	/var/log/samba/smb-migrate.log
-
-A clean samba3 smb.conf is in /usr/share/samba, named smb.conf.clean.
-Your original conf should be /etc/samba/smb.conf.tomerge.
-
-The actual merge script is /usr/share/samba/scripts/smb-migrate.
-
-Questions/issues: sbenedict@mandrakesoft.com
-
-EOF
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post server
-
-%_post_service smb%{samba_major}
-#%_post_service wrepld%{samba_major}
-
-# Add a unix group for samba machine accounts
-groupadd -frg 421 machines
-
-# Migrate tdb's from /var/lock/samba (taken from official samba spec file):
-for i in /var/lock/samba/*.tdb
-do
-if [ -f $i ]; then
-	newname=`echo $i | sed -e's|var\/lock\/samba|var\/cache\/samba|'`
-	echo "Moving $i to $newname"
-	mv $i $newname
-fi
-done
-
-%post common
-# Basic migration script for pre-2.2.1 users,
-# since smb config moved from /etc to %{_sysconfdir}/samba
-
-# Let's create a proper %{_sysconfdir}/samba/smbpasswd file
-[ -f %{_sysconfdir}/%{name}/smbpasswd ] || {
-	echo "Creating password file for samba..."
-	touch %{_sysconfdir}/%{name}/smbpasswd
-}
-
-# And this too, in case we don't have smbd to create it for us
-[ -f /var/cache/%{name}/unexpected.tdb ] || {
-	touch /var/cache/%{name}/unexpected.tdb
-}
-
-# Let's define the proper paths for config files
-perl -pi -e 's/(\/etc\/)(smb)/\1%{name}\/\2/' %{_sysconfdir}/%{name}/smb.conf
-
-# Fix the logrotate.d file from smb and nmb to smbd and nmbd
-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 %{_sysconfdir}/MACHINE.SID ] && mv -f %{_sysconfdir}/MACHINE.SID %{_sysconfdir}/%{name}/ ||:
-
-%triggerpostun common -- samba-common < 3.0.1-3mdk
-# (sb) merge any existing smb.conf with new syntax file
-if [ $1 = 2 ]; then
-	# (sb) save existing smb.conf for merge
-	echo "Upgrade: copy smb.conf to smb.conf.tomerge for merging..."
-	cp -f %{_sysconfdir}/%{name}/smb.conf %{_sysconfdir}/%{name}/smb.conf.tomerge
-	echo "Upgrade: merging previous smb.conf..."
-	if [ -f %{_datadir}/%{name}/smb.conf.clean ]; then
-		cp %{_datadir}/%{name}/smb.conf.clean %{_sysconfdir}/%{name}/smb.conf
-		cp %{_datadir}/%{name}/README.mdk.conf %{_sysconfdir}/%{name}/
-		%{_datadir}/%{name}/scripts/smb-migrate commit
-	fi
-fi
-
-%postun common
-if [ -f %{_sysconfdir}/%{name}/README.mdk.conf ];then rm -f %{_sysconfdir}/%{name}/README.mdk.conf;fi
-
-%if %build_winbind
-%post winbind
-if [ $1 = 1 ]; then
-    /sbin/chkconfig winbind on
-    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 %{_sysconfdir}/nsswitch.conf |grep -v 'winbind' >/dev/null
-        if [ $? = 0 ];then
-            echo "Adding a winbind entry to the $i section of %{_sysconfdir}/nsswitch.conf"
-            awk '/^'$i'/ {print $0 " winbind"};!/^'$i'/ {print}' %{_sysconfdir}/nsswitch.conf.rpmtemp >%{_sysconfdir}/nsswitch.conf;
-	    cp -af %{_sysconfdir}/nsswitch.conf %{_sysconfdir}/nsswitch.conf.rpmtemp
-        else
-            echo "$i entry found in %{_sysconfdir}/nsswitch.conf"
-        fi
-    done
-    if [ -f %{_sysconfdir}/nsswitch.conf.rpmtemp ];then rm -f %{_sysconfdir}/nsswitch.conf.rpmtemp;fi
-fi
-
-%preun winbind
-if [ $1 = 0 ]; then
-	echo "Removing winbind entries from %{_sysconfdir}/nsswitch.conf"
-	perl -pi -e 's/ winbind//' %{_sysconfdir}/nsswitch.conf
-
-	/sbin/chkconfig winbind reset
-fi
-%endif %build_winbind
-
-%if %build_wins
-%post -n nss_wins%{samba_major}
-if [ $1 = 1 ]; then
-    cp -af %{_sysconfdir}/nsswitch.conf %{_sysconfdir}/nsswitch.conf.rpmsave
-    grep '^hosts' %{_sysconfdir}/nsswitch.conf |grep -v 'wins' >/dev/null
-    if [ $? = 0 ];then
-        echo "Adding a wins entry to the hosts section of %{_sysconfdir}/nsswitch.conf"
-        awk '/^hosts/ {print $0 " wins"};!/^hosts/ {print}' %{_sysconfdir}/nsswitch.conf.rpmsave >%{_sysconfdir}/nsswitch.conf;
-    else
-        echo "wins entry found in %{_sysconfdir}/nsswitch.conf"
-    fi
-#    else
-#        echo "Upgrade, leaving nsswitch.conf intact"
-fi
-
-%preun -n nss_wins%{samba_major}
-if [ $1 = 0 ]; then
-	echo "Removing wins entry from %{_sysconfdir}/nsswitch.conf"
-	perl -pi -e 's/ wins//' %{_sysconfdir}/nsswitch.conf
-#else
-#	echo "Leaving %{_sysconfdir}/nsswitch.conf intact"
-fi
-%endif %build_wins
-
-%preun server
-
-%_preun_service smb%{samba_major}
-#%_preun_service wrepld%{samba_major}
-
-if [ $1 = 0 ] ; then
-#    /sbin/chkconfig --level 35 smb reset
-# Let's not loose /var/cache/samba
-
-    if [ -d /var/cache/%{name} ]; then
-      mv -f /var/cache/%{name} /var/cache/%{name}.BAK
-    fi
-fi
-
-%post swat
-if [ -f /var/lock/subsys/xinetd ]; then
-        service xinetd reload >/dev/null 2>&1 || :
-fi
-%update_menus
-
-%postun swat
-
-# Remove swat entry from xinetd
-if [ $1 = 0 -a -f %{_sysconfdir}/xinetd.conf ] ; then
-rm -f %{_sysconfdir}/xinetd.d/swat%{samba_major}
-	service xinetd reload &>/dev/null || :
-fi
-
-if [ "$1" = "0" -a -x /usr/bin/update-menus ]; then /usr/bin/update-menus || true ; fi
-
-%clean_menus
-
-%if %build_system
-%post -n %{libname} -p /sbin/ldconfig
-%postun -n %{libname} -p /sbin/ldconfig
-%endif
-
-%if %build_alternatives
-%post client
-
-update-alternatives --install %{_bindir}/smbclient smbclient \
-%{_bindir}/smbclient%{alternative_major} 10 \
-$(for i in {/bin/mount.cifs,/sbin/{%{client_sbin}},%{_bindir}/{%{clientbin}}};do
-j=`basename $i`
-[ "$j" = "smbclient" ] || \
-echo -n " --slave ${i} ${j} ${i}%{alternative_major}";done) \
---slave %{_libdir}/cups/backend/smb cups_smb %{_libdir}/cups/backend/smb%{alternative_major} || \
-update-alternatives --auto smbclient
-
-%preun client
-[ $1 = 0 ] && update-alternatives --remove smbclient %{_bindir}/smbclient%{alternative_major} ||:
-%endif
-
-%if %build_alternatives
-%triggerpostun client -- samba-client, samba2-client
-[ ! -e %{_bindir}/smbclient ] && update-alternatives --auto smbclient || :
-%endif
-
-%files server
-%defattr(-,root,root)
-%(for i in %{_sbindir}/{%{serversbin}}%{samba_major};do echo $i;done)
-%(for i in %{_bindir}/{%{serverbin}}%{samba_major};do echo $i;done)
-%attr(755,root,root) /%{_lib}/security/pam_smbpass*
-%dir %{_libdir}/%{name}/vfs
-%{_libdir}/%{name}/vfs/*.so
-%if %build_vscan
-%exclude %{_libdir}/%{name}/vfs/vscan*.so
-%endif
-%dir %{_libdir}/%{name}/pdb
-
-%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
-%(for i in %{_mandir}/man?/{%{serverbin},%{serversbin}}%{samba_major}\.[0-9]*;do echo $i|grep -v mkntpwd;done)
-%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(2775,root,adm) %dir %{_localstatedir}/%{name}/printers/*
-%attr(1777,root,root) %dir /var/spool/%{name}
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/scripts
-%attr(0755,root,root) %{_datadir}/%{name}/scripts/print-pdf
-%attr(0750,root,adm) %{_datadir}/%{name}/scripts/smbldap*.pl
-%attr(0750,root,adm) %{_bindir}/smbldap*
-%attr(0640,root,adm) %config(noreplace) %{_sysconfdir}/%{name}/smbldap_conf.pm
-%attr(0644,root,root) %{_datadir}/%{name}/scripts/smbldap_tools.pm
-%{perl_vendorlib}/*.pm
-#%attr(0700,root,root) %{_datadir}/%{name}/scripts/*port_smbpasswd.pl
-%attr(0755,root,root) %{_datadir}/%{name}/scripts/convertSambaAccount
-
-
-%files doc
-%defattr(-,root,root)
-%doc README COPYING Manifest Read-Manifest-Now
-%doc WHATSNEW.txt Roadmap
-%doc README.%{name}-mandrake-rpm
-%doc clean-docs/samba-doc/docs
-%doc clean-docs/samba-doc/examples
-%attr(-,root,root) %{_datadir}/swat%{samba_major}/using_samba/
-
-%files swat
-%defattr(-,root,root)
-%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/
-%lang(ja) %{_datadir}/swat%{samba_major}/lang/ja
-%lang(tr) %{_datadir}/swat%{samba_major}/lang/tr
-%{_mandir}/man8/swat*.8*
-%lang(de) %{_libdir}/%{name}/de.msg
-%lang(en) %{_libdir}/%{name}/en.msg
-%lang(fr) %{_libdir}/%{name}/fr.msg
-%lang(it) %{_libdir}/%{name}/it.msg
-%lang(ja) %{_libdir}/%{name}/ja.msg
-%lang(nl) %{_libdir}/%{name}/nl.msg
-%lang(pl) %{_libdir}/%{name}/pl.msg
-%lang(tr) %{_libdir}/%{name}/tr.msg
-#%doc swat/README
-
-%files client
-%defattr(-,root,root)
-%(for i in %{_bindir}/{%{clientbin}}%{alternative_major};do echo $i;done)
-%(for i in %{_mandir}/man?/{%{clientbin}}%{alternative_major}.?.*;do echo $i|grep -v smbprint;done)
-#xclude %{_mandir}/man?/smbget*
-%{_mandir}/man5/smbgetrc%{alternative_major}.5*
-%ifnarch alpha
-%(for i in /sbin/{%{client_sbin}}%{alternative_major};do echo $i;done)
-%attr(4755,root,root) /bin/mount.cifs%{alternative_major}
-%attr(755,root,root) %{_bindir}/smbmount%{alternative_major}
-%attr(4755,root,root) %{_bindir}/smbumount%{alternative_major}
-%attr(4755,root,root) %{_bindir}/smbmnt%{alternative_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*
-%endif
-# Link of smbspool to CUPS
-/%{_libdir}/cups/backend/smb%{alternative_major}
-
-%files common
-%defattr(-,root,root)
-%dir /var/cache/%{name}
-%dir /var/log/%{name}
-%dir /var/run/%{name}
-%(for i in %{_bindir}/{%{commonbin},tdbtool}%{samba_major};do echo $i;done)
-%(for i in %{_mandir}/man?/{%{commonbin}}%{samba_major}\.[0-9]*;do echo $i;done)
-#%{_libdir}/smbwrapper%{samba_major}.so
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*.dat
-%{_libdir}/%{name}/charset
-#%{_libdir}/%{name}/lowcase.dat
-#%{_libdir}/%{name}/valid.dat
-%dir %{_sysconfdir}/%{name}
-%attr(-,root,root) %config(noreplace) %{_sysconfdir}/%{name}/smb.conf
-%attr(-,root,root) %config(noreplace) %{_sysconfdir}/%{name}/smb-winbind.conf
-%attr(-,root,root) %config(noreplace) %{_sysconfdir}/%{name}/lmhosts
-%dir %{_localstatedir}/%{name}
-%attr(-,root,root) %{_localstatedir}/%{name}/codepages
-%{_mandir}/man5/smb.conf*.5*
-%{_mandir}/man5/lmhosts*.5*
-#%{_mandir}/man7/Samba*.7*
-%dir %{_datadir}/swat%{samba_major}
-%attr(0750,root,adm) %{_datadir}/%{name}/scripts/smb-migrate
-%attr(-,root,root) %{_datadir}/%{name}/smb.conf.clean
-%attr(-,root,root) %{_datadir}/%{name}/README.mdk.conf
-
-%if %build_winbind
-%files winbind
-%defattr(-,root,root)
-%{_sbindir}/winbindd
-%{_sbindir}/winbind
-%{_bindir}/wbinfo
-%attr(755,root,root) /%{_lib}/security/pam_winbind*
-%attr(755,root,root) /%{_lib}/libnss_winbind*
-%attr(-,root,root) %config(noreplace) %{_initrddir}/winbind
-%attr(-,root,root) %config(noreplace) %{_sysconfdir}/pam.d/system-auth-winbind*
-%{_mandir}/man8/winbindd*.8*
-%{_mandir}/man1/wbinfo*.1*
-%endif
-
-%if %build_wins
-%files -n nss_wins%{samba_major}
-%defattr(-,root,root)
-%attr(755,root,root) /%{_lib}/libnss_wins.so*
-%endif
-
-%if %{?_with_test:1}%{!?_with_test:0}
-%files test
-%defattr(-,root,root)
-%(for i in %{_bindir}/{%{testbin}}%{samba_major};do echo $i;done)
-%{_mandir}/man1/vfstest%{samba_major}*.1*
-%exclude %{_mandir}/man1/log2pcap*.1*
-%else
-%exclude %{_mandir}/man1/vfstest%{samba_major}*.1*
-%exclude %{_mandir}/man1/log2pcap*.1*
-%endif
-
-%if %build_system
-%files -n %{libname}
-%defattr(-,root,root)
-%{_libdir}/libsmbclient.so.*
-%else
-%exclude %{_libdir}/libsmbclient.so.*
-%endif
-
-%if %build_system
-%files -n %{libname}-devel
-%defattr(-,root,root)
-%{_includedir}/*
-%{_libdir}/libsmbclient.so
-%doc clean-docs/libsmbclient/*
-%else
-%exclude %{_includedir}/*
-%exclude %{_libdir}/libsmbclient.so
-%endif
-
-%if %build_system
-%files -n %{libname}-static-devel
-%defattr(-,root,root)
-%{_libdir}/libsmbclient.a
-%else
-%exclude %{_libdir}/libsmbclient.a
-%endif
-
-#%files passdb-ldap
-#%defattr(-,root,root)
-#%{_libdir}/%{name}/*/*ldap.so
-
-%ifnarch alpha
-%files passdb-mysql
-%defattr(-,root,root)
-%{_libdir}/%{name}/pdb/*mysql.so
-%endif
-
-#ifnarch alpha
-%files passdb-pgsql
-%defattr(-,root,root)
-%{_libdir}/%{name}/pdb/*pgsql.so
-#endif
-
-%files passdb-xml
-%defattr(-,root,root)
-%{_libdir}/%{name}/pdb/*xml.so
-
-#Files for antivirus support:
-%if %build_clamav
-%files vscan-clamav
-%defattr(-,root,root)
-%{_libdir}/%{name}/vfs/vscan-clamav.so
-%config(noreplace) %{_sysconfdir}/%{name}/vscan-clamav.conf
-%doc %{vfsdir}/%{vscandir}/INSTALL
-%endif
-%if !%build_clamav && %build_vscan
-%exclude %{_libdir}/%{name}/vfs/vscan-clamav.so
-%exclude %{_sysconfdir}/%{name}/vscan-clamav.conf
-%endif
-
-%if %build_fprot
-%files vscan-fprot
-%defattr(-,root,root)
-%{_libdir}/%{name}/vfs/vscan-fprotd.so
-%config(noreplace) %{_sysconfdir}/%{name}/vscan-fprotd.conf
-%doc %{vfsdir}/%{vscandir}/INSTALL
-%endif
-%if !%build_fprot && %build_vscan
-%exclude %{_libdir}/%{name}/vfs/vscan-fprotd.so
-%exclude %{_sysconfdir}/%{name}/vscan-fprotd.conf
-%endif
-
-%if %build_fsav
-%files vscan-fsecure
-%defattr(-,root,root)
-%{_libdir}/%{name}/vfs/vscan-fsav.so
-%config(noreplace) %{_sysconfdir}/%{name}/vscan-fsav.conf
-%doc %{vfsdir}/%{vscandir}/INSTALL
-%endif
-%if !%build_fsav && %build_vscan
-%exclude %{_libdir}/%{name}/vfs/vscan-fsav.so
-%exclude %{_sysconfdir}/%{name}/vscan-fsav.conf
-%endif
-
-%if %build_icap
-%files vscan-icap
-%defattr(-,root,root)
-%{_libdir}/%{name}/vfs/vscan-icap.so
-%config(noreplace) %{_sysconfdir}/%{name}/vscan-icap.conf
-%doc %{vfsdir}/%{vscandir}/INSTALL
-%endif
-%if !%build_icap && %build_vscan
-%exclude %{_libdir}/%{name}/vfs/vscan-icap.so
-%exclude %{_sysconfdir}/%{name}/vscan-icap.conf
-%endif
-
-
-%if %build_kaspersky
-%files vscan-kaspersky
-%defattr(-,root,root)
-%{_libdir}/%{name}/vfs/vscan-kavp.so
-%config(noreplace) %{_sysconfdir}/%{name}/vscan-kavp.conf
-%doc %{vfsdir}/%{vscandir}/INSTALL
-%endif
-%if !%build_kaspersky && %build_vscan
-%exclude %{_libdir}/%{name}/vfs/vscan-kavp.so
-%exclude %{_sysconfdir}/%{name}/vscan-kavp.conf
-%endif
-
-%if %build_mks
-%files vscan-mks
-%defattr(-,root,root)
-%{_libdir}/%{name}/vfs/vscan-mksd.so
-%config(noreplace) %{_sysconfdir}/%{name}/vscan-mks*.conf
-%doc %{vfsdir}/%{vscandir}/INSTALL
-%endif
-%if !%build_mks && %build_vscan
-%exclude %{_libdir}/%{name}/vfs/vscan-mksd.so
-%exclude %{_sysconfdir}/%{name}/vscan-mks*.conf
-%endif
-
-%if %build_nai
-%files vscan-nai
-%defattr(-,root,root)
-%{_libdir}/%{name}/vfs/vscan-mcdaemon.so
-%config(noreplace) %{_sysconfdir}/%{name}/vscan-mcdaemon.conf
-%doc %{vfsdir}/%{vscandir}/INSTALL
-%endif
-%if !%build_nai && %build_vscan
-%exclude %{_libdir}/%{name}/vfs/vscan-mcdaemon.so
-%exclude %{_sysconfdir}/%{name}/vscan-mcdaemon.conf
-%endif
-
-%if %build_openav
-%files vscan-openav
-%defattr(-,root,root)
-%{_libdir}/%{name}/vfs/vscan-oav.so
-%config(noreplace) %{_sysconfdir}/%{name}/vscan-oav.conf
-%doc %{vfsdir}/%{vscandir}/INSTALL
-%endif
-%if !%build_openav && %build_vscan
-%exclude %{_libdir}/%{name}/vfs/vscan-oav.so
-%exclude %{_sysconfdir}/%{name}/vscan-oav.conf
-%endif
-
-%if %build_sophos
-%files vscan-sophos
-%defattr(-,root,root)
-%{_libdir}/%{name}/vfs/vscan-sophos.so
-%config(noreplace) %{_sysconfdir}/%{name}/vscan-sophos.conf
-%doc %{vfsdir}/%{vscandir}/INSTALL
-%endif
-%if !%build_sophos && %build_vscan
-%exclude %{_libdir}/%{name}/vfs/vscan-sophos.so
-%exclude %{_sysconfdir}/%{name}/vscan-sophos.conf
-%endif
-
-%if %build_symantec
-%files vscan-symantec
-%defattr(-,root,root)
-%{_libdir}/%{name}/vfs/vscan-symantec.so
-%config(noreplace) %{_sysconfdir}/%{name}/vscan-symantec.conf
-%doc %{vfsdir}/%{vscandir}/INSTALL
-%endif
-%if !%build_symantec && %build_vscan
-%exclude %{_sysconfdir}/%{name}/vscan-symantec.conf
-%endif
-
-%if %build_trend
-%files vscan-trend
-%defattr(-,root,root)
-%{_libdir}/%{name}/vfs/vscan-trend.so
-%config(noreplace) %{_sysconfdir}/%{name}/vscan-trend.conf
-%doc %{vfsdir}/%{vscandir}/INSTALL
-%endif
-%if !%build_trend && %build_vscan
-%exclude %{_libdir}/%{name}/vfs/vscan-trend.so
-%exclude %{_sysconfdir}/%{name}/vscan-trend.conf
-%endif
-
-%exclude %{_mandir}/man1/smbsh*.1*
-
-%changelog
-* Tue Nov 09 2004 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.8-1mdk
-- 3.0.8
-- add tdbtool to common
-- fix doc permissions (broken in tarball)
-
-* Fri Nov 05 2004 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.8-0.pre2.1mdk
-- 3.0.8pre2
-
-* Wed Oct 06 2004 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.7-3mdk
-- drop patch 23 to ldap schema (patch in 3.0.6 was to bring schema up-to-date
-  with pre-3.0.7 cvs) (#11960)
-- merge winbind init script fix into packaging patch
-- Don't set printcap name in pdf printer share (#11861)
-- allow official builds off-cluster (with _with_official macro defined)
-
-* Tue Sep 14 2004 Stew Benedict <sbenedict@mandrakesoft.com> 3.0.7-2mdk
-- fix typo in winbind init script that prevented stop
-  (in 3.0.6 too, patch27)
-
-* Mon Sep 13 2004 Stew Benedict <sbenedict@mandrakesoft.com> 3.0.7-1mdk
-- 3.0.7 (drop patch10,21,22,24,25,26; rediff patch23)
-
-* Thu Sep 09 2004 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.6-5mdk
-- patch for samba bug 1464
-- make release-depenent release tag more like security updates tags
-- sync smb.conf with drakwizard (which also fixes quoting of macros which
-  can have spaces)
-- add example admin share
-- patches from Gerald Carter
-
-* Mon Aug 31 2004 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.6-4mdk
-- Add Jerry's post-3.0.6 patches
-- fix bug 11088 
-
-* Fri Aug 27 2004 Buchan Milne <bgmilne@linux-mandrake.com>3.0.6-3mdk
-- patch from Urban Widmark via Robert Sim (anthill bug 1086) to be able
-  to diable unix extensions in smbmount (and via 'unix extensions' in smb.conf)
-- magic-devel only available on 9.2 and up
-- allow building for stable release on the chroots on the cluster
-- fix patch8
-- fix build on older releases
-
-* Fri Aug 20 2004 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.6-2mdk
-- 3.0.6
--drop P6 (merged), P7 (broken for now)
--keep libsmbclient where it belongs (on x86 for now)
--implement mandrake version-specific release number
-
-* Thu Aug 12 2004 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.5-2mdk
-- 3.0.5
-- fix pid file location (#10666)
-- merge amd64 fixes (P7)
-- make pdf printer work again, and other misc fixes to default config
-
-* Sun Jun 20 2004 Oden Eriksson <oeriksson@mandrakesoft.com> 3.0.5-0.pre1.3mdk
-- fix rpm group in libsmbclient0-devel (Goetz Waschk)
-
-* Sat Jun 19 2004 Oden Eriksson <oeriksson@mandrakesoft.com> 3.0.5-0.pre1.2mdk
-- fix deps
-
-* Wed May 26 2004 Buchan Milne <bgmilne@linux-mandrake.com>3.0.5-0.pre1.1mdk
-- fix building without scanners
-- 3.0.5pre1 (and drop patch from CVS)
-
-* Fri May 21 2004 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.4-3mdk
-- re-work scanner support
-
-* Thu May 13 2004 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.4-2mdk
-- 3.0.4
-- Patch for winbind (from samba bug 1315)
-
-* Thu Apr 29 2004 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.2a-4mdk
-- Fix samba-vscan (0.3.5), add clamav and icap, and build scanners by default
-- Fix default vscan-clamav config and add sample config for homes share
-- Add pgsql passdb backend
-
-* Mon Mar 01 2004 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.2a-3mdk
-- Fix default smbldap config
-- Don't clobber smb.conf backup for no reason
-
-* Mon Feb 16 2004 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.2a-2mdk
-- 3.0.2a
-- Only update smb.conf in upgrade from <3.0.1-3mdk (via trigger) and update
-  upgrade script (stew)
-
-* Mon Feb 09 2004 Buchan Milne <bgmilne@linux0mandrake.com> 3.0.2-2mdk
-- 3.0.2
-
-* Mon Feb 02 2004 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.2-0.rc2.1mdk
-- 3.0.2rc2
-
-* Tue Jan  6 2004 Stew Benedict <sbenedict@mandrakesoft.com> 3.0.1-5mdk
-- update migrate script, feedback from Luca Berra
-
-* Mon Jan  5 2004 Stew Benedict <sbenedict@mandrakesoft.com> 3.0.1-4mdk
-- re-enable relaxed CFLAGS to fix broken smbmount, smbclient
-
-* Fri Jan  2 2004 Stew Benedict <sbenedict@mandrakesoft.com> 3.0.1-3mdk
-- add migrate script to merge existing smb.conf
-
-* Fri Dec 19 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.1-2mdk
-- 3.0.1 final
-
-* Thu Dec 11 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.1-0.rc2.2mdk
-- 3.0.1rc2
-
-* Sat Dec 06 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.1-0.rc1.2mdk
-- rc1
-- samba-vscan-0.3.4
-
-* Fri Dec 05 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.1-0.pre3.5mdk
-- Allow winbind to start if old winbind ranges are used (ease upgrades)
-
-* Tue Nov 18 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.1-0.pre3.4mdk
-- Fix build as system on 8.2 (and probably earlier)
-
-* Sun Nov 16 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.1-0.pre3.3mdk
-- Ensure printer drivers keep permissions by default (setgid and inherit perms)
-
-* Fri Nov 14 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.1-0.pre3.2mdk
-- 3.0.1pre3
-- Add support for Mandrake 10.0 (as system samba)
-- Fix alternatives triggers
-- Fix obsoletes
-
-* Mon Nov 10 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.1-0.pre2.2mdk
-- 3.0.1pre2
-- misc spec files (pointed out by Luca Olivetti)
-- Fix path to smbldap-passwd.pl
-- Only allow one copy of winbind and nss_wins
-- Add trigger for alternatives
-
-* Sun Oct 12 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.1-0.pre1.2mdk
-- 3.0.1pre1
-- remove buildroot patch (p3), fixed upstream
-
-* Thu Sep 25 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.0-2mdk
-- 3.0.0 final
-
-* Sat Sep 13 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.0-0.rc4.2mdk
-- rc4
-- Don't update alternatives in pre/post scripts when not using alternatives
-- Fix case of --with-system without alternatives
-- Final fixes to smbldap-tools for non-system case
-- Remove duplicate docs (really - 1 character typo ...)
-- Update configs (fix winbind init script, add example scripts in smb.conf)
-
-* Tue Sep 09 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.0-0.rc3.2mdk
-- rc3
-- Fix mount.smb{,fs} alternatives (spotted by Laurent Culioli)
-
-* Thu Sep 04 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.0-0.rc2.3mdk
-- Fix alternatives
-- Fix libname (can I blame guillomovitch's evil line-wrapping spec mode?)
-- Fix smbldap-tools package/use names when not system samba
-- Don't conflict samba3-client with samba-client for now so we can install it
-
-* Fri Aug 29 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.0-0.rc2.2mdk
-- rc2
-- Remove patches 100-102 (upstream)
-- Fix libname
-- Alternatavise client
-- Better solution to avoid rpath
-
-* Fri Aug 22 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.0-0.rc1.3mdk
-- Fix build with test package (p100), but not by default (too big)
-- Fix (p101) for SID resolution when member of samba-2.2.x domain
-- Fix libsmbclient packages (thanks Gotz)
-- version mount.cifs, patch from CVS (p102), and setuid it
-- Clean up docs (guillomovitch spam ;-)
-
-* Sat Aug 16 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.0-0.rc1.2mdk
-- rc1
-- disable test subpackage since it's broken again
-
-* 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.
-- Update default config  
-
-* Wed Jul 02 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.0-0.beta2.2mdk
-- 3.0.0beta2
-- manually build editreg
-- Add some new man pages
-
-* Tue Jun 10 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.0-0.beta1.3mdk
-- add provision for passdb-ldap subpackage (it doesn't build like that yet)
-- avoid debugging info on cooker/9.2 for the moment
-- We probably don't need to autoconf (and can thus build on 8.1)
-- We can probably build without kerberos support (and thus on 8.0)
-- Don't require mysql-devel on alpha's (maybe we want to be able to disable
-  mysql support for other arches?)
-- We shouldn't need to specifically add openssl to include path, since ssl
-  support is deprecated.
-- png icons, change menu title to not conflict with ksambaplugin  
-- update to samba-vscan-0.3.3beta1, but it still does not build the vscan
-  modules.
-- add -static-devel package
-- Add buildrequires for lib packages that are picked up if installed
-  (ncurses, popt) in an attempt to get slbd to build samba3
-- Fix default config (P100)
-
-* Sun Jun 08 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.0-0.beta1.2mdk
-- Get packages into cooker (klama doesn't want to build this package ..)
-- samba-vscan-0.3.2b
-
-* Fri Jun 06 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0-0.alpha24.2mdk
-- Rename debug package to test and other fixes for rpm-4.2
-- prepare for beta1
-
-* Wed Apr 30 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0-0.alpha24.1mdk
-- Remove some files removed upstream
-- In builds from source, don't terminate on missing docs or unpackaged files
-  (if only we could do it for other missing files ...)
-
-* Mon Apr 28 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0-0.alpha24.0mdk
-- Reenable debug package by (--without debug to not build it), fixed post-a23
-- Add bugzilla note for builds from source (also intended for packages made
-  available on samba FTP site) at samba team request
-- Fix build from CVS (run autogen.sh, pass options to all rpm commands)
-- Appease distriblint, but not much to be done about /usr/share/swat3/ since
-  samba-doc owns some subdirs, and samba-swat others, and they can be installed
-  independantly.
-- Apply kaspersky vscan build fix from samba2  
-- Final for alpha24
-
-* Wed Apr 23 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0-0.alpha23.3mdk
-- Small fixes in preparation for testing as system samba
-- Make debug package optional (--with debug) since it's often broken
-- Add support for 9.2 (including in-line smbd quota patch for glibc2.3)
-- Add --with options option, which will just show you the available options and exit
-
-* Sun Apr 06 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0-0.alpha23.2mdk
-- Alpha23
-- buildrequire autconf2.5
-- samba-vscan 0.3.2a
-- Remove patch 102 (upstreamed)
-
-* Thu Mar 06 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0-0.alpha22.2mdk
-- Alpha22
-- Add profiles binary to server and ntlm_auth to common
-- smbwrapper and torture target broken (only in 9.0?)
-- remove unused source 2
-
-* Tue Mar 04 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0-0.alpha21.4mdk
-- Don't provide samba-{server,client,common} when not system samba (bug #2617)
-- Don't build libsmbclient packages when not system samba
-- Fix conflict between samba-server and samba3-server (pam_smbpass)
-- Fix smbwrapper (from 2.2.7a-5mdk for bug #2356)
-- Fix codepage/charset example (bug #1574)
-
-* Thu Jan 23 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0-0.alpha21.3mdk
-- samba-vscan 0.3.1 (and make it build again), including required inline edits
-- Make all vscan packages provide samba(3)-vscan
-- Build all vscan except kav (requires kaspersky lib) with --with-scanners
-- Add vscan-(scanner).conf files
-- Explicitly add ldapsam for 2.2 compatability when building --with ldap,
-  default build now uses new ldap passdb backend (ie you always get ldap)
-- Enable (experimental) tdb passdb backend
-- Fix file ownership conflicts between server and common
-- Cleanup configure, to match order of --help
-- Fix libdir location, was being overridden by --with-fhs
-- Split off a libsmbclient and -devel package
-- Add wins replication init script (patch 102)
-- Workaround passdb/pdb_xml.c not compiling
-- Workaround missing install targets for smbsh/smbwrapper.so in cvs
-- Inline patch smbd/quotas.c for Mandrake >9.0
-
-* Wed Nov 27 2002 Buchan Milne <bgmilne@linux-mandrake.com> 3.0-0.alpha21.2mdk
-- Remove patch 20,21,22,23,25,26 (upstream)
-- New destdir patch from cvs (18)
-- package installed but non-packaged files
-- new debug subpackage for vfstest and related files (it was that or nuke the 
-  manpage ;-))
-- use _libdir for libdir instead of _sysconfdir
-- Update samba-vscan (untested)
-
-* Mon Oct 28 2002 Buchan Milne <bgmilne@linux-mandrake.com> 3.0-0.alpha20.3mdk
-- Fix mount.smbfs3 pointing to smbmount not in package
-- Remove unnecessary lines from install (now done by make)
-- Build with ldap and ads on all releases by default
-- Put av-stuff back
-
-* Mon Oct 21 2002 Buchan Milne <bgmilne@linux-mandrake.com> 3.0-0.alpha20.2mdk
-- When not building as system samba, avoid conflicting with system samba
-- Macro-ize as much as possible for above (aka finish cleanups)
-- Fix paths in init scripts and logrotate and xinetd
-- Fix provides and obsoletes so as to provide samba, but not obsolete
-  current stable until we have a stable release (when it's the system samba).
-- Add warnings to descriptions when not system samba.
-- This is now parallel installable with the normal samba release, for easy
-  testing. It shouldn't touch existing installations. Of course, only
-  one samba at a time on the same interface!
-
-* Sat Sep 28 2002 Buchan Milne <bgmilne@linux-mandrake.com> 3.0-0.alpha20.1mdk
-- Merge with 2.2.6pre2.2mdk
-- Detect alpha- and beta-, along with pre-releases
-
-* Tue Feb 05 2002 Buchan Milne <bgmilne@cae.co.za> 3.0-alpha14-0.1mdk
-- Sync with 2.2.3-2mdk (new --without options, detect when 
-  building for a different distribution.
-
-* Mon Feb 04 2002 Buchan Milne <bgmilne@cae.co.za> 3.0-alpha14-0.0mdk
-- Sync with 2.2.2-10mdk, which added build-time options --with ldap,
-  winbind, acl, wins, mdk72, mdk80, mdk81, mdk82, cooker. Added
-  warning in description if built with these options.
-
-* Wed Jan 23 2002 Buchan Milne <bgmilne@cae.co.za> 3.0-alpha13-0.2mdk
-- Added if's for build_ads, which hopefully will add Active Directory
-  Support (by request).
-
-* Thu Jan 17 2002 Buchan Milne <bgmilne@cae.co.za> 3.0-alpha13-0.1mdk
-- More syncing with 2.2 rpm (post and postun scripts)
-- Testing without ldap
-
-* Thu Jan 17 2002 Buchan Milne <bgmilne@cae.co.za> 3.0-alpha13-0.0mdk
-- 3.0-alpha13
-- Fixed installman.sh patch.
-
-* Wed Jan 09 2002 Buchan Milne <bgmilne@cae.co.za> 3.0-alpha12-0.1mdk
-- Fixed %post and %preun for nss_wins, added %post and %preun for
-  samba-winbind (chkconfig and winbind entries in nsswitch.conf)
-
-* Sun Dec 23 2001 Buchan Milne <bgmilne@cae.co.za> 3.0-alpha12-0.0mdk
-- 3.0-alpha12
-- Sync up with changes made in 2.2.2 to support Mandrake 8.0, 7.2
-- Added new subpackage for swat
-- More if's for ldap.
-
-* Thu Dec 20 2001 Buchan Milne <bgmilne@cae.co.za> 3.0-alpha11-0.0mdk
-- 3.0-alpha11
-
-* Wed Dec 19 2001 Buchan Milne <bgmilne@cae.co.za> 3.0alpha10-0.0mdk
-- 3.0-alpha10
-
-* Tue Dec 18 2001 Buchan Milne <bgmilne@cae.co.za> 3.0alpha9-0.0mdk
-- 3.0-alpha9
-
-* Mon Dec 17 2001 Buchan Milne <bgmilne@cae.co.za> 3.0alpha8-0.1mdk
-- Added net command to %files common, pdbedit and smbgroupedit to
-  %files, s/%{prefix}\/bin/%{_bindir}/ (the big cleanup).
-  Added patch to smb.init from 2.2.2 (got missed with 3.0-alpha1 patches)
-
-* Sun Dec 16 2001 Buchan Milne <bgmilne@cae.co.za> 3.0alpha8-0.0mdk
-- Patch for installman.sh to handle lang=en correctly (p24)
-- added --with-manpages-langs=en,ja,pl (translated manpages), but there
-  aren't any manpages for these languages yet ... so we still
-  need %dir and %doc entries for them ...
-- patch (p25) to configure.in to support more than 2 languages.
-- addtosmbpass seems to have returned for now, but make_* have disappeared!
-
-* Fri Dec 14 2001 Buchan Milne <bgmilne@cae.co.za> 3.0alpha6-0.0mdk
-- DESTDIR patch for Makefile.in (p23), remove a lot of %%install scripts
-  this forces move of smbcontrol and smbmnt to %{prefix}/bin
-  removed --with-pam_smbpass as it doesn't compile.
-
-* Thu Dec 06 2001 Buchan Milne <bgmilne@cae.co.za> 3.0-0.0alpha1mdk
-- Samba 3.0alpha1 released (we missed Samba 3.0alpha0!)
-- Redid smbmount-sbin patch and smb.conf patch (20), removed xfs quota patch 
-  (applied upstream), removed ook-patch (codepage directory totally different).
-- Added winbind.init (21) and system-auth-winbind.pamd (22). Patches 20-23 
-  should be applied upstream before 3.0 ships ...
-
-* Wed Dec 05 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.2-6mdk
-- fixed typo in system-auth-winbind.pamd (--Thanks J. Gluck).
-- fixed %post xxx problem (smb not started in chkconfig --Thanks Viet & B. Kenworthy).
-
-* Fri Nov 23 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.2-5mdk
-- Had to remove the network recycle bin patch: it seems to mess up 
-  file deletion from windows (files appear to be "already in use")
-
-* Tue Nov 13 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.2-4mdk
-- added network recycle bin patch:
-  <http://www.amherst.edu/~bbstone/howto/samba.html>
-- added "recycle bin = .recycled" parameter in smb.conf [homes].
-- fixed winbind/nss_wins perms (oh no I don't own that stuff ;o)
-
-* Mon Nov 12 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.2-3mdk
-- added %build 8.0 and 7.2, for tweakers to play around.
-- changed configure options:
-  . removed --with-mmap, --with-netatalk (obsolete).
-  . added --with-msdfs, --with-vfs (seems stable, but still need testing).
-
-* Mon Nov 12 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.2-2mdk
-- rebuilt with winbind and nss_wins enabled.
-
-* Wed Oct 31 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.2-1mdk
-- Rebuilt on cooker.
-
-* Wed Oct 31 2001 Buchan Milne <bgmilne@cae.co.za> 2.2.2-0.992mdk
-- Patch for smb.conf to fix incorrect lpq command, typo in winbind,
-  and add sample linpopup command. Added print driver directories.
-- New XFS quota patch (untested!, samba runs, but do quotas work? We
-  can't check yet since the kernel doesn't seem to support XFS quotas!)
-
-* Fri Oct 19 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.2-0.99mdk
-- New samba.spec, almost ready for winbind operations. OLA for Buchan Milne
-  Who did a tremendous integration work on 2.2.2.
-  Rebuild on cooker, please test XFS (ACLs and quotas) again...
-  
-* Mon Oct 15 2001 Buchan Milne <bgmilne@cae.co.za> 2.2.2-0.9mdk
-- Samba-2.2.2. released! Use %defines to determine which subpackages
-  are built and which Mandrake release we are buiding on/for (hint: define 
-  build_mdk81 1 for Mandrake 8.1 updates)
-
-* Sun Oct 14 2001 Buchan Milne <bgmilne@cae.co.za> 2.2.2-0.20011014mdk
-- %post and %postun for nss_wins
-
-* Wed Oct 10 2001 Buchan Milne <bgmilne@cae.co.za> 2.2.2-0.20011010mdk
-- New CVS snapshot, /etc/pam.d/system-auth-winbind added
-  with configuration to allow easy winbind setup.
-  
-* Sun Oct 7 2001 Buchan Milne <bgmilne@cae.co.za> 2.2.2-0.20011007mdk
-- Added new package nss_wins and moved smbpasswd to common (required by
-  winbind).
-
-* Sat Oct 6 2001 Buchan Milne <bgmilne@cae.co.za> 2.2.2-0.20011006mdk
-- Added new package winbind.
-
-* Mon Oct 1 2001 Buchan Milne <bgmilne@cae.co.za> 2.2.2-0.20011001mdk
-- Removed patch to smb init.d file (applied in cvs)
-
-* Sun Sep 30 2001 Buchan Milne <bgmilne@cae.co.za> 2.2.2-0.20010930mdk
-- Added winbind init script, which still needs to check for running nmbd.
-
-* Thu Sep 27 2001 Buchan Milne <bgmilne@cae.co.za> 2.2.2-0.20010927mdk
-- Built from samba-2.2.2-pre cvs, added winbindd, wbinfo, nss_winbind and 
-  pam_winbind, moved pam_smbpass from samba-common to samba. We still
-  need a start-up script for winbind, or need to modify existing one.
-  
-* Mon Sep 10 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.1a-15mdk
-- Enabled acl support (XFS acls now supported by kernel-2.4.8-21mdk thx Chmou)
-  Added smbd patch to support XFS quota (Nathan Scott)
-  
-* Mon Sep 10 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.1a-14mdk
-- Oops! smbpasswd created in wrong directory...
-
-* Tue Sep 06 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.1a-13mdk
-- Removed a wrong comment in smb.conf.
-  Added creation of smbpasswd during install.
-
-* Mon Aug 27 2001 Pixel <pixel@mandrakesoft.com> 2.2.1a-12mdk
-- really less verbose %%post
-
-* Sat Aug 25 2001 Geoffrey Lee <snailtalk@mandrakesoft.com> 2.2.1a-11mdk
-- Fix shared libs in /usr/bin silliness.
-
-* Thu Aug 23 2001 Pixel <pixel@mandrakesoft.com> 2.2.1a-10mdk
-- less verbose %%post
-
-* Wed Aug 22 2001 Buchan Milne <bgmilne@cae.co.za> 2.2.1a-9mdk
-- Added smbcacls (missing in %files), modification to smb.conf: ([printers]
-  is still needed, even with point-and-print!, user add script should
-  use name and not gid, since we may not get the gid . New script for
-  putting manpages in place (still need to be added in %files!). Moved
-  smbcontrol to sbin and added it and its man page to %files.
-
-* Wed Aug 22 2001 Pixel <pixel@mandrakesoft.com> 2.2.1a-8mdk
-- cleanup /var/lib/samba/codepage/src
-
-* Tue Aug 21 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.1a-7mdk
-- moved codepage generation to %%install and codepage dir to /var/lib/samba
-
-* Tue Aug 21 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.1a-6mdk
-- /lib/* was in both samba and samba-common
-  Introducing samba-doc: "alas, for the sake of thy modem, shalt thou remember
-  when Samba was under the Megabyte..."
-
-* Fri Aug 03 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.1a-5mdk
-- Added "the gc touch" to smbinit through the use of killall -0 instead of
-  grep cupsd | grep -v grep (too many greps :o)
-
-* Wed Jul 18 2001 Stefan van der Eijk <stefan@eijk.nu> 2.2.1a-4mdk
-- BuildRequires: libcups-devel
-- Removed BuildRequires: openssl-devel
-
-* Fri Jul 13 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.1a-3mdk
-- replace chkconfig --add/del with --level 35 on/reset.
-
-* Fri Jul 13 2001 Geoffrey Lee <snailtalk@mandrakesoft.cm> 2.2.1a-2mdk
-- Replace discription s/inetd/xinetd/, we all love xinetd, blah.
-
-* Thu Jul 12 2001 Buchan Milne <bgmilne@cae.co.za> 2.2.1a-1mdk
-- Bugfix release. Fixed add user script, added print$ share and printer admin
-  We need to test interaction of new print support with CUPS, but printer
-  driver uploads should work.
-
-* Wed Jul 11 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.1-17mdk
-- fixed smb.conf a bit, rebuilt on cooker.
-
-* Tue Jul 10 2001 Buchan Milne <bgmilne@cae.co.za> 2.2.1-16mdk
-- Finally, samba 2.2.1 has actually been release. At least we were ready!
-  Cleaned up smb.conf, and added some useful entries for domain controlling.
-  Migrated changes made in samba's samba2.spec for 2.2.1  to this file.
-  Added groupadd command in post to create a group for samba machine accounts.
-  (We should still check the postun, samba removes pam, logs and cache)
-
-* Tue Jun 26 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.1-15mdk
-- fixed smbwrapper compile options.
-
-* Tue Jun 26 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.1-14mdk
-- added LFS support.
-  added smbwrapper support (smbsh)
-
-* Wed Jun 20 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.1-13mdk
-- /sbin/mount.smb and /sbin/mount.smbfs now point to the correct location
-  of smbmount (/usr/bin/smbmount)
-
-* Tue Jun 19 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.1-12mdk
-- smbmount and smbumount are now in /usr/bin and SUID.
-  added ||: to triggerpostun son you don't get error 1 anymore when rpm -e
-  Checked the .bz2 sources with file *: everything is OK now (I'm so stupid ;o)!
-
-* Tue Jun 19 2001 Geoffrey Lee <snailtalk@mandrakesoft.com> 2.2.1-11mdk
-- s/Copyright/License/;
-- Stop Sylvester from pretending .gz source to be .bz2 source via filename
-  aka really bzip2 the source.
-
-* Mon Jun 18 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.1-10mdk
-- changed Till's startup script modifications: now samba is being reloaded
-  automatically 1 minute after it has started (same reasons as below in 9mdk)
-  added _post_ and _preun_ for service smb
-  fixed creation of /var/lib/samba/{netlogon,profiles} (%dir was missing)
-
-* Thu Jun 14 2001 Till Kamppeter <till@mandrakesoft.com> 2.2.1-9mdk
-- Modified the Samba startup script so that in case of CUPS being used as
-  printing system Samba only starts when the CUPS daemon is ready to accept
-  requests. Otherwise the CUPS queues would not appear as Samba shares.
-
-* Mon Jun 11 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.1-8mdk
-- patched smbmount.c to have it call smbmnt in sbin (thanks Seb).
-
-* Wed May 30 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.1-7mdk
-- put SWAT menu icons back in place.
-
-* Mon May 28 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.1-6mdk
-- OOPS! fixed smbmount symlinks
-
-* Mon May 28 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.1-5mdk
-- removed inetd postun script, replaced with xinetd.
-  updated binary list (smbcacls...)
-  cleaned samba.spec
-
-* Mon May 28 2001 Buchan Milne <bgmilne@cae.co.za> 2.2.1-4mdk
-- Changed configure options to point to correct log and codepage directories,
-  added crude script to fix logrotate file for new log file names, updated
-  patches to work with current CVS.
-
-* Thu May 24 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.1-3mdk
-- Cleaned and updated the %files section.
-
-* Sat May 19 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.1-2mdk
-- Moved all samba files from /etc to /etc/samba (Thanks DomS!).
-  Fixed fixinit patch (/etc/samba/smb.conf)
-
-* Fri May 18 2001 Buchan Milne <bgmilne@cae.co.za> 2.2.1-1mdk
-- Now use packaging/Mandrake/smb.conf, removed unused and obsolete
-  patches, moved netlogon and profile shares to /var/lib/samba in the
-  smb.conf to match the spec file. Added configuration for ntlogon to
-  smb.conf. Removed pam-foo, fixinit and makefilepath patches. Removed
-  symlink I introduced in 2.2.0-1mdk
-
-* Thu May 3 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.0-5mdk
-- Added more configure options. Changed Description field (thx John T).
-
-* Wed Apr 25 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.0-4mdk
-- moved netlogon and profiles to /var/lib/samba by popular demand ;o)
-
-* Tue Apr 24 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.0-3mdk
-- moved netlogon and profiles back to /home.
-
-* Fri Apr 20 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.2.0-2mdk
-- fixed post inetd/xinetd script&
-
-* Thu Apr 19 2001 Buchan Milne <bgmilne@cae.co.za> 2.2.0-1mdk
-- Upgrade to 2.2.0. Merged most of 2.0.7-25mdk's patches (beware
-  nasty "ln -sf samba-%{ver} ../samba-2.0.7" hack to force some patches
-  to take. smbadduser and addtosmbpass seem to have disappeared. Moved
-  all Mandrake-specific files to packaging/Mandrake and made patches
-  from those shipped with samba. Moved netlogon to /home/samba and added
-  /home/samba/profiles. Added winbind,smbfilter and debug2html to make command.
-
-* Thu Apr 12 2001 Frederic Crozat <fcrozat@mandrakesoft.com> 2.0.7-25mdk
-- Fix menu entry and provide separate menu entry for GNOME
-  (nautilus doesn't support HTTP authentication yet)
-- Add icons in package
-
-* Fri Mar 30 2001 Frederic Lepied <flepied@mandrakesoft.com> 2.0.7-24mdk
-- use new server macros
-
-* Wed Mar 21 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.0.7-23mdk
-- check whether /etc/inetd.conf exists (upgrade) or not (fresh install).
-
-* Thu Mar 15 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.0.7-22mdk
-- spec cosmetics, added '-r' option to lpr-cups command line so files are
-  removed from /var/spool/samba after printing.
-
-* Tue Mar 06 2001 Sylvestre Taburet <staburet@mandrakesoft.com> 2.0.7-21mdk
-- merged last rh patches.
-
-* Thu Nov 23 2000 Sylvestre Taburet <staburet@mandrakesoft.com> 2.0.7-20mdk
-- removed dependencies on cups and cups-devel so one can install samba without using cups
-- added /home/netlogon
-
-* Mon Nov 20 2000 Till Kamppeter <till@mandrakesoft.com> 2.0.7-19mdk
-- Changed default print command in /etc/smb.conf, so that the Windows
-  driver of the printer has to be used on the client.
-- Fixed bug in smbspool which prevented from printing from a
-  Linux-Samba-CUPS client to a Windows server through the guest account.
-
-* Mon Oct 16 2000 Till Kamppeter <till@mandrakesoft.com> 2.0.7-18mdk
-- Moved "smbspool" (Samba client of CUPS) to the samba-client package
-
-* Sat Oct 7 2000 Stefan van der Eijk <s.vandereijk@chello.nl> 2.0.7-17mdk
-- Added RedHat's "quota" patch to samba-glibc21.patch.bz2, this fixes
-  quota related compile problems on the alpha.
-
-* Wed Oct 4 2000 Sylvestre Taburet <staburet@mandrakesoft.com> 2.0.7-16mdk
-- Fixed 'guest ok = ok' flag in smb.conf
-
-* Tue Oct 3 2000 Sylvestre Taburet <staburet@mandrakesoft.com> 2.0.7-15mdk
-- Allowed guest account to print in smb.conf
-- added swat icon in menu
-
-* Tue Oct 3 2000 Sylvestre Taburet <staburet@mandrakesoft.com> 2.0.7-14mdk
-- Removed rh ssl patch and --with-ssl flag: not appropriate for 7.2
-
-* Tue Oct 3 2000 Sylvestre Taburet <staburet@mandrakesoft.com> 2.0.7-13mdk
-- Changed fixinit patch.
-- Changed smb.conf for better CUPS configuration.
-- Thanks Fred for doing this ---vvv.
-
-* Tue Oct  3 2000 Frederic Lepied <flepied@mandrakesoft.com> 2.0.7-12mdk
-- menu entry for web configuration tool.
-- merge with rh: xinetd + ssl + pam_stack.
-- Added smbadduser rh-bugfix w/o relocation of config-files.
-
-* Mon Oct  2 2000 Frederic Lepied <flepied@mandrakesoft.com> 2.0.7-11mdk
-- added build requires on cups-devel and pam-devel.
-
-* Mon Oct  2 2000 Till Kamppeter <till@mandrakesoft.com> 2.0.7-10mdk
-- Fixed smb.conf entry for CUPS: "printcap name = lpstat", "lpstats" was
-  wrong.
-
-* Mon Sep 25 2000 Sylvestre Taburet <staburet@mandrakesoft.com> 2.0.7-9mdk
-- Cosmetic changes to make rpmlint more happy
-
-* Wed Sep 11 2000 Sylvestre Taburet <staburet@mandrakesoft.com> 2.0.7-8mdk
-- added linkage to the using_samba book in swat
-
-* Fri Sep 01 2000 Sylvestre Taburet <staburet@mandrakesoft.com> 2.0.7-7mdk
-- Added CUPS support to smb.conf
-- Added internationalization options to smb.conf [Global]
-
-* Wed Aug 30 2000 Till Kamppeter <till@mandrakesoft.com> 2.0.7-6mdk
-- Put "smbspool" to the files to install
-
-* Wed Aug 30 2000 Sylvestre Taburet <staburet@mandrakesoft.com> 2.0.7-5mdk
-- Did some cleaning in the patches
-
-* Fri Jul 28 2000 Sylvestre Taburet <staburet@mandrakesoft.com> 2.0.7-4mdk
-- relocated man pages from /usr/man to /usr/share/man for compatibility reasons
-
-* Fri Jul 28 2000 Sylvestre Taburet <staburet@mandrakesoft.com> 2.0.7-3mdk
-- added make_unicodemap and build of unicode_map.$i in the spec file
-
-* Fri Jul 28 2000 Sylvestre Taburet <staburet@mandrakesoft.com> 2.0.7-2mdk
-- renamed /etc/codepage/codepage.$i into /etc/codepage/unicode_map.$i to fix smbmount bug.
-
-* Fri Jul 07 2000 Sylvestre Taburet <staburet@mandrakesoft.com> 2.0.7-1mdk
-- 2.0.7
-
-* Wed Apr 05 2000 Francis Galiegue <fg@mandrakesoft.com> 2.0.6-4mdk
-
-- Titi sucks, does not put versions in changelog
-- Fixed groups for -common and -client
-- /usr/sbin/samba is no config file
-
-* Thu Mar 23 2000 Thierry Vignaud <tvignaud@mandrakesoft.com>
-- fix buggy post install script (pixel)
-
-* Fri Mar 17 2000 Francis Galiegue <francis@mandrakesoft.com> 2.0.6-2mdk
-
-- Changed group according to 7.1 specs
-- Some spec file changes
-- Let spec-helper do its job
-
-* Thu Nov 25 1999 Chmouel Boudjnah <chmouel@mandrakesoft.com>
-- 2.0.6.
-
-* Tue Nov  2 1999 Chmouel Boudjnah <chmouel@mandrakesoft.com>
-- Merge with rh changes.
-- Split in 3 packages.
-
-* Fri Aug 13 1999 Pablo Saratxaga <pablo@@mandrakesoft.com>
-- corrected a bug with %post (the $1 parameter is "1" in case of
-  a first install, not "0". That parameter is the number of packages
-  of the same name that will exist after running all the steps if nothing
-  is removed; so it is "1" after first isntall, "2" for a second install
-  or an upgrade, and "0" for a removal)
-
-* Wed Jul 28 1999 Pablo Saratxaga <pablo@@mandrakesoft.com>
-- made smbmnt and smbumount suid root, and only executable by group 'smb'
-  add to 'smb' group any user that should be allowed to mount/unmount
-  SMB shared directories
-
-* Fri Jul 23 1999 Chmouel Boudjnah <chmouel@mandrakesoft.com>
-- 2.0.5a (bug security fix).
-
-* Wed Jul 21 1999 Axalon Bloodstone <axalon@linux-mandrake.com>
-- 2.0.5
-- cs/da/de/fi/fr/it/tr descriptions/summaries
-
-* Sun Jun 13 1999 Bernhard Rosenkränzer <bero@mandrakesoft.com>
-- 2.0.4b
-- recompile on a system that works ;)
-
-* Wed Apr 21 1999 Chmouel Boudjnah <chmouel@mandrakesoft.com>
-- Mandrake adaptations.
-- Bzip2 man-pages.
-
-* Fri Mar 26 1999 Bill Nottingham <notting@redhat.com>
-- add a mount.smb to make smb mounting a little easier.
-- smb filesystems apparently do not work on alpha. Oops.
-
-* Thu Mar 25 1999 Bill Nottingham <notting@redhat.com>
-- always create codepages
-
-* Tue Mar 23 1999 Bill Nottingham <notting@redhat.com>
-- logrotate changes
-
-* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
-- auto rebuild in the new build environment (release 3)
-
-* Fri Mar 19 1999 Preston Brown <pbrown@redhat.com>
-- updated init script to use graceful restart (not stop/start)
-
-* Tue Mar  9 1999 Bill Nottingham <notting@redhat.com>
-- update to 2.0.3
-
-* Thu Feb 18 1999 Bill Nottingham <notting@redhat.com>
-- update to 2.0.2
-
-* Mon Feb 15 1999 Bill Nottingham <notting@redhat.com>
-- swat swat
-
-* Tue Feb  9 1999 Bill Nottingham <notting@redhat.com>
-- fix bash2 breakage in post script
-
-* Fri Feb  5 1999 Bill Nottingham <notting@redhat.com>
-- update to 2.0.0
-
-* Mon Oct 12 1998 Cristian Gafton <gafton@redhat.com>
-- make sure all binaries are stripped
-
-* Thu Sep 17 1998 Jeff Johnson <jbj@redhat.com>
-- update to 1.9.18p10.
-- fix %triggerpostun.
-
-* Tue Jul 07 1998 Erik Troan <ewt@redhat.com>
-- updated postun triggerscript to check $0
-- clear /etc/codepages from %preun instead of %postun
-
-* Mon Jun 08 1998 Erik Troan <ewt@redhat.com>
-- made the %postun script a tad less agressive; no reason to remove
-  the logs or lock file (after all, if the lock file is still there,
-  samba is still running)
-- the %postun and %preun should only exectute if this is the final
-  removal
-- migrated %triggerpostun from Red Hat's samba package to work around
-  packaging problems in some Red Hat samba releases
-
-* Sun Apr 26 1998 John H Terpstra <jht@samba.anu.edu.au>
-- minor tidy up in preparation for release of 1.9.18p5
-- added findsmb utility from SGI package
-
-* Wed Mar 18 1998 John H Terpstra <jht@samba.anu.edu.au>
-- Updated version and codepage info.
-- Release to test name resolve order
-
-* Sat Jan 24 1998 John H Terpstra <jht@samba.anu.edu.au>
-- Many optimisations (some suggested by Manoj Kasichainula <manojk@io.com>
-- Use of chkconfig in place of individual symlinks to /etc/rc.d/init/smb
-- Compounded make line
-- Updated smb.init restart mechanism
-- Use compound mkdir -p line instead of individual calls to mkdir
-- Fixed smb.conf file path for log files
-- Fixed smb.conf file path for incoming smb print spool directory
-- Added a number of options to smb.conf file
-- Added smbadduser command (missed from all previous RPMs) - Doooh!
-- Added smbuser file and smb.conf file updates for username map
diff --git a/packaging/Mandrake/smb-migrate b/packaging/Mandrake/smb-migrate
deleted file mode 100644
index 08a5023c13..0000000000
--- a/packaging/Mandrake/smb-migrate
+++ /dev/null
@@ -1,197 +0,0 @@
-#!/usr/bin/perl
-
-# migrate old samba2 smb.conf settings to new samba3 setup
-# as well as merge local configuration settings
-# Dec 3 2003 Stew Benedict <sbenedict@mandrakesoft.com>
-# revised Jan 6 2004 - dropping some parameters
-# revised Feb 11 2004 - don't try to process a config a second time
-
-# check command line arguments
-my $numargs = @ARGV;
-if ($numargs lt 1) {
-	print "useage: smb-migrate test|test-commit|commit\n";
-	exit(1);
-}
-
-# define some variables
-my $user_parms = 0;
-my $new_conf_file = "/etc/samba/smb.conf";
-my @new_conf;
-my $merged_conf_file = "/etc/samba/smb.conf";
-my $merge_comment = "# *** merged from original smb.conf: ***\n";
-my $uncomment_comment = "# *** uncommented from original smb.conf: ***\n";
-my $unique_comment = "# *** unique added from original smb.conf: ***\n";
-my @merge_log;
-my $log_file = "/var/log/samba/smb-migrate.log";
-my $to_merge = "/etc/samba/smb.conf.tomerge";
-
-if ($ARGV[0] eq "test" || $ARGV[0] eq "test-commit") {
-	$to_merge = "smb.conf"; 
-	$log_file = "smb-migrate.log";
-	$merged_conf_file = "smb.conf.merged";
-}
-
-# if the file has already been processed, don't do it again
-my $processed = `grep -c 'original smb.conf: ***' $to_merge`;
-if ($processed > 0) {
-	`cp $to_merge $new_conf_file`;
-	print "Already processed, aborting.\n";	
-	exit 0;
-}
-	
-# get the stripped, uncommented data from old smb.conf
-my @old_conf = `grep -v "^#" $to_merge | grep -v "^;" | grep -v "^\$"` or die;
-
-# use a clean config file as a starting point
-`cp /usr/share/samba/smb.conf.clean $new_conf_file` if $ARGV[0] !~ /test/;
-
-# and the whole new conf file we're going to merge with
-my @new_conf_org = `cat $new_conf_file` or die;
-
-mlog("Data to change/add in standard sections of smb.conf:\n\n");
-
-sub mlog {
-	my (@dstring) = @_;
-	if ($ARGV[0] eq "test") {
-		print "@dstring";
-	} else {
-		push @merge_log, @dstring;
-	}
-}
-
-sub merge_conf {
-	my ($header, $new_value) = @_;
-	my @parmlist = split " = ", $new_value;
-	my $match = 0;
-	my $comment = '';
-	$comment = $unique_comment if $continuation = 0;
-	$continuation = 1;
-	
-	# find the header in question
-	$index = 0;
-	foreach (@new_conf_org) {
- 		if (/^\[$header\]|;\[$header\]|^; \[$header\]|^\[$header\$\]|;\[$header\$\]|^; \[$header\$\]/) {
-			# restore print$
-			$header = "print" . '$' if $header eq "print";
-			# if the header is commented, remove the comment
-			if (/^;\[|^#\[|^; \[/) {
-				my $entry = $_;
-				@new_conf_org[$index] =~ s/^;|^; |^#//g;
-				mlog("uncomment: $header line $index: $entry -> @new_conf_org[$index]");
-				splice(@new_conf_org, $index, 0, $uncomment_comment);
-				$index++
-			}
-			$start_loc = $index;
-#			print "[$header]: $start_loc\n";
-			last;
-		}
-		$index++
-	}
-	
-	my $elements = @new_conf_org;
-
-	# walk through this header's entries, update as needed
-	for ($i = $start_loc + 1; $i < $elements; $i++) {
-		# if we hit a new header, may be commented - bail out
-		my $is_header = @new_conf_org[$i];
-		$is_header =~ s/^ |\t|\n//;
-		if ($is_header =~ /^\[|;\[|#\[/) { 
-#			print "new header: $is_header at $i\n";
-			if ($match == 0) {
-				# it's possible the parameter is continued across multiple lines
-				$continuation = 0 if  $new_value !~ /\\$/;
-				# completely new entry, try to place it under the correct header
-#				print "new entry for [$header]: $new_value\n";
-				mlog("unique: $header line $last_index: $new_value");
-				splice(@new_conf_org, $last_index + 1, 0, $comment, $new_value);
-				$last_index++;$last_index++;
-			}
-			return;
-		}
-
-		# some syntax changes
-		if ($new_value =~ /winbind/) {
-			$old_value = $new_value; 
-			$new_value =~ s/winbind/idmap/;
-			mlog("syntax: $header: $old_value -> $new_value");
-		}
-
-		# partial match, decide whether to add or replace
-		if (@new_conf_org[$i] =~ /@parmlist[0]/) {
-			if (@new_conf_org[$i] !~ /^;|^#/) {
-				if (@new_conf_org[$i] ne $_) { 
-					mlog("update: $header line $i: @new_conf_org[$i] -> $new_value");
-					@new_conf_org[$i] = ";" . $new_conf_org[$i];
-					splice(@new_conf_org, $i + 1, 0, $merge_comment, $new_value);
-#					$match = 1;
-				}
-				$match = 1;
-			} else {
-				# is it really a definition or just a comment?
-				if (@new_conf_org[$i] =~ / = /) {
-					# commented in new config, add the old entry
-					mlog("add: $header line $i: @new_conf_org[$i] -> $new_value");
-					splice(@new_conf_org, $i + 1, 0, $merge_comment, $new_value);
-					$i++;$i++;
-					$match = 1;
-				}
-			}
-#			$match = 1 if $new_value eq @new_conf_org[$i];
-			$last_index = $i;
-			return if ($match eq 1);
-			$match = 0;
-		}	
-	}
-	return;
-}
-
-foreach (@old_conf) {
-	# check for section headers
-	if (/^\[/) {
-		# standard headers?
-		if (!/^\[global\]|^\[homes\]|^\[netlogon\]|^\[Profiles\]|^\[printers\]|^\[print\$\]|^\[pdf-generator\]/) {
-			# non-standard - add to new config
-			$user_parms = 1;
-			push (@new_conf, $_);
-		} else {
-			$user_parms = 0;
-			chop;
-			$header = $_;
-			s/\[|\]|\$//g;
-			$bare_header = $_;
-		}
-	} else {
-		# non-standard - add to new config
-		if ($user_parms == 1) {
-			push (@new_conf, $_);
-		} else {
-			# now we're working with standard settings
-			# update new config with values if they differ or are commented out
-			# translate any old nomenclature to the new style
-			# may still be some commented lines buried
-			# throw those out and try to merge into new config
-			if (!/^[ ]+#|^[ ]+;|^#|^;/) {
-#				print "$header: $_\n";
-				merge_conf($bare_header, $_);
-			}
-		}
-	}
-}
-
-# write the user config data to new smb.conf
-
-mlog("\nNew data for smb.conf:\n\n");
-mlog("@new_conf");
-
-if ($ARGV[0] eq "commit" || $ARGV[0] eq "test-commit") {
-	local *NEWCONF;
-	open(NEWCONF, "> $merged_conf_file");
-	print NEWCONF @new_conf_org;
-	print NEWCONF @new_conf;
-	close NEWCONF;
-	local *LOGFILE;
-	open(LOGFILE, "> $log_file");
-	print LOGFILE @merge_log;
-	close LOGFILE
-}
-
diff --git a/packaging/Mandrake/smb.conf b/packaging/Mandrake/smb.conf
deleted file mode 100644
index ab4e3d0afd..0000000000
--- a/packaging/Mandrake/smb.conf
+++ /dev/null
@@ -1,532 +0,0 @@
-
-# This is the main Samba configuration file. You should read the
-# smb.conf(5) manual page in order to understand the options listed
-# here. Samba has a huge number of configurable options (perhaps too
-# many!) most of which are not shown in this example
-#
-# Any line which starts with a ; (semi-colon) or a # (hash) 
-# is a comment and is ignored. In this example we will use a #
-# for commentry and a ; for parts of the config file that you
-# may wish to enable
-#
-# NOTE: Whenever you modify this file you should run the command "testparm"
-# to check that you have not made any basic syntactic errors. 
-#
-#======================= Global Settings =====================================
-[global]
-
-# 1. Server Naming Options:
-# workgroup = NT-Domain-Name or Workgroup-Name
-   workgroup = MDKGROUP
-
-# netbios name is the name you will see in "Network Neighbourhood",
-# but defaults to your hostname
-#  netbios name = <name_of_this_server>
-
-# server string is the equivalent of the NT Description field
-   server string = Samba Server %v
-
-# Message command is run by samba when a "popup" message is sent to it.
-# The example below is for use with LinPopUp:
-; message command = /usr/bin/linpopup "%f" "%m" %s; rm %s
-
-# 2. Printing Options:
-# CHANGES TO ENABLE PRINTING ON ALL CUPS PRINTERS IN THE NETWORK
-# (as cups is now used in linux-mandrake 7.2 by default)
-# if you want to automatically load your printer list rather
-# than setting them up individually then you'll need this
-   printcap name = lpstat
-   load printers = yes
-
-# It should not be necessary to spell out the print system type unless
-# yours is non-standard. Currently supported print systems include:
-# bsd, sysv, plp, lprng, aix, hpux, qnx, cups
-   printing = cups
-
-# Samba 2.2 supports the Windows NT-style point-and-print feature. To
-# use this, you need to be able to upload print drivers to the samba
-# server. The printer admins (or root) may install drivers onto samba.
-# Note that this feature uses the print$ share, so you will need to 
-# enable it below.
-# printer admin = @<group> <user>
-   printer admin = @adm
-# This should work well for winbind:
-#   printer admin = @"Domain Admins"
-
-# 3. Logging Options:
-# this tells Samba to use a separate log file for each machine
-# that connects
-   log file = /var/log/samba/log.%m
-
-# Put a capping on the size of the log files (in Kb).
-   max log size = 50
-
-# Set the log (verbosity) level (0 <= log level <= 10)
-# log level = 3
-
-# 4. Security and Domain Membership Options:
-# This option is important for security. It allows you to restrict
-# connections to machines which are on your local network. The
-# following example restricts access to two C class networks and
-# the "loopback" interface. For more examples of the syntax see
-# the smb.conf man page. Do not enable this if (tcp/ip) name resolution does
-# not work for all the hosts in your network.
-#   hosts allow = 192.168.1. 192.168.2. 127.
-
-# Uncomment this if you want a guest account, you must add this to /etc/passwd
-# otherwise the user "nobody" is used
-#  guest account = pcguest
-# Allow users to map to guest:
-  map to guest = bad user
-
-# Security mode. Most people will want user level security. See
-# security_level.txt for details.
-   security = user
-# Use password server option only with security = server or security = domain
-# When using security = domain, you should use password server = *
-#   password server = <NT-Server-Name>
-#   password server = *
-
-# Password Level allows matching of _n_ characters of the password for
-# all combinations of upper and lower case.
-#  password level = 8
-#  username level = 8
-
-# You may wish to use password encryption. Please read
-# ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation.
-# Do not enable this option unless you have read those documents
-# Encrypted passwords are required for any use of samba in a Windows NT domain
-# The smbpasswd file is only required by a server doing authentication, thus
-# members of a domain do not need one.
-  encrypt passwords = yes
-  smb passwd file = /etc/samba/smbpasswd
-
-# The following are needed to allow password changing from Windows to
-# also update the Linux system password.
-# 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
-#        to be kept in sync with the SMB password.
-;  unix password sync = Yes
-# You either need to setup a passwd program and passwd chat, or
-# enable pam password change
-;  pam password change = yes
-#  passwd program = /usr/bin/passwd '%u'
-;  passwd chat = *New*UNIX*password* %n\n *Re*ype*new*UNIX*password* %n\n \
-;*passwd:*all*authentication*tokens*updated*successfully*
-
-# Unix users can map to different SMB User names
-;  username map = /etc/samba/smbusers
-
-# Using the following line enables you to customise your configuration
-# on a per machine basis. The %m gets replaced with the netbios name
-# of the machine that is connecting
-#   include = /etc/samba/smb.conf.%m
-
-# Options for using winbind. Winbind allows you to do all account and
-# authentication from a Windows or samba domain controller, creating
-# accounts on the fly, and maintaining a mapping of Windows RIDs to unix uid's 
-# and gid's. winbind uid and winbind gid are the only required parameters.
-#
-# winbind uid is the range of uid's winbind can use when mapping RIDs to uid's
-#  idmap uid = 10000-20000
-#
-# winbind gid is the range of uid's winbind can use when mapping RIDs to gid's
-#  idmap gid = 10000-20000
-#
-# winbind separator is the character a user must use between their domain
-# name and username, defaults to "\"
-#  winbind separator = +
-#
-# winbind use default domain allows you to have winbind return usernames
-# in the form user instead of DOMAIN+user for the domain listed in the
-# workgroup parameter.
-#  winbind use default domain = yes
-#
-# template homedir determines the home directory for winbind users, with 
-# %D expanding to their domain name and %U expanding to their username:
-#  template homedir = /home/%D/%U
-
-# When using winbind, you may want to have samba create home directories
-# on the fly for authenticated users. Ensure that /etc/pam.d/samba is
-# using 'service=system-auth-winbind' in pam_stack modules, and then
-# enable obedience of pam restrictions below:
-#  obey pam restrictions = yes
-
-#
-# template shell determines the shell users authenticated by winbind get
-#  template shell = /bin/bash
-
-# 5. Browser Control and Networking Options:
-# Most people will find that this option gives better performance.
-# See speed.txt and the manual pages for details
-   socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
-
-# Configure Samba to use multiple interfaces
-# If you have multiple network interfaces then you must list them
-# here. See the man page for details.
-#   interfaces = 192.168.12.2/24 192.168.13.2/24 
-
-# Configure remote browse list synchronisation here
-#  request announcement to, or browse list sync from:
-#       a specific host or from / to a whole subnet (see below)
-#   remote browse sync = 192.168.3.25 192.168.5.255
-# Cause this host to announce itself to local subnets here
-#   remote announce = 192.168.1.255 192.168.2.44
-
-# set local master to no if you don't want Samba to become a master
-# browser on your network. Otherwise the normal election rules apply
-#   local master = no
-
-# OS Level determines the precedence of this server in master browser
-# elections. The default value should be reasonable
-#   os level = 33
-
-# Domain Master specifies Samba to be the Domain Master Browser. This
-# allows Samba to collate browse lists between subnets. Don't use this
-# if you already have a Windows NT domain controller doing this job
-#   domain master = yes 
-
-# Preferred Master causes Samba to force a local browser election on startup
-# and gives it a slightly higher chance of winning the election
-#   preferred master = yes
-
-# 6. Domain Control Options:
-# Enable this if you want Samba to be a domain logon server for 
-# Windows95 workstations or Primary Domain Controller for WinNT and Win2k
-#   domain logons = yes
-
-# if you enable domain logons then you may want a per-machine or
-# per user logon script
-# run a specific logon batch file per workstation (machine)
-#   logon script = %m.bat
-# run a specific logon batch file per username
-#   logon script = %u.bat
-
-# Where to store roaming profiles for WinNT and Win2k
-#        %L substitutes for this servers netbios name, %u is username
-#        You must uncomment the [Profiles] share below
-#   logon path = \\%L\Profiles\%u
-
-# Where to store roaming profiles for Win9x. Be careful with this as it also
-# impacts where Win2k finds it's /HOME share
-# logon home = \\%L\%u\.profile
-
-
-# The add user script is used by a domain member to add local user accounts
-# that have been authenticated by the domain controller, or when adding
-# users via the Windows NT Tools (ie User Manager for Domains).
-
-# Scripts for file (passwd, smbpasswd) backend:
-# add user script = /usr/sbin/useradd -s /bin/false '%u'
-# delete user script = /usr/sbin/userdel '%s'
-# add user to group script = /usr/bin/gpasswd -a '%u' '%g'
-# delete user from group script = /usr/bin/gpasswd -d '%u' '%g'
-# set primary group script = /usr/sbin/usermod -g '%g' '%u'
-# add group script = /usr/sbin/groupadd %g && getent group '%g'|awk -F: '{print $3}'
-# delete group script = /usr/sbin/groupdel '%g'
-
-# Scripts for LDAP backend (assumes nss_ldap is in use on the domain controller,
-# and needs configuration in smbldap_conf.pm
-# add user script = /usr/share/samba/scripts/smbldap-useradd.pl '%u'
-# delete user script = /usr/share/samba/scripts/smbldap-userdel.pl '%u'
-# add user to group script = /usr/share/samba/scripts/smbldap-groupmod.pl -m '%u' '%g'
-# delete user from group script = /usr/share/samba/scripts/smbldap-groupmod.pl -x '%u' '%g'
-# set primary group script = /usr/share/samba/scripts/smbldap-usermod.pl -g '%g' '%u'
-# add group script = /usr/share/samba/scripts/smbldap-groupadd.pl '%g' && /usr/share/samba/scripts/smbldap-groupshow.pl %g|awk '/^gidNumber:/ {print $2}'
-# delete group script = /usr/share/samba/scripts/smbldap-userdel.pl '%g'
-
-
-# The add machine script is use by a samba server configured as a domain
-# controller to add local machine accounts when adding machines to the domain.
-# The script must work from the command line when replacing the macros,
-# or the operation will fail. Check that groups exist if forcing a group.
-# Script for domain controller for adding machines:
-# add machine script = /usr/sbin/useradd -d /dev/null -g machines -c 'Machine Account' -s /bin/false -M '%u'
-# Script for domain controller with LDAP backend for adding machines (please
-# configure in /etc/samba/smbldap_conf.pm first):
-# add machine script = /usr/share/samba/scripts/smbldap-useradd.pl -w -d /dev/null -g machines -c 'Machine Account' -s /bin/false '%u'
-
-# Domain groups:
-# Domain groups are now configured by using the 'net groupmap' tool
-
-# Samba Password Database configuration:
-# Samba now has runtime-configurable password database backends. Multiple
-# passdb backends may be used, but users will only be added to the first one
-# Default:
-# passdb backend = smbpasswd guest
-# TDB backen with fallback to smbpasswd and guest
-# passdb backend = tdbsam smbpasswd guest
-# LDAP with fallback to smbpasswd guest
-# Enable SSL by using an ldaps url, or enable tls with 'ldap ssl' below.
-# passdb backend = ldapsam:ldaps://ldap.mydomain.com smbpasswd guest
-# Use the samba2 LDAP schema:
-# passdb backend = ldapsam_compat:ldaps://ldap.mydomain.com smbpasswd guest
-
-# Idmap settings (set idmap uid and idmap gid above):
-# Idmap backend to use:
-# idmap backend = ldap:ldap://ldap.mydomain.com
-
-# LDAP configuration for Domain Controlling:
-# The account (dn) that samba uses to access the LDAP server
-# This account needs to have write access to the LDAP tree
-# You will need to give samba the password for this dn, by 
-# running 'smbpasswd -w mypassword'
-# ldap admin dn = cn=root,dc=mydomain,dc=com
-# ldap ssl = start_tls
-# start_tls should run on 389, but samba defaults incorrectly to 636
-# ldap port = 389
-# ldap suffix = dc=mydomain,dc=com
-# Seperate suffixes are available for machines, users, groups, and idmap, if 
-# ldap suffix appears first, it is appended to the specific suffix.
-# Example for a unix-ish directory layout:
-# ldap machine suffix = ou=Hosts
-# ldap user suffix = ou=People
-# ldap group suffix = ou=Group
-# ldap idmap suffix = ou=Idmap
-# Example for AD-ish layout:
-# ldap machine suffix = cn=Computers
-# ldap user suffix = cn=Users
-# ldap group suffix = cn=Groups
-# ldap idmap suffix = cn=Idmap
-
-
-# 7. Name Resolution Options:
-# All NetBIOS names must be resolved to IP Addresses
-# 'Name Resolve Order' allows the named resolution mechanism to be specified
-# the default order is "host lmhosts wins bcast". "host" means use the unix
-# system gethostbyname() function call that will use either /etc/hosts OR
-# DNS or NIS depending on the settings of /etc/host.config, /etc/nsswitch.conf
-# and the /etc/resolv.conf file. "host" therefore is system configuration
-# dependant. This parameter is most often of use to prevent DNS lookups
-# in order to resolve NetBIOS names to IP Addresses. Use with care!
-# The example below excludes use of name resolution for machines that are NOT
-# on the local network segment
-# - OR - are not deliberately to be known via lmhosts or via WINS.
-# name resolve order = wins lmhosts bcast
-
-# Windows Internet Name Serving Support Section:
-# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
-#   wins support = yes
-
-# WINS Server - Tells the NMBD components of Samba to be a WINS Client
-#       Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
-#   wins server = w.x.y.z
-
-# WINS Proxy - Tells Samba to answer name resolution queries on
-# behalf of a non WINS capable client, for this to work there must be
-# at least one  WINS Server on the network. The default is NO.
-#   wins proxy = yes
-
-# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
-# via DNS nslookups. The built-in default for versions 1.9.17 is yes,
-# this has been changed in version 1.9.18 to no.
-   dns proxy = no 
-
-# 8. File Naming Options:
-# Case Preservation can be handy - system default is _no_
-# NOTE: These can be set on a per share basis
-#  preserve case = no
-#  short preserve case = no
-# Default case is normally upper case for all DOS files
-#  default case = lower
-# Be very careful with case sensitivity - it can break things!
-#  case sensitive = no
-
-# Enabling internationalization:
-# you can match a Windows code page with a UNIX character set.
-# Windows: 437 (US), 737 (GREEK), 850 (Latin1 - Western European),
-# 852 (Eastern Eu.), 861 (Icelandic), 932 (Cyrillic - Russian),
-# 936 (Japanese - Shift-JIS), 936 (Simpl. Chinese), 949 (Korean Hangul),
-# 950 (Trad. Chin.).
-# UNIX: ISO8859-1 (Western European), ISO8859-2 (Eastern Eu.),
-# ISO8859-5 (Russian Cyrillic), KOI8-R (Alt-Russ. Cyril.)
-# This is an example for french users:
-#   dos charset = 850
-#   unix charset = ISO8859-1
-
-
-#============================ Share Definitions ==============================
-[homes]
-   comment = Home Directories
-   browseable = no
-   writable = yes
-# You can enable VFS recycle bin and on-access virus-scanning on a per 
-# share basis:
-# Uncomment the next 2 lines (make sure you create a .recycle folder in 
-# the base of the share and ensure all users will have write access to it.
-# For virus scanning, install samba-vscan-clamav and ensure the clamd service
-# is running
-#   vfs objects = vscan-clamav recycle
-#   vscan-clamav: config-file = /etc/samba/vscan-clamav.conf
-
-# Un-comment the following and create the netlogon directory for Domain Logons
-# [netlogon]
-#   comment = Network Logon Service
-#   path = /var/lib/samba/netlogon
-#   guest ok = yes
-#   writable = no
-
-#Uncomment the following 2 lines if you would like your login scripts to
-#be created dynamically by ntlogon (check that you have it in the correct
-#location (the default of the ntlogon rpm available in contribs)
-#root preexec = /usr/bin/ntlogon -u '%u' -g '%g' -o %a -d /var/lib/samba/netlogon/
-#root postexec = rm -f '/var/lib/samba/netlogon/%u.bat'
-
-# Un-comment the following to provide a specific roving profile share
-# the default is to use the user's home directory
-#[Profiles]
-#    path = /var/lib/samba/profiles
-#    browseable = no
-#    guest ok = yes
-#    writable = yes
-# This script can be enabled to create profile directories on the fly
-# You may want to turn off guest acces if you enable this, as it
-# hasn't been thoroughly tested.
-#root preexec = PROFILE='/var/lib/samba/profiles/%u'; if [ ! -e $PROFILE ]; \
-#                then mkdir -pm700 $PROFILE; chown '%u':'%g' $PROFILE;fi
-# If you want read-only profiles, fake permissions so windows clients think
-# they have written to the files
-# vfs objects = fake_perms
-
-# NOTE: If you have a CUPS print system there is no need to 
-# specifically define each individual printer.
-# You must configure the samba printers with the appropriate Windows
-# drivers on your Windows clients or upload the printer driver to the
-# server from Windows (NT/2000/XP). On the Samba server no filtering is
-# done. If you wish that the server provides the driver and the clients
-# send PostScript ("Generic PostScript Printer" under Windows), you have
-# to use 'printcap name = cups' or swap the 'print command' line below 
-# with the commented one. Note that print commands only work if not using 
-# 'printing=cups'
-[printers]
-   comment = All Printers
-   path = /var/spool/samba
-   browseable = no
-# to allow user 'guest account' to print.
-   guest ok = yes
-   writable = no
-   printable = yes
-   create mode = 0700
-# =====================================
-# print command: see above for details.
-# =====================================
-   print command = lpr-cups -P %p -o raw %s -r   # using client side printer drivers.
-#   print command = lpr-cups -P %p %s # using cups own drivers (use generic PostScript on clients).
-# If you install drivers on the server, you will want to uncomment this so
-# clients request the driver 
-   use client driver = yes
-
-# This share is used for Windows NT-style point-and-print support.
-# To be able to install drivers, you need to be either root, or listed
-# in the printer admin parameter above. Note that you also need write access
-# to the directory and share definition to be able to upload the drivers.
-# For more information on this, please see the Printing Support Section of
-# /usr/share/doc/samba-<version>/docs/Samba-HOWTO-Collection.pdf 
-#
-# A special case is using the CUPS Windows Postscript driver, which allows
-# all features available via CUPS on the client, by publishing the ppd file
-# and the cups driver by using the 'cupsaddsmb' tool. This requires the
-# installation of the CUPS driver (http://www.cups.org/windows.php) 
-# on the server, but doesn't require you to use Windows at all :-).
-[print$]
-   path = /var/lib/samba/printers
-   browseable = yes
-   write list = @adm root
-   guest ok = yes
-   inherit permissions = yes
-   # Settings suitable for Winbind:
-   # write list = @"Domain Admins" root
-   # force group = +@"Domain Admins"
-
-# A useful application of samba is to make a PDF-generation service
-# To streamline this, install windows postscript drivers (preferably colour)
-# on the samba server, so that clients can automatically install them.
-# Note that this only works if 'printing' is *not* set to 'cups'
-
-[pdf-gen]
-   path = /var/tmp
-   guest ok = No
-   printable = Yes
-   comment = PDF Generator (only valid users)
-   printing = bsd
-   #print command = /usr/share/samba/scripts/print-pdf file path win_path recipient IP &
-   print command = /usr/share/samba/scripts/print-pdf "%s" "%H" "//%L/%u" "%m" "%I" "%J" &
-    lpq command = /bin/true
-
-# A share allowing administrators to set ACLs on, or access for backup purposes
-# ll files (as root).
-#[admin] 
-#  path = /
-#  admin users = @"Domain Admins"
-#  valid users = @"Domain Admins"
-#  browseable = no
-#  writeable = yes 
-
-# This one is useful for people to share files
-;[tmp]
-;   comment = Temporary file space
-;   path = /tmp
-;   read only = no
-;   public = yes
-
-# A publicly accessible directory, but read only, except for people in
-# the "staff" group
-;[public]
-;   comment = Public Stuff
-;   path = /home/samba/public
-;   public = yes
-;   writable = no
-;   write list = @staff
-# Audited directory through experimental VFS audit.so module:
-# Uncomment next line.
-#   vfs object = /usr/lib/samba/vfs/audit.so
-
-# Other examples. 
-#
-# A private printer, usable only by Fred. Spool data will be placed in Fred's
-# home directory. Note that fred must have write access to the spool directory,
-# wherever it is.
-;[fredsprn]
-;   comment = Fred's Printer
-;   valid users = fred
-;   path = /homes/fred
-;   printer = freds_printer
-;   public = no
-;   writable = no
-;   printable = yes
-
-# A private directory, usable only by Fred. Note that Fred requires write
-# access to the directory.
-;[fredsdir]
-;   comment = Fred's Service
-;   path = /usr/somewhere/private
-;   valid users = fred
-;   public = no
-;   writable = yes
-;   printable = no
-
-# a service which has a different directory for each machine that connects
-# this allows you to tailor configurations to incoming machines. You could
-# also use the %u option to tailor it by user name.
-# The %m gets replaced with the machine name that is connecting.
-;[pchome]
-;  comment = PC Directories
-;  path = /usr/pc/%m
-;  public = no
-;  writable = yes
-
-# The following two entries demonstrate how to share a directory so that two
-# users can place files there that will be owned by the specific users. In this
-# setup, the directory should be writable by both users and should have the
-# sticky bit set on it to prevent abuse. Obviously this could be extended to
-# as many users as required.
-;[myshare]
-;   comment = Mary's and Fred's stuff
-;   path = /usr/somewhere/shared
-;   valid users = mary fred
-;   public = no
-;   writable = yes
-;   printable = no
-;   create mask = 0765
-
diff --git a/packaging/Mandrake/smb.init b/packaging/Mandrake/smb.init
deleted file mode 100755
index c5d3c8dc21..0000000000
--- a/packaging/Mandrake/smb.init
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-#
-# chkconfig: 35 91 9
-# description: Starts and stops the Samba smbd and nmbd daemons \
-#	       used to provide SMB network services.
-
-# Source function library.
-if [ -f /etc/init.d/functions ] ; then
-  . /etc/init.d/functions
-elif [ -f /etc/rc.d/init.d/functions ] ; then
-  . /etc/rc.d/init.d/functions
-else
-  exit 0
-fi
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
-
-# Check that smb.conf exists.
-[ -f /etc/samba/smb.conf ] || exit 0
-
-RETVAL=0
-
-
-start() {
-       # If CUPS is used as printing system, reload smb after a 1 minute delay
-       # to allow the printers to appear properly as samba shares.
-        if killall -0 cupsd 2>/dev/null; then
-         ( sleep 60 && killproc smbd -HUP 1>/dev/null) &
-       fi
-       export TMPDIR="/var/tmp"
-	echo -n "Starting SMB services: "
-	daemon smbd -D 	
-	RETVAL=$?
-	echo
-	echo -n "Starting NMB services: "
-	daemon nmbd -D 
-	RETVAL2=$?
-	echo
-	[ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && touch /var/lock/subsys/smb || \
-	   RETVAL=1
-	return $RETVAL
-}	
-stop() {
-	echo -n "Shutting down SMB services: "
-	killproc smbd
-	RETVAL=$?
-	echo
-	echo -n "Shutting down NMB services: "
-	killproc nmbd
-	RETVAL2=$?
-	[ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f /var/lock/subsys/smb
-	echo ""
-	return $RETVAL
-}	
-restart() {
-	stop
-	start
-}	
-reload() {
-       export TMPDIR="/var/tmp"
-        echo -n "Reloading smb.conf file: "
-	killproc smbd -HUP
-	RETVAL=$?
-	echo
-	return $RETVAL
-}	
-mdkstatus() {
-	status smbd
-	status nmbd
-}	
-
-case "$1" in
-  start)
-  	start
-	;;
-  stop)
-  	stop
-	;;
-  restart)
-  	restart
-	;;
-  reload)
-  	reload
-	;;
-  status)
-  	mdkstatus
-	;;
-  condrestart)
-  	[ -f /var/lock/subsys/smb ] && restart || :
-	;;
-  *)
-	echo "Usage: $0 {start|stop|restart|status|condrestart}"
-	exit 1
-esac
-
-exit $?
diff --git a/packaging/Mandrake/smbprint b/packaging/Mandrake/smbprint
deleted file mode 100755
index b5f689f291..0000000000
--- a/packaging/Mandrake/smbprint
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-# This script is an input filter for printcap printing on a unix machine. It
-# uses the smbclient program to print the file to the specified smb-based 
-# server and service.
-# For example you could have a printcap entry like this
-#
-# smb:lp=/dev/null:sd=/usr/spool/smb:sh:if=/usr/local/samba/smbprint
-#
-# which would create a unix printer called "smb" that will print via this 
-# script. You will need to create the spool directory /usr/spool/smb with
-# appropriate permissions and ownerships for your system.
-
-# Set these to the server and service you wish to print to 
-# In this example I have a WfWg PC called "lapland" that has a printer 
-# exported called "printer" with no password.
-
-#
-# Script further altered by hamiltom@ecnz.co.nz (Michael Hamilton)
-# so that the server, service, and password can be read from 
-# a /var/spool/lpd/PRINTNAME/.config file.
-#
-# In order for this to work the /etc/printcap entry must include an 
-# accounting file (af=...):
-#
-#   cdcolour:\
-#	:cm=CD IBM Colorjet on 6th:\
-#	:sd=/var/spool/lpd/cdcolour:\
-#	:af=/var/spool/lpd/cdcolour/acct:\
-#	:if=/usr/local/etc/smbprint:\
-#	:mx=0:\
-#	:lp=/dev/null:
-#
-# The /usr/var/spool/lpd/PRINTNAME/.config file should contain:
-#   server=PC_SERVER
-#   service=PR_SHARENAME
-#   password="password"
-#
-# E.g.
-#   server=PAULS_PC
-#   service=CJET_371
-#   password=""
-
-#
-# Debugging log file, change to /dev/null if you like.
-#
-# logfile=/tmp/smb-print.log
-logfile=/dev/null
-
-
-#
-# The last parameter to the filter is the accounting file name.
-#   Extract the directory name from the file name.
-#   Concat this with /.config to get the config file.
-#
-eval acct_file=\${$#}
-spool_dir=`dirname $acct_file` 
-config_file=$spool_dir/.config
-
-# Should read the following variables set in the config file:
-#   server
-#   service
-#   password
-eval `cat $config_file`
-
-#
-# Some debugging help, change the >> to > if you want to same space.
-#
-echo "server $server, service $service" >> $logfile
-
-(
-# NOTE You may wish to add the line `echo translate' if you want automatic
-# CR/LF translation when printing.
-#       echo translate
-	echo "print -"
-	cat
-) | /usr/bin/smbclient "//$server/$service" $password -U $server -N >> $logfile
diff --git a/packaging/Mandrake/smbusers b/packaging/Mandrake/smbusers
deleted file mode 100644
index ae3389f53f..0000000000
--- a/packaging/Mandrake/smbusers
+++ /dev/null
@@ -1,3 +0,0 @@
-# Unix_name = SMB_name1 SMB_name2 ...
-root = administrator admin
-nobody = guest pcguest smbguest
diff --git a/packaging/Mandrake/smbw.patch b/packaging/Mandrake/smbw.patch
deleted file mode 100644
index 0abbfdf73f..0000000000
--- a/packaging/Mandrake/smbw.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- samba-2.0.0/source/smbwrapper/smbsh.in.orig	Mon Oct  5 22:37:01 1998
-+++ samba-2.0.0/source/smbwrapper/smbsh.in	Mon Oct  5 22:37:51 1998
-@@ -1,6 +1,6 @@
- #! /bin/sh
- 
--SMBW_LIBDIR=${SMBW_LIBDIR-@builddir@/smbwrapper}
-+SMBW_LIBDIR=${SMBW_LIBDIR-/usr/bin}
- 
- if [ ! -f ${SMBW_LIBDIR}/smbwrapper.so ]; then
-     echo You need to set LIBDIR in smbsh
diff --git a/packaging/Mandrake/swat_16.png.bz2 b/packaging/Mandrake/swat_16.png.bz2
deleted file mode 100644
index 25522cab06..0000000000
Binary files a/packaging/Mandrake/swat_16.png.bz2 and /dev/null differ
diff --git a/packaging/Mandrake/swat_32.png.bz2 b/packaging/Mandrake/swat_32.png.bz2
deleted file mode 100644
index 737d16034f..0000000000
Binary files a/packaging/Mandrake/swat_32.png.bz2 and /dev/null differ
diff --git a/packaging/Mandrake/swat_48.png.bz2 b/packaging/Mandrake/swat_48.png.bz2
deleted file mode 100644
index 3e921c1feb..0000000000
Binary files a/packaging/Mandrake/swat_48.png.bz2 and /dev/null differ
diff --git a/packaging/Mandrake/system-auth-winbind.pamd b/packaging/Mandrake/system-auth-winbind.pamd
deleted file mode 100644
index af859af72b..0000000000
--- a/packaging/Mandrake/system-auth-winbind.pamd
+++ /dev/null
@@ -1,17 +0,0 @@
-#%PAM-1.0
-
-auth        required      /lib/security/pam_env.so
-auth        sufficient    /lib/security/pam_winbind.so
-auth        sufficient    /lib/security/pam_unix.so likeauth nullok use_first_pass
-auth        required      /lib/security/pam_deny.so
-
-account     sufficient    /lib/security/pam_winbind.so
-account     required      /lib/security/pam_unix.so
-
-password    required      /lib/security/pam_cracklib.so retry=3
-password    sufficient    /lib/security/pam_unix.so nullok use_authtok md5 shadow
-password    required      /lib/security/pam_deny.so
-
-session     required      /lib/security/pam_mkhomedir.so skel=/etc/skel/ umask=0022 
-session     required      /lib/security/pam_limits.so
-session     required      /lib/security/pam_unix.so
diff --git a/packaging/Mandrake/winbind.init b/packaging/Mandrake/winbind.init
deleted file mode 100644
index b7650584c9..0000000000
--- a/packaging/Mandrake/winbind.init
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-#
-# chkconfig: 345 81 45
-# description: Starts and stops the Samba winbind daemon to provide \
-# user and group information from a domain controller to linux.
-
-# Source function library.
-if [ -f /etc/init.d/functions ] ; then
-  . /etc/init.d/functions
-elif [ -f /etc/rc.d/init.d/functions ] ; then
-  . /etc/rc.d/init.d/functions
-else
-  exit 0
-fi
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
-
-# Check that smb.conf exists.
-[ -f /etc/samba/smb.conf ] || exit 0
-
-RETVAL=0
-
-
-start() {
-	echo -n "Starting Winbind services: "
-	RETVAL=1
-	if [ "`grep -i -E '(idmap|winbind) uid' /etc/samba/smb.conf | egrep -v [\#\;]`" -a "`grep -i -E '(idmap|winbind) gid' /etc/samba/smb.conf | egrep -v [\#\;]`" ]; then
-		daemon winbindd
-		RETVAL=$?
-	else
-		echo "Winbind is not configured in /etc/samba/smb.conf, not starting"
-	fi
-	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/winbind || \
-	   RETVAL=1
-	return $RETVAL
-}	
-stop() {
-	echo -n "Shutting down Winbind services: "
-	RETVAL=1
-	if [ "`grep -i -E '(idmap|winbind) uid' /etc/samba/smb.conf | egrep -v [\#\;]`" -a "`grep -i -E '(idmap|winbind) gid' /etc/samba/smb.conf | egrep -v [\#\;]`" ]; then
-		killproc winbindd
-		RETVAL=$?
-	fi
-	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/winbind
-	return $RETVAL
-}	
-restart() {
-	stop
-	start
-}	
-reload() {
-	export TMPDIR="/var/tmp"
-        echo -n "Checking domain trusts: "
-	killproc winbindd -HUP
-	RETVAL=$?
-	echo
-	return $RETVAL
-}	
-mdkstatus() {
-	status winbindd
-}	
-
-case "$1" in
-  start)
-  	start
-	;;
-  stop)
-  	stop
-	;;
-  restart)
-  	restart
-	;;
-  reload)
-  	reload
-	;;
-  status)
-  	mdkstatus
-	;;
-  condrestart)
-  	[ -f /var/lock/subsys/winbindd ] && restart || :
-	;;
-  *)
-	echo "Usage: $0 {start|stop|restart|status|condrestart}"
-	exit 1
-esac
-
-exit $?
diff --git a/packaging/Mandrake/wrepld.init b/packaging/Mandrake/wrepld.init
deleted file mode 100644
index b8057f5f40..0000000000
--- a/packaging/Mandrake/wrepld.init
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-#
-# chkconfig: 345 81 45
-# description: Starts and stops the Samba wrepld daemon to provide \
-# WINS replication services between WINS partner servers.
-
-# Source function library.
-if [ -f /etc/init.d/functions ] ; then
-  . /etc/init.d/functions
-elif [ -f /etc/rc.d/init.d/functions ] ; then
-  . /etc/rc.d/init.d/functions
-else
-  exit 0
-fi
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
-
-# Check that smb.conf exists.
-[ -f /etc/samba/smb.conf ] || exit 0
-
-RETVAL=0
-
-
-start() {
-	echo -n "Starting WINS Replication services: "
-	RETVAL=1
-	if [ "`grep -i 'wins partners' /etc/samba/smb.conf | egrep -v [\#\;]`" ]; then
-		daemon wrepld
-		RETVAL=$?
-	else
-		echo "WINS replication is not configured in /etc/samba/smb.conf, not starting"
-	fi
-	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/wrepld || \
-	   RETVAL=1
-	return $RETVAL
-}	
-stop() {
-	echo -n "Shutting down WINS replication services: "
-	RETVAL=1
-	if [ "`grep -i 'wins partners' /etc/samba/smb.conf | egrep -v [\#\;]`" ]; then
-		killproc wrepld
-		RETVAL=$?
-	fi
-	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/wrepld
-	return $RETVAL
-}	
-restart() {
-	stop
-	start
-}	
-reload() {
-	export TMPDIR="/var/tmp"
-        echo -n "Reloading WINS replication: "
-	killproc wrepld -HUP
-	RETVAL=$?
-	echo
-	return $RETVAL
-}	
-mdkstatus() {
-	status wrepld
-}	
-
-case "$1" in
-  start)
-  	start
-	;;
-  stop)
-  	stop
-	;;
-  restart)
-  	restart
-	;;
-  reload)
-  	reload
-	;;
-  status)
-  	mdkstatus
-	;;
-  condrestart)
-  	[ -f /var/lock/subsys/wrepld ] && restart || :
-	;;
-  *)
-	echo "Usage: $0 {start|stop|restart|status|condrestart}"
-	exit 1
-esac
-
-exit $?
-- 
cgit