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

maintenance update to 1.4.22; many fixes.

Browse Source
This commit is contained in:
sthen 2008-10-07 09:57:52 +00:00
parent 38e34e4365
commit 7dadcbac78
6 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
telephony/asterisk/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.44 2008/07/23 08:57:10 sthen Exp $ # $OpenBSD: Makefile,v 1.45 2008/10/07 09:57:52 sthen Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
COMMENT-main= open source multi-protocol PBX and telephony toolkit COMMENT-main= open source multi-protocol PBX and telephony toolkit
V= 1.4.21.2 V= 1.4.22
DISTNAME= asterisk-$V DISTNAME= asterisk-$V
FULLPKGNAME-main= asterisk-$V FULLPKGNAME-main= asterisk-$V
@ -205,7 +205,8 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/{BUGS,CHANGES,COPYING,CREDITS} \ ${INSTALL_DATA} ${WRKSRC}/{BUGS,CHANGES,COPYING,CREDITS} \
${WRKSRC}/{ChangeLog,LICENSE,README,UPGRADE.txt} \ ${WRKSRC}/{ChangeLog,LICENSE,README,UPGRADE.txt} \
${PREFIX}/share/doc/asterisk ${PREFIX}/share/doc/asterisk
${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/asterisk ${INSTALL_DATA} `find ${WRKSRC}/doc -type f` \
${PREFIX}/share/doc/asterisk
${INSTALL_DATA_DIR} ${EXAMPLEDIR} ${INSTALL_DATA_DIR} ${EXAMPLEDIR}
${INSTALL_DATA_DIR} ${EXAMPLEDIR}/openbsd ${INSTALL_DATA_DIR} ${EXAMPLEDIR}/openbsd
${INSTALL_DATA} ${FILESDIR}/*.sample ${EXAMPLEDIR}/openbsd ${INSTALL_DATA} ${FILESDIR}/*.sample ${EXAMPLEDIR}/openbsd

10
telephony/asterisk/distinfo
View File

@ -1,5 +1,5 @@
MD5 (asterisk-1.4.21.2.tar.gz) = RogeE0Xsoh6hOn1bEDb6bg== MD5 (asterisk-1.4.22.tar.gz) = dib+vEoB4W4BLfzLnkq50g==
RMD160 (asterisk-1.4.21.2.tar.gz) = k4xhjReu70WhfS++UpP7wTxO/g0= RMD160 (asterisk-1.4.22.tar.gz) = RpnGljCJ/RloNvf4b5gn7cE8Q5c=
SHA1 (asterisk-1.4.21.2.tar.gz) = jA3PV/ac4nkp94NggTFqJpXrdvo= SHA1 (asterisk-1.4.22.tar.gz) = WY1/3wdaTmFUvIkQ0+05lfOcnyM=
SHA256 (asterisk-1.4.21.2.tar.gz) = J8O7DkfG92LAznAc2XtfI/00JJhFI781NZO3emluqLU= SHA256 (asterisk-1.4.22.tar.gz) = em2A7Y3job/X8sNELsXrHaPur/as4aPARXiEgYHu55o=
SIZE (asterisk-1.4.21.2.tar.gz) = 11528693 SIZE (asterisk-1.4.22.tar.gz) = 11598693

19
telephony/asterisk/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.17 2008/05/27 22:14:34 sthen Exp $ $OpenBSD: patch-Makefile,v 1.18 2008/10/07 09:57:52 sthen Exp $
--- Makefile.orig Mon May 5 21:17:55 2008 --- Makefile.orig Mon Sep 8 21:15:42 2008
+++ Makefile Wed May 21 01:24:30 2008 +++ Makefile Thu Oct 2 22:54:53 2008
@@ -35,6 +35,7 @@ export ASTVARRUNDIR @@ -35,6 +35,7 @@ export ASTVARRUNDIR
export MODULES_DIR export MODULES_DIR
export ASTSPOOLDIR export ASTSPOOLDIR
@ -69,7 +69,7 @@ $OpenBSD: patch-Makefile,v 1.17 2008/05/27 22:14:34 sthen Exp $
ifeq ($(PROC),ppc) ifeq ($(PROC),ppc)
ASTCFLAGS+=-fsigned-char ASTCFLAGS+=-fsigned-char
@@ -575,13 +583,14 @@ samples: adsi @@ -574,6 +582,7 @@ samples: adsi
echo "astetcdir => $(ASTETCDIR)" ; \ echo "astetcdir => $(ASTETCDIR)" ; \
echo "astmoddir => $(MODULES_DIR)" ; \ echo "astmoddir => $(MODULES_DIR)" ; \
echo "astvarlibdir => $(ASTVARLIBDIR)" ; \ echo "astvarlibdir => $(ASTVARLIBDIR)" ; \
@ -77,15 +77,7 @@ $OpenBSD: patch-Makefile,v 1.17 2008/05/27 22:14:34 sthen Exp $
echo "astdatadir => $(ASTDATADIR)" ; \ echo "astdatadir => $(ASTDATADIR)" ; \
echo "astagidir => $(AGI_DIR)" ; \ echo "astagidir => $(AGI_DIR)" ; \
echo "astspooldir => $(ASTSPOOLDIR)" ; \ echo "astspooldir => $(ASTSPOOLDIR)" ; \
echo "astrundir => $(ASTVARRUNDIR)" ; \ @@ -604,16 +613,16 @@ samples: adsi
echo "astlogdir => $(ASTLOGDIR)" ; \
echo "" ; \
- echo ";[options]" ; \
+ echo "[options]" ; \
echo ";verbose = 3" ; \
echo ";debug = 3" ; \
echo ";alwaysfork = yes ; same as -F at startup" ; \
@@ -605,15 +614,15 @@ samples: adsi
echo ";transmit_silence_during_record = yes ; Transmit SLINEAR silence while a channel is being recorded" ; \ echo ";transmit_silence_during_record = yes ; Transmit SLINEAR silence while a channel is being recorded" ; \
echo ";transmit_silence = yes ; Transmit SLINEAR silence while a channel is being recorded or DTMF is being generated" ; \ echo ";transmit_silence = yes ; Transmit SLINEAR silence while a channel is being recorded or DTMF is being generated" ; \
echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \ echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \
@ -93,6 +85,7 @@ $OpenBSD: patch-Makefile,v 1.17 2008/05/27 22:14:34 sthen Exp $
- echo ";rungroup = asterisk ; The group to run as" ; \ - echo ";rungroup = asterisk ; The group to run as" ; \
+ echo "runuser = _asterisk ; The user to run as" ; \ + echo "runuser = _asterisk ; The user to run as" ; \
+ echo "rungroup = _asterisk ; The group to run as" ; \ + echo "rungroup = _asterisk ; The group to run as" ; \
echo ";dahdichanname = yes ; Channels created by chan_dahdi will be called 'DAHDI', otherwise 'Zap'" ; \
echo "" ; \ echo "" ; \
echo "; Changing the following lines may compromise your security." ; \ echo "; Changing the following lines may compromise your security." ; \
- echo ";[files]" ; \ - echo ";[files]" ; \

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.7 2008/05/27 22:14:34 sthen Exp $ $OpenBSD: patch-configure,v 1.8 2008/10/07 09:57:52 sthen Exp $
--- configure.orig Fri May 9 17:34:08 2008 --- configure.orig Mon Sep 8 17:26:00 2008
+++ configure Wed May 21 01:24:30 2008 +++ configure Thu Oct 2 22:51:06 2008
@@ -23526,13 +23526,13 @@ if test "${USE_UNIXODBC}" != "no"; then @@ -21945,13 +21945,13 @@ if test "${USE_UNIXODBC}" != "no"; then
pbxlibdir="-L${UNIXODBC_DIR}" pbxlibdir="-L${UNIXODBC_DIR}"
fi fi
fi fi
@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.7 2008/05/27 22:14:34 sthen Exp $
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@@ -23595,7 +23595,7 @@ fi @@ -22014,7 +22014,7 @@ fi
if test "${AST_UNIXODBC_FOUND}" = "yes"; then if test "${AST_UNIXODBC_FOUND}" = "yes"; then
@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.7 2008/05/27 22:14:34 sthen Exp $
UNIXODBC_HEADER_FOUND="1" UNIXODBC_HEADER_FOUND="1"
if test "x${UNIXODBC_DIR}" != "x"; then if test "x${UNIXODBC_DIR}" != "x"; then
UNIXODBC_LIB="${pbxlibdir} ${UNIXODBC_LIB}" UNIXODBC_LIB="${pbxlibdir} ${UNIXODBC_LIB}"
@@ -27520,7 +27520,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -25354,7 +25354,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
PWLIB_VERSION=`grep "PWLIB_VERSION" ${PWLIB_INCDIR}/ptbuildopts.h | cut -f2 -d ' ' | sed -e 's/"//g'` PWLIB_VERSION=`grep "PWLIB_VERSION" ${PWLIB_INCDIR}/ptbuildopts.h | cut -f2 -d ' ' | sed -e 's/"//g'`
PWLIB_MAJOR_VERSION=`echo ${PWLIB_VERSION} | cut -f1 -d.` PWLIB_MAJOR_VERSION=`echo ${PWLIB_VERSION} | cut -f1 -d.`
PWLIB_MINOR_VERSION=`echo ${PWLIB_VERSION} | cut -f2 -d.` PWLIB_MINOR_VERSION=`echo ${PWLIB_VERSION} | cut -f2 -d.`
@ -36,7 +36,7 @@ $OpenBSD: patch-configure,v 1.7 2008/05/27 22:14:34 sthen Exp $
let PWLIB_VER=${PWLIB_MAJOR_VERSION}*10000+${PWLIB_MINOR_VERSION}*100+${PWLIB_BUILD_NUMBER} let PWLIB_VER=${PWLIB_MAJOR_VERSION}*10000+${PWLIB_MINOR_VERSION}*100+${PWLIB_BUILD_NUMBER}
let PWLIB_REQ=1*10000+9*100+2 let PWLIB_REQ=1*10000+9*100+2
@@ -27622,6 +27622,9 @@ esac @@ -25456,6 +25456,9 @@ esac
PWLIB_PLATFORM="${PWLIB_OSTYPE}_${PWLIB_MACHTYPE}" PWLIB_PLATFORM="${PWLIB_OSTYPE}_${PWLIB_MACHTYPE}"
@ -46,7 +46,7 @@ $OpenBSD: patch-configure,v 1.7 2008/05/27 22:14:34 sthen Exp $
@@ -28480,7 +28483,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -26314,7 +26317,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
OPENH323_VERSION=`grep "OPENH323_VERSION" ${OPENH323_INCDIR}/openh323buildopts.h | cut -f2 -d ' ' | sed -e 's/"//g'` OPENH323_VERSION=`grep "OPENH323_VERSION" ${OPENH323_INCDIR}/openh323buildopts.h | cut -f2 -d ' ' | sed -e 's/"//g'`
OPENH323_MAJOR_VERSION=`echo ${OPENH323_VERSION} | cut -f1 -d.` OPENH323_MAJOR_VERSION=`echo ${OPENH323_VERSION} | cut -f1 -d.`
OPENH323_MINOR_VERSION=`echo ${OPENH323_VERSION} | cut -f2 -d.` OPENH323_MINOR_VERSION=`echo ${OPENH323_VERSION} | cut -f2 -d.`
@ -55,7 +55,7 @@ $OpenBSD: patch-configure,v 1.7 2008/05/27 22:14:34 sthen Exp $
let OPENH323_VER=${OPENH323_MAJOR_VERSION}*10000+${OPENH323_MINOR_VERSION}*100+${OPENH323_BUILD_NUMBER} let OPENH323_VER=${OPENH323_MAJOR_VERSION}*10000+${OPENH323_MINOR_VERSION}*100+${OPENH323_BUILD_NUMBER}
let OPENH323_REQ=1*10000+17*100+3 let OPENH323_REQ=1*10000+17*100+3
@@ -28501,7 +28504,7 @@ echo "${ECHO_T}yes" >&6; } @@ -26335,7 +26338,7 @@ echo "${ECHO_T}yes" >&6; }
{ echo "$as_me:$LINENO: checking OpenH323 build option" >&5 { echo "$as_me:$LINENO: checking OpenH323 build option" >&5
echo $ECHO_N "checking OpenH323 build option... $ECHO_C" >&6; } echo $ECHO_N "checking OpenH323 build option... $ECHO_C" >&6; }
OPENH323_SUFFIX= OPENH323_SUFFIX=
@ -64,7 +64,7 @@ $OpenBSD: patch-configure,v 1.7 2008/05/27 22:14:34 sthen Exp $
for pfx in $prefixes; do for pfx in $prefixes; do
files=`ls -l ${OPENH323_LIBDIR}/lib${pfx}*.so* 2>/dev/null` files=`ls -l ${OPENH323_LIBDIR}/lib${pfx}*.so* 2>/dev/null`
libfile= libfile=
@@ -28529,7 +28532,8 @@ echo $ECHO_N "checking OpenH323 build option... $ECHO_ @@ -26363,7 +26366,8 @@ echo $ECHO_N "checking OpenH323 build option... $ECHO_
d) d)
OPENH323_BUILD="debug";; OPENH323_BUILD="debug";;
*) *)
@ -74,7 +74,7 @@ $OpenBSD: patch-configure,v 1.7 2008/05/27 22:14:34 sthen Exp $
notrace=`eval "grep NOTRACE ${OPENH323DIR}/openh323u.mak | grep = | sed -e 's/[A-Z0-9_]*[ ]*=[ ]*//'"` notrace=`eval "grep NOTRACE ${OPENH323DIR}/openh323u.mak | grep = | sed -e 's/[A-Z0-9_]*[ ]*=[ ]*//'"`
if test "x$notrace" = "x"; then if test "x$notrace" = "x"; then
notrace="0" notrace="0"
@@ -33636,7 +33640,7 @@ if test "${ac_cv_lib_vorbis_vorbis_info_init+set}" = s @@ -29781,7 +29785,7 @@ if test "${ac_cv_lib_vorbis_vorbis_info_init+set}" = s
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS

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

@ -1,7 +1,7 @@
$OpenBSD: patch-main_asterisk_c,v 1.7 2008/06/14 16:00:10 sthen Exp $ $OpenBSD: patch-main_asterisk_c,v 1.8 2008/10/07 09:57:52 sthen Exp $
--- main/asterisk.c.orig Tue May 27 19:58:09 2008 --- main/asterisk.c.orig Sat Jul 26 16:31:21 2008
+++ main/asterisk.c Thu Jun 12 19:49:36 2008 +++ main/asterisk.c Thu Oct 2 22:51:06 2008
@@ -2478,6 +2478,7 @@ static void ast_readconfig(void) @@ -2486,6 +2486,7 @@ static void ast_readconfig(void)
snprintf(ast_config_AST_MONITOR_DIR, sizeof(ast_config_AST_MONITOR_DIR) - 1, "%s/monitor", v->value); snprintf(ast_config_AST_MONITOR_DIR, sizeof(ast_config_AST_MONITOR_DIR) - 1, "%s/monitor", v->value);
} else if (!strcasecmp(v->name, "astvarlibdir")) { } else if (!strcasecmp(v->name, "astvarlibdir")) {
ast_copy_string(ast_config_AST_VAR_DIR, v->value, sizeof(ast_config_AST_VAR_DIR)); ast_copy_string(ast_config_AST_VAR_DIR, v->value, sizeof(ast_config_AST_VAR_DIR));
@ -9,7 +9,7 @@ $OpenBSD: patch-main_asterisk_c,v 1.7 2008/06/14 16:00:10 sthen Exp $
snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/astdb", v->value); snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/astdb", v->value);
} else if (!strcasecmp(v->name, "astdatadir")) { } else if (!strcasecmp(v->name, "astdatadir")) {
ast_copy_string(ast_config_AST_DATA_DIR, v->value, sizeof(ast_config_AST_DATA_DIR)); ast_copy_string(ast_config_AST_DATA_DIR, v->value, sizeof(ast_config_AST_DATA_DIR));
@@ -2775,6 +2776,7 @@ int main(int argc, char *argv[]) @@ -2797,6 +2798,7 @@ int main(int argc, char *argv[])
rungroup = ast_config_AST_RUN_GROUP; rungroup = ast_config_AST_RUN_GROUP;
if ((!runuser) && !ast_strlen_zero(ast_config_AST_RUN_USER)) if ((!runuser) && !ast_strlen_zero(ast_config_AST_RUN_USER))
runuser = ast_config_AST_RUN_USER; runuser = ast_config_AST_RUN_USER;

9
telephony/asterisk/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.9 2008/06/30 20:03:49 sthen Exp $ @comment $OpenBSD: PLIST-main,v 1.10 2008/10/07 09:57:52 sthen Exp $
@conflict asterisk-sounds-<=1.2.1p2 @conflict asterisk-sounds-<=1.2.1p2
@conflict app_conference-<=20070710 @conflict app_conference-<=20070710
@newgroup _asterisk:545 @newgroup _asterisk:545
@ -34,9 +34,9 @@ include/asterisk/compat.h
include/asterisk/compiler.h include/asterisk/compiler.h
include/asterisk/config.h include/asterisk/config.h
include/asterisk/crypto.h include/asterisk/crypto.h
include/asterisk/dahdi_compat.h
include/asterisk/devicestate.h include/asterisk/devicestate.h
include/asterisk/dial.h include/asterisk/dial.h
include/asterisk/dlfcn-compat.h
include/asterisk/dns.h include/asterisk/dns.h
include/asterisk/dnsmgr.h include/asterisk/dnsmgr.h
include/asterisk/doxyref.h include/asterisk/doxyref.h
@ -84,6 +84,7 @@ include/asterisk/tdd.h
include/asterisk/term.h include/asterisk/term.h
include/asterisk/threadstorage.h include/asterisk/threadstorage.h
include/asterisk/time.h include/asterisk/time.h
include/asterisk/tonezone_compat.h
include/asterisk/transcap.h include/asterisk/transcap.h
include/asterisk/translate.h include/asterisk/translate.h
include/asterisk/udptl.h include/asterisk/udptl.h
@ -735,6 +736,7 @@ share/doc/asterisk/extensions.txt
share/doc/asterisk/externalivr.txt share/doc/asterisk/externalivr.txt
share/doc/asterisk/freetds.txt share/doc/asterisk/freetds.txt
share/doc/asterisk/hardware.txt share/doc/asterisk/hardware.txt
share/doc/asterisk/hebrew.ods
share/doc/asterisk/iax.txt share/doc/asterisk/iax.txt
share/doc/asterisk/ices.txt share/doc/asterisk/ices.txt
share/doc/asterisk/imapstorage.txt share/doc/asterisk/imapstorage.txt
@ -759,6 +761,7 @@ share/doc/asterisk/radius.txt
share/doc/asterisk/realtime.txt share/doc/asterisk/realtime.txt
share/doc/asterisk/rtp-packetization.txt share/doc/asterisk/rtp-packetization.txt
share/doc/asterisk/security.txt share/doc/asterisk/security.txt
share/doc/asterisk/sip-retransmit.txt
share/doc/asterisk/sla.pdf share/doc/asterisk/sla.pdf
share/doc/asterisk/sla.tex share/doc/asterisk/sla.tex
share/doc/asterisk/smdi.txt share/doc/asterisk/smdi.txt
@ -783,6 +786,7 @@ share/examples/asterisk/default/cdr.conf
share/examples/asterisk/default/cdr_custom.conf share/examples/asterisk/default/cdr_custom.conf
share/examples/asterisk/default/cdr_manager.conf share/examples/asterisk/default/cdr_manager.conf
@comment share/examples/asterisk/default/cdr_tds.conf @comment share/examples/asterisk/default/cdr_tds.conf
@comment share/examples/asterisk/default/chan_dahdi.conf
share/examples/asterisk/default/codecs.conf share/examples/asterisk/default/codecs.conf
share/examples/asterisk/default/dnsmgr.conf share/examples/asterisk/default/dnsmgr.conf
share/examples/asterisk/default/dundi.conf share/examples/asterisk/default/dundi.conf
@ -825,7 +829,6 @@ share/examples/asterisk/default/udptl.conf
share/examples/asterisk/default/users.conf share/examples/asterisk/default/users.conf
share/examples/asterisk/default/voicemail.conf share/examples/asterisk/default/voicemail.conf
@comment share/examples/asterisk/default/vpb.conf @comment share/examples/asterisk/default/vpb.conf
@comment share/examples/asterisk/default/zapata.conf
share/examples/asterisk/openbsd/ share/examples/asterisk/openbsd/
share/examples/asterisk/openbsd/extensions.conf.sample share/examples/asterisk/openbsd/extensions.conf.sample
@mode 640 @mode 640