Date: Mon, 22 Apr 2013 21:11:35 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316277 - in head/net: asterisk asterisk/files asterisk10 asterisk10/files asterisk11 asterisk11/files Message-ID: <201304222111.r3MLBZgW007574@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Mon Apr 22 21:11:34 2013 New Revision: 316277 URL: http://svnweb.freebsd.org/changeset/ports/316277 Log: - update net/asterisk to 1.8.21.0 - update net/asterisk11 to 11.3.0 - add -F to command_args in the rc script, this ensures that asterisk detaches from the controlling terminal. It was possible for the asterisk rc script to prevent a box from reaching full multiuser if e.g. -v was passed to command_args. [1] Reported by: Kurt Lidl <lidl@pix.net> Modified: head/net/asterisk/Makefile head/net/asterisk/distinfo head/net/asterisk/files/asterisk.in (contents, props changed) head/net/asterisk/files/patch-configure head/net/asterisk/pkg-plist head/net/asterisk10/Makefile head/net/asterisk10/files/asterisk.in (contents, props changed) head/net/asterisk11/Makefile head/net/asterisk11/distinfo head/net/asterisk11/files/asterisk.in (contents, props changed) head/net/asterisk11/files/patch-configure head/net/asterisk11/pkg-plist Modified: head/net/asterisk/Makefile ============================================================================== --- head/net/asterisk/Makefile Mon Apr 22 20:57:03 2013 (r316276) +++ head/net/asterisk/Makefile Mon Apr 22 21:11:34 2013 (r316277) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 1.8.20.2 +PORTVERSION= 1.8.21.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ Modified: head/net/asterisk/distinfo ============================================================================== --- head/net/asterisk/distinfo Mon Apr 22 20:57:03 2013 (r316276) +++ head/net/asterisk/distinfo Mon Apr 22 21:11:34 2013 (r316277) @@ -1,2 +1,2 @@ -SHA256 (asterisk-1.8.20.2.tar.gz) = 67d9cb7f569d49bfdbd94f6d81b13bac690abadaff79d68c242ed4e55426b59e -SIZE (asterisk-1.8.20.2.tar.gz) = 25180212 +SHA256 (asterisk-1.8.21.0.tar.gz) = 5f7ae7ac26eaedb6b7274281073a6b469157eaf4b8fd7e69bd0880125cea3380 +SIZE (asterisk-1.8.21.0.tar.gz) = 25334905 Modified: head/net/asterisk/files/asterisk.in ============================================================================== --- head/net/asterisk/files/asterisk.in Mon Apr 22 20:57:03 2013 (r316276) +++ head/net/asterisk/files/asterisk.in Mon Apr 22 21:11:34 2013 (r316277) @@ -23,7 +23,7 @@ stop_cmd="asterisk_stop" reload_cmd="asterisk_reload" command="%%PREFIX%%/sbin/asterisk" -command_args="-n -U %%ASTERISK_USER%%" +command_args="-n -F -U %%ASTERISK_USER%%" pidfile=${asterisk_pidfile:-"/var/run/asterisk/asterisk.pid"} asterisk_stop() { Modified: head/net/asterisk/files/patch-configure ============================================================================== --- head/net/asterisk/files/patch-configure Mon Apr 22 20:57:03 2013 (r316276) +++ head/net/asterisk/files/patch-configure Mon Apr 22 21:11:34 2013 (r316277) @@ -1,6 +1,6 @@ ---- configure.orig 2012-08-09 20:58:44.000000000 +0200 -+++ configure 2012-10-09 00:23:16.383254715 +0200 -@@ -4419,9 +4419,9 @@ +--- configure.orig 2013-01-30 18:44:11.000000000 +0100 ++++ configure 2013-04-20 10:54:05.213563665 +0200 +@@ -4680,9 +4680,9 @@ astheaderdir='${includedir}/asterisk' astlibdir='${libdir}/asterisk' astmandir='${mandir}' @@ -12,7 +12,7 @@ astkeydir='${astvarlibdir}' astspooldir='${localstatedir}/spool/asterisk' astlogdir='${localstatedir}/log/asterisk' -@@ -4444,8 +4444,6 @@ +@@ -4705,8 +4705,6 @@ case "${host_os}" in freebsd*) ac_default_prefix=/usr/local @@ -21,16 +21,16 @@ ;; openbsd*) ac_default_prefix=/usr/local -@@ -29734,6 +29732,8 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF +@@ -18262,6 +18260,8 @@ + + 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 () -@@ -47845,7 +47845,7 @@ +@@ -25941,7 +25941,7 @@ fi @@ -38,4 +38,4 @@ + PLATFORM_OPENH323="h323_${OPENH323_SUFFIX}" if test "${HAS_OPENH323:-unset}" != "unset"; then - { $as_echo "$as_me:$LINENO: checking OpenH323 installation validity" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5 Modified: head/net/asterisk/pkg-plist ============================================================================== --- head/net/asterisk/pkg-plist Mon Apr 22 20:57:03 2013 (r316276) +++ head/net/asterisk/pkg-plist Mon Apr 22 21:11:34 2013 (r316277) @@ -654,11 +654,13 @@ share/asterisk/phoneprov/000000000000.cf share/asterisk/phoneprov/polycom.xml share/asterisk/phoneprov/polycom_line.xml share/asterisk/phoneprov/snom-mac.xml -share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.22 -share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.22 -share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.22 +share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.23 +share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.23 +share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.23 share/asterisk/sounds/en/ascending-2tone.gsm +share/asterisk/sounds/en/conf-adminmenu-18.gsm share/asterisk/sounds/en/conf-adminmenu-162.gsm +share/asterisk/sounds/en/conf-adminmenu-menu8.gsm share/asterisk/sounds/en/conf-extended.gsm share/asterisk/sounds/en/conf-nonextended.gsm share/asterisk/sounds/en/conf-now-muted.gsm @@ -1156,7 +1158,7 @@ share/asterisk/sounds/en/vm-undeleted.gs share/asterisk/sounds/en/vm-unknown-caller.gsm share/asterisk/sounds/en/vm-whichbox.gsm share/asterisk/sounds/en/vm-youhave.gsm -share/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.22 +share/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.23 share/asterisk/static-http/ajamdemo.html share/asterisk/static-http/astman.css share/asterisk/static-http/astman.js Modified: head/net/asterisk10/Makefile ============================================================================== --- head/net/asterisk10/Makefile Mon Apr 22 20:57:03 2013 (r316276) +++ head/net/asterisk10/Makefile Mon Apr 22 21:11:34 2013 (r316277) @@ -3,6 +3,7 @@ PORTNAME= asterisk PORTVERSION= 10.12.2 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ Modified: head/net/asterisk10/files/asterisk.in ============================================================================== --- head/net/asterisk10/files/asterisk.in Mon Apr 22 20:57:03 2013 (r316276) +++ head/net/asterisk10/files/asterisk.in Mon Apr 22 21:11:34 2013 (r316277) @@ -23,7 +23,7 @@ stop_cmd="asterisk_stop" reload_cmd="asterisk_reload" command="%%PREFIX%%/sbin/asterisk" -command_args="-n -U %%ASTERISK_USER%%" +command_args="-n -F -U %%ASTERISK_USER%%" pidfile=${asterisk_pidfile:-"/var/run/asterisk/asterisk.pid"} asterisk_stop() { Modified: head/net/asterisk11/Makefile ============================================================================== --- head/net/asterisk11/Makefile Mon Apr 22 20:57:03 2013 (r316276) +++ head/net/asterisk11/Makefile Mon Apr 22 21:11:34 2013 (r316277) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 11.2.2 +PORTVERSION= 11.3.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ Modified: head/net/asterisk11/distinfo ============================================================================== --- head/net/asterisk11/distinfo Mon Apr 22 20:57:03 2013 (r316276) +++ head/net/asterisk11/distinfo Mon Apr 22 21:11:34 2013 (r316277) @@ -1,2 +1,2 @@ -SHA256 (asterisk-11.2.2.tar.gz) = b470a27745735a49e83dc9842ec892c9b4ab186e5d44db68ea1db66e6c684c7b -SIZE (asterisk-11.2.2.tar.gz) = 30468125 +SHA256 (asterisk-11.3.0.tar.gz) = 35b7dd5d21449384ebcab631915a844d631676ff6535a6c14bd2bac819808f09 +SIZE (asterisk-11.3.0.tar.gz) = 30629838 Modified: head/net/asterisk11/files/asterisk.in ============================================================================== --- head/net/asterisk11/files/asterisk.in Mon Apr 22 20:57:03 2013 (r316276) +++ head/net/asterisk11/files/asterisk.in Mon Apr 22 21:11:34 2013 (r316277) @@ -23,7 +23,7 @@ stop_cmd="asterisk_stop" reload_cmd="asterisk_reload" command="%%PREFIX%%/sbin/asterisk" -command_args="-n -U %%ASTERISK_USER%%" +command_args="-n -F -U %%ASTERISK_USER%%" pidfile=${asterisk_pidfile:-"/var/run/asterisk/asterisk.pid"} asterisk_stop() { Modified: head/net/asterisk11/files/patch-configure ============================================================================== --- head/net/asterisk11/files/patch-configure Mon Apr 22 20:57:03 2013 (r316276) +++ head/net/asterisk11/files/patch-configure Mon Apr 22 21:11:34 2013 (r316277) @@ -1,6 +1,6 @@ ---- configure.orig 2012-10-18 22:02:02.000000000 +0200 -+++ configure 2012-12-12 02:37:25.609625743 +0100 -@@ -4300,9 +4300,9 @@ +--- configure.orig 2013-01-30 18:46:52.000000000 +0100 ++++ configure 2013-04-20 10:55:21.078558716 +0200 +@@ -4571,9 +4571,9 @@ astlibdir='${libdir}' astmoddir='${libdir}/asterisk/modules' astmandir='${mandir}' @@ -12,7 +12,7 @@ astkeydir='${astvarlibdir}' astspooldir='${localstatedir}/spool/asterisk' astlogdir='${localstatedir}/log/asterisk' -@@ -4325,8 +4325,6 @@ +@@ -4596,8 +4596,6 @@ case "${host_os}" in freebsd*) ac_default_prefix=/usr/local @@ -21,16 +21,16 @@ ;; openbsd*) ac_default_prefix=/usr/local -@@ -29331,6 +29329,8 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF +@@ -17840,6 +17838,8 @@ + + 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 () -@@ -48461,7 +48461,7 @@ +@@ -26041,7 +26041,7 @@ fi @@ -38,4 +38,4 @@ + PLATFORM_OPENH323="h323_${OPENH323_SUFFIX}" if test "${HAS_OPENH323:-unset}" != "unset"; then - { $as_echo "$as_me:$LINENO: checking OpenH323 installation validity" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5 Modified: head/net/asterisk11/pkg-plist ============================================================================== --- head/net/asterisk11/pkg-plist Mon Apr 22 20:57:03 2013 (r316276) +++ head/net/asterisk11/pkg-plist Mon Apr 22 21:11:34 2013 (r316277) @@ -698,12 +698,14 @@ share/asterisk/phoneprov/000000000000.cf share/asterisk/phoneprov/polycom.xml share/asterisk/phoneprov/polycom_line.xml share/asterisk/phoneprov/snom-mac.xml -share/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.22 -share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.22 -share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.22 -share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.22 +share/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.23 +share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.23 +share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.23 +share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.23 share/asterisk/sounds/en/ascending-2tone.gsm share/asterisk/sounds/en/conf-adminmenu-162.gsm +share/asterisk/sounds/en/conf-adminmenu-18.gsm +share/asterisk/sounds/en/conf-adminmenu-menu8.gsm share/asterisk/sounds/en/conf-extended.gsm share/asterisk/sounds/en/conf-nonextended.gsm share/asterisk/sounds/en/conf-now-muted.gsm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304222111.r3MLBZgW007574>