3 files changed, 49 insertions, 40 deletions

diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile
index b011d3b79992..95b3c756bc61 100644
--- a/net-im/ejabberd/Makefile
+++ b/net-im/ejabberd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ejabberd
-PORTVERSION=	18.09
+PORTVERSION=	18.12
 CATEGORIES=	net-im
 
 MAINTAINER=	ashish@FreeBSD.org
@@ -43,7 +43,8 @@ GH_TUPLE=	erlang-lager:lager:${LAGER_VER}:lager/deps/lager \
 		processone:eimp:${EIMP_VER}:eimp/deps/eimp \
 		DeadZen:goldrush:${GOLDRUSH_VER}:goldrush/deps/goldrush \
 		dvv:base64url:f2c64ed8:base64url/deps/base64url \
-		processone:ezlib:${EZLIB_VER}:ezlib/deps/ezlib
+		processone:ezlib:${EZLIB_VER}:ezlib/deps/ezlib \
+		processone:pkix:${PKIX_VER}:pkix/deps/pkix
 
 OPTIONS_DEFINE=	ODBC PAM DOCS MYSQL PGSQL ICONV RIAK REDIS SIP SQLITE \
 		STUN TOOLS FULLXML
@@ -73,7 +74,7 @@ SUBS= 		PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}		\
 		P1_MYSQL_VER=${P1_MYSQL_VER}				\
 		P1_OAUTH2_VER=${P1_OAUTH2_VER}				\
 		P1_PGSQL_VER=${P1_PGSQL_VER}				\
-		P1_UTILS_VER=${P1_UTILS_VER}				\
+		P1_UTILS_VER=${P1_UTILS_VER} PKIX_VER=${PKIX_VER}	\
 		RIAK_PB_VER=${RIAK_PB_VER} RIAKC_VER=${RIAKC_VER}	\
 		SQLITE3_VER=${SQLITE3_VER}				\
 		STRINGPREP_VER=${STRINGPREP_VER} STUN_VER=${STUN_VER}	\
@@ -88,13 +89,13 @@ SUB_LIST=	${SUBS} \
 SHEBANG_FILES=	${WRKSRC}/ejabberdctl.template
 
 BASE64URL_VER=	0.0.1
-CACHE_TAB_VER=	1.0.16
-EIMP_VER=	1.0.8
+CACHE_TAB_VER=	1.0.17
+EIMP_VER=	1.0.9
 EPAM_VER=	1.0.4
 EREDIS_VER=	1.0.8
-ESIP_VER=	1.0.26
+ESIP_VER=	1.0.27
 EZLIB_VER=	1.0.4
-FAST_TLS_VER=	1.0.25
+FAST_TLS_VER=	1.0.26
 FAST_XML_VER=	1.1.34
 FAST_YAML_VER=	1.0.17
 GOLDRUSH_VER=	0.1.9
@@ -102,19 +103,20 @@ HAMCREST_VER=	0.4.1
 ICONV_VER=	1.0.10
 JIFFY_VER=	0.14.8
 JOSE_VER=	1.8.4
-LAGER_VER=	3.6.5
+LAGER_VER=	3.6.7
 LUERL_VER=	0.3
-MECK_VER=	0.8.4
-P1_MYSQL_VER=	1.0.7
+MECK_VER=	0.8.12
+P1_MYSQL_VER=	1.0.8
 P1_OAUTH2_VER=	0.6.3
 P1_PGSQL_VER=	1.1.6
 P1_UTILS_VER=	1.0.13
+PKIX_VER=	1.0.0
 RIAK_PB_VER=	2.3.2
 RIAKC_VER=	2.5.3
 SQLITE3_VER=	1.1.6
 STRINGPREP_VER=	1.0.14
-STUN_VER=	1.0.25
-XMPP_VER=	1.2.5
+STUN_VER=	1.0.26
+XMPP_VER=	1.2.7
 
 OPTIONS_SUB=		yes
 RIAK_DESC=	Riak database support
diff --git a/net-im/ejabberd/distinfo b/net-im/ejabberd/distinfo
index d35f131573a4..538ecc7d623c 100644
--- a/net-im/ejabberd/distinfo
+++ b/net-im/ejabberd/distinfo
@@ -1,20 +1,20 @@
-TIMESTAMP = 1539100120
-SHA256 (processone-ejabberd-18.09_GH0.tar.gz) = 85c57ba9784f7346f94236c3d1b1dae676f5bb2ee65c6d2204fb4bbcd7582769
-SIZE (processone-ejabberd-18.09_GH0.tar.gz) = 1775451
-SHA256 (erlang-lager-lager-3.6.5_GH0.tar.gz) = 9d2c2b095ede293c7719f19a4f553892e3cf47d428a5ebac945a8f4ebfbf7009
-SIZE (erlang-lager-lager-3.6.5_GH0.tar.gz) = 265168
+TIMESTAMP = 1544595554
+SHA256 (processone-ejabberd-18.12_GH0.tar.gz) = 9a9ca33dd2d8dc580ae10765449d71201dea6b3c7ca86f4710f5046545e0b271
+SIZE (processone-ejabberd-18.12_GH0.tar.gz) = 1779381
+SHA256 (erlang-lager-lager-3.6.7_GH0.tar.gz) = 74af1b94f87882128e584c25162a497ccffc1f255840db2c69fc4f9c20c523cb
+SIZE (erlang-lager-lager-3.6.7_GH0.tar.gz) = 266527
 SHA256 (processone-p1_utils-1.0.13_GH0.tar.gz) = 8f21fc0472c314572ebb066d624cb5463cf5b016e18b7fd7dca9dca2a4589382
 SIZE (processone-p1_utils-1.0.13_GH0.tar.gz) = 56548
-SHA256 (processone-cache_tab-1.0.16_GH0.tar.gz) = 169c3ca82b99c482e5914b616d594fed25cf34a4c995e37bfe1651d70bbaea55
-SIZE (processone-cache_tab-1.0.16_GH0.tar.gz) = 18736
-SHA256 (processone-fast_tls-1.0.25_GH0.tar.gz) = 5bb883b03514999876c750cdb08a5e4cf80a9eb89319037b612e1265c43f6f6d
-SIZE (processone-fast_tls-1.0.25_GH0.tar.gz) = 76303
+SHA256 (processone-cache_tab-1.0.17_GH0.tar.gz) = 938025b3766bb0e2b249e51427a386846cdc072040ec8018f305a1390f06406b
+SIZE (processone-cache_tab-1.0.17_GH0.tar.gz) = 18819
+SHA256 (processone-fast_tls-1.0.26_GH0.tar.gz) = a559c9b61aaa9954178a1a5e56c63694e6431f193b8fdd1489382118f97a799b
+SIZE (processone-fast_tls-1.0.26_GH0.tar.gz) = 76348
 SHA256 (processone-stringprep-1.0.14_GH0.tar.gz) = 32245561f84b03b9024c8768ad2ac8d67f285a032a7f36ff35a74c77fc701f96
 SIZE (processone-stringprep-1.0.14_GH0.tar.gz) = 95662
 SHA256 (processone-fast_xml-1.1.34_GH0.tar.gz) = 8615f77a1448e297af25f85261b6e4a84952af797da2e317c8ec71fe2fe779ac
 SIZE (processone-fast_xml-1.1.34_GH0.tar.gz) = 93530
-SHA256 (processone-xmpp-1.2.5_GH0.tar.gz) = 699f50d50850272e67160b022fd27f3ccc46570e48968d8ee30d491bf926794d
-SIZE (processone-xmpp-1.2.5_GH0.tar.gz) = 459997
+SHA256 (processone-xmpp-1.2.7_GH0.tar.gz) = 18225169e4550e9b11d9da98c65a51771ed710cab8ea51b62380563ed818e7fe
+SIZE (processone-xmpp-1.2.7_GH0.tar.gz) = 460260
 SHA256 (processone-fast_yaml-1.0.17_GH0.tar.gz) = d2675ec9b2f64eba6c3437597e3abe3bfaae2172560784456a2763d1d1a50b08
 SIZE (processone-fast_yaml-1.0.17_GH0.tar.gz) = 49925
 SHA256 (davisp-jiffy-0.14.8_GH0.tar.gz) = 7d1054c475c82c626de3ad57201a7fc51da38667c8a7502149eb751edc6b601d
@@ -23,16 +23,20 @@ SHA256 (processone-p1_oauth2-0.6.3_GH0.tar.gz) = d7d954376ae7c131a0884c7c80b0b9e
 SIZE (processone-p1_oauth2-0.6.3_GH0.tar.gz) = 213860
 SHA256 (potatosalad-erlang-jose-1.8.4_GH0.tar.gz) = a21d514c8b079497f237359f718881d8d5b847cf07e696c2839d1e726e97009a
 SIZE (potatosalad-erlang-jose-1.8.4_GH0.tar.gz) = 230947
-SHA256 (processone-eimp-1.0.8_GH0.tar.gz) = b481dea930a961dc1b9817f172fee646028ae6e47ccd143a6de0d84713291984
-SIZE (processone-eimp-1.0.8_GH0.tar.gz) = 3471332
+SHA256 (processone-eimp-1.0.9_GH0.tar.gz) = c5057ce430fafc1559fbf37e70c3bd08dcb8b9d792d8827679faefd756c82ce5
+SIZE (processone-eimp-1.0.9_GH0.tar.gz) = 3471343
 SHA256 (DeadZen-goldrush-0.1.9_GH0.tar.gz) = 6fb8ac6345d940396ecf89d4ce6b9b809039f336d85d7a54239e85106a807612
 SIZE (DeadZen-goldrush-0.1.9_GH0.tar.gz) = 24548
 SHA256 (dvv-base64url-f2c64ed8_GH0.tar.gz) = d300342e54059b5147b14b2680808354c26c17b1c785b3a0f658644524eda208
 SIZE (dvv-base64url-f2c64ed8_GH0.tar.gz) = 2769
+SHA256 (processone-ezlib-1.0.4_GH0.tar.gz) = 3328661c512c28e68db69b82202b8d6c4127f31f2aefc5b0040ba9bce6abe9b3
+SIZE (processone-ezlib-1.0.4_GH0.tar.gz) = 45510
+SHA256 (processone-pkix-1.0.0_GH0.tar.gz) = 07cd3e9a88b17e7f848a955ddcb420e6b7594be0120eff043ce289dfb12e1dc1
+SIZE (processone-pkix-1.0.0_GH0.tar.gz) = 373631
 SHA256 (processone-iconv-1.0.10_GH0.tar.gz) = 8a9ff8a3dd983284caa964f118b5782ef1c0c662995608b2ca4f4a5f285605a9
 SIZE (processone-iconv-1.0.10_GH0.tar.gz) = 121594
-SHA256 (processone-p1_mysql-1.0.7_GH0.tar.gz) = ba0cf7be1dd9e5e3fbe7065f985658fce155f19f2423cf66694eb069dddbf2ae
-SIZE (processone-p1_mysql-1.0.7_GH0.tar.gz) = 20494
+SHA256 (processone-p1_mysql-1.0.8_GH0.tar.gz) = 94e50b45bf7da78aebaaf3925aa7b9092b22e851276ee379fa11f0b0a2236b56
+SIZE (processone-p1_mysql-1.0.8_GH0.tar.gz) = 21914
 SHA256 (processone-epam-1.0.4_GH0.tar.gz) = 50faf47b1a130525beaf3fcbf8f0412e9626b9e3fde2c082dcada50aaf3330a4
 SIZE (processone-epam-1.0.4_GH0.tar.gz) = 43816
 SHA256 (processone-p1_pgsql-1.1.6_GH0.tar.gz) = f309ac90499b56f7b4c572880b1daa6e24dae95d0bdf52383fa0a773f6a4476b
@@ -45,15 +49,13 @@ SHA256 (basho-riak_pb-2.3.2_GH0.tar.gz) = c42a96ab46a9ac81e4278fac45010e18014f0e
 SIZE (basho-riak_pb-2.3.2_GH0.tar.gz) = 387073
 SHA256 (basho-hamcrest-erlang-0.4.1_GH0.tar.gz) = 4808f973e5df50761a093579124a52b661803dac74061b87c7642c5c14b0a2db
 SIZE (basho-hamcrest-erlang-0.4.1_GH0.tar.gz) = 162203
-SHA256 (processone-esip-1.0.26_GH0.tar.gz) = be38cceff8e2207da24805b8e1c926cdf6d63ab116be12cd829f5a3a4e5e58ab
-SIZE (processone-esip-1.0.26_GH0.tar.gz) = 85846
+SHA256 (processone-esip-1.0.27_GH0.tar.gz) = b4e250087f777b9c0fb65af9558337bfff5696b95a1f386238f2d2047263417b
+SIZE (processone-esip-1.0.27_GH0.tar.gz) = 85844
 SHA256 (processone-erlang-sqlite3-1.1.6_GH0.tar.gz) = dec01d20fa8df7d7690514ccae413cfa56fac7373d0a569cd44b43fe0f11e79a
 SIZE (processone-erlang-sqlite3-1.1.6_GH0.tar.gz) = 1834834
-SHA256 (processone-stun-1.0.25_GH0.tar.gz) = a5a59ae3c75290029aa062ef19ecd52b8377959a8eb7352bd2a62c4ff1dd0613
-SIZE (processone-stun-1.0.25_GH0.tar.gz) = 29332
+SHA256 (processone-stun-1.0.26_GH0.tar.gz) = 6bf8d36def614e2070e4655adc94561089668c93c56ec5dea357eaaf481eabb2
+SIZE (processone-stun-1.0.26_GH0.tar.gz) = 29333
 SHA256 (rvirding-luerl-v0.3_GH0.tar.gz) = 37c6d2be8ecc624a8bf469b80609c4e3f2f079c30886575c31c46391dfedfec6
 SIZE (rvirding-luerl-v0.3_GH0.tar.gz) = 95182
-SHA256 (eproxus-meck-0.8.4_GH0.tar.gz) = b4f951841c69a75a735ea4aea682899f19f254467c749df596f90757e51104b6
-SIZE (eproxus-meck-0.8.4_GH0.tar.gz) = 234157
-SHA256 (processone-ezlib-1.0.4_GH0.tar.gz) = 3328661c512c28e68db69b82202b8d6c4127f31f2aefc5b0040ba9bce6abe9b3
-SIZE (processone-ezlib-1.0.4_GH0.tar.gz) = 45510
+SHA256 (eproxus-meck-0.8.12_GH0.tar.gz) = abe94d8897aa354c6714c6c6d25eb1de81b91b2661b9d80c0b273b4b61300d5b
+SIZE (eproxus-meck-0.8.12_GH0.tar.gz) = 50998
diff --git a/net-im/ejabberd/pkg-plist b/net-im/ejabberd/pkg-plist
index 6c5322089fcc..50fdb3262c51 100644
--- a/net-im/ejabberd/pkg-plist
+++ b/net-im/ejabberd/pkg-plist
@@ -117,10 +117,6 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_caps_riak.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_caps_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_carboncopy.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_carboncopy_mnesia.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_carboncopy_redis.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_carboncopy_riak.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_carboncopy_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_client_state.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_configure.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_disco.beam
@@ -226,6 +222,7 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/nodetree_tree_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/nodetree_virtual.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/prosody2ejabberd.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/proxy_protocol.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/pubsub_db_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/pubsub_subscription_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/pubsub_index.beam
@@ -235,6 +232,8 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/str.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/translate.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/win32_dns.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/xml_compress.beam
+%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/xml_compress_gen.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/ELDAPv3.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/adhoc.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/bosh.hrl
@@ -254,7 +253,6 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/logger.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/mod_announce.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/mod_caps.hrl
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/mod_carboncopy.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/mod_last.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/mod_mam.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/mod_muc.hrl
@@ -595,6 +593,12 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/ebin/p1_utils_sup.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/ebin/treap.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/include/p1_queue.hrl
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/pkix-%%PKIX_VER%%/LICENSE
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/pkix-%%PKIX_VER%%/ebin/pkix.app
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/pkix-%%PKIX_VER%%/ebin/pkix.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/pkix-%%PKIX_VER%%/ebin/pkix_app.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/pkix-%%PKIX_VER%%/ebin/pkix_sup.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/pkix-%%PKIX_VER%%/priv/cacert.pem
 %%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/LICENSE
 %%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/ebin/riak_dt_pb.beam
 %%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/ebin/riak_kv_pb.beam
@@ -820,6 +824,7 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/img/vcss.png
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/js/admin.js
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/js/muc.js
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/lua/redis_sm.lua
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/ca.msg
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/cs.msg
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/de.msg