Add some patches from the net/samba package, and regenerate the old ones.

9 files changed, 63 insertions, 18 deletions

diff --git a/net/samba20/distinfo b/net/samba20/distinfo
index 97ad3ab1068..8067c60d4c4 100644
--- a/net/samba20/distinfo
+++ b/net/samba20/distinfo
@@ -1,8 +1,12 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/08/03 13:24:34 jlam Exp $
+$NetBSD: distinfo,v 1.2 2001/08/03 13:46:02 jlam Exp $
 
 SHA1 (samba-2.0.10.tar.gz) = 368fd7bb25c53fc351357c83f0ff70b1d38e37ca
 Size (samba-2.0.10.tar.gz) = 3496800 bytes
-SHA1 (patch-aa) = 9bd7bc938b77b1fb098345815203f4ae5f2e273e
+SHA1 (patch-aa) = 50c0bc2f64bdfc12b0de84db4b9aae31d035a5c7
 SHA1 (patch-ab) = 3222b66692124edede7f35f3cbb6f4830b70359b
 SHA1 (patch-ac) = 5b87200b0c2439cfb192db608c463fe106460848
 SHA1 (patch-ad) = 72aadc753abda45f8a541f6caeb7a9afeeb8f034
+SHA1 (patch-ae) = 22f67adc1093074a32b81d29a60a11d9350223ea
+SHA1 (patch-af) = 948450d493887b38f5f12a120c6f914c6c3a0c89
+SHA1 (patch-ag) = b182c27c5e5722820343c879ad6390c1ce51a895
+SHA1 (patch-ah) = 157ac02652861492a456aa65016409d8744cdd17
diff --git a/net/samba20/patches/patch-aa b/net/samba20/patches/patch-aa
index f6495b5b062..a70ba5b60cc 100644
--- a/net/samba20/patches/patch-aa
+++ b/net/samba20/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/08/03 13:24:37 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2001/08/03 13:46:02 jlam Exp $
 
 --- Makefile.in.orig	Thu Mar 16 17:57:08 2000
 +++ Makefile.in
@@ -60,15 +60,3 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/08/03 13:24:37 jlam Exp $
  
  bin/smbspool: $(CUPS_OBJ) bin/.dummy
  	@echo Linking $@
-@@ -462,8 +464,9 @@
- install: installbin installman installscripts installcp installswat
- 
- installdirs:
--	$(SHELL) $(srcdir)/install-sh -d -m $(INSTALLPERMS) \
--	$(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(CODEPAGEDIR)
-+	@for dir in $(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(CODEPAGEDIR); do \
-+		$(SHELL) $(srcdir)/install-sh -d -m $(INSTALLPERMS) $${dir}; \
-+	done
- 
- installservers: all installdirs
- 	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
diff --git a/net/samba20/patches/patch-ab b/net/samba20/patches/patch-ab
index ad3a6fb714b..9cc86d69b3a 100644
--- a/net/samba20/patches/patch-ab
+++ b/net/samba20/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/08/03 13:24:37 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2001/08/03 13:46:02 jlam Exp $
 
 --- client/client.c.orig	Tue Apr 17 19:00:52 2001
 +++ client/client.c
diff --git a/net/samba20/patches/patch-ac b/net/samba20/patches/patch-ac
index 8fad0830760..9f307be39ac 100644
--- a/net/samba20/patches/patch-ac
+++ b/net/samba20/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/08/03 13:24:37 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2001/08/03 13:46:02 jlam Exp $
 
 --- configure.in.orig	Tue Apr 17 19:00:52 2001
 +++ configure.in
diff --git a/net/samba20/patches/patch-ad b/net/samba20/patches/patch-ad
index 2b6c6471751..c4240a46112 100644
--- a/net/samba20/patches/patch-ad
+++ b/net/samba20/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/08/03 13:24:37 jlam Exp $
+$NetBSD: patch-ad,v 1.2 2001/08/03 13:46:03 jlam Exp $
 
 --- configure.orig	Tue Apr 17 19:00:52 2001
 +++ configure
diff --git a/net/samba20/patches/patch-ae b/net/samba20/patches/patch-ae
new file mode 100644
index 00000000000..678af70bad9
--- /dev/null
+++ b/net/samba20/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2001/08/03 13:46:03 jlam Exp $
+
+--- script/convert_smbpasswd.orig	Wed Nov  4 21:50:17 1998
++++ script/convert_smbpasswd
+@@ -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=":"} 
++awk 'BEGIN {FS=":"} 
+ {
+ 	if( $0 ~ "^#" ) {
+ 		print $0
diff --git a/net/samba20/patches/patch-af b/net/samba20/patches/patch-af
new file mode 100644
index 00000000000..679a9308aec
--- /dev/null
+++ b/net/samba20/patches/patch-af
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.1 2001/08/03 13:46:03 jlam Exp $
+
+--- script/installbin.sh.orig	Wed Nov 10 09:41:12 1999
++++ script/installbin.sh
+@@ -30,7 +30,9 @@
+    mv $BINDIR/$p2 $BINDIR/$p2.old
+  fi
+  cp $p $BINDIR/
++ strip $BINDIR/$p2
+  chmod $INSTALLPERMS $BINDIR/$p2
++ rm -f $BINDIR/$p2.old
+ 
+  # this is a special case, mount needs this in a specific location
+  if [ $p2 = smbmount ]; then
diff --git a/net/samba20/patches/patch-ag b/net/samba20/patches/patch-ag
new file mode 100644
index 00000000000..3a79617661a
--- /dev/null
+++ b/net/samba20/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2001/08/03 13:46:04 jlam Exp $
+
+--- script/installcp.sh.orig	Thu Mar 16 17:59:40 2000
++++ script/installcp.sh
+@@ -12,7 +12,7 @@
+ echo Installing codepage files in $CODEPAGEDIR
+ for d in $LIBDIR $CODEPAGEDIR; do
+ if [ ! -d $d ]; then
+-mkdir $d
++mkdir -p $d
+ if [ ! -d $d ]; then
+   echo Failed to make directory $d
+   exit 1
diff --git a/net/samba20/patches/patch-ah b/net/samba20/patches/patch-ah
new file mode 100644
index 00000000000..45d6d4d0a6e
--- /dev/null
+++ b/net/samba20/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2001/08/03 13:46:04 jlam Exp $
+
+--- script/installswat.sh.orig	Thu Mar 16 17:59:40 2000
++++ script/installswat.sh
+@@ -10,7 +10,7 @@
+ 
+ for d in $SWATDIR $SWATDIR/help $SWATDIR/images $SWATDIR/include; do
+     if [ ! -d $d ]; then
+-        mkdir $d
++        mkdir -p $d
+         if [ ! -d $d ]; then
+             echo Failed to make directory $d, does $USER have privileges?
+             exit 1