diff options
| -rw-r--r-- | chat/ejabberd/Makefile | 26 | ||||
| -rw-r--r-- | chat/ejabberd/PLIST | 6 | ||||
| -rw-r--r-- | chat/ejabberd/distinfo | 12 | ||||
| -rw-r--r-- | chat/ejabberd/patches/patch-rebar.config | 28 |
4 files changed, 37 insertions, 35 deletions
diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile index f1f37d87c03..7d8d2f75a97 100644 --- a/chat/ejabberd/Makefile +++ b/chat/ejabberd/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.66 2016/05/17 10:32:06 fhajny Exp $ +# $NetBSD: Makefile,v 1.67 2016/08/12 10:27:27 fhajny Exp $ -DISTNAME= ejabberd-16.04 -PKGREVISION= 1 +DISTNAME= ejabberd-16.08 CATEGORIES= chat MASTER_SITES= http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tgz @@ -11,24 +10,24 @@ HOMEPAGE= http://www.ejabberd.im/ COMMENT= Free and Open Source distributed fault-tolerant Jabber server LICENSE= gnu-gpl-v2 -DEPENDS+= erlang-cache_tab>=1.0.2:../../devel/erlang-cache_tab -DEPENDS+= erlang-esip>=1.0.4:../../net/erlang-esip +DEPENDS+= erlang-cache_tab>=1.0.3:../../devel/erlang-cache_tab +DEPENDS+= erlang-esip>=1.0.7:../../net/erlang-esip DEPENDS+= erlang-ezlib>=1.0.1:../../devel/erlang-ezlib -DEPENDS+= erlang-fast_tls>=1.0.3:../../security/erlang-fast_tls -DEPENDS+= erlang-fast_xml>=1.1.3:../../textproc/erlang-fast_xml -DEPENDS+= erlang-fast_yaml>=1.0.3:../../textproc/erlang-fast_yaml -DEPENDS+= erlang-iconv>=1.0.0:../../converters/erlang-iconv +DEPENDS+= erlang-fast_tls>=1.0.6:../../security/erlang-fast_tls +DEPENDS+= erlang-fast_xml>=1.1.14:../../textproc/erlang-fast_xml +DEPENDS+= erlang-fast_yaml>=1.0.5:../../textproc/erlang-fast_yaml +DEPENDS+= erlang-iconv>=1.0.1:../../converters/erlang-iconv DEPENDS+= erlang-jiffy>=0.14.7:../../textproc/erlang-jiffy -DEPENDS+= erlang-lager>=3.0.2:../../sysutils/erlang-lager +DEPENDS+= erlang-lager>=3.2.1:../../sysutils/erlang-lager DEPENDS+= erlang-luerl>=0.2:../../lang/erlang-luerl DEPENDS+= erlang-p1_mysql>=1.0.1:../../databases/erlang-p1_mysql DEPENDS+= erlang-p1_oauth2>=0.6.1:../../security/erlang-p1_oauth2 DEPENDS+= erlang-p1_pam>=1.0.0:../../security/erlang-p1_pam DEPENDS+= erlang-p1_pgsql>=1.1.0:../../databases/erlang-p1_pgsql -DEPENDS+= erlang-p1_utils>=1.0.4:../../misc/erlang-p1_utils +DEPENDS+= erlang-p1_utils>=1.0.5:../../misc/erlang-p1_utils DEPENDS+= erlang-p1_xmlrpc>=1.15.1:../../textproc/erlang-p1_xmlrpc -DEPENDS+= erlang-stringprep>=1.0.3:../../textproc/erlang-stringprep -DEPENDS+= erlang-stun>=1.0.3:../../net/erlang-stun +DEPENDS+= erlang-stringprep>=1.0.5:../../textproc/erlang-stringprep +DEPENDS+= erlang-stun>=1.0.6:../../net/erlang-stun CONFLICTS+= jabberd-[0-9]* GNU_CONFIGURE= yes @@ -37,7 +36,6 @@ USE_TOOLS+= bash:run gmake patch CONFIGURE_ARGS+= --disable-debug CONFIGURE_ARGS+= --enable-iconv -CONFIGURE_ARGS+= --enable-lager CONFIGURE_ARGS+= --enable-mysql CONFIGURE_ARGS+= --enable-odbc CONFIGURE_ARGS+= --enable-pam diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST index 82aacd9825b..21b8a2c1321 100644 --- a/chat/ejabberd/PLIST +++ b/chat/ejabberd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.40 2016/04/29 19:05:22 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.41 2016/08/12 10:27:27 fhajny Exp $ lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam lib/erlang/lib/${PKGNAME}/ebin/acl.beam @@ -40,9 +40,12 @@ lib/erlang/lib/${PKGNAME}/ebin/ejabberd_local.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_logger.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_node_groups.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth.beam +lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth_mnesia.beam +lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth_sql.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_piefxis.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_rdbms.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_receiver.beam +lib/erlang/lib/${PKGNAME}/ebin/ejabberd_redis.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_regexp.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_riak.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_riak_sup.beam @@ -224,6 +227,7 @@ lib/erlang/lib/${PKGNAME}/include/ejabberd_commands.hrl lib/erlang/lib/${PKGNAME}/include/ejabberd_config.hrl lib/erlang/lib/${PKGNAME}/include/ejabberd_ctl.hrl lib/erlang/lib/${PKGNAME}/include/ejabberd_http.hrl +lib/erlang/lib/${PKGNAME}/include/ejabberd_oauth.hrl lib/erlang/lib/${PKGNAME}/include/ejabberd_sm.hrl lib/erlang/lib/${PKGNAME}/include/ejabberd_sql_pt.hrl lib/erlang/lib/${PKGNAME}/include/ejabberd_web_admin.hrl diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo index 4c33d90bad4..1082afb1bca 100644 --- a/chat/ejabberd/distinfo +++ b/chat/ejabberd/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.43 2016/04/29 19:05:22 fhajny Exp $ +$NetBSD: distinfo,v 1.44 2016/08/12 10:27:27 fhajny Exp $ -SHA1 (ejabberd-16.04.tgz) = eaf9fcb827397d9f8cb5c70b2b2bf432408d5d06 -RMD160 (ejabberd-16.04.tgz) = 1672ad385d091cb703c41aa3984eff85756f79db -SHA512 (ejabberd-16.04.tgz) = 5975d5a164060cca59b6d92de2c432f063061e832b2e03cae351fe3c16b178259489dc0b82ea800f1c2388eeb7e3aa4340630ad3c10a22cc6d6f0b4eef8fa0f2 -Size (ejabberd-16.04.tgz) = 1715963 bytes +SHA1 (ejabberd-16.08.tgz) = 9044c6b04c11b2e17232c4e44aa39c82da239e84 +RMD160 (ejabberd-16.08.tgz) = 2fa25907fbf2acb9e316c1d8886df3b28c9f2c7f +SHA512 (ejabberd-16.08.tgz) = 661bf33e6d7f4c53d0c3679d1a9428fba11c22bad7d8bd535b49d7eeeff4de215a7a94f8300683e1dbaf2e68ea908f6e54cfe0ed2f1dc82326a46659e7c70f55 +Size (ejabberd-16.08.tgz) = 1739542 bytes SHA1 (patch-aa) = a9197c75afa9ea4a2fbad70aec894f1b28c7bc88 SHA1 (patch-ad) = 6a7cfbabb22cf362cf21791656be454f10ac5de8 SHA1 (patch-ae) = c61e6662420745ff029418c26ac6211e04f27d49 SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe -SHA1 (patch-rebar.config) = 657a06a7cb002f0bbb898942aa447b984d46604a +SHA1 (patch-rebar.config) = 19ad1ce0d2a31221019d3f52d8e64d2679fbdf01 SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569 diff --git a/chat/ejabberd/patches/patch-rebar.config b/chat/ejabberd/patches/patch-rebar.config index 1529f71c3c3..2fceb237343 100644 --- a/chat/ejabberd/patches/patch-rebar.config +++ b/chat/ejabberd/patches/patch-rebar.config @@ -1,22 +1,22 @@ -$NetBSD: patch-rebar.config,v 1.3 2016/04/29 19:05:22 fhajny Exp $ +$NetBSD: patch-rebar.config,v 1.4 2016/08/12 10:27:27 fhajny Exp $ Deps are handled by pkgsrc. ---- rebar.config.orig 2016-04-28 13:57:55.000000000 +0000 +--- rebar.config.orig 2016-08-04 07:49:23.000000000 +0000 +++ rebar.config @@ -7,51 +7,6 @@ %%% Created : 1 May 2013 by Evgeniy Khramtsov <ekhramtsov@process-one.net> %%%------------------------------------------------------------------- --{deps, [{lager, ".*", {git, "https://github.com/basho/lager", {tag, "3.0.2"}}}, -- {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.4"}}}, -- {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.2"}}}, -- {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.3"}}}, -- {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.3"}}}, -- {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.3"}}}, -- {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.3"}}}, -- {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.4"}}}, -- {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.3"}}}, +-{deps, [{lager, ".*", {git, "https://github.com/basho/lager", {tag, "3.2.1"}}}, +- {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.5"}}}, +- {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.3"}}}, +- {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.6"}}}, +- {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.5"}}}, +- {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.14"}}}, +- {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.6"}}}, +- {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.7"}}}, +- {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.5"}}}, - {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.7"}}}, - {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.1"}}}, - {p1_xmlrpc, ".*", {git, "https://github.com/processone/p1_xmlrpc", {tag, "1.15.1"}}}, @@ -35,17 +35,17 @@ Deps are handled by pkgsrc. - "527722d12d0433b837cdb92a60900c2cb5df8942"}}}, - %% Forces correct dependency for riakc and allow using newer meck version) - {if_var_true, riak, {hamcrest, ".*", {git, "https://github.com/hyperthunk/hamcrest-erlang", -- "908a24fda4a46776a5135db60ca071e3d783f9f6"}}}, % for riak_pb-2.1.0.7 +- "13f9bfb9b27d216e8e033b0e0a9a29097ed923dd"}}}, % for riak_pb-2.1.0.7 - {if_var_true, riak, {protobuffs, ".*", {git, "https://github.com/basho/erlang_protobuffs", - "6e7fc924506e2dc166a6170e580ce1d95ebbd5bd"}}}, % for riak_pb-2.1.0.7 with correct meck dependency - %% Elixir support, needed to run tests - {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir", -- {tag, "v1.1.1"}}}}, +- {tag, {if_version_above, "17", "v1.2.6", "v1.1.1"}}}}}, - %% TODO: When modules are fully migrated to new structure and mix, we will not need anymore rebar_elixir_plugin - {if_var_true, elixir, {rebar_elixir_plugin, ".*", - {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}}, - {if_var_true, iconv, {iconv, ".*", {git, "https://github.com/processone/iconv", -- {tag, "1.0.0"}}}}, +- {tag, "1.0.1"}}}}, - {if_var_true, tools, {meck, "0.8.*", {git, "https://github.com/eproxus/meck", - {tag, "0.8.4"}}}}, - {if_var_true, tools, {moka, ".*", {git, "https://github.com/processone/moka.git", |