Update to Asterisk 1.8.23.0: this is a bugfix release

pkgsrc changes:
- add work around for NetBSD's incompatible implementation of IP_PKTINFO
- core sounds package was updated to 1.4.24

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

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

The following is a sample of the issues resolved in this release:

* --- Fix a memory copying bug in slinfactory which was causing
      mixmonitor issues.

* --- IAX2: fix race condition with nativebridge transfers.

* --- Fix crash in chan_sip when a core initiated op occurs at the
      same time as a BYE

* --- Fix The Payload Being Set On CN Packets And Do Not Set Marker
      Bit

* --- chan_sip: Session-Expires: Set timer to correctly expire at
      (~2/3) of the interval when not the refresher

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

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

Thank you for your continued support of Asterisk!

3 files changed, 22 insertions, 17 deletions

diff --git a/comms/asterisk18/Makefile b/comms/asterisk18/Makefile
index 65e88068de3..5b53cac1eb5 100644
--- a/comms/asterisk18/Makefile
+++ b/comms/asterisk18/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.71 2013/07/12 10:44:53 jperkin Exp $
+# $NetBSD: Makefile,v 1.72 2013/07/21 17:20:26 jnemeth Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked
 
-DISTNAME=	asterisk-1.8.22.0
+DISTNAME=	asterisk-1.8.23.0
 DIST_SUBDIR=	${PKGNAME_NOREV}
 DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
-PKGREVISION=	6
 CATEGORIES=	comms net audio
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
@@ -130,12 +129,18 @@ SUBST_SED.configs+=	-e "s|/usr/local/man|${ASTMANDIR}|"
 SUBST_SED.configs+=	-e "s|/usr/local|${PREFIX}|"
 SUBST_SED.configs+=	-e "s|/var|${VARBASE}|"
 
-# XXX gross hack, remove when atomics properly implemented
 .if (${OPSYS} == "NetBSD")
+# XXX gross hack, remove when atomics properly implemented
 SUBST_CLASSES+=		atomics
 SUBST_STAGE.atomics=	post-configure
 SUBST_FILES.atomics=	include/asterisk/autoconfig.h
 SUBST_SED.atomics=	-e "s|^\#define HAVE_GCC_ATOMICS 1|\#undef HAVE_GCC_ATOMICS|"
+
+# XXX gross hack, IP_PKTINFO in NetBSD isn't compatible with anything else
+SUBST_CLASSES+=         pktinfo
+SUBST_STAGE.pktinfo=    post-configure
+SUBST_FILES.pktinfo=    include/asterisk/autoconfig.h
+SUBST_SED.pktinfo=      -e "s|^\#define HAVE_PKTINFO 1|\#undef HAVE_PKTINFO|"
 .endif
 
 RCD_SCRIPTS=		asterisk
@@ -199,7 +204,7 @@ post-patch:
 
 post-install:
 # check sounds directory for current versions when upgrading package
-	${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.23.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
+	${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.24.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
 	${TAR} xzf ${WRKSRC}/sounds/asterisk-moh-opsound-wav-2.03.tar.gz -C ${DESTDIR}${ASTDATADIR}/moh
 	${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
 	${INSTALL_DATA} ${WRKSRC}/BUGS ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
diff --git a/comms/asterisk18/PLIST b/comms/asterisk18/PLIST
index c94989107e9..66a341b973f 100644
--- a/comms/asterisk18/PLIST
+++ b/comms/asterisk18/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2013/04/18 16:55:22 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.22 2013/07/21 17:20:26 jnemeth Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -356,14 +356,14 @@ libdata/asterisk/phoneprov/000000000000.cfg
 libdata/asterisk/phoneprov/polycom.xml
 libdata/asterisk/phoneprov/polycom_line.xml
 libdata/asterisk/phoneprov/snom-mac.xml
-libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.23
+libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.24
 libdata/asterisk/sounds/en/1-for-am-2-for-pm.gsm
 libdata/asterisk/sounds/en/1-yes-2-no.gsm
-libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.23
+libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.24
 libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.13
-libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.23
+libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.24
 libdata/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.13
-libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.23
+libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.24
 libdata/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.13
 libdata/asterisk/sounds/en/OfficeSpace.gsm
 libdata/asterisk/sounds/en/Randulo-allison.gsm
diff --git a/comms/asterisk18/distinfo b/comms/asterisk18/distinfo
index 72a03adef6c..853e7e1aaa6 100644
--- a/comms/asterisk18/distinfo
+++ b/comms/asterisk18/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.47 2013/06/15 20:51:10 jnemeth Exp $
+$NetBSD: distinfo,v 1.48 2013/07/21 17:20:26 jnemeth Exp $
 
-SHA1 (asterisk-1.8.22.0/asterisk-1.8.22.0.tar.gz) = fca7c971cb0d3621ee64069c4f83aebf10416327
-RMD160 (asterisk-1.8.22.0/asterisk-1.8.22.0.tar.gz) = c232e45463f1915e204e7762a19dceacdd96fb2f
-Size (asterisk-1.8.22.0/asterisk-1.8.22.0.tar.gz) = 25343979 bytes
-SHA1 (asterisk-1.8.22.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 3aac6cf4a07cb2644b7b5369c618b07561619f9f
-RMD160 (asterisk-1.8.22.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 5dc9696c54d2233cf74835fe7ccd2c1791f20041
-Size (asterisk-1.8.22.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 4407925 bytes
+SHA1 (asterisk-1.8.23.0/asterisk-1.8.23.0.tar.gz) = 7e92a8e86b78e5c0e27d247ea8ea671cae74c829
+RMD160 (asterisk-1.8.23.0/asterisk-1.8.23.0.tar.gz) = cdc9d21b02358468445bc9608b177e45adff8b97
+Size (asterisk-1.8.23.0/asterisk-1.8.23.0.tar.gz) = 25278124 bytes
+SHA1 (asterisk-1.8.23.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 3aac6cf4a07cb2644b7b5369c618b07561619f9f
+RMD160 (asterisk-1.8.23.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 5dc9696c54d2233cf74835fe7ccd2c1791f20041
+Size (asterisk-1.8.23.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 4407925 bytes
 SHA1 (patch-aa) = 832f1c043b15198e0a286094dd0cc1a251bcfed0
 SHA1 (patch-af) = 19786616bb606c38f769ec85f2e4d118573659ab
 SHA1 (patch-ai) = e92edab5c1ff323478f41d0b0783102ed527fe39