From 445b315c4b4ef1631057e6653fe7ab2366e7d897 Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Mar 10 2014 15:10:48 +0000 Subject: import fcoe-utils-1.0.29-6.el7.src.rpm --- diff --git a/SOURCES/fcoe-utils-1.0.28-systemd-doc.patch b/SOURCES/fcoe-utils-1.0.28-systemd-doc.patch index ada3283..66dac0a 100644 --- a/SOURCES/fcoe-utils-1.0.28-systemd-doc.patch +++ b/SOURCES/fcoe-utils-1.0.28-systemd-doc.patch @@ -23,3 +23,16 @@ index ec15197..09ee5a2 100644 VLAN NAMING CONVENTIONS ----------------------- +diff --git a/doc/fcoemon.8 b/doc/fcoemon.8 +index e9a045b..8e1a1dd 100644 +--- a/doc/fcoemon.8 ++++ b/doc/fcoemon.8 +@@ -323,7 +323,7 @@ Once these configuration steps have been performed, use \fBfcoeadm\fR to query t + .SH "FILES" + .SS "/etc/fcoe/config" + .sp +-This is the primary configuration file for the \fBfcoe\fR system service\&. The default options in this file are: \fBDEBUG="no"\fR and \fBUSE_SYSLOG="yes"\fR\&. The former is used to enable debugging messages from the fcoe service script and \fBfcoemon\fR (via the \fB\-\-debug\fR option)\&. The latter is to indicate if the log messages are to be output to the system log (via the \fB\-\-syslog\fR option)\&. \fBSUPPORTED_DRIVERS\fR is the list of drivers to automatically load during fcoe service start\&. Any changes to this file will require a restart of the \fBfcoe\fR service\&. ++This is the primary configuration file for the \fBfcoe\fR system service\&. \fBFCOEMON_OPTS\fR are the options we pass to \fBfcoemon\fR and \fBSUPPORTED_DRIVERS\fR is the list of drivers to automatically load during fcoe service start\&. Any changes to this file will require a restart of the \fBfcoe\fR service\&. + .SS "/etc/fcoe/cfg\-" + .sp + These files are read by \fBfcoemon\fR on initialization\&. They are used to indicate which Ethernet or VLAN interfaces should have FCoE instances created\&. The option values in this file normally are: \fBFCOE_ENABLE="yes"\fR, \fBDCB_REQUIRED="yes"\fR, and \fBAUTO_VLAN="yes"\fR, though if the variable values are omitted, they default to "no"\&. diff --git a/SOURCES/fcoe-utils-1.0.29-recv_loop-break.patch b/SOURCES/fcoe-utils-1.0.29-recv_loop-break.patch new file mode 100644 index 0000000..883f952 --- /dev/null +++ b/SOURCES/fcoe-utils-1.0.29-recv_loop-break.patch @@ -0,0 +1,22 @@ +diff --git a/fipvlan.c b/fipvlan.c +index 6f8cf39..64702a7 100644 +--- a/fipvlan.c ++++ b/fipvlan.c +@@ -749,9 +749,15 @@ static void recv_loop(int timeout) + rtnl_recv(pfd[0].fd, rtnl_listener_handler, NULL); + /* everything else should be FIP packet sockets */ + for (i = 1; i < pfd_len; i++) { +- if (pfd[i].revents & POLLIN) +- fip_recv(pfd[i].fd, fip_vlan_handler, NULL); ++ if (pfd[i].revents & POLLIN) { ++ rc = fip_recv(pfd[i].fd, fip_vlan_handler, ++ NULL); ++ if (rc < 0) ++ break; ++ } + } ++ if (i < pfd_len) ++ break; + } + } + diff --git a/SPECS/fcoe-utils.spec b/SPECS/fcoe-utils.spec index 712224f..da47c19 100644 --- a/SPECS/fcoe-utils.spec +++ b/SPECS/fcoe-utils.spec @@ -3,7 +3,7 @@ Name: fcoe-utils Version: 1.0.29 -Release: 2%{?dist} +Release: 6%{?dist} Summary: Fibre Channel over Ethernet utilities Group: Applications/System License: GPLv2 @@ -19,6 +19,8 @@ Patch1: fcoe-utils-1.0.29-make.patch Patch2: fcoe-utils-1.0.18-help.patch Patch3: fcoe-utils-1.0.28-format-strings.patch Patch4: fcoe-utils-1.0.28-systemd-doc.patch +# rhbz#1049018 +Patch5: fcoe-utils-1.0.29-recv_loop-break.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libhbaapi-devel >= 2.2-12 @@ -46,6 +48,7 @@ cp -v %{SOURCE1} quickstart.txt %patch2 -p1 -b .help %patch3 -p1 -b .format-strings %patch4 -p1 -b .systemd-doc +%patch5 -p1 -b .recv-loop %build ./bootstrap.sh @@ -66,6 +69,11 @@ for file in \ done # We supply our own config for fcoe.service rm -f %{buildroot}/%{_sysconfdir}/fcoe/config +%ifarch s390x +# bnx2fc is not available on s390x (#1056371) +sed -i -e 's/SUPPORTED_DRIVERS="libfc fcoe bnx2fc"/SUPPORTED_DRIVERS="libfc fcoe"/' \ + %{buildroot}/%{_sysconfdir}/sysconfig/fcoe +%endif %post %systemd_post fcoe.service @@ -88,6 +96,20 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config %{_libexecdir}/fcoe/ %changelog +* Mon Mar 10 2014 Petr Šabata - 1.0.29-6 +- Break out of recv_loop() (#1049018) + +* Thu Mar 06 2014 Petr Šabata - 1.0.29-5 +- Don't build on s390x again (#1073060) +- Drop bnx2fc from SUPPORTED_DRIVERS on s390x, for future (#1056371) +- Update fcoemon(8) with more systemd changes (#1049162) + +* Fri Jan 17 2014 Petr Šabata - 1.0.29-4 +- Build on s390x again (#1052999) + +* Fri Dec 27 2013 Daniel Mach - 1.0.29-3 +- Mass rebuild 2013-12-27 + * Thu Nov 07 2013 Petr Šabata - 1.0.29-2 - Bug #1024124: - Don't install the old configuration file alongside the new one