[asterisk-commits] branch oej/metermaids r11846 - in
/team/oej/metermaids: ./ apps/ build_tools/
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Sun Mar 5 04:43:51 MST 2006
Author: oej
Date: Sun Mar 5 05:43:47 2006
New Revision: 11846
URL: http://svn.digium.com/view/asterisk?rev=11846&view=rev
Log:
Update to trunk
Modified:
team/oej/metermaids/ (props changed)
team/oej/metermaids/Makefile
team/oej/metermaids/README
team/oej/metermaids/apps/app_mixmonitor.c
team/oej/metermaids/asterisk.c
team/oej/metermaids/build_tools/make_build_h
Propchange: team/oej/metermaids/
------------------------------------------------------------------------------
automerge = yes
Propchange: team/oej/metermaids/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Mar 5 05:43:47 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-7496,7498-11573
+/branches/1.2:1-7496,7498-11845
Modified: team/oej/metermaids/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids/Makefile?rev=11846&r1=11845&r2=11846&view=diff
==============================================================================
--- team/oej/metermaids/Makefile (original)
+++ team/oej/metermaids/Makefile Sun Mar 5 05:43:47 2006
@@ -217,10 +217,12 @@
endif
GREP=grep
+ID=id
ifeq ($(OSARCH),SunOS)
GREP=/usr/xpg4/bin/grep
M4=/usr/local/bin/m4
+ ID=/usr/xpg4/bin/id
endif
INCLUDE+=-Iinclude -I../include
@@ -339,7 +341,6 @@
ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
ASTCFLAGS+= -fomit-frame-pointer
endif
-
SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime
OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
@@ -545,7 +546,7 @@
$(MAKE) -C stdtime clean
datafiles: all
- if [ x`whoami` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+ if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
for x in sounds/digits/*.gsm; do \
Modified: team/oej/metermaids/README
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids/README?rev=11846&r1=11845&r2=11846&view=diff
==============================================================================
--- team/oej/metermaids/README (original)
+++ team/oej/metermaids/README Sun Mar 5 05:43:47 2006
@@ -67,7 +67,7 @@
In order to discover new features to use, please check the configuration
examples in the /configs directory of the source code distribution.
To discover the major new features of Asterisk 1.2, please visit
-http://www.astricon.net/asterisk1-2/
+http://edvina.net/asterisk1-2/
* NEW INSTALLATIONS
Modified: team/oej/metermaids/apps/app_mixmonitor.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids/apps/app_mixmonitor.c?rev=11846&r1=11845&r2=11846&view=diff
==============================================================================
--- team/oej/metermaids/apps/app_mixmonitor.c (original)
+++ team/oej/metermaids/apps/app_mixmonitor.c Sun Mar 5 05:43:47 2006
@@ -210,6 +210,17 @@
if (option_verbose > 1)
ast_verbose(VERBOSE_PREFIX_2 "Begin MixMonitor Recording %s\n", name);
+ if (mixmonitor->post_process) {
+ char *p;
+
+ for (p = mixmonitor->post_process; *p ; p++) {
+ if (*p == '^' && *(p+1) == '{') {
+ *p = '$';
+ }
+ }
+ pbx_substitute_variables_helper(mixmonitor->chan, mixmonitor->post_process, post_process, sizeof(post_process) - 1);
+ }
+
while (1) {
struct ast_frame *next;
int write;
@@ -244,17 +255,6 @@
ast_mutex_unlock(&spy.lock);
}
- if (mixmonitor->post_process) {
- char *p;
-
- for (p = mixmonitor->post_process; *p ; p++) {
- if (*p == '^' && *(p+1) == '{') {
- *p = '$';
- }
- }
- pbx_substitute_variables_helper(mixmonitor->chan, mixmonitor->post_process, post_process, sizeof(post_process) - 1);
- }
-
stopmon(mixmonitor->chan, &spy);
if (option_verbose > 1)
Modified: team/oej/metermaids/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids/asterisk.c?rev=11846&r1=11845&r2=11846&view=diff
==============================================================================
--- team/oej/metermaids/asterisk.c (original)
+++ team/oej/metermaids/asterisk.c Sun Mar 5 05:43:47 2006
@@ -83,6 +83,9 @@
#if defined(__FreeBSD__) || defined( __NetBSD__ ) || defined(SOLARIS)
#include <netdb.h>
+#if defined(SOLARIS)
+extern int daemon(int, int); /* defined in libresolv of all places */
+#endif
#endif
#include "asterisk.h"
@@ -2166,7 +2169,7 @@
exit(1);
}
if (setgid(gr->gr_gid)) {
- ast_log(LOG_WARNING, "Unable to setgid to %d (%s)\n", gr->gr_gid, rungroup);
+ ast_log(LOG_WARNING, "Unable to setgid to %d (%s)\n", (int)gr->gr_gid, rungroup);
exit(1);
}
if (setgroups(0, NULL)) {
@@ -2186,7 +2189,7 @@
}
if (!rungroup) {
if (setgid(pw->pw_gid)) {
- ast_log(LOG_WARNING, "Unable to setgid to %d!\n", pw->pw_gid);
+ ast_log(LOG_WARNING, "Unable to setgid to %d!\n", (int)pw->pw_gid);
exit(1);
}
if (initgroups(pw->pw_name, pw->pw_gid)) {
@@ -2195,7 +2198,7 @@
}
}
if (setuid(pw->pw_uid)) {
- ast_log(LOG_WARNING, "Unable to setuid to %d (%s)\n", pw->pw_uid, runuser);
+ ast_log(LOG_WARNING, "Unable to setuid to %d (%s)\n", (int)pw->pw_uid, runuser);
exit(1);
}
setenv("ASTERISK_ALREADY_NONROOT","yes",1);
@@ -2262,7 +2265,7 @@
unlink(ast_config_AST_PID);
f = fopen(ast_config_AST_PID, "w");
if (f) {
- fprintf(f, "%d\n", getpid());
+ fprintf(f, "%d\n", (int)getpid());
fclose(f);
} else
ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", ast_config_AST_PID, strerror(errno));
@@ -2273,7 +2276,7 @@
unlink(ast_config_AST_PID);
f = fopen(ast_config_AST_PID, "w");
if (f) {
- fprintf(f, "%d\n", getpid());
+ fprintf(f, "%d\n", (int)getpid());
fclose(f);
} else
ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", ast_config_AST_PID, strerror(errno));
Modified: team/oej/metermaids/build_tools/make_build_h
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids/build_tools/make_build_h?rev=11846&r1=11845&r2=11846&view=diff
==============================================================================
--- team/oej/metermaids/build_tools/make_build_h (original)
+++ team/oej/metermaids/build_tools/make_build_h Sun Mar 5 05:43:47 2006
@@ -3,7 +3,11 @@
KERNEL=`uname -r`
MACHINE=`uname -m`
OS=`uname -s`
-USER=`whoami`
+if [ `uname -s` = "SunOS" ]; then
+ USER=`/usr/xpg4/bin/id -un`
+else
+ USER=`id -un`
+fi
DATE=`date -u "+%Y-%m-%d %H:%M:%S"`
cat << END
/*
More information about the asterisk-commits
mailing list