diff options
Diffstat (limited to 'chat')
| -rw-r--r-- | chat/ejabberd/Makefile | 47 | ||||
| -rw-r--r-- | chat/ejabberd/PLIST | 145 | ||||
| -rw-r--r-- | chat/ejabberd/distinfo | 17 | ||||
| -rw-r--r-- | chat/ejabberd/patches/patch-aa | 10 | ||||
| -rw-r--r-- | chat/ejabberd/patches/patch-ad | 15 | ||||
| -rw-r--r-- | chat/ejabberd/patches/patch-ae | 17 | ||||
| -rw-r--r-- | chat/ejabberd/patches/patch-configure | 3 |
7 files changed, 129 insertions, 125 deletions
diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile index c22b0f23ac0..f9028c569d7 100644 --- a/chat/ejabberd/Makefile +++ b/chat/ejabberd/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.88 2020/05/27 19:37:37 wiz Exp $ +# $NetBSD: Makefile,v 1.89 2021/01/16 20:24:33 triaxx Exp $ -DISTNAME= ejabberd-18.06 +DISTNAME= ejabberd-20.12 CATEGORIES= chat -MASTER_SITES= https://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/ +MASTER_SITES= https://www.process-one.net/downloads/downloads-action.php?file=/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tgz MAINTAINER= pkgsrc-users@NetBSD.org @@ -10,27 +10,31 @@ HOMEPAGE= https://www.ejabberd.im/ COMMENT= Free and Open Source distributed fault-tolerant Jabber server LICENSE= gnu-gpl-v2 -DEPENDS+= erlang-cache_tab>=1.0.14:../../devel/erlang-cache_tab -DEPENDS+= erlang-epam>=1.0.4:../../security/erlang-epam +DEPENDS+= erlang-base64url>=1.0.1:../../devel/erlang-base64url +DEPENDS+= erlang-cache_tab>=1.0.26:../../devel/erlang-cache_tab +DEPENDS+= erlang-epam>=1.0.10:../../security/erlang-epam DEPENDS+= erlang-eredis>=1.0.8.20150910:../../databases/erlang-eredis -DEPENDS+= erlang-eimp>=1.0.6:../../graphics/erlang-eimp -DEPENDS+= erlang-esip>=1.0.24:../../net/erlang-esip -DEPENDS+= erlang-ezlib>=1.0.4:../../devel/erlang-ezlib -DEPENDS+= erlang-fast_tls>=1.0.23:../../security/erlang-fast_tls -DEPENDS+= erlang-fast_xml>=1.1.31:../../textproc/erlang-fast_xml -DEPENDS+= erlang-fast_yaml>=1.0.15:../../textproc/erlang-fast_yaml -DEPENDS+= erlang-iconv>=1.0.8:../../converters/erlang-iconv -DEPENDS+= erlang-jiffy>=0.14.8:../../textproc/erlang-jiffy -DEPENDS+= erlang-jose>=1.8.4:../../security/erlang-jose -DEPENDS+= erlang-lager>=3.4.2.:../../sysutils/erlang-lager +DEPENDS+= erlang-eimp>=1.0.18:../../graphics/erlang-eimp +DEPENDS+= erlang-esip>=1.0.39:../../net/erlang-esip +DEPENDS+= erlang-ezlib>=1.0.9:../../devel/erlang-ezlib +DEPENDS+= erlang-fast_tls>=1.1.10:../../security/erlang-fast_tls +DEPENDS+= erlang-fast_xml>=1.1.45:../../textproc/erlang-fast_xml +DEPENDS+= erlang-fast_yaml>=1.0.29:../../textproc/erlang-fast_yaml +DEPENDS+= erlang-jiffy>=1.0.5:../../textproc/erlang-jiffy +DEPENDS+= erlang-jose>=1.9.0:../../security/erlang-jose +DEPENDS+= erlang-lager>=3.6.10.:../../sysutils/erlang-lager DEPENDS+= erlang-luerl>=0.3:../../lang/erlang-luerl +DEPENDS+= erlang-mqtree>=1.0.11:../../devel/erlang-mqtree +DEPENDS+= erlang-p1_acme>=1.0.10:../../security/erlang-p1_acme DEPENDS+= erlang-p1_mysql>=1.0.6:../../databases/erlang-p1_mysql -DEPENDS+= erlang-p1_oauth2>=0.6.3:../../security/erlang-p1_oauth2 +DEPENDS+= erlang-p1_oauth2>=0.6.8:../../security/erlang-p1_oauth2 DEPENDS+= erlang-p1_pgsql>=1.1.6:../../databases/erlang-p1_pgsql -DEPENDS+= erlang-p1_utils>=1.0.12:../../misc/erlang-p1_utils -DEPENDS+= erlang-stringprep>=1.0.12:../../textproc/erlang-stringprep -DEPENDS+= erlang-stun>=1.0.23:../../net/erlang-stun -DEPENDS+= erlang-xmpp>=1.2.1:../../net/erlang-xmpp +DEPENDS+= erlang-p1_utils>=1.0.21:../../misc/erlang-p1_utils +DEPENDS+= erlang-pkix>=1.0.7:../../security/erlang-pkix +DEPENDS+= erlang-stringprep>=1.0.24:../../textproc/erlang-stringprep +DEPENDS+= erlang-stun>=1.0.40:../../net/erlang-stun +DEPENDS+= erlang-xmpp>=1.5.1:../../net/erlang-xmpp +DEPENDS+= erlang-yconf>=1.0.9:../../textproc/erlang-yconf GNU_CONFIGURE= yes USE_GCC_RUNTIME= yes @@ -101,8 +105,7 @@ REPLACE_BASH= ejabberdctl.template tools/captcha.sh SUBST_CLASSES+= paths SUBST_MESSAGE.paths= Localizing paths SUBST_STAGE.paths= pre-configure -SUBST_FILES.paths= Makefile.in ejabberd.yml.example ejabberdctl.template -SUBST_FILES.paths+= tools/ejabberdctl.bc +SUBST_FILES.paths= Makefile.in SUBST_VARS.paths= DISTNAME EJABBERD_DB EJABBERD_LOGDIR EJABBERD_PIDDIR SUBST_VARS.paths+= PKG_SYSCONFDIR PREFIX LOCALBASE diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST index 88ca0761b41..59988fc1caa 100644 --- a/chat/ejabberd/PLIST +++ b/chat/ejabberd/PLIST @@ -1,29 +1,21 @@ -@comment $NetBSD: PLIST,v 1.54 2018/07/20 09:58:26 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.55 2021/01/16 20:24:33 triaxx Exp $ lib/${PKGNAME}/COPYING lib/${PKGNAME}/ebin/ELDAPv3.beam -lib/${PKGNAME}/ebin/XmppAddr.beam lib/${PKGNAME}/ebin/acl.beam -lib/${PKGNAME}/ebin/acme_challenge.beam -lib/${PKGNAME}/ebin/cyrsasl.beam -lib/${PKGNAME}/ebin/cyrsasl_anonymous.beam -lib/${PKGNAME}/ebin/cyrsasl_digest.beam -lib/${PKGNAME}/ebin/cyrsasl_oauth.beam -lib/${PKGNAME}/ebin/cyrsasl_plain.beam -lib/${PKGNAME}/ebin/cyrsasl_scram.beam +lib/${PKGNAME}/ebin/econf.beam lib/${PKGNAME}/ebin/ejabberd.app lib/${PKGNAME}/ebin/ejabberd.beam lib/${PKGNAME}/ebin/ejabberd_access_permissions.beam lib/${PKGNAME}/ebin/ejabberd_acme.beam -lib/${PKGNAME}/ebin/ejabberd_acme_comm.beam lib/${PKGNAME}/ebin/ejabberd_admin.beam lib/${PKGNAME}/ebin/ejabberd_app.beam lib/${PKGNAME}/ebin/ejabberd_auth.beam lib/${PKGNAME}/ebin/ejabberd_auth_anonymous.beam lib/${PKGNAME}/ebin/ejabberd_auth_external.beam +lib/${PKGNAME}/ebin/ejabberd_auth_jwt.beam lib/${PKGNAME}/ebin/ejabberd_auth_ldap.beam lib/${PKGNAME}/ebin/ejabberd_auth_mnesia.beam lib/${PKGNAME}/ebin/ejabberd_auth_pam.beam -lib/${PKGNAME}/ebin/ejabberd_auth_riak.beam lib/${PKGNAME}/ebin/ejabberd_auth_sql.beam lib/${PKGNAME}/ebin/ejabberd_backend_sup.beam lib/${PKGNAME}/ebin/ejabberd_bosh.beam @@ -35,11 +27,13 @@ lib/${PKGNAME}/ebin/ejabberd_cluster_mnesia.beam lib/${PKGNAME}/ebin/ejabberd_commands.beam lib/${PKGNAME}/ebin/ejabberd_commands_doc.beam lib/${PKGNAME}/ebin/ejabberd_config.beam +lib/${PKGNAME}/ebin/ejabberd_config_transformer.beam lib/${PKGNAME}/ebin/ejabberd_ctl.beam +lib/${PKGNAME}/ebin/ejabberd_db_sup.beam +lib/${PKGNAME}/ebin/ejabberd_doc.beam lib/${PKGNAME}/ebin/ejabberd_hooks.beam lib/${PKGNAME}/ebin/ejabberd_http.beam lib/${PKGNAME}/ebin/ejabberd_http_ws.beam -lib/${PKGNAME}/ebin/ejabberd_idna.beam lib/${PKGNAME}/ebin/ejabberd_iq.beam lib/${PKGNAME}/ebin/ejabberd_listener.beam lib/${PKGNAME}/ebin/ejabberd_local.beam @@ -49,29 +43,29 @@ lib/${PKGNAME}/ebin/ejabberd_oauth.beam lib/${PKGNAME}/ebin/ejabberd_oauth_mnesia.beam lib/${PKGNAME}/ebin/ejabberd_oauth_rest.beam lib/${PKGNAME}/ebin/ejabberd_oauth_sql.beam +lib/${PKGNAME}/ebin/ejabberd_old_config.beam +lib/${PKGNAME}/ebin/ejabberd_option.beam +lib/${PKGNAME}/ebin/ejabberd_options.beam +lib/${PKGNAME}/ebin/ejabberd_options_doc.beam lib/${PKGNAME}/ebin/ejabberd_piefxis.beam lib/${PKGNAME}/ebin/ejabberd_pkix.beam -lib/${PKGNAME}/ebin/ejabberd_rdbms.beam lib/${PKGNAME}/ebin/ejabberd_redis.beam lib/${PKGNAME}/ebin/ejabberd_redis_sup.beam lib/${PKGNAME}/ebin/ejabberd_regexp.beam -lib/${PKGNAME}/ebin/ejabberd_riak.beam -lib/${PKGNAME}/ebin/ejabberd_riak_sup.beam lib/${PKGNAME}/ebin/ejabberd_router.beam lib/${PKGNAME}/ebin/ejabberd_router_mnesia.beam lib/${PKGNAME}/ebin/ejabberd_router_multicast.beam lib/${PKGNAME}/ebin/ejabberd_router_redis.beam -lib/${PKGNAME}/ebin/ejabberd_router_riak.beam lib/${PKGNAME}/ebin/ejabberd_router_sql.beam lib/${PKGNAME}/ebin/ejabberd_s2s.beam lib/${PKGNAME}/ebin/ejabberd_s2s_in.beam lib/${PKGNAME}/ebin/ejabberd_s2s_out.beam lib/${PKGNAME}/ebin/ejabberd_service.beam +lib/${PKGNAME}/ebin/ejabberd_shaper.beam lib/${PKGNAME}/ebin/ejabberd_sip.beam lib/${PKGNAME}/ebin/ejabberd_sm.beam lib/${PKGNAME}/ebin/ejabberd_sm_mnesia.beam lib/${PKGNAME}/ebin/ejabberd_sm_redis.beam -lib/${PKGNAME}/ebin/ejabberd_sm_riak.beam lib/${PKGNAME}/ebin/ejabberd_sm_sql.beam lib/${PKGNAME}/ebin/ejabberd_sql.beam lib/${PKGNAME}/ebin/ejabberd_sql_pt.beam @@ -102,155 +96,181 @@ lib/${PKGNAME}/ebin/gen_pubsub_nodetree.beam lib/${PKGNAME}/ebin/jd2ejd.beam lib/${PKGNAME}/ebin/misc.beam lib/${PKGNAME}/ebin/mod_adhoc.beam +lib/${PKGNAME}/ebin/mod_adhoc_opt.beam lib/${PKGNAME}/ebin/mod_admin_extra.beam lib/${PKGNAME}/ebin/mod_admin_update_sql.beam lib/${PKGNAME}/ebin/mod_announce.beam lib/${PKGNAME}/ebin/mod_announce_mnesia.beam -lib/${PKGNAME}/ebin/mod_announce_riak.beam +lib/${PKGNAME}/ebin/mod_announce_opt.beam lib/${PKGNAME}/ebin/mod_announce_sql.beam lib/${PKGNAME}/ebin/mod_avatar.beam +lib/${PKGNAME}/ebin/mod_avatar_opt.beam lib/${PKGNAME}/ebin/mod_block_strangers.beam +lib/${PKGNAME}/ebin/mod_block_strangers_opt.beam lib/${PKGNAME}/ebin/mod_blocking.beam lib/${PKGNAME}/ebin/mod_bosh.beam lib/${PKGNAME}/ebin/mod_bosh_mnesia.beam +lib/${PKGNAME}/ebin/mod_bosh_opt.beam lib/${PKGNAME}/ebin/mod_bosh_redis.beam -lib/${PKGNAME}/ebin/mod_bosh_riak.beam lib/${PKGNAME}/ebin/mod_bosh_sql.beam lib/${PKGNAME}/ebin/mod_caps.beam lib/${PKGNAME}/ebin/mod_caps_mnesia.beam -lib/${PKGNAME}/ebin/mod_caps_riak.beam +lib/${PKGNAME}/ebin/mod_caps_opt.beam lib/${PKGNAME}/ebin/mod_caps_sql.beam lib/${PKGNAME}/ebin/mod_carboncopy.beam -lib/${PKGNAME}/ebin/mod_carboncopy_mnesia.beam -lib/${PKGNAME}/ebin/mod_carboncopy_redis.beam -lib/${PKGNAME}/ebin/mod_carboncopy_riak.beam -lib/${PKGNAME}/ebin/mod_carboncopy_sql.beam lib/${PKGNAME}/ebin/mod_client_state.beam +lib/${PKGNAME}/ebin/mod_client_state_opt.beam lib/${PKGNAME}/ebin/mod_configure.beam lib/${PKGNAME}/ebin/mod_delegation.beam +lib/${PKGNAME}/ebin/mod_delegation_opt.beam lib/${PKGNAME}/ebin/mod_disco.beam -lib/${PKGNAME}/ebin/mod_echo.beam +lib/${PKGNAME}/ebin/mod_disco_opt.beam lib/${PKGNAME}/ebin/mod_fail2ban.beam +lib/${PKGNAME}/ebin/mod_fail2ban_opt.beam lib/${PKGNAME}/ebin/mod_http_api.beam +lib/${PKGNAME}/ebin/mod_http_api_opt.beam lib/${PKGNAME}/ebin/mod_http_fileserver.beam +lib/${PKGNAME}/ebin/mod_http_fileserver_opt.beam lib/${PKGNAME}/ebin/mod_http_upload.beam +lib/${PKGNAME}/ebin/mod_http_upload_opt.beam lib/${PKGNAME}/ebin/mod_http_upload_quota.beam +lib/${PKGNAME}/ebin/mod_http_upload_quota_opt.beam +lib/${PKGNAME}/ebin/mod_jidprep.beam +lib/${PKGNAME}/ebin/mod_jidprep_opt.beam lib/${PKGNAME}/ebin/mod_last.beam lib/${PKGNAME}/ebin/mod_last_mnesia.beam -lib/${PKGNAME}/ebin/mod_last_riak.beam +lib/${PKGNAME}/ebin/mod_last_opt.beam lib/${PKGNAME}/ebin/mod_last_sql.beam lib/${PKGNAME}/ebin/mod_legacy_auth.beam lib/${PKGNAME}/ebin/mod_mam.beam lib/${PKGNAME}/ebin/mod_mam_mnesia.beam +lib/${PKGNAME}/ebin/mod_mam_opt.beam lib/${PKGNAME}/ebin/mod_mam_sql.beam lib/${PKGNAME}/ebin/mod_metrics.beam +lib/${PKGNAME}/ebin/mod_metrics_opt.beam lib/${PKGNAME}/ebin/mod_mix.beam +lib/${PKGNAME}/ebin/mod_mix_mnesia.beam +lib/${PKGNAME}/ebin/mod_mix_opt.beam +lib/${PKGNAME}/ebin/mod_mix_pam.beam +lib/${PKGNAME}/ebin/mod_mix_pam_mnesia.beam +lib/${PKGNAME}/ebin/mod_mix_pam_opt.beam +lib/${PKGNAME}/ebin/mod_mix_pam_sql.beam +lib/${PKGNAME}/ebin/mod_mix_sql.beam +lib/${PKGNAME}/ebin/mod_mqtt.beam +lib/${PKGNAME}/ebin/mod_mqtt_mnesia.beam +lib/${PKGNAME}/ebin/mod_mqtt_opt.beam +lib/${PKGNAME}/ebin/mod_mqtt_session.beam +lib/${PKGNAME}/ebin/mod_mqtt_sql.beam +lib/${PKGNAME}/ebin/mod_mqtt_ws.beam lib/${PKGNAME}/ebin/mod_muc.beam lib/${PKGNAME}/ebin/mod_muc_admin.beam lib/${PKGNAME}/ebin/mod_muc_log.beam +lib/${PKGNAME}/ebin/mod_muc_log_opt.beam lib/${PKGNAME}/ebin/mod_muc_mnesia.beam -lib/${PKGNAME}/ebin/mod_muc_riak.beam +lib/${PKGNAME}/ebin/mod_muc_opt.beam lib/${PKGNAME}/ebin/mod_muc_room.beam lib/${PKGNAME}/ebin/mod_muc_sql.beam +lib/${PKGNAME}/ebin/mod_muc_sup.beam lib/${PKGNAME}/ebin/mod_multicast.beam +lib/${PKGNAME}/ebin/mod_multicast_opt.beam lib/${PKGNAME}/ebin/mod_offline.beam lib/${PKGNAME}/ebin/mod_offline_mnesia.beam -lib/${PKGNAME}/ebin/mod_offline_riak.beam +lib/${PKGNAME}/ebin/mod_offline_opt.beam lib/${PKGNAME}/ebin/mod_offline_sql.beam lib/${PKGNAME}/ebin/mod_ping.beam +lib/${PKGNAME}/ebin/mod_ping_opt.beam lib/${PKGNAME}/ebin/mod_pres_counter.beam +lib/${PKGNAME}/ebin/mod_pres_counter_opt.beam lib/${PKGNAME}/ebin/mod_privacy.beam lib/${PKGNAME}/ebin/mod_privacy_mnesia.beam -lib/${PKGNAME}/ebin/mod_privacy_riak.beam +lib/${PKGNAME}/ebin/mod_privacy_opt.beam lib/${PKGNAME}/ebin/mod_privacy_sql.beam lib/${PKGNAME}/ebin/mod_private.beam lib/${PKGNAME}/ebin/mod_private_mnesia.beam -lib/${PKGNAME}/ebin/mod_private_riak.beam +lib/${PKGNAME}/ebin/mod_private_opt.beam lib/${PKGNAME}/ebin/mod_private_sql.beam lib/${PKGNAME}/ebin/mod_privilege.beam +lib/${PKGNAME}/ebin/mod_privilege_opt.beam lib/${PKGNAME}/ebin/mod_proxy65.beam lib/${PKGNAME}/ebin/mod_proxy65_lib.beam lib/${PKGNAME}/ebin/mod_proxy65_mnesia.beam +lib/${PKGNAME}/ebin/mod_proxy65_opt.beam lib/${PKGNAME}/ebin/mod_proxy65_redis.beam -lib/${PKGNAME}/ebin/mod_proxy65_riak.beam lib/${PKGNAME}/ebin/mod_proxy65_service.beam lib/${PKGNAME}/ebin/mod_proxy65_sql.beam lib/${PKGNAME}/ebin/mod_proxy65_stream.beam lib/${PKGNAME}/ebin/mod_pubsub.beam +lib/${PKGNAME}/ebin/mod_pubsub_mnesia.beam +lib/${PKGNAME}/ebin/mod_pubsub_opt.beam +lib/${PKGNAME}/ebin/mod_pubsub_sql.beam lib/${PKGNAME}/ebin/mod_push.beam lib/${PKGNAME}/ebin/mod_push_keepalive.beam +lib/${PKGNAME}/ebin/mod_push_keepalive_opt.beam lib/${PKGNAME}/ebin/mod_push_mnesia.beam +lib/${PKGNAME}/ebin/mod_push_opt.beam lib/${PKGNAME}/ebin/mod_push_sql.beam lib/${PKGNAME}/ebin/mod_register.beam +lib/${PKGNAME}/ebin/mod_register_opt.beam lib/${PKGNAME}/ebin/mod_register_web.beam lib/${PKGNAME}/ebin/mod_roster.beam lib/${PKGNAME}/ebin/mod_roster_mnesia.beam -lib/${PKGNAME}/ebin/mod_roster_riak.beam +lib/${PKGNAME}/ebin/mod_roster_opt.beam lib/${PKGNAME}/ebin/mod_roster_sql.beam lib/${PKGNAME}/ebin/mod_s2s_dialback.beam +lib/${PKGNAME}/ebin/mod_s2s_dialback_opt.beam lib/${PKGNAME}/ebin/mod_service_log.beam +lib/${PKGNAME}/ebin/mod_service_log_opt.beam lib/${PKGNAME}/ebin/mod_shared_roster.beam lib/${PKGNAME}/ebin/mod_shared_roster_ldap.beam +lib/${PKGNAME}/ebin/mod_shared_roster_ldap_opt.beam lib/${PKGNAME}/ebin/mod_shared_roster_mnesia.beam -lib/${PKGNAME}/ebin/mod_shared_roster_riak.beam +lib/${PKGNAME}/ebin/mod_shared_roster_opt.beam lib/${PKGNAME}/ebin/mod_shared_roster_sql.beam lib/${PKGNAME}/ebin/mod_sic.beam lib/${PKGNAME}/ebin/mod_sip.beam +lib/${PKGNAME}/ebin/mod_sip_opt.beam lib/${PKGNAME}/ebin/mod_sip_proxy.beam lib/${PKGNAME}/ebin/mod_sip_registrar.beam lib/${PKGNAME}/ebin/mod_stats.beam lib/${PKGNAME}/ebin/mod_stream_mgmt.beam +lib/${PKGNAME}/ebin/mod_stream_mgmt_opt.beam +lib/${PKGNAME}/ebin/mod_stun_disco.beam +lib/${PKGNAME}/ebin/mod_stun_disco_opt.beam lib/${PKGNAME}/ebin/mod_time.beam lib/${PKGNAME}/ebin/mod_vcard.beam lib/${PKGNAME}/ebin/mod_vcard_ldap.beam +lib/${PKGNAME}/ebin/mod_vcard_ldap_opt.beam lib/${PKGNAME}/ebin/mod_vcard_mnesia.beam -lib/${PKGNAME}/ebin/mod_vcard_riak.beam +lib/${PKGNAME}/ebin/mod_vcard_mnesia_opt.beam +lib/${PKGNAME}/ebin/mod_vcard_opt.beam lib/${PKGNAME}/ebin/mod_vcard_sql.beam lib/${PKGNAME}/ebin/mod_vcard_xupdate.beam +lib/${PKGNAME}/ebin/mod_vcard_xupdate_opt.beam lib/${PKGNAME}/ebin/mod_version.beam -lib/${PKGNAME}/ebin/node_buddy.beam -lib/${PKGNAME}/ebin/node_club.beam -lib/${PKGNAME}/ebin/node_dag.beam -lib/${PKGNAME}/ebin/node_dispatch.beam +lib/${PKGNAME}/ebin/mod_version_opt.beam +lib/${PKGNAME}/ebin/mqtt_codec.beam lib/${PKGNAME}/ebin/node_flat.beam lib/${PKGNAME}/ebin/node_flat_sql.beam -lib/${PKGNAME}/ebin/node_hometree.beam -lib/${PKGNAME}/ebin/node_hometree_sql.beam -lib/${PKGNAME}/ebin/node_mb.beam -lib/${PKGNAME}/ebin/node_mb_sql.beam -lib/${PKGNAME}/ebin/node_mix.beam -lib/${PKGNAME}/ebin/node_mix_sql.beam -lib/${PKGNAME}/ebin/node_online.beam lib/${PKGNAME}/ebin/node_pep.beam lib/${PKGNAME}/ebin/node_pep_sql.beam -lib/${PKGNAME}/ebin/node_private.beam -lib/${PKGNAME}/ebin/node_public.beam -lib/${PKGNAME}/ebin/nodetree_dag.beam lib/${PKGNAME}/ebin/nodetree_tree.beam lib/${PKGNAME}/ebin/nodetree_tree_sql.beam lib/${PKGNAME}/ebin/nodetree_virtual.beam lib/${PKGNAME}/ebin/prosody2ejabberd.beam +lib/${PKGNAME}/ebin/proxy_protocol.beam lib/${PKGNAME}/ebin/pubsub_db_sql.beam lib/${PKGNAME}/ebin/pubsub_index.beam lib/${PKGNAME}/ebin/pubsub_migrate.beam lib/${PKGNAME}/ebin/pubsub_subscription.beam lib/${PKGNAME}/ebin/pubsub_subscription_sql.beam -lib/${PKGNAME}/ebin/randoms.beam lib/${PKGNAME}/ebin/rest.beam -lib/${PKGNAME}/ebin/scram.beam -lib/${PKGNAME}/ebin/shaper.beam lib/${PKGNAME}/ebin/str.beam lib/${PKGNAME}/ebin/translate.beam lib/${PKGNAME}/ebin/win32_dns.beam -lib/${PKGNAME}/ebin/xmpp_socket.beam -lib/${PKGNAME}/ebin/xmpp_stream_in.beam -lib/${PKGNAME}/ebin/xmpp_stream_out.beam -lib/${PKGNAME}/ebin/xmpp_stream_pkix.beam +lib/${PKGNAME}/ebin/xml_compress.beam lib/${PKGNAME}/include/ELDAPv3.hrl -lib/${PKGNAME}/include/XmppAddr.hrl lib/${PKGNAME}/include/adhoc.hrl lib/${PKGNAME}/include/bosh.hrl -lib/${PKGNAME}/include/ejabberd_acme.hrl lib/${PKGNAME}/include/ejabberd_auth.hrl lib/${PKGNAME}/include/ejabberd_commands.hrl lib/${PKGNAME}/include/ejabberd_config.hrl @@ -259,14 +279,15 @@ lib/${PKGNAME}/include/ejabberd_http.hrl lib/${PKGNAME}/include/ejabberd_oauth.hrl lib/${PKGNAME}/include/ejabberd_router.hrl lib/${PKGNAME}/include/ejabberd_sm.hrl +lib/${PKGNAME}/include/ejabberd_sql.hrl lib/${PKGNAME}/include/ejabberd_sql_pt.hrl +lib/${PKGNAME}/include/ejabberd_stacktrace.hrl lib/${PKGNAME}/include/ejabberd_web_admin.hrl lib/${PKGNAME}/include/eldap.hrl lib/${PKGNAME}/include/http_bind.hrl lib/${PKGNAME}/include/logger.hrl lib/${PKGNAME}/include/mod_announce.hrl lib/${PKGNAME}/include/mod_caps.hrl -lib/${PKGNAME}/include/mod_carboncopy.hrl lib/${PKGNAME}/include/mod_last.hrl lib/${PKGNAME}/include/mod_mam.hrl lib/${PKGNAME}/include/mod_muc.hrl @@ -280,8 +301,8 @@ lib/${PKGNAME}/include/mod_roster.hrl lib/${PKGNAME}/include/mod_shared_roster.hrl lib/${PKGNAME}/include/mod_vcard.hrl lib/${PKGNAME}/include/mod_vcard_xupdate.hrl +lib/${PKGNAME}/include/mqtt.hrl lib/${PKGNAME}/include/pubsub.hrl -lib/${PKGNAME}/include/scram.hrl lib/${PKGNAME}/include/translate.hrl lib/${PKGNAME}/priv/bin/captcha.sh lib/${PKGNAME}/priv/css/admin.css @@ -300,6 +321,7 @@ lib/${PKGNAME}/priv/img/valid-xhtml10.png lib/${PKGNAME}/priv/img/vcss.png lib/${PKGNAME}/priv/js/admin.js lib/${PKGNAME}/priv/js/muc.js +lib/${PKGNAME}/priv/lua/redis_sm.lua lib/${PKGNAME}/priv/msgs/ca.msg lib/${PKGNAME}/priv/msgs/cs.msg lib/${PKGNAME}/priv/msgs/de.msg @@ -309,6 +331,7 @@ lib/${PKGNAME}/priv/msgs/es.msg lib/${PKGNAME}/priv/msgs/fr.msg lib/${PKGNAME}/priv/msgs/gl.msg lib/${PKGNAME}/priv/msgs/he.msg +lib/${PKGNAME}/priv/msgs/hu.msg lib/${PKGNAME}/priv/msgs/id.msg lib/${PKGNAME}/priv/msgs/it.msg lib/${PKGNAME}/priv/msgs/ja.msg @@ -333,10 +356,14 @@ lib/${PKGNAME}/priv/sql/mysql.new.sql lib/${PKGNAME}/priv/sql/mysql.sql lib/${PKGNAME}/priv/sql/pg.new.sql lib/${PKGNAME}/priv/sql/pg.sql +man/man5/ejabberd.yml.5 sbin/ejabberdctl share/bash-completion.d/ejabberd share/doc/ejabberd/COPYING share/examples/ejabberd/ejabberd.yml share/examples/ejabberd/ejabberdctl.cfg share/examples/ejabberd/inetrc +@pkgdir var/spool/ejabberd +@pkgdir var/run/ejabberd +@pkgdir var/log/ejabberd @pkgdir bin diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo index cc3fc4602a6..1921690fb0e 100644 --- a/chat/ejabberd/distinfo +++ b/chat/ejabberd/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.58 2018/07/20 09:58:26 fhajny Exp $ +$NetBSD: distinfo,v 1.59 2021/01/16 20:24:33 triaxx Exp $ -SHA1 (ejabberd-18.06.tgz) = 18c3ab25c904f7898717171d5e4ee568b8fcd68f -RMD160 (ejabberd-18.06.tgz) = d5b00602ccded838df81bb766e0aaefc639c02f6 -SHA512 (ejabberd-18.06.tgz) = ccf3cb8d5edce255604abc7c3b0c77d237203fd673d425a7676a1c35f2d24a27bcfd605a941cd8e7149f111a134bca2aa1d488642e4d0decb273f757c6be8d60 -Size (ejabberd-18.06.tgz) = 1848145 bytes -SHA1 (patch-aa) = b36ab8e2a189e07dc09186fdea0599d99294e0e5 -SHA1 (patch-ad) = de437722779c823a68f576ec587f5bc3a05e6fbc -SHA1 (patch-ae) = d8d1ca7072f35a5652673cf461860e0f585ecd5b -SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe +SHA1 (ejabberd-20.12.tgz) = 33851f33a68ce7dd45a28d4f63b40f7cbb8c9dbc +RMD160 (ejabberd-20.12.tgz) = 155a461097ac70dfeb603a0c23b7bf948de9aa81 +SHA512 (ejabberd-20.12.tgz) = 7e7cb2f6e298db9f85c2f9abb6082ebed7afc42e32b11a3a953b0c4721b0b6ea2924e6d3f78cfb5bdb209ddea2abfb040d310b422f3951b104a5461cec5875a8 +Size (ejabberd-20.12.tgz) = 2030495 bytes +SHA1 (patch-aa) = 8a1aac6e3ee13bc5251d4994fc8d1927b876e372 +SHA1 (patch-ae) = cec3df9f6f02585c869c96aea1d12bd91e61d523 +SHA1 (patch-configure) = 2c92f408fa49ae9595173613157d55a585ec1cb3 SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569 diff --git a/chat/ejabberd/patches/patch-aa b/chat/ejabberd/patches/patch-aa index 2dd0031cc17..e16c21a5a5f 100644 --- a/chat/ejabberd/patches/patch-aa +++ b/chat/ejabberd/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.15 2018/03/28 21:51:09 fhajny Exp $ +$NetBSD: patch-aa,v 1.16 2021/01/16 20:24:33 triaxx Exp $ Fix locations; don't mess with ownership. ---- Makefile.in.orig 2018-03-23 13:48:17.000000000 +0000 +--- Makefile.in.orig 2020-12-15 14:40:16.000000000 +0000 +++ Makefile.in @@ -9,7 +9,7 @@ exec_prefix = @exec_prefix@ DESTDIR = @@ -22,8 +22,8 @@ Fix locations; don't mess with ownership. # /share/doc/ejabberd PACKAGE_TARNAME = @PACKAGE_TARNAME@ -@@ -59,37 +59,24 @@ JSDIR = $(PRIVDIR)/js - SQLDIR = $(PRIVDIR)/sql +@@ -65,37 +65,24 @@ SQLDIR = $(PRIVDIR)/sql + LUADIR = $(PRIVDIR)/lua # /var/lib/ejabberd/ -SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd @@ -61,5 +61,5 @@ Fix locations; don't mess with ownership. - G_USER=-g $(INSTALLGROUP) -endif - all: deps src + IS_REBAR3:=$(shell expr `$(REBAR) --version | awk -F '[ .]' '/rebar / {print $$2}'` '>=' 3) diff --git a/chat/ejabberd/patches/patch-ad b/chat/ejabberd/patches/patch-ad deleted file mode 100644 index ac03576ef5f..00000000000 --- a/chat/ejabberd/patches/patch-ad +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ad,v 1.9 2018/01/03 22:51:30 fhajny Exp $ - -Proper path to captcha script. - ---- ejabberd.yml.example.orig 2013-09-27 09:19:22.000000000 +0000 -+++ ejabberd.yml.example -@@ -490,7 +490,7 @@ language: "en" - ## - ## Full path to a script that generates the image. - ## --## captcha_cmd: "/lib/ejabberd/priv/bin/captcha.sh" -+## captcha_cmd: "@PREFIX@/lib/ejabberd/priv/bin/captcha.sh" - - ## - ## Host for the URL and port where ejabberd listens for CAPTCHA requests. diff --git a/chat/ejabberd/patches/patch-ae b/chat/ejabberd/patches/patch-ae index 24445ff7554..6791d3f0761 100644 --- a/chat/ejabberd/patches/patch-ae +++ b/chat/ejabberd/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.19 2018/01/03 22:51:30 fhajny Exp $ +$NetBSD: patch-ae,v 1.20 2021/01/16 20:24:33 triaxx Exp $ - Default locations. - Use 'su -' instead of just 'su'. Fixes priv delegation on SunOS @@ -7,19 +7,8 @@ $NetBSD: patch-ae,v 1.19 2018/01/03 22:51:30 fhajny Exp $ - At least SunOS has not wheel group. - Portable grep calls. ---- ejabberdctl.template.orig 2017-12-28 18:37:19.000000000 +0000 +--- ejabberdctl.template.orig 2020-12-15 14:40:16.000000000 +0000 +++ ejabberdctl.template -@@ -58,8 +58,8 @@ done - - # define ejabberd variables if not already defined from the command line - : "${ETC_DIR:="{{sysconfdir}}/ejabberd"}" --: "${LOGS_DIR:="{{localstatedir}}/log/ejabberd"}" --: "${SPOOL_DIR:="{{localstatedir}}/lib/ejabberd"}" -+: "${LOGS_DIR:=@EJABBERD_LOGDIR@}" -+: "${SPOOL_DIR:=@EJABBERD_DB@}" - : "${EJABBERD_CONFIG_PATH:="$ETC_DIR/ejabberd.yml"}" - : "${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR/ejabberdctl.cfg"}" - [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH" @@ -110,7 +110,7 @@ export ERL_LIBS exec_cmd() { @@ -29,7 +18,7 @@ $NetBSD: patch-ae,v 1.19 2018/01/03 22:51:30 fhajny Exp $ as_current_user) "$@" ;; esac } -@@ -209,14 +209,14 @@ uid() +@@ -217,14 +217,14 @@ uid() # stop epmd if there is no other running node stop_epmd() { diff --git a/chat/ejabberd/patches/patch-configure b/chat/ejabberd/patches/patch-configure index 872b5ec6c73..58d9f6d7497 100644 --- a/chat/ejabberd/patches/patch-configure +++ b/chat/ejabberd/patches/patch-configure @@ -1,6 +1,7 @@ -$NetBSD: patch-configure,v 1.1 2013/10/11 13:32:25 fhajny Exp $ +$NetBSD: patch-configure,v 1.2 2021/01/16 20:24:33 triaxx Exp $ Portability. + --- configure.orig 2013-10-10 10:59:33.747311941 +0000 +++ configure @@ -2548,7 +2548,7 @@ EOF |