- Fix quoting in supermin-split script (RHBZ#566511).

- Don't include bogus './builddir' entries in supermin hostfiles
    (RHBZ#566512).
This commit is contained in:
Richard W.M. Jones 2010-03-01 11:54:11 +00:00
parent e9b1deb686
commit 7cb911a031
2 changed files with 82 additions and 1 deletions

View File

@ -0,0 +1,66 @@
--- libguestfs-1.0.84.orig/appliance/supermin-split.sh.in 2010-01-28 09:58:20.000000000 +0000
+++ libguestfs-1.0.84.rhbz566512/appliance/supermin-split.sh.in 2010-03-01 11:43:20.647728435 +0000
@@ -51,17 +51,27 @@
dir=$(dirname "$path")
file=$(basename "$path")
+ # For quoting problems with the bash =~ operator, see bash FAQ
+ # question E14 here http://tiswww.case.edu/php/chet/bash/FAQ and
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=487387#25
+ # (RHBZ#566511).
+
# All we're going to keep are the special files /init, the daemon,
# configuration files (/etc), devices and modifiable stuff (/var).
if [ "$path" = "./init" -o "$file" = "guestfsd" ]; then
echo "$path" >&5
- elif [[ "$path" =~ '^\./etc' || "$path" =~ '^./dev' || "$path" =~ '^\./var' ]]; then
+ elif [[ "$path" =~ ^\./etc || "$path" =~ ^./dev || "$path" =~ ^\./var ]]; then
echo "$path" >&5
# Kernel modules are always copied in from the host, including all
# the dependency files.
- elif [[ "$path" =~ '^\./lib/modules/' ]]; then
+ elif [[ "$path" =~ ^\./lib/modules/ ]]; then
+ :
+
+ # On mock/Koji, exclude bogus /builddir directory which for some
+ # reason contains some yum temporary files (RHBZ#566512).
+ elif [[ "$path" =~ ^\./builddir ]]; then
:
elif [ -d "$path" ]; then
@@ -71,27 +81,27 @@
# Some libraries need fixed version numbers replaced by wildcards.
- elif [[ "$file" =~ '^ld-[.0-9]+\.so$' ]]; then
+ elif [[ "$file" =~ ^ld-[.0-9]+\.so$ ]]; then
echo "$dir/ld-*.so" >&6
# Special case for libbfd
- elif [[ "$file" =~ '^libbfd-.*\.so$' ]]; then
+ elif [[ "$file" =~ ^libbfd-.*\.so$ ]]; then
echo "$dir/libbfd-*.so" >&6
# Special case for libgcc_s-<gccversion>-<date>.so.N
- elif [[ "$file" =~ '^libgcc_s-.*\.so\.([0-9]+)$' ]]; then
+ elif [[ "$file" =~ ^libgcc_s-.*\.so\.([0-9]+)$ ]]; then
echo "$dir/libgcc_s-*.so.${BASH_REMATCH[1]}" >&6
# libfoo-1.2.3.so
- elif [[ "$file" =~ '^lib(.*)-[-.0-9]+\.so$' ]]; then
+ elif [[ "$file" =~ ^lib(.*)-[-.0-9]+\.so$ ]]; then
echo "$dir/lib${BASH_REMATCH[1]}-*.so" >&6
# libfoo-1.2.3.so.1.2.3 (but NOT '*.so.N')
- elif [[ "$file" =~ '^lib(.*)-[-.0-9]+\.so\.([0-9]+)\.' ]]; then
+ elif [[ "$file" =~ ^lib(.*)-[-.0-9]+\.so\.([0-9]+)\. ]]; then
echo "$dir/lib${BASH_REMATCH[1]}-*.so.${BASH_REMATCH[2]}.*" >&6
# libfoo.so.1.2.3 (but NOT '*.so.N')
- elif [[ "$file" =~ '^lib(.*)\.so\.([0-9]+)\.' ]]; then
+ elif [[ "$file" =~ ^lib(.*)\.so\.([0-9]+)\. ]]; then
echo "$dir/lib${BASH_REMATCH[1]}.so.${BASH_REMATCH[2]}.*" >&6
else

View File

@ -1,3 +1,7 @@
# If you have trouble building locally ('make local') try adding
# %libguestfs_buildnet 1
# to your ~/.rpmmacros file.
# Enable to build using a network repo # Enable to build using a network repo
# Default is disabled # Default is disabled
%if %{defined libguestfs_buildnet} %if %{defined libguestfs_buildnet}
@ -38,7 +42,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs Name: libguestfs
Epoch: 1 Epoch: 1
Version: 1.0.84 Version: 1.0.84
Release: 4%{?dist} Release: 6%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: Development/Libraries Group: Development/Libraries
URL: http://libguestfs.org/ URL: http://libguestfs.org/
@ -48,6 +52,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
# Disable FUSE tests, not supported in Koji at the moment. # Disable FUSE tests, not supported in Koji at the moment.
Patch0: libguestfs-1.0.79-no-fuse-test.patch Patch0: libguestfs-1.0.79-no-fuse-test.patch
# RHBZ#566511 and RHBZ#566512. Not upstream yet. Needs to go
# upstream in both libguestfs and febootstrap once we have done more
# testing, and worked out if this works with older versions of bash.
Patch1: libguestfs-1.0.84-supermin-split-quoting.patch
# Basic build requirements: # Basic build requirements:
BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2man
BuildRequires: /usr/bin/pod2text BuildRequires: /usr/bin/pod2text
@ -368,6 +377,7 @@ Requires: jpackage-utils
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1
mkdir -p daemon/m4 mkdir -p daemon/m4
@ -651,6 +661,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Mar 1 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.84-6
- Fix quoting in supermin-split script (RHBZ#566511).
- Don't include bogus './builddir' entries in supermin hostfiles
(RHBZ#566512).
* Mon Feb 22 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.84-4 * Mon Feb 22 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.84-4
- Don't include generator.ml in rpm. It's 400K and almost no one will need it. - Don't include generator.ml in rpm. It's 400K and almost no one will need it.
- Add comments to spec file about how repo building works. - Add comments to spec file about how repo building works.