Update to 3.0 alpha 8

6 files changed, 61 insertions, 110 deletions

diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index bc28efbe1537..b163190a2efe 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTVERSION=	3.0a8
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.samba.org/pub/samba/%SUBDIR%/ \
 		ftp://samba.anu.edu.au/pub/samba/%SUBDIR%/ \
 		ftp://de.samba.org/pub/mirror/samba/%SUBDIR%/ \
 		ftp://se.samba.org/pub/samba/%SUBDIR%/ \
 		ftp://ftp.sunet.se/pub/unix/utilities/samba/%SUBDIR%/
-MASTER_SITE_SUBDIR=	. old-versions alpha old
-DISTNAME=	samba-${PORTVERSION}
+MASTER_SITE_SUBDIR=	alpha old
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/a/-alpha/}
 
 MAINTAINER=	dwcjr@FreeBSD.org
 
@@ -23,11 +22,6 @@ MAINTAINER=	dwcjr@FreeBSD.org
 LIB_DEPENDS=	cups.2:${PORTSDIR}/print/cups
 .endif
 
-.if defined(WITH_RECYCLE)
-PATCH_SITES+=	http://www.amherst.edu/~bbstone/recycle_bin/2.2.2/
-PATCHFILES+=	proto.h.patch loadparm.c.patch reply.c.patch
-.endif
-
 # directories
 VARDIR=		/var
 SAMBA_SPOOL=	${VARDIR}/spool/samba
diff --git a/net/samba3/distinfo b/net/samba3/distinfo
index 5ab753cd0457..5e5088275918 100644
--- a/net/samba3/distinfo
+++ b/net/samba3/distinfo
@@ -1,4 +1 @@
-MD5 (samba-2.2.2.tar.gz) = d0aba688a1b6189f09f3ba0b44b1da8e
-MD5 (proto.h.patch) = b8b577540c1de5202e70584a402c2d74
-MD5 (loadparm.c.patch) = df642726476af756df8a2e6c0537eb0d
-MD5 (reply.c.patch) = b75a5312ad6c01c501d6e887c3a65357
+MD5 (samba-3.0-alpha8.tar.gz) = e35bc17ed91e86cbe7b0cbdcb3892d56
diff --git a/net/samba3/files/patch-aa b/net/samba3/files/patch-aa
index b0024a08bcfa..f39f5615be26 100644
--- a/net/samba3/files/patch-aa
+++ b/net/samba3/files/patch-aa
@@ -1,35 +1,48 @@
---- Makefile.in.orig	Sat Oct 13 22:09:06 2001
-+++ Makefile.in	Tue Oct 16 17:15:15 2001
-@@ -46,11 +46,11 @@
+--- Makefile.in.orig	Thu Dec 13 21:38:49 2001
++++ Makefile.in	Sun Dec 16 13:09:45 2001
+@@ -50,7 +50,7 @@
  # 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))
--LOGFILEBASE = @logfilebase@
+-LOGFILEBASE = $(VARDIR)
 +LOGFILEBASE = $(VARDIR)/log
- CONFIGFILE = $(CONFIGDIR)/smb.conf
- LMHOSTSFILE = $(CONFIGDIR)/lmhosts
- DRIVERFILE = $(CONFIGDIR)/printers.def
--PASSWD_PROGRAM = /bin/passwd
-+PASSWD_PROGRAM = /usr/bin/passwd
- # This is where smbpasswd et al go
- PRIVATEDIR = @privatedir@
- 
-@@ -63,6 +63,9 @@
+ CONFIGFILE = $(LIBDIR)/smb.conf
+ LMHOSTSFILE = $(LIBDIR)/lmhosts
+ DRIVERFILE = $(LIBDIR)/printers.def
+@@ -66,6 +66,9 @@
  # the directory where lock files go
  LOCKDIR = @lockdir@
  
 +# the directory where pid files go
 +PIDFILEDIR = $(VARDIR)/run
 +
- # libsmbclient support here
- BLDSHARED = @BLDSHARED@
- LIBSMBCLIENT_MAJOR=0
+ # man pages language(s)
+ man_langs = "@manlangs@"
+ 
 @@ -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)\"
- FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"  
--FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
-+FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
- FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" 
- FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H
- FLAGS  = $(ISA) $(FLAGS5) $(PASSWD_FLAGS)
+ FLAGS32  = $(ISA32) $(FLAGS5)
+ 
+ PASSWD_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DPRIVATE_DIR=\"$(PRIVATE_DIR)\"
+-PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\"  -DSBINDIR=\"$(SBINDIR)\"
++PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\"  -DSBINDIR=\"$(SBINDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\"
+ PATH_FLAGS2 = $(PATH_FLAGS1) -DBINDIR=\"$(BINDIR)\" -DDRIVERFILE=\"$(DRIVERFILE)\" 
+ PATH_FLAGS3 = $(PATH_FLAGS2) -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" 
+ PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\"  -DLOCKDIR=\"$(LOCKDIR)\"
+@@ -503,7 +506,7 @@
+ 	@if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
+ 	 dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
+ 	@echo Compiling $*.c
+-	@$(CC) -I. -I$(srcdir) $(FLAGS) -c $< \
++	@$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) -c $< \
+ 	  -o $@ 
+ @BROKEN_CC@	-mv `echo $@ | sed 's%^.*/%%g'` $@
+ 
+@@ -529,7 +532,7 @@
+ 	@if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
+ 	  dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
+ 	@echo Compiling $*.c with @PICFLAG@
+-	@$(CC) -I. -I$(srcdir) $(FLAGS) @PICFLAG@ -c $< -o $*.@PICSUFFIX@
++	@$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PICFLAG@ -c $< -o $*.@PICSUFFIX@
+ @BROKEN_CC@	-mv `echo $@ | sed -e 's%^.*/%%g' -e 's%\.po$$%.o%'` $@
+ @POBAD_CC@	@mv $*.po.o $@
+ 
diff --git a/net/samba3/files/patch-ab b/net/samba3/files/patch-ab
index b1383c6ae2e3..364cdc5564e0 100644
--- a/net/samba3/files/patch-ab
+++ b/net/samba3/files/patch-ab
@@ -1,6 +1,6 @@
---- 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 @@
+--- param/loadparm.c.orig	Thu Dec 13 21:38:57 2001
++++ param/loadparm.c	Sun Dec 16 01:11:34 2001
+@@ -97,6 +97,7 @@
  	char *szDeletePrinterCommand;
  	char *szOs2DriverMap;
  	char *szLockDir;
@@ -8,8 +8,8 @@
  	char *szRootdir;
  	char *szDefaultService;
  	char *szDfree;
-@@ -986,6 +987,8 @@
- 	{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_DOS_STRING},
+@@ -975,6 +976,8 @@
+ 	{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, 0},
  	{"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},
@@ -17,15 +17,15 @@
  #ifdef WITH_UTMP
  	{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
  	{"wtmp directory", P_STRING, P_GLOBAL, &Globals.szWtmpDir, NULL, NULL, 0},
-@@ -1220,6 +1223,7 @@
- 	string_set(&Globals.szPasswdProgram, PASSWD_PROGRAM);
+@@ -1208,6 +1211,7 @@
+ 	string_set(&Globals.szPasswdProgram, "");
  	string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
- 	string_set(&Globals.szLockDir, LOCKDIR);
+ 	string_set(&Globals.szLockDir, dyn_LOCKDIR);
 +	string_set(&Globals.szPidDir, PIDFILEDIR);
- #ifdef WITH_UTMP
- 	string_set(&Globals.szUtmpDir, "");
- 	string_set(&Globals.szWtmpDir, "");
-@@ -1469,6 +1473,7 @@
+ 	string_set(&Globals.szSocketAddress, "0.0.0.0");
+ 	pstrcpy(s, "Samba ");
+ 	pstrcat(s, VERSION);
+@@ -1457,6 +1461,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)
diff --git a/net/samba3/files/patch-ba b/net/samba3/files/patch-ba
index b6f5a757140d..1052708954bf 100644
--- a/net/samba3/files/patch-ba
+++ b/net/samba3/files/patch-ba
@@ -1,54 +1,11 @@
---- 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)
+--- configure.orig	Sun Dec 16 01:41:44 2001
++++ configure	Sun Dec 16 01:41:54 2001
+@@ -16688,7 +16688,7 @@
  
--############################################
--# for cups support we need libcups, and a handful of header files
--
--AC_CHECK_LIB(cups,httpConnect)
--
--# 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
- 
- ############################################
- # 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"
-     ;;
-@@ -1961,6 +1946,20 @@
-     ;;
-   esac ],
-   AC_MSG_RESULT(no)
-+)
-+
-+#################################################
-+# check for CUPS printing support
-+AC_MSG_CHECKING(whether to use CUPS printing)
-+AC_ARG_WITH(cups,
-+[  --with-cups=base-dir		Include CUPS printing support
-+   --without-cups		Don't include CUPS printing support (default)],
-+[  AC_MSG_RESULT(yes)
-+   LIBS="$LIBS -lcups"
-+   CFLAGS="$CFLAGS -I$withval/include"
-+   LDFLAGS="$LDFLAGS -L$withval/lib"
-+   AC_CHECK_LIB(cups,httpConnect)],
-+ AC_MSG_RESULT(no)
- )
+     fi
  
+-    LIBS="-lssl -lcrypto $LIBS"
++    LIBS="-lssl -lk5crypto $LIBS"
  
+ #    if test ! -d ${withval}; then
+ #      echo "configure: error: called with --with-ssl, but ssl base directory ${withval} does not exist or is not a directory. Aborting config" 1>&2
diff --git a/net/samba3/files/patch-bb b/net/samba3/files/patch-bb
deleted file mode 100644
index 5b14f2131b03..000000000000
--- a/net/samba3/files/patch-bb
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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);
- BOOL lp_utmp(void);