Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xmpp-dns for openSUSE:Factory
checked in at 2024-04-08 17:39:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xmpp-dns (Old)
and /work/SRC/openSUSE:Factory/.xmpp-dns.new.1905 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmpp-dns"
Mon Apr 8 17:39:34 2024 rev:11 rq:1166081 version:0.3.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/xmpp-dns/xmpp-dns.changes 2023-12-28
23:02:20.100353749 +0100
+++ /work/SRC/openSUSE:Factory/.xmpp-dns.new.1905/xmpp-dns.changes
2024-04-08 17:51:55.184905419 +0200
@@ -1,0 +2,6 @@
+Mon Apr 8 06:16:00 UTC 2024 - Michael Vetter <mvet...@suse.com>
+
+- Update to 0.3.11:
+ * Properly detect all stream errors.
+
+-------------------------------------------------------------------
Old:
----
xmpp-dns-0.3.10.tar.gz
New:
----
xmpp-dns-0.3.11.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xmpp-dns.spec ++++++
--- /var/tmp/diff_new_pack.YSQZTn/_old 2024-04-08 17:51:55.664923135 +0200
+++ /var/tmp/diff_new_pack.YSQZTn/_new 2024-04-08 17:51:55.668923283 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xmpp-dns
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: xmpp-dns
-Version: 0.3.10
+Version: 0.3.11
Release: 0
Summary: A CLI tool to check XMPP SRV records
License: BSD-2-Clause
++++++ _service ++++++
--- /var/tmp/diff_new_pack.YSQZTn/_old 2024-04-08 17:51:55.692924169 +0200
+++ /var/tmp/diff_new_pack.YSQZTn/_new 2024-04-08 17:51:55.696924316 +0200
@@ -3,7 +3,7 @@
<param name="url">https://salsa.debian.org/mdosch/xmpp-dns.git</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v0.3.10</param>
+ <param name="revision">v0.3.11</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">disable</param>
<param name="versionrewrite-pattern">v(.*)</param>
++++++ vendor.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/modules.txt new/vendor/modules.txt
--- old/vendor/modules.txt 2023-12-26 09:09:58.000000000 +0100
+++ new/vendor/modules.txt 2024-04-08 08:15:36.000000000 +0200
@@ -1,6 +1,6 @@
# github.com/pborman/getopt/v2 v2.1.0
## explicit
github.com/pborman/getopt/v2
-# salsa.debian.org/mdosch/xmppsrv v0.2.5
+# salsa.debian.org/mdosch/xmppsrv v0.2.6
## explicit
salsa.debian.org/mdosch/xmppsrv
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/salsa.debian.org/mdosch/xmppsrv/CHANGELOG.md
new/vendor/salsa.debian.org/mdosch/xmppsrv/CHANGELOG.md
--- old/vendor/salsa.debian.org/mdosch/xmppsrv/CHANGELOG.md 2023-12-26
09:09:58.000000000 +0100
+++ new/vendor/salsa.debian.org/mdosch/xmppsrv/CHANGELOG.md 2024-04-08
08:15:36.000000000 +0200
@@ -1,12 +1,16 @@
# Changelog
+## [0.2.6] 2024-01-19
+### Changed
+- Don't return an error if either of the xmpp or xmpps look ups returns a
result.
+
## [0.2.5] 2023-03-27
### Changed
- Don't use CNAMES of xmpp domain for xmpp SRV lookups.
## [0.2.4]
### Changed
-- The changes are the same as in 0.2.3 but a new release is created as not all
changes were in 0.2.3 due to a misstake in the release process.
+- The changes are the same as in 0.2.3 but a new release is created as not all
changes were in 0.2.3 due to a mistake in the release process.
## [0.2.3]
### Added
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/salsa.debian.org/mdosch/xmppsrv/LICENSE
new/vendor/salsa.debian.org/mdosch/xmppsrv/LICENSE
--- old/vendor/salsa.debian.org/mdosch/xmppsrv/LICENSE 2023-12-26
09:09:58.000000000 +0100
+++ new/vendor/salsa.debian.org/mdosch/xmppsrv/LICENSE 2024-04-08
08:15:36.000000000 +0200
@@ -1,6 +1,6 @@
BSD 2-Clause License
-Copyright (c) 2021, Martin Dosch
+Copyright (c) Martin Dosch
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/salsa.debian.org/mdosch/xmppsrv/xmppsrv.go
new/vendor/salsa.debian.org/mdosch/xmppsrv/xmppsrv.go
--- old/vendor/salsa.debian.org/mdosch/xmppsrv/xmppsrv.go 2023-12-26
09:09:58.000000000 +0100
+++ new/vendor/salsa.debian.org/mdosch/xmppsrv/xmppsrv.go 2024-04-08
08:15:36.000000000 +0200
@@ -1,4 +1,4 @@
-// Copyright 2021 Martin Dosch.
+// Copyright Martin Dosch.
// Use of this source code is governed by the BSD-2-clause
// license that can be found in the LICENSE file.
@@ -141,7 +141,8 @@
}
func getSRVDoT(server string, srvType string,
- resolver string) ([]SRV, error) {
+ resolver string,
+) ([]SRV, error) {
var records []SRV
var err error
var d tls.Dialer
@@ -168,16 +169,19 @@
}
if len(addr) > 0 {
for _, adr := range addr {
- records = append(records, SRV{srvType,
+ records = append(records, SRV{
+ srvType,
adr.Target, adr.Port, adr.Priority,
- adr.Weight})
+ adr.Weight,
+ })
}
}
return records, err
}
func getSRVCustomResolver(server string, srvType string,
- resolver string) ([]SRV, error) {
+ resolver string,
+) ([]SRV, error) {
var records []SRV
var err error
var d net.Dialer
@@ -197,9 +201,11 @@
}
if len(addr) > 0 {
for _, adr := range addr {
- records = append(records, SRV{srvType,
+ records = append(records, SRV{
+ srvType,
adr.Target, adr.Port, adr.Priority,
- adr.Weight})
+ adr.Weight,
+ })
}
}
return records, err
@@ -216,9 +222,11 @@
}
if len(addr) > 0 {
for _, adr := range addr {
- records = append(records, SRV{srvType,
+ records = append(records, SRV{
+ srvType,
adr.Target, adr.Port, adr.Priority,
- adr.Weight})
+ adr.Weight,
+ })
}
}
return records, err
@@ -372,26 +380,21 @@
default:
records = append(records, records2...)
}
- switch {
- case err != nil && err2 != nil:
+ if err != nil && err2 != nil {
return records, fmt.Errorf("failure in xmpp-client lookup:
%v\n"+
"failure in xmpps-client lookup: %v", err, err2)
- case err != nil:
- return records, err
- case err2 != nil:
- return records, err2
}
switch len(records) {
case 0:
return records, errors.New("no client records found")
case 1:
- return records, err
+ return records, nil
default:
// Sort xmpp- and xmpps-client SRV records according to the
priority
// and weight.
sort.Sort(byPriority(records))
}
- return records, err
+ return records, nil
}
// LookupClient returns the xmpp-client and xmpps-client SRV records sorted by
@@ -427,26 +430,21 @@
default:
records = append(records, records2...)
}
- switch {
- case err != nil && err2 != nil:
+ if err != nil && err2 != nil {
return records, fmt.Errorf("failure in xmpp-client lookup:
%v\n"+
"failure in xmpps-client lookup: %v", err, err2)
- case err != nil:
- return records, err
- case err2 != nil:
- return records, err2
}
switch len(records) {
case 0:
return records, errors.New("no client records found")
case 1:
- return records, err
+ return records, nil
default:
// Sort xmpp- and xmpps-client SRV records according to the
priority
// and weight.
sort.Sort(byPriority(records))
}
- return records, err
+ return records, nil
}
// LookupServer returns the xmpp-server and xmpps-server SRV records sorted by
@@ -466,26 +464,21 @@
default:
records = append(records, records2...)
}
- switch {
- case err != nil && err2 != nil:
+ if err != nil && err2 != nil {
return records, fmt.Errorf("failure in xmpp-server lookup:
%v\n"+
"failure in xmpps-server lookup: %v", err, err2)
- case err != nil:
- return records, err
- case err2 != nil:
- return records, err2
}
switch len(records) {
case 0:
return records, errors.New("no server records found")
case 1:
- return records, err
+ return records, nil
default:
// Sort xmpp- and xmpps-server SRV records according to the
priority
// and weight.
sort.Sort(byPriority(records))
}
- return records, err
+ return records, nil
}
// LookupServer returns the xmpp-server and xmpps-server SRV records sorted by
@@ -523,24 +516,19 @@
default:
records = append(records, records2...)
}
- switch {
- case err != nil && err2 != nil:
+ if err != nil && err2 != nil {
return records, fmt.Errorf("failure in xmpp-server lookup:
%v\n"+
"failure in xmpps-server lookup: %v", err, err2)
- case err != nil:
- return records, err
- case err2 != nil:
- return records, err2
}
switch len(records) {
case 0:
return records, errors.New("no server records found")
case 1:
- return records, err
+ return records, nil
default:
// Sort xmpp- and xmpps-server SRV records according to the
priority
// and weight.
sort.Sort(byPriority(records))
}
- return records, err
+ return records, nil
}
++++++ xmpp-dns-0.3.10.tar.gz -> xmpp-dns-0.3.11.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xmpp-dns-0.3.10/.gitlab-ci.yml
new/xmpp-dns-0.3.11/.gitlab-ci.yml
--- old/xmpp-dns-0.3.10/.gitlab-ci.yml 2023-12-25 19:36:26.000000000 +0100
+++ new/xmpp-dns-0.3.11/.gitlab-ci.yml 2024-04-07 13:22:46.000000000 +0200
@@ -53,6 +53,7 @@
- win386/xmpp-dns.exe
- win64/xmpp-dns.exe
- CI_JOB_ID.txt
+ expire_in: 2 years
release:
stage: release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xmpp-dns-0.3.10/CHANGELOG.md
new/xmpp-dns-0.3.11/CHANGELOG.md
--- old/xmpp-dns-0.3.10/CHANGELOG.md 2023-12-25 19:36:26.000000000 +0100
+++ new/xmpp-dns-0.3.11/CHANGELOG.md 2024-04-07 13:22:46.000000000 +0200
@@ -1,5 +1,9 @@
# Changelog
+## [0.3.11] 2024-04-07
+### Changed
+- Properly detect all stream errors.
+
## [0.3.10] 2023-12-25
### Changed
- Fix stream initialization bug with StartTLS (thanks moparisthebest).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xmpp-dns-0.3.10/go.mod new/xmpp-dns-0.3.11/go.mod
--- old/xmpp-dns-0.3.10/go.mod 2023-12-25 19:36:26.000000000 +0100
+++ new/xmpp-dns-0.3.11/go.mod 2024-04-07 13:22:46.000000000 +0200
@@ -4,5 +4,5 @@
require (
github.com/pborman/getopt/v2 v2.1.0
- salsa.debian.org/mdosch/xmppsrv v0.2.5
+ salsa.debian.org/mdosch/xmppsrv v0.2.6
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xmpp-dns-0.3.10/go.sum new/xmpp-dns-0.3.11/go.sum
--- old/xmpp-dns-0.3.10/go.sum 2023-12-25 19:36:26.000000000 +0100
+++ new/xmpp-dns-0.3.11/go.sum 2024-04-07 13:22:46.000000000 +0200
@@ -1,4 +1,4 @@
github.com/pborman/getopt/v2 v2.1.0
h1:eNfR+r+dWLdWmV8g5OlpyrTYHkhVNxHBdN2cCrJmOEA=
github.com/pborman/getopt/v2 v2.1.0/go.mod
h1:4NtW75ny4eBw9fO1bhtNdYTlZKYX5/tBLtsOpwKIKd0=
-salsa.debian.org/mdosch/xmppsrv v0.2.5
h1:ACPk8EhmCAUMl59TnGe5kvvwSnW065CJrhN7uvt25xY=
-salsa.debian.org/mdosch/xmppsrv v0.2.5/go.mod
h1:udWXnWFa9zkcyN9YSB/u44BCnnRDpeQ0eDy3MVLjHZQ=
+salsa.debian.org/mdosch/xmppsrv v0.2.6
h1:+S7ZxRP7BQwQHGJvYhr408UD0XGAd7+RZaVA/xN4EIc=
+salsa.debian.org/mdosch/xmppsrv v0.2.6/go.mod
h1:udWXnWFa9zkcyN9YSB/u44BCnnRDpeQ0eDy3MVLjHZQ=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xmpp-dns-0.3.10/main.go new/xmpp-dns-0.3.11/main.go
--- old/xmpp-dns-0.3.10/main.go 2023-12-25 19:36:26.000000000 +0100
+++ new/xmpp-dns-0.3.11/main.go 2024-04-07 13:22:46.000000000 +0200
@@ -21,7 +21,7 @@
)
const (
- version = "0.3.10"
+ version = "0.3.11"
)
// Created with https://github.com/miku/zek
@@ -37,12 +37,9 @@
ID string `xml:"id,attr"`
To string `xml:"to,attr"`
Error struct {
- Chardata string `xml:",chardata"`
- PolicyViolation struct {
- Text string `xml:",chardata"`
- Xmlns string `xml:"xmlns,attr"`
- } `xml:"policy-violation"`
- Text struct {
+ Chardata string `xml:",chardata"`
+ Any xml.Name `xml:",any"`
+ Text struct {
Text string `xml:",chardata"`
Xmlns string `xml:"xmlns,attr"`
} `xml:"text"`
@@ -350,11 +347,9 @@
default:
fmt.Println("StartTLS:", statusNOK)
if err.Error() == "EOF" {
- // TODO: Properly check for all
possible server errors
- // instead of only checking for
"policy-violation".
err = xml.Unmarshal(buf,
&serverStreamError)
if err == nil {
- fmt.Println("Server sent
policy-violation:",
+ fmt.Printf("StreamError: %s:
%s\n", serverStreamError.Error.Any.Local,
serverStreamError.Error.Text.Text)
} else {
fmt.Println("Server closed
connection.")
@@ -397,7 +392,7 @@
if err.Error() == "EOF" {
err = xml.Unmarshal(buf, &serverStreamError)
if err == nil {
- fmt.Println("Server sent
policy-violation:",
+ fmt.Printf("StreamError: %s: %s\n",
serverStreamError.Error.Any.Local,
serverStreamError.Error.Text.Text)
} else {
fmt.Println("Server closed connection.")
