diff options
Diffstat (limited to 'comms')
-rw-r--r-- | comms/asterisk16/PLIST | 3 | ||||
-rw-r--r-- | comms/asterisk16/distinfo | 29 | ||||
-rw-r--r-- | comms/asterisk16/patches/patch-aq | 157 | ||||
-rw-r--r-- | comms/asterisk16/patches/patch-be | 13 |
4 files changed, 44 insertions, 158 deletions
diff --git a/comms/asterisk16/PLIST b/comms/asterisk16/PLIST index c175a12a124..8c787df00ee 100644 --- a/comms/asterisk16/PLIST +++ b/comms/asterisk16/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2010/12/12 10:19:44 jnemeth Exp $ +@comment $NetBSD: PLIST,v 1.18 2011/06/06 06:25:06 jnemeth Exp $ include/asterisk.h include/asterisk/_private.h include/asterisk/abstract_jb.h @@ -306,6 +306,7 @@ libdata/asterisk/phoneprov/000000000000-phone.cfg 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/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.20 diff --git a/comms/asterisk16/distinfo b/comms/asterisk16/distinfo index c3287ff8342..e14e6fec4eb 100644 --- a/comms/asterisk16/distinfo +++ b/comms/asterisk16/distinfo @@ -1,17 +1,17 @@ -$NetBSD: distinfo,v 1.20 2011/01/21 05:13:12 jnemeth Exp $ +$NetBSD: distinfo,v 1.21 2011/06/06 06:25:06 jnemeth Exp $ -SHA1 (asterisk-1.6.2.16.1/asterisk-1.6.2.16.1.tar.gz) = 43c6ce9c3e1461bd858dd283a5a8b4753323432c -RMD160 (asterisk-1.6.2.16.1/asterisk-1.6.2.16.1.tar.gz) = f34c759d1f47f4f55fc7468581251bc078a8c930 -Size (asterisk-1.6.2.16.1/asterisk-1.6.2.16.1.tar.gz) = 23707383 bytes -SHA1 (asterisk-1.6.2.16.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9 -RMD160 (asterisk-1.6.2.16.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6 -Size (asterisk-1.6.2.16.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes -SHA1 (asterisk-1.6.2.16.1/extract-cfile.awk) = c4f08eee1ab83c041bde1ab91672a4a3c43c28b8 -RMD160 (asterisk-1.6.2.16.1/extract-cfile.awk) = cd59f8e5807732023d5aec95187e2d5572f400a4 -Size (asterisk-1.6.2.16.1/extract-cfile.awk) = 667 bytes -SHA1 (asterisk-1.6.2.16.1/rfc3951.txt) = 1a6c769be750fb02456d60db2470909254496017 -RMD160 (asterisk-1.6.2.16.1/rfc3951.txt) = 15f7ec61653ec9953172f8f2150e7d8f6f620926 -Size (asterisk-1.6.2.16.1/rfc3951.txt) = 373442 bytes +SHA1 (asterisk-1.6.2.18/asterisk-1.6.2.18.tar.gz) = 0bbe7039da52848ef54175fe9907aed03915629f +RMD160 (asterisk-1.6.2.18/asterisk-1.6.2.18.tar.gz) = 95769626b0acde1a1323d396f3f80923c629e402 +Size (asterisk-1.6.2.18/asterisk-1.6.2.18.tar.gz) = 23764595 bytes +SHA1 (asterisk-1.6.2.18/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9 +RMD160 (asterisk-1.6.2.18/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6 +Size (asterisk-1.6.2.18/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes +SHA1 (asterisk-1.6.2.18/extract-cfile.awk) = c4f08eee1ab83c041bde1ab91672a4a3c43c28b8 +RMD160 (asterisk-1.6.2.18/extract-cfile.awk) = cd59f8e5807732023d5aec95187e2d5572f400a4 +Size (asterisk-1.6.2.18/extract-cfile.awk) = 667 bytes +SHA1 (asterisk-1.6.2.18/rfc3951.txt) = 1a6c769be750fb02456d60db2470909254496017 +RMD160 (asterisk-1.6.2.18/rfc3951.txt) = 15f7ec61653ec9953172f8f2150e7d8f6f620926 +Size (asterisk-1.6.2.18/rfc3951.txt) = 373442 bytes SHA1 (patch-aa) = 8c2a3c75adff34474c8f416bcea5842e771e4631 SHA1 (patch-af) = 09860d714281cb4c65d1a087cf5b16647a16e2fa SHA1 (patch-ag) = c71c61350cefbbe53eefa99245ca7712753f22d5 @@ -22,7 +22,7 @@ SHA1 (patch-am) = 98aa4648b867d193ec05d8da14434205f369c17b SHA1 (patch-an) = 93a5df66fd6459fb76e9191dc3bf37b9ee5483b5 SHA1 (patch-ao) = 0663a698469550b22bb97ee1b18980bc2bc67495 SHA1 (patch-ap) = 309d51a35c600f4898d99ad6ab1c492c47c6a55a -SHA1 (patch-aq) = b20c76de4385da836c627f5310c52beafcdf86d0 +SHA1 (patch-aq) = 52b14e5483704cf68195c84a85c8392b1bbb2120 SHA1 (patch-ar) = 44e46336c0b228ab291e025b8bb5ee505f75345a SHA1 (patch-as) = a887d37f0829c22d115ff08721893da49e4bfda4 SHA1 (patch-at) = 7f366ea0075b16c81bb81ba78becc029b3265151 @@ -36,3 +36,4 @@ SHA1 (patch-ba) = 915eb587d36f3a54734c9c88af15f59c98016708 SHA1 (patch-bb) = 3b78ed3c8233e2db38d09ca81f1768d018ffd2e2 SHA1 (patch-bc) = 0efc99595d1ef82a879361e8bf3b2ef7fd84af62 SHA1 (patch-bd) = c827419664f78230556e43607d1abf6b156dcc88 +SHA1 (patch-be) = b9d1e891b1d1d45612b5b02067393e2845663030 diff --git a/comms/asterisk16/patches/patch-aq b/comms/asterisk16/patches/patch-aq index f646dd7904e..4ce738bcce6 100644 --- a/comms/asterisk16/patches/patch-aq +++ b/comms/asterisk16/patches/patch-aq @@ -1,142 +1,13 @@ -$NetBSD: patch-aq,v 1.10 2011/01/16 06:30:56 jnemeth Exp $ +$NetBSD: patch-aq,v 1.11 2011/06/06 06:25:06 jnemeth Exp $ ---- configure.orig 2011-01-12 16:43:16.000000000 +0000 +--- configure.orig 2011-01-27 17:01:24.000000000 +0000 +++ configure -@@ -21275,6 +21275,146 @@ fi +@@ -15215,6 +15215,17 @@ fi -+if test "${ac_cv_header_sys_atomic_h+set}" = set; then -+ { echo "$as_me:$LINENO: checking for sys/atomic.h" >&5 -+echo $ECHO_N "checking for sys/atomic.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_sys_atomic_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_atomic_h" >&5 -+echo "${ECHO_T}$ac_cv_sys_atomic_h" >&6; } -+else -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking sys/atomic.h usability" >&5 -+echo $ECHO_N "checking sys/atomic.h usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <sys/atomic.h> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ echo "$as_me:$LINENO: checking sys/atomic.h presence" >&5 -+echo $ECHO_N "checking sys/atomic.h presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <sys/atomic.h> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+ -+rm -f conftest.err conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: sys/atomic.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: sys/atomic.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: sys/atomic.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libkern/OSAtomic.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: sys/atomic.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: sys/atomic.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: sys/atomic.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: sys/atomic.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: sys/atomic.h: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ------------------------------------------ ## -+## Report this to https://issues.asterisk.org ## -+## ------------------------------------------ ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ echo "$as_me:$LINENO: checking for sys/atomic.h" >&5 -+echo $ECHO_N "checking for sys/atomic.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_sys_atomic_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_cv_header_sys_atomic_h=$ac_header_preproc -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_atomic_h" >&5 -+echo "${ECHO_T}$ac_cv_header_sys_atomic_h" >&6; } -+ -+fi -+if test $ac_cv_header_sys_atomic_h = yes; then ++ac_fn_c_check_header_mongrel "$LINENO" "sys/atomic.h" "ac_cv_header_sys_atomic_h" "$ac_includes_default" ++if test "x$ac_cv_header_sys_atomic_h" = x""yes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_ATOMIC_H 1 @@ -146,15 +17,15 @@ $NetBSD: patch-aq,v 1.10 2011/01/16 06:30:56 jnemeth Exp $ + + + - { echo "$as_me:$LINENO: checking for int" >&5 - echo $ECHO_N "checking for int... $ECHO_C" >&6; } - if test "${ac_cv_type_int+set}" = set; then -@@ -24509,6 +24649,8 @@ _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF + # 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]];'. +@@ -16181,6 +16192,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 () diff --git a/comms/asterisk16/patches/patch-be b/comms/asterisk16/patches/patch-be new file mode 100644 index 00000000000..3fb10a00c01 --- /dev/null +++ b/comms/asterisk16/patches/patch-be @@ -0,0 +1,13 @@ +$NetBSD: patch-be,v 1.1 2011/06/06 06:25:06 jnemeth Exp $ + +--- contrib/scripts/autosupport.orig 2011-01-04 20:59:56.000000000 +0000 ++++ contrib/scripts/autosupport +@@ -32,7 +32,7 @@ files="n"; + # If a prefix is specified on command-line, add it. + if (set -u; : $1) 2> /dev/null + then +- if [ $1 == "-h" ] || [ $1 == "--help" ]; then ++ if [ $1 = "-h" ] || [ $1 = "--help" ]; then + echo + echo "Digium autosupport script" + echo "Copyright (C) 2005-2010, Digium, Inc." |