Bump samba34 port to the 3.4.8 version.
Major enhancements in Samba 3.4.8 include: o Fix Winbind reconnection to it's own domain (bug #7295). o Fix an uninitialized variable read in smbd (bug #7254). o Fix smbd crash with CUPS printers and no [printers] share defined (bug #7297). o Fix NULL pointer dereference in smbd (bug #7229).
This commit is contained in:
Timur I. Bakeyev
parent
4327ccf070
commit
7d4e37eacd
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=256431
5 changed files with 965 additions and 352 deletions
|
|
@ -6,8 +6,8 @@
|
|||
#
|
||||
|
||||
PORTNAME= samba34
|
||||
PORTVERSION= 3.4.5
|
||||
PORTREVISION?= 1
|
||||
PORTVERSION= 3.4.8
|
||||
PORTREVISION?= 0
|
||||
CATEGORIES?= net
|
||||
MASTER_SITES= ${MASTER_SITE_SAMBA}
|
||||
MASTER_SITE_SUBDIR= . old-versions rc pre
|
||||
|
|
@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME:S|34$||}-${PORTVERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|al
|
|||
MAINTAINER?= timur@FreeBSD.org
|
||||
COMMENT?= A free SMB and CIFS client and server for UNIX
|
||||
|
||||
CONFLICTS?= ja-samba-[23].* samba-[23].* sharity-light-1.* tdb-1.*
|
||||
CONFLICTS?= ja-samba-[235].* samba-[235].* sharity-light-1.* tdb-1.*
|
||||
# Additional patches from Sernet.de
|
||||
PATCH_STRIP= -p1
|
||||
EXTRA_PATCHES= ${PATCHDIR}/sernet.patch
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
MD5 (samba-3.4.5.tar.gz) = 8e8a484782f2b7716b6c6bd9a7d2bf71
|
||||
SHA256 (samba-3.4.5.tar.gz) = 7e4ead58a7c1c0dd1811d6f1df22c6ecf7a1dabf0e46ea7f20a6da9cd457d1ca
|
||||
SIZE (samba-3.4.5.tar.gz) = 35377777
|
||||
MD5 (samba-3.4.8.tar.gz) = fe1f6c77be289fd65e19419c1bcaa42c
|
||||
SHA256 (samba-3.4.8.tar.gz) = 5237bc7a32e0eafd70b78c9cd6735e46dbad0c6f9794f50476b50dd1b43752d6
|
||||
SIZE (samba-3.4.8.tar.gz) = 34851288
|
||||
|
|
|
|||
|
|
@ -1,14 +1,28 @@
|
|||
--- ./source3/Makefile.in.orig 2010-01-18 12:38:09.000000000 +0100
|
||||
+++ ./source3/Makefile.in 2010-01-22 02:42:51.000000000 +0100
|
||||
@@ -851,6 +851,7 @@
|
||||
PAM_WINBIND_OBJ = ../nsswitch/pam_winbind.o localedir.o $(WBCOMMON_OBJ) \
|
||||
--- ./source3/Makefile.in.orig 2010-05-10 14:58:53.000000000 +0200
|
||||
+++ ./source3/Makefile.in 2010-06-10 17:59:21.000000000 +0200
|
||||
@@ -132,7 +132,7 @@
|
||||
# These can be overridden by command line switches (see smbd(8))
|
||||
# or in smb.conf (see smb.conf(5))
|
||||
LOGFILEBASE = @logfilebase@
|
||||
-CONFIGFILE = $(CONFIGDIR)/smb.conf
|
||||
+CONFIGFILE = $(CONFIGDIR)/%%SAMBA_CONFIG%%
|
||||
LMHOSTSFILE = $(CONFIGDIR)/lmhosts
|
||||
NCALRPCDIR = @ncalrpcdir@
|
||||
|
||||
@@ -848,9 +848,11 @@
|
||||
$(LIBADS_OBJ) $(POPT_LIB_OBJ) \
|
||||
$(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(LDB_OBJ)
|
||||
|
||||
-PAM_WINBIND_OBJ = ../nsswitch/pam_winbind.o localedir.o $(WBCOMMON_OBJ) \
|
||||
+PAM_WINBIND_OBJ = ../nsswitch/pam_winbind.o localedir.o \
|
||||
+ @LIBTALLOC_STATIC@ @LIBWBCLIENT_STATIC@ \
|
||||
$(LIBREPLACE_OBJ) @BUILD_INIPARSER@
|
||||
|
||||
+
|
||||
LIBSMBCLIENT_OBJ0 = \
|
||||
libsmb/libsmb_cache.o \
|
||||
libsmb/libsmb_compat.o \
|
||||
@@ -1028,7 +1029,7 @@
|
||||
@@ -1028,7 +1030,7 @@
|
||||
$(LIBSAMBA_OBJ) \
|
||||
$(POPT_LIB_OBJ)
|
||||
|
||||
|
|
@ -17,7 +31,20 @@
|
|||
$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBSAMBA_OBJ)
|
||||
|
||||
REPLACETORT_OBJ = @libreplacedir@/test/testsuite.o \
|
||||
@@ -1281,6 +1282,7 @@
|
||||
@@ -1044,9 +1046,9 @@
|
||||
$(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \
|
||||
$(LIBNDR_GEN_OBJ0)
|
||||
|
||||
-WINBIND_WINS_NSS_OBJ = ../nsswitch/wins.o $(PARAM_OBJ) \
|
||||
- $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ) \
|
||||
- $(LIBNDR_GEN_OBJ0) $(LDB_OBJ)
|
||||
+WINBIND_WINS_NSS_OBJ = ../nsswitch/wins.o @WINBIND_WINS_NSS_EXTRA_OBJS@ \
|
||||
+ $(PARAM_OBJ) $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) \
|
||||
+ $(KRBCLIENT_OBJ) $(LIBNDR_GEN_OBJ0) $(LDB_OBJ)
|
||||
|
||||
PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
|
||||
pam_smbpass/pam_smb_acct.o pam_smbpass/support.o
|
||||
@@ -1281,6 +1283,7 @@
|
||||
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .c .o .lo
|
||||
|
|
@ -25,17 +52,47 @@
|
|||
|
||||
.PHONY: showflags SHOWFLAGS
|
||||
|
||||
@@ -1342,6 +1344,9 @@
|
||||
@@ -1342,6 +1345,12 @@
|
||||
$(COMPILE_CC) >/dev/null 2>&1
|
||||
@BROKEN_CC@ -mv `echo $@ | sed 's%^.*/%%g'` $@
|
||||
|
||||
+.h.h.gch:
|
||||
+ @echo Compiling $*.h
|
||||
+
|
||||
+.h.h.gch:
|
||||
+ @echo Compiling $*.h
|
||||
+
|
||||
PRECOMPILED_HEADER = $(builddir)/include/includes.h.gch
|
||||
|
||||
# this adds support for precompiled headers. To use it, install a snapshot
|
||||
@@ -2705,7 +2710,8 @@
|
||||
@@ -2388,14 +2397,15 @@
|
||||
$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
|
||||
$(ZLIB_LIBS) @SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
|
||||
|
||||
-bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) @LIBWBCLIENT_TARGET@
|
||||
+bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) @LIBTALLOC_TARGET@ @LIBWBCLIENT_TARGET@
|
||||
@echo "Linking $@"
|
||||
- @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT_LIBS) $(KRB5LIBS) \
|
||||
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) $(KRB5LIBS) \
|
||||
@SONAMEFLAG@`basename $@`
|
||||
|
||||
bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) @LIBTALLOC_TARGET@ @LIBWBCLIENT_TARGET@
|
||||
@echo "Linking shared library $@"
|
||||
@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) -lpam @INIPARSERLIBS@ \
|
||||
+ $(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \
|
||||
$(PAM_WINBIND_EXTRA_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) @SONAMEFLAG@`basename $@`
|
||||
|
||||
bin/builtin.@SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_BUILTIN_OBJ)
|
||||
@@ -2571,7 +2581,7 @@
|
||||
|
||||
bin/zfsacl.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_ZFSACL_OBJ)
|
||||
@echo "Building plugin $@"
|
||||
- @$(SHLD_MODULE) $(VFS_ZFSACL_OBJ)
|
||||
+ @$(SHLD_MODULE) $(VFS_ZFSACL_OBJ) $(ACL_LIBS)
|
||||
|
||||
bin/irixacl.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_IRIXACL_OBJ)
|
||||
@echo "Building plugin $@"
|
||||
@@ -2705,7 +2715,8 @@
|
||||
@echo "Linking shared library $@"
|
||||
@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) \
|
||||
$(LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
|
||||
|
|
@ -45,7 +102,7 @@
|
|||
|
||||
bin/tdbbackup@EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
|
||||
@echo Linking $@
|
||||
@@ -3028,7 +3034,7 @@
|
||||
@@ -3028,7 +3039,7 @@
|
||||
@$(LIB_PATH_VAR)=./bin && \
|
||||
export $(LIB_PATH_VAR) && \
|
||||
for module in $(PAM_MODULES); do \
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- ./source3/configure.in.orig 2010-01-18 11:38:09.000000000 +0000
|
||||
+++ ./source3/configure.in 2010-02-06 12:37:49.000000000 +0000
|
||||
--- ./source3/configure.in.orig 2010-05-10 14:58:53.000000000 +0200
|
||||
+++ ./source3/configure.in 2010-06-10 17:50:46.000000000 +0200
|
||||
@@ -210,16 +210,6 @@
|
||||
fi
|
||||
fi
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
PRINT_LIBS=$ac_save_PRINT_LIBS
|
||||
fi
|
||||
|
||||
@@ -1747,9 +1737,6 @@
|
||||
@@ -1749,9 +1739,6 @@
|
||||
AC_MSG_CHECKING([PICFLAG])
|
||||
AC_MSG_RESULT([$PICFLAG])
|
||||
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
AC_CACHE_CHECK([whether building shared libraries actually works],
|
||||
[ac_cv_shlib_works],[
|
||||
# try building a trivial shared library
|
||||
@@ -3959,10 +3946,10 @@
|
||||
@@ -3961,10 +3948,10 @@
|
||||
|
||||
################################################################
|
||||
# first test for Active Directory support being enabled
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
##################################################################
|
||||
# then test for uuid.h (necessary to generate unique DNS keynames
|
||||
# (uuid.h is required for this test)
|
||||
@@ -4179,15 +4166,51 @@
|
||||
@@ -4181,15 +4168,51 @@
|
||||
x"$ac_cv_header_pam_pam_modules_h" = x"no" ; then
|
||||
if test x"${try_pam}" = x"yes";then
|
||||
AC_MSG_ERROR([--with-pam=yes but pam_modules.h not found])
|
||||
|
|
@ -123,7 +123,7 @@
|
|||
|
||||
if test x"$create_pam_modules" = x"yes"; then
|
||||
AC_DEFINE(WITH_PAM_MODULES,1,[Whether to include PAM MODULES support])
|
||||
@@ -4197,7 +4220,7 @@
|
||||
@@ -4199,7 +4222,7 @@
|
||||
AC_CHECK_HEADERS(pam/pam_ext.h pam/_pam_macros.h)
|
||||
AC_CHECK_FUNC_EXT(pam_vsyslog,$PAM_LIBS)
|
||||
else
|
||||
|
|
@ -132,15 +132,25 @@
|
|||
fi
|
||||
fi
|
||||
AC_MSG_CHECKING(whether to use PAM support)
|
||||
@@ -5794,6 +5817,7 @@
|
||||
@@ -5254,7 +5277,8 @@
|
||||
esac
|
||||
fi # with_acl_support
|
||||
|
||||
-
|
||||
+# check for NFSv4 acl
|
||||
+AC_CHECK_LIB(sunacl, acl, [ACL_LIBS="$ACL_LIBS -lsunacl"])
|
||||
|
||||
#################################################
|
||||
# check for AIO support
|
||||
@@ -5796,6 +5820,7 @@
|
||||
NSSSONAMEVERSIONSUFFIX=".1"
|
||||
WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_freebsd.o \
|
||||
../nsswitch/winbind_nss_linux.o"
|
||||
+ WINBIND_WINS_NSS_EXTRA_OBJS="nsswitch/wins_freebsd.o"
|
||||
+ WINBIND_WINS_NSS_EXTRA_OBJS="../nsswitch/wins_freebsd.o"
|
||||
WINBIND_NSS="../nsswitch/nss_winbind.$SHLIBEXT"
|
||||
WINBIND_WINS_NSS="../nsswitch/nss_wins.$SHLIBEXT"
|
||||
;;
|
||||
@@ -5886,17 +5910,10 @@
|
||||
@@ -5888,17 +5913,10 @@
|
||||
AC_DEFINE(WITH_WINBIND,1,[Whether to link to wbclient])
|
||||
EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
|
||||
else
|
||||
|
|
@ -158,7 +168,7 @@
|
|||
## Only worry about libwbclient if we have shared
|
||||
# library support
|
||||
LIBWBCLIENT_SHARED=$LIBWBCLIENT_SHARED_TARGET
|
||||
@@ -5918,26 +5935,34 @@
|
||||
@@ -5920,26 +5938,34 @@
|
||||
|
||||
EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
|
||||
EXTRA_SBIN_PROGS="$EXTRA_SBIN_PROGS bin/winbindd\$(EXEEXT)"
|
||||
|
|
@ -197,7 +207,7 @@
|
|||
|
||||
AC_SUBST(WINBIND_KRB5_LOCATOR)
|
||||
|
||||
@@ -6129,13 +6154,21 @@
|
||||
@@ -6131,13 +6157,21 @@
|
||||
# Start
|
||||
AC_CHECK_FUNC(getmntent)
|
||||
|
||||
|
|
@ -220,10 +230,20 @@
|
|||
int main(void)
|
||||
{
|
||||
struct statfs fsd;
|
||||
@@ -6447,6 +6480,16 @@
|
||||
@@ -6449,6 +6483,26 @@
|
||||
CFLAGS="-I../lib/zlib $CFLAGS"
|
||||
])
|
||||
|
||||
+AC_ARG_ENABLE(dmalloc, [AS_HELP_STRING([--enable-dmalloc], [Enable heap debugging [default=no]])])
|
||||
+
|
||||
+if test "x$enable_dmalloc" = xyes
|
||||
+then
|
||||
+ AC_DEFINE(ENABLE_DMALLOC, 1, [Define to turn on dmalloc debugging])
|
||||
+ AC_DEFINE(DMALLOC_FUNC_CHECK, 1,
|
||||
+ [Define to check invariants around some common functions])
|
||||
+ LIBS="$LIBS -ldmalloc"
|
||||
+fi
|
||||
+
|
||||
+AC_ARG_ENABLE(dmalloc, [AS_HELP_STRING([--enable-dmalloc], [Enable heap debugging [default=no]])])
|
||||
+
|
||||
+if test "x$enable_dmalloc" = xyes
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue