[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Quilt-dev] [PATCH] Add support for lzip archives
From: |
Jean Delvare |
Subject: |
[Quilt-dev] [PATCH] Add support for lzip archives |
Date: |
Thu, 4 Oct 2018 14:41:17 +0200 |
Add support for lzip-compressed archives (*.tar.lz) and patches.
This closes bug #54570:
https://savannah.nongnu.org/bugs/?54570
Signed-off-by: Jean Delvare <address@hidden>
---
quilt/push.in | 3 +++
quilt/scripts/patchfns.in | 8 ++++++--
quilt/setup.in | 8 +++++++-
3 files changed, 16 insertions(+), 3 deletions(-)
--- quilt.orig/quilt/push.in 2017-07-18 09:22:28.860617331 +0200
+++ quilt/quilt/push.in 2018-10-04 10:11:08.671030984 +0200
@@ -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
--- quilt.orig/quilt/scripts/patchfns.in 2018-03-26 10:37:24.657863131
+0200
+++ quilt/quilt/scripts/patchfns.in 2018-10-04 10:12:24.522955066 +0200
@@ -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}"
--- quilt.orig/quilt/setup.in 2017-07-18 09:22:28.860617331 +0200
+++ quilt/quilt/setup.in 2018-10-04 10:16:15.831998457 +0200
@@ -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
--
Jean Delvare
SUSE L3 Support
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Quilt-dev] [PATCH] Add support for lzip archives,
Jean Delvare <=