From 99decc69916ff3a6fc78c077c3550e6f4ca33863 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 6 May 2015 17:00:44 +0100 Subject: [PATCH] Ensure redhat hardening flags didn't leak into the tarball. Several people reported that the tarballs didn't work on non-Fedora/RHEL platforms. The reason is that the 'redhat-hardened' LDFLAGS managed to leak into the build-aux/ltmain.sh file (part of libtool). This happened because of a bug in Fedora's libtool: https://bugzilla.redhat.com/show_bug.cgi?id=1214506 Add a check to ensure this cannot happen in future. --- libguestfs_upstream.ml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libguestfs_upstream.ml b/libguestfs_upstream.ml index ad46864..dd69b25 100644 --- a/libguestfs_upstream.ml +++ b/libguestfs_upstream.ml @@ -153,11 +153,17 @@ and tarball_created version = make V=1 make dist + + # Ensure redhat hardening flags didn't leak into the tarball. + # https://bugzilla.redhat.com/show_bug.cgi?id=1214506 + if zcat %s | grep -q redhat-hardened; then exit 1; fi + mv %s %s/tarballs/%s " repodir version.version (quote (libguestfs_localconfigure `Git)) (quote (libguestfs_localenv (supermin version))) + version.tarball version.tarball buildtmp version.tarball (* Goal: test a commit. *) -- 1.8.3.1