From owner-svn-ports-head@freebsd.org Sat Dec 19 08:02:52 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 264CE4C0706; Sat, 19 Dec 2020 08:02:52 +0000 (UTC) (envelope-from ashish@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CydWb6d6Nz4sb9; Sat, 19 Dec 2020 08:02:51 +0000 (UTC) (envelope-from ashish@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CB90919CBC; Sat, 19 Dec 2020 08:02:51 +0000 (UTC) (envelope-from ashish@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BJ82p69045691; Sat, 19 Dec 2020 08:02:51 GMT (envelope-from ashish@FreeBSD.org) Received: (from ashish@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BJ82p6G045689; Sat, 19 Dec 2020 08:02:51 GMT (envelope-from ashish@FreeBSD.org) Message-Id: <202012190802.0BJ82p6G045689@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ashish set sender to ashish@FreeBSD.org using -f From: Ashish SHUKLA Date: Sat, 19 Dec 2020 08:02:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r558440 - head/net-im/ejabberd X-SVN-Group: ports-head X-SVN-Commit-Author: ashish X-SVN-Commit-Paths: head/net-im/ejabberd X-SVN-Commit-Revision: 558440 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Dec 2020 08:02:52 -0000 Author: ashish Date: Sat Dec 19 08:02:51 2020 New Revision: 558440 URL: https://svnweb.freebsd.org/changeset/ports/558440 Log: - Update to 20.12 - Import a patch from upstream to fix unexpected downgrade of dependency version - Remove ineffective REINPLACE_CMD lines Modified: head/net-im/ejabberd/Makefile head/net-im/ejabberd/distinfo Modified: head/net-im/ejabberd/Makefile ============================================================================== --- head/net-im/ejabberd/Makefile Sat Dec 19 07:57:02 2020 (r558439) +++ head/net-im/ejabberd/Makefile Sat Dec 19 08:02:51 2020 (r558440) @@ -1,10 +1,14 @@ # $FreeBSD$ PORTNAME= ejabberd -PORTVERSION= 20.07 -PORTREVISION= 1 +PORTVERSION= 20.12 CATEGORIES= net-im +# To be removed in the next update +# See https://github.com/processone/ejabberd/pull/3452 +PATCH_SITES= https://github.com/processone/ejabberd/commit/ +PATCHFILES= 2f3063def69c1d120262f6dd7a26ce59b6e6569c.patch:-p1 + MAINTAINER= ashish@FreeBSD.org COMMENT= Free and Open Source distributed fault-tolerant Jabber server @@ -47,7 +51,7 @@ GH_TUPLE= erlang-lager:lager:${LAGER_VER}:lager/deps/l potatosalad:erlang-jose:${JOSE_VER}:jose/deps/jose \ processone:eimp:${EIMP_VER}:eimp/deps/eimp \ DeadZen:goldrush:${GOLDRUSH_VER}:goldrush/deps/goldrush \ - dvv:base64url:v${BASE64URL_VER}:base64url/deps/base64url \ + dvv:base64url:${BASE64URL_VER}:base64url/deps/base64url \ processone:ezlib:${EZLIB_VER}:ezlib/deps/ezlib \ processone:pkix:${PKIX_VER}:pkix/deps/pkix \ processone:mqtree:${MQTREE_VER}:mqtree/deps/mqtree \ @@ -99,35 +103,35 @@ SUB_LIST= ${SUBS} \ EJABBERD_LIBDIR=${EJABBERD_LIBDIR} SHEBANG_FILES= ${WRKSRC}/ejabberdctl.template -BASE64URL_VER= 1.0 -CACHE_TAB_VER= 1.0.25 -EIMP_VER= 1.0.17 -EPAM_VER= 1.0.9 +BASE64URL_VER= 1.0.1 +CACHE_TAB_VER= 1.0.26 +EIMP_VER= 1.0.18 +EPAM_VER= 1.0.10 EREDIS_VER= 1.0.8 -ESIP_VER= 1.0.37 -EZLIB_VER= 1.0.8 -FAST_TLS_VER= 1.1.8 -FAST_XML_VER= 1.1.43 -FAST_YAML_VER= 1.0.27 +ESIP_VER= 1.0.39 +EZLIB_VER= 1.0.9 +FAST_TLS_VER= 1.1.10 +FAST_XML_VER= 1.1.45 +FAST_YAML_VER= 1.0.29 GOLDRUSH_VER= 0.1.9 IDNA_VER= 6.0.0 JIFFY_VER= 1.0.5 JOSE_VER= 1.9.0 LAGER_VER= 3.6.10 LUERL_VER= 0.3 -MQTREE_VER= 1.0.10 -P1_ACME_VER= 1.0.8 -P1_MYSQL_VER= 1.0.16 -P1_OAUTH2_VER= 0.6.7 +MQTREE_VER= 1.0.11 +P1_ACME_VER= 1.0.10 +P1_MYSQL_VER= 1.0.17 +P1_OAUTH2_VER= 0.6.8 P1_PGSQL_VER= 1.1.10 -P1_UTILS_VER= 1.0.20 -PKIX_VER= 1.0.6 -SQLITE3_VER= 1.1.8 -STRINGPREP_VER= 1.0.22 -STUN_VER= 1.0.37 +P1_UTILS_VER= 1.0.21 +PKIX_VER= 1.0.7 +SQLITE3_VER= 1.1.9 +STRINGPREP_VER= 1.0.24 +STUN_VER= 1.0.40 UNICODE_UTIL_COMPAT_VER= 0.4.1 -XMPP_VER= 1.4.9 -YCONF_VER= 1.0.7 +XMPP_VER= 1.5.1 +YCONF_VER= 1.0.9 OPTIONS_SUB= yes SIP_DESC= SIP support @@ -169,8 +173,6 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -e 's,^convert,${LOCALBASE}/bin/convert,' ${WRKSRC}/tools/captcha.sh @${REINPLACE_CMD} -e 's,%%PORTVERSION%%,${PORTVERSION},' ${WRKSRC}/configure.ac - @${REINPLACE_CMD} -e '/vsn/s/git/"${JIFFY_VER}"/' ${WRKSRC}/deps/jiffy/src/jiffy.app.src - @${REINPLACE_CMD} -e '/vsn/s/0.0.1/${BASE64URL_VER}/' ${WRKSRC}/deps/base64url/src/base64url.app.src .if ${OSVERSION} < 1200000 # Disable LTO required by dependency, not available by default in < 12.x @${REINPLACE_CMD} -e 's/$$FLTO_FLAG//' ${WRKSRC}/deps/jiffy/rebar.config @@ -179,8 +181,6 @@ post-patch: pre-configure: cd ${WRKSRC} && ${SH} autogen.sh @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ - ${WRKSRC}/ejabberdctl.template pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR} @@ -199,7 +199,6 @@ post-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}/${PORTNAME}-${PORTVERSION}/priv/bin/captcha.sh \ ${STAGEDIR}${DATADIR} - @${REINPLACE_CMD} -r -e '/captcha_cmd:/s,"[^"]+","${DATADIR}/captcha.sh",' ${STAGEDIR}${ETCDIR}/${PORTNAME}.yml.example @${CHMOD} +x ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}/${PORTNAME}-${PORTVERSION}/lib/eimp-${EIMP_VER}/priv/bin/eimp @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}/${PORTNAME}-${PORTVERSION}/lib/eimp-${EIMP_VER}/priv/bin/eimp Modified: head/net-im/ejabberd/distinfo ============================================================================== --- head/net-im/ejabberd/distinfo Sat Dec 19 07:57:02 2020 (r558439) +++ head/net-im/ejabberd/distinfo Sat Dec 19 08:02:51 2020 (r558440) @@ -1,61 +1,63 @@ -TIMESTAMP = 1596386704 -SHA256 (processone-ejabberd-20.07_GH0.tar.gz) = 7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41 -SIZE (processone-ejabberd-20.07_GH0.tar.gz) = 1990511 +TIMESTAMP = 1608359819 +SHA256 (processone-ejabberd-20.12_GH0.tar.gz) = 1fc9a9e02fcb04de8ddc05940d51f79221edbb05b2721adfecc9cff34ae46924 +SIZE (processone-ejabberd-20.12_GH0.tar.gz) = 1992192 SHA256 (erlang-lager-lager-3.6.10_GH0.tar.gz) = c5bb4ba6f918e90d2e6671c3996d72c61f2a589b65c151b3df8011d046362981 SIZE (erlang-lager-lager-3.6.10_GH0.tar.gz) = 268657 -SHA256 (processone-p1_utils-1.0.20_GH0.tar.gz) = 234b88227f61ef03a6177d97ed062c62a22760b6fd189a5a24d2fd1599d95ac9 -SIZE (processone-p1_utils-1.0.20_GH0.tar.gz) = 63739 -SHA256 (processone-cache_tab-1.0.25_GH0.tar.gz) = 32cb3a3017f53e66bd1c2b75f60a2c4a14f00f375582a3c511ea39266b2385b9 -SIZE (processone-cache_tab-1.0.25_GH0.tar.gz) = 23433 -SHA256 (processone-fast_tls-1.1.8_GH0.tar.gz) = 490dcde4cd9a8aabf71a49fd1494678e017a167ba046a35751b5d2d08bfb481e -SIZE (processone-fast_tls-1.1.8_GH0.tar.gz) = 80396 -SHA256 (processone-stringprep-1.0.22_GH0.tar.gz) = ff7cedc6dae4394e780a540219daea3b684e614e2d1bafaa3862cfca6ab38ba5 -SIZE (processone-stringprep-1.0.22_GH0.tar.gz) = 98910 -SHA256 (processone-fast_xml-1.1.43_GH0.tar.gz) = 012b3acd7af00c48dbf56eec03def689dfb2adad6719ab2aaa326399313b3fea -SIZE (processone-fast_xml-1.1.43_GH0.tar.gz) = 99115 -SHA256 (processone-xmpp-1.4.9_GH0.tar.gz) = 4f7f238787c1942da42341c4afc000463c3521c440a0aeffd1086fb13853981b -SIZE (processone-xmpp-1.4.9_GH0.tar.gz) = 483243 -SHA256 (processone-fast_yaml-1.0.27_GH0.tar.gz) = 089a43e25a8fb789772615ea5949aa7b3f86d8c15db3f89067d6acfbb4784e5c -SIZE (processone-fast_yaml-1.0.27_GH0.tar.gz) = 59075 +SHA256 (processone-p1_utils-1.0.21_GH0.tar.gz) = 92dbadb135bd9561fa33a01b2872f73fd9cc559bb68f67e21e97ecebc239ab74 +SIZE (processone-p1_utils-1.0.21_GH0.tar.gz) = 63913 +SHA256 (processone-cache_tab-1.0.26_GH0.tar.gz) = 0364b0fb7bf8d40ef2ad79be5f5246951f8c714f5b63cc2460f4c170826682e9 +SIZE (processone-cache_tab-1.0.26_GH0.tar.gz) = 23511 +SHA256 (processone-fast_tls-1.1.10_GH0.tar.gz) = 49c77fc7e2b82ece140fa6e3999086af43b3ba885fb2411dc16ef6e487e07a4f +SIZE (processone-fast_tls-1.1.10_GH0.tar.gz) = 80575 +SHA256 (processone-stringprep-1.0.24_GH0.tar.gz) = dc0445fbab2f47cbf75edb5f58d3bd697f9b3ede192390eab706f0df9b0dcf19 +SIZE (processone-stringprep-1.0.24_GH0.tar.gz) = 99131 +SHA256 (processone-fast_xml-1.1.45_GH0.tar.gz) = d967049ab1ebec145657bd15e461dcd5f2b8c932a71af944c57474e92a2e53c5 +SIZE (processone-fast_xml-1.1.45_GH0.tar.gz) = 107006 +SHA256 (processone-xmpp-1.5.1_GH0.tar.gz) = 1a8c98bfc5a3acbced363e22430d0484e28de24384543a53cd246d2e206eba56 +SIZE (processone-xmpp-1.5.1_GH0.tar.gz) = 507197 +SHA256 (processone-fast_yaml-1.0.29_GH0.tar.gz) = fe54b76203f1e8a5c4965c8c3afcf07d6afaf6601fcc451d198901ed99f79343 +SIZE (processone-fast_yaml-1.0.29_GH0.tar.gz) = 59122 SHA256 (davisp-jiffy-1.0.5_GH0.tar.gz) = e5acdee0beacc7b0fcd099d360f83d8d7d77c3029bd4d5ff5270494af36e5929 SIZE (davisp-jiffy-1.0.5_GH0.tar.gz) = 1896318 -SHA256 (processone-p1_oauth2-0.6.7_GH0.tar.gz) = c5cf0d2a9f5874c289cc6044945f4771a79007bda812e5269dea3a4c92fc8811 -SIZE (processone-p1_oauth2-0.6.7_GH0.tar.gz) = 213885 +SHA256 (processone-p1_oauth2-0.6.8_GH0.tar.gz) = 04757cd1b56e69e2db8a898c002773a57d9aea4fc2825e33974902d6331f9cd8 +SIZE (processone-p1_oauth2-0.6.8_GH0.tar.gz) = 214027 SHA256 (potatosalad-erlang-jose-1.9.0_GH0.tar.gz) = d55a9d3a1697833fed555a21f1aeb2727af88193995cb6ffa945d4b6749d0e8d SIZE (potatosalad-erlang-jose-1.9.0_GH0.tar.gz) = 258407 -SHA256 (processone-eimp-1.0.17_GH0.tar.gz) = 1a529fa6e8264d3cad43861db417a1e841b28c0601aa847857fa0d6a81935922 -SIZE (processone-eimp-1.0.17_GH0.tar.gz) = 3476648 +SHA256 (processone-eimp-1.0.18_GH0.tar.gz) = 354cacd2289f3fca5603eadfb474e58a2d2174ef990016063cd7d9598eef4342 +SIZE (processone-eimp-1.0.18_GH0.tar.gz) = 3477198 SHA256 (DeadZen-goldrush-0.1.9_GH0.tar.gz) = 6fb8ac6345d940396ecf89d4ce6b9b809039f336d85d7a54239e85106a807612 SIZE (DeadZen-goldrush-0.1.9_GH0.tar.gz) = 24548 -SHA256 (dvv-base64url-v1.0_GH0.tar.gz) = 73d15d618741e59b5ba260e2478f566c6bb30b01c23340157204e78d228a2c7e -SIZE (dvv-base64url-v1.0_GH0.tar.gz) = 2759 -SHA256 (processone-ezlib-1.0.8_GH0.tar.gz) = ce514c8ea8fc8fd8901b71f7e4e658aa5d52371f6f7fee248d82aa81fa4fa20a -SIZE (processone-ezlib-1.0.8_GH0.tar.gz) = 49200 -SHA256 (processone-pkix-1.0.6_GH0.tar.gz) = 3a39c4ca74f93efa0e4de4c37f9e4d073b1aeb142ad669f12588ad2b3c39724e -SIZE (processone-pkix-1.0.6_GH0.tar.gz) = 411903 -SHA256 (processone-mqtree-1.0.10_GH0.tar.gz) = 4f86e272a97152d3f5166dad583dc1b5bda9582f6777f6294fb8328def8b2189 -SIZE (processone-mqtree-1.0.10_GH0.tar.gz) = 228863 -SHA256 (processone-yconf-1.0.7_GH0.tar.gz) = 69c7427cc477d5ac08d9a204f7b36575a09d11b26d80747a7bb482b0e3ec541c -SIZE (processone-yconf-1.0.7_GH0.tar.gz) = 222483 -SHA256 (processone-p1_acme-1.0.8_GH0.tar.gz) = 68b742a75d2b85bfb7aa83da5b5089ce4b199ea39fc1faababb9ecf14532982d -SIZE (processone-p1_acme-1.0.8_GH0.tar.gz) = 221082 +SHA256 (dvv-base64url-1.0.1_GH0.tar.gz) = 7ef7210effd25ac1f82f190fcfaef53e49d7bc40bb94112c4aa07266c32a851b +SIZE (dvv-base64url-1.0.1_GH0.tar.gz) = 2726 +SHA256 (processone-ezlib-1.0.9_GH0.tar.gz) = f0ac60336b2ddf55ac4f58934580cb8f02dba440d68feb607be312dd35d91269 +SIZE (processone-ezlib-1.0.9_GH0.tar.gz) = 49395 +SHA256 (processone-pkix-1.0.7_GH0.tar.gz) = ef1a0f1cf0bd66696fa1c0336efe784864b8337564c0415bff83867010a1b950 +SIZE (processone-pkix-1.0.7_GH0.tar.gz) = 412022 +SHA256 (processone-mqtree-1.0.11_GH0.tar.gz) = 298cf6e207e1e76423ea733b3f507b21f9b14a0fdfdc00b695f0a3d1b400327f +SIZE (processone-mqtree-1.0.11_GH0.tar.gz) = 228876 +SHA256 (processone-yconf-1.0.9_GH0.tar.gz) = bc992fa01714250f060b70c0b6c126430373b3c171d16ead21efa17209afb0c9 +SIZE (processone-yconf-1.0.9_GH0.tar.gz) = 222572 +SHA256 (processone-p1_acme-1.0.10_GH0.tar.gz) = 9eca9dbf57354bce476b995dccef92eff062d07a66069f358240ab8d566c0c6b +SIZE (processone-p1_acme-1.0.10_GH0.tar.gz) = 221088 SHA256 (benoitc-erlang-idna-6.0.0_GH0.tar.gz) = d57e20ee88018ff0431e0275e91ada5915782870c9981fc798bcd05589031d6f SIZE (benoitc-erlang-idna-6.0.0_GH0.tar.gz) = 740802 SHA256 (benoitc-unicode_util_compat-0.4.1_GH0.tar.gz) = daca2a0d9469b6d8b766f72168ff5576b1e902d1b026a659d6ef0073adb996fa SIZE (benoitc-unicode_util_compat-0.4.1_GH0.tar.gz) = 416975 -SHA256 (processone-p1_mysql-1.0.16_GH0.tar.gz) = 9480b1982bde9e0bbe8c0fb8690f240bb24223cc853bcd1a3299b91f96a9bbbf -SIZE (processone-p1_mysql-1.0.16_GH0.tar.gz) = 26959 -SHA256 (processone-epam-1.0.9_GH0.tar.gz) = 6027400c51e3a4059f22c34483b7ff94f378c2674fb8a951a9c925eaa1090a7c -SIZE (processone-epam-1.0.9_GH0.tar.gz) = 47548 +SHA256 (processone-p1_mysql-1.0.17_GH0.tar.gz) = 894587c9591fd03d319902479ec64a93936a89f3a6a5cb059f7581804f686808 +SIZE (processone-p1_mysql-1.0.17_GH0.tar.gz) = 27100 +SHA256 (processone-epam-1.0.10_GH0.tar.gz) = 6502b15e2ed40abec947afbcbc7a6a45095690f8ee102c3301d7873260f9783c +SIZE (processone-epam-1.0.10_GH0.tar.gz) = 47727 SHA256 (processone-p1_pgsql-1.1.10_GH0.tar.gz) = 18d7435d7b5366bab44d5711ea2133816b6a2291ecf471f2e6db408b5d9820e6 SIZE (processone-p1_pgsql-1.1.10_GH0.tar.gz) = 24073 SHA256 (wooga-eredis-v1.0.8_GH0.tar.gz) = cd75c5b19dca8b23ec998fecf83ea5f0e29f3cb75618a61d3080168c66509b56 SIZE (wooga-eredis-v1.0.8_GH0.tar.gz) = 124993 -SHA256 (processone-esip-1.0.37_GH0.tar.gz) = 345798a3981440345f05adc898465f4aaf6f2f0137c02e2ece872d13798c3a8d -SIZE (processone-esip-1.0.37_GH0.tar.gz) = 89632 -SHA256 (processone-erlang-sqlite3-1.1.8_GH0.tar.gz) = c3e2b27095b897bc6c3c528b20bb1907577f4e2959a0e400fcd2065071ff238f -SIZE (processone-erlang-sqlite3-1.1.8_GH0.tar.gz) = 1881308 -SHA256 (processone-stun-1.0.37_GH0.tar.gz) = b268318dad5457316b24efbf40b45b624863494edc16d41bd3cbbb090f835dff -SIZE (processone-stun-1.0.37_GH0.tar.gz) = 38486 +SHA256 (processone-esip-1.0.39_GH0.tar.gz) = 4688d3c0930d2916a10a5c16a45a6cab18b81659fb73c124710eff9aab62afbf +SIZE (processone-esip-1.0.39_GH0.tar.gz) = 89844 +SHA256 (processone-erlang-sqlite3-1.1.9_GH0.tar.gz) = ca69f1f6de890bf20b821c8bd78410740a80c8c4524ae756f3e11d07d9a50fed +SIZE (processone-erlang-sqlite3-1.1.9_GH0.tar.gz) = 1881273 +SHA256 (processone-stun-1.0.40_GH0.tar.gz) = 6296b81dead66575c6b65863b2a728323e9fed39f6e961832a6d2b11fd3c3103 +SIZE (processone-stun-1.0.40_GH0.tar.gz) = 39372 SHA256 (rvirding-luerl-v0.3_GH0.tar.gz) = 37c6d2be8ecc624a8bf469b80609c4e3f2f079c30886575c31c46391dfedfec6 SIZE (rvirding-luerl-v0.3_GH0.tar.gz) = 95182 +SHA256 (2f3063def69c1d120262f6dd7a26ce59b6e6569c.patch) = 3a2a3aa7d451e953524a0562d58a31e1888e200d8074a6a38c7c4b37df744530 +SIZE (2f3063def69c1d120262f6dd7a26ce59b6e6569c.patch) = 3229