Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian....@packages.debian.org
Usertags: pu
X-Debbugs-Cc: Debian Go Packaging Team <team+pkg...@tracker.debian.org>
* Fix building on newer linux kernels (Closes: #1002231)
Test-only change to fix FTBFS caused by kernel change already
backported to 5.10.
Plus some trivial packaging changes that are harmless enough to
use the package from bookworm instead of backporting the patch.
diff -Nru golang-github-pkg-term-1.1.0/debian/changelog
golang-github-pkg-term-1.1.0/debian/changelog
--- golang-github-pkg-term-1.1.0/debian/changelog 2020-12-19
09:34:44.000000000 +0200
+++ golang-github-pkg-term-1.1.0/debian/changelog 2022-08-25
16:16:50.000000000 +0300
@@ -1,3 +1,24 @@
+golang-github-pkg-term (1.1.0-4~deb11u1) bullseye; urgency=medium
+
+ * Non-maintainer upload.
+ * Rebuild for bullseye.
+
+ -- Adrian Bunk <b...@debian.org> Thu, 25 Aug 2022 16:16:50 +0300
+
+golang-github-pkg-term (1.1.0-4) unstable; urgency=medium
+
+ * Team Upload
+
+ [ Aloïs Micard ]
+ * d/control:
+ - Update my uploader email.
+ - Bump Standards-Version.
+
+ [ Stephen Gelman ]
+ * Fix building on newer linux kernels (Closes: #1002231)
+
+ -- Stephen Gelman <ssg...@debian.org> Thu, 13 Jan 2022 18:03:22 -0600
+
golang-github-pkg-term (1.1.0-3) unstable; urgency=medium
* Team upload.
diff -Nru golang-github-pkg-term-1.1.0/debian/control
golang-github-pkg-term-1.1.0/debian/control
--- golang-github-pkg-term-1.1.0/debian/control 2020-12-19 09:33:26.000000000
+0200
+++ golang-github-pkg-term-1.1.0/debian/control 2022-01-14 00:07:55.000000000
+0200
@@ -2,12 +2,12 @@
Section: devel
Priority: optional
Maintainer: Debian Go Packaging Team <team+pkg...@tracker.debian.org>
-Uploaders: Aloïs Micard <al...@micard.lu>
+Uploaders: Aloïs Micard <creekor...@debian.org>
Build-Depends: debhelper-compat (= 13),
dh-golang,
golang-any,
golang-golang-x-sys-dev
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0
Homepage: https://github.com/pkg/term
Vcs-Browser: https://salsa.debian.org/go-team/packages/golang-github-pkg-term
Vcs-Git: https://salsa.debian.org/go-team/packages/golang-github-pkg-term.git
diff -Nru golang-github-pkg-term-1.1.0/debian/gitlab-ci.yml
golang-github-pkg-term-1.1.0/debian/gitlab-ci.yml
--- golang-github-pkg-term-1.1.0/debian/gitlab-ci.yml 1970-01-01
02:00:00.000000000 +0200
+++ golang-github-pkg-term-1.1.0/debian/gitlab-ci.yml 2022-01-14
00:07:55.000000000 +0200
@@ -0,0 +1,6 @@
+# auto-generated, DO NOT MODIFY.
+# The authoritative copy of this file lives at:
+#
https://salsa.debian.org/go-team/infra/pkg-go-tools/blob/master/config/gitlabciyml.go
+---
+include:
+ -
https://salsa.debian.org/go-team/infra/pkg-go-tools/-/raw/master/pipeline/test-archive.yml
diff -Nru
golang-github-pkg-term-1.1.0/debian/patches/0002-enotty-newer-kernels.patch
golang-github-pkg-term-1.1.0/debian/patches/0002-enotty-newer-kernels.patch
--- golang-github-pkg-term-1.1.0/debian/patches/0002-enotty-newer-kernels.patch
1970-01-01 02:00:00.000000000 +0200
+++ golang-github-pkg-term-1.1.0/debian/patches/0002-enotty-newer-kernels.patch
2022-01-14 02:03:22.000000000 +0200
@@ -0,0 +1,25 @@
+Description: As of torvalds/linux@1b8b20868a6d64cfe8174a21b25b74367bdf0560,
+ unsupported ioctls now return ENOTTY instead of EINVAL. This change was
+ also backported to the 5.10 stable branch, so it's a problem on the
+ current release of many Linux distros now.
+Forwarded: https://github.com/pkg/term/pull/71
+Author: Stephen Gelman <ssg...@debian.org>
+Last-Update: 2022-01-13
+---
+This patch header follows DEP-4: http://dep.debian.net/deps/dep3/
+--- a/termios/termios_test.go
++++ b/termios/termios_test.go
+@@ -1,3 +1,4 @@
++//go:build !windows
+ // +build !windows
+
+ package termios
+@@ -165,7 +166,7 @@
+
+ // some ioctls fail against char devices if they do not
+ // support a particular feature
+- if (runtime.GOOS == "darwin" && err == unix.ENOTTY) || (runtime.GOOS ==
"linux" && err == unix.EINVAL) {
++ if ((runtime.GOOS == "darwin" || runtime.GOOS == "linux") && err ==
unix.ENOTTY) || (runtime.GOOS == "linux" && err == unix.EINVAL) {
+ t.Skip(err)
+ }
+ }
diff -Nru golang-github-pkg-term-1.1.0/debian/patches/series
golang-github-pkg-term-1.1.0/debian/patches/series
--- golang-github-pkg-term-1.1.0/debian/patches/series 2020-12-19
09:34:30.000000000 +0200
+++ golang-github-pkg-term-1.1.0/debian/patches/series 2022-01-14
02:01:39.000000000 +0200
@@ -1 +1,2 @@
0001-fix_ppc_build.patch
+0002-enotty-newer-kernels.patch
