From 7cdcfc5ff0305f0a806fd5c5a483275f329bbfdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Tue, 15 Jan 2013 09:49:56 +0200 Subject: main/asterisk: upgrade to 11.2.0 Rebase uclibc-daemon patch, and cherry-pick regression fix for ASTERISK-20938. --- main/asterisk/100-uclibc-daemon.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'main/asterisk/100-uclibc-daemon.patch') diff --git a/main/asterisk/100-uclibc-daemon.patch b/main/asterisk/100-uclibc-daemon.patch index 4956791d4d..a1e2b0b20e 100644 --- a/main/asterisk/100-uclibc-daemon.patch +++ b/main/asterisk/100-uclibc-daemon.patch @@ -7,7 +7,7 @@ diff -Nru asterisk-1.6.1-beta4.org/main/asterisk.c asterisk-1.6.1-beta4/main/ast #ifndef HAVE_SBIN_LAUNCHD +#ifndef __UCLIBC__ if (daemon(1, 0) < 0) { - ast_log(LOG_ERROR, "daemon() failed: %s\n", strerror(errno)); + fprintf(stderr, "daemon() failed: %s\n", strerror(errno)); } +#else + /* @@ -39,6 +39,6 @@ diff -Nru asterisk-1.6.1-beta4.org/main/asterisk.c asterisk-1.6.1-beta4/main/ast + close(fd); + } +#endif - ast_mainpid = getpid(); - /* Blindly re-write pid file since we are forking */ - unlink(ast_config_AST_PID); + #else + fprintf(stderr, "Mac OS X detected. Use 'launchctl load /Library/LaunchDaemon/org.asterisk.asterisk.plist'.\n"); + #endif -- cgit v1.2.3