The package rpms/git.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/git.git/commit/?id=9163954e0f609a....
Change:
-%ifarch s390x
Thanks.
Full change:
============
commit 6eb7905679ed6315b4cd1aaa42e1f620a598e1c8
Author: Todd Zullinger <tmz(a)pobox.com>
Date: Tue Mar 9 13:51:47 2021 -0500
update to 2.30.2
This release includes a fix for CVE-2021-21300¹.
Release notes:
https://github.com/git/git/raw/v2.30.2/Documentation/RelNotes/2.30.2.txt
¹ Per the 2.17.6 release notes on CVE-2021-21300:
On case-insensitive file systems with support for symbolic links, if
Git is configured globally to apply delay-capable clean/smudge
filters (such as Git LFS), Git could be fooled into running remote
code during a clone.
diff --git a/git.spec b/git.spec
index 6fa4261..caf8df8 100644
--- a/git.spec
+++ b/git.spec
@@ -96,8 +96,8 @@
#global rcrev .rc0
Name: git
-Version: 2.30.1
-Release: 3%{?rcrev}%{?dist}
+Version: 2.30.2
+Release: 1%{?rcrev}%{?dist}
Summary: Fast Version Control System
License: GPLv2
URL:
https://git-scm.com/
@@ -1070,6 +1070,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog
+* Tue Mar 09 2021 Todd Zullinger <tmz(a)pobox.com> - 2.30.2-1
+- update to 2.30.2 (CVE-2021-21300)
+
* Tue Mar 02 2021 Todd Zullinger <tmz(a)pobox.com> - 2.30.1-3
- use %%{gpgverify} macro to verify tarball signature
diff --git a/sources b/sources
index 8265a5c..de8021b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (git-2.30.1.tar.xz) =
b3567d251c73807857f05f46cae3acb4e0d876590d122229c05509d5eb17fc3eee0ba97a1b2068070b399085f7a92aa2493c4833b98f65b8ef15fc279798caa3
-SHA512 (git-2.30.1.tar.sign) =
74f03e9b38fb33cfc8bf8d17ac108c769663acfd4b72c5fade4410b06b6c7c29479a82f58409ba780468f56e0ce24bc86f118e7f31060941067c34f02778f6e2
+SHA512 (git-2.30.2.tar.xz) =
4f7e1c30f8eee849d1febeda872d56c60c5d051a31726505a4c7bab11b274d3a2ab5588f910b7b49c5c0ec5228a18457f705c7b66e8bbdf809d3c75c59032b7e
+SHA512 (git-2.30.2.tar.sign) =
36aed3ddda7d60899970c63da7afd5e64a27d1a0998aaeabfcdb8f3865b5629f8b9b039cd3b23532d358b995bd700dfbe0624c48568ac102763498a1fc409b0c
commit e34350e16edfddb6571c632ce1a74b40ed0cfcb6
Author: Todd Zullinger <tmz(a)pobox.com>
Date: Tue Mar 2 13:17:44 2021 -0500
improve gpg verification of upstream source
Use %{gpgverify} macro to verify tarball signature. The macro is now
available for all supported Fedora and EPEL releases. (It is presumed
that EL-9 will include %{gpgverify} as it will be branched from F-34.
If that turns out to be false, we will adjust later.)
The Packaging Guidelines require the use of the %{gpgverify} macro:
https://docs.fedoraproject.org/en-US/packaging-guidelines/#_verifying_sig...
Add a BuildRequires for xz as well, since we use it explicitly in %prep.
Renumber Junio's GPG key from Source9 to Source2 so the %{gpgverify}
calls follow the typical pattern. It (mildly) lessens cognitive load
for anyone reviewing the spec file.
While here, remove a stale comment about leaving a blank line after
%autosetup to work around a bug on EL6.
diff --git a/git.spec b/git.spec
index 7b2ece5..6fa4261 100644
--- a/git.spec
+++ b/git.spec
@@ -97,7 +97,7 @@
Name: git
Version: 2.30.1
-Release: 2%{?rcrev}%{?dist}.1
+Release: 3%{?rcrev}%{?dist}
Summary: Fast Version Control System
License: GPLv2
URL:
https://git-scm.com/
@@ -113,7 +113,7 @@ Source1:
https://www.kernel.org/pub/software/scm/git/%{?rcrev:testing/}%{
#
#
https://git.kernel.org/cgit/git/git.git/tag/?h=junio-gpg-pub
#
https://git.kernel.org/cgit/git/git.git/blob/?h=junio-gpg-pub&id=7214...
-Source9: gpgkey-junio.asc
+Source2: gpgkey-junio.asc
# Local sources begin at 10 to allow for additional future upstream sources
Source11: git.xinetd.in
@@ -152,11 +152,12 @@ BuildRequires: diffutils
BuildRequires: emacs-common
%endif
# endif emacs-common
-%if 0%{?rhel} == 7
-# Require epel-rpm-macros for the %%build_cflags and %%build_ldflags macros
+%if 0%{?rhel} && 0%{?rhel} < 9
+# Require epel-rpm-macros for the %%gpgverify macro on EL-7/EL-8, and
+# %%build_cflags & %%build_ldflags on EL-7.
BuildRequires: epel-rpm-macros
%endif
-# endif rhel == 7
+# endif rhel < 9
BuildRequires: expat-devel
BuildRequires: findutils
BuildRequires: gawk
@@ -192,6 +193,7 @@ BuildRequires: systemd
# endif use_systemd
BuildRequires: tcl
BuildRequires: tk
+BuildRequires: xz
BuildRequires: zlib-devel >= 1.2
%if %{with tests}
@@ -521,16 +523,8 @@ Requires: subversion
%prep
# Verify GPG signatures
-gpghome="$(mktemp -qd)" # Ensure we don't use any existing gpg keyrings
-# Convert the ascii-armored key to binary
-# (use --yes to ensure an existing dearmored key is overwritten)
-gpg2 --homedir "$gpghome" --dearmor --quiet --yes %{SOURCE9}
-xz -dc %{SOURCE0} | # Upstream signs the uncompressed tarballs
- gpgv2 --homedir "$gpghome" --quiet --keyring %{SOURCE9}.gpg %{SOURCE1} -
-rm -rf "$gpghome" # Cleanup tmp gpg home dir
-
-# Ensure a blank line follows autosetup, el6 chokes otherwise
-#
https://bugzilla.redhat.com/1310704
+xz -dc '%{SOURCE0}' | %{gpgverify} --keyring='%{SOURCE2}'
--signature='%{SOURCE1}' --data=-
+
%autosetup -p1 -n %{name}-%{version}%{?rcrev}
# Install print-failed-test-output script
@@ -1076,6 +1070,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog
+* Tue Mar 02 2021 Todd Zullinger <tmz(a)pobox.com> - 2.30.1-3
+- use %%{gpgverify} macro to verify tarball signature
+
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl> - 2.30.1-2.1
- Rebuilt for updated systemd-rpm-macros
See
https://pagure.io/fesco/issue/2583.
commit 5662337240a54677ee453b27645f5e3ef7dc9842
Author: Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl>
Date: Tue Mar 2 16:13:48 2021 +0100
Rebuilt for updated systemd-rpm-macros
See
https://pagure.io/fesco/issue/2583.
diff --git a/git.spec b/git.spec
index b8e6172..7b2ece5 100644
--- a/git.spec
+++ b/git.spec
@@ -97,7 +97,7 @@
Name: git
Version: 2.30.1
-Release: 2%{?rcrev}%{?dist}
+Release: 2%{?rcrev}%{?dist}.1
Summary: Fast Version Control System
License: GPLv2
URL:
https://git-scm.com/
@@ -1076,6 +1076,10 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl> - 2.30.1-2.1
+- Rebuilt for updated systemd-rpm-macros
+ See
https://pagure.io/fesco/issue/2583.
+
* Thu Feb 18 2021 Ondřej Pohořelský <opohorel(a)redhat.com - 2.30.1-2
- include git-daemon in git-all meta-package
commit 8d486728064e3a61c040d24aff44a21a74f0d64d
Author: Ondřej Pohořelský <opohorel(a)redhat.com>
Date: Mon Feb 1 16:33:48 2021 +0100
include git-daemon in git-all meta-package
Installing the git-all meta-package is intended to bring in all git
subpackages. Add the missing git-daemon.
diff --git a/git.spec b/git.spec
index ae7ba4d..b8e6172 100644
--- a/git.spec
+++ b/git.spec
@@ -97,7 +97,7 @@
Name: git
Version: 2.30.1
-Release: 1%{?rcrev}%{?dist}
+Release: 2%{?rcrev}%{?dist}
Summary: Fast Version Control System
License: GPLv2
URL:
https://git-scm.com/
@@ -323,6 +323,7 @@ Requires: git-credential-libsecret = %{version}-%{release}
Requires: git-cvs = %{version}-%{release}
%endif
# endif with cvs
+Requires: git-daemon = %{version}-%{release}
Requires: git-email = %{version}-%{release}
Requires: git-gui = %{version}-%{release}
%if %{with p4}
@@ -1075,6 +1076,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog
+* Thu Feb 18 2021 Ondřej Pohořelský <opohorel(a)redhat.com - 2.30.1-2
+- include git-daemon in git-all meta-package
+
* Thu Feb 18 2021 Todd Zullinger <tmz(a)pobox.com>
- re-enable t7812-grep-icase-non-ascii on s390x
commit 9163954e0f609af7a8b38c7d569b3a781066cec6
Author: Todd Zullinger <tmz(a)pobox.com>
Date: Thu Feb 18 01:52:02 2021 -0500
re-enable t7812-grep-icase-non-ascii on s390x
We disabled t7812's 'PCRE v2: grep non-ASCII from invalid UTF-8 data'
test in 33ecb78 (skip failing test in t7812-grep-icase-non-ascii on
s390x, 2019-10-24).
It was subsequently fixed upstream in e714b898c6 (t7812: expect failure
for grep -i with invalid UTF-8 data, 2019-11-29) and more recently
improved with a4fea08b6e (grep/pcre2 tests: don't rely on invalid UTF-8
data test, 2021-01-24).
Don't skip the test any longer.
diff --git a/git.spec b/git.spec
index 1098420..ae7ba4d 100644
--- a/git.spec
+++ b/git.spec
@@ -883,16 +883,6 @@ GIT_SKIP_TESTS="$GIT_SKIP_TESTS t9115"
%endif
# endif %%{power64}
-%ifarch s390x
-# Skip tests which fail on s390x
-#
-# t7812-grep-icase-non-ascii's "PCRE v2: grep non-ASCII from invalid UTF-8
-# data" test fails on big-endian arches. This is known upstream and will
-# hopefully be resolved soon (2019/10/24, tmz)
-GIT_SKIP_TESTS="$GIT_SKIP_TESTS t7812.11"
-%endif
-# endif s390x
-
export GIT_SKIP_TESTS
# Set LANG so various UTF-8 tests are run
@@ -1085,6 +1075,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog
+* Thu Feb 18 2021 Todd Zullinger <tmz(a)pobox.com>
+- re-enable t7812-grep-icase-non-ascii on s390x
+
* Tue Feb 09 2021 Todd Zullinger <tmz(a)pobox.com> - 2.30.1-1
- update to 2.30.1
commit 0cb8e1a37845c98ca9691942ee2296246db732d6
Author: Todd Zullinger <tmz(a)pobox.com>
Date: Mon Feb 8 22:05:08 2021 -0500
update to 2.30.1
Release notes:
https://github.com/git/git/raw/v2.30.1/Documentation/RelNotes/2.30.1.txt
diff --git a/git.spec b/git.spec
index 5e1be22..1098420 100644
--- a/git.spec
+++ b/git.spec
@@ -96,8 +96,8 @@
#global rcrev .rc0
Name: git
-Version: 2.30.0
-Release: 2%{?rcrev}%{?dist}
+Version: 2.30.1
+Release: 1%{?rcrev}%{?dist}
Summary: Fast Version Control System
License: GPLv2
URL:
https://git-scm.com/
@@ -1085,6 +1085,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog
+* Tue Feb 09 2021 Todd Zullinger <tmz(a)pobox.com> - 2.30.1-1
+- update to 2.30.1
+
* Mon Feb 08 2021 Ondřej Pohořelský <opohorel(a)redhat.com> - 2.30.0-2
- add rhel 9 conditional to require httpd instead of lighttpd in git-instaweb
diff --git a/sources b/sources
index f500963..8265a5c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (git-2.30.0.tar.xz) =
2ce154d6e224e78d7da2ea9b954d8cf56bdfe43636b93dd5045a950a7362d3943866b4949eb5ed03528d6e5f0466c33c233b502d84430ed9d90326bcc696101d
-SHA512 (git-2.30.0.tar.sign) =
194980220d1e6260c1eb9ef6c284ebcd810636bffb51753d7a5b08bb398ab05ae839bf5622c72c031b45b3aab371331724a6ba3a46d37e2fab34a954d418a128
+SHA512 (git-2.30.1.tar.xz) =
b3567d251c73807857f05f46cae3acb4e0d876590d122229c05509d5eb17fc3eee0ba97a1b2068070b399085f7a92aa2493c4833b98f65b8ef15fc279798caa3
+SHA512 (git-2.30.1.tar.sign) =
74f03e9b38fb33cfc8bf8d17ac108c769663acfd4b72c5fade4410b06b6c7c29479a82f58409ba780468f56e0ce24bc86f118e7f31060941067c34f02778f6e2
commit 3913289de2c79ff2ba1ec89f12499fd0b7ea16fd
Author: Ondřej Pohořelský <opohorel(a)redhat.com>
Date: Mon Feb 8 15:55:29 2021 +0100
add rhel 9 conditional to require httpd instead of lighttpd in git-instaweb
diff --git a/git.spec b/git.spec
index f0023f4..5e1be22 100644
--- a/git.spec
+++ b/git.spec
@@ -97,7 +97,7 @@
Name: git
Version: 2.30.0
-Release: 1%{?rcrev}%{?dist}.1
+Release: 2%{?rcrev}%{?dist}
Summary: Fast Version Control System
License: GPLv2
URL:
https://git-scm.com/
@@ -460,7 +460,11 @@ Summary: Repository browser in gitweb
BuildArch: noarch
Requires: git = %{version}-%{release}
Requires: gitweb = %{version}-%{release}
+%if 0%{?rhel} >= 9
+Requires: httpd
+%else
Requires: lighttpd
+%endif
%description instaweb
A simple script to set up gitweb and a web server for browsing the local
@@ -1081,6 +1085,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog
+* Mon Feb 08 2021 Ondřej Pohořelský <opohorel(a)redhat.com> - 2.30.0-2
+- add rhel 9 conditional to require httpd instead of lighttpd in git-instaweb
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
2.30.0-1.1
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
commit 50e6f6ece0fe90b3f97f60e92f8015b2d283f3a9
Author: Todd Zullinger <tmz(a)pobox.com>
Date: Wed Jan 27 11:53:45 2021 -0500
update Junio's GPG key (with extended expiration)
The key used to sign git releases expired in July 2020. While this
doesn't strictly affect us because use gpgv to verify the releases
against a known key file, it is worth updating to make it clear that
we're using the correct signing key.
Refer to 7c95c76 (Update Junio's GPG key, 2017-09-16) for a previous
update of the key, including the process used.
Here is a diff of the key file before and after the update:
$ diff -u <(gpg gpgkey-junio.asc.old 2>/dev/null) <(gpg gpgkey-junio.asc
2>/dev/null)
--- /dev/fd/63 2021-01-25 11:57:17.367151191 -0500
+++ /dev/fd/62 2021-01-25 11:57:17.368151229 -0500
@@ -3,6 +3,6 @@
uid Junio C Hamano <gitster(a)pobox.com>
uid Junio C Hamano <junio(a)pobox.com>
uid Junio C Hamano <jch(a)google.com>
-sub rsa4096/B0B5E88696AFE6CB 2011-10-03 [S] [expired: 2020-07-26]
+sub rsa4096/B0B5E88696AFE6CB 2011-10-03 [S] [expires: 2028-01-11]
sub rsa4096/86B76D5D833262C4 2011-10-01 [E]
-sub rsa4096/7594EEC7B3F7CAC9 2014-09-20 [S] [expired: 2020-07-26]
+sub rsa4096/7594EEC7B3F7CAC9 2014-09-20 [S] [expires: 2028-01-11]
This thread on the git list is where the question was raised and Junio
confirmed he'd extended the expiration of his signing key:
https://lore.kernel.org/git/B6DFB74D-A722-4DBD-A4B2-562604B21CCB@alchemis...
diff --git a/gpgkey-junio.asc b/gpgkey-junio.asc
index 032428d..5edb58f 100644
--- a/gpgkey-junio.asc
+++ b/gpgkey-junio.asc
@@ -59,108 +59,86 @@ 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
-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
-=z4yI
+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
+=7hTI
-----END PGP PUBLIC KEY BLOCK-----
commit cb12da19d4f919c8bef348ebdedee1e9a44bd3e4
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 26 08:07:04 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/git.spec b/git.spec
index 6479825..f0023f4 100644
--- a/git.spec
+++ b/git.spec
@@ -97,7 +97,7 @@
Name: git
Version: 2.30.0
-Release: 1%{?rcrev}%{?dist}
+Release: 1%{?rcrev}%{?dist}.1
Summary: Fast Version Control System
License: GPLv2
URL:
https://git-scm.com/
@@ -1081,6 +1081,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
2.30.0-1.1
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Mon Dec 28 2020 Todd Zullinger <tmz(a)pobox.com> - 2.30.0-1
- update to 2.30.0
commit c93103f5ad8d0e0ce9c5ae05b28d7488d2e4a1d2
Author: Todd Zullinger <tmz(a)pobox.com>
Date: Mon Dec 28 15:02:16 2020 -0500
update to 2.30.0
Release notes:
https://github.com/git/git/raw/v2.30.0/Documentation/RelNotes/2.30.0.txt
diff --git a/git.spec b/git.spec
index c3795bc..6479825 100644
--- a/git.spec
+++ b/git.spec
@@ -93,11 +93,11 @@
%endif
# Define for release candidates
-%global rcrev .rc2
+#global rcrev .rc0
Name: git
Version: 2.30.0
-Release: 0.2%{?rcrev}%{?dist}
+Release: 1%{?rcrev}%{?dist}
Summary: Fast Version Control System
License: GPLv2
URL:
https://git-scm.com/
@@ -1081,6 +1081,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog
+* Mon Dec 28 2020 Todd Zullinger <tmz(a)pobox.com> - 2.30.0-1
+- update to 2.30.0
+
* Wed Dec 23 2020 Todd Zullinger <tmz(a)pobox.com> - 2.30.0-0.2.rc2
- update to 2.30.0-rc2
diff --git a/sources b/sources
index d222949..f500963 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (git-2.30.0.rc2.tar.xz) =
bae9e0eae3f54ae7598d8ec661a99327c1040c413430f9f9c40defd81dfd0acd5884a3a1465ebc2a0c78ed2b1fda650e4998d14018e80b6ed1e5aaa20a1a8a9c
-SHA512 (git-2.30.0.rc2.tar.sign) =
f2efc4869a3f68e16e442c71d10945bc7f9fca78a924d21709c03309644e24776614260f859ad3aff65f88f306c41a4ce24567e0baa4ad6d055e8f531e83e611
+SHA512 (git-2.30.0.tar.xz) =
2ce154d6e224e78d7da2ea9b954d8cf56bdfe43636b93dd5045a950a7362d3943866b4949eb5ed03528d6e5f0466c33c233b502d84430ed9d90326bcc696101d
+SHA512 (git-2.30.0.tar.sign) =
194980220d1e6260c1eb9ef6c284ebcd810636bffb51753d7a5b08bb398ab05ae839bf5622c72c031b45b3aab371331724a6ba3a46d37e2fab34a954d418a128
commit 8fef3782c3057d868f57f847dec67e1c38b02a21
Author: Todd Zullinger <tmz(a)pobox.com>
Date: Wed Dec 23 19:01:29 2020 -0500
update to 2.30.0-rc2
Release notes:
https://github.com/git/git/raw/v2.30.0-rc2/Documentation/RelNotes/2.30.0.txt
diff --git a/git.spec b/git.spec
index 5de02f6..c3795bc 100644
--- a/git.spec
+++ b/git.spec
@@ -93,11 +93,11 @@
%endif
# Define for release candidates
-%global rcrev .rc1
+%global rcrev .rc2
Name: git
Version: 2.30.0
-Release: 0.1%{?rcrev}%{?dist}
+Release: 0.2%{?rcrev}%{?dist}
Summary: Fast Version Control System
License: GPLv2
URL:
https://git-scm.com/
@@ -1081,6 +1081,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog
+* Wed Dec 23 2020 Todd Zullinger <tmz(a)pobox.com> - 2.30.0-0.2.rc2
+- update to 2.30.0-rc2
+
* Sat Dec 19 2020 Todd Zullinger <tmz(a)pobox.com> - 2.30.0-0.1.rc1
- update to 2.30.0-rc1
diff --git a/sources b/sources
index 6c6c71c..d222949 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (git-2.30.0.rc1.tar.xz) =
dfd51fce13b93fefde0364601efade9e438556469f5d6977e00a2e0727e5f50c506452d214848804831855bf22ba2593aa1d7bb01ad81a111e7ddfd9b17a9760
-SHA512 (git-2.30.0.rc1.tar.sign) =
e709a8ef1f38fe8872d412aeb5fdff2cce38c27b8415a91994bd3b4b6b93a3d675cc4efa26adaaa13ac232e528e8765d5cce5dd857bd1c14977fe8f2df579866
+SHA512 (git-2.30.0.rc2.tar.xz) =
bae9e0eae3f54ae7598d8ec661a99327c1040c413430f9f9c40defd81dfd0acd5884a3a1465ebc2a0c78ed2b1fda650e4998d14018e80b6ed1e5aaa20a1a8a9c
+SHA512 (git-2.30.0.rc2.tar.sign) =
f2efc4869a3f68e16e442c71d10945bc7f9fca78a924d21709c03309644e24776614260f859ad3aff65f88f306c41a4ce24567e0baa4ad6d055e8f531e83e611
commit 9e220daf74ebee477e1cb04a6af4758e4f6dbf41
Author: Todd Zullinger <tmz(a)pobox.com>
Date: Fri Dec 18 23:40:05 2020 -0500
update to 2.30.0-rc1
Release notes:
https://github.com/git/git/raw/v2.30.0-rc1/Documentation/RelNotes/2.30.0.txt
diff --git a/git.spec b/git.spec
index 22a0eba..5de02f6 100644
--- a/git.spec
+++ b/git.spec
@@ -93,11 +93,11 @@
%endif
# Define for release candidates
-%global rcrev .rc0
+%global rcrev .rc1
Name: git
Version: 2.30.0
-Release: 0.0%{?rcrev}%{?dist}
+Release: 0.1%{?rcrev}%{?dist}
Summary: Fast Version Control System
License: GPLv2
URL:
https://git-scm.com/
@@ -1081,6 +1081,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog
+* Sat Dec 19 2020 Todd Zullinger <tmz(a)pobox.com> - 2.30.0-0.1.rc1
+- update to 2.30.0-rc1
+
* Mon Dec 14 2020 Todd Zullinger <tmz(a)pobox.com> - 2.30.0-0.0.rc0
- update to 2.30.0-rc0
diff --git a/sources b/sources
index 4f2ec89..6c6c71c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (git-2.30.0.rc0.tar.xz) =
aecfa17571ec718e9f8892f6d5ba059451e44ac00f4e39f0d8fef51b9c27e885eff2711e3fc2ebfbb0bc0815370fa0a13b8e9243b60d6cf7cb1278e406cb743f
-SHA512 (git-2.30.0.rc0.tar.sign) =
f9b997ba3f9f3f7e7f42e79258f2309ceeced85331a6e1e0dc9f83d93cf4fa8fd08154ea868dc64067d5830c7fb208449643742897991cfdbd22f5d5ceec3b3f
+SHA512 (git-2.30.0.rc1.tar.xz) =
dfd51fce13b93fefde0364601efade9e438556469f5d6977e00a2e0727e5f50c506452d214848804831855bf22ba2593aa1d7bb01ad81a111e7ddfd9b17a9760
+SHA512 (git-2.30.0.rc1.tar.sign) =
e709a8ef1f38fe8872d412aeb5fdff2cce38c27b8415a91994bd3b4b6b93a3d675cc4efa26adaaa13ac232e528e8765d5cce5dd857bd1c14977fe8f2df579866
commit 528c7a0575f5049888fadde7c9b28a6b6bce5c60
Author: Todd Zullinger <tmz(a)pobox.com>
Date: Mon Dec 14 15:09:47 2020 -0500
update to 2.30.0-rc0
Release notes:
https://github.com/git/git/raw/v2.30.0-rc0/Documentation/RelNotes/2.30.0.txt
diff --git a/0001-fast-import-fix-over-allocation-of-marks-storage.patch
b/0001-fast-import-fix-over-allocation-of-marks-storage.patch
deleted file mode 100644
index eff5fb2..0000000
--- a/0001-fast-import-fix-over-allocation-of-marks-storage.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From 3f018ec716292b4d757385686f42f57af3bca685 Mon Sep 17 00:00:00 2001
-From: Jeff King <peff(a)peff.net>
-Date: Thu, 15 Oct 2020 11:38:49 -0400
-Subject: [PATCH] fast-import: fix over-allocation of marks storage
-
-Fast-import stores its marks in a trie-like structure made of mark_set
-structs. Each struct has a fixed size (1024). If our id number is too
-large to fit in the struct, then we allocate a new struct which shifts
-the id number by 10 bits. Our original struct becomes a child node
-of this new layer, and the new struct becomes the top level of the trie.
-
-This scheme was broken by ddddf8d7e2 (fast-import: permit reading
-multiple marks files, 2020-02-22). Before then, we had a top-level
-"marks" pointer, and the push-down worked by assigning the new top-level
-struct to "marks". But after that commit, insert_mark() takes a pointer
-to the mark_set, rather than using the global "marks". It continued to
-assign to the global "marks" variable during the push down, which was
-wrong for two reasons:
-
- - we added a call in option_rewrite_submodules() which uses a separate
- mark set; pushing down on "marks" is outright wrong here. We'd
- corrupt the "marks" set, and we'd fail to correctly store any
- submodule mappings with an id over 1024.
-
- - the other callers passed "marks", but the push-down was still wrong.
- In read_mark_file(), we take the pointer to the mark_set as a
- parameter. So even though insert_mark() was updating the global
- "marks", the local pointer we had in read_mark_file() was not
- updated. As a result, we'd add a new level when needed, but then the
- next call to insert_mark() wouldn't see it! It would then allocate a
- new layer, which would also not be seen, and so on. Lookups for the
- lost layers obviously wouldn't work, but before we even hit any
- lookup stage, we'd generally run out of memory and die.
-
-Our tests didn't notice either of these cases because they didn't have
-enough marks to trigger the push-down behavior. The new tests in t9304
-cover both cases (and fail without this patch).
-
-We can solve the problem by having insert_mark() take a pointer-to-pointer
-of the top-level of the set. Then our push down can assign to it in a
-way that the caller actually sees. Note the subtle reordering in
-option_rewrite_submodules(). Our call to read_mark_file() may modify our
-top-level set pointer, so we have to wait until after it returns to
-assign its value into the string_list.
-
-Reported-by: Sergey Brester <serg.brester(a)sebres.de>
-Signed-off-by: Jeff King <peff(a)peff.net>
-Signed-off-by: Junio C Hamano <gitster(a)pobox.com>
----
- builtin/fast-import.c | 31 ++++++++++++----------
- t/t9304-fast-import-marks.sh | 51 ++++++++++++++++++++++++++++++++++++
- 2 files changed, 68 insertions(+), 14 deletions(-)
- create mode 100755 t/t9304-fast-import-marks.sh
-
-diff --git a/builtin/fast-import.c b/builtin/fast-import.c
-index 1bf50a73dc359..70d7d25eed2e0 100644
---- a/builtin/fast-import.c
-+++ b/builtin/fast-import.c
-@@ -150,7 +150,7 @@ struct recent_command {
- char *buf;
- };
-
--typedef void (*mark_set_inserter_t)(struct mark_set *s, struct object_id *oid, uintmax_t
mark);
-+typedef void (*mark_set_inserter_t)(struct mark_set **s, struct object_id *oid,
uintmax_t mark);
- typedef void (*each_mark_fn_t)(uintmax_t mark, void *obj, void *cbp);
-
- /* Configured limits on output */
-@@ -526,13 +526,15 @@ static unsigned int hc_str(const char *s, size_t len)
- return r;
- }
-
--static void insert_mark(struct mark_set *s, uintmax_t idnum, struct object_entry *oe)
-+static void insert_mark(struct mark_set **top, uintmax_t idnum, struct object_entry
*oe)
- {
-+ struct mark_set *s = *top;
-+
- while ((idnum >> s->shift) >= 1024) {
- s = mem_pool_calloc(&fi_mem_pool, 1, sizeof(struct mark_set));
-- s->shift = marks->shift + 10;
-- s->data.sets[0] = marks;
-- marks = s;
-+ s->shift = (*top)->shift + 10;
-+ s->data.sets[0] = *top;
-+ *top = s;
- }
- while (s->shift) {
- uintmax_t i = idnum >> s->shift;
-@@ -944,7 +946,7 @@ static int store_object(
-
- e = insert_object(&oid);
- if (mark)
-- insert_mark(marks, mark, e);
-+ insert_mark(&marks, mark, e);
- if (e->idx.offset) {
- duplicate_count_by_type[type]++;
- return 1;
-@@ -1142,7 +1144,7 @@ static void stream_blob(uintmax_t len, struct object_id *oidout,
uintmax_t mark)
- e = insert_object(&oid);
-
- if (mark)
-- insert_mark(marks, mark, e);
-+ insert_mark(&marks, mark, e);
-
- if (e->idx.offset) {
- duplicate_count_by_type[OBJ_BLOB]++;
-@@ -1717,7 +1719,7 @@ static void dump_marks(void)
- }
- }
-
--static void insert_object_entry(struct mark_set *s, struct object_id *oid, uintmax_t
mark)
-+static void insert_object_entry(struct mark_set **s, struct object_id *oid, uintmax_t
mark)
- {
- struct object_entry *e;
- e = find_object(oid);
-@@ -1734,12 +1736,12 @@ static void insert_object_entry(struct mark_set *s, struct
object_id *oid, uintm
- insert_mark(s, mark, e);
- }
-
--static void insert_oid_entry(struct mark_set *s, struct object_id *oid, uintmax_t mark)
-+static void insert_oid_entry(struct mark_set **s, struct object_id *oid, uintmax_t
mark)
- {
- insert_mark(s, mark, xmemdupz(oid, sizeof(*oid)));
- }
-
--static void read_mark_file(struct mark_set *s, FILE *f, mark_set_inserter_t inserter)
-+static void read_mark_file(struct mark_set **s, FILE *f, mark_set_inserter_t inserter)
- {
- char line[512];
- while (fgets(line, sizeof(line), f)) {
-@@ -1772,7 +1774,7 @@ static void read_marks(void)
- goto done; /* Marks file does not exist */
- else
- die_errno("cannot read '%s'", import_marks_file);
-- read_mark_file(marks, f, insert_object_entry);
-+ read_mark_file(&marks, f, insert_object_entry);
- fclose(f);
- done:
- import_marks_file_done = 1;
-@@ -3228,7 +3230,7 @@ static void parse_alias(void)
- die(_("Expected 'to' command, got %s"), command_buf.buf);
- e = find_object(&b.oid);
- assert(e);
-- insert_mark(marks, next_mark, e);
-+ insert_mark(&marks, next_mark, e);
- }
-
- static char* make_fast_import_path(const char *path)
-@@ -3321,13 +3323,14 @@ static void option_rewrite_submodules(const char *arg, struct
string_list *list)
- *f = '\0';
- f++;
- ms = xcalloc(1, sizeof(*ms));
-- string_list_insert(list, s)->util = ms;
-
- fp = fopen(f, "r");
- if (!fp)
- die_errno("cannot read '%s'", f);
-- read_mark_file(ms, fp, insert_oid_entry);
-+ read_mark_file(&ms, fp, insert_oid_entry);
- fclose(fp);
-+
-+ string_list_insert(list, s)->util = ms;
- }
-
- static int parse_one_option(const char *option)
-diff --git a/t/t9304-fast-import-marks.sh b/t/t9304-fast-import-marks.sh
-new file mode 100755
-index 0000000000000..d4359dba21c9c
---- /dev/null
-+++ b/t/t9304-fast-import-marks.sh
-@@ -0,0 +1,51 @@
-+#!/bin/sh
-+
-+test_description='test exotic situations with marks'
-+. ./test-lib.sh
-+
-+test_expect_success 'setup dump of basic history' '
-+ test_commit one &&
-+ git fast-export --export-marks=marks HEAD >dump
-+'
-+
-+test_expect_success 'setup large marks file' '
-+ # normally a marks file would have a lot of useful, unique
-+ # marks. But for our purposes, just having a lot of nonsense
-+ # ones is fine. Start at 1024 to avoid clashing with marks
-+ # legitimately used in our tiny dump.
-+ blob=$(git rev-parse HEAD:one.t) &&
-+ for i in $(test_seq 1024 16384)
-+ do
-+ echo ":$i $blob"
-+ done >>marks
-+'
-+
-+test_expect_success 'import with large marks file' '
-+ git fast-import --import-marks=marks <dump
-+'
-+
-+test_expect_success 'setup dump with submodule' '
-+ git submodule add "$PWD" sub &&
-+ git commit -m "add submodule" &&
-+ git fast-export HEAD >dump
-+'
-+
-+test_expect_success 'setup submodule mapping with large id' '
-+ old=$(git rev-parse HEAD:sub) &&
-+ new=$(echo $old | sed s/./a/g) &&
-+ echo ":12345 $old" >from &&
-+ echo ":12345 $new" >to
-+'
-+
-+test_expect_success 'import with submodule mapping' '
-+ git init dst &&
-+ git -C dst fast-import \
-+ --rewrite-submodules-from=sub:../from \
-+ --rewrite-submodules-to=sub:../to \
-+ <dump &&
-+ git -C dst rev-parse HEAD:sub >actual &&
-+ echo "$new" >expect &&
-+ test_cmp expect actual
-+'
-+
-+test_done
diff --git a/0001-log-diagnose-L-used-with-pathspec-as-an-error.patch
b/0001-log-diagnose-L-used-with-pathspec-as-an-error.patch
deleted file mode 100644
index 0f99aba..0000000
--- a/0001-log-diagnose-L-used-with-pathspec-as-an-error.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 39664cb0aca42f240468ddf84fe75df4172ab63f Mon Sep 17 00:00:00 2001
-From: Junio C Hamano <gitster(a)pobox.com>
-Date: Wed, 4 Nov 2020 09:54:01 -0800
-Subject: [PATCH] log: diagnose -L used with pathspec as an error
-
-The -L option is documented to accept no pathspec, but the
-command line option parser has allowed the combination without
-checking so far. Ensure that there is no pathspec when the -L
-option is in effect to fix this.
-
-Incidentally, this change fixes another bug in the command line
-option parser, which has allowed the -L option used together
-with the --follow option. Because the latter requires exactly
-one path given, but the former takes no pathspec, they become
-mutually incompatible automatically. Because the -L option
-follows renames on its own, there is no reason to give --follow
-at the same time.
-
-The new tests say they may fail with "-L and --follow being
-incompatible" instead of "-L and pathspec being incompatible".
-Currently the expected failure can come only from the latter, but
-this is to futureproof them, in case we decide to add code to
-explicititly die on -L and --follow used together.
-
-Heled-by: Jeff King <peff(a)peff.net>
-Signed-off-by: Junio C Hamano <gitster(a)pobox.com>
----
- builtin/log.c | 3 +++
- t/t4211-line-log.sh | 22 ++++++++++++++++++++++
- 2 files changed, 25 insertions(+)
-
-diff --git a/builtin/log.c b/builtin/log.c
-index 0a7ed4bef92b9..9d70f3e60b9c0 100644
---- a/builtin/log.c
-+++ b/builtin/log.c
-@@ -206,6 +206,9 @@ static void cmd_log_init_finish(int argc, const char **argv, const
char *prefix,
- if (argc > 1)
- die(_("unrecognized argument: %s"), argv[1]);
-
-+ if (rev->line_level_traverse && rev->prune_data.nr)
-+ die(_("-L<range>:<file> cannot be used with pathspec"));
-+
- memset(&w, 0, sizeof(w));
- userformat_find_requirements(NULL, &w);
-
-diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
-index 2d1d7b5d1938a..85d151423dedc 100755
---- a/t/t4211-line-log.sh
-+++ b/t/t4211-line-log.sh
-@@ -8,6 +8,28 @@ test_expect_success 'setup (import history)' '
- git reset --hard
- '
-
-+test_expect_success 'basic command line parsing' '
-+ # This may fail due to "no such path a.c in commit", or
-+ # "-L is incompatible with pathspec", depending on the
-+ # order the error is checked. Either is acceptable.
-+ test_must_fail git log -L1,1:a.c -- a.c &&
-+
-+ # -L requires there is no pathspec
-+ test_must_fail git log -L1,1:b.c -- b.c 2>error &&
-+ test_i18ngrep "cannot be used with pathspec" error &&
-+
-+ # This would fail because --follow wants a single path, but
-+ # we may fail due to incompatibility between -L/--follow in
-+ # the future. Either is acceptable.
-+ test_must_fail git log -L1,1:b.c --follow &&
-+ test_must_fail git log --follow -L1,1:b.c &&
-+
-+ # This would fail because -L wants no pathspec, but
-+ # we may fail due to incompatibility between -L/--follow in
-+ # the future. Either is acceptable.
-+ test_must_fail git log --follow -L1,1:b.c -- b.c
-+'
-+
- canned_test_1 () {
- test_expect_$1 "$2" "
- git log $2 >actual &&
diff --git a/git.spec b/git.spec
index 8e9e616..22a0eba 100644
--- a/git.spec
+++ b/git.spec
@@ -93,11 +93,11 @@
%endif
# Define for release candidates
-#global rcrev .rc0
+%global rcrev .rc0
Name: git
-Version: 2.29.2
-Release: 4%{?rcrev}%{?dist}
+Version: 2.30.0
+Release: 0.0%{?rcrev}%{?dist}
Summary: Fast Version Control System
License: GPLv2
URL:
https://git-scm.com/
@@ -129,14 +129,6 @@ Source99: print-failed-test-output
#
https://bugzilla.redhat.com/490602
Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch
-#
https://bugzilla.redhat.com/1791810
-#
https://lore.kernel.org/git/xmqqy2jglv29.fsf_-_@gitster.c.googlers.com/
-Patch1:
https://github.com/git/git/commit/39664cb0ac.patch#/0001-log-diagnose-L-u...
-
-#
https://bugzilla.redhat.com/1900335
-#
https://lore.kernel.org/git/20201015153849.GA551964@coredump.intra.peff.net/
-Patch2:
https://github.com/git/git/commit/3f018ec716.patch#/0001-fast-import-fix-...
-
%if %{with docs}
# pod2man is needed to build Git.3pm
BuildRequires: %{_bindir}/pod2man
@@ -1089,6 +1081,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog
+* Mon Dec 14 2020 Todd Zullinger <tmz(a)pobox.com> - 2.30.0-0.0.rc0
+- update to 2.30.0-rc0
+
* Sun Dec 06 2020 Todd Zullinger <tmz(a)pobox.com> - 2.29.2-4
- move git-difftool to git-core, it does not require perl
diff --git a/sources b/sources
index 61331f5..4f2ec89 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (git-2.29.2.tar.xz) =
34117628c6d43ac0940c43bffaa1bda7f12af863728f391492725a3e57d1bbda523cf7734e90f463fe9a9ae4e70fc1cc2523643dbb3c27377d98dc4736b0ea62
-SHA512 (git-2.29.2.tar.sign) =
781f0f12d061ca5d3576a23f90df7646fb03cc4a735a41c0118022a1124a053cdea439905efd69cd6cb0161dfe40b93b4c8c99ddac4bc484ecee14881e7ed0af
+SHA512 (git-2.30.0.rc0.tar.xz) =
aecfa17571ec718e9f8892f6d5ba059451e44ac00f4e39f0d8fef51b9c27e885eff2711e3fc2ebfbb0bc0815370fa0a13b8e9243b60d6cf7cb1278e406cb743f
+SHA512 (git-2.30.0.rc0.tar.sign) =
f9b997ba3f9f3f7e7f42e79258f2309ceeced85331a6e1e0dc9f83d93cf4fa8fd08154ea868dc64067d5830c7fb208449643742897991cfdbd22f5d5ceec3b3f
commit ce1d42aa54d30f4410570a93a90ef8894e459cef
Author: Todd Zullinger <tmz(a)pobox.com>
Date: Sun Dec 6 14:39:05 2020 -0500
lint: ignore "no-binary" warning for main git package
Making the main package noarch is not trivial since we have
arch-specific subpackages. (I'm not sure it's even possible.)
As noted in 5c331b2 (fix/quiet rpmlint issues from libsecret split,
2020-04-05), when libsecret was split into a subpackage in 9d91bab
(split libsecret credential helper into a subpackage (#1804741),
2020-02-19), it removed the only remaining binary from the main package.
diff --git a/git.rpmlintrc b/git.rpmlintrc
index a3dd0ad..9fd93ce 100644
--- a/git.rpmlintrc
+++ b/git.rpmlintrc
@@ -10,6 +10,10 @@ addFilter("git(-core-doc)?\..*: W: dangling-relative-symlink
/usr/share/doc/git/
# git-gui requires git, which provides the git binary
addFilter("git-gui.noarch: W: desktopfile-without-binary
/usr/share/applications/git-gui.desktop git")
+# ignore no binary warning for main git package; making it noarch isn't trivial
+# since we have arch-specific subpackages
+addFilter("git\..*: E: no-binary$")
+
# ignore no doc/manpage warnings where we don't expect any documentation
addFilter("git-(all|core|credential-libsecret)\..*: W: no-documentation")
addFilter("perl-Git-SVN.noarch: W: no-documentation")
commit 858ea85cce6a24418da268407ed675751dc68f4c
Author: Todd Zullinger <tmz(a)pobox.com>
Date: Sun Dec 6 13:56:02 2020 -0500
move git-difftool to git-core, it does not require perl
The `git difftool` command was converted to a builtin in git-2.12.0
(from 2017). We don't need to split it out of git-core.
This was missed in cb7fab7 (Move commands which no longer require perl
into git-core, 2017-11-10) and d56cfc6 (Use symlinks instead of
hardlinks for installed binaries, 2018-03-15). Better late than never.
diff --git a/git.rpmlintrc b/git.rpmlintrc
index b2d9407..a3dd0ad 100644
--- a/git.rpmlintrc
+++ b/git.rpmlintrc
@@ -7,9 +7,6 @@ addFilter("git-subtree.* spelling-error %description .*
(subdirectory|subproject
# git-core-doc requires git-core, which provides the symlink target
addFilter("git(-core-doc)?\..*: W: dangling-relative-symlink
/usr/share/doc/git/contrib/hooks ../../../git-core/contrib/hooks")
-# git requires git-core, which provides the symlink target
-addFilter("git\..*: W: dangling-relative-symlink /usr/libexec/git-core/git-difftool
../../bin/git")
-
# git-gui requires git, which provides the git binary
addFilter("git-gui.noarch: W: desktopfile-without-binary
/usr/share/applications/git-gui.desktop git")
diff --git a/git.spec b/git.spec
index 2ef6a9a..8e9e616 100644
--- a/git.spec
+++ b/git.spec
@@ -97,7 +97,7 @@
Name: git
Version: 2.29.2
-Release: 3%{?rcrev}%{?dist}
+Release: 4%{?rcrev}%{?dist}
Summary: Fast Version Control System
License: GPLv2
URL:
https://git-scm.com/
@@ -810,7 +810,7 @@ chmod a-x Documentation/technical/api-index.sh
find contrib -type f -print0 | xargs -r0 chmod -x
# Split core files
-not_core_re="git-(add--interactive|contacts|credential-netrc|difftool|filter-branch|instaweb|request-pull|send-mail)|gitweb"
+not_core_re="git-(add--interactive|contacts|credential-netrc|filter-branch|instaweb|request-pull|send-mail)|gitweb"
grep -vE "$not_core_re|%{_mandir}" bin-man-doc-files > bin-files-core
touch man-doc-files-core
%if %{with docs}
@@ -1089,6 +1089,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog
+* Sun Dec 06 2020 Todd Zullinger <tmz(a)pobox.com> - 2.29.2-4
+- move git-difftool to git-core, it does not require perl
+
* Wed Nov 25 2020 Todd Zullinger <tmz(a)pobox.com> - 2.29.2-3
- apply upstream patch to resolve git fast-import memory leak (#1900335)
- add epel-rpm-macros BuildRequires on EL-7 (#1872865)