head 1.22; access; symbols pkgsrc-2023Q4:1.22.0.10 pkgsrc-2023Q4-base:1.22 pkgsrc-2023Q3:1.22.0.8 pkgsrc-2023Q3-base:1.22 pkgsrc-2023Q2:1.22.0.6 pkgsrc-2023Q2-base:1.22 pkgsrc-2023Q1:1.22.0.4 pkgsrc-2023Q1-base:1.22 pkgsrc-2022Q4:1.22.0.2 pkgsrc-2022Q4-base:1.22 pkgsrc-2022Q3:1.21.0.14 pkgsrc-2022Q3-base:1.21 pkgsrc-2022Q2:1.21.0.12 pkgsrc-2022Q2-base:1.21 pkgsrc-2022Q1:1.21.0.10 pkgsrc-2022Q1-base:1.21 pkgsrc-2021Q4:1.21.0.8 pkgsrc-2021Q4-base:1.21 pkgsrc-2021Q3:1.21.0.6 pkgsrc-2021Q3-base:1.21 pkgsrc-2021Q2:1.21.0.4 pkgsrc-2021Q2-base:1.21 pkgsrc-2021Q1:1.21.0.2 pkgsrc-2021Q1-base:1.21 pkgsrc-2020Q4:1.19.0.24 pkgsrc-2020Q4-base:1.19 pkgsrc-2020Q3:1.19.0.22 pkgsrc-2020Q3-base:1.19 pkgsrc-2020Q2:1.19.0.20 pkgsrc-2020Q2-base:1.19 pkgsrc-2020Q1:1.19.0.16 pkgsrc-2020Q1-base:1.19 pkgsrc-2019Q4:1.19.0.18 pkgsrc-2019Q4-base:1.19 pkgsrc-2019Q3:1.19.0.14 pkgsrc-2019Q3-base:1.19 pkgsrc-2019Q2:1.19.0.12 pkgsrc-2019Q2-base:1.19 pkgsrc-2019Q1:1.19.0.10 pkgsrc-2019Q1-base:1.19 pkgsrc-2018Q4:1.19.0.8 pkgsrc-2018Q4-base:1.19 pkgsrc-2018Q3:1.19.0.6 pkgsrc-2018Q3-base:1.19 pkgsrc-2018Q2:1.19.0.4 pkgsrc-2018Q2-base:1.19 pkgsrc-2018Q1:1.19.0.2 pkgsrc-2018Q1-base:1.19 pkgsrc-2017Q4:1.18.0.2 pkgsrc-2017Q4-base:1.18 pkgsrc-2017Q3:1.17.0.4 pkgsrc-2017Q3-base:1.17 pkgsrc-2017Q2:1.15.0.10 pkgsrc-2017Q2-base:1.15 pkgsrc-2017Q1:1.15.0.8 pkgsrc-2017Q1-base:1.15 pkgsrc-2016Q4:1.15.0.6 pkgsrc-2016Q4-base:1.15 pkgsrc-2016Q3:1.15.0.4 pkgsrc-2016Q3-base:1.15 pkgsrc-2016Q2:1.15.0.2 pkgsrc-2016Q2-base:1.15 pkgsrc-2016Q1:1.13.0.2 pkgsrc-2016Q1-base:1.13 pkgsrc-2015Q4:1.12.0.2 pkgsrc-2015Q4-base:1.12 pkgsrc-2015Q3:1.11.0.2 pkgsrc-2015Q3-base:1.11 pkgsrc-2015Q2:1.10.0.4 pkgsrc-2015Q2-base:1.10 pkgsrc-2015Q1:1.10.0.2 pkgsrc-2015Q1-base:1.10 pkgsrc-2014Q4:1.9.0.4 pkgsrc-2014Q4-base:1.9 pkgsrc-2014Q3:1.9.0.2 pkgsrc-2014Q3-base:1.9 pkgsrc-2014Q2:1.7.0.6 pkgsrc-2014Q2-base:1.7 pkgsrc-2014Q1:1.7.0.4 pkgsrc-2014Q1-base:1.7 pkgsrc-2013Q4:1.7.0.2 pkgsrc-2013Q4-base:1.7 pkgsrc-2013Q3:1.6.0.26 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.24 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.22 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.6.0.20 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q3:1.6.0.18 pkgsrc-2012Q3-base:1.6 pkgsrc-2012Q2:1.6.0.16 pkgsrc-2012Q2-base:1.6 pkgsrc-2012Q1:1.6.0.14 pkgsrc-2012Q1-base:1.6 pkgsrc-2011Q4:1.6.0.12 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.6.0.10 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.6.0.8 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.6.0.6 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.6.0.4 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.6.0.2 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.5.0.4 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.2 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.4.0.2 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.3.0.8 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.6 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.4 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.2 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.2.0.8 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.6 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.4 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.2 pkgsrc-2008Q1:1.1.1.1.0.2 pkgsrc-2008Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.22 date 2022.10.15.18.20.40; author triaxx; state Exp; branches; next 1.21; commitid 1xs3u1Spr1numQXD; 1.21 date 2021.01.16.21.19.33; author triaxx; state Exp; branches; next 1.20; commitid rH7W06xLJm8QOZDC; 1.20 date 2021.01.16.20.24.33; author triaxx; state Exp; branches; next 1.19; commitid l2iqIHTIXD7nvZDC; 1.19 date 2018.01.03.22.51.30; author fhajny; state Exp; branches; next 1.18; commitid prEAKXFtpxGRYtlA; 1.18 date 2017.10.17.14.55.36; author fhajny; state Exp; branches; next 1.17; commitid 9uVt5Uzvxfo8RpbA; 1.17 date 2017.08.20.12.58.04; author fhajny; state Exp; branches; next 1.16; commitid uNw49ty9ZgHn4X3A; 1.16 date 2017.07.07.10.08.40; author fhajny; state Exp; branches; next 1.15; commitid 2n8PhXQEZecNxhYz; 1.15 date 2016.04.29.19.05.22; author fhajny; state Exp; branches; next 1.14; commitid ijN07rdtlvrQsy4z; 1.14 date 2016.04.25.20.24.14; author fhajny; state Exp; branches; next 1.13; commitid Zc9on2PipISE134z; 1.13 date 2016.01.16.19.28.02; author fhajny; state Exp; branches; next 1.12; commitid 3xMibV8uArTVVbRy; 1.12 date 2015.11.05.12.23.50; author fhajny; state Exp; branches; next 1.11; commitid EccIBfcCNoZJTTHy; 1.11 date 2015.06.29.21.44.10; author fhajny; state Exp; branches; next 1.10; commitid XKsanJzRZJcl8nry; 1.10 date 2015.01.02.09.14.16; author fhajny; state Exp; branches; next 1.9; commitid c0GBbxdIWyMxIq4y; 1.9 date 2014.08.21.19.32.27; author tron; state Exp; branches; next 1.8; commitid 9Dd9tbN03KzCrgNx; 1.8 date 2014.07.30.09.45.38; author fhajny; state Exp; branches; next 1.7; commitid LeKM0MwHUMnISnKx; 1.7 date 2013.10.11.13.32.25; author fhajny; state Exp; branches; next 1.6; commitid LPqmqcxb1NwhxS8x; 1.6 date 2010.09.03.10.31.43; author fhajny; state Exp; branches; next 1.5; 1.5 date 2010.03.13.21.05.49; author fhajny; state Exp; branches; next 1.4; 1.4 date 2009.12.15.13.30.54; author fhajny; state Exp; branches 1.4.2.1; next 1.3; 1.3 date 2008.11.12.13.13.59; author martti; state Exp; branches; next 1.2; 1.2 date 2008.04.22.11.31.05; author martti; state Exp; branches; next 1.1; 1.1 date 2008.03.10.08.58.32; author martti; state Exp; branches 1.1.1.1; next ; 1.4.2.1 date 2010.03.15.10.21.58; author tron; state Exp; branches; next ; 1.1.1.1 date 2008.03.10.08.58.32; author martti; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2008.04.25.01.09.18; author rtr; state Exp; branches; next ; desc @@ 1.22 log @ejabberd: Update to 22.05 upstream changes: ----------------- Version 22.05 o https://github.com/processone/ejabberd/blob/432e972/CHANGELOG.md Version 21.12 o https://github.com/processone/ejabberd/blob/21.12/CHANGELOG.md Version 21.07 o https://github.com/processone/ejabberd/blob/21.07/CHANGELOG.md @ text @$NetBSD: patch-ae,v 1.21 2021/01/16 21:19:33 triaxx Exp $ - Default locations. - Use 'su -' instead of just 'su'. Fixes priv delegation on SunOS and AIX where Erlang relies on $HOME set correctly. Use a portable su arg order while at it. - At least SunOS has not wheel group. - Portable grep calls. - Fix spool directory. --- ejabberdctl.template.orig 2022-05-06 13:12:22.000000000 +0000 +++ ejabberdctl.template @@@@ -112,7 +112,7 @@@@ export SCRIPT_DIR exec_cmd() { case $EXEC_CMD in - as_install_user) su -s /bin/sh -c '"$0" "$@@"' "$INSTALLUSER" -- "$@@" ;; + as_install_user) su - "$INSTALLUSER" -c '"$@@"' -- "$@@" ;; as_current_user) "$@@" ;; esac } @@@@ -218,14 +218,14 @@@@ uid() # stop epmd if there is no other running node stop_epmd() { - "$EPMD" -names 2>/dev/null | grep -q name || "$EPMD" -kill >/dev/null + "$EPMD" -names 2>/dev/null | grep name >/dev/null || "$EPMD" -kill >/dev/null } # make sure node not already running and node name unregistered # if all ok, ensure runtime directory exists and make it current directory check_start() { - "$EPMD" -names 2>/dev/null | grep -q " ${ERLANG_NODE%@@*} " && { + "$EPMD" -names 2>/dev/null | grep " ${ERLANG_NODE%@@*} " >/dev/null && { pgrep -f "$ERLANG_NODE" >/dev/null && { echo "ERROR: The ejabberd node '$ERLANG_NODE' is already running." exit 4 @ 1.21 log @ejabberd: Fix spool directory for ejabberdctl pkgsrc changes: --------------- * The spool directory is set to ${VARBASE}/spool/ejabberd by pkgsrc but ejabberdctl used ${VARBASE}/lib/ejabberd * Bump revision @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.20 2021/01/16 20:24:33 triaxx Exp $ d11 1 a11 1 --- ejabberdctl.template.orig 2020-12-15 14:40:16.000000000 +0000 d13 1 a13 10 @@@@ -57,7 +57,7 @@@@ 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"}" +: "${SPOOL_DIR:="{{localstatedir}}/spool/ejabberd"}" : "${EJABBERD_CONFIG_PATH:="$ETC_DIR/ejabberd.yml"}" : "${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR/ejabberdctl.cfg"}" # Allows passing extra Erlang command-line arguments in vm.args file @@@@ -110,7 +110,7 @@@@ export ERL_LIBS d22 1 a22 1 @@@@ -217,14 +217,14 @@@@ uid() @ 1.20 log @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) @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.19 2018/01/03 22:51:30 fhajny Exp $ d9 1 d13 9 @ 1.19 log @Update chat/ejabberd to 17.12. pkgsrc - Change installation home for Erlang libs to prevent build conflicts with previous versions that may be present on the system, as encountered by @@gdt. Core - Rewrite ejabberd system monitor for efficiency - Fix incoming XMPP processing order - Use xmpp:try_subtag/2 wherever possible - Better process subtag decoding errors - Only allow compression after SASL as per XEP-0170 - Don't crash on unexpected XML events - Fix session mnesia table cleanup - Don't let privacy list prevent local roster update Encryption - Rely on Server Name Indication for incoming Direct-TLS connections - Speedup certificate chains creation and validation - Log warning on empty wildcard paths - Don't call pkix_is_self_signed/1 too frequently - Eat less memory during building certificates graph - Avoid infinite loop between self-signed certs - Fix function clause on filelib:wildcard/1 - Use ejabberd_pkix API in mod_sip - Move 'certfile' based options in a single place Groupchat - Don't crash on malformed IQ - Include x tag in presence errors related to nick change - Include 110 status on shutdown - Improve muc#roominfo and muc#roomconfig forms - mod_mam: Never store MUC messages in user archives PubSub - Fix num_subscribers on node metadata - Fix send last items on initial presence - Send last PEP items to owner on initial presence - Support pubsub#publish-options PRECONDITIONs - Add pubsub#multi-items to features list (Support XEP-0060 v1.14) - Add missing Nidx building records from sql result - Don't force RSM in get_items when max_items is not provided Admin - Introduce option 'ca_file' - Set executable permission on mac_listener when installing - Use /bin/sh as the explicit shell when using su in ejabberdctl. - Windows does not have /tmp, fallback to $HOME/conf for ODBC configuration files Logging - Change loglevel of TLS failures - Log a warning when a disk is almost full - Disable default alarm handler - Handle also process_memory_high_watermark alarm - Kill and restart lager when it's overloaded - Avoid excessive logging of SQL failures Commands - New muc_online_room_by_regex command - Fix race between join_cluster and ejabberd_mnesia - Fix commands rooms_unused_list and _destroy - send_direct_invitations accepts only user jids - ejabberd_sm: Fix get_session_sid/3 SQL - Add missing server_host column in pg.new.sql - Add new schema for MySQL and Sqlite - Fix SQL serialization Installer - MacOS installer is signed. You can now easily install ejabberd on your Mac. Build - Compile sql_pt early - Binary installer uses OTP 20.2 @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.18 2017/10/17 14:55:36 fhajny Exp $ d10 1 a10 1 --- ejabberdctl.template.orig 2017-12-28 18:37:19.000000000 +0000 a11 11 @@@@ -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" d21 1 a21 1 @@@@ -209,14 +209,14 @@@@ uid() @ 1.18 log @Update chat/ejabberd to 17.09. Admin - Harden ejabberdctl - Fix ejabberdctl quoting when using iex - Call earlier deps configure scripts during compilation - Fix iexdebug and iexlive commands - Quote $PEER in ping command to avoid hostnames containing "-" being interpreted as arithmetic - Docker: Sync containers from rroemhild and add instructions in README - Use eimp instead of ImageMagick calls for thumbnails creation - Add forgotten caching options to the validator - Fix 'make install' to work with new output from rebar list-deps - Rewrite muc_register_nick and muc_unregister_nick to be DB independent - WebAdmin: Fix deletion of multiple offline messages Encryption - Add support for XEP-0368 in outgoing s2s: SRV records for XMPP over TLS - Deprecate s2s_use_starttls: required_trusted - Don't attempt to access(2) a certificate file - Let 'domain_certfile' take higher precedence instead of s2s_certfile or c2s_certfile Databases - mysql.sql: Use multi-column index on username/ID - Use forked repo of Riak Erlang client to support OTP20 Modules - mod_avatar: New module with support for legacy and modern clients - mod_block_strangers: Introduce option 'allow_transports' - mod_block_strangers: Block messages from strangers before mod_mam/mod_offline processing - mod_http_upload: Don't ignore 'custom_headers' - mod_muc: Improve presence-error and unavailable of multi-session occupants - mod_multicast: Fix start and reading of configured limits - mod_mam: Simplify check for anon MUC JID filtering - mod_mam: Refuse filtering anon MUC queries by JID - mod_privacy: Explicitly match against - mod_register: Introduce 'redirect_url' option - mod_stream_mgmt: Delete 'c2s_init' hook - mod_vcard_xupdate: Also replace vcard-x-update in direct presences PubSub - Fix get_items/get_item calls - Add correct order when requesting all items - Implement '6.5.7 Requesting the Most Recent Items' - Fix RSM support on SQL - Add RSM support on mnesia - Fix node_options: default options only apply on first plugin - Broadcast updated node configuration - Enforce controls on publish and delete items Miscelanea - Preserve correct order of deserialized XML elements - Suppress push notifications for online clients - Extract strings and prepare translation files works again @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.17 2017/08/20 12:58:04 fhajny Exp $ d10 1 a10 1 --- ejabberdctl.template.orig 2017-09-28 13:21:11.000000000 +0000 d12 1 a12 1 @@@@ -57,8 +57,8 @@@@ done d23 1 a23 1 @@@@ -109,7 +109,7 @@@@ export ERL_LIBS d27 1 a27 1 - as_install_user) su -c '"$0" "$@@"' "$INSTALLUSER" -- "$@@" ;; d32 1 a32 1 @@@@ -208,14 +208,14 @@@@ uid() @ 1.17 log @Update chat/ejabberd to 17.08. Core - Erlang/OTP 17.5 or higher is required, and 20 is now supported - Make ejabberd_cluster modular - Replace gen_fsm with p1_fsm to avoid warnings in OTP20+ - Fix clustering table reg_users_counter - ext_mod: Update spec from custom and allow modules dependencies - extauth.py: Fix to support : in passwords - Set high water mark in lager for all backends - Fix old route record in mnesia’s route table haven’t been remove when restarting in some cases - ejabberd_cluster*.erl: Add copyright and fix description - Add support of rfc6120 section 4.9.3.16 on node shutdown Configuration - ejabberd_c2s: Fix priority of ‘certfile’ option - Introduce ‘hosts’ modules option - Fix ERLANG_OPTS, INET_DIST_INTERFACE and FIREWALL_WINDOW option - Remove unused ‘managers’ option, related to the deferred XEP-0321 Commands - Fix errors when running ejabberdctl as root - Fix set_presence command to work in recent ejabberd - Rename stop_all_connections to stop_s2s_connections for consistency - Change policy of user_resources command, from user to admin - Remove old command calling interface - Describe more command arguments and results Modules - mod_http_api: Use hide_sensitive_log_data option when registering users - mod_http_fileserver: Request basic auth dialog from browser - mod_muc: Fix nick bug with MUC on riak - mod_muc: new hooks - mod_push: Support XEP-0357: Push Notifications - mod_push_keepalive: New module PubSub/PEP - Keep disco#info on PEP compatible with XEP-0060 - Preliminary export PubSub data from Mnesia tables to SQL file - Fix PubSub send last published items - Fix PEP node removal - Fix PEP node identity - Fix disco#items on PEP service - Fix getting cached last item - Add import of PEP from prosody @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.16 2017/07/07 10:08:40 fhajny Exp $ d10 1 a10 1 --- ejabberdctl.template.orig 2017-08-14 07:43:02.000000000 +0000 d12 1 a12 1 @@@@ -56,8 +56,8 @@@@ done d15 7 a21 7 : ${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} d23 1 a23 1 @@@@ -108,7 +108,7 @@@@ export ERL_LIBS d32 1 a32 1 @@@@ -207,19 +207,19 @@@@ uid() a44 1 - ps ux | grep -v grep | grep -q " $ERLANG_NODE " && { d46 1 a46 1 + ps ux | grep -v grep | grep " $ERLANG_NODE " >/dev/null && { a48 6 } || { - ps ux | grep -v grep | grep -q beam && { + ps ux | grep -v grep | grep beam >/dev/null && { echo "ERROR: The ejabberd node '$ERLANG_NODE' is registered," echo " but no related beam process has been found." echo "Shutdown all other erlang nodes, and call 'epmd -kill'." @ 1.16 log @Update chat/ejabberd to 17.07. Version 17.07 ============= Core - Close accepted socket if sockname/peername has failed. Version 17.06 ============= New features - The new cache system is also a new component that allows fine tuning of ejabberd performance for either small systems or large scale servers. - Certificate Manager is a feature that has been requested by many organisations, allowing administrators to manage their certificate more easily - Riak support for several modules API - Deprecate misc:encode_base64/1 and misc:decode_base64/1 - Rename is_user_exists function to user_exists - Allow api access on both ipv4 and 6 loopback addresses - Fix invalid argument in get_messages_susbset Admin - Refactor ejabberdctl - Improve ejabberdctl parameters parsing - Quote all paths to allow spaces in directory names - update-deps-releases.pl: Show operations to perform before asking to apply them - Fix Salt import from prosody SCRAMmed password Configuration - Validate module options on start_module/2 - Validate new options before module reloading - Validate second-level options - Introduce iqdisc global option - stream_management listen option deprecated, use mod_stream_mgmt - Check presence of some files during option validation - Speedup configuration options lookup - Validate all certfiles on startup - Only validate certfiles if public_key:short_name_hash/1 is available - Introduce Certficate Manager Commands - Add clear_cache admin command - Parse correctly presence_broadcast option in change_room_option command - Describe command arguments and results in mod_muc_admin - Improve export2sql explanation; remove obsolete and duplicated command - Fix and document push_roster_all command - Fix mod_muc_admin command set_room_affiliation - Fix invalid {args,result}_examples in mod_muc_admin - Fix srg_user_add/del for non-Mnesia database backends - Make ext_mod api return rescode Compilation - Erlang 17.5 or higher is required - Add --enable-system-deps configure option - Add --enable-stun and --enable-sip configure options Core - Speedup Mnesia tables initialization - Improve Mnesia tables creation and transformation - Improve ejabberd_c2s:close() - ejabberd_c2s: Don’t close session on stream resume - Speedup loading of translation files - Fix ejabberd_router:is_my_route/1 - Don’t let a receiver crash if a controller is unavailable - Fix OTP-17.5 support - websocket: Catch exception that may happen when sending data over websocket Databases - New sql_connect_timeout option - New sql_query_timeout option - Get rid of sql_queries.erl - Use round-robin algorithm when selecting worker from DB pool - Add Riak as BOSH RAM backend - Add Riak as mod_proxy65 RAM backend - Add Riak as mod_carboncopy RAM backend - Add Riak as router RAM backend - Add Riak as session manager RAM backend - Fix cleaning of Riak route table - Add pubsub import from prosody/metronome - Fix username in mam export - Fix Salt import from prosody SCRAMmed password - In offline export to SQL, first write all DELETE, later all INSERT Cache - Implement cache for mod_announce - Implement cache for mod_private - Implement cache for mod_privacy/mod_blocking - Implement cache for mod_last - Implement cache for mod_vcard and mod_vcard_xupdate - Implement cache for roster - Add cache options to the validator - Use cache for authentication backends - Use new cache API in mod_shared_roster_ldap - Use new cache API in ejabberd_oauth - Use new cache API in mod_mam - Use new cache API in mod_caps - Use cache in front of Redis/SQL RAM backends Modules - mod_http_upload: Add support for HTTP File Upload 0.3.0 - mod_mam: Added export function - mod_metrics: Don’t leak with UDP sockets - mod_metrics: New options ip and port - mod_muc: Allow a room admin to un/subscribe another JID - mod_offline: Don’t store messages via a single process - mod_offline: Make sure only jabber:x:event tag is present in offline event - mod_register: New option ‘access_remove’ ACL - mod_stream_mgmt: Preserve stanza count on timeout - mod_vcard_ldap: Parse ldap_uids like in eldap_utils - mod_client_state: Reset state on session resume - mod_metrics: Fix IP address parsing - mod_pubsub: Avoid useless calls on simples subscriptions - mod_block_strangers: Add allow_local_users option Elixir - Update elixir to v1.4.4 @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.15 2016/04/29 19:05:22 fhajny Exp $ d5 2 a6 1 and AIX where Erlang relies on $HOME set correctly. d10 1 a10 1 --- ejabberdctl.template.orig 2017-06-30 12:24:35.000000000 +0000 d12 1 a12 10 @@@@ -21,7 +21,7 @@@@ if [ -n "$INSTALLUSER" ] ; then if [ $(id -g) -eq $(id -g $INSTALLUSER || echo -1) ] ; then EXEC_CMD="as_current_user" else - id -Gn | grep -q wheel && EXEC_CMD="as_install_user" + id -Gn | grep 'wheel\|root' >/dev/null && EXEC_CMD="as_install_user" fi else EXEC_CMD="as_current_user" @@@@ -49,8 +49,8 @@@@ done d23 1 a23 1 @@@@ -103,7 +103,7 @@@@ export ERL_LIBS d27 2 a28 2 - as_install_user) su -c '"$0" $@@"' "$INSTALLUSER" -- "$@@" ;; + as_install_user) su - -c '"$0" $@@"' "$INSTALLUSER" -- "$@@" ;; d32 1 a32 1 @@@@ -202,19 +202,19 @@@@ uid() @ 1.15 log @Update chat/ejabberd to 16.04. API Commands - Add API versionning - Changed error handling, based on exception - ejabberd Command bugfixes - Accept commands: add_commands syntax (along commands: – add_commands) - Fix mod_muc_admin:get_room_options and set_room_affiliation - mod_http_api: support 'open' ejabberd commands Databases - Split modules DB specific code into separate modules - Rename "odbc" to "sql" everywhere - Rename "internal" auth to "mnesia" - Improve detection of databases supported by modules - Switch to varchar(64) in mysql user.server/salt as text can't have default values - 'serverkey' and 'salt' should have empty string as default XMPP - Drop headline messages sent to offline resources - Don't omit bounces for messages of type "result" - Match namespace when checking for chat states - Fix check for standalone chat state notifications - Disable TLS compression for s2s by default - Make sure that ejabberd_sm sid are unique - Send stream trailer at the very end of the processing - Generate shorted jid for anonymous connections - Fix anonymous SASL auth ejabberdctl - Add option to migration script to delete data from a table after they have been successfully moved to SQL database: ejabberdctl delete_mnesia example.org - Remove useless variable and quote EPMD and SPOOL_DIR - Fix node ping command - Use UUID for ctl node name - Remove --auth in ejabberd_ctl.erl as it's useless, still useful for mod_rest - Force ERL_PATH for Elixir console Pubsub - Fix use of pubsub node plugin when configured with default_node_config - Set default value for pubsub#itemreply option - Add subscribe/unsubscribe hooks Internal - Add mod_mam header file - Replace ?ERR_* macros with ?ERRT_* - change mod_ping Timers using maps instead of dict Dependencies - Update p1_utils to 1.0.4: Adds p1_time_compat:unique_timestamp() - Update fast_tls to 1.0.3: Prevent buffer overflows and allocation failures - Update stringprep to 1.0.3: Fix compilation on Windows and error message - Update stun to 1.0.3: Use fast_tls 1.0.3 - Update esip to 1.0.4: Use fast_tls 1.0.3 @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.14 2016/04/25 20:24:14 fhajny Exp $ d6 2 d9 1 a9 1 --- ejabberdctl.template.orig 2016-04-28 13:57:55.000000000 +0000 d11 53 a63 31 @@@@ -27,7 +27,7 @@@@ if [ "$INSTALLUSER" != "" ] ; then mkdir -p "$INSTALLUSER_HOME" chown "$INSTALLUSER" "$INSTALLUSER_HOME" fi - EXEC_CMD="su $INSTALLUSER -c" + EXEC_CMD="su - $INSTALLUSER -c" fi done if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then @@@@ -73,10 +73,10 @@@@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml fi if [ "$LOGS_DIR" = "" ] ; then - LOGS_DIR={{localstatedir}}/log/ejabberd + LOGS_DIR=@@EJABBERD_LOGDIR@@ fi if [ "$SPOOL_DIR" = "" ] ; then - SPOOL_DIR={{localstatedir}}/lib/ejabberd + SPOOL_DIR=@@EJABBERD_DB@@ fi if [ "$EJABBERD_DOC_PATH" = "" ] ; then EJABBERD_DOC_PATH={{docdir}} @@@@ -85,7 +85,7 @@@@ if [ "$ERLANG_NODE_ARG" != "" ] ; then ERLANG_NODE=$ERLANG_NODE_ARG fi if [ "{{release}}" != "true" -a "$EJABBERD_BIN_PATH" = "" ] ; then - EJABBERD_BIN_PATH={{libdir}}/ejabberd/priv/bin + EJABBERD_BIN_PATH={{libdir}}/erlang/lib/ejabberd/priv/bin fi EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log DATETIME=`date "+%Y%m%d-%H%M%S"` @ 1.14 log @Update chat/ejabberd to 16.03. 16.03 ===== Protocols - mod_mix: Experimental support for MIX (XEP-0369) - mod_http_upload: Add support for XEP-0363 v0.2 Core - Use SASL PLAIN authzid as client identity if auth module permits it - Make auto generated resources shorter - Start ezlib only if required, as it's optional - Make it possible to get virtual host of a registered route LDAP improvements - Fix issue getting shared roster - Do not call to deprected/undefined functions from mod_shared_roster_ldap - Proper naming for LDAP test function for shared roster SQL databases support - New parse transform for SQL queries, use prepare/execute calls with Postgres - Support for run-time SQL queries selection depending on DBMS version - In SQL files create Users table with SCRAM support by default - Do not auto append IP suffix to usernames - Fix some LIMIT related problems with MSSQL - Update Microsoft SQL Server schema Riak - Add support for Riak authentication - Fix is_connected/0 function - Keep alive Riak connections by default API and Commands - Add support for ReST admin commands that are only restricted by source IP. This is key for easy integration with other backend using ReST API. - Fix add_commands and remove_commands options - Pass noauth when auth isn't provided - Improve ban_account command to work with other DBs than Mnesia - Escape quoting node name for ejabberdctl ping - Bare JID in 'from' of Roster Push (RFC 6121 section 2.1.6) in mod_admin_extra - Fix result type of "connected_users_info" command - New command delete_mnesia deletes all tables that can be exported. This is useful after you have migrated to another backend, like SQL. PubSub - Unregister route at the very end - Define PubSub node configuration per route/host explicitly - Fix config fetch and pubsub disco after host/serverhost cleanup Admin and build chain - Update OTP release to use R17.5 and drop release 17.1 - Compile ejabberd_config early to stop undefined behaviour warnings - Fix start via systemd - Fixed type specifications for 'rebar doc' - Specify lacking nodename in ejabberdctl Dependencies - Update p1_pgsql to 1.1.0: This add support for prepared statements. - Uptate fast_yaml to 1.0.3: This improves the error reporting on syntax errors in Yaml configuration file. - Use the v0.2 release of luerl instead of a commit. Test framework - Add Coveralls support - Add ability to run the ejabberd test suite in a modular way. You can now run the test suite, even if you only have a a single backend locally. Other - mod_mam: Don't store watchdog notifications in MAM archives - mod_multicast: Fix Addresses element which lacked others local destinations - mod_offline: Mark get_queue_length obsolete, and use count_offline_messages - Update Gallician translation 16.02 ===== New XMPP Extensions support - New Flexible Offline Message Retrieval (XEP-0013) support Admin - New migration script from Prosody to ejabberd - Fix --disable-debug compilation flag - don't escape ERL_OPTIONS - Two new global timeouts configurable: c2s_hibernate, receiver_hibernate - Make it possible to define sm_db_type per virtual host - configuration checker: Describe option type in code for domain_balancing option - Log failed SQL requests - Include mod_muc.hrl and fix records - mod_http_upload: Expand docroot before using it, also expand @@HOST@@ Commands - New import_prosody command - Start documenting arguments in mod_admin_extra commands - We added a way to get all ejabberd_commands, not only those that was registered - Allow to pass \n in argument to ejabberdctl - Add error handling to send_stanza command - Fix format_result so get_room_options command works again after commit reference aa5caa3 Dependencies - lager is the default (and only) logging module and we removed p1_logger - Handle spaces in vsn attribute of app file when installing deps - Renamed dependencies and modules for consistency but also to reflect huge performance gains: . p1_iconv -> iconv . p1_stringprep -> stringprep . p1_stun -> stun . p1_tls -> fast_tls . p1_yaml -> fast_yaml . p1_zlib -> ezlib Message Archive Management - Advertise MUC MAM v0.4.1 in room JID's disco#info - Add "delete_old_mam_messages" admin command - Add 'from' attribute to tag - Add "request_activates_archiving" option - Respond to form requests - Support XEP-0313 v0.2 MUC archive queries - Check whether MUC message is desired - Reject -based paging - Limit result set page size - Sort messages returned by Mnesia - Strip existing JID tags from MUC messages - Expose MUC occupant JID in more cases - Don't let outcasts access MUC archive - Send new preferences when they are set - Stream management (XEP-0198): Let MAM take care of pending messages GroupChat - Send presence with code 170 in initial presence from MUC - Add most status codes only to initial MUC presence - mod_muc_room: Don't expose JIDs in anonymous rooms - mod_muc_room: Let members see admin/owner JIDs PubSub - Fix presence-based delivery - Make caps warning less confusing - Fix host/serverhost usage - Add support of pubsub#itemreply=publisher Other - Accept stream compression request after SASL - Make C2S session establishment optional to better conform to XMPP specifications and still be friendly with older clients. - MUC: new regexp_room_id option to limit possible room names. - ODBC: Set utf8mb4 charset on MySQL connection to support emoji storage as default. - LDAP: Improve LDAP shared roster support. - mod_register_web: Allow setting host when deleting account or changing password. - Rename timestamp_to_iso functions in jlib. - Stream management (XEP-0198): Fix session timeout corner case. - Several improvements in Elixir support. - Updated many translations. - Improve web admin stylesheet to fix rendering issues in some browsers. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.13 2016/01/16 19:28:02 fhajny Exp $ a3 1 - Make it work with NetBSD's flock(1). d7 1 a7 1 --- ejabberdctl.template.orig 2016-03-30 14:08:04.000000000 +0000 d31 2 a32 1 @@@@ -87,7 +87,7 @@@@ if [ "$ERLANG_NODE_ARG" != "" ] ; then d34 6 a39 25 if [ "{{release}}" != "true" ] ; then if [ "$EJABBERDDIR" = "" ] ; then - EJABBERDDIR={{libdir}}/ejabberd + EJABBERDDIR={{libdir}}/erlang/lib/ejabberd fi if [ "$EJABBERD_PRIV_PATH" = "" ] ; then EJABBERD_PRIV_PATH=$EJABBERDDIR/priv @@@@ -371,7 +371,7 @@@@ ctl() # using flock if available. Expects a linux-style # flock that can lock a file descriptor. MAXCONNID=100 - CONNLOCKDIR={{localstatedir}}/lock/ejabberdctl + CONNLOCKDIR=@@EJABBERD_PIDDIR@@ FLOCK=/usr/bin/flock if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then JOT=/usr/bin/jot @@@@ -398,7 +398,7 @@@@ ctl() CTL_LOCKFILE="$CONNLOCKDIR/$CTL_CONN" ( exec 8>"$CTL_LOCKFILE" - if flock --nb 8; then + if flock -x -n 8; then ctlexec $CTL_CONN "$@@" ssresult=$? # segregate from possible flock exit(1) @ 1.13 log @Update chat/ejabberd to 16.01 Security - Improve Dialback Key Generation and Validation support (XEP-0185) - More generally, improve random number generator to avoid timing / guessing attacks on any random value. Database - Use BLOB instead of TEXT on mysql in stanza storage - Use UTF8MB4 character set in MySQL tables - Make Riak working on Erlang R18 MAM - Use stanza-id tags for deduplication - Advertise MAM in disco info for account/room JID - Improve MUC support - Don't store resent messages - Do not forget to include xmlns in mam prefs response (#859) - Honor Message Processing Hints (XEP-0334) MUC - Add support for muc#roomconfig_presencebroadcast option - Only filter rooms in Service Disco when more than 100 (EJAB-343) - List in Service Disco non-empty rooms and provide Node for empty (EJAB-343) - When user joins logged room, he must be warned (EJAB-726) Pubsub - Fix pubsub virtual nodetree plugin - Use correct notification_type for last items (#827) - PubSub plugin for online users only - Disable use of multi-subscribe and subscription-option on standard plugins - Limit number of subscriptions per node and allow custom default node configuration - Don't force max_items_node to MAXITEMS if not defined - Don't read pubsub options when plugin does not use them Elixir - Upgrade Elixir to v1.1.0 Admin - Add plugin for passing extra erl_opts flags to deps, and use it for hipe - Add --enable-latest-deps to configure - Remove "--enable-nif" flag - New send_stanza command - ejabberdctl: new --no-timout flag - ejabberdctl: Don't let "reopen_log" rotate files (EJAB-1243) - ejabberdctl: Improve escaping of arguments passed to ejabberdctl - OpenSSL minimum required version: raised from 0.9.8 to 1.0.0 Config - New option accept_interval in ejabberd_listener - Webadmin console visual refresh (EJAB-1142) - If mod_register access_from is 'none', then don't advertise IBR (#857) - Fix handling of some options in old style configs - Fix parsing option trusted_proxies - Fix ipv6 configuration processing (#803) - ejabberd_service: simplify configuration: no need for 'hosts', just provide 'password' Cleanup and optimisations - Faster string_to_jid/1 implementation - Move JID related functions from jlib.erl to jid.erl (#847) - Remove usage of erlang's now() - Update dependency name from p1_cache_tab to cache_tab - Use crypto:rand_uniform instead of random:uniform - Fix randoms.erl on R17 that don't have random:seed(integer()) - Faster and more memory efficient XML parsing. - Faster stringprep library. Other changes - ejabberd_http: Cope with large POST/PUT requests - ejabberd_http: Log debug message on receive errors - mod_offline: Discard chat states notifications - mod_offline: Honor store hint - mod_http_upload: various fixes - XEP-0198: Fix stanza counting corner case issue - Adding WEBIRC, custom realname & ident, ISO-8859-15 - Update hebrew translation @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.12 2015/11/05 12:23:50 fhajny Exp $ d5 2 d8 1 a8 1 --- ejabberdctl.template.orig 2016-01-12 11:07:58.000000000 +0000 d10 9 d41 1 a41 1 @@@@ -351,7 +351,7 @@@@ ctl() d50 1 a50 1 @@@@ -378,7 +378,7 @@@@ ctl() @ 1.12 log @Update ejabberd to 15.10. Switch dependencies to use standalone packages for Erlang modules. Core - c2s: Let stop/1 close XEP-0198 sessions - c2s: Close socket when waiting for resume - s2s: Don't crash on certificates without extensions - xml: Optimizations in memory allocator - OAuth: Fix cyrsasl_oauth:mech_new call Modules - mod_http_upload: New HTTP File Upload module (XEP-0363) - mod_http_upload_quota: New module to support user quotas - mod_metrics: New simple metrics module for use with grapherl - mod_mam: Advertise XEP-0313 v0.4 support in room disco - mod_mam: Avoid MAM dups when routing to multiple resources Compilation - Make: Pass {C,CPP,LD}FLAGS used in main ./configure to deps - Use OTP directory structure for `make install` - mix.lock should be commited to ensure consistent builds - Code cosmetic cleanup Commands - Let modules_update_specs report failures - Fix problem with -auth - Fix unauthenticated calls to commands with policy=user - Improve access_commands option backward compatibility Configuration - ejabberdctl.cfg: New CONTRIB_MODULES_CONF_DIR - Be able to merge old style configs with {listen,...} - Fix support for macros - mod_ping: New option ping_ack_timeout @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.11 2015/06/29 21:44:10 fhajny Exp $ d6 1 a6 1 --- ejabberdctl.template.orig 2015-10-28 14:53:12.000000000 +0000 d8 1 a8 1 @@@@ -72,10 +72,10 @@@@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th d21 1 a21 1 @@@@ -86,7 +86,7 @@@@ if [ "$ERLANG_NODE_ARG" != "" ] ; then d30 1 a30 1 @@@@ -325,7 +325,7 @@@@ ctl() d39 1 a39 1 @@@@ -352,7 +352,7 @@@@ ctl() d45 1 a45 1 ctlexec $CTL_CONN $COMMAND @ 1.11 log @Update chat/ejabberd to 15.06. Message archiving - Add support for message archiving in Mnesia or relational databases. Protocol - Document protocol support and version inside each module and use that info in documentation - Remove deprecated XEP-0090 Entity Time and XEP-0091 Delayed Delivery - Don't add body element to MUC subject messages - Do not bounce normal messages sent to unavailable resource Admin command-line tool - Fixed several ejabberd commands - Allow password with ';' passed in ejabberdctl - Improve ejabberdctl external module install code, allows better error checking - New ping ejabberdctl command to check if the node is up and running - New commands for Multi-User chat management: get_room_options and get_user_rooms Configuration - Add config validation at startup - Fix include of non yaml config files - New option hide_sensitive_log_data to hide client IP address in log - New option net_ticktime, to fine tune Erlang cluster networking - New option max_users_presence in mod_muc, to avoid broadcasting presence packet from users after a chat room has reached a given size Elixir - Add correct package version for mix Security - New options to configure your own custom Diffie-Helman parameters: dhfile and s2s_dhfile PubSub - Enforce definition of pubsub node max_items - Fix pubsub/odbc crash on remote user unsubscribe - Fix use of publish_only affiliation with odbc backend Multicast - Pick first local multicast service, otherwise remote Databases - Fix anonymous user login, it wasn't stored in anonymous mnesia table - Fixed some string/binary issues in ejabberd_odbc - PostgreSQL storage: added missing sm (session manager) table Packaging - Microsoft Windows 64 bits installer - Provide RPM and DEB binary packages for linux 64 bits. Clean up - Remove obsolete doc and win32 files @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.10 2015/01/02 09:14:16 fhajny Exp $ d6 1 a6 1 --- ejabberdctl.template.orig 2015-06-24 09:58:37.000000000 +0000 d8 1 a8 1 @@@@ -71,10 +71,10 @@@@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th d21 1 a21 1 @@@@ -85,7 +85,7 @@@@ if [ "$ERLANG_NODE_ARG" != "" ] ; then d26 1 a26 1 + EJABBERDDIR={{libdir}}/erlang/lib/@@DISTNAME@@ d28 3 a30 3 if [ "$EJABBERD_EBIN_PATH" = "" ] ; then EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin @@@@ -335,7 +335,7 @@@@ ctl() d39 1 a39 1 @@@@ -362,7 +362,7 @@@@ ctl() @ 1.10 log @Update ejabberd to 14.12. ejabberd Community 14.12 includes many bugfixes, and a few new features: - New module mod_client_state implements XEP-0352: Client State Indication - New module mod_fail2ban to ban IPs that show malicious signs - New option store_empty_body in mod_offline - New option disable_sasl_mechanisms - Improve option resend_on_timeout to support if_offline - More robust offline server - Better charset support in XMLRPC - Some PEP issues fixed @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.9 2014/08/21 19:32:27 tron Exp $ d6 3 a8 3 --- ejabberdctl.template.orig 2014-07-22 16:42:49.000000000 +0100 +++ ejabberdctl.template 2014-08-21 20:17:35.000000000 +0100 @@@@ -67,10 +67,10 @@@@ d21 1 a21 1 @@@@ -81,7 +81,7 @@@@ d30 1 a30 1 @@@@ -281,7 +281,7 @@@@ d36 1 a36 1 FLOCK='/usr/bin/flock' d38 2 a39 2 JOT='/usr/bin/jot' @@@@ -308,7 +308,7 @@@@ @ 1.9 log @Use a complete set of command line options for executing "flock" to make "ejabberctl" work with NetBSD 7.0's flock(1) as well. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.8 2014/07/30 09:45:38 fhajny Exp $ a7 9 @@@@ -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 @ 1.8 log @Update ejabberd to 14.07. * SIP - SIP Outbound (RFC 5626) support - New option always_record_route - New options record_route and routes * Carbon Copy (XEP-0280) - Don't log MUC messages with hint - Don't carbon copy messages with hint - Let is_carbon_copy/1 recognize carbons - Don't send XEP-0280 v1 copies back to sender * Stream Management (XEP-0198) - XEP-0198: Terminate session if stanza queue becomes too large - XEP-0198: Don't exit on socket send failure - XEP-0198: Don't drop session on failed resume - XEP-0198: Check whether routed packets are stanzas * Riak - Riak support * Install and config - New options log_rotate_count, log_rotate_size and log_rate_limit - html guide is now generated when building source tarball - Use p1_utils, and move treap.erl to p1_utils - Get rid of p1_mnesia file - old release notes are not installed anymore - Don't "forget" listener options - Always enable STUN at compile time - Do not check for Erlang apps at configure time - Add --enable-riak configure flag * Tests - Add tests for stream management - Add tests for mod_carboncopy - Add tests for mod_caps - Improve MUC test cases - Travis CI: Enable Riak tests - Add Riak backend to the testing suit - The test suite no longer fails without --enable-transient_supervisors. * MUC - MUC messages with ~ were not logged (EJAB-1696). @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.7 2013/10/11 13:32:25 fhajny Exp $ d3 6 a8 4 Default locations. --- ejabberdctl.template.orig 2014-07-22 15:42:49.000000000 +0000 +++ ejabberdctl.template @@@@ -22,7 +22,7 @@@@ if [ "$INSTALLUSER" != "" ] ; then d17 1 a17 1 @@@@ -67,10 +67,10 @@@@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th d30 1 a30 1 @@@@ -81,7 +81,7 @@@@ if [ "$ERLANG_NODE_ARG" != "" ] ; then d39 1 a39 1 @@@@ -281,7 +281,7 @@@@ ctl() d48 9 @ 1.7 log @Update ejabberd to 13.10. Major changes since 2.1.13: * Huge improvements regarding performances * Optimized memory consumption * Clean code representation of xmlel records Release notes (yet?) unavailable, changelog points at bug tracker: https://support.process-one.net/secure/IssueNavigator.jspa?reset=true&jqlQuery=project+%3D+EJAB+AND+fixVersion+%3D+%22ejabberd+13.10%22 @ text @d1 1 a1 1 $NetBSD$ d4 1 a4 1 --- ejabberdctl.template.orig 2013-09-27 09:19:22.000000000 +0000 d6 1 a6 1 @@@@ -23,7 +23,7 @@@@ if [ "$INSTALLUSER" != "" ] ; then d15 2 a16 2 @@@@ -68,10 +68,10 @@@@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th EJABBERD_CONFIG_PATH=$ETCDIR/ejabberd.yml d22 3 a24 3 if [ "$SPOOLDIR" = "" ] ; then - SPOOLDIR={{localstatedir}}/lib/ejabberd + SPOOLDIR=@@EJABBERD_DB@@ d28 1 a28 1 @@@@ -82,7 +82,7 @@@@ if [ "$ERLANG_NODE_ARG" != "" ] ; then d37 1 a37 1 @@@@ -261,7 +261,7 @@@@ ctl() @ 1.6 log @Updated chat/ejabberd to 2.1.5. Short list of changes: * Erlang/OTP R12 support fixed * Erlang/OTP R14A support added * OpenSSL 0.9.8 or higher is required * BOSH: New optional connection attribute process-delay * C2S: Don't ask for client certificate when using tls * C2S: Inform client that SSL session caching is disabled * CTL: Fix problem when FIREWALL_WINDOW options for erl kernel were used * CTL: Some systems delete the lock dir; in such case don't use Flock at all * Caps: Support all the hash functions required by XEP-0115 * Config: Fix typo in --enable-transient_supervisors * Config: New configure option: --enable-nif * Extauth: Support parallel script running * MUC: Allow admins to see private rooms in disco * ODBC: Correct handling of SQL boolean types * ODBC: Discard too old queued requests (the caller has already got a timeout) * ODBC: Fixes wrong SQL escaping when --enable-full-xml is set * ODBC: Use ets insead of asking supervisor in ejabberd_odbc_sup:get_pids/1 * Pubsub: Enforce disco features results * S2S: When logging s2s out connection attempt or success, log if TLS is used * Shared Rosters: When account is deleted, delete also member of stored rosters @ text @d3 14 a16 3 --- src/ejabberdctl.template.orig 2010-08-02 16:33:20.000000000 +0000 +++ src/ejabberdctl.template @@@@ -43,10 +43,10 @@@@ if [ "$EJABBERDCTL_CONFIG_PATH" = "" ] ; a17 1 [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH" d19 1 a19 1 - LOGS_DIR=@@LOCALSTATEDIR@@/log/ejabberd d23 1 a23 1 - SPOOLDIR=@@LOCALSTATEDIR@@/lib/ejabberd d27 2 a28 7 EJABBERD_DOC_PATH=@@DOCDIR@@ @@@@ -86,7 +86,7 @@@@ ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_ # define additional environment variables if [ "$EJABBERDDIR" = "" ]; then - EJABBERDDIR=@@LIBDIR@@/ejabberd + EJABBERDDIR=@@LIBDIR@@/erlang/lib/@@DISTNAME@@ d30 8 a37 3 if [ "$EJABBERD_EBIN_PATH" = "" ]; then EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin @@@@ -237,7 +237,7 @@@@ ctl () d41 1 a41 1 - CONNLOCKDIR=@@LOCALSTATEDIR@@/lock/ejabberdctl d45 1 a45 1 JOT='/usr/bin/jot' @ 1.5 log @Updated chat/ejabberd to 2.1.3. Changes in ejabberd-2.1.3 Client connections * Avoid 'invalid' value in iq record * Avoid resending stream:error stanzas on terminate (EJAB-1180) * Close also legacy sessions that were half connected (EJAB-1165) * iq_query_info/1 now returns 'invalid' if XMLNS is invalid * New ejabberd_c2s option support: max_fsm_queue * Rewrite mnesia counter functions to use dirty_update_counter (EJAB-1177) * Run user_receive_packet also when sending offline messages (EJAB-1193) * Use p1_fsm behaviour in c2s FSM (EJAB-1173) Clustering * Fix cluster race condition in route read * New command to set master Mnesia node * Use mnesia:async_dirty when cleaning table from failed node Documentation * Add quotes in documentation of some erl arguments (EJAB-1191) * Add option access_from (EJAB-1187) * Add option max_fsm_queue (EJAB-1185) * Fix documentation installation, no need for executable permission (EJAB-1170) * Fix typo in EJABBERD_BIN_PATH (EJAB-891) * Fix typos in example config comments (EJAB-1192) ejabberdctl * Support concurrent connections with bound connection names * Add support for Jot in ctl and TTY in debug * Support help command names with old - characters * Fix to really use the variable ERL_PROCESSES Erlang compatibility * Don't call queue:filter/2 to keep compatibility with older Erlang versions * Use alternative of file:read_line/1 to not require R13B02 HTTP * Add new debugging hook to the http receiving process * Allow a request_handler to serve a file in root of HTTP HTTP-Bind (BOSH) * Cross-domain HTTP-Bind support (EJAB-1168) * Hibernate http-bind process after handling a request * Reduce verbosity of HTTP Binding log messages LDAP * Document ldap_dn_filter, fetch only needed attributes in search (EJAB-1204) * Use "%u" pattern as default for ldap_uids (EJAB-1203) Localization * Fix German translation (EJAB-1195) * Fix Russian translation ODBC * Fix MSSQL support, which was broken (EJAB-1201) * Improved SQL reconnect behaviour Pubsub, PEP and Caps * Add extended stanza addressing 'replyto' on PEP (EJAB-1198) * Add pubsub#purge_offline (EJAB-1186) * Fix pubsub#title option (EJAB-1190) * Fix remove_user for node subscriptions (EJAB-1172) * Optimizations in mod_caps Other * mod_register: Add new acl access_from, default is to deny * mod_sic: new module for the experimental XEP-0279 Server IP Check (EJAB-1205) * PIEFXIS: Catch errors when exporting to PIEFXIS file (EJAB-1178) * Proxy65: new option "hostname" (EJAB-838) * Roster: Fix resending authorization problem * Shared Roster Groups: get contacts nickname from vcard (EJAB-114) * S2S: Improved s2s connections clean up (EJAB-1202) Changes in ejabberd-2.1.2 Core * Close sessions that were half connected * Fix SASL PLAIN authentication message for RFC4616 compliance * Fix support for old Erlang/OTP R10 and R11 * Return proper error (not 'conflict') when register is forbidden by ACL * When ejabberd stops, send stream close to clients ejabberdctl * Check for EGID in ejabberdctl command * Command to stop ejabberd informing users, with grace period * If there's a problem in config file, display config lines and stop node MUC * Kick occupants with reason when room is stopped due to MUC shutdown * Write in room log when a room is created, destroyed, started, stopped PubSub and PEP * Don't call gen_server on internal event (improves performance and scalability) * Fix duplicate SHIM header in Pubsub message * Notification messages of Pubsub node config change contained a SHIM header * SubID SHIM header missing in Pubsub message with multiple subscriptions on the same node * PEP: last published item not sent from unavailable users when the subscription is implicit (XEP-0115) * pep_mapping not working due to Node type mismatch WebAdmin * If big offline message queue, show only subset on WebAdmin * Support in user list page of WebAdmin when mod_offline is disabled @ text @d3 1 a3 1 --- src/ejabberdctl.template.orig 2010-03-12 10:40:41.000000000 +0000 d27 1 a27 1 @@@@ -234,7 +234,7 @@@@ ctl () d34 1 a34 1 if [ ! -x "$FLOCK" ] ; then @ 1.4 log @Update ejabberd to 2.1.0. Very brief list of additions: * Erlang/OTP R13 support * HTTP-Bind (BOSH) optimization and clean-up * LDAPS support * MUC rooms can require a CAPTCHA to join the room * PubSub: major improvements. Update to XEP version 1.12 * PEP and Caps: many improvements * Run commands with ejabberdctl or other frontends (XML-RPC, HTTP) * STUN server * XEPs like: XMPP Ping, Roster Versioning, Import/Export Format See full release note: http://www.process-one.net/en/ejabberd/release_notes/release_note_ejabberd_2.1.0 @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.3 2008/11/12 13:13:59 martti Exp $ d3 1 a3 1 --- src/ejabberdctl.template.orig 2009-11-16 20:25:51.344260518 +0000 d18 1 a18 1 @@@@ -83,7 +83,7 @@@@ ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_ d27 9 @ 1.4.2.1 log @Pullup ticket #3054 - requested by martti ejabberd: security update Revisions pulled up: - chat/ejabberd/Makefile 1.17-1.19 - chat/ejabberd/PLIST 1.11 - chat/ejabberd/distinfo 1.11-1.12 - chat/ejabberd/patches/patch-aa 1.6-1.7 - chat/ejabberd/patches/patch-ad 1.5 - chat/ejabberd/patches/patch-ae 1.5 --- Module Name: pkgsrc Committed By: dmcmahill Date: Mon Mar 8 17:30:23 UTC 2010 Modified Files: pkgsrc/chat/ejabberd: Makefile pkgsrc/chat/ejabberd/patches: patch-aa Log Message: use BSD_INSTALL_SCRIPT instead of BSD_INSTALL_DATA for a shell script --- Module Name: pkgsrc Committed By: spz Date: Thu Mar 11 06:33:04 UTC 2010 Modified Files: pkgsrc/chat/ejabberd: distinfo Log Message: updated patch -> distinfo needs an update too --- odule Name: pkgsrc Committed By: fhajny Date: Sat Mar 13 21:05:49 UTC 2010 Modified Files: pkgsrc/chat/ejabberd: Makefile PLIST distinfo pkgsrc/chat/ejabberd/patches: patch-aa patch-ad patch-ae Log Message: Updated chat/ejabberd to 2.1.3. Changes in ejabberd-2.1.3 Client connections * Avoid 'invalid' value in iq record * Avoid resending stream:error stanzas on terminate (EJAB-1180) * Close also legacy sessions that were half connected (EJAB-1165) * iq_query_info/1 now returns 'invalid' if XMLNS is invalid * New ejabberd_c2s option support: max_fsm_queue * Rewrite mnesia counter functions to use dirty_update_counter (EJAB-1177) * Run user_receive_packet also when sending offline messages (EJAB-1193) * Use p1_fsm behaviour in c2s FSM (EJAB-1173) Clustering * Fix cluster race condition in route read * New command to set master Mnesia node * Use mnesia:async_dirty when cleaning table from failed node Documentation * Add quotes in documentation of some erl arguments (EJAB-1191) * Add option access_from (EJAB-1187) * Add option max_fsm_queue (EJAB-1185) * Fix documentation installation, no need for executable permission (EJAB-1170) * Fix typo in EJABBERD_BIN_PATH (EJAB-891) * Fix typos in example config comments (EJAB-1192) ejabberdctl * Support concurrent connections with bound connection names * Add support for Jot in ctl and TTY in debug * Support help command names with old - characters * Fix to really use the variable ERL_PROCESSES Erlang compatibility * Don't call queue:filter/2 to keep compatibility with older Erlang versions * Use alternative of file:read_line/1 to not require R13B02 HTTP * Add new debugging hook to the http receiving process * Allow a request_handler to serve a file in root of HTTP HTTP-Bind (BOSH) * Cross-domain HTTP-Bind support (EJAB-1168) * Hibernate http-bind process after handling a request * Reduce verbosity of HTTP Binding log messages LDAP * Document ldap_dn_filter, fetch only needed attributes in search (EJAB-1204) * Use "%u" pattern as default for ldap_uids (EJAB-1203) Localization * Fix German translation (EJAB-1195) * Fix Russian translation ODBC * Fix MSSQL support, which was broken (EJAB-1201) * Improved SQL reconnect behaviour Pubsub, PEP and Caps * Add extended stanza addressing 'replyto' on PEP (EJAB-1198) * Add pubsub#purge_offline (EJAB-1186) * Fix pubsub#title option (EJAB-1190) * Fix remove_user for node subscriptions (EJAB-1172) * Optimizations in mod_caps Other * mod_register: Add new acl access_from, default is to deny * mod_sic: new module for the experimental XEP-0279 Server IP Check (EJAB-1205) * PIEFXIS: Catch errors when exporting to PIEFXIS file (EJAB-1178) * Proxy65: new option "hostname" (EJAB-838) * Roster: Fix resending authorization problem * Shared Roster Groups: get contacts nickname from vcard (EJAB-114) * S2S: Improved s2s connections clean up (EJAB-1202) Changes in ejabberd-2.1.2 Core * Close sessions that were half connected * Fix SASL PLAIN authentication message for RFC4616 compliance * Fix support for old Erlang/OTP R10 and R11 * Return proper error (not 'conflict') when register is forbidden by ACL * When ejabberd stops, send stream close to clients ejabberdctl * Check for EGID in ejabberdctl command * Command to stop ejabberd informing users, with grace period * If there's a problem in config file, display config lines and stop node MUC * Kick occupants with reason when room is stopped due to MUC shutdown * Write in room log when a room is created, destroyed, started, stopped PubSub and PEP * Don't call gen_server on internal event (improves performance and scalability) * Fix duplicate SHIM header in Pubsub message * Notification messages of Pubsub node config change contained a SHIM header * SubID SHIM header missing in Pubsub message with multiple subscriptions on the same node * PEP: last published item not sent from unavailable users when the subscription is implicit (XEP-0115) * pep_mapping not working due to Node type mismatch WebAdmin * If big offline message queue, show only subset on WebAdmin * Support in user list page of WebAdmin when mod_offline is disabled --- Module Name: pkgsrc Committed By: martti Date: Mon Mar 15 06:27:55 UTC 2010 Modified Files: pkgsrc/chat/ejabberd: Makefile Log Message: Reset MAINTAINER. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- src/ejabberdctl.template.orig 2010-03-12 10:40:41.000000000 +0000 d18 1 a18 1 @@@@ -86,7 +86,7 @@@@ ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_ a26 9 @@@@ -234,7 +234,7 @@@@ ctl () # using flock if available. Expects a linux-style # flock that can lock a file descriptor. MAXCONNID=100 - CONNLOCKDIR=@@LOCALSTATEDIR@@/lock/ejabberdctl + CONNLOCKDIR=@@EJABBERD_PIDDIR@@ FLOCK='/usr/bin/flock' if [ ! -x "$FLOCK" ] ; then JOT='/usr/bin/jot' @ 1.3 log @Updated chat/ejabberd to 2.0.2 (patch received from Fabrice Colliot) * Bug fixes * Patch #389 (https://support.process-one.net/browse/EJAB-389) applied instead of the old pkgsrc patch. You MUST modify your ejabberd.cfg! @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 3 Modified for pkgsrc --- src/ejabberdctl.template.orig 2008-08-27 12:37:52.000000000 +0300 d5 14 a18 13 @@@@ -14,8 +14,8 @@@@ ERLANG_NODE=$NODE@@$HOST ERL=@@erl@@ ROOTDIR=@@rootdir@@ EJABBERD_CONFIG_PATH=$ROOTDIR/etc/ejabberd/ejabberd.cfg -LOGS_DIR=$ROOTDIR/var/log/ejabberd/ -EJABBERD_DB=$ROOTDIR/var/lib/ejabberd/db/$NODE +LOGS_DIR=@@EJABBERD_LOGDIR@@ +EJABBERD_DB=@@EJABBERD_VARDIR@@/spool/ejabberd/db/$NODE # read custom configuration CONFIG=$ROOTDIR/etc/ejabberd/ejabberdctl.cfg @@@@ -43,16 +43,16 @@@@ NAME=-name ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES" d21 6 a26 17 -EJABBERD_EBIN=$ROOTDIR/var/lib/ejabberd/ebin -EJABBERD_MSGS_PATH=$ROOTDIR/var/lib/ejabberd/priv/msgs -EJABBERD_SO_PATH=$ROOTDIR/var/lib/ejabberd/priv/lib +EJABBERD_EBIN=$ROOTDIR/lib/erlang/lib/@@DISTNAME@@/ebin +EJABBERD_MSGS_PATH=$ROOTDIR/lib/erlang/lib/@@DISTNAME@@/priv/msgs +EJABBERD_SO_PATH=$ROOTDIR/lib/erlang/lib/@@DISTNAME@@/priv/lib EJABBERD_BIN_PATH=$ROOTDIR/var/lib/ejabberd/priv/bin EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log SASL_LOG_PATH=$LOGS_DIR/sasl.log DATETIME=`date "+%Y%m%d-%H%M%S"` ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump ERL_INETRC=$ROOTDIR/etc/ejabberd/inetrc -HOME=$ROOTDIR/var/lib/ejabberd +HOME=@@EJABBERD_VARDIR@@/spool/ejabberd/db/$NODE # export global variables export EJABBERD_CONFIG_PATH @ 1.2 log @Updated chat/ejabberd to 2.0.0nb1 Fix pkg/38347 (patch provided by Daniel Horecki). @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.1.1.1 2008/03/10 08:58:32 martti Exp $ d3 1 a3 1 Keep things tidy (nothing under /usr/pkg/var) d5 4 a8 4 --- src/ejabberdctl.template.orig 2008-02-22 16:42:12.000000000 +0200 +++ src/ejabberdctl.template 2008-02-22 17:45:01.000000000 +0200 @@@@ -13,8 +13,8 @@@@ ERLANG_NODE=$NODE@@$HOST d18 1 a18 1 @@@@ -42,15 +42,15 @@@@ d28 1 @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d34 1 a34 1 +HOME=@@EJABBERD_VARDIR@@/run/ejabberd @ 1.1.1.1 log @ejabberd is a Free and Open Source distributed fault-tolerant Jabber server. It is writen mostly in Erlang. @ text @@ 1.1.1.1.2.1 log @pullup ticket #2348 - requested by martti update ejabberd fixes problem with startup after reboot Revisions pulled up: - pkgsrc/chat/ejabberd/Makefile 1.3,1.4,1.5 - pkgsrc/chat/ejabberd/MESSAGE 1.2 - pkgsrc/chat/ejabberd/PLIST 1.2 - pkgsrc/chat/ejabberd/distinfo 1.2,1.3 - pkgsrc/chat/ejabberd/patches/patch-aa 1.2 - pkgsrc/chat/ejabberd/patches/patch-ae 1.2 Module Name: pkgsrc Committed By: martti Date: Tue Apr 22 11:31:05 UTC 2008 Modified Files: pkgsrc/chat/ejabberd: Makefile distinfo pkgsrc/chat/ejabberd/patches: patch-ae Log Message: Updated chat/ejabberd to 2.0.0nb1 Fix pkg/38347 (patch provided by Daniel Horecki). ------------------------------------------------------------------------ Module Name: pkgsrc Committed By: martti Date: Thu Apr 24 08:04:13 UTC 2008 Modified Files: pkgsrc/chat/ejabberd: MESSAGE Makefile PLIST distinfo pkgsrc/chat/ejabberd/patches: patch-aa Log Message: Fixed PLIST issues, this should not leave any files or directories behind now. ------------------------------------------------------------------------ Module Name: pkgsrc Committed By: martti Date: Thu Apr 24 08:04:59 UTC 2008 Modified Files: pkgsrc/chat/ejabberd: Makefile Log Message: PKGREVISION++ @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.1.1.1 2008/03/10 08:58:32 martti Exp $ d34 1 a34 1 +HOME=@@EJABBERD_VARDIR@@/spool/ejabberd/db/$NODE @