summaryrefslogtreecommitdiff
path: root/comms/asterisk
diff options
context:
space:
mode:
Diffstat (limited to 'comms/asterisk')
-rw-r--r--comms/asterisk/Makefile6
-rw-r--r--comms/asterisk/PLIST16
-rw-r--r--comms/asterisk/distinfo21
-rw-r--r--comms/asterisk/options.mk22
-rw-r--r--comms/asterisk/patches/patch-Makefile43
-rw-r--r--comms/asterisk/patches/patch-include_asterisk_utils.h16
-rw-r--r--comms/asterisk/patches/patch-res_Makefile24
-rw-r--r--comms/asterisk/patches/patch-res_res__xmpp.c96
8 files changed, 161 insertions, 83 deletions
diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile
index d84197f82b2..2863168788d 100644
--- a/comms/asterisk/Makefile
+++ b/comms/asterisk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.124 2015/06/12 10:48:29 wiz Exp $
+# $NetBSD: Makefile,v 1.125 2015/08/09 04:07:13 jnemeth Exp $
#
# NOTE: when updating this package, there are two places that sound
# tarballs need to be checked
-DISTNAME= asterisk-11.17.1
+DISTNAME= asterisk-11.19.0
DIST_SUBDIR= ${PKGNAME_NOREV}
DISTFILES= ${DEFAULT_DISTFILES}
EXTRACT_ONLY= ${DISTNAME}.tar.gz
@@ -215,7 +215,7 @@ post-patch:
post-install:
# check sounds directory for current versions when upgrading package
- ${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.26.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
+ ${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.27.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
${TAR} xzf ${WRKSRC}/sounds/asterisk-moh-opsound-wav-2.03.tar.gz -C ${DESTDIR}${ASTDATADIR}/moh
${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
${INSTALL_DATA} ${WRKSRC}/BUGS ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
diff --git a/comms/asterisk/PLIST b/comms/asterisk/PLIST
index 55f8071eb8b..00e48b028ae 100644
--- a/comms/asterisk/PLIST
+++ b/comms/asterisk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2014/10/14 03:36:40 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.10 2015/08/09 04:07:13 jnemeth Exp $
include/asterisk.h
include/asterisk/_private.h
include/asterisk/abstract_jb.h
@@ -145,6 +145,7 @@ include/asterisk/udptl.h
include/asterisk/ulaw.h
include/asterisk/unaligned.h
include/asterisk/utils.h
+include/asterisk/vector.h
include/asterisk/version.h
include/asterisk/xml.h
include/asterisk/xmldoc.h
@@ -222,11 +223,13 @@ lib/asterisk/modules/cdr_csv.so
lib/asterisk/modules/cdr_custom.so
lib/asterisk/modules/cdr_manager.so
${PLIST.unixodbc}lib/asterisk/modules/cdr_odbc.so
+${PLIST.pgsql}lib/asterisk/modules/cdr_pgsql.so
lib/asterisk/modules/cdr_sqlite3_custom.so
lib/asterisk/modules/cdr_syslog.so
lib/asterisk/modules/cel_custom.so
lib/asterisk/modules/cel_manager.so
${PLIST.unixodbc}lib/asterisk/modules/cel_odbc.so
+${PLIST.pgsql}lib/asterisk/modules/cel_pgsql.so
lib/asterisk/modules/cel_sqlite3_custom.so
lib/asterisk/modules/chan_agent.so
lib/asterisk/modules/chan_bridge.so
@@ -327,6 +330,7 @@ lib/asterisk/modules/res_clioriginate.so
lib/asterisk/modules/res_config_curl.so
${PLIST.ldap}lib/asterisk/modules/res_config_ldap.so
${PLIST.unixodbc}lib/asterisk/modules/res_config_odbc.so
+${PLIST.pgsql}lib/asterisk/modules/res_config_pgsql.so
lib/asterisk/modules/res_config_sqlite3.so
lib/asterisk/modules/res_convert.so
lib/asterisk/modules/res_crypto.so
@@ -350,6 +354,7 @@ lib/asterisk/modules/res_rtp_asterisk.so
lib/asterisk/modules/res_rtp_multicast.so
lib/asterisk/modules/res_security_log.so
lib/asterisk/modules/res_smdi.so
+${PLIST.snmp}lib/asterisk/modules/res_snmp.so
lib/asterisk/modules/res_speech.so
lib/asterisk/modules/res_stun_monitor.so
${PLIST.kqueue}lib/asterisk/modules/res_timing_kqueue.so
@@ -377,14 +382,14 @@ libdata/asterisk/phoneprov/000000000000.cfg
libdata/asterisk/phoneprov/polycom.xml
libdata/asterisk/phoneprov/polycom_line.xml
libdata/asterisk/phoneprov/snom-mac.xml
-libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.26
+libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.27
libdata/asterisk/sounds/en/1-for-am-2-for-pm.gsm
libdata/asterisk/sounds/en/1-yes-2-no.gsm
-libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.26
+libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.27
libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.15
-libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.26
+libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.27
libdata/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.15
-libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.26
+libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.27
libdata/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.15
libdata/asterisk/sounds/en/OfficeSpace.gsm
libdata/asterisk/sounds/en/Randulo-allison.gsm
@@ -497,6 +502,7 @@ libdata/asterisk/sounds/en/bar.gsm
libdata/asterisk/sounds/en/barn.gsm
libdata/asterisk/sounds/en/barns.gsm
libdata/asterisk/sounds/en/barometric.gsm
+libdata/asterisk/sounds/en/basic-pbx-ivr-main.gsm
libdata/asterisk/sounds/en/bearing.gsm
libdata/asterisk/sounds/en/beaufort.gsm
libdata/asterisk/sounds/en/because-paranoid.gsm
diff --git a/comms/asterisk/distinfo b/comms/asterisk/distinfo
index e03f01c8ea4..3b51739c199 100644
--- a/comms/asterisk/distinfo
+++ b/comms/asterisk/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.73 2015/05/19 07:52:14 jnemeth Exp $
+$NetBSD: distinfo,v 1.74 2015/08/09 04:07:13 jnemeth Exp $
-SHA1 (asterisk-11.17.1/asterisk-11.17.1.tar.gz) = 90a83350623cd0d3638e526504107aafe6df4cc5
-RMD160 (asterisk-11.17.1/asterisk-11.17.1.tar.gz) = 1aefeecafb9efb98b9aa259827bf6b72f99a6c5b
-Size (asterisk-11.17.1/asterisk-11.17.1.tar.gz) = 35002041 bytes
-SHA1 (asterisk-11.17.1/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = fbb94494e31fc08eee8fdf2ce7d12eb274018050
-RMD160 (asterisk-11.17.1/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 53656a3d6771602504f220ad312093e3503e1150
-Size (asterisk-11.17.1/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 4409969 bytes
-SHA1 (patch-Makefile) = ed581d46026e8e89ed8be374c7085efca19911d2
+SHA1 (asterisk-11.19.0/asterisk-11.19.0.tar.gz) = e35b9d910cb549b0bea20dbad60760f230bd3881
+RMD160 (asterisk-11.19.0/asterisk-11.19.0.tar.gz) = 1dca1ddf50233b57f8f1edcaace76ccd56ca2e7e
+Size (asterisk-11.19.0/asterisk-11.19.0.tar.gz) = 34852510 bytes
+SHA1 (asterisk-11.19.0/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = fbb94494e31fc08eee8fdf2ce7d12eb274018050
+RMD160 (asterisk-11.19.0/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 53656a3d6771602504f220ad312093e3503e1150
+Size (asterisk-11.19.0/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 4409969 bytes
+SHA1 (patch-Makefile) = 5fd774779d3c8d85936beca8a3407dd3011af2dc
SHA1 (patch-addons_chan__ooh323.c) = 57f61a2edf0f9f022e03837230ee572ec9cf47b4
SHA1 (patch-apps_app__confbridge.c) = c815905994355a19c32e8e3e2eb5dc9f1679eb29
SHA1 (patch-apps_app__dial.c) = 0f78d2571af88384a2d472ece08bf4b06f9ad211
@@ -33,7 +33,7 @@ SHA1 (patch-include_asterisk_autoconfig.h.in) = 09a8f8d5398612fdadba25f221b16c19
SHA1 (patch-include_asterisk_endian.h) = 41c1a9a9e02fe394bc9261f5559e931b1378ea28
SHA1 (patch-include_asterisk_lock.h) = cb1404e56de4708836091c224df439158119764c
SHA1 (patch-include_asterisk_strings.h) = fc5987a98429ca470f7e9bdcf170d49b0c1f3407
-SHA1 (patch-include_asterisk_utils.h) = ea06ed86369b1eaedf5d7d245190f54f1eb1edd0
+SHA1 (patch-include_asterisk_utils.h) = 07e70fe0adf39cd9a7f94c735b9a3fa72ae3df89
SHA1 (patch-main_Makefile) = 5f9238a528d2b96777e17a4ac6d3e7876dfffb98
SHA1 (patch-main_acl.c) = 1eac532a15127c25981d2db9462a8ccce2c58620
SHA1 (patch-main_asterisk.c) = bfdbd5299b7279ef080a015a9a10627aa929dd49
@@ -55,6 +55,7 @@ SHA1 (patch-main_test.c) = 3f239ed7611facbd937057f056ebc7495403dbaf
SHA1 (patch-main_udptl.c) = 260586e4203b4bf51737ba171cbfe57621de8728
SHA1 (patch-main_utils.c) = df8bfd592f82b9b5c2c95a6860d2dca7003f66ca
SHA1 (patch-pbx_pbx__dundi.c) = 4dbcbbae3cbace91c8ed87e3e10cad0a1eb45e75
+SHA1 (patch-res_Makefile) = 2b3fa69b155a88e9026005fa6d89f651541bde8a
SHA1 (patch-res_pjproject_aconfigure) = 0095894c5daac2dec6a9ec745c0ecb8d46c0b73a
SHA1 (patch-res_pjproject_aconfigure.ac) = cbabe4a5f1888e180c93404324ddb96728dc20b9
SHA1 (patch-res_pjproject_build.symbian_makedef.sh) = 37781fe307564ad827e9be67f507f84230ebf299
@@ -62,7 +63,7 @@ SHA1 (patch-res_res__calendar.c) = a4c491d8c77f88d0834d0eb52622f7c6e4f3428b
SHA1 (patch-res_res__calendar__caldav.c) = 673e8a256fc748338f35c7deddbf283809d19904
SHA1 (patch-res_res__calendar__icalendar.c) = 3258522abbdc5c0cfe76868f73f16931118983e5
SHA1 (patch-res_res__config__pgsql.c) = 719fa8939ca0e6cae256dd1b19a11405f475a620
-SHA1 (patch-res_res__xmpp.c) = 5296a4f7454e432592a058939c7b0f2e328d53e2
+SHA1 (patch-res_res__xmpp.c) = 25ce66a0536a290598b4c11f14c7ab94f6577af5
SHA1 (patch-sounds_Makefile) = 792c2e25e1c8334fe8c9038b8b630376a5894c31
SHA1 (patch-tests_test__abstract__jb.c) = 42cfa303fc2e399aa9fe3bebf51464d0776e171c
SHA1 (patch-tests_test__config.c) = fa049dc1fedb8a0c898afa6848406d191acb54d3
diff --git a/comms/asterisk/options.mk b/comms/asterisk/options.mk
index 81c5e0bf634..fc3da08421b 100644
--- a/comms/asterisk/options.mk
+++ b/comms/asterisk/options.mk
@@ -1,15 +1,15 @@
-# $NetBSD: options.mk,v 1.6 2015/01/29 21:54:33 jnemeth Exp $
+# $NetBSD: options.mk,v 1.7 2015/08/09 04:07:13 jnemeth Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.asterisk
PKG_SUPPORTED_OPTIONS= zaptel x11 unixodbc ilbc webvmail ldap spandsp
-PKG_SUPPORTED_OPTIONS+= jabber speex
+PKG_SUPPORTED_OPTIONS+= jabber speex snmp pgsql
PKG_OPTIONS_LEGACY_OPTS+= gtk:x11
PKG_SUGGESTED_OPTIONS= ldap jabber speex
.include "../../mk/bsd.options.mk"
PLIST_VARS+= zaptel x11 unixodbc webvmail ldap spandsp jabber
-PLIST_VARS+= speex
+PLIST_VARS+= speex snmp pgsql
# Asterisk now uses DAHDI, not zaptel; not implemented yet...
#.if !empty(PKG_OPTIONS:Mzaptel)
@@ -105,3 +105,19 @@ PLIST.speex= yes
CONFIGURE_ARGS+= --without-speex
CONFIGURE_ARGS+= --without-speexdsp
.endif
+
+.if !empty(PKG_OPTIONS:Msnmp)
+.include "../../net/net-snmp/buildlink3.mk"
+CONFIGURE_ARGS+= --with-netsnmp
+PLIST.snmp= yes
+.else
+CONFIGURE_ARGS+= --without-netsnmp
+.endif
+
+.if !empty(PKG_OPTIONS:Mpgsql)
+.include "../../mk/pgsql.buildlink3.mk"
+CONFIGURE_ARGS+= --with-postgres
+PLIST.pgsql= yes
+.else
+CONFIGURE_ARGS+= --without-postgres
+.endif
diff --git a/comms/asterisk/patches/patch-Makefile b/comms/asterisk/patches/patch-Makefile
index 70e5ce4802e..e507b2ea14d 100644
--- a/comms/asterisk/patches/patch-Makefile
+++ b/comms/asterisk/patches/patch-Makefile
@@ -1,6 +1,6 @@
-$NetBSD: patch-Makefile,v 1.2 2013/05/18 03:40:17 jnemeth Exp $
+$NetBSD: patch-Makefile,v 1.3 2015/08/09 04:07:13 jnemeth Exp $
---- Makefile.orig 2013-02-04 19:50:52.000000000 +0000
+--- Makefile.orig 2015-06-04 00:44:42.000000000 +0000
+++ Makefile
@@ -130,7 +130,7 @@ DEBUG=-g3
@@ -11,7 +11,17 @@ $NetBSD: patch-Makefile,v 1.2 2013/05/18 03:40:17 jnemeth Exp $
AGI_DIR=$(ASTDATADIR)/agi-bin
# If you use Apache, you may determine by a grep 'DocumentRoot' of your httpd.conf file
-@@ -197,10 +197,6 @@ ifeq ($(AST_DEVMODE),yes)
+@@ -164,6 +164,9 @@ LINKER_SYMBOL_PREFIX=
+ # supported run:
+ # menuselect/menuselect --help
+
++GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
++USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
++
+
+ MOD_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
+ OTHER_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
+@@ -203,10 +206,6 @@ ifeq ($(AST_DEVMODE),yes)
ADDL_TARGETS+=validate-docs
endif
@@ -22,7 +32,20 @@ $NetBSD: patch-Makefile,v 1.2 2013/05/18 03:40:17 jnemeth Exp $
ifeq ($(OSARCH),FreeBSD)
# -V is understood by BSD Make, not by GNU make.
BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
-@@ -427,7 +423,6 @@ dist-clean: distclean
+@@ -340,10 +339,10 @@ makeopts: configure
+ @echo "****"
+ @exit 1
+
+-menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts build_tools/menuselect-deps
++menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts build_tools/menuselect-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
+ ifeq ($(filter %menuselect,$(MAKECMDGOALS)),)
+ menuselect/menuselect --check-deps $@
+- menuselect/menuselect --check-deps $@
++ menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
+ endif
+
+ $(MOD_SUBDIRS_EMBED_LDSCRIPT):
+@@ -439,7 +438,6 @@ dist-clean: distclean
distclean: $(SUBDIRS_DIST_CLEAN) _clean
@$(MAKE) -C menuselect dist-clean
@@ -30,7 +53,7 @@ $NetBSD: patch-Makefile,v 1.2 2013/05/18 03:40:17 jnemeth Exp $
rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
rm -f makeopts.embed_rules
rm -f config.log config.status config.cache
-@@ -525,7 +520,7 @@ update:
+@@ -538,7 +536,7 @@ update:
NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir $(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
@@ -39,7 +62,7 @@ $NetBSD: patch-Makefile,v 1.2 2013/05/18 03:40:17 jnemeth Exp $
"$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \
"$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \
"$(ASTSPOOLDIR)/voicemail" "$(ASTHEADERDIR)" "$(ASTHEADERDIR)/doxygen" \
-@@ -636,21 +631,21 @@ upgrade: bininstall
+@@ -650,21 +648,21 @@ upgrade: bininstall
# XXX why *.adsi is installed first ?
adsi:
@echo Installing adsi config files...
@@ -65,7 +88,7 @@ $NetBSD: patch-Makefile,v 1.2 2013/05/18 03:40:17 jnemeth Exp $
if [ -f "$${dst}" ]; then \
if [ "$(OVERWRITE)" = "y" ]; then \
if cmp -s "$${dst}" "$$x" ; then \
-@@ -679,9 +674,9 @@ samples: adsi
+@@ -693,9 +691,9 @@ samples: adsi
-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
-e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
@@ -78,7 +101,7 @@ $NetBSD: patch-Makefile,v 1.2 2013/05/18 03:40:17 jnemeth Exp $
fi ; \
$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX"
build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)"
-@@ -707,7 +702,7 @@ samples: adsi
+@@ -721,7 +719,7 @@ samples: adsi
webvmail:
@[ -d "$(DESTDIR)$(HTTP_DOCSDIR)/" ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
@[ -d "$(DESTDIR)$(HTTP_CGIDIR)" ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
@@ -87,7 +110,7 @@ $NetBSD: patch-Makefile,v 1.2 2013/05/18 03:40:17 jnemeth Exp $
$(INSTALL) -d "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk"
for x in images/*.gif; do \
$(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \
-@@ -863,7 +858,7 @@ uninstall-all: _uninstall
+@@ -899,7 +897,7 @@ uninstall-all: _uninstall
rm -rf "$(DESTDIR)$(ASTVARLIBDIR)"
rm -rf "$(DESTDIR)$(ASTDATADIR)"
rm -rf "$(DESTDIR)$(ASTSPOOLDIR)"
@@ -96,7 +119,7 @@ $NetBSD: patch-Makefile,v 1.2 2013/05/18 03:40:17 jnemeth Exp $
rm -rf "$(DESTDIR)$(ASTLOGDIR)"
menuconfig: menuselect
-@@ -934,6 +929,7 @@ menuselect-tree: $(foreach dir,$(filter-
+@@ -970,6 +968,7 @@ menuselect-tree: $(foreach dir,$(filter-
@echo "</menu>" >> $@
.PHONY: menuselect
diff --git a/comms/asterisk/patches/patch-include_asterisk_utils.h b/comms/asterisk/patches/patch-include_asterisk_utils.h
index 6d9e59481a3..e5e05670b2a 100644
--- a/comms/asterisk/patches/patch-include_asterisk_utils.h
+++ b/comms/asterisk/patches/patch-include_asterisk_utils.h
@@ -1,25 +1,19 @@
-$NetBSD: patch-include_asterisk_utils.h,v 1.2 2015/05/19 07:52:14 jnemeth Exp $
+$NetBSD: patch-include_asterisk_utils.h,v 1.3 2015/08/09 04:07:13 jnemeth Exp $
---- include/asterisk/utils.h.orig 2015-03-12 12:26:57.000000000 +0000
+--- include/asterisk/utils.h.orig 2015-06-04 00:44:42.000000000 +0000
+++ include/asterisk/utils.h
-@@ -943,30 +943,9 @@ char *ast_utils_which(const char *binary
+@@ -949,24 +949,9 @@ char *ast_utils_which(const char *binary
* \encode
*/
-#if defined(__clang__)
--
--#if defined(__has_feature) && __has_feature(blocks)
-typedef void (^_raii_cleanup_block_t)(void);
-static inline void _raii_cleanup_block(_raii_cleanup_block_t *b) { (*b)(); }
-
-#define RAII_VAR(vartype, varname, initval, dtor) \
- _raii_cleanup_block_t _raii_cleanup_ ## varname __attribute__((cleanup(_raii_cleanup_block),unused)) = NULL; \
-- vartype varname = initval; \
-- _raii_cleanup_ ## varname = ^{ dtor(varname); }
--
--#else
-- #error "CLANG must support the 'blocks' feature to compile Asterisk."
--#endif /* #if defined(__has_feature) && __has_feature(blocks) */
+- __block vartype varname = initval; \
+- _raii_cleanup_ ## varname = ^{ {(void)dtor(varname);} }
-
-#elif defined(__GNUC__)
-
diff --git a/comms/asterisk/patches/patch-res_Makefile b/comms/asterisk/patches/patch-res_Makefile
new file mode 100644
index 00000000000..cfcc616f40b
--- /dev/null
+++ b/comms/asterisk/patches/patch-res_Makefile
@@ -0,0 +1,24 @@
+$NetBSD: patch-res_Makefile,v 1.1 2015/08/09 04:07:13 jnemeth Exp $
+
+--- res/Makefile.orig 2015-06-04 00:44:42.000000000 +0000
++++ res/Makefile
+@@ -90,11 +90,12 @@ FORCE:
+ $(PJ_LIB_FILES): FORCE
+ $(MAKE) -C $(patsubst %/lib/,%,$(dir $@))/build/ ../lib/$(notdir $@)
+
+-ifeq ($(subst 1:0,1,$(UUID)), 1)
+-res_rtp_asterisk.o: $(PJ_LIB_FILES)
+-res_rtp_asterisk.o: _ASTCFLAGS+=-DUSE_PJPROJECT
+-res_rtp_asterisk.o: _ASTCFLAGS+=$(PJ_CFLAGS)
+-res_rtp_asterisk.so: _ASTLDFLAGS+=$(PJ_LDFLAGS)
+-res_rtp_asterisk.so: LIBS+=$(PJ_LDLIBS)
+-endif
++#XXX PJSIP is known not work properly on NetBSD, comment it out for now
++#ifeq ($(subst 1:0,1,$(UUID)), 1)
++#res_rtp_asterisk.o: $(PJ_LIB_FILES)
++#res_rtp_asterisk.o: _ASTCFLAGS+=-DUSE_PJPROJECT
++#res_rtp_asterisk.o: _ASTCFLAGS+=$(PJ_CFLAGS)
++#res_rtp_asterisk.so: _ASTLDFLAGS+=$(PJ_LDFLAGS)
++#res_rtp_asterisk.so: LIBS+=$(PJ_LDLIBS)
++#endif
+
diff --git a/comms/asterisk/patches/patch-res_res__xmpp.c b/comms/asterisk/patches/patch-res_res__xmpp.c
index de43a58fd94..aeee3af47ac 100644
--- a/comms/asterisk/patches/patch-res_res__xmpp.c
+++ b/comms/asterisk/patches/patch-res_res__xmpp.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
+$NetBSD: patch-res_res__xmpp.c,v 1.3 2015/08/09 04:07:13 jnemeth Exp $
---- res/res_xmpp.c.orig 2013-09-07 00:59:41.000000000 +0000
+--- res/res_xmpp.c.orig 2015-06-04 00:44:42.000000000 +0000
+++ res/res_xmpp.c
-@@ -510,11 +510,14 @@ static void *xmpp_config_find(struct ao2
+@@ -511,11 +511,14 @@ static void *xmpp_config_find(struct ao2
return ao2_find(tmp_container, category, OBJ_KEY);
}
@@ -19,7 +19,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
if (!cfg || !cfg->clients || !(clientcfg = xmpp_config_find(cfg->clients, category))) {
return xmpp_client_alloc(category);
-@@ -602,11 +605,13 @@ error:
+@@ -601,11 +604,13 @@ error:
return NULL;
}
@@ -35,7 +35,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
if (ast_strlen_zero(clientcfg->user)) {
ast_log(LOG_ERROR, "No user specified on client '%s'\n", clientcfg->name);
-@@ -642,7 +647,7 @@ static int xmpp_config_prelink(void *new
+@@ -641,7 +646,7 @@ static int xmpp_config_prelink(void *new
static void xmpp_config_post_apply(void)
{
@@ -44,7 +44,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
ao2_callback(cfg->clients, OBJ_NODATA | OBJ_MULTIPLE, xmpp_client_config_post_apply, NULL);
}
-@@ -728,8 +733,8 @@ static int xmpp_is_secure(struct ast_xmp
+@@ -727,8 +732,8 @@ static int xmpp_is_secure(struct ast_xmp
struct ast_xmpp_client *ast_xmpp_client_find(const char *name)
{
@@ -55,7 +55,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
if (!cfg || !cfg->clients || !(clientcfg = xmpp_config_find(cfg->clients, name))) {
return NULL;
-@@ -757,8 +762,8 @@ void ast_xmpp_client_unlock(struct ast_x
+@@ -756,8 +761,8 @@ void ast_xmpp_client_unlock(struct ast_x
/*! \brief Internal function used to send a message to a user or chatroom */
static int xmpp_client_send_message(struct ast_xmpp_client *client, int group, const char *nick, const char *address, const char *message)
{
@@ -66,7 +66,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
int res = 0;
char from[XMPP_MAX_JIDLEN];
iks *message_packet;
-@@ -821,8 +826,8 @@ done:
+@@ -820,8 +825,8 @@ done:
static int xmpp_client_set_group_presence(struct ast_xmpp_client *client, const char *room, int level, const char *nick)
{
@@ -77,7 +77,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
int res = 0;
iks *presence = NULL, *x = NULL;
char from[XMPP_MAX_JIDLEN], roomid[XMPP_MAX_JIDLEN];
-@@ -892,8 +897,8 @@ void ast_xmpp_increment_mid(char *mid)
+@@ -891,8 +896,8 @@ void ast_xmpp_increment_mid(char *mid)
*/
static iks* xmpp_pubsub_iq_create(struct ast_xmpp_client *client, const char *type)
{
@@ -88,7 +88,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
iks *request;
if (!cfg || !cfg->clients || !(clientcfg = xmpp_config_find(cfg->clients, client->name)) ||
-@@ -925,7 +930,7 @@ static iks* xmpp_pubsub_iq_create(struct
+@@ -924,7 +929,7 @@ static iks* xmpp_pubsub_iq_create(struct
static iks* xmpp_pubsub_build_publish_skeleton(struct ast_xmpp_client *client, const char *node,
const char *event_type, unsigned int cachable)
{
@@ -97,7 +97,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
iks *request, *pubsub, *publish, *item;
if (!cfg || !cfg->global || !(request = xmpp_pubsub_iq_create(client, "set"))) {
-@@ -1151,7 +1156,7 @@ static void xmpp_pubsub_publish_mwi(stru
+@@ -1150,7 +1155,7 @@ static void xmpp_pubsub_publish_mwi(stru
static void xmpp_pubsub_publish_device_state(struct ast_xmpp_client *client, const char *device,
const char *device_state, unsigned int cachable)
{
@@ -106,7 +106,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
iks *request, *state;
char eid_str[20], cachable_str[2];
-@@ -1263,7 +1268,7 @@ static void xmpp_pubsub_unsubscribe(stru
+@@ -1262,7 +1267,7 @@ static void xmpp_pubsub_unsubscribe(stru
*/
static void xmpp_pubsub_subscribe(struct ast_xmpp_client *client, const char *node)
{
@@ -115,7 +115,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
iks *request = xmpp_pubsub_iq_create(client, "set");
iks *pubsub, *subscribe;
-@@ -1370,7 +1375,7 @@ static int xmpp_pubsub_handle_event(void
+@@ -1369,7 +1374,7 @@ static int xmpp_pubsub_handle_event(void
static int xmpp_pubsub_handle_error(void *data, ikspak *pak)
{
@@ -124,7 +124,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
char *node_name, *error;
int error_num;
iks *orig_request, *orig_pubsub = iks_find(pak->x, "pubsub");
-@@ -1443,8 +1448,8 @@ static int xmpp_pubsub_handle_error(void
+@@ -1442,8 +1447,8 @@ static int xmpp_pubsub_handle_error(void
*/
static void xmpp_init_event_distribution(struct ast_xmpp_client *client)
{
@@ -135,7 +135,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
if (!cfg || !cfg->clients || !(clientcfg = xmpp_config_find(cfg->clients, client->name))) {
return;
-@@ -1498,8 +1503,8 @@ static int xmpp_resource_immediate(void
+@@ -1497,8 +1502,8 @@ static int xmpp_resource_immediate(void
*/
static int xmpp_status_exec(struct ast_channel *chan, const char *data)
{
@@ -146,7 +146,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
struct ast_xmpp_buddy *buddy;
struct ast_xmpp_resource *resource;
char *s = NULL, status[2];
-@@ -1577,8 +1582,8 @@ static int xmpp_status_exec(struct ast_c
+@@ -1576,8 +1581,8 @@ static int xmpp_status_exec(struct ast_c
*/
static int acf_jabberstatus_read(struct ast_channel *chan, const char *name, char *data, char *buf, size_t buflen)
{
@@ -157,7 +157,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
struct ast_xmpp_buddy *buddy;
struct ast_xmpp_resource *resource;
int stat = 7;
-@@ -1650,8 +1655,8 @@ static struct ast_custom_function jabber
+@@ -1649,8 +1654,8 @@ static struct ast_custom_function jabber
*/
static int xmpp_join_exec(struct ast_channel *chan, const char *data)
{
@@ -168,7 +168,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
char *s, nick[XMPP_MAX_RESJIDLEN];
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(sender);
-@@ -1709,8 +1714,8 @@ static int xmpp_join_exec(struct ast_cha
+@@ -1708,8 +1713,8 @@ static int xmpp_join_exec(struct ast_cha
*/
static int xmpp_leave_exec(struct ast_channel *chan, const char *data)
{
@@ -179,7 +179,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
char *s, nick[XMPP_MAX_RESJIDLEN];
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(sender);
-@@ -1770,8 +1775,8 @@ static int xmpp_leave_exec(struct ast_ch
+@@ -1769,8 +1774,8 @@ static int xmpp_leave_exec(struct ast_ch
*/
static int xmpp_send_exec(struct ast_channel *chan, const char *data)
{
@@ -190,7 +190,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
char *s;
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(sender);
-@@ -1811,8 +1816,8 @@ static int xmpp_send_exec(struct ast_cha
+@@ -1810,8 +1815,8 @@ static int xmpp_send_exec(struct ast_cha
*/
static int xmpp_sendgroup_exec(struct ast_channel *chan, const char *data)
{
@@ -201,7 +201,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
char *s, nick[XMPP_MAX_RESJIDLEN];
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(sender);
-@@ -1864,8 +1869,8 @@ static int xmpp_sendgroup_exec(struct as
+@@ -1863,8 +1868,8 @@ static int xmpp_sendgroup_exec(struct as
*/
static int acf_jabberreceive_read(struct ast_channel *chan, const char *name, char *data, char *buf, size_t buflen)
{
@@ -212,7 +212,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
char *parse = NULL;
int timeout, jidlen, resourcelen, found = 0;
struct timeval start;
-@@ -2023,8 +2028,8 @@ static struct ast_custom_function jabber
+@@ -2022,8 +2027,8 @@ static struct ast_custom_function jabber
*/
static int delete_old_messages(struct ast_xmpp_client *client, char *from)
{
@@ -223,7 +223,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
int deleted = 0, isold = 0;
struct ast_xmpp_message *message = NULL;
-@@ -2057,8 +2062,8 @@ static int delete_old_messages(struct as
+@@ -2056,8 +2061,8 @@ static int delete_old_messages(struct as
static int xmpp_send_cb(const struct ast_msg *msg, const char *to, const char *from)
{
@@ -234,7 +234,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
char *sender, *dest;
int res;
-@@ -2182,8 +2187,8 @@ static int xmpp_client_subscribe_user(vo
+@@ -2181,8 +2186,8 @@ static int xmpp_client_subscribe_user(vo
/*! \brief Hook function called when roster is received from server */
static int xmpp_roster_hook(void *data, ikspak *pak)
{
@@ -245,7 +245,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
struct ast_xmpp_client *client = data;
iks *item;
-@@ -2240,8 +2245,8 @@ static int xmpp_roster_hook(void *data,
+@@ -2239,8 +2244,8 @@ static int xmpp_roster_hook(void *data,
/*! \brief Internal function which changes the presence status of an XMPP client */
static void xmpp_client_set_presence(struct ast_xmpp_client *client, const char *to, const char *from, int level, const char *desc)
{
@@ -256,7 +256,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
iks *presence = NULL, *cnode = NULL, *priority = NULL;
char priorityS[10];
-@@ -2368,8 +2373,8 @@ static int xmpp_client_service_discovery
+@@ -2367,8 +2372,8 @@ static int xmpp_client_service_discovery
/*! \brief Hook function called when client finishes authenticating with the server */
static int xmpp_connect_hook(void *data, ikspak *pak)
{
@@ -267,7 +267,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
struct ast_xmpp_client *client = data;
iks *roster;
-@@ -2406,8 +2411,8 @@ static int xmpp_connect_hook(void *data,
+@@ -2405,8 +2410,8 @@ static int xmpp_connect_hook(void *data,
/*! \brief Logging hook function */
static void xmpp_log_hook(void *data, const char *xmpp, size_t size, int incoming)
{
@@ -278,7 +278,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
struct ast_xmpp_client *client = data;
if (!ast_strlen_zero(xmpp)) {
-@@ -2745,8 +2750,8 @@ static int xmpp_component_authenticate(s
+@@ -2748,8 +2753,8 @@ static int xmpp_component_authenticate(s
/*! \brief Hook function called when component receives a service discovery get message */
static int xmpp_component_service_discovery_get_hook(void *data, ikspak *pak)
{
@@ -289,7 +289,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
struct ast_xmpp_client *client = data;
iks *iq = NULL, *query = NULL, *identity = NULL, *disco = NULL, *reg = NULL, *commands = NULL, *gateway = NULL;
iks *version = NULL, *vcard = NULL, *search = NULL, *item = NULL;
-@@ -2832,8 +2837,8 @@ done:
+@@ -2835,8 +2840,8 @@ done:
/*! \brief Hook function called when the component is queried about registration */
static int xmpp_component_register_get_hook(void *data, ikspak *pak)
{
@@ -300,7 +300,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
struct ast_xmpp_client *client = data;
iks *iq = NULL, *query = NULL, *error = NULL, *notacceptable = NULL, *instructions = NULL;
struct ast_xmpp_buddy *buddy;
-@@ -2940,8 +2945,8 @@ done:
+@@ -2943,8 +2948,8 @@ done:
/*! \brief Hook function called when we receive a service discovery items request */
static int xmpp_component_service_discovery_items_hook(void *data, ikspak *pak)
{
@@ -311,7 +311,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
struct ast_xmpp_client *client = data;
iks *iq = NULL, *query = NULL, *item = NULL, *feature = NULL;
char *node;
-@@ -3324,8 +3329,8 @@ static int xmpp_pak_s10n(struct ast_xmpp
+@@ -3327,8 +3332,8 @@ static int xmpp_pak_s10n(struct ast_xmpp
/*! \brief Action hook for when things occur */
static int xmpp_action_hook(void *data, int type, iks *node)
{
@@ -322,7 +322,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
struct ast_xmpp_client *client = data;
ikspak *pak;
int i;
-@@ -3435,8 +3440,8 @@ int ast_xmpp_client_disconnect(struct as
+@@ -3438,8 +3443,8 @@ int ast_xmpp_client_disconnect(struct as
static int xmpp_client_reconnect(struct ast_xmpp_client *client)
{
struct timeval tv = { .tv_sec = 5, .tv_usec = 0 };
@@ -333,7 +333,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
int res = IKS_NET_NOCONN;
if (!cfg || !cfg->clients || !(clientcfg = xmpp_config_find(cfg->clients, client->name))) {
-@@ -3611,8 +3616,8 @@ static void *xmpp_client_thread(void *da
+@@ -3614,8 +3619,8 @@ static void *xmpp_client_thread(void *da
} else if (res == IKS_NET_TLSFAIL) {
ast_log(LOG_ERROR, "JABBER: Failure in TLS.\n");
} else if (!client->timeout && client->state == XMPP_STATE_CONNECTED) {
@@ -344,7 +344,21 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
if (cfg && cfg->clients) {
clientcfg = xmpp_config_find(cfg->clients, client->name);
-@@ -3725,8 +3730,8 @@ static int xmpp_client_config_post_apply
+@@ -3669,10 +3674,12 @@ static int xmpp_client_config_merge_budd
+ return 1;
+ }
+
++RAII_DECL(struct xmpp_config *, gcfg, ao2_cleanup);
++
+ static int xmpp_client_config_post_apply(void *obj, void *arg, int flags)
+ {
+ struct ast_xmpp_client_config *cfg = obj;
+- RAII_VAR(struct xmpp_config *, gcfg, ao2_global_obj_ref(globals), ao2_cleanup);
++ RAII_VAR(struct xmpp_config *, gcfg, ao2_global_obj_ref(globals));
+
+ /* Merge global options that have not been modified */
+ ast_copy_flags(&cfg->flags, &gcfg->global->general, ~(cfg->mod_flags.flags) & (XMPP_AUTOPRUNE | XMPP_AUTOREGISTER | XMPP_AUTOACCEPT));
+@@ -3732,8 +3739,8 @@ static int xmpp_client_config_post_apply
*/
static int manager_jabber_send(struct mansession *s, const struct message *m)
{
@@ -355,7 +369,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
const char *id = astman_get_header(m, "ActionID");
const char *jabber = astman_get_header(m, "Jabber");
const char *screenname = astman_get_header(m, "ScreenName");
-@@ -3852,8 +3857,8 @@ static void xmpp_pubsub_request_nodes(st
+@@ -3859,8 +3866,8 @@ static void xmpp_pubsub_request_nodes(st
static char *xmpp_cli_list_pubsub_nodes(struct ast_cli_entry *e, int cmd, struct
ast_cli_args *a)
{
@@ -366,7 +380,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
const char *name = NULL, *collection = NULL;
switch (cmd) {
-@@ -3938,8 +3943,8 @@ static void xmpp_pubsub_purge_nodes(stru
+@@ -3945,8 +3952,8 @@ static void xmpp_pubsub_purge_nodes(stru
static char *xmpp_cli_purge_pubsub_nodes(struct ast_cli_entry *e, int cmd, struct
ast_cli_args *a)
{
@@ -377,7 +391,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
const char *name;
switch (cmd) {
-@@ -3983,8 +3988,8 @@ static char *xmpp_cli_purge_pubsub_nodes
+@@ -3990,8 +3997,8 @@ static char *xmpp_cli_purge_pubsub_nodes
static char *xmpp_cli_delete_pubsub_node(struct ast_cli_entry *e, int cmd, struct
ast_cli_args *a)
{
@@ -388,7 +402,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
const char *name;
switch (cmd) {
-@@ -4020,8 +4025,8 @@ static char *xmpp_cli_delete_pubsub_node
+@@ -4027,8 +4034,8 @@ static char *xmpp_cli_delete_pubsub_node
*/
static char *xmpp_cli_create_collection(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
@@ -399,7 +413,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
const char *name, *collection_name;
switch (cmd) {
-@@ -4060,8 +4065,8 @@ static char *xmpp_cli_create_collection(
+@@ -4067,8 +4074,8 @@ static char *xmpp_cli_create_collection(
*/
static char *xmpp_cli_create_leafnode(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
@@ -410,7 +424,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
const char *name, *collection_name, *leaf_name;
switch (cmd) {
-@@ -4136,7 +4141,7 @@ static char *xmpp_do_set_debug(struct as
+@@ -4143,7 +4150,7 @@ static char *xmpp_do_set_debug(struct as
*/
static char *xmpp_show_clients(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
@@ -419,7 +433,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
struct ao2_iterator i;
struct ast_xmpp_client_config *clientcfg;
-@@ -4212,7 +4217,7 @@ static char *xmpp_show_clients(struct as
+@@ -4219,7 +4226,7 @@ static char *xmpp_show_clients(struct as
*/
static char *xmpp_show_buddies(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-15 21:46:45 +0000