diff --git a/sources b/sources index 109d66d..5cae19b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1e914d340a2f84641ea0287ebaee9276 xrootd-4.2.1.tar.gz +b746481a2f3dd6c04031ee0a76994cbe xrootd-4.2.2.tar.gz diff --git a/xrootd-narrowing.patch b/xrootd-narrowing.patch deleted file mode 100644 index 142db75..0000000 --- a/xrootd-narrowing.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur xrootd-4.2.1.orig/src/XrdCms/XrdCmsLogin.cc xrootd-4.2.1/src/XrdCms/XrdCmsLogin.cc ---- xrootd-4.2.1.orig/src/XrdCms/XrdCmsLogin.cc 2015-05-29 16:00:55.000000000 +0200 -+++ xrootd-4.2.1/src/XrdCms/XrdCmsLogin.cc 2015-06-02 16:45:12.871062524 +0200 -@@ -272,7 +272,7 @@ - - int XrdCmsLogin::SendErrorBL(XrdLink *Link, char *rbuff, int rblen) - { -- CmsRRHdr Rsp = {0, kYR_try, CmsTryRequest::kYR_permtop, htons(rblen)}; -+ CmsRRHdr Rsp = {0, kYR_try, CmsTryRequest::kYR_permtop, htons((unsigned short int)rblen)}; - struct iovec iov[2] = {{(char *)&Rsp, sizeof(Rsp)}, - {rbuff, static_cast(rblen)}}; - char msgbuff[2048]; -Endast i xrootd-4.2.1/src/XrdCms: XrdCmsLogin.cc~ diff --git a/xrootd-selinux.patch b/xrootd-selinux.patch new file mode 100644 index 0000000..9709b68 --- /dev/null +++ b/xrootd-selinux.patch @@ -0,0 +1,53 @@ +From b0a54330e206fbef5bd9b9be228e2929d866ab7a Mon Sep 17 00:00:00 2001 +From: Lukas Vrabec +Date: Fri, 31 Jul 2015 17:11:59 +0200 +Subject: [PATCH] Fix selinux policy for xrootd due to new SELinux change + https://fedoraproject.org/wiki/Changes/SELinuxPolicyStoreMigration + +--- + packaging/common/xrootd.te | 35 +++++++++++++++++++---------------- + 1 file changed, 19 insertions(+), 16 deletions(-) + +diff --git a/packaging/common/xrootd.te b/packaging/common/xrootd.te +index 5fa024c..3f47fad 100644 +--- a/packaging/common/xrootd.te ++++ b/packaging/common/xrootd.te +@@ -1,19 +1,22 @@ +-module xrootd 4; ++policy_module(xrootd, 4) + +-require { +- type logrotate_t; +- type var_log_t; +- type ptmx_t; +- type tmpfs_t; +- type devpts_t; +- class fifo_file { write open getattr }; +- class chr_file { open read write ioctl getattr }; +- class filesystem getattr; +-} + + #============= logrotate_t ============== +-allow logrotate_t var_log_t:fifo_file { write open getattr }; +-allow logrotate_t ptmx_t:chr_file { open read write ioctl }; +-allow logrotate_t tmpfs_t:filesystem getattr; +-allow logrotate_t devpts_t:filesystem getattr; +-allow logrotate_t devpts_t:chr_file { getattr open read write ioctl }; ++optional_policy(` ++ ++ gen_require(` ++ type logrotate_t; ++ type var_log_t; ++ type ptmx_t; ++ type tmpfs_t; ++ type devpts_t; ++ class fifo_file { write open getattr }; ++ class chr_file { open read write ioctl getattr }; ++ class filesystem getattr; ++ ') ++ allow logrotate_t var_log_t:fifo_file { write open getattr }; ++ allow logrotate_t ptmx_t:chr_file { open read write ioctl }; ++ allow logrotate_t tmpfs_t:filesystem getattr; ++ allow logrotate_t devpts_t:filesystem getattr; ++ allow logrotate_t devpts_t:chr_file { getattr open read write ioctl }; ++') diff --git a/xrootd.spec b/xrootd.spec index 384c5fc..2f94fc7 100644 --- a/xrootd.spec +++ b/xrootd.spec @@ -9,16 +9,16 @@ Name: xrootd Epoch: 1 -Version: 4.2.1 -Release: 3%{?dist} +Version: 4.2.2 +Release: 1%{?dist} Summary: Extended ROOT file server Group: System Environment/Daemons License: LGPLv3+ URL: http://xrootd.org/ Source0: http://xrootd.org/download/v%{version}/%{name}-%{version}.tar.gz -# Fix narrowing conversion error on ppc64 (EPEL 7) -Patch0: %{name}-narrowing.patch +# https://github.com/xrootd/xrootd/pull/272 (rhbz 1249137) +Patch0: %{name}-selinux.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake @@ -245,12 +245,6 @@ This package contains the API documentation of the xrootd libraries. sed 's/ open / /' -i packaging/common/%{name}.te %endif -# Rename documentation file to get the includes right -mv bindings/python/examples/copy_example.py bindings/python/examples/copy.py - -# Create missing documentation file -touch bindings/python/README.rst - %build mkdir build @@ -612,6 +606,10 @@ fi %doc %{_pkgdocdir} %changelog +* Fri Jul 31 2015 Mattias Ellert - 1:4.2.2-1 +- Update to version 4.2.2 +- Drop patch xrootd-narrowing.patch (accepted upstream) + * Fri Jun 19 2015 Fedora Release Engineering - 1:4.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild