[dracut/f18] dracut-024-29.git20130227

[Harald Hoyer]

commit 7701eb8623f2ce2afb319aa58c8e6c146e0844e9
Author: Harald Hoyer <harald at redhat.com>
Date:   Wed Feb 27 16:36:13 2013 +0100

    dracut-024-29.git20130227
    
    - turn off globbing for curl
    Resolves: rhbz#907497

 0028-url-lib.sh-fix-curl-globoff-arg.patch |   31 ++++++++++++++++++++++++++++
 dracut.spec                                |    7 +++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/0028-url-lib.sh-fix-curl-globoff-arg.patch b/0028-url-lib.sh-fix-curl-globoff-arg.patch
new file mode 100644
index 0000000..1bf6227
--- /dev/null
+++ b/0028-url-lib.sh-fix-curl-globoff-arg.patch
@@ -0,0 +1,31 @@
+From f76db85f2b45b4297cc2907e3fd8325bd72c5b3d Mon Sep 17 00:00:00 2001
+From: Jan Stodola <jstodola at redhat.com>
+Date: Wed, 27 Feb 2013 16:33:32 +0100
+Subject: [PATCH] url-lib.sh: fix curl globoff arg
+
+---
+ modules.d/45url-lib/url-lib.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/45url-lib/url-lib.sh b/modules.d/45url-lib/url-lib.sh
+index 3236c78..5edae5c 100755
+--- a/modules.d/45url-lib/url-lib.sh
++++ b/modules.d/45url-lib/url-lib.sh
+@@ -54,7 +54,7 @@ add_url_handler() {
+ 
+ export CURL_HOME="/run/initramfs/url-lib"
+ mkdir -p $CURL_HOME
+-curl_args="--location --retry 3 --fail --show-error"
++curl_args="--globoff --location --retry 3 --fail --show-error"
+ getargbool 0 rd.noverifyssl && curl_args+=" --insecure"
+ 
+ proxy=$(getarg proxy=)
+@@ -64,7 +64,7 @@ curl_fetch_url() {
+     local url="$1" outloc="$2"
+     echo "$url" > /proc/self/fd/0
+     if [ -n "$outloc" ]; then
+-        curl --globoff $curl_args --output "$outloc" "$url" || return $?
++        curl $curl_args --output "$outloc" "$url" || return $?
+     else
+         local outdir="$(mkuniqdir /tmp curl_fetch_url)"
+         ( cd "$outdir"; curl $curl_args --remote-name "$url" || return $? )
diff --git a/dracut.spec b/dracut.spec
index 7be9177..34a2c64 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 024
-Release: 28.git20130226%{?dist}
+Release: 29.git20130227%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -56,6 +56,7 @@ Patch24: 0024-shutdown-call-losetup-D-on-shutdown.patch
 Patch25: 0025-url-lib-url-lib.sh-turn-off-curl-globbing.patch
 Patch26: 0026-url-lib-url-lib.sh-add-proxy-support-for-curl.patch
 Patch27: 0027-url-lib-url-lib.sh-remove-bashism.patch
+Patch28: 0028-url-lib.sh-fix-curl-globoff-arg.patch
 
 
 BuildRequires: dash bash git
@@ -393,6 +394,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Wed Feb 27 2013 Harald Hoyer <harald at redhat.com> 024-29.git20130227
+- turn off globbing for curl
+Resolves: rhbz#907497
+
 * Tue Feb 26 2013 Harald Hoyer <harald at redhat.com> 024-28.git20130226
 - turn off globbing for curl
 Resolves: rhbz#907497