Backport patch to fix test failure.

This commit is contained in:
Elliott Sales de Andrade 2019-01-21 05:45:12 -05:00
parent 7a004a7f33
commit dc32612980
2 changed files with 32 additions and 2 deletions

25
1260.patch Normal file
View File

@ -0,0 +1,25 @@
From 32b2d3034b04a54118bc95c3f83ea5af78f9de41 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 20 Nov 2014 05:08:45 +0300
Subject: [PATCH] Fix test_filter_ipc for cleared supplementary groups
This should fix part of [https://github.com/zeromq/libzmq/issues/1129].
---
tests/test_filter_ipc.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/test_filter_ipc.cpp b/tests/test_filter_ipc.cpp
index 00518f710..83035949b 100644
--- a/tests/test_filter_ipc.cpp
+++ b/tests/test_filter_ipc.cpp
@@ -122,8 +122,8 @@ int main (void)
// Get the group and supplimental groups of the process owner
gid_t groups[100];
int ngroups = getgroups(100, groups);
- assert (ngroups != -1 && ngroups != 0);
- gid_t group = getgid(), supgroup = groups[0], notgroup = groups[ngroups - 1] + 1;
+ assert (ngroups != -1);
+ gid_t group = getgid(), supgroup = group, notgroup = group + 1;
for (int i = 0; i < ngroups; i++) {
if (supgroup == group && group != groups[i])
supgroup = groups[i];

View File

@ -2,7 +2,7 @@
Name: zeromq
Version: 4.1.6
Release: 10%{?dist}
Release: 11%{?dist}
Summary: Software library for fast, message-based applications
License: LGPLv3+
@ -10,6 +10,7 @@ URL: http://www.zeromq.org
Source0: https://github.com/zeromq/zeromq4-1/releases/download/v%{version}/zeromq-%{version}.tar.gz
Source1: https://raw.githubusercontent.com/zeromq/cppzmq/master/zmq.hpp
Source2: https://raw.githubusercontent.com/zeromq/cppzmq/master/LICENSE
Patch0001: https://github.com/zeromq/libzmq/pull/1260.patch
BuildRequires: autoconf
BuildRequires: automake
@ -57,7 +58,7 @@ developing applications that use the C++ header files of %{name}.
%prep
%setup -q
%autosetup -p1
cp -a %{SOURCE2} .
# Don't turn warnings into errors
@ -108,6 +109,10 @@ make check V=1
%changelog
* Mon Jan 21 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 4.1.6-11
- Backport patch to fix test failures in build
- Cleanup spec a little
* Tue Aug 28 2018 Pavel Zhukov <landgraf@fedoraproject.org> - 4.1.6-10
- Add gcc-c++ BR