From: Paco Esteban Subject: update net/go-sendxmpp to 0.9.0 To: ports@openbsd.org Date: Sun, 14 Apr 2024 13:15:48 +0200 Hi ports@, This is an update of net/go-sendxmpp to its latest version 0.9.0 Here's the list of changes: (for 0.8.4) Properly handle lost connection. Better compatibility with perl sendxmpp config files. Improve file name for private Ox keys. Improve fallback behavior if no SRV records are provided. Remove 100ms sleep before closing the connection. This should be no more needed since go-xmpp commit 9684a8ff690f0d75e284f8845696c5057926d276. Return an error if there is no answer to an IQ within 60s. Check for errors after sending the auth message during SCRAM authentication (via go-xmpp v0.1.2). (for 0.9.0) Properly close stream if Ctrl+C is pressed in interactive mode. Properly close stream if Ctrl+C is pressed in listening mode. Print OS, architecture and go version for flag --version. Improve closing of connection (via go-xmpp v0.1.4). Don't send stanzas that exceed the size limit provided by XEP-0478 (requires go-xmpp >= v0.1.4). Fixed hanging forever in stream close if the server doesn't reply with a closing stream element (via go-xmpp >= v0.1.4). New command line flag ssdp-off to disable XEP-0474: SASL SCRAM Downgrade Protection (requires go-xmpp >= v0.1.4). On the port itself, the usual golang port stuff. Builds and works on amd64. Lightly tested with a couple of xmpp accounts. ok to commit ? diff /usr/ports commit - a3f9a3e4800770f5bb68a5fe8c7c049c44a057c5 path + /usr/ports blob - 28e6b1811bdd5eda120c9e32369d6239b60f6dfe file + net/go-sendxmpp/Makefile --- net/go-sendxmpp/Makefile +++ net/go-sendxmpp/Makefile @@ -1,7 +1,7 @@ COMMENT = CLI tool to send messages over XMPP MODGO_MODNAME = salsa.debian.org/mdosch/go-sendxmpp -MODGO_VERSION = v0.8.3 +MODGO_VERSION = v0.9.0 DISTNAME = go-sendxmpp-${MODGO_VERSION} PKGNAME = ${DISTNAME:S/-v/-/} @@ -10,6 +10,8 @@ CATEGORIES = net HOMEPAGE = https://salsa.debian.org/mdosch/go-sendxmpp +MAINTAINER = Paco Esteban + # BSD-2 PERMIT_PACKAGE = Yes blob - 0d339530fc3280bafbf82ca0cc7985d3809b7d55 file + net/go-sendxmpp/distinfo --- net/go-sendxmpp/distinfo +++ net/go-sendxmpp/distinfo @@ -1,4 +1,4 @@ -SHA256 (go-sendxmpp-v0.8.3.zip) = XG1A0msP67TIC/VnO7xhqk7C8EVILSDQ63ONPSPY/ZY= +SHA256 (go-sendxmpp-v0.9.0.zip) = o/2EyIbs4HLImokY52QqsqjKPPQaXzdS9zSts31vlTQ= SHA256 (go_modules/github.com/!proton!mail/go-crypto/@v/v0.0.0-20230717121422-5aa5874ade95.mod) = QN3pYrzx0TZG3Np4fmjzXpUa/oaZqf2L5Vt+RgWo/zQ= SHA256 (go_modules/github.com/!proton!mail/go-crypto/@v/v1.0.0.mod) = QN3pYrzx0TZG3Np4fmjzXpUa/oaZqf2L5Vt+RgWo/zQ= SHA256 (go_modules/github.com/!proton!mail/go-crypto/@v/v1.0.0.zip) = rAklRjDJ4LO6hQePqRf+pmSfQVVR/jVDalHv2gjsC04= @@ -28,16 +28,15 @@ SHA256 (go_modules/github.com/stretchr/objx/@v/v0.1.0. SHA256 (go_modules/github.com/stretchr/objx/@v/v0.1.0.zip) = H6ENq0BO1/yO0qAz+HhBh9XfNRPO04Qc455G03hQ6x0= SHA256 (go_modules/github.com/stretchr/testify/@v/v1.7.0.mod) = //gWjZjmoHFWxFShtuklUJ8xd+lsFVUW1/lrQHnMo78= SHA256 (go_modules/github.com/stretchr/testify/@v/v1.7.0.zip) = WkbM6+/1EN8+L204Qu550/aNDnsVVM1u6TOQ1otsazQ= -SHA256 (go_modules/github.com/xmppo/go-xmpp/@v/v0.0.2-0.20240201055852-b369b7df1031.mod) = egzwy2q9ZrJpYzzmrg8ox4s021x1b1FkI+Ey0goLsE8= -SHA256 (go_modules/github.com/xmppo/go-xmpp/@v/v0.0.2-0.20240201055852-b369b7df1031.zip) = 9YNoHFF5uPjksSFofwzfx5Z+JlNTqM7S1JPBE5Kw2jA= +SHA256 (go_modules/github.com/xmppo/go-xmpp/@v/v0.1.4.mod) = 65E1rsIfraw7A1iaaGL663q6kLH9AYzIDEKYfAAdoiI= +SHA256 (go_modules/github.com/xmppo/go-xmpp/@v/v0.1.4.zip) = eIrJLq3T3wPBap3jPtKtwR+7E2w3fDYDcuuNAgUodDY= SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.4.13.mod) = 7n/kRmIDoB06wZrcE0zeyZvG3nGZLCjz3Zp0SAv/BgM= SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.4.13.zip) = u0GmArF0NF/aOSyK2D/MkyF8KFx2NplndjC+kP63peM= SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod) = M+0HClpm4JYGhaxThkQOG1mJnnTYo4oRgGhecqIZXe0= SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20210921155107-089bfa567519.mod) = zWMRYSoqpNDX4DxBs6ofvC1fiVqz9hCJ+rgL/p+PVIU= SHA256 (go_modules/golang.org/x/crypto/@v/v0.17.0.mod) = 3ECGe+88pReVacwvh0K7YYuMxoSw0lp1MlDoHW3ClEI= -SHA256 (go_modules/golang.org/x/crypto/@v/v0.18.0.mod) = NZUzto92xP1p92GhTCs2V+uTBl77meCu87szYi4uGnY= -SHA256 (go_modules/golang.org/x/crypto/@v/v0.19.0.mod) = +LWV5clhCTxod7lq9nn0MyIlSlMIexH9JkVkLmk779U= -SHA256 (go_modules/golang.org/x/crypto/@v/v0.19.0.zip) = c+4xJC4RNP+YMIOyWpFab6HldCZYlyJZz1+0wS2yzYY= +SHA256 (go_modules/golang.org/x/crypto/@v/v0.21.0.mod) = f/QKV7DP8QbRsVNeHQvHdCOK+z5T95f+/hgkt2WraE0= +SHA256 (go_modules/golang.org/x/crypto/@v/v0.21.0.zip) = aJ1rkxPUBuBhhjubhOtDsCt/vggaSbslCXv7GS8bkOA= SHA256 (go_modules/golang.org/x/crypto/@v/v0.3.1-0.20221117191849-2c476679df9a.mod) = t5UQb4uN637XdSOoHeAatGAfDwOBNTkYRX0teK2ePOk= SHA256 (go_modules/golang.org/x/crypto/@v/v0.7.0.mod) = yJ/iLnPawmoAplasEf9MbhprbNKrzFftzazew/va2C0= SHA256 (go_modules/golang.org/x/mod/@v/v0.6.0-dev.0.20220419223038-86c51ed26bb4.mod) = QtGQI/+PLq5wC8VJXzcezZmKItGbqYXQr19pkAslQIM= @@ -46,12 +45,11 @@ SHA256 (go_modules/golang.org/x/mod/@v/v0.8.0.zip) = S SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod) = 5u/a94opUD8IDPbSYV4onPsdnjq31XD1NmjsorSrQdo= SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod) = /vWJbRA6C85QVf216W6DCUQzR5JDeGU0dxjtzrYzNIo= SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20220722155237-a158d28d115b.mod) = sxXFJkfS2i925c2502fh1nJ3hCNqm/+2EhkrGbEKEo0= -SHA256 (go_modules/golang.org/x/net/@v/v0.10.0.mod) = 07fiNv8J5jIr5IkXAhbgGNMiGGLxoFPctj5T6rhTPBc= SHA256 (go_modules/golang.org/x/net/@v/v0.17.0.mod) = y6YYS4uODVRWC/WmXxNszXanNMScBm7YA+twvQbBdpY= SHA256 (go_modules/golang.org/x/net/@v/v0.2.0.mod) = B+xkXjNT/CZz8tje5cFOuSi5wTEnpAn+PsQOq6Tb2zA= -SHA256 (go_modules/golang.org/x/net/@v/v0.20.0.mod) = newurzc+4/6l+REZzxyzb38n6dRoFAfe1fZSI4HAwg4= SHA256 (go_modules/golang.org/x/net/@v/v0.21.0.mod) = Du8+n+f2aL5bTSTI8SUcbFAtEWiVPICBrJ3D85nGTwY= -SHA256 (go_modules/golang.org/x/net/@v/v0.21.0.zip) = Tpy0ve0ZV+c/5wl0HCmHnqsFBHYXybFLcjcxT/kCSRM= +SHA256 (go_modules/golang.org/x/net/@v/v0.22.0.mod) = Cz+667RmgBS03KX15YpFkWcFZ+9EKexf3k6u1mreb6w= +SHA256 (go_modules/golang.org/x/net/@v/v0.22.0.zip) = L2JOUE9M1WnpB6lEnTSfHE42UmI/ueNS6B0hVezCwTM= SHA256 (go_modules/golang.org/x/net/@v/v0.6.0.mod) = Qex26iFy8+4wMeOPmlNZOaWE1rs170gIVP3LjCAmcBs= SHA256 (go_modules/golang.org/x/net/@v/v0.8.0.mod) = 6275vWQFrOPZnkOB0CVs5B+Dxm0aILTigwpMd2JF9xo= SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw= @@ -64,16 +62,16 @@ SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210615 SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220520151302-bc2c85ada10a.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220722155257-8c9f86f7a55f.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= SHA256 (go_modules/golang.org/x/sys/@v/v0.15.0.mod) = 0iezJfYh9OvijTm6dz6pm4cPOTt8CcNFksNlsW3VYN4= -SHA256 (go_modules/golang.org/x/sys/@v/v0.17.0.mod) = 0iezJfYh9OvijTm6dz6pm4cPOTt8CcNFksNlsW3VYN4= -SHA256 (go_modules/golang.org/x/sys/@v/v0.17.0.zip) = tJ+5uqLNEzWWkn7wcM50vzgiPZfnyB73P+Hosqs2Oc0= +SHA256 (go_modules/golang.org/x/sys/@v/v0.18.0.mod) = 0iezJfYh9OvijTm6dz6pm4cPOTt8CcNFksNlsW3VYN4= +SHA256 (go_modules/golang.org/x/sys/@v/v0.18.0.zip) = luOxaxWn0ZPJ2yl020yr7SmzerS7CfY+36RBGZ3m/fg= SHA256 (go_modules/golang.org/x/sys/@v/v0.2.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= SHA256 (go_modules/golang.org/x/sys/@v/v0.3.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= SHA256 (go_modules/golang.org/x/sys/@v/v0.5.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= SHA256 (go_modules/golang.org/x/sys/@v/v0.6.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= SHA256 (go_modules/golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod) = TLqxT3cGdxsnHZlaGzzBMf5aJGqtx+5tG6bwvYlHgfo= SHA256 (go_modules/golang.org/x/term/@v/v0.0.0-20210927222741-03fcf44c2211.mod) = dAeU4pFPXMh+JWVsWEMiKyxlZlghIF9FYyoEd8jT95s= -SHA256 (go_modules/golang.org/x/term/@v/v0.17.0.mod) = 2+oCJUqsLPP9D3LHxgLlQ8X7rS0A2vwvgZwoqTUlgZk= -SHA256 (go_modules/golang.org/x/term/@v/v0.17.0.zip) = o49AMBqcoRVO3HDcv8bdKizlWrvUna2AMfsVwaXmJFk= +SHA256 (go_modules/golang.org/x/term/@v/v0.18.0.mod) = g8LUm6V+PVvzArifuftB8QhV0RS/cRhMwzuCUXc0Sug= +SHA256 (go_modules/golang.org/x/term/@v/v0.18.0.zip) = YGUvfdL6QYXGKGe8qj+lblmwf1txCD2PcquILSUTVaY= SHA256 (go_modules/golang.org/x/term/@v/v0.2.0.mod) = 7fgz2hAZAP4s6NsjQJ5CRI9EGJjT19juRRmI47MMkwI= SHA256 (go_modules/golang.org/x/term/@v/v0.5.0.mod) = DW9YIoqtwaZSjmdV2gGFFlZuOuXFIB963hdz9W+o2TQ= SHA256 (go_modules/golang.org/x/term/@v/v0.6.0.mod) = ZDWbnGU3CEePAgcpiFBE/z2ABxhtnUQRJf6HSBfnEgE= @@ -98,7 +96,7 @@ SHA256 (go_modules/gopkg.in/yaml.v3/@v/v3.0.0-20200313 SHA256 (go_modules/gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip) = rPGcy0/KmDsjSjnvAy+vmrcOdZaAZzuz3/B353/uIP4= SHA256 (go_modules/salsa.debian.org/mdosch/xmppsrv/@v/v0.2.6.mod) = nRDLqwOcN0P7S/6Mz4gRKDu6KW1Ixwq29V8fJ3sb97o= SHA256 (go_modules/salsa.debian.org/mdosch/xmppsrv/@v/v0.2.6.zip) = tlGTpfKVVlMKho2cSN2SzrD+kRFyBvdRQXz6bf/QOuc= -SIZE (go-sendxmpp-v0.8.3.zip) = 47521 +SIZE (go-sendxmpp-v0.9.0.zip) = 48313 SIZE (go_modules/github.com/!proton!mail/go-crypto/@v/v0.0.0-20230717121422-5aa5874ade95.mod) = 125 SIZE (go_modules/github.com/!proton!mail/go-crypto/@v/v1.0.0.mod) = 125 SIZE (go_modules/github.com/!proton!mail/go-crypto/@v/v1.0.0.zip) = 383010 @@ -128,16 +126,15 @@ SIZE (go_modules/github.com/stretchr/objx/@v/v0.1.0.mo SIZE (go_modules/github.com/stretchr/objx/@v/v0.1.0.zip) = 34637 SIZE (go_modules/github.com/stretchr/testify/@v/v1.7.0.mod) = 216 SIZE (go_modules/github.com/stretchr/testify/@v/v1.7.0.zip) = 105564 -SIZE (go_modules/github.com/xmppo/go-xmpp/@v/v0.0.2-0.20240201055852-b369b7df1031.mod) = 111 -SIZE (go_modules/github.com/xmppo/go-xmpp/@v/v0.0.2-0.20240201055852-b369b7df1031.zip) = 25307 +SIZE (go_modules/github.com/xmppo/go-xmpp/@v/v0.1.4.mod) = 111 +SIZE (go_modules/github.com/xmppo/go-xmpp/@v/v0.1.4.zip) = 24825 SIZE (go_modules/github.com/yuin/goldmark/@v/v1.4.13.mod) = 41 SIZE (go_modules/github.com/yuin/goldmark/@v/v1.4.13.zip) = 229017 SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod) = 88 SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20210921155107-089bfa567519.mod) = 247 SIZE (go_modules/golang.org/x/crypto/@v/v0.17.0.mod) = 190 -SIZE (go_modules/golang.org/x/crypto/@v/v0.18.0.mod) = 190 -SIZE (go_modules/golang.org/x/crypto/@v/v0.19.0.mod) = 190 -SIZE (go_modules/golang.org/x/crypto/@v/v0.19.0.zip) = 1797936 +SIZE (go_modules/golang.org/x/crypto/@v/v0.21.0.mod) = 190 +SIZE (go_modules/golang.org/x/crypto/@v/v0.21.0.zip) = 1799301 SIZE (go_modules/golang.org/x/crypto/@v/v0.3.1-0.20221117191849-2c476679df9a.mod) = 171 SIZE (go_modules/golang.org/x/crypto/@v/v0.7.0.mod) = 171 SIZE (go_modules/golang.org/x/mod/@v/v0.6.0-dev.0.20220419223038-86c51ed26bb4.mod) = 157 @@ -146,12 +143,11 @@ SIZE (go_modules/golang.org/x/mod/@v/v0.8.0.zip) = 161 SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod) = 181 SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod) = 179 SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20220722155237-a158d28d115b.mod) = 179 -SIZE (go_modules/golang.org/x/net/@v/v0.10.0.mod) = 123 SIZE (go_modules/golang.org/x/net/@v/v0.17.0.mod) = 155 SIZE (go_modules/golang.org/x/net/@v/v0.2.0.mod) = 123 -SIZE (go_modules/golang.org/x/net/@v/v0.20.0.mod) = 155 SIZE (go_modules/golang.org/x/net/@v/v0.21.0.mod) = 155 -SIZE (go_modules/golang.org/x/net/@v/v0.21.0.zip) = 1868726 +SIZE (go_modules/golang.org/x/net/@v/v0.22.0.mod) = 155 +SIZE (go_modules/golang.org/x/net/@v/v0.22.0.zip) = 1884138 SIZE (go_modules/golang.org/x/net/@v/v0.6.0.mod) = 123 SIZE (go_modules/golang.org/x/net/@v/v0.8.0.mod) = 123 SIZE (go_modules/golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod) = 25 @@ -164,16 +160,16 @@ SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-2021061503 SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20220520151302-bc2c85ada10a.mod) = 33 SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20220722155257-8c9f86f7a55f.mod) = 33 SIZE (go_modules/golang.org/x/sys/@v/v0.15.0.mod) = 33 -SIZE (go_modules/golang.org/x/sys/@v/v0.17.0.mod) = 33 -SIZE (go_modules/golang.org/x/sys/@v/v0.17.0.zip) = 1905235 +SIZE (go_modules/golang.org/x/sys/@v/v0.18.0.mod) = 33 +SIZE (go_modules/golang.org/x/sys/@v/v0.18.0.zip) = 1907063 SIZE (go_modules/golang.org/x/sys/@v/v0.2.0.mod) = 33 SIZE (go_modules/golang.org/x/sys/@v/v0.3.0.mod) = 33 SIZE (go_modules/golang.org/x/sys/@v/v0.5.0.mod) = 33 SIZE (go_modules/golang.org/x/sys/@v/v0.6.0.mod) = 33 SIZE (go_modules/golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod) = 95 SIZE (go_modules/golang.org/x/term/@v/v0.0.0-20210927222741-03fcf44c2211.mod) = 95 -SIZE (go_modules/golang.org/x/term/@v/v0.17.0.mod) = 68 -SIZE (go_modules/golang.org/x/term/@v/v0.17.0.zip) = 19883 +SIZE (go_modules/golang.org/x/term/@v/v0.18.0.mod) = 68 +SIZE (go_modules/golang.org/x/term/@v/v0.18.0.zip) = 19883 SIZE (go_modules/golang.org/x/term/@v/v0.2.0.mod) = 67 SIZE (go_modules/golang.org/x/term/@v/v0.5.0.mod) = 67 SIZE (go_modules/golang.org/x/term/@v/v0.6.0.mod) = 67 blob - 80068306346472c66224dc33aff230ddace50af8 file + net/go-sendxmpp/modules.inc --- net/go-sendxmpp/modules.inc +++ net/go-sendxmpp/modules.inc @@ -12,14 +12,14 @@ MODGO_MODULES = \ github.com/pmezard/go-difflib v1.0.0 \ github.com/stretchr/objx v0.1.0 \ github.com/stretchr/testify v1.7.0 \ - github.com/xmppo/go-xmpp v0.0.2-0.20240201055852-b369b7df1031 \ + github.com/xmppo/go-xmpp v0.1.4 \ github.com/yuin/goldmark v1.4.13 \ - golang.org/x/crypto v0.19.0 \ + golang.org/x/crypto v0.21.0 \ golang.org/x/mod v0.8.0 \ - golang.org/x/net v0.21.0 \ + golang.org/x/net v0.22.0 \ golang.org/x/sync v0.1.0 \ - golang.org/x/sys v0.17.0 \ - golang.org/x/term v0.17.0 \ + golang.org/x/sys v0.18.0 \ + golang.org/x/term v0.18.0 \ golang.org/x/text v0.14.0 \ golang.org/x/tools v0.6.0 \ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 \ @@ -34,17 +34,15 @@ MODGO_MODFILES = \ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 \ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 \ golang.org/x/crypto v0.17.0 \ - golang.org/x/crypto v0.18.0 \ golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a \ golang.org/x/crypto v0.7.0 \ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 \ golang.org/x/net v0.0.0-20190620200207-3b0461eec859 \ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 \ golang.org/x/net v0.0.0-20220722155237-a158d28d115b \ - golang.org/x/net v0.10.0 \ golang.org/x/net v0.17.0 \ golang.org/x/net v0.2.0 \ - golang.org/x/net v0.20.0 \ + golang.org/x/net v0.21.0 \ golang.org/x/net v0.6.0 \ golang.org/x/net v0.8.0 \ golang.org/x/sync v0.0.0-20190423024810-112230192c58 \ -- Paco Esteban. 0x5818130B8A6DBC03