sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

o Upgrade to 1.2.23.

Browse source 
o Disable fax-related modules since they don't compile with newest spandsp.

o Enable FreeTDS support (could be disabled using WITHOUT_FREETDS knob).

Sponsored by: Sippy Software, Inc. ( http://www.sippysoft.com/ )
This commit is contained in:
Maxim Sobolev 2007-07-31 21:18:09 +00:00
parent f830ac44dd
commit f93d68c089
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=196860
7 changed files with 41 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
net/asterisk12/Makefile
View file

@ -6,14 +6,13 @@
#
PORTNAME= asterisk
PORTVERSION= 1.2.17
PORTREVISION= 1
PORTVERSION= 1.2.23
PKGNAMESUFFIX= 12
CATEGORIES= net
MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \
http://ftp.digium.com/pub/asterisk/old-releases/
PATCHFILES= asterisk-1.2.17-codec-negotiation-20070416.diff.gz
PATCHFILES= asterisk-1.2.23-codec-negotiation-20070730.diff.gz
PATCH_SITES= http://sobomax.homeunix.org/~sobomax/
# ${PORTNAME}-1.2.4-${BRIVER}.patch.gz:bristuff
@ -46,6 +45,7 @@ MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
CXX="${CXX}"
PLIST_SUB= BRISTUFF="@comment "
MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8
WITHOUT_FAX= yes # Doesn't build with spandsp-0.0.3.
.include <bsd.port.pre.mk>
@ -85,6 +85,14 @@ PLIST_SUB+= WITH_ODBC=""
MAKE_ENV+= WITH_ODBC=1
.endif
.if defined(WITHOUT_FREETDS)
PLIST_SUB+= WITH_FREETDS="@comment "
.else
LIB_DEPENDS+= tds.5:${PORTSDIR}/databases/freetds
PLIST_SUB+= WITH_FREETDS=""
MAKE_ENV+= WITH_FREETDS=1
.endif
.if defined(WITHOUT_FAX)
PLIST_SUB+= WITH_FAX="@comment "
.else

12
net/asterisk12/distinfo
View file

@ -1,6 +1,6 @@
MD5 (asterisk-1.2.17.tar.gz) = 1a41a1f4a535813b1272bae0545c7990
SHA256 (asterisk-1.2.17.tar.gz) = ab20ada37e0f2874a0c59ac7d5395c5980419da6344cbb78b60874e9b8631cf1
SIZE (asterisk-1.2.17.tar.gz) = 10615354
MD5 (asterisk-1.2.17-codec-negotiation-20070416.diff.gz) = 9e31b80a8a9ca26afe9c62f62e6401f7
SHA256 (asterisk-1.2.17-codec-negotiation-20070416.diff.gz) = c715dd17259902ee1068ef2b1844f726570598e2d945f92233c42b0702abc2c6
SIZE (asterisk-1.2.17-codec-negotiation-20070416.diff.gz) = 32987
MD5 (asterisk-1.2.23.tar.gz) = e1e13a496a45342dec88dcf76162e6f0
SHA256 (asterisk-1.2.23.tar.gz) = 963f84c4d72de2df9c3d7374646f228849f90e7156a99df398fe0a50160e7561
SIZE (asterisk-1.2.23.tar.gz) = 10660237
MD5 (asterisk-1.2.23-codec-negotiation-20070730.diff.gz) = 8aed76c48ae24470fc578861078e38d0
SHA256 (asterisk-1.2.23-codec-negotiation-20070730.diff.gz) = 5cfec2daae25d4543abb31d1767c9ad2718ec5e27cb09494f5dc40d83f2fa9b1
SIZE (asterisk-1.2.23-codec-negotiation-20070730.diff.gz) = 32935

4
net/asterisk12/files/patch-Makefile
View file

@ -343,7 +343,7 @@ $FreeBSD$
+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
+ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
fi
- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
@ -470,7 +470,7 @@ $FreeBSD$
done
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
for x in sounds/*.mp3; do \
for x in sounds/moh/*.mp3 sounds/moh/LICENSE; do \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
done

2
net/asterisk12/files/patch-cdr::Makefile
View file

@ -30,7 +30,7 @@ $FreeBSD$
#
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),)
- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.64),1)
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),)
+ifdef WITH_FREETDS
+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.64),1)
CFLAGS += -DFREETDS_0_64
else

14
net/asterisk12/files/patch-channels::Makefile
View file

@ -14,7 +14,7 @@ $FreeBSD$
CHANH323LIB=-pthread
endif
@@ -75,11 +75,11 @@
@@ -75,7 +75,7 @@
SOLINK+=-lrt
endif
@ -23,12 +23,16 @@ $FreeBSD$
CHANNEL_LIBS+=chan_phone.so
endif
@@ -83,7 +83,7 @@
CFLAGS+=-DHAVE_LINUX_COMPILER_H
endif
-ifneq ($(wildcard h323/libchanh323.a),)
+ifdef WITH_H323
CHANNEL_LIBS+=chan_h323.so
endif
@@ -94,12 +94,12 @@
@@ -102,12 +102,12 @@
CHANNEL_LIBS+=chan_alsa.so
endif
@ -43,7 +47,7 @@ $FreeBSD$
CFLAGS+=-DZAPATA_R2
ZAPR2=-lmfcr2
endif
@@ -112,12 +112,12 @@
@@ -120,12 +120,12 @@
endif
ifndef WITHOUT_ZAPTEL
@ -58,7 +62,7 @@ $FreeBSD$
endif
CFLAGS+=-DIAX_TRUNKING
CHANNEL_LIBS+=chan_zap.so
@@ -233,8 +233,10 @@
@@ -241,8 +241,10 @@
chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast
$(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) -lstdc++
else
@ -71,7 +75,7 @@ $FreeBSD$
endif
misdn/chan_misdn_lib.a:
@@ -253,8 +255,7 @@
@@ -261,8 +263,7 @@
# $(CC) -rdynamic -shared -Xlinker -x -o $@ $<
install: all

20
net/asterisk12/files/patch-channels::chan_sip.c
View file

@ -3,7 +3,7 @@ $FreeBSD$
--- channels/chan_sip.c.orig
+++ channels/chan_sip.c
@@ -340,7 +340,7 @@
@@ -339,7 +339,7 @@
static char default_language[MAX_LANGUAGE] = "";
@ -20,7 +20,7 @@ $FreeBSD$
char hop[0];
};
@@ -2815,6 +2816,8 @@
@@ -2835,6 +2836,8 @@
ast_codec_pref_remove2(&tmp->nativeformats, ~i->usercapability);
fmt = ast_codec_pref_index_audio(&tmp->nativeformats, 0);
@ -29,7 +29,7 @@ $FreeBSD$
if (title)
snprintf(tmp->name, sizeof(tmp->name), "SIP/%s-%08x", title, (int)(long) i);
else if (strchr(i->fromdomain,':'))
@@ -6222,6 +6225,7 @@
@@ -6312,6 +6315,7 @@
/* Make a struct route */
thishop = malloc(sizeof(*thishop) + len);
if (thishop) {
@ -37,7 +37,7 @@ $FreeBSD$
ast_copy_string(thishop->hop, rr, len);
ast_log(LOG_DEBUG, "build_route: Record-Route hop: <%s>\n", thishop->hop);
/* Link in */
@@ -6247,31 +6251,41 @@
@@ -6337,31 +6341,41 @@
/* Only append the contact if we are dealing with a strict router */
if (!head || (!ast_strlen_zero(head->hop) && strstr(head->hop,";lr") == NULL) ) {
@ -103,7 +103,7 @@ $FreeBSD$
}
}
}
@@ -9248,6 +9262,13 @@
@@ -9356,6 +9370,13 @@
secret = p->peersecret;
md5secret = p->peermd5secret;
}
@ -117,7 +117,7 @@ $FreeBSD$
if (ast_strlen_zero(username)) /* We have no authentication */
return -1;
@@ -10621,7 +10642,11 @@
@@ -10759,7 +10780,11 @@
gotdest = get_destination(p, NULL);
get_rdnis(p, NULL);
@ -130,7 +130,7 @@ $FreeBSD$
build_contact(p);
if (gotdest) {
@@ -10649,7 +10674,6 @@
@@ -10780,7 +10805,6 @@
c = sip_new(p, AST_STATE_DOWN, ast_strlen_zero(p->username) ? NULL : p->username );
*recount = 1;
/* Save Record-Route for any later requests we make on this dialogue */
@ -138,17 +138,17 @@ $FreeBSD$
if (c) {
/* Pre-lock the call */
ast_mutex_lock(&c->lock);
@@ -10735,7 +10759,12 @@
@@ -10867,7 +10891,12 @@
transmit_response(p, "180 Ringing", req);
break;
case AST_STATE_UP:
- /* Here we have reINVITE request - try to renegotiate codecs with */
- /* If this is not a re-invite or something to ignore - it's critical */
+ /* Assuming this to be reinvite, process new SDP portion */
+ if (!ast_strlen_zero(get_header(req, "Content-Type"))) {
+ process_sdp(p, req);
+ } else {
+ ast_log(LOG_DEBUG, "Hm.... No sdp for the moment\n");
+ }
transmit_response_with_sdp(p, "200 OK", req, 1);
transmit_response_with_sdp(p, "200 OK", req, (ignore || reinvite) ? 1 : 2);
break;
default:

2
net/asterisk12/pkg-plist
View file

@ -310,6 +310,7 @@ lib/asterisk/modules/cdr_csv.so
lib/asterisk/modules/cdr_custom.so
lib/asterisk/modules/cdr_manager.so
%%WITH_ODBC%%lib/asterisk/modules/cdr_odbc.so
%%WITH_FREETDS%%lib/asterisk/modules/cdr_tds.so
lib/asterisk/modules/chan_agent.so
lib/asterisk/modules/chan_features.so
%%WITH_H323%%lib/asterisk/modules/chan_h323.so
@ -381,6 +382,7 @@ sbin/streamplayer
%%DATADIR%%/images/asterisk-intro.jpg
%%DATADIR%%/keys/freeworlddialup.pub
%%DATADIR%%/keys/iaxtel.pub
%%DATADIR%%/mohmp3/LICENSE
%%DATADIR%%/mohmp3/fpm-calm-river.mp3
%%DATADIR%%/mohmp3/fpm-sunshine.mp3
%%DATADIR%%/mohmp3/fpm-world-mix.mp3