Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 65E111A9217 for ; Sat, 16 Jan 2021 20:24:38 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 899E18512C; Sat, 16 Jan 2021 20:24:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C38D08512B for ; Sat, 16 Jan 2021 20:24:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id hoCMDJW0M3sh for ; Sat, 16 Jan 2021 20:24:34 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 206E884CEF for ; Sat, 16 Jan 2021 20:24:34 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 17FDCFA9D; Sat, 16 Jan 2021 20:24:34 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1610828674183750" MIME-Version: 1.0 Date: Sat, 16 Jan 2021 20:24:34 +0000 From: =?UTF-8?B?RnLDqWTDqXJpYyBGYXViZXJ0ZWF1?= Subject: CVS commit: pkgsrc/chat/ejabberd To: pkgsrc-changes@NetBSD.org Reply-To: triaxx@netbsd.org X-Mailer: log_accum Message-Id: <20210116202434.17FDCFA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1610828674183750 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: triaxx Date: Sat Jan 16 20:24:33 UTC 2021 Modified Files: pkgsrc/chat/ejabberd: Makefile PLIST distinfo pkgsrc/chat/ejabberd/patches: patch-aa patch-ae patch-configure Removed Files: pkgsrc/chat/ejabberd/patches: patch-ad Log Message: ejabberd: Update to 20.12 pkgsrc changes: --------------- * This update is mainly justified by the fact that OTS 23 breaks a lot of dependencies which are very old. upstream changes: ----------------- Version 20.12 Add support for SCRAM-SHA-{256,512}-{PLUS} authentication Don't use same value in cache for user don't exist and wrong password outgoing_s2s_ipv*_address: New options to set ipv4/ipv6 outbound s2s out interface s2s_send_packet: this hook now filters outgoing s2s stanzas start_room: new hook runs when a room process is started check_decoded_jwt: new hook to check decoded JWT after success authentication Admin Docker: Fix DB initialization New sql_odbc_driver option: choose the mssql ODBC driver Rebar3: Fully supported. Enable with ./configure --with-rebar=/path/to/rebar3 systemd: start ejabberd in foreground Modules: MAM: Make sure that jid used as base in mam xml_compress is bare MAM: Support for MAM Flipped Pages MUC: Always show MucSub subscribers nicks MUC: Don't forget not-persistent rooms in load_permanent_rooms MUC Admin: Better error reporting MUC Admin: Fix commands with hibernated rooms MUC Admin: Many improvements in rooms_unused_list/destroy MUC Admin: create_room_with_opts Store options only if room starts Pubsub: Remove 'dag' node plugin documentation Push: Fix API call return type on error Push: Support cache config changes on reload Register: Allow for account-removal-only setup again Roster: Make roster subscriptions work better with invalid roster state in db Vcard: Fix vCard search by User when using Mnesia WebAdmin: Allow vhost admins to view WebAdmin menus WebAdmin: Don't do double utf-8 conversion on translated strings WebAdmin: Mark dangerous buttons with CSS WebSocket: Make websocket send put back pressure on c2s process Version 20.07 Changes in this version Add support for using unix sockets in listeners. Make this version compatible with erlang R23 Make room permissions checks more strict for subscribers Fix problem with muc rooms crashing when using muc logger with some locales Limit stat calls that logger module issues Don't throw errors when using user_regexp acl rule and having non-matching host Fix problem with leaving old data when updating shared rosters Fix edge case that caused failure of resuming old sessions with stream management. Fix crash when room that was started with loging enabled was later changed to logging disabled Increase default shaper limits (this should help with delays for clients that are using jingle) Fix couple compatibility problems which prevented working on erlang R19 Fix sending presence unavailable when session terminates for clients that only send directed presences (helps with sometimes not leaving muc rooms on disconnect). Prevent supervisor errors for sockets that were closed before they were passed to handler modules Make stun module work better with ipv6 addresses Version 20.03 Changes in this version Add support of ssl connection when connection to mysql database (configured with sql_ssl: true option) Experimental support for cockroachdb when configured with postgres connector Add cache and optimize queries issued by mod_shared_roster, this should greatly improve performance of this module when used with sql backend Fix problem with accessing webadmin Make webadmin work even when url is missing trailing slash When compiling external modules with ext_mod, use flags that were detected during compilation of ejabberd Make config changed to ldap options be updated when issued reload_config command Fix room_empty_destory command Fix reporting errors in send_stanza command when xml passed to it couldn't be passed correctly Version 20.02 Changes in this version Fix problems when trying to use string format with unicode values directly in xmpp nodes Add missing oauth_client table declaration in lite.new.sql Improve compatibility with CocroachDB Fix importing of piefxis files that did use scram passwords Fix importing of piefxis files that had multiple includes in them Update jiffy dependency Allow storage of emojis when using mssql database (Thanks to Christoph Scholz) Make ejabberd_auth_http be able to use auth_opts Make custom_headers options in http modules correctly override built-in values Fix return value of reload_config and dump_config commands Version 20.01 New features Implement OAUTH authentication in mqtt Make logging infrastructure use new logger introduced in Erlang (requires OTP22) New configuration parser/validator Initial work on being able to use CockroachDB as database backend Add gc command Add option to disable using prepared statements on Postgresql Implement routine for converting password to SCRAM format for all backends not only SQL Add infrastructure for having module documentation directly in individual module source code Generate man page automaticaly Implement copy feature in mod_carboncopy Fixes Make webadmin work with configurable paths Fix handling of result in xmlrpc module Make webadmin work even when accessed through not declared domain Better error reporting in xmlrpc Limit ammount of results returned by disco queries to pubsub nodes Improve validation of configured JWT keys Fix race condition in Redis/SQL startup Fix loading order of third party modules Fix reloading of ACL rules Make account removal requests properly route response Improve handling of malformed inputs in send_message command Omit push notification if storing message in offline storage failed Fix crash in stream management when timeout was not set Version 19.09 Admin The minimum required Erlang/OTP version is now 19.3 Fix API call using OAuth (#2982) Rename MUC command arguments from Host to Service (#2976) Webadmin Don't treat 'Host' header as a virtual XMPP host (#2989) Fix some links to Guide in WebAdmin and add new ones (#3003) Use select fields to input host in WebAdmin Backup (#3000) Check account auth provided in WebAdmin is a local host (#3000) ACME Improve ACME implementation Fix IDA support in ACME requests Fix unicode formatting in ACME module Log an error message on IDNA failure Support IDN hostnames in ACME requests Don't attempt to create ACME directory on ejabberd startup Don't allow requesting certificates for localhost or IP-like domains Don't auto request certificate for localhost and IP-like domains Add listener for ACME challenge in example config Authentication JWT-only authentication for some users (#3012) MUC Apply default role after revoking admin affiliation (#3023) Custom exit message is not broadcast (#3004) Revert "Affiliations other than admin and owner cannot invite to members_only rooms" (#2987) When join new room with password, set pass and password_protected (#2668) Improve rooms_* commands to accept 'global' as MUC service argument (#2976) Rename MUC command arguments from Host to Service (#2976) SQL Fix transactions for Microsoft SQL Server (#2978) Spawn SQL connections on demand only Misc Add support for XEP-0328: JID Prep Added gsfonts for captcha Log Mnesia table type on creation Replicate Mnesia 'bosh' table when nodes are joined Fix certificate selection for s2s (#3015) Provide meaningful error when adding non-local users to shared roster (#3000) Websocket: don't treat 'Host' header as a virtual XMPP host (#2989) Fix sm ack related c2s error (#2984) Don't hide the reason why c2s connection has failed Unicode support Correctly handle unicode in log messages Fix unicode processing in ejabberd.yml Version 19.08 Administration Improve ejabberd halting procedure Process unexpected erlang messages uniformly: logging a warning mod_configure: Remove modules management Configuration Use new configuration validator ejabberd_http: Use correct virtual host when consulting trusted_proxies Fix Elixir modules detection in the configuration file Make option 'validate_stream' global Allow multiple definitions of host_config and append_host_config Introduce option 'captcha_url' mod_stream_mgmt: Allow flexible timeout format mod_mqtt: Allow flexible timeout format in session_expiry option Misc Fix SQL connections leakage New authentication method using JWT tokens extauth: Add 'certauth' command Improve SQL pool logic Add and improve type specs Improve extraction of translated strings Improve error handling/reporting when loading language translations Improve hooks validator and fix bugs related to hooks registration Gracefully close inbound s2s connections mod_mqtt: Fix usage of TLS mod_offline: Make count_offline_messages cache work when using mam for storage mod_privacy: Don't attempt to query 'undefined' active list mod_privacy: Fix race condition MUC Add code for hibernating inactive muc_room processes Improve handling of unexpected iq in mod_muc_room Attach mod_muc_room processes to a supervisor Restore room when receiving message or generic iq for not started room Distribute routing of MUC messages accross all CPU cores PubSub Fix pending nodes retrieval for SQL backend Check access_model when publishing PEP Remove deprecated pubsub plugins Expose access_model and publish_model in pubsub#metadata Version 19.05 Admin The minimum required Erlang/OTP version is now 19.1 Provide a suggestion when unknown command, module, option or request handler is detected Deprecate some listening options: captcha, register, web_admin, http_bind and xmlrpc Add commands to get Mnesia info: mnesia_info and mnesia_table_info Fix Register command to respect mod_register's Access option Fixes in Prosody import: privacy and rooms Remove TLS options from the example config Improve request_handlers validator Fix syntax in example Elixir config file Auth Correctly support cache tags in ejabberd_auth Don't process failed EXTERNAL authentication by mod_fail2ban Don't call to mod_register when it's not loaded Make anonymous auth don't {de}register user when there are other resources Developer Rename listening callback from start/2 to start/3 New hook called when room gets destroyed: room_destroyed New hooks for tracking mucsub subscriptions changes: muc_subscribed, muc_unsubscribed Make static hooks analyzer working again MUC Service admins are allowed to recreate room even if archiv is nonempty New option user_mucsub_from_muc_archive Avoid late arrival of get_disco_item response Handle get_subscribed_rooms call from mod_muc_room pid Fix room state cleanup from db on change of persistent option change Make get_subscribed_rooms work even for non-persistant rooms Allow non-moderator subscribers to get list of room subscribers Offline New option bounce_groupchat: make it not bounce mucsub/groupchat messages New option use_mam_for_storage: fetch data from mam instead of spool table When applying limit of max msgs in spool check only spool size Do not store mucsub wrapped messages with no-store hint in offline storage Always store ActivityMarker messages Don't issue count/message fetch queries for offline from mam when not needed Properly handle infinity as max number of message in mam offline storage Sort messages by stanza_id when using mam storage in mod_offline Return correct value from count_offline_messages with mam storage option Make mod_offline put msg ignored by mam in spool when mam storage is on SQL: Add SQL schemas for MQTT tables Report better errors on SQL terms decode failure Fix PostgreSQL compatibility in mod_offline_sql:remove_old_messages Fix handling of list arguments on pgsql Preliminary support for SQL in process_rosteritems command Tests Add tests for user mucsub mam from muc mam Add tests for offline with mam storage Add tests for offline use_mam_for_storage Initial Docker environment to run ejabberd test suite Test offline:use_mam_for_storage, mam:user_mucsub_from_muc_archive used together Websocket Add WebSockets support to mod_mqtt Return "Bad request" error when origin in websocket connection doesn't match Fix RFC6454 violation on websocket connection when validating Origin header Origin header validation on websocket connection Other modules mod_adhoc: Use xml:lang from stanza when it's missing in element mod_announce: Add 'sessionid' attribute when required mod_bosh: Don't put duplicate polling attribute in bosh payload mod_http_api: Improve argument error messages and log messages mod_http_upload: Feed whole image to eimp:identify/1 mod_http_upload: Log nicer warning on unknown host mod_http_upload: Case-insensitive host comparison mod_mqtt: Support other socket modules mod_push: Check for payload in encrypted messages Version 19.02 Admin Fix in configure.ac the Erlang/OTP version: from 17.5 to 19.0 reload_config command: Fix crash when sql_pool_size option is used reload_config command: Fix crash when SQL is not configured rooms_empty_destroy command: Several fixes to behave more conservative Fix serverhost->host parameter name for muc_(un)register_nick API Configuration Allow specifying tag for listener for api_permission purposes Change default ciphers to intermediate Define default ciphers/protocol_option in example config Don't crash on malformed 'modules' section mod_mam: New option clear_archive_on_room_destroy to prevent archive removal on room destroy mod_mam: New option access_preferences to restrict who can modify the MAM preferences mod_muc: New option access_mam to restrict who can modify that room option mod_offline: New option store_groupchat to allow storing group chat messages Core Add MQTT protocol support Fix (un)setting of priority Use OTP application startup infrastructure for starting dependencies Improve starting order of several dependencies MAM mod_mam_mnesia/sql: Improve check for empty archive disallow room creation if archive not empty and clear_archive_on_room_destroy is false allow check if archive is empty for or user or room Additional checks for database failures MUC Make sure that room_destroyed is called even when some code throws in terminate Update muc room state after adding extra access field to it MUC/Sub: Send mucsub subscriber notification events with from set to room jid Shared Roster Don't perform roster push for non-local contacts Handle versioning result when shared roster group has remote account Fix SQL queries Miscelanea CAPTCHA: Add no-store hint to CAPTCHA challenge stanzas HTTP: Reject http_api request with malformed Authentication header mod_carboncopy: Don't lose carbons on presence change or session resumption mod_mix: Fix submission-id and channel resource mod_ping: Fix ping IQ reply/timeout processing (17.x regression) mod_private: Hardcode item ID for PEP bookmarks mod_push: Improve notification error handling PIEFXIS: Fix user export when password is scrammed Prosody: Improve import of roster items, rooms and attributes Translations: fixed "make translations" WebAdmin: Fix support to restart module with new options Version 18.12 MAM data store compression Proxy protocol support (http://www.haproxy.org/download/1.8/doc/proxy-protocol.txt) MUC Self-Ping optimization (XEP-0410) Bookmarks conversion (XEP-0411) To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.89 pkgsrc/chat/ejabberd/Makefile cvs rdiff -u -r1.54 -r1.55 pkgsrc/chat/ejabberd/PLIST cvs rdiff -u -r1.58 -r1.59 pkgsrc/chat/ejabberd/distinfo cvs rdiff -u -r1.15 -r1.16 pkgsrc/chat/ejabberd/patches/patch-aa cvs rdiff -u -r1.9 -r0 pkgsrc/chat/ejabberd/patches/patch-ad cvs rdiff -u -r1.19 -r1.20 pkgsrc/chat/ejabberd/patches/patch-ae cvs rdiff -u -r1.1 -r1.2 pkgsrc/chat/ejabberd/patches/patch-configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1610828674183750 Content-Disposition: inline Content-Length: 23860 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/chat/ejabberd/Makefile diff -u pkgsrc/chat/ejabberd/Makefile:1.88 pkgsrc/chat/ejabberd/Makefile:1.89 --- pkgsrc/chat/ejabberd/Makefile:1.88 Wed May 27 19:37:37 2020 +++ pkgsrc/chat/ejabberd/Makefile Sat Jan 16 20:24:33 2021 @@ -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 tool 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 Index: pkgsrc/chat/ejabberd/PLIST diff -u pkgsrc/chat/ejabberd/PLIST:1.54 pkgsrc/chat/ejabberd/PLIST:1.55 --- pkgsrc/chat/ejabberd/PLIST:1.54 Fri Jul 20 09:58:26 2018 +++ pkgsrc/chat/ejabberd/PLIST Sat Jan 16 20:24:33 2021 @@ -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_mne 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. 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.pn 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 Index: pkgsrc/chat/ejabberd/distinfo diff -u pkgsrc/chat/ejabberd/distinfo:1.58 pkgsrc/chat/ejabberd/distinfo:1.59 --- pkgsrc/chat/ejabberd/distinfo:1.58 Fri Jul 20 09:58:26 2018 +++ pkgsrc/chat/ejabberd/distinfo Sat Jan 16 20:24:33 2021 @@ -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 Index: pkgsrc/chat/ejabberd/patches/patch-aa diff -u pkgsrc/chat/ejabberd/patches/patch-aa:1.15 pkgsrc/chat/ejabberd/patches/patch-aa:1.16 --- pkgsrc/chat/ejabberd/patches/patch-aa:1.15 Wed Mar 28 21:51:09 2018 +++ pkgsrc/chat/ejabberd/patches/patch-aa Sat Jan 16 20:24:33 2021 @@ -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) Index: pkgsrc/chat/ejabberd/patches/patch-ae diff -u pkgsrc/chat/ejabberd/patches/patch-ae:1.19 pkgsrc/chat/ejabberd/patches/patch-ae:1.20 --- pkgsrc/chat/ejabberd/patches/patch-ae:1.19 Wed Jan 3 22:51:30 2018 +++ pkgsrc/chat/ejabberd/patches/patch-ae Sat Jan 16 20:24:33 2021 @@ -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:5 - 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:5 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() { Index: pkgsrc/chat/ejabberd/patches/patch-configure diff -u pkgsrc/chat/ejabberd/patches/patch-configure:1.1 pkgsrc/chat/ejabberd/patches/patch-configure:1.2 --- pkgsrc/chat/ejabberd/patches/patch-configure:1.1 Fri Oct 11 13:32:25 2013 +++ pkgsrc/chat/ejabberd/patches/patch-configure Sat Jan 16 20:24:33 2021 @@ -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 --_----------=_1610828674183750--