Updated samba to 2.2.6

* Fixes for MS-RPC printing issues affecting Windows 2000 clients
* New support for smb.conf generation in SWAT
* Inclusion of several performance enhancements
* Fixes for several file locking bugs and returned status codes
This commit is contained in:
martti 2002-10-18 11:50:27 +00:00
parent 5fb7348e42
commit 48a8590454
8 changed files with 44 additions and 38 deletions

View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile.common,v 1.2 2002/08/25 21:50:10 jlam Exp $ # $NetBSD: Makefile.common,v 1.3 2002/10/18 11:50:27 martti Exp $
DISTNAME= samba-${SAMBA_DIST_VERS} DISTNAME= samba-${SAMBA_DIST_VERS}
SAMBA_DIST_VERS= 2.2.5 SAMBA_DIST_VERS= 2.2.6
WRKSRC?= ${WRKDIR}/${DISTNAME}/source WRKSRC?= ${WRKDIR}/${DISTNAME}/source
CATEGORIES?= net CATEGORIES?= net
MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \ MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.9 2002/08/25 21:50:11 jlam Exp $ @comment $NetBSD: PLIST,v 1.10 2002/10/18 11:50:27 martti Exp $
bin/findsmb bin/findsmb
bin/make_printerdef bin/make_printerdef
bin/make_smbcodepage bin/make_smbcodepage
@ -71,6 +71,7 @@ share/doc/samba/Application_Serving.txt
share/doc/samba/BROWSING-Config.txt share/doc/samba/BROWSING-Config.txt
share/doc/samba/BROWSING.txt share/doc/samba/BROWSING.txt
share/doc/samba/BUGS.txt share/doc/samba/BUGS.txt
share/doc/samba/CUPS-PrintingInfo.txt
share/doc/samba/DHCP-Server-Configuration.txt share/doc/samba/DHCP-Server-Configuration.txt
share/doc/samba/DIAGNOSIS.txt share/doc/samba/DIAGNOSIS.txt
share/doc/samba/DNIX.txt share/doc/samba/DNIX.txt
@ -117,6 +118,7 @@ share/examples/samba/LDAP/export_smbpasswd.pl
share/examples/samba/LDAP/import_smbpasswd.pl share/examples/samba/LDAP/import_smbpasswd.pl
share/examples/samba/LDAP/ldapchpasswd share/examples/samba/LDAP/ldapchpasswd
share/examples/samba/LDAP/ldapsync.pl share/examples/samba/LDAP/ldapsync.pl
share/examples/samba/LDAP/samba-nds.schema
share/examples/samba/LDAP/samba-schema-netscapeds4.x share/examples/samba/LDAP/samba-schema-netscapeds4.x
share/examples/samba/LDAP/samba-schema-netscapeds5.x share/examples/samba/LDAP/samba-schema-netscapeds5.x
share/examples/samba/LDAP/samba-schema.IBMSecureWay share/examples/samba/LDAP/samba-schema.IBMSecureWay
@ -188,6 +190,7 @@ share/examples/samba/validchars/nwdos70.out
share/examples/samba/validchars/readme share/examples/samba/validchars/readme
share/examples/samba/validchars/validchr.c share/examples/samba/validchars/validchr.c
share/examples/samba/validchars/validchr.com share/examples/samba/validchars/validchr.com
share/samba/codepages/codepage.1125
share/samba/codepages/codepage.1251 share/samba/codepages/codepage.1251
share/samba/codepages/codepage.437 share/samba/codepages/codepage.437
share/samba/codepages/codepage.737 share/samba/codepages/codepage.737
@ -201,6 +204,7 @@ share/samba/codepages/codepage.932
share/samba/codepages/codepage.936 share/samba/codepages/codepage.936
share/samba/codepages/codepage.949 share/samba/codepages/codepage.949
share/samba/codepages/codepage.950 share/samba/codepages/codepage.950
share/samba/codepages/unicode_map.1125
share/samba/codepages/unicode_map.1251 share/samba/codepages/unicode_map.1251
share/samba/codepages/unicode_map.437 share/samba/codepages/unicode_map.437
share/samba/codepages/unicode_map.737 share/samba/codepages/unicode_map.737
@ -222,6 +226,7 @@ share/samba/codepages/unicode_map.ISO8859-5
share/samba/codepages/unicode_map.ISO8859-7 share/samba/codepages/unicode_map.ISO8859-7
share/samba/codepages/unicode_map.ISO8859-9 share/samba/codepages/unicode_map.ISO8859-9
share/samba/codepages/unicode_map.KOI8-R share/samba/codepages/unicode_map.KOI8-R
share/samba/codepages/unicode_map.KOI8-U
share/samba/swat/help/CVS-Access.html share/samba/swat/help/CVS-Access.html
share/samba/swat/help/DOMAIN_MEMBER.html share/samba/swat/help/DOMAIN_MEMBER.html
share/samba/swat/help/ENCRYPTION.html share/samba/swat/help/ENCRYPTION.html
@ -275,6 +280,7 @@ share/samba/swat/images/samba.gif
share/samba/swat/images/shares.gif share/samba/swat/images/shares.gif
share/samba/swat/images/status.gif share/samba/swat/images/status.gif
share/samba/swat/images/viewconfig.gif share/samba/swat/images/viewconfig.gif
share/samba/swat/images/wizard.gif
share/samba/swat/include/footer.html share/samba/swat/include/footer.html
share/samba/swat/include/header.html share/samba/swat/include/header.html
share/samba/swat/using_samba/appa_01.html share/samba/swat/using_samba/appa_01.html

View file

@ -1,14 +1,14 @@
$NetBSD: distinfo,v 1.22 2002/10/14 01:51:26 kim Exp $ $NetBSD: distinfo,v 1.23 2002/10/18 11:50:28 martti Exp $
SHA1 (samba-2.2.5.tar.bz2) = 67e1025a8d01ba51b8cea6f04176fdbc57b7c012 SHA1 (samba-2.2.6.tar.bz2) = 90efbd8296bd6cff74b7af1cda36b28782a3bc5c
Size (samba-2.2.5.tar.bz2) = 4343641 bytes Size (samba-2.2.6.tar.bz2) = 4390352 bytes
SHA1 (patch-aa) = 994befda25575f26829ea096d609dd204511d117 SHA1 (patch-aa) = 8e2e56f2cf231240eaf62e695c8c22d8338312c3
SHA1 (patch-ab) = 777bd40add3c40b299e03fe9b26704ebffb528d4 SHA1 (patch-ab) = 78ebbd174408450445e14cf73a324ca7afca2501
SHA1 (patch-ac) = a055bcc69e1a40124ada075ac836d1061ecfcd15 SHA1 (patch-ac) = cfde267ffe57046de18691f612e73ecdd1158d86
SHA1 (patch-ad) = 38dc1cf2d2c322db32a1a3cbebf9dff59841fa4f SHA1 (patch-ad) = 6e9ee82a00235572bec1738ef388e1ca17c3474e
SHA1 (patch-ag) = 256a7e1edb961985398a94c0b738fd96fe781f9c SHA1 (patch-ag) = 256a7e1edb961985398a94c0b738fd96fe781f9c
SHA1 (patch-ah) = e87f2e393db68acc7028fe20d4772455379ad7aa SHA1 (patch-ah) = e87f2e393db68acc7028fe20d4772455379ad7aa
SHA1 (patch-aj) = e2c5f7580a8c701b6bf35d0d3004f714f2c810cb SHA1 (patch-aj) = e2c5f7580a8c701b6bf35d0d3004f714f2c810cb
SHA1 (patch-al) = 368c7f88c5538fcaa32d7263ba98d138ba179859 SHA1 (patch-al) = 9507677d964044416802e91597c29310c61c9622
SHA1 (patch-ap) = cc0b3d73d0c7de4cd46e66b0d66b2c3bbaddeb41 SHA1 (patch-ap) = cc0b3d73d0c7de4cd46e66b0d66b2c3bbaddeb41
SHA1 (patch-aq) = ea9cd9097cf91dd2b9f1acd9e6ff6f9445505774 SHA1 (patch-aq) = ea9cd9097cf91dd2b9f1acd9e6ff6f9445505774

View file

@ -1,8 +1,8 @@
$NetBSD: patch-aa,v 1.21 2002/08/25 21:50:13 jlam Exp $ $NetBSD: patch-aa,v 1.22 2002/10/18 11:50:28 martti Exp $
--- configure.in.orig Sun Jul 28 18:13:04 2002 --- configure.in.orig Wed Oct 9 22:27:21 2002
+++ configure.in +++ configure.in Fri Oct 18 13:01:18 2002
@@ -1976,6 +1976,10 @@ AC_ARG_WITH(pam, @@ -1991,6 +1991,10 @@
# we can't build a pam module if we don't have pam. # we can't build a pam module if we don't have pam.
AC_CHECK_LIB(pam, pam_get_data, [AC_DEFINE(HAVE_LIBPAM)]) AC_CHECK_LIB(pam, pam_get_data, [AC_DEFINE(HAVE_LIBPAM)])

View file

@ -1,8 +1,8 @@
$NetBSD: patch-ab,v 1.17 2002/08/25 21:50:13 jlam Exp $ $NetBSD: patch-ab,v 1.18 2002/10/18 11:50:28 martti Exp $
--- configure.orig Sun Jul 28 18:13:04 2002 --- configure.orig Wed Oct 9 22:27:21 2002
+++ configure +++ configure Fri Oct 18 13:01:38 2002
@@ -11945,6 +11945,49 @@ else @@ -11993,6 +11993,49 @@
fi fi
@ -52,7 +52,7 @@ $NetBSD: patch-ab,v 1.17 2002/08/25 21:50:13 jlam Exp $
################################################# #################################################
# check for pam_smbpass support # check for pam_smbpass support
echo $ac_n "checking whether to use pam_smbpass""... $ac_c" 1>&6 echo $ac_n "checking whether to use pam_smbpass""... $ac_c" 1>&6
@@ -13787,6 +13830,7 @@ s%@TERMLIBS@%$TERMLIBS%g @@ -14362,6 +14405,7 @@
s%@TERMLDFLAGS@%$TERMLDFLAGS%g s%@TERMLDFLAGS@%$TERMLDFLAGS%g
s%@ROFF@%$ROFF%g s%@ROFF@%$ROFF%g
s%@DYNEXP@%$DYNEXP%g s%@DYNEXP@%$DYNEXP%g

View file

@ -1,13 +1,13 @@
$NetBSD: patch-ac,v 1.10 2002/02/04 08:09:03 martti Exp $ $NetBSD: patch-ac,v 1.11 2002/10/18 11:50:28 martti Exp $
--- profile/profile.c.orig Sun Feb 3 01:46:49 2002 --- profile/profile.c.orig Wed Oct 9 22:27:22 2002
+++ profile/profile.c Mon Feb 4 08:32:16 2002 +++ profile/profile.c Fri Oct 18 13:02:32 2002
@@ -22,7 +22,7 @@ @@ -23,7 +23,7 @@
#include "includes.h" #include "includes.h"
#ifdef WITH_PROFILE
-#define IPC_PERMS ((SHM_R | SHM_W) | (SHM_R>>3) | (SHM_R>>6)) -#define IPC_PERMS ((SHM_R | SHM_W) | (SHM_R>>3) | (SHM_R>>6))
+#define IPC_PERMS ((S_IRUSR | S_IWUSR) | S_IRGRP | S_IROTH) +#define IPC_PERMS ((S_IRUSR | S_IWUSR) | S_IRGRP | S_IROTH)
static int shm_id; static int shm_id;
static BOOL read_only; static BOOL read_only;

View file

@ -1,8 +1,8 @@
$NetBSD: patch-ad,v 1.10 2002/08/25 21:50:14 jlam Exp $ $NetBSD: patch-ad,v 1.11 2002/10/18 11:50:28 martti Exp $
--- Makefile.in.orig Sun Jul 28 18:13:04 2002 --- Makefile.in.orig Wed Oct 9 22:27:15 2002
+++ Makefile.in +++ Makefile.in Fri Oct 18 13:04:01 2002
@@ -89,6 +89,8 @@ FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $ @@ -89,6 +89,8 @@
FLAGS = $(ISA) $(FLAGS5) $(PASSWD_FLAGS) FLAGS = $(ISA) $(FLAGS5) $(PASSWD_FLAGS)
FLAGS32 = $(ISA32) $(FLAGS5) $(PASSWD_FLAGS) FLAGS32 = $(ISA32) $(FLAGS5) $(PASSWD_FLAGS)
@ -11,16 +11,16 @@ $NetBSD: patch-ad,v 1.10 2002/08/25 21:50:14 jlam Exp $
WINBIND_PROGS = @WINBIND_TARGETS@ WINBIND_PROGS = @WINBIND_TARGETS@
WINBIND_SPROGS = @WINBIND_STARGETS@ WINBIND_SPROGS = @WINBIND_STARGETS@
WINBIND_PAM_PROGS = @WINBIND_PAM_TARGETS@ WINBIND_PAM_PROGS = @WINBIND_PAM_TARGETS@
@@ -650,7 +652,7 @@ bin/libsmbclient.a: $(LIBSMBCLIENT_PICOB @@ -654,7 +656,7 @@
bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_OBJ) bin/.dummy bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_OBJ) bin/.dummy
@echo Linking shared library $@ @echo Linking shared library $@
- $(SHLD) @LDSHFLAGS@ -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(DYNEXP) $(LIBS) -lc \ - $(SHLD) @LDSHFLAGS@ -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(DYNEXP) $(LIBS) $(LDAPLIBS) -lc \
+ $(SHLD) @LDSHFLAGS@ -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(DYNEXP) $(LIBS) $(PAM_NEEDS_LIBC) \ + $(SHLD) @LDSHFLAGS@ -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(DYNEXP) $(LIBS) $(LDAPLIBS) $(PAM_NEEDS_LIBC) \
@SONAMEFLAG@`basename $@` @SONAMEFLAG@`basename $@`
nsswitch/libnss_wins.so: $(NSS_OBJ) nsswitch/libnss_wins.so: $(NSS_OBJ)
@@ -674,7 +676,7 @@ nsswitch/libnss_winbind.so: $(WINBIND_NS @@ -678,7 +680,7 @@
nsswitch/pam_winbind.so: $(PAM_WINBIND_OBJ) nsswitch/pam_winbind.so: $(PAM_WINBIND_OBJ)
@echo Linking $@ @echo Linking $@

View file

@ -1,8 +1,8 @@
$NetBSD: patch-al,v 1.1 2002/02/05 00:36:27 taca Exp $ $NetBSD: patch-al,v 1.2 2002/10/18 11:50:28 martti Exp $
--- include/local.h.orig Sun Feb 3 09:46:39 2002 --- include/local.h.orig Wed Oct 9 22:27:21 2002
+++ include/local.h +++ include/local.h Fri Oct 18 13:04:36 2002
@@ -170,10 +170,10 @@ @@ -169,10 +169,10 @@
* Default passwd chat script. * Default passwd chat script.
*/ */