Update to 2.2.5 pre 1

Pretty soon 2.2.5 will be released and 2_2 will go into maintenance mode

6 files changed, 7 insertions, 113 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 39178e3aca92..f8aca187fe40 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -6,15 +6,12 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	2.2.4
-PORTREVISION=   1
+PORTVERSION=	2.2.5.p1
 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 old
+MASTER_SITES=	ftp://ftp.samba.org/pub/samba/pre/ \
+		ftp://samba.anu.edu.au/pub/samba/pre/ \
+		ftp://de.samba.org/pub/mirror/samba/pre/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/pre/}
 
 MAINTAINER=	dwcjr@FreeBSD.org
 
@@ -152,7 +149,7 @@ PLIST_SUB=      AUDIT=${AUDIT} \
 .if defined(WITH_RECYCLE) || defined(WITH_AUDIT)
 post-build:
 	cd ${WRKDIR}/${DISTNAME}/examples/VFS; \
-		${GMAKE}
+		${RM} config.cache;./configure;${GMAKE}
 .endif
 
 post-install:
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 29042e1c9242..15aeaab292c2 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1 +1 @@
-MD5 (samba-2.2.4.tar.bz2) = 28b4b75bb34d7d021e0dc2546ec68c7a
+MD5 (samba-2.2.5pre1.tar.bz2) = 74a2e060c1a8c0fdd982d1653fdf6920
diff --git a/net/samba/files/patch-aa b/net/samba/files/patch-aa
index 4ebb6d292903..077f9c66a3ad 100644
--- a/net/samba/files/patch-aa
+++ b/net/samba/files/patch-aa
@@ -1,14 +1,5 @@
 --- source/Makefile.in.orig	Thu May  2 20:02:26 2002
 +++ source/Makefile.in	Fri May  3 10:04:22 2002
-@@ -51,7 +51,7 @@
- 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@
- 
 @@ -82,7 +82,7 @@
  PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DTDB_PASSWD_FILE=\"$(TDB_PASSWD_FILE)\"
  FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DLOGFILEBASE=\"$(LOGFILEBASE)\"
diff --git a/net/samba/files/patch-ba b/net/samba/files/patch-ba
index 35130d168337..2f7498be5179 100644
--- a/net/samba/files/patch-ba
+++ b/net/samba/files/patch-ba
@@ -1,39 +1,5 @@
 --- source/configure.in.orig	Thu May  2 20:02:46 2002
 +++ source/configure.in	Thu May  9 02:29:20 2002
-@@ -498,9 +498,23 @@
- ############################################
- # we need dlopen/dlclose/dlsym/dlerror for PAM, the password database plugins and the new VFS code
- AC_CHECK_FUNCS(dlopen)
-+case "$host_os" in
-+	*bsd*)
-+		AC_CHECK_LIB(c, dlopen, [LIBS="$LIBS -lc";
-+		AC_DEFINE(HAVE_DLOPEN)])
-+		;;
-+esac
- if test x"$ac_cv_func_dlopen" = x"no"; then
--	AC_CHECK_LIB(dl, dlopen, [LIBS="$LIBS -ldl";
--	AC_DEFINE(HAVE_DLOPEN)])
-+	case "$host_os" in
-+	 *bsd*)
-+		AC_CHECK_LIB(c, dlopen, [LIBS="$LIBS -lc";
-+		AC_DEFINE(HAVE_DLOPEN)])
-+		;;
-+	     *)
-+		AC_CHECK_LIB(dl, dlopen, [LIBS="$LIBS -ldl";
-+		AC_DEFINE(HAVE_DLOPEN)])
-+		;;
-+	esac
- fi
- # dlopen/dlclose/dlsym/dlerror will be checked again later and defines will be set then
- 
-@@ -870,6 +884,7 @@
- 		;;
- 		*bsd*)  BLDSHARED="true"
- 			LDSHFLAGS="-shared"
-+			DYNEXP="-Wl,--export-dynamic"
- 			SONAMEFLAG="-Wl,-soname,"
- 			PICFLAG="-fPIC"
- 			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
 @@ -1868,7 +1883,7 @@
    yes)
      AC_MSG_RESULT(yes)
@@ -43,12 +9,3 @@
      CFLAGS="$CFLAGS -I$withval/include"
      LDFLAGS="$LDFLAGS -L$withval/lib"
      ;;
-@@ -2042,7 +2057,7 @@
-   yes)
-     AC_MSG_RESULT(yes)
-     AC_DEFINE(WITH_LDAP_SAM)
--    LIBS="-lldap -llber -lresolv $LIBS"
-+    LIBS="-lldap -llber $LIBS"
-     with_smbpasswd_sam=no
-     ;;
-   *)
diff --git a/net/samba/files/patch-examples-VFS-Makefile b/net/samba/files/patch-examples-VFS-Makefile
deleted file mode 100644
index 9df50476160f..000000000000
--- a/net/samba/files/patch-examples-VFS-Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- examples/VFS/Makefile.orig	Tue May  7 11:17:58 2002
-+++ examples/VFS/Makefile	Tue May  7 11:19:31 2002
-@@ -10,9 +10,10 @@
- 
- SAMBA_SRC = ../../source
- SAMBA_INCL = ../../source/include
-+POPT_INCL = ../../source/popt
- UBIQX_SRC = ../../source/ubiqx
- SMBWR_SRC = ../../source/smbwrapper
--CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g
-+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I${POPT_INCL} -Wall -g
- VFS_OBJS = audit.so skel.so recycle.so
- 
- # Default target
diff --git a/net/samba/files/patch-examples-VFS-recycle.c b/net/samba/files/patch-examples-VFS-recycle.c
deleted file mode 100644
index 44a1a8a2a08a..000000000000
--- a/net/samba/files/patch-examples-VFS-recycle.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- examples/VFS/recycle.c.orig	Wed May  8 21:30:11 2002
-+++ examples/VFS/recycle.c	Thu May  9 02:19:32 2002
-@@ -238,15 +238,18 @@
- 		return default_vfs_ops.unlink(conn,fname);
- 	}
- 
--	base = strrchr(fname, '/') + 1;
--	if(base == (char*)1)
--		ext = strrchr(fname, '.');
--	else
--		ext = strrchr(base, '.');
--
-+	base = strrchr(fname, '/');
- 	pstrcpy(bin, recycle_bin);
- 	pstrcat(bin, "/");
--	pstrcat(bin, base);
-+
-+	if(base == NULL) {
-+		ext = strrchr(fname, '.');
-+		pstrcat(bin, fname);
-+	} else {
-+		ext = strrchr(base, '.');
-+		pstrcat(bin, base+1);
-+	}
-+	DEBUG(3, ("recycle bin: base %s, ext %s, fname %s, bin %s\n", base, ext, fname, bin));
- 
- 	if(strcmp(fname,bin) == 0) {
- 		DEBUG(3, ("recycle bin: file %s exists, purging...\n", fname));
-@@ -254,6 +257,8 @@
- 	}
- 
- 	len = strlen(bin);
-+	if ( ext != NULL)
-+		len = len - strlen(ext);
- 	addlen = sizeof(pstring)-len-1;
- 	while(recycle_file_exist(conn,bin)) {
- 		slprintf(bin+len, addlen, " (Copy #%d)", i++);