Ticket #8132: packaging.5.diff

File packaging.5.diff, 27.8 KB (added by superm1@…, 7 years ago)

rendition 5, accidentally dropped g722 and rtp in rendition 4

  • patches/101-fix-google-voice-out.patch

     
     1Index: asterisk-1.8.0/channels/chan_gtalk.c 
     2=================================================================== 
     3--- asterisk-1.8.0/channels/chan_gtalk.c        (revision 297950) 
     4+++ asterisk-1.8.0/channels/chan_gtalk.c        (working copy) 
     5@@ -196,6 +196,8 @@ 
     6 static char *gtalk_show_channels(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a); 
     7 static char *gtalk_show_settings(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a); 
     8 static int gtalk_update_externip(void); 
     9+static int gtalk_parser(void *data, ikspak *pak); 
     10+static int gtalk_create_candidates(struct gtalk *client, struct gtalk_pvt *p, char *sid, char *from, char *to); 
     11  
     12 /*! \brief PBX interface structure for channel registration */ 
     13 static const struct ast_channel_tech gtalk_tech = { 
     14@@ -466,12 +468,46 @@ 
     15 static int gtalk_ringing_ack(void *data, ikspak *pak) 
     16 { 
     17        struct gtalk_pvt *p = data; 
     18+       struct ast_channel *owner; 
     19  
     20-       if (p->ringrule) 
     21+       ast_mutex_lock(&p->lock); 
     22+ 
     23+       if (p->ringrule) { 
     24                iks_filter_remove_rule(p->parent->connection->f, p->ringrule); 
     25+       } 
     26        p->ringrule = NULL; 
     27-       if (p->owner) 
     28-               ast_queue_control(p->owner, AST_CONTROL_RINGING); 
     29+ 
     30+       /* this may be a redirect */ 
     31+       if (!strcmp(S_OR(iks_find_attrib(pak->x, "type"), ""), "error")) { 
     32+               char *name = NULL; 
     33+               char *redirect = NULL; 
     34+               iks *traversenodes = NULL; 
     35+               traversenodes = pak->query; 
     36+               while (traversenodes) { 
     37+                       if (!(name = iks_name(traversenodes))) { 
     38+                               break; 
     39+                       } 
     40+                       if (!strcasecmp(name, "error") && 
     41+                               (redirect = iks_find_cdata(traversenodes, "redirect")) && 
     42+                               (redirect = strstr(redirect, "xmpp:"))) { 
     43+                               redirect += 5; 
     44+                               ast_log(LOG_DEBUG, "redirect %s\n", redirect); 
     45+                               ast_copy_string(p->them, redirect, sizeof(p->them)); 
     46+ 
     47+                               gtalk_invite(p, p->them, p->us, p->sid, 1); 
     48+                               break; 
     49+                       } 
     50+                       traversenodes = iks_next_tag(traversenodes); 
     51+               } 
     52+       } 
     53+       gtalk_create_candidates(p->parent, p, p->sid, p->them, p->us); 
     54+       owner = p->owner; 
     55+       ast_mutex_unlock(&p->lock); 
     56+ 
     57+       if (owner) { 
     58+               ast_queue_control(owner, AST_CONTROL_RINGING); 
     59+       } 
     60+ 
     61        return IKS_FILTER_EAT; 
     62 } 
     63  
     64@@ -973,7 +1009,7 @@ 
     65                if (resources) { 
     66                        snprintf(idroster, sizeof(idroster), "%s/%s", them, resources->resource); 
     67                } else if ((*them == '+') || (strstr(them, "@voice.google.com"))) { 
     68-                       snprintf(idroster, sizeof(idroster), "%s/srvres", them); 
     69+                       snprintf(idroster, sizeof(idroster), "%s", them); 
     70                } else { 
     71                        ast_log(LOG_ERROR, "no gtalk capable clients to talk to.\n"); 
     72                        return NULL; 
     73@@ -1783,7 +1819,6 @@ 
     74        } 
     75  
     76        gtalk_invite(p, p->them, p->us, p->sid, 1); 
     77-       gtalk_create_candidates(p->parent, p, p->sid, p->them, p->us); 
     78  
     79        return 0; 
     80 } 
  • patches/100-build_tools-iconv.patch

     
    1 diff -Nru asterisk-1.6.2.0-beta2.org/build_tools/menuselect-deps.in asterisk-1.6.2.0-beta2/build_tools/menuselect-deps.in 
    2 --- asterisk-1.6.2.0-beta2.org/build_tools/menuselect-deps.in   2009-01-15 21:18:53.000000000 +0100 
    3 +++ asterisk-1.6.2.0-beta2/build_tools/menuselect-deps.in       2009-06-04 19:37:42.000000000 +0200 
    4 @@ -11,7 +11,7 @@ 
    5  GTK=@PBX_GTK@ 
     1--- asterisk-1.8.0/build_tools/menuselect-deps.in.orig  2010-07-27 18:30:38.000000000 -0400 
     2+++ asterisk-1.8.0/build_tools/menuselect-deps.in       2010-10-26 00:28:45.989447002 -0400 
     3@@ -14,7 +14,7 @@ 
    64 H323=@PBX_H323@ 
    75 HOARD=@PBX_HOARD@ 
     6 ICAL=@PBX_ICAL@ 
    87-ICONV=@PBX_ICONV@ 
    98+ICONV=0 
    109 IKSEMEL=@PBX_IKSEMEL@ 
  • Makefile

     
    88include $(TOPDIR)/rules.mk 
    99 
    1010PKG_NAME:=asterisk 
    11 PKG_VERSION:=1.6.2.14 
    12 PKG_RELEASE:=1 
     11PKG_VERSION:=1.8.0 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1515PKG_SOURCE_URL:=http://downloads.digium.com/pub/asterisk/releases/ 
     
    1717 
    1818include $(INCLUDE_DIR)/package.mk 
    1919 
    20 define Package/asterisk16/Default 
    21   SUBMENU:=asterisk16 (Complete Open Source PBX), v1.6.x 
     20define Package/asterisk18/Default 
     21  SUBMENU:=asterisk18 (Complete Open Source PBX), v1.8.x 
    2222  SECTION:=net 
    2323  CATEGORY:=Network 
    2424  URL:=http://www.asterisk.org/ 
    2525  MAINTAINER:=Hans Zandbelt <hans.zandbelt@gmail.com> 
    2626endef 
    2727 
    28 define Package/asterisk16/Default/description 
     28define Package/asterisk18/Default/description 
    2929 Asterisk is a complete PBX in software. It provides all of the features 
    3030 you would expect from a PBX and more. Asterisk does voice over IP in three 
    3131 protocols, and can interoperate with almost all standards-based telephony 
     
    3333endef 
    3434 
    3535 
    36 define Package/asterisk16 
    37 $(call Package/asterisk16/Default) 
     36define Package/asterisk18 
     37$(call Package/asterisk18/Default) 
    3838  TITLE:=Complete open source PBX 
    3939  DEPENDS:= +libopenssl +libncurses +libpopt +libpthread +zlib @!TARGET_avr32 @!PACKAGE_asterisk14 
    4040endef 
    4141 
    42 define Package/asterisk16/description 
    43 $(call Package/asterisk16/Default/description) 
     42define Package/asterisk18/description 
     43$(call Package/asterisk18/Default/description) 
    4444endef 
    4545 
    46 define Package/asterisk16-sounds 
    47 $(call Package/asterisk16/Default) 
     46define Package/asterisk18-sounds 
     47$(call Package/asterisk18/Default) 
    4848  TITLE:=Sound files 
    49   DEPENDS:= +asterisk16 
     49  DEPENDS:= +asterisk18 
    5050endef 
    5151 
    52 define Package/asterisk16-sounds/description 
    53 $(call Package/asterisk16/Default/description) 
     52define Package/asterisk18-sounds/description 
     53$(call Package/asterisk18/Default/description) 
    5454 This package contains sound files for Asterisk. 
    5555endef 
    5656 
    5757 
    58 define Package/asterisk16-voicemail 
    59 $(call Package/asterisk16/Default) 
     58define Package/asterisk18-voicemail 
     59$(call Package/asterisk18/Default) 
    6060  TITLE:=Voicemail support 
    61   DEPENDS:= +asterisk16 
     61  DEPENDS:= +asterisk18 
    6262endef 
    6363 
    64 define Package/asterisk16-voicemail/description 
    65 $(call Package/asterisk16/Default/description) 
     64define Package/asterisk18-voicemail/description 
     65$(call Package/asterisk18/Default/description) 
    6666 This package contains voicemail related modules for Asterisk. 
    6767endef 
    6868 
    69 define Package/asterisk16-app-meetme 
    70 $(call Package/asterisk16/Default) 
     69define Package/asterisk18-app-meetme 
     70$(call Package/asterisk18/Default) 
    7171  TITLE:=conferencing support 
    72   DEPENDS:= +asterisk16 +dahdi-tools-libtonezone +kmod-dahdi-linux 
     72  DEPENDS:= +asterisk18 +dahdi-tools-libtonezone +kmod-dahdi-linux 
    7373endef 
    7474 
    75 define Package/asterisk16-app-meetme/description 
    76 $(call Package/asterisk16/Default/description) 
     75define Package/asterisk18-app-meetme/description 
     76$(call Package/asterisk18/Default/description) 
    7777 This package provides the MeetMe application driver Conferencing support to 
    7878 Asterisk. 
    7979endef 
    8080 
    81 define Package/asterisk16-chan-iax2 
    82 $(call Package/asterisk16/Default) 
     81define Package/asterisk18-chan-iax2 
     82$(call Package/asterisk18/Default) 
    8383  TITLE:=IAX support 
    84   DEPENDS:= +asterisk16 
     84  DEPENDS:= +asterisk18 
    8585endef 
    8686 
    87 define Package/asterisk16-chan-iax2/description 
    88 $(call Package/asterisk16/Default/description) 
     87define Package/asterisk18-chan-iax2/description 
     88$(call Package/asterisk18/Default/description) 
    8989 This package provides IAX support to 
    9090 Asterisk. 
    9191endef 
    9292 
    93 define Package/asterisk16-cdr 
    94 $(call Package/asterisk16/Default) 
     93define Package/asterisk18-cdr 
     94$(call Package/asterisk18/Default) 
    9595  TITLE:=CDR support 
    96   DEPENDS:= +asterisk16 
     96  DEPENDS:= +asterisk18 
    9797endef 
    9898 
    99 define Package/asterisk16-cdr/description 
    100 $(call Package/asterisk16/Default/description) 
     99define Package/asterisk18-cdr/description 
     100$(call Package/asterisk18/Default/description) 
    101101 This package provides Call Detail Record support to 
    102102 Asterisk. 
    103103endef 
    104104 
    105 define Package/asterisk16-res-musiconhold 
    106 $(call Package/asterisk16/Default) 
     105define Package/asterisk18-res-musiconhold 
     106$(call Package/asterisk18/Default) 
    107107  TITLE:=MOH support 
    108   DEPENDS:= +asterisk16 
     108  DEPENDS:= +asterisk18 
    109109endef 
    110110 
    111 define Package/asterisk16-res-musiconhold/description 
    112 $(call Package/asterisk16/Default/description) 
     111define Package/asterisk18-res-musiconhold/description 
     112$(call Package/asterisk18/Default/description) 
    113113 This package provides Music On Hold support to 
    114114 Asterisk. 
    115115endef 
    116116 
    117 define Package/asterisk16-chan-gtalk 
    118 $(call Package/asterisk16/Default) 
     117define Package/asterisk18-res-rtp-asterisk 
     118$(call Package/asterisk18/Default) 
     119  TITLE:=RTP Support 
     120  DEPENDS:= +asterisk18 
     121endef 
     122 
     123define Package/asterisk18-res-rtp-asterisk/description 
     124$(call Package/asterisk18/Default/description) 
     125 This package provides RTP support to Asterisk. 
     126 It is needed by chan_sip. 
     127endef 
     128 
     129define Package/asterisk18-chan-gtalk 
     130$(call Package/asterisk18/Default) 
    119131  TITLE:=GTalk support 
    120   DEPENDS:= +asterisk16 +libiksemel 
     132  DEPENDS:= +asterisk18 +libiksemel 
    121133endef 
    122134 
    123 define Package/asterisk16-chan-gtalk/description 
    124 $(call Package/asterisk16/Default/description) 
     135define Package/asterisk18-chan-gtalk/description 
     136$(call Package/asterisk18/Default/description) 
    125137 This package provides the channel chan_gtalk and res_jabber for GTalk 
    126138 support to Asterisk. 
    127139endef 
    128140 
    129 define Package/asterisk16-curl 
    130 $(call Package/asterisk16/Default) 
     141define Package/asterisk18-curl 
     142$(call Package/asterisk18/Default) 
    131143  TITLE:=CURL support 
    132   DEPENDS:= +asterisk16 +libcurl 
     144  DEPENDS:= +asterisk18 +libcurl 
    133145endef 
    134146 
    135 define Package/asterisk16-curl/description 
    136 $(call Package/asterisk16/Default/description) 
     147define Package/asterisk18-curl/description 
     148$(call Package/asterisk18/Default/description) 
    137149 This package provides CURL 
    138150 support to Asterisk. 
    139151endef 
    140152  
    141 ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk16-app-meetme),) 
     153ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-app-meetme),) 
    142154  CONFIGURE_ARGS+= \ 
    143155        --with-dahdi="$(STAGING_DIR)/usr" 
    144156else 
     
    146158        --without-dahdi 
    147159endif 
    148160 
    149 ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk16-chan-gtalk),) 
     161ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-chan-gtalk),) 
    150162  CONFIGURE_ARGS+= \ 
    151163        --with-gnutls="$(STAGING_DIR)/usr" \ 
    152164        --with-iksemel="$(STAGING_DIR)/usr" 
     
    159171        --without-iksemel 
    160172endif 
    161173 
    162 ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk16-curl),) 
     174ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-curl),) 
    163175  CONFIGURE_ARGS+= \ 
    164176        --with-curl="$(STAGING_DIR)/usr" 
    165177else 
     
    228240#       $(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk.h $(1)/usr/include/ 
    229241#endef 
    230242 
    231 define Package/asterisk16/conffiles 
     243define Package/asterisk18/conffiles 
    232244/etc/asterisk/asterisk.conf 
    233245/etc/asterisk/modules.conf 
    234246/etc/asterisk/extensions.conf 
     
    243255/etc/init.d/asterisk 
    244256endef 
    245257 
    246 define Package/asterisk16/install 
     258define Package/asterisk18/install 
    247259        $(INSTALL_DIR) $(1)/etc/asterisk 
    248260        for f in asterisk extensions features \ 
    249261                indications logger manager modules \ 
     
    267279        $(INSTALL_BIN)  ./files/asterisk.init $(1)/etc/init.d/asterisk 
    268280endef 
    269281 
    270 define Package/asterisk16-sounds/install 
    271         $(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/ 
    272         $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/* $(1)/usr/lib/asterisk/sounds/ 
    273         rm -f $(1)/usr/lib/asterisk/sounds/vm-* 
    274         rm -f $(1)/usr/lib/asterisk/sounds/conf-* 
     282define Package/asterisk18-sounds/install 
     283        $(INSTALL_DIR) $(1)/var/lib/asterisk/sounds/ 
     284        $(CP) $(PKG_INSTALL_DIR)/var/lib/asterisk/sounds/en/* $(1)/var/lib/asterisk/sounds/ 
     285        rm -f $(1)/var/lib/asterisk/sounds/vm-* 
     286        rm -f $(1)/var/lib/asterisk/sounds/conf-* 
    275287endef 
    276288 
    277289 
    278 define Package/asterisk16-voicemail/conffiles 
     290define Package/asterisk18-voicemail/conffiles 
    279291/etc/asterisk/voicemail.conf 
    280292endef 
    281293 
    282 define Package/asterisk16-voicemail/install 
     294define Package/asterisk18-voicemail/install 
    283295        $(INSTALL_DIR) $(1)/etc/asterisk 
    284296        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/voicemail.conf $(1)/etc/asterisk/ 
    285297        $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules 
    286298        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/*voicemail.so $(1)/usr/lib/asterisk/modules/ 
    287299        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_adsi.so $(1)/usr/lib/asterisk/modules/ 
    288         $(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/ 
    289         $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/vm-*.gsm $(1)/usr/lib/asterisk/sounds/ 
     300        $(INSTALL_DIR) $(1)/var/lib/asterisk/sounds/ 
     301        $(CP) $(PKG_INSTALL_DIR)/var/lib/asterisk/sounds/en/vm-*.gsm $(1)/var/lib/asterisk/sounds/ 
    290302endef 
    291303 
    292 define Package/asterisk16-app-meetme/conffiles 
     304define Package/asterisk18-app-meetme/conffiles 
    293305/etc/asterisk/meetme.conf 
    294306endef 
    295307 
    296 define Package/asterisk16-app-meetme/install 
     308define Package/asterisk18-app-meetme/install 
    297309        $(INSTALL_DIR) $(1)/etc/asterisk 
    298310        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/meetme.conf $(1)/etc/asterisk/ 
    299311        $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules 
    300312        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/app_meetme.so $(1)/usr/lib/asterisk/modules/ 
    301313        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_dahdi.so $(1)/usr/lib/asterisk/modules/ 
    302         $(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/ 
    303         $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/conf-*.gsm $(1)/usr/lib/asterisk/sounds/ 
     314        $(INSTALL_DIR) $(1)/var/lib/asterisk/sounds/ 
     315        $(CP) $(PKG_INSTALL_DIR)/var/lib/asterisk/sounds/en/conf-*.gsm $(1)/var/lib/asterisk/sounds/ 
    304316endef 
    305317 
    306 define Package/asterisk16-chan-iax2/conffiles 
     318define Package/asterisk18-chan-iax2/conffiles 
    307319/etc/asterisk/iax.conf 
    308320/etc/asterisk/iaxprov.conf 
    309321endef 
    310322 
    311 define Package/asterisk16-cdr/conffiles 
     323define Package/asterisk18-cdr/conffiles 
    312324/etc/asterisk/cdr.conf 
    313325/etc/asterisk/cdr_custom.conf 
    314326/etc/asterisk/cdr_manager.conf 
     
    317329/etc/asterisk/cdr_tds.conf 
    318330endef 
    319331 
    320 define Package/asterisk16-res-musiconhold/conffiles 
     332define Package/asterisk18-res-musiconhold/conffiles 
    321333/etc/asterisk/musiconhold.conf 
    322334endef 
    323335 
    324 define Package/asterisk16-chan-iax2/install 
     336define Package/asterisk18-chan-iax2/install 
    325337        $(INSTALL_DIR) $(1)/etc/asterisk 
    326338        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/iax.conf $(1)/etc/asterisk/ 
    327339        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/iaxprov.conf $(1)/etc/asterisk/ 
     
    329341        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_iax2.so $(1)/usr/lib/asterisk/modules/ 
    330342endef 
    331343 
    332 define Package/asterisk16-cdr/install 
     344define Package/asterisk18-cdr/install 
    333345        $(INSTALL_DIR) $(1)/etc/asterisk 
    334346        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/cdr*.conf $(1)/etc/asterisk/ 
    335347        $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules 
    336348        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/*cdr*.so $(1)/usr/lib/asterisk/modules/ 
    337349endef 
    338350 
    339 define Package/asterisk16-res-musiconhold/install 
     351define Package/asterisk18-res-musiconhold/install 
    340352        $(INSTALL_DIR) $(1)/etc/asterisk 
    341353        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/musiconhold.conf $(1)/etc/asterisk/ 
    342354        $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules 
    343355        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_musiconhold.so $(1)/usr/lib/asterisk/modules/ 
    344356endef 
    345357 
    346 define Package/asterisk16-chan-gtalk/conffiles 
     358define Package/asterisk18-res-rtp-asterisk/install 
     359        $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules 
     360        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_rtp*.so $(1)/usr/lib/asterisk/modules/ 
     361endef 
     362 
     363define Package/asterisk18-res-rtp-asterisk/install  
     364        $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules 
     365        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_rtp*.so $(1)/usr/lib/asterisk/modules/  
     366endef  
     367 
     368define Package/asterisk18-chan-gtalk/conffiles 
    347369/etc/asterisk/gtalk.conf 
    348370/etc/asterisk/jabber.conf 
    349371endef 
    350372 
    351 define Package/asterisk16-chan-gtalk/install 
     373define Package/asterisk18-chan-gtalk/install 
    352374        $(INSTALL_DIR) $(1)/etc/asterisk 
    353375        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/gtalk.conf $(1)/etc/asterisk/ 
    354376        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/jabber.conf $(1)/etc/asterisk/ 
     
    357379        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_jabber.so $(1)/usr/lib/asterisk/modules/ 
    358380endef 
    359381 
    360 define Package/asterisk16-curl/install 
     382define Package/asterisk18-curl/install 
    361383        $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules 
    362384        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/func_curl.so $(1)/usr/lib/asterisk/modules/ 
    363385        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_curl.so $(1)/usr/lib/asterisk/modules/ 
    364386endef 
    365387 
    366 define BuildAsterisk16ModuleTemplate 
     388define Buildasterisk18ModuleTemplate 
    367389 
    368   define Package/asterisk16-$(subst _,-,$(1)) 
    369   $$(call Package/asterisk16/Default) 
     390  define Package/asterisk18-$(subst _,-,$(1)) 
     391  $$(call Package/asterisk18/Default) 
    370392    TITLE:=$(2) support 
    371     DEPENDS:= +asterisk16 
     393    DEPENDS:= +asterisk18 
    372394  endef 
    373395 
    374   define Package/asterisk16-$(subst _,-,$(1))/description 
    375   $$(call Package/asterisk16/Default/description) 
     396  define Package/asterisk18-$(subst _,-,$(1))/description 
     397  $$(call Package/asterisk18/Default/description) 
    376398    This package provides support $(3) in Asterisk. 
    377399  endef 
    378400 
    379   define Package/asterisk16-$(subst _,-,$(1))/install 
     401  define Package/asterisk18-$(subst _,-,$(1))/install 
    380402        $(INSTALL_DIR) $$(1)/usr/lib/asterisk/modules 
    381403        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/$(1).so $$(1)/usr/lib/asterisk/modules/ 
    382404  endef 
    383405 
    384   $$(eval $$(call BuildPackage,asterisk16-$(subst _,-,$(1)))) 
     406  $$(eval $$(call BuildPackage,asterisk18-$(subst _,-,$(1)))) 
    385407endef 
    386408 
    387 $(eval $(call BuildPackage,asterisk16)) 
    388 $(eval $(call BuildPackage,asterisk16-voicemail)) 
    389 $(eval $(call BuildPackage,asterisk16-sounds)) 
    390 #$(eval $(call BuildPackage,asterisk16-app-meetme)) 
    391 $(eval $(call BuildPackage,asterisk16-chan-iax2)) 
    392 $(eval $(call BuildPackage,asterisk16-cdr)) 
    393 $(eval $(call BuildPackage,asterisk16-res-musiconhold)) 
    394 $(eval $(call BuildPackage,asterisk16-chan-gtalk)) 
    395 $(eval $(call BuildPackage,asterisk16-curl)) 
    396 $(eval $(call BuildAsterisk16ModuleTemplate,app_authenticate,Authenticate,support for executing arbitrary authenticate commands)) 
    397 $(eval $(call BuildAsterisk16ModuleTemplate,app_chanisavail,Channel availability check,support for checking if a channel is available)) 
    398 $(eval $(call BuildAsterisk16ModuleTemplate,app_chanspy,Channel listen in,support for listening in on any channel)) 
    399 $(eval $(call BuildAsterisk16ModuleTemplate,app_directed_pickup,Directed call pickup,support for directed call pickup)) 
    400 $(eval $(call BuildAsterisk16ModuleTemplate,app_exec,Exec application,support for application execution)) 
    401 $(eval $(call BuildAsterisk16ModuleTemplate,app_minivm,Minimal voicemail system,a voicemail system in small building blocks working together based on the Comedian Mail voicemail system)) 
    402 $(eval $(call BuildAsterisk16ModuleTemplate,app_readexten,Extension to variable,a trivial application to read an extension into a variable)) 
    403 $(eval $(call BuildAsterisk16ModuleTemplate,app_read,Variable read,a trivial application to read a variable)) 
    404 $(eval $(call BuildAsterisk16ModuleTemplate,app_sayunixtime,Say Unix time,an application to say Unix time)) 
    405 $(eval $(call BuildAsterisk16ModuleTemplate,app_sms,SMS,SMS support (ETSI ES 201 912 protocol 1))) 
    406 $(eval $(call BuildAsterisk16ModuleTemplate,app_stack,Stack applications, stack applications Gosub Return etc.)) 
    407 $(eval $(call BuildAsterisk16ModuleTemplate,app_system,System exec,support for executing system commands)) 
    408 $(eval $(call BuildAsterisk16ModuleTemplate,app_talkdetect,File playback with audio detect,for file playback with audio detect)) 
    409 $(eval $(call BuildAsterisk16ModuleTemplate,app_waituntil,Sleep,support sleeping until the given epoch)) 
    410 $(eval $(call BuildAsterisk16ModuleTemplate,app_while,While loop,a while loop implementation)) 
    411 $(eval $(call BuildAsterisk16ModuleTemplate,chan_agent,Agents proxy channel, an implementation of agents proxy channel)) 
    412 $(eval $(call BuildAsterisk16ModuleTemplate,chan_local,Local proxy channel, an implementation of local proxy channel)) 
    413 $(eval $(call BuildAsterisk16ModuleTemplate,codec_ulaw,Signed linear to ulaw translation,translation between signed linear and ulaw codecs)) 
    414 $(eval $(call BuildAsterisk16ModuleTemplate,codec_a_mu,Alaw to ulaw translation,translation between alaw and ulaw codecs)) 
    415 $(eval $(call BuildAsterisk16ModuleTemplate,codec_g726,Signed linear to G.726 translation,translation between signed linear and ITU G.726-32kbps codecs)) 
    416 $(eval $(call BuildAsterisk16ModuleTemplate,format_g726,G.726,support for headerless G.726 16/24/32/40kbps data format)) 
    417 $(eval $(call BuildAsterisk16ModuleTemplate,format_g729,G.729,support for raw headerless G729 data)) 
    418 $(eval $(call BuildAsterisk16ModuleTemplate,format_sln,Raw slinear format,support for raw slinear format)) 
    419 $(eval $(call BuildAsterisk16ModuleTemplate,format_sln16,Raw slinear 16 format,support for Raw slinear 16 format)) 
    420 $(eval $(call BuildAsterisk16ModuleTemplate,func_db,Database interaction,functions for interaction with the database)) 
    421 $(eval $(call BuildAsterisk16ModuleTemplate,func_devstate,Blinky lights control,functions for manually controlled blinky lights)) 
    422 $(eval $(call BuildAsterisk16ModuleTemplate,func_vmcount,vmcount dialplan,a vmcount dialplan function)) 
    423 $(eval $(call BuildAsterisk16ModuleTemplate,func_extstate,Hinted extension state,retrieving the state of a hinted extension for dialplan control)) 
    424 $(eval $(call BuildAsterisk16ModuleTemplate,func_global,Global variable,global variable dialplan functions)) 
    425 $(eval $(call BuildAsterisk16ModuleTemplate,func_shell,Shell,support for shell execution)) 
    426 $(eval $(call BuildAsterisk16ModuleTemplate,pbx_ael,Asterisk Extension Logic,support for symbolic Asterisk Extension Logic)) 
    427 $(eval $(call BuildAsterisk16ModuleTemplate,res_ael_share,Shareable AEL code,support for shareable AEL code mainly between internal and external modules)) 
    428 $(eval $(call BuildAsterisk16ModuleTemplate,pbx_spool,Call Spool,outgoing call spool support)) 
    429 $(eval $(call BuildAsterisk16ModuleTemplate,res_agi,Asterisk Gateway Interface,support for the Asterisk Gateway Interface extension)) 
    430 $(eval $(call BuildAsterisk16ModuleTemplate,app_alarmreceiver,Alarm receiver,Central Station Alarm receiver for Ademco Contact ID)) 
    431 $(eval $(call BuildAsterisk16ModuleTemplate,app_setcallerid,Set callerid,support for setting callerid)) 
    432 $(eval $(call BuildAsterisk16ModuleTemplate,app_verbose,Verbose logging,Verbose logging application)) 
    433 $(eval $(call BuildAsterisk16ModuleTemplate,func_channel,Channel info,Channel info dialplan function)) 
    434 $(eval $(call BuildAsterisk16ModuleTemplate,func_blacklist,Blacklist on callerid,looking up the callerid number, and see if it is blacklisted)) 
    435 $(eval $(call BuildAsterisk16ModuleTemplate,app_originate,Originate a call,originating an outbound call and connecting it to a specified extension or application)) 
     409$(eval $(call BuildPackage,asterisk18)) 
     410$(eval $(call BuildPackage,asterisk18-voicemail)) 
     411$(eval $(call BuildPackage,asterisk18-sounds)) 
     412#$(eval $(call BuildPackage,asterisk18-app-meetme)) 
     413$(eval $(call BuildPackage,asterisk18-chan-iax2)) 
     414$(eval $(call BuildPackage,asterisk18-cdr)) 
     415$(eval $(call BuildPackage,asterisk18-res-musiconhold)) 
     416$(eval $(call BuildPackage,asterisk18-res-rtp-asterisk))  
     417$(eval $(call BuildPackage,asterisk18-chan-gtalk)) 
     418$(eval $(call BuildPackage,asterisk18-curl)) 
     419$(eval $(call Buildasterisk18ModuleTemplate,app_authenticate,Authenticate,support for executing arbitrary authenticate commands)) 
     420$(eval $(call Buildasterisk18ModuleTemplate,app_chanisavail,Channel availability check,support for checking if a channel is available)) 
     421$(eval $(call Buildasterisk18ModuleTemplate,app_chanspy,Channel listen in,support for listening in on any channel)) 
     422$(eval $(call Buildasterisk18ModuleTemplate,app_directed_pickup,Directed call pickup,support for directed call pickup)) 
     423$(eval $(call Buildasterisk18ModuleTemplate,app_exec,Exec application,support for application execution)) 
     424$(eval $(call Buildasterisk18ModuleTemplate,app_minivm,Minimal voicemail system,a voicemail system in small building blocks working together based on the Comedian Mail voicemail system)) 
     425$(eval $(call Buildasterisk18ModuleTemplate,app_readexten,Extension to variable,a trivial application to read an extension into a variable)) 
     426$(eval $(call Buildasterisk18ModuleTemplate,app_read,Variable read,a trivial application to read a variable)) 
     427$(eval $(call Buildasterisk18ModuleTemplate,app_sayunixtime,Say Unix time,an application to say Unix time)) 
     428$(eval $(call Buildasterisk18ModuleTemplate,app_sms,SMS,SMS support (ETSI ES 201 912 protocol 1))) 
     429$(eval $(call Buildasterisk18ModuleTemplate,app_stack,Stack applications, stack applications Gosub Return etc.)) 
     430$(eval $(call Buildasterisk18ModuleTemplate,app_system,System exec,support for executing system commands)) 
     431$(eval $(call Buildasterisk18ModuleTemplate,app_talkdetect,File playback with audio detect,for file playback with audio detect)) 
     432$(eval $(call Buildasterisk18ModuleTemplate,app_waituntil,Sleep,support sleeping until the given epoch)) 
     433$(eval $(call Buildasterisk18ModuleTemplate,app_while,While loop,a while loop implementation)) 
     434$(eval $(call Buildasterisk18ModuleTemplate,chan_agent,Agents proxy channel, an implementation of agents proxy channel)) 
     435$(eval $(call Buildasterisk18ModuleTemplate,chan_local,Local proxy channel, an implementation of local proxy channel)) 
     436$(eval $(call Buildasterisk18ModuleTemplate,codec_alaw,Signed linear to alaw translation,translation between signed linear and alaw codecs))  
     437$(eval $(call Buildasterisk18ModuleTemplate,codec_ulaw,Signed linear to ulaw translation,translation between signed linear and ulaw codecs)) 
     438$(eval $(call Buildasterisk18ModuleTemplate,codec_a_mu,Alaw to ulaw translation,translation between alaw and ulaw codecs)) 
     439$(eval $(call Buildasterisk18ModuleTemplate,codec_g722,G.722,a high bit rate 48/56/64Kbps ITU standard codec))  
     440$(eval $(call Buildasterisk18ModuleTemplate,codec_g726,Signed linear to G.726 translation,translation between signed linear and ITU G.726-32kbps codecs)) 
     441$(eval $(call Buildasterisk18ModuleTemplate,format_g726,G.726,support for headerless G.726 16/24/32/40kbps data format)) 
     442$(eval $(call Buildasterisk18ModuleTemplate,format_g729,G.729,support for raw headerless G729 data)) 
     443$(eval $(call Buildasterisk18ModuleTemplate,format_sln,Raw slinear format,support for raw slinear format)) 
     444$(eval $(call Buildasterisk18ModuleTemplate,format_sln16,Raw slinear 16 format,support for Raw slinear 16 format)) 
     445$(eval $(call Buildasterisk18ModuleTemplate,func_db,Database interaction,functions for interaction with the database)) 
     446$(eval $(call Buildasterisk18ModuleTemplate,func_devstate,Blinky lights control,functions for manually controlled blinky lights)) 
     447$(eval $(call Buildasterisk18ModuleTemplate,func_vmcount,vmcount dialplan,a vmcount dialplan function)) 
     448$(eval $(call Buildasterisk18ModuleTemplate,func_extstate,Hinted extension state,retrieving the state of a hinted extension for dialplan control)) 
     449$(eval $(call Buildasterisk18ModuleTemplate,func_global,Global variable,global variable dialplan functions)) 
     450$(eval $(call Buildasterisk18ModuleTemplate,func_shell,Shell,support for shell execution)) 
     451$(eval $(call Buildasterisk18ModuleTemplate,pbx_ael,Asterisk Extension Logic,support for symbolic Asterisk Extension Logic)) 
     452$(eval $(call Buildasterisk18ModuleTemplate,res_ael_share,Shareable AEL code,support for shareable AEL code mainly between internal and external modules)) 
     453$(eval $(call Buildasterisk18ModuleTemplate,pbx_spool,Call Spool,outgoing call spool support)) 
     454$(eval $(call Buildasterisk18ModuleTemplate,res_agi,Asterisk Gateway Interface,support for the Asterisk Gateway Interface extension)) 
     455$(eval $(call Buildasterisk18ModuleTemplate,app_alarmreceiver,Alarm receiver,Central Station Alarm receiver for Ademco Contact ID)) 
     456$(eval $(call Buildasterisk18ModuleTemplate,app_setcallerid,Set callerid,support for setting callerid)) 
     457$(eval $(call Buildasterisk18ModuleTemplate,app_verbose,Verbose logging,Verbose logging application)) 
     458$(eval $(call Buildasterisk18ModuleTemplate,func_channel,Channel info,Channel info dialplan function)) 
     459$(eval $(call Buildasterisk18ModuleTemplate,func_blacklist,Blacklist on callerid,looking up the callerid number, and see if it is blacklisted)) 
     460$(eval $(call Buildasterisk18ModuleTemplate,app_originate,Originate a call,originating an outbound call and connecting it to a specified extension or application))