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

update to 1.6.2.8

Browse Source
This commit is contained in:
sthen 2010-06-02 13:18:56 +00:00
parent a1bbe6c268
commit 0551c55946
6 changed files with 60 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
telephony/asterisk/Makefile
View File

@ -1,15 +1,13 @@
# $OpenBSD: Makefile,v 1.85 2010/05/04 23:02:58 sthen Exp $
# $OpenBSD: Makefile,v 1.86 2010/06/02 13:18:56 sthen Exp $
SHARED_ONLY= Yes
COMMENT-main= open source multi-protocol PBX and telephony toolkit
VER= 1.6.2.7
# you can set PATCHVER=p0, p1 etc to bump everything,
# this takes care of the subpackage/flavor maze
#PATCHVER= p4
CORESOUNDS= 1.4.17
VER= 1.6.2.8
CORESOUNDS= 1.4.18
DISTNAME= asterisk-${VER:S/rc/-rc/}
PKGNAME-main= asterisk-${VER}${PATCHVER}
# XXX if bumping, see FULLPKGNAME overrides below.
PKGNAME-main= asterisk-${VER}
CATEGORIES= telephony
@ -203,19 +201,19 @@ LIB_DEPENDS-fax= spandsp::telephony/spandsp \
tiff::graphics/tiff
.endif
.for i in ${MULTI_PACKAGES:N-main}
# the subpackages aren't flavoured, so overwrite the default name/path
FULLPKGNAME$i ?= asterisk$i-${VER}${PATCHVER}
FULLPKGPATH$i ?= ${PKGPATH},$i
RUN_DEPENDS$i += :asterisk-${VER}:${PKGPATH}
.endfor
NO_REGRESS= Yes
INSTALL_TARGET= install samples
EXAMPLEDIR= ${PREFIX}/share/examples/asterisk
EXAMPLEFILES= extensions.ael extensions.conf logger.conf \
modules.conf musiconhold.conf sip.conf voicemail.conf
.for i in ${MULTI_PACKAGES:N-main}
# subpackages aren't flavoured, so overwrite the default name/path
FULLPKGNAME$i ?= asterisk$i-${VER}
FULLPKGPATH$i ?= ${PKGPATH},$i
RUN_DEPENDS$i += :asterisk-${VER}:${PKGPATH}
.endfor
# we don't really want to drag in TeX as a dependency, but at least
# allow the icons in the HTML docs to work if you already have latex2html
# installed.
@ -229,6 +227,9 @@ post-patch:
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
./bootstrap.sh
post-build:
cd ${WRKBUILD}; ${MAKE_PROGRAM} asterisk.txt
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/asterisk
${INSTALL_DATA} ${WRKSRC}/{BUGS,CHANGES,COPYING,CREDITS} \

10
telephony/asterisk/distinfo
View File

@ -1,5 +1,5 @@
MD5 (asterisk-1.6.2.7.tar.gz) = hh9XukO/4F3GReBnmiYOQQ==
RMD160 (asterisk-1.6.2.7.tar.gz) = 0ymKImeck+Vl6fjzcdSrsVig7nM=
SHA1 (asterisk-1.6.2.7.tar.gz) = 2hRSC5GK56tai0fY86Tn/ZX2arM=
SHA256 (asterisk-1.6.2.7.tar.gz) = IX9f7NKgMsOfQBzN64/NwxqUtEpQTRxWeAelJ7+s8Rc=
SIZE (asterisk-1.6.2.7.tar.gz) = 23283195
MD5 (asterisk-1.6.2.8.tar.gz) = LuW7uRdxx8mxMdpHOXG8Lw==
RMD160 (asterisk-1.6.2.8.tar.gz) = TUnA5mTKibQXiFcCK+SPPQe9UDo=
SHA1 (asterisk-1.6.2.8.tar.gz) = fdeCPwaY/1CVCf5uKejZvbnoVXA=
SHA256 (asterisk-1.6.2.8.tar.gz) = EVQY4Ct3M16cHdQ5hS1zc9NxULWH6t/KLO/IsrHJ120=
SIZE (asterisk-1.6.2.8.tar.gz) = 23565401

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

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.25 2010/04/08 16:18:00 sthen Exp $
--- Makefile.orig Thu Feb 18 04:21:31 2010
+++ Makefile Fri Apr 2 00:59:18 2010
@@ -122,7 +122,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
$OpenBSD: patch-Makefile,v 1.26 2010/06/02 13:18:56 sthen Exp $
--- Makefile.orig Mon May 3 18:42:36 2010
+++ Makefile Tue Jun 1 22:23:41 2010
@@ -121,7 +121,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
OVERWRITE=y
# Include debug and macro symbols in the executables (-g) and profiling info (-pg)
@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile,v 1.25 2010/04/08 16:18:00 sthen Exp $
# Define standard directories for various platforms
@@ -184,8 +184,10 @@ HTTP_CGIDIR=/var/www/cgi-bin
@@ -183,8 +183,10 @@ HTTP_CGIDIR=/var/www/cgi-bin
# The file /etc/asterisk.makeopts will also be included but can be overridden
# by the file in your home directory.
@ -21,7 +21,7 @@ $OpenBSD: patch-Makefile,v 1.25 2010/04/08 16:18:00 sthen Exp $
MOD_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
OTHER_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
@@ -228,7 +230,9 @@ endif
@@ -227,7 +229,9 @@ endif
ifeq ($(findstring -save-temps,$(_ASTCFLAGS) $(ASTCFLAGS)),)
ifeq ($(findstring -pipe,$(_ASTCFLAGS) $(ASTCFLAGS)),)
@ -31,7 +31,7 @@ $OpenBSD: patch-Makefile,v 1.25 2010/04/08 16:18:00 sthen Exp $
endif
endif
@@ -254,7 +258,9 @@ endif
@@ -253,7 +257,9 @@ endif
ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),)
ifneq ($(PROC),ultrasparc)
@ -41,7 +41,7 @@ $OpenBSD: patch-Makefile,v 1.25 2010/04/08 16:18:00 sthen Exp $
endif
endif
@@ -733,18 +739,18 @@ samples: adsi
@@ -730,18 +736,18 @@ samples: adsi
echo " ; to the device. It is for this reason that this is optional, as it may result in requiring a" ; \
echo " ; temporary codec translation path for a channel that may not otherwise require one." ; \
echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \

8
telephony/asterisk/patches/patch-channels_chan_sip_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-channels_chan_sip_c,v 1.5 2010/05/04 23:02:58 sthen Exp $
$OpenBSD: patch-channels_chan_sip_c,v 1.6 2010/06/02 13:18:56 sthen Exp $
https://issues.asterisk.org/view.php?id=15827
--- channels/chan_sip.c.orig Tue Apr 13 20:42:36 2010
+++ channels/chan_sip.c Tue May 4 20:19:13 2010
@@ -3328,6 +3328,7 @@ static struct sip_proxy *proxy_allocate(char *name, ch
--- channels/chan_sip.c.orig Wed May 5 20:08:42 2010
+++ channels/chan_sip.c Tue Jun 1 22:23:41 2010
@@ -3333,6 +3333,7 @@ static struct sip_proxy *proxy_allocate(char *name, ch
proxy->force = force;
ast_copy_string(proxy->name, name, sizeof(proxy->name));
proxy->ip.sin_port = htons(port_str2int(port, STANDARD_SIP_PORT));

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.8 2010/04/14 08:23:38 sthen Exp $
--- configure.ac.orig Wed Feb 10 14:49:18 2010
+++ configure.ac Tue Apr 13 17:42:12 2010
@@ -526,6 +526,8 @@ AC_MSG_RESULT(no)
$OpenBSD: patch-configure_ac,v 1.9 2010/06/02 13:18:56 sthen Exp $
--- configure.ac.orig Wed Apr 28 21:34:07 2010
+++ configure.ac Tue Jun 1 22:23:41 2010
@@ -528,6 +528,8 @@ AC_MSG_RESULT(no)
)
AC_MSG_CHECKING(for pthread_rwlock_timedwrlock() in pthread.h)
@ -10,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.8 2010/04/14 08:23:38 sthen Exp $
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[#include <pthread.h>
@@ -539,6 +541,7 @@ AC_LINK_IFELSE(
@@ -541,6 +543,7 @@ AC_LINK_IFELSE(
ac_cv_pthread_rwlock_timedwrlock="no"
]
)
@ -18,7 +18,7 @@ $OpenBSD: patch-configure_ac,v 1.8 2010/04/14 08:23:38 sthen Exp $
if test "${ac_cv_pthread_rwlock_timedwrlock}" = "yes"; then
AC_DEFINE([HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK], 1, [Define if your system has pthread_rwlock_timedwrlock()])
fi
@@ -1399,7 +1402,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp], , [--agent-l
@@ -1415,7 +1418,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp], , [--agent-l
AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])
@ -27,7 +27,7 @@ $OpenBSD: patch-configure_ac,v 1.8 2010/04/14 08:23:38 sthen Exp $
AST_EXT_LIB_CHECK([OGG], [ogg], [ogg_sync_init], [])
@@ -1524,7 +1527,8 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "
@@ -1540,7 +1543,8 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "
AST_CHECK_OPENH323()
AST_CHECK_PWLIB_VERSION([OpenH323], [OPENH323], [openh323buildopts.h], [1], [17], [3])
AST_CHECK_OPENH323_BUILD()
@ -37,7 +37,7 @@ $OpenBSD: patch-configure_ac,v 1.8 2010/04/14 08:23:38 sthen Exp $
AST_CHECK_PWLIB_BUILD([OpenH323], [OPENH323],
[Define if your system has the OpenH323 libraries.],
[#include "ptlib.h"
@@ -1623,7 +1627,8 @@ AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], [
@@ -1639,7 +1643,8 @@ AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], [
if test "${OSARCH}" = "OpenBSD";
then

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.28 2010/05/03 21:00:34 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.29 2010/06/02 13:18:56 sthen Exp $
@conflict asterisk-sounds-<=1.2.1p2
@conflict asterisk-ogg-*
@conflict chan_unistim-*
@ -368,10 +368,14 @@ share/asterisk/sounds/en/conf-lockednow.gsm
share/asterisk/sounds/en/conf-muted.gsm
share/asterisk/sounds/en/conf-noempty.gsm
share/asterisk/sounds/en/conf-nonextended.gsm
share/asterisk/sounds/en/conf-now-muted.gsm
share/asterisk/sounds/en/conf-now-recording.gsm
share/asterisk/sounds/en/conf-now-unmuted.gsm
share/asterisk/sounds/en/conf-onlyone.gsm
share/asterisk/sounds/en/conf-onlyperson.gsm
share/asterisk/sounds/en/conf-otherinparty.gsm
share/asterisk/sounds/en/conf-placeintoconf.gsm
share/asterisk/sounds/en/conf-roll-callcomplete.gsm
share/asterisk/sounds/en/conf-thereare.gsm
share/asterisk/sounds/en/conf-unlockednow.gsm
share/asterisk/sounds/en/conf-unmuted.gsm
@ -435,6 +439,7 @@ share/asterisk/sounds/en/digits/9.gsm
share/asterisk/sounds/en/digits/90.gsm
share/asterisk/sounds/en/digits/a-m.gsm
share/asterisk/sounds/en/digits/at.gsm
share/asterisk/sounds/en/digits/billion.gsm
share/asterisk/sounds/en/digits/day-0.gsm
share/asterisk/sounds/en/digits/day-1.gsm
share/asterisk/sounds/en/digits/day-2.gsm
@ -459,11 +464,21 @@ share/asterisk/sounds/en/digits/h-20.gsm
share/asterisk/sounds/en/digits/h-3.gsm
share/asterisk/sounds/en/digits/h-30.gsm
share/asterisk/sounds/en/digits/h-4.gsm
share/asterisk/sounds/en/digits/h-40.gsm
share/asterisk/sounds/en/digits/h-5.gsm
share/asterisk/sounds/en/digits/h-50.gsm
share/asterisk/sounds/en/digits/h-6.gsm
share/asterisk/sounds/en/digits/h-60.gsm
share/asterisk/sounds/en/digits/h-7.gsm
share/asterisk/sounds/en/digits/h-70.gsm
share/asterisk/sounds/en/digits/h-8.gsm
share/asterisk/sounds/en/digits/h-80.gsm
share/asterisk/sounds/en/digits/h-9.gsm
share/asterisk/sounds/en/digits/h-90.gsm
share/asterisk/sounds/en/digits/h-billion.gsm
share/asterisk/sounds/en/digits/h-hundred.gsm
share/asterisk/sounds/en/digits/h-million.gsm
share/asterisk/sounds/en/digits/h-thousand.gsm
share/asterisk/sounds/en/digits/hundred.gsm
share/asterisk/sounds/en/digits/million.gsm
share/asterisk/sounds/en/digits/minus.gsm
@ -578,6 +593,7 @@ share/asterisk/sounds/en/letters/zed.gsm
share/asterisk/sounds/en/minutes.gsm
share/asterisk/sounds/en/pbx-invalid.gsm
share/asterisk/sounds/en/pbx-invalidpark.gsm
share/asterisk/sounds/en/pbx-parkingfailed.gsm
share/asterisk/sounds/en/pbx-transfer.gsm
share/asterisk/sounds/en/phonetic/
share/asterisk/sounds/en/phonetic/9_p.gsm
@ -793,7 +809,6 @@ share/asterisk/static-http/docs/images.out
share/asterisk/static-http/docs/images.pl
share/asterisk/static-http/docs/images.tex
share/asterisk/static-http/docs/img1.png
share/asterisk/static-http/docs/img10.png
share/asterisk/static-http/docs/img2.png
share/asterisk/static-http/docs/img3.png
share/asterisk/static-http/docs/img4.png
@ -1096,6 +1111,7 @@ share/doc/asterisk/CODING-GUIDELINES
share/doc/asterisk/COPYING
share/doc/asterisk/CREDITS
share/doc/asterisk/ChangeLog
share/doc/asterisk/HOWTO_collect_debug_information.txt
share/doc/asterisk/IAX2-security.pdf
share/doc/asterisk/IAX2-security.txt
share/doc/asterisk/India-CID.txt
@ -1121,6 +1137,7 @@ share/doc/asterisk/asterisk-mib.txt
share/doc/asterisk/asterisk.8
share/doc/asterisk/asterisk.aux
share/doc/asterisk/asterisk.css
share/doc/asterisk/asterisk.dvi
share/doc/asterisk/asterisk.html
share/doc/asterisk/asterisk.log
share/doc/asterisk/asterisk.out
@ -1128,6 +1145,7 @@ share/doc/asterisk/asterisk.pdf
share/doc/asterisk/asterisk.sgml
share/doc/asterisk/asterisk.tex
share/doc/asterisk/asterisk.toc
share/doc/asterisk/asterisk.txt
share/doc/asterisk/backtrace.tex
share/doc/asterisk/backtrace.txt
share/doc/asterisk/billing.tex
@ -1163,7 +1181,6 @@ share/doc/asterisk/images.pl
share/doc/asterisk/images.tex
share/doc/asterisk/imapstorage.tex
share/doc/asterisk/img1.png
share/doc/asterisk/img10.png
share/doc/asterisk/img2.png
share/doc/asterisk/img3.png
share/doc/asterisk/img4.png