Architecture specific change in rpms/git-time-metric.git
by githook-noreply＠fedoraproject.org
The package rpms/git-time-metric.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/git-time-metric.git/commit/?id=b0....
Change:
+ExcludeArch: i686 armv7hl
Thanks.
Full change:
============
commit b067d9a781f742bbd656de0a50596bf1d91d4998
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Fri Feb 22 22:55:06 2019 -0500
Add ExcludeArch because of golang-github-libgit2-git2go.
diff --git a/git-time-metric.spec b/git-time-metric.spec
index 7a87fab..fcd975c 100644
--- a/git-time-metric.spec
+++ b/git-time-metric.spec
@@ -10,6 +10,10 @@ License: MIT
URL: %{gourl}
Source0: %{gosource}
+# Because of golang-github-libgit2-git2go issues:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1680200
+ExcludeArch: i686 armv7hl
+
%description
%{summary}
5 years, 2 months
Architecture specific change in rpms/golang-github-libgit2-git2go.git
by githook-noreply＠fedoraproject.org
The package rpms/golang-github-libgit2-git2go.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-libgit2-git2go.git/....
Change:
+ExcludeArch: i686 armv7hl
Thanks.
Full change:
============
commit 31cc1f26c2f59b802bbfba01f5ff73191d7d6988
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Fri Feb 22 21:01:20 2019 -0500
Fix changelog.
diff --git a/golang-github-libgit2-git2go.spec b/golang-github-libgit2-git2go.spec
index befa2d8..36217b9 100644
--- a/golang-github-libgit2-git2go.spec
+++ b/golang-github-libgit2-git2go.spec
@@ -56,5 +56,5 @@ use import path with %{goipath} prefix.
%changelog
-* Wed Feb 20 2019 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 0-0.27.1.20190222gitecaeb7a
+* Wed Feb 20 2019 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 0-0.27.1.20190223gitecaeb7a
- First package for Fedora
commit 3cf5910e96e9acd7710840433948d1f91ab14e3c
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Fri Feb 22 21:00:38 2019 -0500
Exclude 32-bit arches.
See https://bugzilla.redhat.com/show_bug.cgi?id=1680200 and
https://github.com/libgit2/git2go/issues/487
diff --git a/golang-github-libgit2-git2go.spec b/golang-github-libgit2-git2go.spec
index 99ecd2e..befa2d8 100644
--- a/golang-github-libgit2-git2go.spec
+++ b/golang-github-libgit2-git2go.spec
@@ -17,6 +17,9 @@ Source0: %{gosource}
Patch0001: 0001-Skip-tests-that-use-the-network.patch
%endif
+# https://bugzilla.redhat.com/show_bug.cgi?id=1680200
+ExcludeArch: i686 armv7hl
+
%description
%{summary}
5 years, 2 months
Architecture specific change in rpms/golang-github-libgit2-git2go.git
by githook-noreply＠fedoraproject.org
The package rpms/golang-github-libgit2-git2go.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-libgit2-git2go.git/....
Change:
+ExcludeArch: i686 armv7hl
Thanks.
Full change:
============
commit 31cc1f26c2f59b802bbfba01f5ff73191d7d6988
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Fri Feb 22 21:01:20 2019 -0500
Fix changelog.
diff --git a/golang-github-libgit2-git2go.spec b/golang-github-libgit2-git2go.spec
index befa2d8..36217b9 100644
--- a/golang-github-libgit2-git2go.spec
+++ b/golang-github-libgit2-git2go.spec
@@ -56,5 +56,5 @@ use import path with %{goipath} prefix.
%changelog
-* Wed Feb 20 2019 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 0-0.27.1.20190222gitecaeb7a
+* Wed Feb 20 2019 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 0-0.27.1.20190223gitecaeb7a
- First package for Fedora
commit 3cf5910e96e9acd7710840433948d1f91ab14e3c
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Fri Feb 22 21:00:38 2019 -0500
Exclude 32-bit arches.
See https://bugzilla.redhat.com/show_bug.cgi?id=1680200 and
https://github.com/libgit2/git2go/issues/487
diff --git a/golang-github-libgit2-git2go.spec b/golang-github-libgit2-git2go.spec
index 99ecd2e..befa2d8 100644
--- a/golang-github-libgit2-git2go.spec
+++ b/golang-github-libgit2-git2go.spec
@@ -17,6 +17,9 @@ Source0: %{gosource}
Patch0001: 0001-Skip-tests-that-use-the-network.patch
%endif
+# https://bugzilla.redhat.com/show_bug.cgi?id=1680200
+ExcludeArch: i686 armv7hl
+
%description
%{summary}
5 years, 2 months
Architecture specific change in rpms/golang-github-libgit2-git2go.git
by githook-noreply＠fedoraproject.org
The package rpms/golang-github-libgit2-git2go.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-libgit2-git2go.git/....
Change:
+ExcludeArch: i686 armv7hl
Thanks.
Full change:
============
commit 31cc1f26c2f59b802bbfba01f5ff73191d7d6988
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Fri Feb 22 21:01:20 2019 -0500
Fix changelog.
diff --git a/golang-github-libgit2-git2go.spec b/golang-github-libgit2-git2go.spec
index befa2d8..36217b9 100644
--- a/golang-github-libgit2-git2go.spec
+++ b/golang-github-libgit2-git2go.spec
@@ -56,5 +56,5 @@ use import path with %{goipath} prefix.
%changelog
-* Wed Feb 20 2019 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 0-0.27.1.20190222gitecaeb7a
+* Wed Feb 20 2019 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 0-0.27.1.20190223gitecaeb7a
- First package for Fedora
commit 3cf5910e96e9acd7710840433948d1f91ab14e3c
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Fri Feb 22 21:00:38 2019 -0500
Exclude 32-bit arches.
See https://bugzilla.redhat.com/show_bug.cgi?id=1680200 and
https://github.com/libgit2/git2go/issues/487
diff --git a/golang-github-libgit2-git2go.spec b/golang-github-libgit2-git2go.spec
index 99ecd2e..befa2d8 100644
--- a/golang-github-libgit2-git2go.spec
+++ b/golang-github-libgit2-git2go.spec
@@ -17,6 +17,9 @@ Source0: %{gosource}
Patch0001: 0001-Skip-tests-that-use-the-network.patch
%endif
+# https://bugzilla.redhat.com/show_bug.cgi?id=1680200
+ExcludeArch: i686 armv7hl
+
%description
%{summary}
5 years, 2 months
Architecture specific change in rpms/delve.git
by githook-noreply＠fedoraproject.org
The package rpms/delve.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/delve.git/commit/?id=39cfa248f89a....
Change:
+ExclusiveArch: x86_64
Thanks.
Full change:
============
commit 39cfa248f89aa69b377aede2ba07c76df8fe0552
Author: Derek Parker <deparker(a)redhat.com>
Date: Fri Feb 22 13:02:51 2019 -0800
Add ExclusiveArch
diff --git a/delve.spec b/delve.spec
index 8777d2e..b175ad4 100644
--- a/delve.spec
+++ b/delve.spec
@@ -22,6 +22,7 @@ Summary: A debugger for the Go programming language
License: MIT
URL: %{gourl}
Source0: %{gosource}
+ExclusiveArch: x86_64
Patch1: ./disable-default-compression-dwz-test.patch
Patch2: ./integration-test-symlinks.patch
5 years, 2 months
Architecture specific change in rpms/golang-github-transip-gotransip.git
by githook-noreply＠fedoraproject.org
The package rpms/golang-github-transip-gotransip.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-transip-gotransip.g....
Change:
+%ifnarch %{arm} %{ix86}
Thanks.
Full change:
============
commit 4d9a0e7a41c42925f9457fbecb40858093eae388
Author: Carl George <carl(a)george.computer>
Date: Fri Feb 22 09:57:16 2019 -0600
Skip tests on 32bit architectures
diff --git a/golang-github-transip-gotransip.spec b/golang-github-transip-gotransip.spec
index 61c2b36..189227a 100644
--- a/golang-github-transip-gotransip.spec
+++ b/golang-github-transip-gotransip.spec
@@ -6,14 +6,21 @@ Version: 5.8.1
This is the Go client for the TransIP API. To use it you need an account with
TransIP, enable API usage and setup a private API key.}
+%ifnarch %{arm} %{ix86}
+# https://github.com/transip/gotransip/issues/11
+%bcond_without tests
+%endif
+
Name: %{goname}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: TransIP API client for Go
License: MIT
URL: %{gourl}
Source0: %{gosource}
+%if %{with tests}
BuildRequires: golang(github.com/stretchr/testify/assert)
+%endif
%description
@@ -40,8 +47,10 @@ the %{goipath} Go namespace.
%goinstall
+%if %{with tests}
%check
%gochecks
+%endif
%files devel -f devel.file-list
@@ -50,5 +59,8 @@ the %{goipath} Go namespace.
%changelog
+* Fri Feb 22 2019 Carl George <carl(a)george.computer> - 5.8.1-2
+- Skip tests on 32bit architectures
+
* Mon Feb 11 2019 Carl George <carl(a)george.computer> - 5.8.1-1
- Initial package
commit c1fc3378226b42a284d00548e749dfe20d689c00
Author: Carl George <carl(a)george.computer>
Date: Mon Feb 18 15:50:14 2019 -0600
Initial package
https://bugzilla.redhat.com/show_bug.cgi?id=1675937
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..daa318c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/gotransip-*.tar.gz
diff --git a/README.md b/README.md
deleted file mode 100644
index 4687991..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# golang-github-transip-gotransip
-
-TransIP API client for Go
\ No newline at end of file
diff --git a/golang-github-transip-gotransip.spec b/golang-github-transip-gotransip.spec
new file mode 100644
index 0000000..61c2b36
--- /dev/null
+++ b/golang-github-transip-gotransip.spec
@@ -0,0 +1,54 @@
+%global goipath github.com/transip/gotransip
+Version: 5.8.1
+%gometa
+
+%global common_description %{expand:
+This is the Go client for the TransIP API. To use it you need an account with
+TransIP, enable API usage and setup a private API key.}
+
+Name: %{goname}
+Release: 1%{?dist}
+Summary: TransIP API client for Go
+License: MIT
+URL: %{gourl}
+Source0: %{gosource}
+
+BuildRequires: golang(github.com/stretchr/testify/assert)
+
+
+%description
+%{common_description}
+
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+
+%description devel
+%{common_description}
+
+This package contains the source code needed for building packages that import
+the %{goipath} Go namespace.
+
+
+%prep
+%forgeautosetup
+
+
+%install
+%goinstall
+
+
+%check
+%gochecks
+
+
+%files devel -f devel.file-list
+%license LICENSE
+%doc README.md
+
+
+%changelog
+* Mon Feb 11 2019 Carl George <carl(a)george.computer> - 5.8.1-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..e4dbe6d
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (gotransip-5.8.1.tar.gz) = f7100e8c32f02a94a2c10ca89d393463ca870cd0002f4a3f3f0d8afb47556ce233d5d559f20a55aeef6793ddd3382ddadae4ba2672d22e05410e55143abc7ead
5 years, 2 months
Architecture specific change in rpms/golang-github-transip-gotransip.git
by githook-noreply＠fedoraproject.org
The package rpms/golang-github-transip-gotransip.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-transip-gotransip.g....
Change:
+%ifnarch %{arm} %{ix86}
Thanks.
Full change:
============
commit 4d9a0e7a41c42925f9457fbecb40858093eae388
Author: Carl George <carl(a)george.computer>
Date: Fri Feb 22 09:57:16 2019 -0600
Skip tests on 32bit architectures
diff --git a/golang-github-transip-gotransip.spec b/golang-github-transip-gotransip.spec
index 61c2b36..189227a 100644
--- a/golang-github-transip-gotransip.spec
+++ b/golang-github-transip-gotransip.spec
@@ -6,14 +6,21 @@ Version: 5.8.1
This is the Go client for the TransIP API. To use it you need an account with
TransIP, enable API usage and setup a private API key.}
+%ifnarch %{arm} %{ix86}
+# https://github.com/transip/gotransip/issues/11
+%bcond_without tests
+%endif
+
Name: %{goname}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: TransIP API client for Go
License: MIT
URL: %{gourl}
Source0: %{gosource}
+%if %{with tests}
BuildRequires: golang(github.com/stretchr/testify/assert)
+%endif
%description
@@ -40,8 +47,10 @@ the %{goipath} Go namespace.
%goinstall
+%if %{with tests}
%check
%gochecks
+%endif
%files devel -f devel.file-list
@@ -50,5 +59,8 @@ the %{goipath} Go namespace.
%changelog
+* Fri Feb 22 2019 Carl George <carl(a)george.computer> - 5.8.1-2
+- Skip tests on 32bit architectures
+
* Mon Feb 11 2019 Carl George <carl(a)george.computer> - 5.8.1-1
- Initial package
commit c1fc3378226b42a284d00548e749dfe20d689c00
Author: Carl George <carl(a)george.computer>
Date: Mon Feb 18 15:50:14 2019 -0600
Initial package
https://bugzilla.redhat.com/show_bug.cgi?id=1675937
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..daa318c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/gotransip-*.tar.gz
diff --git a/README.md b/README.md
deleted file mode 100644
index 4687991..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# golang-github-transip-gotransip
-
-TransIP API client for Go
\ No newline at end of file
diff --git a/golang-github-transip-gotransip.spec b/golang-github-transip-gotransip.spec
new file mode 100644
index 0000000..61c2b36
--- /dev/null
+++ b/golang-github-transip-gotransip.spec
@@ -0,0 +1,54 @@
+%global goipath github.com/transip/gotransip
+Version: 5.8.1
+%gometa
+
+%global common_description %{expand:
+This is the Go client for the TransIP API. To use it you need an account with
+TransIP, enable API usage and setup a private API key.}
+
+Name: %{goname}
+Release: 1%{?dist}
+Summary: TransIP API client for Go
+License: MIT
+URL: %{gourl}
+Source0: %{gosource}
+
+BuildRequires: golang(github.com/stretchr/testify/assert)
+
+
+%description
+%{common_description}
+
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+
+%description devel
+%{common_description}
+
+This package contains the source code needed for building packages that import
+the %{goipath} Go namespace.
+
+
+%prep
+%forgeautosetup
+
+
+%install
+%goinstall
+
+
+%check
+%gochecks
+
+
+%files devel -f devel.file-list
+%license LICENSE
+%doc README.md
+
+
+%changelog
+* Mon Feb 11 2019 Carl George <carl(a)george.computer> - 5.8.1-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..e4dbe6d
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (gotransip-5.8.1.tar.gz) = f7100e8c32f02a94a2c10ca89d393463ca870cd0002f4a3f3f0d8afb47556ce233d5d559f20a55aeef6793ddd3382ddadae4ba2672d22e05410e55143abc7ead
5 years, 2 months
Architecture specific change in rpms/golang-github-transip-gotransip.git
by githook-noreply＠fedoraproject.org
The package rpms/golang-github-transip-gotransip.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-transip-gotransip.g....
Change:
+%ifnarch %{arm} %{ix86}
Thanks.
Full change:
============
commit 4d9a0e7a41c42925f9457fbecb40858093eae388
Author: Carl George <carl(a)george.computer>
Date: Fri Feb 22 09:57:16 2019 -0600
Skip tests on 32bit architectures
diff --git a/golang-github-transip-gotransip.spec b/golang-github-transip-gotransip.spec
index 61c2b36..189227a 100644
--- a/golang-github-transip-gotransip.spec
+++ b/golang-github-transip-gotransip.spec
@@ -6,14 +6,21 @@ Version: 5.8.1
This is the Go client for the TransIP API. To use it you need an account with
TransIP, enable API usage and setup a private API key.}
+%ifnarch %{arm} %{ix86}
+# https://github.com/transip/gotransip/issues/11
+%bcond_without tests
+%endif
+
Name: %{goname}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: TransIP API client for Go
License: MIT
URL: %{gourl}
Source0: %{gosource}
+%if %{with tests}
BuildRequires: golang(github.com/stretchr/testify/assert)
+%endif
%description
@@ -40,8 +47,10 @@ the %{goipath} Go namespace.
%goinstall
+%if %{with tests}
%check
%gochecks
+%endif
%files devel -f devel.file-list
@@ -50,5 +59,8 @@ the %{goipath} Go namespace.
%changelog
+* Fri Feb 22 2019 Carl George <carl(a)george.computer> - 5.8.1-2
+- Skip tests on 32bit architectures
+
* Mon Feb 11 2019 Carl George <carl(a)george.computer> - 5.8.1-1
- Initial package
5 years, 2 months
Architecture specific change in rpms/golang-github-transip-gotransip.git
by githook-noreply＠fedoraproject.org
The package rpms/golang-github-transip-gotransip.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-transip-gotransip.g....
Change:
+%ifnarch %{arm} %{ix86}
Thanks.
Full change:
============
commit 4d9a0e7a41c42925f9457fbecb40858093eae388
Author: Carl George <carl(a)george.computer>
Date: Fri Feb 22 09:57:16 2019 -0600
Skip tests on 32bit architectures
diff --git a/golang-github-transip-gotransip.spec b/golang-github-transip-gotransip.spec
index 61c2b36..189227a 100644
--- a/golang-github-transip-gotransip.spec
+++ b/golang-github-transip-gotransip.spec
@@ -6,14 +6,21 @@ Version: 5.8.1
This is the Go client for the TransIP API. To use it you need an account with
TransIP, enable API usage and setup a private API key.}
+%ifnarch %{arm} %{ix86}
+# https://github.com/transip/gotransip/issues/11
+%bcond_without tests
+%endif
+
Name: %{goname}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: TransIP API client for Go
License: MIT
URL: %{gourl}
Source0: %{gosource}
+%if %{with tests}
BuildRequires: golang(github.com/stretchr/testify/assert)
+%endif
%description
@@ -40,8 +47,10 @@ the %{goipath} Go namespace.
%goinstall
+%if %{with tests}
%check
%gochecks
+%endif
%files devel -f devel.file-list
@@ -50,5 +59,8 @@ the %{goipath} Go namespace.
%changelog
+* Fri Feb 22 2019 Carl George <carl(a)george.computer> - 5.8.1-2
+- Skip tests on 32bit architectures
+
* Mon Feb 11 2019 Carl George <carl(a)george.computer> - 5.8.1-1
- Initial package
5 years, 2 months
Architecture specific change in rpms/xrootd.git
by githook-noreply＠fedoraproject.org
The package rpms/xrootd.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/xrootd.git/commit/?id=49575f7ae5b...
https://src.fedoraproject.org/cgit/rpms/xrootd.git/commit/?id=48878bf86f6...
https://src.fedoraproject.org/cgit/rpms/xrootd.git/commit/?id=d8462931322....
Change:
-ExcludeArch: i686 armv7hl
+ExcludeArch: i686 armv7hl
+%ifarch %{ix86} %{arm}
Thanks.
Full change:
============
commit f3dd2bbb1f715050909e9f78227b7fdbde0e113c
Author: Mattias Ellert <mattias.ellert(a)physics.uu.se>
Date: Fri Feb 22 15:12:57 2019 +0100
Update to version 4.9.0
Drop patches previously backported
diff --git a/sources b/sources
index 5f7f64b..b21c824 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xrootd-4.8.5.tar.gz) = ab4057bc0266a0019f3d165cf252a80e04afe7a6b35990a8e1941be8eca1f38741d7db26d69116647171384fb6ac3b9b54549da69140343e835bcec177dc184a
+SHA512 (xrootd-4.9.0.tar.gz) = a956262a8adae4c9cb9a91275d4207943cf43251fc61ade111c91152c62baf06c1cbdf1d659c6d792703045a4c2a82bac732220ecfd2fa707e445d6fc66ee047
diff --git a/xrootd-XrdCl-Handle-properly-server-disconnect.patch b/xrootd-XrdCl-Handle-properly-server-disconnect.patch
deleted file mode 100644
index 8cc745c..0000000
--- a/xrootd-XrdCl-Handle-properly-server-disconnect.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 2ab600c98abe37f3550b4ff709d92efd00c6792d Mon Sep 17 00:00:00 2001
-From: Michal Simon <michal.simon(a)cern.ch>
-Date: Fri, 9 Nov 2018 12:36:23 +0100
-Subject: [PATCH] [XrdCl] Handle properly seerver disconnect.
-
----
- src/XrdCl/XrdClXRootDTransport.cc | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/src/XrdCl/XrdClXRootDTransport.cc b/src/XrdCl/XrdClXRootDTransport.cc
-index 0ff3e5d1..75002dc6 100644
---- a/src/XrdCl/XrdClXRootDTransport.cc
-+++ b/src/XrdCl/XrdClXRootDTransport.cc
-@@ -227,7 +227,13 @@ namespace XrdCl
- while( leftToBeRead )
- {
- int status = ::read( socket, message->GetBufferAtCursor(), leftToBeRead );
-- if( status <= 0 )
-+
-+ // if the server shut down the socket declare a socket error (it
-+ // will trigger a re-connect)
-+ if( status == 0 )
-+ return Status( stError, errSocketError, errno );
-+
-+ if( status < 0 )
- return ClassifyErrno( errno );
-
- leftToBeRead -= status;
-@@ -263,7 +269,13 @@ namespace XrdCl
- while( leftToBeRead )
- {
- int status = ::read( socket, message->GetBufferAtCursor(), leftToBeRead );
-- if( status <= 0 )
-+
-+ // if the server shut down the socket declare a socket error (it
-+ // will trigger a re-connect)
-+ if( status == 0 )
-+ return Status( stError, errSocketError, errno );
-+
-+ if( status < 0 )
- return ClassifyErrno( errno );
-
- leftToBeRead -= status;
---
-2.19.1
-
diff --git a/xrootd-cmake-python.patch b/xrootd-cmake-python.patch
deleted file mode 100644
index c57154a..0000000
--- a/xrootd-cmake-python.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f60c1652697c6802ef3516e2fa8dc66fa423e343 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
-Date: Fri, 2 Nov 2018 16:39:39 +0100
-Subject: [PATCH] PythonInterp before PythonLibs
-
----
- cmake/XRootDFindLibs.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/XRootDFindLibs.cmake b/cmake/XRootDFindLibs.cmake
-index abb8c82d..785ae5cc 100644
---- a/cmake/XRootDFindLibs.cmake
-+++ b/cmake/XRootDFindLibs.cmake
-@@ -110,8 +110,8 @@ if( ENABLE_CEPH )
- endif()
-
- if( ENABLE_PYTHON AND (Linux OR APPLE) )
-- find_package( PythonLibs ${XRD_PYTHON_REQ_VERSION} )
- find_package( PythonInterp ${XRD_PYTHON_REQ_VERSION} )
-+ find_package( PythonLibs ${XRD_PYTHON_REQ_VERSION} )
- if( PYTHONINTERP_FOUND AND PYTHONLIBS_FOUND )
- set( BUILD_PYTHON TRUE )
- set( PYTHON_FOUND TRUE )
---
-2.19.1
-
diff --git a/xrootd-gcc9.patch b/xrootd-gcc9.patch
deleted file mode 100644
index e14e3a5..0000000
--- a/xrootd-gcc9.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -ur xrootd-4.8.5.orig/cmake/XRootDOSDefs.cmake xrootd-4.8.5/cmake/XRootDOSDefs.cmake
---- xrootd-4.8.5.orig/cmake/XRootDOSDefs.cmake 2018-10-22 12:02:26.000000000 +0200
-+++ xrootd-4.8.5/cmake/XRootDOSDefs.cmake 2019-01-30 08:13:38.481198951 +0100
-@@ -46,6 +46,12 @@
- if( GCC_VERSION VERSION_GREATER 6.0 OR GCC_VERSION VERSION_EQUAL 6.0 )
- set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=misleading-indentation" )
- endif()
-+
-+ # gcc 9.0 is even more pedantic
-+ if( GCC_VERSION VERSION_GREATER 9.0 OR GCC_VERSION VERSION_EQUAL 9.0 )
-+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=address-of-packed-member" )
-+ endif()
-+
- endif()
-
- #-------------------------------------------------------------------------------
-diff -ur xrootd-4.8.5.orig/src/XrdFileCache/XrdFileCachePrint.cc xrootd-4.8.5/src/XrdFileCache/XrdFileCachePrint.cc
---- xrootd-4.8.5.orig/src/XrdFileCache/XrdFileCachePrint.cc 2018-10-22 12:02:26.000000000 +0200
-+++ xrootd-4.8.5/src/XrdFileCache/XrdFileCachePrint.cc 2019-01-30 08:13:25.973335710 +0100
-@@ -91,7 +91,7 @@
-
- if (m_verbose)
- {
-- int n_db = 0;
-+ int8_t n_db = 0;
- { int x = cfi.GetSizeInBits(); while (x)
- {
- x /= 10; ++n_db;
-diff -ur xrootd-4.8.5.orig/src/XrdHttp/XrdHttpProtocol.hh xrootd-4.8.5/src/XrdHttp/XrdHttpProtocol.hh
---- xrootd-4.8.5.orig/src/XrdHttp/XrdHttpProtocol.hh 2018-10-22 12:02:26.000000000 +0200
-+++ xrootd-4.8.5/src/XrdHttp/XrdHttpProtocol.hh 2019-01-30 08:13:25.973335710 +0100
-@@ -110,6 +110,7 @@
-
-
- /// Ctor, dtors and copy ctor
-+ XrdHttpProtocol(const XrdHttpProtocol&) = default;
- XrdHttpProtocol operator =(const XrdHttpProtocol &rhs);
- XrdHttpProtocol(bool imhttps);
- ~XrdHttpProtocol() {
-diff -ur xrootd-4.8.5.orig/src/XrdOfs/XrdOfsHandle.hh xrootd-4.8.5/src/XrdOfs/XrdOfsHandle.hh
---- xrootd-4.8.5.orig/src/XrdOfs/XrdOfsHandle.hh 2018-10-22 12:02:26.000000000 +0200
-+++ xrootd-4.8.5/src/XrdOfs/XrdOfsHandle.hh 2019-01-30 08:13:25.973335710 +0100
-@@ -74,6 +74,8 @@
- XrdOucCRC::CRC32((const unsigned char *)key,kln) : 0);
- }
-
-+ XrdOfsHanKey(const XrdOfsHanKey&) = default;
-+
- ~XrdOfsHanKey() {};
- };
-
-diff -ur xrootd-4.8.5.orig/src/XrdXrootd/XrdXrootdProtocol.cc xrootd-4.8.5/src/XrdXrootd/XrdXrootdProtocol.cc
---- xrootd-4.8.5.orig/src/XrdXrootd/XrdXrootdProtocol.cc 2018-10-22 12:02:26.000000000 +0200
-+++ xrootd-4.8.5/src/XrdXrootd/XrdXrootdProtocol.cc 2019-01-30 08:13:25.974335699 +0100
-@@ -212,7 +212,7 @@
- /* A s s i g n m e n t O p e r a t o r */
- /******************************************************************************/
-
--XrdXrootdProtocol XrdXrootdProtocol::operator =(const XrdXrootdProtocol &rhs)
-+XrdXrootdProtocol& XrdXrootdProtocol::operator =(const XrdXrootdProtocol &rhs)
- {
- // Reset all common fields
- //
-diff -ur xrootd-4.8.5.orig/src/XrdXrootd/XrdXrootdProtocol.hh xrootd-4.8.5/src/XrdXrootd/XrdXrootdProtocol.hh
---- xrootd-4.8.5.orig/src/XrdXrootd/XrdXrootdProtocol.hh 2018-10-22 12:02:26.000000000 +0200
-+++ xrootd-4.8.5/src/XrdXrootd/XrdXrootdProtocol.hh 2019-01-30 08:13:25.974335699 +0100
-@@ -122,7 +122,7 @@
- static int StatGen(struct stat &buf, char *xxBuff);
-
- // XrdXrootdProtocol operator =(const XrdXrootdProtocol &rhs) = delete;
-- XrdXrootdProtocol operator =(const XrdXrootdProtocol &rhs);
-+ XrdXrootdProtocol& operator =(const XrdXrootdProtocol &rhs);
- XrdXrootdProtocol();
- ~XrdXrootdProtocol() {Cleanup();}
-
diff --git a/xrootd.spec b/xrootd.spec
index 1ab621f..fb60d4e 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -31,35 +31,33 @@
%global ceph 0
%endif
+%if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 7
+%global macaroons 1
+%else
+%global macaroons 0
+%endif
+
Name: xrootd
Epoch: 1
-Version: 4.8.5
-Release: 7%{?dist}
+Version: 4.9.0
+Release: 1%{?dist}
Summary: Extended ROOT file server
License: LGPLv3+
URL: http://xrootd.org/
Source0: http://xrootd.org/download/v%{version}/%{name}-%{version}.tar.gz
-# PythonInterp before PythonLibs
-# https://github.com/xrootd/xrootd/pull/851
-Patch0: %{name}-cmake-python.patch
-# XrdCl: Handle properly server disconnect
-# Backport from upstream git
-Patch1: %{name}-XrdCl-Handle-properly-server-disconnect.patch
-# Fix Fedora Rawhide build (gcc 9)
-# Backport from upstream git
-Patch2: %{name}-gcc9.patch
BuildRequires: gcc-c++
BuildRequires: cmake
+BuildRequires: fuse-devel
BuildRequires: krb5-devel
+BuildRequires: libcurl-devel
BuildRequires: libxml2-devel
BuildRequires: ncurses-devel
BuildRequires: openssl-devel
BuildRequires: perl-generators
BuildRequires: readline-devel
BuildRequires: zlib-devel
-BuildRequires: fuse-devel
BuildRequires: doxygen
BuildRequires: graphviz
BuildRequires: selinux-policy-devel
@@ -85,6 +83,11 @@ BuildRequires: python-sphinx10
BuildRequires: librados-devel
BuildRequires: libradosstriper-devel
%endif
+%if %{macaroons}
+BuildRequires: json-c-devel
+BuildRequires: libmacaroons-devel
+BuildRequires: libuuid-devel
+%endif
Requires: %{name}-server%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-selinux = %{epoch}:%{version}-%{release}
@@ -287,9 +290,6 @@ This package contains the API documentation of the xrootd libraries.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
mkdir build
@@ -417,6 +417,8 @@ sed 's!/usr/bin/env bash!/bin/bash!' -i %{buildroot}%{_bindir}/xrootd-config
rm %{buildroot}%{_libdir}/libXrdCephPosix.so
%endif
+mkdir -p %{buildroot}%{_sysconfdir}/%{name}/config.d
+
mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
mkdir -p %{buildroot}%{_localstatedir}/spool/%{name}
@@ -574,6 +576,7 @@ fi
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%endif
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%dir %{_sysconfdir}/%{name}/config.d
%attr(-,xrootd,xrootd) %config(noreplace) %{_sysconfdir}/%{name}/*.cfg
%attr(-,xrootd,xrootd) %{_localstatedir}/log/%{name}
%attr(-,xrootd,xrootd) %{_localstatedir}/spool/%{name}
@@ -636,6 +639,7 @@ fi
%{_libdir}/libXrdPosix.so
%files server-libs
+%{_libdir}/libXrdHttpUtils.so.*
%{_libdir}/libXrdServer.so.*
%{_libdir}/libXrdSsiLib.so.*
%{_libdir}/libXrdSsiShMap.so.*
@@ -644,6 +648,10 @@ fi
%{_libdir}/libXrdBwm-4.so
%{_libdir}/libXrdFileCache-4.so
%{_libdir}/libXrdHttp-4.so
+%{_libdir}/libXrdHttpTPC-4.so
+%if %{macaroons}
+%{_libdir}/libXrdMacaroons-4.so
+%endif
%{_libdir}/libXrdN2No2p-4.so
%{_libdir}/libXrdOssSIgpfsT-4.so
%{_libdir}/libXrdPss-4.so
@@ -656,10 +664,12 @@ fi
%{_includedir}/%{name}/XrdAcc
%{_includedir}/%{name}/XrdCms
%{_includedir}/%{name}/XrdFileCache
+%{_includedir}/%{name}/XrdHttp
%{_includedir}/%{name}/XrdOss
%{_includedir}/%{name}/XrdSfs
%{_includedir}/%{name}/XrdXrootd
%{_includedir}/%{name}/XrdHttp
+%{_libdir}/libXrdHttpUtils.so
%{_libdir}/libXrdServer.so
%files private-devel
@@ -725,6 +735,10 @@ fi
%doc %{_pkgdocdir}
%changelog
+* Fri Feb 22 2019 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 1:4.9.0-1
+- Update to version 4.9.0
+- Drop patches previously backported
+
* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 1:4.8.5-7
- Rebuild for readline 8.0
commit 0df4d9130cc492932ae21688e1f6f0c27bbcbfed
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Sun Feb 17 09:30:54 2019 +0100
Rebuild for readline 8.0
diff --git a/xrootd.spec b/xrootd.spec
index 581e9c3..1ab621f 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -34,7 +34,7 @@
Name: xrootd
Epoch: 1
Version: 4.8.5
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Extended ROOT file server
License: LGPLv3+
@@ -725,6 +725,9 @@ fi
%doc %{_pkgdocdir}
%changelog
+* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 1:4.8.5-7
+- Rebuild for readline 8.0
+
* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:4.8.5-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 8f9c0408aa35b06396ed10fb30abb6b9b2c2aa76
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sun Feb 3 12:48:45 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/xrootd.spec b/xrootd.spec
index 8961b5d..581e9c3 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -34,7 +34,7 @@
Name: xrootd
Epoch: 1
Version: 4.8.5
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Extended ROOT file server
License: LGPLv3+
@@ -725,6 +725,9 @@ fi
%doc %{_pkgdocdir}
%changelog
+* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:4.8.5-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Wed Jan 30 2019 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 1:4.8.5-5
- Fix Fedora Rawhide build (gcc 9)
commit 4c657695517a763fa311ae7e36e80a840cc7c4c4
Author: Mattias Ellert <mattias.ellert(a)physics.uu.se>
Date: Wed Jan 30 09:16:59 2019 +0100
Fix Fedora Rawhide build (gcc 9)
diff --git a/xrootd-gcc9.patch b/xrootd-gcc9.patch
new file mode 100644
index 0000000..e14e3a5
--- /dev/null
+++ b/xrootd-gcc9.patch
@@ -0,0 +1,75 @@
+diff -ur xrootd-4.8.5.orig/cmake/XRootDOSDefs.cmake xrootd-4.8.5/cmake/XRootDOSDefs.cmake
+--- xrootd-4.8.5.orig/cmake/XRootDOSDefs.cmake 2018-10-22 12:02:26.000000000 +0200
++++ xrootd-4.8.5/cmake/XRootDOSDefs.cmake 2019-01-30 08:13:38.481198951 +0100
+@@ -46,6 +46,12 @@
+ if( GCC_VERSION VERSION_GREATER 6.0 OR GCC_VERSION VERSION_EQUAL 6.0 )
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=misleading-indentation" )
+ endif()
++
++ # gcc 9.0 is even more pedantic
++ if( GCC_VERSION VERSION_GREATER 9.0 OR GCC_VERSION VERSION_EQUAL 9.0 )
++ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=address-of-packed-member" )
++ endif()
++
+ endif()
+
+ #-------------------------------------------------------------------------------
+diff -ur xrootd-4.8.5.orig/src/XrdFileCache/XrdFileCachePrint.cc xrootd-4.8.5/src/XrdFileCache/XrdFileCachePrint.cc
+--- xrootd-4.8.5.orig/src/XrdFileCache/XrdFileCachePrint.cc 2018-10-22 12:02:26.000000000 +0200
++++ xrootd-4.8.5/src/XrdFileCache/XrdFileCachePrint.cc 2019-01-30 08:13:25.973335710 +0100
+@@ -91,7 +91,7 @@
+
+ if (m_verbose)
+ {
+- int n_db = 0;
++ int8_t n_db = 0;
+ { int x = cfi.GetSizeInBits(); while (x)
+ {
+ x /= 10; ++n_db;
+diff -ur xrootd-4.8.5.orig/src/XrdHttp/XrdHttpProtocol.hh xrootd-4.8.5/src/XrdHttp/XrdHttpProtocol.hh
+--- xrootd-4.8.5.orig/src/XrdHttp/XrdHttpProtocol.hh 2018-10-22 12:02:26.000000000 +0200
++++ xrootd-4.8.5/src/XrdHttp/XrdHttpProtocol.hh 2019-01-30 08:13:25.973335710 +0100
+@@ -110,6 +110,7 @@
+
+
+ /// Ctor, dtors and copy ctor
++ XrdHttpProtocol(const XrdHttpProtocol&) = default;
+ XrdHttpProtocol operator =(const XrdHttpProtocol &rhs);
+ XrdHttpProtocol(bool imhttps);
+ ~XrdHttpProtocol() {
+diff -ur xrootd-4.8.5.orig/src/XrdOfs/XrdOfsHandle.hh xrootd-4.8.5/src/XrdOfs/XrdOfsHandle.hh
+--- xrootd-4.8.5.orig/src/XrdOfs/XrdOfsHandle.hh 2018-10-22 12:02:26.000000000 +0200
++++ xrootd-4.8.5/src/XrdOfs/XrdOfsHandle.hh 2019-01-30 08:13:25.973335710 +0100
+@@ -74,6 +74,8 @@
+ XrdOucCRC::CRC32((const unsigned char *)key,kln) : 0);
+ }
+
++ XrdOfsHanKey(const XrdOfsHanKey&) = default;
++
+ ~XrdOfsHanKey() {};
+ };
+
+diff -ur xrootd-4.8.5.orig/src/XrdXrootd/XrdXrootdProtocol.cc xrootd-4.8.5/src/XrdXrootd/XrdXrootdProtocol.cc
+--- xrootd-4.8.5.orig/src/XrdXrootd/XrdXrootdProtocol.cc 2018-10-22 12:02:26.000000000 +0200
++++ xrootd-4.8.5/src/XrdXrootd/XrdXrootdProtocol.cc 2019-01-30 08:13:25.974335699 +0100
+@@ -212,7 +212,7 @@
+ /* A s s i g n m e n t O p e r a t o r */
+ /******************************************************************************/
+
+-XrdXrootdProtocol XrdXrootdProtocol::operator =(const XrdXrootdProtocol &rhs)
++XrdXrootdProtocol& XrdXrootdProtocol::operator =(const XrdXrootdProtocol &rhs)
+ {
+ // Reset all common fields
+ //
+diff -ur xrootd-4.8.5.orig/src/XrdXrootd/XrdXrootdProtocol.hh xrootd-4.8.5/src/XrdXrootd/XrdXrootdProtocol.hh
+--- xrootd-4.8.5.orig/src/XrdXrootd/XrdXrootdProtocol.hh 2018-10-22 12:02:26.000000000 +0200
++++ xrootd-4.8.5/src/XrdXrootd/XrdXrootdProtocol.hh 2019-01-30 08:13:25.974335699 +0100
+@@ -122,7 +122,7 @@
+ static int StatGen(struct stat &buf, char *xxBuff);
+
+ // XrdXrootdProtocol operator =(const XrdXrootdProtocol &rhs) = delete;
+- XrdXrootdProtocol operator =(const XrdXrootdProtocol &rhs);
++ XrdXrootdProtocol& operator =(const XrdXrootdProtocol &rhs);
+ XrdXrootdProtocol();
+ ~XrdXrootdProtocol() {Cleanup();}
+
diff --git a/xrootd.spec b/xrootd.spec
index 45701ab..8961b5d 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -34,7 +34,7 @@
Name: xrootd
Epoch: 1
Version: 4.8.5
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Extended ROOT file server
License: LGPLv3+
@@ -46,6 +46,9 @@ Patch0: %{name}-cmake-python.patch
# XrdCl: Handle properly server disconnect
# Backport from upstream git
Patch1: %{name}-XrdCl-Handle-properly-server-disconnect.patch
+# Fix Fedora Rawhide build (gcc 9)
+# Backport from upstream git
+Patch2: %{name}-gcc9.patch
BuildRequires: gcc-c++
BuildRequires: cmake
@@ -286,6 +289,7 @@ This package contains the API documentation of the xrootd libraries.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
mkdir build
@@ -721,6 +725,9 @@ fi
%doc %{_pkgdocdir}
%changelog
+* Wed Jan 30 2019 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 1:4.8.5-5
+- Fix Fedora Rawhide build (gcc 9)
+
* Thu Jan 17 2019 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 1:4.8.5-4
- Drop ceph support for 32 bit arches in Fedore 30+
commit d846293132243abbbc460b0bec3baa1a557c2c8c
Author: Mattias Ellert <mattias.ellert(a)physics.uu.se>
Date: Thu Jan 17 12:55:16 2019 +0100
Drop ceph support for 32 bit arches in Fedore 30+
diff --git a/xrootd-XrdCl-Handle-properly-seerver-disconnect.patch b/xrootd-XrdCl-Handle-properly-seerver-disconnect.patch
deleted file mode 100644
index 8cc745c..0000000
--- a/xrootd-XrdCl-Handle-properly-seerver-disconnect.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 2ab600c98abe37f3550b4ff709d92efd00c6792d Mon Sep 17 00:00:00 2001
-From: Michal Simon <michal.simon(a)cern.ch>
-Date: Fri, 9 Nov 2018 12:36:23 +0100
-Subject: [PATCH] [XrdCl] Handle properly seerver disconnect.
-
----
- src/XrdCl/XrdClXRootDTransport.cc | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/src/XrdCl/XrdClXRootDTransport.cc b/src/XrdCl/XrdClXRootDTransport.cc
-index 0ff3e5d1..75002dc6 100644
---- a/src/XrdCl/XrdClXRootDTransport.cc
-+++ b/src/XrdCl/XrdClXRootDTransport.cc
-@@ -227,7 +227,13 @@ namespace XrdCl
- while( leftToBeRead )
- {
- int status = ::read( socket, message->GetBufferAtCursor(), leftToBeRead );
-- if( status <= 0 )
-+
-+ // if the server shut down the socket declare a socket error (it
-+ // will trigger a re-connect)
-+ if( status == 0 )
-+ return Status( stError, errSocketError, errno );
-+
-+ if( status < 0 )
- return ClassifyErrno( errno );
-
- leftToBeRead -= status;
-@@ -263,7 +269,13 @@ namespace XrdCl
- while( leftToBeRead )
- {
- int status = ::read( socket, message->GetBufferAtCursor(), leftToBeRead );
-- if( status <= 0 )
-+
-+ // if the server shut down the socket declare a socket error (it
-+ // will trigger a re-connect)
-+ if( status == 0 )
-+ return Status( stError, errSocketError, errno );
-+
-+ if( status < 0 )
- return ClassifyErrno( errno );
-
- leftToBeRead -= status;
---
-2.19.1
-
diff --git a/xrootd-XrdCl-Handle-properly-server-disconnect.patch b/xrootd-XrdCl-Handle-properly-server-disconnect.patch
new file mode 100644
index 0000000..8cc745c
--- /dev/null
+++ b/xrootd-XrdCl-Handle-properly-server-disconnect.patch
@@ -0,0 +1,46 @@
+From 2ab600c98abe37f3550b4ff709d92efd00c6792d Mon Sep 17 00:00:00 2001
+From: Michal Simon <michal.simon(a)cern.ch>
+Date: Fri, 9 Nov 2018 12:36:23 +0100
+Subject: [PATCH] [XrdCl] Handle properly seerver disconnect.
+
+---
+ src/XrdCl/XrdClXRootDTransport.cc | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/src/XrdCl/XrdClXRootDTransport.cc b/src/XrdCl/XrdClXRootDTransport.cc
+index 0ff3e5d1..75002dc6 100644
+--- a/src/XrdCl/XrdClXRootDTransport.cc
++++ b/src/XrdCl/XrdClXRootDTransport.cc
+@@ -227,7 +227,13 @@ namespace XrdCl
+ while( leftToBeRead )
+ {
+ int status = ::read( socket, message->GetBufferAtCursor(), leftToBeRead );
+- if( status <= 0 )
++
++ // if the server shut down the socket declare a socket error (it
++ // will trigger a re-connect)
++ if( status == 0 )
++ return Status( stError, errSocketError, errno );
++
++ if( status < 0 )
+ return ClassifyErrno( errno );
+
+ leftToBeRead -= status;
+@@ -263,7 +269,13 @@ namespace XrdCl
+ while( leftToBeRead )
+ {
+ int status = ::read( socket, message->GetBufferAtCursor(), leftToBeRead );
+- if( status <= 0 )
++
++ // if the server shut down the socket declare a socket error (it
++ // will trigger a re-connect)
++ if( status == 0 )
++ return Status( stError, errSocketError, errno );
++
++ if( status < 0 )
+ return ClassifyErrno( errno );
+
+ leftToBeRead -= status;
+--
+2.19.1
+
diff --git a/xrootd.spec b/xrootd.spec
index e10a118..45701ab 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -16,10 +16,25 @@
%global py2 1
%endif
+%if %{?fedora}%{!?fedora:0} >= 24
+%if %{?fedora}%{!?fedora:0} >= 30
+# Ceph is broken for 32 bit arches in Fedora 30+
+%ifarch %{ix86} %{arm}
+%global ceph 0
+%else
+%global ceph 1
+%endif
+%else
+%global ceph 1
+%endif
+%else
+%global ceph 0
+%endif
+
Name: xrootd
Epoch: 1
Version: 4.8.5
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Extended ROOT file server
License: LGPLv3+
@@ -28,9 +43,9 @@ Source0: http://xrootd.org/download/v%{version}/%{name}-%{version}.tar.gz
# PythonInterp before PythonLibs
# https://github.com/xrootd/xrootd/pull/851
Patch0: %{name}-cmake-python.patch
-# XrdCl: Handle properly seerver disconnect
+# XrdCl: Handle properly server disconnect
# Backport from upstream git
-Patch1: %{name}-XrdCl-Handle-properly-seerver-disconnect.patch
+Patch1: %{name}-XrdCl-Handle-properly-server-disconnect.patch
BuildRequires: gcc-c++
BuildRequires: cmake
@@ -63,7 +78,7 @@ BuildRequires: python2-sphinx
%if %{?rhel}%{!?rhel:0} == 6
BuildRequires: python-sphinx10
%endif
-%if %{?fedora}%{!?fedora:0} >= 24
+%if %{ceph}
BuildRequires: librados-devel
BuildRequires: libradosstriper-devel
%endif
@@ -216,7 +231,7 @@ Requires: fuse
This package contains the FUSE (file system in user space) xrootd mount
tool.
-%if %{?fedora}%{!?fedora:0} >= 24
+%if %{ceph}
%package ceph
Summary: Ceph back-end plug-in for xrootd
Requires: %{name}-server%{?_isa} = %{epoch}:%{version}-%{release}
@@ -394,7 +409,7 @@ sed 's!/usr/bin/env perl!/usr/bin/perl!' -i \
sed 's!/usr/bin/env bash!/bin/bash!' -i %{buildroot}%{_bindir}/xrootd-config
-%if %{?fedora}%{!?fedora:0} >= 24
+%if %{ceph}
rm %{buildroot}%{_libdir}/libXrdCephPosix.so
%endif
@@ -422,7 +437,7 @@ rm %{buildroot}%{_pkgdocdir}/python/.buildinfo
%ldconfig_scriptlets server-libs
-%if %{?fedora}%{!?fedora:0} >= 24
+%if %{ceph}
%ldconfig_scriptlets ceph
%endif
@@ -674,7 +689,7 @@ fi
%{_bindir}/xrootdfs
%{_mandir}/man1/xrootdfs.1*
-%if %{?fedora}%{!?fedora:0} >= 24
+%if %{ceph}
%files ceph
%{_libdir}/libXrdCeph-4.so
%{_libdir}/libXrdCephXattr-4.so
@@ -706,11 +721,14 @@ fi
%doc %{_pkgdocdir}
%changelog
+* Thu Jan 17 2019 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 1:4.8.5-4
+- Drop ceph support for 32 bit arches in Fedore 30+
+
* Mon Jan 14 2019 Bjrn Esser <besser82(a)fedoraproject.org> - 1:4.8.5-3
- Rebuilt for libcrypt.so.2 (#1666033)
* Wed Nov 14 2018 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 1:4.8.5-2
-- XrdCl: Handle properly seerver disconnect
+- XrdCl: Handle properly server disconnect
* Sat Nov 03 2018 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 1:4.8.5-1
- Update to version 4.8.5
commit 49575f7ae5b124c08a9cfb885315368cfc567bb8
Author: Mattias Ellert <mattias.ellert(a)physics.uu.se>
Date: Thu Jan 17 10:53:27 2019 +0100
Revert "Add ExcludeArch: i686 armv7hl as ceph excludes those arches"
This reverts commit 48878bf86f6c149400181cb8e6ab5e0021e9d23f.
diff --git a/xrootd.spec b/xrootd.spec
index 8be6e41..e10a118 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -32,9 +32,6 @@ Patch0: %{name}-cmake-python.patch
# Backport from upstream git
Patch1: %{name}-XrdCl-Handle-properly-seerver-disconnect.patch
-# Inherited from ceph.spec.
-ExcludeArch: i686 armv7hl
-
BuildRequires: gcc-c++
BuildRequires: cmake
BuildRequires: krb5-devel
@@ -711,7 +708,6 @@ fi
%changelog
* Mon Jan 14 2019 Bjrn Esser <besser82(a)fedoraproject.org> - 1:4.8.5-3
- Rebuilt for libcrypt.so.2 (#1666033)
-- Add ExcludeArch: i686 armv7hl as ceph excludes those arches
* Wed Nov 14 2018 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 1:4.8.5-2
- XrdCl: Handle properly seerver disconnect
commit 48878bf86f6c149400181cb8e6ab5e0021e9d23f
Author: Bjrn Esser <besser82(a)fedoraproject.org>
Date: Tue Jan 15 08:24:08 2019 +0100
Add ExcludeArch: i686 armv7hl as ceph excludes those arches
diff --git a/xrootd.spec b/xrootd.spec
index e10a118..8be6e41 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -32,6 +32,9 @@ Patch0: %{name}-cmake-python.patch
# Backport from upstream git
Patch1: %{name}-XrdCl-Handle-properly-seerver-disconnect.patch
+# Inherited from ceph.spec.
+ExcludeArch: i686 armv7hl
+
BuildRequires: gcc-c++
BuildRequires: cmake
BuildRequires: krb5-devel
@@ -708,6 +711,7 @@ fi
%changelog
* Mon Jan 14 2019 Bjrn Esser <besser82(a)fedoraproject.org> - 1:4.8.5-3
- Rebuilt for libcrypt.so.2 (#1666033)
+- Add ExcludeArch: i686 armv7hl as ceph excludes those arches
* Wed Nov 14 2018 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 1:4.8.5-2
- XrdCl: Handle properly seerver disconnect
commit 416ead7de47a53f57d6963de54210707668fa44f
Author: Bjrn Esser <besser82(a)fedoraproject.org>
Date: Mon Jan 14 19:20:00 2019 +0100
Rebuilt for libcrypt.so.2 (#1666033)
diff --git a/xrootd.spec b/xrootd.spec
index 57cc531..e10a118 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -19,7 +19,7 @@
Name: xrootd
Epoch: 1
Version: 4.8.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Extended ROOT file server
License: LGPLv3+
@@ -706,6 +706,9 @@ fi
%doc %{_pkgdocdir}
%changelog
+* Mon Jan 14 2019 Bjrn Esser <besser82(a)fedoraproject.org> - 1:4.8.5-3
+- Rebuilt for libcrypt.so.2 (#1666033)
+
* Wed Nov 14 2018 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 1:4.8.5-2
- XrdCl: Handle properly seerver disconnect
5 years, 2 months