First patch: The bootstrap script and the main makefile use "==" to test string equality, which doesn't work as-is on FreeBSD (where /bin/sh is not bash, "[" is not a shell builtin, and /bin/[ doesn't support using "=="). Second patch: Adds group-read flag to switch_file_open call in mod_logfile (0604 -> 0644). Mike Watters diff --git a/Makefile.am b/Makefile.am index a263462..ff00638 100644 --- a/Makefile.am +++ b/Makefile.am @@ -359,14 +359,14 @@ src/include/switch_version.h: src/include/switch_version.h.in .version $(libfree else \ if [ -d .git ] ; then \ version=`git log --format="%h %ci" -1 HEAD | head -1 | sed -e 's|:|-|g' || echo hacked` ; \ - if [ "x$$version" == "xhacked" ] ; then \ + if [ "x$$version" = "xhacked" ] ; then \ version="hacked-`date -u +%Y%m%dT%H%M%SZ`" ; \ else \ version="git-$$version" ; \ fi ;\ else \ version=`svnversion . -n || echo hacked` ; \ - if [ "x$$version" == "xhacked" ] ; then \ + if [ "x$$version" = "xhacked" ] ; then \ version="hacked-`date -u +%Y%m%dT%H%M%SZ`" ; \ else \ version="svn-$$version" ; \ diff --git a/bootstrap.sh b/bootstrap.sh index 59a5687..0ea5cd4 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -341,7 +341,7 @@ rm -rf autom4te*.cache echo "Entering directory ${LIBDIR}/apr-util" cd ${LIBDIR}/apr-util -if [ "${BGJOB}" == "false" ] ; then +if [ "${BGJOB}" = "false" ] ; then ./buildconf else ./buildconf & @@ -350,14 +350,14 @@ fi for i in ${SUBDIRS} do - if [ "${BGJOB}" == "false" ] ; then + if [ "${BGJOB}" = "false" ] ; then libbootstrap ${i} else libbootstrap ${i} & fi done -if [ "${BGJOB}" == "true" ] ; then +if [ "${BGJOB}" = "true" ] ; then wait fi cd ${BASEDIR} diff --git a/src/mod/loggers/mod_logfile/mod_logfile.c b/src/mod/loggers/mod_logfile/mod_logfile.c index 8cdaf96..90ca963 100644 --- a/src/mod/loggers/mod_logfile/mod_logfile.c +++ b/src/mod/loggers/mod_logfile/mod_logfile.c @@ -94,7 +94,7 @@ static switch_status_t mod_logfile_openlogfile(logfile_profile_t *profile, switc flags |= SWITCH_FOPEN_WRITE; flags |= SWITCH_FOPEN_APPEND; - stat = switch_file_open(&afd, profile->logfile, flags, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE | SWITCH_FPROT_WREAD, module_pool); + stat = switch_file_open(&afd, profile->logfile, flags, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE | SWITCH_FPROT_GREAD | SWITCH_FPROT_WREAD, module_pool); if (stat != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_FALSE; }