Update to Asterisk 1.8.12.0: this is a bugfix release

pkgsrc changes:

- set OPTIMIZE to -O3 as levels above are poorly defined and can
  cause problems
- maintain current patch namimg convention

-----

The Asterisk Development Team has announced the release of Asterisk 1.8.12.0.

The release of Asterisk 1.8.12.0 resolves several issues reported by the
community and would have not been possible without your participation.
Thank you!

The following are the issues resolved in this release:

* --- Prevent chanspy from binding to zombie channels

* --- Fix Dial m and r options and forked calls generating warnings
      for voice frames.

* --- Remove ISDN hold restriction for non-bridged calls.

* --- Fix copying of CDR(accountcode) to local channels.

* --- Ensure Asterisk acknowledges ACKs to 4xx on Replaces errors

* --- Eliminate double close of file descriptor in manager.c

For a full list of changes in this release, please see the ChangeLog:

http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-1.8.12.0

Thank you for your continued support of Asterisk!

4 files changed, 26 insertions, 26 deletions

diff --git a/comms/asterisk18/Makefile b/comms/asterisk18/Makefile
index 5e64ed4157f..3cf987e7345 100644
--- a/comms/asterisk18/Makefile
+++ b/comms/asterisk18/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2012/05/04 16:06:14 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2012/05/06 05:40:50 jnemeth Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked
 
-DISTNAME=	asterisk-1.8.11.1
+DISTNAME=	asterisk-1.8.12.0
 DIST_SUBDIR=	${PKGNAME_NOREV}
 DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
@@ -90,7 +90,7 @@ MAKE_FLAGS+=		WRKSRC=${WRKSRC}
 MAKE_FLAGS+=		LDOPTS=${LDFLAGS:M*:Q}
 MAKE_FLAGS+=		HTTP_DOCSDIR=${PREFIX}/share/httpd/htdocs
 MAKE_FLAGS+=		HTTP_CGIDIR=${PREFIX}/libexec/cgi-bin
-MAKE_FLAGS+=		OPTIMIZE=
+MAKE_FLAGS+=		OPTIMIZE=-O3
 
 .if !empty(MACHINE_PLATFORM:MSunOS-*-i386)
 BUILDLINK_TRANSFORM+=	rm:-march=i386
diff --git a/comms/asterisk18/distinfo b/comms/asterisk18/distinfo
index 3824b6eea10..1134f15a838 100644
--- a/comms/asterisk18/distinfo
+++ b/comms/asterisk18/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.28 2012/05/04 16:06:14 joerg Exp $
+$NetBSD: distinfo,v 1.29 2012/05/06 05:40:50 jnemeth Exp $
 
-SHA1 (asterisk-1.8.11.1/asterisk-1.8.11.1.tar.gz) = 401be7f99665bc423cbafd8ae4c0d7d76769b3db
-RMD160 (asterisk-1.8.11.1/asterisk-1.8.11.1.tar.gz) = 5f1cc9449c243e56be4d778bc262e5cd931aa29e
-Size (asterisk-1.8.11.1/asterisk-1.8.11.1.tar.gz) = 25243311 bytes
-SHA1 (asterisk-1.8.11.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
-RMD160 (asterisk-1.8.11.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
-Size (asterisk-1.8.11.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
+SHA1 (asterisk-1.8.12.0/asterisk-1.8.12.0.tar.gz) = 2dbb4f86425db1da6bc3a199469920a41a2cfbbd
+RMD160 (asterisk-1.8.12.0/asterisk-1.8.12.0.tar.gz) = e512a3d7690bf0f1f8eee523fb26ed6a0406cf93
+Size (asterisk-1.8.12.0/asterisk-1.8.12.0.tar.gz) = 25100215 bytes
+SHA1 (asterisk-1.8.12.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
+RMD160 (asterisk-1.8.12.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
+Size (asterisk-1.8.12.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
 SHA1 (patch-aa) = 496565e1e567c42ab6ba8f996c506f52cb9c8cfe
 SHA1 (patch-af) = 19786616bb606c38f769ec85f2e4d118573659ab
 SHA1 (patch-ag) = c71c61350cefbbe53eefa99245ca7712753f22d5
@@ -16,7 +16,7 @@ SHA1 (patch-am) = 5f9cbf47ec1cb66758492a5ed1bf843006eae9b7
 SHA1 (patch-an) = 93a5df66fd6459fb76e9191dc3bf37b9ee5483b5
 SHA1 (patch-ao) = aa95464a8bd4a417f313541b465142d2e4c3ee47
 SHA1 (patch-ap) = ed22f6483191f429389c0d3198d30c63b96d4df6
-SHA1 (patch-aq) = edb8a95a6bcfd528c9b6229c3a69109e7baf9cef
+SHA1 (patch-aq) = 4b7a13e605fc5933d5d87b797a40479e206f42d3
 SHA1 (patch-ar) = da8e614e68e476ce32c66fed5ee9dcb8c5f9a060
 SHA1 (patch-as) = b2e1aadf49f20506243ab40796f15aab12d95bad
 SHA1 (patch-at) = df318d7b492121ff6f766b0e6ea73415293e96f0
@@ -39,4 +39,4 @@ SHA1 (patch-bk) = 93679dfb04d26c99ac9c2822e0d74d869d16369f
 SHA1 (patch-bl) = 35cede8f5c253baed3d3983f58986c7c662e35e2
 SHA1 (patch-bm) = 284b34e20091b3427cd67b835fc7aa62c9d92a6c
 SHA1 (patch-bn) = 51d14bde5591bd4a68c8074838196e05ac86f2f2
-SHA1 (patch-include_asterisk_inline__api.h) = ff43d14e2608dd08d7d03799dfe9847f9f7f5666
+SHA1 (patch-bo) = ff43d14e2608dd08d7d03799dfe9847f9f7f5666
diff --git a/comms/asterisk18/patches/patch-aq b/comms/asterisk18/patches/patch-aq
index 34a56b20857..85ab599e8cd 100644
--- a/comms/asterisk18/patches/patch-aq
+++ b/comms/asterisk18/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.9 2012/04/07 20:10:45 jnemeth Exp $
+$NetBSD: patch-aq,v 1.10 2012/05/06 05:40:50 jnemeth Exp $
 
---- configure.orig	2012-02-16 19:26:16.000000000 +0000
+--- configure.orig	2012-03-27 14:32:40.000000000 +0000
 +++ configure
-@@ -25178,6 +25178,146 @@ fi
+@@ -17094,6 +17094,146 @@ fi
  
  
  
@@ -149,21 +149,21 @@ $NetBSD: patch-aq,v 1.9 2012/04/07 20:10:45 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]];'.
-@@ -29482,6 +29622,8 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+@@ -18219,6 +18359,8 @@ $as_echo_n "checking if \"struct ifaddrs
+ 
+ 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <ifaddrs.h>
++ #include <sys/types.h>
++ #include <sys/socket.h>
+  #include <ifaddrs.h>
  int
  main ()
-@@ -55700,10 +55842,9 @@ cat >>confdefs.h <<\_ACEOF
- #define HAVE_SBIN_LAUNCHD 1
- _ACEOF
+@@ -29288,10 +29430,10 @@ if test "x$ac_cv_file__sbin_launchd" = x
+ 
+ $as_echo "#define HAVE_SBIN_LAUNCHD 1" >>confdefs.h
  
 -fi
--
+ 
    PBX_LAUNCHD=1
  fi
 +fi
diff --git a/comms/asterisk18/patches/patch-include_asterisk_inline__api.h b/comms/asterisk18/patches/patch-bo
index 97c45ab8621..4744c508a42 100644
--- a/comms/asterisk18/patches/patch-include_asterisk_inline__api.h
+++ b/comms/asterisk18/patches/patch-bo
@@ -1,4 +1,4 @@
-$NetBSD: patch-include_asterisk_inline__api.h,v 1.1 2012/05/04 16:06:14 joerg Exp $
+$NetBSD: patch-bo,v 1.1 2012/05/06 05:40:50 jnemeth Exp $
 
 --- include/asterisk/inline_api.h.orig	2006-02-14 19:14:15.000000000 +0000
 +++ include/asterisk/inline_api.h