diff --git a/.gitignore b/.gitignore index 7a60ae1..6a7d4b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /sys-3fd5a3612ccd7907f26270fa92579a0f2f76f734.tar.gz /sys-fde4db37ae7ad8191b03d30d27f258b5291ae4e3.tar.gz +/sys-ac6580df4449443a05718fd7858c1f91ad5f8d20.tar.gz diff --git a/golang-x-sys-Disable-TestOpenByHandleAt.patch b/golang-x-sys-Disable-TestOpenByHandleAt.patch new file mode 100644 index 0000000..954a320 --- /dev/null +++ b/golang-x-sys-Disable-TestOpenByHandleAt.patch @@ -0,0 +1,29 @@ +diff -up sys-ac6580df4449443a05718fd7858c1f91ad5f8d20/unix/syscall_linux_test.go.orig sys-ac6580df4449443a05718fd7858c1f91ad5f8d20/unix/syscall_linux_test.go +--- sys-ac6580df4449443a05718fd7858c1f91ad5f8d20/unix/syscall_linux_test.go.orig 2019-12-10 03:34:23.000000000 +0100 ++++ sys-ac6580df4449443a05718fd7858c1f91ad5f8d20/unix/syscall_linux_test.go 2019-12-15 21:07:20.485011744 +0100 +@@ -15,7 +15,7 @@ import ( + "os" + "runtime" + "runtime/debug" +- "strconv" ++// "strconv" + "strings" + "testing" + "time" +@@ -571,6 +571,8 @@ func TestClockNanosleep(t *testing.T) { + } + } + ++/* This test does not work in Mock/Koji environment because it has no access to ++ * /proc with nspawn. It works with --isolation=simple. + func TestOpenByHandleAt(t *testing.T) { + skipIfNotSupported := func(t *testing.T, name string, err error) { + if err == unix.EPERM { +@@ -622,6 +624,7 @@ func TestOpenByHandleAt(t *testing.T) { + }) + } + } ++*/ + + func openMountByID(mountID int) (f *os.File, err error) { + mi, err := os.Open("/proc/self/mountinfo") diff --git a/golang-x-sys.spec b/golang-x-sys.spec index f33abf7..48ebc39 100644 --- a/golang-x-sys.spec +++ b/golang-x-sys.spec @@ -4,7 +4,7 @@ # https://github.com/golang/sys %global goipath golang.org/x/sys %global forgeurl https://github.com/golang/sys -%global commit fde4db37ae7ad8191b03d30d27f258b5291ae4e3 +%global commit ac6580df4449443a05718fd7858c1f91ad5f8d20 %gometa @@ -23,7 +23,7 @@ Go packages for low-level interactions with the operating system.} Name: %{goname} Version: 0 -Release: 0.28%{?dist} +Release: 0.29%{?dist} Summary: Go packages for low-level interaction with the operating system # Upstream license specification: BSD-3-Clause @@ -32,6 +32,8 @@ URL: %{gourl} Source0: %{gosource} Source1: glide.yaml Source2: glide.lock +# Disable TestOpenByHandleAt which doesn't work in Mock chroot +Patch0: golang-x-sys-Disable-TestOpenByHandleAt.patch %description %{common_description} @@ -40,6 +42,7 @@ Source2: glide.lock %prep %goprep +%patch -p1 cp %{S:1} %{S:2} . %install @@ -53,6 +56,10 @@ cp %{S:1} %{S:2} . %gopkgfiles %changelog +* Sun Dec 15 20:24:34 CET 2019 Robert-André Mauchin - 0-0.29.20191215gitac6580d +- Bump to commit ac6580df4449443a05718fd7858c1f91ad5f8d20 +- Disable TestOpenByHandleAt test + * Sun Aug 18 2019 Elliott Sales de Andrade - 0-0.28.20190818gitfde4db3 - Bump to commit fde4db37ae7ad8191b03d30d27f258b5291ae4e3 diff --git a/sources b/sources index 5641fdb..a532f29 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sys-fde4db37ae7ad8191b03d30d27f258b5291ae4e3.tar.gz) = 10d47c2b5fc004872db6e61b447d258aed143891eb7b68f4b8d3afd135511ee7138b61580c5c6cb6e4c953f640f0c581aa1a1450e42054a0c497d5e91e40ba7f +SHA512 (sys-ac6580df4449443a05718fd7858c1f91ad5f8d20.tar.gz) = 04694885729ba407504280b2b1e276c5f7fb6e33058bf6a27929223a5d95f800c3f773bbcd2c1721ff8778ab4a22cb80ee2455dbd70b6a96b2a148a6bbe746c3