- update to 1.4.14 (many code improvements and fixes, some through valgrind testing) - add h323 FLAVOR (build must be manually restarted; ohphone can connect, light i386 testing only for this) - remove upstream-merged patch
http://svn.digium.com/view/asterisk/tags/1.4.14/ChangeLog?revision=89343&view=markup tested on sparc64, i386. any comments (other than "what drugs were they on when thinking up the h323 build procedure and where did they get them")? ok? cvs server: Diffing . Index: Makefile =================================================================== RCS file: /cvs/ports/telephony/asterisk/Makefile,v retrieving revision 1.25 diff -u -p -u -p -r1.25 Makefile --- Makefile 11 Oct 2007 08:05:18 -0000 1.25 +++ Makefile 19 Nov 2007 23:51:11 -0000 @@ -3,7 +3,7 @@ SHARED_ONLY= Yes COMMENT-main= open source multi-protocol PBX and telephony toolkit -V= 1.4.13 +V= 1.4.14 DISTNAME= asterisk-$V FULLPKGNAME-main= ${DISTNAME} @@ -60,9 +60,7 @@ CONFIGURE_ARGS+= --with-osptk=no \ --with-radius=no \ --with-sqlite=no \ --with-tds=no \ - --with-imap=no \ - --with-pwlib=no \ - --with-h323=no + --with-imap=no # Some build options (including a useful malloc debug) are available # via menuselect. They may be enabled by running 'make configure', cd @@ -70,6 +68,7 @@ CONFIGURE_ARGS+= --with-osptk=no \ # and 'make'. FLAVOR?= +FLAVORS= h323 # odbc PSEUDO_FLAVORS+= no_odbc @@ -163,6 +162,21 @@ WANTLIB-jabber= gcrypt gnutls gpg-error LIB_DEPENDS-jabber= iksemel::textproc/iksemel CONFIGURE_ARGS+= --with-gnutls=${LOCALBASE} \ --with-iksemel=${LOCALBASE} +.endif + +# h323 +.if ${FLAVOR:L:Mh323} +IS_INTERACTIVE= Yes +# must restart build by hand. +LIB_DEPENDS-main+= h323::net/openh323 \ + pt::devel/pwlib +CONFIGURE_ARGS+= --with-pwlib=/usr/local/lib \ + --with-h323=/usr/local/lib +WANTLIB-main+= expat ossaudio avutil +FULLPKGNAME-main= ${DISTNAME}-h323 +.else +CONFIGURE_ARGS+= --with-pwlib=no \ + --with-h323=no .endif .for i in ${MULTI_PACKAGES:S/-main//} Index: distinfo =================================================================== RCS file: /cvs/ports/telephony/asterisk/distinfo,v retrieving revision 1.19 diff -u -p -u -p -r1.19 distinfo --- distinfo 11 Oct 2007 08:05:18 -0000 1.19 +++ distinfo 19 Nov 2007 23:51:11 -0000 @@ -1,5 +1,5 @@ -MD5 (asterisk-1.4.13.tar.gz) = SbcxFIMcIcyXhNOz9Ptb7A== -RMD160 (asterisk-1.4.13.tar.gz) = bgImiL18CnrthNbOffaiaS6PFDg= -SHA1 (asterisk-1.4.13.tar.gz) = dsB9y8Ob937z3m66XTRaHyLR3BY= -SHA256 (asterisk-1.4.13.tar.gz) = C+ovYSx7brz7l8d9RzpFAYo+ES5WEP9/q4NWG+exlEk= -SIZE (asterisk-1.4.13.tar.gz) = 11257579 +MD5 (asterisk-1.4.14.tar.gz) = oRun8tOT5Wyq/KgMEUcpHQ== +RMD160 (asterisk-1.4.14.tar.gz) = 9xv9dGI5kFuQtVD1GtJ9kxe9HAo= +SHA1 (asterisk-1.4.14.tar.gz) = t2UbFYAeSpwfvGRbX7bPlZYOkqI= +SHA256 (asterisk-1.4.14.tar.gz) = LQ/ITtFl8Uau/ldeupTCZ8VPurULe1TTwEmQrd4Kky0= +SIZE (asterisk-1.4.14.tar.gz) = 11279263 cvs server: Diffing files cvs server: Diffing patches Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/telephony/asterisk/patches/patch-Makefile,v retrieving revision 1.12 diff -u -p -u -p -r1.12 patch-Makefile --- patches/patch-Makefile 4 Oct 2007 11:25:44 -0000 1.12 +++ patches/patch-Makefile 19 Nov 2007 23:51:11 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-Makefile,v 1.12 2007/10/04 11:25:44 sthen Exp $ ---- Makefile.orig Tue Oct 2 21:06:07 2007 -+++ Makefile Wed Oct 3 12:50:21 2007 +--- Makefile.orig Thu Nov 15 18:37:38 2007 ++++ Makefile Sat Nov 17 00:58:06 2007 @@ -35,6 +35,7 @@ export ASTVARRUNDIR export MODULES_DIR export ASTSPOOLDIR @@ -46,16 +46,18 @@ $OpenBSD: patch-Makefile,v 1.12 2007/10/ MOD_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include OTHER_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include -@@ -194,7 +198,7 @@ ifeq ($(OSARCH),linux-gnu) - endif +@@ -195,8 +199,10 @@ ifeq ($(OSARCH),linux-gnu) endif --ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) -+ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) + ifeq ($(findstring -save-temps,$(ASTCFLAGS)),) ++ifneq ($(OSARCH),OpenBSD) + ASTCFLAGS+=-pipe + endif ++endif - ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h + ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) -@@ -207,9 +211,11 @@ ifneq ($(findstring BSD,$(OSARCH)),) +@@ -211,9 +217,11 @@ ifneq ($(findstring BSD,$(OSARCH)),) ASTLDFLAGS+=-L/usr/local/lib endif @@ -67,7 +69,7 @@ $OpenBSD: patch-Makefile,v 1.12 2007/10/ ifeq ($(PROC),ppc) ASTCFLAGS+=-fsigned-char -@@ -552,21 +558,25 @@ samples: adsi +@@ -556,13 +564,14 @@ samples: adsi echo "astetcdir => $(ASTETCDIR)" ; \ echo "astmoddir => $(MODULES_DIR)" ; \ echo "astvarlibdir => $(ASTVARLIBDIR)" ; \ @@ -80,17 +82,24 @@ $OpenBSD: patch-Makefile,v 1.12 2007/10/ echo "" ; \ - echo ";[options]" ; \ + echo "[options]" ; \ - echo ";internal_timing = yes" ; \ - echo ";systemname = my_system_name ; prefix uniqueid with a system name for global uniqueness issues" ; \ + echo ";verbose = 3" ; \ + echo ";debug = 3" ; \ + echo ";alwaysfork = yes ; same as -F at startup" ; \ +@@ -585,15 +594,15 @@ samples: adsi + echo ";record_cache_dir = /tmp ; Specify cache directory (used in cnjunction with cache_record_files)" ; \ + echo ";transmit_silence_during_record = yes ; Transmit SLINEAR silence while a channel is being recorded" ; \ + echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \ +- echo ";runuser = asterisk ; The user to run as" ; \ +- echo ";rungroup = asterisk ; The group to run as" ; \ ++ echo "runuser = _asterisk ; The user to run as" ; \ ++ echo "rungroup = _asterisk ; The group to run as" ; \ + echo "" ; \ echo "; Changing the following lines may compromise your security." ; \ - echo ";[files]" ; \ - echo ";astctlpermissions = 0660" ; \ - echo ";astctlowner = root" ; \ - echo ";astctlgroup = apache" ; \ - echo ";astctl = asterisk.ctl" ; \ -+ echo "runuser => _asterisk" ; \ -+ echo "rungroup => _asterisk" ; \ -+ echo "" ; \ + echo "[files]" ; \ + echo "astctlpermissions = 0660" ; \ + echo "astctlowner = _asterisk" ; \ Index: patches/patch-main_asterisk_c =================================================================== RCS file: /cvs/ports/telephony/asterisk/patches/patch-main_asterisk_c,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-main_asterisk_c --- patches/patch-main_asterisk_c 4 Oct 2007 11:25:44 -0000 1.2 +++ patches/patch-main_asterisk_c 19 Nov 2007 23:51:11 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-main_asterisk_c,v 1.2 2007/10/04 11:25:44 sthen Exp $ ---- main/asterisk.c.orig Thu Sep 20 22:16:48 2007 -+++ main/asterisk.c Wed Oct 3 12:50:22 2007 -@@ -2403,6 +2403,7 @@ static void ast_readconfig(void) +--- main/asterisk.c.orig Wed Oct 17 16:23:51 2007 ++++ main/asterisk.c Sat Nov 17 00:45:45 2007 +@@ -2411,6 +2411,7 @@ static void ast_readconfig(void) snprintf(ast_config_AST_MONITOR_DIR, sizeof(ast_config_AST_MONITOR_DIR) - 1, "%s/monitor", v->value); } else if (!strcasecmp(v->name, "astvarlibdir")) { 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.2 20 snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/astdb", v->value); } else if (!strcasecmp(v->name, "astdatadir")) { ast_copy_string(ast_config_AST_DATA_DIR, v->value, sizeof(ast_config_AST_DATA_DIR)); -@@ -2701,12 +2702,20 @@ int main(int argc, char *argv[]) +@@ -2708,6 +2709,7 @@ int main(int argc, char *argv[]) rungroup = ast_config_AST_RUN_GROUP; if ((!runuser) && !ast_strlen_zero(ast_config_AST_RUN_USER)) runuser = ast_config_AST_RUN_USER; @@ -17,25 +17,3 @@ $OpenBSD: patch-main_asterisk_c,v 1.2 20 #ifndef __CYGWIN__ - if (!is_child_of_nonroot) - ast_set_priority(ast_opt_high_priority); - -+ /* -+ * don't try to setuid()/setgid() when only running as 'asterisk -r' -+ * otherwise users must be root to reconnect to an existing instance, -+ * even if they already have filesystem permissions on asterisk.ctl -+ * (see asterisk.conf). -+ */ -+ if(!ast_opt_remote) { - if (!is_child_of_nonroot && rungroup) { - struct group *gr; - gr = getgrnam(rungroup); -@@ -2751,7 +2760,7 @@ int main(int argc, char *argv[]) - if (option_verbose) - ast_verbose("Running as user '%s'\n", runuser); - } -- -+ } - #endif /* __CYGWIN__ */ - - #ifdef linux cvs server: Diffing pkg Index: pkg/DESCR-speex =================================================================== RCS file: /cvs/ports/telephony/asterisk/pkg/DESCR-speex,v retrieving revision 1.1 diff -u -p -u -p -r1.1 DESCR-speex --- pkg/DESCR-speex 5 Sep 2007 22:42:52 -0000 1.1 +++ pkg/DESCR-speex 19 Nov 2007 23:51:11 -0000 @@ -1 +1 @@ -A driver for the Speex codec to be used in Asterisk channels.1 +A driver for the Speex codec to be used in Asterisk channels. Index: pkg/PFRAG.h323-main =================================================================== RCS file: pkg/PFRAG.h323-main diff -N pkg/PFRAG.h323-main --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/PFRAG.h323-main 19 Nov 2007 23:51:11 -0000 @@ -0,0 +1,5 @@ [EMAIL PROTECTED] $OpenBSD$ +lib/asterisk/modules/chan_h323.so +share/doc/asterisk/h323.txt +share/examples/asterisk/default/h323.conf [EMAIL PROTECTED] ${SYSCONFDIR}/asterisk/h323.conf Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/telephony/asterisk/pkg/PLIST-main,v retrieving revision 1.2 diff -u -p -u -p -r1.2 PLIST-main --- pkg/PLIST-main 4 Oct 2007 11:25:44 -0000 1.2 +++ pkg/PLIST-main 19 Nov 2007 23:51:11 -0000 @@ -3,6 +3,7 @@ @conflict app_conference-<=20070710 @newgroup _asterisk:545 @newuser _asterisk:545:_asterisk:daemon:asterisk user:/nonexistent:/sbin/nologin +%%h323%% include/asterisk/ include/asterisk.h include/asterisk/abstract_jb.h @@ -683,7 +684,6 @@ share/doc/asterisk/extconfig.txt share/doc/asterisk/extensions.txt share/doc/asterisk/externalivr.txt share/doc/asterisk/freetds.txt -share/doc/asterisk/h323.txt share/doc/asterisk/hardware.txt share/doc/asterisk/iax.txt share/doc/asterisk/ices.txt @@ -714,6 +714,7 @@ share/doc/asterisk/sla.tex share/doc/asterisk/smdi.txt share/doc/asterisk/sms.txt share/doc/asterisk/speechrec.txt +share/doc/asterisk/valgrind.txt share/doc/asterisk/video.txt share/examples/asterisk/ @sample ${SYSCONFDIR}/asterisk/ @@ -743,7 +744,6 @@ share/examples/asterisk/default/extensio @comment share/examples/asterisk/default/features.conf share/examples/asterisk/default/festival.conf share/examples/asterisk/default/followme.conf [EMAIL PROTECTED] share/examples/asterisk/default/h323.conf share/examples/asterisk/default/http.conf share/examples/asterisk/default/iax.conf share/examples/asterisk/default/iaxprov.conf
