seems alright on amd64, sparc64.

"There are many areas that have been significantly improved by various
fixes.  Those include the IAX2 channel driver, Queues, timezone
handling, AEL, the Manager Interface, MeetMe, AGI, the SIP channel
driver, Music on Hold, Jabber, the Gtalk channel driver, and more."

changelog is here:
http://svn.digium.com/view/asterisk/tags/1.4.12/ChangeLog?view=markup

comments/ok?

cvs server: Diffing .
Index: Makefile
===================================================================
RCS file: /cvs/ports/telephony/asterisk/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile    5 Sep 2007 22:42:52 -0000       1.23
+++ Makefile    3 Oct 2007 23:22:06 -0000
@@ -3,7 +3,7 @@
 SHARED_ONLY=           Yes
 COMMENT-main=          open source multi-protocol PBX and telephony toolkit
 
-V=                     1.4.11
+V=                     1.4.12
 DISTNAME=              asterisk-${V}
 FULLPKGNAME-main=      ${DISTNAME}
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/telephony/asterisk/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo    5 Sep 2007 22:42:52 -0000       1.17
+++ distinfo    3 Oct 2007 23:22:06 -0000
@@ -1,5 +1,5 @@
-MD5 (asterisk-1.4.11.tar.gz) = O6mzmf7caN5IRbHFYD0WfA==
-RMD160 (asterisk-1.4.11.tar.gz) = MAKC9QbLIvkSfoWMfXjYzuimIqc=
-SHA1 (asterisk-1.4.11.tar.gz) = KicVXdcWv4vT+S/p7uf+guMRFww=
-SHA256 (asterisk-1.4.11.tar.gz) = mZKPiqti5TLnH97L0Y1a8tIR8bvOJ8+c8u/DTleiAQE=
-SIZE (asterisk-1.4.11.tar.gz) = 11218944
+MD5 (asterisk-1.4.12.tar.gz) = 8qyYuTILl6dAmoBTFeffGQ==
+RMD160 (asterisk-1.4.12.tar.gz) = 6XWkdRodgSuVN/5o5CrBUFlyilE=
+SHA1 (asterisk-1.4.12.tar.gz) = vOZNgFfnUBxtNbSGnvdivYvDBtM=
+SHA256 (asterisk-1.4.12.tar.gz) = ge8nGAMWAQIc5rqzwf5pj7AH5jjOe1oY5RBxJFFnEY8=
+SIZE (asterisk-1.4.12.tar.gz) = 11255703
cvs server: Diffing files
cvs server: Diffing patches
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 patch-Makefile
--- patches/patch-Makefile      5 Sep 2007 22:42:52 -0000       1.11
+++ patches/patch-Makefile      3 Oct 2007 23:22:06 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-Makefile,v 1.11 2007/09/05 22:42:52 sthen Exp $
---- Makefile.orig      Fri Aug 10 00:10:46 2007
-+++ Makefile   Wed Aug 15 22:17:33 2007
+--- Makefile.orig      Tue Oct  2 21:06:07 2007
++++ Makefile   Wed Oct  3 12:50:21 2007
 @@ -35,6 +35,7 @@ export ASTVARRUNDIR
  export MODULES_DIR
  export ASTSPOOLDIR
@@ -9,8 +9,8 @@ $OpenBSD: patch-Makefile,v 1.11 2007/09/
  export ASTDATADIR
  export ASTLOGDIR
  export ASTLIBDIR
-@@ -74,7 +75,7 @@ ifneq ($(wildcard makeopts),)
- endif
+@@ -81,7 +82,7 @@ ASTCFLAGS+=$(COPTS)
+ ASTLDFLAGS+=$(LDOPTS)
  
  #Uncomment this to see all build commands instead of 'quiet' output
 -#NOISY_BUILD=yes
@@ -18,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.11 2007/09/
  
  # Create OPTIONS variable
  OPTIONS=
-@@ -85,7 +86,7 @@ ASTTOPDIR:=$(shell pwd)
+@@ -92,7 +93,7 @@ ASTTOPDIR:=$(shell pwd)
  OVERWRITE=y
  
  # Include debug and macro symbols in the executables (-g) and profiling info 
(-pg)
@@ -27,7 +27,7 @@ $OpenBSD: patch-Makefile,v 1.11 2007/09/
  
  # Staging directory
  # Files are copied here temporarily during the install process
-@@ -120,6 +121,7 @@ else
+@@ -127,6 +128,7 @@ else
  ifneq ($(findstring BSD,$(OSARCH)),)
    ASTVARLIBDIR=$(prefix)/share/asterisk
    ASTVARRUNDIR=$(localstatedir)/run/asterisk
@@ -35,7 +35,7 @@ $OpenBSD: patch-Makefile,v 1.11 2007/09/
  else
    ASTVARLIBDIR=$(localstatedir)/lib/asterisk
  endif
-@@ -148,8 +150,10 @@ HTTP_CGIDIR=/var/www/cgi-bin
+@@ -155,8 +157,10 @@ HTTP_CGIDIR=/var/www/cgi-bin
  # The file /etc/asterisk.makeopts will also be included but can be overridden
  # by the file in your home directory.
  
@@ -46,7 +46,7 @@ $OpenBSD: patch-Makefile,v 1.11 2007/09/
  
  MOD_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
  OTHER_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
-@@ -187,7 +191,7 @@ ifeq ($(OSARCH),linux-gnu)
+@@ -194,7 +198,7 @@ ifeq ($(OSARCH),linux-gnu)
    endif
  endif
  
@@ -55,7 +55,7 @@ $OpenBSD: patch-Makefile,v 1.11 2007/09/
  
  ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h
  
-@@ -200,9 +204,11 @@ ifneq ($(findstring BSD,$(OSARCH)),)
+@@ -207,9 +211,11 @@ ifneq ($(findstring BSD,$(OSARCH)),)
    ASTLDFLAGS+=-L/usr/local/lib
  endif
  
@@ -67,7 +67,7 @@ $OpenBSD: patch-Makefile,v 1.11 2007/09/
  
  ifeq ($(PROC),ppc)
    ASTCFLAGS+=-fsigned-char
-@@ -541,21 +547,25 @@ samples: adsi
+@@ -552,21 +558,25 @@ samples: adsi
                echo "astetcdir => $(ASTETCDIR)" ; \
                echo "astmoddir => $(MODULES_DIR)" ; \
                echo "astvarlibdir => $(ASTVARLIBDIR)" ; \
Index: patches/patch-build_tools_make_defaults_h
===================================================================
RCS file: 
/cvs/ports/telephony/asterisk/patches/patch-build_tools_make_defaults_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-build_tools_make_defaults_h
--- patches/patch-build_tools_make_defaults_h   5 Sep 2007 22:42:52 -0000       
1.3
+++ patches/patch-build_tools_make_defaults_h   3 Oct 2007 23:22:06 -0000
@@ -1,10 +1,10 @@
 $OpenBSD: patch-build_tools_make_defaults_h,v 1.3 2007/09/05 22:42:52 sthen 
Exp $
---- build_tools/make_defaults_h.orig   Sat Apr 15 23:53:53 2006
-+++ build_tools/make_defaults_h        Mon Jun 18 12:01:50 2007
+--- build_tools/make_defaults_h.orig   Mon Sep 24 18:22:08 2007
++++ build_tools/make_defaults_h        Wed Oct  3 12:54:37 2007
 @@ -15,7 +15,7 @@ cat << END
  #define AST_LOG_DIR    "${INSTALL_PATH}${ASTLOGDIR}"
  #define AST_AGI_DIR    "${INSTALL_PATH}${AGI_DIR}"
- #define AST_KEY_DIR    "${INSTALL_PATH}${ASTVARLIBDIR}/keys"
+ #define AST_KEY_DIR    "${INSTALL_PATH}${ASTDATADIR}/keys"
 -#define AST_DB         "${INSTALL_PATH}${ASTVARLIBDIR}/astdb"
 +#define AST_DB         "${INSTALL_PATH}${ASTDBDIR}/astdb"
  #define AST_TMP_DIR    "${INSTALL_PATH}${ASTSPOOLDIR}/tmp"
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure
--- patches/patch-configure     5 Sep 2007 22:42:52 -0000       1.1
+++ patches/patch-configure     3 Oct 2007 23:22:06 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure,v 1.1 2007/09/05 22:42:52 sthen Exp $
---- configure.orig     Mon Aug  6 15:18:20 2007
-+++ configure  Tue Aug  7 23:24:28 2007
-@@ -18435,7 +18435,11 @@ echo $ECHO_N "checking for UW IMAP Toolkit c-client li
+--- configure.orig     Fri Sep 14 16:50:49 2007
++++ configure  Wed Oct  3 12:50:22 2007
+@@ -18468,7 +18468,11 @@ echo $ECHO_N "checking for UW IMAP Toolkit c-client li
        imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
     fi
     CPPFLAGS="${CPPFLAGS} -I${IMAP_TK_DIR}/c-client"
@@ -14,7 +14,7 @@ $OpenBSD: patch-configure,v 1.1 2007/09/
     cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22140,13 +22144,13 @@ if test "${USE_UNIXODBC}" != "no"; then
+@@ -22173,13 +22177,13 @@ if test "${USE_UNIXODBC}" != "no"; then
                 pbxlibdir="-L${UNIXODBC_DIR}"
        fi
     fi
@@ -31,7 +31,7 @@ $OpenBSD: patch-configure,v 1.1 2007/09/
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22209,7 +22213,7 @@ fi
+@@ -22242,7 +22246,7 @@ fi
  
  
     if test "${AST_UNIXODBC_FOUND}" = "yes"; then
@@ -40,7 +40,7 @@ $OpenBSD: patch-configure,v 1.1 2007/09/
        UNIXODBC_HEADER_FOUND="1"
        if test "x${UNIXODBC_DIR}" != "x"; then
           UNIXODBC_LIB="${pbxlibdir} ${UNIXODBC_LIB}"
-@@ -25640,7 +25644,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -25673,7 +25677,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
                PWLIB_VERSION=`grep "PWLIB_VERSION" 
${PWLIB_INCDIR}/ptbuildopts.h | cut -f2 -d ' ' | sed -e 's/"//g'`
                PWLIB_MAJOR_VERSION=`echo ${PWLIB_VERSION} | cut -f1 -d.`
                PWLIB_MINOR_VERSION=`echo ${PWLIB_VERSION} | cut -f2 -d.`
@@ -49,7 +49,7 @@ $OpenBSD: patch-configure,v 1.1 2007/09/
                let 
PWLIB_VER=${PWLIB_MAJOR_VERSION}*10000+${PWLIB_MINOR_VERSION}*100+${PWLIB_BUILD_NUMBER}
                let PWLIB_REQ=1*10000+9*100+2
  
-@@ -25742,6 +25746,9 @@ esac
+@@ -25775,6 +25779,9 @@ esac
  
  PWLIB_PLATFORM="${PWLIB_OSTYPE}_${PWLIB_MACHTYPE}"
  
@@ -59,7 +59,7 @@ $OpenBSD: patch-configure,v 1.1 2007/09/
  
  
  
-@@ -26580,7 +26587,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -26613,7 +26620,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
                OPENH323_VERSION=`grep "OPENH323_VERSION" 
${OPENH323_INCDIR}/openh323buildopts.h | cut -f2 -d ' ' | sed -e 's/"//g'`
                OPENH323_MAJOR_VERSION=`echo ${OPENH323_VERSION} | cut -f1 -d.`
                OPENH323_MINOR_VERSION=`echo ${OPENH323_VERSION} | cut -f2 -d.`
@@ -68,7 +68,7 @@ $OpenBSD: patch-configure,v 1.1 2007/09/
                let 
OPENH323_VER=${OPENH323_MAJOR_VERSION}*10000+${OPENH323_MINOR_VERSION}*100+${OPENH323_BUILD_NUMBER}
                let OPENH323_REQ=1*10000+17*100+3
  
-@@ -26601,7 +26608,7 @@ echo "${ECHO_T}yes" >&6; }
+@@ -26634,7 +26641,7 @@ echo "${ECHO_T}yes" >&6; }
                { echo "$as_me:$LINENO: checking OpenH323 build option" >&5
  echo $ECHO_N "checking OpenH323 build option... $ECHO_C" >&6; }
                OPENH323_SUFFIX=
@@ -77,7 +77,7 @@ $OpenBSD: patch-configure,v 1.1 2007/09/
                for pfx in $prefixes; do
                        files=`ls -l ${OPENH323_LIBDIR}/lib${pfx}*.so* 
2>/dev/null`
                        libfile=
-@@ -26629,7 +26636,8 @@ echo $ECHO_N "checking OpenH323 build option... $ECHO_
+@@ -26662,7 +26669,8 @@ echo $ECHO_N "checking OpenH323 build option... $ECHO_
                        d)
                                OPENH323_BUILD="debug";;
                        *)
@@ -87,7 +87,7 @@ $OpenBSD: patch-configure,v 1.1 2007/09/
                                        notrace=`eval "grep NOTRACE 
${OPENH323DIR}/openh323u.mak | grep = | sed -e 's/[A-Z0-9_]*[       ]*=[    
]*//'"`
                                        if test "x$notrace" = "x"; then
                                                notrace="0"
-@@ -30668,7 +30676,7 @@ if test "${ac_cv_lib_vorbis_vorbis_info_init+set}" = s
+@@ -31100,7 +31108,7 @@ if test "${ac_cv_lib_vorbis_vorbis_info_init+set}" = s
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
Index: patches/patch-contrib_scripts_safe_asterisk
===================================================================
RCS file: 
/cvs/ports/telephony/asterisk/patches/patch-contrib_scripts_safe_asterisk,v
retrieving revision 1.4
diff -u -p -r1.4 patch-contrib_scripts_safe_asterisk
--- patches/patch-contrib_scripts_safe_asterisk 5 Sep 2007 22:42:52 -0000       
1.4
+++ patches/patch-contrib_scripts_safe_asterisk 3 Oct 2007 23:22:06 -0000
@@ -1,7 +1,9 @@
 $OpenBSD: patch-contrib_scripts_safe_asterisk,v 1.4 2007/09/05 22:42:52 sthen 
Exp $
---- contrib/scripts/safe_asterisk.orig Mon Jun 18 18:46:40 2007
-+++ contrib/scripts/safe_asterisk      Wed Aug  1 13:01:21 2007
-@@ -2,19 +2,20 @@
+--- contrib/scripts/safe_asterisk.orig Thu Sep 20 22:01:20 2007
++++ contrib/scripts/safe_asterisk      Wed Oct  3 21:15:26 2007
+@@ -1,20 +1,21 @@
+-#!/bin/bash
++#!/bin/sh
  # vim:textwidth=80:tabstop=4:shiftwidth=4:smartindent:autoindent
  
  CLIARGS="$*"                          # Grab any args passed to safe_asterisk
Index: patches/patch-main_asterisk_c
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-main_asterisk_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-main_asterisk_c
--- patches/patch-main_asterisk_c       5 Sep 2007 22:42:52 -0000       1.1
+++ patches/patch-main_asterisk_c       3 Oct 2007 23:22:06 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-main_asterisk_c,v 1.1 2007/09/05 22:42:52 sthen Exp $
---- main/asterisk.c.orig       Thu Jun 28 00:29:14 2007
-+++ main/asterisk.c    Mon Jul  2 15:45:09 2007
-@@ -2394,6 +2394,7 @@ static void ast_readconfig(void) 
+--- main/asterisk.c.orig       Thu Sep 20 22:16:48 2007
++++ main/asterisk.c    Wed Oct  3 12:50:22 2007
+@@ -2403,6 +2403,7 @@ static void ast_readconfig(void) 
                        snprintf(ast_config_AST_MONITOR_DIR, 
sizeof(ast_config_AST_MONITOR_DIR) - 1, "%s/monitor", v->value);
                } else if (!strcasecmp(v->name, "astvarlibdir")) {
                        ast_copy_string(ast_config_AST_VAR_DIR, v->value, 
sizeof(ast_config_AST_VAR_DIR));
@@ -9,7 +9,7 @@ $OpenBSD: patch-main_asterisk_c,v 1.1 20
                        snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), 
"%s/astdb", v->value);
                } else if (!strcasecmp(v->name, "astdatadir")) {
                        ast_copy_string(ast_config_AST_DATA_DIR, v->value, 
sizeof(ast_config_AST_DATA_DIR));
-@@ -2692,12 +2693,20 @@ int main(int argc, char *argv[])
+@@ -2701,12 +2702,20 @@ int main(int argc, char *argv[])
                rungroup = ast_config_AST_RUN_GROUP;
        if ((!runuser) && !ast_strlen_zero(ast_config_AST_RUN_USER))
                runuser = ast_config_AST_RUN_USER;
@@ -30,7 +30,7 @@ $OpenBSD: patch-main_asterisk_c,v 1.1 20
        if (!is_child_of_nonroot && rungroup) {
                struct group *gr;
                gr = getgrnam(rungroup);
-@@ -2742,7 +2751,7 @@ int main(int argc, char *argv[])
+@@ -2751,7 +2760,7 @@ int main(int argc, char *argv[])
                if (option_verbose)
                        ast_verbose("Running as user '%s'\n", runuser);
        }
cvs server: Diffing pkg
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/telephony/asterisk/pkg/PLIST-main,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-main
--- pkg/PLIST-main      5 Sep 2007 22:42:52 -0000       1.1
+++ pkg/PLIST-main      3 Oct 2007 23:22:06 -0000
@@ -17,6 +17,7 @@ include/asterisk/ast_expr.h
 include/asterisk/astdb.h
 include/asterisk/astmm.h
 include/asterisk/astobj.h
+include/asterisk/astobj2.h
 include/asterisk/astosp.h
 include/asterisk/autoconfig.h
 include/asterisk/build.h
@@ -753,7 +754,6 @@ share/examples/asterisk/default/manager.
 @comment share/examples/asterisk/default/meetme.conf
 share/examples/asterisk/default/mgcp.conf
 @comment share/examples/asterisk/default/misdn.conf
[EMAIL PROTECTED] share/examples/asterisk/default/modem.conf
 share/examples/asterisk/default/modules.conf
 share/examples/asterisk/default/musiconhold.conf
 share/examples/asterisk/default/muted.conf

Reply via email to