From ea59aa363719d7f73903a7ec9f0f53d775bf1614 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 16 Sep 2022 00:21:22 -0400 Subject: [PATCH 1/8] update to 2.38.0-rc0 Adjust number of t5541 "push 2000 tags over http" test, which we skip on aarch64 and ppc64le arches. It was shifted from 36 to 37 by upstream b0c4adcdd7 (remote-curl: send Accept-Language header to server, 2022-07-11). Release notes: https://github.com/git/git/raw/v2.38.0-rc0/Documentation/RelNotes/2.38.0.txt --- ...docs-fix-a-few-recently-broken-links.patch | 75 +++++++++++++++++++ ...s-link-to-html-version-of-api-trace2.patch | 29 +++++++ git.spec | 17 ++++- sources | 4 +- 4 files changed, 119 insertions(+), 6 deletions(-) create mode 100644 0001-docs-fix-a-few-recently-broken-links.patch create mode 100644 0002-api-docs-link-to-html-version-of-api-trace2.patch diff --git a/0001-docs-fix-a-few-recently-broken-links.patch b/0001-docs-fix-a-few-recently-broken-links.patch new file mode 100644 index 0000000..91961ec --- /dev/null +++ b/0001-docs-fix-a-few-recently-broken-links.patch @@ -0,0 +1,75 @@ +From 349a26b8a0fe65e26b1d75af4e30d356de499a2f Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Fri, 16 Sep 2022 00:50:28 -0400 +Subject: [PATCH] docs: fix a few recently broken links + +Some links were broken in the recent move of various technical docs +c0f6dd49f1 (Merge branch 'ab/tech-docs-to-help', 2022-08-14). + +Fix them. + +Signed-off-by: Todd Zullinger +--- + Documentation/gitprotocol-capabilities.txt | 4 ++-- + Documentation/gitprotocol-v2.txt | 4 ++-- + Documentation/technical/bundle-uri.txt | 3 +-- + Documentation/user-manual.txt | 2 +- + 4 files changed, 6 insertions(+), 7 deletions(-) + +diff --git a/Documentation/gitprotocol-capabilities.txt b/Documentation/gitprotocol-capabilities.txt +index c6dcc7d565..0fb5ea0c1c 100644 +--- a/Documentation/gitprotocol-capabilities.txt ++++ b/Documentation/gitprotocol-capabilities.txt +@@ -388,8 +388,8 @@ the server as well. + Session IDs should be unique to a given process. They must fit within a + packet-line, and must not contain non-printable or whitespace characters. The + current implementation uses trace2 session IDs (see +-link:api-trace2.html[api-trace2] for details), but this may change and users of +-the session ID should not rely on this fact. ++link:technical/api-trace2.html[api-trace2] for details), but this may change ++and users of the session ID should not rely on this fact. + + GIT + --- +diff --git a/Documentation/gitprotocol-v2.txt b/Documentation/gitprotocol-v2.txt +index c9c0f9160b..59bf41cefb 100644 +--- a/Documentation/gitprotocol-v2.txt ++++ b/Documentation/gitprotocol-v2.txt +@@ -544,8 +544,8 @@ the server as well. + Session IDs should be unique to a given process. They must fit within a + packet-line, and must not contain non-printable or whitespace characters. The + current implementation uses trace2 session IDs (see +-link:api-trace2.html[api-trace2] for details), but this may change and users of +-the session ID should not rely on this fact. ++link:technical/api-trace2.html[api-trace2] for details), but this may change ++and users of the session ID should not rely on this fact. + + object-info + ~~~~~~~~~~~ +diff --git a/Documentation/technical/bundle-uri.txt b/Documentation/technical/bundle-uri.txt +index c25c42378a..85c6a7fc7c 100644 +--- a/Documentation/technical/bundle-uri.txt ++++ b/Documentation/technical/bundle-uri.txt +@@ -3,8 +3,7 @@ Bundle URIs + + Git bundles are files that store a pack-file along with some extra metadata, + including a set of refs and a (possibly empty) set of necessary commits. See +-linkgit:git-bundle[1] and link:bundle-format.txt[the bundle format] for more +-information. ++linkgit:git-bundle[1] and linkgit:gitformat-bundle[5] for more information. + + Bundle URIs are locations where Git can download one or more bundles in + order to bootstrap the object database in advance of fetching the remaining +diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt +index ca9decdd95..dc9c6a663a 100644 +--- a/Documentation/user-manual.txt ++++ b/Documentation/user-manual.txt +@@ -3133,7 +3133,7 @@ those "loose" objects. + You can save space and make Git faster by moving these loose objects in + to a "pack file", which stores a group of objects in an efficient + compressed format; the details of how pack files are formatted can be +-found in link:gitformat-pack[5]. ++found in linkgit:gitformat-pack[5]. + + To put the loose objects into a pack, just run git repack: + diff --git a/0002-api-docs-link-to-html-version-of-api-trace2.patch b/0002-api-docs-link-to-html-version-of-api-trace2.patch new file mode 100644 index 0000000..4c854f4 --- /dev/null +++ b/0002-api-docs-link-to-html-version-of-api-trace2.patch @@ -0,0 +1,29 @@ +From 6e50f870372027b5c8c3e68df3c193384c5f6e59 Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Fri, 16 Sep 2022 01:15:15 -0400 +Subject: [PATCH] api docs: link to html version of api-trace2 + +In f6d25d7878 (api docs: document that BUG() emits a trace2 error event, +2021-04-13), a link to the plain text version of api-trace2 was added in +`technical/api-error-handling.txt`. + +All of our other `link:`s point to the html versions. Do the same here. + +Signed-off-by: Todd Zullinger +--- + Documentation/technical/api-error-handling.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Documentation/technical/api-error-handling.txt b/Documentation/technical/api-error-handling.txt +index 70bf1d3e52..665c4960b4 100644 +--- a/Documentation/technical/api-error-handling.txt ++++ b/Documentation/technical/api-error-handling.txt +@@ -46,7 +46,7 @@ parse-options.c. + returns -1 after reporting the situation to the caller. + + These reports will be logged via the trace2 facility. See the "error" +-event in link:api-trace2.txt[trace2 API]. ++event in link:api-trace2.html[trace2 API]. + + Customizable error handlers + --------------------------- diff --git a/git.spec b/git.spec index 2d1fab2..36bc8e0 100644 --- a/git.spec +++ b/git.spec @@ -70,14 +70,14 @@ %endif # Define for release candidates -#global rcrev .rc0 +%global rcrev .rc0 # Set path to the package-notes linker script %global _package_note_file %{_builddir}/%{name}-%{version}%{?rcrev}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.37.3 -Release: 1%{?rcrev}%{?dist} +Version: 2.38.0 +Release: 0.0%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -119,6 +119,12 @@ Patch2: 0002-t-lib-git-daemon-try-harder-to-find-a-port.patch # https://github.com/tmzullinger/git/commit/aa5105dc11 Patch3: 0003-t-lib-git-svn-try-harder-to-find-a-port.patch +# fix a few broken links +# https://lore.kernel.org/git/20220916062303.3736166-1-tmz@pobox.com/ +# https://lore.kernel.org/git/20220916062303.3736166-2-tmz@pobox.com/ +Patch4: 0001-docs-fix-a-few-recently-broken-links.patch +Patch5: 0002-api-docs-link-to-html-version-of-api-trace2.patch + %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -800,7 +806,7 @@ GIT_SKIP_TESTS="" # to limit the maximum stack size. # t5541.36 'push 2000 tags over http' # t5551.25 'clone the 2,000 tag repo to check OS command line overflow' -GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5541.36 t5551.25" +GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5541.37 t5551.25" %endif # endif aarch64 %%{arm} %%{power64} @@ -1005,6 +1011,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Sep 16 2022 Todd Zullinger - 2.38.0-0.0.rc0 +- update to 2.38.0-rc0 + * Tue Aug 30 2022 Todd Zullinger - 2.37.3-1 - update to 2.37.3 - remove %%changelog entries prior to 2020 diff --git a/sources b/sources index 4f304df..eed459c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.37.3.tar.xz) = 9120050b01d8ac8d9f9e85f19cb84dc90c28f3beadc3ea94da94845f2eb5e35aa83eee8447a7ecef5190b8eb5d01be621be2e82bb3020e51e05037cd1fa9b58f -SHA512 (git-2.37.3.tar.sign) = ca2b0396c7d5f47822578f654588580b101ce97e0a4913071b6987cdbb470e3fad456b967cf6ec5928c85d56aa8a8eeff123e0e9aaa4ce1cbfc79c30a2af3b03 +SHA512 (git-2.38.0.rc0.tar.xz) = 98b5aa08da0a754d3d6119b4690e2add3f85295ba5243f8cbfef04738c27ab1d39c3388e27349a824841f4b54004e22e8731f5aa37afa5f62b2b2a197b8ec84a +SHA512 (git-2.38.0.rc0.tar.sign) = 80d1c913f32a4c63178f3514cf04052580c9699c1161d7d5ed4329961218c4712705c5dcf16162ec53487a2bb0b204bbad6559c7ff99de8fa1b937b0e9ed3f7e From 35ed577d15d597bfc92ffb88bde85349d9fb96ac Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 21 Sep 2022 20:32:41 -0400 Subject: [PATCH 2/8] update to 2.38.0-rc1 Release notes: https://github.com/git/git/raw/v2.38.0-rc1/Documentation/RelNotes/2.38.0.txt --- ...docs-fix-a-few-recently-broken-links.patch | 75 ------------------- ...s-link-to-html-version-of-api-trace2.patch | 29 ------- git.spec | 13 ++-- sources | 4 +- 4 files changed, 7 insertions(+), 114 deletions(-) delete mode 100644 0001-docs-fix-a-few-recently-broken-links.patch delete mode 100644 0002-api-docs-link-to-html-version-of-api-trace2.patch diff --git a/0001-docs-fix-a-few-recently-broken-links.patch b/0001-docs-fix-a-few-recently-broken-links.patch deleted file mode 100644 index 91961ec..0000000 --- a/0001-docs-fix-a-few-recently-broken-links.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 349a26b8a0fe65e26b1d75af4e30d356de499a2f Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Fri, 16 Sep 2022 00:50:28 -0400 -Subject: [PATCH] docs: fix a few recently broken links - -Some links were broken in the recent move of various technical docs -c0f6dd49f1 (Merge branch 'ab/tech-docs-to-help', 2022-08-14). - -Fix them. - -Signed-off-by: Todd Zullinger ---- - Documentation/gitprotocol-capabilities.txt | 4 ++-- - Documentation/gitprotocol-v2.txt | 4 ++-- - Documentation/technical/bundle-uri.txt | 3 +-- - Documentation/user-manual.txt | 2 +- - 4 files changed, 6 insertions(+), 7 deletions(-) - -diff --git a/Documentation/gitprotocol-capabilities.txt b/Documentation/gitprotocol-capabilities.txt -index c6dcc7d565..0fb5ea0c1c 100644 ---- a/Documentation/gitprotocol-capabilities.txt -+++ b/Documentation/gitprotocol-capabilities.txt -@@ -388,8 +388,8 @@ the server as well. - Session IDs should be unique to a given process. They must fit within a - packet-line, and must not contain non-printable or whitespace characters. The - current implementation uses trace2 session IDs (see --link:api-trace2.html[api-trace2] for details), but this may change and users of --the session ID should not rely on this fact. -+link:technical/api-trace2.html[api-trace2] for details), but this may change -+and users of the session ID should not rely on this fact. - - GIT - --- -diff --git a/Documentation/gitprotocol-v2.txt b/Documentation/gitprotocol-v2.txt -index c9c0f9160b..59bf41cefb 100644 ---- a/Documentation/gitprotocol-v2.txt -+++ b/Documentation/gitprotocol-v2.txt -@@ -544,8 +544,8 @@ the server as well. - Session IDs should be unique to a given process. They must fit within a - packet-line, and must not contain non-printable or whitespace characters. The - current implementation uses trace2 session IDs (see --link:api-trace2.html[api-trace2] for details), but this may change and users of --the session ID should not rely on this fact. -+link:technical/api-trace2.html[api-trace2] for details), but this may change -+and users of the session ID should not rely on this fact. - - object-info - ~~~~~~~~~~~ -diff --git a/Documentation/technical/bundle-uri.txt b/Documentation/technical/bundle-uri.txt -index c25c42378a..85c6a7fc7c 100644 ---- a/Documentation/technical/bundle-uri.txt -+++ b/Documentation/technical/bundle-uri.txt -@@ -3,8 +3,7 @@ Bundle URIs - - Git bundles are files that store a pack-file along with some extra metadata, - including a set of refs and a (possibly empty) set of necessary commits. See --linkgit:git-bundle[1] and link:bundle-format.txt[the bundle format] for more --information. -+linkgit:git-bundle[1] and linkgit:gitformat-bundle[5] for more information. - - Bundle URIs are locations where Git can download one or more bundles in - order to bootstrap the object database in advance of fetching the remaining -diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt -index ca9decdd95..dc9c6a663a 100644 ---- a/Documentation/user-manual.txt -+++ b/Documentation/user-manual.txt -@@ -3133,7 +3133,7 @@ those "loose" objects. - You can save space and make Git faster by moving these loose objects in - to a "pack file", which stores a group of objects in an efficient - compressed format; the details of how pack files are formatted can be --found in link:gitformat-pack[5]. -+found in linkgit:gitformat-pack[5]. - - To put the loose objects into a pack, just run git repack: - diff --git a/0002-api-docs-link-to-html-version-of-api-trace2.patch b/0002-api-docs-link-to-html-version-of-api-trace2.patch deleted file mode 100644 index 4c854f4..0000000 --- a/0002-api-docs-link-to-html-version-of-api-trace2.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6e50f870372027b5c8c3e68df3c193384c5f6e59 Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Fri, 16 Sep 2022 01:15:15 -0400 -Subject: [PATCH] api docs: link to html version of api-trace2 - -In f6d25d7878 (api docs: document that BUG() emits a trace2 error event, -2021-04-13), a link to the plain text version of api-trace2 was added in -`technical/api-error-handling.txt`. - -All of our other `link:`s point to the html versions. Do the same here. - -Signed-off-by: Todd Zullinger ---- - Documentation/technical/api-error-handling.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Documentation/technical/api-error-handling.txt b/Documentation/technical/api-error-handling.txt -index 70bf1d3e52..665c4960b4 100644 ---- a/Documentation/technical/api-error-handling.txt -+++ b/Documentation/technical/api-error-handling.txt -@@ -46,7 +46,7 @@ parse-options.c. - returns -1 after reporting the situation to the caller. - - These reports will be logged via the trace2 facility. See the "error" --event in link:api-trace2.txt[trace2 API]. -+event in link:api-trace2.html[trace2 API]. - - Customizable error handlers - --------------------------- diff --git a/git.spec b/git.spec index 36bc8e0..0952808 100644 --- a/git.spec +++ b/git.spec @@ -70,14 +70,14 @@ %endif # Define for release candidates -%global rcrev .rc0 +%global rcrev .rc1 # Set path to the package-notes linker script %global _package_note_file %{_builddir}/%{name}-%{version}%{?rcrev}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git Version: 2.38.0 -Release: 0.0%{?rcrev}%{?dist} +Release: 0.1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -119,12 +119,6 @@ Patch2: 0002-t-lib-git-daemon-try-harder-to-find-a-port.patch # https://github.com/tmzullinger/git/commit/aa5105dc11 Patch3: 0003-t-lib-git-svn-try-harder-to-find-a-port.patch -# fix a few broken links -# https://lore.kernel.org/git/20220916062303.3736166-1-tmz@pobox.com/ -# https://lore.kernel.org/git/20220916062303.3736166-2-tmz@pobox.com/ -Patch4: 0001-docs-fix-a-few-recently-broken-links.patch -Patch5: 0002-api-docs-link-to-html-version-of-api-trace2.patch - %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -1011,6 +1005,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Sep 21 2022 Todd Zullinger - 2.38.0-0.1.rc1 +- update to 2.38.0-rc1 + * Fri Sep 16 2022 Todd Zullinger - 2.38.0-0.0.rc0 - update to 2.38.0-rc0 diff --git a/sources b/sources index eed459c..53e6bb3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.38.0.rc0.tar.xz) = 98b5aa08da0a754d3d6119b4690e2add3f85295ba5243f8cbfef04738c27ab1d39c3388e27349a824841f4b54004e22e8731f5aa37afa5f62b2b2a197b8ec84a -SHA512 (git-2.38.0.rc0.tar.sign) = 80d1c913f32a4c63178f3514cf04052580c9699c1161d7d5ed4329961218c4712705c5dcf16162ec53487a2bb0b204bbad6559c7ff99de8fa1b937b0e9ed3f7e +SHA512 (git-2.38.0.rc1.tar.xz) = 2be15be5c687f7c65f9381ee34bfca00063ca2568981a9713a220f05cb16f7a1c4fdf628ab1971399e77d0b4b39d71b47d73e93b937d00efd965cf4c49e34af2 +SHA512 (git-2.38.0.rc1.tar.sign) = 4a944bae3dd5ee357627f60f7b3edcc3b58da280cf2fef5cc8c49098a059be03383851b5a5c7b5cdf021bca87bfd6f0e6d778eb486ae8e37cdcef644ec8a9592 From 047cf1702dc780d03769e81392176ad9501c84f0 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 22 Sep 2022 00:32:27 -0400 Subject: [PATCH 3/8] git-subtree sub-package is noarch In 986b772 (Split 'git subtree' into a separate package, 2018-02-07), I mistakenly created the package as arch-specific. It should have been noarch; it is merely a shell script. --- git.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git.spec b/git.spec index 0952808..a5bb7c4 100644 --- a/git.spec +++ b/git.spec @@ -478,6 +478,7 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi %package subtree Summary: Git tools to merge and split repositories +BuildArch: noarch Requires: git-core = %{version}-%{release} %description subtree Git subtrees allow subprojects to be included within a subdirectory @@ -1007,6 +1008,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Wed Sep 21 2022 Todd Zullinger - 2.38.0-0.1.rc1 - update to 2.38.0-rc1 +- git-subtree sub-package is noarch * Fri Sep 16 2022 Todd Zullinger - 2.38.0-0.0.rc0 - update to 2.38.0-rc0 From 588c4c7c7ca2a8bf38ae5b11cb1f72b03b3d1538 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 21 Sep 2022 23:29:51 -0400 Subject: [PATCH 4/8] lint: update filter rules We removed '%{_emacs_version}' in 3395646 (remove --with/--without emacs build conditional, 2022-06-13). Drop the unnecessary filter from the rpmlint config. Add filters for several new checks in rpmlint 2.x: files-duplicate; package-with-huge-docs; and potential-bashisms. Also ignore unused-direct-shlib-dependency for libpcre2. While this is accurate, the additional linking would be tricky to remove from the upstream Makefile. It would almost certainly not be worth the effort. Lastly (even though it's the first line in the file), drop the unneeded 'from Config import *' directive. The rpmlint config is no longer loaded directly as python code (yay!). --- git.rpmlintrc | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/git.rpmlintrc b/git.rpmlintrc index 9fd93ce..0c6926b 100644 --- a/git.rpmlintrc +++ b/git.rpmlintrc @@ -1,5 +1,3 @@ -from Config import * - # the dictionary is a bit limited addFilter("git.* spelling-error %description .* subpackages") addFilter("git-subtree.* spelling-error %description .* (subdirectory|subproject|subtree)") @@ -23,5 +21,16 @@ addFilter("git-core\..*: W: no-manual-page-for-binary") # similarly ignore the warning when git-cvs and git-p4 are disabled addFilter("git.* obsolete-not-provided git-(cvs|gnome-keyring|p4)") -# we BR emacs which requires emacs-common and provides %{_emacs_version} -addFilter("git.(spec|src): .* Possible unexpanded macro in: Requires:.*emacs-filesystem >= %{_emacs_version}") +# git-svn has both man and html docs and only a single command +addFilter('git-svn\..*: W: package-with-huge-docs') + +# ignore potential "bashisms" in docs +addFilter('git-core-doc\.noarch: W: potential-bashisms /usr/share/doc/git/') + +# ignore unused-direct-shlib-dependency for libpcre; while it probably could be +# removed from some binaries, the cost of doing so isn't worth the gain. +addFilter('git-(core|daemon)\..*: W: unused-direct-shlib-dependency .* /lib64/libpcre2-.*') + +# ignore duplicate gvimdiff/nvimdiff files; they are only 29 bytes, sourcing the same base +# vimdiff mergetool +addFilter('git-core\..*: W: files-duplicate /usr/libexec/git-core/mergetools/[gn]vimdiff') From 202c5f9f242d26c01c51f10ef57fd6900e7c7a0d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 28 Sep 2022 00:18:42 -0400 Subject: [PATCH 5/8] update to 2.38.0-rc2 Release notes: https://github.com/git/git/raw/v2.38.0-rc2/Documentation/RelNotes/2.38.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index a5bb7c4..0d6a1d4 100644 --- a/git.spec +++ b/git.spec @@ -70,14 +70,14 @@ %endif # Define for release candidates -%global rcrev .rc1 +%global rcrev .rc2 # Set path to the package-notes linker script %global _package_note_file %{_builddir}/%{name}-%{version}%{?rcrev}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git Version: 2.38.0 -Release: 0.1%{?rcrev}%{?dist} +Release: 0.2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1006,6 +1006,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Sep 28 2022 Todd Zullinger - 2.38.0-0.2.rc2 +- update to 2.38.0-rc2 + * Wed Sep 21 2022 Todd Zullinger - 2.38.0-0.1.rc1 - update to 2.38.0-rc1 - git-subtree sub-package is noarch diff --git a/sources b/sources index 53e6bb3..9998f4f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.38.0.rc1.tar.xz) = 2be15be5c687f7c65f9381ee34bfca00063ca2568981a9713a220f05cb16f7a1c4fdf628ab1971399e77d0b4b39d71b47d73e93b937d00efd965cf4c49e34af2 -SHA512 (git-2.38.0.rc1.tar.sign) = 4a944bae3dd5ee357627f60f7b3edcc3b58da280cf2fef5cc8c49098a059be03383851b5a5c7b5cdf021bca87bfd6f0e6d778eb486ae8e37cdcef644ec8a9592 +SHA512 (git-2.38.0.rc2.tar.xz) = 223ae2e2da38eed0c0f834defb50ea98069db2a79f60e52ec03c56a5cf125f1a35f10091c5c2c44fb70ad02ecfc5ab9cfdecfbcc9a7d1051bff42008bbae48cd +SHA512 (git-2.38.0.rc2.tar.sign) = c29a1710cbe420d7d8091da592abe72a1840767fe4026fdfe7ab4ed0ed06947efddd1eea1b9e107003329b0964a0d25d463958dbf5f9623fa2179b5c09f37e17 From 269487c60468f6be951df620c1eee891d2f189d5 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 3 Oct 2022 15:21:28 -0400 Subject: [PATCH 6/8] update to 2.38.0 Release notes: https://github.com/git/git/raw/v2.38.0/Documentation/RelNotes/2.38.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 0d6a1d4..f01dd45 100644 --- a/git.spec +++ b/git.spec @@ -70,14 +70,14 @@ %endif # Define for release candidates -%global rcrev .rc2 +#global rcrev .rc0 # Set path to the package-notes linker script %global _package_note_file %{_builddir}/%{name}-%{version}%{?rcrev}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git Version: 2.38.0 -Release: 0.2%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1006,6 +1006,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Oct 03 2022 Todd Zullinger - 2.38.0-1 +- update to 2.38.0 + * Wed Sep 28 2022 Todd Zullinger - 2.38.0-0.2.rc2 - update to 2.38.0-rc2 diff --git a/sources b/sources index 9998f4f..126f70f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.38.0.rc2.tar.xz) = 223ae2e2da38eed0c0f834defb50ea98069db2a79f60e52ec03c56a5cf125f1a35f10091c5c2c44fb70ad02ecfc5ab9cfdecfbcc9a7d1051bff42008bbae48cd -SHA512 (git-2.38.0.rc2.tar.sign) = c29a1710cbe420d7d8091da592abe72a1840767fe4026fdfe7ab4ed0ed06947efddd1eea1b9e107003329b0964a0d25d463958dbf5f9623fa2179b5c09f37e17 +SHA512 (git-2.38.0.tar.xz) = 5c475d25b40a01cc62be28478b9b5a1b0cedf91c3e007d4869019a25bdc980b5ef9b761e7ee02d7c581bff6c7dbf2696a624431a718dcd976bad34a3f2be5cb6 +SHA512 (git-2.38.0.tar.sign) = e3fb09d2e520074888d0b63a241427a596bf63648734325316f18343955a83086a4f6be622eb65e965478630ece905a6ae15989358012f84ebf6424abe6419e9 From 6e2a249aefd0b03e6820c4ac1dc4c11e3ea70a9d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 7 Oct 2022 21:37:05 -0400 Subject: [PATCH 7/8] lint: ignore non-standard-dir-in-var for gitweb Newer rpmlint rightly points out this minor gitweb issue. Fixing it is a low priority as we need to arrange the change only for newer releases, keeping the old layout on existing systems. This is tracked in bug 479613. --- git.rpmlintrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git.rpmlintrc b/git.rpmlintrc index 0c6926b..b83cb0a 100644 --- a/git.rpmlintrc +++ b/git.rpmlintrc @@ -34,3 +34,6 @@ addFilter('git-(core|daemon)\..*: W: unused-direct-shlib-dependency .* /lib64/li # ignore duplicate gvimdiff/nvimdiff files; they are only 29 bytes, sourcing the same base # vimdiff mergetool addFilter('git-core\..*: W: files-duplicate /usr/libexec/git-core/mergetools/[gn]vimdiff') + +# ignore non-standard-dir-in-var for gitweb (#479613) +addFilter('gitweb.noarch: W: non-standard-dir-in-var www') From 537938edaa895ddc9a1d714bc54814ecaa832645 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 18 Oct 2022 13:43:15 -0400 Subject: [PATCH 8/8] update to 2.38.1 (CVE-2022-39253, CVE-2022-39260) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From the release notes for 2.30.6¹ * CVE-2022-39253: When relying on the `--local` clone optimization, Git dereferences symbolic links in the source repository before creating hardlinks (or copies) of the dereferenced link in the destination repository. This can lead to surprising behavior where arbitrary files are present in a repository's `$GIT_DIR` when cloning from a malicious repository. Git will no longer dereference symbolic links via the `--local` clone mechanism, and will instead refuse to clone repositories that have symbolic links present in the `$GIT_DIR/objects` directory. Additionally, the value of `protocol.file.allow` is changed to be "user" by default. * CVE-2022-39260: An overly-long command string given to `git shell` can result in overflow in `split_cmdline()`, leading to arbitrary heap writes and remote code execution when `git shell` is exposed and the directory `$HOME/git-shell-commands` exists. `git shell` is taught to refuse interactive commands that are longer than 4MiB in size. `split_cmdline()` is hardened to reject inputs larger than 2GiB. Credit for finding CVE-2022-39253 goes to Cory Snider of Mirantis. The fix was authored by Taylor Blau, with help from Johannes Schindelin. Credit for finding CVE-2022-39260 goes to Kevin Backhouse of GitHub. The fix was authored by Kevin Backhouse, Jeff King, and Taylor Blau. ¹ https://github.com/git/git/raw/v2.38.1/Documentation/RelNotes/2.30.6.txt --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index f01dd45..4ab882b 100644 --- a/git.spec +++ b/git.spec @@ -76,7 +76,7 @@ %global _package_note_file %{_builddir}/%{name}-%{version}%{?rcrev}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.38.0 +Version: 2.38.1 Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -1006,6 +1006,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Oct 18 2022 Todd Zullinger - 2.38.1-1 +- update to 2.38.1 (CVE-2022-39253, CVE-2022-39260) + * Mon Oct 03 2022 Todd Zullinger - 2.38.0-1 - update to 2.38.0 diff --git a/sources b/sources index 126f70f..3f9c27f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.38.0.tar.xz) = 5c475d25b40a01cc62be28478b9b5a1b0cedf91c3e007d4869019a25bdc980b5ef9b761e7ee02d7c581bff6c7dbf2696a624431a718dcd976bad34a3f2be5cb6 -SHA512 (git-2.38.0.tar.sign) = e3fb09d2e520074888d0b63a241427a596bf63648734325316f18343955a83086a4f6be622eb65e965478630ece905a6ae15989358012f84ebf6424abe6419e9 +SHA512 (git-2.38.1.tar.xz) = e62ca6f54f01d2e4ccffb5f94e8e5cd2f3e098b766d909c694a8daf4d00d5cdeb9cc5ff8e9bc55d888406f292ba99433d334d4da9689c0ce5d7299a3c67c90e0 +SHA512 (git-2.38.1.tar.sign) = a10fa332d5d5ea96bf6a0ed0c2a568212dd033acd539d07efbb73def13dd0144640a5a17477ea5cfe4104f1fa166237d7b251de275307eac7b91c6e60ca3de5d