[Pkg-golang-commits] [golang] 01/03: Apply some changelog tweaks proposed by Hilko Bengen to prepare for 1.6 release
Tianon Gravi
tianon at debian.org
Sat Feb 20 09:17:40 UTC 2016
This is an automated email from the git hooks/post-receive script.
tianon pushed a commit to branch debian-sid
in repository golang.
commit 51b3d382a92875c2023044b3c242cf6bc1126489
Author: Tianon Gravi <tianon at debian.org>
Date: Sat Feb 20 01:15:00 2016 -0800
Apply some changelog tweaks proposed by Hilko Bengen to prepare for 1.6 release
---
debian/changelog | 15 +++++----
debian/patches/ar-rc.patch | 35 -------------------
debian/patches/cl-17154.patch | 39 ----------------------
debian/patches/series | 3 --
.../patches/skip-userns-tests-when-chrooted.patch | 37 --------------------
5 files changed, 8 insertions(+), 121 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 315901a..56b555f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,21 @@
-golang (2:1.5.3-2) UNRELEASED; urgency=medium
+golang (2:1.6-1) UNRELEASED; urgency=medium
+
+ * Update to 1.6 upstream release (thanks Hilko!)
+ - change "ar" arguments to quiet spurious warnings while using gccgo
+ (Closes: #807138)
+ - skip multicast listen test (Closes: #814849)
+ - skip userns tests when chrooted (Closes: #807303)
[ Michael Hudson-Doyle ]
* Respect "nocheck" in DEB_BUILD_OPTIONS while building to skip tests
(Closes: #807290)
- * Skip userns tests when chrooted (Closes: #807303)
* Trim Build-Depends (Closes: #807299)
* Fix several minor debian/copyright issues (Closes: #807304)
[ Tianon Gravi ]
- * Backport "ar" arguments change from go1.6 to quiet spurious warnings while
- using gccgo (Closes: #807138)
* Add "-k" to "run.bash" invocation so that we do a full test run every time
- * Backport test skipping change from go1.6 for multicast listen in short mode
- (Closes: #814849)
- -- Tianon Gravi <tianon at debian.org> Tue, 02 Feb 2016 21:54:29 -0800
+ -- Tianon Gravi <tianon at debian.org> Sat, 20 Feb 2016 01:11:40 -0800
golang (2:1.5.3-1) unstable; urgency=high
diff --git a/debian/patches/ar-rc.patch b/debian/patches/ar-rc.patch
deleted file mode 100644
index b58cb05..0000000
--- a/debian/patches/ar-rc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 321cf6f86dd28248d98e5e24c073740f23c1897b Mon Sep 17 00:00:00 2001
-From: Ian Lance Taylor <iant at golang.org>
-Date: Wed, 4 Nov 2015 17:38:53 -0800
-Subject: [PATCH] cmd/go: change ar argument to rc
-
-Put 'r' first because that is the command, and 'c' is the modifier.
-Keep 'c' because it means to not warn when creating an archive.
-Drop 'u' because it is unnecessary and fails on Arch Linux.
-
-No test because this is only for gccgo (I tested it manually).
-
-Fixes #12310.
-
-Change-Id: Id740257fb1c347dfaa60f7d613af2897dae2c059
-Reviewed-on: https://go-review.googlesource.com/16664
-Run-TryBot: Ian Lance Taylor <iant at golang.org>
-TryBot-Result: Gobot Gobot <gobot at golang.org>
-Reviewed-by: David Crawshaw <crawshaw at golang.org>
----
- src/cmd/go/build.go | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
-index 54d1b8f..e869b27 100644
---- a/src/cmd/go/build.go
-+++ b/src/cmd/go/build.go
-@@ -2506,7 +2506,7 @@ func (gccgoToolchain) pack(b *builder, p *Package, objDir, afile string, ofiles
- for _, f := range ofiles {
- absOfiles = append(absOfiles, mkAbs(objDir, f))
- }
-- return b.run(p.Dir, p.ImportPath, nil, "ar", "cru", mkAbs(objDir, afile), absOfiles)
-+ return b.run(p.Dir, p.ImportPath, nil, "ar", "rc", mkAbs(objDir, afile), absOfiles)
- }
-
- func (tools gccgoToolchain) ld(b *builder, root *action, out string, allactions []*action, mainpkg string, ofiles []string) error {
diff --git a/debian/patches/cl-17154.patch b/debian/patches/cl-17154.patch
deleted file mode 100644
index 06cb69c..0000000
--- a/debian/patches/cl-17154.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 7e312243292866e73d2f2346a81eceffa1890f64 Mon Sep 17 00:00:00 2001
-From: Ian Lance Taylor <iant at golang.org>
-Date: Fri, 20 Nov 2015 16:01:45 -0800
-Subject: [PATCH] net: don't run multicast listen test on nil interface in
- short mode
-
-The gccgo bug report https://gcc.gnu.org/PR65785 points out that the
-multicast listen tests will use the network even with -test.short.
-Fix test by checking testing.Short with a nil interface.
-
-Change-Id: I7eab8df34fe3b78fc376912312fac9d0f94977f1
-Reviewed-on: https://go-review.googlesource.com/17154
-Reviewed-by: Mikio Hara <mikioh.mikioh at gmail.com>
----
- src/net/listen_test.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/net/listen_test.go b/src/net/listen_test.go
-index d5627f2..51ffe67 100644
---- a/src/net/listen_test.go
-+++ b/src/net/listen_test.go
-@@ -542,7 +542,7 @@ func TestIPv4MulticastListener(t *testing.T) {
- // routing stuff for finding out an appropriate
- // nexthop containing both network and link layer
- // adjacencies.
-- if ifi == nil && !*testExternal {
-+ if ifi == nil && (testing.Short() || !*testExternal) {
- continue
- }
- for _, tt := range ipv4MulticastListenerTests {
-@@ -618,7 +618,7 @@ func TestIPv6MulticastListener(t *testing.T) {
- // routing stuff for finding out an appropriate
- // nexthop containing both network and link layer
- // adjacencies.
-- if ifi == nil && (!*testExternal || !*testIPv6) {
-+ if ifi == nil && (testing.Short() || !*testExternal || !*testIPv6) {
- continue
- }
- for _, tt := range ipv6MulticastListenerTests {
diff --git a/debian/patches/series b/debian/patches/series
index 7a06aad..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +0,0 @@
-skip-userns-tests-when-chrooted.patch
-ar-rc.patch
-cl-17154.patch
diff --git a/debian/patches/skip-userns-tests-when-chrooted.patch b/debian/patches/skip-userns-tests-when-chrooted.patch
deleted file mode 100644
index 15bd724..0000000
--- a/debian/patches/skip-userns-tests-when-chrooted.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: skip tests that create a user namespace when chrooted
-Origin: https://go.googlesource.com/go/+/21efa7b2bc872958bcb252f5ab4dc52b2b0abeae
-Applied-Upstream: commit:21efa7b2bc872958bcb252f5ab4dc52b2b0abeae
-
---- a/src/syscall/exec_linux_test.go
-+++ b/src/syscall/exec_linux_test.go
-@@ -17,6 +17,17 @@
- "testing"
- )
-
-+// Check if we are in a chroot by checking if the inode of / is
-+// different from 2 (there is no better test available to non-root on
-+// linux).
-+func isChrooted(t *testing.T) bool {
-+ root, err := os.Stat("/")
-+ if err != nil {
-+ t.Fatalf("cannot stat /: %v", err)
-+ }
-+ return root.Sys().(*syscall.Stat_t).Ino != 2
-+}
-+
- func whoamiCmd(t *testing.T, uid, gid int, setgroups bool) *exec.Cmd {
- if _, err := os.Stat("/proc/self/ns/user"); err != nil {
- if os.IsNotExist(err) {
-@@ -24,6 +35,12 @@
- }
- t.Fatalf("Failed to stat /proc/self/ns/user: %v", err)
- }
-+ if isChrooted(t) {
-+ // create_user_ns in the kernel (see
-+ // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/kernel/user_namespace.c)
-+ // forbids the creation of user namespaces when chrooted.
-+ t.Skip("cannot create user namespaces when chrooted")
-+ }
- cmd := exec.Command("whoami")
- cmd.SysProcAttr = &syscall.SysProcAttr{
- Cloneflags: syscall.CLONE_NEWUSER,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-golang/golang.git
More information about the pkg-golang-commits
mailing list