--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: unblock: golang-gopkg-yaml.v3/3.0.0~git20200121.a6ecf24-3
- From: Shengjing Zhu <zhsj@debian.org>
- Date: Sat, 17 Apr 2021 00:01:09 +0800
- Message-id: <YHm0xabDx4V/ds1Q@local.zhsj.me>
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: zhsj@debian.org
Please unblock package golang-gopkg-yaml.v3
[ Reason ]
Fix FTBFS on 32 bit arch
[ Impact ]
The package FTBFS on 32 bit arch.
And packages that build-dep on it _may_ have wrong behaviour on 32 bit arch.
But I think the underlying issue _may_ be minor.
[ Tests ]
Upstream unit tests, and autopkgtest on 32 bit arch.
[ Risks ]
Change is trivial. Key package.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
None
unblock golang-gopkg-yaml.v3/3.0.0~git20200121.a6ecf24-3
diff -Nru golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/changelog golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/changelog
--- golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/changelog 2020-06-02 02:10:00.000000000 +0800
+++ golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/changelog 2021-04-16 00:25:23.000000000 +0800
@@ -1,3 +1,15 @@
+golang-gopkg-yaml.v3 (3.0.0~git20200121.a6ecf24-3) unstable; urgency=medium
+
+ * Team upload.
+ * Add patch to fix failed test on 32 bit arch (Closes: #987005)
+ * Update Section to golang
+ * Update Standards-Version to 4.5.1 (no changes)
+ * Remove test dependency from -dev package
+ * Remove redundant line in d/rules
+ * Fix uscan watch file
+
+ -- Shengjing Zhu <zhsj@debian.org> Fri, 16 Apr 2021 00:25:23 +0800
+
golang-gopkg-yaml.v3 (3.0.0~git20200121.a6ecf24-2) unstable; urgency=medium
* Team upload.
diff -Nru golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/control golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/control
--- golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/control 2020-06-02 02:10:00.000000000 +0800
+++ golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/control 2021-04-16 00:25:23.000000000 +0800
@@ -1,14 +1,14 @@
Source: golang-gopkg-yaml.v3
Maintainer: Debian Go Packaging Team <team+pkg-go@tracker.debian.org>
-Uploaders: Daniel Swarbrick <daniel.swarbrick@cloud.ionos.com>
-Section: devel
+Uploaders: Daniel Swarbrick <daniel.swarbrick@cloud.ionos.com>,
+Section: golang
Testsuite: autopkgtest-pkg-go
Priority: optional
Build-Depends: debhelper-compat (= 12),
- dh-golang,
+ dh-golang (>= 1.39),
golang-any,
golang-gopkg-check.v1-dev,
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
Rules-Requires-Root: no
Vcs-Browser: https://salsa.debian.org/go-team/packages/golang-gopkg-yaml.v3
Vcs-Git: https://salsa.debian.org/go-team/packages/golang-gopkg-yaml.v3.git
@@ -17,8 +17,7 @@
Package: golang-gopkg-yaml.v3-dev
Architecture: all
-Depends: golang-gopkg-check.v1-dev,
- ${misc:Depends},
+Depends: ${misc:Depends},
${shlibs:Depends},
Description: YAML support for the Go language
The yaml package enables Go programs to very comfortably encode and decode
diff -Nru golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/patches/0001-Fix-0b-on-32-bit-systems.patch golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/patches/0001-Fix-0b-on-32-bit-systems.patch
--- golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/patches/0001-Fix-0b-on-32-bit-systems.patch 1970-01-01 08:00:00.000000000 +0800
+++ golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/patches/0001-Fix-0b-on-32-bit-systems.patch 2021-04-16 00:25:23.000000000 +0800
@@ -0,0 +1,48 @@
+From: Shengjing Zhu <zhsj@debian.org>
+Date: Fri, 16 Apr 2021 00:40:09 +0800
+Subject: Fix -0b on 32-bit systems
+
+Origin: backport, https://github.com/go-yaml/yaml/pull/442
+---
+ decode_test.go | 7 ++++---
+ resolve.go | 2 +-
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/decode_test.go b/decode_test.go
+index 51f5070..9cac74c 100644
+--- a/decode_test.go
++++ b/decode_test.go
+@@ -175,9 +175,6 @@ var unmarshalTests = []struct {
+ }, {
+ "bin: -0b101010",
+ map[string]interface{}{"bin": -42},
+- }, {
+- "bin: -0b1000000000000000000000000000000000000000000000000000000000000000",
+- map[string]interface{}{"bin": -9223372036854775808},
+ }, {
+ "decimal: +685_230",
+ map[string]int{"decimal": 685230},
+@@ -357,6 +354,10 @@ var unmarshalTests = []struct {
+ "int64_min: -9223372036854775808",
+ map[string]int64{"int64_min": math.MinInt64},
+ },
++ {
++ "int64_min_base2: -0b1000000000000000000000000000000000000000000000000000000000000000",
++ map[string]int64{"int64_min_base2": math.MinInt64},
++ },
+ {
+ "int64_neg_base2: -0b111111111111111111111111111111111111111111111111111111111111111",
+ map[string]int64{"int64_neg_base2": -math.MaxInt64},
+diff --git a/resolve.go b/resolve.go
+index 64ae888..1b7d8c3 100644
+--- a/resolve.go
++++ b/resolve.go
+@@ -223,7 +223,7 @@ func resolve(tag string, in string) (rtag string, out interface{}) {
+ } else if strings.HasPrefix(plain, "-0b") {
+ intv, err := strconv.ParseInt("-"+plain[3:], 2, 64)
+ if err == nil {
+- if true || intv == int64(int(intv)) {
++ if intv == int64(int(intv)) {
+ return intTag, int(intv)
+ } else {
+ return intTag, intv
diff -Nru golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/patches/series golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/patches/series
--- golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/patches/series 1970-01-01 08:00:00.000000000 +0800
+++ golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/patches/series 2021-04-16 00:25:23.000000000 +0800
@@ -0,0 +1 @@
+0001-Fix-0b-on-32-bit-systems.patch
diff -Nru golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/rules golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/rules
--- golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/rules 2020-06-02 02:10:00.000000000 +0800
+++ golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/rules 2021-04-16 00:25:23.000000000 +0800
@@ -1,6 +1,4 @@
#!/usr/bin/make -f
-export DH_GOLANG_INSTALL_EXTRA := go.mod
-
%:
dh $@ --buildsystem=golang --with=golang
diff -Nru golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/watch golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/watch
--- golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/watch 2020-06-02 02:10:00.000000000 +0800
+++ golang-gopkg-yaml.v3-3.0.0~git20200121.a6ecf24/debian/watch 2021-04-16 00:25:23.000000000 +0800
@@ -1,3 +1,4 @@
version=4
-opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/yaml-$1\.tar\.gz/ \
- https://github.com/go-yaml/yaml/tags .*/v?(\d\S+)\.tar\.gz
+opts="mode=git, pgpmode=none, pretty=3.0~git%cd.%h" \
+ https://github.com/go-yaml/yaml \
+ heads/v3
--- End Message ---