Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package go-sendxmpp for openSUSE:Factory checked in at 2024-10-27 11:26:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/go-sendxmpp (Old) and /work/SRC/openSUSE:Factory/.go-sendxmpp.new.2020 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "go-sendxmpp" Sun Oct 27 11:26:27 2024 rev:19 rq:1218605 version:0.11.4 Changes: -------- --- /work/SRC/openSUSE:Factory/go-sendxmpp/go-sendxmpp.changes 2024-09-18 15:28:03.571782362 +0200 +++ /work/SRC/openSUSE:Factory/.go-sendxmpp.new.2020/go-sendxmpp.changes 2024-10-27 11:26:57.386586362 +0100 @@ -1,0 +2,14 @@ +Sat Oct 26 17:42:16 UTC 2024 - Michael Vetter <mvetter@suse.com> + +- Update to 0.11.4: + * Fix bug in SCRAM-SHA-256-PLUS (via go-xmpp >= 0.2.4). + +------------------------------------------------------------------- +Sat Oct 26 17:41:55 UTC 2024 - Michael Vetter <mvetter@suse.com> + +- Update to 0.11.3: + * Add go-xmpp library version to --version output (requires go-xmpp >= 0.2.2). + * Fix XEP-0474: SASL SCRAM Downgrade Protection hash calculation bug (via go-xmpp >= v0.2.3). + * [gocritic]: Improve code quality. + +------------------------------------------------------------------- Old: ---- go-sendxmpp-0.11.2.tar.gz New: ---- go-sendxmpp-0.11.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ go-sendxmpp.spec ++++++ --- /var/tmp/diff_new_pack.dL6yPp/_old 2024-10-27 11:26:59.154659652 +0100 +++ /var/tmp/diff_new_pack.dL6yPp/_new 2024-10-27 11:26:59.170660315 +0100 @@ -17,7 +17,7 @@ Name: go-sendxmpp -Version: 0.11.2 +Version: 0.11.4 Release: 0 Summary: A little tool to send messages to an XMPP contact or MUC License: BSD-2-Clause ++++++ _service ++++++ --- /var/tmp/diff_new_pack.dL6yPp/_old 2024-10-27 11:26:59.438671425 +0100 +++ /var/tmp/diff_new_pack.dL6yPp/_new 2024-10-27 11:26:59.466672585 +0100 @@ -3,7 +3,7 @@ <param name="url">https://salsa.debian.org/mdosch/go-sendxmpp.git</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v0.11.2</param> + <param name="revision">v0.11.4</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">disable</param> <param name="versionrewrite-pattern">v(.*)</param> ++++++ go-sendxmpp-0.11.2.tar.gz -> go-sendxmpp-0.11.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/go-sendxmpp-0.11.2/CHANGELOG.md new/go-sendxmpp-0.11.4/CHANGELOG.md --- old/go-sendxmpp-0.11.2/CHANGELOG.md 2024-09-17 20:52:24.000000000 +0200 +++ new/go-sendxmpp-0.11.4/CHANGELOG.md 2024-10-26 00:54:13.000000000 +0200 @@ -1,5 +1,17 @@ # Changelog +## [v0.11.4] 2024-10-26 +### Changed +- Fix bug in SCRAM-SHA-256-PLUS (via go-xmpp >= 0.2.4). + +## [v0.11.3] 2024-10-25 +### Added +- Add go-xmpp library version to `--version` output (requires go-xmpp >= 0.2.2). + +### Changed +- Fix XEP-0474: SASL SCRAM Downgrade Protection hash calculation bug (via go-xmpp >= 0.2.3). +- [gocritic]: Improve code quality. + ## [v0.11.2] 2024-09-17 ### Changed - Add Gopenpgp and Xmppsrv version to `--version` output (requires xmppsrv >= 0.3.2). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/go-sendxmpp-0.11.2/README.md new/go-sendxmpp-0.11.4/README.md --- old/go-sendxmpp-0.11.2/README.md 2024-09-17 20:52:24.000000000 +0200 +++ new/go-sendxmpp-0.11.4/README.md 2024-10-26 00:54:13.000000000 +0200 @@ -136,25 +136,25 @@ Send a message to two recipients using a configuration file. ```bash -cat message.txt | ./go-sendxmpp -f ./sendxmpp recipient1@example.com recipient2@example.com +cat message.txt|go-sendxmpp -f ./sendxmpp recipient1@example.com recipient2@example.com ``` Send a message to two recipients directly defining account credentials. ```bash -cat message.txt | ./go-sendxmpp -u bob@example.com -p swordfish recipient1@example.com recipient2@example.com +cat message.txt|go-sendxmpp -u bob@example.com -p swordfish recipient1@example.com recipient2@example.com ``` Send a message to two groupchats (`-c`) using a configuration file. ```bash -cat message.txt | ./go-sendxmpp -cf ./sendxmpp chat1@conference.example.com chat2@conference.example.com +cat message.txt|go-sendxmpp -cf ./sendxmpp chat1@conference.example.com chat2@conference.example.com ``` Send file changes to two groupchats (`-c`) using a configuration file. ```bash -tail -f example.log | ./go-sendxmpp -cif ./sendxmpp chat1@conference.example.com chat2@conference.example.com +tail -f example.log|go-sendxmpp -cif ./sendxmpp chat1@conference.example.com chat2@conference.example.com ``` Send a notification if a long running process finishes. @@ -164,12 +164,21 @@ ### shell completion -#### zsh +There are no shell completions yet (contributions welcome) but for zsh it is possible to automatically create completions from `--help` and for fish it is possible to create completions from the man page. +Those might work *good enough*. -There are no shell completions yet (contributions welcome) but for zsh it is possible to automatically create completions from `--help` which might work *good enough*. +#### zsh Just place the following in your `~/.zshrc` or `~/.zshrc.local`: ``` bash compdef _gnu_generic go-sendxmpp ``` + +#### fish + +Fish can generate them from the man page with following command: + +``` bash +fish_update_completions +``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/go-sendxmpp-0.11.2/const.go new/go-sendxmpp-0.11.4/const.go --- old/go-sendxmpp-0.11.2/const.go 2024-09-17 20:52:24.000000000 +0200 +++ new/go-sendxmpp-0.11.4/const.go 2024-10-26 00:54:13.000000000 +0200 @@ -5,7 +5,7 @@ package main const ( - version = "0.11.2" + version = "0.11.4" // defaults defaultBufferSize = 100 defaultConfigColumnSep = 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/go-sendxmpp-0.11.2/go.mod new/go-sendxmpp-0.11.4/go.mod --- old/go-sendxmpp-0.11.2/go.mod 2024-09-17 20:52:24.000000000 +0200 +++ new/go-sendxmpp-0.11.4/go.mod 2024-10-26 00:54:13.000000000 +0200 @@ -1,24 +1,26 @@ module salsa.debian.org/mdosch/go-sendxmpp -go 1.21.5 +go 1.22.0 + +toolchain go1.22.7 require ( - github.com/ProtonMail/gopenpgp/v2 v2.7.5 + github.com/ProtonMail/gopenpgp/v2 v2.8.0-beta.0 github.com/beevik/etree v1.4.1 - github.com/gabriel-vasile/mimetype v1.4.5 + github.com/gabriel-vasile/mimetype v1.4.6 github.com/google/uuid v1.6.0 github.com/pborman/getopt/v2 v2.1.0 - github.com/xmppo/go-xmpp v0.2.2-0.20240910180004-06b143aee341 - golang.org/x/crypto v0.27.0 + github.com/xmppo/go-xmpp v0.2.4 + golang.org/x/crypto v0.28.0 salsa.debian.org/mdosch/xmppsrv v0.3.2 ) require ( - github.com/ProtonMail/go-crypto v1.0.0 // indirect + github.com/ProtonMail/go-crypto v1.1.0-beta.0 // indirect github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect - github.com/cloudflare/circl v1.4.0 // indirect + github.com/cloudflare/circl v1.5.0 // indirect github.com/pkg/errors v0.9.1 // indirect - golang.org/x/net v0.29.0 // indirect - golang.org/x/sys v0.25.0 // indirect - golang.org/x/text v0.18.0 // indirect + golang.org/x/net v0.30.0 // indirect + golang.org/x/sys v0.26.0 // indirect + golang.org/x/text v0.19.0 // indirect ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/go-sendxmpp-0.11.2/go.sum new/go-sendxmpp-0.11.4/go.sum --- old/go-sendxmpp-0.11.2/go.sum 2024-09-17 20:52:24.000000000 +0200 +++ new/go-sendxmpp-0.11.4/go.sum 2024-10-26 00:54:13.000000000 +0200 @@ -1,21 +1,17 @@ -github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= -github.com/ProtonMail/go-crypto v1.0.0 h1:LRuvITjQWX+WIfr930YHG2HNfjR1uOfyf5vE0kC2U78= -github.com/ProtonMail/go-crypto v1.0.0/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= +github.com/ProtonMail/go-crypto v1.1.0-beta.0 h1:9ZLo7gzqEbrSakeRM4L0jaHMuZSLrjoYBIdIwcBr4C4= +github.com/ProtonMail/go-crypto v1.1.0-beta.0/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f h1:tCbYj7/299ekTTXpdwKYF8eBlsYsDVoggDAuAjoK66k= github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f/go.mod h1:gcr0kNtGBqin9zDW9GOHcVntrwnjrK+qdJ06mWYBybw= -github.com/ProtonMail/gopenpgp/v2 v2.7.5 h1:STOY3vgES59gNgoOt2w0nyHBjKViB/qSg7NjbQWPJkA= -github.com/ProtonMail/gopenpgp/v2 v2.7.5/go.mod h1:IhkNEDaxec6NyzSI0PlxapinnwPVIESk8/76da3Ct3g= +github.com/ProtonMail/gopenpgp/v2 v2.8.0-beta.0 h1:tTiGHVwjTCVhgA2hod0OyVncfCK3l2j3tApi7tKW07s= +github.com/ProtonMail/gopenpgp/v2 v2.8.0-beta.0/go.mod h1:M2xITH7IEPDrcxzmYtFmpypFMISvUV+DXuG8nBqfqf8= github.com/beevik/etree v1.4.1 h1:PmQJDDYahBGNKDcpdX8uPy1xRCwoCGVUiW669MEirVI= github.com/beevik/etree v1.4.1/go.mod h1:gPNJNaBGVZ9AwsidazFZyygnd+0pAU38N4D+WemwKNs= -github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= -github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= -github.com/cloudflare/circl v1.4.0 h1:BV7h5MgrktNzytKmWjpOtdYrf0lkkbF8YMlBGPhJQrY= -github.com/cloudflare/circl v1.4.0/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU= +github.com/cloudflare/circl v1.5.0 h1:hxIWksrX6XN5a1L2TI/h53AGPhNHoUBo+TD1ms9+pys= +github.com/cloudflare/circl v1.5.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs= +github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8Gql0kxn4= -github.com/gabriel-vasile/mimetype v1.4.5/go.mod h1:ibHel+/kbxn9x2407k1izTA1S81ku1z/DlgOW2QE0M4= +github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc= +github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/pborman/getopt/v2 v2.1.0 h1:eNfR+r+dWLdWmV8g5OlpyrTYHkhVNxHBdN2cCrJmOEA= @@ -24,28 +20,23 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/xmppo/go-xmpp v0.2.2-0.20240910180004-06b143aee341 h1:Nn7xp8WOd+hPDasApuRBRrmt0UbhEj2FM2cSovdTMdc= -github.com/xmppo/go-xmpp v0.2.2-0.20240910180004-06b143aee341/go.mod h1:0ZxTwt7zQQbRkVg9PpBISmGAjmxf+oik0JyAahsewM8= +github.com/xmppo/go-xmpp v0.2.4 h1:2ed1qnYUAKsooL3kphniIWmqBjz8IB8cmzyGB/WdAXo= +github.com/xmppo/go-xmpp v0.2.4/go.mod h1:b24GAaIpOqpxK7vYpZsMo11ReZ1qMBu3DPjkZXcqSpw= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= -golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= +golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= +golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= -golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -54,31 +45,24 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= -golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= -golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= salsa.debian.org/mdosch/xmppsrv v0.3.2 h1:c83iqkp/GnsPYqQ12dTw8MQBzI+Dtw9mQOFSuL3GjaQ= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/go-sendxmpp-0.11.2/helpers.go new/go-sendxmpp-0.11.4/helpers.go --- old/go-sendxmpp-0.11.2/helpers.go 2024-09-17 20:52:24.000000000 +0200 +++ new/go-sendxmpp-0.11.4/helpers.go 2024-10-26 00:54:13.000000000 +0200 @@ -57,7 +57,7 @@ } func getFastData(jid string, password string) (xmpp.Fast, error) { - folder := strings.Replace(strings.Replace(jid, "@", "_at_", -1), ".", "_", -1) + folder := fsFriendlyJid(jid) var fast xmpp.Fast fastPath, err := getDataPath(folder) if err != nil { @@ -100,7 +100,7 @@ func writeFastData(jid string, password string, fast xmpp.Fast) error { var encBuf bytes.Buffer - folder := strings.Replace(strings.Replace(jid, "@", "_at_", -1), ".", "_", -1) + folder := fsFriendlyJid(jid) fastPath, err := getDataPath(folder) if err != nil { return fmt.Errorf("writeFastData: failed to write fast cache file: %w", err) @@ -150,7 +150,7 @@ func getClientID(jid string) (string, error) { var clientID string - folder := strings.Replace(strings.Replace(jid, "@", "_at_", -1), ".", "_", -1) + folder := fsFriendlyJid(jid) clientIDLoc, err := getClientIDLoc(folder) if err != nil { return strError, err @@ -244,3 +244,9 @@ func getShortID() string { return uuid.NewString()[:6] } + +// Remove @ and dots +func fsFriendlyJid(jid string) string { + jid = strings.ReplaceAll(jid, "@", "_at_") + return strings.ReplaceAll(jid, ".", "_") +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/go-sendxmpp-0.11.2/main.go new/go-sendxmpp-0.11.4/main.go --- old/go-sendxmpp-0.11.2/main.go 2024-09-17 20:52:24.000000000 +0200 +++ new/go-sendxmpp-0.11.4/main.go 2024-10-26 00:54:13.000000000 +0200 @@ -151,6 +151,7 @@ case *flagVersion: // If requested, show version and quit. fmt.Println("Go-sendxmpp", version) + fmt.Println("Go-xmpp library version:", xmpp.Version) fmt.Println("Xmppsrv library version:", xmppsrv.Version) fmt.Println("Gopenpgp library version:", gopenpgpConst.Version) system := runtime.GOOS + "/" + runtime.GOARCH diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/go-sendxmpp-0.11.2/ox.go new/go-sendxmpp-0.11.4/ox.go --- old/go-sendxmpp-0.11.2/ox.go 2024-09-17 20:52:24.000000000 +0200 +++ new/go-sendxmpp-0.11.4/ox.go 2024-10-26 00:54:13.000000000 +0200 @@ -315,7 +315,7 @@ } func oxGetPrivKeyLoc(jid string) (string, error) { - dataDir, err := getDataPath(strings.Replace(strings.Replace(jid, "@", "_at_", -1), ".", "_", -1)) + dataDir, err := getDataPath(fsFriendlyJid(jid)) if err != nil { return strError, fmt.Errorf("oxGetPrivKeyLoc: %w", err) } @@ -326,8 +326,8 @@ // TODO: Remove handling of oldDataFile in a later version when it's very likely that there are no // more versions in use using the oldDataFile (<0.8.3). oldDataFile := oldDataDir + base64.StdEncoding.EncodeToString([]byte(jid)) - oldDataFile2 := oldDataDir + strings.Replace(jid, "@", "_at_", -1) - oldDataFile3 := oldDataDir + strings.Replace(strings.Replace(jid, "@", "_at_", -1), ".", "_", -1) + oldDataFile2 := oldDataDir + strings.ReplaceAll(jid, "@", "_at_") + oldDataFile3 := oldDataDir + fsFriendlyJid(jid) dataFile := dataDir + "oxprivkey" if _, err := os.Stat(oldDataFile); err == nil { err := os.Rename(oldDataFile, dataFile) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/go-sendxmpp-0.11.2/parseconfig.go new/go-sendxmpp-0.11.4/parseconfig.go --- old/go-sendxmpp-0.11.2/parseconfig.go 2024-09-17 20:52:24.000000000 +0200 +++ new/go-sendxmpp-0.11.4/parseconfig.go 2024-10-26 00:54:13.000000000 +0200 @@ -85,7 +85,6 @@ if err != nil { return output, fmt.Errorf("parseConfig: failed to open config file: %w", err) } - defer file.Close() scanner := bufio.NewScanner(file) scanner.Split(bufio.ScanLines) @@ -111,6 +110,7 @@ } out, err := exec.Command(shell, "-c", column[1]).Output() if err != nil { + file.Close() log.Fatal(err) } output.password = string(out) @@ -156,5 +156,6 @@ } } + file.Close() return output, err } ++++++ vendor.tar.gz ++++++ ++++ 8693 lines of diff (skipped)