From 814203878324077ada1b876a39b98b643686fa5c Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Sun, 27 Jun 2021 18:17:14 +0200 Subject: [PATCH] Adjust glibc.req so that egrep does not cause eu-readelf to fail --- glibc.req.in | 6 ++++-- glibc.spec | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/glibc.req.in b/glibc.req.in index 3f922d1..9fb7f76 100644 --- a/glibc.req.in +++ b/glibc.req.in @@ -28,8 +28,10 @@ eu-elfclassify --loadable --file --stdin --print | while read path; do if $searching; then # Undefined symbols within latest, under-development # (changing) symbol versions trigger the versioned RPM - # dependency. - if eu-readelf -s "$path" | egrep -q '\sUNDEF\s.*@''@SYMVER@(\s|$)' + # dependency. Do not use "egrep -q" to keep reading from the + # pipe, avoiding a spurious EPIPE error in eu-readelf. + if eu-readelf -s "$path" \ + | egrep '\sUNDEF\s.*@''@SYMVER@(\s|$)' >/dev/null then echo 'glibc >= @VERSION@-@RELEASE@' # Stop searching after the first match, but keep reading from diff --git a/glibc.spec b/glibc.spec index 7712174..42056ed 100644 --- a/glibc.spec +++ b/glibc.spec @@ -111,7 +111,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 27%{?dist} +Release: 28%{?dist} # In general, GPLv2+ is used by programs, LGPLv2+ is used for # libraries. @@ -2212,6 +2212,9 @@ fi %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared %changelog +* Sun Jun 27 2021 Florian Weimer - 2.33.9000-28 +- Adjust glibc.req so that egrep does not cause eu-readelf to fail + * Sun Jun 27 2021 Florian Weimer - 2.33.9000-27 - Drop glibc-revert-dtv-gap-reuse.patch, applied upstream. - Auto-sync with upstream branch master,