diff options
| -rw-r--r-- | quilt/push.in | 3 | ||||
| -rw-r--r-- | quilt/scripts/patchfns.in | 8 | ||||
| -rw-r--r-- | quilt/setup.in | 8 |
3 files changed, 16 insertions, 3 deletions
diff --git a/quilt/push.in b/quilt/push.in index 0ddbbfd..44ff742 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -135,6 +135,9 @@ apply_patch() elif [ "${patch_file:(-5)}" = ".lzma" ] then lzma -cd "$patch_file" | "$@" 2>&1 + elif [ "${patch_file:(-3)}" = ".lz" ] + then + lzip -cd "$patch_file" | "$@" 2>&1 else "$@" -i "$patch_file" 2>&1 fi diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in index bd7cf45..0676399 100644 --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -528,7 +528,7 @@ find_patch() local patch=${1#$SUBDIR_DOWN$QUILT_PATCHES/} local bre=$(quote_bre "$patch") - set -- $(sed -e "/^$bre\(\|\.patch\|\.diff\?\)\(\|\.gz\|\.bz2\|\.xz\|\.lzma\)\([ "$'\t'"]\|$\)/!d" \ + set -- $(sed -e "/^$bre\(\|\.patch\|\.diff\?\)\(\|\.gz\|\.bz2\|\.xz\|\.lzma\|\.lz\)\([ "$'\t'"]\|$\)/!d" \ -e 's/[ '$'\t''].*//' "$SERIES") if [ $# -eq 1 ] then @@ -783,6 +783,8 @@ cat_file() xz -cd "$filename" ;; *.lzma) lzma -cd "$filename" ;; + *.lz) + lzip -cd "$filename" ;; *) cat "$filename" ;; esac @@ -823,6 +825,8 @@ cat_to_new_file() xz -c ;; *.lzma) lzma -c ;; + *.lz) + lzip -c ;; *) cat ;; esac \ @@ -937,7 +941,7 @@ next_filename() { local patch=$1 base num base=$(echo "$patch" \ - | sed -r -e 's:(\.gz|\.bz2|\.xz|\.lzma)$::' -e 's:(\.diff?|\.patch)$::') + | sed -r -e 's:(\.gz|\.bz2|\.xz|\.lzma|\.lz)$::' -e 's:(\.diff?|\.patch)$::') num=$(echo "$base" | sed -nre 's:.*-([0-9]+)$:\1:'p) [ -n "$num" ] || num=1 echo "${base%-$num}-$((num+1))${patch#$base}" diff --git a/quilt/setup.in b/quilt/setup.in index 1f7cfe4..ccfb794 100644 --- a/quilt/setup.in +++ b/quilt/setup.in @@ -141,7 +141,7 @@ create_md5sums() ;; # In fast mode, we are only interested in patches, so filter out # archives - *.tar|*.tar.Z|*.tar.gz|*.tgz|*.tar.bz2|*.tar.xz|*.zip|*.7z) + *.tar|*.tar.Z|*.tar.gz|*.tgz|*.tar.bz2|*.tar.xz|*.tar.lz|*.zip|*.7z) [ -n "$QUILT_SETUP_FAST" ] && continue ;; esac @@ -191,6 +191,12 @@ create_md5sums() set -- $(lzma -cd "$file" | md5sum) echo "$1 $basename" ;; + lzip*) + echo -n "l" >&4 + echo "lzip -cd $file | md5sum" >&5 + set -- $(lzip -cd "$file" | md5sum) + echo "$1 $basename" + ;; esac done > $output echo >&4 |