From 9b0fecb7d4105437e94ad76e7a03478c4fe7e557 Mon Sep 17 00:00:00 2001 From: Richard W.M. Jones Date: Mar 12 2010 15:28:13 +0000 Subject: Backport upstream patch to remove dependency on /lib/libntfs-3g.so.N. --- diff --git a/libguestfs-1.0.85-bash-regexp-quoting-fix-for-rhel-5.patch b/libguestfs-1.0.85-bash-regexp-quoting-fix-for-rhel-5.patch new file mode 100644 index 0000000..094378e --- /dev/null +++ b/libguestfs-1.0.85-bash-regexp-quoting-fix-for-rhel-5.patch @@ -0,0 +1,110 @@ +From 4891ff9945177e8666af8381d1e0a54b8ce363e2 Mon Sep 17 00:00:00 2001 +From: Richard Jones +Date: Tue, 2 Mar 2010 10:34:20 +0000 +Subject: [PATCH] More complete fix for bash regexp quoting bug. + +Commit 457fccae1b665347 was not a complete fix, in that it +didn't work properly on RHEL 5 era bash (3.2.x). For example: + + file=libntfs-3g.so.74 + [[ "$file" =~ ^lib(.*)\.so\.([0-9]+)\. ]] && \ + echo "lib${BASH_REMATCH[1]}.so.${BASH_REMATCH[2]}.*" + +would on those old shells print: + + libntfs-3g.so.7.* + +It seems the final \. was being treated as a plain period (ie. +match anything). + +The only way to work around this incompatibility is to assign the +patterns to variables and match on those, ie: + + p='^lib(.*)\.so\.([0-9]+)\.' + [[ "$file" =~ $p ]] && ... + +This works in both old and new shells. +--- + appliance/supermin-split.sh.in | 29 ++++++++++++++++++++--------- + 1 files changed, 20 insertions(+), 9 deletions(-) + +diff --git a/appliance/supermin-split.sh.in b/appliance/supermin-split.sh.in +index 753fca3..cd29b8a 100755 +--- a/appliance/supermin-split.sh.in ++++ b/appliance/supermin-split.sh.in +@@ -55,24 +55,35 @@ for path in $(find -not -name fakeroot.log); do + # 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). ++ p_etc='^\./etc' ++ p_dev='^\./dev' ++ p_var='^\./var' ++ p_lib_modules='^\./lib/modules/' ++ p_builddir='^\./builddir' ++ p_ld_so='^ld-[.0-9]+\.so$' ++ p_libbfd='^libbfd-.*\.so$' ++ p_libgcc='^libgcc_s-.*\.so\.([0-9]+)$' ++ p_lib123so='^lib(.*)-[-.0-9]+\.so$' ++ p_lib123so123='^lib(.*)-[-.0-9]+\.so\.([0-9]+)\.' ++ p_libso123='^lib(.*)\.so\.([0-9]+)\.' + + # 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 ]] ++ elif [[ "$path" =~ $p_etc || "$path" =~ $p_dev || "$path" =~ $p_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" =~ $p_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 [[ "$path" =~ $p_builddir ]]; then + : + + elif [ -d "$path" ]; then +@@ -82,27 +93,27 @@ for path in $(find -not -name fakeroot.log); do + + # Some libraries need fixed version numbers replaced by wildcards. + +- elif [[ "$file" =~ ^ld-[.0-9]+\.so$ ]]; then ++ elif [[ "$file" =~ $p_ld_so ]]; then + echo "$dir/ld-*.so" >&6 + + # Special case for libbfd +- elif [[ "$file" =~ ^libbfd-.*\.so$ ]]; then ++ elif [[ "$file" =~ $p_libbfd ]]; then + echo "$dir/libbfd-*.so" >&6 + + # Special case for libgcc_s--.so.N +- elif [[ "$file" =~ ^libgcc_s-.*\.so\.([0-9]+)$ ]]; then ++ elif [[ "$file" =~ $p_libgcc ]]; then + echo "$dir/libgcc_s-*.so.${BASH_REMATCH[1]}" >&6 + + # libfoo-1.2.3.so +- elif [[ "$file" =~ ^lib(.*)-[-.0-9]+\.so$ ]]; then ++ elif [[ "$file" =~ $p_lib123so ]]; 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" =~ $p_lib123so123 ]]; 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" =~ $p_libso123 ]]; then + echo "$dir/lib${BASH_REMATCH[1]}.so.${BASH_REMATCH[2]}.*" >&6 + + else +-- +1.6.5.2 + diff --git a/libguestfs-1.0.85-weaken-dependency-on-libntfs-3g.patch b/libguestfs-1.0.85-weaken-dependency-on-libntfs-3g.patch new file mode 100644 index 0000000..852baf2 --- /dev/null +++ b/libguestfs-1.0.85-weaken-dependency-on-libntfs-3g.patch @@ -0,0 +1,63 @@ +From: Richard Jones +Date: Fri, 12 Mar 2010 15:10:28 +0000 (+0000) +Subject: Special case hostfiles handling for libntfs-3g.so +X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=599f94c9c14c970dcfd7cec8d6898cd3b46af8ca + +Special case hostfiles handling for libntfs-3g.so + +The ntfs-3g project keeps bumping their soname, and this causes +dependency problems for the Fedora package. The root of the problem +is we depend on /lib/libntfs-3g.so., but if keeps bumping, +the dependency keeps breaking. + +This commit changes the hostfiles (and hence dependency) to be on +/lib/libntfs-3g.so.* instead. The downside to this is we could end +up pulling more files into the appliance than are strictly required, +but it will fix the Fedora packaging problems being felt by the +Fedora maintainer of ntfs-3g. + +After applying this commit, the change to hostfiles looks like this: + +@@ -1489,7 +1489,7 @@ + ./lib/libpam_misc.so.0 + ./lib/libdmraid.so + ./lib/libidn.so.11 +-./lib/libntfs-3g.so.74 ++./lib/libntfs-3g.so.* + ./lib/libext2fs.so.2.* + ./lib/libpam.so.0 + ./lib/libsepol.so.1 +@@ -1520,7 +1520,6 @@ + ./lib/libnss_files-*.so + ./lib/libgio-2.0.so.0 + ./lib/libpam_misc.so.0.* +-./lib/libntfs-3g.so.74.* + ./lib/libanl.so.1 + ./lib/libdevmapper-event-lvm2.so.2.* + ./lib/libpthread.so.0 +--- + +diff --git a/appliance/supermin-split.sh.in b/appliance/supermin-split.sh.in +index cd29b8a..94990dd 100755 +--- a/appliance/supermin-split.sh.in ++++ b/appliance/supermin-split.sh.in +@@ -63,6 +63,7 @@ for path in $(find -not -name fakeroot.log); do + p_ld_so='^ld-[.0-9]+\.so$' + p_libbfd='^libbfd-.*\.so$' + p_libgcc='^libgcc_s-.*\.so\.([0-9]+)$' ++ p_libntfs3g='^libntfs-3g\.so\..*$' + p_lib123so='^lib(.*)-[-.0-9]+\.so$' + p_lib123so123='^lib(.*)-[-.0-9]+\.so\.([0-9]+)\.' + p_libso123='^lib(.*)\.so\.([0-9]+)\.' +@@ -104,6 +105,11 @@ for path in $(find -not -name fakeroot.log); do + elif [[ "$file" =~ $p_libgcc ]]; then + echo "$dir/libgcc_s-*.so.${BASH_REMATCH[1]}" >&6 + ++ # Special case for libntfs-3g.so.* ++ elif [[ "$file" =~ $p_libntfs3g ]]; then ++ [ -n "$libntfs3g_once" ] || echo "$dir/libntfs-3g.so.*" >&6 ++ libntfs3g_once=1 ++ + # libfoo-1.2.3.so + elif [[ "$file" =~ $p_lib123so ]]; then + echo "$dir/lib${BASH_REMATCH[1]}-*.so" >&6 diff --git a/libguestfs.spec b/libguestfs.spec index 0bb3f5f..093a040 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -42,7 +42,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.0.85 -Release: 2%{?dist}.3 +Release: 2%{?dist}.4 License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -52,6 +52,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # Disable FUSE tests, not supported in Koji at the moment. Patch0: libguestfs-1.0.79-no-fuse-test.patch +# More complete fix for bash regexp quoting screw-up. +Patch1: libguestfs-1.0.85-bash-regexp-quoting-fix-for-rhel-5.patch + +# Backport upstream commit to weaken dependency on libntfs-3g.so.N. +Patch2: libguestfs-1.0.85-weaken-dependency-on-libntfs-3g.patch + # Basic build requirements: BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2text @@ -374,6 +380,8 @@ Requires: jpackage-utils %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 mkdir -p daemon/m4 @@ -646,6 +654,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 12 2010 Richard W.M. Jones - 1:1.0.85-2.4 +- Backport upstream patch to remove dependency on /lib/libntfs-3g.so.N. +- The above depends on the bash quoting patch, so apply that first. + * Mon Mar 08 2010 Richard W.M. Jones - 1:1.0.85-2.3 - Rebuild against latest plymouth in F-13 updates-testing.