svn commit: r284986 - in releng/9.3: . contrib/sendmail/src lib/libc/locale sys/conf

[Xin LI]

Author: delphij
Date: Tue Jun 30 23:21:48 2015
New Revision: 284986
URL: https://svnweb.freebsd.org/changeset/base/284986

Log:
  [EN-15:08] Revised: Improvements to sendmail TLS/DH interoperability.
  
  [EN-15:09] Fix inconsistency between locale and rune locale states.
  
  Approved by:	so

Modified:
  releng/9.3/UPDATING
  releng/9.3/contrib/sendmail/src/sendmail.h
  releng/9.3/lib/libc/locale/setrunelocale.c
  releng/9.3/lib/libc/locale/xlocale.c
  releng/9.3/sys/conf/newvers.sh

Modified: releng/9.3/UPDATING
==============================================================================
--- releng/9.3/UPDATING	Tue Jun 30 23:21:37 2015	(r284985)
+++ releng/9.3/UPDATING	Tue Jun 30 23:21:48 2015	(r284986)
@@ -11,6 +11,14 @@ handbook:
 Items affecting the ports and packages system can be found in
 /usr/ports/UPDATING.  Please read that file before running portupgrade.
 
+20150630:	p18	FreeBSD-EN-15:08.sendmail [revised]
+			FreeBSD-EN-15:09.xlocale
+
+	Improvements to sendmail TLS/DH interoperability. [EN-15:08]
+
+	Fix inconsistency between locale and rune locale states.
+	[EN-15:09]
+
 20150618:	p17	FreeBSD-EN-15:08.sendmail
 	Improvements to sendmail TLS/DH interoperability. [EN-15:08]
 

Modified: releng/9.3/contrib/sendmail/src/sendmail.h
==============================================================================
--- releng/9.3/contrib/sendmail/src/sendmail.h	Tue Jun 30 23:21:37 2015	(r284985)
+++ releng/9.3/contrib/sendmail/src/sendmail.h	Tue Jun 30 23:21:48 2015	(r284986)
@@ -1935,7 +1935,7 @@ struct termescape
 
 /* server requirements */
 #define TLS_I_SRV	(TLS_I_SRV_CERT | TLS_I_RSA_TMP | TLS_I_VRFY_PATH | \
-			 TLS_I_VRFY_LOC | TLS_I_TRY_DH | TLS_I_DH512 | \
+			 TLS_I_VRFY_LOC | TLS_I_TRY_DH | TLS_I_DH1024 | \
 			 TLS_I_CACHE)
 
 /* client requirements */

Modified: releng/9.3/lib/libc/locale/setrunelocale.c
==============================================================================
--- releng/9.3/lib/libc/locale/setrunelocale.c	Tue Jun 30 23:21:37 2015	(r284985)
+++ releng/9.3/lib/libc/locale/setrunelocale.c	Tue Jun 30 23:21:48 2015	(r284986)
@@ -202,6 +202,8 @@ __set_thread_rune_locale(locale_t loc)
 
 	if (loc == NULL) {
 		_ThreadRuneLocale = &_DefaultRuneLocale;
+	} else if (loc == LC_GLOBAL_LOCALE) {
+		_ThreadRuneLocale = 0;
 	} else {
 		_ThreadRuneLocale = XLOCALE_CTYPE(loc)->runes;
 	}

Modified: releng/9.3/lib/libc/locale/xlocale.c
==============================================================================
--- releng/9.3/lib/libc/locale/xlocale.c	Tue Jun 30 23:21:37 2015	(r284985)
+++ releng/9.3/lib/libc/locale/xlocale.c	Tue Jun 30 23:21:48 2015	(r284986)
@@ -154,23 +154,24 @@ __get_locale(void)
 static void
 set_thread_locale(locale_t loc)
 {
+	locale_t l = (loc == LC_GLOBAL_LOCALE) ? 0 : loc;
 
 	_once(&once_control, init_key);
 	
-	if (NULL != loc) {
-		xlocale_retain((struct xlocale_refcounted*)loc);
+	if (NULL != l) {
+		xlocale_retain((struct xlocale_refcounted*)l);
 	}
 	locale_t old = pthread_getspecific(locale_info_key);
-	if ((NULL != old) && (loc != old)) {
+	if ((NULL != old) && (l != old)) {
 		xlocale_release((struct xlocale_refcounted*)old);
 	}
 	if (fake_tls) {
-		thread_local_locale = loc;
+		thread_local_locale = l;
 	} else {
-		pthread_setspecific(locale_info_key, loc);
+		pthread_setspecific(locale_info_key, l);
 	}
 #ifndef __NO_TLS
-	__thread_locale = loc;
+	__thread_locale = l;
 	__set_thread_rune_locale(loc);
 #endif
 }
@@ -361,9 +362,6 @@ locale_t uselocale(locale_t loc)
 {
 	locale_t old = get_thread_locale();
 	if (NULL != loc) {
-		if (LC_GLOBAL_LOCALE == loc) {
-			loc = NULL;
-		}
 		set_thread_locale(loc);
 	}
 	return (old ? old : LC_GLOBAL_LOCALE);

Modified: releng/9.3/sys/conf/newvers.sh
==============================================================================
--- releng/9.3/sys/conf/newvers.sh	Tue Jun 30 23:21:37 2015	(r284985)
+++ releng/9.3/sys/conf/newvers.sh	Tue Jun 30 23:21:48 2015	(r284986)
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="9.3"
-BRANCH="RELEASE-p17"
+BRANCH="RELEASE-p18"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi