From eb1e10ed03374bb84dd85ff70d77441745420fd99ad619e59c0ff60f73590369 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Tue, 8 Dec 2020 06:50:24 +0000 Subject: [PATCH 1/5] relink OBS-URL: https://build.opensuse.org/package/show/devel:tools/b4?expand=0&rev=25 --- _servicedata | 4 -- b4-0.5.4+0.obscpio | 3 -- b4.changes | 101 --------------------------------------------- b4.obsinfo | 5 --- b4.spec | 72 -------------------------------- 5 files changed, 185 deletions(-) delete mode 100644 _servicedata delete mode 100644 b4-0.5.4+0.obscpio delete mode 100644 b4.changes delete mode 100644 b4.obsinfo delete mode 100644 b4.spec diff --git a/_servicedata b/_servicedata deleted file mode 100644 index b9e84a5..0000000 --- a/_servicedata +++ /dev/null @@ -1,4 +0,0 @@ - - - git://git.kernel.org/pub/scm/utils/b4/b4.git - 6d6adf338ec454304d8cb3d30684fce6c595b0df \ No newline at end of file diff --git a/b4-0.5.4+0.obscpio b/b4-0.5.4+0.obscpio deleted file mode 100644 index 1cab9a6..0000000 --- a/b4-0.5.4+0.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f969af8e5d1db272caeeb3205b76c9fc1a2a5092459c6a6aa37b1eb17f50978 -size 212491 diff --git a/b4.changes b/b4.changes deleted file mode 100644 index 8d77f13..0000000 --- a/b4.changes +++ /dev/null @@ -1,101 +0,0 @@ -------------------------------------------------------------------- -Wed Dec 02 12:10:32 UTC 2020 - jslaby@suse.cz - -- Update to version 0.5.4+0: - * Release 0.5.4 with the fix for b4 ty bug - * Fix b4 ty auto-matching - * Fix headers generated by "b4 ty" - * man: Drop apostrophe from midmask value - * Increment version to 0.5.4-dev - -------------------------------------------------------------------- -Fri Nov 27 11:02:21 UTC 2020 - jslaby@suse.cz - -- Update to version 0.5.3+0: - * Increment version to 0.5.3 in prep for release - * Unbreak thanks-tracking - * Fix crash on incomplete series thanks tracking - * Improve ty with cherrypicked subsets - * Unquote msgid if we're getting a full https URL - -------------------------------------------------------------------- -Mon Nov 23 10:21:55 UTC 2020 - jslaby@suse.cz - -- Update to version 0.5.2+9: - * Fix crasher when attempting a 3-way prep - * Fix handling of series with the [PATCHvX] defect - * Fix header encoding introduced by earlier fix - * Fix some cherry-picking corner cases - * Don't crash when no valid patches are found - * Use bytes when dumping to stdout - * Set charset in order to generate MIME headers - -------------------------------------------------------------------- -Thu Aug 20 05:30:13 UTC 2020 - jslaby@suse.com - -- Update to version 0.5.2+2: - * Require that a trailer is at least 2 chars long - * Cover letters may not have a diffstat -- add requests to Requires - -------------------------------------------------------------------- -Tue Jul 28 11:07:40 UTC 2020 - jslaby@suse.com - -- Update to version 0.5.2: - * Prepare for 0.5.2 release - * Fix handling of single-paragraph commit message bodies - * Fix basement detection for empty commit message bodies - * Support mbox -m to be a maildir - * man: Update commit url mask to contain 12 chars of ID - * Fix attestation error messages - * Deal with [PATCHvX] subjects - * Fix crash when -c used with incomplete series - * man: Drop the apostrophe from the linkmask configuration - * Fix crash with unbalanced [] in subject - * Fix regression with oddball charsets - * Up the version to 0.5.2-dev - * Prepare for 0.5.1 release - * Fix mbox naming inconsistencies - * Output less confusing trailer mismatch messages - * Fix bug with threading when cover ref is missing - * Fix body part parsing when '---' is not used - * Use proper charset when reading back mailinfo - * Don't output git am suggestion for -o - - * Add --no-cover and -o - to output to stdout - * Use unicode escape sequences - * Up the version to 0.5.1-dev -- switch to obs_scm -- switch to 0.5 stable branch - -------------------------------------------------------------------- -Tue Jun 16 06:23:16 UTC 2020 - jslaby@suse.com - -- Update to version 0.5.0+git20200612.g5c4ec14b: - * Fix crash with unbalanced [] in subject - * Fix regression with oddball charsets - * Fix mbox naming inconsistencies - * Output less confusing trailer mismatch messages - * Fix bug with threading when cover ref is missing - * Fix body part parsing when '---' is not used - * Use proper charset when reading back mailinfo - -------------------------------------------------------------------- -Mon Jun 08 10:57:26 UTC 2020 - jslaby@suse.com - -- Update to version 0.5.0+git20200528.g204416b80fbb: - * Don't output git am suggestion for -o - - * Add --no-cover and -o - to output to stdout - -------------------------------------------------------------------- -Tue May 26 13:05:22 UTC 2020 - jslaby@suse.com - -- Update to version 0.5.0+git20200526.ga926bac9e6c2: - * Use unicode escape sequences - * Up the version to 0.6.0-dev - * Prepare for 0.5.0 - * Backfill series before diffing them - -------------------------------------------------------------------- -Tue May 26 09:56:21 UTC 2020 - Jiri Slaby - -- initial package (0.4.0+git20200525.g59be08453137) diff --git a/b4.obsinfo b/b4.obsinfo deleted file mode 100644 index b0b4602..0000000 --- a/b4.obsinfo +++ /dev/null @@ -1,5 +0,0 @@ -name: b4 -version: 0.5.4+0 -mtime: 1606838505 -commit: 6d6adf338ec454304d8cb3d30684fce6c595b0df - diff --git a/b4.spec b/b4.spec deleted file mode 100644 index 4f2c6b3..0000000 --- a/b4.spec +++ /dev/null @@ -1,72 +0,0 @@ -# -# spec file for package b4 -# -# Copyright (c) 2020 SUSE LLC -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via https://bugs.opensuse.org/ -# - - -%define skip_python2 1 -%define version_unconverted 0.5.4+0 -Name: b4 -Version: 0.5.4+0 -Release: 0 -Summary: Helper scripts for kernel.org patches -License: GPL-2.0-or-later -Group: Development/Tools/Other -URL: https://git.kernel.org/pub/scm/utils/b4/b4.git -Source0: %{name}-%{version}.tar.xz -BuildArch: noarch -BuildRequires: %{python_module requests} -BuildRequires: %{python_module setuptools} -BuildRequires: tar -Requires: python3-requests - -%description -This is a helper utility to work with patches made available via a -public-inbox archive like lore.kernel.org. It is written to make it -easier to participate in a patch-based workflows, like those used in -the Linux kernel development. - -The name "b4" was chosen for ease of typing and because B-4 was the -precursor to Lore and Data in the Star Trek universe. - -%prep -%autosetup -p1 - -# ditch shebang from .py files, they are non-executables anyway -sed -i.old '1{/#!.*/d}' b4/*.py - -%build -%python_build - -%install -install -d %{buildroot}/%{_mandir}/man.5 -install -m 0644 -t %{buildroot}/%{_mandir}/man.5 man/b4.5 -%python_install - -%check -%python_exec setup.py check -export PYTHONPATH="./" -%python_exec ./b4/command.py --version >check_version -echo %version | grep "`cat check_version`" - -%files -%doc README.rst -%license COPYING -%{_bindir}/{%name} -%dir %{_mandir}/man.5/ -%{_mandir}/man.5/b4.5.gz -%{python_sitelib}/%{name}* - -%changelog From 88ade289c2239953f575ddb4077d7f47b1792720032614224dea1b4aad01036b Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Tue, 8 Dec 2020 06:50:39 +0000 Subject: [PATCH 2/5] relink OBS-URL: https://build.opensuse.org/package/show/devel:tools/b4?expand=0&rev=26 --- _service | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 _service diff --git a/_service b/_service deleted file mode 100644 index 47e698e..0000000 --- a/_service +++ /dev/null @@ -1,18 +0,0 @@ - - - git://git.kernel.org/pub/scm/utils/b4/b4.git - git - enable - stable-0.5.y - @PARENT_TAG@+@TAG_OFFSET@ - v(.*) - \1 - - - - - - *.tar - xz - - From 5b018d6725a817f91aab498c862b344fc51c5b4e80fa63a2a9ec7d35e2ae5e3f Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Tue, 8 Dec 2020 06:55:01 +0000 Subject: [PATCH 3/5] up to 0.6.1 OBS-URL: https://build.opensuse.org/package/show/devel:tools/b4?expand=0&rev=27 --- _service | 18 +++++++ _servicedata | 4 ++ b4-0.6.1.obscpio | 3 ++ b4.changes | 123 +++++++++++++++++++++++++++++++++++++++++++++++ b4.obsinfo | 5 ++ b4.spec | 72 +++++++++++++++++++++++++++ 6 files changed, 225 insertions(+) create mode 100644 _service create mode 100644 _servicedata create mode 100644 b4-0.6.1.obscpio create mode 100644 b4.changes create mode 100644 b4.obsinfo create mode 100644 b4.spec diff --git a/_service b/_service new file mode 100644 index 0000000..14c9243 --- /dev/null +++ b/_service @@ -0,0 +1,18 @@ + + + git://git.kernel.org/pub/scm/utils/b4/b4.git + git + enable + @PARENT_TAG@ + @PARENT_TAG@ + v(.*) + \1 + + + + + + *.tar + xz + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..c7f8345 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + git://git.kernel.org/pub/scm/utils/b4/b4.git + d13c5e30f00656d91dcd86bec5234da14037eb9b \ No newline at end of file diff --git a/b4-0.6.1.obscpio b/b4-0.6.1.obscpio new file mode 100644 index 0000000..2a43354 --- /dev/null +++ b/b4-0.6.1.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9e22c312e24ad44bc6a23cd15f03e1d51fd1e4ef3a9523696fb0cde4acdd049 +size 228363 diff --git a/b4.changes b/b4.changes new file mode 100644 index 0000000..3e90594 --- /dev/null +++ b/b4.changes @@ -0,0 +1,123 @@ +------------------------------------------------------------------- +Tue Dec 08 06:52:43 UTC 2020 - jslaby@suse.cz + +- Update to version 0.6.1: + * Add dkimpy and dnspython to install_requires + * Don't crash if dkimpy is not installed + * Try all DKIM headers if failed on the first + * Silence some pycharm warnings + * Fix logic when adding trailers without DKIM sigs + * Limit slug length by 100 characters + * Fix ReST in README.rst + * Move the g= hash back into the XPH header + * Fix logic on git-patch-id hash generation + * Don't give up on attestation if there's no index + * Deal with dupe follow-up trailers sent to cover + * Fix crash when dnspython is not available + * Fix b4 ty auto-matching + * Fix headers generated by "b4 ty" + * man: Drop apostrophe from midmask value + * Properly clean up temporary threadfile + * and much more... + +------------------------------------------------------------------- +Wed Dec 02 12:10:32 UTC 2020 - jslaby@suse.cz + +- Update to version 0.5.4+0: + * Release 0.5.4 with the fix for b4 ty bug + * Fix b4 ty auto-matching + * Fix headers generated by "b4 ty" + * man: Drop apostrophe from midmask value + * Increment version to 0.5.4-dev + +------------------------------------------------------------------- +Fri Nov 27 11:02:21 UTC 2020 - jslaby@suse.cz + +- Update to version 0.5.3+0: + * Increment version to 0.5.3 in prep for release + * Unbreak thanks-tracking + * Fix crash on incomplete series thanks tracking + * Improve ty with cherrypicked subsets + * Unquote msgid if we're getting a full https URL + +------------------------------------------------------------------- +Mon Nov 23 10:21:55 UTC 2020 - jslaby@suse.cz + +- Update to version 0.5.2+9: + * Fix crasher when attempting a 3-way prep + * Fix handling of series with the [PATCHvX] defect + * Fix header encoding introduced by earlier fix + * Fix some cherry-picking corner cases + * Don't crash when no valid patches are found + * Use bytes when dumping to stdout + * Set charset in order to generate MIME headers + +------------------------------------------------------------------- +Thu Aug 20 05:30:13 UTC 2020 - jslaby@suse.com + +- Update to version 0.5.2+2: + * Require that a trailer is at least 2 chars long + * Cover letters may not have a diffstat +- add requests to Requires + +------------------------------------------------------------------- +Tue Jul 28 11:07:40 UTC 2020 - jslaby@suse.com + +- Update to version 0.5.2: + * Prepare for 0.5.2 release + * Fix handling of single-paragraph commit message bodies + * Fix basement detection for empty commit message bodies + * Support mbox -m to be a maildir + * man: Update commit url mask to contain 12 chars of ID + * Fix attestation error messages + * Deal with [PATCHvX] subjects + * Fix crash when -c used with incomplete series + * man: Drop the apostrophe from the linkmask configuration + * Fix crash with unbalanced [] in subject + * Fix regression with oddball charsets + * Up the version to 0.5.2-dev + * Prepare for 0.5.1 release + * Fix mbox naming inconsistencies + * Output less confusing trailer mismatch messages + * Fix bug with threading when cover ref is missing + * Fix body part parsing when '---' is not used + * Use proper charset when reading back mailinfo + * Don't output git am suggestion for -o - + * Add --no-cover and -o - to output to stdout + * Use unicode escape sequences + * Up the version to 0.5.1-dev +- switch to obs_scm +- switch to 0.5 stable branch + +------------------------------------------------------------------- +Tue Jun 16 06:23:16 UTC 2020 - jslaby@suse.com + +- Update to version 0.5.0+git20200612.g5c4ec14b: + * Fix crash with unbalanced [] in subject + * Fix regression with oddball charsets + * Fix mbox naming inconsistencies + * Output less confusing trailer mismatch messages + * Fix bug with threading when cover ref is missing + * Fix body part parsing when '---' is not used + * Use proper charset when reading back mailinfo + +------------------------------------------------------------------- +Mon Jun 08 10:57:26 UTC 2020 - jslaby@suse.com + +- Update to version 0.5.0+git20200528.g204416b80fbb: + * Don't output git am suggestion for -o - + * Add --no-cover and -o - to output to stdout + +------------------------------------------------------------------- +Tue May 26 13:05:22 UTC 2020 - jslaby@suse.com + +- Update to version 0.5.0+git20200526.ga926bac9e6c2: + * Use unicode escape sequences + * Up the version to 0.6.0-dev + * Prepare for 0.5.0 + * Backfill series before diffing them + +------------------------------------------------------------------- +Tue May 26 09:56:21 UTC 2020 - Jiri Slaby + +- initial package (0.4.0+git20200525.g59be08453137) diff --git a/b4.obsinfo b/b4.obsinfo new file mode 100644 index 0000000..5f5b9ef --- /dev/null +++ b/b4.obsinfo @@ -0,0 +1,5 @@ +name: b4 +version: 0.6.1 +mtime: 1607377580 +commit: d13c5e30f00656d91dcd86bec5234da14037eb9b + diff --git a/b4.spec b/b4.spec new file mode 100644 index 0000000..3916e4a --- /dev/null +++ b/b4.spec @@ -0,0 +1,72 @@ +# +# spec file for package b4 +# +# Copyright (c) 2020 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define skip_python2 1 +%define version_unconverted 0.6.1 +Name: b4 +Version: 0.6.1 +Release: 0 +Summary: Helper scripts for kernel.org patches +License: GPL-2.0-or-later +Group: Development/Tools/Other +URL: https://git.kernel.org/pub/scm/utils/b4/b4.git +Source0: %{name}-%{version}.tar.xz +BuildArch: noarch +BuildRequires: %{python_module requests} +BuildRequires: %{python_module setuptools} +BuildRequires: tar +Requires: python3-requests + +%description +This is a helper utility to work with patches made available via a +public-inbox archive like lore.kernel.org. It is written to make it +easier to participate in a patch-based workflows, like those used in +the Linux kernel development. + +The name "b4" was chosen for ease of typing and because B-4 was the +precursor to Lore and Data in the Star Trek universe. + +%prep +%autosetup -p1 + +# ditch shebang from .py files, they are non-executables anyway +sed -i.old '1{/#!.*/d}' b4/*.py + +%build +%python_build + +%install +install -d %{buildroot}/%{_mandir}/man.5 +install -m 0644 -t %{buildroot}/%{_mandir}/man.5 man/b4.5 +%python_install + +%check +%python_exec setup.py check +export PYTHONPATH="./" +%python_exec ./b4/command.py --version >check_version +echo %version | grep "`cat check_version`" + +%files +%doc README.rst +%license COPYING +%{_bindir}/{%name} +%dir %{_mandir}/man.5/ +%{_mandir}/man.5/b4.5.gz +%{python_sitelib}/%{name}* + +%changelog From 453711b4b0925f5a9ecb7e1decfd05addf1ab70fa7531d22d195f8d80011cb8a Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Tue, 8 Dec 2020 07:05:22 +0000 Subject: [PATCH 4/5] up to 0.6.1 OBS-URL: https://build.opensuse.org/package/show/devel:tools/b4?expand=0&rev=28 --- _servicedata | 2 +- b4-0.6.1.obscpio | 2 +- b4.obsinfo | 4 ++-- b4.spec | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/_servicedata b/_servicedata index c7f8345..36ee729 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://git.kernel.org/pub/scm/utils/b4/b4.git - d13c5e30f00656d91dcd86bec5234da14037eb9b \ No newline at end of file + 0369d53cf093aab6f69a0725ce21b0e05b4ed9b9 \ No newline at end of file diff --git a/b4-0.6.1.obscpio b/b4-0.6.1.obscpio index 2a43354..8569a00 100644 --- a/b4-0.6.1.obscpio +++ b/b4-0.6.1.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9e22c312e24ad44bc6a23cd15f03e1d51fd1e4ef3a9523696fb0cde4acdd049 +oid sha256:0e1290e4880df80cc3ca9c6f2f9bbf73d88bbcdcebe56d59517939047c14cc07 size 228363 diff --git a/b4.obsinfo b/b4.obsinfo index 5f5b9ef..de40443 100644 --- a/b4.obsinfo +++ b/b4.obsinfo @@ -1,5 +1,5 @@ name: b4 version: 0.6.1 -mtime: 1607377580 -commit: d13c5e30f00656d91dcd86bec5234da14037eb9b +mtime: 1607376387 +commit: 0369d53cf093aab6f69a0725ce21b0e05b4ed9b9 diff --git a/b4.spec b/b4.spec index 3916e4a..87d792e 100644 --- a/b4.spec +++ b/b4.spec @@ -51,9 +51,8 @@ sed -i.old '1{/#!.*/d}' b4/*.py %python_build %install -install -d %{buildroot}/%{_mandir}/man.5 -install -m 0644 -t %{buildroot}/%{_mandir}/man.5 man/b4.5 %python_install +mv %{buildroot}/%{_mandir}/man5 %{buildroot}/%{_mandir}/man.5 %check %python_exec setup.py check From cfc457d75a024041c3b3b988a08ad2253ef5a8e60f0865bc7040a713d53e3bc7 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Tue, 8 Dec 2020 07:13:03 +0000 Subject: [PATCH 5/5] requirements OBS-URL: https://build.opensuse.org/package/show/devel:tools/b4?expand=0&rev=29 --- b4.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/b4.spec b/b4.spec index 87d792e..75d69f7 100644 --- a/b4.spec +++ b/b4.spec @@ -29,8 +29,9 @@ Source0: %{name}-%{version}.tar.xz BuildArch: noarch BuildRequires: %{python_module requests} BuildRequires: %{python_module setuptools} -BuildRequires: tar -Requires: python3-requests +Requires: python3-dkimpy >= 1.0.5 +Requires: python3-dnspython >= 2.0.0 +Requires: python3-requests >= 2.24.0 %description This is a helper utility to work with patches made available via a