From c820cb8fafda1055c3b8f4f8a50fb52c8a31beaa Mon Sep 17 00:00:00 2001 From: kirill Date: Thu, 7 May 2026 10:17:00 +0000 Subject: [PATCH] net/ejabberd: update to 26.04 Changes: https://www.process-one.net/blog/ejabberd-26-04/ --- net/ejabberd/Makefile | 14 ++------------ net/ejabberd/distinfo | 14 ++++++-------- net/ejabberd/modules.inc | 4 ++-- net/ejabberd/pkg/PLIST | 3 +-- 4 files changed, 11 insertions(+), 24 deletions(-) diff --git a/net/ejabberd/Makefile b/net/ejabberd/Makefile index f65fa5fc28b..f5572e4b29e 100644 --- a/net/ejabberd/Makefile +++ b/net/ejabberd/Makefile @@ -1,8 +1,6 @@ COMMENT = robust, ubiquitous and massively scalable messaging platform -V = 26.03 -REVISION = 0 -JQUERY_V = 4.0.0 +V = 26.04 BOOTSTRAP_V = 5.3.8 DIST_TUPLE += github processone ejabberd ${V} . @@ -25,7 +23,7 @@ SUBST_VARS += MODERL_MODULE_erlydtl_VERSION # GPLv2+: # eJabberd # MIT: -# bootstrap, erlydtl, p1_oauth2, idna, jose, jquery +# bootstrap, erlydtl, p1_oauth2, idna, jose # Erlang 1.1: # sqlite3 PERMIT_PACKAGE = Yes @@ -35,14 +33,9 @@ WANTLIB += ${COMPILER_LIBCXX} c crypto expat m sqlite3 ssl yaml-0 # dlopen()'ed WANTLIB += jpeg webp png gd -SITES.j = https://code.jquery.com/ -DISTFILES.j = jquery-${JQUERY_V}.min.js - SITES.b = https://github.com/twbs/bootstrap/releases/download/v${BOOTSTRAP_V}/ DISTFILES.b = bootstrap-${BOOTSTRAP_V}-dist.zip -EXTRACT_ONLY= ${ALL_DISTFILES:N*.js} - MODULES = lang/erlang MODERL_USE_REBAR3 = Yes @@ -95,9 +88,6 @@ SUBST_VARS += V # some regression tests require network access or MySQL, redis and so on post-extract: - mkdir -p ${WRKSRC}/priv/mod_invites/static/jquery - cp ${FULLDISTDIR}/${DISTFILES.j} \ - ${WRKSRC}/priv/mod_invites/static/jquery/jquery.min.js mv ${WRKDIR}/bootstrap-${BOOTSTRAP_V}-dist \ ${WRKSRC}/priv/mod_invites/static/bootstrap diff --git a/net/ejabberd/distinfo b/net/ejabberd/distinfo index 659d572eccb..bab01af633b 100644 --- a/net/ejabberd/distinfo +++ b/net/ejabberd/distinfo @@ -7,7 +7,7 @@ SHA256 (hex_modules/eredis-1.7.1.tar) = fCtUxWb+1V/u8zQcp5sBAKY0j9PxYhhLftURjSWM SHA256 (hex_modules/esip-1.0.60.tar) = BgTL1LvI2hWSwAgwz+MGIM5PZlurEZnRSjtF+v0DFE8= SHA256 (hex_modules/ezlib-1.0.16.tar) = tIGVQEA9Hst+rmRf3/FCqNsrR22JMojTm6u5KSIlBAU= SHA256 (hex_modules/fast_tls-1.1.26.tar) = aw1N0jCQN1Zeuqms858CgI9fghWjkQGh2jPCpbG1mz8= -SHA256 (hex_modules/fast_xml-1.1.58.tar) = o21uA6OYxTuhiekSv0x1WaNwSsY8UFDxJtR0FAGLTKA= +SHA256 (hex_modules/fast_xml-1.1.60.tar) = z54nSd1HIEcCy3oEq1BFZC+gCW/fyc/y6cptPyq9N8U= SHA256 (hex_modules/fast_yaml-1.0.40.tar) = J3BcKZAsHG8yaLqb84fV+pKLLmVbUxEPpHuOR20ys4Y= SHA256 (hex_modules/getopt-1.0.1.tar) = U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw= SHA256 (hex_modules/hex_core-0.10.1.tar) = /TkVLTQrf9TOP4A6x/CEtg0byb8T5wfjXb3OJm+7ZfA= @@ -30,10 +30,9 @@ SHA256 (hex_modules/sqlite3-1.1.15.tar) = PAuk4TMiwq1J3k4t3SgxE2at3lS+ro26nZ44iP SHA256 (hex_modules/stringprep-1.0.34.tar) = J+eOo3GIF2TgVvvoRdOtMEdA/14xMbwfOKZvC6qMm0c= SHA256 (hex_modules/stun-1.2.22.tar) = NAi0sR1SN6CI9TsmCgaUDDCxb0pICUiS1qkgThZDGIo= SHA256 (hex_modules/verl-1.1.1.tar) = CSXlHNkqCovicXZbAkMLLiz/isMO8k0SO9DVhRHo+xg= -SHA256 (hex_modules/xmpp-1.13.1.tar) = oCTu98y094uftS431jhaV73RUL515Q1Ru8uvOamriD0= +SHA256 (hex_modules/xmpp-1.13.3.tar) = BWSKpNvM/uYqqnlLKSowWEY50DyR9cCGa+jDQ0tqb0g= SHA256 (hex_modules/yconf-1.0.23.tar) = JbTft1MoAmrKp3TPXG+4fUi1XuvOYw3aozYkQdrDFDc= -SHA256 (jquery-4.0.0.min.js) = OaVG6prZf4v69dPg6PhVattBXkcOWQB62pdZ3ORyrao= -SHA256 (processone-ejabberd-26.03.tar.gz) = WEudQ6H2fpKf2wj6dCnzWfq8AikjrKMRZmsQc+1wmlI= +SHA256 (processone-ejabberd-26.04.tar.gz) = d96xBTl4rpeQ+Qm3tXOsYca5TXxGWoTFtWVoKS1J5H0= SIZE (bootstrap-5.3.8-dist.zip) = 1500314 SIZE (erlydtl-erlydtl-0.15.0.tar.gz) = 120544 SIZE (hex_modules/cache_tab-1.0.34.tar) = 23552 @@ -43,7 +42,7 @@ SIZE (hex_modules/eredis-1.7.1.tar) = 34816 SIZE (hex_modules/esip-1.0.60.tar) = 81408 SIZE (hex_modules/ezlib-1.0.16.tar) = 48128 SIZE (hex_modules/fast_tls-1.1.26.tar) = 80384 -SIZE (hex_modules/fast_xml-1.1.58.tar) = 96768 +SIZE (hex_modules/fast_xml-1.1.60.tar) = 97280 SIZE (hex_modules/fast_yaml-1.0.40.tar) = 55296 SIZE (hex_modules/getopt-1.0.1.tar) = 19456 SIZE (hex_modules/hex_core-0.10.1.tar) = 83968 @@ -66,7 +65,6 @@ SIZE (hex_modules/sqlite3-1.1.15.tar) = 1679872 SIZE (hex_modules/stringprep-1.0.34.tar) = 91136 SIZE (hex_modules/stun-1.2.22.tar) = 43008 SIZE (hex_modules/verl-1.1.1.tar) = 15360 -SIZE (hex_modules/xmpp-1.13.1.tar) = 390144 +SIZE (hex_modules/xmpp-1.13.3.tar) = 390144 SIZE (hex_modules/yconf-1.0.23.tar) = 22016 -SIZE (jquery-4.0.0.min.js) = 78748 -SIZE (processone-ejabberd-26.03.tar.gz) = 2935422 +SIZE (processone-ejabberd-26.04.tar.gz) = 2936092 diff --git a/net/ejabberd/modules.inc b/net/ejabberd/modules.inc index f7672f78d05..f770535caf1 100644 --- a/net/ejabberd/modules.inc +++ b/net/ejabberd/modules.inc @@ -15,7 +15,7 @@ MODERL_MODULES = cache_tab 1.0.34 \ esip 1.0.60 \ ezlib 1.0.16 \ fast_tls 1.1.26 \ - fast_xml 1.1.58 \ + fast_xml 1.1.60 \ fast_yaml 1.0.40 \ idna 7.1.0 \ jose 1.11.12 \ @@ -30,5 +30,5 @@ MODERL_MODULES = cache_tab 1.0.34 \ sqlite3 1.1.15 \ stringprep 1.0.34 \ stun 1.2.22 \ - xmpp 1.13.1 \ + xmpp 1.13.3 \ yconf 1.0.23 diff --git a/net/ejabberd/pkg/PLIST b/net/ejabberd/pkg/PLIST index b1635d3fcf1..a7b2edf0c8a 100644 --- a/net/ejabberd/pkg/PLIST +++ b/net/ejabberd/pkg/PLIST @@ -404,6 +404,7 @@ lib/ejabberd/ejabberd-${V}/priv/js/sortable.min.js lib/ejabberd/ejabberd-${V}/priv/lua/ lib/ejabberd/ejabberd-${V}/priv/lua/redis_sm.lua lib/ejabberd/ejabberd-${V}/priv/mod_invites/ +lib/ejabberd/ejabberd-${V}/priv/mod_invites/HOWTO.md lib/ejabberd/ejabberd-${V}/priv/mod_invites/apps.html lib/ejabberd/ejabberd-${V}/priv/mod_invites/apps.json lib/ejabberd/ejabberd-${V}/priv/mod_invites/base.html @@ -426,8 +427,6 @@ lib/ejabberd/ejabberd-${V}/priv/mod_invites/static/favicon.png lib/ejabberd/ejabberd-${V}/priv/mod_invites/static/illus-empty.svg lib/ejabberd/ejabberd-${V}/priv/mod_invites/static/invite.css lib/ejabberd/ejabberd-${V}/priv/mod_invites/static/invite.js -lib/ejabberd/ejabberd-${V}/priv/mod_invites/static/jquery/ -lib/ejabberd/ejabberd-${V}/priv/mod_invites/static/jquery/jquery.min.js lib/ejabberd/ejabberd-${V}/priv/mod_invites/static/logos/ lib/ejabberd/ejabberd-${V}/priv/mod_invites/static/logos/apple_as.svg lib/ejabberd/ejabberd-${V}/priv/mod_invites/static/logos/beagle-im.svg