Attachment #126686 for bug #170446

View | Details | Raw Unified | Return to bug 170446
Collapse All | Expand All

Lines 6-12 Link Here

(-)samba36/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= ${SAMBA_BASENAME}36	8	PORTNAME= ${SAMBA_BASENAME}36
9	PORTVERSION= 3.6.5	9	PORTVERSION= 3.6.7
10	PORTREVISION?= 0	10	PORTREVISION?= 0
11	CATEGORIES?= net	11	CATEGORIES?= net
12	MASTER_SITES= ${MASTER_SITE_SAMBA}	12	MASTER_SITES= ${MASTER_SITE_SAMBA}

Lines 1-2 Link Here

(-)samba36/distinfo (-2 / +2 lines)
1	SHA256 (samba-3.6.5.tar.gz) = 8af65ff3b8c1155e7897c89a895e3155534ec3c5b97877ee2f05fc9d8bab80c4	1	SHA256 (samba-3.6.7.tar.gz) = b858a0f011ba7fe554881b9c7e6cb1c9cb7face22ed86860f560fcaecc4ed4ca
2	SIZE (samba-3.6.5.tar.gz) = 29009444	2	SIZE (samba-3.6.7.tar.gz) = 34067900




 LMHOSTSFILE = $(CONFIGDIR)/lmhosts
 NCALRPCDIR = @ncalrpcdir@
 
@@ -1303,8 +1303,8 @@
                  $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \
 		 $(LIBNDR_GEN_OBJ0)
 

 
 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 ../lib/util/asn1.o
@@ -1621,6 +1621,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .o .lo

 
 .PHONY: showflags SHOWFLAGS
 
@@ -1682,6 +1683,9 @@
 		$(COMPILE_CC) >/dev/null 2>&1
 @BROKEN_CC@	-mv `echo $@ | sed 's%^.*/%%g'` $@
 

 PRECOMPILED_HEADER = $(builddir)/include/includes.h.gch
 
 # this adds support for precompiled headers. To use it, install a snapshot
@@ -2763,14 +2767,15 @@
 		$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS) \
 		@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
 

 	@echo "Linking $@"
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT_LIBS) $(KRB5LIBS) \
+	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) $(KRB5LIBS) \
 		$(LIBREPLACE_LIBS) @SONAMEFLAG@`basename $@`
 
 bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) $(LIBTALLOC) $(LIBWBCLIENT)
 	@echo "Linking shared library $@"

 		$(LIBREPLACE_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) @SONAMEFLAG@`basename $@`
 
 ##########
@@ -3122,7 +3127,8 @@
 	@echo "Linking shared library $@"
 	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) $(LIBCLI_LDAP_NDR_OBJ) -lpam $(DYNEXP) \
 		$(LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \




--- ./source3/configure.in.orig	2011-08-09 13:17:47.000000000 +0200
+++ ./source3/configure.in	2011-10-13 23:29:28.000000000 +0200
@@ -756,9 +756,9 @@
 if test x"$ac_cv_header_md5_h" = x"yes"; then
 	AC_DEFINE(HAVE_MD5_H, 1,
 		[Whether md5.h is available.])
-	AC_CHECK_LIB(md5, MD5Update,
+	AC_CHECK_LIB(md, MD5Update,
 	    [
-		LIBS="${LIBS} -lmd5"
+		LIBS="${LIBS} -lmd"
 		CRYPTO_MD5_OBJ=
 		AC_DEFINE(HAVE_LIBMD5, 1,
 		    [Whether libmd5 conformant to rfc1321 is available.])],
@@ -852,9 +852,13 @@
 	AC_PATH_PROG(CUPS_CONFIG, cups-config)
 
         if test "x$CUPS_CONFIG" != x; then

 		AC_CHECK_HEADERS(cups/cups.h cups/language.h)
 
 		if test x"$ac_cv_header_cups_cups_h" = xyes -a \
@@ -863,7 +867,7 @@
 			# underlinked. With cups-config --libs we pull in unwanted and unneeded
 			# dendencies including thread libraries - use cups-config only if really
 			# required. 

 				[PRINT_LIBS="$ac_save_PRINT_LIBS -lcups"],
 				[AC_MSG_WARN([your cups library doesn't link with -lcups alone, it might be underlinked.]) ;
 				 PRINT_LIBS="$ac_save_PRINT_LIBS `$CUPS_CONFIG --libs`"])
@@ -873,10 +877,10 @@
 			AC_CHECK_LIB_EXT(cups, PRINT_LIBS, httpConnectEncrypt)
 		else
 			AC_MSG_WARN([cups-config around but cups-devel not installed])

 
 	elif test x"$enable_cups" = x"yes"; then
 		AC_MSG_ERROR(Cups support required but cups-config not located.  Make sure cups-devel related files are installed.)
@@ -1964,9 +1968,6 @@
 AC_MSG_CHECKING([PICFLAG])
 AC_MSG_RESULT([$PICFLAG])
 

 AC_CACHE_CHECK([whether building shared libraries actually works],
                [ac_cv_shlib_works],[
    # try building a trivial shared library
@@ -4624,15 +4625,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])

 
 		if test x"$create_pam_modules" = x"yes"; then
 			AC_DEFINE(WITH_PAM_MODULES,1,[Whether to include PAM MODULES support])
@@ -4642,7 +4679,7 @@
 			AC_CHECK_HEADERS(pam/pam_ext.h pam/_pam_macros.h)
 			AC_CHECK_FUNC_EXT(pam_vsyslog,$PAM_LIBS)
 		else

 		fi
 	fi
 	AC_MSG_CHECKING(whether to use PAM support)
@@ -5844,9 +5881,17 @@
 [AC_MSG_RESULT(no)])
 
 			AC_MSG_CHECKING(for aio_suspend)

 [AC_MSG_RESULT(no)])
 		fi
 
@@ -6299,12 +6344,13 @@
 		NSSSONAMEVERSIONSUFFIX=".2"
 		WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_linux.o"
 		;;

 		WINBIND_NSS="../nsswitch/nss_winbind.$SHLIBEXT"
 		WINBIND_WINS_NSS="../nsswitch/nss_wins.$SHLIBEXT"
 		;;
@@ -6451,10 +6497,14 @@
         AC_MSG_RESULT(no$winbind_no_reason)
 fi
 

 AC_SUBST(NSSSONAMEVERSIONSUFFIX)
 
 AC_SUBST(WINBIND_KRB5_LOCATOR)
@@ -6773,13 +6823,21 @@
 # Start
 AC_CHECK_FUNC(getmntent)
 

 		int main(void)
 		{
 			struct statfs fsd;
@@ -7079,6 +7137,16 @@
 	LIBS="$LIBS -ldmalloc"
 fi
 




--- ./source3/lib/fault.c.orig	2010-04-01 15:26:22.000000000 +0200
+++ ./source3/lib/fault.c	2010-04-23 01:08:35.000000000 +0200
@@ -26,6 +26,10 @@
 #endif
 
 

 #ifdef HAVE_SYS_PRCTL_H
 #include <sys/prctl.h>
 #endif
@@ -144,52 +148,93 @@
  * before dump_core() calls abort.
  */
 #if (defined(FREEBSD) && defined(HAVE_SYSCTLBYNAME))

 }
 #endif
 
@@ -248,8 +293,7 @@
 {
 #if (defined(FREEBSD) && defined(HAVE_SYSCTLBYNAME))
 	char *tmp_corepath = NULL;
-	tmp_corepath = get_freebsd_corepath();
-

 	/* If this has been set correctly, we're done. */
 	if (tmp_corepath) {
 		return tmp_corepath;
@@ -327,7 +371,7 @@
 	SAFE_FREE(logbase);
 }
 

Lines 1-6 Link Here

(-)samba36/files/patch-source3__lib__system.c (-1 / +1 lines)
1	--- ./source3/lib/system.c.orig 2011-08-09 13:17:47.000000000 +0200	1	--- ./source3/lib/system.c.orig 2011-08-09 13:17:47.000000000 +0200
2	+++ ./source3/lib/system.c 2011-10-13 23:38:02.000000000 +0200	2	+++ ./source3/lib/system.c 2011-10-13 23:38:02.000000000 +0200
3	@@ -2584,14 +2584,14 @@	3	@@ -2586,14 +2586,14 @@
4	}	4	}
5		5
6	/*******************************************************************	6	/*******************************************************************

Lines 1-6 Link Here

(-)samba36/files/patch-source3__m4__aclocal.m4 (-2 / +2 lines)
1	--- ./source3/m4/aclocal.m4.orig 2011-08-09 13:17:47.000000000 +0200	1	--- ./source3/m4/aclocal.m4.orig 2011-08-09 13:17:47.000000000 +0200
2	+++ ./source3/m4/aclocal.m4 2011-10-05 22:59:19.000000000 +0200	2	+++ ./source3/m4/aclocal.m4 2011-10-05 22:59:19.000000000 +0200
3	@@ -379,11 +379,15 @@	3	@@ -385,11 +385,15 @@
4	ac_new_flags=""	4	ac_new_flags=""
5	for i in [$]$1; do	5	for i in [$]$1; do
6	case [$]i in	6	case [$]i in
Lines 18-24 Link Here
18	])	18	])
19		19
20	dnl Removes '-L/usr/lib[/]', '-Wl,-rpath,/usr/lib[/]'	20	dnl Removes '-L/usr/lib[/]', '-Wl,-rpath,/usr/lib[/]'
21	@@ -431,104 +435,81 @@	21	@@ -437,104 +441,81 @@
22	dnl those with the standalone portable libiconv installed).	22	dnl those with the standalone portable libiconv installed).
23	AC_MSG_CHECKING(for iconv in $1)	23	AC_MSG_CHECKING(for iconv in $1)
24	jm_cv_func_iconv="no"	24	jm_cv_func_iconv="no"

Lines 1-6 Link Here

(-)samba36/files/patch-source3__smbd__quotas.c (-2 / +2 lines)
1	--- ./source3/smbd/quotas.c.orig 2010-04-01 15:26:22.000000000 +0200	1	--- ./source3/smbd/quotas.c.orig 2010-04-01 15:26:22.000000000 +0200
2	+++ ./source3/smbd/quotas.c 2010-04-23 01:08:35.000000000 +0200	2	+++ ./source3/smbd/quotas.c 2010-04-23 01:08:35.000000000 +0200
3	@@ -1035,6 +1035,7 @@	3	@@ -1235,6 +1235,7 @@
4	if (!cutstr)	4	if (!cutstr)
5	return False;	5	return False;
6		6
Lines 8-14 Link Here
8	memset(cutstr, '\0', len+1);	8	memset(cutstr, '\0', len+1);
9	host = strncat(cutstr,mnttype, sizeof(char) * len );	9	host = strncat(cutstr,mnttype, sizeof(char) * len );
10	DEBUG(5,("nfs_quotas: looking for mount on \"%s\"\n", cutstr));	10	DEBUG(5,("nfs_quotas: looking for mount on \"%s\"\n", cutstr));
11	@@ -1043,7 +1044,7 @@	11	@@ -1243,7 +1244,7 @@
12	args.gqa_pathp = testpath+1;	12	args.gqa_pathp = testpath+1;
13	args.gqa_uid = uid;	13	args.gqa_uid = uid;
14		14




    Copyright (C) James Peach				2006
    
    This program is free software; you can redistribute it and/or modify
@@ -49,9 +50,42 @@
 	}
 	return result;
 }

+{
+	struct statfs statfs_buf;
+	int result;
+
-#if defined(DARWINOS)
+	result = statfs(path, &statfs_buf);
+	if(result != 0) {
+		return result;

+		statbuf->FsCapabilities |= FILE_VOLUME_QUOTAS;
+	if(statfs_buf.f_flags & MNT_RDONLY)
+		statbuf->FsCapabilities |= FILE_READ_ONLY_VOLUME;
 
-#if defined(DARWINOS)
+	return 0;
+}
+

 
 #include <sys/attr.h>
 
@@ -137,6 +171,8 @@
 {
 #if defined(LINUX) && defined(HAVE_FSID_INT)
 	return linux_statvfs(path, statbuf);

Lines 1-6 Link Here

(-)samba36/files/patch-source3__utils__net_time.c (-1 / +1 lines)
1	--- ./source3/utils/net_time.c.orig 2010-04-01 15:26:22.000000000 +0200	1	--- ./source3/utils/net_time.c.orig 2010-04-01 15:26:22.000000000 +0200
2	+++ ./source3/utils/net_time.c 2010-04-23 01:08:35.000000000 +0200	2	+++ ./source3/utils/net_time.c 2010-04-23 01:08:35.000000000 +0200
3	@@ -85,10 +85,15 @@	3	@@ -87,10 +87,15 @@
4	if (!tm) {	4	if (!tm) {
5	return "unknown";	5	return "unknown";
6	}	6	}

Lines 16-22 Link Here

(-)samba36/files/sernet.patch (-1 / +1 lines)
16	index 0ce495e..0511a28 100644	16	index 0ce495e..0511a28 100644
17	--- a/lib/util/util_net.c	17	--- a/lib/util/util_net.c
18	+++ b/lib/util/util_net.c	18	+++ b/lib/util/util_net.c
19	@@ -351,13 +351,11 @@ bool is_broadcast_addr(const struct sockaddr *pss)	19	@@ -353,13 +353,11 @@
20	}	20	}
21		21
22	/**	22	/**




%%EXAMPLESDIR%%/LDAP/ol-schema-migrate.pl
%%EXAMPLESDIR%%/LDAP/samba-nds.schema
%%EXAMPLESDIR%%/LDAP/samba-schema-FDS.ldif
%%EXAMPLESDIR%%/LDAP/samba-schema-netscapeds5.x.README
%%EXAMPLESDIR%%/LDAP/samba-schema.IBMSecureWay
%%EXAMPLESDIR%%/LDAP/samba.ldif
%%EXAMPLESDIR%%/LDAP/samba.schema

%%EXAMPLESDIR%%/VFS/autogen.sh
%%EXAMPLESDIR%%/VFS/config.guess
%%EXAMPLESDIR%%/VFS/config.sub
%%EXAMPLESDIR%%/VFS/configure
%%EXAMPLESDIR%%/VFS/configure.in
%%EXAMPLESDIR%%/VFS/install-sh
%%EXAMPLESDIR%%/VFS/module_config.h.in
%%EXAMPLESDIR%%/VFS/shadow_copy_test.c
%%EXAMPLESDIR%%/VFS/skel_opaque.c
%%EXAMPLESDIR%%/VFS/skel_transparent.c

Return to bug 170446

Lines 9-15 Link Here

(-)samba36/files/patch-source3__Makefile.in (-6 / +6 lines)
9	LMHOSTSFILE = $(CONFIGDIR)/lmhosts	9	LMHOSTSFILE = $(CONFIGDIR)/lmhosts
10	NCALRPCDIR = @ncalrpcdir@	10	NCALRPCDIR = @ncalrpcdir@
11		11
12	@@ -1302,8 +1302,8 @@	12	@@ -1303,8 +1303,8 @@
13	$(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \	13	$(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \
14	$(LIBNDR_GEN_OBJ0)	14	$(LIBNDR_GEN_OBJ0)
15		15
Lines 20-26 Link Here
20		20
21	PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \	21	PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
22	pam_smbpass/pam_smb_acct.o pam_smbpass/support.o ../lib/util/asn1.o	22	pam_smbpass/pam_smb_acct.o pam_smbpass/support.o ../lib/util/asn1.o
23	@@ -1620,6 +1620,7 @@	23	@@ -1621,6 +1621,7 @@
24		24
25	.SUFFIXES:	25	.SUFFIXES:
26	.SUFFIXES: .c .o .lo	26	.SUFFIXES: .c .o .lo
Lines 28-34 Link Here
28		28
29	.PHONY: showflags SHOWFLAGS	29	.PHONY: showflags SHOWFLAGS
30		30
31	@@ -1681,6 +1682,9 @@	31	@@ -1682,6 +1683,9 @@
32	$(COMPILE_CC) >/dev/null 2>&1	32	$(COMPILE_CC) >/dev/null 2>&1
33	@BROKEN_CC@ -mv `echo $@ \| sed 's%^.*/%%g'` $@	33	@BROKEN_CC@ -mv `echo $@ \| sed 's%^.*/%%g'` $@
34		34
Lines 38-44 Link Here
38	PRECOMPILED_HEADER = $(builddir)/include/includes.h.gch	38	PRECOMPILED_HEADER = $(builddir)/include/includes.h.gch
39		39
40	# this adds support for precompiled headers. To use it, install a snapshot	40	# this adds support for precompiled headers. To use it, install a snapshot
41	@@ -2762,14 +2766,15 @@	41	@@ -2763,14 +2767,15 @@
42	$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS) \	42	$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS) \
43	@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@	43	@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
44		44
Lines 47-53 Link Here
47	@echo "Linking $@"	47	@echo "Linking $@"
48	- @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT_LIBS) $(KRB5LIBS) \	48	- @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT_LIBS) $(KRB5LIBS) \
49	+ @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) $(KRB5LIBS) \	49	+ @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) $(KRB5LIBS) \
50	@SONAMEFLAG@`basename $@`	50	$(LIBREPLACE_LIBS) @SONAMEFLAG@`basename $@`
51		51
52	bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) $(LIBTALLOC) $(LIBWBCLIENT)	52	bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) $(LIBTALLOC) $(LIBWBCLIENT)
53	@echo "Linking shared library $@"	53	@echo "Linking shared library $@"
Lines 56-62 Link Here
56	$(LIBREPLACE_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) @SONAMEFLAG@`basename $@`	56	$(LIBREPLACE_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) @SONAMEFLAG@`basename $@`
57		57
58	##########	58	##########
59	@@ -3117,7 +3122,8 @@	59	@@ -3122,7 +3127,8 @@
60	@echo "Linking shared library $@"	60	@echo "Linking shared library $@"
61	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) $(LIBCLI_LDAP_NDR_OBJ) -lpam $(DYNEXP) \	61	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) $(LIBCLI_LDAP_NDR_OBJ) -lpam $(DYNEXP) \
62	$(LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \	62	$(LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \

Lines 1-6 Link Here

(-)samba36/files/patch-source3__configure.in (-11 / +23 lines)
1	--- ./source3/configure.in.orig 2011-08-09 13:17:47.000000000 +0200	1	--- ./source3/configure.in.orig 2011-08-09 13:17:47.000000000 +0200
2	+++ ./source3/configure.in 2011-10-13 23:29:28.000000000 +0200	2	+++ ./source3/configure.in 2011-10-13 23:29:28.000000000 +0200
3	@@ -831,9 +831,13 @@	3	@@ -756,9 +756,9 @@
		4	if test x"$ac_cv_header_md5_h" = x"yes"; then
		5	AC_DEFINE(HAVE_MD5_H, 1,
		6	[Whether md5.h is available.])
		7	- AC_CHECK_LIB(md5, MD5Update,
		8	+ AC_CHECK_LIB(md, MD5Update,
		9	[
		10	- LIBS="${LIBS} -lmd5"
		11	+ LIBS="${LIBS} -lmd"
		12	CRYPTO_MD5_OBJ=
		13	AC_DEFINE(HAVE_LIBMD5, 1,
		14	[Whether libmd5 conformant to rfc1321 is available.])],
		15	@@ -852,9 +852,13 @@
4	AC_PATH_PROG(CUPS_CONFIG, cups-config)	16	AC_PATH_PROG(CUPS_CONFIG, cups-config)
5		17
6	if test "x$CUPS_CONFIG" != x; then	18	if test "x$CUPS_CONFIG" != x; then
Lines 15-21 Link Here
15	AC_CHECK_HEADERS(cups/cups.h cups/language.h)	27	AC_CHECK_HEADERS(cups/cups.h cups/language.h)
16		28
17	if test x"$ac_cv_header_cups_cups_h" = xyes -a \	29	if test x"$ac_cv_header_cups_cups_h" = xyes -a \
18	@@ -842,7 +846,7 @@	30	@@ -863,7 +867,7 @@
19	# underlinked. With cups-config --libs we pull in unwanted and unneeded	31	# underlinked. With cups-config --libs we pull in unwanted and unneeded
20	# dendencies including thread libraries - use cups-config only if really	32	# dendencies including thread libraries - use cups-config only if really
21	# required.	33	# required.
Lines 24-30 Link Here
24	[PRINT_LIBS="$ac_save_PRINT_LIBS -lcups"],	36	[PRINT_LIBS="$ac_save_PRINT_LIBS -lcups"],
25	[AC_MSG_WARN([your cups library doesn't link with -lcups alone, it might be underlinked.]) ;	37	[AC_MSG_WARN([your cups library doesn't link with -lcups alone, it might be underlinked.]) ;
26	PRINT_LIBS="$ac_save_PRINT_LIBS `$CUPS_CONFIG --libs`"])	38	PRINT_LIBS="$ac_save_PRINT_LIBS `$CUPS_CONFIG --libs`"])
27	@@ -852,10 +856,10 @@	39	@@ -873,10 +877,10 @@
28	AC_CHECK_LIB_EXT(cups, PRINT_LIBS, httpConnectEncrypt)	40	AC_CHECK_LIB_EXT(cups, PRINT_LIBS, httpConnectEncrypt)
29	else	41	else
30	AC_MSG_WARN([cups-config around but cups-devel not installed])	42	AC_MSG_WARN([cups-config around but cups-devel not installed])
Lines 37-43 Link Here
37		49
38	elif test x"$enable_cups" = x"yes"; then	50	elif test x"$enable_cups" = x"yes"; then
39	AC_MSG_ERROR(Cups support required but cups-config not located. Make sure cups-devel related files are installed.)	51	AC_MSG_ERROR(Cups support required but cups-config not located. Make sure cups-devel related files are installed.)
40	@@ -1943,9 +1947,6 @@	52	@@ -1964,9 +1968,6 @@
41	AC_MSG_CHECKING([PICFLAG])	53	AC_MSG_CHECKING([PICFLAG])
42	AC_MSG_RESULT([$PICFLAG])	54	AC_MSG_RESULT([$PICFLAG])
43		55
Lines 47-53 Link Here
47	AC_CACHE_CHECK([whether building shared libraries actually works],	59	AC_CACHE_CHECK([whether building shared libraries actually works],
48	[ac_cv_shlib_works],[	60	[ac_cv_shlib_works],[
49	# try building a trivial shared library	61	# try building a trivial shared library
50	@@ -4601,15 +4602,51 @@	62	@@ -4624,15 +4625,51 @@
51	x"$ac_cv_header_pam_pam_modules_h" = x"no" ; then	63	x"$ac_cv_header_pam_pam_modules_h" = x"no" ; then
52	if test x"${try_pam}" = x"yes";then	64	if test x"${try_pam}" = x"yes";then
53	AC_MSG_ERROR([--with-pam=yes but pam_modules.h not found])	65	AC_MSG_ERROR([--with-pam=yes but pam_modules.h not found])
Lines 103-109 Link Here
103		115
104	if test x"$create_pam_modules" = x"yes"; then	116	if test x"$create_pam_modules" = x"yes"; then
105	AC_DEFINE(WITH_PAM_MODULES,1,[Whether to include PAM MODULES support])	117	AC_DEFINE(WITH_PAM_MODULES,1,[Whether to include PAM MODULES support])
106	@@ -4619,7 +4656,7 @@	118	@@ -4642,7 +4679,7 @@
107	AC_CHECK_HEADERS(pam/pam_ext.h pam/_pam_macros.h)	119	AC_CHECK_HEADERS(pam/pam_ext.h pam/_pam_macros.h)
108	AC_CHECK_FUNC_EXT(pam_vsyslog,$PAM_LIBS)	120	AC_CHECK_FUNC_EXT(pam_vsyslog,$PAM_LIBS)
109	else	121	else
Lines 112-118 Link Here
112	fi	124	fi
113	fi	125	fi
114	AC_MSG_CHECKING(whether to use PAM support)	126	AC_MSG_CHECKING(whether to use PAM support)
115	@@ -5821,9 +5858,17 @@	127	@@ -5844,9 +5881,17 @@
116	[AC_MSG_RESULT(no)])	128	[AC_MSG_RESULT(no)])
117		129
118	AC_MSG_CHECKING(for aio_suspend)	130	AC_MSG_CHECKING(for aio_suspend)
Lines 133-139 Link Here
133	[AC_MSG_RESULT(no)])	145	[AC_MSG_RESULT(no)])
134	fi	146	fi
135		147
136	@@ -6276,12 +6321,13 @@	148	@@ -6299,12 +6344,13 @@
137	NSSSONAMEVERSIONSUFFIX=".2"	149	NSSSONAMEVERSIONSUFFIX=".2"
138	WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_linux.o"	150	WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_linux.o"
139	;;	151	;;
Lines 148-154 Link Here
148	WINBIND_NSS="../nsswitch/nss_winbind.$SHLIBEXT"	160	WINBIND_NSS="../nsswitch/nss_winbind.$SHLIBEXT"
149	WINBIND_WINS_NSS="../nsswitch/nss_wins.$SHLIBEXT"	161	WINBIND_WINS_NSS="../nsswitch/nss_wins.$SHLIBEXT"
150	;;	162	;;
151	@@ -6426,10 +6474,14 @@	163	@@ -6451,10 +6497,14 @@
152	AC_MSG_RESULT(no$winbind_no_reason)	164	AC_MSG_RESULT(no$winbind_no_reason)
153	fi	165	fi
154		166
Lines 163-169 Link Here
163	AC_SUBST(NSSSONAMEVERSIONSUFFIX)	175	AC_SUBST(NSSSONAMEVERSIONSUFFIX)
164		176
165	AC_SUBST(WINBIND_KRB5_LOCATOR)	177	AC_SUBST(WINBIND_KRB5_LOCATOR)
166	@@ -6745,13 +6797,21 @@	178	@@ -6773,13 +6823,21 @@
167	# Start	179	# Start
168	AC_CHECK_FUNC(getmntent)	180	AC_CHECK_FUNC(getmntent)
169		181
Lines 186-192 Link Here
186	int main(void)	198	int main(void)
187	{	199	{
188	struct statfs fsd;	200	struct statfs fsd;
189	@@ -7050,6 +7110,16 @@	201	@@ -7079,6 +7137,16 @@
190	LIBS="$LIBS -ldmalloc"	202	LIBS="$LIBS -ldmalloc"
191	fi	203	fi
192		204

Lines 1-6 Link Here

(-)samba36/files/patch-source3__lib__fault.c (-6 / +6 lines)
1	--- ./source3/lib/fault.c.orig 2010-04-01 15:26:22.000000000 +0200	1	--- ./source3/lib/fault.c.orig 2010-04-01 15:26:22.000000000 +0200
2	+++ ./source3/lib/fault.c 2010-04-23 01:08:35.000000000 +0200	2	+++ ./source3/lib/fault.c 2010-04-23 01:08:35.000000000 +0200
3	@@ -25,6 +25,10 @@	3	@@ -26,6 +26,10 @@
4	#endif	4	#endif
5		5
6		6
Lines 11-17 Link Here
11	#ifdef HAVE_SYS_PRCTL_H	11	#ifdef HAVE_SYS_PRCTL_H
12	#include <sys/prctl.h>	12	#include <sys/prctl.h>
13	#endif	13	#endif
14	@@ -143,52 +147,93 @@	14	@@ -144,52 +148,93 @@
15	* before dump_core() calls abort.	15	* before dump_core() calls abort.
16	*/	16	*/
17	#if (defined(FREEBSD) && defined(HAVE_SYSCTLBYNAME))	17	#if (defined(FREEBSD) && defined(HAVE_SYSCTLBYNAME))
Lines 143-151 Link Here
143	}	143	}
144	#endif	144	#endif
145		145
146	@@ -204,8 +249,7 @@	146	@@ -248,8 +293,7 @@
147	/* @todo: Add support for the linux corepath. */	147	{
148		148	#if (defined(FREEBSD) && defined(HAVE_SYSCTLBYNAME))
149	char *tmp_corepath = NULL;	149	char *tmp_corepath = NULL;
150	- tmp_corepath = get_freebsd_corepath();	150	- tmp_corepath = get_freebsd_corepath();
151	-	151	-
Lines 153-159 Link Here
153	/* If this has been set correctly, we're done. */	153	/* If this has been set correctly, we're done. */
154	if (tmp_corepath) {	154	if (tmp_corepath) {
155	return tmp_corepath;	155	return tmp_corepath;
156	@@ -281,7 +325,7 @@	156	@@ -327,7 +371,7 @@
157	SAFE_FREE(logbase);	157	SAFE_FREE(logbase);
158	}	158	}
159		159

Lines 8-14 Link Here

(-)samba36/files/patch-source3__smbd__statvfs.c (-5 / +5 lines)
8	Copyright (C) James Peach 2006	8	Copyright (C) James Peach 2006
9		9
10	This program is free software; you can redistribute it and/or modify	10	This program is free software; you can redistribute it and/or modify
11	@@ -47,9 +48,42 @@	11	@@ -49,9 +50,42 @@
12	}	12	}
13	return result;	13	return result;
14	}	14	}
Lines 18-25 Link Here
18	+{	18	+{
19	+ struct statfs statfs_buf;	19	+ struct statfs statfs_buf;
20	+ int result;	20	+ int result;
21		21	+
22	-#if defined(DARWINOS)
23	+ result = statfs(path, &statfs_buf);	22	+ result = statfs(path, &statfs_buf);
24	+ if(result != 0) {	23	+ if(result != 0) {
25	+ return result;	24	+ return result;
Lines 45-51 Link Here
45	+ statbuf->FsCapabilities \|= FILE_VOLUME_QUOTAS;	44	+ statbuf->FsCapabilities \|= FILE_VOLUME_QUOTAS;
46	+ if(statfs_buf.f_flags & MNT_RDONLY)	45	+ if(statfs_buf.f_flags & MNT_RDONLY)
47	+ statbuf->FsCapabilities \|= FILE_READ_ONLY_VOLUME;	46	+ statbuf->FsCapabilities \|= FILE_READ_ONLY_VOLUME;
48	+	47
		48	-#if defined(DARWINOS)
49	+ return 0;	49	+ return 0;
50	+}	50	+}
51	+	51	+
Lines 53-59 Link Here
53		53
54	#include <sys/attr.h>	54	#include <sys/attr.h>
55		55
56	@@ -135,6 +169,8 @@	56	@@ -137,6 +171,8 @@
57	{	57	{
58	#if defined(LINUX) && defined(HAVE_FSID_INT)	58	#if defined(LINUX) && defined(HAVE_FSID_INT)
59	return linux_statvfs(path, statbuf);	59	return linux_statvfs(path, statbuf);

Lines 40-46 Link Here

(-)samba36/pkg-plist (-1 / +3 lines)
40	%%EXAMPLESDIR%%/LDAP/ol-schema-migrate.pl	40	%%EXAMPLESDIR%%/LDAP/ol-schema-migrate.pl
41	%%EXAMPLESDIR%%/LDAP/samba-nds.schema	41	%%EXAMPLESDIR%%/LDAP/samba-nds.schema
42	%%EXAMPLESDIR%%/LDAP/samba-schema-FDS.ldif	42	%%EXAMPLESDIR%%/LDAP/samba-schema-FDS.ldif
43	%%EXAMPLESDIR%%/LDAP/samba-schema-netscapeds5.x	43	%%EXAMPLESDIR%%/LDAP/samba-schema-netscapeds5.x.README
44	%%EXAMPLESDIR%%/LDAP/samba-schema.IBMSecureWay	44	%%EXAMPLESDIR%%/LDAP/samba-schema.IBMSecureWay
45	%%EXAMPLESDIR%%/LDAP/samba.ldif	45	%%EXAMPLESDIR%%/LDAP/samba.ldif
46	%%EXAMPLESDIR%%/LDAP/samba.schema	46	%%EXAMPLESDIR%%/LDAP/samba.schema
Lines 52-59 Link Here
52	%%EXAMPLESDIR%%/VFS/autogen.sh	52	%%EXAMPLESDIR%%/VFS/autogen.sh
53	%%EXAMPLESDIR%%/VFS/config.guess	53	%%EXAMPLESDIR%%/VFS/config.guess
54	%%EXAMPLESDIR%%/VFS/config.sub	54	%%EXAMPLESDIR%%/VFS/config.sub
		55	%%EXAMPLESDIR%%/VFS/configure
55	%%EXAMPLESDIR%%/VFS/configure.in	56	%%EXAMPLESDIR%%/VFS/configure.in
56	%%EXAMPLESDIR%%/VFS/install-sh	57	%%EXAMPLESDIR%%/VFS/install-sh
		58	%%EXAMPLESDIR%%/VFS/module_config.h.in
57	%%EXAMPLESDIR%%/VFS/shadow_copy_test.c	59	%%EXAMPLESDIR%%/VFS/shadow_copy_test.c
58	%%EXAMPLESDIR%%/VFS/skel_opaque.c	60	%%EXAMPLESDIR%%/VFS/skel_opaque.c
59	%%EXAMPLESDIR%%/VFS/skel_transparent.c	61	%%EXAMPLESDIR%%/VFS/skel_transparent.c