February 2014 - golang - Fedora mailing-lists

[golang] fix patchlevel for patch200
by Adam Miller 20 Feb '14

20 Feb '14

commit 969848f0f9c81275b40dc6989c2c49fa453c0976 Author: Adam Miller <admiller(a)redhat.com> Date: Thu Feb 20 13:02:19 2014 -0600 fix patchlevel for patch200 golang.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/golang.spec b/golang.spec index 7c495b5..3dbbcdc 100644 --- a/golang.spec +++ b/golang.spec @@ -151,7 +151,7 @@ end cp %SOURCE400 src/pkg/archive/tar/testdata/xattrs.tar %if 0%{?fedora} >= 21 -%patch210 -p0 +%patch210 -p1 %patch211 -p0 %endif

1 0

[golang] re-order some patches, remove unneeded glibc deprecated macros _BSD_SOURCE and _SVID_SOURCE
by Adam Miller 20 Feb '14

20 Feb '14

commit d0ddbae8497429789a3a8baf8b41679e262dd20d Author: Adam Miller <admiller(a)redhat.com> Date: Thu Feb 20 12:16:11 2014 -0600 re-order some patches, remove unneeded glibc deprecated macros _BSD_SOURCE and _SVID_SOURCE golang-1.2-BSD-SVID-SOURCE.patch | 12 ++++++++++++ golang.spec | 29 +++++++++++++++++++++-------- 2 files changed, 33 insertions(+), 8 deletions(-) --- diff --git a/golang-1.2-BSD-SVID-SOURCE.patch b/golang-1.2-BSD-SVID-SOURCE.patch new file mode 100644 index 0000000..9ad1677 --- /dev/null +++ b/golang-1.2-BSD-SVID-SOURCE.patch @@ -0,0 +1,12 @@ +--- include/u.h.orig 2014-02-20 11:27:46.943079375 -0600 ++++ include/u.h 2014-02-20 11:27:54.126195603 -0600 +@@ -38,9 +38,6 @@ + # define __MAKECONTEXT_V2_SOURCE 1 + # endif + #endif +-#define _BSD_SOURCE 1 +-#define _NETBSD_SOURCE 1 /* NetBSD */ +-#define _SVID_SOURCE 1 + #if !defined(__APPLE__) && !defined(__OpenBSD__) + # define _XOPEN_SOURCE 1000 + # define _XOPEN_SOURCE_EXTENDED 1 diff --git a/golang.spec b/golang.spec index 90b56be..7c495b5 100644 --- a/golang.spec +++ b/golang.spec @@ -25,7 +25,7 @@ Name: golang Version: 1.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: The Go Programming Language License: BSD @@ -35,7 +35,11 @@ Source0: https://go.googlecode.com/files/go%{version}.src.tar.gz # this command moved places %if 0%{?fedora} >= 21 BuildRequires: /usr/bin/hostname -Patch1: golang-f21-hostname.patch +Patch210: golang-f21-hostname.patch + +# Patch211 - F21+ has glibc 2.19.90 (2.20 devel)+ which deprecates +# _BSD_SOURCE and _SVID_SOURCE +Patch211: golang-1.2-BSD-SVID-SOURCE.patch %else BuildRequires: /bin/hostname %endif @@ -55,16 +59,16 @@ Requires: glibc Patch0: golang-1.2-verbose-build.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1038683 -Patch2: golang-1.2-remove-ECC-p224.patch +Patch1: golang-1.2-remove-ECC-p224.patch # disable flaky test for now # http://code.google.com/p/go/issues/detail?id=6522 -Patch3: ./golang-1.2-skipCpuProfileTest.patch +Patch2: ./golang-1.2-skipCpuProfileTest.patch # Pull in new archive/tar upstream patch to support xattrs for # docker-0.8.1 # https://code.google.com/p/go/source/detail?r=a15f344a9efa -Patch4: golang-1.2-archive_tar-xattr.patch +Patch3: golang-1.2-archive_tar-xattr.patch # Having documentation separate was broken Obsoletes: %{name}-docs < 1.1-4 @@ -146,17 +150,22 @@ end cp %SOURCE400 src/pkg/archive/tar/testdata/xattrs.tar +%if 0%{?fedora} >= 21 +%patch210 -p0 +%patch211 -p0 +%endif + # increase verbosity of build %patch0 -p1 # remove the P224 curve -%patch2 -p1 +%patch1 -p1 # skip flaky test -%patch3 -p1 +%patch2 -p1 # new archive/tar implementation from upstream -%patch4 -p1 +%patch3 -p1 # create a [dirty] gcc wrapper to allow us to build with our own flags # (dirty because it is spoofing 'gcc' since CC value is stored in the go tool) @@ -309,6 +318,10 @@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf %changelog +* Thu Feb 20 2014 Adam Miller <maxamillion(a)fedoraproejct.org> 1.2-7 +- Remove _BSD_SOURCE and _SVID_SOURCE, they are deprecated in recent + versions of glibc and aren't needed + * Wed Feb 19 2014 Adam Miller <maxamillion(a)fedoraproject.org> 1.2-6 - pull in upstream archive/tar implementation that supports xattr for docker 0.8.1

1 0

[Bug 1067110] /usr/include/features.h:145:3: error: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Werror=cpp
by Red Hat Bugzilla 20 Feb '14

20 Feb '14

https://bugzilla.redhat.com/show_bug.cgi?id=1067110 --- Comment #5 from Carlos O'Donell <codonell(a)redhat.com> --- You have several options. The first question is: Do you really need those feature macros defined? I would start by removing them and building. Those definitions may just have been copied blindly from other source configurations without thinking about the interfaces they enable. If you do need the interfaces enabled by _BSD_SOURCE and or _SVID_SOURCE, then you can do the following: #if defined __linux__ || defined __GNU__ || defined __GLIBC__ #define _DEFAULT_SOURCE 1 #else #define _BSD_SOURCE 1 #define _SVID_SOURCE 1 #endif So you have two options to try. Build without those macros and see if it works, this tests to see if you actually ever needed them. Modify the headers to define _DEFAULT_SOURCE instead which is the new all-encompassing feature test macro. Notice that the old feature test macros are not deprecated yet, but we are issuing a warning. In your case with -Werror the warning is treated as if it were an error. -- You are receiving this mail because: You are on the CC list for the bug.

1 0

[Bug 1067110] /usr/include/features.h:145:3: error: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Werror=cpp
by Red Hat Bugzilla 20 Feb '14

20 Feb '14

https://bugzilla.redhat.com/show_bug.cgi?id=1067110 --- Comment #4 from Adam Miller <admiller(a)redhat.com> --- u.h that's part of the golang source distribution (attached) -- You are receiving this mail because: You are on the CC list for the bug.

1 0

[Bug 1067110] /usr/include/features.h:145:3: error: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Werror=cpp
by Red Hat Bugzilla 20 Feb '14

20 Feb '14

https://bugzilla.redhat.com/show_bug.cgi?id=1067110 --- Comment #3 from Adam Miller <admiller(a)redhat.com> --- Created attachment 865604 --> https://bugzilla.redhat.com/attachment.cgi?id=865604&action=edit Plan 9 from User Space include/u.h - shipped as part of golang -- You are receiving this mail because: You are on the CC list for the bug.

1 0

[Bug 1067110] /usr/include/features.h:145:3: error: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Werror=cpp
by Red Hat Bugzilla 20 Feb '14

20 Feb '14

https://bugzilla.redhat.com/show_bug.cgi?id=1067110 Carlos O'Donell <codonell(a)redhat.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |adam(a)spicenitz.org, | |admiller(a)redhat.com, | |golang(a)lists.fedoraproject. | |org, lemenkov(a)gmail.com, | |lsm5(a)redhat.com, | |renich(a)woralelandia.com, | |skottler(a)redhat.com Component|glibc |golang Assignee|codonell(a)redhat.com |adam(a)spicenitz.org --- Comment #2 from Carlos O'Donell <codonell(a)redhat.com> --- This is expected. The warning is correct. The _BSD_SOURCE and _SVID_SOURCE feature test macros are deprecated as of glibc 2.19.90 (2.20 devel). What defines _BSD_SOURCE or _SVID_SOURCE for you? -- You are receiving this mail because: You are on the CC list for the bug.

1 0

File docker-0.8.1.tar.gz uploaded to lookaside cache by wtogami
by Warren Togami 砥上勇 20 Feb '14

20 Feb '14

A file has been added to the lookaside cache for docker-io: 3e74f5af4a74f3448a1db5763e455eb9 docker-0.8.1.tar.gz

1 0

[golang/f20: 2/2] Merge branch 'master' into f20
by Adam Miller 19 Feb '14

19 Feb '14

commit 5253fbfde833562e75dc82726bfccbe0983c721b Merge: ea4af86 40f74d4 Author: Adam Miller <admiller(a)redhat.com> Date: Wed Feb 19 10:43:11 2014 -0600 Merge branch 'master' into f20 * master: replace f21+ hostname patch that fedpkg import deleted golang-f21-hostname.patch | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) ---

1 0

[golang/f20] (2 commits) ...Merge branch 'master' into f20
by Adam Miller 19 Feb '14

19 Feb '14

Summary of changes: 40f74d4... replace f21+ hostname patch that fedpkg import deleted (*) 5253fbf... Merge branch 'master' into f20 (*) This commit already existed in another branch; no separate mail sent

1 0

[golang/f19: 2/2] Merge branch 'master' into f19
by Adam Miller 19 Feb '14

19 Feb '14

commit 957169509d7a18280f0ec4b6e54a3e3dd981aaef Merge: ba9665b 40f74d4 Author: Adam Miller <admiller(a)redhat.com> Date: Wed Feb 19 10:43:17 2014 -0600 Merge branch 'master' into f19 * master: replace f21+ hostname patch that fedpkg import deleted golang-f21-hostname.patch | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) ---

1 0

[golang/f19] (2 commits) ...Merge branch 'master' into f19
by Adam Miller 19 Feb '14

19 Feb '14

Summary of changes: 40f74d4... replace f21+ hostname patch that fedpkg import deleted (*) 9571695... Merge branch 'master' into f19 (*) This commit already existed in another branch; no separate mail sent

1 0

[golang/epel7: 2/2] Merge branch 'master' into epel7
by Adam Miller 19 Feb '14

19 Feb '14

commit bb2aeae6adbba753736a1351a5548af7fd90a0fa Merge: b9ac06a 40f74d4 Author: Adam Miller <admiller(a)redhat.com> Date: Wed Feb 19 10:43:29 2014 -0600 Merge branch 'master' into epel7 * master: replace f21+ hostname patch that fedpkg import deleted golang-f21-hostname.patch | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) ---

1 0

[golang/epel7] (2 commits) ...Merge branch 'master' into epel7
by Adam Miller 19 Feb '14

19 Feb '14

Summary of changes: 40f74d4... replace f21+ hostname patch that fedpkg import deleted (*) bb2aeae... Merge branch 'master' into epel7 (*) This commit already existed in another branch; no separate mail sent

1 0

[golang/el6: 2/2] Merge branch 'master' into el6
by Adam Miller 19 Feb '14

19 Feb '14

commit 9e4e25cf53580274afc63db6a30bcb91813fa753 Merge: 52bd3bf 40f74d4 Author: Adam Miller <admiller(a)redhat.com> Date: Wed Feb 19 10:43:23 2014 -0600 Merge branch 'master' into el6 * master: replace f21+ hostname patch that fedpkg import deleted golang-f21-hostname.patch | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) ---

1 0

[golang/el6] (2 commits) ...Merge branch 'master' into el6
by Adam Miller 19 Feb '14

19 Feb '14

Summary of changes: 40f74d4... replace f21+ hostname patch that fedpkg import deleted (*) 9e4e25c... Merge branch 'master' into el6 (*) This commit already existed in another branch; no separate mail sent

1 0

[golang] replace f21+ hostname patch that fedpkg import deleted
by Adam Miller 19 Feb '14

19 Feb '14

commit 40f74d4d72e08804a90f20caf043448186242be4 Author: Adam Miller <admiller(a)redhat.com> Date: Wed Feb 19 10:42:29 2014 -0600 replace f21+ hostname patch that fedpkg import deleted golang-f21-hostname.patch | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) --- diff --git a/golang-f21-hostname.patch b/golang-f21-hostname.patch new file mode 100644 index 0000000..acc3c6c --- /dev/null +++ b/golang-f21-hostname.patch @@ -0,0 +1,13 @@ +Index: go/src/pkg/os/os_test.go +=================================================================== +--- go.orig/src/pkg/os/os_test.go ++++ go/src/pkg/os/os_test.go +@@ -842,7 +842,7 @@ func run(t *testing.T, cmd []string) str + if err != nil { + t.Fatal(err) + } +- p, err := StartProcess("/bin/hostname", []string{"hostname"}, &ProcAttr{Files: []*File{nil, w, Stderr}}) ++ p, err := StartProcess("/usr/bin/hostname", []string{"hostname"}, &ProcAttr{Files: []*File{nil, w, Stderr}}) + if err != nil { + t.Fatal(err) + }

1 0

[golang/epel7: 3/3] Merge branch 'master' into epel7
by Adam Miller 19 Feb '14

19 Feb '14

commit b9ac06acb315291407bdd003080e82c6cbcdc675 Merge: a9a1e21 1318683 Author: Adam Miller <admiller(a)redhat.com> Date: Wed Feb 19 10:36:16 2014 -0600 Merge branch 'master' into epel7 * master: pull in xattr archive/tar from upstream Provide 'go' .gitignore | 1 + golang-1.2-archive_tar-xattr.patch | 197 ++++++++++++++++++++++++++++++++++++ golang-f21-hostname.patch | 13 --- golang.spec | 25 +++++- sources | 1 + 5 files changed, 223 insertions(+), 14 deletions(-) ---

1 0

[golang/epel7] (3 commits) ...Merge branch 'master' into epel7
by Adam Miller 19 Feb '14

19 Feb '14

Summary of changes: 77cba21... Provide 'go' (*) 1318683... pull in xattr archive/tar from upstream (*) b9ac06a... Merge branch 'master' into epel7 (*) This commit already existed in another branch; no separate mail sent

1 0

[golang/el6: 3/3] Merge branch 'master' into el6
by Adam Miller 19 Feb '14

19 Feb '14

commit 52bd3bfa8d7af2376ae9b0b9adc99693fcf22d54 Merge: 8197a39 1318683 Author: Adam Miller <admiller(a)redhat.com> Date: Wed Feb 19 10:35:50 2014 -0600 Merge branch 'master' into el6 * master: pull in xattr archive/tar from upstream Provide 'go' .gitignore | 1 + golang-1.2-archive_tar-xattr.patch | 197 ++++++++++++++++++++++++++++++++++++ golang-f21-hostname.patch | 13 --- golang.spec | 25 +++++- sources | 1 + 5 files changed, 223 insertions(+), 14 deletions(-) ---

1 0

[golang/el6] (3 commits) ...Merge branch 'master' into el6
by Adam Miller 19 Feb '14

19 Feb '14

Summary of changes: 77cba21... Provide 'go' (*) 1318683... pull in xattr archive/tar from upstream (*) 52bd3bf... Merge branch 'master' into el6 (*) This commit already existed in another branch; no separate mail sent

1 0

[golang/f19: 3/3] Merge branch 'master' into f19
by Adam Miller 19 Feb '14

19 Feb '14

commit ba9665b0fe53e7b04285909c3e0a72ac837333b8 Merge: 583f94d 1318683 Author: Adam Miller <admiller(a)redhat.com> Date: Wed Feb 19 10:35:09 2014 -0600 Merge branch 'master' into f19 * master: pull in xattr archive/tar from upstream Provide 'go' .gitignore | 1 + golang-1.2-archive_tar-xattr.patch | 197 ++++++++++++++++++++++++++++++++++++ golang-f21-hostname.patch | 13 --- golang.spec | 25 +++++- sources | 1 + 5 files changed, 223 insertions(+), 14 deletions(-) ---

1 0

[golang/f19] (3 commits) ...Merge branch 'master' into f19
by Adam Miller 19 Feb '14

19 Feb '14

Summary of changes: 77cba21... Provide 'go' (*) 1318683... pull in xattr archive/tar from upstream (*) ba9665b... Merge branch 'master' into f19 (*) This commit already existed in another branch; no separate mail sent

1 0

[golang/f20: 3/3] Merge branch 'master' into f20
by Adam Miller 19 Feb '14

19 Feb '14

commit ea4af86ffb170ddbe2805e50a68e3ce2cd84c70b Merge: 4604bf7 1318683 Author: Adam Miller <admiller(a)redhat.com> Date: Wed Feb 19 10:33:23 2014 -0600 Merge branch 'master' into f20 * master: pull in xattr archive/tar from upstream Provide 'go' .gitignore | 1 + golang-1.2-archive_tar-xattr.patch | 197 ++++++++++++++++++++++++++++++++++++ golang-f21-hostname.patch | 13 --- golang.spec | 25 +++++- sources | 1 + 5 files changed, 223 insertions(+), 14 deletions(-) ---

1 0

[golang/f20] (3 commits) ...Merge branch 'master' into f20
by Adam Miller 19 Feb '14

19 Feb '14

Summary of changes: 77cba21... Provide 'go' (*) 1318683... pull in xattr archive/tar from upstream (*) ea4af86... Merge branch 'master' into f20 (*) This commit already existed in another branch; no separate mail sent

1 0

[golang] pull in xattr archive/tar from upstream
by Adam Miller 19 Feb '14

19 Feb '14

commit 1318683961fedd00746cbe3146f7310b9a5ec024 Author: Adam Miller <admiller(a)redhat.com> Date: Wed Feb 19 10:31:14 2014 -0600 pull in xattr archive/tar from upstream .gitignore | 1 + golang-1.2-archive_tar-xattr.patch | 197 ++++++++++++++++++++++++++++++++++++ golang-f21-hostname.patch | 13 --- golang.spec | 20 ++++- sources | 1 + 5 files changed, 218 insertions(+), 14 deletions(-) --- diff --git a/.gitignore b/.gitignore index b049d62..6caf296 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /go1.1.1.src.tar.gz /go1.1.2.src.tar.gz /go1.2.src.tar.gz +/golang-19087:a15f344a9efa-xattrs.tar diff --git a/golang-1.2-archive_tar-xattr.patch b/golang-1.2-archive_tar-xattr.patch new file mode 100644 index 0000000..10c8f3d --- /dev/null +++ b/golang-1.2-archive_tar-xattr.patch @@ -0,0 +1,197 @@ +# HG changeset patch +# User Alexander Larsson <alexander.larsson(a)gmail.com> +# Date 1392282510 -39600 +# Node ID a15f344a9efa35ef168c8feaa92a15a1cdc93db5 +# Parent 1a32fe60e0798d82bbff6c945001c7f0ba8de5ea +archive/tar: support extended attributes + +This adds support for archives with the SCHILY.xattr field in the +pax header. This is what gnu tar and star generate. +Fixes issue 7154. + +LGTM=dsymonds +R=golang-codereviews, gobot, dsymonds +CC=golang-codereviews +https://codereview.appspot.com/54570043 + +Committer: David Symonds <dsymonds(a)golang.org> + +diff -r 1a32fe60e079 -r a15f344a9efa src/pkg/archive/tar/common.go +--- a/src/pkg/archive/tar/common.go Thu Feb 13 03:09:03 2014 -0500 ++++ b/src/pkg/archive/tar/common.go Thu Feb 13 20:08:30 2014 +1100 +@@ -57,6 +57,7 @@ + Devminor int64 // minor number of character or block device + AccessTime time.Time // access time + ChangeTime time.Time // status change time ++ Xattrs map[string]string + } + + // File name constants from the tar spec. +@@ -189,6 +190,7 @@ + paxSize = "size" + paxUid = "uid" + paxUname = "uname" ++ paxXattr = "SCHILY.xattr." + paxNone = "" + ) + +diff -r 1a32fe60e079 -r a15f344a9efa src/pkg/archive/tar/reader.go +--- a/src/pkg/archive/tar/reader.go Thu Feb 13 03:09:03 2014 -0500 ++++ b/src/pkg/archive/tar/reader.go Thu Feb 13 20:08:30 2014 +1100 +@@ -139,8 +139,14 @@ + return err + } + hdr.Size = int64(size) ++ default: ++ if strings.HasPrefix(k, paxXattr) { ++ if hdr.Xattrs == nil { ++ hdr.Xattrs = make(map[string]string) ++ } ++ hdr.Xattrs[k[len(paxXattr):]] = v ++ } + } +- + } + return nil + } +diff -r 1a32fe60e079 -r a15f344a9efa src/pkg/archive/tar/reader_test.go +--- a/src/pkg/archive/tar/reader_test.go Thu Feb 13 03:09:03 2014 -0500 ++++ b/src/pkg/archive/tar/reader_test.go Thu Feb 13 20:08:30 2014 +1100 +@@ -161,6 +161,46 @@ + }, + }, + }, ++ { ++ file: "testdata/xattrs.tar", ++ headers: []*Header{ ++ { ++ Name: "small.txt", ++ Mode: 0644, ++ Uid: 1000, ++ Gid: 10, ++ Size: 5, ++ ModTime: time.Unix(1386065770, 448252320), ++ Typeflag: '0', ++ Uname: "alex", ++ Gname: "wheel", ++ AccessTime: time.Unix(1389782991, 419875220), ++ ChangeTime: time.Unix(1389782956, 794414986), ++ Xattrs: map[string]string{ ++ "user.key": "value", ++ "user.key2": "value2", ++ // Interestingly, selinux encodes the terminating null inside the xattr ++ "security.selinux": "unconfined_u:object_r:default_t:s0\x00", ++ }, ++ }, ++ { ++ Name: "small2.txt", ++ Mode: 0644, ++ Uid: 1000, ++ Gid: 10, ++ Size: 11, ++ ModTime: time.Unix(1386065770, 449252304), ++ Typeflag: '0', ++ Uname: "alex", ++ Gname: "wheel", ++ AccessTime: time.Unix(1389782991, 419875220), ++ ChangeTime: time.Unix(1386065770, 449252304), ++ Xattrs: map[string]string{ ++ "security.selinux": "unconfined_u:object_r:default_t:s0\x00", ++ }, ++ }, ++ }, ++ }, + } + + func TestReader(t *testing.T) { +@@ -180,7 +220,7 @@ + f.Close() + continue testLoop + } +- if *hdr != *header { ++ if !reflect.DeepEqual(*hdr, *header) { + t.Errorf("test %d, entry %d: Incorrect header:\nhave %+v\nwant %+v", + i, j, *hdr, *header) + } +@@ -253,7 +293,7 @@ + } + + // check the header +- if *hdr != *headers[nread] { ++ if !reflect.DeepEqual(*hdr, *headers[nread]) { + t.Errorf("Incorrect header:\nhave %+v\nwant %+v", + *hdr, headers[nread]) + } +diff -r 1a32fe60e079 -r a15f344a9efa src/pkg/archive/tar/writer.go +--- a/src/pkg/archive/tar/writer.go Thu Feb 13 03:09:03 2014 -0500 ++++ b/src/pkg/archive/tar/writer.go Thu Feb 13 20:08:30 2014 +1100 +@@ -236,6 +236,12 @@ + return tw.err + } + ++ if allowPax { ++ for k, v := range hdr.Xattrs { ++ paxHeaders[paxXattr+k] = v ++ } ++ } ++ + if len(paxHeaders) > 0 { + if !allowPax { + return errInvalidHeader +diff -r 1a32fe60e079 -r a15f344a9efa src/pkg/archive/tar/writer_test.go +--- a/src/pkg/archive/tar/writer_test.go Thu Feb 13 03:09:03 2014 -0500 ++++ b/src/pkg/archive/tar/writer_test.go Thu Feb 13 20:08:30 2014 +1100 +@@ -10,6 +10,7 @@ + "io" + "io/ioutil" + "os" ++ "reflect" + "strings" + "testing" + "testing/iotest" +@@ -338,6 +339,45 @@ + } + } + ++func TestPaxXattrs(t *testing.T) { ++ xattrs := map[string]string{ ++ "user.key": "value", ++ } ++ ++ // Create an archive with an xattr ++ fileinfo, err := os.Stat("testdata/small.txt") ++ if err != nil { ++ t.Fatal(err) ++ } ++ hdr, err := FileInfoHeader(fileinfo, "") ++ if err != nil { ++ t.Fatalf("os.Stat: %v", err) ++ } ++ contents := "Kilts" ++ hdr.Xattrs = xattrs ++ var buf bytes.Buffer ++ writer := NewWriter(&buf) ++ if err := writer.WriteHeader(hdr); err != nil { ++ t.Fatal(err) ++ } ++ if _, err = writer.Write([]byte(contents)); err != nil { ++ t.Fatal(err) ++ } ++ if err := writer.Close(); err != nil { ++ t.Fatal(err) ++ } ++ // Test that we can get the xattrs back out of the archive. ++ reader := NewReader(&buf) ++ hdr, err = reader.Next() ++ if err != nil { ++ t.Fatal(err) ++ } ++ if !reflect.DeepEqual(hdr.Xattrs, xattrs) { ++ t.Fatalf("xattrs did not survive round trip: got %+v, want %+v", ++ hdr.Xattrs, xattrs) ++ } ++} ++ + func TestPAXHeader(t *testing.T) { + medName := strings.Repeat("CD", 50) + longName := strings.Repeat("AB", 100) diff --git a/golang.spec b/golang.spec index d9f4ca8..90b56be 100644 --- a/golang.spec +++ b/golang.spec @@ -25,7 +25,7 @@ Name: golang Version: 1.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The Go Programming Language License: BSD @@ -61,6 +61,11 @@ Patch2: golang-1.2-remove-ECC-p224.patch # http://code.google.com/p/go/issues/detail?id=6522 Patch3: ./golang-1.2-skipCpuProfileTest.patch +# Pull in new archive/tar upstream patch to support xattrs for +# docker-0.8.1 +# https://code.google.com/p/go/source/detail?r=a15f344a9efa +Patch4: golang-1.2-archive_tar-xattr.patch + # Having documentation separate was broken Obsoletes: %{name}-docs < 1.1-4 @@ -72,6 +77,10 @@ ExclusiveArch: %{ix86} x86_64 %{arm} Source100: golang-gdbinit Source101: golang-prelink.conf +# Patch4 - pull in new archive/tar upstream patch, this file is part +# of the upstream merge and is used for test cases. +Source400: golang-19087:a15f344a9efa-xattrs.tar + %description %{summary}. @@ -135,6 +144,8 @@ end %prep %setup -q -n go +cp %SOURCE400 src/pkg/archive/tar/testdata/xattrs.tar + # increase verbosity of build %patch0 -p1 @@ -144,6 +155,9 @@ end # skip flaky test %patch3 -p1 +# new archive/tar implementation from upstream +%patch4 -p1 + # create a [dirty] gcc wrapper to allow us to build with our own flags # (dirty because it is spoofing 'gcc' since CC value is stored in the go tool) # TODO: remove this and just set CFLAGS/LDFLAGS once upstream supports it @@ -295,6 +309,10 @@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf %changelog +* Wed Feb 19 2014 Adam Miller <maxamillion(a)fedoraproject.org> 1.2-6 +- pull in upstream archive/tar implementation that supports xattr for + docker 0.8.1 + * Tue Feb 18 2014 Vincent Batts <vbatts(a)redhat.com> 1.2-5 - provide 'go', so users can yum install 'go' diff --git a/sources b/sources index f14eee7..506d921 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ c2ace56f6b6413a5c6318b9527a8b763 go1.2.src.tar.gz +d76dc07e475b2905b5fec1cf319b6356 golang-19087:a15f344a9efa-xattrs.tar

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

golang February 2014