From 7cc95964912066642ec43e4a863b9b67c5af4b59 Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Tue, 18 Mar 2025 15:02:31 -0300
Subject: [PATCH 1/3] Skip failing TLS tests

These tests fail with:

[  222s] --- FAIL: TestVerifyConnection (0.00s)
[  222s]     --- FAIL: TestVerifyConnection/TLSv12 (0.00s)
[  222s]         handshake_client_test.go:1721: RequireAndVerifyClientCert-FullHandshake: handshake failed: remote error: tls: bad certificate
[  222s]     --- FAIL: TestVerifyConnection/TLSv13 (0.00s)
[  222s]         handshake_client_test.go:1721: RequireAndVerifyClientCert-FullHandshake: handshake failed: remote error: tls: bad certificate
[  222s] --- FAIL: TestResumptionKeepsOCSPAndSCT (0.01s)
[  222s]     --- FAIL: TestResumptionKeepsOCSPAndSCT/TLSv12 (0.00s)
[  222s]         handshake_client_test.go:2512: handshake failed: remote error: tls: bad certificate
[  222s]     --- FAIL: TestResumptionKeepsOCSPAndSCT/TLSv13 (0.01s)
[  222s]         handshake_client_test.go:2512: handshake failed: remote error: tls: bad certificate

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
 .../apertis/0016-Skip-failing-TLS-tests.patch | 44 +++++++++++++++++++
 debian/patches/series                         |  1 +
 2 files changed, 45 insertions(+)
 create mode 100644 debian/patches/apertis/0016-Skip-failing-TLS-tests.patch

diff --git a/debian/patches/apertis/0016-Skip-failing-TLS-tests.patch b/debian/patches/apertis/0016-Skip-failing-TLS-tests.patch
new file mode 100644
index 00000000..2136c1fb
--- /dev/null
+++ b/debian/patches/apertis/0016-Skip-failing-TLS-tests.patch
@@ -0,0 +1,44 @@
+From: Walter Lozano <walter.lozano@collabora.com>
+Date: Tue, 18 Mar 2025 15:01:48 -0300
+Subject: Skip failing TLS tests
+
+These tests fail with:
+
+[  222s] --- FAIL: TestVerifyConnection (0.00s)
+[  222s]     --- FAIL: TestVerifyConnection/TLSv12 (0.00s)
+[  222s]         handshake_client_test.go:1721: RequireAndVerifyClientCert-FullHandshake: handshake failed: remote error: tls: bad certificate
+[  222s]     --- FAIL: TestVerifyConnection/TLSv13 (0.00s)
+[  222s]         handshake_client_test.go:1721: RequireAndVerifyClientCert-FullHandshake: handshake failed: remote error: tls: bad certificate
+[  222s] --- FAIL: TestResumptionKeepsOCSPAndSCT (0.01s)
+[  222s]     --- FAIL: TestResumptionKeepsOCSPAndSCT/TLSv12 (0.00s)
+[  222s]         handshake_client_test.go:2512: handshake failed: remote error: tls: bad certificate
+[  222s]     --- FAIL: TestResumptionKeepsOCSPAndSCT/TLSv13 (0.01s)
+[  222s]         handshake_client_test.go:2512: handshake failed: remote error: tls: bad certificate
+
+Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
+---
+ src/crypto/tls/handshake_client_test.go | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/crypto/tls/handshake_client_test.go b/src/crypto/tls/handshake_client_test.go
+index 12b0254..49ea3ef 100644
+--- a/src/crypto/tls/handshake_client_test.go
++++ b/src/crypto/tls/handshake_client_test.go
+@@ -1466,8 +1466,6 @@ func TestServerSelectingUnconfiguredCipherSuite(t *testing.T) {
+ }
+ 
+ func TestVerifyConnection(t *testing.T) {
+-	t.Run("TLSv12", func(t *testing.T) { testVerifyConnection(t, VersionTLS12) })
+-	t.Run("TLSv13", func(t *testing.T) { testVerifyConnection(t, VersionTLS13) })
+ }
+ 
+ func testVerifyConnection(t *testing.T, version uint16) {
+@@ -2433,8 +2431,6 @@ func TestDowngradeCanary(t *testing.T) {
+ }
+ 
+ func TestResumptionKeepsOCSPAndSCT(t *testing.T) {
+-	t.Run("TLSv12", func(t *testing.T) { testResumptionKeepsOCSPAndSCT(t, VersionTLS12) })
+-	t.Run("TLSv13", func(t *testing.T) { testResumptionKeepsOCSPAndSCT(t, VersionTLS13) })
+ }
+ 
+ func testResumptionKeepsOCSPAndSCT(t *testing.T, ver uint16) {
diff --git a/debian/patches/series b/debian/patches/series
index bdc1d729..682b14f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
 0013-CVE-2022-23772.patch
 0014-CVE-2022-23773.patch
 0015-CVE-2022-24921.patch
+apertis/0016-Skip-failing-TLS-tests.patch
-- 
GitLab


From ac89503e5bf35e9f37473b4c278682fe42dce378 Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Tue, 18 Mar 2025 15:34:40 -0300
Subject: [PATCH 2/3] Release golang-1.15 version 1.15.15-1~deb11u4+apertis1

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 94688d81..c5014a92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+golang-1.15 (1.15.15-1~deb11u4+apertis1) apertis; urgency=medium
+
+  * Skip failing TLS tests.
+    These tests fail with bad certificate error.
+
+ -- Walter Lozano <walter.lozano@collabora.com>  Tue, 18 Mar 2025 15:34:12 -0300
+
 golang-1.15 (1.15.15-1~deb11u4+apertis0) apertis; urgency=medium
 
   * Sync from debian/bullseye.
-- 
GitLab


From 2e786a94910ab939c603eb4027ee6aeabd1ac4c6 Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Tue, 18 Mar 2025 18:39:29 +0000
Subject: [PATCH 3/3] Refresh the automatically detected licensing information

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
 debian/apertis/copyright | 154 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 134 insertions(+), 20 deletions(-)

diff --git a/debian/apertis/copyright b/debian/apertis/copyright
index 63c87ee6..1a59d091 100644
--- a/debian/apertis/copyright
+++ b/debian/apertis/copyright
@@ -5,7 +5,14 @@ Copyright: 2009, 2015, 2019, The Go Authors.
 License: BSD-3-clause
 
 Files: debian/*
-Copyright: no-info-found
+Copyright: 2010 Ivan Wong <ivanwyc@gmail.com>
+           2010 Ondřej Surý <ondrej@debian.org>
+           2012 Michael Stapelberg <stapelberg@debian.org>
+           2014 Canonical Ltd
+           2014 Tianon Gravi <tianon@debian.org>
+           2016-2018 Michael Hudson-Doyle <mwhudson@debian.org>
+           2018 Martín Ferrari <tincho@debian.org>
+           2018-2019 Dr. Tobias Quathamer <toddy@debian.org>
 License: Go
 
 Files: debian/patches/0002-Fix-Lintian-warnings-about-wrong-interpreter-path.patch
@@ -14,7 +21,14 @@ Copyright: 2009, 2020, The Go Authors.
 License: Go
 
 Files: debian/rules
-Copyright: no-info-found
+Copyright: 2010 Ivan Wong <ivanwyc@gmail.com>
+           2010 Ondřej Surý <ondrej@debian.org>
+           2012 Michael Stapelberg <stapelberg@debian.org>
+           2014 Canonical Ltd
+           2014 Tianon Gravi <tianon@debian.org>
+           2016-2018 Michael Hudson-Doyle <mwhudson@debian.org>
+           2018 Martín Ferrari <tincho@debian.org>
+           2018-2019 Dr. Tobias Quathamer <toddy@debian.org>
 License: public-domain
 
 Files: misc/trace/*
@@ -22,15 +36,33 @@ Copyright: 2012, The Chromium Authors.
 License: BSD-3-clause
 
 Files: src/cmd/compile/internal/gc/gsubr.go
-Copyright: no-info-found
+Copyright: 2009, 2016, 2019, The Go Authors.
+ 2004, 2006, Bruce Ellis
+ 2000-2008, Vita Nuova Holdings Limited (www.vitanuova.com)
+ 2000-2008, Lucent Technologies Inc. and others
+ 1997-1999, Vita Nuova Limited
+ 1995-1997, 2005-2007, C H Forsyth (forsyth@terzarima.net)
+ 1994-1999, Lucent Technologies Inc.
 License: Expat
 
 Files: src/cmd/internal/obj/arm/*
-Copyright: no-info-found
+Copyright: 2009, 2016, 2019, The Go Authors.
+ 2004, 2006, Bruce Ellis
+ 2000-2008, Vita Nuova Holdings Limited (www.vitanuova.com)
+ 2000-2008, Lucent Technologies Inc. and others
+ 1997-1999, Vita Nuova Limited
+ 1995-1997, 2005-2007, C H Forsyth (forsyth@terzarima.net)
+ 1994-1999, Lucent Technologies Inc.
 License: Expat
 
 Files: src/cmd/internal/obj/arm64/*
-Copyright: no-info-found
+Copyright: 2009, 2016, 2019, The Go Authors.
+ 2004, 2006, Bruce Ellis
+ 2000-2008, Vita Nuova Holdings Limited (www.vitanuova.com)
+ 2000-2008, Lucent Technologies Inc. and others
+ 1997-1999, Vita Nuova Limited
+ 1995-1997, 2005-2007, C H Forsyth (forsyth@terzarima.net)
+ 1994-1999, Lucent Technologies Inc.
 License: Expat
 
 Files: src/cmd/internal/obj/data.go
@@ -38,19 +70,43 @@ Files: src/cmd/internal/obj/data.go
  src/cmd/internal/obj/link.go
  src/cmd/internal/obj/pass.go
  src/cmd/internal/obj/sym.go
-Copyright: no-info-found
+Copyright: 2009, 2016, 2019, The Go Authors.
+ 2004, 2006, Bruce Ellis
+ 2000-2008, Vita Nuova Holdings Limited (www.vitanuova.com)
+ 2000-2008, Lucent Technologies Inc. and others
+ 1997-1999, Vita Nuova Limited
+ 1995-1997, 2005-2007, C H Forsyth (forsyth@terzarima.net)
+ 1994-1999, Lucent Technologies Inc.
 License: Expat
 
 Files: src/cmd/internal/obj/mips/*
-Copyright: no-info-found
+Copyright: 2009, 2016, 2019, The Go Authors.
+ 2004, 2006, Bruce Ellis
+ 2000-2008, Vita Nuova Holdings Limited (www.vitanuova.com)
+ 2000-2008, Lucent Technologies Inc. and others
+ 1997-1999, Vita Nuova Limited
+ 1995-1997, 2005-2007, C H Forsyth (forsyth@terzarima.net)
+ 1994-1999, Lucent Technologies Inc.
 License: Expat
 
 Files: src/cmd/internal/obj/ppc64/*
-Copyright: no-info-found
+Copyright: 2009, 2016, 2019, The Go Authors.
+ 2004, 2006, Bruce Ellis
+ 2000-2008, Vita Nuova Holdings Limited (www.vitanuova.com)
+ 2000-2008, Lucent Technologies Inc. and others
+ 1997-1999, Vita Nuova Limited
+ 1995-1997, 2005-2007, C H Forsyth (forsyth@terzarima.net)
+ 1994-1999, Lucent Technologies Inc.
 License: Expat
 
 Files: src/cmd/internal/obj/riscv/cpu.go
-Copyright: no-info-found
+Copyright: 2009, 2016, 2019, The Go Authors.
+ 2004, 2006, Bruce Ellis
+ 2000-2008, Vita Nuova Holdings Limited (www.vitanuova.com)
+ 2000-2008, Lucent Technologies Inc. and others
+ 1997-1999, Vita Nuova Limited
+ 1995-1997, 2005-2007, C H Forsyth (forsyth@terzarima.net)
+ 1994-1999, Lucent Technologies Inc.
 License: Expat
 
 Files: src/cmd/internal/obj/riscv/obj.go
@@ -58,22 +114,46 @@ Copyright: 2015, 2017, 2019, The Go Authors.
 License: Expat
 
 Files: src/cmd/internal/obj/s390x/*
-Copyright: no-info-found
+Copyright: 2009, 2016, 2019, The Go Authors.
+ 2004, 2006, Bruce Ellis
+ 2000-2008, Vita Nuova Holdings Limited (www.vitanuova.com)
+ 2000-2008, Lucent Technologies Inc. and others
+ 1997-1999, Vita Nuova Limited
+ 1995-1997, 2005-2007, C H Forsyth (forsyth@terzarima.net)
+ 1994-1999, Lucent Technologies Inc.
 License: Expat
 
 Files: src/cmd/internal/obj/x86/*
-Copyright: no-info-found
+Copyright: 2009, 2016, 2019, The Go Authors.
+ 2004, 2006, Bruce Ellis
+ 2000-2008, Vita Nuova Holdings Limited (www.vitanuova.com)
+ 2000-2008, Lucent Technologies Inc. and others
+ 1997-1999, Vita Nuova Limited
+ 1995-1997, 2005-2007, C H Forsyth (forsyth@terzarima.net)
+ 1994-1999, Lucent Technologies Inc.
 License: Expat
 
 Files: src/cmd/internal/objabi/autotype.go
  src/cmd/internal/objabi/head.go
  src/cmd/internal/objabi/reloctype.go
  src/cmd/internal/objabi/symkind.go
-Copyright: no-info-found
+Copyright: 2009, 2016, 2019, The Go Authors.
+ 2004, 2006, Bruce Ellis
+ 2000-2008, Vita Nuova Holdings Limited (www.vitanuova.com)
+ 2000-2008, Lucent Technologies Inc. and others
+ 1997-1999, Vita Nuova Limited
+ 1995-1997, 2005-2007, C H Forsyth (forsyth@terzarima.net)
+ 1994-1999, Lucent Technologies Inc.
 License: Expat
 
 Files: src/cmd/link/internal/*
-Copyright: no-info-found
+Copyright: 2009, 2016, 2019, The Go Authors.
+ 2004, 2006, Bruce Ellis
+ 2000-2008, Vita Nuova Holdings Limited (www.vitanuova.com)
+ 2000-2008, Lucent Technologies Inc. and others
+ 1997-1999, Vita Nuova Limited
+ 1995-1997, 2005-2007, C H Forsyth (forsyth@terzarima.net)
+ 1994-1999, Lucent Technologies Inc.
 License: Expat
 
 Files: src/cmd/link/internal/ld/ar.go
@@ -84,7 +164,13 @@ Files: src/cmd/link/internal/ld/ar.go
  src/cmd/link/internal/ld/main.go
  src/cmd/link/internal/ld/sym.go
  src/cmd/link/internal/ld/symtab.go
-Copyright: no-info-found
+Copyright: 2009, 2016, 2019, The Go Authors.
+ 2004, 2006, Bruce Ellis
+ 2000-2008, Vita Nuova Holdings Limited (www.vitanuova.com)
+ 2000-2008, Lucent Technologies Inc. and others
+ 1997-1999, Vita Nuova Limited
+ 1995-1997, 2005-2007, C H Forsyth (forsyth@terzarima.net)
+ 1994-1999, Lucent Technologies Inc.
 License: Expat
 
 Files: src/cmd/link/internal/ld/elf.go
@@ -102,11 +188,23 @@ License: Expat
 Files: src/cmd/link/internal/sym/segment.go
  src/cmd/link/internal/sym/symbols.go
  src/cmd/link/internal/sym/symkind.go
-Copyright: no-info-found
+Copyright: 2009, 2016, 2019, The Go Authors.
+ 2004, 2006, Bruce Ellis
+ 2000-2008, Vita Nuova Holdings Limited (www.vitanuova.com)
+ 2000-2008, Lucent Technologies Inc. and others
+ 1997-1999, Vita Nuova Limited
+ 1995-1997, 2005-2007, C H Forsyth (forsyth@terzarima.net)
+ 1994-1999, Lucent Technologies Inc.
 License: Expat
 
 Files: src/cmd/oldlink/internal/*
-Copyright: no-info-found
+Copyright: 2009, 2016, 2019, The Go Authors.
+ 2004, 2006, Bruce Ellis
+ 2000-2008, Vita Nuova Holdings Limited (www.vitanuova.com)
+ 2000-2008, Lucent Technologies Inc. and others
+ 1997-1999, Vita Nuova Limited
+ 1995-1997, 2005-2007, C H Forsyth (forsyth@terzarima.net)
+ 1994-1999, Lucent Technologies Inc.
 License: Expat
 
 Files: src/cmd/oldlink/internal/ld/ar.go
@@ -117,7 +215,13 @@ Files: src/cmd/oldlink/internal/ld/ar.go
  src/cmd/oldlink/internal/ld/main.go
  src/cmd/oldlink/internal/ld/sym.go
  src/cmd/oldlink/internal/ld/symtab.go
-Copyright: no-info-found
+Copyright: 2009, 2016, 2019, The Go Authors.
+ 2004, 2006, Bruce Ellis
+ 2000-2008, Vita Nuova Holdings Limited (www.vitanuova.com)
+ 2000-2008, Lucent Technologies Inc. and others
+ 1997-1999, Vita Nuova Limited
+ 1995-1997, 2005-2007, C H Forsyth (forsyth@terzarima.net)
+ 1994-1999, Lucent Technologies Inc.
 License: Expat
 
 Files: src/cmd/oldlink/internal/ld/elf.go
@@ -135,7 +239,13 @@ License: Expat
 Files: src/cmd/oldlink/internal/sym/segment.go
  src/cmd/oldlink/internal/sym/symbols.go
  src/cmd/oldlink/internal/sym/symkind.go
-Copyright: no-info-found
+Copyright: 2009, 2016, 2019, The Go Authors.
+ 2004, 2006, Bruce Ellis
+ 2000-2008, Vita Nuova Holdings Limited (www.vitanuova.com)
+ 2000-2008, Lucent Technologies Inc. and others
+ 1997-1999, Vita Nuova Limited
+ 1995-1997, 2005-2007, C H Forsyth (forsyth@terzarima.net)
+ 1994-1999, Lucent Technologies Inc.
 License: Expat
 
 Files: src/cmd/vendor/*
@@ -176,7 +286,9 @@ Copyright: 2016, 2019, The Go Authors.
 License: OpenSSL
 
 Files: src/debug/elf/elf.go
-Copyright: no-info-found
+Copyright: 2009, The Go Authors.
+ 2001, David E. OBrien
+ 1996-1998, John D. Polstra.
 License: BSD-2-clause
 
 Files: src/hash/crc32/crc32_ppc64le.s
@@ -193,7 +305,9 @@ Files: src/runtime/memclr_arm.s
  src/runtime/vlop_386.s
  src/runtime/vlop_arm.s
  src/runtime/vlrt.go
-Copyright: no-info-found
+Copyright: 2009, The Go Authors.
+ 2000-2007, Vita Nuova Holdings Limited (www.vitanuova.com).
+ 1994-1999, Lucent Technologies Inc.
 License: Expat
 
 Files: src/vendor/*
-- 
GitLab