ports/171717: net/samba36 update to 3.6.8

[Andrey Simonenko]

>Number:         171717
>Category:       ports
>Synopsis:       net/samba36 update to 3.6.8
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 17 16:20:04 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Andrey Simonenko
>Release:        FreeBSD 9.1-PRERELEASE amd64
>Organization:
>Environment:
>Description:

Update of net/samba36 to the 3.6.8 version requires modification
of the patch for configure.in only.

>How-To-Repeat:
>Fix:
diff -ruN samba36.orig/Makefile samba36/Makefile
--- samba36.orig/Makefile	2012-08-27 11:48:16.000000000 +0300
+++ samba36/Makefile	2012-09-17 18:40:55.000000000 +0300
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		${SAMBA_BASENAME}36
-PORTVERSION=		3.6.7
+PORTVERSION=		3.6.8
 PORTREVISION?=		0
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
diff -ruN samba36.orig/distinfo samba36/distinfo
--- samba36.orig/distinfo	2012-08-27 11:48:16.000000000 +0300
+++ samba36/distinfo	2012-09-17 18:40:59.000000000 +0300
@@ -1,2 +1,2 @@
-SHA256 (samba-3.6.7.tar.gz) = b858a0f011ba7fe554881b9c7e6cb1c9cb7face22ed86860f560fcaecc4ed4ca
-SIZE (samba-3.6.7.tar.gz) = 34067900
+SHA256 (samba-3.6.8.tar.gz) = 4f5a171a8d902c6b4f822ed875c51eb8339196d9ccf0ecd7f6521c966b3514de
+SIZE (samba-3.6.8.tar.gz) = 34070798
diff -ruN samba36.orig/files/patch-source3__configure.in samba36/files/patch-source3__configure.in
--- samba36.orig/files/patch-source3__configure.in	2012-08-27 11:48:16.000000000 +0300
+++ samba36/files/patch-source3__configure.in	2012-09-17 18:50:03.000000000 +0300
@@ -1,18 +1,6 @@
 --- ./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 @@
+@@ -868,9 +868,13 @@
  	AC_PATH_PROG(CUPS_CONFIG, cups-config)
  
          if test "x$CUPS_CONFIG" != x; then
@@ -27,7 +15,7 @@
  		AC_CHECK_HEADERS(cups/cups.h cups/language.h)
  
  		if test x"$ac_cv_header_cups_cups_h" = xyes -a \
-@@ -863,7 +867,7 @@
+@@ -879,7 +883,7 @@
  			# underlinked. With cups-config --libs we pull in unwanted and unneeded
  			# dendencies including thread libraries - use cups-config only if really
  			# required. 
@@ -36,7 +24,7 @@
  				[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 @@
+@@ -889,10 +893,10 @@
  			AC_CHECK_LIB_EXT(cups, PRINT_LIBS, httpConnectEncrypt)
  		else
  			AC_MSG_WARN([cups-config around but cups-devel not installed])
@@ -49,7 +37,7 @@
  
  	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 @@
+@@ -1980,9 +1984,6 @@
  AC_MSG_CHECKING([PICFLAG])
  AC_MSG_RESULT([$PICFLAG])
  
@@ -59,7 +47,7 @@
  AC_CACHE_CHECK([whether building shared libraries actually works],
                 [ac_cv_shlib_works],[
     # try building a trivial shared library
-@@ -4624,15 +4625,51 @@
+@@ -4639,15 +4640,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])
@@ -115,7 +103,7 @@
  
  		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 @@
+@@ -4657,7 +4694,7 @@
  			AC_CHECK_HEADERS(pam/pam_ext.h pam/_pam_macros.h)
  			AC_CHECK_FUNC_EXT(pam_vsyslog,$PAM_LIBS)
  		else
@@ -124,7 +112,7 @@
  		fi
  	fi
  	AC_MSG_CHECKING(whether to use PAM support)
-@@ -5844,9 +5881,17 @@
+@@ -5859,9 +5896,17 @@
  [AC_MSG_RESULT(no)])
  
  			AC_MSG_CHECKING(for aio_suspend)
@@ -145,7 +133,7 @@
  [AC_MSG_RESULT(no)])
  		fi
  
-@@ -6299,12 +6344,13 @@
+@@ -6314,12 +6359,13 @@
  		NSSSONAMEVERSIONSUFFIX=".2"
  		WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_linux.o"
  		;;
@@ -160,7 +148,7 @@
  		WINBIND_NSS="../nsswitch/nss_winbind.$SHLIBEXT"
  		WINBIND_WINS_NSS="../nsswitch/nss_wins.$SHLIBEXT"
  		;;
-@@ -6451,10 +6497,14 @@
+@@ -6466,10 +6512,14 @@
          AC_MSG_RESULT(no$winbind_no_reason)
  fi
  
@@ -175,7 +163,7 @@
  AC_SUBST(NSSSONAMEVERSIONSUFFIX)
  
  AC_SUBST(WINBIND_KRB5_LOCATOR)
-@@ -6773,13 +6823,21 @@
+@@ -6788,13 +6838,21 @@
  # Start
  AC_CHECK_FUNC(getmntent)
  
@@ -198,7 +186,7 @@
  		int main(void)
  		{
  			struct statfs fsd;
-@@ -7079,6 +7137,16 @@
+@@ -7094,6 +7152,16 @@
  	LIBS="$LIBS -ldmalloc"
  fi
  


>Release-Note:
>Audit-Trail:
>Unformatted: