diff options
| -rw-r--r-- | chat/ejabberd/Makefile | 7 | ||||
| -rw-r--r-- | chat/ejabberd/PLIST | 19 | ||||
| -rw-r--r-- | chat/ejabberd/distinfo | 18 | ||||
| -rw-r--r-- | chat/ejabberd/patches/patch-ae | 11 | ||||
| -rw-r--r-- | chat/ejabberd/patches/patch-deps_p1__iconv_rebar.config | 14 | ||||
| -rw-r--r-- | chat/ejabberd/patches/patch-src_ejabberd__c2s.erl | 23 |
6 files changed, 19 insertions, 73 deletions
diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile index 35cd3a8b499..f95ed46ff28 100644 --- a/chat/ejabberd/Makefile +++ b/chat/ejabberd/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.47 2014/11/13 09:45:47 fhajny Exp $ +# $NetBSD: Makefile,v 1.48 2015/01/02 09:14:16 fhajny Exp $ -DISTNAME= ejabberd-14.07 -PKGREVISION= 4 +DISTNAME= ejabberd-14.12 CATEGORIES= chat MASTER_SITES= http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tgz -DISTFILES+= ${DEFAULT_DISTFILES} ${DISTNAME}-deps.tar.gz +DISTFILES= ${DEFAULT_DISTFILES} ${DISTNAME}-deps.tar.gz SITES.${DISTNAME}-deps.tar.gz= ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/ MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST index e504250d6c9..ce4b286863a 100644 --- a/chat/ejabberd/PLIST +++ b/chat/ejabberd/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.27 2014/10/15 22:05:40 joerg Exp $ +@comment $NetBSD: PLIST,v 1.28 2015/01/02 09:14:16 fhajny Exp $ lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam lib/erlang/lib/${PKGNAME}/ebin/acl.beam lib/erlang/lib/${PKGNAME}/ebin/adhoc.beam -lib/erlang/lib/${PKGNAME}/ebin/beam_util.beam +lib/erlang/lib/${PKGNAME}/ebin/bitmap.beam lib/erlang/lib/${PKGNAME}/ebin/cache_tab.beam lib/erlang/lib/${PKGNAME}/ebin/cache_tab_app.beam lib/erlang/lib/${PKGNAME}/ebin/cache_tab_sup.beam @@ -12,6 +12,8 @@ lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_anonymous.beam lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_digest.beam lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_plain.beam lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_scram.beam +lib/erlang/lib/${PKGNAME}/ebin/ehyperloglog.app +lib/erlang/lib/${PKGNAME}/ebin/ehyperloglog.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd.app lib/erlang/lib/${PKGNAME}/ebin/ejabberd.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_admin.beam @@ -83,7 +85,6 @@ lib/erlang/lib/${PKGNAME}/ebin/esip_tmp_sup.beam lib/erlang/lib/${PKGNAME}/ebin/esip_transaction.beam lib/erlang/lib/${PKGNAME}/ebin/esip_transport.beam lib/erlang/lib/${PKGNAME}/ebin/esip_udp_sup.beam -lib/erlang/lib/${PKGNAME}/ebin/example_serv.beam lib/erlang/lib/${PKGNAME}/ebin/extauth.beam lib/erlang/lib/${PKGNAME}/ebin/ezlib.beam lib/erlang/lib/${PKGNAME}/ebin/ezlib_app.beam @@ -140,10 +141,12 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_announce.beam lib/erlang/lib/${PKGNAME}/ebin/mod_blocking.beam lib/erlang/lib/${PKGNAME}/ebin/mod_caps.beam lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy.beam +lib/erlang/lib/${PKGNAME}/ebin/mod_client_state.beam lib/erlang/lib/${PKGNAME}/ebin/mod_configure.beam lib/erlang/lib/${PKGNAME}/ebin/mod_configure2.beam lib/erlang/lib/${PKGNAME}/ebin/mod_disco.beam lib/erlang/lib/${PKGNAME}/ebin/mod_echo.beam +lib/erlang/lib/${PKGNAME}/ebin/mod_fail2ban.beam lib/erlang/lib/${PKGNAME}/ebin/mod_http_bind.beam lib/erlang/lib/${PKGNAME}/ebin/mod_http_fileserver.beam lib/erlang/lib/${PKGNAME}/ebin/mod_ip_blacklist.beam @@ -238,26 +241,18 @@ lib/erlang/lib/${PKGNAME}/ebin/stun_shaper.beam lib/erlang/lib/${PKGNAME}/ebin/stun_sup.beam lib/erlang/lib/${PKGNAME}/ebin/stun_test.beam lib/erlang/lib/${PKGNAME}/ebin/stun_tmp_sup.beam -lib/erlang/lib/${PKGNAME}/ebin/tcp_serv.beam lib/erlang/lib/${PKGNAME}/ebin/translate.beam lib/erlang/lib/${PKGNAME}/ebin/treap.beam lib/erlang/lib/${PKGNAME}/ebin/turn.beam lib/erlang/lib/${PKGNAME}/ebin/turn_sm.beam lib/erlang/lib/${PKGNAME}/ebin/turn_tmp_sup.beam -lib/erlang/lib/${PKGNAME}/ebin/url_util.beam lib/erlang/lib/${PKGNAME}/ebin/win32_dns.beam lib/erlang/lib/${PKGNAME}/ebin/xml.beam lib/erlang/lib/${PKGNAME}/ebin/xml_app.beam lib/erlang/lib/${PKGNAME}/ebin/xml_gen.beam lib/erlang/lib/${PKGNAME}/ebin/xml_stream.beam lib/erlang/lib/${PKGNAME}/ebin/xml_sup.beam -lib/erlang/lib/${PKGNAME}/ebin/xmlrpc.app -lib/erlang/lib/${PKGNAME}/ebin/xmlrpc.beam lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_codec.beam -lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_decode.beam -lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_encode.beam -lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_http.beam -lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_util.beam lib/erlang/lib/${PKGNAME}/include/ELDAPv3.hrl lib/erlang/lib/${PKGNAME}/include/XmppAddr.hrl lib/erlang/lib/${PKGNAME}/include/adhoc.hrl @@ -283,8 +278,8 @@ lib/erlang/lib/${PKGNAME}/include/pubsub.hrl lib/erlang/lib/${PKGNAME}/include/stun.hrl lib/erlang/lib/${PKGNAME}/include/xml.hrl lib/erlang/lib/${PKGNAME}/include/xml_gen.hrl -lib/erlang/lib/${PKGNAME}/include/xmlrpc.hrl lib/erlang/lib/${PKGNAME}/priv/bin/captcha.sh +lib/erlang/lib/${PKGNAME}/priv/jiffy.so lib/erlang/lib/${PKGNAME}/priv/lib/esip_drv.so lib/erlang/lib/${PKGNAME}/priv/lib/expat_erl.so lib/erlang/lib/${PKGNAME}/priv/lib/ezlib_drv.so diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo index a063176ed45..c8fd3811373 100644 --- a/chat/ejabberd/distinfo +++ b/chat/ejabberd/distinfo @@ -1,14 +1,12 @@ -$NetBSD: distinfo,v 1.28 2014/11/13 09:45:47 fhajny Exp $ +$NetBSD: distinfo,v 1.29 2015/01/02 09:14:16 fhajny Exp $ -SHA1 (ejabberd-14.07-deps.tar.gz) = 102a78c428fe587d57385c66a11cc731d2ec434e -RMD160 (ejabberd-14.07-deps.tar.gz) = 02c28e5a0c234800811d8ff24ca6afab4d3d0eec -Size (ejabberd-14.07-deps.tar.gz) = 8797259 bytes -SHA1 (ejabberd-14.07.tgz) = 321b28faedbc28f80664d4b301424b118dd0bad0 -RMD160 (ejabberd-14.07.tgz) = 6df710abe3a73746939930790623d65009c2b83f -Size (ejabberd-14.07.tgz) = 3200975 bytes +SHA1 (ejabberd-14.12-deps.tar.gz) = 995cd087df008f7493bac2bd66de6b276cfd37b8 +RMD160 (ejabberd-14.12-deps.tar.gz) = 77f04cb42fbed07680bef05d384093753cc435c0 +Size (ejabberd-14.12-deps.tar.gz) = 8906098 bytes +SHA1 (ejabberd-14.12.tgz) = baf944fb15a31ea19a3bc6da685bbc0e7c0daeff +RMD160 (ejabberd-14.12.tgz) = 71ccb676695730bcb8b5ad0c683d8de4fd6ef569 +Size (ejabberd-14.12.tgz) = 3261685 bytes SHA1 (patch-aa) = f573f541ae6963acffa5a470a290874b3312b787 SHA1 (patch-ad) = cdd7a61333f3206ac3ae9168b1878a059da25988 -SHA1 (patch-ae) = 542ac36eecc4b679dded78e56903686060fd643a +SHA1 (patch-ae) = 90787d77dda8317d89908ca9520710ea4e8d43f4 SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe -SHA1 (patch-deps_p1__iconv_rebar.config) = e9252229695195ebfe5aeea7ef3ef2c6cd95bc02 -SHA1 (patch-src_ejabberd__c2s.erl) = f9b8a00e1d5f85134cce8bb9b770d1e41a29b906 diff --git a/chat/ejabberd/patches/patch-ae b/chat/ejabberd/patches/patch-ae index 2970a78c2e4..b3e58478bda 100644 --- a/chat/ejabberd/patches/patch-ae +++ b/chat/ejabberd/patches/patch-ae @@ -1,19 +1,10 @@ -$NetBSD: patch-ae,v 1.9 2014/08/21 19:32:27 tron Exp $ +$NetBSD: patch-ae,v 1.10 2015/01/02 09:14:16 fhajny Exp $ - Default locations. - Make it work with NetBSD's flock(1). --- ejabberdctl.template.orig 2014-07-22 16:42:49.000000000 +0100 +++ ejabberdctl.template 2014-08-21 20:17:35.000000000 +0100 -@@ -22,7 +22,7 @@ - EXEC_CMD="false" - for GID in `id -G`; do - if [ $GID -eq 0 ] ; then -- EXEC_CMD="su $INSTALLUSER -p -c" -+ EXEC_CMD="su $INSTALLUSER -m -c" - fi - done - if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then @@ -67,10 +67,10 @@ EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml fi diff --git a/chat/ejabberd/patches/patch-deps_p1__iconv_rebar.config b/chat/ejabberd/patches/patch-deps_p1__iconv_rebar.config deleted file mode 100644 index fe398386cb7..00000000000 --- a/chat/ejabberd/patches/patch-deps_p1__iconv_rebar.config +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-deps_p1__iconv_rebar.config,v 1.1 2014/10/16 12:47:59 fhajny Exp $ - -Fix libiconv linking. ---- deps/p1_iconv/rebar.config.orig 2013-10-11 06:52:27.975407457 +0000 -+++ deps/p1_iconv/rebar.config 2013-10-11 06:59:26.293793956 +0000 -@@ -1,6 +1,7 @@ - {erl_opts, [debug_info]}. - --{port_env, [{"CFLAGS", "-g -O2 -Wall"}]}. -+{port_env, [{"CFLAGS", "$CFLAGS -g -O2 -Wall"}, -+ {"LDFLAGS", "$LDFLAGS -liconv"}]}. - - {port_specs, [{"priv/lib/iconv.so", ["c_src/iconv.c"]}]}. - diff --git a/chat/ejabberd/patches/patch-src_ejabberd__c2s.erl b/chat/ejabberd/patches/patch-src_ejabberd__c2s.erl deleted file mode 100644 index 252d5ddf71b..00000000000 --- a/chat/ejabberd/patches/patch-src_ejabberd__c2s.erl +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-src_ejabberd__c2s.erl,v 1.1 2014/11/13 09:45:47 fhajny Exp $ - -Backport upstream commit to fix CVE-2014-8760 ---- src/ejabberd_c2s.erl.orig 2014-07-22 15:42:49.000000000 +0000 -+++ src/ejabberd_c2s.erl -@@ -718,7 +718,7 @@ wait_for_feature_request({xmlstreameleme - (StateData#state.sockmod):get_sockmod(StateData#state.socket), - case {xml:get_attr_s(<<"xmlns">>, Attrs), Name} of - {?NS_SASL, <<"auth">>} -- when not ((SockMod == gen_tcp) and TLSRequired) -> -+ when TLSEnabled or not TLSRequired -> - Mech = xml:get_attr_s(<<"mechanism">>, Attrs), - ClientIn = jlib:decode_base64(xml:get_cdata(Els)), - case cyrsasl:server_start(StateData#state.sasl_state, -@@ -832,7 +832,7 @@ wait_for_feature_request({xmlstreameleme - end - end; - _ -> -- if (SockMod == gen_tcp) and TLSRequired -> -+ if TLSRequired and not TLSEnabled -> - Lang = StateData#state.lang, - send_element(StateData, - ?POLICY_VIOLATION_ERR(Lang, |