update to asterisk-1.0.7

- put jolan's mirror second
- RUN_DEPENDS on sox and mpg123 for music on hold
- install example indications.conf so ringing works

ok jolan@
This commit is contained in:
jcs 2005-05-01 02:12:46 +00:00
parent d9d3eb7842
commit 21340eeda8
11 changed files with 54 additions and 59 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.2 2004/12/05 15:15:20 alek Exp $
# $OpenBSD: Makefile,v 1.3 2005/05/01 02:12:46 jcs Exp $
COMMENT= "open source PBX"
DISTNAME= asterisk-1.0.0
DISTNAME= asterisk-1.0.7
CATEGORIES= telephony
MASTER_SITES= http://mirrors.protection.cx/~jolan/ \
ftp://ftp.asterisk.org/pub/telephony/asterisk/
MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
http://mirrors.protection.cx/~jolan/
HOMEPAGE= http://www.asterisk.org/
@ -21,6 +21,8 @@ NO_REGRESS= Yes
USE_GMAKE= Yes
BUILD_DEPENDS= :bison-*:devel/bison
RUN_DEPENDS= :mpg123-*:audio/mpg123 \
:sox-*:audio/sox
MAKE_ENV+= SYSCONFDIR='${SYSCONFDIR}'

View File

@ -1,4 +1,4 @@
MD5 (asterisk-1.0.0.tar.gz) = 7d14fb592d3922b5c16bb0423467a165
RMD160 (asterisk-1.0.0.tar.gz) = 0bb18a9b00ae2f39e705dd7cbd8b8de10e78a71a
SHA1 (asterisk-1.0.0.tar.gz) = 3322dbe95c06cb2bc32da85c963b7cd9fc1a32fe
SIZE (asterisk-1.0.0.tar.gz) = 9555336
MD5 (asterisk-1.0.7.tar.gz) = 4cc3c1e4a1b12e0e4c748326ad153291
RMD160 (asterisk-1.0.7.tar.gz) = bb738f0e3d100314fa7497c9ee81f8a022e536bb
SHA1 (asterisk-1.0.7.tar.gz) = 7e91d6771901c34f6bbd8e0bbc3ca15173654c87
SIZE (asterisk-1.0.7.tar.gz) = 9591705

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2004/09/26 00:38:24 jolan Exp $
--- Makefile.orig Thu Sep 16 13:46:39 2004
+++ Makefile Sat Sep 25 18:03:29 2004
$OpenBSD: patch-Makefile,v 1.2 2005/05/01 02:12:47 jcs Exp $
--- Makefile.orig Thu Mar 10 02:15:05 2005
+++ Makefile Wed Mar 30 13:34:20 2005
@@ -20,6 +20,7 @@ OSARCH=$(shell uname -s)
ifeq (${OSARCH},Linux)
@ -9,15 +9,15 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2004/09/26 00:38:24 jolan Exp $
ifeq ($(PROC),x86_64)
# You must have GCC 3.4 to use k8, otherwise use athlon
PROC=k8
@@ -39,6 +40,7 @@ OPTIONS+=-fomit-frame-pointer
endif
@@ -40,6 +41,7 @@ endif
MPG123TARG=linux
endif
+endif
ifeq ($(findstring BSD,${OSARCH}),BSD)
PROC=$(shell uname -m)
@@ -62,10 +64,14 @@ PWD=$(shell pwd)
@@ -63,10 +65,14 @@ PWD=$(shell pwd)
#K6OPT = -DK6OPT
#Tell gcc to optimize the asterisk's code
@ -32,7 +32,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2004/09/26 00:38:24 jolan Exp $
# If you are running a radio application, define RADIO_RELAX so that the DTMF
# will be received more reliably
@@ -90,7 +96,11 @@ MALLOC_DEBUG = #-include $(PWD)/include/
@@ -91,7 +97,11 @@ MALLOC_DEBUG = #-include $(PWD)/include/
# Where to install asterisk after compiling
# Default -> leave empty
@ -44,7 +44,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2004/09/26 00:38:24 jolan Exp $
# Staging directory
# Files are copied here temporarily during the install process
@@ -110,31 +120,35 @@ BUSYDETECT+= #-DBUSYDETECT_TONEONLY
@@ -111,31 +121,35 @@ BUSYDETECT+= #-DBUSYDETECT_TONEONLY
# Don't use together with -DBUSYDETECT_TONEONLY
BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
@ -92,7 +92,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2004/09/26 00:38:24 jolan Exp $
ifeq (${OSARCH},FreeBSD)
OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
@@ -156,8 +170,10 @@ endif
@@ -159,8 +173,10 @@ endif
#Uncomment this to use the older DSP routines
#CFLAGS+=-DOLD_DSP_ROUTINES
@ -103,7 +103,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2004/09/26 00:38:24 jolan Exp $
LIBEDIT=editline/libedit.a
@@ -219,17 +235,21 @@ ASTLINK=-Wl,-E
@@ -222,17 +238,21 @@ ASTLINK=-Wl,-E
SOLINK=-shared -Xlinker -x
endif
@ -126,7 +126,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2004/09/26 00:38:24 jolan Exp $
all: depend asterisk subdirs
@@ -397,7 +417,8 @@ bininstall: all
@@ -401,7 +421,8 @@ bininstall: all
mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
install -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
@ -136,19 +136,19 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2004/09/26 00:38:24 jolan Exp $
if [ -d contrib/firmware/iax ]; then \
install -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
else \
@@ -406,6 +427,7 @@ bininstall: all
@@ -410,6 +431,7 @@ bininstall: all
( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -s $(ASTSPOOLDIR)/vm . )
( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -s $(ASTSPOOLDIR)/voicemail . )
if [ -f mpg123-0.59r/mpg123 ]; then make -C mpg123-0.59r install; fi
if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
+ifneq (${OSARCH},OpenBSD)
@echo " +---- Asterisk Installation Complete -------+"
@echo " + +"
@echo " + YOU MUST READ THE SECURITY DOCUMENT +"
@@ -427,6 +449,7 @@ bininstall: all
@echo " + **Note** This requires that you have +"
@echo " + doxygen installed on your local system +"
@@ -441,6 +463,7 @@ bininstall: all
@echo " + before doing a '$(MAKE) install'. +"
@echo " + +"
@echo " +-------------------------------------------+"
+endif
install: all datafiles bininstall
install: all datafiles bininstall

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-apps_app_sms_c,v 1.1.1.1 2004/09/26 00:38:24 jolan Exp $
--- apps/app_sms.c.orig Tue Aug 31 08:32:11 2004
+++ apps/app_sms.c Thu Sep 23 13:51:14 2004
$OpenBSD: patch-apps_app_sms_c,v 1.2 2005/05/01 02:12:47 jcs Exp $
--- apps/app_sms.c.orig Sun Oct 24 16:26:29 2004
+++ apps/app_sms.c Sun Mar 20 21:32:37 2005
@@ -24,6 +24,7 @@
#include <unistd.h>
#include <errno.h>
@ -8,4 +8,4 @@ $OpenBSD: patch-apps_app_sms_c,v 1.1.1.1 2004/09/26 00:38:24 jolan Exp $
+#include <sys/stat.h>
#include <dirent.h>
#include <ctype.h>
#include "../astconf.h"

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-apps_app_test_c,v 1.1.1.1 2004/09/26 00:38:24 jolan Exp $
--- apps/app_test.c.orig Wed Sep 22 07:15:00 2004
+++ apps/app_test.c Thu Sep 23 13:51:46 2004
$OpenBSD: patch-apps_app_test_c,v 1.2 2005/05/01 02:12:47 jcs Exp $
--- apps/app_test.c.orig Tue Jan 4 23:41:24 2005
+++ apps/app_test.c Sun Mar 20 21:32:37 2005
@@ -13,6 +13,7 @@
*/
#include <sys/types.h>
+#include <sys/stat.h>
#include <asterisk/channel.h>
#include <asterisk/options.h>
#include <asterisk/module.h>
#include <asterisk/logger.h>

View File

@ -1,12 +1,11 @@
$OpenBSD: patch-codecs_Makefile,v 1.1.1.1 2004/09/26 00:38:24 jolan Exp $
--- codecs/Makefile.orig Mon Jul 19 10:52:57 2004
+++ codecs/Makefile Sat Sep 25 19:20:42 2004
--- codecs/Makefile.orig Wed Mar 30 13:33:49 2005
+++ codecs/Makefile Wed Mar 30 13:32:50 2005
@@ -19,7 +19,9 @@
#MODG723=codec_g723_1.so codec_g723_1b.so
MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
+ifneq (${OSARCH},OpenBSD)
MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/include/speex/speex.h ] || [ -f /usr/local/include/speex.h ] || [ -f /usr/local/include/speex/speex.h ] && echo "codec_speex.so")
+endif
MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
CFLAGS+=-fPIC

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-codecs_gsm_Makefile,v 1.1.1.1 2004/09/26 00:38:24 jolan Exp $
--- codecs/gsm/Makefile.orig Tue Aug 31 11:33:00 2004
+++ codecs/gsm/Makefile Thu Sep 23 14:47:04 2004
$OpenBSD: patch-codecs_gsm_Makefile,v 1.2 2005/05/01 02:12:47 jcs Exp $
--- codecs/gsm/Makefile.orig Tue Dec 21 14:49:24 2004
+++ codecs/gsm/Makefile Sun Mar 20 21:32:37 2005
@@ -37,6 +37,7 @@ WAV49 = -DWAV49
######### ppro's, etc, as well as the AMD K6 and K7. The compile will
######### probably require gcc.
@ -9,7 +9,7 @@ $OpenBSD: patch-codecs_gsm_Makefile,v 1.1.1.1 2004/09/26 00:38:24 jolan Exp $
ifneq (${OSARCH},Darwin)
ifneq (${PROC},x86_64)
ifneq (${PROC},ultrasparc)
@@ -48,14 +49,17 @@ endif
@@ -50,14 +51,17 @@ endif
endif
endif
endif

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-res_res_agi_c,v 1.1.1.1 2004/09/26 00:38:24 jolan Exp $
--- res/res_agi.c.orig Wed Sep 22 10:21:36 2004
+++ res/res_agi.c Thu Sep 23 13:33:13 2004
@@ -12,6 +12,7 @@
*/
#include <sys/types.h>
+#include <sys/socket.h>
#include <asterisk/file.h>
#include <asterisk/logger.h>
#include <asterisk/channel.h>

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-rtp_c,v 1.1.1.1 2004/09/26 00:38:24 jolan Exp $
--- rtp.c.orig Sat Sep 25 16:41:56 2004
+++ rtp.c Sat Sep 25 16:44:48 2004
@@ -342,9 +342,7 @@ struct ast_frame *ast_rtcp_read(struct a
$OpenBSD: patch-rtp_c,v 1.2 2005/05/01 02:12:47 jcs Exp $
--- rtp.c.orig Tue Jan 18 20:33:54 2005
+++ rtp.c Sun Mar 20 21:32:38 2005
@@ -351,9 +351,7 @@ struct ast_frame *ast_rtcp_read(struct a
0, (struct sockaddr *)&sin, &len);
if (res < 0) {
@ -12,7 +12,7 @@ $OpenBSD: patch-rtp_c,v 1.1.1.1 2004/09/26 00:38:24 jolan Exp $
ast_log(LOG_WARNING, "RTP Read error: %s\n", strerror(errno));
if (errno == EBADF)
CRASH;
@@ -416,9 +414,7 @@ struct ast_frame *ast_rtp_read(struct as
@@ -426,9 +424,7 @@ struct ast_frame *ast_rtp_read(struct as
rtpheader = (unsigned int *)(rtp->rawdata + AST_FRIENDLY_OFFSET);
if (res < 0) {

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2004/09/26 00:38:24 jolan Exp $
@comment $OpenBSD: PFRAG.shared,v 1.2 2005/05/01 02:12:47 jcs Exp $
lib/asterisk/modules/app_adsiprog.so
lib/asterisk/modules/app_alarmreceiver.so
lib/asterisk/modules/app_authenticate.so
@ -15,6 +15,7 @@ lib/asterisk/modules/app_enumlookup.so
lib/asterisk/modules/app_eval.so
lib/asterisk/modules/app_exec.so
lib/asterisk/modules/app_festival.so
lib/asterisk/modules/app_forkcdr.so
lib/asterisk/modules/app_getcpeid.so
lib/asterisk/modules/app_groupcount.so
lib/asterisk/modules/app_hasnewvoicemail.so

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2004/09/26 00:38:24 jolan Exp $
@comment $OpenBSD: PLIST,v 1.2 2005/05/01 02:12:47 jcs Exp $
include/asterisk/
include/asterisk/acl.h
include/asterisk/adsi.h
@ -61,6 +61,7 @@ lib/asterisk/modules/
@man man/man8/asterisk.8
sbin/asterisk
sbin/astgenkey
sbin/autosupport
sbin/safe_asterisk
share/asterisk/
@comment share/asterisk/firmware/
@ -266,6 +267,7 @@ share/asterisk/sounds/privacy-thankyou.gsm
share/asterisk/sounds/privacy-unident.gsm
share/asterisk/sounds/queue-callswaiting.gsm
share/asterisk/sounds/queue-holdtime.gsm
share/asterisk/sounds/queue-less-than.gsm
share/asterisk/sounds/queue-minutes.gsm
share/asterisk/sounds/queue-seconds.gsm
share/asterisk/sounds/queue-thankyou.gsm
@ -348,6 +350,7 @@ share/asterisk/sounds/vm-saved.gsm
share/asterisk/sounds/vm-savedto.gsm
share/asterisk/sounds/vm-savefolder.gsm
share/asterisk/sounds/vm-savemessage.gsm
share/asterisk/sounds/vm-saveoper.gsm
share/asterisk/sounds/vm-sorry.gsm
share/asterisk/sounds/vm-star-cancel.gsm
share/asterisk/sounds/vm-starmain.gsm
@ -419,6 +422,7 @@ share/examples/asterisk/default/festival.conf.sample
share/examples/asterisk/default/iax.conf.sample
share/examples/asterisk/default/iaxprov.conf.sample
share/examples/asterisk/default/indications.conf.sample
@sample ${SYSCONFDIR}/asterisk/indications.conf
share/examples/asterisk/default/logger.conf.sample
share/examples/asterisk/default/manager.conf.sample
share/examples/asterisk/default/meetme.conf.sample