cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix update to Asterisk 10.11.0

Browse Source 
- while there, revise pbx_spool.c kevent timeout fix; rather than
clamping the timestamp, in the particular problem situation we hit
the loop (where dirlist is empty), pass in NULL rather than
INT_MAX-timenow similar to what's done in the inotify case.
This commit is contained in:
sthen 2012-12-11 14:46:41 +00:00
parent 03f48a2e3a
commit c38a08495b
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/asterisk/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.165 2012/12/07 12:20:27 sthen Exp $
# $OpenBSD: Makefile,v 1.166 2012/12/11 14:46:41 sthen Exp $
SHARED_ONLY= Yes
COMMENT-main= open source multi-protocol PBX and telephony toolkit
VER= 10.10.1
VER= 10.11.0
DISTNAME= asterisk-${VER:S/beta/-beta/:S/rc/-rc/}
PKGNAME-main= asterisk-${VER}

4
telephony/asterisk/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (asterisk-10.10.1.tar.gz) = ww8RrhpDNM8/By67KtlbQjV5Qo3FnQ60VGTZ/UQNA2s=
SIZE (asterisk-10.10.1.tar.gz) = 25069495
SHA256 (asterisk-10.11.0.tar.gz) = 9YC0o0H37vWh0lu1/OQquez/44isGxigXBmOmUUjcTE=
SIZE (asterisk-10.11.0.tar.gz) = 25095528

10
telephony/asterisk/patches/patch-configure_ac
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.26 2012/09/28 00:03:57 sthen Exp $
--- configure.ac.orig Thu Apr 12 16:01:13 2012
+++ configure.ac Tue Sep 18 23:44:17 2012
$OpenBSD: patch-configure_ac,v 1.27 2012/12/11 14:46:41 sthen Exp $
--- configure.ac.orig Thu Oct 18 20:53:08 2012
+++ configure.ac Tue Dec 11 10:56:24 2012
@@ -59,7 +59,7 @@ AC_SUBST([astvarrundir], ['${localstatedir}/run/a
case "${host_os}" in
@ -10,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.26 2012/09/28 00:03:57 sthen Exp $
astvarlibdir='${prefix}/share/asterisk'
astdbdir='${localstatedir}/db/asterisk'
fi
@@ -1617,7 +1617,7 @@ if test "${USE_IMAP_TK}" != "no"; then
@@ -1618,7 +1618,7 @@ if test "${USE_IMAP_TK}" != "no"; then
)
else #looking in imap directory didn't work, try c-client
imap_ldflags=""
@ -19,7 +19,7 @@ $OpenBSD: patch-configure_ac,v 1.26 2012/09/28 00:03:57 sthen Exp $
imap_include="-DUSE_SYSTEM_CCLIENT"
CPPFLAGS="${saved_cppflags}"
LIBS="${saved_libs}"
@@ -1803,7 +1803,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--
@@ -1804,7 +1804,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--
AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])

22
telephony/asterisk/patches/patch-pbx_pbx_spool_c
View File

@ -1,16 +1,16 @@
$OpenBSD: patch-pbx_pbx_spool_c,v 1.2 2012/09/28 00:03:57 sthen Exp $
--- pbx/pbx_spool.c.orig Mon Feb 13 22:03:33 2012
+++ pbx/pbx_spool.c Thu Mar 29 21:47:56 2012
@@ -723,6 +723,12 @@ static void *scan_thread(void *unused)
$OpenBSD: patch-pbx_pbx_spool_c,v 1.3 2012/12/11 14:46:41 sthen Exp $
Don't pass an invalid time limit to kevent() if the directory list is empty
(limit is 100M seconds; see itimerfix() in /sys/kern/kern_time.c).
--- pbx/pbx_spool.c.orig Mon Oct 8 22:11:41 2012
+++ pbx/pbx_spool.c Tue Dec 11 14:34:03 2012
@@ -742,7 +742,7 @@ static void *scan_thread(void *unused)
queue_created_files();
#else
struct timespec ts2 = { next - now, 0 };
+ /*
+ * OpenBSD: interval timer must be <=100M seconds;
+ * see itimerfix() in /sys/kern/kern_time.c
+ */
+ if (ts2.tv_sec > 100000000)
+ ts2.tv_sec = 100000000;
if (kevent(inotify_fd, NULL, 0, &kev, 1, &ts2) <= 0) {
- if (kevent(inotify_fd, NULL, 0, &kev, 1, &ts2) <= 0) {
+ if (kevent(inotify_fd, NULL, 0, &kev, 1, next == INT_MAX ? NULL : &ts2) <= 0) {
/* Interrupt or timeout, restart calculations */
continue;
} else {