another round of syncs for HEAD that I forget

(This used to be commit 3aaf65d297d20320dc1f2c0ac0487feb47873609)
author: Gerald Carter <jerry@samba.org> 2003-09-09 11:12:43 +0000
committer: Gerald Carter <jerry@samba.org> 2003-09-09 11:12:43 +0000
commit: f83a6ce2adbdd471809ccbcfd69dc3fcf6d89129 (patch)
tree: 5a9a498dc581d42374824065c68c4d13aedfc24a /packaging
parent: 7f438c3b9e8913a7836b4851ef7c40a7b97a986d (diff)
download: samba-f83a6ce2adbdd471809ccbcfd69dc3fcf6d89129.tar.gz
samba-f83a6ce2adbdd471809ccbcfd69dc3fcf6d89129.tar.bz2
samba-f83a6ce2adbdd471809ccbcfd69dc3fcf6d89129.zip
21 files changed, 15 insertions, 1465 deletions
diff --git a/packaging/Debian/debian/libsmbclient.postinst b/packaging/Debian/debian/libsmbclient.postinst
deleted file mode 100644
index 3223fa64d6..0000000000
--- a/packaging/Debian/debian/libsmbclient.postinst
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# postinst script for libsmbclient
-#
-# $Id: libsmbclient.postinst,v 1.3 2003/06/01 07:12:51 peloy Exp $
-#
-
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
-
-#DEBHELPER#
diff --git a/packaging/Debian/debian/patches/configure.patch b/packaging/Debian/debian/patches/configure.patch
deleted file mode 100644
index 0cf1434b29..0000000000
--- a/packaging/Debian/debian/patches/configure.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -uNr samba-3.0alpha21.orig/source/configure.in samba-3.0alpha21/source/configure.in
---- samba-3.0alpha21.orig/source/configure.in	2003-02-16 13:01:45.000000000 -0600
-+++ samba-3.0alpha21/source/configure.in	2003-02-16 13:04:03.000000000 -0600
-@@ -481,6 +481,28 @@
- #endif
- }
- ], [LINUX_LFS_SUPPORT=yes], [LINUX_LFS_SUPPORT=no], [LINUX_LFS_SUPPORT=cross])
-+	if test x$LINUX_LFS_SUPPORT = xyes ; then
-+          AC_TRY_RUN([
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <fcntl.h>
-+main() {
-+   unsigned int *padding;
-+   struct flock foo_lock = {F_WRLCK, SEEK_SET, 0, 1, 0};
-+   int fd = open("/dev/null", O_RDWR);
-+
-+   /* Yes, we're depending on the internals of the Linux flock structure
-+      here -- but this test is explicitly Linux-specific to begin with. */
-+   padding = (unsigned int *)&foo_lock;
-+   padding[1] = 0xffffffff;
-+   foo_lock.l_start = 0;
-+   if (fcntl(fd, F_SETLK, &foo_lock) < 0)
-+      exit(1);
-+
-+   exit(0);
-+}
-+], [LINUX_LFS_SUPPORT=yes], [LINUX_LFS_SUPPORT=no], [LINUX_LFS_SUPPORT=cross])
-+	fi
-         CPPFLAGS="$old_CPPFLAGS"
-         if test x$LINUX_LFS_SUPPORT = xyes ; then
-           CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
diff --git a/packaging/Debian/debian/patches/krb5-vars.patch b/packaging/Debian/debian/patches/krb5-vars.patch
deleted file mode 100644
index d6eadfd91b..0000000000
--- a/packaging/Debian/debian/patches/krb5-vars.patch
+++ /dev/null
@@ -1,688 +0,0 @@
---- samba_3_0/source/Makefile.in.orig	2003-07-15 12:26:55.000000000 -0400
-+++ samba_3_0/source/Makefile.in	2003-07-15 12:26:57.000000000 -0400
-@@ -32,7 +32,6 @@
- ACLLIBS=@ACLLIBS@
- PASSDBLIBS=@PASSDBLIBS@
- IDMAP_LIBS=@IDMAP_LIBS@
--ADSLIBS=@ADSLIBS@
- KRB5LIBS=@KRB5_LIBS@
- LDAPLIBS=@LDAP_LIBS@
- 
-@@ -735,12 +734,12 @@
- 
- bin/smbd@EXEEXT@: $(SMBD_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(ADSLIBS) $(LDFLAGS) $(DYNEXP) $(PRINTLIBS) \
-+	@$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(KRB5LIBS) $(LDAPLIBS) $(LDFLAGS) $(DYNEXP) $(PRINTLIBS) \
- 	  $(AUTHLIBS) $(ACLLIBS) $(PASSDBLIBS) $(LIBS) @POPTLIBS@
- 
- bin/nmbd@EXEEXT@: $(NMBD_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(ADSLIBS)
-+	@$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAPLIBS)
- 
- bin/wrepld@EXEEXT@: $(WREPL_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-@@ -749,19 +748,19 @@
- bin/swat@EXEEXT@: $(SWAT_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP) $(PRINTLIBS) \
--	  $(AUTHLIBS) $(LIBS) $(PASSDBLIBS) @POPTLIBS@ $(KRB5LIBS)
-+	  $(AUTHLIBS) $(LIBS) $(PASSDBLIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAPLIBS)
- 
- bin/rpcclient@EXEEXT@: $(RPCCLIENT_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(PASSDBLIBS) $(RPCCLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(ADSLIBS)
-+	@$(CC) $(FLAGS) -o $@ $(PASSDBLIBS) $(RPCCLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAPLIBS)
- 
- bin/smbclient@EXEEXT@: $(CLIENT_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(ADSLIBS)
-+	@$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAPLIBS)
- 
- bin/net@EXEEXT@: $(NET_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(ADSLIBS) $(PASSDBLIBS)
-+	@$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAPLIBS) $(PASSDBLIBS)
- 
- bin/profiles@EXEEXT@: $(PROFILES_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-@@ -809,7 +808,7 @@
- 
- bin/smbpasswd@EXEEXT@: $(SMBPASSWD_OBJ) bin/.dummy
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(PASSDBLIBS) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(PASSDBLIBS) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAPLIBS)
- 
- bin/pdbedit@EXEEXT@: $(PDBEDIT_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-@@ -881,7 +880,7 @@
- 
- bin/smbw_sample@EXEEXT@: $(SMBW_OBJ) utils/smbw_sample.o bin/.dummy
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(SMBW_OBJ) utils/smbw_sample.o $(LDFLAGS) $(LIBS) $(KRB5LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(SMBW_OBJ) utils/smbw_sample.o $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAPLIBS)
- 
- bin/smbsh@EXEEXT@: $(SMBSH_OBJ) bin/.dummy
- 	@echo Linking $@
-@@ -890,12 +889,14 @@
- bin/smbwrapper.@SHLIBEXT@: $(PICOBJS) bin/.dummy
- 	@echo Linking shared library $@
- 	@$(SHLD) $(LDSHFLAGS) -o $@ $(PICOBJS) $(LIBS) \
--		@SONAMEFLAG@`basename $@` $(KRB5LIBS)
-+		$(KRB5LIBS) $(LDAPLIBS) \
-+		@SONAMEFLAG@`basename $@`
- 
- bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS)
- 	@echo Linking libsmbclient shared library $@
- 	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \
--	$(KRB5LIBS) @SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
-+		$(KRB5LIBS) $(LDAPLIBS) \
-+		@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
- 
- bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS)
- 	@echo Linking libsmbclient non-shared library $@
-@@ -905,7 +906,8 @@
- bin/libbigballofmud.@SHLIBEXT@: $(LIBBIGBALLOFMUD_PICOBJS)
- 	@echo Linking bigballofmud shared library $@
- 	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_PICOBJS) $(LIBS) \
--		@SONAMEFLAG@`basename $@`.$(LIBBIGBALLOFMUD_MAJOR) $(PASSDBLIBS) $(IDMAP_LIBS) $(ADSLIBS)
-+		$(PASSDBLIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAPLIBS) \
-+		@SONAMEFLAG@`basename $@`.$(LIBBIGBALLOFMUD_MAJOR)
- 	ln -snf libbigballofmud.so bin/libbigballofmud.so.0
- 
- # It would be nice to build a static bigballofmud too, but when I try
-diff -uNr samba-3.0.0beta2.orig/source/aclocal.m4 samba-3.0.0beta2/source/aclocal.m4
---- samba-3.0.0beta2.orig/source/aclocal.m4	2003-07-01 15:44:25.000000000 -0500
-+++ samba-3.0.0beta2/source/aclocal.m4	2003-07-05 16:22:30.000000000 -0500
-@@ -111,6 +111,113 @@
-   esac
- ])
- 
-+# AC_CHECK_LIB_EXT(LIBRARY, [EXT_LIBS], [FUNCTION],
-+#              [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
-+#              [ADD-ACTION-IF-FOUND],[OTHER-LIBRARIES])
-+# ------------------------------------------------------
-+#
-+# Use a cache variable name containing both the library and function name,
-+# because the test really is for library $1 defining function $3, not
-+# just for library $1.  Separate tests with the same $1 and different $3s
-+# may have different results.
-+#
-+# Note that using directly AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$3])
-+# is asking for troubles, since AC_CHECK_LIB($lib, fun) would give
-+# ac_cv_lib_$lib_fun, which is definitely not what was meant.  Hence
-+# the AS_LITERAL_IF indirection.
-+#
-+# FIXME: This macro is extremely suspicious.  It DEFINEs unconditionnally,
-+# whatever the FUNCTION, in addition to not being a *S macro.  Note
-+# that the cache does depend upon the function we are looking for.
-+#
-+# It is on purpose we used `ac_check_lib_ext_save_LIBS' and not just
-+# `ac_save_LIBS': there are many macros which don't want to see `LIBS'
-+# changed but still want to use AC_CHECK_LIB_EXT, so they save `LIBS'.
-+# And ``ac_save_LIBS' is too tempting a name, so let's leave them some
-+# freedom.
-+AC_DEFUN([AC_CHECK_LIB_EXT],
-+[
-+AH_CHECK_LIB_EXT([$1])
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-l$1 $$2 $7 $LIBS"
-+AS_LITERAL_IF([$1],
-+      [AS_VAR_PUSHDEF([ac_Lib_ext], [ac_cv_lib_ext_$1])],
-+      [AS_VAR_PUSHDEF([ac_Lib_ext], [ac_cv_lib_ext_$1''])])dnl
-+
-+m4_ifval([$3],
-+ [
-+    AH_CHECK_FUNC_EXT([$3])
-+    AS_LITERAL_IF([$1],
-+              [AS_VAR_PUSHDEF([ac_Lib_func], [ac_cv_lib_ext_$1_$3])],
-+              [AS_VAR_PUSHDEF([ac_Lib_func], [ac_cv_lib_ext_$1''_$3])])dnl
-+    AC_CACHE_CHECK([for $3 in -l$1], ac_Lib_func,
-+	[AC_TRY_LINK_FUNC($3,
-+                 [AS_VAR_SET(ac_Lib_func, yes);
-+		  AS_VAR_SET(ac_Lib_ext, yes)],
-+                 [AS_VAR_SET(ac_Lib_func, no);
-+		  AS_VAR_SET(ac_Lib_ext, no)])
-+	])
-+    AS_IF([test AS_VAR_GET(ac_Lib_func) = yes],
-+        [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_$3))])dnl
-+    AS_VAR_POPDEF([ac_Lib_func])dnl
-+ ],[
-+    AC_CACHE_CHECK([for -l$1], ac_Lib_ext,
-+	[AC_TRY_LINK_FUNC([main],
-+                 [AS_VAR_SET(ac_Lib_ext, yes)],
-+                 [AS_VAR_SET(ac_Lib_ext, no)])
-+	])
-+ ])
-+LIBS=$ac_check_lib_ext_save_LIBS
-+
-+AS_IF([test AS_VAR_GET(ac_Lib_ext) = yes],
-+    [m4_default([$4], 
-+        [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1))
-+		case "$$2" in
-+		    *-l$1*)
-+			;;
-+		    *)
-+			$2="$$2 -l$1"
-+			;;
-+		esac])
-+		[$6]
-+	    ],
-+	    [$5])dnl
-+AS_VAR_POPDEF([ac_Lib_ext])dnl
-+])# AC_CHECK_LIB_EXT
-+
-+# AH_CHECK_LIB_EXT(LIBNAME)
-+# ---------------------
-+m4_define([AH_CHECK_LIB_EXT],
-+[AH_TEMPLATE(AS_TR_CPP(HAVE_LIB$1),
-+             [Define to 1 if you have the `]$1[' library (-l]$1[).])])
-+
-+# AC_CHECK_FUNCS_EXT(FUNCTION, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+# -----------------------------------------------------------------
-+dnl check for a function in a $LIBS and $OTHER_LIBS libraries variable.
-+dnl AC_CHECK_FUNC_EXT(func,OTHER_LIBS,IF-TRUE,IF-FALSE)
-+AC_DEFUN([AC_CHECK_FUNC_EXT],
-+[
-+    AH_CHECK_FUNC_EXT($1)	
-+    ac_check_func_ext_save_LIBS=$LIBS
-+    LIBS="$2 $LIBS"
-+    AS_VAR_PUSHDEF([ac_var], [ac_cv_func_ext_$1])dnl
-+    AC_CACHE_CHECK([for $1], ac_var,
-+	[AC_LINK_IFELSE([AC_LANG_FUNC_LINK_TRY([$1])],
-+                [AS_VAR_SET(ac_var, yes)],
-+                [AS_VAR_SET(ac_var, no)])])
-+    LIBS=$ac_check_func_ext_save_LIBS
-+    AS_IF([test AS_VAR_GET(ac_var) = yes], 
-+	    [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_$1])) $3], 
-+	    [$4])dnl
-+AS_VAR_POPDEF([ac_var])dnl
-+])# AC_CHECK_FUNC
-+
-+# AH_CHECK_FUNC_EXT(FUNCNAME)
-+# ---------------------
-+m4_define([AH_CHECK_FUNC_EXT],
-+[AH_TEMPLATE(AS_TR_CPP(HAVE_$1),
-+             [Define to 1 if you have the `]$1[' function.])])
-+
- dnl Define an AC_DEFINE with ifndef guard.
- dnl AC_N_DEFINE(VARIABLE [, VALUE])
- define(AC_N_DEFINE,
-diff -uNr samba-3.0.0beta2.orig/source/configure.in samba-3.0.0beta2/source/configure.in
---- samba-3.0.0beta2.orig/source/configure.in	2003-07-05 16:22:00.000000000 -0500
-+++ samba-3.0.0beta2/source/configure.in	2003-07-05 16:23:53.000000000 -0500
-@@ -162,12 +162,10 @@
- AC_SUBST(PRINTLIBS)
- AC_SUBST(AUTHLIBS)
- AC_SUBST(ACLLIBS)
--AC_SUBST(ADSLIBS)
- AC_SUBST(PASSDBLIBS)
- AC_SUBST(IDMAP_LIBS)
- AC_SUBST(KRB5_LIBS)
- AC_SUBST(LDAP_LIBS)
--AC_SUBST(LDAP_OBJ)
- AC_SUBST(SHLIB_PROGS)
- AC_SUBST(SMBWRAPPER)
- AC_SUBST(EXTRA_BIN_PROGS)
-@@ -2105,14 +2103,107 @@
-   AC_MSG_RESULT(no)
- )
- 
-+########################################################
-+# Compile with LDAP support?
-+
-+with_ldap_support=auto
-+AC_MSG_CHECKING([for LDAP support])
-+
-+AC_ARG_WITH(ldap,
-+[  --with-ldap             LDAP support (default yes)],
-+[ case "$withval" in
-+    yes|no)
-+	with_ldap_support=$withval
-+	;;
-+  esac ])
-+
-+AC_MSG_RESULT($with_ldap_support)
-+
-+SMBLDAP=""
-+SMBLDAP_PROTO=""
-+AC_SUBST(SMBLDAP)
-+AC_SUBST(SMBLDAP_PROTO)
-+if test x"$with_ldap_support" != x"no"; then
-+
-+  ##################################################################
-+  # first test for ldap.h and lber.h
-+  # (ldap.h is required for this test)
-+  AC_CHECK_HEADERS(ldap.h lber.h)
-+  
-+  if test x"$ac_cv_header_ldap_h" != x"yes"; then
-+	if test x"$with_ldap_support" = x"yes"; then
-+	 AC_MSG_ERROR(ldap.h is needed for LDAP support)
-+	else
-+	 AC_MSG_WARN(ldap.h is needed for LDAP support)
-+	fi
-+	
-+	with_ldap_support=no
-+  fi
-+fi
-+
-+if test x"$with_ldap_support" != x"no"; then
-+  ac_save_LIBS=$LIBS
-+
-+  ##################################################################
-+  # we might need the lber lib on some systems. To avoid link errors
-+  # this test must be before the libldap test
-+  AC_CHECK_LIB_EXT(lber, LDAP_LIBS, ber_scanf)
-+
-+  ########################################################
-+  # now see if we can find the ldap libs in standard paths
-+  AC_CHECK_LIB_EXT(ldap, LDAP_LIBS, ldap_init)
-+
-+  AC_CHECK_FUNC_EXT(ldap_domain2hostlist,$LDAP_LIBS)
-+  
-+  ########################################################
-+  # If we have LDAP, does it's rebind procedure take 2 or 3 arguments?
-+  # Check found in pam_ldap 145.
-+  AC_CHECK_FUNC_EXT(ldap_set_rebind_proc,$LDAP_LIBS)
-+
-+  LIBS="$LIBS $LDAP_LIBS"
-+  AC_CACHE_CHECK(whether ldap_set_rebind_proc takes 3 arguments, smb_ldap_cv_ldap_set_rebind_proc, [
-+    AC_TRY_COMPILE([
-+	#include <lber.h>
-+	#include <ldap.h>], 
-+	[ldap_set_rebind_proc(0, 0, 0);], 
-+	[smb_ldap_cv_ldap_set_rebind_proc=3], 
-+	[smb_ldap_cv_ldap_set_rebind_proc=2]
-+    ) 
-+  ])
-+  
-+  AC_DEFINE_UNQUOTED(LDAP_SET_REBIND_PROC_ARGS, $smb_ldap_cv_ldap_set_rebind_proc, [Number of arguments to ldap_set_rebind_proc])
-+
-+  AC_CHECK_FUNC_EXT(ldap_initialize,$LDAP_LIBS)	
-+  
-+  if test x"$ac_cv_lib_ext_ldap_ldap_init" = x"yes" -a x"$ac_cv_func_ext_ldap_domain2hostlist" = x"yes"; then
-+    AC_DEFINE(HAVE_LDAP,1,[Whether ldap is available])
-+    default_static_modules="$default_static_modules pdb_ldap idmap_ldap";
-+    SMBLDAP="lib/smbldap.o"
-+    with_ldap_support=yes
-+    AC_MSG_CHECKING(whether LDAP support is used)
-+    AC_MSG_RESULT(yes)
-+  else
-+    if test x"$with_ldap_support" = x"yes"; then
-+	AC_MSG_ERROR(libldap is needed for LDAP support)
-+    else
-+	AC_MSG_WARN(libldap is needed for LDAP support)
-+    fi
-+    
-+    LDAP_LIBS=""
-+    with_ldap_support=no
-+  fi
-+  LIBS=$ac_save_LIBS
-+fi
-+
-+
- #################################################
- # active directory support
- 
- with_ads_support=auto
--AC_MSG_CHECKING([whether to use Active Directory])
-+AC_MSG_CHECKING([for Active Directory and krb5 support])
- 
- AC_ARG_WITH(ads,
--[  --with-ads              Active Directory support (default yes)],
-+[  --with-ads              Active Directory support (default auto)],
- [ case "$withval" in
-     yes|no)
- 	with_ads_support="$withval"
-@@ -2124,22 +2215,28 @@
- FOUND_KRB5=no
- KRB5_LIBS=""
- 
-+if test x"$with_ldap_support" != x"yes"; then
-+    if test x"$with_ads_support" = x"yes"; then
-+	AC_MSG_ERROR(Active Directory Support requires LDAP support)
-+    elif test x"$with_ads_support" != x"no"; then
-+	AC_MSG_WARN(Active Directory Support requires LDAP support)
-+    fi
-+    with_ads_support=no
-+fi
-+
- if test x"$with_ads_support" != x"no"; then
- 
-   # Do no harm to the values of CFLAGS and LIBS while testing for
-   # Kerberos support.
- 
--  ac_save_CFLAGS="$CFLAGS"
--  ac_save_LIBS="$LIBS"
--
-   #################################################
-   # check for krb5-config from recent MIT and Heimdal kerberos 5
-   AC_PATH_PROG(KRB5_CONFIG, krb5-config)
-   AC_MSG_CHECKING(for working krb5-config)
-   if test -x "$KRB5_CONFIG"; then
--    LIBS="$LIBS `$KRB5_CONFIG --libs`"
--    CFLAGS="$CFLAGS `$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`" 
--    CPPFLAGS="$CPPFLAGS `$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`"
-+    KRB5_LIBS="`CFLAGS='' $KRB5_CONFIG --libs gssapi`"
-+    KRB5_CFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`" 
-+    KRB5_CPPFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`"
-     FOUND_KRB5=yes
-     AC_MSG_RESULT(yes)
-   else
-@@ -2154,18 +2251,23 @@
-     [  --with-krb5=base-dir    Locate Kerberos 5 support (default=/usr)],
-     [ case "$withval" in
-       no)
--        AC_MSG_RESULT(no)
-+        AC_MSG_RESULT(no krb5-path given)
-+        ;;
-+      yes)
-+        AC_MSG_RESULT(/usr)
-+        KRB5_LIBS="-lkrb5"
-+        FOUND_KRB5=yes
-         ;;
-       *)
--        AC_MSG_RESULT(yes)
--        LIBS="$LIBS -lkrb5"
--        CFLAGS="$CFLAGS -I$withval/include"
--        CPPFLAGS="$CPPFLAGS -I$withval/include"
--        LDFLAGS="$LDFLAGS -L$withval/lib"
-+        AC_MSG_RESULT($withval)
-+        KRB5_LIBS="-lkrb5"
-+        KRB5_CFLAGS="-I$withval/include"
-+        KRB5_CPPFLAGS="-I$withval/include"
-+        KRB5_LDFLAGS="-L$withval/lib"
-         FOUND_KRB5=yes
-         ;;
-       esac ],
--      AC_MSG_RESULT(no)
-+      AC_MSG_RESULT(no krb5-path given)
-     )
-   fi
- 
-@@ -2175,15 +2277,15 @@
-     AC_MSG_CHECKING(for /usr/include/heimdal)
-     if test -d /usr/include/heimdal; then
-       if test -f /usr/lib/heimdal/lib/libkrb5.a; then
--          LIBS="$LIBS -lkrb5"
--          CFLAGS="$CFLAGS -I/usr/include/heimdal"
--          CPPFLAGS="$CPPFLAGS -I/usr/include/heimdal"
--          LDFLAGS="$LDFLAGS -L/usr/lib/heimdal/lib"
-+          KRB5_LIBS="-lkrb5"
-+          KRB5_CFLAGS="-I/usr/include/heimdal"
-+          KRB5_CPPFLAGS="-I/usr/include/heimdal"
-+          KRB5_LDFLAGS="-L/usr/lib/heimdal/lib"
-           AC_MSG_RESULT(yes)
-       else
--          LIBS="$LIBS -lkrb5"
--          CFLAGS="$CFLAGS -I/usr/include/heimdal"
--          CPPFLAGS="$CPPFLAGS -I/usr/include/heimdal"
-+          KRB5_LIBS="-lkrb5"
-+          KRB5_CFLAGS="-I/usr/include/heimdal"
-+          KRB5_CPPFLAGS="-I/usr/include/heimdal"
-           AC_MSG_RESULT(yes)
-       fi
-     else
-@@ -2196,16 +2298,26 @@
-     # see if this box has the RedHat location for kerberos
-     AC_MSG_CHECKING(for /usr/kerberos)
-     if test -d /usr/kerberos -a -f /usr/kerberos/lib/libkrb5.a; then
--      LIBS="$LIBS -lkrb5"
--      LDFLAGS="$LDFLAGS -L/usr/kerberos/lib"
--      CFLAGS="$CFLAGS -I/usr/kerberos/include"
--      CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
-+      KRB5_LIBS="-lkrb5"
-+      KRB5_LDFLAGS="-L/usr/kerberos/lib"
-+      KRB5_CFLAGS="-I/usr/kerberos/include"
-+      KRB5_CPPFLAGS="-I/usr/kerberos/include"
-       AC_MSG_RESULT(yes)
-     else
-       AC_MSG_RESULT(no)
-     fi
-   fi
- 
-+  ac_save_CFLAGS=$CFLAGS
-+  ac_save_CPPFLAGS=$CPPFLAGS
-+  ac_save_LDFLAGS=$LDFLAGS
-+
-+  CFLAGS="$CFLAGS $KRB5_CFLAGS"
-+  CPPFLAGS="$CPPFLAGS $KRB5_CPPFLAGS"
-+  LDFLAGS="$LDFLAGS $KRB5_LDFLAGS"
-+
-+  KRB5_LIBS="$KRB5_LDFLAGS $KRB5_LIBS"
-+
-   # now check for krb5.h. Some systems have the libraries without the headers!
-   # note that this check is done here to allow for different kerberos
-   # include paths
-@@ -2225,24 +2337,17 @@
-     # Turn off AD support and restore CFLAGS and LIBS variables
- 
-     with_ads_support="no"
--
--    CFLAGS="$ac_save_CFLAGS"
--    LIBS="$ac_save_LIBS"
--
--  else
--
--    # Get rid of case where $with_ads_support=auto
--
--    with_ads_support="yes"
--
-+    
-+    CFLAGS=$ac_save_CFLAGS
-+    CPPFLAGS=$ac_save_CPPFLAGS
-+    LDFLAGS=$ac_save_LDFLAGS
-   fi
- fi
- 
- # Now we have determined whether we really want ADS support
- 
--if test x"$with_ads_support" = x"yes"; then
--
--  AC_DEFINE(WITH_ADS,1,[Whether to include Active Directory support])
-+if test x"$with_ads_support" != x"no"; then
-+  ac_save_LIBS=$LIBS
- 
-   # now check for gssapi headers.  This is also done here to allow for
-   # different kerberos include paths
-@@ -2250,64 +2365,46 @@
- 
-   ##################################################################
-   # we might need the k5crypto and com_err libraries on some systems
--  AC_CHECK_LIB(com_err, _et_list)
--  AC_CHECK_LIB(k5crypto, krb5_encrypt_data)
-+  AC_CHECK_LIB_EXT(com_err, KRB5_LIBS, _et_list)
-+  AC_CHECK_LIB_EXT(k5crypto, KRB5_LIBS, krb5_encrypt_data)
- 
-   # Heimdal checks.
--  AC_CHECK_LIB(crypto, des_set_key)
--  AC_CHECK_LIB(asn1, copy_Authenticator)
--  AC_CHECK_LIB(roken, roken_getaddrinfo_hostspec)
-+  AC_CHECK_LIB_EXT(crypto, KRB5_LIBS, des_set_key)
-+  AC_CHECK_LIB_EXT(asn1, KRB5_LIBS, copy_Authenticator)
-+  AC_CHECK_LIB_EXT(roken, KRB5_LIBS, roken_getaddrinfo_hostspec)
- 
-   # Heimdal checks. On static Heimdal gssapi must be linked before krb5.
--  AC_CHECK_LIB(gssapi, gss_display_status, [LIBS="$LIBS -lgssapi -lkrb5";
-+  AC_CHECK_LIB_EXT(gssapi, KRB5_LIBS, gss_display_status, [KRB5_LIBS="$KRB5_LIBS -lgssapi -lkrb5";
-                  AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])])
- 
--  AC_CHECK_LIB(krb5, krb5_set_real_time, 
--	         [AC_DEFINE(HAVE_KRB5_SET_REAL_TIME,1,
--                   [Whether krb5_set_real_time is available])])
--  AC_CHECK_LIB(krb5, krb5_set_default_in_tkt_etypes, 
--                 [AC_DEFINE(HAVE_KRB5_SET_DEFAULT_IN_TKT_ETYPES,1,
--                   [Whether krb5_set_default_in_tkt_etypes, is available])])
--  AC_CHECK_LIB(krb5, krb5_set_default_tgs_ktypes, 
--                 [AC_DEFINE(HAVE_KRB5_SET_DEFAULT_TGS_KTYPES,1,
--                   [Whether krb5_set_default_tgs_ktypes is available])])
--
--  AC_CHECK_LIB(krb5, krb5_principal2salt, 
--                [AC_DEFINE(HAVE_KRB5_PRINCIPAL2SALT,1,
--                   [Whether krb5_principal2salt is available])])
--  AC_CHECK_LIB(krb5, krb5_use_enctype, 
--                [AC_DEFINE(HAVE_KRB5_USE_ENCTYPE,1,
--                   [Whether krb5_use_enctype is available])])
--  AC_CHECK_LIB(krb5, krb5_string_to_key, 
--                [AC_DEFINE(HAVE_KRB5_STRING_TO_KEY,1,
--                   [Whether krb5_string_to_key is available])])
--  AC_CHECK_LIB(krb5, krb5_get_pw_salt, 
--                [AC_DEFINE(HAVE_KRB5_GET_PW_SALT,1,
--                   [Whether krb5_get_pw_salt is available])])
--  AC_CHECK_LIB(krb5, krb5_string_to_key_salt, 
--                [AC_DEFINE(HAVE_KRB5_STRING_TO_KEY_SALT,1,
--                   [Whether krb5_string_to_key_salt is available])])
--  AC_CHECK_LIB(krb5, krb5_auth_con_setkey, 
--                [AC_DEFINE(HAVE_KRB5_AUTH_CON_SETKEY,1,
--                   [Whether krb5_auth_con_setkey is available])])
--  AC_CHECK_LIB(krb5, krb5_auth_con_setuseruserkey, 
--                [AC_DEFINE(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY,1,
--                   [Whether krb5_auth_con_setuseruserkey is available])])
--  AC_CHECK_LIB(krb5, krb5_locate_kdc, 
--                [AC_DEFINE(HAVE_KRB5_LOCATE_KDC,1,
--                   [Whether krb5_locate_kdc is available])])
--  AC_CHECK_LIB(krb5, krb5_get_permitted_enctypes, 
--                [AC_DEFINE(HAVE_KRB5_GET_PERMITTED_ENCTYPES,1,
--                   [Whether krb5_get_permitted_enctypes is available])])
--  AC_CHECK_LIB(krb5, krb5_get_default_in_tkt_etypes, 
--                [AC_DEFINE(HAVE_KRB5_GET_DEFAULT_IN_TKT_ETYPES,1,
--                   [Whether krb5_get_default_in_tkt_etypes is available])])
--  AC_CHECK_LIB(krb5, krb5_free_ktypes, 
--                [AC_DEFINE(HAVE_KRB5_FREE_KTYPES,1,
--                   [Whether krb5_free_ktypes is available])])
--  AC_CHECK_LIB(krb5, krb5_principal_get_comp_string, 
--                [AC_DEFINE(HAVE_KRB5_PRINCIPAL_GET_COMP_STRING,1,
--                   [Whether krb5_principal_get_comp_string is available])])
-+  ########################################################
-+  # now see if we can find the krb5 libs in standard paths
-+  # or as specified above
-+  AC_CHECK_LIB_EXT(krb5, KRB5_LIBS, krb5_mk_req_extended)
-+
-+  ########################################################
-+  # now see if we can find the gssapi libs in standard paths
-+  AC_CHECK_LIB_EXT(gssapi_krb5, KRB5_LIBS,gss_display_status,[],[],
-+	   AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available]))
-+
-+  AC_CHECK_FUNC_EXT(krb5_set_real_time, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_set_default_in_tkt_etypes, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_set_default_tgs_ktypes, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_principal2salt, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_use_enctype, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_string_to_key, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_get_pw_salt, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_string_to_key_salt, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_auth_con_setkey, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_auth_con_setuseruserkey, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_locate_kdc, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_get_permitted_enctypes, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_get_default_in_tkt_etypes, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_free_ktypes, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_principal_get_comp_string, $KRB5_LIBS)
-+
-+  LIBS="$LIBS $KRB5_LIBS"
-+
-   AC_CACHE_CHECK([for the krb5_princ_component macro],
-                 samba_cv_HAVE_KRB5_PRINC_COMPONENT,[
-     AC_TRY_LINK([#include <krb5.h>],
-@@ -2380,87 +2468,21 @@
-               [Whether the ENCTYPE_ARCFOUR_HMAC_MD5 key type is available])
-   fi
- 
--  ########################################################
--  # now see if we can find the krb5 libs in standard paths
--  # or as specified above
--  AC_CHECK_LIB(krb5, krb5_mk_req_extended, [KRB5_LIBS="$LIBS -lkrb5";
--	       KRB5_CFLAGS="$CFLAGS";
--               AC_DEFINE(HAVE_KRB5,1,[Whether KRB5 is available])])
--
--  ########################################################
--  # now see if we can find the gssapi libs in standard paths
--  AC_CHECK_LIB(gssapi_krb5, gss_display_status, 
--               [KRB5_LIBS="$KRB5_LIBS -lgssapi_krb5";
--                AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])])
--
--  CFLAGS="$ac_save_CFLAGS"
--  LIBS="$ac_save_LIBS"
--fi
--
--########################################################
--# Compile with LDAP support?
--
--LDAP_OBJ=""
--with_ldap_support=yes
--AC_MSG_CHECKING([whether to use LDAP])
--
--AC_ARG_WITH(ldap,
--[  --with-ldap             LDAP support (default yes)],
--[ case "$withval" in
--    no)
--	with_ldap_support=no
--	;;
--  esac ])
--
--AC_MSG_RESULT($with_ldap_support)
--
--SMBLDAP=""
--if test x"$with_ldap_support" = x"yes"; then
--  ac_save_LIBS="$LIBS"
--  LIBS=""
--
--  ##################################################################
--  # we might need the lber lib on some systems. To avoid link errors
--  # this test must be before the libldap test
--  AC_CHECK_LIB(lber, ber_scanf)
--
--  ########################################################
--  # now see if we can find the ldap libs in standard paths
--  if test x$have_ldap != xyes; then
--        AC_CHECK_LIB(ldap, ldap_init, [
--           LIBS="$LIBS -lldap";
--           AC_CHECK_LIB(ldap, ldap_domain2hostlist, [
--	      AC_DEFINE(HAVE_LDAP,1,[Whether ldap is available])
--	      AC_CHECK_HEADERS([ldap.h lber.h], 
--                 [default_static_modules="$default_static_modules pdb_ldap idmap_ldap";
--                  SMBLDAP="lib/smbldap.o"])
--           ])
--        ])
--
--	########################################################
--	# If we have LDAP, does it's rebind procedure take 2 or 3 arguments?
--	# Check found in pam_ldap 145.
--	AC_CHECK_FUNCS(ldap_set_rebind_proc)
--	AC_CACHE_CHECK(whether ldap_set_rebind_proc takes 3 arguments, pam_ldap_cv_ldap_set_rebind_proc, [
--	AC_TRY_COMPILE([
--	#include <lber.h>
--	#include <ldap.h>], [ldap_set_rebind_proc(0, 0, 0);], [pam_ldap_cv_ldap_set_rebind_proc=3], [pam_ldap_cv_ldap_set_rebind_proc=2]) ])
--	AC_DEFINE_UNQUOTED(LDAP_SET_REBIND_PROC_ARGS, $pam_ldap_cv_ldap_set_rebind_proc, [Number of arguments to ldap_set_rebind_proc])
--	AC_CHECK_FUNCS(ldap_initialize)	
--  fi
--  
--  AC_SUBST(SMBLDAP)
--  LDAP_LIBS="$LIBS";
--  LIBS="$ac_save_LIBS";
--else
--    # Can't have ADS support without LDAP
-+  if test x"$ac_cv_lib_ext_krb5_krb5_mk_req_extended" = x"yes"; then
-+    AC_DEFINE(HAVE_KRB5,1,[Whether to have KRB5 support])
-+    AC_DEFINE(WITH_ADS,1,[Whether to include Active Directory support])
-+    AC_MSG_CHECKING(whether Active Directory and krb5 support is used)
-+    AC_MSG_RESULT(yes)
-+  else
-     if test x"$with_ads_support" = x"yes"; then
--       AC_MSG_ERROR(Active directory support requires LDAP)
-+	AC_MSG_ERROR(libkrb5 is needed for Active Directory support)
-+    else
-+	AC_MSG_WARN(libkrb5 is needed for Active Directory support)
-     fi
--fi
--
--if test x"$with_ads_support" = x"yes"; then
--	ADSLIBS="$LDAP_LIBS $KRB5_LIBS"
-+    KRB5_LIBS=""
-+    with_ads_support=no 
-+  fi
-+  LIBS="$ac_save_LIBS"
- fi
- 
- ########################################################
diff --git a/packaging/Debian/debian/patches/pam_smbpass_linkage.patch b/packaging/Debian/debian/patches/pam_smbpass_linkage.patch
deleted file mode 100644
index 022a3a0a28..0000000000
--- a/packaging/Debian/debian/patches/pam_smbpass_linkage.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makefile.in
---- samba-3.0.0beta2.orig/source/Makefile.in	2003-07-05 16:24:34.000000000 -0500
-+++ samba-3.0.0beta2/source/Makefile.in	2003-07-05 16:24:54.000000000 -0500
-@@ -579,8 +579,8 @@
- PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
-                pam_smbpass/pam_smb_acct.o pam_smbpass/support.o \
-                libsmb/smbencrypt.o libsmb/smbdes.o libsmb/nterr.o \
--               $(PARAM_OBJ) $(LIB_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
--               $(SECRETS_OBJ) $(UBIQX_OBJ)
-+               $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(PASSDB_OBJ) \
-+	       $(GROUPDB_OBJ) $(SECRETS_OBJ) $(UBIQX_OBJ) $(SMBLDAP_OBJ)
- 
- PAM_SMBPASS_PICOOBJ = $(PAM_SMBPASS_OBJ_0:.o=.po)
- 
-@@ -1076,7 +1076,8 @@
- 
- bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_PICOOBJ)
- 	@echo "Linking shared library $@"
--	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) $(LIBS) -lc
-+	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) \
-+		 $(PASSDBLIBS) $(LIBS) -lc
- 
- bin/libmsrpc.a: $(LIBMSRPC_PICOBJ)
- 	@-$(AR) -rc $@ $(LIBMSRPC_PICOBJ) 
diff --git a/packaging/Debian/debian/patches/smbadduser.patch b/packaging/Debian/debian/patches/smbadduser.patch
deleted file mode 100644
index 36b74b3175..0000000000
--- a/packaging/Debian/debian/patches/smbadduser.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -uNr samba-3.0alpha21.orig/source/smbadduser samba-3.0alpha21/source/smbadduser
---- samba-3.0alpha21.orig/source/smbadduser	2003-02-16 13:01:45.000000000 -0600
-+++ samba-3.0alpha21/source/smbadduser	2003-02-16 16:25:16.000000000 -0600
-@@ -2,13 +2,14 @@
- #
- # smbadduser - Written by Mike Zakharoff
- #
-+# Customized for Debian by Eloy A. Paris <peloy@debian.org>
-+#
- unalias *
--set path = ($path /usr/local/samba/bin)
-+# No need to set a path in Debian
-+#set path = ($path /usr/local/samba/bin)
- 
--set smbpasswd = /usr/local/samba/private/smbpasswd
--#set smbpasswd = /etc/samba/smbpasswd
--set user_map  = /usr/local/samba/lib/users.map
--#set user_map  = /etc/samba/smbusers
-+set smbpasswd = /etc/samba/smbpasswd
-+set user_map  = /etc/samba/users.map
- #
- # Set to site specific passwd command
- #
diff --git a/packaging/Debian/debian/patches/smbclient-tar.patch b/packaging/Debian/debian/patches/smbclient-tar.patch
deleted file mode 100644
index e6cdcafbf8..0000000000
--- a/packaging/Debian/debian/patches/smbclient-tar.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -uNr samba-3.0.0beta2.orig/source/client/client.c samba-3.0.0beta2/source/client/client.c
---- samba-3.0.0beta2.orig/source/client/client.c	2003-07-01 22:36:24.000000000 -0500
-+++ samba-3.0.0beta2/source/client/client.c	2003-07-06 15:17:36.000000000 -0500
-@@ -2731,6 +2731,7 @@
- 	int opt;
- 	pstring query_host;
- 	BOOL message = False;
-+	char* tar_args = NULL;
- 	extern char tar_type;
- 	pstring term_code;
- 	static const char *new_name_resolve_order = NULL;
-@@ -2816,7 +2817,7 @@
- 			max_protocol = interpret_protocol(poptGetOptArg(pc), max_protocol);
- 			break;
- 		case 'T':
--			if (!tar_parseargs(argc, argv, poptGetOptArg(pc), optind)) {
-+			if (!(tar_args = poptGetOptArg(pc))) {
- 				poptPrintUsage(pc, stderr, 0);
- 				exit(1);
- 			}
-@@ -2848,6 +2849,22 @@
- 		pstrcpy(cmdline_auth_info.password,poptGetArg(pc));  
- 	}
- 
-+	/* The tar command may take a number of string options; pass
-+	   everything we have left to tar_parseargs(). */
-+	if (tar_args) {
-+		const char **argv2 = poptGetArgs(pc);
-+		int argc2 = 0;
-+
-+		if (argv2) {
-+			while (argv2[argc2]) argc2++;
-+		}
-+		
-+		if (!tar_parseargs(argc2, argv2, tar_args, 0)) {
-+			poptPrintUsage(pc, stderr, 0);
-+			exit(1);
-+		}
-+	}
-+
- 	init_names();
- 
- 	if(new_name_resolve_order)
diff --git a/packaging/Debian/debian/python2.2-samba.files b/packaging/Debian/debian/python2.2-samba.files
deleted file mode 100644
index a24e2b98c8..0000000000
--- a/packaging/Debian/debian/python2.2-samba.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python2.2/site-packages/
diff --git a/packaging/Debian/debian/samba-common.conffiles b/packaging/Debian/debian/samba-common.conffiles
deleted file mode 100644
index 4684ede3d1..0000000000
--- a/packaging/Debian/debian/samba-common.conffiles
+++ /dev/null
@@ -1,3 +0,0 @@
-/etc/pam.d/samba
-/etc/samba/gdbcommands
-/etc/dhcp3/dhclient-enter-hooks.d/samba
diff --git a/packaging/Debian/debian/samba.conffiles b/packaging/Debian/debian/samba.conffiles
deleted file mode 100644
index 908a791a62..0000000000
--- a/packaging/Debian/debian/samba.conffiles
+++ /dev/null
@@ -1,3 +0,0 @@
-/etc/cron.daily/samba
-/etc/init.d/samba
-/etc/logrotate.d/samba
diff --git a/packaging/Debian/debian/swat.docs b/packaging/Debian/debian/swat.docs
deleted file mode 100644
index afbfcf0c61..0000000000
--- a/packaging/Debian/debian/swat.docs
+++ /dev/null
@@ -1 +0,0 @@
-swat/README
diff --git a/packaging/Debian/debian/winbind.conffiles b/packaging/Debian/debian/winbind.conffiles
deleted file mode 100644
index c9adbfff17..0000000000
--- a/packaging/Debian/debian/winbind.conffiles
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/init.d/winbind
-/etc/logrotate.d/winbind
diff --git a/packaging/Mandrake/samba-2.2.0-gawk.patch b/packaging/Mandrake/samba-2.2.0-gawk.patch
deleted file mode 100644
index b77bc3a93c..0000000000
--- a/packaging/Mandrake/samba-2.2.0-gawk.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- samba-2.2.0/source/script/convert_smbpasswd.gawk	Thu Nov  5 04:50:17 1998
-+++ samba-2.2.0/source/script/convert_smbpasswd	Thu Apr 19 08:43:44 2001
-@@ -7,7 +7,7 @@
- # with trying to work out how to get the seconds since 1970
- # in awk or the shell. JRA.
- #
--nawk 'BEGIN {FS=":"} 
-+gawk 'BEGIN {FS=":"} 
- {
- 	if( $0 ~ "^#" ) {
- 		print $0
diff --git a/packaging/Mandrake/samba-2.2.5-gp-reloc-fix.patch b/packaging/Mandrake/samba-2.2.5-gp-reloc-fix.patch
deleted file mode 100644
index 8888d6622e..0000000000
--- a/packaging/Mandrake/samba-2.2.5-gp-reloc-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur samba-2.2.5.orig/examples/VFS/Makefile.in samba-2.2.5/examples/VFS/Makefile.in
---- samba-2.2.5.orig/examples/VFS/Makefile.in	2002-06-17 20:35:09.000000000 +0200
-+++ samba-2.2.5/examples/VFS/Makefile.in	2002-06-30 16:43:15.000000000 +0200
-@@ -4,7 +4,7 @@
- 
- CC=@CC@
- LIBTOOL=@LIBTOOL@
--CFLAGS=@CFLAGS@
-+CFLAGS=@CFLAGS@ -DPIC -fPIC
- LDFLAGS=@LDFLAGS@
- 
- VFS_OBJS=audit.so skel.so block/block.so recycle/recycle.so
diff --git a/packaging/Mandrake/smbmount-sbin.patch b/packaging/Mandrake/smbmount-sbin.patch
deleted file mode 100644
index b638720813..0000000000
--- a/packaging/Mandrake/smbmount-sbin.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-+++ samba-2.2.1/source/client/smbmount.c	Sun Apr 15 01:03:46 2001
---- samba-2.2.1/source/client/smbmount.c.seb	Mon Jun 11 14:26:23 2001
-@@ -484,9 +484,9 @@
- 	}
- 
- 	if (sys_fork() == 0) {
--		if (file_exist(BINDIR "/smbmnt", NULL)) {
--			execv(BINDIR "/smbmnt", args);
--			fprintf(stderr,"execv of %s failed. Error was %s.", BINDIR "/smbmnt", strerror(errno));
-+		if (file_exist(SBINDIR "/smbmnt", NULL)) {
-+			execv(SBINDIR "/smbmnt", args);
-+			fprintf(stderr,"execv of %s failed. Error was %s.", SBINDIR "/smbmnt", strerror(errno));
- 		} else {
- 			execvp("smbmnt", args);
- 			fprintf(stderr,"execvp of smbmnt failed. Error was %s.", strerror(errno) );
diff --git a/packaging/Mandrake/swat_16.xpm.bz2 b/packaging/Mandrake/swat_16.xpm.bz2
deleted file mode 100644
index c17430c589..0000000000
--- a/packaging/Mandrake/swat_16.xpm.bz2
+++ /dev/null
diff --git a/packaging/Mandrake/swat_32.xpm.bz2 b/packaging/Mandrake/swat_32.xpm.bz2
deleted file mode 100644
index c8e4df6bff..0000000000
--- a/packaging/Mandrake/swat_32.xpm.bz2
+++ /dev/null
diff --git a/packaging/Mandrake/swat_48.xpm.bz2 b/packaging/Mandrake/swat_48.xpm.bz2
deleted file mode 100644
index 812b737b4f..0000000000
--- a/packaging/Mandrake/swat_48.xpm.bz2
+++ /dev/null
diff --git a/packaging/README.UnixWare b/packaging/README.UnixWare
deleted file mode 100644
index a4b08954ec..0000000000
--- a/packaging/README.UnixWare
+++ /dev/null
@@ -1,6 +0,0 @@
-Date: 		January 9, 2001
-Maintainer: 	John H Terpstra
-Subject:	UnixWare Packaging Files
-Modifications:	Initial release 20010109
-
-Note:		The packaging build files for UnixWare are located under ~samba/packaging/Caldera/UnixWare.
diff --git a/packaging/RedHat/samba2.spec.tmpl b/packaging/RedHat/samba2.spec.tmpl
deleted file mode 100644
index 638df4f2cc..0000000000
--- a/packaging/RedHat/samba2.spec.tmpl
+++ /dev/null
@@ -1,429 +0,0 @@
-Summary: Samba SMB client and server
-Name: samba
-Version: PVERSION
-Release: PRELEASE
-Copyright: GNU GPL version 2
-Group: Networking
-Source: http://download.samba.org/samba/ftp/samba-%{version}.tar.bz2
-Packager: Gerald Carter [Samba-Team] <jerry@samba.org>
-Requires: pam >= 0.72 kernel >= 2.2.1 glibc >= 2.1.2
-Prereq: chkconfig fileutils
-Provides: samba = %{version}
-Obsoletes: samba-common, samba-client, samba-swat
-BuildRoot: /var/tmp/samba
-Prefix: /usr
-
-%description
-Samba provides an SMB/CIFS server which can be used to provide
-network file and print services to SMB/CIFS 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 also introduces UNICODE support and kerberos/ldap
-integration as a member server in a Windows 2000 domain.
-
-Please refer to the WHATSNEW.txt document for fixup information.
-
-%changelog
-* Mon Nov 18 2002 Gerald Carter <jerry@samba.org>
-  - removed change log entries since history
-    is being maintained in CVS
-
-%prep
-%setup
-
-%build
-## Build main Samba source
-cd source
-
-%ifarch ia64
-libtoolize --copy --force     # get it to recognize IA-64
-autoheader
-autoconf
-EXTRA="-D_LARGEFILE64_SOURCE"
-%endif
-NUMCPU=`grep processor /proc/cpuinfo | wc -l`
-CFLAGS="$RPM_OPT_FLAGS $EXTRA" ./configure \
-	--prefix=%{prefix} \
-	--localstatedir=/var \
-	--with-configdir=/etc/samba \
-	--with-privatedir=/etc/samba \
-	--with-fhs \
-	--with-quotas \
-	--with-smbmount \
-	--with-pam \
-	--with-pam_smbpass \
-	--with-syslog \
-	--with-utmp \
-	--with-sambabook=%{prefix}/share/swat/using_samba \
-	--with-swatdir=%{prefix}/share/swat \
-	--with-libsmbclient 
-make -j${NUMCPU} proto
-make -j${NUMCPU} all nsswitch/libnss_wins.so modules
-make -j${NUMCPU} debug2html
-make -j${NUMCPU} bin/smbspool
-
-# Remove some permission bits to avoid to many dependencies
-find examples docs -type f | xargs -r chmod -x
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/sbin
-mkdir -p $RPM_BUILD_ROOT/etc/samba
-mkdir -p $RPM_BUILD_ROOT/etc/{logrotate.d,pam.d,samba}
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-mkdir -p $RPM_BUILD_ROOT%{prefix}/{bin,sbin}
-mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/{images,help,include,using_samba}
-mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/using_samba/{figs,gifs}
-mkdir -p $RPM_BUILD_ROOTMANDIR_MACRO
-mkdir -p $RPM_BUILD_ROOT/var/cache/samba
-mkdir -p $RPM_BUILD_ROOT/var/{log,run}/samba
-mkdir -p $RPM_BUILD_ROOT/var/spool/samba
-mkdir -p $RPM_BUILD_ROOT/lib/security
-mkdir -p $RPM_BUILD_ROOT%{prefix}/lib/samba/vfs
-mkdir -p $RPM_BUILD_ROOT%{prefix}/{lib,include}
-
-# Install standard binary files
-for i in nmblookup smbclient smbpasswd smbstatus testparm testprns \
-	rpcclient smbspool smbcacls smbcontrol wbinfo smbmnt net smbgroupedit \
-	smbcacls pdbedit tdbbackup smbtree
-do
-	install -m755 source/bin/$i $RPM_BUILD_ROOT%{prefix}/bin
-done
-
-for i in mksmbpasswd.sh smbtar findsmb
-do
-	install -m755 source/script/$i $RPM_BUILD_ROOT%{prefix}/bin
-done
-
-# Install secure binary files
-for i in smbd nmbd swat smbmount smbumount debug2html winbindd wrepld
-do
-	install -m755 source/bin/$i $RPM_BUILD_ROOT%{prefix}/sbin
-done
-
-# we need a symlink for mount to recognise the smb and smbfs filesystem types
-ln -sf %{prefix}/sbin/smbmount $RPM_BUILD_ROOT/sbin/mount.smbfs
-ln -sf %{prefix}/sbin/smbmount $RPM_BUILD_ROOT/sbin/mount.smb
-
-# This allows us to get away without duplicating code that 
-#  sombody else can maintain for us.  
-cd source
-make BASEDIR=$RPM_BUILD_ROOT/usr \
-	CONFIGDIR=$RPM_BUILD_ROOT/etc/samba \
-	LIBDIR=$RPM_BUILD_ROOT%{prefix}/lib/samba \
-	VARDIR=$RPM_BUILD_ROOT/var \
-	SBINDIR=$RPM_BUILD_ROOT%{prefix}/sbin \
-	BINDIR=$RPM_BUILD_ROOT%{prefix}/bin \
-	MANDIR=$RPM_BUILD_ROOTMANDIR_MACRO \
-	SWATDIR=$RPM_BUILD_ROOT%{prefix}/share/swat \
-	SAMBABOOK=$RPM_BUILD_ROOT%{prefix}/share/swat/using_samba \
-	installman installswat installdat installmodules
-cd ..
-
-# Install the nsswitch wins library
-install -m755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/lib
-( cd $RPM_BUILD_ROOT/lib; ln -sf libnss_wins.so libnss_wins.so.2; )
-
-# Install winbind shared libraries
-install -m755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/lib
-( cd $RPM_BUILD_ROOT/lib; ln -sf libnss_winbind.so libnss_winbind.so.2; )
-install -m755 source/nsswitch/pam_winbind.so $RPM_BUILD_ROOT/lib/security
-
-# Install pam_smbpass.so
-install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/lib/security
-
-# libsmbclient
-install -m 755 source/bin/libsmbclient.so $RPM_BUILD_ROOT%{prefix}/lib/
-install -m 755 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{prefix}/lib/
-install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{prefix}/include/
-
-# Install SWAT helper files
-#for i in swat/help/*.html docs/htmldocs/*.html
-#do
-#	install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/help
-#done
-#for i in swat/images/*.gif
-#do
-#	install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/images
-#done
-#for i in swat/include/*.html
-#do
-#	install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/include
-#done
-
-# Install the miscellany
-install -m755 packaging/RedHat/smbprint $RPM_BUILD_ROOT%{prefix}/bin
-install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT/etc/rc.d/init.d/smb
-install -m755 packaging/RedHat/winbind.init $RPM_BUILD_ROOT/etc/rc.d/init.d/winbind
-install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT%{prefix}/sbin/samba
-install -m644 packaging/RedHat/samba.log $RPM_BUILD_ROOT/etc/logrotate.d/samba
-install -m644 packaging/RedHat/smb.conf $RPM_BUILD_ROOT/etc/samba/smb.conf
-install -m644 packaging/RedHat/smbusers $RPM_BUILD_ROOT/etc/samba/smbusers
-install -m644 packaging/RedHat/samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba
-install -m644 packaging/RedHat/samba.pamd.stack $RPM_BUILD_ROOT/etc/samba/samba.stack
-install -m644 packaging/RedHat/samba.xinetd $RPM_BUILD_ROOT/etc/samba/samba.xinetd
-echo 127.0.0.1 localhost > $RPM_BUILD_ROOT/etc/samba/lmhosts
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-/sbin/chkconfig --add smb
-/sbin/chkconfig --add winbind
-/sbin/chkconfig smb off
-/sbin/chkconfig winbind off
-
-echo "Looking for old /etc/smb.conf..."
-if [ -f /etc/smb.conf -a ! -f /etc/samba/smb.conf ]; then
-	echo "Moving old /etc/smb.conf to /etc/samba/smb.conf"
-	mv /etc/smb.conf /etc/samba/smb.conf
-fi
-
-echo "Looking for old /etc/smbusers..."
-if [ -f /etc/smbusers -a ! -f /etc/samba/smbusers ]; then
-	echo "Moving old /etc/smbusers to /etc/samba/smbusers"
-	mv /etc/smbusers /etc/samba/smbusers
-fi
-
-echo "Looking for old /etc/lmhosts..."
-if [ -f /etc/lmhosts -a ! -f /etc/samba/lmhosts ]; then
-	echo "Moving old /etc/lmhosts to /etc/samba/lmhosts"
-	mv /etc/lmhosts /etc/samba/lmhosts
-fi
-
-echo "Looking for old /etc/MACHINE.SID..."
-if [ -f /etc/MACHINE.SID -a ! -f /etc/samba/MACHINE.SID ]; then
-	echo "Moving old /etc/MACHINE.SID to /etc/samba/MACHINE.SID"
-	mv /etc/MACHINE.SID /etc/samba/MACHINE.SID
-fi
-
-echo "Looking for old /etc/smbpasswd..."
-if [ -f /etc/smbpasswd -a ! -f /etc/samba/smbpasswd ]; then
-	echo "Moving old /etc/smbpasswd to /etc/samba/smbpasswd"
-	mv /etc/smbpasswd /etc/samba/smbpasswd
-fi
-
-#
-# For 2.2.1 we move the tdb files from /var/lock/samba to /var/cache/samba
-# to preserve across reboots.
-#
-echo "Moving tdb files in /var/lock/samba/*.tdb to /var/cache/samba/*.tdb"
-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
-
-# Remove the transient tdb files.
-if [ -e /var/cache/samba/brlock.tdb ]; then
-	rm -f /var/cache/samba/brlock.tdb
-fi
-
-if [ -e /var/cache/samba/unexpected.tdb ]; then
-	rm -f /var/cache/samba/unexpected.tdb
-fi
-
-if [ -e /var/cache/samba/connections.tdb ]; then
-	rm -f /var/cache/samba/connections.tdb
-fi
-
-if [ -e /var/cache/samba/locking.tdb ]; then
-	rm -f /var/cache/samba/locking.tdb
-fi
-
-if [ -e /var/cache/samba/messages.tdb ]; then
-	rm -f /var/cache/samba/messages.tdb
-fi
-
-if [ -d /var/lock/samba ]; then
-	rm -rf /var/lock/samba
-fi
-
-# Add swat entry to /etc/services if not already there.
-if !( grep ^[:space:]*swat /etc/services > /dev/null ) then
-	echo 'swat		901/tcp				# Add swat service used via inetd' >> /etc/services
-fi
-
-# Add swat entry to /etc/inetd.conf if needed.
-if [ -f /etc/inetd.conf ]; then
-	if !( grep ^[:space:]*swat /etc/inetd.conf > /dev/null ) then
-		echo 'swat	stream	tcp	nowait.400	root	%{prefix}/sbin/swat swat' >> /etc/inetd.conf
-	killall -1 inetd || :
-	fi
-fi
-
-# Add swat entry to xinetd.d if needed.
-if [ -d $RPM_BUILD_ROOT/etc/xinetd.d -a ! -f /etc/xinetd.d/swat ]; then
-	mv /etc/samba/samba.xinetd /etc/xinetd.d/swat
-else
-	rm -f /etc/samba/samba.xinetd
-fi
-
-# Install the correct version of the samba pam file, depending on pam version.
-if [ -f /lib/security/pam_stack.so ]; then
-	echo "Installing stack version of /etc/pam.d/samba..."
-	mv /etc/samba/samba.stack /etc/pam.d/samba
-else
-	echo "Installing non-stack version of /etc/pam.d/samba..."
-	rm -f /etc/samba/samba.stack
-fi
-
-# Create winbind nss client symlink
-
-if [ -e /lib/libnss_winbind.so ]; then
-	ln -sf /lib/libnss_winbind.so /lib/libnss_winbind.so.2
-fi
-
-%preun
-if [ $1 = 0 ] ; then
-	/sbin/chkconfig --del smb
-
-	# We want to remove the browse.dat and wins.dat files so they can not interfer with a new version of samba!
-	if [ -e /var/cache/samba/browse.dat ]; then
-		rm -f /var/cache/samba/browse.dat
-	fi
-	if [ -e /var/cache/samba/wins.dat ]; then
-		rm -f /var/cache/samba/wins.dat
-	fi
-
-	# Remove the transient tdb files.
-	if [ -e /var/cache/samba/brlock.tdb ]; then
-		rm -f /var/cache/samba/brlock.tdb
-	fi
-
-	if [ -e /var/cache/samba/unexpected.tdb ]; then
-		rm -f /var/cache/samba/unexpected.tdb
-	fi
-
-	if [ -e /var/cache/samba/connections.tdb ]; then
-		rm -f /var/cache/samba/connections.tdb
-	fi
-
-	if [ -e /var/cache/samba/locking.tdb ]; then
-		rm -f /var/cache/samba/locking.tdb
-	fi
-
-	if [ -e /var/cache/samba/messages.tdb ]; then
-		rm -f /var/cache/samba/messages.tdb
-	fi
-
-	# Remove winbind nss client symlink
-
-	if [ -L /lib/libnss_winbind.so.2 ]; then
-		rm -f /lib/libnss_winbind.so.2
-	fi
-fi
-
-%postun
-# Only delete remnants of samba if this is the final deletion.
-if [ $1 = 0 ] ; then
-    if [ -x /etc/pam.d/samba ]; then
-      rm -f /etc/pam.d/samba
-    fi
-    if [ -e /var/log/samba ]; then
-      rm -rf /var/log/samba
-    fi
-	if [ -e /var/cache/samba ]; then
-		rm -rf /var/cache/samba
-	fi
-
-    # Remove swat entries from /etc/inetd.conf and /etc/services
-    cd /etc
-    tmpfile=/etc/tmp.$$
-	if [ -f /etc/inetd.conf ]; then
-      # preserve inetd.conf permissions.
-      cp -p /etc/inetd.conf $tmpfile
-      sed -e '/^[:space:]*swat.*$/d' /etc/inetd.conf > $tmpfile
-      mv $tmpfile inetd.conf
-	fi
-    # preserve services permissions.
-    cp -p /etc/services $tmpfile
-    sed -e '/^[:space:]*swat.*$/d' /etc/services > $tmpfile
-    mv $tmpfile /etc/services
-
-	# Remove swat entry from /etc/xinetd.d
-	if [ -f /etc/xinetd.d/swat ]; then
-		rm -r /etc/xinetd.d/swat
-	fi
-fi
-
-%files
-%defattr(-,root,root)
-%doc README COPYING Manifest Read-Manifest-Now
-%doc WHATSNEW.txt Roadmap
-%doc docs
-%doc swat/README
-%doc examples
-%{prefix}/sbin/smbd
-%{prefix}/sbin/nmbd
-%{prefix}/sbin/swat
-%{prefix}/bin/smbmnt
-%{prefix}/sbin/smbmount
-%{prefix}/sbin/smbumount
-%{prefix}/sbin/winbindd
-%{prefix}/sbin/wrepld
-%{prefix}/sbin/samba
-%{prefix}/sbin/debug2html
-/sbin/mount.smbfs
-/sbin/mount.smb
-%{prefix}/bin/mksmbpasswd.sh
-%{prefix}/bin/smbclient
-%{prefix}/bin/smbspool
-%{prefix}/bin/rpcclient
-%{prefix}/bin/testparm
-%{prefix}/bin/testprns
-%{prefix}/bin/findsmb
-%{prefix}/bin/smbstatus
-%{prefix}/bin/nmblookup
-%{prefix}/bin/smbpasswd
-%{prefix}/bin/smbtar
-%{prefix}/bin/smbprint
-%{prefix}/bin/smbcontrol
-%{prefix}/bin/wbinfo
-%{prefix}/bin/net
-%{prefix}/bin/smbgroupedit
-%{prefix}/bin/smbcacls
-%{prefix}/bin/pdbedit
-%{prefix}/bin/tdbbackup
-%{prefix}/bin/smbtree
-%attr(755,root,root) /lib/libnss_wins.s*
-%attr(755,root,root) %{prefix}/lib/samba/vfs/*.so
-%attr(755,root,root) %{prefix}/lib/samba/*.dat
-%{prefix}/include/libsmbclient.h
-%{prefix}/lib/libsmbclient.a
-%{prefix}/lib/libsmbclient.so
-%{prefix}/share/swat/help/*
-%{prefix}/share/swat/images/*
-%{prefix}/share/swat/include/*.html
-%{prefix}/share/swat/lang/*/help/*
-%{prefix}/share/swat/lang/*/images/*
-%{prefix}/share/swat/lang/*/include/*.html
-%{prefix}/share/swat/using_samba/*
-%config(noreplace) /etc/samba/lmhosts
-%config(noreplace) /etc/samba/smb.conf
-%config(noreplace) /etc/samba/smbusers
-/etc/samba/samba.stack
-/etc/samba/samba.xinetd
-/etc/rc.d/init.d/smb
-/etc/rc.d/init.d/winbind
-/etc/logrotate.d/samba
-%config(noreplace) /etc/pam.d/samba
-MANDIR_MACRO/man1/*
-MANDIR_MACRO/man5/*
-MANDIR_MACRO/man7/*
-MANDIR_MACRO/man8/*
-%attr(755,root,root) %dir /var/cache/samba
-%dir /var/log/samba
-%dir /var/run/samba
-%attr(1777,root,root) %dir /var/spool/samba
-%attr(-,root,root) /lib/libnss_winbind.so
-%attr(-,root,root) /lib/security/pam_winbind.so
-%attr(-,root,root) /lib/security/pam_smbpass.so
diff --git a/packaging/SGI/relnotes.html b/packaging/SGI/relnotes.html
index d055be6c1a..afcf579677 100644
--- a/packaging/SGI/relnotes.html
+++ b/packaging/SGI/relnotes.html
@@ -205,8 +205,17 @@ printer name to describe its location.</DD>
 of the <B>docs</B> directory from the Samba distribution; consult <I>samba</I>(7)
 for an introduction. </P>
 
-<P>There is a mailing list for discussion of Samba.  To subscribe and
-      for more information go to <a href="http://lists.samba.org/">lists.samba.org</a>.
+<P>There is a mailing list for discussion of Samba. To subscribe send mail
+to <A HREF="mailto:listproc@samba.org">listproc@samba.org</A>
+with a body of &quot;subscribe samba Your Name&quot; </P>
+
+<P>To send mail to everyone on the list mail to <A HREF="mailto:samba@samba.org">samba@samba.org</A>.
+</P>
+
+<P>There is also an announcement mailing list where new versions are announced.
+To subscribe send mail to <A HREF="mailto:listproc@samba.org">listproc@samba.org</A>
+with a body of &quot;subscribe samba-announce Your Name&quot;. All announcements
+also go to the samba list. </P>
 
 <P>You might also like to look at the Usenet news group <A HREF="news:comp.protocols.smb">comp.protocols.smb</A>
 as it often contains lots of useful info and is frequented by lots of Samba
@@ -214,10 +223,10 @@ users. The newsgroup was initially setup by people on the Samba mailing
 list. It is not, however, exclusive to Samba, it is a forum for discussing
 the SMB protocol (which Samba implements). </P>
 
-<P>
-      A Samba WWW site has been setup with lots of useful info. Connect to:
-      <A HREF="http://samba.org/">http://samba.org/</A>.  You can
-      contact the webmaster at "webmaster at samba dot org".
+<P>A Samba WWW site has been setup with lots of useful info. Connect to:
+<A HREF="http://samba.org/pub/samba/">http://samba.org/pub/samba/</A>.
+It is maintained by Paul Blackman (thanks Paul!). You can contact him at
+<A HREF="mailto:ictinus@lake.canberra.edu.au">ictinus@lake.canberra.edu.au</A>.
 </P>
 
 </BODY>
diff --git a/packaging/Solaris/makepkg.sh b/packaging/Solaris/makepkg.sh
deleted file mode 100755
index bd370e9a62..0000000000
--- a/packaging/Solaris/makepkg.sh
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) Shirish A Kalele 2000
-#
-# Builds a Samba package from the samba distribution. 
-# By default, the package will be built to install samba in /usr/local
-# Change the INSTALL_BASE variable to change this: will modify the pkginfo 
-# and samba.server files to point to the new INSTALL_BASE
-#
-INSTALL_BASE=/usr/local
-
-add_dynamic_entries() 
-{
-  # Add the binaries, docs and SWAT files
-
-  echo "#\n# Binaries \n#"
-  cd $DISTR_BASE/source/bin
-  for binfile in *
-  do
-    if [ -f $binfile ]; then
-      echo f none samba/bin/$binfile=source/bin/$binfile 0755 root other
-    fi
-  done
-
-  # Add the scripts to bin/
-  echo "#\n# Scripts \n#"
-  cd $DISTR_BASE/source/script
-  for shfile in *
-  do
-    if [ -f $shfile ]; then
- 	echo f none samba/bin/$shfile=source/script/$shfile 0755 root other
-    fi
-  done
-
-  # Add the manpages
-  echo "#\n# man pages \n#"
-  echo d none /usr ? ? ?
-  echo d none /usr/share ? ? ?
-  echo d none /usr/share/man ? ? ?
-
-  # Create directories for man page sections if nonexistent
-  cd $DISTR_BASE/docs/manpages
-  for i in 1 2 3 4 5 6 7 8 9
-  do
-     manpages=`ls *.$i 2>/dev/null`
-     if [ $? -eq 0 ]
-     then
-	echo d none /usr/share/man/man$i ? ? ?
-	for manpage in $manpages 
-	do
-		echo f none /usr/share/man/man${i}/${manpage}=docs/manpages/$manpage 0644 root other
-	done
-     fi
-  done
-
-  echo "#\n# HTML documentation \n#"
-  cd $DISTR_BASE
-  list=`find docs/htmldocs -type d | grep -v "/CVS$"`
-  for docdir in $list
-  do
-    if [ -d $docdir ]; then
-	echo d none samba/$docdir 0755 root other
-    fi
-  done
-
-  list=`find docs/htmldocs -type f | grep -v /CVS/`
-  for htmldoc in $list
-  do
-    if [ -f $htmldoc ]; then
-      echo f none samba/$htmldoc=$htmldoc 0644 root other
-    fi
-  done
-
-  # Create a symbolic link to the Samba book in docs/ for beginners
-  echo 's none samba/docs/samba_book=htmldocs/using_samba'
-
-  echo "#\n# Text Docs \n#"
-  echo d none samba/docs/textdocs 0755 root other
-  cd $DISTR_BASE/docs/textdocs
-  for textdoc in *
-  do 
-    if [ -f $textdoc ]; then
-      echo f none samba/docs/textdocs/$textdoc=docs/textdocs/$textdoc 0644 root other
-    fi
-  done
-  echo "#\n# SWAT \n#"
-  cd $DISTR_BASE
-  list=`find swat -type d | grep -v "/CVS$"`
-  for i in $list
-  do
-    echo "d none samba/$i 0755 root other"
-  done
-  list=`find swat -type f | grep -v /CVS/`
-  for i in $list
-  do
-    echo "f none samba/$i=$i 0644 root other"
-  done
-  echo "#\n# HTML documentation for SWAT\n#"
-  cd $DISTR_BASE/docs/htmldocs
-  for htmldoc in *
-  do
-    if [ -f $htmldoc ]; then
-      echo f none samba/swat/help/$htmldoc=docs/htmldocs/$htmldoc 0644 root other
-    fi
-  done
-
-  echo "#\n# Using Samba Book files for SWAT\n#"
-  cd $DISTR_BASE/docs/htmldocs
-
-# set up a symbolic link instead of duplicating the book tree
-  echo 's none samba/swat/using_samba=../docs/htmldocs/using_samba'
-
-}
-
-if [ $# = 0 ]
-then
-	# Try to guess the distribution base..
-	CURR_DIR=`pwd`
-	DISTR_BASE=`echo $CURR_DIR | sed 's|\(.*\)/packaging.*|\1|'`
-	echo "Assuming Samba distribution is rooted at $DISTR_BASE.."
-else
-	DISTR_BASE=$1
-fi
-
-#
-if [ ! -d $DISTR_BASE ]; then
-	echo "Source build directory $DISTR_BASE does not exist."
-	exit 1
-fi
-
-# Set up the prototype file from prototype.master
-if [ -f prototype ]; then
-	rm prototype
-fi
-
-# Setup version from version.h
-VERSION=`sed 's/#define VERSION \"\(.*\)\"$/\1/' ../../source/include/version.h`
-sed -e "s|__VERSION__|$VERSION|" -e "s|__ARCH__|`uname -p`|" -e "s|__BASEDIR__|$INSTALL_BASE|g" pkginfo.master >pkginfo
-
-sed -e "s|__BASEDIR__|$INSTALL_BASE|g" inetd.conf.master >inetd.conf
-sed -e "s|__BASEDIR__|$INSTALL_BASE|g" samba.server.master >samba.server
-
-cp prototype.master prototype
-
-# Add the dynamic part to the prototype file
-(add_dynamic_entries >> prototype)
-
-# Create the package
-pkgmk -o -d /tmp -b $DISTR_BASE -f prototype
-if [ $? = 0 ]
-then
-	pkgtrans /tmp samba.pkg samba
-fi
-echo The samba package is in /tmp
author	Gerald Carter <jerry@samba.org>	2003-09-09 11:12:43 +0000
committer	Gerald Carter <jerry@samba.org>	2003-09-09 11:12:43 +0000
commit	f83a6ce2adbdd471809ccbcfd69dc3fcf6d89129 (patch)
tree	5a9a498dc581d42374824065c68c4d13aedfc24a /packaging
parent	7f438c3b9e8913a7836b4851ef7c40a7b97a986d (diff)
download	samba-f83a6ce2adbdd471809ccbcfd69dc3fcf6d89129.tar.gz samba-f83a6ce2adbdd471809ccbcfd69dc3fcf6d89129.tar.bz2 samba-f83a6ce2adbdd471809ccbcfd69dc3fcf6d89129.zip