forked from pool/quilt
Update to version 0.66
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=119
This commit is contained in:
Jean Delvare
Git OBS Bridge
parent
85aace6492
commit
2d908781a3
@ -1,31 +0,0 @@
|
|||||||
From: Jean Delvare <jdelvare@suse.de>
|
|
||||||
Date: Fri, 14 Apr 2017 09:07:51 +0200
|
|
||||||
Subject: mail: Fix patch set threading
|
|
||||||
Git-commit: 360b85e1f6b6d1aff5ada942fcee816e1ad7a13c
|
|
||||||
Patch-mainline: yes
|
|
||||||
|
|
||||||
Let patches reference the introduction message so that the patch set
|
|
||||||
is properly threaded by MUA. This used to work but was broken by
|
|
||||||
accident.
|
|
||||||
|
|
||||||
This fixes bug #50775:
|
|
||||||
https://savannah.nongnu.org/bugs/index.php?50775
|
|
||||||
|
|
||||||
Signed-off-by: Jean Delvare <jdelvare@suse.de>
|
|
||||||
Fixes: 1d659bebaf3d ("quilt/mail: Remove procmail dependency")
|
|
||||||
Tested-by: Okash Khawaja <okash.khawaja@gmail.com>
|
|
||||||
Acked-by: Kent R. Spillner <kspillner@acm.org>
|
|
||||||
|
|
||||||
diff --git a/quilt/mail.in b/quilt/mail.in
|
|
||||||
index 046b502..80fabe8 100644
|
|
||||||
--- a/quilt/mail.in
|
|
||||||
+++ b/quilt/mail.in
|
|
||||||
@@ -95,7 +95,7 @@ extract_header_value()
|
|
||||||
|
|
||||||
# Long Header Fields may span multiple lines, in which case CRLF
|
|
||||||
# is followed by space or tab (RFC 2822)
|
|
||||||
- sed -n "/^${header}/,/^[^[:blank:]]/ { /^${header}/ { s/^${header}//p; n; }; /^[^[:blank:]]/q; /^$/q; p; }"
|
|
||||||
+ sed -ne "/^${header}/I,/^[^[:blank:]]/ { /^${header}/I { s/^${header}//I; p; n; }; /^[^[:blank:]]/q; /^$/q; p; }"
|
|
||||||
}
|
|
||||||
|
|
||||||
# See RFC 2822 Internet Message Format for how the In-Reply-To and
|
|
||||||
@ -1,98 +0,0 @@
|
|||||||
From: Andreas Gruenbacher <andreas.gruenbacher@gmail.com>
|
|
||||||
Date: Thu, 1 Dec 2016 11:15:48 +0100
|
|
||||||
Subject: patch-wrapper: Make the patch names that quilt shows more convenient
|
|
||||||
Git-commit: 1cde19389bc5805da713361ac32869388e42f592
|
|
||||||
Patch-mainline: yes
|
|
||||||
|
|
||||||
When operating on an rpm package, create links to the rpm sources and
|
|
||||||
build directories and make patch names relative to these links. This is
|
|
||||||
more convenient than using ugly absolute paths.
|
|
||||||
|
|
||||||
--- a/bin/patch-wrapper.in
|
|
||||||
+++ b/bin/patch-wrapper.in
|
|
||||||
@@ -28,7 +28,7 @@ fi
|
|
||||||
|
|
||||||
backup_files()
|
|
||||||
{
|
|
||||||
- declare dir=${QUILT_PC:-.pc}/$patch
|
|
||||||
+ declare dir=${QUILT_PC:-.pc}/$name
|
|
||||||
|
|
||||||
if [ "$backup_mode" = --backup-if-mismatch ]
|
|
||||||
then
|
|
||||||
@@ -201,39 +201,56 @@ then
|
|
||||||
fi
|
|
||||||
|
|
||||||
quilt_patches=${QUILT_PATCHES:-patches}
|
|
||||||
-dir=$(dirname "$quilt_patches/$patch")
|
|
||||||
-mkdir -p "$dir"
|
|
||||||
-if [ -e "$patch" ]
|
|
||||||
+
|
|
||||||
+if [ "${patch#$RPM_SOURCE_DIR}" != "$patch" ]
|
|
||||||
+then
|
|
||||||
+ name=SOURCES/${patch#$RPM_SOURCE_DIR/}
|
|
||||||
+ if [ ! -e "$quilt_patches/SOURCES" ]
|
|
||||||
+ then
|
|
||||||
+ mkdir -p "$quilt_patches"
|
|
||||||
+ ln -s $RPM_SOURCE_DIR "$quilt_patches/SOURCES"
|
|
||||||
+ fi
|
|
||||||
+elif [ "${patch#$RPM_BUILD_DIR}" != "$patch" ]
|
|
||||||
then
|
|
||||||
+ name=BUILD/${patch#$RPM_BUILD_DIR/}
|
|
||||||
+ if [ ! -e "$quilt_patches/BUILD" ]
|
|
||||||
+ then
|
|
||||||
+ mkdir -p "$quilt_patches"
|
|
||||||
+ ln -s $RPM_BUILD_DIR "$quilt_patches/BUILD"
|
|
||||||
+ fi
|
|
||||||
+else
|
|
||||||
+ name=${patch#/}
|
|
||||||
+ dir=$(dirname "$quilt_patches/$name")
|
|
||||||
+ mkdir -p "$dir"
|
|
||||||
+
|
|
||||||
if [ "${patch:0:1}" = / ]
|
|
||||||
then
|
|
||||||
- ln -s "$patch" "$quilt_patches$patch"
|
|
||||||
- patch=${patch#/}
|
|
||||||
+ ln -s "$patch" "$quilt_patches/${name#/}"
|
|
||||||
else
|
|
||||||
- while ! [ "$dir/$updir$patch" -ef "$patch" ]
|
|
||||||
+ while ! [ "$dir/$updir$name" -ef "$patch" ]
|
|
||||||
do
|
|
||||||
updir=$updir../
|
|
||||||
[ ${#updir} -gt 96 ] && break
|
|
||||||
done
|
|
||||||
- if [ "$dir/$updir$patch" -ef "$patch" ]
|
|
||||||
+ if [ "$dir/$updir$name" -ef "$patch" ]
|
|
||||||
then
|
|
||||||
- ln -s "$updir$patch" "$quilt_patches/$patch"
|
|
||||||
+ ln -s "$updir$patch" "$quilt_patches/$name"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$opt_strip" = -p1 ]; then
|
|
||||||
- echo "$patch"
|
|
||||||
+ echo "$name"
|
|
||||||
else
|
|
||||||
- echo "$patch $opt_strip"
|
|
||||||
+ echo "$name $opt_strip"
|
|
||||||
fi >> $quilt_patches/series
|
|
||||||
|
|
||||||
-$PATCH "${new_options[@]}" --backup --prefix "${QUILT_PC:-.pc}/$patch/" \
|
|
||||||
+$PATCH "${new_options[@]}" --backup --prefix "${QUILT_PC:-.pc}/$name/" \
|
|
||||||
| backup_files
|
|
||||||
status=${PIPESTATUS[0]}
|
|
||||||
if [ $status -eq 0 ]
|
|
||||||
then
|
|
||||||
- dir=${QUILT_PC:-.pc}/$patch
|
|
||||||
+ dir=${QUILT_PC:-.pc}/$name
|
|
||||||
if [ ! -e "$dir" ]
|
|
||||||
then
|
|
||||||
mkdir -p "$dir"
|
|
||||||
@@ -243,6 +260,6 @@ then
|
|
||||||
then
|
|
||||||
echo 2 > ${QUILT_PC:-.pc}/.version
|
|
||||||
fi
|
|
||||||
- echo "$patch" >> "${QUILT_PC:-.pc}/applied-patches"
|
|
||||||
+ echo "$name" >> "${QUILT_PC:-.pc}/applied-patches"
|
|
||||||
fi
|
|
||||||
exit $status
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
Index: quilt-0.65/test/run
|
|
||||||
===================================================================
|
|
||||||
--- quilt-0.65.orig/test/run
|
|
||||||
+++ quilt-0.65/test/run
|
|
||||||
@@ -111,7 +111,7 @@ sub flush_output()
|
|
||||||
sub substitute_vars($)
|
|
||||||
{
|
|
||||||
my ($line) = @_;
|
|
||||||
- $line =~ s[%{(\w+)}][defined $ENV{$1} ? $ENV{$1} : ""]eg;
|
|
||||||
+ $line =~ s[%\{(\w+)}][defined $ENV{$1} ? $ENV{$1} : ""]eg;
|
|
||||||
return $line;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -287,7 +287,7 @@ while (defined(my $line = <SOURCE>)) {
|
|
||||||
# Parse the next command
|
|
||||||
if ($line =~ s/^\s*\$ ?//) {
|
|
||||||
# Substitute %{?} with the last command's status
|
|
||||||
- $line =~ s[%{\?}][$last_status]eg;
|
|
||||||
+ $line =~ s[%\{\?}][$last_status]eg;
|
|
||||||
|
|
||||||
chomp($prog = substitute_vars($line));
|
|
||||||
$prog_line = $lineno;
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:59080871272c49167882d80d5edb36a5e961a926bfa1a935693418e7880ca24c
|
|
||||||
size 356822
|
|
||||||
3
quilt-0.66.tar.bz2
Normal file
3
quilt-0.66.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:a8c423ecb0b2d8c3774f6b6ddb10644f2386d30112948105245e3d6938020d6d
|
||||||
|
size 359074
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- a/po/de.po
|
|
||||||
+++ b/po/de.po
|
|
||||||
@@ -433,7 +433,7 @@ msgstr ""
|
|
||||||
"im obersten Patch enthalten sind, dann wird der neue Patch mit der\n"
|
|
||||||
"angegebenen Anzahl an Strip-Ebenen angewandt (Standardwert = 1).\n"
|
|
||||||
"\n"
|
|
||||||
-"-r\tPatch verkehrt herum anwenden.\n"
|
|
||||||
+"-R\tPatch verkehrt herum anwenden.\n"
|
|
||||||
"\n"
|
|
||||||
"-q\tWenige Meldungen ausgeben.\n"
|
|
||||||
"\n"
|
|
||||||
@ -1,3 +1,41 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Mar 29 15:34:44 UTC 2019 - Jean Delvare <jdelvare@suse.com>
|
||||||
|
|
||||||
|
- Update to version 0.66:
|
||||||
|
* Add support for lzip archives and patches
|
||||||
|
* Document QUILT_PC as user-settable
|
||||||
|
* configure: Don't require md5sum
|
||||||
|
* Test suite: Allow keeping the working directory on failure
|
||||||
|
* Test suite: Fix /bin/sh filtering
|
||||||
|
* Test suite: Run tests again if test.quiltrc changes
|
||||||
|
* Test suite: Handle alternative QUILT_PATCHES values
|
||||||
|
* Test suite: Increase code path coverage
|
||||||
|
* Test suite: Be verbose on directory error
|
||||||
|
* Test suite: Clean up when interrupted
|
||||||
|
* Test suite: Prevent test cases from escaping
|
||||||
|
* diff: Add missing quotes in basename call
|
||||||
|
* header: Fix corruption when trailing newline is missing
|
||||||
|
* mail: Remove Content-Disposition headers
|
||||||
|
* mail: Complain when a patch doesn't exist
|
||||||
|
* new: Fix corruption when trailing newline is missing
|
||||||
|
* refresh: Add missing quotes in basename call
|
||||||
|
* setup: Add basic support for p7zip (.7z) archives
|
||||||
|
* setup: Align --fast on --slow for series files
|
||||||
|
* quilt.el: Define quilt-edit-top-only before it's used
|
||||||
|
* quilt.el: Stop using deprecated toggle-read-only
|
||||||
|
* quilt.el: Don't strip directory in quilt-top-patch
|
||||||
|
* quilt.el: Fix emacs compatibility issue
|
||||||
|
* quilt.el: Read QUILT_PC from config file
|
||||||
|
* guards: Mention it in quilt manual page
|
||||||
|
* compat/getopt: Handle a second separator
|
||||||
|
* compat/getopt: Allow non-digit parameter embedded in short option
|
||||||
|
* Obsoletes mail-fix-patch-set-threading.patch
|
||||||
|
* Obsoletes patch-wrapper-rpm.diff
|
||||||
|
* Obsoletes perl-526.patch
|
||||||
|
* Obsoletes quilt-translations.patch
|
||||||
|
* Obsoletes quiltrc-support-all-patch-formats-by-default.patch
|
||||||
|
- Refresh suse-workaround-pseudo-release.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu May 3 08:53:20 CEST 2018 - jdelvare@suse.de
|
Thu May 3 08:53:20 CEST 2018 - jdelvare@suse.de
|
||||||
|
|
||||||
|
|||||||
18
quilt.spec
18
quilt.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package quilt
|
# spec file for package quilt
|
||||||
#
|
#
|
||||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -12,15 +12,15 @@
|
|||||||
# license that conforms to the Open Source Definition (Version 1.9)
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
# published by the Open Source Initiative.
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
Name: quilt
|
Name: quilt
|
||||||
Version: 0.65
|
Version: 0.66
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: A Tool for Working with Many Patches
|
Summary: A Tool for Working with Many Patches
|
||||||
License: GPL-2.0+
|
License: GPL-2.0-or-later
|
||||||
Group: Development/Tools/Version Control
|
Group: Development/Tools/Version Control
|
||||||
BuildRequires: diffstat
|
BuildRequires: diffstat
|
||||||
BuildRequires: ed
|
BuildRequires: ed
|
||||||
@ -40,12 +40,7 @@ Source: %{name}-%{version}.tar.bz2
|
|||||||
Source1: suse-start-quilt-mode.el
|
Source1: suse-start-quilt-mode.el
|
||||||
Patch1: expand.diff
|
Patch1: expand.diff
|
||||||
Patch2: quilt-support-vimdiff.patch
|
Patch2: quilt-support-vimdiff.patch
|
||||||
Patch3: patch-wrapper-rpm.diff
|
|
||||||
Patch4: suse-workaround-pseudo-release.patch
|
Patch4: suse-workaround-pseudo-release.patch
|
||||||
Patch5: mail-fix-patch-set-threading.patch
|
|
||||||
Patch6: quilt-translations.patch
|
|
||||||
Patch7: perl-526.patch
|
|
||||||
Patch8: quiltrc-support-all-patch-formats-by-default.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
@ -66,12 +61,7 @@ un-applied, refreshed, and more.
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%patch5 -p1
|
|
||||||
%patch6 -p1
|
|
||||||
%patch7 -p1
|
|
||||||
%patch8 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# --with-rpmbuild=/usr/lib/rpm/rpmb:
|
# --with-rpmbuild=/usr/lib/rpm/rpmb:
|
||||||
|
|||||||
@ -1,30 +0,0 @@
|
|||||||
From: Jean Delvare <jdelvare@suse.de>
|
|
||||||
Date: Thu, 3 May 2018 08:33:24 +0200
|
|
||||||
Subject: quiltrc: Support all patch formats by default
|
|
||||||
Git-commit: 6d2c0da841aeaaec60993441bf6899f1909f310d
|
|
||||||
Patch-mainline: yes
|
|
||||||
References: bsc#1088281
|
|
||||||
|
|
||||||
Passing --unified to patch by default prevents using other patch
|
|
||||||
formats. Out of curiosity, I checked if it helped with performance
|
|
||||||
but was not able to measure any improvement. So stop passing
|
|
||||||
--unified by default.
|
|
||||||
|
|
||||||
Signed-off-by: Jean Delvare <jdelvare@suse.de>
|
|
||||||
|
|
||||||
diff --git a/quilt.quiltrc b/quilt.quiltrc
|
|
||||||
index 58f665e..f0ec21e 100644
|
|
||||||
--- a/quilt.quiltrc
|
|
||||||
+++ b/quilt.quiltrc
|
|
||||||
@@ -3,10 +3,8 @@
|
|
||||||
# Options passed to GNU diff when generating patches
|
|
||||||
QUILT_DIFF_OPTS="--show-c-function"
|
|
||||||
|
|
||||||
-# Options passed to GNU patch when applying patches.
|
|
||||||
-# (For appling patches which are not in unified format, remove the "--unified".)
|
|
||||||
+# Options passed to GNU patch when applying patches
|
|
||||||
#QUILT_PATCH_OPTS="--ignore-whitespace"
|
|
||||||
-QUILT_PATCH_OPTS="--unified"
|
|
||||||
|
|
||||||
# Options passed to diffstat when generating patch statistics
|
|
||||||
#QUILT_DIFFSTAT_OPTS="-f0"
|
|
||||||
@ -10,9 +10,9 @@ happy again. Packages in openSUSE 11.4 and later no longer need this.
|
|||||||
|
|
||||||
--- a/quilt/setup.in
|
--- a/quilt/setup.in
|
||||||
+++ b/quilt/setup.in
|
+++ b/quilt/setup.in
|
||||||
@@ -221,6 +221,14 @@ inspect()
|
@@ -228,6 +228,14 @@ inspect()
|
||||||
ln -s $QUILT_DIR/scripts/inspect-wrapper $tmpdir/bin/tar
|
|
||||||
ln -s $QUILT_DIR/scripts/inspect-wrapper $tmpdir/bin/unzip
|
ln -s $QUILT_DIR/scripts/inspect-wrapper $tmpdir/bin/unzip
|
||||||
|
ln -s $QUILT_DIR/scripts/inspect-wrapper $tmpdir/bin/7z
|
||||||
|
|
||||||
+ # Older versions of Suse packages have a symbolic release number, and
|
+ # Older versions of Suse packages have a symbolic release number, and
|
||||||
+ # rpmbuild won't like that, so change it to something compliant.
|
+ # rpmbuild won't like that, so change it to something compliant.
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user