diff -Nru dkms-2.2.0.3/debian/changelog dkms-2.2.0.3/debian/changelog --- dkms-2.2.0.3/debian/changelog 2014-01-15 11:57:23.000000000 +0000 +++ dkms-2.2.0.3/debian/changelog 2014-12-01 23:00:24.000000000 +0000 @@ -1,3 +1,10 @@ +dkms (2.2.0.3-1.1ubuntu5.14.10) utopic; urgency=medium + + * fixed_sed_without_options_issue.patch: Backport of patch to fix sed issues. + (LP: #1358373) + + -- Chris J Arges Mon, 01 Dec 2014 16:53:16 -0600 + dkms (2.2.0.3-1.1ubuntu5) trusty; urgency=low [ Mario Limonciello ] diff -Nru dkms-2.2.0.3/debian/patches/fixed_sed_without_options_issue.patch dkms-2.2.0.3/debian/patches/fixed_sed_without_options_issue.patch --- dkms-2.2.0.3/debian/patches/fixed_sed_without_options_issue.patch 1970-01-01 00:00:00.000000000 +0000 +++ dkms-2.2.0.3/debian/patches/fixed_sed_without_options_issue.patch 2014-12-01 22:56:36.000000000 +0000 @@ -0,0 +1,25 @@ +--- a/dkms ++++ b/dkms +@@ -761,16 +766,17 @@ + # do all the changes at once, record the diffs for posterity + for file in "$@"; do + [[ $file && -w $file ]] || continue ++ _tmpf="$temp_dir_name/${file##*/}.new" + if [[ $file = /etc/sysconfig/kernel ]]; then +- sed "${sa_sck_o[@]}" "$file" > "$temp_dir_name/${file##*/}.new" ++ [ -z "${sa_sck_o[@]}" ] || sed "${sa_sck_o[@]}" "$file" > "$_tmpf" + else +- sed "${sa_mc_o[@]}" "$file" > "$temp_dir_name/${file##*/}.new" ++ [ -z "${sa_mc_o[@]}" ] || sed "${sa_mc_o[@]}" "$file" > "$_tmpf" + fi +- if ! mod_diff=$(diff -u "$temp_dir_name/${file##*/}.new" "$file"); then ++ if [ -f "$_tmpf" ] && ! mod_diff=$(diff -u "$_tmpf" "$file"); then + echo $"$file updated to replace obsoleted module references:" + echo "$mod_diff" +- cp -fp "$temp_dir_name/${file##*/}.new" "$file" +- rm -f "$temp_dir_name/${file##*/}.new" ++ cp -fp "$_tmpf" "$file" ++ rm -f "$_tmpf" + fi + done + } diff -Nru dkms-2.2.0.3/debian/patches/series dkms-2.2.0.3/debian/patches/series --- dkms-2.2.0.3/debian/patches/series 2014-01-15 11:55:33.000000000 +0000 +++ dkms-2.2.0.3/debian/patches/series 2014-12-01 22:57:52.000000000 +0000 @@ -5,3 +5,4 @@ apport_python3.patch apport_dup_signature.patch fix_have_one_kernel_for_non-zero_return_code.diff +fixed_sed_without_options_issue.patch