- fix PLIST when jabber option is disabled

- fix build when newlocale is detected, patch from joerg@

7 files changed, 145 insertions, 21 deletions

diff --git a/comms/asterisk10/Makefile b/comms/asterisk10/Makefile
index c8a8934e8e4..8239ff669ad 100644
--- a/comms/asterisk10/Makefile
+++ b/comms/asterisk10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2013/06/06 12:54:09 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2013/06/14 23:53:03 jnemeth Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked
@@ -7,7 +7,7 @@ DISTNAME=	asterisk-10.12.2
 DIST_SUBDIR=	${PKGNAME_NOREV}
 DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	comms net audio
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
diff --git a/comms/asterisk10/PLIST b/comms/asterisk10/PLIST
index be3dfd753a8..b70bf8415ec 100644
--- a/comms/asterisk10/PLIST
+++ b/comms/asterisk10/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2012/09/30 19:24:18 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.11 2013/06/14 23:53:03 jnemeth Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -223,7 +223,7 @@ ${PLIST.unixodbc}lib/asterisk/modules/cel_odbc.so
 lib/asterisk/modules/cel_sqlite3_custom.so
 lib/asterisk/modules/chan_agent.so
 lib/asterisk/modules/chan_bridge.so
-lib/asterisk/modules/chan_gtalk.so
+${PLIST.jabber}lib/asterisk/modules/chan_gtalk.so
 lib/asterisk/modules/chan_iax2.so
 lib/asterisk/modules/chan_local.so
 ${PLIST.mgcp}lib/asterisk/modules/chan_mgcp.so
@@ -325,7 +325,7 @@ lib/asterisk/modules/res_fax.so
 ${PLIST.spandsp}lib/asterisk/modules/res_fax_spandsp.so
 lib/asterisk/modules/res_format_attr_celt.so
 lib/asterisk/modules/res_format_attr_silk.so
-lib/asterisk/modules/res_jabber.so
+${PLIST.jabber}lib/asterisk/modules/res_jabber.so
 lib/asterisk/modules/res_limit.so
 lib/asterisk/modules/res_monitor.so
 lib/asterisk/modules/res_musiconhold.so
diff --git a/comms/asterisk10/distinfo b/comms/asterisk10/distinfo
index f2ea243566d..e62996107b4 100644
--- a/comms/asterisk10/distinfo
+++ b/comms/asterisk10/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2013/04/10 05:27:08 jnemeth Exp $
+$NetBSD: distinfo,v 1.27 2013/06/14 23:53:03 jnemeth Exp $
 
 SHA1 (asterisk-10.12.2/asterisk-10.12.2.tar.gz) = 4c1e681223b9e86a74d5c8a57dc4da87045a1656
 RMD160 (asterisk-10.12.2/asterisk-10.12.2.tar.gz) = ec365462b3f9668906b3d1bf5b7342fb39cc7e2c
@@ -13,10 +13,10 @@ SHA1 (patch-apps_app__queue.c) = 6fc4edbf9386e2ff39a63a1c3a3d9fe2ea27d187
 SHA1 (patch-apps_app__sms.c) = d89b27a9df04d4da98d562241c07d25d182baefc
 SHA1 (patch-build__tools_mkpkgconfig) = 2bd3c0e24bc6d721cc234feb19b64a57106fcbe4
 SHA1 (patch-channels_chan__oss.c) = fccfa6fca010294ed2d3ab87fc31f436d67f49fa
-SHA1 (patch-configure) = e114b113b5b2733edfd138d48740d65dda6d639e
-SHA1 (patch-configure.ac) = fa39e67fe998d0fe7dfb5fb3988f2be712b3b29f
+SHA1 (patch-configure) = 49b17e4661cf1ef98342774ad4f2bb377326dee5
+SHA1 (patch-configure.ac) = a68fce7769679a8f40fc266711b80dcccdc15cad
 SHA1 (patch-contrib_scripts_vmail.cgi) = 650b9bbf3e322d1ad351932cfe6f747baa8f35e4
-SHA1 (patch-include_asterisk_autoconfig.h.in) = 1d658b1997b3664cf34d01f1903fa38c8c986ee2
+SHA1 (patch-include_asterisk_autoconfig.h.in) = 90f8688b17f181775319e0c92e353a969b09c93f
 SHA1 (patch-include_asterisk_endian.h) = 41c1a9a9e02fe394bc9261f5559e931b1378ea28
 SHA1 (patch-include_asterisk_inline__api.h) = ff43d14e2608dd08d7d03799dfe9847f9f7f5666
 SHA1 (patch-include_asterisk_lock.h) = fc7b4934e5f53a09066802daa054300895cf7bcf
@@ -27,6 +27,7 @@ SHA1 (patch-main_features.c) = 1932f46e435f38b0f03b25ce98767fccd4f83ec7
 SHA1 (patch-main_manager.c) = 05e65a5d3d06a674c55a5b2d5779fd62aff26b7d
 SHA1 (patch-main_netsock.c) = 92542984c6f35fab53d1d107880a51743e3419c6
 SHA1 (patch-main_sched.c) = 3a1ef5a384a7fa7329abf2babdacf3dd1d57a041
+SHA1 (patch-main_stdtime_localtime.c) = f2234055c370854b43a7a3a6b06226aeeb1dbe96
 SHA1 (patch-main_utils.c) = 6d0fd44963149b0561ae179771b7e9fd80fa00b9
 SHA1 (patch-pbx_pbx__dundi.c) = 0645ee88c18f94b90ed051cfe100414300f2763f
 SHA1 (patch-sounds_Makefile) = 579c38e483bb0631fa1c4ea67fca24462caac41e
diff --git a/comms/asterisk10/patches/patch-configure b/comms/asterisk10/patches/patch-configure
index d7c00e9fc8b..5b1c566fb72 100644
--- a/comms/asterisk10/patches/patch-configure
+++ b/comms/asterisk10/patches/patch-configure
@@ -1,8 +1,17 @@
-$NetBSD: patch-configure,v 1.6 2012/10/09 01:36:32 jnemeth Exp $
+$NetBSD: patch-configure,v 1.7 2013/06/14 23:53:03 jnemeth Exp $
 
---- configure.orig	2012-08-09 19:11:01.000000000 +0000
+--- configure.orig	2012-10-18 19:53:08.000000000 +0000
 +++ configure
-@@ -23605,7 +23605,7 @@ $as_echo "user CFLAGS present" >&6; }
+@@ -19348,7 +19348,7 @@ done
+ 
+ 
+ 
+-for ac_func in asprintf atexit closefrom dup2 eaccess endpwent euidaccess ffsll ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday glob htonll ioperm inet_ntoa isascii memchr memmove memset mkdir mkdtemp munmap ntohll newlocale ppoll putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtod strtol strtold strtoq unsetenv utime vasprintf getpeereid sysctl swapctl
++for ac_func in asprintf atexit closefrom dup2 eaccess endpwent euidaccess ffsll ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday glob htonll ioperm inet_ntoa isascii memchr memmove memset mkdir mkdtemp munmap ntohll newlocale ppoll putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strftime_l strptime_l strtod strtol strtold strtoq unsetenv utime vasprintf getpeereid sysctl swapctl
+ do
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+@@ -23647,7 +23647,7 @@ $as_echo "user CFLAGS present" >&6; }
  else
  	{ $as_echo "$as_me:$LINENO: result: no" >&5
  $as_echo "no" >&6; }
@@ -11,7 +20,7 @@ $NetBSD: patch-configure,v 1.6 2012/10/09 01:36:32 jnemeth Exp $
  fi
  
  
-@@ -24494,6 +24494,148 @@ fi
+@@ -24536,6 +24536,148 @@ fi
  
  
  
@@ -160,7 +169,7 @@ $NetBSD: patch-configure,v 1.6 2012/10/09 01:36:32 jnemeth Exp $
  # The cast to long int works around a bug in the HP C Compiler
  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-@@ -29069,6 +29211,8 @@ _ACEOF
+@@ -29111,6 +29253,8 @@ _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -169,7 +178,7 @@ $NetBSD: patch-configure,v 1.6 2012/10/09 01:36:32 jnemeth Exp $
  #include <ifaddrs.h>
  int
  main ()
-@@ -55829,10 +55973,10 @@ cat >>confdefs.h <<\_ACEOF
+@@ -55871,10 +56015,10 @@ cat >>confdefs.h <<\_ACEOF
  #define HAVE_SBIN_LAUNCHD 1
  _ACEOF
  
diff --git a/comms/asterisk10/patches/patch-configure.ac b/comms/asterisk10/patches/patch-configure.ac
index 486128613f2..210b64afddf 100644
--- a/comms/asterisk10/patches/patch-configure.ac
+++ b/comms/asterisk10/patches/patch-configure.ac
@@ -1,8 +1,17 @@
-$NetBSD: patch-configure.ac,v 1.3 2012/10/09 01:36:32 jnemeth Exp $
+$NetBSD: patch-configure.ac,v 1.4 2013/06/14 23:53:03 jnemeth Exp $
 
---- configure.ac.orig	2012-08-09 19:11:01.000000000 +0000
+--- configure.ac.orig	2012-10-18 19:53:08.000000000 +0000
 +++ configure.ac
-@@ -1004,7 +1004,7 @@ if $(${CC} -march=native -S -o /dev/null
+@@ -571,7 +571,7 @@ AC_FUNC_STRNLEN
+ AC_FUNC_STRTOD
+ AC_FUNC_UTIME_NULL
+ AC_FUNC_VPRINTF
+-AC_CHECK_FUNCS([asprintf atexit closefrom dup2 eaccess endpwent euidaccess ffsll ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday glob htonll ioperm inet_ntoa isascii memchr memmove memset mkdir mkdtemp munmap ntohll newlocale ppoll putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtod strtol strtold strtoq unsetenv utime vasprintf getpeereid sysctl swapctl])
++AC_CHECK_FUNCS([asprintf atexit closefrom dup2 eaccess endpwent euidaccess ffsll ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday glob htonll ioperm inet_ntoa isascii memchr memmove memset mkdir mkdtemp munmap ntohll newlocale ppoll putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strftime_l strptime_l strtod strtol strtold strtoq unsetenv utime vasprintf getpeereid sysctl swapctl])
+ 
+ # NOTE: we use AC_CHECK_LIB to get -lm into the arguments for later checks,
+ # so that AC_CHECK_FUNCS can detect functions in that library.
+@@ -1005,7 +1005,7 @@ if $(${CC} -march=native -S -o /dev/null
  	fi
  else
  	AC_MSG_RESULT(no)
@@ -11,7 +20,7 @@ $NetBSD: patch-configure.ac,v 1.3 2012/10/09 01:36:32 jnemeth Exp $
  fi
  AC_SUBST(AST_NATIVE_ARCH)
  
-@@ -1084,6 +1084,9 @@ AST_C_DEFINE_CHECK([IP_MTU_DISCOVER], [I
+@@ -1085,6 +1085,9 @@ AST_C_DEFINE_CHECK([IP_MTU_DISCOVER], [I
  AC_CHECK_HEADER([libkern/OSAtomic.h],
                  [AC_DEFINE_UNQUOTED([HAVE_OSX_ATOMICS], 1, [Define to 1 if OSX atomic operations are supported.])])
  
diff --git a/comms/asterisk10/patches/patch-include_asterisk_autoconfig.h.in b/comms/asterisk10/patches/patch-include_asterisk_autoconfig.h.in
index 7785d1044aa..31223843420 100644
--- a/comms/asterisk10/patches/patch-include_asterisk_autoconfig.h.in
+++ b/comms/asterisk10/patches/patch-include_asterisk_autoconfig.h.in
@@ -1,8 +1,21 @@
-$NetBSD: patch-include_asterisk_autoconfig.h.in,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
+$NetBSD: patch-include_asterisk_autoconfig.h.in,v 1.3 2013/06/14 23:53:03 jnemeth Exp $
 
 --- include/asterisk/autoconfig.h.in.orig	2012-08-09 19:11:01.000000000 +0000
 +++ include/asterisk/autoconfig.h.in
-@@ -899,6 +899,9 @@
+@@ -824,6 +824,12 @@
+ /* Define to 1 if you have the `strstr' function. */
+ #undef HAVE_STRSTR
+ 
++/* Define to 1 if you have the `strftime_l' function. */
++#undef HAVE_STRFTIME_L
++
++/* Define to 1 if you have the `strptime_l' function. */
++#undef HAVE_STRPTIME_L
++
+ /* Define to 1 if you have the `strtod' function. */
+ #undef HAVE_STRTOD
+ 
+@@ -899,6 +905,9 @@
  /* Define to 1 if you have the <syslog.h> header file. */
  #undef HAVE_SYSLOG_H
  
diff --git a/comms/asterisk10/patches/patch-main_stdtime_localtime.c b/comms/asterisk10/patches/patch-main_stdtime_localtime.c
new file mode 100644
index 00000000000..732e0e19e21
--- /dev/null
+++ b/comms/asterisk10/patches/patch-main_stdtime_localtime.c
@@ -0,0 +1,92 @@
+$NetBSD: patch-main_stdtime_localtime.c,v 1.1 2013/06/14 23:53:03 jnemeth Exp $
+
+--- main/stdtime/localtime.c.orig	2012-12-03 20:33:08.000000000 +0000
++++ main/stdtime/localtime.c
+@@ -2213,6 +2213,23 @@ static struct locale_entry *find_by_name
+ 	return NULL;
+ }
+ 
++#if HAVE_STRFTIME_L || HAVE_STRPTIME_L
++static locale_t ast_getlocale(const char *locale)
++{
++	struct locale_entry *cur;
++
++	AST_LIST_LOCK(&localelist);
++	if ((cur = find_by_name(locale)) == NULL) {
++		cur->locale = newlocale(LC_ALL_MASK, locale, NULL);
++		strcpy(cur->name, locale); /* SAFE */
++		AST_LIST_INSERT_TAIL(&localelist, cur, list);
++	}
++	AST_LIST_UNLOCK(&localelist);
++	return(cur->locale);
++}
++#endif
++
++#if !HAVE_STRFTIME_L || !HAVE_STRPTIME_L
+ static const char *store_by_locale(locale_t prevlocale)
+ {
+ 	struct locale_entry *cur;
+@@ -2270,6 +2287,7 @@ const char *ast_setlocale(const char *lo
+ 	AST_LIST_UNLOCK(&localelist);
+ 	return store_by_locale(prevlocale);
+ }
++#endif
+ #else
+ const char *ast_setlocale(const char *unused)
+ {
+@@ -2283,7 +2301,9 @@ int ast_strftime_locale(char *buf, size_
+ 	char *format = ast_calloc(1, fmtlen), *fptr = format, *newfmt;
+ 	int decimals = -1, i, res;
+ 	long fraction;
++#if !HAVE_STRFTIME_L
+ 	const char *prevlocale;
++#endif
+ 
+ 	if (!format) {
+ 		return -1;
+@@ -2337,6 +2357,14 @@ defcase:	*fptr++ = *tmp;
+ 	}
+ 	*fptr = '\0';
+ #undef strftime
++#if HAVE_STRFTIME_L
++	if (locale) {
++		locale_t l = ast_getlocale(locale);
++		res = (int)strftime_l(buf, len, format, (struct tm *)tm, l);
++	} else {
++		res = (int)strftime(buf, len, format, (struct tm *)tm);
++	}
++#else
+ 	if (locale) {
+ 		prevlocale = ast_setlocale(locale);
+ 	}
+@@ -2344,6 +2372,7 @@ defcase:	*fptr++ = *tmp;
+ 	if (locale) {
+ 		ast_setlocale(prevlocale);
+ 	}
++#endif
+ 	ast_free(format);
+ 	return res;
+ }
+@@ -2357,11 +2386,22 @@ char *ast_strptime_locale(const char *s,
+ {
+ 	struct tm tm2 = { 0, };
+ 	char *res;
++#if !HAVE_STRPTIME_L
+ 	const char *prevlocale;
++#endif
+ 
++#if HAVE_STRPTIME_L
++	if (locale) {
++		locale_t l = ast_getlocale(locale);
++		res = strptime_l(s, format, &tm2, l);
++	} else {
++		res = strptime(s, format, &tm2);
++	}
++#else
+ 	prevlocale = ast_setlocale(locale);
+ 	res = strptime(s, format, &tm2);
+ 	ast_setlocale(prevlocale);
++#endif
+ 	/* ast_time and tm are not the same size - tm is a subset of
+ 	 * ast_time.  Hence, the size of tm needs to be used for the
+ 	 * memcpy