merge

6 files changed, 0 insertions, 507 deletions

diff --git a/packaging/Debian/debian/control.smbwrapper b/packaging/Debian/debian/control.smbwrapper
deleted file mode 100644
index 70444ca5f58..00000000000
--- a/packaging/Debian/debian/control.smbwrapper
+++ /dev/null
@@ -1,111 +0,0 @@
-Source: samba
-Section: net
-Priority: optional
-Maintainer: Eloy A. Paris <peloy@debian.org>
-Standards-Version: 2.4.0.0
-
-Package: samba
-Architecture: any
-Depends: samba-common (= ${Source-Version}), ${shlibs:Depends}
-Replaces: samba-common (<= 2.0.5a-2)
-Suggests: samba-doc
-Description: A LanManager like file and printer server for Unix.
- The Samba software suite is a collection of programs that
- implements the SMB protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or Netbios protocol.
- .
- This package contains all the components necessary to turn your
- Debian GNU/Linux box into a powerful file and printer server.
- .
- As of Samba 2.0.0, the Samba Debian packages consist of the following:
- .
- samba - A LanManager like file and printer server for Unix.
- samba-common - Samba common files used by both the server and the client.
- smbclient - A LanManager like simple client for Unix.
- swat - Samba Web Administration Tool
- samba-doc - Samba documentation.
- smbfsx - Mount and umount commands for the smbfs and kernels > 2.1.70.
- smbwrapper - A shared library that provides SMB client services
-
-Package: samba-common
-Architecture: any
-Depends: ${shlibs:Depends}
-Replaces: samba (<= 2.0.5a-2)
-Description: Samba common files used by both the server and the client.
- The Samba software suite is a collection of programs that
- implements the SMB protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or Netbios protocol.
- .
- This package contains the common files that are used by both the server
- (provided in the samba package) and the client (provided in the smbclient
- package).
-
-Package: smbclient
-Architecture: any
-Depends: samba-common (= ${Source-Version}), ${shlibs:Depends}
-Description: A LanManager like simple client for Unix.
- The Samba software suite is a collection of programs that
- implements the SMB protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or Netbios protocol.
- .
- This package contains the client components of the Samba suite.
-
-Package: swat
-Architecture: any
-Depends: samba, ${shlibs:Depends}
-Description: Samba Web Administration Tool
- The Samba software suite is a collection of programs that
- implements the SMB protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or Netbios protocol.
- .
- This package contains the components of the Samba suite that are needed
- for Web administration fo the Samba server.
-
-Package: samba-doc
-Architecture: all
-Description: Samba documentation.
- The Samba software suite is a collection of programs that
- implements the SMB protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or Netbios protocol.
- .
- This package contains all the documentation that comes in the original
- tarball.
-
-Package: smbfs
-Section: otherosfs
-Priority: optional
-Architecture: any
-Depends: netbase (>= 2.02), samba-common (= ${Source-Version}), ${shlibs:Depends}
-Replaces: smbfsx
-Conflicts: smbfsx
-Description: Mount and umount commands for the smbfs (2.0.x and 2.1.x kernels)
- Smbfs is a filesystem which understands the SMB protocol.
- This is the protocol Windows for Workgroups, Windows NT or
- Lan Manager use to talk to each other. It was inspired by
- samba, the program by Andrew Tridgell that turns any unix
- site into a file server for DOS or Windows clients.
- .
- Starting with the Debian Samba packages version 2.0.4b-2, the old smbfs
- utilities for 2.0.x and the new smbfs utilities for 2.2.x kernels have been
- merged in a single package called smbfs. A wrapper script called smbmount.sh
- identifies the version of the kernel running and calls the correct binary.
-
-Package: smbwrapper
-Section: otherosfs
-Priority: optional
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: A shared library that provides SMB client services
- The Samba software suite is a collection of programs that
- implements the SMB protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or Netbios protocol.
- .
- This package contains prelodable shared library that provides SMB client 
- services for existing executables. Using this you can simulate a smb
- filesystem.
diff --git a/packaging/Debian/debian/patches/Makefile.patch b/packaging/Debian/debian/patches/Makefile.patch
deleted file mode 100644
index 2b28da5c3a9..00000000000
--- a/packaging/Debian/debian/patches/Makefile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- samba-2.2.2.cvs20020120.orig/source/Makefile.in
-+++ samba-2.2.2.cvs20020120/source/Makefile.in
-@@ -91,7 +91,7 @@
- 
- SPROGS = bin/smbd bin/nmbd bin/swat
- PROGS1 = bin/smbclient bin/smbspool bin/testparm bin/testprns bin/smbstatus bin/smbcontrol bin/make_printerdef @RUNPROG@ 
--PROGS2 = bin/smbpasswd bin/make_smbcodepage bin/rpcclient bin/make_unicodemap bin/smbcacls @WRAP@ @WRAP32@ @PAM_MOD@ @PDBEDIT@ @LIBSMBCLIENT@
-+PROGS2 = bin/smbpasswd bin/make_smbcodepage bin/rpcclient bin/make_unicodemap bin/smbcacls @WRAP@ @WRAP32@ @PAM_MOD@ @PDBEDIT@ @LIBSMBCLIENT_STATIC@ @LIBSMBCLIENT_SHARED@
- MPROGS = @MPROGS@
- LPROGS = $(WINBIND_PAM_PROGS) $(WINBIND_LPROGS)
- PROGS = $(PROGS1) $(PROGS2) $(MPROGS) bin/nmblookup
-@@ -614,13 +614,15 @@
- 	@echo Linking shared library $@
- 	@$(SHLD) -32 @LDSHFLAGS@ -o $@ $(PICOBJS32) $(LIBS)
- 
--libsmbclient: $(LIBSMBCLIENT_PICOBJS)
--	@echo Linking libsmbclient shared library bin/$@.@SHLIBEXT@
--	@$(SHLD) @LDSHFLAGS@ -o  bin/$@.@SHLIBEXT@ \
-+bin/libsmbclient.so: $(LIBSMBCLIENT_PICOBJS)
-+	@echo Linking libsmbclient shared library $@
-+	@$(SHLD) @LDSHFLAGS@ -o  $@ \
- 		$(LIBSMBCLIENT_PICOBJS) $(LIBS) \
- 		@SONAMEFLAG@libsmbclient.so.$(LIBSMBCLIENT_MAJOR)
--	@echo Linking libsmbclient non-shared library bin/$@.a
--	@-$(AR) -rc bin/$@.a $(LIBSMBCLIENT_PICOBJS)
-+
-+bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS)
-+	@echo Linking libsmbclient non-shared library $@
-+	@-$(AR) -rc $@ $(LIBSMBCLIENT_PICOBJS)
- 
- bin/smbsh: $(SMBSH_OBJ) bin/.dummy
- 	@echo Linking $@
-@@ -673,10 +675,12 @@
- installswat: installdirs
- 	@$(SHELL) $(srcdir)/script/installswat.sh $(SWATDIR) $(srcdir)
- 
--installclientlib:
--	-$(INSTALLCMD) bin/libsmbclient.so
--	-$(INSTALLCMD) -d ${prefix}/include
--	-$(INSTALLCMD) include/libsmbclient.h ${prefix}/include
-+installclientlib: bin/libsmbclient.so bin/libsmbclient.a
-+	# Installed (in the wrong location, BTW) by installbin above (peloy@debian.org)
-+	# -$(INSTALLCMD) bin/libsmbclient.so $(BASEDIR)/lib
-+	# -$(INSTALLCMD) bin/libsmbclient.a $(BASEDIR)/lib
-+	-$(INSTALLCMD) -d $(INCLUDEDIR)
-+	-$(INSTALLCMD) include/libsmbclient.h $(INCLUDEDIR)
- 
- # revert to the previously installed version
- revert:
diff --git a/packaging/Debian/debian/rules.smbwrapper b/packaging/Debian/debian/rules.smbwrapper
deleted file mode 100644
index e3c72ee47c4..00000000000
--- a/packaging/Debian/debian/rules.smbwrapper
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/usr/bin/make -f
-# Made with the iad of dh_make, by Craig Small
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# Also some stuff taken from debmake scripts, by Cristopt Lameter.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-BVARS = BASEDIR=/usr \
-		LIBDIR=/etc/samba \
-		SMB_PASSWD_FILE=/etc/samba/smbpasswd \
-		SMBLOGFILE=/var/log/smb NMBLOGFILE=/var/log/nmb \
-		LOCKDIR=/var/samba \
-		SWATDIR=/usr/share/samba/swat
-
-DESTDIR=`pwd`/debian/tmp
-SWATDIR=`pwd`/debian/swat
-
-IVARS = BASEDIR=$(DESTDIR)/usr \
-		BINDIR=$(DESTDIR)/usr/bin \
-		SBINDIR=$(DESTDIR)/usr/sbin \
-		MANDIR=$(DESTDIR)/usr/share/man \
-		LIBDIR=$(DESTDIR)/etc/samba \
-		VARDIR=$(DESTDIR)/var/samba \
-		SWATDIR=$(SWATDIR)/usr/share/samba/swat
-
-build: build-stamp
-build-stamp:
-	dh_testdir
-
-	# Compile the Samba package first
-	[ -f source/Makefile ] || (cd source && ./configure --prefix=/usr --exec-prefix=/usr --with-netatalk --with-smbmount --with-smbwrapper)
-	$(MAKE) -C source $(BVARS) all smbtorture rpctorture debug2html
-
-	# Now compile the old smbfs package
-	$(MAKE) -C source/smbfs-2.0.x
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp install-stamp
-
-	# Clean first the Samba package
-#	-$(MAKE) -C source realclean
-	-$(MAKE) -C source distclean
-#	-$(MAKE) -C source clean
-	rm -f source/bin/{rpctorture,smbtorture,debug2html}
-
-	# Now clean the old smbfs-2.0.x package
-	-$(MAKE) -C source/smbfs-2.0.x clean
-
-	dh_clean
-
-install: install-stamp
-install-stamp: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp.
-	$(MAKE) -C source install $(IVARS)
-
-	# Install other stuff not installed by "make install"
-	install -m 0755 source/script/mksmbpasswd.sh $(DESTDIR)/usr/sbin/mksmbpasswd
-	install -m 0755 source/bin/smbtorture $(DESTDIR)/usr/bin/
-	install -m 0755 debian/sambaconfig $(DESTDIR)/usr/sbin/
-	install -m 0755 source/smbadduser $(DESTDIR)/usr/sbin/
-
-	# Install man pages for files without man pages in the upstream dist.
-	install -m 0644 debian/sambaconfig.8 $(DESTDIR)/usr/share/man/man8/sambaconfig.8
-	install -m 0644 debian/addtosmbpass.8 $(DESTDIR)/usr/share/man/man8/addtosmbpass.8
-	install -m 0644 debian/mksmbpasswd.8 $(DESTDIR)/usr/share/man/man8/mksmbpasswd.8
-
-	# Delete unwanted stuff leftover from "make install"
-
-	# smbrun is not longer needed by smbd, so delete its man page
-	rm $(DESTDIR)/usr/share/man/man1/smbrun.1
-
-	# We need to rename the SMB mount utilities so they don't have the same
-	#	names as the files in the smbfs package.
-	mv $(DESTDIR)/usr/bin/smbmount $(DESTDIR)/usr/bin/smbmount-2.2.x
-	mv $(DESTDIR)/usr/bin/smbumount $(DESTDIR)/usr/bin/smbumount-2.2.x
-	mv $(DESTDIR)/usr/share/man/man8/smbmount.8 $(DESTDIR)/usr/share/man/man8/smbmount-2.2.x.8
-	mv $(DESTDIR)/usr/share/man/man8/smbumount.8 $(DESTDIR)/usr/share/man/man8/smbumount-2.2.x.8
-
-	# These files are not part of the main samba package, move to where they
-	#	belong...
-	mv $(DESTDIR)/usr/bin/smbwrapper.so debian/smbwrapper/usr/share/samba/
-
-	# The smbmnt, smbmount-2.2.x and smbumount-2.2.x binaries must 
-	#	be setuid-root.
-	chmod u+s $(DESTDIR)/usr/bin/smbmnt $(DESTDIR)/usr/bin/smbmount-2.2.x $(DESTDIR)/usr/bin/smbumount-2.2.x
-
-	# Install samba-common's conffiles
-	cp debian/smb.conf $(DESTDIR)/etc/samba/
-
-
-	# OK, now it's time to install the smbfs-2.0.2 files
-	$(MAKE) -C source/smbfs-2.0.x install $(IVARS)
-
-	# Rename the old smbfs utilities to more convenient names
-	mv $(DESTDIR)/usr/bin/smbmount $(DESTDIR)/usr/bin/smbmount-2.0.x
-	mv $(DESTDIR)/usr/bin/smbumount $(DESTDIR)/usr/bin/smbumount-2.0.x
-	mv $(DESTDIR)/usr/share/man/man8/smbmount.8 $(DESTDIR)/usr/share/man/man8/smbmount-2.0.x.8
-	mv $(DESTDIR)/usr/share/man/man8/smbumount.8 $(DESTDIR)/usr/share/man/man8/smbumount-2.0.x.8
-
-	# Now install the smbmount and smbumount wrappers
-	install debian/smbmount.sh $(DESTDIR)/usr/bin/smbmount
-	install debian/smbumount.sh $(DESTDIR)/usr/bin/smbumount
-
-	# Install some docs. that go in "unusual" places
-	cp README-smbmount debian/smbfs/usr/share/doc/smbfs/2.2.x/
-	cp source/smbfs-2.0.x/{FAQ,README,smbfs-2.0.2.lsm,Changes} debian/smbfs/usr/share/doc/smbfs/2.0.x/
-
-	dh_movefiles
-	touch install-stamp
-
-# Build architecture-independent files here.
-binary-indep: build install
-#	dh_testversion
-	dh_testdir -i
-	dh_testroot -i
-	dh_installdocs -i -A docs/textdocs/DIAGNOSIS.txt
-	dh_installexamples -i
-#	dh_installmenu -i
-#	dh_installemacsen -i
-#	dh_installinit -i
-#	dh_installcron -i
-#	dh_installmanpages -i
-	dh_undocumented
-	dh_installchangelogs -i 
-	dh_compress -i
-#	dh_suidregister -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install
-#	dh_testversion
-	dh_testdir -a
-	dh_testroot -a
-	dh_installdocs -a -A docs/textdocs/DIAGNOSIS.txt
-	dh_installexamples -a
-#	dh_installmenu -a
-#	dh_installemacsen -a
-	dh_installinit -a
-	dh_installcron -a
-#	dh_installmanpages -a
-	dh_undocumented
-	dh_installchangelogs -a 
-	dh_strip -a
-	dh_compress -a
-	dh_suidregister -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-#	dh_makeshlibs -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-source diff:                                                                  
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
diff --git a/packaging/Debian/debian/sambaconfig b/packaging/Debian/debian/sambaconfig
deleted file mode 100644
index 0d35a519670..00000000000
--- a/packaging/Debian/debian/sambaconfig
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/sh
-#
-#	Written by Eloy A. Paris <peloy@debian.org> for Debian GNU/Linux.
-#
-
-PATH="/usr/sbin:/usr/bin:/sbin:/bin"
-DEBIAN_CONFIG=/etc/samba/debian_config
-
-NMBDPID=/var/state/samba/nmbd.pid
-SMBDPID=/var/state/samba/smbd.pid
-
-if [ ! -f $DEBIAN_CONFIG ]; then
-	echo "The file $DEBIAN_CONFIG does not exist! There is something wrong"
-	echo "with the installation of Samba on this system. Please re-install"
-	echo "Samba."
-	exit 1
-fi
-
-# Read current Samba configuration
-. $DEBIAN_CONFIG
-
-reload=1
-
-while [ $# -gt 0 ]
-do
-	case "$1" in
-		--run-from-inetd)
-			run_from_inetd=1
-			shift
-		;;
-
-		--run-as-daemons)
-			run_from_inetd=0
-			shift
-		;;
-		--no-reload)
-			reload=0
-			shift
-		;;
-
-		*)
-			echo "Usage: $0 [--run-from-inetd|--run-as-daemons] [no-reload]" >&2
-			exit 1
-		;;
-	esac
-done
-
-# Make sure there are no Samba daemons (nmbd or smbd) running
-#
-
-if [ "$run_mode" = "from_inetd" ]; then
-	# Samba is running from inetd - need to disable inetd before
-	#	killing the daemons.
-	update-inetd --disable netbios-ssn
-	update-inetd --disable netbios-ns
-	start-stop-daemon --stop --oknodo --user root --name nmbd --quiet --pidfile $NMBDPID
-	start-stop-daemon --stop --oknodo --user root --name smbd --quiet --pidfile $SMBDPID
-else
-	# Samba is running as daemons
-	/etc/init.d/samba stop
-fi
-
-if [ "x$run_from_inetd" = "x" ]
-then
-	echo "Run Samba as daemons or from inetd?"
-	echo -n "Press 'D' for to run as daemons or 'I' to run from inetd: [I] "
-
-	read mode
-	test -n "$mode" || mode="I"
-
-	case "$mode" in
-		[Dd]*)
-			run_from_inetd=0
-		;;
-
-		*)
-			run_from_inetd=1
-		;;
-	esac
-fi
-
-if [ "$run_from_inetd" = 1 ]; then
-	echo "Samba will run from inetd. Run sambaconfig to reconfigure."
-	echo ""
-	update-inetd --enable netbios-ssn
-	update-inetd --enable netbios-ns
-	run_mode="from_inetd"
-else
-	echo "Samba will run as daemons. Run sambaconfig to reconfigure."
-	echo ""
-	update-inetd --disable netbios-ssn
-	update-inetd --disable netbios-ns
-	run_mode="as_daemons"
-fi
-
-# Rebuild Debian configuration file (only thing that could have
-#	changed so far is the variable called "run_mode".
-
-# Start the Samba daemons (take care of whether the user used the --no-reload
-#	option and how Samba is running: from inetd or as daemons)
-echo "config_version=$config_version" > $DEBIAN_CONFIG
-echo "run_mode=$run_mode" >> $DEBIAN_CONFIG
-echo "smbpasswd_created=$smbpasswd_created" >> $DEBIAN_CONFIG
-
-if [ "$reload" = 0 ]; then
-	echo "Samba will not start (--no-reload parameter provided). Please note"
-	echo "that if you configured Samba to run from inetd, the Samba daemons"
-	echo "will start automatically when there is traffic in the NetBIOS ports"
-elif [ "$run_from_inetd" = 1 ]; then
-	echo "The --no-reload parameter was not provided so I assume you want"
-	echo "to have the Samba daemons started. Since you are running from inetd"
-	echo "the Samba daemosn will start automatically when there is traffic"
-	echo "in the NetBIOS ports."
-else
-	echo -n "The --no-reload parameter was not provided, start Samba now? [Y/n] "
-	read yn
-	test -n "$yn" || yn="Y"
-
-	case "$yn" in
-		[Nn]*)
-			echo "Not started; to start later, do: /etc/init.d/samba start"
-			echo -n "Press [ENTER] "
-			read line
-		;;
-
-		*)
-			/etc/init.d/samba start
-		;;
-	esac
-fi
diff --git a/packaging/Debian/debian/sambaconfig.8 b/packaging/Debian/debian/sambaconfig.8
deleted file mode 100644
index 2a0aaa9aa31..00000000000
--- a/packaging/Debian/debian/sambaconfig.8
+++ /dev/null
@@ -1,40 +0,0 @@
-.TH SAMBACONFIG 8 06-Apr-1998
-.SH NAME
-sambaconfig \- configure Samba for Debian systems
-.SH SYNOPSIS
-sambaconfig [--run-from-inetd|--run-as-daemons] [--no-reload]
-.SH DESCRIPTION
-.B sambaconfig
-is used to simplify the configuration of samba(8) for use on Debian
-systems.
-.PP
-You may run this program to (re)configure samba for your Debian system 
-at any time.
-.PP
-Normally
-.B sambaconfig
-will ask if you want to reload the Samba daemons after making changes to its
-configuration. The --no-reload option will avoid this question. Note
-that if Samba is running from inetd and --no-reload is not supplied no
-questions is asked because Samba will start automatically from inetd
-when there is traffic on the NetBIOS ports.
-.SH FILES
-.TP
-/etc/inetd.conf
-If the lines that start the NetBIOS daemons nmbd and smbd are
-commented out then Samba will start as daemons from /etc/init.d/start
-.TP
-/etc/init.d/samba
-Script that will start/stop/restart Samba when running as daemons
-.TP
-/etc/samba/smbpasswd
-Encrypted passwords file for the Samba daemons
-.TP
-/etc/samba/debian_config
-Debian specific configuration information, it holds the mode in which
-Samba is running (from inetd or as daemons).
-.SH SEE ALSO
-samba(7), nmbd(8), smbd(8)
-.SH AUTHOR
-Eloy A. Paris <peloy@debian.org> (man page based on sendmailconfig's man page
-by Robert Leslie <rob@mars.org>)
diff --git a/packaging/Debian/debian/smbfs.suid b/packaging/Debian/debian/smbfs.suid
deleted file mode 100644
index 9569087fff3..00000000000
--- a/packaging/Debian/debian/smbfs.suid
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/bin/smbmnt
-usr/bin/smbmount-2.2.x
-usr/bin/smbumount-2.2.x
-usr/bin/smbmount-2.0.x
-usr/bin/smbumount-2.0.x