[golang/f19: 5/5] Merge branch 'master' into f19
by Adam Miller
commit 2e5eb6e3d18e4593c0c706804184200b1837f960
Merge: 9571695 64f9c14
Author: Adam Miller <admiller(a)redhat.com>
Date: Thu Feb 20 15:06:34 2014 -0600
Merge branch 'master' into f19
* master:
fix BSD/SVID patch, and fix up changelog entry (rpmlint was complaining about invalid date)
update hostname patch
fix patchlevel for patch200
re-order some patches, remove unneeded glibc deprecated macros _BSD_SOURCE and _SVID_SOURCE
golang-1.2-BSD-SVID-SOURCE.patch | 31 +++++++++++++++++++++++++++++++
golang-f21-hostname.patch | 10 ++++------
golang.spec | 31 ++++++++++++++++++++++---------
3 files changed, 57 insertions(+), 15 deletions(-)
---
10 years, 2 months
[golang/f19] (5 commits) ...Merge branch 'master' into f19
by Adam Miller
Summary of changes:
d0ddbae... re-order some patches, remove unneeded glibc deprecated mac (*)
969848f... fix patchlevel for patch200 (*)
a9aa183... update hostname patch (*)
64f9c14... fix BSD/SVID patch, and fix up changelog entry (rpmlint was (*)
2e5eb6e... Merge branch 'master' into f19
(*) This commit already existed in another branch; no separate mail sent
10 years, 2 months
[golang/epel7: 5/5] Merge branch 'master' into epel7
by Adam Miller
commit c773818a7b113771223d1dee8c6c4da4dcde7af9
Merge: bb2aeae 64f9c14
Author: Adam Miller <admiller(a)redhat.com>
Date: Thu Feb 20 15:06:43 2014 -0600
Merge branch 'master' into epel7
* master:
fix BSD/SVID patch, and fix up changelog entry (rpmlint was complaining about invalid date)
update hostname patch
fix patchlevel for patch200
re-order some patches, remove unneeded glibc deprecated macros _BSD_SOURCE and _SVID_SOURCE
golang-1.2-BSD-SVID-SOURCE.patch | 31 +++++++++++++++++++++++++++++++
golang-f21-hostname.patch | 10 ++++------
golang.spec | 31 ++++++++++++++++++++++---------
3 files changed, 57 insertions(+), 15 deletions(-)
---
10 years, 2 months
[golang/epel7] (5 commits) ...Merge branch 'master' into epel7
by Adam Miller
Summary of changes:
d0ddbae... re-order some patches, remove unneeded glibc deprecated mac (*)
969848f... fix patchlevel for patch200 (*)
a9aa183... update hostname patch (*)
64f9c14... fix BSD/SVID patch, and fix up changelog entry (rpmlint was (*)
c773818... Merge branch 'master' into epel7
(*) This commit already existed in another branch; no separate mail sent
10 years, 2 months
[golang/el6: 5/5] Merge branch 'master' into el6
by Adam Miller
commit 3fb203860205d3aa713f13fa23fe15c99f3777c5
Merge: 9e4e25c 64f9c14
Author: Adam Miller <admiller(a)redhat.com>
Date: Thu Feb 20 15:06:55 2014 -0600
Merge branch 'master' into el6
* master:
fix BSD/SVID patch, and fix up changelog entry (rpmlint was complaining about invalid date)
update hostname patch
fix patchlevel for patch200
re-order some patches, remove unneeded glibc deprecated macros _BSD_SOURCE and _SVID_SOURCE
golang-1.2-BSD-SVID-SOURCE.patch | 31 +++++++++++++++++++++++++++++++
golang-f21-hostname.patch | 10 ++++------
golang.spec | 31 ++++++++++++++++++++++---------
3 files changed, 57 insertions(+), 15 deletions(-)
---
10 years, 2 months
[golang/el6] (5 commits) ...Merge branch 'master' into el6
by Adam Miller
Summary of changes:
d0ddbae... re-order some patches, remove unneeded glibc deprecated mac (*)
969848f... fix patchlevel for patch200 (*)
a9aa183... update hostname patch (*)
64f9c14... fix BSD/SVID patch, and fix up changelog entry (rpmlint was (*)
3fb2038... Merge branch 'master' into el6
(*) This commit already existed in another branch; no separate mail sent
10 years, 2 months
[golang] fix BSD/SVID patch, and fix up changelog entry (rpmlint was complaining about invalid date)
by Adam Miller
commit 64f9c1459a3af3e8d31daddc9c57f443b6985771
Author: Adam Miller <admiller(a)redhat.com>
Date: Thu Feb 20 14:39:08 2014 -0600
fix BSD/SVID patch, and fix up changelog entry (rpmlint was complaining about invalid date)
golang-1.2-BSD-SVID-SOURCE.patch | 29 ++++++++++++++++++++++++-----
golang.spec | 2 +-
2 files changed, 25 insertions(+), 6 deletions(-)
---
diff --git a/golang-1.2-BSD-SVID-SOURCE.patch b/golang-1.2-BSD-SVID-SOURCE.patch
index 9ad1677..d65e04a 100644
--- a/golang-1.2-BSD-SVID-SOURCE.patch
+++ b/golang-1.2-BSD-SVID-SOURCE.patch
@@ -1,12 +1,31 @@
---- 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 @@
+--- include/u.h.orig 2014-02-20 13:51:53.456000000 -0600
++++ include/u.h 2014-02-20 13:55:51.072000000 -0600
+@@ -38,9 +38,12 @@
# define __MAKECONTEXT_V2_SOURCE 1
# endif
#endif
--#define _BSD_SOURCE 1
++#if defined __linux__ || defined __GNU__ || defined __GLIBC__
++#define _DEFAULT_SOURCE 1
++#else
+ #define _BSD_SOURCE 1
-#define _NETBSD_SOURCE 1 /* NetBSD */
--#define _SVID_SOURCE 1
+ #define _SVID_SOURCE 1
++#endif
#if !defined(__APPLE__) && !defined(__OpenBSD__)
# define _XOPEN_SOURCE 1000
# define _XOPEN_SOURCE_EXTENDED 1
+--- src/lib9/utf/utfecpy.c.orig 2014-02-20 14:12:27.735000000 -0600
++++ src/lib9/utf/utfecpy.c 2014-02-20 14:13:09.242000000 -0600
+@@ -11,7 +11,11 @@
+ * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
+ * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
+ */
+-#define _BSD_SOURCE 1
++#if defined __linux__ || defined __GNU__ || defined __GLIBC__
++#define _DEFAULT_SOURCE 1
++#else
++ #define _BSD_SOURCE 1
++#endif
+ #include <string.h>
+ #include "utf.h"
+ #include "utfdef.h"
diff --git a/golang.spec b/golang.spec
index 7c495b5..5b2882c 100644
--- a/golang.spec
+++ b/golang.spec
@@ -329,7 +329,7 @@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf
* Tue Feb 18 2014 Vincent Batts <vbatts(a)redhat.com> 1.2-5
- provide 'go', so users can yum install 'go'
-* Thu Jan 24 2014 Vincent Batts <vbatts(a)redhat.com> 1.2-4
+* Fri Jan 24 2014 Vincent Batts <vbatts(a)redhat.com> 1.2-4
- skip a flaky test that is sporadically failing on the build server
* Thu Jan 16 2014 Vincent Batts <vbatts(a)redhat.com> 1.2-3
10 years, 2 months
[golang] update hostname patch
by Adam Miller
commit a9aa1838b73b3980384203d607a0c883ff1e88b5
Author: Adam Miller <admiller(a)redhat.com>
Date: Thu Feb 20 13:16:56 2014 -0600
update hostname patch
golang-f21-hostname.patch | 10 ++++------
golang.spec | 2 +-
2 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/golang-f21-hostname.patch b/golang-f21-hostname.patch
index acc3c6c..6025ecb 100644
--- a/golang-f21-hostname.patch
+++ b/golang-f21-hostname.patch
@@ -1,11 +1,9 @@
-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 {
+--- src/pkg/os/os_test.go.orig 2014-02-20 13:14:45.543644182 -0600
++++ src/pkg/os/os_test.go 2014-02-20 13:14:55.934813622 -0600
+@@ -854,7 +854,7 @@
t.Fatal(err)
}
+ defer r.Close()
- 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 {
diff --git a/golang.spec b/golang.spec
index 3dbbcdc..7c495b5 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 -p1
+%patch210 -p0
%patch211 -p0
%endif
10 years, 2 months