11 files changed, 76 insertions, 65 deletions

diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 5080bdef450a..adaa4ff8ddb0 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	2.2.1a
-PORTREVISION=	2
+PORTVERSION=	2.2.2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.samba.org/pub/samba/%SUBDIR%/ \
 		ftp://samba.anu.edu.au/pub/samba/%SUBDIR%/ \
@@ -118,13 +117,12 @@ post-install:
 			${WRKDIR}/${DISTNAME}/Read-Manifest-Now		\
 			${WRKDIR}/${DISTNAME}/Roadmap			\
 			${WRKDIR}/${DISTNAME}/WHATSNEW.txt		\
-			${WRKDIR}/${DISTNAME}/docs/*.reg		\
 			${WRKDIR}/${DISTNAME}/docs/THANKS		\
 			${WRKDIR}/${DISTNAME}/docs/announce		\
 			${WRKDIR}/${DISTNAME}/docs/history ; do		\
 		${INSTALL_DATA} $$i ${DOCSDIR} ;		\
 	done
-	for i in faq htmldocs textdocs ; do			\
+	for i in faq htmldocs textdocs Registry ; do			\
 		${MKDIR} ${DOCSDIR}/$$i ;		\
 		for j in ${WRKDIR}/${DISTNAME}/docs/$$i/* ; do		\
 			if [ $$j != ${WRKDIR}/${DISTNAME}/docs/htmldocs/using_samba ] ; then \
diff --git a/net/samba3/distinfo b/net/samba3/distinfo
index fd388b9182c6..25e5e5feab43 100644
--- a/net/samba3/distinfo
+++ b/net/samba3/distinfo
@@ -1 +1 @@
-MD5 (samba-2.2.1a.tar.gz) = c8810245887bc080191d755fab961760
+MD5 (samba-2.2.2.tar.gz) = d0aba688a1b6189f09f3ba0b44b1da8e
diff --git a/net/samba3/files/patch-aa b/net/samba3/files/patch-aa
index af170104b851..b0024a08bcfa 100644
--- a/net/samba3/files/patch-aa
+++ b/net/samba3/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Fri Mar 23 16:38:06 2001
-+++ Makefile.in	Fri Mar 23 18:12:53 2001
-@@ -43,11 +43,11 @@
+--- Makefile.in.orig	Sat Oct 13 22:09:06 2001
++++ Makefile.in	Tue Oct 16 17:15:15 2001
+@@ -46,11 +46,11 @@
  # set these to where to find various files
  # These can be overridden by command line switches (see smbd(8))
  # or in smb.conf (see smb.conf(5))
@@ -14,16 +14,16 @@
  # This is where smbpasswd et al go
  PRIVATEDIR = @privatedir@
  
-@@ -60,6 +60,9 @@
+@@ -63,6 +63,9 @@
  # the directory where lock files go
  LOCKDIR = @lockdir@
  
 +# the directory where pid files go
 +PIDFILEDIR = $(VARDIR)/run
 +
- # The directory where code page definition files go
- CODEPAGEDIR = @codepagedir@
- 
+ # libsmbclient support here
+ BLDSHARED = @BLDSHARED@
+ LIBSMBCLIENT_MAJOR=0
 @@ -78,7 +81,7 @@
  PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DTDB_PASSWD_FILE=\"$(TDB_PASSWD_FILE)\"
  FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DLOGFILEBASE=\"$(LOGFILEBASE)\"
diff --git a/net/samba3/files/patch-ab b/net/samba3/files/patch-ab
index 7cc000262680..b1383c6ae2e3 100644
--- a/net/samba3/files/patch-ab
+++ b/net/samba3/files/patch-ab
@@ -1,23 +1,23 @@
---- param/loadparm.c.orig	Fri Feb  2 00:42:53 2001
-+++ param/loadparm.c	Fri Feb  2 00:45:23 2001
-@@ -108,6 +108,7 @@
- 	char *szAddPrinterCommand;
+--- param/loadparm.c.orig	Sat Oct 13 22:09:31 2001
++++ param/loadparm.c	Tue Oct 16 17:16:46 2001
+@@ -107,6 +107,7 @@
  	char *szDeletePrinterCommand;
+ 	char *szOs2DriverMap;
  	char *szLockDir;
 +	char *szPidDir;
  	char *szRootdir;
  	char *szDefaultService;
  	char *szDfree;
-@@ -948,6 +949,8 @@
+@@ -986,6 +987,8 @@
  	{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_DOS_STRING},
  	{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0}, 
  	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
 +	{"pidfile dir", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
 +	{"pidfile directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
  #ifdef WITH_UTMP
- 	{"utmp dir", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
  	{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
-@@ -1171,6 +1174,7 @@
+ 	{"wtmp directory", P_STRING, P_GLOBAL, &Globals.szWtmpDir, NULL, NULL, 0},
+@@ -1220,6 +1223,7 @@
  	string_set(&Globals.szPasswdProgram, PASSWD_PROGRAM);
  	string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
  	string_set(&Globals.szLockDir, LOCKDIR);
@@ -25,9 +25,9 @@
  #ifdef WITH_UTMP
  	string_set(&Globals.szUtmpDir, "");
  	string_set(&Globals.szWtmpDir, "");
-@@ -1403,6 +1407,7 @@
- FN_GLOBAL_STRING(lp_addprinter_cmd, &Globals.szAddPrinterCommand)
+@@ -1469,6 +1473,7 @@
  FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand)
+ FN_GLOBAL_STRING(lp_os2_driver_map, &Globals.szOs2DriverMap)
  FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
 +FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir)
  #ifdef WITH_UTMP
diff --git a/net/samba3/files/patch-ac b/net/samba3/files/patch-ac
index 0527cb5a32f8..8fbd726ae435 100644
--- a/net/samba3/files/patch-ac
+++ b/net/samba3/files/patch-ac
@@ -1,5 +1,5 @@
---- lib/pidfile.c.orig	Fri Feb  2 00:38:09 2001
-+++ lib/pidfile.c	Fri Feb  2 00:38:26 2001
+--- lib/pidfile.c.orig	Sat Oct 13 22:09:24 2001
++++ lib/pidfile.c	Tue Oct 16 17:17:51 2001
 @@ -39,7 +39,7 @@
  	unsigned ret;
  	pstring pidFile;
@@ -7,7 +7,7 @@
 -	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
 +	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
  
- 	fd = sys_open(pidFile, O_NONBLOCK | O_RDWR, 0644);
+ 	fd = sys_open(pidFile, O_NONBLOCK | O_RDONLY, 0644);
  	if (fd == -1) {
 @@ -80,7 +80,7 @@
  	pstring pidFile;
diff --git a/net/samba3/files/patch-ae b/net/samba3/files/patch-ae
index 252ac19c8e63..e735b5794be1 100644
--- a/net/samba3/files/patch-ae
+++ b/net/samba3/files/patch-ae
@@ -1,5 +1,5 @@
---- script/convert_smbpasswd.orig	Thu Nov  5 11:50:17 1998
-+++ script/convert_smbpasswd	Wed Feb 10 00:02:01 1999
+--- script/convert_smbpasswd.orig	Thu Nov  5 02:50:17 1998
++++ script/convert_smbpasswd	Tue Oct 16 17:19:10 2001
 @@ -7,7 +7,7 @@
  # with trying to work out how to get the seconds since 1970
  # in awk or the shell. JRA.
diff --git a/net/samba3/files/patch-ah b/net/samba3/files/patch-ah
index e97b12388c05..319dc96d7944 100644
--- a/net/samba3/files/patch-ah
+++ b/net/samba3/files/patch-ah
@@ -1,5 +1,5 @@
---- lib/util_sock.c.orig	Fri Feb  2 12:09:17 2001
-+++ lib/util_sock.c	Fri Feb  2 12:09:36 2001
+--- lib/util_sock.c.orig	Sat Oct 13 22:09:26 2001
++++ lib/util_sock.c	Tue Oct 16 17:19:38 2001
 @@ -28,6 +28,9 @@
  extern int  sslFd;
  #endif  /* WITH_SSL */
diff --git a/net/samba3/files/patch-aj b/net/samba3/files/patch-aj
index ad93c26811da..8804493c38df 100644
--- a/net/samba3/files/patch-aj
+++ b/net/samba3/files/patch-aj
@@ -1,6 +1,6 @@
---- include/local.h.orig	Thu Nov 11 03:36:00 1999
-+++ include/local.h	Fri Feb  4 11:33:01 2000
-@@ -171,9 +171,9 @@
+--- include/local.h.orig	Fri Jul  6 03:01:26 2001
++++ include/local.h	Tue Oct 16 17:20:36 2001
+@@ -176,10 +176,10 @@
   * Default passwd chat script.
   */
  
@@ -11,4 +11,5 @@
 -#define MINPASSWDLENGTH 5
 +#define MINPASSWDLENGTH 6
  
- #endif
+ /* maximum ID number used for session control. This cannot be larger
+    than 62*62 for the current code */
diff --git a/net/samba3/files/patch-ba b/net/samba3/files/patch-ba
index 14c0d89b492a..b6f5a757140d 100644
--- a/net/samba3/files/patch-ba
+++ b/net/samba3/files/patch-ba
@@ -1,28 +1,41 @@
---- configure.in.orig	Tue Apr 17 19:00:52 2001
-+++ configure.in	Thu Jun  7 13:49:53 2001
-@@ -234,9 +234,6 @@
- AC_CHECK_TYPE(offset_t,loff_t)
+--- configure.in.orig	Sat Oct 13 22:09:16 2001
++++ configure.in	Tue Oct 16 17:21:21 2001
+@@ -406,21 +406,6 @@
  AC_CHECK_TYPE(ssize_t, int)
+ AC_CHECK_TYPE(wchar_t, unsigned short)
  
--# we need libcups for CUPS support...
+-############################################
+-# for cups support we need libcups, and a handful of header files
+-
 -AC_CHECK_LIB(cups,httpConnect)
 -
- # we need libdl for PAM and the new VFS code
- AC_CHECK_LIB(dl,main)
+-# I wonder if there is a nicer way of doing this?
+-
+-if test x"$ac_cv_lib_cups_httpConnect" = x"yes"; then
+-        AC_CHECK_HEADERS(cups/cups.h cups/language.h)
+-        if test x"$ac_cv_header_cups_cups_h" = x"yes"; then
+-                if test x"$ac_cv_header_cups_language_h" = x"yes"; then
+-                        AC_DEFINE(HAVE_CUPS)
+-                fi
+-        fi
+-fi
  
-@@ -1258,7 +1255,7 @@
-   --without-krb5          Don't include Kerberos 5 support (default)],
- [   AC_MSG_RESULT(yes)
+ ############################################
+ # we need libdl for PAM and the new VFS code
+@@ -1622,7 +1607,7 @@
+   yes)
+     AC_MSG_RESULT(yes)
      AC_DEFINE(KRB5_AUTH)
 -    LIBS="$LIBS -ldes425 -lkrb5 -lcrypto -lcom_err"
 +    LIBS="$LIBS -ldes425 -lkrb5 -lk5crypto -lcom_err"
      CFLAGS="$CFLAGS -I$withval/include"
-     LDFLAGS="$LDFLAGS -L$withval/lib"],
-   AC_MSG_RESULT(no)
-@@ -1486,6 +1483,21 @@
+     LDFLAGS="$LDFLAGS -L$withval/lib"
+     ;;
+@@ -1961,6 +1946,20 @@
+     ;;
    esac ],
    AC_MSG_RESULT(no)
- )
++)
 +
 +#################################################
 +# check for CUPS printing support
@@ -36,8 +49,6 @@
 +   LDFLAGS="$LDFLAGS -L$withval/lib"
 +   AC_CHECK_LIB(cups,httpConnect)],
 + AC_MSG_RESULT(no)
-+)
-+
+ )
+ 
  
- #################################################
- # check for experimental disk-quotas support
diff --git a/net/samba3/files/patch-bb b/net/samba3/files/patch-bb
index 0f70c69c78f4..5b14f2131b03 100644
--- a/net/samba3/files/patch-bb
+++ b/net/samba3/files/patch-bb
@@ -1,10 +1,10 @@
---- include/proto.h.orig	Fri Feb  2 15:34:50 2001
-+++ include/proto.h	Fri Feb  2 16:13:03 2001
-@@ -1420,6 +1420,7 @@
- char *lp_addprinter_cmd(void);
+--- include/proto.h.orig	Sat Oct 13 22:09:22 2001
++++ include/proto.h	Tue Oct 16 17:21:53 2001
+@@ -1733,6 +1733,7 @@
  char *lp_deleteprinter_cmd(void);
+ char *lp_os2_driver_map(void);
  char *lp_lockdir(void);
 +char *lp_piddir(void);
  char *lp_utmpdir(void);
  char *lp_wtmpdir(void);
- char *lp_utmp_hostname(void);
+ BOOL lp_utmp(void);
diff --git a/net/samba3/pkg-plist b/net/samba3/pkg-plist
index 3a227933e325..717e75c91e91 100644
--- a/net/samba3/pkg-plist
+++ b/net/samba3/pkg-plist
@@ -53,21 +53,22 @@ sbin/smbd
 sbin/swat
 %%PORTDOCS%%share/doc/samba/COPYING
 %%PORTDOCS%%share/doc/samba/Manifest
-%%PORTDOCS%%share/doc/samba/NT4-Locking.reg
-%%PORTDOCS%%share/doc/samba/NT4_PlainPassword.reg
 %%PORTDOCS%%share/doc/samba/README
 %%PORTDOCS%%share/doc/samba/README.FreeBSD
 %%PORTDOCS%%share/doc/samba/README.swat
 %%PORTDOCS%%share/doc/samba/Read-Manifest-Now
+%%PORTDOCS%%share/doc/samba/Registry/NT4-Locking.reg
+%%PORTDOCS%%share/doc/samba/Registry/NT4_PlainPassword.reg
+%%PORTDOCS%%share/doc/samba/Registry/Win2000_PlainPassword.reg
+%%PORTDOCS%%share/doc/samba/Registry/Win95_PlainPassword.reg
+%%PORTDOCS%%share/doc/samba/Registry/Win98_PlainPassword.reg
+%%PORTDOCS%%share/doc/samba/Registry/Win9X-CacheHandling.reg
+%%PORTDOCS%%share/doc/samba/Registry/WinME_PlainPassword.reg
+%%PORTDOCS%%share/doc/samba/Registry/WinXP_SignOrSeal.reg
+%%PORTDOCS%%share/doc/samba/Registry/WindowsTerminalServer.reg
 %%PORTDOCS%%share/doc/samba/Roadmap
 %%PORTDOCS%%share/doc/samba/THANKS
 %%PORTDOCS%%share/doc/samba/WHATSNEW.txt
-%%PORTDOCS%%share/doc/samba/Win2000_PlainPassword.reg
-%%PORTDOCS%%share/doc/samba/Win95_PlainPassword.reg
-%%PORTDOCS%%share/doc/samba/Win98_PlainPassword.reg
-%%PORTDOCS%%share/doc/samba/Win9X-CacheHandling.reg
-%%PORTDOCS%%share/doc/samba/WinME_PlainPassword.reg
-%%PORTDOCS%%share/doc/samba/WindowsTerminalServer.reg
 %%PORTDOCS%%share/doc/samba/announce
 %%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ-1.html
 %%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ-2.html
@@ -159,7 +160,7 @@ sbin/swat
 %%PORTDOCS%%share/doc/samba/textdocs/RoutedNetworks.txt
 %%PORTDOCS%%share/doc/samba/textdocs/SCO.txt
 %%PORTDOCS%%share/doc/samba/textdocs/SMBTAR.notes
-%%PORTDOCS%%share/doc/samba/textdocs/SSLeay.txt
+%%PORTDOCS%%share/doc/samba/textdocs/Samba-OpenSSL.txt
 %%PORTDOCS%%share/doc/samba/textdocs/Speed.txt
 %%PORTDOCS%%share/doc/samba/textdocs/Speed2.txt
 %%PORTDOCS%%share/doc/samba/textdocs/Tracing.txt
@@ -180,7 +181,6 @@ share/examples/samba/LDAP/import_smbpasswd.pl
 share/examples/samba/LDAP/ldapchpasswd
 share/examples/samba/LDAP/ldapsync.pl
 share/examples/samba/LDAP/samba.schema
-
 share/examples/samba/README
 share/examples/samba/VFS/.cvsignore
 share/examples/samba/VFS/Makefile
@@ -467,6 +467,7 @@ share/swat/using_samba/this_edition.html
 @dirrm share/examples/samba/VFS/block
 @dirrm share/examples/samba/VFS
 @dirrm share/examples/samba
+%%PORTDOCS%%@dirrm share/doc/samba/Registry
 %%PORTDOCS%%@dirrm share/doc/samba/textdocs
 %%PORTDOCS%%@dirrm share/doc/samba/htmldocs
 %%PORTDOCS%%@dirrm share/doc/samba/faq