From 21e2695602c60e5e13bba4a7afa88260456066c5 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Fri, 16 Sep 2005 18:10:58 +0000 Subject: [PATCH 001/842] auto-import git-core-0.99.6-1 on branch devel from git-core-0.99.6-1.src.rpm --- .cvsignore | 2 +- git-core.spec | 12 +++++++----- sources | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index c591405..88321a6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-core-0.99.4.tar.gz +git-core-0.99.6.tar.gz diff --git a/git-core.spec b/git-core.spec index 4e8c33a..4e1ca4d 100644 --- a/git-core.spec +++ b/git-core.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.4 -Release: 4%{?dist} +Version: 0.99.6 +Release: 1%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools @@ -24,12 +24,11 @@ elsewhere for tools for ordinary humans layered on top of this. %build make COPTS="$RPM_OPT_FLAGS" prefix=%{_prefix} all %{!?_without_docs: doc} -make COPTS="$RPM_OPT_FLAGS" -C tools all %install rm -rf $RPM_BUILD_ROOT -make dest=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \ - install install-tools %{!?_without_docs: install-doc} +make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \ + install %{!?_without_docs: install-doc} %clean rm -rf $RPM_BUILD_ROOT @@ -44,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %{_mandir}/man7/*.7.gz} %changelog +* Fri Sep 16 2005 Chris Wright 0.99.6-1 +- update to 0.99.6 + * Thu Aug 18 2005 Chris Wright 0.99.4-4 - drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires - use RPM_OPT_FLAGS in spec file, drop patch0 diff --git a/sources b/sources index 6ccf369..771b23b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -06935e265e7a556d8819a097dcb44f35 git-core-0.99.4.tar.gz +ca2f17bc1550909a2675386e8be46f0f git-core-0.99.6.tar.gz From 3657fffc26c2d2ef44abf840dd7b5f1ee9f99058 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Fri, 16 Sep 2005 18:13:23 +0000 Subject: [PATCH 002/842] auto-import git-core-0.99.6-1 on branch FC-3 from git-core-0.99.6-1.src.rpm --- .cvsignore | 2 +- git-core.spec | 12 +++++++----- sources | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index c591405..88321a6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-core-0.99.4.tar.gz +git-core-0.99.6.tar.gz diff --git a/git-core.spec b/git-core.spec index 4e8c33a..4e1ca4d 100644 --- a/git-core.spec +++ b/git-core.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.4 -Release: 4%{?dist} +Version: 0.99.6 +Release: 1%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools @@ -24,12 +24,11 @@ elsewhere for tools for ordinary humans layered on top of this. %build make COPTS="$RPM_OPT_FLAGS" prefix=%{_prefix} all %{!?_without_docs: doc} -make COPTS="$RPM_OPT_FLAGS" -C tools all %install rm -rf $RPM_BUILD_ROOT -make dest=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \ - install install-tools %{!?_without_docs: install-doc} +make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \ + install %{!?_without_docs: install-doc} %clean rm -rf $RPM_BUILD_ROOT @@ -44,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %{_mandir}/man7/*.7.gz} %changelog +* Fri Sep 16 2005 Chris Wright 0.99.6-1 +- update to 0.99.6 + * Thu Aug 18 2005 Chris Wright 0.99.4-4 - drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires - use RPM_OPT_FLAGS in spec file, drop patch0 diff --git a/sources b/sources index 6ccf369..771b23b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -06935e265e7a556d8819a097dcb44f35 git-core-0.99.4.tar.gz +ca2f17bc1550909a2675386e8be46f0f git-core-0.99.6.tar.gz From 71b2e9ebc70b9ed8f316ae8cf687cabb364cdf7e Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 19 Sep 2005 22:23:57 +0000 Subject: [PATCH 003/842] Update to git-core 0.99.7 --- .cvsignore | 2 +- git-core.spec | 15 +++++++++++---- sources | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 88321a6..8978d7c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-core-0.99.6.tar.gz +git-core-0.99.7.tar.gz diff --git a/git-core.spec b/git-core.spec index 4e1ca4d..7f4a28e 100644 --- a/git-core.spec +++ b/git-core.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.6 +Version: 0.99.7 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -9,7 +9,7 @@ URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rsync, rcs, curl +Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.4, tk %description This is a stupid (but extremely fast) directory content manager. It @@ -39,13 +39,20 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/git-core/ %doc README COPYING Documentation/*.txt %{!?_without_docs: %doc Documentation/*.html } -%{!?_without_docs: %{_mandir}/man1/*.1.gz} -%{!?_without_docs: %{_mandir}/man7/*.7.gz} +%{!?_without_docs: %{_mandir}/man1/*.1*} +%{!?_without_docs: %{_mandir}/man7/*.7*} %changelog * Fri Sep 16 2005 Chris Wright 0.99.6-1 - update to 0.99.6 +* Fri Sep 16 2005 Horst H. von Brand +- Linus noticed that less is required, added to the dependencies + +* Sun Sep 11 2005 Horst H. von Brand +- Updated dependencies +- Don't assume manpages are gzipped + * Thu Aug 18 2005 Chris Wright 0.99.4-4 - drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires - use RPM_OPT_FLAGS in spec file, drop patch0 diff --git a/sources b/sources index 771b23b..6548e71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ca2f17bc1550909a2675386e8be46f0f git-core-0.99.6.tar.gz +0035da109f1e0f9f4fdbd425f2f6723b git-core-0.99.7.tar.gz From c7fa4a750453a585936bbd33ac68362ded7ef60f Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 19 Sep 2005 22:32:09 +0000 Subject: [PATCH 004/842] Update git-core to 0.99.7 --- .cvsignore | 2 +- git-core.spec | 15 +++++++++++---- sources | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 88321a6..8978d7c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-core-0.99.6.tar.gz +git-core-0.99.7.tar.gz diff --git a/git-core.spec b/git-core.spec index 4e1ca4d..7f4a28e 100644 --- a/git-core.spec +++ b/git-core.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.6 +Version: 0.99.7 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -9,7 +9,7 @@ URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rsync, rcs, curl +Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.4, tk %description This is a stupid (but extremely fast) directory content manager. It @@ -39,13 +39,20 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/git-core/ %doc README COPYING Documentation/*.txt %{!?_without_docs: %doc Documentation/*.html } -%{!?_without_docs: %{_mandir}/man1/*.1.gz} -%{!?_without_docs: %{_mandir}/man7/*.7.gz} +%{!?_without_docs: %{_mandir}/man1/*.1*} +%{!?_without_docs: %{_mandir}/man7/*.7*} %changelog * Fri Sep 16 2005 Chris Wright 0.99.6-1 - update to 0.99.6 +* Fri Sep 16 2005 Horst H. von Brand +- Linus noticed that less is required, added to the dependencies + +* Sun Sep 11 2005 Horst H. von Brand +- Updated dependencies +- Don't assume manpages are gzipped + * Thu Aug 18 2005 Chris Wright 0.99.4-4 - drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires - use RPM_OPT_FLAGS in spec file, drop patch0 diff --git a/sources b/sources index 771b23b..6548e71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ca2f17bc1550909a2675386e8be46f0f git-core-0.99.6.tar.gz +0035da109f1e0f9f4fdbd425f2f6723b git-core-0.99.7.tar.gz From 65675b4380755362be4d394176127994b49a0f84 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 22 Sep 2005 19:44:11 +0000 Subject: [PATCH 005/842] Update git-core to 0.99.7a (bugfix release) --- .cvsignore | 2 +- git-core.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8978d7c..cf76edf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-core-0.99.7.tar.gz +git-core-0.99.7a.tar.gz diff --git a/git-core.spec b/git-core.spec index 7f4a28e..eca4336 100644 --- a/git-core.spec +++ b/git-core.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.7 +Version: 0.99.7a Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -9,7 +9,7 @@ URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.4, tk +Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk %description This is a stupid (but extremely fast) directory content manager. It @@ -23,11 +23,13 @@ elsewhere for tools for ordinary humans layered on top of this. %setup -q %build -make COPTS="$RPM_OPT_FLAGS" prefix=%{_prefix} all %{!?_without_docs: doc} +make COPTS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ + prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \ +make DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ + prefix=%{_prefix} mandir=%{_mandir} \ install %{!?_without_docs: install-doc} %clean diff --git a/sources b/sources index 6548e71..aa44b7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0035da109f1e0f9f4fdbd425f2f6723b git-core-0.99.7.tar.gz +9c1f316a34f00e1b595cc0063010a213 git-core-0.99.7a.tar.gz From 916e43bdc86fb345abb3ed6bcc15d3fce12c771b Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 22 Sep 2005 19:47:52 +0000 Subject: [PATCH 006/842] Update git-core to 0.99.7a (bugfix release) --- .cvsignore | 2 +- git-core.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8978d7c..cf76edf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-core-0.99.7.tar.gz +git-core-0.99.7a.tar.gz diff --git a/git-core.spec b/git-core.spec index 7f4a28e..eca4336 100644 --- a/git-core.spec +++ b/git-core.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.7 +Version: 0.99.7a Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -9,7 +9,7 @@ URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.4, tk +Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk %description This is a stupid (but extremely fast) directory content manager. It @@ -23,11 +23,13 @@ elsewhere for tools for ordinary humans layered on top of this. %setup -q %build -make COPTS="$RPM_OPT_FLAGS" prefix=%{_prefix} all %{!?_without_docs: doc} +make COPTS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ + prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \ +make DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ + prefix=%{_prefix} mandir=%{_mandir} \ install %{!?_without_docs: install-doc} %clean diff --git a/sources b/sources index 6548e71..aa44b7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0035da109f1e0f9f4fdbd425f2f6723b git-core-0.99.7.tar.gz +9c1f316a34f00e1b595cc0063010a213 git-core-0.99.7a.tar.gz From df5ef35f787a4e88f69642bec7385cd477ec8f5a Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 4 Oct 2005 00:10:04 +0000 Subject: [PATCH 007/842] Update git-core to 0.99.8 --- .cvsignore | 2 +- git-core.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index cf76edf..3379f20 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-core-0.99.7a.tar.gz +git-core-0.99.8.tar.gz diff --git a/git-core.spec b/git-core.spec index eca4336..518f41a 100644 --- a/git-core.spec +++ b/git-core.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.7a +Version: 0.99.8 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -9,7 +9,7 @@ URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk +Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk >= 8.4 %description This is a stupid (but extremely fast) directory content manager. It @@ -23,12 +23,12 @@ elsewhere for tools for ordinary humans layered on top of this. %setup -q %build -make COPTS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ +make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} mandir=%{_mandir} \ install %{!?_without_docs: install-doc} @@ -45,6 +45,10 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %{_mandir}/man7/*.7*} %changelog +* Tue Sep 27 2005 H. Peter Anvin +- parallelize build +- COPTS -> CFLAGS + * Fri Sep 16 2005 Chris Wright 0.99.6-1 - update to 0.99.6 diff --git a/sources b/sources index aa44b7c..19994b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9c1f316a34f00e1b595cc0063010a213 git-core-0.99.7a.tar.gz +1043b2fc900b767723b40dfd5e00c9fd git-core-0.99.8.tar.gz From 069c5c16f55b01611b81c0136a46d0b0ee7a0e01 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 4 Oct 2005 00:12:14 +0000 Subject: [PATCH 008/842] Update git-core to 0.99.8 --- .cvsignore | 2 +- git-core.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index cf76edf..3379f20 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-core-0.99.7a.tar.gz +git-core-0.99.8.tar.gz diff --git a/git-core.spec b/git-core.spec index eca4336..518f41a 100644 --- a/git-core.spec +++ b/git-core.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.7a +Version: 0.99.8 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -9,7 +9,7 @@ URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk +Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk >= 8.4 %description This is a stupid (but extremely fast) directory content manager. It @@ -23,12 +23,12 @@ elsewhere for tools for ordinary humans layered on top of this. %setup -q %build -make COPTS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ +make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} mandir=%{_mandir} \ install %{!?_without_docs: install-doc} @@ -45,6 +45,10 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %{_mandir}/man7/*.7*} %changelog +* Tue Sep 27 2005 H. Peter Anvin +- parallelize build +- COPTS -> CFLAGS + * Fri Sep 16 2005 Chris Wright 0.99.6-1 - update to 0.99.6 diff --git a/sources b/sources index aa44b7c..19994b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9c1f316a34f00e1b595cc0063010a213 git-core-0.99.7a.tar.gz +1043b2fc900b767723b40dfd5e00c9fd git-core-0.99.8.tar.gz From 44192de7565ecf8753d395b0ec43ba5ed2c0efe4 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 4 Oct 2005 20:05:40 +0000 Subject: [PATCH 009/842] Update git-core to 0.99.8a --- .cvsignore | 2 +- git-core.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3379f20..28611e8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-core-0.99.8.tar.gz +git-core-0.99.8a.tar.gz diff --git a/git-core.spec b/git-core.spec index 518f41a..7e83360 100644 --- a/git-core.spec +++ b/git-core.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.8 +Version: 0.99.8a Release: 1%{?dist} Summary: Git core and tools License: GPL diff --git a/sources b/sources index 19994b2..a583ed2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1043b2fc900b767723b40dfd5e00c9fd git-core-0.99.8.tar.gz +ae5a79d6dc485ea959090b659b06de97 git-core-0.99.8a.tar.gz From 833a267616bf892982bfbeec1777c23a14517ae3 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 4 Oct 2005 20:14:42 +0000 Subject: [PATCH 010/842] Update git-core to 0.99.8a --- .cvsignore | 2 +- git-core.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3379f20..28611e8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-core-0.99.8.tar.gz +git-core-0.99.8a.tar.gz diff --git a/git-core.spec b/git-core.spec index 518f41a..7e83360 100644 --- a/git-core.spec +++ b/git-core.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.8 +Version: 0.99.8a Release: 1%{?dist} Summary: Git core and tools License: GPL diff --git a/sources b/sources index 19994b2..a583ed2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1043b2fc900b767723b40dfd5e00c9fd git-core-0.99.8.tar.gz +ae5a79d6dc485ea959090b659b06de97 git-core-0.99.8a.tar.gz From c6226a8d50e097c89f967573ee346613ebf02f2c Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 11 Oct 2005 01:09:39 +0000 Subject: [PATCH 011/842] Update git-core to 0.99.8c --- .cvsignore | 2 +- git-core.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 28611e8..39191b8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-core-0.99.8a.tar.gz +git-core-0.99.8c.tar.gz diff --git a/git-core.spec b/git-core.spec index 7e83360..61fa2cc 100644 --- a/git-core.spec +++ b/git-core.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.8a +Version: 0.99.8c Release: 1%{?dist} Summary: Git core and tools License: GPL diff --git a/sources b/sources index a583ed2..5f9e4be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ae5a79d6dc485ea959090b659b06de97 git-core-0.99.8a.tar.gz +40049f2a7dfad9d18848b5f4aea6c1e9 git-core-0.99.8c.tar.gz From 385ae7ce47837d0d0fd342c8dfc6ce1d5f977f03 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 11 Oct 2005 01:11:10 +0000 Subject: [PATCH 012/842] Update git-core to 0.99.8c --- .cvsignore | 2 +- git-core.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 28611e8..39191b8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-core-0.99.8a.tar.gz +git-core-0.99.8c.tar.gz diff --git a/git-core.spec b/git-core.spec index 7e83360..61fa2cc 100644 --- a/git-core.spec +++ b/git-core.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.8a +Version: 0.99.8c Release: 1%{?dist} Summary: Git core and tools License: GPL diff --git a/sources b/sources index a583ed2..5f9e4be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ae5a79d6dc485ea959090b659b06de97 git-core-0.99.8a.tar.gz +40049f2a7dfad9d18848b5f4aea6c1e9 git-core-0.99.8c.tar.gz From 3b1a33fb90473f183b9da77dcf3b233c11a406f6 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Sun, 16 Oct 2005 17:03:38 +0000 Subject: [PATCH 013/842] Update git-core to 0.99.8d --- .cvsignore | 2 +- git-core.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 39191b8..750cbbf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-core-0.99.8c.tar.gz +git-core-0.99.8d.tar.gz diff --git a/git-core.spec b/git-core.spec index 61fa2cc..4162da9 100644 --- a/git-core.spec +++ b/git-core.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.8c +Version: 0.99.8d Release: 1%{?dist} Summary: Git core and tools License: GPL diff --git a/sources b/sources index 5f9e4be..396ccba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -40049f2a7dfad9d18848b5f4aea6c1e9 git-core-0.99.8c.tar.gz +07ef22197a082154f5096c6c0c164c99 git-core-0.99.8d.tar.gz From 4bffebbfcf274b02595160382c24cfeec86d7c59 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Sun, 16 Oct 2005 17:11:15 +0000 Subject: [PATCH 014/842] Update git-core to 0.99.8d --- .cvsignore | 2 +- git-core.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 39191b8..750cbbf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-core-0.99.8c.tar.gz +git-core-0.99.8d.tar.gz diff --git a/git-core.spec b/git-core.spec index 61fa2cc..4162da9 100644 --- a/git-core.spec +++ b/git-core.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.8c +Version: 0.99.8d Release: 1%{?dist} Summary: Git core and tools License: GPL diff --git a/sources b/sources index 5f9e4be..396ccba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -40049f2a7dfad9d18848b5f4aea6c1e9 git-core-0.99.8c.tar.gz +07ef22197a082154f5096c6c0c164c99 git-core-0.99.8d.tar.gz From 3bad94ab5485c4462a4566212f836ffea0069871 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Wed, 19 Oct 2005 10:29:58 +0000 Subject: [PATCH 015/842] Update git-core to 0.99.8f --- .cvsignore | 2 +- git-core.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 750cbbf..8f281a7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-core-0.99.8d.tar.gz +git-core-0.99.8f.tar.gz diff --git a/git-core.spec b/git-core.spec index 4162da9..cc5de93 100644 --- a/git-core.spec +++ b/git-core.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.8d +Version: 0.99.8f Release: 1%{?dist} Summary: Git core and tools License: GPL diff --git a/sources b/sources index 396ccba..0d8b54c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -07ef22197a082154f5096c6c0c164c99 git-core-0.99.8d.tar.gz +0ee5acc5acf8ef1f424770d61d009113 git-core-0.99.8f.tar.gz From 17949f894d458416011e1cdf633b4d9a7d7ab40c Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Wed, 19 Oct 2005 10:32:36 +0000 Subject: [PATCH 016/842] Update git-core to 0.99.8f --- .cvsignore | 2 +- git-core.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 750cbbf..8f281a7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-core-0.99.8d.tar.gz +git-core-0.99.8f.tar.gz diff --git a/git-core.spec b/git-core.spec index 4162da9..cc5de93 100644 --- a/git-core.spec +++ b/git-core.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.8d +Version: 0.99.8f Release: 1%{?dist} Summary: Git core and tools License: GPL diff --git a/sources b/sources index 396ccba..0d8b54c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -07ef22197a082154f5096c6c0c164c99 git-core-0.99.8d.tar.gz +0ee5acc5acf8ef1f424770d61d009113 git-core-0.99.8f.tar.gz From c4d09c07acc319e33153d06b9fdcdfb6f7103837 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 31 Oct 2005 05:32:56 +0000 Subject: [PATCH 017/842] Update git-core to 0.99.9 --- .cvsignore | 2 +- git-core.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8f281a7..199915b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-core-0.99.8f.tar.gz +git-core-0.99.9.tar.gz diff --git a/git-core.spec b/git-core.spec index cc5de93..d743219 100644 --- a/git-core.spec +++ b/git-core.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.8f +Version: 0.99.9 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -9,7 +9,7 @@ URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk >= 8.4 +Requires: zlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk >= 8.4 %description This is a stupid (but extremely fast) directory content manager. It diff --git a/sources b/sources index 0d8b54c..696ef2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0ee5acc5acf8ef1f424770d61d009113 git-core-0.99.8f.tar.gz +904e84bd63ef6ab0cdd30eea87e62784 git-core-0.99.9.tar.gz From fae9296aeec8124331d9eafc3005aefaddfc9bc2 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 31 Oct 2005 05:41:27 +0000 Subject: [PATCH 018/842] Update git-core to 0.99.9 --- .cvsignore | 2 +- git-core.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8f281a7..199915b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-core-0.99.8f.tar.gz +git-core-0.99.9.tar.gz diff --git a/git-core.spec b/git-core.spec index cc5de93..d743219 100644 --- a/git-core.spec +++ b/git-core.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.8f +Version: 0.99.9 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -9,7 +9,7 @@ URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk >= 8.4 +Requires: zlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk >= 8.4 %description This is a stupid (but extremely fast) directory content manager. It diff --git a/sources b/sources index 0d8b54c..696ef2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0ee5acc5acf8ef1f424770d61d009113 git-core-0.99.8f.tar.gz +904e84bd63ef6ab0cdd30eea87e62784 git-core-0.99.9.tar.gz From 0578b002ebc353f697b6aeefc25b1ecbb8588f56 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 31 Oct 2005 06:14:32 +0000 Subject: [PATCH 019/842] Update git-core to 0.99.9a (fix bogus RPM dependencies) --- .cvsignore | 2 +- git-core.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 199915b..efd62f1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-core-0.99.9.tar.gz +git-core-0.99.9a.tar.gz diff --git a/git-core.spec b/git-core.spec index d743219..ef583c0 100644 --- a/git-core.spec +++ b/git-core.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.9 +Version: 0.99.9a Release: 1%{?dist} Summary: Git core and tools License: GPL diff --git a/sources b/sources index 696ef2d..2946c96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -904e84bd63ef6ab0cdd30eea87e62784 git-core-0.99.9.tar.gz +c7e8d98eb5b260c9d4d0d4fcad64a92f git-core-0.99.9a.tar.gz From fe3886089472ef9d82c6ac2d2ceea7c3126fcb5e Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 31 Oct 2005 06:17:33 +0000 Subject: [PATCH 020/842] Update git-core to 0.99.9a (fix bogus RPM dependencies) --- .cvsignore | 2 +- git-core.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 199915b..efd62f1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-core-0.99.9.tar.gz +git-core-0.99.9a.tar.gz diff --git a/git-core.spec b/git-core.spec index d743219..ef583c0 100644 --- a/git-core.spec +++ b/git-core.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core -Version: 0.99.9 +Version: 0.99.9a Release: 1%{?dist} Summary: Git core and tools License: GPL diff --git a/sources b/sources index 696ef2d..2946c96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -904e84bd63ef6ab0cdd30eea87e62784 git-core-0.99.9.tar.gz +c7e8d98eb5b260c9d4d0d4fcad64a92f git-core-0.99.9a.tar.gz From 3f96466ba8b534f1ecf7ab70d4cafbe4ff17c044 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Fri, 11 Nov 2005 20:40:13 +0000 Subject: [PATCH 021/842] Bump release and rebuild to pick up new openssl in rawhide --- git-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-core.spec b/git-core.spec index ef583c0..9a29cec 100644 --- a/git-core.spec +++ b/git-core.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core Version: 0.99.9a -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools From 924bae0fdb535245101809554cad11e997311209 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 10 Jan 2006 23:42:14 +0000 Subject: [PATCH 022/842] Update git 1.1.0 --- .cvsignore | 2 +- git-core.spec | 83 --------------------- git.spec | 198 ++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 2 +- 4 files changed, 200 insertions(+), 85 deletions(-) delete mode 100644 git-core.spec create mode 100644 git.spec diff --git a/.cvsignore b/.cvsignore index efd62f1..1c9118e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-core-0.99.9a.tar.gz +git-1.1.0.tar.gz diff --git a/git-core.spec b/git-core.spec deleted file mode 100644 index 9a29cec..0000000 --- a/git-core.spec +++ /dev/null @@ -1,83 +0,0 @@ -# Pass --without docs to rpmbuild if you don't want the documetnation -Name: git-core -Version: 0.99.9a -Release: 2%{?dist} -Summary: Git core and tools -License: GPL -Group: Development/Tools -URL: http://kernel.org/pub/software/scm/git/ -Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz -BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: zlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk >= 8.4 - -%description -This is a stupid (but extremely fast) directory content manager. It -doesn't do a whole lot, but what it _does_ do is track directory -contents efficiently. It is intended to be the base of an efficient, -distributed source code management system. This package includes -rudimentary tools that can be used as a SCM, but you should look -elsewhere for tools for ordinary humans layered on top of this. - -%prep -%setup -q - -%build -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ - prefix=%{_prefix} all %{!?_without_docs: doc} - -%install -rm -rf $RPM_BUILD_ROOT -make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ - prefix=%{_prefix} mandir=%{_mandir} \ - install %{!?_without_docs: install-doc} - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root) -%{_bindir}/* -%{_datadir}/git-core/ -%doc README COPYING Documentation/*.txt -%{!?_without_docs: %doc Documentation/*.html } -%{!?_without_docs: %{_mandir}/man1/*.1*} -%{!?_without_docs: %{_mandir}/man7/*.7*} - -%changelog -* Tue Sep 27 2005 H. Peter Anvin -- parallelize build -- COPTS -> CFLAGS - -* Fri Sep 16 2005 Chris Wright 0.99.6-1 -- update to 0.99.6 - -* Fri Sep 16 2005 Horst H. von Brand -- Linus noticed that less is required, added to the dependencies - -* Sun Sep 11 2005 Horst H. von Brand -- Updated dependencies -- Don't assume manpages are gzipped - -* Thu Aug 18 2005 Chris Wright 0.99.4-4 -- drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires -- use RPM_OPT_FLAGS in spec file, drop patch0 - -* Wed Aug 17 2005 Tom "spot" Callaway 0.99.4-3 -- use dist tag to differentiate between branches -- use rpm optflags by default (patch0) -- own %{_datadir}/git-core/ - -* Mon Aug 15 2005 Chris Wright -- update spec file to fix Buildroot, Requires, and drop Vendor - -* Sun Aug 07 2005 Horst H. von Brand -- Redid the description -- Cut overlong make line, loosened changelog a bit -- I think Junio (or perhaps OSDL?) should be vendor... - -* Thu Jul 14 2005 Eric Biederman -- Add the man pages, and the --without docs build option - -* Wed Jul 7 2005 Chris Wright -- initial git spec file diff --git a/git.spec b/git.spec new file mode 100644 index 0000000..257da79 --- /dev/null +++ b/git.spec @@ -0,0 +1,198 @@ +# Pass --without docs to rpmbuild if you don't want the documentation +# Pass --with email to rpmbuild if you want git-email (more perl dependencies) +Name: git +Version: 1.1.0 +Release: 1%{?dist} +Summary: Git core and tools +License: GPL +Group: Development/Tools +URL: http://kernel.org/pub/software/scm/git/ +Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz +BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: git-core, git-svn, git-cvs, git-arch, %{?_with_email: git-email}, gitk + +%description +This is a stupid (but extremely fast) directory content manager. It +doesn't do a whole lot, but what it _does_ do is track directory +contents efficiently. It is intended to be the base of an efficient, +distributed source code management system. This package includes +rudimentary tools that can be used as a SCM, but you should look +elsewhere for tools for ordinary humans layered on top of this. + +This is a dummy package which brings in all subpackages. + +%package core +Summary: Core git tools +Group: Development/Tools +Requires: zlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, expat +%description core +This is a stupid (but extremely fast) directory content manager. It +doesn't do a whole lot, but what it _does_ do is track directory +contents efficiently. It is intended to be the base of an efficient, +distributed source code management system. This package includes +rudimentary tools that can be used as a SCM, but you should look +elsewhere for tools for ordinary humans layered on top of this. + +These are the core tools with minimal dependencies. + +%package svn +Summary: Git tools for importing Subversion repositories +Group: Development/Tools +Requires: git-core = %{version}-%{release}, subversion +%description svn +Git tools for importing Subversion repositories. + +%package cvs +Summary: Git tools for importing CVS repositories +Group: Development/Tools +Requires: git-core = %{version}-%{release}, cvs, cvsps +%description cvs +Git tools for importing CVS repositories. + +%package arch +Summary: Git tools for importing Arch repositories +Group: Development/Tools +Requires: git-core = %{version}-%{release}, tla +%description arch +Git tools for importing Arch repositories. + +%if %{?_with_email:1}0 +%package email +Summary: Git tools for sending email +Group: Development/Tools +Requires: git-core = %{version}-%{release} +%description email +Git tools for sending email. +%endif + +%package -n gitk +Summary: Git revision tree visualiser ('gitk') +Group: Development/Tools +Requires: git-core = %{version}-%{release}, tk >= 8.4 +%description -n gitk +Git revision tree visualiser ('gitk') + +%prep +%setup -q + +%build +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ + prefix=%{_prefix} all %{!?_without_docs: doc} + +%install +rm -rf $RPM_BUILD_ROOT +make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ + prefix=%{_prefix} mandir=%{_mandir} \ + install %{!?_without_docs: install-doc} + +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +%if %{!?_without_docs:1}0 +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +# These are no files in the root package + +%files svn +%defattr(-,root,root) +%{_bindir}/*svn* +%doc Documentation/*svn*.txt +%{!?_without_docs: %{_mandir}/man1/*svn*.1*} +%{!?_without_docs: %doc Documentation/*svn*.html } + +%files cvs +%defattr(-,root,root) +%doc Documentation/*git-cvs*.txt +%{_bindir}/*cvs* +%{!?_without_docs: %{_mandir}/man1/*cvs*.1*} +%{!?_without_docs: %doc Documentation/*git-cvs*.html } + +%files arch +%defattr(-,root,root) +%doc Documentation/*arch*.txt +%{_bindir}/*arch* +%{!?_without_docs: %{_mandir}/man1/*arch*.1*} +%{!?_without_docs: %doc Documentation/*arch*.html } + +%if %{?_with_email:1}0 +%files email +%defattr(-,root,root) +%doc Documentation/*email*.txt +%{_bindir}/*email* +%{!?_without_docs: %{_mandir}/man1/*email*.1*} +%{!?_without_docs: %doc Documentation/*email*.html } +%endif + +%files -n gitk +%defattr(-,root,root) +%doc Documentation/*gitk*.txt +%{_bindir}/*gitk* +%{!?_without_docs: %{_mandir}/man1/*gitk*.1*} +%{!?_without_docs: %doc Documentation/*gitk*.html } + +%files core -f bin-man-doc-files +%defattr(-,root,root) +%{_datadir}/git-core/ +%doc README COPYING Documentation/*.txt +%{!?_without_docs: %doc Documentation/*.html } + +%changelog +* Tue Jan 10 2006 Chris Wright 1.1.0-1 +- Update to latest git-1.1.0 (drop git-email for now) +- Now creates multiple packages: +- git-core, git-svn, git-cvs, git-arch, gitk + +* Mon Nov 14 2005 H. Peter Anvin 0.99.9j-1 +- Change subpackage names to git- instead of git-core- +- Create empty root package which brings in all subpackages +- Rename git-tk -> gitk + +* Thu Nov 10 2005 Chris Wright 0.99.9g-1 +- zlib dependency fix +- Minor cleanups from split +- Move arch import to separate package as well + +* Tue Sep 27 2005 Jim Radford +- Move programs with non-standard dependencies (svn, cvs, email) + into separate packages + +* Tue Sep 27 2005 H. Peter Anvin +- parallelize build +- COPTS -> CFLAGS + +* Fri Sep 16 2005 Chris Wright 0.99.6-1 +- update to 0.99.6 + +* Fri Sep 16 2005 Horst H. von Brand +- Linus noticed that less is required, added to the dependencies + +* Sun Sep 11 2005 Horst H. von Brand +- Updated dependencies +- Don't assume manpages are gzipped + +* Thu Aug 18 2005 Chris Wright 0.99.4-4 +- drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires +- use RPM_OPT_FLAGS in spec file, drop patch0 + +* Wed Aug 17 2005 Tom "spot" Callaway 0.99.4-3 +- use dist tag to differentiate between branches +- use rpm optflags by default (patch0) +- own %{_datadir}/git-core/ + +* Mon Aug 15 2005 Chris Wright +- update spec file to fix Buildroot, Requires, and drop Vendor + +* Sun Aug 07 2005 Horst H. von Brand +- Redid the description +- Cut overlong make line, loosened changelog a bit +- I think Junio (or perhaps OSDL?) should be vendor... + +* Thu Jul 14 2005 Eric Biederman +- Add the man pages, and the --without docs build option + +* Wed Jul 7 2005 Chris Wright +- initial git spec file diff --git a/sources b/sources index 2946c96..234035f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c7e8d98eb5b260c9d4d0d4fcad64a92f git-core-0.99.9a.tar.gz +8dce75185c3b7fb59113c09f1899c38d git-1.1.0.tar.gz From b49a322adebcbef9213dea1af985fb679d114ee9 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 10 Jan 2006 23:46:18 +0000 Subject: [PATCH 023/842] Update git to 1.1.0 --- .cvsignore | 2 +- git-core.spec | 83 --------------------- git.spec | 198 ++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 2 +- 4 files changed, 200 insertions(+), 85 deletions(-) delete mode 100644 git-core.spec create mode 100644 git.spec diff --git a/.cvsignore b/.cvsignore index efd62f1..1c9118e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-core-0.99.9a.tar.gz +git-1.1.0.tar.gz diff --git a/git-core.spec b/git-core.spec deleted file mode 100644 index ef583c0..0000000 --- a/git-core.spec +++ /dev/null @@ -1,83 +0,0 @@ -# Pass --without docs to rpmbuild if you don't want the documetnation -Name: git-core -Version: 0.99.9a -Release: 1%{?dist} -Summary: Git core and tools -License: GPL -Group: Development/Tools -URL: http://kernel.org/pub/software/scm/git/ -Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz -BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: zlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk >= 8.4 - -%description -This is a stupid (but extremely fast) directory content manager. It -doesn't do a whole lot, but what it _does_ do is track directory -contents efficiently. It is intended to be the base of an efficient, -distributed source code management system. This package includes -rudimentary tools that can be used as a SCM, but you should look -elsewhere for tools for ordinary humans layered on top of this. - -%prep -%setup -q - -%build -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ - prefix=%{_prefix} all %{!?_without_docs: doc} - -%install -rm -rf $RPM_BUILD_ROOT -make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ - prefix=%{_prefix} mandir=%{_mandir} \ - install %{!?_without_docs: install-doc} - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root) -%{_bindir}/* -%{_datadir}/git-core/ -%doc README COPYING Documentation/*.txt -%{!?_without_docs: %doc Documentation/*.html } -%{!?_without_docs: %{_mandir}/man1/*.1*} -%{!?_without_docs: %{_mandir}/man7/*.7*} - -%changelog -* Tue Sep 27 2005 H. Peter Anvin -- parallelize build -- COPTS -> CFLAGS - -* Fri Sep 16 2005 Chris Wright 0.99.6-1 -- update to 0.99.6 - -* Fri Sep 16 2005 Horst H. von Brand -- Linus noticed that less is required, added to the dependencies - -* Sun Sep 11 2005 Horst H. von Brand -- Updated dependencies -- Don't assume manpages are gzipped - -* Thu Aug 18 2005 Chris Wright 0.99.4-4 -- drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires -- use RPM_OPT_FLAGS in spec file, drop patch0 - -* Wed Aug 17 2005 Tom "spot" Callaway 0.99.4-3 -- use dist tag to differentiate between branches -- use rpm optflags by default (patch0) -- own %{_datadir}/git-core/ - -* Mon Aug 15 2005 Chris Wright -- update spec file to fix Buildroot, Requires, and drop Vendor - -* Sun Aug 07 2005 Horst H. von Brand -- Redid the description -- Cut overlong make line, loosened changelog a bit -- I think Junio (or perhaps OSDL?) should be vendor... - -* Thu Jul 14 2005 Eric Biederman -- Add the man pages, and the --without docs build option - -* Wed Jul 7 2005 Chris Wright -- initial git spec file diff --git a/git.spec b/git.spec new file mode 100644 index 0000000..257da79 --- /dev/null +++ b/git.spec @@ -0,0 +1,198 @@ +# Pass --without docs to rpmbuild if you don't want the documentation +# Pass --with email to rpmbuild if you want git-email (more perl dependencies) +Name: git +Version: 1.1.0 +Release: 1%{?dist} +Summary: Git core and tools +License: GPL +Group: Development/Tools +URL: http://kernel.org/pub/software/scm/git/ +Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz +BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: git-core, git-svn, git-cvs, git-arch, %{?_with_email: git-email}, gitk + +%description +This is a stupid (but extremely fast) directory content manager. It +doesn't do a whole lot, but what it _does_ do is track directory +contents efficiently. It is intended to be the base of an efficient, +distributed source code management system. This package includes +rudimentary tools that can be used as a SCM, but you should look +elsewhere for tools for ordinary humans layered on top of this. + +This is a dummy package which brings in all subpackages. + +%package core +Summary: Core git tools +Group: Development/Tools +Requires: zlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, expat +%description core +This is a stupid (but extremely fast) directory content manager. It +doesn't do a whole lot, but what it _does_ do is track directory +contents efficiently. It is intended to be the base of an efficient, +distributed source code management system. This package includes +rudimentary tools that can be used as a SCM, but you should look +elsewhere for tools for ordinary humans layered on top of this. + +These are the core tools with minimal dependencies. + +%package svn +Summary: Git tools for importing Subversion repositories +Group: Development/Tools +Requires: git-core = %{version}-%{release}, subversion +%description svn +Git tools for importing Subversion repositories. + +%package cvs +Summary: Git tools for importing CVS repositories +Group: Development/Tools +Requires: git-core = %{version}-%{release}, cvs, cvsps +%description cvs +Git tools for importing CVS repositories. + +%package arch +Summary: Git tools for importing Arch repositories +Group: Development/Tools +Requires: git-core = %{version}-%{release}, tla +%description arch +Git tools for importing Arch repositories. + +%if %{?_with_email:1}0 +%package email +Summary: Git tools for sending email +Group: Development/Tools +Requires: git-core = %{version}-%{release} +%description email +Git tools for sending email. +%endif + +%package -n gitk +Summary: Git revision tree visualiser ('gitk') +Group: Development/Tools +Requires: git-core = %{version}-%{release}, tk >= 8.4 +%description -n gitk +Git revision tree visualiser ('gitk') + +%prep +%setup -q + +%build +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ + prefix=%{_prefix} all %{!?_without_docs: doc} + +%install +rm -rf $RPM_BUILD_ROOT +make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ + prefix=%{_prefix} mandir=%{_mandir} \ + install %{!?_without_docs: install-doc} + +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +%if %{!?_without_docs:1}0 +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +# These are no files in the root package + +%files svn +%defattr(-,root,root) +%{_bindir}/*svn* +%doc Documentation/*svn*.txt +%{!?_without_docs: %{_mandir}/man1/*svn*.1*} +%{!?_without_docs: %doc Documentation/*svn*.html } + +%files cvs +%defattr(-,root,root) +%doc Documentation/*git-cvs*.txt +%{_bindir}/*cvs* +%{!?_without_docs: %{_mandir}/man1/*cvs*.1*} +%{!?_without_docs: %doc Documentation/*git-cvs*.html } + +%files arch +%defattr(-,root,root) +%doc Documentation/*arch*.txt +%{_bindir}/*arch* +%{!?_without_docs: %{_mandir}/man1/*arch*.1*} +%{!?_without_docs: %doc Documentation/*arch*.html } + +%if %{?_with_email:1}0 +%files email +%defattr(-,root,root) +%doc Documentation/*email*.txt +%{_bindir}/*email* +%{!?_without_docs: %{_mandir}/man1/*email*.1*} +%{!?_without_docs: %doc Documentation/*email*.html } +%endif + +%files -n gitk +%defattr(-,root,root) +%doc Documentation/*gitk*.txt +%{_bindir}/*gitk* +%{!?_without_docs: %{_mandir}/man1/*gitk*.1*} +%{!?_without_docs: %doc Documentation/*gitk*.html } + +%files core -f bin-man-doc-files +%defattr(-,root,root) +%{_datadir}/git-core/ +%doc README COPYING Documentation/*.txt +%{!?_without_docs: %doc Documentation/*.html } + +%changelog +* Tue Jan 10 2006 Chris Wright 1.1.0-1 +- Update to latest git-1.1.0 (drop git-email for now) +- Now creates multiple packages: +- git-core, git-svn, git-cvs, git-arch, gitk + +* Mon Nov 14 2005 H. Peter Anvin 0.99.9j-1 +- Change subpackage names to git- instead of git-core- +- Create empty root package which brings in all subpackages +- Rename git-tk -> gitk + +* Thu Nov 10 2005 Chris Wright 0.99.9g-1 +- zlib dependency fix +- Minor cleanups from split +- Move arch import to separate package as well + +* Tue Sep 27 2005 Jim Radford +- Move programs with non-standard dependencies (svn, cvs, email) + into separate packages + +* Tue Sep 27 2005 H. Peter Anvin +- parallelize build +- COPTS -> CFLAGS + +* Fri Sep 16 2005 Chris Wright 0.99.6-1 +- update to 0.99.6 + +* Fri Sep 16 2005 Horst H. von Brand +- Linus noticed that less is required, added to the dependencies + +* Sun Sep 11 2005 Horst H. von Brand +- Updated dependencies +- Don't assume manpages are gzipped + +* Thu Aug 18 2005 Chris Wright 0.99.4-4 +- drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires +- use RPM_OPT_FLAGS in spec file, drop patch0 + +* Wed Aug 17 2005 Tom "spot" Callaway 0.99.4-3 +- use dist tag to differentiate between branches +- use rpm optflags by default (patch0) +- own %{_datadir}/git-core/ + +* Mon Aug 15 2005 Chris Wright +- update spec file to fix Buildroot, Requires, and drop Vendor + +* Sun Aug 07 2005 Horst H. von Brand +- Redid the description +- Cut overlong make line, loosened changelog a bit +- I think Junio (or perhaps OSDL?) should be vendor... + +* Thu Jul 14 2005 Eric Biederman +- Add the man pages, and the --without docs build option + +* Wed Jul 7 2005 Chris Wright +- initial git spec file diff --git a/sources b/sources index 2946c96..234035f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c7e8d98eb5b260c9d4d0d4fcad64a92f git-core-0.99.9a.tar.gz +8dce75185c3b7fb59113c09f1899c38d git-1.1.0.tar.gz From 04ae15d075b0eca04c731162fa896afab37e114f Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Wed, 11 Jan 2006 05:59:22 +0000 Subject: [PATCH 024/842] Update git to 1.1.1 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1c9118e..432e6fe 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.1.0.tar.gz +git-1.1.1.tar.gz diff --git a/git.spec b/git.spec index 257da79..c8a29eb 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.1.0 +Version: 1.1.1 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Tue Jan 10 2006 Chris Wright 1.1.1-1 +- git-1.1.1 + * Tue Jan 10 2006 Chris Wright 1.1.0-1 - Update to latest git-1.1.0 (drop git-email for now) - Now creates multiple packages: diff --git a/sources b/sources index 234035f..9763712 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8dce75185c3b7fb59113c09f1899c38d git-1.1.0.tar.gz +f62fc5276642108469fccb45e020cb95 git-1.1.1.tar.gz From 9e3183d61409144cf81a324bcfc6620e92ce5374 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Wed, 11 Jan 2006 06:05:47 +0000 Subject: [PATCH 025/842] Update to git-1.1.1 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1c9118e..432e6fe 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.1.0.tar.gz +git-1.1.1.tar.gz diff --git a/git.spec b/git.spec index 257da79..c8a29eb 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.1.0 +Version: 1.1.1 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Tue Jan 10 2006 Chris Wright 1.1.1-1 +- git-1.1.1 + * Tue Jan 10 2006 Chris Wright 1.1.0-1 - Update to latest git-1.1.0 (drop git-email for now) - Now creates multiple packages: diff --git a/sources b/sources index 234035f..9763712 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8dce75185c3b7fb59113c09f1899c38d git-1.1.0.tar.gz +f62fc5276642108469fccb45e020cb95 git-1.1.1.tar.gz From 135e30f11edff1920e06e3768681b864494e857a Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 16 Jan 2006 05:03:53 +0000 Subject: [PATCH 026/842] Update to git-1.1.2 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 432e6fe..72315d5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.1.1.tar.gz +git-1.1.2.tar.gz diff --git a/git.spec b/git.spec index c8a29eb..fc3feed 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.1.1 +Version: 1.1.2 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Sun Jan 15 2006 Chris Wright 1.1.2-1 +- git-1.1.2 + * Tue Jan 10 2006 Chris Wright 1.1.1-1 - git-1.1.1 diff --git a/sources b/sources index 9763712..f4d87c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f62fc5276642108469fccb45e020cb95 git-1.1.1.tar.gz +b83aabef7d0b6124bf9a2f1bcf0e4081 git-1.1.2.tar.gz From 2b5f3831d25f078f13a6fb033925614a418e20ae Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 16 Jan 2006 05:09:22 +0000 Subject: [PATCH 027/842] Update to git-1.1.2 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 432e6fe..72315d5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.1.1.tar.gz +git-1.1.2.tar.gz diff --git a/git.spec b/git.spec index c8a29eb..fc3feed 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.1.1 +Version: 1.1.2 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Sun Jan 15 2006 Chris Wright 1.1.2-1 +- git-1.1.2 + * Tue Jan 10 2006 Chris Wright 1.1.1-1 - git-1.1.1 diff --git a/sources b/sources index 9763712..f4d87c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f62fc5276642108469fccb45e020cb95 git-1.1.1.tar.gz +b83aabef7d0b6124bf9a2f1bcf0e4081 git-1.1.2.tar.gz From 0de8d1aa7215ce4c90456d768c36afad344a1e56 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 24 Jan 2006 22:44:00 +0000 Subject: [PATCH 028/842] Update to git-1.1.4 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 72315d5..5ed6d44 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.1.2.tar.gz +git-1.1.4.tar.gz diff --git a/git.spec b/git.spec index fc3feed..cb07cb2 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.1.2 +Version: 1.1.4 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Tue Jan 24 2006 Chris Wright 1.1.4-1 +- git-1.1.4 + * Sun Jan 15 2006 Chris Wright 1.1.2-1 - git-1.1.2 diff --git a/sources b/sources index f4d87c7..b102e54 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b83aabef7d0b6124bf9a2f1bcf0e4081 git-1.1.2.tar.gz +8a3ebe9070f738f4fc502b3a9fb7f3f5 git-1.1.4.tar.gz From 85391c40029d927af8f12b26266ca32c9e085630 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 24 Jan 2006 22:47:36 +0000 Subject: [PATCH 029/842] Update to git-1.1.4 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 72315d5..5ed6d44 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.1.2.tar.gz +git-1.1.4.tar.gz diff --git a/git.spec b/git.spec index fc3feed..cb07cb2 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.1.2 +Version: 1.1.4 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Tue Jan 24 2006 Chris Wright 1.1.4-1 +- git-1.1.4 + * Sun Jan 15 2006 Chris Wright 1.1.2-1 - git-1.1.2 diff --git a/sources b/sources index f4d87c7..b102e54 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b83aabef7d0b6124bf9a2f1bcf0e4081 git-1.1.2.tar.gz +8a3ebe9070f738f4fc502b3a9fb7f3f5 git-1.1.4.tar.gz From 4900fdab0fd33036c05992b97393d8e3d8f7f339 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Wed, 1 Feb 2006 16:36:09 +0000 Subject: [PATCH 030/842] Update to git-1.1.6 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5ed6d44..6ee325b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.1.4.tar.gz +git-1.1.6.tar.gz diff --git a/git.spec b/git.spec index cb07cb2..9e66e5a 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.1.4 +Version: 1.1.6 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Tue Feb 1 2006 Chris Wright 1.1.6-1 +- git-1.1.6 + * Tue Jan 24 2006 Chris Wright 1.1.4-1 - git-1.1.4 diff --git a/sources b/sources index b102e54..6e1a9ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a3ebe9070f738f4fc502b3a9fb7f3f5 git-1.1.4.tar.gz +78a3cf399db4cdf6023647dc8a30e93b git-1.1.6.tar.gz From 5e46bab10855d4b93bc1b18e63d7caad26cb6617 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Wed, 1 Feb 2006 16:42:29 +0000 Subject: [PATCH 031/842] Update to git-1.1.6 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5ed6d44..6ee325b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.1.4.tar.gz +git-1.1.6.tar.gz diff --git a/git.spec b/git.spec index cb07cb2..9e66e5a 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.1.4 +Version: 1.1.6 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Tue Feb 1 2006 Chris Wright 1.1.6-1 +- git-1.1.6 + * Tue Jan 24 2006 Chris Wright 1.1.4-1 - git-1.1.4 diff --git a/sources b/sources index b102e54..6e1a9ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a3ebe9070f738f4fc502b3a9fb7f3f5 git-1.1.4.tar.gz +78a3cf399db4cdf6023647dc8a30e93b git-1.1.6.tar.gz From be5d673c7d6e2021a4d9c8bd7fe148faace934da Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 13 Feb 2006 18:27:06 +0000 Subject: [PATCH 032/842] Update to git-1.2.0 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6ee325b..b9ba4b0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.1.6.tar.gz +git-1.2.0.tar.gz diff --git a/git.spec b/git.spec index 9e66e5a..6614fe2 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.1.6 +Version: 1.2.0 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Mon Feb 13 2006 Chris Wright 1.2.0-1 +- git-1.2.0 + * Tue Feb 1 2006 Chris Wright 1.1.6-1 - git-1.1.6 diff --git a/sources b/sources index 6e1a9ee..5c98208 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -78a3cf399db4cdf6023647dc8a30e93b git-1.1.6.tar.gz +044a1e60cd247320c068749aa10a08f3 git-1.2.0.tar.gz From 0bed77d1d7918466af9143780d87d59cac514da9 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 13 Feb 2006 18:30:49 +0000 Subject: [PATCH 033/842] Update to git-1.2.0 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6ee325b..b9ba4b0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.1.6.tar.gz +git-1.2.0.tar.gz diff --git a/git.spec b/git.spec index 9e66e5a..6614fe2 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.1.6 +Version: 1.2.0 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Mon Feb 13 2006 Chris Wright 1.2.0-1 +- git-1.2.0 + * Tue Feb 1 2006 Chris Wright 1.1.6-1 - git-1.1.6 diff --git a/sources b/sources index 6e1a9ee..5c98208 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -78a3cf399db4cdf6023647dc8a30e93b git-1.1.6.tar.gz +044a1e60cd247320c068749aa10a08f3 git-1.2.0.tar.gz From 9ce4204ebf9fb5164273dae79fa9fcc8a65d31c7 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 16 Feb 2006 19:35:43 +0000 Subject: [PATCH 034/842] Update to git-1.2.1 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index b9ba4b0..37d5fb4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.2.0.tar.gz +git-1.2.1.tar.gz diff --git a/git.spec b/git.spec index 6614fe2..75fc07b 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.2.0 +Version: 1.2.1 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu Feb 16 2006 Chris Wright 1.2.1-1 +- git-1.2.1 + * Mon Feb 13 2006 Chris Wright 1.2.0-1 - git-1.2.0 diff --git a/sources b/sources index 5c98208..03cbcd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -044a1e60cd247320c068749aa10a08f3 git-1.2.0.tar.gz +80feda57f121454ee4185eceb6149604 git-1.2.1.tar.gz From cabf6e8618cdc112f2dc7f24c2afb7738a3b0e5c Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 16 Feb 2006 19:44:06 +0000 Subject: [PATCH 035/842] Update to git-1.2.1 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index b9ba4b0..37d5fb4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.2.0.tar.gz +git-1.2.1.tar.gz diff --git a/git.spec b/git.spec index 6614fe2..75fc07b 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.2.0 +Version: 1.2.1 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu Feb 16 2006 Chris Wright 1.2.1-1 +- git-1.2.1 + * Mon Feb 13 2006 Chris Wright 1.2.0-1 - git-1.2.0 diff --git a/sources b/sources index 5c98208..03cbcd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -044a1e60cd247320c068749aa10a08f3 git-1.2.0.tar.gz +80feda57f121454ee4185eceb6149604 git-1.2.1.tar.gz From 14e2dfdff35134697bc02d4f9fe8a7b889556c82 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Wed, 22 Feb 2006 00:10:10 +0000 Subject: [PATCH 036/842] Update to git-1.2.2 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 37d5fb4..5e0866c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.2.1.tar.gz +git-1.2.2.tar.gz diff --git a/git.spec b/git.spec index 75fc07b..8228793 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.2.1 +Version: 1.2.2 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Tue Feb 21 2006 Chris Wright 1.2.2-1 +- git-1.2.2 + * Thu Feb 16 2006 Chris Wright 1.2.1-1 - git-1.2.1 diff --git a/sources b/sources index 03cbcd7..e2382cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -80feda57f121454ee4185eceb6149604 git-1.2.1.tar.gz +01cb4c005b1e47af42ad7e3296d4ba39 git-1.2.2.tar.gz From 96b4c796d93ada31a2d029eb82d798c12659825c Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Wed, 22 Feb 2006 00:41:38 +0000 Subject: [PATCH 037/842] Update to git-1.2.2 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 37d5fb4..5e0866c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.2.1.tar.gz +git-1.2.2.tar.gz diff --git a/git.spec b/git.spec index 75fc07b..8228793 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.2.1 +Version: 1.2.2 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Tue Feb 21 2006 Chris Wright 1.2.2-1 +- git-1.2.2 + * Thu Feb 16 2006 Chris Wright 1.2.1-1 - git-1.2.1 diff --git a/sources b/sources index 03cbcd7..e2382cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -80feda57f121454ee4185eceb6149604 git-1.2.1.tar.gz +01cb4c005b1e47af42ad7e3296d4ba39 git-1.2.2.tar.gz From f3034c459db8e4199b81b4bf688a383e87d798a1 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 23 Feb 2006 02:28:48 +0000 Subject: [PATCH 038/842] Update to git-1.2.3 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5e0866c..7d588cb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.2.2.tar.gz +git-1.2.3.tar.gz diff --git a/git.spec b/git.spec index 8228793..b1a53ea 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.2.2 +Version: 1.2.3 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Wed Feb 22 2006 Chris Wright 1.2.3-1 +- git-1.2.3 + * Tue Feb 21 2006 Chris Wright 1.2.2-1 - git-1.2.2 diff --git a/sources b/sources index e2382cb..3c01b46 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -01cb4c005b1e47af42ad7e3296d4ba39 git-1.2.2.tar.gz +8d03a39d4e2dea1339204b2d3cc41716 git-1.2.3.tar.gz From d3d50ba09b23e3f94a86db463e3f7af49d167ec4 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 23 Feb 2006 02:31:33 +0000 Subject: [PATCH 039/842] Update to git-1.2.3 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5e0866c..7d588cb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.2.2.tar.gz +git-1.2.3.tar.gz diff --git a/git.spec b/git.spec index 8228793..b1a53ea 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.2.2 +Version: 1.2.3 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Wed Feb 22 2006 Chris Wright 1.2.3-1 +- git-1.2.3 + * Tue Feb 21 2006 Chris Wright 1.2.2-1 - git-1.2.2 diff --git a/sources b/sources index e2382cb..3c01b46 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -01cb4c005b1e47af42ad7e3296d4ba39 git-1.2.2.tar.gz +8d03a39d4e2dea1339204b2d3cc41716 git-1.2.3.tar.gz From 8011604a189ad0aada5da024169371d15dbe8295 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 2 Mar 2006 06:45:58 +0000 Subject: [PATCH 040/842] Update git to 1.2.4 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7d588cb..1b5b535 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.2.3.tar.gz +git-1.2.4.tar.gz diff --git a/git.spec b/git.spec index b1a53ea..919aa4e 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Wed Mar 1 2006 Chris Wright 1.2.4-1 +- git-1.2.4 + * Wed Feb 22 2006 Chris Wright 1.2.3-1 - git-1.2.3 diff --git a/sources b/sources index 3c01b46..fa19215 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8d03a39d4e2dea1339204b2d3cc41716 git-1.2.3.tar.gz +04b24119a7e3a0a6e322cd9cfc9b08ad git-1.2.4.tar.gz From 76412beb1bc560e937785f64f69c0eeca6a60397 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 2 Mar 2006 06:50:14 +0000 Subject: [PATCH 041/842] Update git to 1.2.4 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7d588cb..1b5b535 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.2.3.tar.gz +git-1.2.4.tar.gz diff --git a/git.spec b/git.spec index b1a53ea..919aa4e 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Wed Mar 1 2006 Chris Wright 1.2.4-1 +- git-1.2.4 + * Wed Feb 22 2006 Chris Wright 1.2.3-1 - git-1.2.3 diff --git a/sources b/sources index 3c01b46..fa19215 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8d03a39d4e2dea1339204b2d3cc41716 git-1.2.3.tar.gz +04b24119a7e3a0a6e322cd9cfc9b08ad git-1.2.4.tar.gz From 67ae5ca3db4b0ca03ba92f70da2397e71e2de7a9 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Wed, 5 Apr 2006 23:25:25 +0000 Subject: [PATCH 042/842] Update to git-1.2.5 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1b5b535..b7138e0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.2.4.tar.gz +git-1.2.5.tar.gz diff --git a/git.spec b/git.spec index 919aa4e..37a4bc3 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.2.4 +Version: 1.2.5 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Wed Apr 5 2006 Chris Wright 1.2.5-1 +- git-1.2.5 + * Wed Mar 1 2006 Chris Wright 1.2.4-1 - git-1.2.4 diff --git a/sources b/sources index fa19215..ca2130c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -04b24119a7e3a0a6e322cd9cfc9b08ad git-1.2.4.tar.gz +30b4c8b1765636f3c0f9f7d69e8b286c git-1.2.5.tar.gz From b3d43c2ab041413e7c8918f1ec855f1d572392ea Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Wed, 5 Apr 2006 23:28:25 +0000 Subject: [PATCH 043/842] Update to git-1.2.5 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1b5b535..b7138e0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.2.4.tar.gz +git-1.2.5.tar.gz diff --git a/git.spec b/git.spec index 919aa4e..37a4bc3 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.2.4 +Version: 1.2.5 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Wed Apr 5 2006 Chris Wright 1.2.5-1 +- git-1.2.5 + * Wed Mar 1 2006 Chris Wright 1.2.4-1 - git-1.2.4 diff --git a/sources b/sources index fa19215..ca2130c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -04b24119a7e3a0a6e322cd9cfc9b08ad git-1.2.4.tar.gz +30b4c8b1765636f3c0f9f7d69e8b286c git-1.2.5.tar.gz From 9fd4064d42646fdb443043534ec42f940e50084d Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 10 Apr 2006 16:47:48 +0000 Subject: [PATCH 044/842] rename git-core to git --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2921301..6c8a637 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ -# Makefile for source rpm: git-core +# Makefile for source rpm: git # $Id$ -NAME := git-core +NAME := git SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common From acc88cbc5bd4565cd08208c9f6f53bdf2b72c6b7 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 10 Apr 2006 16:48:25 +0000 Subject: [PATCH 045/842] Update to git-1.2.6 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index b7138e0..7e00403 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.2.5.tar.gz +git-1.2.6.tar.gz diff --git a/git.spec b/git.spec index 37a4bc3..454dd74 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.2.5 +Version: 1.2.6 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Mon Apr 10 2006 Chris Wright 1.2.6-1 +- git-1.2.6 + * Wed Apr 5 2006 Chris Wright 1.2.5-1 - git-1.2.5 diff --git a/sources b/sources index ca2130c..6585b41 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -30b4c8b1765636f3c0f9f7d69e8b286c git-1.2.5.tar.gz +f10a13074e849ff8670f5dba07bfe5c1 git-1.2.6.tar.gz From 50ab47ebee82ed1369a896f724c55451c7f9865b Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 10 Apr 2006 16:52:46 +0000 Subject: [PATCH 046/842] rename git-core to git --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2921301..4a03d85 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ -# Makefile for source rpm: git-core -# $Id$ -NAME := git-core +# Makefile for source rpm: git +# $Id: Makefile,v 1.1 2005/08/30 00:36:41 jwboyer Exp $ +NAME := git SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common From f8a0228443d53320cb6e2582e4705e1b6920cd00 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 10 Apr 2006 16:53:10 +0000 Subject: [PATCH 047/842] Update to git-1.2.6 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index b7138e0..7e00403 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.2.5.tar.gz +git-1.2.6.tar.gz diff --git a/git.spec b/git.spec index 37a4bc3..454dd74 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.2.5 +Version: 1.2.6 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Mon Apr 10 2006 Chris Wright 1.2.6-1 +- git-1.2.6 + * Wed Apr 5 2006 Chris Wright 1.2.5-1 - git-1.2.5 diff --git a/sources b/sources index ca2130c..6585b41 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -30b4c8b1765636f3c0f9f7d69e8b286c git-1.2.5.tar.gz +f10a13074e849ff8670f5dba07bfe5c1 git-1.2.6.tar.gz From e841ac147130c44d19a2dbc1021ffaa4fe17dc07 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 20 Apr 2006 00:34:48 +0000 Subject: [PATCH 048/842] Update to git-1.3.0 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7e00403..a5129fb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.2.6.tar.gz +git-1.3.0.tar.gz diff --git a/git.spec b/git.spec index 454dd74..011fe55 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.2.6 +Version: 1.3.0 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Wed Apr 19 2006 Chris Wright 1.3.0-1 +- git-1.3.0 + * Mon Apr 10 2006 Chris Wright 1.2.6-1 - git-1.2.6 diff --git a/sources b/sources index 6585b41..c24f963 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f10a13074e849ff8670f5dba07bfe5c1 git-1.2.6.tar.gz +37137c9f87b0082fbf04e6b80a5144e2 git-1.3.0.tar.gz From b16bf443c2042bf417a0a4d6242af97c3e17d913 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 20 Apr 2006 00:41:34 +0000 Subject: [PATCH 049/842] Update to git-1.3.0 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7e00403..a5129fb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.2.6.tar.gz +git-1.3.0.tar.gz diff --git a/git.spec b/git.spec index 454dd74..011fe55 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.2.6 +Version: 1.3.0 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Wed Apr 19 2006 Chris Wright 1.3.0-1 +- git-1.3.0 + * Mon Apr 10 2006 Chris Wright 1.2.6-1 - git-1.2.6 diff --git a/sources b/sources index 6585b41..c24f963 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f10a13074e849ff8670f5dba07bfe5c1 git-1.2.6.tar.gz +37137c9f87b0082fbf04e6b80a5144e2 git-1.3.0.tar.gz From 14f6c3efa185aca0afe74b8e2ddc1de3725d5a07 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Sat, 29 Apr 2006 01:22:33 +0000 Subject: [PATCH 050/842] Update to git-1.3.1 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index a5129fb..679d762 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.3.0.tar.gz +git-1.3.1.tar.gz diff --git a/git.spec b/git.spec index 011fe55..2d1b396 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.3.0 +Version: 1.3.1 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Fri Apr 28 2006 Chris Wright 1.3.1-1 +- git-1.3.1 + * Wed Apr 19 2006 Chris Wright 1.3.0-1 - git-1.3.0 diff --git a/sources b/sources index c24f963..9ee2089 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -37137c9f87b0082fbf04e6b80a5144e2 git-1.3.0.tar.gz +c925fd87f01f5ba638ff06d21578405b git-1.3.1.tar.gz From d52d123f55973ad98c51bd74f5356822fbfcbe49 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Sat, 29 Apr 2006 01:28:51 +0000 Subject: [PATCH 051/842] Update to git-1.3.1 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index a5129fb..679d762 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.3.0.tar.gz +git-1.3.1.tar.gz diff --git a/git.spec b/git.spec index 011fe55..2d1b396 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.3.0 +Version: 1.3.1 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Fri Apr 28 2006 Chris Wright 1.3.1-1 +- git-1.3.1 + * Wed Apr 19 2006 Chris Wright 1.3.0-1 - git-1.3.0 diff --git a/sources b/sources index c24f963..9ee2089 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -37137c9f87b0082fbf04e6b80a5144e2 git-1.3.0.tar.gz +c925fd87f01f5ba638ff06d21578405b git-1.3.1.tar.gz From ac2b474ae01979275074646e3643129d4be0aaf3 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 4 May 2006 19:44:23 +0000 Subject: [PATCH 052/842] Update to git-1.3.2 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 679d762..4f5962f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.3.1.tar.gz +git-1.3.2.tar.gz diff --git a/git.spec b/git.spec index 2d1b396..b8364cc 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.3.1 +Version: 1.3.2 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu May 4 2006 Chris Wright 1.3.2-1 +- git-1.3.2 + * Fri Apr 28 2006 Chris Wright 1.3.1-1 - git-1.3.1 diff --git a/sources b/sources index 9ee2089..e0cc9c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c925fd87f01f5ba638ff06d21578405b git-1.3.1.tar.gz +df1405d45cb90114620007823b9e7658 git-1.3.2.tar.gz From d0c0bc6abc2ed42e8d606eaa9881abebd6c6b356 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 4 May 2006 19:48:01 +0000 Subject: [PATCH 053/842] Update to git-1.3.2 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 679d762..4f5962f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.3.1.tar.gz +git-1.3.2.tar.gz diff --git a/git.spec b/git.spec index 2d1b396..b8364cc 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.3.1 +Version: 1.3.2 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu May 4 2006 Chris Wright 1.3.2-1 +- git-1.3.2 + * Fri Apr 28 2006 Chris Wright 1.3.1-1 - git-1.3.1 diff --git a/sources b/sources index 9ee2089..e0cc9c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c925fd87f01f5ba638ff06d21578405b git-1.3.1.tar.gz +df1405d45cb90114620007823b9e7658 git-1.3.2.tar.gz From 5d2d73cb055ef261c4704b3ed1fb1d02e6cba457 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 16 May 2006 07:53:21 +0000 Subject: [PATCH 054/842] Update to git-1.3.3 --- .cvsignore | 2 +- git.spec | 21 ++++++++++----------- sources | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4f5962f..0e361f0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.3.2.tar.gz +git-1.3.3.tar.gz diff --git a/git.spec b/git.spec index b8364cc..9fcf150 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation -# Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.3.2 +Version: 1.3.3 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -10,7 +9,7 @@ URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core, git-svn, git-cvs, git-arch, %{?_with_email: git-email}, gitk +Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk %description This is a stupid (but extremely fast) directory content manager. It @@ -57,14 +56,12 @@ Requires: git-core = %{version}-%{release}, tla %description arch Git tools for importing Arch repositories. -%if %{?_with_email:1}0 %package email Summary: Git tools for sending email Group: Development/Tools Requires: git-core = %{version}-%{release} %description email Git tools for sending email. -%endif %package -n gitk Summary: Git revision tree visualiser ('gitk') @@ -77,18 +74,18 @@ Git revision tree visualiser ('gitk') %setup -q %build -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT -make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ +make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} mandir=%{_mandir} \ install %{!?_without_docs: install-doc} -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %endif %clean @@ -118,14 +115,12 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %{_mandir}/man1/*arch*.1*} %{!?_without_docs: %doc Documentation/*arch*.html } -%if %{?_with_email:1}0 %files email %defattr(-,root,root) %doc Documentation/*email*.txt %{_bindir}/*email* %{!?_without_docs: %{_mandir}/man1/*email*.1*} %{!?_without_docs: %doc Documentation/*email*.html } -%endif %files -n gitk %defattr(-,root,root) @@ -141,6 +136,10 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu May 4 2006 Chris Wright 1.3.3-1 +- git-1.3.3 +- enable git-email building, prereqs have been relaxed + * Thu May 4 2006 Chris Wright 1.3.2-1 - git-1.3.2 diff --git a/sources b/sources index e0cc9c0..5983906 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -df1405d45cb90114620007823b9e7658 git-1.3.2.tar.gz +e8bb8020d6336abd2d777549201d8c33 git-1.3.3.tar.gz From d3f3de17e7499a18e9110b8975dc5da5b15a5736 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 16 May 2006 08:13:29 +0000 Subject: [PATCH 055/842] Update to git-1.3.3 --- .cvsignore | 2 +- git.spec | 21 ++++++++++----------- sources | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4f5962f..0e361f0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.3.2.tar.gz +git-1.3.3.tar.gz diff --git a/git.spec b/git.spec index b8364cc..9fcf150 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation -# Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.3.2 +Version: 1.3.3 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -10,7 +9,7 @@ URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core, git-svn, git-cvs, git-arch, %{?_with_email: git-email}, gitk +Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk %description This is a stupid (but extremely fast) directory content manager. It @@ -57,14 +56,12 @@ Requires: git-core = %{version}-%{release}, tla %description arch Git tools for importing Arch repositories. -%if %{?_with_email:1}0 %package email Summary: Git tools for sending email Group: Development/Tools Requires: git-core = %{version}-%{release} %description email Git tools for sending email. -%endif %package -n gitk Summary: Git revision tree visualiser ('gitk') @@ -77,18 +74,18 @@ Git revision tree visualiser ('gitk') %setup -q %build -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT -make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ +make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} mandir=%{_mandir} \ install %{!?_without_docs: install-doc} -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %endif %clean @@ -118,14 +115,12 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %{_mandir}/man1/*arch*.1*} %{!?_without_docs: %doc Documentation/*arch*.html } -%if %{?_with_email:1}0 %files email %defattr(-,root,root) %doc Documentation/*email*.txt %{_bindir}/*email* %{!?_without_docs: %{_mandir}/man1/*email*.1*} %{!?_without_docs: %doc Documentation/*email*.html } -%endif %files -n gitk %defattr(-,root,root) @@ -141,6 +136,10 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu May 4 2006 Chris Wright 1.3.3-1 +- git-1.3.3 +- enable git-email building, prereqs have been relaxed + * Thu May 4 2006 Chris Wright 1.3.2-1 - git-1.3.2 diff --git a/sources b/sources index e0cc9c0..5983906 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -df1405d45cb90114620007823b9e7658 git-1.3.2.tar.gz +e8bb8020d6336abd2d777549201d8c33 git-1.3.3.tar.gz From c46c94a4c070e631d8504fe44b77bd4749c20a01 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 13 Jun 2006 23:21:51 +0000 Subject: [PATCH 056/842] Update to git-1.4.0 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0e361f0..6c28318 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.3.3.tar.gz +git-1.4.0.tar.gz diff --git a/git.spec b/git.spec index 9fcf150..dfcbacf 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.3.3 +Version: 1.4.0 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Tue Jun 13 2006 Chris Wright 1.4.0-1 +* git-1.4.0 + * Thu May 4 2006 Chris Wright 1.3.3-1 - git-1.3.3 - enable git-email building, prereqs have been relaxed diff --git a/sources b/sources index 5983906..7d510ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e8bb8020d6336abd2d777549201d8c33 git-1.3.3.tar.gz +d6f9bf04f1ba9bdd6ed207fdf1b0e45e git-1.4.0.tar.gz From 18aafd4f738c07d63bdd0d850ce95254a72fc324 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 13 Jun 2006 23:26:15 +0000 Subject: [PATCH 057/842] Update to git-1.4.0 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0e361f0..6c28318 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.3.3.tar.gz +git-1.4.0.tar.gz diff --git a/git.spec b/git.spec index 9fcf150..dfcbacf 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.3.3 +Version: 1.4.0 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Tue Jun 13 2006 Chris Wright 1.4.0-1 +* git-1.4.0 + * Thu May 4 2006 Chris Wright 1.3.3-1 - git-1.3.3 - enable git-email building, prereqs have been relaxed diff --git a/sources b/sources index 5983906..7d510ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e8bb8020d6336abd2d777549201d8c33 git-1.3.3.tar.gz +d6f9bf04f1ba9bdd6ed207fdf1b0e45e git-1.4.0.tar.gz From 74f764ca0764bcf158279097d34868db34bb4533 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Fri, 7 Jul 2006 06:51:50 +0000 Subject: [PATCH 058/842] Update to git-1.4.1 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6c28318..ce5848d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.4.0.tar.gz +git-1.4.1.tar.gz diff --git a/git.spec b/git.spec index dfcbacf..b05c747 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.4.0 +Version: 1.4.1 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -136,8 +136,11 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu Jul 6 2006 Chris Wright 1.4.1-1 +- git-1.4.1 + * Tue Jun 13 2006 Chris Wright 1.4.0-1 -* git-1.4.0 +- git-1.4.0 * Thu May 4 2006 Chris Wright 1.3.3-1 - git-1.3.3 diff --git a/sources b/sources index 7d510ce..020d96b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d6f9bf04f1ba9bdd6ed207fdf1b0e45e git-1.4.0.tar.gz +2c00c5aea4d5c44d1ce107ef98c84bdd git-1.4.1.tar.gz From f1e3764cf16968b758d649059a332accae9243cd Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Fri, 7 Jul 2006 06:54:56 +0000 Subject: [PATCH 059/842] Update to git-1.4.1 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6c28318..ce5848d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.4.0.tar.gz +git-1.4.1.tar.gz diff --git a/git.spec b/git.spec index dfcbacf..b05c747 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.4.0 +Version: 1.4.1 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -136,8 +136,11 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu Jul 6 2006 Chris Wright 1.4.1-1 +- git-1.4.1 + * Tue Jun 13 2006 Chris Wright 1.4.0-1 -* git-1.4.0 +- git-1.4.0 * Thu May 4 2006 Chris Wright 1.3.3-1 - git-1.3.3 diff --git a/sources b/sources index 7d510ce..020d96b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d6f9bf04f1ba9bdd6ed207fdf1b0e45e git-1.4.0.tar.gz +2c00c5aea4d5c44d1ce107ef98c84bdd git-1.4.1.tar.gz From d7f5e05d312b45aef4d0d8ac4c7d337f01fdc025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Aug 2006 20:26:31 +0000 Subject: [PATCH 060/842] http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild --- needs.rebuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 0d6d831e19774672fc118658ad923a322ae7d79a Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 11 Sep 2006 22:50:53 +0000 Subject: [PATCH 061/842] Update to git-1.4.2 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index ce5848d..58a6a5a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.4.1.tar.gz +git-1.4.2.tar.gz diff --git a/git.spec b/git.spec index b05c747..9ffa9ad 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.4.1 +Version: 1.4.2 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Mon Sep 11 2006 Chris Wright 1.4.2-1 +- git-1.4.2 + * Thu Jul 6 2006 Chris Wright 1.4.1-1 - git-1.4.1 diff --git a/sources b/sources index 020d96b..f8538dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c00c5aea4d5c44d1ce107ef98c84bdd git-1.4.1.tar.gz +2c20f04363f2944d3d8b00781fe02239 git-1.4.2.tar.gz From 4282f061b90e784bf321df9988bdfeabb3db3a2d Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 11 Sep 2006 22:53:46 +0000 Subject: [PATCH 062/842] Update to git-1.4.2 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index ce5848d..58a6a5a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.4.1.tar.gz +git-1.4.2.tar.gz diff --git a/git.spec b/git.spec index b05c747..9ffa9ad 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.4.1 +Version: 1.4.2 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Mon Sep 11 2006 Chris Wright 1.4.2-1 +- git-1.4.2 + * Thu Jul 6 2006 Chris Wright 1.4.1-1 - git-1.4.1 diff --git a/sources b/sources index 020d96b..f8538dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c00c5aea4d5c44d1ce107ef98c84bdd git-1.4.1.tar.gz +2c20f04363f2944d3d8b00781fe02239 git-1.4.2.tar.gz From 377d7cec350a87a709fd6f91ca99a021ca899844 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 11 Sep 2006 23:22:39 +0000 Subject: [PATCH 063/842] Updated git and resubmitted build, should no longer need rebuild. --- needs.rebuild | 1 - 1 file changed, 1 deletion(-) delete mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 5d505ae0446e4cef9878a03a6478f28ddf7e82e6 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Fri, 22 Sep 2006 18:10:26 +0000 Subject: [PATCH 064/842] Update to git-1.4.2.1 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 58a6a5a..0cecf47 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.4.2.tar.gz +git-1.4.2.1.tar.gz diff --git a/git.spec b/git.spec index 9ffa9ad..ebf3c22 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.4.2 +Version: 1.4.2.1 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Fri Sep 22 2006 Chris Wright 1.4.2.1-1 +- git-1.4.2.1 + * Mon Sep 11 2006 Chris Wright 1.4.2-1 - git-1.4.2 diff --git a/sources b/sources index f8538dc..4d86ddb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c20f04363f2944d3d8b00781fe02239 git-1.4.2.tar.gz +3077983e34cea955b0f5cacb39b307e7 git-1.4.2.1.tar.gz From 45bceb8e3a06f1a73e3e8d036b54954819e0efa5 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Fri, 22 Sep 2006 18:14:25 +0000 Subject: [PATCH 065/842] Update to git-1.4.2.1 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 58a6a5a..0cecf47 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.4.2.tar.gz +git-1.4.2.1.tar.gz diff --git a/git.spec b/git.spec index 9ffa9ad..ebf3c22 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.4.2 +Version: 1.4.2.1 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Fri Sep 22 2006 Chris Wright 1.4.2.1-1 +- git-1.4.2.1 + * Mon Sep 11 2006 Chris Wright 1.4.2-1 - git-1.4.2 diff --git a/sources b/sources index f8538dc..4d86ddb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c20f04363f2944d3d8b00781fe02239 git-1.4.2.tar.gz +3077983e34cea955b0f5cacb39b307e7 git-1.4.2.1.tar.gz From 616f3a0a3ba98e897435101f18865e09ce6a0793 Mon Sep 17 00:00:00 2001 From: Christian Iseli Date: Wed, 4 Oct 2006 22:27:47 +0000 Subject: [PATCH 066/842] automated bump and rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index ebf3c22..9e2e614 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools @@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu Oct 05 2006 Christian Iseli 1.4.2.1-2 + - rebuilt for unwind info generation, broken in gcc-4.1.1-21 + * Fri Sep 22 2006 Chris Wright 1.4.2.1-1 - git-1.4.2.1 From e9a29724028f774930a56b46097b097df608f601 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 5 Oct 2006 05:00:10 +0000 Subject: [PATCH 067/842] Update to git-1.4.2.3 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0cecf47..233457c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.4.2.1.tar.gz +git-1.4.2.3.tar.gz diff --git a/git.spec b/git.spec index ebf3c22..a8f1515 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.4.2.1 +Version: 1.4.2.3 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Wed Oct 4 2006 Chris Wright 1.4.2.3-1 +- git-1.4.2.3 + * Fri Sep 22 2006 Chris Wright 1.4.2.1-1 - git-1.4.2.1 diff --git a/sources b/sources index 4d86ddb..628ec31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3077983e34cea955b0f5cacb39b307e7 git-1.4.2.1.tar.gz +3b1de2bcf5123494d79b1b1b84e498fc git-1.4.2.3.tar.gz From bbfac7006e700604f4c6860fdfeaf4e5a9f967cf Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 5 Oct 2006 05:02:54 +0000 Subject: [PATCH 068/842] Update to git-1.4.2.3 --- .cvsignore | 2 +- git.spec | 8 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0cecf47..233457c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.4.2.1.tar.gz +git-1.4.2.3.tar.gz diff --git a/git.spec b/git.spec index 9e2e614..a8f1515 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.4.2.1 -Release: 2%{?dist} +Version: 1.4.2.3 +Release: 1%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools @@ -136,8 +136,8 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog -* Thu Oct 05 2006 Christian Iseli 1.4.2.1-2 - - rebuilt for unwind info generation, broken in gcc-4.1.1-21 +* Wed Oct 4 2006 Chris Wright 1.4.2.3-1 +- git-1.4.2.3 * Fri Sep 22 2006 Chris Wright 1.4.2.1-1 - git-1.4.2.1 diff --git a/sources b/sources index 4d86ddb..628ec31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3077983e34cea955b0f5cacb39b307e7 git-1.4.2.1.tar.gz +3b1de2bcf5123494d79b1b1b84e498fc git-1.4.2.3.tar.gz From 7850b1c1a1043c808dfdabaca0bea5e27b71eed5 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 17 Oct 2006 18:31:21 +0000 Subject: [PATCH 069/842] Update to git-1.4.2.4 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 233457c..6e343b5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.4.2.3.tar.gz +git-1.4.2.4.tar.gz diff --git a/git.spec b/git.spec index a8f1515..692f7e4 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.4.2.3 +Version: 1.4.2.4 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Tue Oct 17 2006 Chris Wright 1.4.2.4-1 +- git-1.4.2.4 + * Wed Oct 4 2006 Chris Wright 1.4.2.3-1 - git-1.4.2.3 diff --git a/sources b/sources index 628ec31..d885a62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3b1de2bcf5123494d79b1b1b84e498fc git-1.4.2.3.tar.gz +285f8b7a57f3062217e9fb5fb53836a5 git-1.4.2.4.tar.gz From c2dafda69fe03270229c3b486800b7ddb43e6440 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Wed, 18 Oct 2006 04:14:35 +0000 Subject: [PATCH 070/842] Update to git-1.4.2.4 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 233457c..6e343b5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.4.2.3.tar.gz +git-1.4.2.4.tar.gz diff --git a/git.spec b/git.spec index a8f1515..692f7e4 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.4.2.3 +Version: 1.4.2.4 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Tue Oct 17 2006 Chris Wright 1.4.2.4-1 +- git-1.4.2.4 + * Wed Oct 4 2006 Chris Wright 1.4.2.3-1 - git-1.4.2.3 diff --git a/sources b/sources index 628ec31..d885a62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3b1de2bcf5123494d79b1b1b84e498fc git-1.4.2.3.tar.gz +285f8b7a57f3062217e9fb5fb53836a5 git-1.4.2.4.tar.gz From d22aa95b519a2de423a26fa971b29584714abc2e Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Mon, 6 Nov 2006 15:35:52 +0000 Subject: [PATCH 071/842] - rebuild against the new curl --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 692f7e4..3895f77 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.4.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools @@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Mon Nov 6 2006 Jindrich Novy 1.4.2.4-2 +- rebuild against the new curl + * Tue Oct 17 2006 Chris Wright 1.4.2.4-1 - git-1.4.2.4 From d8f9dac0cc9ace3dbd6baac30956b2c82bb40ac3 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Sun, 10 Dec 2006 22:33:20 +0000 Subject: [PATCH 072/842] Update to git-1.4.4.2 --- .cvsignore | 2 +- git.spec | 42 ++++++++++++++++++++++++++++++++---------- sources | 2 +- 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6e343b5..ca2ed08 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.4.2.4.tar.gz +git-1.4.4.2.tar.gz diff --git a/git.spec b/git.spec index 3895f77..7726355 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.4.2.4 -Release: 2%{?dist} +Version: 1.4.4.2 +Release: 1%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools @@ -9,7 +9,7 @@ URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk +Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, perl-Git %description This is a stupid (but extremely fast) directory content manager. It @@ -70,6 +70,16 @@ Requires: git-core = %{version}-%{release}, tk >= 8.4 %description -n gitk Git revision tree visualiser ('gitk') +%package -n perl-Git +Summary: Perl interface to Git +Group: Development/Libraries +Requires: git-core = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl(Error) + +%description -n perl-Git +Perl interface to Git + %prep %setup -q @@ -80,12 +90,18 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ %install rm -rf $RPM_BUILD_ROOT make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ - prefix=%{_prefix} mandir=%{_mandir} \ + prefix=%{_prefix} mandir=%{_mandir} INSTALLDIRS=vendor \ install %{!?_without_docs: install-doc} +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +%else +rm -rf $RPM_BUILD_ROOT%{_mandir} %endif %clean @@ -110,10 +126,10 @@ rm -rf $RPM_BUILD_ROOT %files arch %defattr(-,root,root) -%doc Documentation/*arch*.txt -%{_bindir}/*arch* -%{!?_without_docs: %{_mandir}/man1/*arch*.1*} -%{!?_without_docs: %doc Documentation/*arch*.html } +%doc Documentation/git-archimport.txt +%{_bindir}/git-archimport +%{!?_without_docs: %{_mandir}/man1/git-archimport.1*} +%{!?_without_docs: %doc Documentation/git-archimport.html } %files email %defattr(-,root,root) @@ -129,6 +145,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %{_mandir}/man1/*gitk*.1*} %{!?_without_docs: %doc Documentation/*gitk*.html } +%files -n perl-Git -f perl-files +%defattr(-,root,root) + %files core -f bin-man-doc-files %defattr(-,root,root) %{_datadir}/git-core/ @@ -136,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Sun Dec 10 2006 Chris Wright 1.4.4.2-1 +- git-1.4.4.2 + * Mon Nov 6 2006 Jindrich Novy 1.4.2.4-2 - rebuild against the new curl diff --git a/sources b/sources index d885a62..4046dd8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -285f8b7a57f3062217e9fb5fb53836a5 git-1.4.2.4.tar.gz +e659d672930ed5144ab20df4d6958007 git-1.4.4.2.tar.gz From 9c66fe54a1170e81362327c03930ddaa76f84433 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Sun, 10 Dec 2006 22:35:27 +0000 Subject: [PATCH 073/842] Update to git-1.4.4.2 --- .cvsignore | 2 +- git.spec | 40 +++++++++++++++++++++++++++++++--------- sources | 2 +- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6e343b5..ca2ed08 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.4.2.4.tar.gz +git-1.4.4.2.tar.gz diff --git a/git.spec b/git.spec index 692f7e4..400fd3f 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.4.2.4 +Version: 1.4.4.2 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -9,7 +9,7 @@ URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk +Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, perl-Git %description This is a stupid (but extremely fast) directory content manager. It @@ -70,6 +70,16 @@ Requires: git-core = %{version}-%{release}, tk >= 8.4 %description -n gitk Git revision tree visualiser ('gitk') +%package -n perl-Git +Summary: Perl interface to Git +Group: Development/Libraries +Requires: git-core = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl(Error) + +%description -n perl-Git +Perl interface to Git + %prep %setup -q @@ -80,12 +90,18 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ %install rm -rf $RPM_BUILD_ROOT make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ - prefix=%{_prefix} mandir=%{_mandir} \ + prefix=%{_prefix} mandir=%{_mandir} INSTALLDIRS=vendor \ install %{!?_without_docs: install-doc} +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +%else +rm -rf $RPM_BUILD_ROOT%{_mandir} %endif %clean @@ -110,10 +126,10 @@ rm -rf $RPM_BUILD_ROOT %files arch %defattr(-,root,root) -%doc Documentation/*arch*.txt -%{_bindir}/*arch* -%{!?_without_docs: %{_mandir}/man1/*arch*.1*} -%{!?_without_docs: %doc Documentation/*arch*.html } +%doc Documentation/git-archimport.txt +%{_bindir}/git-archimport +%{!?_without_docs: %{_mandir}/man1/git-archimport.1*} +%{!?_without_docs: %doc Documentation/git-archimport.html } %files email %defattr(-,root,root) @@ -129,6 +145,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %{_mandir}/man1/*gitk*.1*} %{!?_without_docs: %doc Documentation/*gitk*.html } +%files -n perl-Git -f perl-files +%defattr(-,root,root) + %files core -f bin-man-doc-files %defattr(-,root,root) %{_datadir}/git-core/ @@ -136,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Sun Dec 10 2006 Chris Wright 1.4.4.2-1 +- git-1.4.4.2 + * Tue Oct 17 2006 Chris Wright 1.4.2.4-1 - git-1.4.2.4 diff --git a/sources b/sources index d885a62..4046dd8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -285f8b7a57f3062217e9fb5fb53836a5 git-1.4.2.4.tar.gz +e659d672930ed5144ab20df4d6958007 git-1.4.4.2.tar.gz From d0ec876d176b7fc5e83a2688956e95eae1408eb6 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 11 Dec 2006 09:01:15 +0000 Subject: [PATCH 074/842] couple minor git fixes --- ...oid-miscounting-bytes-in-Perl-v5.8.x.patch | 32 +++++++++++++++++++ git-install-non-executable-doc-files.patch | 22 +++++++++++++ git.spec | 13 +++++++- 3 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch create mode 100644 git-install-non-executable-doc-files.patch diff --git a/cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch b/cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch new file mode 100644 index 0000000..ef01f4d --- /dev/null +++ b/cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch @@ -0,0 +1,32 @@ +From 4f88d3e0cbf443cd309c2c881209f3366f14023d Mon Sep 17 00:00:00 2001 +From: Martin Langhoff +Date: Thu, 7 Dec 2006 16:38:50 +1300 +Subject: [PATCH] cvsserver: Avoid miscounting bytes in Perl v5.8.x + +At some point between v5.6 and 5.8 Perl started to assume its input, +output and filehandles are UTF-8. This breaks the counting of bytes +for the CVS protocol, resulting in the client expecting less data +than we actually send, and storing truncated files. + +Signed-off-by: Martin Langhoff +Signed-off-by: Junio C Hamano +Signed-off-by: Chris Wright +--- + git-cvsserver.perl | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/git-cvsserver.perl b/git-cvsserver.perl +index ca519b7..197014d 100755 +--- a/git-cvsserver.perl ++++ b/git-cvsserver.perl +@@ -17,6 +17,7 @@ + + use strict; + use warnings; ++use bytes; + + use Fcntl; + use File::Temp qw/tempdir tempfile/; +-- +1.4.4.2 + diff --git a/git-install-non-executable-doc-files.patch b/git-install-non-executable-doc-files.patch new file mode 100644 index 0000000..4f19f23 --- /dev/null +++ b/git-install-non-executable-doc-files.patch @@ -0,0 +1,22 @@ +No need to install documentation files as executable. + +Signed-off-by: Chris Wright +--- + Documentation/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Documentation/Makefile b/Documentation/Makefile +index c00f5f6..d68bc4a 100644 +--- a/Documentation/Makefile ++++ b/Documentation/Makefile +@@ -56,8 +56,8 @@ man7: $(DOC_MAN7) + + install: man + $(INSTALL) -d -m755 $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir) +- $(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1dir) +- $(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7dir) ++ $(INSTALL) -m644 $(DOC_MAN1) $(DESTDIR)$(man1dir) ++ $(INSTALL) -m644 $(DOC_MAN7) $(DESTDIR)$(man7dir) + + + # diff --git a/git.spec b/git.spec index 400fd3f..bc7db6e 100644 --- a/git.spec +++ b/git.spec @@ -1,12 +1,14 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.4.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz +Patch0: git-install-non-executable-doc-files.patch +Patch1: cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, perl-Git @@ -82,6 +84,8 @@ Perl interface to Git %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ @@ -155,9 +159,16 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Sun Dec 10 2006 Chris Wright 1.4.4.2-2 +- no need to install manpages executable (bz 216790) +- use bytes for git-cvsserver + * Sun Dec 10 2006 Chris Wright 1.4.4.2-1 - git-1.4.4.2 +* Mon Nov 6 2006 Jindrich Novy 1.4.2.4-2 +- rebuild against the new curl + * Tue Oct 17 2006 Chris Wright 1.4.2.4-1 - git-1.4.2.4 From ae67d257ac7778c79eee5b47b6523ff66161f039 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 11 Dec 2006 09:06:32 +0000 Subject: [PATCH 075/842] couple minor git fixes --- ...oid-miscounting-bytes-in-Perl-v5.8.x.patch | 32 +++++++++++++++++++ git-install-non-executable-doc-files.patch | 22 +++++++++++++ git.spec | 10 +++++- 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch create mode 100644 git-install-non-executable-doc-files.patch diff --git a/cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch b/cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch new file mode 100644 index 0000000..ef01f4d --- /dev/null +++ b/cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch @@ -0,0 +1,32 @@ +From 4f88d3e0cbf443cd309c2c881209f3366f14023d Mon Sep 17 00:00:00 2001 +From: Martin Langhoff +Date: Thu, 7 Dec 2006 16:38:50 +1300 +Subject: [PATCH] cvsserver: Avoid miscounting bytes in Perl v5.8.x + +At some point between v5.6 and 5.8 Perl started to assume its input, +output and filehandles are UTF-8. This breaks the counting of bytes +for the CVS protocol, resulting in the client expecting less data +than we actually send, and storing truncated files. + +Signed-off-by: Martin Langhoff +Signed-off-by: Junio C Hamano +Signed-off-by: Chris Wright +--- + git-cvsserver.perl | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/git-cvsserver.perl b/git-cvsserver.perl +index ca519b7..197014d 100755 +--- a/git-cvsserver.perl ++++ b/git-cvsserver.perl +@@ -17,6 +17,7 @@ + + use strict; + use warnings; ++use bytes; + + use Fcntl; + use File::Temp qw/tempdir tempfile/; +-- +1.4.4.2 + diff --git a/git-install-non-executable-doc-files.patch b/git-install-non-executable-doc-files.patch new file mode 100644 index 0000000..4f19f23 --- /dev/null +++ b/git-install-non-executable-doc-files.patch @@ -0,0 +1,22 @@ +No need to install documentation files as executable. + +Signed-off-by: Chris Wright +--- + Documentation/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Documentation/Makefile b/Documentation/Makefile +index c00f5f6..d68bc4a 100644 +--- a/Documentation/Makefile ++++ b/Documentation/Makefile +@@ -56,8 +56,8 @@ man7: $(DOC_MAN7) + + install: man + $(INSTALL) -d -m755 $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir) +- $(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1dir) +- $(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7dir) ++ $(INSTALL) -m644 $(DOC_MAN1) $(DESTDIR)$(man1dir) ++ $(INSTALL) -m644 $(DOC_MAN7) $(DESTDIR)$(man7dir) + + + # diff --git a/git.spec b/git.spec index 7726355..bc7db6e 100644 --- a/git.spec +++ b/git.spec @@ -1,12 +1,14 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.4.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz +Patch0: git-install-non-executable-doc-files.patch +Patch1: cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, perl-Git @@ -82,6 +84,8 @@ Perl interface to Git %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ @@ -155,6 +159,10 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Sun Dec 10 2006 Chris Wright 1.4.4.2-2 +- no need to install manpages executable (bz 216790) +- use bytes for git-cvsserver + * Sun Dec 10 2006 Chris Wright 1.4.4.2-1 - git-1.4.4.2 From 8a7ece38d18d18595c1eb107ed60621b4ffde635 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 26 Feb 2007 22:41:39 +0000 Subject: [PATCH 076/842] Update to git-1.5.0.2 --- .cvsignore | 2 +- ...oid-miscounting-bytes-in-Perl-v5.8.x.patch | 32 ---------- git-install-non-executable-doc-files.patch | 22 ------- git.spec | 63 ++++++++++++------- sources | 2 +- 5 files changed, 42 insertions(+), 79 deletions(-) delete mode 100644 cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch delete mode 100644 git-install-non-executable-doc-files.patch diff --git a/.cvsignore b/.cvsignore index ca2ed08..ca282a9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.4.4.2.tar.gz +git-1.5.0.2.tar.gz diff --git a/cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch b/cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch deleted file mode 100644 index ef01f4d..0000000 --- a/cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4f88d3e0cbf443cd309c2c881209f3366f14023d Mon Sep 17 00:00:00 2001 -From: Martin Langhoff -Date: Thu, 7 Dec 2006 16:38:50 +1300 -Subject: [PATCH] cvsserver: Avoid miscounting bytes in Perl v5.8.x - -At some point between v5.6 and 5.8 Perl started to assume its input, -output and filehandles are UTF-8. This breaks the counting of bytes -for the CVS protocol, resulting in the client expecting less data -than we actually send, and storing truncated files. - -Signed-off-by: Martin Langhoff -Signed-off-by: Junio C Hamano -Signed-off-by: Chris Wright ---- - git-cvsserver.perl | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/git-cvsserver.perl b/git-cvsserver.perl -index ca519b7..197014d 100755 ---- a/git-cvsserver.perl -+++ b/git-cvsserver.perl -@@ -17,6 +17,7 @@ - - use strict; - use warnings; -+use bytes; - - use Fcntl; - use File::Temp qw/tempdir tempfile/; --- -1.4.4.2 - diff --git a/git-install-non-executable-doc-files.patch b/git-install-non-executable-doc-files.patch deleted file mode 100644 index 4f19f23..0000000 --- a/git-install-non-executable-doc-files.patch +++ /dev/null @@ -1,22 +0,0 @@ -No need to install documentation files as executable. - -Signed-off-by: Chris Wright ---- - Documentation/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Documentation/Makefile b/Documentation/Makefile -index c00f5f6..d68bc4a 100644 ---- a/Documentation/Makefile -+++ b/Documentation/Makefile -@@ -56,8 +56,8 @@ man7: $(DOC_MAN7) - - install: man - $(INSTALL) -d -m755 $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir) -- $(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1dir) -- $(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7dir) -+ $(INSTALL) -m644 $(DOC_MAN1) $(DESTDIR)$(man1dir) -+ $(INSTALL) -m644 $(DOC_MAN7) $(DESTDIR)$(man7dir) - - - # diff --git a/git.spec b/git.spec index bc7db6e..f0fe843 100644 --- a/git.spec +++ b/git.spec @@ -1,39 +1,31 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.4.4.2 -Release: 2%{?dist} +Version: 1.5.0.2 +Release: 1%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz -Patch0: git-install-non-executable-doc-files.patch -Patch1: cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, perl-Git +Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, perl-Git %description -This is a stupid (but extremely fast) directory content manager. It -doesn't do a whole lot, but what it _does_ do is track directory -contents efficiently. It is intended to be the base of an efficient, -distributed source code management system. This package includes -rudimentary tools that can be used as a SCM, but you should look -elsewhere for tools for ordinary humans layered on top of this. +Git is a fast, scalable, distributed revision control system with an +unusually rich command set that provides both high-level operations +and full access to internals. This is a dummy package which brings in all subpackages. %package core Summary: Core git tools Group: Development/Tools -Requires: zlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, expat +Requires: zlib >= 1.2, rsync, curl, less, openssh-clients, expat %description core -This is a stupid (but extremely fast) directory content manager. It -doesn't do a whole lot, but what it _does_ do is track directory -contents efficiently. It is intended to be the base of an efficient, -distributed source code management system. This package includes -rudimentary tools that can be used as a SCM, but you should look -elsewhere for tools for ordinary humans layered on top of this. +Git is a fast, scalable, distributed revision control system with an +unusually rich command set that provides both high-level operations +and full access to internals. These are the core tools with minimal dependencies. @@ -65,6 +57,13 @@ Requires: git-core = %{version}-%{release} %description email Git tools for sending email. +%package gui +Summary: Git GUI tool +Group: Development/Tools +Requires: git-core = %{version}-%{release}, tk >= 8.4 +%description gui +Git GUI tool + %package -n gitk Summary: Git revision tree visualiser ('gitk') Group: Development/Tools @@ -84,8 +83,6 @@ Perl interface to Git %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ @@ -93,17 +90,18 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ %install rm -rf $RPM_BUILD_ROOT -make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \ + WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} mandir=%{_mandir} INSTALLDIRS=vendor \ install %{!?_without_docs: install-doc} find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files (find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %else rm -rf $RPM_BUILD_ROOT%{_mandir} %endif @@ -142,6 +140,16 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %{_mandir}/man1/*email*.1*} %{!?_without_docs: %doc Documentation/*email*.html } +%files gui +%defattr(-,root,root) +%{_bindir}/git-gui +%{_bindir}/git-citool +# Not Yet... +# %{!?_without_docs: %{_mandir}/man1/git-gui.1} +# %{!?_without_docs: %doc Documentation/git-gui.html} +# %{!?_without_docs: %{_mandir}/man1/git-citool.1} +# %{!?_without_docs: %doc Documentation/git-citool.html} + %files -n gitk %defattr(-,root,root) %doc Documentation/*gitk*.txt @@ -159,6 +167,15 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Mon Feb 26 2007 Chris Wright 1.5.0.2-1 +- git-1.5.0.2 + +* Mon Feb 13 2007 Nicolas Pitre +- Update core package description (Git isn't as stupid as it used to be) + +* Mon Feb 12 2007 Junio C Hamano +- Add git-gui and git-citool. + * Sun Dec 10 2006 Chris Wright 1.4.4.2-2 - no need to install manpages executable (bz 216790) - use bytes for git-cvsserver diff --git a/sources b/sources index 4046dd8..4b18025 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e659d672930ed5144ab20df4d6958007 git-1.4.4.2.tar.gz +7bdc4894ece40e0219f259f64750978d git-1.5.0.2.tar.gz From 29dba59fb4ed65693a2371d24d96b3ab4d3f5f8c Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Fri, 2 Mar 2007 21:53:30 +0000 Subject: [PATCH 077/842] Fix BuildRequires for new perl --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index f0fe843..611709d 100644 --- a/git.spec +++ b/git.spec @@ -1,13 +1,13 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz -BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} +BuildRequires: perl-devel, zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, perl-Git @@ -167,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Fri Mar 2 2007 Chris Wright 1.5.0.2-2 +- BuildRequires perl-devel as of perl-5.8.8-14 (bz 230680) + * Mon Feb 26 2007 Chris Wright 1.5.0.2-1 - git-1.5.0.2 From f0090ff29ee08c69a170a3394a69b0adfea4e94f Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 13 Mar 2007 21:02:08 +0000 Subject: [PATCH 078/842] Update to git-1.5.0.3 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index ca282a9..eb468e3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.0.2.tar.gz +git-1.5.0.3.tar.gz diff --git a/git.spec b/git.spec index 611709d..c99d6d0 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.0.2 -Release: 2%{?dist} +Version: 1.5.0.3 +Release: 1%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools @@ -167,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Tue Mar 13 2007 Chris Wright 1.5.0.3-1 +- git-1.5.0.3 + * Fri Mar 2 2007 Chris Wright 1.5.0.2-2 - BuildRequires perl-devel as of perl-5.8.8-14 (bz 230680) diff --git a/sources b/sources index 4b18025..1459854 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7bdc4894ece40e0219f259f64750978d git-1.5.0.2.tar.gz +eed1b888334310bb0e7f3f7e4f074963 git-1.5.0.3.tar.gz From ac210a5ddd09d9dbc3f0cc86fcdb975e36ef8a47 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 19 Mar 2007 21:50:01 +0000 Subject: [PATCH 079/842] Update to git-1.5.0.5 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index eb468e3..23afead 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.0.3.tar.gz +git-1.5.0.5.tar.gz diff --git a/git.spec b/git.spec index c99d6d0..2230f27 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.0.3 +Version: 1.5.0.5 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -167,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Mon Mar 19 2007 Chris Wright 1.5.0.5-1 +- git-1.5.0.5 + * Tue Mar 13 2007 Chris Wright 1.5.0.3-1 - git-1.5.0.3 diff --git a/sources b/sources index 1459854..cf42138 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eed1b888334310bb0e7f3f7e4f074963 git-1.5.0.3.tar.gz +f7e6406f27464517cf9b718f8541dcb1 git-1.5.0.5.tar.gz From 9fc60a6f1af39c4bf5ff820a1614982845aca96b Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Fri, 30 Mar 2007 17:50:32 +0000 Subject: [PATCH 080/842] Update to git-1.5.0.6 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 23afead..e8e0fe7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.0.5.tar.gz +git-1.5.0.6.tar.gz diff --git a/git.spec b/git.spec index 2230f27..0738653 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.0.5 +Version: 1.5.0.6 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -167,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Fri Mar 30 2007 Chris Wright 1.5.0.6-1 +- git-1.5.0.6 + * Mon Mar 19 2007 Chris Wright 1.5.0.5-1 - git-1.5.0.5 diff --git a/sources b/sources index cf42138..43c7921 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f7e6406f27464517cf9b718f8541dcb1 git-1.5.0.5.tar.gz +d9564417eadc424d4dd7616339fa9b2f git-1.5.0.6.tar.gz From a034ecc3617ee90df0933f0141e701d1b125d1f4 Mon Sep 17 00:00:00 2001 From: jbowes Date: Fri, 8 Jun 2007 16:22:14 +0000 Subject: [PATCH 081/842] git-1.5.2.1-1 for rawhide --- .cvsignore | 2 +- git.spec | 25 +++++++++++++++++++------ sources | 2 +- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index e8e0fe7..8239acc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.0.6.tar.gz +git-1.5.2.1.tar.gz diff --git a/git.spec b/git.spec index 0738653..44a488b 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.0.6 +Version: 1.5.2.1 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -85,15 +85,16 @@ Perl interface to Git %setup -q %build -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ + ETC_GITCONFIG=/etc/gitconfig \ prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \ - WITH_OWN_SUBPROCESS_PY=YesPlease \ - prefix=%{_prefix} mandir=%{_mandir} INSTALLDIRS=vendor \ - install %{!?_without_docs: install-doc} + prefix=%{_prefix} mandir=%{_mandir} \ + ETC_GITCONFIG=/etc/gitconfig \ + INSTALLDIRS=vendor install %{!?_without_docs: install-doc} find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' @@ -144,6 +145,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_bindir}/git-gui %{_bindir}/git-citool +%{_datadir}/git-gui/ # Not Yet... # %{!?_without_docs: %{_mandir}/man1/git-gui.1} # %{!?_without_docs: %doc Documentation/git-gui.html} @@ -164,9 +166,20 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_datadir}/git-core/ %doc README COPYING Documentation/*.txt -%{!?_without_docs: %doc Documentation/*.html } +%{!?_without_docs: %doc Documentation/*.html Documentation/howto} +%{!?_without_docs: %doc Documentation/technical} %changelog +* Fri Jun 08 2007 James Bowes 1.5.2.1-1 +- git-1.5.2.1 + +* Tue May 13 2007 Quy Tonthat +- Added lib files for git-gui +- Added Documentation/technical (As needed by Git Users Manual) + +* Tue May 8 2007 Quy Tonthat +- Added howto files + * Fri Mar 30 2007 Chris Wright 1.5.0.6-1 - git-1.5.0.6 diff --git a/sources b/sources index 43c7921..943574d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d9564417eadc424d4dd7616339fa9b2f git-1.5.0.6.tar.gz +e65b08c2e1a4112c3139c15ac5a13e71 git-1.5.2.1.tar.gz From 54174e5cf05ee5008e689484a4d8ee1cfdb014f6 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Fri, 8 Jun 2007 19:49:42 +0000 Subject: [PATCH 082/842] Initialize branch EL-4 for git --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..6ec5cef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-4 From 847e262a5424899b958d6640451d6cfcbfcb3756 Mon Sep 17 00:00:00 2001 From: jbowes Date: Mon, 18 Jun 2007 17:22:45 +0000 Subject: [PATCH 083/842] git-1.5.2.2 for rawhide --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8239acc..d6e9e55 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.2.1.tar.gz +git-1.5.2.2.tar.gz diff --git a/git.spec b/git.spec index 44a488b..dcc759f 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.2.1 +Version: 1.5.2.2 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Mon Jun 18 2007 James Bowes 1.5.2.2-1 +- git-1.5.2.2 + * Fri Jun 08 2007 James Bowes 1.5.2.1-1 - git-1.5.2.1 diff --git a/sources b/sources index 943574d..c3c97df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e65b08c2e1a4112c3139c15ac5a13e71 git-1.5.2.1.tar.gz +6a0f39577cbfbb575edb3c45d8f5d528 git-1.5.2.2.tar.gz From e46bac574f5e9290432d418039cfe6a314daa59a Mon Sep 17 00:00:00 2001 From: jwboyer Date: Fri, 22 Jun 2007 13:21:35 +0000 Subject: [PATCH 084/842] Add emacs-git package from Ville (#235431) --- git-init.el | 2 ++ git.spec | 42 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 git-init.el diff --git a/git-init.el b/git-init.el new file mode 100644 index 0000000..5b7eb3e --- /dev/null +++ b/git-init.el @@ -0,0 +1,2 @@ +;; Git VC backend +(add-to-list 'vc-handled-backends 'GIT t) diff --git a/git.spec b/git.spec index dcc759f..70fc502 100644 --- a/git.spec +++ b/git.spec @@ -1,15 +1,16 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz -BuildRequires: perl-devel, zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} +Source1: git-init.el +BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, perl-Git +Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, perl-Git, emacs-git %description Git is a fast, scalable, distributed revision control system with an @@ -62,24 +63,32 @@ Summary: Git GUI tool Group: Development/Tools Requires: git-core = %{version}-%{release}, tk >= 8.4 %description gui -Git GUI tool +Git GUI tool. %package -n gitk -Summary: Git revision tree visualiser ('gitk') +Summary: Git revision tree visualiser Group: Development/Tools Requires: git-core = %{version}-%{release}, tk >= 8.4 %description -n gitk -Git revision tree visualiser ('gitk') +Git revision tree visualiser. %package -n perl-Git Summary: Perl interface to Git Group: Development/Libraries Requires: git-core = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -BuildRequires: perl(Error) +BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) %description -n perl-Git -Perl interface to Git +Perl interface to Git. + +%package -n emacs-git +Summary: Git version control system support for Emacs +Group: Applications/Editors +Requires: git-core = %{version}-%{release}, emacs-common + +%description -n emacs-git +%{summary}. %prep %setup -q @@ -88,6 +97,7 @@ Perl interface to Git make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ ETC_GITCONFIG=/etc/gitconfig \ prefix=%{_prefix} all %{!?_without_docs: doc} +make -C contrib/emacs %install rm -rf $RPM_BUILD_ROOT @@ -95,6 +105,14 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \ prefix=%{_prefix} mandir=%{_mandir} \ ETC_GITCONFIG=/etc/gitconfig \ INSTALLDIRS=vendor install %{!?_without_docs: install-doc} +make -C contrib/emacs install \ + emacsdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp +for elc in $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/*.elc ; do + install -pm 644 contrib/emacs/$(basename $elc .elc).el \ + $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp +done +install -Dpm 644 %{SOURCE1} \ + $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/git-init.el find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' @@ -162,6 +180,11 @@ rm -rf $RPM_BUILD_ROOT %files -n perl-Git -f perl-files %defattr(-,root,root) +%files -n emacs-git +%defattr(-,root,root) +%{_datadir}/emacs/site-lisp/*git*.el* +%{_datadir}/emacs/site-lisp/site-start.d/git-init.el + %files core -f bin-man-doc-files %defattr(-,root,root) %{_datadir}/git-core/ @@ -170,6 +193,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Thu Jun 21 2007 Josh Boyer 1.5.2.2-2 +- Add emacs-git package (#235431) + * Mon Jun 18 2007 James Bowes 1.5.2.2-1 - git-1.5.2.2 From d24dae5d65925de5212f5292289c7d32d9df7947 Mon Sep 17 00:00:00 2001 From: jbowes Date: Fri, 22 Jun 2007 17:07:24 +0000 Subject: [PATCH 085/842] git-1.5.2.1 for el4 --- ...oid-miscounting-bytes-in-Perl-v5.8.x.patch | 32 ------ git-install-non-executable-doc-files.patch | 22 ----- git.spec | 98 +++++++++++++------ sources | 2 +- 4 files changed, 71 insertions(+), 83 deletions(-) delete mode 100644 cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch delete mode 100644 git-install-non-executable-doc-files.patch diff --git a/cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch b/cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch deleted file mode 100644 index ef01f4d..0000000 --- a/cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4f88d3e0cbf443cd309c2c881209f3366f14023d Mon Sep 17 00:00:00 2001 -From: Martin Langhoff -Date: Thu, 7 Dec 2006 16:38:50 +1300 -Subject: [PATCH] cvsserver: Avoid miscounting bytes in Perl v5.8.x - -At some point between v5.6 and 5.8 Perl started to assume its input, -output and filehandles are UTF-8. This breaks the counting of bytes -for the CVS protocol, resulting in the client expecting less data -than we actually send, and storing truncated files. - -Signed-off-by: Martin Langhoff -Signed-off-by: Junio C Hamano -Signed-off-by: Chris Wright ---- - git-cvsserver.perl | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/git-cvsserver.perl b/git-cvsserver.perl -index ca519b7..197014d 100755 ---- a/git-cvsserver.perl -+++ b/git-cvsserver.perl -@@ -17,6 +17,7 @@ - - use strict; - use warnings; -+use bytes; - - use Fcntl; - use File::Temp qw/tempdir tempfile/; --- -1.4.4.2 - diff --git a/git-install-non-executable-doc-files.patch b/git-install-non-executable-doc-files.patch deleted file mode 100644 index 4f19f23..0000000 --- a/git-install-non-executable-doc-files.patch +++ /dev/null @@ -1,22 +0,0 @@ -No need to install documentation files as executable. - -Signed-off-by: Chris Wright ---- - Documentation/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Documentation/Makefile b/Documentation/Makefile -index c00f5f6..d68bc4a 100644 ---- a/Documentation/Makefile -+++ b/Documentation/Makefile -@@ -56,8 +56,8 @@ man7: $(DOC_MAN7) - - install: man - $(INSTALL) -d -m755 $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir) -- $(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1dir) -- $(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7dir) -+ $(INSTALL) -m644 $(DOC_MAN1) $(DESTDIR)$(man1dir) -+ $(INSTALL) -m644 $(DOC_MAN7) $(DESTDIR)$(man7dir) - - - # diff --git a/git.spec b/git.spec index bc7db6e..44a488b 100644 --- a/git.spec +++ b/git.spec @@ -1,39 +1,31 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.4.4.2 -Release: 2%{?dist} +Version: 1.5.2.1 +Release: 1%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz -Patch0: git-install-non-executable-doc-files.patch -Patch1: cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch -BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} +BuildRequires: perl-devel, zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, perl-Git +Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, perl-Git %description -This is a stupid (but extremely fast) directory content manager. It -doesn't do a whole lot, but what it _does_ do is track directory -contents efficiently. It is intended to be the base of an efficient, -distributed source code management system. This package includes -rudimentary tools that can be used as a SCM, but you should look -elsewhere for tools for ordinary humans layered on top of this. +Git is a fast, scalable, distributed revision control system with an +unusually rich command set that provides both high-level operations +and full access to internals. This is a dummy package which brings in all subpackages. %package core Summary: Core git tools Group: Development/Tools -Requires: zlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, expat +Requires: zlib >= 1.2, rsync, curl, less, openssh-clients, expat %description core -This is a stupid (but extremely fast) directory content manager. It -doesn't do a whole lot, but what it _does_ do is track directory -contents efficiently. It is intended to be the base of an efficient, -distributed source code management system. This package includes -rudimentary tools that can be used as a SCM, but you should look -elsewhere for tools for ordinary humans layered on top of this. +Git is a fast, scalable, distributed revision control system with an +unusually rich command set that provides both high-level operations +and full access to internals. These are the core tools with minimal dependencies. @@ -65,6 +57,13 @@ Requires: git-core = %{version}-%{release} %description email Git tools for sending email. +%package gui +Summary: Git GUI tool +Group: Development/Tools +Requires: git-core = %{version}-%{release}, tk >= 8.4 +%description gui +Git GUI tool + %package -n gitk Summary: Git revision tree visualiser ('gitk') Group: Development/Tools @@ -84,26 +83,26 @@ Perl interface to Git %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ + ETC_GITCONFIG=/etc/gitconfig \ prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT -make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ - prefix=%{_prefix} mandir=%{_mandir} INSTALLDIRS=vendor \ - install %{!?_without_docs: install-doc} +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \ + prefix=%{_prefix} mandir=%{_mandir} \ + ETC_GITCONFIG=/etc/gitconfig \ + INSTALLDIRS=vendor install %{!?_without_docs: install-doc} find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files (find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %else rm -rf $RPM_BUILD_ROOT%{_mandir} %endif @@ -142,6 +141,17 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %{_mandir}/man1/*email*.1*} %{!?_without_docs: %doc Documentation/*email*.html } +%files gui +%defattr(-,root,root) +%{_bindir}/git-gui +%{_bindir}/git-citool +%{_datadir}/git-gui/ +# Not Yet... +# %{!?_without_docs: %{_mandir}/man1/git-gui.1} +# %{!?_without_docs: %doc Documentation/git-gui.html} +# %{!?_without_docs: %{_mandir}/man1/git-citool.1} +# %{!?_without_docs: %doc Documentation/git-citool.html} + %files -n gitk %defattr(-,root,root) %doc Documentation/*gitk*.txt @@ -156,9 +166,41 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_datadir}/git-core/ %doc README COPYING Documentation/*.txt -%{!?_without_docs: %doc Documentation/*.html } +%{!?_without_docs: %doc Documentation/*.html Documentation/howto} +%{!?_without_docs: %doc Documentation/technical} %changelog +* Fri Jun 08 2007 James Bowes 1.5.2.1-1 +- git-1.5.2.1 + +* Tue May 13 2007 Quy Tonthat +- Added lib files for git-gui +- Added Documentation/technical (As needed by Git Users Manual) + +* Tue May 8 2007 Quy Tonthat +- Added howto files + +* Fri Mar 30 2007 Chris Wright 1.5.0.6-1 +- git-1.5.0.6 + +* Mon Mar 19 2007 Chris Wright 1.5.0.5-1 +- git-1.5.0.5 + +* Tue Mar 13 2007 Chris Wright 1.5.0.3-1 +- git-1.5.0.3 + +* Fri Mar 2 2007 Chris Wright 1.5.0.2-2 +- BuildRequires perl-devel as of perl-5.8.8-14 (bz 230680) + +* Mon Feb 26 2007 Chris Wright 1.5.0.2-1 +- git-1.5.0.2 + +* Mon Feb 13 2007 Nicolas Pitre +- Update core package description (Git isn't as stupid as it used to be) + +* Mon Feb 12 2007 Junio C Hamano +- Add git-gui and git-citool. + * Sun Dec 10 2006 Chris Wright 1.4.4.2-2 - no need to install manpages executable (bz 216790) - use bytes for git-cvsserver diff --git a/sources b/sources index 4046dd8..943574d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e659d672930ed5144ab20df4d6958007 git-1.4.4.2.tar.gz +e65b08c2e1a4112c3139c15ac5a13e71 git-1.5.2.1.tar.gz From 02477c64f58cbc6c8bdc0a85a268aa0a4842f3f0 Mon Sep 17 00:00:00 2001 From: jbowes Date: Fri, 22 Jun 2007 17:20:36 +0000 Subject: [PATCH 086/842] Remove F7 specific perl reqs --- git.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 44a488b..85a5e67 100644 --- a/git.spec +++ b/git.spec @@ -1,13 +1,13 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz -BuildRequires: perl-devel, zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} +BuildRequires: perl, zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, perl-Git @@ -76,7 +76,6 @@ Summary: Perl interface to Git Group: Development/Libraries Requires: git-core = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -BuildRequires: perl(Error) %description -n perl-Git Perl interface to Git @@ -170,6 +169,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Fri Jun 22 2007 James Bowes 1.5.2.1-2 +- Remove buildreq on perl(Error) and perl-devel for el4. + * Fri Jun 08 2007 James Bowes 1.5.2.1-1 - git-1.5.2.1 From aed6e3618e843b99fe053dc8ede65d6803fb8968 Mon Sep 17 00:00:00 2001 From: jwboyer Date: Tue, 26 Jun 2007 11:27:51 +0000 Subject: [PATCH 087/842] Add git-status and git-blame autoloads for emacs --- git-init.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git-init.el b/git-init.el index 5b7eb3e..d2a96a7 100644 --- a/git-init.el +++ b/git-init.el @@ -1,2 +1,5 @@ ;; Git VC backend (add-to-list 'vc-handled-backends 'GIT t) +(autoload 'git-status "git" "GIT mode." t) +(autoload 'git-blame-mode "git-blame" + "Minor mode for incremental blame for Git." t) From 87530d166bcc02333f48d5c58c06f697cdb9083b Mon Sep 17 00:00:00 2001 From: jbowes Date: Mon, 23 Jul 2007 20:29:53 +0000 Subject: [PATCH 088/842] Remove git-arch subpackage --- git.spec | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/git.spec b/git.spec index 85a5e67..1e60bc6 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools @@ -9,7 +9,7 @@ URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: perl, zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, perl-Git +Requires: git-core, git-svn, git-cvs, git-email, gitk, git-gui, perl-Git %description Git is a fast, scalable, distributed revision control system with an @@ -43,13 +43,6 @@ Requires: git-core = %{version}-%{release}, cvs, cvsps %description cvs Git tools for importing CVS repositories. -%package arch -Summary: Git tools for importing Arch repositories -Group: Development/Tools -Requires: git-core = %{version}-%{release}, tla -%description arch -Git tools for importing Arch repositories. - %package email Summary: Git tools for sending email Group: Development/Tools @@ -126,13 +119,6 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %{_mandir}/man1/*cvs*.1*} %{!?_without_docs: %doc Documentation/*git-cvs*.html } -%files arch -%defattr(-,root,root) -%doc Documentation/git-archimport.txt -%{_bindir}/git-archimport -%{!?_without_docs: %{_mandir}/man1/git-archimport.1*} -%{!?_without_docs: %doc Documentation/git-archimport.html } - %files email %defattr(-,root,root) %doc Documentation/*email*.txt @@ -169,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Mon Jul 23 2007 James Bowes 1.5.2.1-3 +- Remove the git-arch subpackage (tla is not in epel). + * Fri Jun 22 2007 James Bowes 1.5.2.1-2 - Remove buildreq on perl(Error) and perl-devel for el4. From b39f55103e98a2bf75a127b5e567b7d1a455ee78 Mon Sep 17 00:00:00 2001 From: jbowes Date: Mon, 23 Jul 2007 20:36:01 +0000 Subject: [PATCH 089/842] Also clear out the files that were installed --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 1e60bc6..e9e8425 100644 --- a/git.spec +++ b/git.spec @@ -91,7 +91,10 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +# Remove the git-arch bits +find $RPM_BUILD_ROOT -type f -name 'git-archimport*' -exec rm -f {} ';' + +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "svn|cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files (find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files %if %{!?_without_docs:1}0 (find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files From c97cf8e11f90a5954396b5e9d7f2f3563009c3dc Mon Sep 17 00:00:00 2001 From: jwboyer Date: Sat, 4 Aug 2007 02:05:22 +0000 Subject: [PATCH 090/842] Add git-daemon and gitweb packages --- git-1.5-gitweb-home-link.patch | 11 ++++++++ git.conf.httpd | 6 +++++ git.spec | 47 ++++++++++++++++++++++++++++++++-- git.xinetd | 16 ++++++++++++ 4 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 git-1.5-gitweb-home-link.patch create mode 100644 git.conf.httpd create mode 100644 git.xinetd diff --git a/git-1.5-gitweb-home-link.patch b/git-1.5-gitweb-home-link.patch new file mode 100644 index 0000000..cd36563 --- /dev/null +++ b/git-1.5-gitweb-home-link.patch @@ -0,0 +1,11 @@ +--- git-1.5.0.6/gitweb/gitweb.perl~ 2007-03-30 01:37:05.000000000 +0100 ++++ git-1.5.0.6/gitweb/gitweb.perl 2007-05-07 08:31:37.000000000 +0100 +@@ -39,7 +39,7 @@ our $projectroot = "++GITWEB_PROJECTROOT + our $home_link = $my_uri || "/"; + + # string of the home link on top of all pages +-our $home_link_str = "++GITWEB_HOME_LINK_STR++"; ++our $home_link_str = $ENV{'SERVER_NAME'} ? "git://" . $ENV{'SERVER_NAME'} : "projects"; + + # name of your site or organization to appear in page titles + # replace this with something more descriptive for clearer bookmarks diff --git a/git.conf.httpd b/git.conf.httpd new file mode 100644 index 0000000..3611943 --- /dev/null +++ b/git.conf.httpd @@ -0,0 +1,6 @@ +Alias /git /var/www/git + + + Options +ExecCGI + AddHandler cgi-script .cgi + diff --git a/git.spec b/git.spec index 70fc502..0f484ab 100644 --- a/git.spec +++ b/git.spec @@ -1,13 +1,16 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz Source1: git-init.el +Source2: git.xinetd +Source3: git.conf.httpd +Patch0: git-1.5-gitweb-home-link.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, perl-Git, emacs-git @@ -30,6 +33,22 @@ and full access to internals. These are the core tools with minimal dependencies. +%package daemon +Summary: Git protocol dæmon +Group: Development/Tools +Requires: git-core = %{version}-%{release} +%description daemon +The git dæmon for supporting git:// access to git repositories + +%package -n gitweb +Summary: Simple web interface to git repositories +Group: Development/Tools +Requires: git-core = %{version}-%{release} + +%description -n gitweb +Simple web interface to track changes in git repositories + + %package svn Summary: Git tools for importing Subversion repositories Group: Development/Tools @@ -92,6 +111,7 @@ Requires: git-core = %{version}-%{release}, emacs-common %prep %setup -q +%patch0 -p1 %build make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ @@ -113,17 +133,26 @@ for elc in $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/*.elc ; do done install -Dpm 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/git-init.el +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d +install -m 644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/git +mkdir -p $RPM_BUILD_ROOT/var/www/git +install -m 644 -t $RPM_BUILD_ROOT/var/www/git gitweb/*.png gitweb/*.css +install -m 755 -t $RPM_BUILD_ROOT/var/www/git gitweb/gitweb.cgi +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d +install -m 0644 %SOURCE3 $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/git.conf + find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citooli|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files (find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files %if %{!?_without_docs:1}0 (find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %else rm -rf $RPM_BUILD_ROOT%{_mandir} %endif +mkdir -p $RPM_BUILD_ROOT/srv/git %clean rm -rf $RPM_BUILD_ROOT @@ -189,10 +218,24 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_datadir}/git-core/ %doc README COPYING Documentation/*.txt + +%files daemon +%defattr(-,root,root) +%{_bindir}/git-daemon +%config(noreplace)%{_sysconfdir}/xinetd.d/git +/srv/git + +%files -n gitweb +%defattr(-,root,root) +/var/www/git/ +%{_sysconfdir}/httpd/conf.d/git.conf %{!?_without_docs: %doc Documentation/*.html Documentation/howto} %{!?_without_docs: %doc Documentation/technical} %changelog +* Tue Jul 03 2007 Josh Boyer 1.5.2.2-3 +- Add git-daemon and gitweb packages + * Thu Jun 21 2007 Josh Boyer 1.5.2.2-2 - Add emacs-git package (#235431) diff --git a/git.xinetd b/git.xinetd new file mode 100644 index 0000000..dcfae91 --- /dev/null +++ b/git.xinetd @@ -0,0 +1,16 @@ +# default: off +# description: The git dæmon allows git repositories to be exported using +# the git:// protocol. + +service git +{ + disable = yes + socket_type = stream + wait = no + user = nobody + server = /usr/bin/git-daemon + server_args = --base-path=/srv/git --export-all --user-path=public_git --syslog --inetd --verbose + log_on_failure += USERID +# xinetd doesn't do this by default. bug #195265 + flags = IPv6 +} From c9ad777f80fcaecfeb567632a3b63df6f99bf0b8 Mon Sep 17 00:00:00 2001 From: jwboyer Date: Sat, 4 Aug 2007 02:43:05 +0000 Subject: [PATCH 091/842] Update to latest stable git release --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index d6e9e55..3a031f1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.2.2.tar.gz +git-1.5.2.4.tar.gz diff --git a/git.spec b/git.spec index 0f484ab..152232e 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.2.2 -Release: 3%{?dist} +Version: 1.5.2.4 +Release: 1%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools @@ -233,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Fri Aug 03 2007 Josh Boyer 1.5.2.4-1 +- git-1.5.2.4-1 + * Tue Jul 03 2007 Josh Boyer 1.5.2.2-3 - Add git-daemon and gitweb packages diff --git a/sources b/sources index c3c97df..5ae257c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a0f39577cbfbb575edb3c45d8f5d528 git-1.5.2.2.tar.gz +a8537d8707c6e852d19545bc16d1afb8 git-1.5.2.4.tar.gz From d107cac9e2d439fdbccabd5ea9308730b846da3e Mon Sep 17 00:00:00 2001 From: jbowes Date: Fri, 24 Aug 2007 00:28:24 +0000 Subject: [PATCH 092/842] git 1.5.2.5 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3a031f1..c8ba9c8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.2.4.tar.gz +git-1.5.2.5.tar.gz diff --git a/git.spec b/git.spec index 152232e..2996b69 100644 --- a/git.spec +++ b/git.spec @@ -1,9 +1,9 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.2.4 +Version: 1.5.2.5 Release: 1%{?dist} Summary: Git core and tools -License: GPL +License: GPLv2 Group: Development/Tools URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz @@ -233,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Thu Aug 23 2007 James Bowes 1.5.2.5-1 +- git-1.5.2.5-1 + * Fri Aug 03 2007 Josh Boyer 1.5.2.4-1 - git-1.5.2.4-1 diff --git a/sources b/sources index 5ae257c..d208348 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a8537d8707c6e852d19545bc16d1afb8 git-1.5.2.4.tar.gz +4e8de9e56882f3214a92f6d7dc3c49ec git-1.5.2.5.tar.gz From 61201b75f4bb78703c64a3c6583791b9963e789e Mon Sep 17 00:00:00 2001 From: jwboyer Date: Thu, 6 Sep 2007 15:48:06 +0000 Subject: [PATCH 093/842] - git-1.5.3.1-1 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index c8ba9c8..b029088 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.2.5.tar.gz +git-1.5.3.1.tar.gz diff --git a/git.spec b/git.spec index 2996b69..076ab85 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.2.5 +Version: 1.5.3.1 Release: 1%{?dist} Summary: Git core and tools License: GPLv2 @@ -233,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Thu Sep 06 2007 Josh Boyer 1.5.3.1-1 +- git-1.5.3.1-1 + * Thu Aug 23 2007 James Bowes 1.5.2.5-1 - git-1.5.2.5-1 diff --git a/sources b/sources index d208348..58f25fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4e8de9e56882f3214a92f6d7dc3c49ec git-1.5.2.5.tar.gz +afef243b2d271004d13b0381ac2ee580 git-1.5.3.1.tar.gz From 882051a633e122cae882d24ebb85da10fd287d4b Mon Sep 17 00:00:00 2001 From: jwboyer Date: Thu, 6 Sep 2007 17:35:42 +0000 Subject: [PATCH 094/842] - Include git-gui and git-citool docs --- git.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index 076ab85..88753e2 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -194,10 +194,10 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/git-citool %{_datadir}/git-gui/ # Not Yet... -# %{!?_without_docs: %{_mandir}/man1/git-gui.1} -# %{!?_without_docs: %doc Documentation/git-gui.html} -# %{!?_without_docs: %{_mandir}/man1/git-citool.1} -# %{!?_without_docs: %doc Documentation/git-citool.html} +%{!?_without_docs: %{_mandir}/man1/git-gui.1*} +%{!?_without_docs: %doc Documentation/git-gui.html} +%{!?_without_docs: %{_mandir}/man1/git-citool.1*} +%{!?_without_docs: %doc Documentation/git-citool.html} %files -n gitk %defattr(-,root,root) @@ -233,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Thu Sep 06 2007 Josh Boyer 1.5.3.1-2 +- Include git-gui and git-citool docs + * Thu Sep 06 2007 Josh Boyer 1.5.3.1-1 - git-1.5.3.1-1 From d28bb9e265ad1bd59724f3892b796ed238772250 Mon Sep 17 00:00:00 2001 From: jbowes Date: Thu, 27 Sep 2007 01:34:46 +0000 Subject: [PATCH 095/842] git-1.5.3.2 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index b029088..0d1f766 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.3.1.tar.gz +git-1.5.3.2.tar.gz diff --git a/git.spec b/git.spec index 88753e2..88dcc37 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.3.1 -Release: 2%{?dist} +Version: 1.5.3.2 +Release: 1%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -233,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Wed Sep 26 2007 James Bowes 1.5.3.2-1 +- git-1.5.3.2 + * Thu Sep 06 2007 Josh Boyer 1.5.3.1-2 - Include git-gui and git-citool docs diff --git a/sources b/sources index 58f25fe..421d631 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -afef243b2d271004d13b0381ac2ee580 git-1.5.3.1.tar.gz +9930f19e22c121b8a803337cbda1e661 git-1.5.3.2.tar.gz From fa07213ef8f9daf66458f834dbdb81ef5177c110 Mon Sep 17 00:00:00 2001 From: jbowes Date: Sun, 30 Sep 2007 15:17:23 +0000 Subject: [PATCH 096/842] git 1.5.3.3 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0d1f766..7cff24f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.3.2.tar.gz +git-1.5.3.3.tar.gz diff --git a/git.spec b/git.spec index 88dcc37..6a5d88b 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.3.2 +Version: 1.5.3.3 Release: 1%{?dist} Summary: Git core and tools License: GPLv2 @@ -233,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Sun Sep 30 2007 James Bowes 1.5.3.3-1 +- git-1.5.3.3 + * Wed Sep 26 2007 James Bowes 1.5.3.2-1 - git-1.5.3.2 diff --git a/sources b/sources index 421d631..557dc24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9930f19e22c121b8a803337cbda1e661 git-1.5.3.2.tar.gz +978bda72a636d805dd3058efec5e6f2e git-1.5.3.3.tar.gz From a2aec494f7d33d80df53270481babfbfc13963a4 Mon Sep 17 00:00:00 2001 From: jbowes Date: Tue, 9 Oct 2007 12:16:42 +0000 Subject: [PATCH 097/842] git 1.5.3.4 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7cff24f..1725bcd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.3.3.tar.gz +git-1.5.3.4.tar.gz diff --git a/git.spec b/git.spec index 6a5d88b..140adb1 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.3.3 +Version: 1.5.3.4 Release: 1%{?dist} Summary: Git core and tools License: GPLv2 @@ -233,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Tue Oct 09 2007 James Bowes 1.5.3.4-1 +- git-1.5.3.4 + * Sun Sep 30 2007 James Bowes 1.5.3.3-1 - git-1.5.3.3 diff --git a/sources b/sources index 557dc24..3012073 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -978bda72a636d805dd3058efec5e6f2e git-1.5.3.3.tar.gz +863235e36f5e4922c7f7a8459e0f8910 git-1.5.3.4.tar.gz From 7b295a34fcd4c18e4f06e6fce9ba4c7e8d1b7784 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 23 Oct 2007 22:35:14 +0000 Subject: [PATCH 098/842] Added dependency on Perl(Error) to perl-Git --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 140adb1..c799a06 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -94,7 +94,7 @@ Git revision tree visualiser. %package -n perl-Git Summary: Perl interface to Git Group: Development/Libraries -Requires: git-core = %{version}-%{release} +Requires: git-core = %{version}-%{release}, perl(Error) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) @@ -233,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Wed Oct 24 2007 Lubomir Kundrak 1.5.3.4-2 +- git-Perl requires Error package + * Tue Oct 09 2007 James Bowes 1.5.3.4-1 - git-1.5.3.4 From edddb8398d8c721be9d6b04432677ebcae29a8e7 Mon Sep 17 00:00:00 2001 From: jwboyer Date: Tue, 27 Nov 2007 16:27:59 +0000 Subject: [PATCH 099/842] Update to latest upstream release. Fix some bugs at the same time --- .cvsignore | 2 +- git.spec | 16 +++++++++++----- sources | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1725bcd..c6a071e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.3.4.tar.gz +git-1.5.3.6.tar.gz diff --git a/git.spec b/git.spec index c799a06..772477a 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.3.4 -Release: 2%{?dist} +Version: 1.5.3.6 +Release: 1%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -25,7 +25,7 @@ This is a dummy package which brings in all subpackages. %package core Summary: Core git tools Group: Development/Tools -Requires: zlib >= 1.2, rsync, curl, less, openssh-clients, expat +Requires: zlib >= 1.2, rsync, curl, less, openssh-clients, expat, perl(Error) %description core Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations @@ -52,7 +52,7 @@ Simple web interface to track changes in git repositories %package svn Summary: Git tools for importing Subversion repositories Group: Development/Tools -Requires: git-core = %{version}-%{release}, subversion +Requires: git-core = %{version}-%{release}, subversion, perl(Term::ReadKey) %description svn Git tools for importing Subversion repositories. @@ -73,7 +73,7 @@ Git tools for importing Arch repositories. %package email Summary: Git tools for sending email Group: Development/Tools -Requires: git-core = %{version}-%{release} +Requires: git-core = %{version}-%{release}, perl-Git = %{version}-%{release} %description email Git tools for sending email. @@ -233,6 +233,12 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Tue Nov 27 2007 Josh Boyer 1.5.3.6-1 +- git-1.5.3.6 +- git-core requires perl(Error) (bug 367861) +- git-svn requires perl(Term:ReadKey) (bug 261361) +- git-email requires perl-Git (bug 333061) + * Wed Oct 24 2007 Lubomir Kundrak 1.5.3.4-2 - git-Perl requires Error package diff --git a/sources b/sources index 3012073..31bf148 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -863235e36f5e4922c7f7a8459e0f8910 git-1.5.3.4.tar.gz +37126a4eb247b491b29e768fd25bfee8 git-1.5.3.6.tar.gz From 345ffe2b741c1a91d538c604f14b6d90f8a33ec1 Mon Sep 17 00:00:00 2001 From: jwboyer Date: Mon, 3 Dec 2007 21:36:52 +0000 Subject: [PATCH 100/842] - git-1.5.3.7 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index c6a071e..7b50fde 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.3.6.tar.gz +git-1.5.3.7.tar.gz diff --git a/git.spec b/git.spec index 772477a..c7b5b97 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.3.6 +Version: 1.5.3.7 Release: 1%{?dist} Summary: Git core and tools License: GPLv2 @@ -233,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Mon Dec 03 2007 Josh Boyer 1.5.3.7-1 +- git-1.5.3.7 + * Tue Nov 27 2007 Josh Boyer 1.5.3.6-1 - git-1.5.3.6 - git-core requires perl(Error) (bug 367861) diff --git a/sources b/sources index 31bf148..2a0b639 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -37126a4eb247b491b29e768fd25bfee8 git-1.5.3.6.tar.gz +1dc83cf9e529abceb4d65ff018da60a2 git-1.5.3.7.tar.gz From 496180660a7c8480c7faecfbcc3943d393c25961 Mon Sep 17 00:00:00 2001 From: jbowes Date: Fri, 21 Dec 2007 14:49:10 +0000 Subject: [PATCH 101/842] Update to git 1.5.3.6 for el4 --- git-1.5-gitweb-home-link.patch | 11 +++++++ git.conf.httpd | 6 ++++ git.spec | 59 +++++++++++++++++++++++++++++----- git.xinetd | 16 +++++++++ sources | 2 +- 5 files changed, 85 insertions(+), 9 deletions(-) create mode 100644 git-1.5-gitweb-home-link.patch create mode 100644 git.conf.httpd create mode 100644 git.xinetd diff --git a/git-1.5-gitweb-home-link.patch b/git-1.5-gitweb-home-link.patch new file mode 100644 index 0000000..cd36563 --- /dev/null +++ b/git-1.5-gitweb-home-link.patch @@ -0,0 +1,11 @@ +--- git-1.5.0.6/gitweb/gitweb.perl~ 2007-03-30 01:37:05.000000000 +0100 ++++ git-1.5.0.6/gitweb/gitweb.perl 2007-05-07 08:31:37.000000000 +0100 +@@ -39,7 +39,7 @@ our $projectroot = "++GITWEB_PROJECTROOT + our $home_link = $my_uri || "/"; + + # string of the home link on top of all pages +-our $home_link_str = "++GITWEB_HOME_LINK_STR++"; ++our $home_link_str = $ENV{'SERVER_NAME'} ? "git://" . $ENV{'SERVER_NAME'} : "projects"; + + # name of your site or organization to appear in page titles + # replace this with something more descriptive for clearer bookmarks diff --git a/git.conf.httpd b/git.conf.httpd new file mode 100644 index 0000000..3611943 --- /dev/null +++ b/git.conf.httpd @@ -0,0 +1,6 @@ +Alias /git /var/www/git + + + Options +ExecCGI + AddHandler cgi-script .cgi + diff --git a/git.spec b/git.spec index e9e8425..2a69cbf 100644 --- a/git.spec +++ b/git.spec @@ -1,12 +1,15 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.2.1 -Release: 3%{?dist} +Version: 1.5.3.6 +Release: 1%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz +Source1: git.xinetd +Source2: git.conf.httpd +Patch0: git-1.5-gitweb-home-link.patch BuildRequires: perl, zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: git-core, git-svn, git-cvs, git-email, gitk, git-gui, perl-Git @@ -29,6 +32,20 @@ and full access to internals. These are the core tools with minimal dependencies. +%package daemon +Summary: Git protocol daemon +Group: Development/Tools +Requires: git-core = %{version}-%{release} +%description daemon +The git dæmon for supporting git:// access to git repositories + +%package -n gitweb +Summary: Simple web interface to git repositories +Group: Development/Tools +Requires: git-core = %{version}-%{release} +%description -n gitweb +Simple web interface to track changes in git repositories + %package svn Summary: Git tools for importing Subversion repositories Group: Development/Tools @@ -75,6 +92,7 @@ Perl interface to Git %prep %setup -q +%patch0 -p1 %build make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ @@ -87,6 +105,14 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \ prefix=%{_prefix} mandir=%{_mandir} \ ETC_GITCONFIG=/etc/gitconfig \ INSTALLDIRS=vendor install %{!?_without_docs: install-doc} +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d +install -m 644 %SOURCE1 $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/git +mkdir -p $RPM_BUILD_ROOT/var/www/git +install -m 644 -t $RPM_BUILD_ROOT/var/www/git gitweb/*.png gitweb/*.css +install -m 755 -t $RPM_BUILD_ROOT/var/www/git gitweb/gitweb.cgi +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d +install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/git.conf + find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' @@ -97,10 +123,11 @@ find $RPM_BUILD_ROOT -type f -name 'git-archimport*' -exec rm -f {} ';' (find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "svn|cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files (find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %else rm -rf $RPM_BUILD_ROOT%{_mandir} %endif +mkdir -p $RPM_BUILD_ROOT/srv/git %clean rm -rf $RPM_BUILD_ROOT @@ -134,11 +161,10 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/git-gui %{_bindir}/git-citool %{_datadir}/git-gui/ -# Not Yet... -# %{!?_without_docs: %{_mandir}/man1/git-gui.1} -# %{!?_without_docs: %doc Documentation/git-gui.html} -# %{!?_without_docs: %{_mandir}/man1/git-citool.1} -# %{!?_without_docs: %doc Documentation/git-citool.html} +%{!?_without_docs: %{_mandir}/man1/git-gui.1*} +%{!?_without_docs: %doc Documentation/git-gui.html} +%{!?_without_docs: %{_mandir}/man1/git-citool.1*} +%{!?_without_docs: %doc Documentation/git-citool.html} %files -n gitk %defattr(-,root,root) @@ -154,10 +180,27 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_datadir}/git-core/ %doc README COPYING Documentation/*.txt +%files daemon +%defattr(-,root,root) +%{_bindir}/git-daemon +%config(noreplace)%{_sysconfdir}/xinetd.d/git +/srv/git + +%files -n gitweb +%defattr(-,root,root) +/var/www/git/ +%{_sysconfdir}/httpd/conf.d/git.conf %{!?_without_docs: %doc Documentation/*.html Documentation/howto} %{!?_without_docs: %doc Documentation/technical} + %changelog +* Wed Dec 05 2007 James Bowes 1.5.3.6-1 +- git-1.5.3.6 (Changes courtesy Josh Boyer) + +* Fri Oct 12 2007 James Bowes 1.5.3.3-1 +- git-1.5.3.3 + * Mon Jul 23 2007 James Bowes 1.5.2.1-3 - Remove the git-arch subpackage (tla is not in epel). diff --git a/git.xinetd b/git.xinetd new file mode 100644 index 0000000..dcfae91 --- /dev/null +++ b/git.xinetd @@ -0,0 +1,16 @@ +# default: off +# description: The git dæmon allows git repositories to be exported using +# the git:// protocol. + +service git +{ + disable = yes + socket_type = stream + wait = no + user = nobody + server = /usr/bin/git-daemon + server_args = --base-path=/srv/git --export-all --user-path=public_git --syslog --inetd --verbose + log_on_failure += USERID +# xinetd doesn't do this by default. bug #195265 + flags = IPv6 +} diff --git a/sources b/sources index 943574d..31bf148 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e65b08c2e1a4112c3139c15ac5a13e71 git-1.5.2.1.tar.gz +37126a4eb247b491b29e768fd25bfee8 git-1.5.3.6.tar.gz From 279d5f8fb2b1944f67f9d28ea7a441026d80a33b Mon Sep 17 00:00:00 2001 From: jbowes Date: Fri, 21 Dec 2007 15:09:40 +0000 Subject: [PATCH 102/842] install -t isn't available in el4 --- git.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 2a69cbf..4abc833 100644 --- a/git.spec +++ b/git.spec @@ -108,8 +108,8 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d install -m 644 %SOURCE1 $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/git mkdir -p $RPM_BUILD_ROOT/var/www/git -install -m 644 -t $RPM_BUILD_ROOT/var/www/git gitweb/*.png gitweb/*.css -install -m 755 -t $RPM_BUILD_ROOT/var/www/git gitweb/gitweb.cgi +install -m 644 gitweb/*.png gitweb/*.css $RPM_BUILD_ROOT/var/www/git +install -m 755 gitweb/gitweb.cgi $RPM_BUILD_ROOT/var/www/git mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/git.conf From e39a013e4ac4aad131f762bb8b1ba3f4917e60b6 Mon Sep 17 00:00:00 2001 From: jbowes Date: Fri, 21 Dec 2007 15:40:35 +0000 Subject: [PATCH 103/842] Have git metapackage require explicit versions --- git.spec | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index c7b5b97..874b085 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.3.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -13,7 +13,17 @@ Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, perl-Git, emacs-git + +Requires: git-core = %{version}-%{release} +Requires: git-svn = %{version}-%{release} +Requires: git-cvs = %{version}-%{release} +Requires: git-arch = %{version}-%{release} +Requires: git-email = %{version}-%{release} +Requires: gitk = %{version}-%{release} +Requires: git-gui = %{version}-%{release} +Requires: perl-Git = %{version}-%{release} +Requires: emacs-git = %{version}-%{release} + %description Git is a fast, scalable, distributed revision control system with an @@ -233,6 +243,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Fri Dec 21 2007 James Bowes 1.5.3.7-2 +- Have git metapackage require explicit versions (bug 247214) + * Mon Dec 03 2007 Josh Boyer 1.5.3.7-1 - git-1.5.3.7 From d054635f73ad25bc0afb117ee6b7e87b1ebf1a52 Mon Sep 17 00:00:00 2001 From: jbowes Date: Tue, 8 Jan 2008 12:43:50 +0000 Subject: [PATCH 104/842] git-1.5.3.8 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7b50fde..214eefd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.3.7.tar.gz +git-1.5.3.8.tar.gz diff --git a/git.spec b/git.spec index 874b085..5059488 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.3.7 -Release: 2%{?dist} +Version: 1.5.3.8 +Release: 1%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -243,6 +243,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Tue Jan 08 2008 James Bowes 1.5.3.8-1 +- git-1.5.3.8 + * Fri Dec 21 2007 James Bowes 1.5.3.7-2 - Have git metapackage require explicit versions (bug 247214) diff --git a/sources b/sources index 2a0b639..88cf747 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1dc83cf9e529abceb4d65ff018da60a2 git-1.5.3.7.tar.gz +95a79b889cfdb6e33388058f9a188e66 git-1.5.3.8.tar.gz From 6e9300fbf84e1649dd1ea7f3e986d85f9e078d67 Mon Sep 17 00:00:00 2001 From: jbowes Date: Sat, 2 Feb 2008 19:18:23 +0000 Subject: [PATCH 105/842] git 1.5.4 --- .cvsignore | 2 +- git.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 214eefd..c699025 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.3.8.tar.gz +git-1.5.4.tar.gz diff --git a/git.spec b/git.spec index 5059488..04aee76 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.3.8 +Version: 1.5.4 Release: 1%{?dist} Summary: Git core and tools License: GPLv2 @@ -213,6 +213,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc Documentation/*gitk*.txt %{_bindir}/*gitk* +%{_datadir}/gitk %{!?_without_docs: %{_mandir}/man1/*gitk*.1*} %{!?_without_docs: %doc Documentation/*gitk*.html } @@ -243,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Sat Feb 02 2008 James Bowes 1.5.4-1 +- git-1.5.4 + * Tue Jan 08 2008 James Bowes 1.5.3.8-1 - git-1.5.3.8 diff --git a/sources b/sources index 88cf747..11a9cc9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -95a79b889cfdb6e33388058f9a188e66 git-1.5.3.8.tar.gz +22725d00bf2006bc9464873b7ae85e28 git-1.5.4.tar.gz From 70ebaedb54660321beae9c779c8930031db1cd8f Mon Sep 17 00:00:00 2001 From: jbowes Date: Sun, 3 Feb 2008 20:49:30 +0000 Subject: [PATCH 106/842] Add BR on gettext --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 04aee76..318d4cd 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -11,7 +11,7 @@ Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch -BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs %{!?_without_docs:, xmlto, asciidoc > 6.0.3} +BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: git-core = %{version}-%{release} @@ -244,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Sun Feb 03 2008 James Bowes 1.5.4-1 +- Add BuidRequires on gettext. + * Sat Feb 02 2008 James Bowes 1.5.4-1 - git-1.5.4 From 20408359cc021e8abb0565733f63ea4341edc470 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 6 Feb 2008 02:17:10 +0000 Subject: [PATCH 107/842] Rebuild for new perl --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 318d4cd..d418315 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -244,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Tue Feb 05 2008 Tom "spot" Callaway 1.5.4-3 +- rebuild for new perl + * Sun Feb 03 2008 James Bowes 1.5.4-1 - Add BuidRequires on gettext. From 9e5f7a30de54d86f954598538f40e06c46b601c1 Mon Sep 17 00:00:00 2001 From: jbowes Date: Sun, 10 Feb 2008 14:24:31 +0000 Subject: [PATCH 108/842] git 1.5.4.1 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index c699025..f198e31 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.4.tar.gz +git-1.5.4.1.tar.gz diff --git a/git.spec b/git.spec index d418315..1ef5018 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.4 -Release: 3%{?dist} +Version: 1.5.4.1 +Release: 1%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -244,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Sun Feb 10 2008 James Bowes 1.5.4.1-1 +- git-1.5.4.1 + * Tue Feb 05 2008 Tom "spot" Callaway 1.5.4-3 - rebuild for new perl diff --git a/sources b/sources index 11a9cc9..3b6a520 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -22725d00bf2006bc9464873b7ae85e28 git-1.5.4.tar.gz +b9f43605fad1543597ed85dc7c7af86e git-1.5.4.1.tar.gz From 32c593e37d834dc2a152617cc3993747d268eb96 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 11 Feb 2008 18:07:33 +0000 Subject: [PATCH 109/842] - Add upstream patch (e62a641de17b172ffc4d3a803085c8afbfbec3d1) to have gitweb rss feeds point be commitdiffs instead of commit --- git-gitweb-commitdiff.patch | 34 ++++++++++++++++++++++++++++++++++ git.spec | 8 +++++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 git-gitweb-commitdiff.patch diff --git a/git-gitweb-commitdiff.patch b/git-gitweb-commitdiff.patch new file mode 100644 index 0000000..0dc90e9 --- /dev/null +++ b/git-gitweb-commitdiff.patch @@ -0,0 +1,34 @@ +commit e62a641de17b172ffc4d3a803085c8afbfbec3d1 +Author: Florian La Roche +Date: Sun Feb 3 12:38:46 2008 +0100 + + gitweb: Make feed entries point to commitdiff view + + Change feeds entries (feeds items) from pointing (linking) to 'commit' + view to pointing to 'commitdiff' view. + + First, feed entries have whatchanged-like list of files which were + modified in a commit, so 'commitdiff' view more naturally reflects + feed entry (is more naturally alternate / extended version of a feed + item). Second, this way the patches are shown directly and code review + is done more easily via watching feeds. + + [jn: Rewritten commit message] + + Signed-off-by: Florian La Roche + Signed-off-by: Jakub Narebski + Signed-off-by: Junio C Hamano + +diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl +index ae2d057..8ef2735 100755 +--- a/gitweb/gitweb.perl ++++ b/gitweb/gitweb.perl +@@ -5565,7 +5565,7 @@ XML + or next; + + # print element (entry, item) +- my $co_url = href(-full=>1, action=>"commit", hash=>$commit); ++ my $co_url = href(-full=>1, action=>"commitdiff", hash=>$commit); + if ($format eq 'rss') { + print "\n" . + "" . esc_html($co{'title'}) . "\n" . diff --git a/git.spec b/git.spec index 1ef5018..a657db4 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -11,6 +11,7 @@ Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch +Patch1: git-gitweb-commitdiff.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -122,6 +123,7 @@ Requires: git-core = %{version}-%{release}, emacs-common %prep %setup -q %patch0 -p1 +%patch1 -p1 %build make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ @@ -244,6 +246,10 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Mon Feb 11 2008 Jeremy Katz - 1.5.4.1-2 +- Add upstream patch (e62a641de17b172ffc4d3a803085c8afbfbec3d1) to have + gitweb rss feeds point be commitdiffs instead of commit + * Sun Feb 10 2008 James Bowes 1.5.4.1-1 - git-1.5.4.1 From 1ba7c1adf13290d34aa790bcbd288364364eb08f Mon Sep 17 00:00:00 2001 From: jbowes Date: Sun, 17 Feb 2008 16:12:31 +0000 Subject: [PATCH 110/842] 1.5.4.2 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index f198e31..e9cc810 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.4.1.tar.gz +git-1.5.4.2.tar.gz diff --git a/git.spec b/git.spec index a657db4..3514cb5 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.4.1 -Release: 2%{?dist} +Version: 1.5.4.2 +Release: 1%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -246,6 +246,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Sun Feb 17 2008 James Bowes 1.5.4.2-1 +- git-1.5.4.2 + * Mon Feb 11 2008 Jeremy Katz - 1.5.4.1-2 - Add upstream patch (e62a641de17b172ffc4d3a803085c8afbfbec3d1) to have gitweb rss feeds point be commitdiffs instead of commit diff --git a/sources b/sources index 3b6a520..5857469 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b9f43605fad1543597ed85dc7c7af86e git-1.5.4.1.tar.gz +32a1f5d94bb0cea5e987d854007b21a4 git-1.5.4.2.tar.gz From 0c4a11cad2c5d6c007147b1fcb84d4bccc6531ac Mon Sep 17 00:00:00 2001 From: jbowes Date: Sat, 23 Feb 2008 22:44:40 +0000 Subject: [PATCH 111/842] git 1.5.4.3 and include krh's change to rename git-core to git --- .cvsignore | 2 +- git.spec | 82 +++++++++++++++++++++++++++++++----------------------- sources | 2 +- 3 files changed, 49 insertions(+), 37 deletions(-) diff --git a/.cvsignore b/.cvsignore index e9cc810..924d482 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.4.2.tar.gz +git-1.5.4.3.tar.gz diff --git a/git.spec b/git.spec index 3514cb5..3a8f403 100644 --- a/git.spec +++ b/git.spec @@ -1,8 +1,8 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.4.2 +Version: 1.5.4.3 Release: 1%{?dist} -Summary: Git core and tools +Summary: Core git tools License: GPLv2 Group: Development/Tools URL: http://kernel.org/pub/software/scm/git/ @@ -11,38 +11,44 @@ Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch -Patch1: git-gitweb-commitdiff.patch +Patch1: git-gitweb-commitdiff.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core = %{version}-%{release} -Requires: git-svn = %{version}-%{release} -Requires: git-cvs = %{version}-%{release} -Requires: git-arch = %{version}-%{release} -Requires: git-email = %{version}-%{release} -Requires: gitk = %{version}-%{release} -Requires: git-gui = %{version}-%{release} -Requires: perl-Git = %{version}-%{release} -Requires: emacs-git = %{version}-%{release} - +Requires: perl-Git = %{version}-%{release} +Requires: zlib >= 1.2, rsync, curl, less, openssh-clients, expat, perl(Error) +Provides: git-core = %{version}-%{release} +Obsoletes: git-core <= 1.5.4.2 %description Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals. -This is a dummy package which brings in all subpackages. +The git rpm installs the core tools with minimal dependencies. To +install all git packages, including tools for integrating with other +SCMs, install the git-all meta-package. -%package core -Summary: Core git tools +%package all +Summary: Meta-package to pull in all git tools Group: Development/Tools -Requires: zlib >= 1.2, rsync, curl, less, openssh-clients, expat, perl(Error) -%description core +Requires: git = %{version}-%{release} +Requires: git-svn = %{version}-%{release} +Requires: git-cvs = %{version}-%{release} +Requires: git-arch = %{version}-%{release} +Requires: git-email = %{version}-%{release} +Requires: gitk = %{version}-%{release} +Requires: git-gui = %{version}-%{release} +Requires: perl-Git = %{version}-%{release} +Requires: emacs-git = %{version}-%{release} +Obsoletes: git <= 1.5.4.2 + +%description all Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals. -These are the core tools with minimal dependencies. +This is a dummy package which brings in all subpackages. %package daemon Summary: Git protocol dæmon @@ -63,49 +69,49 @@ Simple web interface to track changes in git repositories %package svn Summary: Git tools for importing Subversion repositories Group: Development/Tools -Requires: git-core = %{version}-%{release}, subversion, perl(Term::ReadKey) +Requires: git = %{version}-%{release}, subversion, perl(Term::ReadKey) %description svn Git tools for importing Subversion repositories. %package cvs Summary: Git tools for importing CVS repositories Group: Development/Tools -Requires: git-core = %{version}-%{release}, cvs, cvsps +Requires: git = %{version}-%{release}, cvs, cvsps %description cvs Git tools for importing CVS repositories. %package arch Summary: Git tools for importing Arch repositories Group: Development/Tools -Requires: git-core = %{version}-%{release}, tla +Requires: git = %{version}-%{release}, tla %description arch Git tools for importing Arch repositories. %package email Summary: Git tools for sending email Group: Development/Tools -Requires: git-core = %{version}-%{release}, perl-Git = %{version}-%{release} +Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} %description email Git tools for sending email. %package gui Summary: Git GUI tool Group: Development/Tools -Requires: git-core = %{version}-%{release}, tk >= 8.4 +Requires: git = %{version}-%{release}, tk >= 8.4 %description gui Git GUI tool. %package -n gitk Summary: Git revision tree visualiser Group: Development/Tools -Requires: git-core = %{version}-%{release}, tk >= 8.4 +Requires: git = %{version}-%{release}, tk >= 8.4 %description -n gitk Git revision tree visualiser. %package -n perl-Git Summary: Perl interface to Git Group: Development/Libraries -Requires: git-core = %{version}-%{release}, perl(Error) +Requires: git = %{version}-%{release}, perl(Error) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) @@ -115,7 +121,7 @@ Perl interface to Git. %package -n emacs-git Summary: Git version control system support for Emacs Group: Applications/Editors -Requires: git-core = %{version}-%{release}, emacs-common +Requires: git = %{version}-%{release}, emacs-common %description -n emacs-git %{summary}. @@ -169,8 +175,12 @@ mkdir -p $RPM_BUILD_ROOT/srv/git %clean rm -rf $RPM_BUILD_ROOT -%files -# These are no files in the root package +%files -f bin-man-doc-files +%defattr(-,root,root) +%{_datadir}/git-core/ +%doc README COPYING Documentation/*.txt +%{!?_without_docs: %doc Documentation/*.html Documentation/howto} +%{!?_without_docs: %doc Documentation/technical} %files svn %defattr(-,root,root) @@ -205,7 +215,6 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/git-gui %{_bindir}/git-citool %{_datadir}/git-gui/ -# Not Yet... %{!?_without_docs: %{_mandir}/man1/git-gui.1*} %{!?_without_docs: %doc Documentation/git-gui.html} %{!?_without_docs: %{_mandir}/man1/git-citool.1*} @@ -227,11 +236,6 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/emacs/site-lisp/*git*.el* %{_datadir}/emacs/site-lisp/site-start.d/git-init.el -%files core -f bin-man-doc-files -%defattr(-,root,root) -%{_datadir}/git-core/ -%doc README COPYING Documentation/*.txt - %files daemon %defattr(-,root,root) %{_bindir}/git-daemon @@ -245,7 +249,15 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html Documentation/howto} %{!?_without_docs: %doc Documentation/technical} +%files all +# No files for you! + %changelog +* Sat Feb 23 2008 James Bowes 1.5.4.3-1 +- git-1.5.4.3 +- Include Kristian Høgsberg's changes to rename git-core to + git and git to git-all. + * Sun Feb 17 2008 James Bowes 1.5.4.2-1 - git-1.5.4.2 diff --git a/sources b/sources index 5857469..45cae7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -32a1f5d94bb0cea5e987d854007b21a4 git-1.5.4.2.tar.gz +6311a711eb780b1fbae29e0fd28836bd git-1.5.4.3.tar.gz From ba45fbb45c77026b0079446a096fd1033befd43d Mon Sep 17 00:00:00 2001 From: Bernie Innocenti Date: Sun, 24 Feb 2008 14:57:54 +0000 Subject: [PATCH 112/842] - Do not silently overwrite /etc/httpd/conf.d/git.conf --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 3a8f403..9c44a19 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -245,7 +245,7 @@ rm -rf $RPM_BUILD_ROOT %files -n gitweb %defattr(-,root,root) /var/www/git/ -%{_sysconfdir}/httpd/conf.d/git.conf +%config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf %{!?_without_docs: %doc Documentation/*.html Documentation/howto} %{!?_without_docs: %doc Documentation/technical} @@ -253,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sun Feb 24 2008 Bernardo Innocenti 1.5.4.3-2 +- Do not silently overwrite /etc/httpd/conf.d/git.conf + * Sat Feb 23 2008 James Bowes 1.5.4.3-1 - git-1.5.4.3 - Include Kristian Høgsberg's changes to rename git-core to From eb64d17febfd507a4ca4562de8a6446ea6535227 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 3 Mar 2008 20:30:21 +0000 Subject: [PATCH 113/842] new perl --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 9c44a19..764dffe 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -253,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Mon Mar 3 2008 Tom "spot" Callaway 1.5.4.3-3 +- rebuild for new perl (again) + * Sun Feb 24 2008 Bernardo Innocenti 1.5.4.3-2 - Do not silently overwrite /etc/httpd/conf.d/git.conf From 364f1ec04b3879f2a2fce09b00ec4ebeb3a33abc Mon Sep 17 00:00:00 2001 From: jbowes Date: Thu, 13 Mar 2008 16:03:14 +0000 Subject: [PATCH 114/842] git 1.5.4.4 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 924d482..078e7a4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.4.3.tar.gz +git-1.5.4.4.tar.gz diff --git a/git.spec b/git.spec index 764dffe..6d08bd9 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.4.3 -Release: 3%{?dist} +Version: 1.5.4.4 +Release: 1%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -253,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Thu Mar 13 2008 James Bowes 1.5.4.4-1 +- git-1.5.4.4 + * Mon Mar 3 2008 Tom "spot" Callaway 1.5.4.3-3 - rebuild for new perl (again) diff --git a/sources b/sources index 45cae7f..1710ce1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6311a711eb780b1fbae29e0fd28836bd git-1.5.4.3.tar.gz +08816904bc7fd0b79a380da04ee787e0 git-1.5.4.4.tar.gz From 8e04882e3c34ad2689d673c566e6dbc2c350ea88 Mon Sep 17 00:00:00 2001 From: jbowes Date: Wed, 19 Mar 2008 13:07:11 +0000 Subject: [PATCH 115/842] Fix obsoletes version for updating from F8 --- git.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 6d08bd9..5d62442 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl-Git = %{version}-%{release} Requires: zlib >= 1.2, rsync, curl, less, openssh-clients, expat, perl(Error) Provides: git-core = %{version}-%{release} -Obsoletes: git-core <= 1.5.4.2 +Obsoletes: git-core <= 1.5.4.3 %description Git is a fast, scalable, distributed revision control system with an @@ -41,7 +41,7 @@ Requires: gitk = %{version}-%{release} Requires: git-gui = %{version}-%{release} Requires: perl-Git = %{version}-%{release} Requires: emacs-git = %{version}-%{release} -Obsoletes: git <= 1.5.4.2 +Obsoletes: git <= 1.5.4.3 %description all Git is a fast, scalable, distributed revision control system with an @@ -253,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Wed Mar 19 2008 James Bowes 1.5.4.4-2 +- Obsolete git <= 1.5.4.3, to catch going from F8 to rawhide/F9 + * Thu Mar 13 2008 James Bowes 1.5.4.4-1 - git-1.5.4.4 From 758b1eb860c88ed1bd92c55e941c91aa6da9c773 Mon Sep 17 00:00:00 2001 From: jbowes Date: Wed, 26 Mar 2008 11:52:54 +0000 Subject: [PATCH 116/842] Assorted bug fixes: - Include the sample hooks from contrib/hooks as docs (bug 321151). - Install the bash completion script from contrib (bug 433255). - Include the html docs in the 'core' package again (bug 434271). --- git.spec | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/git.spec b/git.spec index 5d62442..bf778b9 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -172,15 +172,22 @@ rm -rf $RPM_BUILD_ROOT%{_mandir} %endif mkdir -p $RPM_BUILD_ROOT/srv/git +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d +install -m 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git + + %clean rm -rf $RPM_BUILD_ROOT + %files -f bin-man-doc-files %defattr(-,root,root) %{_datadir}/git-core/ -%doc README COPYING Documentation/*.txt -%{!?_without_docs: %doc Documentation/*.html Documentation/howto} -%{!?_without_docs: %doc Documentation/technical} +%doc README COPYING Documentation/*.txt contrib/hooks +%{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} +%{!?_without_docs: %doc Documentation/howto Documentation/technical} +%{_sysconfdir}/bash_completion.d/git + %files svn %defattr(-,root,root) @@ -246,13 +253,17 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) /var/www/git/ %config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf -%{!?_without_docs: %doc Documentation/*.html Documentation/howto} -%{!?_without_docs: %doc Documentation/technical} + %files all # No files for you! %changelog +* Tue Mar 25 2008 James Bowes 1.5.4.4-3 +- Include the sample hooks from contrib/hooks as docs (bug 321151). +- Install the bash completion script from contrib (bug 433255). +- Include the html docs in the 'core' package again (bug 434271). + * Wed Mar 19 2008 James Bowes 1.5.4.4-2 - Obsolete git <= 1.5.4.3, to catch going from F8 to rawhide/F9 From 5730de22f2f181d934ad8dfeef4d1063e95944ad Mon Sep 17 00:00:00 2001 From: jbowes Date: Thu, 27 Mar 2008 00:06:43 +0000 Subject: [PATCH 117/842] Own the bash completion dir in case bash-completion isn't installed --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index bf778b9..1c17e01 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -186,7 +186,7 @@ rm -rf $RPM_BUILD_ROOT %doc README COPYING Documentation/*.txt contrib/hooks %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} %{!?_without_docs: %doc Documentation/howto Documentation/technical} -%{_sysconfdir}/bash_completion.d/git +%{_sysconfdir}/bash_completion.d %files svn @@ -259,6 +259,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Wed Mar 26 2008 James Bowes 1.5.4.4-4 +- Own /etc/bash_completion.d in case bash-completion isn't installed. + * Tue Mar 25 2008 James Bowes 1.5.4.4-3 - Include the sample hooks from contrib/hooks as docs (bug 321151). - Install the bash completion script from contrib (bug 433255). From c2080dd3aa0f1623b03674f5e0fb93ff70afffbf Mon Sep 17 00:00:00 2001 From: jbowes Date: Fri, 28 Mar 2008 13:47:49 +0000 Subject: [PATCH 118/842] update to 1.5.4.5 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 078e7a4..1458352 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.4.4.tar.gz +git-1.5.4.5.tar.gz diff --git a/git.spec b/git.spec index 1c17e01..ecafa1e 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.4.4 -Release: 4%{?dist} +Version: 1.5.4.5 +Release: 1%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -259,6 +259,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Fri Mar 28 2008 James Bowes 1.5.4.5-1 +- git-1.5.4.5 + * Wed Mar 26 2008 James Bowes 1.5.4.4-4 - Own /etc/bash_completion.d in case bash-completion isn't installed. diff --git a/sources b/sources index 1710ce1..d8c9a79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -08816904bc7fd0b79a380da04ee787e0 git-1.5.4.4.tar.gz +9f83d18be41c88e5df6a2718c081520c git-1.5.4.5.tar.gz From 977b81323fe5bdbb0e30e80353c61d75ddefafe8 Mon Sep 17 00:00:00 2001 From: jbowes Date: Wed, 2 Apr 2008 12:24:12 +0000 Subject: [PATCH 119/842] Remove the commitdiff patch, it's upstream already --- git-gitweb-commitdiff.patch | 34 ---------------------------------- git.spec | 7 ++++--- 2 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 git-gitweb-commitdiff.patch diff --git a/git-gitweb-commitdiff.patch b/git-gitweb-commitdiff.patch deleted file mode 100644 index 0dc90e9..0000000 --- a/git-gitweb-commitdiff.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit e62a641de17b172ffc4d3a803085c8afbfbec3d1 -Author: Florian La Roche -Date: Sun Feb 3 12:38:46 2008 +0100 - - gitweb: Make feed entries point to commitdiff view - - Change feeds entries (feeds items) from pointing (linking) to 'commit' - view to pointing to 'commitdiff' view. - - First, feed entries have whatchanged-like list of files which were - modified in a commit, so 'commitdiff' view more naturally reflects - feed entry (is more naturally alternate / extended version of a feed - item). Second, this way the patches are shown directly and code review - is done more easily via watching feeds. - - [jn: Rewritten commit message] - - Signed-off-by: Florian La Roche - Signed-off-by: Jakub Narebski - Signed-off-by: Junio C Hamano - -diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl -index ae2d057..8ef2735 100755 ---- a/gitweb/gitweb.perl -+++ b/gitweb/gitweb.perl -@@ -5565,7 +5565,7 @@ XML - or next; - - # print element (entry, item) -- my $co_url = href(-full=>1, action=>"commit", hash=>$commit); -+ my $co_url = href(-full=>1, action=>"commitdiff", hash=>$commit); - if ($format eq 'rss') { - print "\n" . - "" . esc_html($co{'title'}) . "\n" . diff --git a/git.spec b/git.spec index ecafa1e..1d357df 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -11,7 +11,6 @@ Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch -Patch1: git-gitweb-commitdiff.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -129,7 +128,6 @@ Requires: git = %{version}-%{release}, emacs-common %prep %setup -q %patch0 -p1 -%patch1 -p1 %build make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ @@ -259,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Wed Apr 02 2008 James Bowes 1.5.4.5-2 +- Remove a patch that's already upstream. + * Fri Mar 28 2008 James Bowes 1.5.4.5-1 - git-1.5.4.5 From 4243f59168a0556d9ae900582ad76f6cafdc1dd8 Mon Sep 17 00:00:00 2001 From: jbowes Date: Sat, 5 Apr 2008 13:26:07 +0000 Subject: [PATCH 120/842] Remove the remaining requires on git-core --- git.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 1d357df..5fdf8fb 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -52,14 +52,14 @@ This is a dummy package which brings in all subpackages. %package daemon Summary: Git protocol dæmon Group: Development/Tools -Requires: git-core = %{version}-%{release} +Requires: git = %{version}-%{release} %description daemon The git dæmon for supporting git:// access to git repositories %package -n gitweb Summary: Simple web interface to git repositories Group: Development/Tools -Requires: git-core = %{version}-%{release} +Requires: git = %{version}-%{release} %description -n gitweb Simple web interface to track changes in git repositories @@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Fri Apr 04 2008 James Bowes 1.5.4.5-3 +- Remove the last two requires on git-core. + * Wed Apr 02 2008 James Bowes 1.5.4.5-2 - Remove a patch that's already upstream. From 42eb2e04dc5b6ed2f6188674a52e25b1faf4d327 Mon Sep 17 00:00:00 2001 From: jbowes Date: Wed, 9 Apr 2008 14:19:55 +0000 Subject: [PATCH 121/842] git 1.5.5 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1458352..e058737 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.4.5.tar.gz +git-1.5.5.tar.gz diff --git a/git.spec b/git.spec index 5fdf8fb..fbb0378 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.4.5 -Release: 3%{?dist} +Version: 1.5.5 +Release: 1%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Wed Apr 09 2008 James Bowes 1.5.5-1 +- git-1.5.5 + * Fri Apr 04 2008 James Bowes 1.5.4.5-3 - Remove the last two requires on git-core. diff --git a/sources b/sources index d8c9a79..f37bdad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9f83d18be41c88e5df6a2718c081520c git-1.5.4.5.tar.gz +978e50ddefeeb2e0c55b3f1c7fca2e16 git-1.5.5.tar.gz From 0036192d72092fd3746cc00203b45dabbd9863ba Mon Sep 17 00:00:00 2001 From: jbowes Date: Tue, 22 Apr 2008 18:22:18 +0000 Subject: [PATCH 122/842] 1.5.5.1 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index e058737..cdf93b1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.5.tar.gz +git-1.5.5.1.tar.gz diff --git a/git.spec b/git.spec index fbb0378..62b54f0 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.5 +Version: 1.5.5.1 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Mon Apr 21 2008 James Bowes 1.5.5.1-1 +- git-1.5.5.1 + * Wed Apr 09 2008 James Bowes 1.5.5-1 - git-1.5.5 diff --git a/sources b/sources index f37bdad..c62e723 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -978e50ddefeeb2e0c55b3f1c7fca2e16 git-1.5.5.tar.gz +863df5545e3496d9f29688ab25b6a53d git-1.5.5.1.tar.gz From 47a8f73b270c10827c44253cdbc6e1698f2dd9b9 Mon Sep 17 00:00:00 2001 From: jbowes Date: Mon, 26 May 2008 10:40:50 +0000 Subject: [PATCH 123/842] git 1.5.5.2 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index cdf93b1..4e963f7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.5.1.tar.gz +git-1.5.5.2.tar.gz diff --git a/git.spec b/git.spec index 62b54f0..3bfd775 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.5.1 +Version: 1.5.5.2 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Mon May 26 2008 James Bowes 1.5.5.2-1 +- git-1.5.5.2 + * Mon Apr 21 2008 James Bowes 1.5.5.1-1 - git-1.5.5.1 diff --git a/sources b/sources index c62e723..7a14cff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -863df5545e3496d9f29688ab25b6a53d git-1.5.5.1.tar.gz +3ae18e7f6e23b698be03260ebdcd4f15 git-1.5.5.2.tar.gz From e2c8759419f7607d4a203843615099164ab968d5 Mon Sep 17 00:00:00 2001 From: jbowes Date: Wed, 28 May 2008 12:17:49 +0000 Subject: [PATCH 124/842] git 1.5.5.3 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4e963f7..2ad20d3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.5.2.tar.gz +git-1.5.5.3.tar.gz diff --git a/git.spec b/git.spec index 3bfd775..ad93010 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.5.2 +Version: 1.5.5.3 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Wed May 28 2008 James Bowes 1.5.5.3-1 +- git-1.5.5.3 + * Mon May 26 2008 James Bowes 1.5.5.2-1 - git-1.5.5.2 diff --git a/sources b/sources index 7a14cff..272fde3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3ae18e7f6e23b698be03260ebdcd4f15 git-1.5.5.2.tar.gz +fd7a2d4b25fc82ec9f9312e6d954f442 git-1.5.5.3.tar.gz From c894294501387303e709d1d6be814a696292ebdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= Date: Tue, 3 Jun 2008 12:40:38 +0000 Subject: [PATCH 125/842] - use tar.bz2 instead of tar.gz --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index ad93010..1412f64 100644 --- a/git.spec +++ b/git.spec @@ -1,12 +1,12 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools URL: http://kernel.org/pub/software/scm/git/ -Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz +Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2 Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd @@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Tue Jun 3 2008 Stepan Kasal 1.5.5.3-2 +- use tar.bz2 instead of tar.gz + * Wed May 28 2008 James Bowes 1.5.5.3-1 - git-1.5.5.3 From 32525d99788a357aeed5ec1f88e080d20b89705c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= Date: Tue, 3 Jun 2008 15:39:56 +0000 Subject: [PATCH 126/842] - use tar.bz2 instead of tar.gz --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2ad20d3..812fb30 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.5.3.tar.gz +git-1.5.5.3.tar.bz2 diff --git a/sources b/sources index 272fde3..593658f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd7a2d4b25fc82ec9f9312e6d954f442 git-1.5.5.3.tar.gz +022ce5772b900243ef5d289deb7a3667 git-1.5.5.3.tar.bz2 From a0598d9a30fa821d191acddf904b5da0d6081017 Mon Sep 17 00:00:00 2001 From: jbowes Date: Thu, 19 Jun 2008 12:38:47 +0000 Subject: [PATCH 127/842] update to 1.5.6 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 812fb30..60f3874 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.5.3.tar.bz2 +git-1.5.6.tar.bz2 diff --git a/git.spec b/git.spec index 1412f64..6fc6567 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.5.3 -Release: 2%{?dist} +Version: 1.5.6 +Release: 1%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Thu Jun 19 2008 James Bowes 1.5.6-1 +- git-1.5.6 + * Tue Jun 3 2008 Stepan Kasal 1.5.5.3-2 - use tar.bz2 instead of tar.gz diff --git a/sources b/sources index 593658f..5722e82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -022ce5772b900243ef5d289deb7a3667 git-1.5.5.3.tar.bz2 +76c4efaaa5470a5385e22d99349a97b3 git-1.5.6.tar.bz2 From 9fb22aac21243ff9a052199d4e89db97bc00aad3 Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Mon, 7 Jul 2008 20:37:42 +0000 Subject: [PATCH 128/842] Drop git-cvs requirement for cvsps, it is not available in EL-4. --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 4abc833..d4f0135 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.3.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools @@ -56,7 +56,7 @@ Git tools for importing Subversion repositories. %package cvs Summary: Git tools for importing CVS repositories Group: Development/Tools -Requires: git-core = %{version}-%{release}, cvs, cvsps +Requires: git-core = %{version}-%{release}, cvs %description cvs Git tools for importing CVS repositories. @@ -195,6 +195,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 07 2008 Xavier Bachelot 1.5.3.6-2 +- Drop git-cvs requirement for cvsps, it is not available in EL-4. + * Wed Dec 05 2007 James Bowes 1.5.3.6-1 - git-1.5.3.6 (Changes courtesy Josh Boyer) From ec200a81382a5483af3052af430cbb0a17fae078 Mon Sep 17 00:00:00 2001 From: jbowes Date: Thu, 24 Jul 2008 14:03:40 +0000 Subject: [PATCH 129/842] git-1.5.6.4 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 60f3874..2d8c288 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.6.tar.bz2 +git-1.5.6.4.tar.bz2 diff --git a/git.spec b/git.spec index 6fc6567..4ab0248 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.6 +Version: 1.5.6.4 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Thu Jul 24 2008 James Bowes 1.5.6-4 +- git-1.5.6.4 + * Thu Jun 19 2008 James Bowes 1.5.6-1 - git-1.5.6 diff --git a/sources b/sources index 5722e82..e38b97c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -76c4efaaa5470a5385e22d99349a97b3 git-1.5.6.tar.bz2 +b5f248c71d32921ff0ff7e35f7770003 git-1.5.6.4.tar.bz2 From 95feff0f38aa10a6cce1cbff39a00fb907741997 Mon Sep 17 00:00:00 2001 From: jbowes Date: Thu, 28 Aug 2008 12:16:58 +0000 Subject: [PATCH 130/842] git 1.6.0.1 --- .cvsignore | 2 +- git.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2d8c288..e4b6d52 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.6.4.tar.bz2 +git-1.6.0.1.tar.bz2 diff --git a/git.spec b/git.spec index 4ab0248..fb66416 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.6.4 +Version: 1.6.0.1 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -132,6 +132,7 @@ Requires: git = %{version}-%{release}, emacs-common %build make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ ETC_GITCONFIG=/etc/gitconfig \ + gitexecdir=%{_bindir} \ prefix=%{_prefix} all %{!?_without_docs: doc} make -C contrib/emacs @@ -140,6 +141,7 @@ rm -rf $RPM_BUILD_ROOT make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \ prefix=%{_prefix} mandir=%{_mandir} \ ETC_GITCONFIG=/etc/gitconfig \ + gitexecdir=%{_bindir} \ INSTALLDIRS=vendor install %{!?_without_docs: install-doc} make -C contrib/emacs install \ emacsdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp @@ -257,6 +259,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Thu Aug 28 2008 James Bowes 1.6.0.1-1 +- git-1.6.0.1 + * Thu Jul 24 2008 James Bowes 1.5.6-4 - git-1.5.6.4 diff --git a/sources b/sources index e38b97c..ce81aef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b5f248c71d32921ff0ff7e35f7770003 git-1.5.6.4.tar.bz2 +264701ebd9036ca2458358f01aa6c093 git-1.6.0.1.tar.bz2 From 5a18ae4d9107cde5545cc65abff605b8f0fd116d Mon Sep 17 00:00:00 2001 From: jwboyer Date: Wed, 22 Oct 2008 12:18:50 +0000 Subject: [PATCH 131/842] - git-1.6.0.3 - Drop curl requirement in favor of libcurl (bug 449388) - Add requires for SMTP-SSL perl module to make git-send-email work (bug 443615) --- .cvsignore | 2 +- git.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index e4b6d52..99abeff 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.0.1.tar.bz2 +git-1.6.0.3.tar.bz2 diff --git a/git.spec b/git.spec index fb66416..43cdbc7 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.0.1 +Version: 1.6.0.3 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -11,11 +11,11 @@ Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch -BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} +BuildRequires: zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl-Git = %{version}-%{release} -Requires: zlib >= 1.2, rsync, curl, less, openssh-clients, expat, perl(Error) +Requires: zlib >= 1.2, rsync, libcurl, less, openssh-clients, expat, perl(Error) Provides: git-core = %{version}-%{release} Obsoletes: git-core <= 1.5.4.3 @@ -90,6 +90,7 @@ Git tools for importing Arch repositories. Summary: Git tools for sending email Group: Development/Tools Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} +Requires: perl(Net::SMTP::SSL) %description email Git tools for sending email. @@ -259,6 +260,11 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Wed Oct 22 2008 Josh Boyer 1.6.0.3-1 +- git-1.6.0.3 +- Drop curl requirement in favor of libcurl (bug 449388) +- Add requires for SMTP-SSL perl module to make git-send-email work (bug 443615) + * Thu Aug 28 2008 James Bowes 1.6.0.1-1 - git-1.6.0.1 diff --git a/sources b/sources index ce81aef..f2fb1e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -264701ebd9036ca2458358f01aa6c093 git-1.6.0.1.tar.bz2 +d7178b0b0eaaa07538149bb231902796 git-1.6.0.3.tar.bz2 From 985c13cd2da858cb7d1688fa1107725049e7a194 Mon Sep 17 00:00:00 2001 From: jwboyer Date: Fri, 14 Nov 2008 13:54:36 +0000 Subject: [PATCH 132/842] - git-1.6.0.4 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 99abeff..38b8d8f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.0.3.tar.bz2 +git-1.6.0.4.tar.bz2 diff --git a/git.spec b/git.spec index 43cdbc7..839b452 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.0.3 +Version: 1.6.0.4 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -260,6 +260,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Fri Nov 14 2008 Josh Boyer 1.6.0.4-1 +- git-1.6.0.4 + * Wed Oct 22 2008 Josh Boyer 1.6.0.3-1 - git-1.6.0.3 - Drop curl requirement in favor of libcurl (bug 449388) diff --git a/sources b/sources index f2fb1e9..6391dc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7178b0b0eaaa07538149bb231902796 git-1.6.0.3.tar.bz2 +ed8c4fa007a44d51b646865c35461ce8 git-1.6.0.4.tar.bz2 From 514ce7172ba7829c338c3bae6e14af2df5741320 Mon Sep 17 00:00:00 2001 From: jwboyer Date: Thu, 11 Dec 2008 16:47:39 +0000 Subject: [PATCH 133/842] - git-1.6.0.5 --- .cvsignore | 2 +- git.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 38b8d8f..69ce87c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.0.4.tar.bz2 +git-1.6.0.5.tar.bz2 diff --git a/git.spec b/git.spec index 839b452..e741afa 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.0.4 +Version: 1.6.0.5 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -171,7 +171,7 @@ find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' %else rm -rf $RPM_BUILD_ROOT%{_mandir} %endif -mkdir -p $RPM_BUILD_ROOT/srv/git +mkdir -p $RPM_BUILD_ROOT/var/lib/git-daemon mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d install -m 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git @@ -248,7 +248,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_bindir}/git-daemon %config(noreplace)%{_sysconfdir}/xinetd.d/git -/srv/git +/var/lib/git-daemon %files -n gitweb %defattr(-,root,root) @@ -260,6 +260,12 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Thu Dec 11 2008 Josh Boyer 1.6.0.5-1 +- git-1.6.0.5 + +* Mon Nov 17 2008 Seth Vidal +- switch from /srv/git to /var/lib/git-daemon for packaging rules compliance + * Fri Nov 14 2008 Josh Boyer 1.6.0.4-1 - git-1.6.0.4 diff --git a/sources b/sources index 6391dc7..69eade4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ed8c4fa007a44d51b646865c35461ce8 git-1.6.0.4.tar.bz2 +899172ebeac65f7a09a8e204d4f87d8c git-1.6.0.5.tar.bz2 From 413c55e528463fab93f6682a5d38f968c6fad48d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 20 Dec 2008 17:26:02 +0000 Subject: [PATCH 134/842] - git-1.6.0.6 - Fixes a local privilege escalation bug in gitweb (http://article.gmane.org/gmane.comp.version-control.git/103624) - Add gitk Requires to git-gui (bug 476308) --- .cvsignore | 2 +- git.spec | 9 ++++++++- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 69ce87c..3db4196 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.0.5.tar.bz2 +git-1.6.0.6.tar.bz2 diff --git a/git.spec b/git.spec index e741afa..040d620 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.0.5 +Version: 1.6.0.6 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -98,6 +98,7 @@ Git tools for sending email. Summary: Git GUI tool Group: Development/Tools Requires: git = %{version}-%{release}, tk >= 8.4 +Requires: gitk = %{version}-%{release} %description gui Git GUI tool. @@ -260,6 +261,12 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sat Dec 20 2008 Todd Zullinger 1.6.0.6-1 +- git-1.6.0.6 +- Fixes a local privilege escalation bug in gitweb + (http://article.gmane.org/gmane.comp.version-control.git/103624) +- Add gitk Requires to git-gui (bug 476308) + * Thu Dec 11 2008 Josh Boyer 1.6.0.5-1 - git-1.6.0.5 diff --git a/sources b/sources index 69eade4..383d999 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -899172ebeac65f7a09a8e204d4f87d8c git-1.6.0.5.tar.bz2 +b5be9b34b441cb57f92086bfaf59f255 git-1.6.0.6.tar.bz2 From b6cb93f5bb04b56b3349489b7bc051e5462fa9af Mon Sep 17 00:00:00 2001 From: jbowes Date: Sat, 20 Dec 2008 18:15:48 +0000 Subject: [PATCH 135/842] git 1.5.4.7 --- .cvsignore | 2 +- git.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index ca2ed08..adcc250 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.4.4.2.tar.gz +git-1.5.4.7.tar.gz diff --git a/git.spec b/git.spec index d4f0135..1fa5b48 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.3.6 -Release: 2%{?dist} +Version: 1.5.4.7 +Release: 1%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools @@ -10,7 +10,7 @@ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz Source1: git.xinetd Source2: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch -BuildRequires: perl, zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} +BuildRequires: perl, zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: git-core, git-svn, git-cvs, git-email, gitk, git-gui, perl-Git @@ -170,6 +170,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc Documentation/*gitk*.txt %{_bindir}/*gitk* +%{_datadir}/gitk %{!?_without_docs: %{_mandir}/man1/*gitk*.1*} %{!?_without_docs: %doc Documentation/*gitk*.html } @@ -195,6 +196,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Dec 20 2008 James Bowes 1.5.4.7-1 +- Update to latest maintenence release. + * Mon Jul 07 2008 Xavier Bachelot 1.5.3.6-2 - Drop git-cvs requirement for cvsps, it is not available in EL-4. diff --git a/sources b/sources index 31bf148..db6e98c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -37126a4eb247b491b29e768fd25bfee8 git-1.5.3.6.tar.gz +923798b1e3100aaa1be62a19d557188b git-1.5.4.7.tar.gz From f1f8cabac8c7dd4890995fd94a4d91440ad992ad Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 3 Jan 2009 16:36:21 +0000 Subject: [PATCH 136/842] - Install git-* commands in %{_libexecdir}/git-core, the upstream default - Remove libcurl from Requires, rpm will pick this up automatically - Consolidate build/install options in %make_git (Roland McGrath) - Include DirectoryIndex in gitweb httpd-config (bug 471692) - Define DOCBOOK_XSL_172 to fix minor manpage issues - Rename %{_var}/lib/git-daemon to %{_var}/lib/git - Preserve timestamps on installed files - Quiet some rpmlint complaints - Use macros more consistently --- .cvsignore | 2 +- git.conf.httpd | 1 + git.spec | 167 ++++++++++++++++++++++++++++--------------------- git.xinetd | 4 +- sources | 2 +- 5 files changed, 100 insertions(+), 76 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3db4196..a78fd3d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.0.6.tar.bz2 +git-1.6.1.tar.bz2 diff --git a/git.conf.httpd b/git.conf.httpd index 3611943..4f4eac7 100644 --- a/git.conf.httpd +++ b/git.conf.httpd @@ -3,4 +3,5 @@ Alias /git /var/www/git Options +ExecCGI AddHandler cgi-script .cgi + DirectoryIndex gitweb.cgi diff --git a/git.spec b/git.spec index 040d620..599d4e0 100644 --- a/git.spec +++ b/git.spec @@ -1,23 +1,23 @@ # Pass --without docs to rpmbuild if you don't want the documentation -Name: git -Version: 1.6.0.6 -Release: 1%{?dist} -Summary: Core git tools -License: GPLv2 -Group: Development/Tools -URL: http://kernel.org/pub/software/scm/git/ -Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2 -Source1: git-init.el -Source2: git.xinetd -Source3: git.conf.httpd -Patch0: git-1.5-gitweb-home-link.patch -BuildRequires: zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Name: git +Version: 1.6.1 +Release: 1%{?dist} +Summary: Core git tools +License: GPLv2 +Group: Development/Tools +URL: http://kernel.org/pub/software/scm/git/ +Source0: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2 +Source1: git-init.el +Source2: git.xinetd +Source3: git.conf.httpd +Patch0: git-1.5-gitweb-home-link.patch +BuildRequires: zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: perl-Git = %{version}-%{release} -Requires: zlib >= 1.2, rsync, libcurl, less, openssh-clients, expat, perl(Error) -Provides: git-core = %{version}-%{release} -Obsoletes: git-core <= 1.5.4.3 +Requires: perl-Git = %{version}-%{release} +Requires: zlib >= 1.2, rsync, less, openssh-clients, expat, perl(Error) +Provides: git-core = %{version}-%{release} +Obsoletes: git-core <= 1.5.4.3 %description Git is a fast, scalable, distributed revision control system with an @@ -29,18 +29,18 @@ install all git packages, including tools for integrating with other SCMs, install the git-all meta-package. %package all -Summary: Meta-package to pull in all git tools -Group: Development/Tools -Requires: git = %{version}-%{release} -Requires: git-svn = %{version}-%{release} -Requires: git-cvs = %{version}-%{release} -Requires: git-arch = %{version}-%{release} -Requires: git-email = %{version}-%{release} -Requires: gitk = %{version}-%{release} -Requires: git-gui = %{version}-%{release} -Requires: perl-Git = %{version}-%{release} -Requires: emacs-git = %{version}-%{release} -Obsoletes: git <= 1.5.4.3 +Summary: Meta-package to pull in all git tools +Group: Development/Tools +Requires: git = %{version}-%{release} +Requires: git-svn = %{version}-%{release} +Requires: git-cvs = %{version}-%{release} +Requires: git-arch = %{version}-%{release} +Requires: git-email = %{version}-%{release} +Requires: gitk = %{version}-%{release} +Requires: git-gui = %{version}-%{release} +Requires: perl-Git = %{version}-%{release} +Requires: emacs-git = %{version}-%{release} +Obsoletes: git <= 1.5.4.3 %description all Git is a fast, scalable, distributed revision control system with an @@ -50,9 +50,9 @@ and full access to internals. This is a dummy package which brings in all subpackages. %package daemon -Summary: Git protocol dæmon -Group: Development/Tools -Requires: git = %{version}-%{release} +Summary: Git protocol dæmon +Group: Development/Tools +Requires: git = %{version}-%{release} %description daemon The git dæmon for supporting git:// access to git repositories @@ -89,8 +89,8 @@ Git tools for importing Arch repositories. %package email Summary: Git tools for sending email Group: Development/Tools -Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} -Requires: perl(Net::SMTP::SSL) +Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} +Requires: perl(Net::SMTP::SSL) %description email Git tools for sending email. @@ -120,9 +120,9 @@ BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) Perl interface to Git. %package -n emacs-git -Summary: Git version control system support for Emacs -Group: Applications/Editors -Requires: git = %{version}-%{release}, emacs-common +Summary: Git version control system support for Emacs +Group: Applications/Editors +Requires: git = %{version}-%{release}, emacs-common %description -n emacs-git %{summary}. @@ -131,51 +131,61 @@ Requires: git = %{version}-%{release}, emacs-common %setup -q %patch0 -p1 +# Use these same options for every invocation of 'make'. +# Otherwise it will rebuild in %%install due to flags changes. +%define make_git \ +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \\\ + ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\ + DESTDIR=$RPM_BUILD_ROOT \\\ + DOCBOOK_XSL_172=YesPlease \\\ + INSTALL="install -p" \\\ + INSTALLDIRS=vendor \\\ + prefix=%{_prefix} + %build -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ - ETC_GITCONFIG=/etc/gitconfig \ - gitexecdir=%{_bindir} \ - prefix=%{_prefix} all %{!?_without_docs: doc} +%{make_git} all %{!?_without_docs: doc} make -C contrib/emacs %install rm -rf $RPM_BUILD_ROOT -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \ - prefix=%{_prefix} mandir=%{_mandir} \ - ETC_GITCONFIG=/etc/gitconfig \ - gitexecdir=%{_bindir} \ - INSTALLDIRS=vendor install %{!?_without_docs: install-doc} +%{make_git} install %{!?_without_docs: install-doc} make -C contrib/emacs install \ - emacsdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp + emacsdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp for elc in $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/*.elc ; do - install -pm 644 contrib/emacs/$(basename $elc .elc).el \ - $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp + install -pm 644 contrib/emacs/$(basename $elc .elc).el \ + $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp done install -Dpm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/git-init.el -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d -install -m 644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/git -mkdir -p $RPM_BUILD_ROOT/var/www/git -install -m 644 -t $RPM_BUILD_ROOT/var/www/git gitweb/*.png gitweb/*.css -install -m 755 -t $RPM_BUILD_ROOT/var/www/git gitweb/gitweb.cgi + $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/git-init.el +mkdir -p $RPM_BUILD_ROOT%{_var}/www/git +install -pm 644 -t $RPM_BUILD_ROOT%{_var}/www/git gitweb/*.png gitweb/*.css +install -pm 755 -t $RPM_BUILD_ROOT%{_var}/www/git gitweb/gitweb.cgi mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d -install -m 0644 %SOURCE3 $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/git.conf +install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/git.conf find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citooli|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT{%{_bindir},%{_libexecdir}} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citooli|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files (find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %else rm -rf $RPM_BUILD_ROOT%{_mandir} %endif -mkdir -p $RPM_BUILD_ROOT/var/lib/git-daemon + +mkdir -p $RPM_BUILD_ROOT%{_var}/lib/git +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d +install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/git mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d -install -m 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git +install -pm 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git + +# quiet some rpmlint complaints +chmod g-w $RPM_BUILD_ROOT%{_libexecdir}/git-core/* +rm -f Documentation/technical/.gitignore +chmod a-x Documentation/technical/api-index.sh %clean @@ -185,6 +195,7 @@ rm -rf $RPM_BUILD_ROOT %files -f bin-man-doc-files %defattr(-,root,root) %{_datadir}/git-core/ +%dir %{_libexecdir}/git-core/ %doc README COPYING Documentation/*.txt contrib/hooks %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} %{!?_without_docs: %doc Documentation/howto Documentation/technical} @@ -193,7 +204,7 @@ rm -rf $RPM_BUILD_ROOT %files svn %defattr(-,root,root) -%{_bindir}/*svn* +%{_libexecdir}/git-core/*svn* %doc Documentation/*svn*.txt %{!?_without_docs: %{_mandir}/man1/*svn*.1*} %{!?_without_docs: %doc Documentation/*svn*.html } @@ -201,28 +212,29 @@ rm -rf $RPM_BUILD_ROOT %files cvs %defattr(-,root,root) %doc Documentation/*git-cvs*.txt -%{_bindir}/*cvs* +%{_bindir}/git-cvsserver +%{_libexecdir}/git-core/*cvs* %{!?_without_docs: %{_mandir}/man1/*cvs*.1*} %{!?_without_docs: %doc Documentation/*git-cvs*.html } %files arch %defattr(-,root,root) %doc Documentation/git-archimport.txt -%{_bindir}/git-archimport +%{_libexecdir}/git-core/git-archimport %{!?_without_docs: %{_mandir}/man1/git-archimport.1*} %{!?_without_docs: %doc Documentation/git-archimport.html } %files email %defattr(-,root,root) %doc Documentation/*email*.txt -%{_bindir}/*email* +%{_libexecdir}/git-core/*email* %{!?_without_docs: %{_mandir}/man1/*email*.1*} %{!?_without_docs: %doc Documentation/*email*.html } %files gui %defattr(-,root,root) -%{_bindir}/git-gui -%{_bindir}/git-citool +%{_libexecdir}/git-core/git-gui* +%{_libexecdir}/git-core/git-citool %{_datadir}/git-gui/ %{!?_without_docs: %{_mandir}/man1/git-gui.1*} %{!?_without_docs: %doc Documentation/git-gui.html} @@ -247,13 +259,13 @@ rm -rf $RPM_BUILD_ROOT %files daemon %defattr(-,root,root) -%{_bindir}/git-daemon +%{_libexecdir}/git-core/git-daemon %config(noreplace)%{_sysconfdir}/xinetd.d/git -/var/lib/git-daemon +%{_var}/lib/git %files -n gitweb %defattr(-,root,root) -/var/www/git/ +%{_var}/www/git/ %config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf @@ -261,6 +273,17 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sat Jan 03 2009 Todd Zullinger 1.6.1-1 +- Install git-* commands in %%{_libexecdir}/git-core, the upstream default +- Remove libcurl from Requires, rpm will pick this up automatically +- Consolidate build/install options in %%make_git (Roland McGrath) +- Include DirectoryIndex in gitweb httpd-config (bug 471692) +- Define DOCBOOK_XSL_172 to fix minor manpage issues +- Rename %%{_var}/lib/git-daemon to %%{_var}/lib/git +- Preserve timestamps on installed files +- Quiet some rpmlint complaints +- Use macros more consistently + * Sat Dec 20 2008 Todd Zullinger 1.6.0.6-1 - git-1.6.0.6 - Fixes a local privilege escalation bug in gitweb @@ -514,7 +537,7 @@ rm -rf $RPM_BUILD_ROOT * Tue Jan 10 2006 Chris Wright 1.1.0-1 - Update to latest git-1.1.0 (drop git-email for now) - Now creates multiple packages: -- git-core, git-svn, git-cvs, git-arch, gitk +- git-core, git-svn, git-cvs, git-arch, gitk * Mon Nov 14 2005 H. Peter Anvin 0.99.9j-1 - Change subpackage names to git- instead of git-core- @@ -551,7 +574,7 @@ rm -rf $RPM_BUILD_ROOT * Wed Aug 17 2005 Tom "spot" Callaway 0.99.4-3 - use dist tag to differentiate between branches - use rpm optflags by default (patch0) -- own %{_datadir}/git-core/ +- own %%{_datadir}/git-core/ * Mon Aug 15 2005 Chris Wright - update spec file to fix Buildroot, Requires, and drop Vendor diff --git a/git.xinetd b/git.xinetd index dcfae91..52365ce 100644 --- a/git.xinetd +++ b/git.xinetd @@ -8,8 +8,8 @@ service git socket_type = stream wait = no user = nobody - server = /usr/bin/git-daemon - server_args = --base-path=/srv/git --export-all --user-path=public_git --syslog --inetd --verbose + server = /usr/bin/git + server_args = daemon --base-path=/var/lib/git --export-all --user-path=public_git --syslog --inetd --verbose log_on_failure += USERID # xinetd doesn't do this by default. bug #195265 flags = IPv6 diff --git a/sources b/sources index 383d999..004c7dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b5be9b34b441cb57f92086bfaf59f255 git-1.6.0.6.tar.bz2 +66265d85593473b23290232b9dccef77 git-1.6.1.tar.bz2 From e9afada94e68c01923223b8640d165a1711e63de Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 14 Jan 2009 18:58:39 +0000 Subject: [PATCH 137/842] Backport gitweb fixes for CVE-2008-5516 and CVE-2008-5517 (bug 479715) --- git.spec | 9 ++- gitweb-CVE-2008-5516.patch | 143 +++++++++++++++++++++++++++++++++++++ gitweb-CVE-2008-5517.patch | 75 +++++++++++++++++++ 3 files changed, 226 insertions(+), 1 deletion(-) create mode 100644 gitweb-CVE-2008-5516.patch create mode 100644 gitweb-CVE-2008-5517.patch diff --git a/git.spec b/git.spec index 1fa5b48..3392d55 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools @@ -10,6 +10,8 @@ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz Source1: git.xinetd Source2: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch +Patch1: gitweb-CVE-2008-5516.patch +Patch2: gitweb-CVE-2008-5517.patch BuildRequires: perl, zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: git-core, git-svn, git-cvs, git-email, gitk, git-gui, perl-Git @@ -93,6 +95,8 @@ Perl interface to Git %prep %setup -q %patch0 -p1 +%patch1 -p1 -b .CVE-2008-5516 +%patch2 -p1 -b .CVE-2008-5517 %build make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ @@ -196,6 +200,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jan 12 2009 Todd Zullinger 1.5.4.7-2 +- Backport gitweb fixes for CVE-2008-5516 and CVE-2008-5517 (bug 479715) + * Sat Dec 20 2008 James Bowes 1.5.4.7-1 - Update to latest maintenence release. diff --git a/gitweb-CVE-2008-5516.patch b/gitweb-CVE-2008-5516.patch new file mode 100644 index 0000000..c8b8620 --- /dev/null +++ b/gitweb-CVE-2008-5516.patch @@ -0,0 +1,143 @@ +From 8f8bfb38271775770cd1da8fb7cfd1e2d7ef2481 Mon Sep 17 00:00:00 2001 +From: Jakub Narebski +Date: Wed, 5 Mar 2008 09:31:55 +0100 +Subject: [PATCH 1/2] gitweb: Fix and simplify pickaxe search + +Instead of using "git-rev-list | git-diff-tree" pipeline for pickaxe +search, use git-log with appropriate options. Besides reducing number +of forks by one, this allows to use list form of open, which in turn +allow to not worry about quoting arguments and to avoid forking shell. + +The options to git-log were chosen to reduce required changes in +pickaxe git command output parsing; gitweb still parses returned +commits one by one. + +Parsing "pickaxe" output is simplified: git_search now reuses +parse_difftree_raw_line and writes affected files as they arrive using +the fact that commit name goes always before [raw] diff. + +While at it long bug of pickaxe search was fixed, namely that the last +commit found by pickaxe search was never shown. + +Signed-off-by: Jakub Narebski +Signed-off-by: Junio C Hamano + +Note: This patch was backported to 1.5.4.7 by Todd Zullinger +. Any blame for problems should come to me, not the +upstream authors. :) +--- + gitweb/gitweb.perl | 83 ++++++++++++++++++++++++++------------------------- + 1 files changed, 42 insertions(+), 41 deletions(-) + +diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl +index 86a6ced..e011393 100755 +--- a/gitweb/gitweb.perl ++++ b/gitweb/gitweb.perl +@@ -5199,50 +5199,18 @@ sub git_search { + print "\n"; + my $alternate = 1; + $/ = "\n"; +- my $git_command = git_cmd_str(); +- my $searchqtext = $searchtext; +- $searchqtext =~ s/'/'\\''/; +- open my $fd, "-|", "$git_command rev-list $hash | " . +- "$git_command diff-tree -r --stdin -S\'$searchqtext\'"; ++ open my $fd, '-|', git_cmd(), '--no-pager', 'log', @diff_opts, ++ '--pretty=format:%H', '--no-abbrev', '--raw', "-S$searchtext"; + undef %co; + my @files; + while (my $line = <$fd>) { +- if (%co && $line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)\t(.*)$/) { +- my %set; +- $set{'file'} = $6; +- $set{'from_id'} = $3; +- $set{'to_id'} = $4; +- $set{'id'} = $set{'to_id'}; +- if ($set{'id'} =~ m/0{40}/) { +- $set{'id'} = $set{'from_id'}; +- } +- if ($set{'id'} =~ m/0{40}/) { +- next; +- } +- push @files, \%set; +- } elsif ($line =~ m/^([0-9a-fA-F]{40})$/){ ++ chomp $line; ++ next unless $line; ++ ++ my %set = parse_difftree_raw_line($line); ++ if (defined $set{'commit'}) { ++ # finish previous commit + if (%co) { +- if ($alternate) { +- print "\n"; +- } else { +- print "\n"; +- } +- $alternate ^= 1; +- my $author = chop_and_escape_str($co{'author_name'}, 15, 5); +- print "\n" . +- "\n" . +- "\n" . + "\n" . + "\n"; + } +- %co = parse_commit($1); ++ ++ if ($alternate) { ++ print "\n"; ++ } else { ++ print "\n"; ++ } ++ $alternate ^= 1; ++ %co = parse_commit($set{'commit'}); ++ my $author = chop_and_escape_str($co{'author_name'}, 15, 5); ++ print "\n" . ++ "\n" . ++ "\n" . ++ "\n" . ++ "\n"; ++ } ++ + print "
$co{'age_string_date'}" . $author . "" . +- $cgi->a({-href => href(action=>"commit", hash=>$co{'id'}), +- -class => "list subject"}, +- chop_and_escape_str($co{'title'}, 50) . "
"); +- while (my $setref = shift @files) { +- my %set = %$setref; +- print $cgi->a({-href => href(action=>"blob", hash_base=>$co{'id'}, +- hash=>$set{'id'}, file_name=>$set{'file'}), +- -class => "list"}, +- "" . esc_path($set{'file'}) . "") . +- "
\n"; +- } + print "		" . + $cgi->a({-href => href(action=>"commit", hash=>$co{'id'})}, "commit") . +@@ -5251,11 +5219,44 @@ sub git_search { + print "
$co{'age_string_date'}$author" . ++ $cgi->a({-href => href(action=>"commit", hash=>$co{'id'}), ++ -class => "list subject"}, ++ chop_and_escape_str($co{'title'}, 50) . "
"); ++ } elsif (defined $set{'to_id'}) { ++ next if ($set{'to_id'} =~ m/^0{40}$/); ++ ++ print $cgi->a({-href => href(action=>"blob", hash_base=>$co{'id'}, ++ hash=>$set{'to_id'}, file_name=>$set{'to_file'}), ++ -class => "list"}, ++ "" . esc_path($set{'file'}) . "") . ++ "
\n"; + } + } + close $fd; + ++ # finish last commit (warning: repetition!) ++ if (%co) { ++ print "		" . ++ $cgi->a({-href => href(action=>"commit", hash=>$co{'id'})}, "commit") . ++ " | " . ++ $cgi->a({-href => href(action=>"tree", hash=>$co{'tree'}, hash_base=>$co{'id'})}, "tree"); ++ print "
\n"; + } + +-- +1.6.1 + diff --git a/gitweb-CVE-2008-5517.patch b/gitweb-CVE-2008-5517.patch new file mode 100644 index 0000000..ad69925 --- /dev/null +++ b/gitweb-CVE-2008-5517.patch @@ -0,0 +1,75 @@ +From 2813e6cef24a8b363a97ea0c86bf4494fc453f32 Mon Sep 17 00:00:00 2001 +From: Lea Wiemann +Date: Tue, 17 Jun 2008 23:46:35 +0200 +Subject: [PATCH 2/2] gitweb: quote commands properly when calling the shell + +This eliminates the function git_cmd_str, which was used for composing +command lines, and adds a quote_command function, which quotes all of +its arguments (as in quote.c). + +Signed-off-by: Lea Wiemann +Signed-off-by: Junio C Hamano +--- + gitweb/gitweb.perl | 24 ++++++++++++++---------- + 1 files changed, 14 insertions(+), 10 deletions(-) + +diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl +index e011393..bd50c07 100755 +--- a/gitweb/gitweb.perl ++++ b/gitweb/gitweb.perl +@@ -1396,9 +1396,13 @@ sub git_cmd { + return $GIT, '--git-dir='.$git_dir; + } + +-# returns path to the core git executable and the --git-dir parameter as string +-sub git_cmd_str { +- return join(' ', git_cmd()); ++# quote the given arguments for passing them to the shell ++# quote_command("command", "arg 1", "arg with ' and ! characters") ++# => "'command' 'arg 1' 'arg with '\'' and '\!' characters'" ++# Try to avoid using this function wherever possible. ++sub quote_command { ++ return join(' ', ++ map( { my $a = $_; $a =~ s/(['!])/'\\$1'/g; "'$a'" } @_ )); + } + + # get HEAD ref of given project as hash +@@ -4477,7 +4481,6 @@ sub git_snapshot { + $hash = git_get_head_hash($project); + } + +- my $git_command = git_cmd_str(); + my $name = $project; + $name =~ s,([^/])/*\.git$,$1,; + $name = basename($name); +@@ -4485,11 +4488,12 @@ sub git_snapshot { + $name =~ s/\047/\047\\\047\047/g; + my $cmd; + $filename .= "-$hash$known_snapshot_formats{$format}{'suffix'}"; +- $cmd = "$git_command archive " . +- "--format=$known_snapshot_formats{$format}{'format'} " . +- "--prefix=\'$name\'/ $hash"; ++ $cmd = quote_command( ++ git_cmd(), 'archive', ++ "--format=$known_snapshot_formats{$format}{'format'}", ++ "--prefix=$name/", $hash); + if (exists $known_snapshot_formats{$format}{'compressor'}) { +- $cmd .= ' | ' . join ' ', @{$known_snapshot_formats{$format}{'compressor'}}; ++ $cmd .= ' | ' . quote_command(@{$known_snapshot_formats{$format}{'compressor'}}); + } + + print $cgi->header( +@@ -4702,8 +4706,8 @@ sub git_object { + if ($hash || ($hash_base && !defined $file_name)) { + my $object_id = $hash || $hash_base; + +- my $git_command = git_cmd_str(); +- open my $fd, "-|", "$git_command cat-file -t $object_id 2>/dev/null" ++ open my $fd, "-|", quote_command( ++ git_cmd(), 'cat-file', '-t', $object_id) . ' 2> /dev/null' + or die_error('404 Not Found', "Object does not exist"); + $type = <$fd>; + chomp $type; +-- +1.6.1 + From 3ff74b9f170c983cf520436756fa779c4fabf4d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Fri, 16 Jan 2009 15:16:36 +0000 Subject: [PATCH 138/842] - rebuild with new openssl --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 599d4e0..6919ba9 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -273,6 +273,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Fri Jan 16 2009 Tomas Mraz 1.6.1-2 +- rebuild with new openssl + * Sat Jan 03 2009 Todd Zullinger 1.6.1-1 - Install git-* commands in %%{_libexecdir}/git-core, the upstream default - Remove libcurl from Requires, rpm will pick this up automatically From c97202cde7b9a9e6049d712131176779718b3e57 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 27 Jan 2009 01:25:02 +0000 Subject: [PATCH 139/842] Update to git-1.6.1.1 Also, make the compile more verbose. --- .cvsignore | 2 +- git.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index a78fd3d..f3e021c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.1.tar.bz2 +git-1.6.1.1.tar.bz2 diff --git a/git.spec b/git.spec index 6919ba9..44c02bf 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.1 -Release: 2%{?dist} +Version: 1.6.1.1 +Release: 1%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -134,7 +134,7 @@ Requires: git = %{version}-%{release}, emacs-common # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. %define make_git \ -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \\\ +make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\ ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\ DESTDIR=$RPM_BUILD_ROOT \\\ DOCBOOK_XSL_172=YesPlease \\\ @@ -273,6 +273,10 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Mon Jan 26 2009 Todd Zullinger 1.6.1.1-1 +- git-1.6.1.1 +- Make compile more verbose + * Fri Jan 16 2009 Tomas Mraz 1.6.1-2 - rebuild with new openssl diff --git a/sources b/sources index 004c7dd..4c1352f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -66265d85593473b23290232b9dccef77 git-1.6.1.tar.bz2 +d2b6925cb03e1e33911fdf9392946747 git-1.6.1.1.tar.bz2 From 3bdf7d67a6ed67f511eb60eab1381f83bc10d62e Mon Sep 17 00:00:00 2001 From: jwboyer Date: Thu, 29 Jan 2009 13:10:58 +0000 Subject: [PATCH 140/842] - git-1.6.1.2 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index f3e021c..428e000 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.1.1.tar.bz2 +git-1.6.1.2.tar.bz2 diff --git a/git.spec b/git.spec index 44c02bf..8911467 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.1.1 +Version: 1.6.1.2 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -273,6 +273,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Thu Jan 29 2009 Josh Boyer 1.6.1.2-1 +- git-1.6.1.2 + * Mon Jan 26 2009 Todd Zullinger 1.6.1.1-1 - git-1.6.1.1 - Make compile more verbose diff --git a/sources b/sources index 4c1352f..c22d282 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d2b6925cb03e1e33911fdf9392946747 git-1.6.1.1.tar.bz2 +72a9d88932190ff3523678eec88844ae git-1.6.1.2.tar.bz2 From a72ee4cc9ceacf85e3cc583250bc90e545776647 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 9 Feb 2009 06:39:19 +0000 Subject: [PATCH 141/842] Update to git-1.6.1.3 - Set htmldir so "git help -w " works - Patch git-web--browse to not use "/sbin/start" to browse - Include git-daemon documentation in the git-daemon package --- .cvsignore | 2 +- git.spec | 19 ++++++++++++++++--- sources | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 428e000..486f016 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.1.2.tar.bz2 +git-1.6.1.3.tar.bz2 diff --git a/git.spec b/git.spec index 8911467..83d1a79 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.1.2 +Version: 1.6.1.3 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -11,6 +11,8 @@ Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch +# Submitted upstream on 2009-02-08, tmz +Patch1: 0001-git-web-browse-Fix-check-for-bin-start.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -130,6 +132,7 @@ Requires: git = %{version}-%{release}, emacs-common %prep %setup -q %patch0 -p1 +%patch1 -p1 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -140,6 +143,7 @@ make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\ DOCBOOK_XSL_172=YesPlease \\\ INSTALL="install -p" \\\ INSTALLDIRS=vendor \\\ + htmldir=%{_docdir}/%{name}-%{version} \\\ prefix=%{_prefix} %build @@ -170,7 +174,7 @@ find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' (find $RPM_BUILD_ROOT{%{_bindir},%{_libexecdir}} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citooli|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files (find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %else rm -rf $RPM_BUILD_ROOT%{_mandir} %endif @@ -259,9 +263,12 @@ rm -rf $RPM_BUILD_ROOT %files daemon %defattr(-,root,root) -%{_libexecdir}/git-core/git-daemon +%doc Documentation/*daemon*.txt %config(noreplace)%{_sysconfdir}/xinetd.d/git +%{_libexecdir}/git-core/git-daemon %{_var}/lib/git +%{!?_without_docs: %{_mandir}/man1/*daemon*.1*} +%{!?_without_docs: %doc Documentation/*daemon*.html} %files -n gitweb %defattr(-,root,root) @@ -273,6 +280,12 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Mon Feb 09 2009 Todd Zullinger 1.6.1.3-1 +- git-1.6.1.3 +- Set htmldir so "git help -w " works +- Patch git-web--browse to not use "/sbin/start" to browse +- Include git-daemon documentation in the git-daemon package + * Thu Jan 29 2009 Josh Boyer 1.6.1.2-1 - git-1.6.1.2 diff --git a/sources b/sources index c22d282..1fc3d6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -72a9d88932190ff3523678eec88844ae git-1.6.1.2.tar.bz2 +e31ea5ce9b076f5745056f01465e9602 git-1.6.1.3.tar.bz2 From 59f9f439edbbe21c76316eb21dd9edd04b3c0c03 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 9 Feb 2009 06:40:44 +0000 Subject: [PATCH 142/842] Add git-web--browse patch --- ...t-web-browse-Fix-check-for-bin-start.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 0001-git-web-browse-Fix-check-for-bin-start.patch diff --git a/0001-git-web-browse-Fix-check-for-bin-start.patch b/0001-git-web-browse-Fix-check-for-bin-start.patch new file mode 100644 index 0000000..70a8487 --- /dev/null +++ b/0001-git-web-browse-Fix-check-for-bin-start.patch @@ -0,0 +1,33 @@ +From e44161a223e7ec2cfb1f1b71399b995626c2d208 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Todd Zullinger +Date: Sun, 8 Feb 2009 14:04:20 -0500 +Subject: [PATCH 1/2] git-web--browse: Fix check for /bin/start + +The previous check in git-web--browse for /bin/start used test -n +/bin/start, which was always true. This lead to "start" being tried +first in the browser list. On systems with upstart installed, "start" +exists and might be in the PATH, but it makes a poor choice for a web +browser. Instead, test that /bin/start exists and is executable. + +Signed-off-by: Todd Zullinger +--- + git-web--browse.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/git-web--browse.sh b/git-web--browse.sh +index 78d236b..7ed0fad 100755 +--- a/git-web--browse.sh ++++ b/git-web--browse.sh +@@ -115,7 +115,7 @@ if test -z "$browser" ; then + browser_candidates="open $browser_candidates" + fi + # /bin/start indicates MinGW +- if test -n /bin/start; then ++ if test -x /bin/start; then + browser_candidates="start $browser_candidates" + fi + +-- +1.6.1.3 + From 96ee310620a0cecf5bdbe29bfc124639ef0a2a66 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 23 Feb 2009 19:58:18 +0000 Subject: [PATCH 143/842] Some git's subpackages should be noarch. We'll do that and rebuild manually. --- noautobuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 noautobuild diff --git a/noautobuild b/noautobuild new file mode 100644 index 0000000..716a23a --- /dev/null +++ b/noautobuild @@ -0,0 +1 @@ +Some git's subpackages should be noarch. We'll do that and rebuild manually. From 33cd3a66841f598fbb3f6354bd459610467f0623 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 25 Feb 2009 02:22:19 +0000 Subject: [PATCH 144/842] - Require perl(Authen::SASL) in git-email (bug 483062) - Build many of the subpackages as noarch - Update URL field --- git.spec | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 83d1a79..99e025d 100644 --- a/git.spec +++ b/git.spec @@ -1,17 +1,17 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.6.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools -URL: http://kernel.org/pub/software/scm/git/ +URL: http://git-scm.com/ Source0: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2 Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch -# Submitted upstream on 2009-02-08, tmz +# Included upstream as f6b98e4, tmz Patch1: 0001-git-web-browse-Fix-check-for-bin-start.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -33,6 +33,7 @@ SCMs, install the git-all meta-package. %package all Summary: Meta-package to pull in all git tools Group: Development/Tools +BuildArch: noarch Requires: git = %{version}-%{release} Requires: git-svn = %{version}-%{release} Requires: git-cvs = %{version}-%{release} @@ -61,6 +62,7 @@ The git dæmon for supporting git:// access to git repositories %package -n gitweb Summary: Simple web interface to git repositories Group: Development/Tools +BuildArch: noarch Requires: git = %{version}-%{release} %description -n gitweb @@ -70,6 +72,7 @@ Simple web interface to track changes in git repositories %package svn Summary: Git tools for importing Subversion repositories Group: Development/Tools +BuildArch: noarch Requires: git = %{version}-%{release}, subversion, perl(Term::ReadKey) %description svn Git tools for importing Subversion repositories. @@ -77,6 +80,7 @@ Git tools for importing Subversion repositories. %package cvs Summary: Git tools for importing CVS repositories Group: Development/Tools +BuildArch: noarch Requires: git = %{version}-%{release}, cvs, cvsps %description cvs Git tools for importing CVS repositories. @@ -84,6 +88,7 @@ Git tools for importing CVS repositories. %package arch Summary: Git tools for importing Arch repositories Group: Development/Tools +BuildArch: noarch Requires: git = %{version}-%{release}, tla %description arch Git tools for importing Arch repositories. @@ -91,14 +96,16 @@ Git tools for importing Arch repositories. %package email Summary: Git tools for sending email Group: Development/Tools +BuildArch: noarch Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} -Requires: perl(Net::SMTP::SSL) +Requires: perl(Net::SMTP::SSL), perl(Authen::SASL) %description email Git tools for sending email. %package gui Summary: Git GUI tool Group: Development/Tools +BuildArch: noarch Requires: git = %{version}-%{release}, tk >= 8.4 Requires: gitk = %{version}-%{release} %description gui @@ -107,6 +114,7 @@ Git GUI tool. %package -n gitk Summary: Git revision tree visualiser Group: Development/Tools +BuildArch: noarch Requires: git = %{version}-%{release}, tk >= 8.4 %description -n gitk Git revision tree visualiser. @@ -114,6 +122,7 @@ Git revision tree visualiser. %package -n perl-Git Summary: Perl interface to Git Group: Development/Libraries +BuildArch: noarch Requires: git = %{version}-%{release}, perl(Error) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) @@ -124,6 +133,7 @@ Perl interface to Git. %package -n emacs-git Summary: Git version control system support for Emacs Group: Applications/Editors +BuildArch: noarch Requires: git = %{version}-%{release}, emacs-common %description -n emacs-git @@ -280,6 +290,11 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Tue Feb 24 2009 Todd Zullinger - 1.6.1.3-2 +- Require perl(Authen::SASL) in git-email (bug 483062) +- Build many of the subpackages as noarch +- Update URL field + * Mon Feb 09 2009 Todd Zullinger 1.6.1.3-1 - git-1.6.1.3 - Set htmldir so "git help -w " works From 33e67f8a54e9b7884ef212c8072ca944cfd5aaf9 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 3 Mar 2009 13:35:13 +0000 Subject: [PATCH 145/842] Remove unneeded noautobuild file now that the F11 mass rebuild is done --- noautobuild | 1 - 1 file changed, 1 deletion(-) delete mode 100644 noautobuild diff --git a/noautobuild b/noautobuild deleted file mode 100644 index 716a23a..0000000 --- a/noautobuild +++ /dev/null @@ -1 +0,0 @@ -Some git's subpackages should be noarch. We'll do that and rebuild manually. From 3fb48f5afaa275d50e3bfdeb0db126bb67ba1923 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 9 Mar 2009 20:36:41 +0000 Subject: [PATCH 146/842] Update to git-1.6.2 - Include contrib/emacs/README in emacs subpackage - Drop upstreamed git-web--browse patch --- .cvsignore | 2 +- ...t-web-browse-Fix-check-for-bin-start.patch | 33 ------------------- git.spec | 13 +++++--- sources | 2 +- 4 files changed, 10 insertions(+), 40 deletions(-) delete mode 100644 0001-git-web-browse-Fix-check-for-bin-start.patch diff --git a/.cvsignore b/.cvsignore index 486f016..e8c0c3f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.1.3.tar.bz2 +git-1.6.2.tar.bz2 diff --git a/0001-git-web-browse-Fix-check-for-bin-start.patch b/0001-git-web-browse-Fix-check-for-bin-start.patch deleted file mode 100644 index 70a8487..0000000 --- a/0001-git-web-browse-Fix-check-for-bin-start.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e44161a223e7ec2cfb1f1b71399b995626c2d208 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Todd Zullinger -Date: Sun, 8 Feb 2009 14:04:20 -0500 -Subject: [PATCH 1/2] git-web--browse: Fix check for /bin/start - -The previous check in git-web--browse for /bin/start used test -n -/bin/start, which was always true. This lead to "start" being tried -first in the browser list. On systems with upstart installed, "start" -exists and might be in the PATH, but it makes a poor choice for a web -browser. Instead, test that /bin/start exists and is executable. - -Signed-off-by: Todd Zullinger ---- - git-web--browse.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/git-web--browse.sh b/git-web--browse.sh -index 78d236b..7ed0fad 100755 ---- a/git-web--browse.sh -+++ b/git-web--browse.sh -@@ -115,7 +115,7 @@ if test -z "$browser" ; then - browser_candidates="open $browser_candidates" - fi - # /bin/start indicates MinGW -- if test -n /bin/start; then -+ if test -x /bin/start; then - browser_candidates="start $browser_candidates" - fi - --- -1.6.1.3 - diff --git a/git.spec b/git.spec index 99e025d..90f9bd2 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.1.3 -Release: 2%{?dist} +Version: 1.6.2 +Release: 1%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -11,8 +11,6 @@ Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch -# Included upstream as f6b98e4, tmz -Patch1: 0001-git-web-browse-Fix-check-for-bin-start.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -142,7 +140,6 @@ Requires: git = %{version}-%{release}, emacs-common %prep %setup -q %patch0 -p1 -%patch1 -p1 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -268,6 +265,7 @@ rm -rf $RPM_BUILD_ROOT %files -n emacs-git %defattr(-,root,root) +%doc contrib/emacs/README %{_datadir}/emacs/site-lisp/*git*.el* %{_datadir}/emacs/site-lisp/site-start.d/git-init.el @@ -290,6 +288,11 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Mon Mar 09 2009 Todd Zullinger - 1.6.2-1 +- git-1.6.2 +- Include contrib/emacs/README in emacs subpackage +- Drop upstreamed git-web--browse patch + * Tue Feb 24 2009 Todd Zullinger - 1.6.1.3-2 - Require perl(Authen::SASL) in git-email (bug 483062) - Build many of the subpackages as noarch diff --git a/sources b/sources index 1fc3d6c..06f7e08 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e31ea5ce9b076f5745056f01465e9602 git-1.6.1.3.tar.bz2 +12c7d874e17c6e111697b1714b5f4319 git-1.6.2.tar.bz2 From ff79f533a220d7bfb66b33517209edd82798b264 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 4 Apr 2009 20:47:17 +0000 Subject: [PATCH 147/842] Update to git-1.6.2.2 - Include contrib/ dir in %doc (bug 492490) - Don't set DOCBOOK_XSL_172, fix the '\&.ft' with sed (bug 485161) - Ignore Branches output from cvsps-2.2b1 (bug 490602) - Remove shebang from bash-completion script - Include README in gitweb subpackage --- .cvsignore | 2 +- ...t-Ignore-cvsps-2.2b1-Branches-output.patch | 26 +++++++++++++++++++ git.spec | 26 ++++++++++++++++--- sources | 2 +- 4 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch diff --git a/.cvsignore b/.cvsignore index e8c0c3f..7b52e58 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.2.tar.bz2 +git-1.6.2.2.tar.bz2 diff --git a/git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch b/git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch new file mode 100644 index 0000000..37a22dd --- /dev/null +++ b/git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch @@ -0,0 +1,26 @@ +From 09891c65a5f7409ce0bd37daced0ff31fbb1b1c9 Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Mon, 23 Mar 2009 00:03:36 -0400 +Subject: [PATCH] git-cvsimport: Ignore cvsps-2.2b1 Branches: output + +Signed-off-by: Todd Zullinger +--- + git-cvsimport.perl | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/git-cvsimport.perl b/git-cvsimport.perl +index e439202..d020f1a 100755 +--- a/git-cvsimport.perl ++++ b/git-cvsimport.perl +@@ -952,7 +952,7 @@ while () { + } elsif (/^-+$/) { # end of unknown-line processing + $state = 1; + } elsif ($state != 11) { # ignore stuff when skipping +- print STDERR "* UNKNOWN LINE * $_\n"; ++ print STDERR "* UNKNOWN LINE * $_\n" unless /^Branches: /; + } + } + commit() if $branch and $state != 11; +-- +1.6.2.2 + diff --git a/git.spec b/git.spec index 90f9bd2..f2d67c2 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.2 +Version: 1.6.2.2 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -11,6 +11,8 @@ Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch +# https://bugzilla.redhat.com/490602 +Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -140,6 +142,7 @@ Requires: git = %{version}-%{release}, emacs-common %prep %setup -q %patch0 -p1 +%patch1 -p1 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -147,7 +150,6 @@ Requires: git = %{version}-%{release}, emacs-common make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\ ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\ DESTDIR=$RPM_BUILD_ROOT \\\ - DOCBOOK_XSL_172=YesPlease \\\ INSTALL="install -p" \\\ INSTALLDIRS=vendor \\\ htmldir=%{_docdir}/%{name}-%{version} \\\ @@ -157,6 +159,12 @@ make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\ %{make_git} all %{!?_without_docs: doc} make -C contrib/emacs +# Work around odd manpage issues (bug #485161) +grep -rl '\\&\.ft' Documentation/ | xargs -i sed -i 's/\\&\.ft/.ft/g' {} + +# Remove shebang from bash-completion script +sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash + %install rm -rf $RPM_BUILD_ROOT %{make_git} install %{!?_without_docs: install-doc} @@ -195,8 +203,9 @@ install -pm 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysc # quiet some rpmlint complaints chmod g-w $RPM_BUILD_ROOT%{_libexecdir}/git-core/* -rm -f Documentation/technical/.gitignore +rm -f {Documentation/technical,contrib/emacs}/.gitignore chmod a-x Documentation/technical/api-index.sh +find contrib -type f -perm /a+x | xargs chmod -x %clean @@ -207,7 +216,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_datadir}/git-core/ %dir %{_libexecdir}/git-core/ -%doc README COPYING Documentation/*.txt contrib/hooks +%doc README COPYING Documentation/*.txt contrib/ %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} %{!?_without_docs: %doc Documentation/howto Documentation/technical} %{_sysconfdir}/bash_completion.d @@ -280,6 +289,7 @@ rm -rf $RPM_BUILD_ROOT %files -n gitweb %defattr(-,root,root) +%doc gitweb/README %{_var}/www/git/ %config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf @@ -288,6 +298,14 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Fri Apr 03 2009 Todd Zullinger - 1.6.2.2-1 +- git-1.6.2.2 +- Include contrib/ dir in %%doc (bug 492490) +- Don't set DOCBOOK_XSL_172, fix the '\&.ft' with sed (bug 485161) +- Ignore Branches output from cvsps-2.2b1 (bug 490602) +- Remove shebang from bash-completion script +- Include README in gitweb subpackage + * Mon Mar 09 2009 Todd Zullinger - 1.6.2-1 - git-1.6.2 - Include contrib/emacs/README in emacs subpackage diff --git a/sources b/sources index 06f7e08..7b92812 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -12c7d874e17c6e111697b1714b5f4319 git-1.6.2.tar.bz2 +d219aa5480ed6396f8ab968f3f7eb0f9 git-1.6.2.2.tar.bz2 From e8f3787a2a4d1939e2e47e98cad6f610f46f19d1 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 6 Jun 2009 01:45:16 +0000 Subject: [PATCH 148/842] Update to git-1.6.3.2 - Require emacs >= 22.2 for emacs support (bug 495312) - Add a .desktop file for git-gui (bug 498801) - Set ASCIIDOC8 and ASCIIDOC_NO_ROFF to correct documentation issues, the sed hack to fix bug 485161 should no longer be needed - Escape newline in git-daemon xinetd description (bug 502393) - Add xinetd to git-daemon Requires (bug 504105) - Organize BuildRequires/Requires, drop redundant expat Requires - Only build noarch subpackages on Fedora >= 10 - Only build emacs and arch subpackages on Fedora - Handle curl/libcurl naming for EPEL and Fedora --- .cvsignore | 2 +- git-gui.desktop | 9 +++++ git.spec | 96 ++++++++++++++++++++++++++++++++++++++++++++----- git.xinetd | 2 +- sources | 2 +- 5 files changed, 99 insertions(+), 12 deletions(-) create mode 100644 git-gui.desktop diff --git a/.cvsignore b/.cvsignore index 7b52e58..65a8f60 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.2.2.tar.bz2 +git-1.6.3.2.tar.bz2 diff --git a/git-gui.desktop b/git-gui.desktop new file mode 100644 index 0000000..f74f066 --- /dev/null +++ b/git-gui.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Git GUI +GenericName=Git GUI +Comment=A graphical interface to Git +Exec=git gui +Icon=/usr/share/git-gui/lib/git-gui.ico +Terminal=false +Type=Application +Categories=Development; diff --git a/git.spec b/git.spec index f2d67c2..18d6b64 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.2.2 +Version: 1.6.3.2 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -10,14 +10,32 @@ Source0: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd +Source4: git-gui.desktop Patch0: git-1.5-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -BuildRequires: zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: desktop-file-utils +%if 0%{?fedora} +BuildRequires: emacs >= 22.2 +BuildRequires: libcurl-devel +%else +BuildRequires: curl-devel +%endif +BuildRequires: expat-devel +BuildRequires: gettext +BuildRequires: openssl-devel +BuildRequires: zlib-devel >= 1.2 +%{!?_without_docs:BuildRequires: asciidoc > 6.0.3, xmlto} + +Requires: less +Requires: openssh-clients +Requires: perl(Error) Requires: perl-Git = %{version}-%{release} -Requires: zlib >= 1.2, rsync, less, openssh-clients, expat, perl(Error) +Requires: rsync +Requires: zlib >= 1.2 + Provides: git-core = %{version}-%{release} Obsoletes: git-core <= 1.5.4.3 @@ -33,16 +51,20 @@ SCMs, install the git-all meta-package. %package all Summary: Meta-package to pull in all git tools Group: Development/Tools +%if 0%{?fedora} >= 10 BuildArch: noarch +%endif Requires: git = %{version}-%{release} Requires: git-svn = %{version}-%{release} Requires: git-cvs = %{version}-%{release} -Requires: git-arch = %{version}-%{release} Requires: git-email = %{version}-%{release} Requires: gitk = %{version}-%{release} Requires: git-gui = %{version}-%{release} Requires: perl-Git = %{version}-%{release} +%if 0%{?fedora} Requires: emacs-git = %{version}-%{release} +Requires: git-arch = %{version}-%{release} +%endif Obsoletes: git <= 1.5.4.3 %description all @@ -55,14 +77,16 @@ This is a dummy package which brings in all subpackages. %package daemon Summary: Git protocol dæmon Group: Development/Tools -Requires: git = %{version}-%{release} +Requires: git = %{version}-%{release}, xinetd %description daemon The git dæmon for supporting git:// access to git repositories %package -n gitweb Summary: Simple web interface to git repositories Group: Development/Tools +%if 0%{?fedora} >= 10 BuildArch: noarch +%endif Requires: git = %{version}-%{release} %description -n gitweb @@ -72,7 +96,9 @@ Simple web interface to track changes in git repositories %package svn Summary: Git tools for importing Subversion repositories Group: Development/Tools +%if 0%{?fedora} >= 10 BuildArch: noarch +%endif Requires: git = %{version}-%{release}, subversion, perl(Term::ReadKey) %description svn Git tools for importing Subversion repositories. @@ -80,23 +106,31 @@ Git tools for importing Subversion repositories. %package cvs Summary: Git tools for importing CVS repositories Group: Development/Tools +%if 0%{?fedora} >= 10 BuildArch: noarch +%endif Requires: git = %{version}-%{release}, cvs, cvsps %description cvs Git tools for importing CVS repositories. +%if 0%{?fedora} %package arch Summary: Git tools for importing Arch repositories Group: Development/Tools +%if 0%{?fedora} >= 10 BuildArch: noarch +%endif Requires: git = %{version}-%{release}, tla %description arch Git tools for importing Arch repositories. +%endif %package email Summary: Git tools for sending email Group: Development/Tools +%if 0%{?fedora} >= 10 BuildArch: noarch +%endif Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} Requires: perl(Net::SMTP::SSL), perl(Authen::SASL) %description email @@ -105,7 +139,9 @@ Git tools for sending email. %package gui Summary: Git GUI tool Group: Development/Tools +%if 0%{?fedora} >= 10 BuildArch: noarch +%endif Requires: git = %{version}-%{release}, tk >= 8.4 Requires: gitk = %{version}-%{release} %description gui @@ -114,7 +150,9 @@ Git GUI tool. %package -n gitk Summary: Git revision tree visualiser Group: Development/Tools +%if 0%{?fedora} >= 10 BuildArch: noarch +%endif Requires: git = %{version}-%{release}, tk >= 8.4 %description -n gitk Git revision tree visualiser. @@ -122,7 +160,9 @@ Git revision tree visualiser. %package -n perl-Git Summary: Perl interface to Git Group: Development/Libraries +%if 0%{?fedora} >= 10 BuildArch: noarch +%endif Requires: git = %{version}-%{release}, perl(Error) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) @@ -130,14 +170,18 @@ BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) %description -n perl-Git Perl interface to Git. +%if 0%{?fedora} %package -n emacs-git Summary: Git version control system support for Emacs Group: Applications/Editors +%if 0%{?fedora} >= 10 BuildArch: noarch -Requires: git = %{version}-%{release}, emacs-common +%endif +Requires: git = %{version}-%{release}, emacs-common >= 22.2 %description -n emacs-git %{summary}. +%endif %prep %setup -q @@ -148,6 +192,7 @@ Requires: git = %{version}-%{release}, emacs-common # Otherwise it will rebuild in %%install due to flags changes. %define make_git \ make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\ + ASCIIDOC8=1 ASCIIDOC_NO_ROFF=1 \\\ ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\ DESTDIR=$RPM_BUILD_ROOT \\\ INSTALL="install -p" \\\ @@ -157,10 +202,10 @@ make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\ %build %{make_git} all %{!?_without_docs: doc} -make -C contrib/emacs -# Work around odd manpage issues (bug #485161) -grep -rl '\\&\.ft' Documentation/ | xargs -i sed -i 's/\\&\.ft/.ft/g' {} +%if 0%{?fedora} +make -C contrib/emacs +%endif # Remove shebang from bash-completion script sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash @@ -168,6 +213,8 @@ sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash %install rm -rf $RPM_BUILD_ROOT %{make_git} install %{!?_without_docs: install-doc} + +%if 0%{?fedora} make -C contrib/emacs install \ emacsdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp for elc in $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/*.elc ; do @@ -176,6 +223,8 @@ for elc in $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/*.elc ; do done install -Dpm 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/git-init.el +%endif + mkdir -p $RPM_BUILD_ROOT%{_var}/www/git install -pm 644 -t $RPM_BUILD_ROOT%{_var}/www/git gitweb/*.png gitweb/*.css install -pm 755 -t $RPM_BUILD_ROOT%{_var}/www/git gitweb/gitweb.cgi @@ -186,6 +235,10 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' +%if ! 0%{?fedora} +find $RPM_BUILD_ROOT Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' +%endif + (find $RPM_BUILD_ROOT{%{_bindir},%{_libexecdir}} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citooli|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files (find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files %if %{!?_without_docs:1}0 @@ -201,6 +254,13 @@ install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/git mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d install -pm 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git +# install git-gui .desktop file +desktop-file-install \ +%if 0%{?rhel} && 0%{?rhel} <= 5 + --vendor fedora \ +%endif + --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE4} + # quiet some rpmlint complaints chmod g-w $RPM_BUILD_ROOT%{_libexecdir}/git-core/* rm -f {Documentation/technical,contrib/emacs}/.gitignore @@ -237,12 +297,14 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %{_mandir}/man1/*cvs*.1*} %{!?_without_docs: %doc Documentation/*git-cvs*.html } +%if 0%{?fedora} %files arch %defattr(-,root,root) %doc Documentation/git-archimport.txt %{_libexecdir}/git-core/git-archimport %{!?_without_docs: %{_mandir}/man1/git-archimport.1*} %{!?_without_docs: %doc Documentation/git-archimport.html } +%endif %files email %defattr(-,root,root) @@ -255,6 +317,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_libexecdir}/git-core/git-gui* %{_libexecdir}/git-core/git-citool +%{_datadir}/applications/*git-gui.desktop %{_datadir}/git-gui/ %{!?_without_docs: %{_mandir}/man1/git-gui.1*} %{!?_without_docs: %doc Documentation/git-gui.html} @@ -272,11 +335,13 @@ rm -rf $RPM_BUILD_ROOT %files -n perl-Git -f perl-files %defattr(-,root,root) +%if 0%{?fedora} %files -n emacs-git %defattr(-,root,root) %doc contrib/emacs/README %{_datadir}/emacs/site-lisp/*git*.el* %{_datadir}/emacs/site-lisp/site-start.d/git-init.el +%endif %files daemon %defattr(-,root,root) @@ -298,6 +363,19 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Fri Jun 05 2009 Todd Zullinger - 1.6.3.2-1 +- git-1.6.3.2 +- Require emacs >= 22.2 for emacs support (bug 495312) +- Add a .desktop file for git-gui (bug 498801) +- Set ASCIIDOC8 and ASCIIDOC_NO_ROFF to correct documentation issues, + the sed hack to fix bug 485161 should no longer be needed +- Escape newline in git-daemon xinetd description (bug 502393) +- Add xinetd to git-daemon Requires (bug 504105) +- Organize BuildRequires/Requires, drop redundant expat Requires +- Only build noarch subpackages on Fedora >= 10 +- Only build emacs and arch subpackages on Fedora +- Handle curl/libcurl naming for EPEL and Fedora + * Fri Apr 03 2009 Todd Zullinger - 1.6.2.2-1 - git-1.6.2.2 - Include contrib/ dir in %%doc (bug 492490) diff --git a/git.xinetd b/git.xinetd index 52365ce..6c9933d 100644 --- a/git.xinetd +++ b/git.xinetd @@ -1,5 +1,5 @@ # default: off -# description: The git dæmon allows git repositories to be exported using +# description: The git dæmon allows git repositories to be exported using \ # the git:// protocol. service git diff --git a/sources b/sources index 7b92812..4faa209 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d219aa5480ed6396f8ab968f3f7eb0f9 git-1.6.2.2.tar.bz2 +149948ff33fb7d8cf9eef925e6c08157 git-1.6.3.2.tar.bz2 From 4387c32ff055cd3d1c3ff1c9aaef4097a3c9ac99 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 19 Jun 2009 13:10:45 +0000 Subject: [PATCH 149/842] Fix git-daemon hang on invalid input (CVE-2009-2108, bug 505761) --- git-1.6.3.2-daemon-extra-args.patch | 104 ++++++++++++++++++++++++++++ git.spec | 8 ++- 2 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 git-1.6.3.2-daemon-extra-args.patch diff --git a/git-1.6.3.2-daemon-extra-args.patch b/git-1.6.3.2-daemon-extra-args.patch new file mode 100644 index 0000000..150f98c --- /dev/null +++ b/git-1.6.3.2-daemon-extra-args.patch @@ -0,0 +1,104 @@ +From 73bb33a94ec67a53e7d805b12ad9264fa25f4f8d Mon Sep 17 00:00:00 2001 +From: Shawn O. Pearce +Date: Thu, 4 Jun 2009 18:33:32 -0700 +Subject: [PATCH] daemon: Strictly parse the "extra arg" part of the command + +Since 1.4.4.5 (49ba83fb67 "Add virtualization support to git-daemon") +git daemon enters an infinite loop and never terminates if a client +hides any extra arguments in the initial request line which is not +exactly "\0host=blah\0". + +Since that change, a client must never insert additional extra +arguments, or attempt to use any argument other than "host=", as +any daemon will get stuck parsing the request line and will never +complete the request. + +Since the client can't tell if the daemon is patched or not, it +is not possible to know if additional extra args might actually be +able to be safely requested. + +If we ever need to extend the git daemon protocol to support a new +feature, we may have to do something like this to the exchange: + + # If both support git:// v2 + # + C: 000cgit://v2 + S: 0010ok host user + C: 0018host git.kernel.org + C: 0027git-upload-pack /pub/linux-2.6.git + S: ...git-upload-pack header... + + # If client supports git:// v2, server does not: + # + C: 000cgit://v2 + S: + + C: 003bgit-upload-pack /pub/linux-2.6.git\0host=git.kernel.org\0 + S: ...git-upload-pack header... + +This requires the client to create two TCP connections to talk to +an older git daemon, however all daemons since the introduction of +daemon.c will safely reject the unknown "git://v2" command request, +so the client can quite easily determine the server supports an +older protocol. + +Signed-off-by: Shawn O. Pearce +Signed-off-by: Junio C Hamano + +diff --git a/connect.c b/connect.c +index f6b8ba6..958c831 100644 +--- a/connect.c ++++ b/connect.c +@@ -579,7 +579,10 @@ struct child_process *git_connect(int fd[2], const char *url_orig, + git_tcp_connect(fd, host, flags); + /* + * Separate original protocol components prog and path +- * from extended components with a NUL byte. ++ * from extended host header with a NUL byte. ++ * ++ * Note: Do not add any other headers here! Doing so ++ * will cause older git-daemon servers to crash. + */ + packet_write(fd[1], + "%s %s%chost=%s%c", +diff --git a/daemon.c b/daemon.c +index daa4c8e..b2babcc 100644 +--- a/daemon.c ++++ b/daemon.c +@@ -406,15 +406,15 @@ static char *xstrdup_tolower(const char *str) + } + + /* +- * Separate the "extra args" information as supplied by the client connection. ++ * Read the host as supplied by the client connection. + */ +-static void parse_extra_args(char *extra_args, int buflen) ++static void parse_host_arg(char *extra_args, int buflen) + { + char *val; + int vallen; + char *end = extra_args + buflen; + +- while (extra_args < end && *extra_args) { ++ if (extra_args < end && *extra_args) { + saw_extended_args = 1; + if (strncasecmp("host=", extra_args, 5) == 0) { + val = extra_args + 5; +@@ -436,6 +436,8 @@ static void parse_extra_args(char *extra_args, int buflen) + /* On to the next one */ + extra_args = val + vallen; + } ++ if (extra_args < end && *extra_args) ++ die("Invalid request"); + } + + /* +@@ -545,7 +547,7 @@ static int execute(struct sockaddr *addr) + hostname = canon_hostname = ip_address = tcp_port = NULL; + + if (len != pktlen) +- parse_extra_args(line + len + 1, pktlen - len - 1); ++ parse_host_arg(line + len + 1, pktlen - len - 1); + + for (i = 0; i < ARRAY_SIZE(daemon_service); i++) { + struct daemon_service *s = &(daemon_service[i]); diff --git a/git.spec b/git.spec index 18d6b64..15e8215 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.6.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -14,6 +14,8 @@ Source4: git-gui.desktop Patch0: git-1.5-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch +# http://git.kernel.org/?p=git/git.git;a=commitdiff;h=73bb33a9 +Patch2: git-1.6.3.2-daemon-extra-args.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -187,6 +189,7 @@ Requires: git = %{version}-%{release}, emacs-common >= 22.2 %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -363,6 +366,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Fri Jun 19 2009 Todd Zullinger - 1.6.3.2-2 +- Fix git-daemon hang on invalid input (CVE-2009-2108, bug 505761) + * Fri Jun 05 2009 Todd Zullinger - 1.6.3.2-1 - git-1.6.3.2 - Require emacs >= 22.2 for emacs support (bug 495312) From 0a4b1682d1d222111c739906a30aaaafeae0073e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 19 Jun 2009 13:35:08 +0000 Subject: [PATCH 150/842] Fix git-daemon hang on invalid input (CVE-2009-2108, bug 505761) --- git-1.5.4.7-daemon-extra-args.patch | 114 ++++++++++++++++++++++++++++ git.spec | 7 +- 2 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 git-1.5.4.7-daemon-extra-args.patch diff --git a/git-1.5.4.7-daemon-extra-args.patch b/git-1.5.4.7-daemon-extra-args.patch new file mode 100644 index 0000000..1960741 --- /dev/null +++ b/git-1.5.4.7-daemon-extra-args.patch @@ -0,0 +1,114 @@ +From 96c61f0fa25770a4b6f92243ee2b3ee2769f7f00 Mon Sep 17 00:00:00 2001 +From: Shawn O. Pearce +Date: Thu, 4 Jun 2009 18:33:32 -0700 +Subject: [PATCH] daemon: Strictly parse the "extra arg" part of the command + +This is a backport of upstream commit 73bb33a. + +Since 1.4.4.5 (49ba83fb67 "Add virtualization support to git-daemon") +git daemon enters an infinite loop and never terminates if a client +hides any extra arguments in the initial request line which is not +exactly "\0host=blah\0". + +Since that change, a client must never insert additional extra +arguments, or attempt to use any argument other than "host=", as +any daemon will get stuck parsing the request line and will never +complete the request. + +Since the client can't tell if the daemon is patched or not, it +is not possible to know if additional extra args might actually be +able to be safely requested. + +If we ever need to extend the git daemon protocol to support a new +feature, we may have to do something like this to the exchange: + + # If both support git:// v2 + # + C: 000cgit://v2 + S: 0010ok host user + C: 0018host git.kernel.org + C: 0027git-upload-pack /pub/linux-2.6.git + S: ...git-upload-pack header... + + # If client supports git:// v2, server does not: + # + C: 000cgit://v2 + S: + + C: 003bgit-upload-pack /pub/linux-2.6.git\0host=git.kernel.org\0 + S: ...git-upload-pack header... + +This requires the client to create two TCP connections to talk to +an older git daemon, however all daemons since the introduction of +daemon.c will safely reject the unknown "git://v2" command request, +so the client can quite easily determine the server supports an +older protocol. + +Signed-off-by: Shawn O. Pearce +Signed-off-by: Junio C Hamano +--- + connect.c | 5 ++++- + daemon.c | 11 ++++++----- + 2 files changed, 10 insertions(+), 6 deletions(-) + +diff --git a/connect.c b/connect.c +index 71597d4..b7bc917 100644 +--- a/connect.c ++++ b/connect.c +@@ -569,7 +569,10 @@ struct child_process *git_connect(int fd[2], const char *url_orig, + git_tcp_connect(fd, host, flags); + /* + * Separate original protocol components prog and path +- * from extended components with a NUL byte. ++ * from extended host header with a NUL byte. ++ * ++ * Note: Do not add any other headers here! Doing so ++ * will cause older git-daemon servers to crash. + */ + packet_write(fd[1], + "%s %s%chost=%s%c", +diff --git a/daemon.c b/daemon.c +index 2b4a6f1..5566a6f 100644 +--- a/daemon.c ++++ b/daemon.c +@@ -431,16 +431,15 @@ static void make_service_overridable(const char *name, int ena) + } + + /* +- * Separate the "extra args" information as supplied by the client connection. +- * Any resulting data is squirreled away in the given interpolation table. ++ * Read the host as supplied by the client connection. + */ +-static void parse_extra_args(struct interp *table, char *extra_args, int buflen) ++static void parse_host_arg(struct interp *table, char *extra_args, int buflen) + { + char *val; + int vallen; + char *end = extra_args + buflen; + +- while (extra_args < end && *extra_args) { ++ if (extra_args < end && *extra_args) { + saw_extended_args = 1; + if (strncasecmp("host=", extra_args, 5) == 0) { + val = extra_args + 5; +@@ -460,6 +459,8 @@ static void parse_extra_args(struct interp *table, char *extra_args, int buflen) + /* On to the next one */ + extra_args = val + vallen; + } ++ if (extra_args < end && *extra_args) ++ die("Invalid request"); + } + } + +@@ -579,7 +580,7 @@ static int execute(struct sockaddr *addr) + interp_set_entry(interp_table, INTERP_SLOT_PERCENT, "%"); + + if (len != pktlen) { +- parse_extra_args(interp_table, line + len + 1, pktlen - len - 1); ++ parse_host_arg(interp_table, line + len + 1, pktlen - len - 1); + fill_in_extra_table_entries(interp_table); + } + +-- +1.6.3.2 + diff --git a/git.spec b/git.spec index 3392d55..f554b95 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools @@ -12,6 +12,7 @@ Source2: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch Patch1: gitweb-CVE-2008-5516.patch Patch2: gitweb-CVE-2008-5517.patch +Patch3: git-1.5.4.7-daemon-extra-args.patch BuildRequires: perl, zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: git-core, git-svn, git-cvs, git-email, gitk, git-gui, perl-Git @@ -97,6 +98,7 @@ Perl interface to Git %patch0 -p1 %patch1 -p1 -b .CVE-2008-5516 %patch2 -p1 -b .CVE-2008-5517 +%patch3 -p1 -b .daemon-extra-args %build make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ @@ -200,6 +202,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jun 19 2009 Todd Zullinger - 1.5.4.7-3 +- Fix git-daemon hang on invalid input (CVE-2009-2108, bug 505761) + * Mon Jan 12 2009 Todd Zullinger 1.5.4.7-2 - Backport gitweb fixes for CVE-2008-5516 and CVE-2008-5517 (bug 479715) From 87ceff4e35986ecf89d9faea3cd78dde6917c051 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 20 Jun 2009 00:52:46 +0000 Subject: [PATCH 151/842] Temporarily disable asciidoc's safe mode until bug 506953 is fixed --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 15e8215..ba6a063 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.6.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -195,7 +195,7 @@ Requires: git = %{version}-%{release}, emacs-common >= 22.2 # Otherwise it will rebuild in %%install due to flags changes. %define make_git \ make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\ - ASCIIDOC8=1 ASCIIDOC_NO_ROFF=1 \\\ + ASCIIDOC="asciidoc --unsafe" ASCIIDOC8=1 ASCIIDOC_NO_ROFF=1 \\\ ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\ DESTDIR=$RPM_BUILD_ROOT \\\ INSTALL="install -p" \\\ @@ -366,6 +366,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Fri Jun 19 2009 Todd Zullinger - 1.6.3.2-3 +- Temporarily disable asciidoc's safe mode until bug 506953 is fixed + * Fri Jun 19 2009 Todd Zullinger - 1.6.3.2-2 - Fix git-daemon hang on invalid input (CVE-2009-2108, bug 505761) From 762cf1156ba49f6ec459ed20930b7c315b60c7a7 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 28 Jun 2009 23:26:09 +0000 Subject: [PATCH 152/842] Update to git-1.6.3.3 - Move contributed hooks to %{_datadir}/git-core/contrib/hooks (bug 500137) --- .cvsignore | 2 +- git-1.6-update-contrib-hooks-path.patch | 43 ++++++++++ git-1.6.3.2-daemon-extra-args.patch | 104 ------------------------ git.spec | 35 ++++++-- sources | 2 +- 5 files changed, 75 insertions(+), 111 deletions(-) create mode 100644 git-1.6-update-contrib-hooks-path.patch delete mode 100644 git-1.6.3.2-daemon-extra-args.patch diff --git a/.cvsignore b/.cvsignore index 65a8f60..c7eb084 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.3.2.tar.bz2 +git-1.6.3.3.tar.bz2 diff --git a/git-1.6-update-contrib-hooks-path.patch b/git-1.6-update-contrib-hooks-path.patch new file mode 100644 index 0000000..cfa3817 --- /dev/null +++ b/git-1.6-update-contrib-hooks-path.patch @@ -0,0 +1,43 @@ +From 1963c852acc5d8c521a3e4f3b9ceb313d26a473c Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Mon, 22 Jun 2009 08:00:29 -0400 +Subject: [PATCH] Update path to contrib/hooks/post-receive-email + +--- + contrib/hooks/post-receive-email | 6 +++--- + templates/hooks--post-receive.sample | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email +index 2a66063..4835ada 100755 +--- a/contrib/hooks/post-receive-email ++++ b/contrib/hooks/post-receive-email +@@ -10,12 +10,12 @@ + # This hook is stored in the contrib/hooks directory. Your distribution + # will have put this somewhere standard. You should make this script + # executable then link to it in the repository you would like to use it in. +-# For example, on debian the hook is stored in +-# /usr/share/doc/git-core/contrib/hooks/post-receive-email: ++# For example, on fedora the hook is stored in ++# /usr/share/git-core/contrib/hooks/post-receive-email: + # + # chmod a+x post-receive-email + # cd /path/to/your/repository.git +-# ln -sf /usr/share/doc/git-core/contrib/hooks/post-receive-email hooks/post-receive ++# ln -sf /usr/share/git-core/contrib/hooks/post-receive-email hooks/post-receive + # + # This hook script assumes it is enabled on the central repository of a + # project, with all users pushing only to it and not between each other. It +diff --git a/templates/hooks--post-receive.sample b/templates/hooks--post-receive.sample +index 18d2e0f..cf57878 100755 +--- a/templates/hooks--post-receive.sample ++++ b/templates/hooks--post-receive.sample +@@ -12,4 +12,4 @@ + # see contrib/hooks/ for an sample, or uncomment the next line and + # rename the file to "post-receive". + +-#. /usr/share/doc/git-core/contrib/hooks/post-receive-email ++#. /usr/share/git-core/contrib/hooks/post-receive-email +-- +1.6.3.2 + diff --git a/git-1.6.3.2-daemon-extra-args.patch b/git-1.6.3.2-daemon-extra-args.patch deleted file mode 100644 index 150f98c..0000000 --- a/git-1.6.3.2-daemon-extra-args.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 73bb33a94ec67a53e7d805b12ad9264fa25f4f8d Mon Sep 17 00:00:00 2001 -From: Shawn O. Pearce -Date: Thu, 4 Jun 2009 18:33:32 -0700 -Subject: [PATCH] daemon: Strictly parse the "extra arg" part of the command - -Since 1.4.4.5 (49ba83fb67 "Add virtualization support to git-daemon") -git daemon enters an infinite loop and never terminates if a client -hides any extra arguments in the initial request line which is not -exactly "\0host=blah\0". - -Since that change, a client must never insert additional extra -arguments, or attempt to use any argument other than "host=", as -any daemon will get stuck parsing the request line and will never -complete the request. - -Since the client can't tell if the daemon is patched or not, it -is not possible to know if additional extra args might actually be -able to be safely requested. - -If we ever need to extend the git daemon protocol to support a new -feature, we may have to do something like this to the exchange: - - # If both support git:// v2 - # - C: 000cgit://v2 - S: 0010ok host user - C: 0018host git.kernel.org - C: 0027git-upload-pack /pub/linux-2.6.git - S: ...git-upload-pack header... - - # If client supports git:// v2, server does not: - # - C: 000cgit://v2 - S: - - C: 003bgit-upload-pack /pub/linux-2.6.git\0host=git.kernel.org\0 - S: ...git-upload-pack header... - -This requires the client to create two TCP connections to talk to -an older git daemon, however all daemons since the introduction of -daemon.c will safely reject the unknown "git://v2" command request, -so the client can quite easily determine the server supports an -older protocol. - -Signed-off-by: Shawn O. Pearce -Signed-off-by: Junio C Hamano - -diff --git a/connect.c b/connect.c -index f6b8ba6..958c831 100644 ---- a/connect.c -+++ b/connect.c -@@ -579,7 +579,10 @@ struct child_process *git_connect(int fd[2], const char *url_orig, - git_tcp_connect(fd, host, flags); - /* - * Separate original protocol components prog and path -- * from extended components with a NUL byte. -+ * from extended host header with a NUL byte. -+ * -+ * Note: Do not add any other headers here! Doing so -+ * will cause older git-daemon servers to crash. - */ - packet_write(fd[1], - "%s %s%chost=%s%c", -diff --git a/daemon.c b/daemon.c -index daa4c8e..b2babcc 100644 ---- a/daemon.c -+++ b/daemon.c -@@ -406,15 +406,15 @@ static char *xstrdup_tolower(const char *str) - } - - /* -- * Separate the "extra args" information as supplied by the client connection. -+ * Read the host as supplied by the client connection. - */ --static void parse_extra_args(char *extra_args, int buflen) -+static void parse_host_arg(char *extra_args, int buflen) - { - char *val; - int vallen; - char *end = extra_args + buflen; - -- while (extra_args < end && *extra_args) { -+ if (extra_args < end && *extra_args) { - saw_extended_args = 1; - if (strncasecmp("host=", extra_args, 5) == 0) { - val = extra_args + 5; -@@ -436,6 +436,8 @@ static void parse_extra_args(char *extra_args, int buflen) - /* On to the next one */ - extra_args = val + vallen; - } -+ if (extra_args < end && *extra_args) -+ die("Invalid request"); - } - - /* -@@ -545,7 +547,7 @@ static int execute(struct sockaddr *addr) - hostname = canon_hostname = ip_address = tcp_port = NULL; - - if (len != pktlen) -- parse_extra_args(line + len + 1, pktlen - len - 1); -+ parse_host_arg(line + len + 1, pktlen - len - 1); - - for (i = 0; i < ARRAY_SIZE(daemon_service); i++) { - struct daemon_service *s = &(daemon_service[i]); diff --git a/git.spec b/git.spec index ba6a063..9857342 100644 --- a/git.spec +++ b/git.spec @@ -1,8 +1,8 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.3.2 -Release: 3%{?dist} -Summary: Core git tools +Version: 1.6.3.3 +Release: 1%{?dist} +Summary: Fast Version Control System License: GPLv2 Group: Development/Tools URL: http://git-scm.com/ @@ -14,8 +14,8 @@ Source4: git-gui.desktop Patch0: git-1.5-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# http://git.kernel.org/?p=git/git.git;a=commitdiff;h=73bb33a9 -Patch2: git-1.6.3.2-daemon-extra-args.patch +# https://bugzilla.redhat.com/500137 +Patch2: git-1.6-update-contrib-hooks-path.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -203,6 +203,17 @@ make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\ htmldir=%{_docdir}/%{name}-%{version} \\\ prefix=%{_prefix} +# Filter bogus perl requires +# packed-refs comes from a comment in contrib/hooks/update-paranoid +cat << \EOF > %{name}-req +#!/bin/sh +%{__perl_requires} $* |\ +sed -e '/perl(packed-refs)/d' +EOF + +%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req +chmod +x %{__perl_requires} + %build %{make_git} all %{!?_without_docs: doc} @@ -257,6 +268,14 @@ install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/git mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d install -pm 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git +# Move contrib/hooks out of %%docdir and make them executable +mkdir -p $RPM_BUILD_ROOT%{_datadir}/git-core/contrib +mv contrib/hooks $RPM_BUILD_ROOT%{_datadir}/git-core/contrib +chmod +x $RPM_BUILD_ROOT%{_datadir}/git-core/contrib/hooks/* +pushd contrib > /dev/null +ln -s ../../../git-core/contrib/hooks +popd > /dev/null + # install git-gui .desktop file desktop-file-install \ %if 0%{?rhel} && 0%{?rhel} <= 5 @@ -266,6 +285,7 @@ desktop-file-install \ # quiet some rpmlint complaints chmod g-w $RPM_BUILD_ROOT%{_libexecdir}/git-core/* +chmod a-x $RPM_BUILD_ROOT%{_libexecdir}/git-core/git-mergetool--lib rm -f {Documentation/technical,contrib/emacs}/.gitignore chmod a-x Documentation/technical/api-index.sh find contrib -type f -perm /a+x | xargs chmod -x @@ -366,6 +386,11 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sun Jun 28 2009 Todd Zullinger - 1.6.3.3-1 +- git-1.6.3.3 +- Move contributed hooks to %%{_datadir}/git-core/contrib/hooks (bug 500137) +- Fix rpmlint warnings about Summary and git-mergetool--lib missing shebang + * Fri Jun 19 2009 Todd Zullinger - 1.6.3.2-3 - Temporarily disable asciidoc's safe mode until bug 506953 is fixed diff --git a/sources b/sources index 4faa209..80c46f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -149948ff33fb7d8cf9eef925e6c08157 git-1.6.3.2.tar.bz2 +91ae46ac01dadab1962beb064abd5b60 git-1.6.3.3.tar.bz2 From 0069f8b607e34f2f4fb74fbde868326062d4b164 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 00:12:40 +0000 Subject: [PATCH 153/842] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 9857342..4892202 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.6.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -386,6 +386,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 1.6.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Sun Jun 28 2009 Todd Zullinger - 1.6.3.3-1 - git-1.6.3.3 - Move contributed hooks to %%{_datadir}/git-core/contrib/hooks (bug 500137) From 1c30876e7b52349f880eb1d26928fb56c9bcd9fa Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 29 Jul 2009 11:49:52 +0000 Subject: [PATCH 154/842] Update to git-1.6.4 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index c7eb084..8eb7d9d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.3.3.tar.bz2 +git-1.6.4.tar.bz2 diff --git a/git.spec b/git.spec index 4892202..fde020f 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.3.3 -Release: 2%{?dist} +Version: 1.6.4 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -386,6 +386,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Wed Jul 29 2009 Todd Zullinger - 1.6.4-1 +- git-1.6.4 + * Fri Jul 24 2009 Fedora Release Engineering - 1.6.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 80c46f7..fd75ba6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -91ae46ac01dadab1962beb064abd5b60 git-1.6.3.3.tar.bz2 +d41e3d43c8f1d23024fb3d3fe6aa3858 git-1.6.4.tar.bz2 From 7eeaed53fe719e31ab487c2d0676d29df6726436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Fri, 21 Aug 2009 13:30:59 +0000 Subject: [PATCH 155/842] - rebuilt with new openssl --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index fde020f..4b1ce9f 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.6.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -386,6 +386,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Fri Aug 21 2009 Tomas Mraz - 1.6.4-2 +- rebuilt with new openssl + * Wed Jul 29 2009 Todd Zullinger - 1.6.4-1 - git-1.6.4 From b11d0403161a70eae524848a22afb4607c2ea251 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 23 Aug 2009 16:33:46 +0000 Subject: [PATCH 156/842] Update to git-1.6.4.1 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8eb7d9d..dc02e51 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.4.tar.bz2 +git-1.6.4.1.tar.bz2 diff --git a/git.spec b/git.spec index 4b1ce9f..a3e2a13 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.4 -Release: 2%{?dist} +Version: 1.6.4.1 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -386,6 +386,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sat Aug 22 2009 Todd Zullinger - 1.6.4.1-1 +- git-1.6.4.1 + * Fri Aug 21 2009 Tomas Mraz - 1.6.4-2 - rebuilt with new openssl diff --git a/sources b/sources index fd75ba6..1c30151 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d41e3d43c8f1d23024fb3d3fe6aa3858 git-1.6.4.tar.bz2 +bdc9b8be7d56a3beabad2d228f2e8e9a git-1.6.4.1.tar.bz2 From 958314da4ad2a67d94b0f8145f8729fcc1a29d6d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 31 Aug 2009 14:30:41 +0000 Subject: [PATCH 157/842] Update to git-1.6.4.2 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index dc02e51..bdd30c6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.4.1.tar.bz2 +git-1.6.4.2.tar.bz2 diff --git a/git.spec b/git.spec index a3e2a13..9cc4300 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.4.1 +Version: 1.6.4.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -386,6 +386,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sun Aug 30 2009 Todd Zullinger - 1.6.4.2-1 +- git-1.6.4.2 + * Sat Aug 22 2009 Todd Zullinger - 1.6.4.1-1 - git-1.6.4.1 diff --git a/sources b/sources index 1c30151..331941b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bdc9b8be7d56a3beabad2d228f2e8e9a git-1.6.4.1.tar.bz2 +05c41dc84eae47e3d4fe5b3dee9cc73c git-1.6.4.2.tar.bz2 From ee3bd9c6ee06bcfa15f19c07b4bb3224550de128 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 13 Sep 2009 14:40:24 +0000 Subject: [PATCH 158/842] Update to git-1.6.4.3 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index bdd30c6..4ab23da 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.4.2.tar.bz2 +git-1.6.4.3.tar.bz2 diff --git a/git.spec b/git.spec index 9cc4300..d06e97d 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.4.2 +Version: 1.6.4.3 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -386,6 +386,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sun Sep 13 2009 Todd Zullinger - 1.6.4.3-1 +- git-1.6.4.2 + * Sun Aug 30 2009 Todd Zullinger - 1.6.4.2-1 - git-1.6.4.2 diff --git a/sources b/sources index 331941b..f551d1a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -05c41dc84eae47e3d4fe5b3dee9cc73c git-1.6.4.2.tar.bz2 +4af70ff9b8f209704059f7ef96127236 git-1.6.4.3.tar.bz2 From b9c71ac0ca7ad5742ff35ba763450ac2c2443302 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 13 Sep 2009 15:03:53 +0000 Subject: [PATCH 159/842] Fix %changelog typo (hardly worth a rebuild, as 1.6.5 is not too far off) --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index d06e97d..b45f94a 100644 --- a/git.spec +++ b/git.spec @@ -387,7 +387,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Sun Sep 13 2009 Todd Zullinger - 1.6.4.3-1 -- git-1.6.4.2 +- git-1.6.4.3 * Sun Aug 30 2009 Todd Zullinger - 1.6.4.2-1 - git-1.6.4.2 From 38399517f7c10760a1aec2be36b02be90d8720f8 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 17 Sep 2009 01:47:17 +0000 Subject: [PATCH 160/842] Update to git-1.6.4.4 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4ab23da..0ba28a0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.4.3.tar.bz2 +git-1.6.4.4.tar.bz2 diff --git a/git.spec b/git.spec index b45f94a..d6453de 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.4.3 +Version: 1.6.4.4 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -386,6 +386,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Wed Sep 16 2009 Todd Zullinger - 1.6.4.4-1 +- git-1.6.4.4 + * Sun Sep 13 2009 Todd Zullinger - 1.6.4.3-1 - git-1.6.4.3 diff --git a/sources b/sources index f551d1a..ad782c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4af70ff9b8f209704059f7ef96127236 git-1.6.4.3.tar.bz2 +b150352782998ca1f84185e6af53ec26 git-1.6.4.4.tar.bz2 From b79693427a70cf957654803c2d567d03e916b8e3 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 28 Sep 2009 15:01:54 +0000 Subject: [PATCH 161/842] Update to git-1.6.5.rc2 Enable Linus' block-sha1 implementation. This allows git to not link most binaries with libcrypto (from openssl). Combined with the upstream changes to not link to libcurl except when needed, this slims down the git binaries a bit. --- .cvsignore | 2 +- git.spec | 16 +++++++++++----- sources | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0ba28a0..21852c0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.4.4.tar.bz2 +git-1.6.5.rc2.tar.bz2 diff --git a/git.spec b/git.spec index d6453de..ccb0f29 100644 --- a/git.spec +++ b/git.spec @@ -1,12 +1,13 @@ # Pass --without docs to rpmbuild if you don't want the documentation +%global snap .rc2 Name: git -Version: 1.6.4.4 -Release: 1%{?dist} +Version: 1.6.5 +Release: 0.2%{?snap}%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools URL: http://git-scm.com/ -Source0: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2 +Source0: http://kernel.org/pub/software/scm/git/%{name}-%{version}%{?snap}.tar.bz2 Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd @@ -186,7 +187,7 @@ Requires: git = %{version}-%{release}, emacs-common >= 22.2 %endif %prep -%setup -q +%setup -q -n %{name}-%{version}%{?snap} %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -196,6 +197,7 @@ Requires: git = %{version}-%{release}, emacs-common >= 22.2 %define make_git \ make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\ ASCIIDOC="asciidoc --unsafe" ASCIIDOC8=1 ASCIIDOC_NO_ROFF=1 \\\ + BLK_SHA1=1 \\\ ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\ DESTDIR=$RPM_BUILD_ROOT \\\ INSTALL="install -p" \\\ @@ -211,7 +213,7 @@ cat << \EOF > %{name}-req sed -e '/perl(packed-refs)/d' EOF -%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req +%global __perl_requires %{_builddir}/%{name}-%{version}%{?snap}/%{name}-req chmod +x %{__perl_requires} %build @@ -386,6 +388,10 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Mon Sep 28 2009 Todd Zullinger - 1.6.5-0.2.rc2 +- git-1.6.5.rc2 +- Enable Linus' block-sha1 implementation + * Wed Sep 16 2009 Todd Zullinger - 1.6.4.4-1 - git-1.6.4.4 diff --git a/sources b/sources index ad782c2..5030125 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b150352782998ca1f84185e6af53ec26 git-1.6.4.4.tar.bz2 +e9cfec47e38232948dc90188927f7782 git-1.6.5.rc2.tar.bz2 From 83562ac72a082a80e193044d9fdca48fd323bc2c Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 14 Oct 2009 02:40:46 +0000 Subject: [PATCH 162/842] Update to git-1.6.5 --- .cvsignore | 2 +- git-1.6-update-contrib-hooks-path.patch | 2 +- git.spec | 12 +++++++----- sources | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 21852c0..dd5767e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.5.rc2.tar.bz2 +git-1.6.5.tar.bz2 diff --git a/git-1.6-update-contrib-hooks-path.patch b/git-1.6-update-contrib-hooks-path.patch index cfa3817..a4220ad 100644 --- a/git-1.6-update-contrib-hooks-path.patch +++ b/git-1.6-update-contrib-hooks-path.patch @@ -33,7 +33,7 @@ index 18d2e0f..cf57878 100755 --- a/templates/hooks--post-receive.sample +++ b/templates/hooks--post-receive.sample @@ -12,4 +12,4 @@ - # see contrib/hooks/ for an sample, or uncomment the next line and + # see contrib/hooks/ for a sample, or uncomment the next line and # rename the file to "post-receive". -#. /usr/share/doc/git-core/contrib/hooks/post-receive-email diff --git a/git.spec b/git.spec index ccb0f29..d5348d7 100644 --- a/git.spec +++ b/git.spec @@ -1,13 +1,12 @@ # Pass --without docs to rpmbuild if you don't want the documentation -%global snap .rc2 Name: git Version: 1.6.5 -Release: 0.2%{?snap}%{?dist} +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools URL: http://git-scm.com/ -Source0: http://kernel.org/pub/software/scm/git/%{name}-%{version}%{?snap}.tar.bz2 +Source0: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2 Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd @@ -187,7 +186,7 @@ Requires: git = %{version}-%{release}, emacs-common >= 22.2 %endif %prep -%setup -q -n %{name}-%{version}%{?snap} +%setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -213,7 +212,7 @@ cat << \EOF > %{name}-req sed -e '/perl(packed-refs)/d' EOF -%global __perl_requires %{_builddir}/%{name}-%{version}%{?snap}/%{name}-req +%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req chmod +x %{__perl_requires} %build @@ -388,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sun Oct 11 2009 Todd Zullinger - 1.6.5-1 +- git-1.6.5 + * Mon Sep 28 2009 Todd Zullinger - 1.6.5-0.2.rc2 - git-1.6.5.rc2 - Enable Linus' block-sha1 implementation diff --git a/sources b/sources index 5030125..36246ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e9cfec47e38232948dc90188927f7782 git-1.6.5.rc2.tar.bz2 +da86c1736c55edb9f446828581137b51 git-1.6.5.tar.bz2 From 8c6a74fbc761ec81f73ae9c040290a9f498d5299 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 18 Oct 2009 13:30:26 +0000 Subject: [PATCH 163/842] Update to git-1.6.5.1 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index dd5767e..ae71b27 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.5.tar.bz2 +git-1.6.5.1.tar.bz2 diff --git a/git.spec b/git.spec index d5348d7..cf422cd 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.5 +Version: 1.6.5.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -387,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sat Oct 17 2009 Todd Zullinger - 1.6.5.1-1 +- git-1.6.5.1 + * Sun Oct 11 2009 Todd Zullinger - 1.6.5-1 - git-1.6.5 diff --git a/sources b/sources index 36246ed..58e8374 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -da86c1736c55edb9f446828581137b51 git-1.6.5.tar.bz2 +fd784f407d538705ed36c0498542d4f5 git-1.6.5.1.tar.bz2 From baa02def71078bd1bded4b271d868fdb029e4634 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 31 Oct 2009 01:44:28 +0000 Subject: [PATCH 164/842] Update to git-1.6.5.2 - Drop asciidoc --unsafe option, it should not be needed anymore - Don't use install -t/-T, they're not compatible with older coreutils - Don't use -perm /a+x with find, it's incompatible with older findutils --- .cvsignore | 2 +- git.spec | 18 ++++++++++++------ sources | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index ae71b27..49a8acf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.5.1.tar.bz2 +git-1.6.5.2.tar.bz2 diff --git a/git.spec b/git.spec index cf422cd..dd9aff7 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.5.1 +Version: 1.6.5.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -195,7 +195,7 @@ Requires: git = %{version}-%{release}, emacs-common >= 22.2 # Otherwise it will rebuild in %%install due to flags changes. %define make_git \ make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\ - ASCIIDOC="asciidoc --unsafe" ASCIIDOC8=1 ASCIIDOC_NO_ROFF=1 \\\ + ASCIIDOC8=1 ASCIIDOC_NO_ROFF=1 \\\ BLK_SHA1=1 \\\ ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\ DESTDIR=$RPM_BUILD_ROOT \\\ @@ -241,8 +241,8 @@ install -Dpm 644 %{SOURCE1} \ %endif mkdir -p $RPM_BUILD_ROOT%{_var}/www/git -install -pm 644 -t $RPM_BUILD_ROOT%{_var}/www/git gitweb/*.png gitweb/*.css -install -pm 755 -t $RPM_BUILD_ROOT%{_var}/www/git gitweb/gitweb.cgi +install -pm 644 gitweb/*.png gitweb/*.css $RPM_BUILD_ROOT%{_var}/www/git +install -pm 755 gitweb/gitweb.cgi $RPM_BUILD_ROOT%{_var}/www/git mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/git.conf @@ -267,7 +267,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/git mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d -install -pm 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git +install -pm 644 contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git # Move contrib/hooks out of %%docdir and make them executable mkdir -p $RPM_BUILD_ROOT%{_datadir}/git-core/contrib @@ -289,7 +289,7 @@ chmod g-w $RPM_BUILD_ROOT%{_libexecdir}/git-core/* chmod a-x $RPM_BUILD_ROOT%{_libexecdir}/git-core/git-mergetool--lib rm -f {Documentation/technical,contrib/emacs}/.gitignore chmod a-x Documentation/technical/api-index.sh -find contrib -type f -perm /a+x | xargs chmod -x +find contrib -type f | xargs chmod -x %clean @@ -387,6 +387,12 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Mon Oct 26 2009 Todd Zullinger - 1.6.5.2-1 +- git-1.6.5.2 +- Drop asciidoc --unsafe option, it should not be needed anymore +- Don't use install -t/-T, they're not compatible with older coreutils +- Don't use -perm /a+x with find, it's incompatible with older findutils + * Sat Oct 17 2009 Todd Zullinger - 1.6.5.1-1 - git-1.6.5.1 diff --git a/sources b/sources index 58e8374..acbb4bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd784f407d538705ed36c0498542d4f5 git-1.6.5.1.tar.bz2 +99708c449b23433136dbdfa38bd16d80 git-1.6.5.2.tar.bz2 From 075e35089926ded6357e68fdc07dcfa79fbed10b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:19:26 +0000 Subject: [PATCH 165/842] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6c8a637..fbfe8aa 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := git SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 394cf6a48b6c8fd0ae87d158079c779afb81099f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:56:49 +0000 Subject: [PATCH 166/842] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4a03d85..a85ab14 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: git -# $Id: Makefile,v 1.1 2005/08/30 00:36:41 jwboyer Exp $ +# $Id: Makefile,v 1.2 2006/04/10 16:52:46 chrisw Exp $ NAME := git SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From dc9ff0d4c3e0183dd11c23531f7439e1891f29af Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 27 Nov 2009 03:10:18 +0000 Subject: [PATCH 167/842] Update to git-1.6.5.3 - Only BR perl(Error) on Fedora and RHEL >= 5 - Use config.mak to set build options - Improve compatibility with EPEL - Replace $RPM_BUILD_ROOT with %{buildroot} - Fix Obsoletes for those rebuilding on EL-4 --- .cvsignore | 2 +- git.spec | 158 ++++++++++++++++++++++++++++++++++------------------- sources | 2 +- 3 files changed, 105 insertions(+), 57 deletions(-) diff --git a/.cvsignore b/.cvsignore index 49a8acf..57401d1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.5.2.tar.bz2 +git-1.6.5.3.tar.bz2 diff --git a/git.spec b/git.spec index dd9aff7..715c730 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,12 @@ # Pass --without docs to rpmbuild if you don't want the documentation +%if 0%{?rhel} && 0%{?rhel} <= 5 +%global gitcoredir %{_bindir} +%else +%global gitcoredir %{_libexecdir}/git-core +%endif + Name: git -Version: 1.6.5.2 +Version: 1.6.5.3 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -33,13 +39,21 @@ BuildRequires: zlib-devel >= 1.2 Requires: less Requires: openssh-clients +%if 0%{?fedora} || 0%{?rhel} >= 5 Requires: perl(Error) +%endif Requires: perl-Git = %{version}-%{release} Requires: rsync Requires: zlib >= 1.2 Provides: git-core = %{version}-%{release} +%if 0%{?fedora} || 0%{?rhel} >= 5 Obsoletes: git-core <= 1.5.4.3 +%else +# EL-4 has 1.5.4.7-3.el4. We don't support this, but no point making it more +# difficult than it needs to be (folks stuck on EL-4 have it bad enough ;). +Obsoletes: git-core <= 1.5.4.7-4 +%endif %description Git is a fast, scalable, distributed revision control system with an @@ -67,7 +81,13 @@ Requires: perl-Git = %{version}-%{release} Requires: emacs-git = %{version}-%{release} Requires: git-arch = %{version}-%{release} %endif +%if 0%{?fedora} || 0%{?rhel} >= 5 Obsoletes: git <= 1.5.4.3 +%else +# EL-4 has 1.5.4.7-3.el4. We don't support this, but no point making it more +# difficult than it needs to be (folks stuck on EL-4 have it bad enough ;). +Obsoletes: git <= 1.5.4.7-4 +%endif %description all Git is a fast, scalable, distributed revision control system with an @@ -111,7 +131,10 @@ Group: Development/Tools %if 0%{?fedora} >= 10 BuildArch: noarch %endif -Requires: git = %{version}-%{release}, cvs, cvsps +Requires: git = %{version}-%{release}, cvs +%if 0%{?fedora} || 0%{?rhel} >= 5 +Requires: cvsps +%endif %description cvs Git tools for importing CVS repositories. @@ -134,7 +157,10 @@ Group: Development/Tools BuildArch: noarch %endif Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} -Requires: perl(Net::SMTP::SSL), perl(Authen::SASL) +Requires: perl(Authen::SASL) +%if 0%{?fedora} || 0%{?rhel} >= 5 +Requires: perl(Net::SMTP::SSL) +%endif %description email Git tools for sending email. @@ -165,9 +191,12 @@ Group: Development/Libraries %if 0%{?fedora} >= 10 BuildArch: noarch %endif -Requires: git = %{version}-%{release}, perl(Error) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: git = %{version}-%{release} +%if 0%{?fedora} || 0%{?rhel} >= 5 BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) +Requires: perl(Error) +%endif +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -n perl-Git Perl interface to Git. @@ -193,16 +222,27 @@ Requires: git = %{version}-%{release}, emacs-common >= 22.2 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. -%define make_git \ -make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\ - ASCIIDOC8=1 ASCIIDOC_NO_ROFF=1 \\\ - BLK_SHA1=1 \\\ - ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\ - DESTDIR=$RPM_BUILD_ROOT \\\ - INSTALL="install -p" \\\ - INSTALLDIRS=vendor \\\ - htmldir=%{_docdir}/%{name}-%{version} \\\ - prefix=%{_prefix} +cat << \EOF > config.mak +V = 1 +CFLAGS = %{optflags} +BLK_SHA1 = 1 +ETC_GITCONFIG = %{_sysconfdir}/gitconfig +DESTDIR = %{buildroot} +INSTALL = install -p +htmldir = %{_docdir}/%{name}-%{version} +prefix = %{_prefix} +EOF + +%if 0%{?fedora} +cat << \EOF >> config.mak +ASCIIDOC8 = 1 +ASCIIDOC_NO_ROFF = 1 +EOF +%endif + +%if 0%{?rhel} && 0%{?rhel} <= 5 +echo gitexecdir = %{_bindir} >> config.mak +%endif # Filter bogus perl requires # packed-refs comes from a comment in contrib/hooks/update-paranoid @@ -216,7 +256,7 @@ EOF chmod +x %{__perl_requires} %build -%{make_git} all %{!?_without_docs: doc} +make %{?_smp_mflags} all %{!?_without_docs: doc} %if 0%{?fedora} make -C contrib/emacs @@ -226,53 +266,53 @@ make -C contrib/emacs sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash %install -rm -rf $RPM_BUILD_ROOT -%{make_git} install %{!?_without_docs: install-doc} +rm -rf %{buildroot} +make %{?_smp_mflags} INSTALLDIRS=vendor install %{!?_without_docs: install-doc} %if 0%{?fedora} make -C contrib/emacs install \ - emacsdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp -for elc in $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/*.elc ; do + emacsdir=%{buildroot}%{_datadir}/emacs/site-lisp +for elc in %{buildroot}%{_datadir}/emacs/site-lisp/*.elc ; do install -pm 644 contrib/emacs/$(basename $elc .elc).el \ - $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp + %{buildroot}%{_datadir}/emacs/site-lisp done install -Dpm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/git-init.el + %{buildroot}%{_datadir}/emacs/site-lisp/site-start.d/git-init.el %endif -mkdir -p $RPM_BUILD_ROOT%{_var}/www/git -install -pm 644 gitweb/*.png gitweb/*.css $RPM_BUILD_ROOT%{_var}/www/git -install -pm 755 gitweb/gitweb.cgi $RPM_BUILD_ROOT%{_var}/www/git -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d -install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/git.conf +mkdir -p %{buildroot}%{_var}/www/git +install -pm 644 gitweb/*.png gitweb/*.css %{buildroot}%{_var}/www/git +install -pm 755 gitweb/gitweb.cgi %{buildroot}%{_var}/www/git +mkdir -p %{buildroot}/%{_sysconfdir}/httpd/conf.d +install -pm 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/httpd/conf.d/git.conf -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' +find %{buildroot} -type f -name .packlist -exec rm -f {} ';' +find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';' +find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';' %if ! 0%{?fedora} -find $RPM_BUILD_ROOT Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' +find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' %endif -(find $RPM_BUILD_ROOT{%{_bindir},%{_libexecdir}} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citooli|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files -(find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files +(find %{buildroot}{%{_bindir},%{_libexecdir}} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e s@^%{buildroot}@@) > bin-man-doc-files +(find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) >> perl-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find %{buildroot}%{_mandir} -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e s@^%{buildroot}@@ -e 's/$/*/' ) >> bin-man-doc-files %else -rm -rf $RPM_BUILD_ROOT%{_mandir} +rm -rf %{buildroot}%{_mandir} %endif -mkdir -p $RPM_BUILD_ROOT%{_var}/lib/git -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d -install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/git +mkdir -p %{buildroot}%{_var}/lib/git +mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d +install -pm 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/git -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d -install -pm 644 contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git +mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d +install -pm 644 contrib/completion/git-completion.bash %{buildroot}%{_sysconfdir}/bash_completion.d/git # Move contrib/hooks out of %%docdir and make them executable -mkdir -p $RPM_BUILD_ROOT%{_datadir}/git-core/contrib -mv contrib/hooks $RPM_BUILD_ROOT%{_datadir}/git-core/contrib -chmod +x $RPM_BUILD_ROOT%{_datadir}/git-core/contrib/hooks/* +mkdir -p %{buildroot}%{_datadir}/git-core/contrib +mv contrib/hooks %{buildroot}%{_datadir}/git-core/contrib +chmod +x %{buildroot}%{_datadir}/git-core/contrib/hooks/* pushd contrib > /dev/null ln -s ../../../git-core/contrib/hooks popd > /dev/null @@ -282,24 +322,24 @@ desktop-file-install \ %if 0%{?rhel} && 0%{?rhel} <= 5 --vendor fedora \ %endif - --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE4} + --dir=%{buildroot}%{_datadir}/applications %{SOURCE4} # quiet some rpmlint complaints -chmod g-w $RPM_BUILD_ROOT%{_libexecdir}/git-core/* -chmod a-x $RPM_BUILD_ROOT%{_libexecdir}/git-core/git-mergetool--lib +chmod -R g-w %{buildroot} +find %{buildroot} -name git-mergetool--lib | xargs chmod a-x rm -f {Documentation/technical,contrib/emacs}/.gitignore chmod a-x Documentation/technical/api-index.sh find contrib -type f | xargs chmod -x %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files -f bin-man-doc-files %defattr(-,root,root) %{_datadir}/git-core/ -%dir %{_libexecdir}/git-core/ +%dir %{gitcoredir} %doc README COPYING Documentation/*.txt contrib/ %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} %{!?_without_docs: %doc Documentation/howto Documentation/technical} @@ -308,7 +348,7 @@ rm -rf $RPM_BUILD_ROOT %files svn %defattr(-,root,root) -%{_libexecdir}/git-core/*svn* +%{gitcoredir}/*svn* %doc Documentation/*svn*.txt %{!?_without_docs: %{_mandir}/man1/*svn*.1*} %{!?_without_docs: %doc Documentation/*svn*.html } @@ -317,7 +357,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc Documentation/*git-cvs*.txt %{_bindir}/git-cvsserver -%{_libexecdir}/git-core/*cvs* +%{gitcoredir}/*cvs* %{!?_without_docs: %{_mandir}/man1/*cvs*.1*} %{!?_without_docs: %doc Documentation/*git-cvs*.html } @@ -325,7 +365,7 @@ rm -rf $RPM_BUILD_ROOT %files arch %defattr(-,root,root) %doc Documentation/git-archimport.txt -%{_libexecdir}/git-core/git-archimport +%{gitcoredir}/git-archimport %{!?_without_docs: %{_mandir}/man1/git-archimport.1*} %{!?_without_docs: %doc Documentation/git-archimport.html } %endif @@ -333,14 +373,14 @@ rm -rf $RPM_BUILD_ROOT %files email %defattr(-,root,root) %doc Documentation/*email*.txt -%{_libexecdir}/git-core/*email* +%{gitcoredir}/*email* %{!?_without_docs: %{_mandir}/man1/*email*.1*} %{!?_without_docs: %doc Documentation/*email*.html } %files gui %defattr(-,root,root) -%{_libexecdir}/git-core/git-gui* -%{_libexecdir}/git-core/git-citool +%{gitcoredir}/git-gui* +%{gitcoredir}/git-citool %{_datadir}/applications/*git-gui.desktop %{_datadir}/git-gui/ %{!?_without_docs: %{_mandir}/man1/git-gui.1*} @@ -371,7 +411,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc Documentation/*daemon*.txt %config(noreplace)%{_sysconfdir}/xinetd.d/git -%{_libexecdir}/git-core/git-daemon +%{gitcoredir}/git-daemon %{_var}/lib/git %{!?_without_docs: %{_mandir}/man1/*daemon*.1*} %{!?_without_docs: %doc Documentation/*daemon*.html} @@ -387,6 +427,14 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sat Nov 21 2009 Todd Zullinger - 1.6.5.3-1 +- git-1.6.5.3 +- Only BR perl(Error) on Fedora and RHEL >= 5 +- Use config.mak to set build options +- Improve compatibility with EPEL +- Replace $RPM_BUILD_ROOT with %%{buildroot} +- Fix Obsoletes for those rebuilding on EL-4 + * Mon Oct 26 2009 Todd Zullinger - 1.6.5.2-1 - git-1.6.5.2 - Drop asciidoc --unsafe option, it should not be needed anymore diff --git a/sources b/sources index acbb4bd..f3afea8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -99708c449b23433136dbdfa38bd16d80 git-1.6.5.2.tar.bz2 +a1dbc3da46cbf33c4367db689853c142 git-1.6.5.3.tar.bz2 From 5d53d5203f5327e58155f012eaeaea5f142cca55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= Date: Sun, 6 Dec 2009 23:09:37 +0000 Subject: [PATCH 168/842] - rebuild against perl 5.10.1 --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 715c730..131c238 100644 --- a/git.spec +++ b/git.spec @@ -7,7 +7,7 @@ Name: git Version: 1.6.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -427,6 +427,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Dec 4 2009 Stepan Kasal - 1.6.5.3-2 +- rebuild against perl 5.10.1 + * Sat Nov 21 2009 Todd Zullinger - 1.6.5.3-1 - git-1.6.5.3 - Only BR perl(Error) on Fedora and RHEL >= 5 From bc3e0f7744b2115f79a5acbcab5e1a52de0d7b89 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 7 Dec 2009 15:11:59 +0000 Subject: [PATCH 169/842] Update to git-1.6.5.5 Fixes bug 543481 (Unsubstituted Docbook parameters in git manpages) --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 57401d1..2aae902 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.5.3.tar.bz2 +git-1.6.5.5.tar.bz2 diff --git a/git.spec b/git.spec index 131c238..9e87ad3 100644 --- a/git.spec +++ b/git.spec @@ -6,8 +6,8 @@ %endif Name: git -Version: 1.6.5.3 -Release: 2%{?dist} +Version: 1.6.5.5 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -427,6 +427,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sun Dec 06 2009 Todd Zullinger - 1.6.5.5-1 +- git-1.6.5.5 + * Fri Dec 4 2009 Stepan Kasal - 1.6.5.3-2 - rebuild against perl 5.10.1 diff --git a/sources b/sources index f3afea8..a25dd1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a1dbc3da46cbf33c4367db689853c142 git-1.6.5.3.tar.bz2 +fd575f22e67adbea1d17e5bc66a80f8d git-1.6.5.5.tar.bz2 From 64dae55e57e4bb99220dd179267e8d92f7bb5bd1 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 24 Dec 2009 13:38:47 +0000 Subject: [PATCH 170/842] Update to git-1.6.6 --- .cvsignore | 2 +- git.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2aae902..1255b84 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.5.5.tar.bz2 +git-1.6.6.tar.bz2 diff --git a/git.spec b/git.spec index 9e87ad3..fb9918a 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.6.5.5 +Version: 1.6.6 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -427,6 +427,12 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Dec 23 2009 Todd Zullinger - 1.6.6-1 +- git-1.6.6 + +* Fri Dec 11 2009 Todd Zullinger - 1.6.5.6-1 +- git-1.6.5.6 + * Sun Dec 06 2009 Todd Zullinger - 1.6.5.5-1 - git-1.6.5.5 diff --git a/sources b/sources index a25dd1c..e075050 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd575f22e67adbea1d17e5bc66a80f8d git-1.6.5.5.tar.bz2 +25e4bcdc528b3ffadc6e59908a513881 git-1.6.6.tar.bz2 From 68affad56786d410729dbee27c54b3a3fc409522 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 31 Jan 2010 21:05:27 +0000 Subject: [PATCH 171/842] Update to git-1.6.6.1 - Use %{gitcoredir}/git-daemon as xinetd server option, for SELinux (#529682) - Make %{_var}/lib/git the default gitweb projectroot (#556299) - Include gitweb/INSTALL file as documentation, the gitweb README refers to it - Ship a short example gitweb config file (%{_sysconfdir}/gitweb.conf) - Remove long fixed xinetd IPv6 workaround on Fedora (#557528) - Install missing gitweb.js (#558740) --- git.spec | 39 +++++++++++++++++++++++++++++-------- git.xinetd | 16 --------------- git.xinetd.in | 14 +++++++++++++ gitweb.conf.in | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+), 24 deletions(-) delete mode 100644 git.xinetd create mode 100644 git.xinetd.in create mode 100644 gitweb.conf.in diff --git a/git.spec b/git.spec index fb9918a..3daf682 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.6.6 +Version: 1.6.6.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -14,9 +14,10 @@ Group: Development/Tools URL: http://git-scm.com/ Source0: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2 Source1: git-init.el -Source2: git.xinetd +Source2: git.xinetd.in Source3: git.conf.httpd Source4: git-gui.desktop +Source5: gitweb.conf.in Patch0: git-1.5-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch @@ -229,6 +230,7 @@ BLK_SHA1 = 1 ETC_GITCONFIG = %{_sysconfdir}/gitconfig DESTDIR = %{buildroot} INSTALL = install -p +GITWEB_PROJECTROOT = %{_var}/lib/git htmldir = %{_docdir}/%{name}-%{version} prefix = %{_prefix} EOF @@ -281,10 +283,12 @@ install -Dpm 644 %{SOURCE1} \ %endif mkdir -p %{buildroot}%{_var}/www/git -install -pm 644 gitweb/*.png gitweb/*.css %{buildroot}%{_var}/www/git +install -pm 644 gitweb/*.{css,js,png} %{buildroot}%{_var}/www/git install -pm 755 gitweb/gitweb.cgi %{buildroot}%{_var}/www/git -mkdir -p %{buildroot}/%{_sysconfdir}/httpd/conf.d -install -pm 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/httpd/conf.d/git.conf +mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d +install -pm 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf +sed "s|@PROJECTROOT@|%{_var}/lib/git|g" \ + %{SOURCE5} > %{buildroot}%{_sysconfdir}/gitweb.conf find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';' @@ -304,7 +308,16 @@ rm -rf %{buildroot}%{_mandir} mkdir -p %{buildroot}%{_var}/lib/git mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d -install -pm 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/git +# On EL <= 5, xinetd does not enable IPv6 by default +enable_ipv6=" # xinetd does not enable IPv6 by default + flags = IPv6" +perl -p \ + -e "s|\@GITCOREDIR\@|%{gitcoredir}|g;" \ + -e "s|\@BASE_PATH\@|%{_var}/lib/git|g;" \ +%if 0%{?rhel} && 0%{?rhel} <= 5 + -e "s|^}|$enable_ipv6\n$&|;" \ +%endif + %{SOURCE2} > %{buildroot}%{_sysconfdir}/xinetd.d/git mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d install -pm 644 contrib/completion/git-completion.bash %{buildroot}%{_sysconfdir}/bash_completion.d/git @@ -418,15 +431,25 @@ rm -rf %{buildroot} %files -n gitweb %defattr(-,root,root) -%doc gitweb/README -%{_var}/www/git/ +%doc gitweb/INSTALL gitweb/README +%config(noreplace)%{_sysconfdir}/gitweb.conf %config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf +%{_var}/www/git/ %files all # No files for you! %changelog +* Tue Jan 26 2010 Todd Zullinger - 1.6.6.1-1 +- git-1.6.6.1 +- Use %%{gitcoredir}/git-daemon as xinetd server option, for SELinux (#529682) +- Make %%{_var}/lib/git the default gitweb projectroot (#556299) +- Include gitweb/INSTALL file as documentation, the gitweb README refers to it +- Ship a short example gitweb config file (%%{_sysconfdir}/gitweb.conf) +- Remove long fixed xinetd IPv6 workaround on Fedora (#557528) +- Install missing gitweb.js (#558740) + * Wed Dec 23 2009 Todd Zullinger - 1.6.6-1 - git-1.6.6 diff --git a/git.xinetd b/git.xinetd deleted file mode 100644 index 6c9933d..0000000 --- a/git.xinetd +++ /dev/null @@ -1,16 +0,0 @@ -# default: off -# description: The git dæmon allows git repositories to be exported using \ -# the git:// protocol. - -service git -{ - disable = yes - socket_type = stream - wait = no - user = nobody - server = /usr/bin/git - server_args = daemon --base-path=/var/lib/git --export-all --user-path=public_git --syslog --inetd --verbose - log_on_failure += USERID -# xinetd doesn't do this by default. bug #195265 - flags = IPv6 -} diff --git a/git.xinetd.in b/git.xinetd.in new file mode 100644 index 0000000..540e070 --- /dev/null +++ b/git.xinetd.in @@ -0,0 +1,14 @@ +# default: off +# description: The git dæmon allows git repositories to be exported using \ +# the git:// protocol. + +service git +{ + disable = yes + socket_type = stream + wait = no + user = nobody + server = @GITCOREDIR@/git-daemon + server_args = --base-path=@BASE_PATH@ --export-all --user-path=public_git --syslog --inetd --verbose + log_on_failure += USERID +} diff --git a/gitweb.conf.in b/gitweb.conf.in new file mode 100644 index 0000000..c04a96b --- /dev/null +++ b/gitweb.conf.in @@ -0,0 +1,53 @@ +# The gitweb config file is a fragment of perl code. You can set variables +# using "our $variable = value"; text from "#" character until the end of a +# line is ignored. See perlsyn(1) man page for details. +# +# See /usr/share/doc/gitweb-*/README and /usr/share/doc/gitweb-*/INSTALL for +# more details and available configuration variables. + +# Set the path to git projects. This is an absolute filesystem path which will +# be prepended to the project path. +#our $projectroot = "@PROJECTROOT@"; + +# Set the list of git base URLs used for URL to where fetch project from, i.e. +# the full URL is "$git_base_url/$project". By default this is empty +#our @git_base_url_list = qw(git://git.example.com +# ssh://git.example.com@PROJECTROOT@); + +# Enable the 'blame' blob view, showing the last commit that modified +# each line in the file. This can be very CPU-intensive. Disabled by default +#$feature{'blame'}{'default'} = [1]; +# +# Allow projects to override the default setting via git config file. +# Example: gitweb.blame = 0|1; +#$feature{'blame'}{'override'} = 1; + +# Disable the 'snapshot' link, providing a compressed archive of any tree. This +# can potentially generate high traffic if you have large project. Enabled for +# .tar.gz snapshots by default. +# +# Value is a list of formats defined in %known_snapshot_formats that you wish +# to offer. +#$feature{'snapshot'}{'default'} = []; +# +# Allow projects to override the default setting via git config file. +# Example: gitweb.snapshot = tbz2,zip; (use "none" to disable) +#$feature{'snapshot'}{'override'} = 1; + +# Disable grep search, which will list the files in currently selected tree +# containing the given string. This can be potentially CPU-intensive, of +# course. Enabled by default. +#$feature{'grep'}{'default'} = [0]; +# +# Allow projects to override the default setting via git config file. +# Example: gitweb.grep = 0|1; +#$feature{'grep'}{'override'} = 1; + +# Disable the pickaxe search, which will list the commits that modified a given +# string in a file. This can be practical and quite faster alternative to +# 'blame', but still potentially CPU-intensive. Enabled by default. +#$feature{'pickaxe'}{'default'} = [0]; +# +# Allow projects to override the default setting via git config file. +# Example: gitweb.pickaxe = 0|1; +#$feature{'pickaxe'}{'override'} = 1; From f31fb739f4238e9ba0c827313788ce0d0b41a8ec Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 31 Jan 2010 21:24:39 +0000 Subject: [PATCH 172/842] Add git-1.6.6.1 tarball --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1255b84..707db7c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.6.tar.bz2 +git-1.6.6.1.tar.bz2 diff --git a/sources b/sources index e075050..5ca3aac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -25e4bcdc528b3ffadc6e59908a513881 git-1.6.6.tar.bz2 +9d254bfdae56c6fa124d8a1312a1b034 git-1.6.6.1.tar.bz2 From 78783483c5c7d85804642e43d8b5a8ebf43742e8 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 15 Feb 2010 00:47:41 +0000 Subject: [PATCH 173/842] Update to git-1.7.0 - Link imap-send with libcrypto (#565147) - Disable building of unused python remote helper libs --- .cvsignore | 2 +- git.spec | 9 ++++++++- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 707db7c..b2eda6f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.6.1.tar.bz2 +git-1.7.0.tar.bz2 diff --git a/git.spec b/git.spec index 3daf682..a432c06 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.6.6.1 +Version: 1.7.0 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -227,6 +227,8 @@ cat << \EOF > config.mak V = 1 CFLAGS = %{optflags} BLK_SHA1 = 1 +NEEDS_CRYPTO_WITH_SSL = 1 +NO_PYTHON = 1 ETC_GITCONFIG = %{_sysconfdir}/gitconfig DESTDIR = %{buildroot} INSTALL = install -p @@ -441,6 +443,11 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sat Feb 13 2010 Todd Zullinger - 1.7.0-1 +- git-1.7.0 +- Link imap-send with libcrypto (#565147) +- Disable building of unused python remote helper libs + * Tue Jan 26 2010 Todd Zullinger - 1.6.6.1-1 - git-1.6.6.1 - Use %%{gitcoredir}/git-daemon as xinetd server option, for SELinux (#529682) diff --git a/sources b/sources index 5ca3aac..9992ad3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9d254bfdae56c6fa124d8a1312a1b034 git-1.6.6.1.tar.bz2 +c7553b73e2156d187ece6ba936ae30ab git-1.7.0.tar.bz2 From d5e5b3bd578fc7e395378a2b9f68d0ef5dfeb8a5 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 1 Mar 2010 14:16:42 +0000 Subject: [PATCH 174/842] Update to git-1.7.0.1 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index b2eda6f..3c2b4ea 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.7.0.tar.bz2 +git-1.7.0.1.tar.bz2 diff --git a/git.spec b/git.spec index a432c06..79793cd 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.0 +Version: 1.7.0.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -443,6 +443,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Mar 01 2010 Todd Zullinger - 1.7.0.1-1 +- git-1.7.0.1 + * Sat Feb 13 2010 Todd Zullinger - 1.7.0-1 - git-1.7.0 - Link imap-send with libcrypto (#565147) diff --git a/sources b/sources index 9992ad3..a0c39d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c7553b73e2156d187ece6ba936ae30ab git-1.7.0.tar.bz2 +c4315200efc90ea0f243cf0e86cda1f1 git-1.7.0.1.tar.bz2 From 011aa9301e7263a32d8b125a29f1c77795ef6238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Thu, 29 Apr 2010 11:28:02 +0000 Subject: [PATCH 175/842] - Mass rebuild with perl-5.12.0 --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 79793cd..9c7440e 100644 --- a/git.spec +++ b/git.spec @@ -7,7 +7,7 @@ Name: git Version: 1.7.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -443,6 +443,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Apr 29 2010 Marcela Maslanova - 1.7.0.1-2 +- Mass rebuild with perl-5.12.0 + * Mon Mar 01 2010 Todd Zullinger - 1.7.0.1-1 - git-1.7.0.1 From 77b1a5d6f6370300949ae6cd0332e0a82d48589e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 20 May 2010 15:56:11 +0000 Subject: [PATCH 176/842] Update to git-1.7.1 - Fix conditionals for EL-6 - Comply with Emacs add-on packaging guidelines (#573423), Jonathan Underwood - Place elisp source files in separate emacs-git-el package - Place git support files in own directory under site-lisp - Use Emacs packaging macros --- .cvsignore | 2 +- git.spec | 83 ++++++++++++++++++++++++++++++++++-------------------- sources | 2 +- 3 files changed, 54 insertions(+), 33 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3c2b4ea..74d9875 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.7.0.1.tar.bz2 +git-1.7.1.tar.bz2 diff --git a/git.spec b/git.spec index 9c7440e..90a0137 100644 --- a/git.spec +++ b/git.spec @@ -6,8 +6,8 @@ %endif Name: git -Version: 1.7.0.1 -Release: 2%{?dist} +Version: 1.7.1 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -26,7 +26,7 @@ Patch2: git-1.6-update-contrib-hooks-path.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 6 BuildRequires: emacs >= 22.2 BuildRequires: libcurl-devel %else @@ -68,19 +68,21 @@ SCMs, install the git-all meta-package. %package all Summary: Meta-package to pull in all git tools Group: Development/Tools -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release} -Requires: git-svn = %{version}-%{release} +%if 0%{?fedora} +Requires: git-arch = %{version}-%{release} +%endif Requires: git-cvs = %{version}-%{release} Requires: git-email = %{version}-%{release} -Requires: gitk = %{version}-%{release} Requires: git-gui = %{version}-%{release} +Requires: git-svn = %{version}-%{release} +Requires: gitk = %{version}-%{release} Requires: perl-Git = %{version}-%{release} -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 6 Requires: emacs-git = %{version}-%{release} -Requires: git-arch = %{version}-%{release} %endif %if 0%{?fedora} || 0%{?rhel} >= 5 Obsoletes: git <= 1.5.4.3 @@ -107,7 +109,7 @@ The git dæmon for supporting git:// access to git repositories %package -n gitweb Summary: Simple web interface to git repositories Group: Development/Tools -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release} @@ -119,7 +121,7 @@ Simple web interface to track changes in git repositories %package svn Summary: Git tools for importing Subversion repositories Group: Development/Tools -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release}, subversion, perl(Term::ReadKey) @@ -129,7 +131,7 @@ Git tools for importing Subversion repositories. %package cvs Summary: Git tools for importing CVS repositories Group: Development/Tools -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release}, cvs @@ -143,9 +145,7 @@ Git tools for importing CVS repositories. %package arch Summary: Git tools for importing Arch repositories Group: Development/Tools -%if 0%{?fedora} >= 10 BuildArch: noarch -%endif Requires: git = %{version}-%{release}, tla %description arch Git tools for importing Arch repositories. @@ -154,7 +154,7 @@ Git tools for importing Arch repositories. %package email Summary: Git tools for sending email Group: Development/Tools -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} @@ -168,7 +168,7 @@ Git tools for sending email. %package gui Summary: Git GUI tool Group: Development/Tools -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release}, tk >= 8.4 @@ -179,7 +179,7 @@ Git GUI tool. %package -n gitk Summary: Git revision tree visualiser Group: Development/Tools -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release}, tk >= 8.4 @@ -189,7 +189,7 @@ Git revision tree visualiser. %package -n perl-Git Summary: Perl interface to Git Group: Development/Libraries -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release} @@ -202,17 +202,24 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi %description -n perl-Git Perl interface to Git. -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 6 %package -n emacs-git Summary: Git version control system support for Emacs Group: Applications/Editors -%if 0%{?fedora} >= 10 BuildArch: noarch -%endif -Requires: git = %{version}-%{release}, emacs-common >= 22.2 +Requires: git = %{version}-%{release}, emacs(bin) >= %{_emacs_version} %description -n emacs-git %{summary}. + +%package -n emacs-git-el +Summary: Elisp source files for git version control system support for Emacs +Group: Applications/Editors +BuildArch: noarch +Requires: emacs-git = %{version}-%{release} + +%description -n emacs-git-el +%{summary}. %endif %prep @@ -237,7 +244,7 @@ htmldir = %{_docdir}/%{name}-%{version} prefix = %{_prefix} EOF -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 6 cat << \EOF >> config.mak ASCIIDOC8 = 1 ASCIIDOC_NO_ROFF = 1 @@ -262,7 +269,7 @@ chmod +x %{__perl_requires} %build make %{?_smp_mflags} all %{!?_without_docs: doc} -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 6 make -C contrib/emacs %endif @@ -273,15 +280,16 @@ sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash rm -rf %{buildroot} make %{?_smp_mflags} INSTALLDIRS=vendor install %{!?_without_docs: install-doc} -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 6 +%global elispdir %{_emacs_sitelispdir}/git make -C contrib/emacs install \ - emacsdir=%{buildroot}%{_datadir}/emacs/site-lisp -for elc in %{buildroot}%{_datadir}/emacs/site-lisp/*.elc ; do + emacsdir=%{buildroot}%{elispdir} +for elc in %{buildroot}%{elispdir}/*.elc ; do install -pm 644 contrib/emacs/$(basename $elc .elc).el \ - %{buildroot}%{_datadir}/emacs/site-lisp + %{buildroot}%{elispdir} done install -Dpm 644 %{SOURCE1} \ - %{buildroot}%{_datadir}/emacs/site-lisp/site-start.d/git-init.el + %{buildroot}%{_emacs_sitestartdir}/git-init.el %endif mkdir -p %{buildroot}%{_var}/www/git @@ -414,12 +422,17 @@ rm -rf %{buildroot} %files -n perl-Git -f perl-files %defattr(-,root,root) -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 6 %files -n emacs-git %defattr(-,root,root) %doc contrib/emacs/README -%{_datadir}/emacs/site-lisp/*git*.el* -%{_datadir}/emacs/site-lisp/site-start.d/git-init.el +%dir %{elispdir} +%{elispdir}/*.elc +%{_emacs_sitestartdir}/git-init.el + +%files -n emacs-git-el +%defattr(-,root,root) +%{elispdir}/*.el %endif %files daemon @@ -443,6 +456,14 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue May 04 2010 Todd Zullinger - 1.7.1-1 +- git-1.7.1 +- Fix conditionals for EL-6 +- Comply with Emacs add-on packaging guidelines (#573423), Jonathan Underwood + - Place elisp source files in separate emacs-git-el package + - Place git support files in own directory under site-lisp + - Use Emacs packaging macros + * Thu Apr 29 2010 Marcela Maslanova - 1.7.0.1-2 - Mass rebuild with perl-5.12.0 diff --git a/sources b/sources index a0c39d8..2c3f8d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c4315200efc90ea0f243cf0e86cda1f1 git-1.7.0.1.tar.bz2 +3da231dbe82ad103373cb530ae7475d5 git-1.7.1.tar.bz2 From 7fef5735cfe284c05ded4ec79975c0491f6b24ad Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Fri, 25 Jun 2010 18:20:55 +0000 Subject: [PATCH 177/842] - rebuild against new perl --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 90a0137..232ae75 100644 --- a/git.spec +++ b/git.spec @@ -7,7 +7,7 @@ Name: git Version: 1.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -456,6 +456,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Jun 25 2010 Adam Tkac - 1.7.1-2 +- rebuild against new perl + * Tue May 04 2010 Todd Zullinger - 1.7.1-1 - git-1.7.1 - Fix conditionals for EL-6 From bb50e46edd9939c6b316845ecd066964f0e2864d Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Fri, 2 Jul 2010 13:29:19 +0000 Subject: [PATCH 178/842] - update to 1.7.1.1 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 74d9875..393c4f7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.7.1.tar.bz2 +git-1.7.1.1.tar.bz2 diff --git a/git.spec b/git.spec index 232ae75..9f658cc 100644 --- a/git.spec +++ b/git.spec @@ -6,8 +6,8 @@ %endif Name: git -Version: 1.7.1 -Release: 2%{?dist} +Version: 1.7.1.1 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -456,6 +456,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Jul 02 2010 Adam Tkac - 1.7.1.1-1 +- update to 1.7.1.1 + * Fri Jun 25 2010 Adam Tkac - 1.7.1-2 - rebuild against new perl diff --git a/sources b/sources index 2c3f8d4..4184383 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3da231dbe82ad103373cb530ae7475d5 git-1.7.1.tar.bz2 +1b116a3e2ecce46a89e4272abf0de955 git-1.7.1.1.tar.bz2 From 8c3bcd12a1a3f7397765733963007ae98ed53bfa Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 22 Jul 2010 11:09:55 +0000 Subject: [PATCH 179/842] - update to 1.7.2 --- .cvsignore | 2 +- git-1.5-gitweb-home-link.patch | 9 +++++---- git.spec | 9 +++++---- sources | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index 393c4f7..e23ad7a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.7.1.1.tar.bz2 +git-1.7.2.tar.bz2 diff --git a/git-1.5-gitweb-home-link.patch b/git-1.5-gitweb-home-link.patch index cd36563..74c8390 100644 --- a/git-1.5-gitweb-home-link.patch +++ b/git-1.5-gitweb-home-link.patch @@ -1,7 +1,8 @@ ---- git-1.5.0.6/gitweb/gitweb.perl~ 2007-03-30 01:37:05.000000000 +0100 -+++ git-1.5.0.6/gitweb/gitweb.perl 2007-05-07 08:31:37.000000000 +0100 -@@ -39,7 +39,7 @@ our $projectroot = "++GITWEB_PROJECTROOT - our $home_link = $my_uri || "/"; +diff -up git-1.7.2/gitweb/gitweb.perl.orig git-1.7.2/gitweb/gitweb.perl +--- git-1.7.2/gitweb/gitweb.perl.orig 2010-07-21 23:35:25.000000000 +0200 ++++ git-1.7.2/gitweb/gitweb.perl 2010-07-22 10:49:50.385707086 +0200 +@@ -79,7 +79,7 @@ our $projectroot = "++GITWEB_PROJECTROOT + our $project_maxdepth = "++GITWEB_PROJECT_MAXDEPTH++"; # string of the home link on top of all pages -our $home_link_str = "++GITWEB_HOME_LINK_STR++"; diff --git a/git.spec b/git.spec index 9f658cc..2fe57fa 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.1.1 +Version: 1.7.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -242,6 +242,7 @@ INSTALL = install -p GITWEB_PROJECTROOT = %{_var}/lib/git htmldir = %{_docdir}/%{name}-%{version} prefix = %{_prefix} +gitwebdir = %{_var}/www/git EOF %if 0%{?fedora} || 0%{?rhel} >= 6 @@ -292,9 +293,6 @@ install -Dpm 644 %{SOURCE1} \ %{buildroot}%{_emacs_sitestartdir}/git-init.el %endif -mkdir -p %{buildroot}%{_var}/www/git -install -pm 644 gitweb/*.{css,js,png} %{buildroot}%{_var}/www/git -install -pm 755 gitweb/gitweb.cgi %{buildroot}%{_var}/www/git mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d install -pm 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf sed "s|@PROJECTROOT@|%{_var}/lib/git|g" \ @@ -456,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Jul 22 2010 Adam Tkac - 1.7.2-1 +- update to 1.7.2 + * Fri Jul 02 2010 Adam Tkac - 1.7.1.1-1 - update to 1.7.1.1 diff --git a/sources b/sources index 4184383..188db10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b116a3e2ecce46a89e4272abf0de955 git-1.7.1.1.tar.bz2 +652f861ae161e48979ef834707e2dc4c git-1.7.2.tar.bz2 From 5001719f8696f5e1dadf8cb4cd9b8777725da776 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 15:41:18 +0000 Subject: [PATCH 180/842] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a85ab14..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: git -# $Id: Makefile,v 1.2 2006/04/10 16:52:46 chrisw Exp $ -NAME := git -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 6ec5cef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-4 From 012e1b5c7c5a32b104d9878e9e257d71cc25f54a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 15:41:35 +0000 Subject: [PATCH 181/842] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index fbfe8aa..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: git -# $Id$ -NAME := git -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 4764d30f286c50e99c7b13afa7488fee5d9a0287 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 30 Jul 2010 10:15:19 -0400 Subject: [PATCH 182/842] Update to git-1.7.2.1 --- .gitignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e23ad7a..1dd8967 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -git-1.7.2.tar.bz2 +git-1.7.2.1.tar.bz2 diff --git a/git.spec b/git.spec index 2fe57fa..3b15654 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.2 +Version: 1.7.2.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -454,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Jul 29 2010 Todd Zullinger - 1.7.2.1-1 +- Update to git-1.7.2.1 + * Thu Jul 22 2010 Adam Tkac - 1.7.2-1 - update to 1.7.2 diff --git a/sources b/sources index 188db10..c6e2468 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -652f861ae161e48979ef834707e2dc4c git-1.7.2.tar.bz2 +24a443a120a0ab372185cb6bc0dbd934 git-1.7.2.1.tar.bz2 From 383e396ac5599f312be817126ef2e195939338ca Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Fri, 30 Jul 2010 22:52:13 +0200 Subject: [PATCH 183/842] cherry-pick: "Do not unquote + into ' ' in URLs" There are problems with this bug in dist-git. --- git-1.7.2.1-730220de.patch | 86 ++++++++++++++++++++++++++++++++++++++ git.spec | 9 +++- 2 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 git-1.7.2.1-730220de.patch diff --git a/git-1.7.2.1-730220de.patch b/git-1.7.2.1-730220de.patch new file mode 100644 index 0000000..fdf4d2e --- /dev/null +++ b/git-1.7.2.1-730220de.patch @@ -0,0 +1,86 @@ +commit 730220de8be669257287e9a1f5dde349ace5426a +Author: Thomas Rast +Date: Sat Jul 24 16:49:04 2010 +0200 + + Do not unquote + into ' ' in URLs + + Since 9d2e942 (decode file:// and ssh:// URLs, 2010-05-23) the URL + logic unquotes escaped URLs. For the %2B type of escape, this is + conformant with RFC 2396. However, it also unquotes + into a space + character, which is only appropriate for the query strings in HTTP. + This notably broke fetching from the gtk+ repository. + + We cannot just remove the corresponding code since the same + url_decode_internal() is also used by the HTTP backend to decode query + parameters. Introduce a new argument that controls whether the + + decoding happens, and use it only in the (client-side) url_decode(). + + Reported-by: Jasper St. Pierre + Signed-off-by: Thomas Rast + Signed-off-by: Junio C Hamano + +diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh +index 8abb71a..4431dfd 100755 +--- a/t/t5601-clone.sh ++++ b/t/t5601-clone.sh +@@ -178,8 +178,14 @@ test_expect_success 'clone respects global branch.autosetuprebase' ' + + test_expect_success 'respect url-encoding of file://' ' + git init x+y && +- test_must_fail git clone "file://$PWD/x+y" xy-url && +- git clone "file://$PWD/x%2By" xy-url ++ git clone "file://$PWD/x+y" xy-url-1 && ++ git clone "file://$PWD/x%2By" xy-url-2 ++' ++ ++test_expect_success 'do not query-string-decode + in URLs' ' ++ rm -rf x+y && ++ git init "x y" && ++ test_must_fail git clone "file://$PWD/x+y" xy-no-plus + ' + + test_expect_success 'do not respect url-encoding of non-url path' ' +diff --git a/url.c b/url.c +index 2306236..cd8f74f 100644 +--- a/url.c ++++ b/url.c +@@ -67,7 +67,8 @@ static int url_decode_char(const char *q) + return val; + } + +-static char *url_decode_internal(const char **query, const char *stop_at, struct strbuf *out) ++static char *url_decode_internal(const char **query, const char *stop_at, ++ struct strbuf *out, int decode_plus) + { + const char *q = *query; + +@@ -90,7 +91,7 @@ static char *url_decode_internal(const char **query, const char *stop_at, struct + } + } + +- if (c == '+') ++ if (decode_plus && c == '+') + strbuf_addch(out, ' '); + else + strbuf_addch(out, c); +@@ -110,17 +111,17 @@ char *url_decode(const char *url) + strbuf_add(&out, url, colon - url); + url = colon; + } +- return url_decode_internal(&url, NULL, &out); ++ return url_decode_internal(&url, NULL, &out, 0); + } + + char *url_decode_parameter_name(const char **query) + { + struct strbuf out = STRBUF_INIT; +- return url_decode_internal(query, "&=", &out); ++ return url_decode_internal(query, "&=", &out, 1); + } + + char *url_decode_parameter_value(const char **query) + { + struct strbuf out = STRBUF_INIT; +- return url_decode_internal(query, "&", &out); ++ return url_decode_internal(query, "&", &out, 1); + } diff --git a/git.spec b/git.spec index 3b15654..3be1405 100644 --- a/git.spec +++ b/git.spec @@ -7,7 +7,7 @@ Name: git Version: 1.7.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -23,6 +23,9 @@ Patch0: git-1.5-gitweb-home-link.patch Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://bugzilla.redhat.com/500137 Patch2: git-1.6-update-contrib-hooks-path.patch +# Do not unquote + into ' ' in URLs +# cherry-picked from upstream +Patch3: git-1.7.2.1-730220de.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -227,6 +230,7 @@ Requires: emacs-git = %{version}-%{release} %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -454,6 +458,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Jul 30 2010 Thomas Spura - 1.7.2.1-2 +- cherry-pick: "Do not unquote + into ' ' in URLs" + * Thu Jul 29 2010 Todd Zullinger - 1.7.2.1-1 - Update to git-1.7.2.1 From 71a8c911be9b871bb73673abd2c2f715962038e0 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Fri, 20 Aug 2010 10:55:54 +0200 Subject: [PATCH 184/842] Update to 1.7.2.2. Signed-off-by: Adam Tkac --- .gitignore | 1 + git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1dd8967..51ec344 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ git-1.7.2.1.tar.bz2 +/git-1.7.2.2.tar.bz2 diff --git a/git.spec b/git.spec index 3be1405..48f52a7 100644 --- a/git.spec +++ b/git.spec @@ -6,8 +6,8 @@ %endif Name: git -Version: 1.7.2.1 -Release: 2%{?dist} +Version: 1.7.2.2 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -458,6 +458,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Aug 20 2010 Adam Tkac - 1.7.2.2-1 +- update to 1.7.2.2 + * Fri Jul 30 2010 Thomas Spura - 1.7.2.1-2 - cherry-pick: "Do not unquote + into ' ' in URLs" diff --git a/sources b/sources index c6e2468..37117e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -24a443a120a0ab372185cb6bc0dbd934 git-1.7.2.1.tar.bz2 +4a5840b6d650692cb320eddb5ccefbaf git-1.7.2.2.tar.bz2 From d5dd393b9af6d7627f2c2c4fcda27aa40b9816c5 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Tue, 7 Sep 2010 10:14:04 +0200 Subject: [PATCH 185/842] Update to 1.7.2.3. Signed-off-by: Adam Tkac --- .gitignore | 1 + git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 51ec344..99ca092 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ git-1.7.2.1.tar.bz2 /git-1.7.2.2.tar.bz2 +/git-1.7.2.3.tar.bz2 diff --git a/git.spec b/git.spec index 48f52a7..e3db044 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.2.2 +Version: 1.7.2.3 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -458,6 +458,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Sep 07 2010 Adam Tkac - 1.7.2.3-1 +- update to 1.7.2.3 + * Fri Aug 20 2010 Adam Tkac - 1.7.2.2-1 - update to 1.7.2.2 diff --git a/sources b/sources index 37117e1..461cff7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4a5840b6d650692cb320eddb5ccefbaf git-1.7.2.2.tar.bz2 +d88c06f6442156686deb4b4fbab0954c git-1.7.2.3.tar.bz2 From 6d000faf2c345830839a95c24b9fe15eb890be9b Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 19 Sep 2010 10:37:07 -0400 Subject: [PATCH 186/842] Update to 1.7.3 --- git-1.7.2.1-730220de.patch | 86 -------------------------------------- git.spec | 9 ++-- 2 files changed, 4 insertions(+), 91 deletions(-) delete mode 100644 git-1.7.2.1-730220de.patch diff --git a/git-1.7.2.1-730220de.patch b/git-1.7.2.1-730220de.patch deleted file mode 100644 index fdf4d2e..0000000 --- a/git-1.7.2.1-730220de.patch +++ /dev/null @@ -1,86 +0,0 @@ -commit 730220de8be669257287e9a1f5dde349ace5426a -Author: Thomas Rast -Date: Sat Jul 24 16:49:04 2010 +0200 - - Do not unquote + into ' ' in URLs - - Since 9d2e942 (decode file:// and ssh:// URLs, 2010-05-23) the URL - logic unquotes escaped URLs. For the %2B type of escape, this is - conformant with RFC 2396. However, it also unquotes + into a space - character, which is only appropriate for the query strings in HTTP. - This notably broke fetching from the gtk+ repository. - - We cannot just remove the corresponding code since the same - url_decode_internal() is also used by the HTTP backend to decode query - parameters. Introduce a new argument that controls whether the + - decoding happens, and use it only in the (client-side) url_decode(). - - Reported-by: Jasper St. Pierre - Signed-off-by: Thomas Rast - Signed-off-by: Junio C Hamano - -diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh -index 8abb71a..4431dfd 100755 ---- a/t/t5601-clone.sh -+++ b/t/t5601-clone.sh -@@ -178,8 +178,14 @@ test_expect_success 'clone respects global branch.autosetuprebase' ' - - test_expect_success 'respect url-encoding of file://' ' - git init x+y && -- test_must_fail git clone "file://$PWD/x+y" xy-url && -- git clone "file://$PWD/x%2By" xy-url -+ git clone "file://$PWD/x+y" xy-url-1 && -+ git clone "file://$PWD/x%2By" xy-url-2 -+' -+ -+test_expect_success 'do not query-string-decode + in URLs' ' -+ rm -rf x+y && -+ git init "x y" && -+ test_must_fail git clone "file://$PWD/x+y" xy-no-plus - ' - - test_expect_success 'do not respect url-encoding of non-url path' ' -diff --git a/url.c b/url.c -index 2306236..cd8f74f 100644 ---- a/url.c -+++ b/url.c -@@ -67,7 +67,8 @@ static int url_decode_char(const char *q) - return val; - } - --static char *url_decode_internal(const char **query, const char *stop_at, struct strbuf *out) -+static char *url_decode_internal(const char **query, const char *stop_at, -+ struct strbuf *out, int decode_plus) - { - const char *q = *query; - -@@ -90,7 +91,7 @@ static char *url_decode_internal(const char **query, const char *stop_at, struct - } - } - -- if (c == '+') -+ if (decode_plus && c == '+') - strbuf_addch(out, ' '); - else - strbuf_addch(out, c); -@@ -110,17 +111,17 @@ char *url_decode(const char *url) - strbuf_add(&out, url, colon - url); - url = colon; - } -- return url_decode_internal(&url, NULL, &out); -+ return url_decode_internal(&url, NULL, &out, 0); - } - - char *url_decode_parameter_name(const char **query) - { - struct strbuf out = STRBUF_INIT; -- return url_decode_internal(query, "&=", &out); -+ return url_decode_internal(query, "&=", &out, 1); - } - - char *url_decode_parameter_value(const char **query) - { - struct strbuf out = STRBUF_INIT; -- return url_decode_internal(query, "&", &out); -+ return url_decode_internal(query, "&", &out, 1); - } diff --git a/git.spec b/git.spec index e3db044..552d01f 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.2.3 +Version: 1.7.3 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -23,9 +23,6 @@ Patch0: git-1.5-gitweb-home-link.patch Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://bugzilla.redhat.com/500137 Patch2: git-1.6-update-contrib-hooks-path.patch -# Do not unquote + into ' ' in URLs -# cherry-picked from upstream -Patch3: git-1.7.2.1-730220de.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -230,7 +227,6 @@ Requires: emacs-git = %{version}-%{release} %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -458,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sun Sep 19 2010 Todd Zullinger - 1.7.3-1 +- Update to 1.7.3 + * Tue Sep 07 2010 Adam Tkac - 1.7.2.3-1 - update to 1.7.2.3 From f279779f02353cf0005c3154d9c83f7f8592b41e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 19 Sep 2010 21:50:58 -0400 Subject: [PATCH 187/842] Update sources for 1.7.3 It helps to have the tarball uploaded for building. :/ --- .gitignore | 8 +++++--- sources | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 99ca092..119e105 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ -git-1.7.2.1.tar.bz2 -/git-1.7.2.2.tar.bz2 -/git-1.7.2.3.tar.bz2 +*~ +*.rpm +*.tar.bz2 +/.build*.log +/git-*/ diff --git a/sources b/sources index 461cff7..769cf95 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ d88c06f6442156686deb4b4fbab0954c git-1.7.2.3.tar.bz2 +c18eb252ce63a688071f10c3f7bc28e1 git-1.7.3.tar.bz2 From 84a8287c19caeb95affbc9ff64f1b6736ec08568 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 20 Sep 2010 15:45:41 -0400 Subject: [PATCH 188/842] Ensure the release notes are included in %doc --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 552d01f..5daf800 100644 --- a/git.spec +++ b/git.spec @@ -7,7 +7,7 @@ Name: git Version: 1.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -361,7 +361,7 @@ rm -rf %{buildroot} %defattr(-,root,root) %{_datadir}/git-core/ %dir %{gitcoredir} -%doc README COPYING Documentation/*.txt contrib/ +%doc README COPYING Documentation/*.txt Documentation/RelNotes contrib/ %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} %{!?_without_docs: %doc Documentation/howto Documentation/technical} %{_sysconfdir}/bash_completion.d @@ -454,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Sep 20 2010 Todd Zullinger - 1.7.3-2 +- Ensure the release notes are included in %%doc + * Sun Sep 19 2010 Todd Zullinger - 1.7.3-1 - Update to 1.7.3 From 10effb55093784aae83b9a95a19d61281f6816ff Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 29 Sep 2010 14:17:04 -0700 Subject: [PATCH 189/842] - Rebuilt for gcc bug 634757 --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 5daf800..05da8dd 100644 --- a/git.spec +++ b/git.spec @@ -7,7 +7,7 @@ Name: git Version: 1.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -454,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Sep 29 2010 jkeating - 1.7.3-3 +- Rebuilt for gcc bug 634757 + * Mon Sep 20 2010 Todd Zullinger - 1.7.3-2 - Ensure the release notes are included in %%doc From 0114f5785d46c49c1ea0afd77c37225e547a698f Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 30 Sep 2010 13:28:18 +0200 Subject: [PATCH 190/842] Update to 1.7.3.1. Signed-off-by: Adam Tkac --- .gitignore | 1 + git.spec | 7 +++++-- sources | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 119e105..c15bf68 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ *.tar.bz2 /.build*.log /git-*/ +/git-1.7.3.1.tar.bz2 diff --git a/git.spec b/git.spec index 05da8dd..69c989d 100644 --- a/git.spec +++ b/git.spec @@ -6,8 +6,8 @@ %endif Name: git -Version: 1.7.3 -Release: 3%{?dist} +Version: 1.7.3.1 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -454,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Sep 30 2010 Adam Tkac - 1.7.3.1-1 +- update to 1.7.3.1 + * Wed Sep 29 2010 jkeating - 1.7.3-3 - Rebuilt for gcc bug 634757 diff --git a/sources b/sources index 769cf95..73bb43e 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -d88c06f6442156686deb4b4fbab0954c git-1.7.2.3.tar.bz2 -c18eb252ce63a688071f10c3f7bc28e1 git-1.7.3.tar.bz2 +77e1611498919965fb65fd1f229ee155 git-1.7.3.1.tar.bz2 From 154dc10e8988763d96b89bb89589e9f2c2ee2194 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Fri, 22 Oct 2010 09:26:15 +0200 Subject: [PATCH 191/842] Update to 1.7.3.2. Signed-off-by: Adam Tkac --- .gitignore | 1 + git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c15bf68..dbe618c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /.build*.log /git-*/ /git-1.7.3.1.tar.bz2 +/git-1.7.3.2.tar.bz2 diff --git a/git.spec b/git.spec index 69c989d..ae9268f 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.3.1 +Version: 1.7.3.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -454,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Oct 22 2010 Adam Tkac - 1.7.3.2-1 +- update to 1.7.3.2 + * Thu Sep 30 2010 Adam Tkac - 1.7.3.1-1 - update to 1.7.3.1 diff --git a/sources b/sources index 73bb43e..a5d6e61 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -77e1611498919965fb65fd1f229ee155 git-1.7.3.1.tar.bz2 +902f7f07a789fedc0d2ac03656b85969 git-1.7.3.2.tar.bz2 From 2d2f51feecddcda9ff76876423423ed12f950ed1 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 6 Dec 2010 09:29:50 +0100 Subject: [PATCH 192/842] Update to 1.7.3.3. Signed-off-by: Adam Tkac --- .gitignore | 1 + git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dbe618c..2c7d4c2 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /git-*/ /git-1.7.3.1.tar.bz2 /git-1.7.3.2.tar.bz2 +/git-1.7.3.3.tar.bz2 diff --git a/git.spec b/git.spec index ae9268f..819ec56 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.3.2 +Version: 1.7.3.3 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -454,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Dec 06 2010 Adam Tkac - 1.7.3.3-1 +- update to 1.7.3.3 + * Fri Oct 22 2010 Adam Tkac - 1.7.3.2-1 - update to 1.7.3.2 diff --git a/sources b/sources index a5d6e61..c88e80b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -902f7f07a789fedc0d2ac03656b85969 git-1.7.3.2.tar.bz2 +0430440eeb7c037afd4254bc6fd2cce8 git-1.7.3.3.tar.bz2 From 32225e93ff161082e4bbdbe506481c29a4a6a153 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 16 Dec 2010 12:59:03 +0100 Subject: [PATCH 193/842] Update to 1.7.3.4. Signed-off-by: Adam Tkac --- .gitignore | 1 + git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2c7d4c2..3134a8d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /git-1.7.3.1.tar.bz2 /git-1.7.3.2.tar.bz2 /git-1.7.3.3.tar.bz2 +/git-1.7.3.4.tar.bz2 diff --git a/git.spec b/git.spec index 819ec56..5c3f016 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.3.3 +Version: 1.7.3.4 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -454,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Dec 16 2010 Adam Tkac - 1.7.3.4-1 +- update to 1.7.3.4 + * Mon Dec 06 2010 Adam Tkac - 1.7.3.3-1 - update to 1.7.3.3 diff --git a/sources b/sources index c88e80b..f53a6a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0430440eeb7c037afd4254bc6fd2cce8 git-1.7.3.3.tar.bz2 +3a2602016f98c529cda7b9fad1a6e216 git-1.7.3.4.tar.bz2 From 7175565872d3d5970b05da32d6edd6637583c6db Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Wed, 19 Jan 2011 11:20:32 +0100 Subject: [PATCH 194/842] Update to 1.7.3.5. Signed-off-by: Adam Tkac --- git.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 5c3f016..52dfdb9 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.3.4 +Version: 1.7.3.5 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -454,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Jan 19 2011 Adam Tkac - 1.7.3.5-1 +- update to 1.7.3.5 + * Thu Dec 16 2010 Adam Tkac - 1.7.3.4-1 - update to 1.7.3.4 diff --git a/sources b/sources index f53a6a0..df61f92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3a2602016f98c529cda7b9fad1a6e216 git-1.7.3.4.tar.bz2 +8a8cd93b8a4dff0a03c0fdc77253af3e git-1.7.3.5.tar.bz2 From c658997bfc79a3901c13d88559cfd48143a730ff Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 31 Jan 2011 11:48:52 +0100 Subject: [PATCH 195/842] Update to 1.7.4. Signed-off-by: Adam Tkac --- git.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 52dfdb9..6f92dfd 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.3.5 +Version: 1.7.4 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -454,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Jan 31 2011 Adam Tkac - 1.7.4-1 +- update to 1.7.4 + * Wed Jan 19 2011 Adam Tkac - 1.7.3.5-1 - update to 1.7.3.5 diff --git a/sources b/sources index df61f92..f4039d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a8cd93b8a4dff0a03c0fdc77253af3e git-1.7.3.5.tar.bz2 +fa24dc1ef0b663327ea0fe1981365b39 git-1.7.4.tar.bz2 From 8c320784c225a75d42f124148d93dafa387deebf Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 20:01:30 -0600 Subject: [PATCH 196/842] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 6f92dfd..1d2e435 100644 --- a/git.spec +++ b/git.spec @@ -7,7 +7,7 @@ Name: git Version: 1.7.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -454,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 1.7.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Jan 31 2011 Adam Tkac - 1.7.4-1 - update to 1.7.4 From 031dd59158fb38095f08d84b08762143924b0e8b Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 12 Feb 2011 19:42:10 -0500 Subject: [PATCH 197/842] Update to 1.7.4.1 --- .gitignore | 4 ---- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 3134a8d..119e105 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,3 @@ *.tar.bz2 /.build*.log /git-*/ -/git-1.7.3.1.tar.bz2 -/git-1.7.3.2.tar.bz2 -/git-1.7.3.3.tar.bz2 -/git-1.7.3.4.tar.bz2 diff --git a/git.spec b/git.spec index 1d2e435..b4a3751 100644 --- a/git.spec +++ b/git.spec @@ -6,8 +6,8 @@ %endif Name: git -Version: 1.7.4 -Release: 2%{?dist} +Version: 1.7.4.1 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -454,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sun Feb 13 2011 Todd Zullinger - 1.7.4.1-1 +- Update to 1.7.4.1 + * Tue Feb 08 2011 Fedora Release Engineering - 1.7.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index f4039d1..0faef81 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fa24dc1ef0b663327ea0fe1981365b39 git-1.7.4.tar.bz2 +76898de4566d11c0d0eec7e99edc2b5c git-1.7.4.1.tar.bz2 From 8b78beb4c3bf81c4e2c9c818161461a724db18f3 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 12 Feb 2011 19:53:31 -0500 Subject: [PATCH 198/842] Improve EL-5 compatibility, thanks to Kevin Fenzi for emacs testing --- git-1.7-el5-emacs-support.patch | 252 ++++++++++++++++++++++++++++++++ git.spec | 33 ++++- 2 files changed, 278 insertions(+), 7 deletions(-) create mode 100644 git-1.7-el5-emacs-support.patch diff --git a/git-1.7-el5-emacs-support.patch b/git-1.7-el5-emacs-support.patch new file mode 100644 index 0000000..25b3c31 --- /dev/null +++ b/git-1.7-el5-emacs-support.patch @@ -0,0 +1,252 @@ +From 424058e0607b4b3c558d19633090e06e7bd2b851 Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Wed, 2 Feb 2011 21:24:44 -0500 +Subject: [PATCH] Restore vc-git.el for basic compatibility on EL-5 + +This is the vc-git.el from 1.6.4.1, the last version to include it. +Most uses will be better served by the vc-git.el which is provided by +emacs >= 22.2, but on EL-5 we don't have the luxury of a modern emacs. +--- + contrib/emacs/Makefile | 2 +- + contrib/emacs/vc-git.el | 216 +++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 217 insertions(+), 1 deletions(-) + create mode 100644 contrib/emacs/vc-git.el + +diff --git a/contrib/emacs/Makefile b/contrib/emacs/Makefile +index 24d9312..a48540a 100644 +--- a/contrib/emacs/Makefile ++++ b/contrib/emacs/Makefile +@@ -2,7 +2,7 @@ + + EMACS = emacs + +-ELC = git.elc git-blame.elc ++ELC = git.elc vc-git.elc git-blame.elc + INSTALL ?= install + INSTALL_ELC = $(INSTALL) -m 644 + prefix ?= $(HOME) +diff --git a/contrib/emacs/vc-git.el b/contrib/emacs/vc-git.el +new file mode 100644 +index 0000000..b8f6be5 +--- /dev/null ++++ b/contrib/emacs/vc-git.el +@@ -0,0 +1,216 @@ ++;;; vc-git.el --- VC backend for the git version control system ++ ++;; Copyright (C) 2006 Alexandre Julliard ++ ++;; This program is free software; you can redistribute it and/or ++;; modify it under the terms of the GNU General Public License as ++;; published by the Free Software Foundation; either version 2 of ++;; the License, or (at your option) any later version. ++;; ++;; This program is distributed in the hope that it will be ++;; useful, but WITHOUT ANY WARRANTY; without even the implied ++;; warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ++;; PURPOSE. See the GNU General Public License for more details. ++;; ++;; You should have received a copy of the GNU General Public ++;; License along with this program; if not, write to the Free ++;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++;; MA 02111-1307 USA ++ ++;;; Commentary: ++ ++;; This file contains a VC backend for the git version control ++;; system. ++;; ++;; To install: put this file on the load-path and add GIT to the list ++;; of supported backends in `vc-handled-backends'; the following line, ++;; placed in your ~/.emacs, will accomplish this: ++;; ++;; (add-to-list 'vc-handled-backends 'GIT) ++;; ++;; TODO ++;; - changelog generation ++;; - working with revisions other than HEAD ++;; ++ ++(eval-when-compile (require 'cl)) ++ ++(defvar git-commits-coding-system 'utf-8 ++ "Default coding system for git commits.") ++ ++(defun vc-git--run-command-string (file &rest args) ++ "Run a git command on FILE and return its output as string." ++ (let* ((ok t) ++ (str (with-output-to-string ++ (with-current-buffer standard-output ++ (unless (eq 0 (apply #'call-process "git" nil '(t nil) nil ++ (append args (list (file-relative-name file))))) ++ (setq ok nil)))))) ++ (and ok str))) ++ ++(defun vc-git--run-command (file &rest args) ++ "Run a git command on FILE, discarding any output." ++ (let ((name (file-relative-name file))) ++ (eq 0 (apply #'call-process "git" nil (get-buffer "*Messages") nil (append args (list name)))))) ++ ++(defun vc-git-registered (file) ++ "Check whether FILE is registered with git." ++ (with-temp-buffer ++ (let* ((dir (file-name-directory file)) ++ (name (file-relative-name file dir))) ++ (and (ignore-errors ++ (when dir (cd dir)) ++ (eq 0 (call-process "git" nil '(t nil) nil "ls-files" "-c" "-z" "--" name))) ++ (let ((str (buffer-string))) ++ (and (> (length str) (length name)) ++ (string= (substring str 0 (1+ (length name))) (concat name "\0")))))))) ++ ++(defun vc-git-state (file) ++ "git-specific version of `vc-state'." ++ (let ((diff (vc-git--run-command-string file "diff-index" "-z" "HEAD" "--"))) ++ (if (and diff (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} [ADMU]\0[^\0]+\0" diff)) ++ 'edited ++ 'up-to-date))) ++ ++(defun vc-git-workfile-version (file) ++ "git-specific version of `vc-workfile-version'." ++ (let ((str (with-output-to-string ++ (with-current-buffer standard-output ++ (call-process "git" nil '(t nil) nil "symbolic-ref" "HEAD"))))) ++ (if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str) ++ (match-string 2 str) ++ str))) ++ ++(defun vc-git-symbolic-commit (commit) ++ "Translate COMMIT string into symbolic form. ++Returns nil if not possible." ++ (and commit ++ (with-temp-buffer ++ (and ++ (zerop ++ (call-process "git" nil '(t nil) nil "name-rev" ++ "--name-only" "--tags" ++ commit)) ++ (goto-char (point-min)) ++ (= (forward-line 2) 1) ++ (bolp) ++ (buffer-substring-no-properties (point-min) (1- (point-max))))))) ++ ++(defun vc-git-previous-version (file rev) ++ "git-specific version of `vc-previous-version'." ++ (let ((default-directory (file-name-directory (expand-file-name file))) ++ (file (file-name-nondirectory file))) ++ (vc-git-symbolic-commit ++ (with-temp-buffer ++ (and ++ (zerop ++ (call-process "git" nil '(t nil) nil "rev-list" ++ "-2" rev "--" file)) ++ (goto-char (point-max)) ++ (bolp) ++ (zerop (forward-line -1)) ++ (not (bobp)) ++ (buffer-substring-no-properties ++ (point) ++ (1- (point-max)))))))) ++ ++(defun vc-git-next-version (file rev) ++ "git-specific version of `vc-next-version'." ++ (let* ((default-directory (file-name-directory ++ (expand-file-name file))) ++ (file (file-name-nondirectory file)) ++ (current-rev ++ (with-temp-buffer ++ (and ++ (zerop ++ (call-process "git" nil '(t nil) nil "rev-list" ++ "-1" rev "--" file)) ++ (goto-char (point-max)) ++ (bolp) ++ (zerop (forward-line -1)) ++ (bobp) ++ (buffer-substring-no-properties ++ (point) ++ (1- (point-max))))))) ++ (and current-rev ++ (vc-git-symbolic-commit ++ (with-temp-buffer ++ (and ++ (zerop ++ (call-process "git" nil '(t nil) nil "rev-list" ++ "HEAD" "--" file)) ++ (goto-char (point-min)) ++ (search-forward current-rev nil t) ++ (zerop (forward-line -1)) ++ (buffer-substring-no-properties ++ (point) ++ (progn (forward-line 1) (1- (point)))))))))) ++ ++(defun vc-git-revert (file &optional contents-done) ++ "Revert FILE to the version stored in the git repository." ++ (if contents-done ++ (vc-git--run-command file "update-index" "--") ++ (vc-git--run-command file "checkout" "HEAD"))) ++ ++(defun vc-git-checkout-model (file) ++ 'implicit) ++ ++(defun vc-git-workfile-unchanged-p (file) ++ (let ((sha1 (vc-git--run-command-string file "hash-object" "--")) ++ (head (vc-git--run-command-string file "ls-tree" "-z" "HEAD" "--"))) ++ (and head ++ (string-match "[0-7]\\{6\\} blob \\([0-9a-f]\\{40\\}\\)\t[^\0]+\0" head) ++ (string= (car (split-string sha1 "\n")) (match-string 1 head))))) ++ ++(defun vc-git-register (file &optional rev comment) ++ "Register FILE into the git version-control system." ++ (vc-git--run-command file "update-index" "--add" "--")) ++ ++(defun vc-git-print-log (file &optional buffer) ++ (let ((name (file-relative-name file)) ++ (coding-system-for-read git-commits-coding-system)) ++ (vc-do-command buffer 'async "git" name "rev-list" "--pretty" "HEAD" "--"))) ++ ++(defun vc-git-diff (file &optional rev1 rev2 buffer) ++ (let ((name (file-relative-name file)) ++ (buf (or buffer "*vc-diff*"))) ++ (if (and rev1 rev2) ++ (vc-do-command buf 0 "git" name "diff-tree" "-p" rev1 rev2 "--") ++ (vc-do-command buf 0 "git" name "diff-index" "-p" (or rev1 "HEAD") "--")) ++ ; git-diff-index doesn't set exit status like diff does ++ (if (vc-git-workfile-unchanged-p file) 0 1))) ++ ++(defun vc-git-checkin (file rev comment) ++ (let ((coding-system-for-write git-commits-coding-system)) ++ (vc-git--run-command file "commit" "-m" comment "--only" "--"))) ++ ++(defun vc-git-checkout (file &optional editable rev destfile) ++ (if destfile ++ (let ((fullname (substring ++ (vc-git--run-command-string file "ls-files" "-z" "--full-name" "--") ++ 0 -1)) ++ (coding-system-for-read 'no-conversion) ++ (coding-system-for-write 'no-conversion)) ++ (with-temp-file destfile ++ (eq 0 (call-process "git" nil t nil "cat-file" "blob" ++ (concat (or rev "HEAD") ":" fullname))))) ++ (vc-git--run-command file "checkout" (or rev "HEAD")))) ++ ++(defun vc-git-annotate-command (file buf &optional rev) ++ ; FIXME: rev is ignored ++ (let ((name (file-relative-name file))) ++ (call-process "git" nil buf nil "blame" name))) ++ ++(defun vc-git-annotate-time () ++ (and (re-search-forward "[0-9a-f]+ (.* \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\) \\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\) \\([-+0-9]+\\) +[0-9]+)" nil t) ++ (vc-annotate-convert-time ++ (apply #'encode-time (mapcar (lambda (match) (string-to-number (match-string match))) '(6 5 4 3 2 1 7)))))) ++ ++;; Not really useful since we can't do anything with the revision yet ++;;(defun vc-annotate-extract-revision-at-line () ++;; (save-excursion ++;; (move-beginning-of-line 1) ++;; (and (looking-at "[0-9a-f]+") ++;; (buffer-substring (match-beginning 0) (match-end 0))))) ++ ++(provide 'vc-git) +-- +1.7.3.4 + diff --git a/git.spec b/git.spec index b4a3751..01c066b 100644 --- a/git.spec +++ b/git.spec @@ -23,11 +23,15 @@ Patch0: git-1.5-gitweb-home-link.patch Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://bugzilla.redhat.com/500137 Patch2: git-1.6-update-contrib-hooks-path.patch +# https://bugzilla.redhat.com/600411 +Patch3: git-1.7-el5-emacs-support.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils +%if 0%{?fedora} || 0%{?rhel} >= 5 +BuildRequires: emacs +%endif %if 0%{?fedora} || 0%{?rhel} >= 6 -BuildRequires: emacs >= 22.2 BuildRequires: libcurl-devel %else BuildRequires: curl-devel @@ -81,7 +85,7 @@ Requires: git-gui = %{version}-%{release} Requires: git-svn = %{version}-%{release} Requires: gitk = %{version}-%{release} Requires: perl-Git = %{version}-%{release} -%if 0%{?fedora} || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?rhel} >= 5 Requires: emacs-git = %{version}-%{release} %endif %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -202,12 +206,17 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi %description -n perl-Git Perl interface to Git. -%if 0%{?fedora} || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?rhel} >= 5 %package -n emacs-git Summary: Git version control system support for Emacs Group: Applications/Editors +Requires: git = %{version}-%{release} +%if 0%{?fedora} || 0%{?rhel} >= 6 BuildArch: noarch -Requires: git = %{version}-%{release}, emacs(bin) >= %{_emacs_version} +Requires: emacs(bin) >= %{_emacs_version} +%else +Requires: emacs-common +%endif %description -n emacs-git %{summary}. @@ -215,7 +224,9 @@ Requires: git = %{version}-%{release}, emacs(bin) >= %{_emacs_version} %package -n emacs-git-el Summary: Elisp source files for git version control system support for Emacs Group: Applications/Editors +%if 0%{?fedora} || 0%{?rhel} >= 6 BuildArch: noarch +%endif Requires: emacs-git = %{version}-%{release} %description -n emacs-git-el @@ -227,6 +238,9 @@ Requires: emacs-git = %{version}-%{release} %patch0 -p1 %patch1 -p1 %patch2 -p1 +%if 0%{?rhel} == 5 +%patch3 -p1 +%endif # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -270,7 +284,7 @@ chmod +x %{__perl_requires} %build make %{?_smp_mflags} all %{!?_without_docs: doc} -%if 0%{?fedora} || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?rhel} >= 5 make -C contrib/emacs %endif @@ -281,7 +295,11 @@ sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash rm -rf %{buildroot} make %{?_smp_mflags} INSTALLDIRS=vendor install %{!?_without_docs: install-doc} -%if 0%{?fedora} || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?rhel} >= 5 +%if 0%{?rhel} == 5 +%global _emacs_sitelispdir %{_datadir}/emacs/site-lisp +%global _emacs_sitestartdir %{_emacs_sitelispdir}/site-start.d +%endif %global elispdir %{_emacs_sitelispdir}/git make -C contrib/emacs install \ emacsdir=%{buildroot}%{elispdir} @@ -420,7 +438,7 @@ rm -rf %{buildroot} %files -n perl-Git -f perl-files %defattr(-,root,root) -%if 0%{?fedora} || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?rhel} >= 5 %files -n emacs-git %defattr(-,root,root) %doc contrib/emacs/README @@ -456,6 +474,7 @@ rm -rf %{buildroot} %changelog * Sun Feb 13 2011 Todd Zullinger - 1.7.4.1-1 - Update to 1.7.4.1 +- Improve EL-5 compatibility, thanks to Kevin Fenzi for emacs testing * Tue Feb 08 2011 Fedora Release Engineering - 1.7.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 94ce6ac2e5e07e3b268a06ba0301a78b6ab491d3 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 13 Feb 2011 13:34:14 -0500 Subject: [PATCH 199/842] Clean up documentation settings (the defaults changed in 1.7.4) Special settings for current Fedora and EL >= 6 are no longer required. Adjust the settings for older EL releases. --- git.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index 01c066b..fb6b7a5 100644 --- a/git.spec +++ b/git.spec @@ -259,17 +259,19 @@ prefix = %{_prefix} gitwebdir = %{_var}/www/git EOF -%if 0%{?fedora} || 0%{?rhel} >= 6 -cat << \EOF >> config.mak -ASCIIDOC8 = 1 -ASCIIDOC_NO_ROFF = 1 -EOF -%endif - %if 0%{?rhel} && 0%{?rhel} <= 5 echo gitexecdir = %{_bindir} >> config.mak %endif +%if 0%{?rhel} && 0%{?rhel} == 5 +# This is needed for 1.69.1-1.71.0 +echo DOCBOOK_SUPPRESS_SP = 1 >> config.mak +%endif + +%if 0%{?rhel} && 0%{?rhel} <= 4 +echo ASCIIDOC7 = 1 >> config.mak +%endif + # Filter bogus perl requires # packed-refs comes from a comment in contrib/hooks/update-paranoid cat << \EOF > %{name}-req @@ -474,6 +476,7 @@ rm -rf %{buildroot} %changelog * Sun Feb 13 2011 Todd Zullinger - 1.7.4.1-1 - Update to 1.7.4.1 +- Clean up documentation settings (the defaults changed in 1.7.4) - Improve EL-5 compatibility, thanks to Kevin Fenzi for emacs testing * Tue Feb 08 2011 Fedora Release Engineering - 1.7.4-2 From bba13f413a415197c961906a1d305407bca94994 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 28 Mar 2011 16:40:50 +0200 Subject: [PATCH 200/842] Update to 1.7.4.2. - move man3/Git.3pm file to perl-Git subpkg (#664889) - add perl-DBD-SQLite dependency to git-cvs (#602410) Signed-off-by: Adam Tkac --- git.spec | 11 +++++++++-- sources | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index fb6b7a5..ad84abf 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.4.1 +Version: 1.7.4.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -141,6 +141,7 @@ BuildArch: noarch Requires: git = %{version}-%{release}, cvs %if 0%{?fedora} || 0%{?rhel} >= 5 Requires: cvsps +Requires: perl-DBD-SQLite %endif %description cvs Git tools for importing CVS repositories. @@ -329,7 +330,7 @@ find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ' (find %{buildroot}{%{_bindir},%{_libexecdir}} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e s@^%{buildroot}@@) > bin-man-doc-files (find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) >> perl-files %if %{!?_without_docs:1}0 -(find %{buildroot}%{_mandir} -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e s@^%{buildroot}@@ -e 's/$/*/' ) >> bin-man-doc-files +(find %{buildroot}%{_mandir} -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool|git-daemon|Git" | sed -e s@^%{buildroot}@@ -e 's/$/*/' ) >> bin-man-doc-files %else rm -rf %{buildroot}%{_mandir} %endif @@ -439,6 +440,7 @@ rm -rf %{buildroot} %files -n perl-Git -f perl-files %defattr(-,root,root) +%{!?_without_docs: %{_mandir}/man3/*Git*.3pm*} %if 0%{?fedora} || 0%{?rhel} >= 5 %files -n emacs-git @@ -474,6 +476,11 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Mar 28 2011 Adam Tkac - 1.7.4.2-1 +- update to 1.7.4.2 +- move man3/Git.3pm file to perl-Git subpkg (#664889) +- add perl-DBD-SQLite dependency to git-cvs (#602410) + * Sun Feb 13 2011 Todd Zullinger - 1.7.4.1-1 - Update to 1.7.4.1 - Clean up documentation settings (the defaults changed in 1.7.4) diff --git a/sources b/sources index 0faef81..496b381 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -76898de4566d11c0d0eec7e99edc2b5c git-1.7.4.1.tar.bz2 +4b2df3f916061439ae105d7a27637925 git-1.7.4.2.tar.bz2 From 7ea8da77be138378c477ad341449ef07ff2ea512 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 11 Apr 2011 11:47:23 +0200 Subject: [PATCH 201/842] Update to 1.7.4.4. Signed-off-by: Adam Tkac --- git.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index ad84abf..abb65f9 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.4.2 +Version: 1.7.4.4 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -476,6 +476,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Apr 11 2011 Adam Tkac - 1.7.4.4-1 +- update to 1.7.4.4 + * Mon Mar 28 2011 Adam Tkac - 1.7.4.2-1 - update to 1.7.4.2 - move man3/Git.3pm file to perl-Git subpkg (#664889) diff --git a/sources b/sources index 496b381..dcd8d52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4b2df3f916061439ae105d7a27637925 git-1.7.4.2.tar.bz2 +1313f71d62fa100b32fa313769a85f2a git-1.7.4.4.tar.bz2 From 3e8af219845559f1227c195b5c577b4799b81a2f Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Wed, 27 Apr 2011 10:10:14 +0200 Subject: [PATCH 202/842] Update to 1.7.5. Signed-off-by: Adam Tkac --- git.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index abb65f9..73fb11e 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.4.4 +Version: 1.7.5 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -476,6 +476,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Apr 27 2011 Adam Tkac - 1.7.5-1 +- update to 1.7.5 + * Mon Apr 11 2011 Adam Tkac - 1.7.4.4-1 - update to 1.7.4.4 diff --git a/sources b/sources index dcd8d52..5ed7ca1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1313f71d62fa100b32fa313769a85f2a git-1.7.4.4.tar.bz2 +7f0bc26a6e87d251c9b09fa05a186ed3 git-1.7.5.tar.bz2 From 3c50076911e7a7aa105878dd68b18a74f5516409 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 5 May 2011 12:18:42 +0200 Subject: [PATCH 203/842] Update to 1.7.5.1 Signed-off-by: Adam Tkac --- git.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 73fb11e..8685f9f 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.5 +Version: 1.7.5.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -476,6 +476,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu May 05 2011 Adam Tkac - 1.7.5.1-1 +- update to 1.7.5.1 + * Wed Apr 27 2011 Adam Tkac - 1.7.5-1 - update to 1.7.5 diff --git a/sources b/sources index 5ed7ca1..dfbf4f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f0bc26a6e87d251c9b09fa05a186ed3 git-1.7.5.tar.bz2 +a49291116e3b0564e069ae989e4db6fb git-1.7.5.1.tar.bz2 From d11e2cf2486361f0903ae1076295a314701fcaf0 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Tue, 24 May 2011 10:52:49 +0200 Subject: [PATCH 204/842] Update to 1.7.5.2. Signed-off-by: Adam Tkac --- git.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 8685f9f..9bd87e2 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.5.1 +Version: 1.7.5.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -476,6 +476,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue May 24 2011 Adam Tkac - 1.7.5.2-1 +- update to 1.7.5.2 + * Thu May 05 2011 Adam Tkac - 1.7.5.1-1 - update to 1.7.5.1 diff --git a/sources b/sources index dfbf4f9..f5076cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a49291116e3b0564e069ae989e4db6fb git-1.7.5.1.tar.bz2 +f79ab8fe79b35346b499f131cbf381a4 git-1.7.5.2.tar.bz2 From 493c5c5b00be4782209de28c87ece1683605221f Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 9 Jun 2011 11:19:10 +0200 Subject: [PATCH 205/842] Update to 1.7.5.4 Signed-off-by: Adam Tkac --- git.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 9bd87e2..7d07a3d 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.5.2 +Version: 1.7.5.4 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -476,6 +476,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Jun 09 2011 Adam Tkac - 1.7.5.4-1 +- update to 1.7.5.4 + * Tue May 24 2011 Adam Tkac - 1.7.5.2-1 - update to 1.7.5.2 diff --git a/sources b/sources index f5076cf..7a4d6fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f79ab8fe79b35346b499f131cbf381a4 git-1.7.5.2.tar.bz2 +4985b774db84d3bbcc2b8d90952552a3 git-1.7.5.4.tar.bz2 From 9b4cb0385429bdfcf8e0dcce229ea432dc038195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Mon, 20 Jun 2011 22:17:44 +0200 Subject: [PATCH 206/842] Perl mass rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 7d07a3d..9df0543 100644 --- a/git.spec +++ b/git.spec @@ -7,7 +7,7 @@ Name: git Version: 1.7.5.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -476,6 +476,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Jun 20 2011 Marcela Mašláňová - 1.7.5.4-2 +- Perl mass rebuild + * Thu Jun 09 2011 Adam Tkac - 1.7.5.4-1 - update to 1.7.5.4 From 5dc4f2bfb5a4968a1e2232265e5fa1f48da9566e Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Wed, 29 Jun 2011 15:07:52 +0200 Subject: [PATCH 207/842] Update to 1.7.6 Signed-off-by: Adam Tkac --- git.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 9df0543..e3f5172 100644 --- a/git.spec +++ b/git.spec @@ -6,8 +6,8 @@ %endif Name: git -Version: 1.7.5.4 -Release: 2%{?dist} +Version: 1.7.6 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -476,6 +476,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Jun 29 2011 Adam Tkac - 1.7.6-1 +- update to 1.7.6 + * Mon Jun 20 2011 Marcela Mašláňová - 1.7.5.4-2 - Perl mass rebuild diff --git a/sources b/sources index 7a4d6fd..9c931b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4985b774db84d3bbcc2b8d90952552a3 git-1.7.5.4.tar.bz2 +9e0a438eb71e89eedb61f89470ed32a0 git-1.7.6.tar.bz2 From b8e748f9f914734eac133a41ac3ab234b650341e Mon Sep 17 00:00:00 2001 From: Petr Sabata Date: Wed, 20 Jul 2011 11:42:32 +0200 Subject: [PATCH 208/842] Perl mass rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index e3f5172..12cce13 100644 --- a/git.spec +++ b/git.spec @@ -7,7 +7,7 @@ Name: git Version: 1.7.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -476,6 +476,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Jul 20 2011 Petr Sabata - 1.7.6-2 +- Perl mass rebuild + * Wed Jun 29 2011 Adam Tkac - 1.7.6-1 - update to 1.7.6 From 56b925003b1620437540fe8c881a2205822c3e63 Mon Sep 17 00:00:00 2001 From: Petr Sabata Date: Thu, 21 Jul 2011 18:33:42 +0200 Subject: [PATCH 209/842] Perl mass rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 12cce13..0c2e522 100644 --- a/git.spec +++ b/git.spec @@ -7,7 +7,7 @@ Name: git Version: 1.7.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -476,6 +476,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Jul 21 2011 Petr Sabata - 1.7.6-3 +- Perl mass rebuild + * Wed Jul 20 2011 Petr Sabata - 1.7.6-2 - Perl mass rebuild From 3f0dc974fa8b2943641d67c73ad1e34df4a3dcff Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 26 Jul 2011 11:56:36 -0400 Subject: [PATCH 210/842] Drop git-arch on fedora >= 16 The tla package was retired. --- git.spec | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index 0c2e522..78d478c 100644 --- a/git.spec +++ b/git.spec @@ -5,9 +5,16 @@ %global gitcoredir %{_libexecdir}/git-core %endif +# Only build git-arch for Fedora < 16, where tla is available +%if 0%{?fedora} && 0%{?fedora} < 16 +%global arch_support 1 +%else +%global arch_support 0 +%endif + Name: git Version: 1.7.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -76,7 +83,7 @@ Group: Development/Tools BuildArch: noarch %endif Requires: git = %{version}-%{release} -%if 0%{?fedora} +%if %{arch_support} Requires: git-arch = %{version}-%{release} %endif Requires: git-cvs = %{version}-%{release} @@ -146,7 +153,7 @@ Requires: perl-DBD-SQLite %description cvs Git tools for importing CVS repositories. -%if 0%{?fedora} +%if %{arch_support} %package arch Summary: Git tools for importing Arch repositories Group: Development/Tools @@ -323,7 +330,7 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';' find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';' -%if ! 0%{?fedora} +%if ! %{arch_support} find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' %endif @@ -403,7 +410,7 @@ rm -rf %{buildroot} %{!?_without_docs: %{_mandir}/man1/*cvs*.1*} %{!?_without_docs: %doc Documentation/*git-cvs*.html } -%if 0%{?fedora} +%if %{arch_support} %files arch %defattr(-,root,root) %doc Documentation/git-archimport.txt @@ -476,6 +483,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Jul 26 2011 Todd Zullinger - 1.7.6-4 +- Drop git-arch on fedora >= 16, the tla package has been retired + * Thu Jul 21 2011 Petr Sabata - 1.7.6-3 - Perl mass rebuild From 7e2e90daedd07f9f4820ebfac45bd261b39ecf28 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 26 Jul 2011 14:12:21 -0400 Subject: [PATCH 211/842] Rework most spec file dist conditionals Over time the spec file had become littered with conditional statements to enable, disable, patch, and/or tweak things for various releases. Consolidate all these at the top of the spec file to make it easier to add future conditions. --- git.spec | 132 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 86 insertions(+), 46 deletions(-) diff --git a/git.spec b/git.spec index 78d478c..7eabe22 100644 --- a/git.spec +++ b/git.spec @@ -1,10 +1,65 @@ # Pass --without docs to rpmbuild if you don't want the documentation + +# Leave git-* binaries in %{_bindir} on EL <= 5 %if 0%{?rhel} && 0%{?rhel} <= 5 %global gitcoredir %{_bindir} %else %global gitcoredir %{_libexecdir}/git-core %endif +# Build noarch subpackages and use libcurl-devel on Fedora and EL >= 6 +%if 0%{?fedora} || 0%{?rhel} >= 6 +%global noarch_sub 1 +%global libcurl_devel libcurl-devel +%else +%global noarch_sub 0 +%global libcurl_devel curl-devel +%endif + +# Build git-emacs, use perl(Error) and perl(Net::SMTP::SSL), require cvsps, and +# adjust git-core obsolete version on Fedora and EL >= 5. (We don't really +# support EL-4, but folks stuck using it have enough problems, no point making +# it harder on them.) +%if 0%{?fedora} || 0%{?rhel} >= 5 +%global emacs_support 1 +%global git_core_version 1.5.4.3 +%global perl_error 1 +%global perl_net_smtp_ssl 1 +%global require_cvsps 1 +%else +%global emacs_support 0 +%global git_core_version 1.5.4.7-4 +%global perl_error 0 +%global perl_net_smtp_ssl 0 +%global require_cvsps 0 +%endif + +# Patch emacs and tweak docbook spaces on EL-5 +%if 0%{?rhel} == 5 +%global emacs_old 1 +%global docbook_suppress_sp 1 +%else +%global emacs_old 0 +%global docbook_suppress_sp 0 +%endif + +# Enable ipv6 for git-daemon and use desktop --vendor option on EL <= 5 +%if 0%{?rhel} && 0%{?rhel} <= 5 +%global enable_ipv6 1 +%global use_desktop_vendor 1 +%else +%global enable_ipv6 1 +%global use_desktop_vendor 1 +%endif + +# Use asciidoc-7 on EL <= 4. Again, we don't support EL-4, but no need to make +# it more difficult to build a modern git there. +%if 0%{?rhel} && 0%{?rhel} <= 4 +%global asciidoc7 1 +%else +%global asciidoc7 0 +%endif + # Only build git-arch for Fedora < 16, where tla is available %if 0%{?fedora} && 0%{?fedora} < 16 %global arch_support 1 @@ -35,14 +90,10 @@ Patch3: git-1.7-el5-emacs-support.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -%if 0%{?fedora} || 0%{?rhel} >= 5 +%if %{emacs_support} BuildRequires: emacs %endif -%if 0%{?fedora} || 0%{?rhel} >= 6 -BuildRequires: libcurl-devel -%else -BuildRequires: curl-devel -%endif +BuildRequires: %{libcurl_devel} BuildRequires: expat-devel BuildRequires: gettext BuildRequires: openssl-devel @@ -51,7 +102,7 @@ BuildRequires: zlib-devel >= 1.2 Requires: less Requires: openssh-clients -%if 0%{?fedora} || 0%{?rhel} >= 5 +%if %{perl_error} Requires: perl(Error) %endif Requires: perl-Git = %{version}-%{release} @@ -59,13 +110,7 @@ Requires: rsync Requires: zlib >= 1.2 Provides: git-core = %{version}-%{release} -%if 0%{?fedora} || 0%{?rhel} >= 5 -Obsoletes: git-core <= 1.5.4.3 -%else -# EL-4 has 1.5.4.7-3.el4. We don't support this, but no point making it more -# difficult than it needs to be (folks stuck on EL-4 have it bad enough ;). -Obsoletes: git-core <= 1.5.4.7-4 -%endif +Obsoletes: git-core <= %{git_core_version} %description Git is a fast, scalable, distributed revision control system with an @@ -79,7 +124,7 @@ SCMs, install the git-all meta-package. %package all Summary: Meta-package to pull in all git tools Group: Development/Tools -%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 +%if %{noarch_sub} BuildArch: noarch %endif Requires: git = %{version}-%{release} @@ -92,16 +137,10 @@ Requires: git-gui = %{version}-%{release} Requires: git-svn = %{version}-%{release} Requires: gitk = %{version}-%{release} Requires: perl-Git = %{version}-%{release} -%if 0%{?fedora} || 0%{?rhel} >= 5 +%if %{emacs_support} Requires: emacs-git = %{version}-%{release} %endif -%if 0%{?fedora} || 0%{?rhel} >= 5 -Obsoletes: git <= 1.5.4.3 -%else -# EL-4 has 1.5.4.7-3.el4. We don't support this, but no point making it more -# difficult than it needs to be (folks stuck on EL-4 have it bad enough ;). -Obsoletes: git <= 1.5.4.7-4 -%endif +Obsoletes: git <= %{git_core_version} %description all Git is a fast, scalable, distributed revision control system with an @@ -120,7 +159,7 @@ The git dæmon for supporting git:// access to git repositories %package -n gitweb Summary: Simple web interface to git repositories Group: Development/Tools -%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 +%if %{noarch_sub} BuildArch: noarch %endif Requires: git = %{version}-%{release} @@ -132,7 +171,7 @@ Simple web interface to track changes in git repositories %package svn Summary: Git tools for importing Subversion repositories Group: Development/Tools -%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 +%if %{noarch_sub} BuildArch: noarch %endif Requires: git = %{version}-%{release}, subversion, perl(Term::ReadKey) @@ -142,11 +181,11 @@ Git tools for importing Subversion repositories. %package cvs Summary: Git tools for importing CVS repositories Group: Development/Tools -%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 +%if %{noarch_sub} BuildArch: noarch %endif Requires: git = %{version}-%{release}, cvs -%if 0%{?fedora} || 0%{?rhel} >= 5 +%if %{require_cvsps} Requires: cvsps Requires: perl-DBD-SQLite %endif @@ -166,12 +205,12 @@ Git tools for importing Arch repositories. %package email Summary: Git tools for sending email Group: Development/Tools -%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 +%if %{noarch_sub} BuildArch: noarch %endif Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} Requires: perl(Authen::SASL) -%if 0%{?fedora} || 0%{?rhel} >= 5 +%if %{perl_net_smtp_ssl} Requires: perl(Net::SMTP::SSL) %endif %description email @@ -180,7 +219,7 @@ Git tools for sending email. %package gui Summary: Git GUI tool Group: Development/Tools -%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 +%if %{noarch_sub} BuildArch: noarch %endif Requires: git = %{version}-%{release}, tk >= 8.4 @@ -191,7 +230,7 @@ Git GUI tool. %package -n gitk Summary: Git revision tree visualiser Group: Development/Tools -%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 +%if %{noarch_sub} BuildArch: noarch %endif Requires: git = %{version}-%{release}, tk >= 8.4 @@ -201,11 +240,11 @@ Git revision tree visualiser. %package -n perl-Git Summary: Perl interface to Git Group: Development/Libraries -%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 +%if %{noarch_sub} BuildArch: noarch %endif Requires: git = %{version}-%{release} -%if 0%{?fedora} || 0%{?rhel} >= 5 +%if %{perl_error} BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) Requires: perl(Error) %endif @@ -214,12 +253,12 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi %description -n perl-Git Perl interface to Git. -%if 0%{?fedora} || 0%{?rhel} >= 5 +%if %{emacs_support} %package -n emacs-git Summary: Git version control system support for Emacs Group: Applications/Editors Requires: git = %{version}-%{release} -%if 0%{?fedora} || 0%{?rhel} >= 6 +%if %{noarch_sub} BuildArch: noarch Requires: emacs(bin) >= %{_emacs_version} %else @@ -232,7 +271,7 @@ Requires: emacs-common %package -n emacs-git-el Summary: Elisp source files for git version control system support for Emacs Group: Applications/Editors -%if 0%{?fedora} || 0%{?rhel} >= 6 +%if %{noarch_sub} BuildArch: noarch %endif Requires: emacs-git = %{version}-%{release} @@ -246,7 +285,7 @@ Requires: emacs-git = %{version}-%{release} %patch0 -p1 %patch1 -p1 %patch2 -p1 -%if 0%{?rhel} == 5 +%if %{emacs_old} %patch3 -p1 %endif @@ -267,16 +306,16 @@ prefix = %{_prefix} gitwebdir = %{_var}/www/git EOF -%if 0%{?rhel} && 0%{?rhel} <= 5 +%if "%{gitcoredir}" == "%{_bindir}" echo gitexecdir = %{_bindir} >> config.mak %endif -%if 0%{?rhel} && 0%{?rhel} == 5 +%if %{docbook_suppress_sp} # This is needed for 1.69.1-1.71.0 echo DOCBOOK_SUPPRESS_SP = 1 >> config.mak %endif -%if 0%{?rhel} && 0%{?rhel} <= 4 +%if %{asciidoc7} echo ASCIIDOC7 = 1 >> config.mak %endif @@ -294,7 +333,7 @@ chmod +x %{__perl_requires} %build make %{?_smp_mflags} all %{!?_without_docs: doc} -%if 0%{?fedora} || 0%{?rhel} >= 5 +%if %{emacs_support} make -C contrib/emacs %endif @@ -305,8 +344,8 @@ sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash rm -rf %{buildroot} make %{?_smp_mflags} INSTALLDIRS=vendor install %{!?_without_docs: install-doc} -%if 0%{?fedora} || 0%{?rhel} >= 5 -%if 0%{?rhel} == 5 +%if %{emacs_support} +%if %{emacs_old} %global _emacs_sitelispdir %{_datadir}/emacs/site-lisp %global _emacs_sitestartdir %{_emacs_sitelispdir}/site-start.d %endif @@ -350,7 +389,7 @@ enable_ipv6=" # xinetd does not enable IPv6 by default perl -p \ -e "s|\@GITCOREDIR\@|%{gitcoredir}|g;" \ -e "s|\@BASE_PATH\@|%{_var}/lib/git|g;" \ -%if 0%{?rhel} && 0%{?rhel} <= 5 +%if %{enable_ipv6} -e "s|^}|$enable_ipv6\n$&|;" \ %endif %{SOURCE2} > %{buildroot}%{_sysconfdir}/xinetd.d/git @@ -368,7 +407,7 @@ popd > /dev/null # install git-gui .desktop file desktop-file-install \ -%if 0%{?rhel} && 0%{?rhel} <= 5 +%if %{use_desktop_vendor} --vendor fedora \ %endif --dir=%{buildroot}%{_datadir}/applications %{SOURCE4} @@ -449,7 +488,7 @@ rm -rf %{buildroot} %defattr(-,root,root) %{!?_without_docs: %{_mandir}/man3/*Git*.3pm*} -%if 0%{?fedora} || 0%{?rhel} >= 5 +%if %{emacs_support} %files -n emacs-git %defattr(-,root,root) %doc contrib/emacs/README @@ -485,6 +524,7 @@ rm -rf %{buildroot} %changelog * Tue Jul 26 2011 Todd Zullinger - 1.7.6-4 - Drop git-arch on fedora >= 16, the tla package has been retired +- Rework most spec file dist conditionals to make future changes easier * Thu Jul 21 2011 Petr Sabata - 1.7.6-3 - Perl mass rebuild From 69974bd1686fd973b53492f0cc0847294ce4a992 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 5 Aug 2011 16:28:48 -0400 Subject: [PATCH 212/842] Fix git push --quiet, thanks to Clemens Buchacher (#725593) --- ...gate-quiet-to-send-pack-receive-pack.patch | 201 ++++++++++++++++++ git.spec | 8 +- 2 files changed, 208 insertions(+), 1 deletion(-) create mode 100644 0001-propagate-quiet-to-send-pack-receive-pack.patch diff --git a/0001-propagate-quiet-to-send-pack-receive-pack.patch b/0001-propagate-quiet-to-send-pack-receive-pack.patch new file mode 100644 index 0000000..59f8879 --- /dev/null +++ b/0001-propagate-quiet-to-send-pack-receive-pack.patch @@ -0,0 +1,201 @@ +From c513fc653a2f88fd29e30ffcdd8aaf7741222cc7 Mon Sep 17 00:00:00 2001 +From: Clemens Buchacher +Date: Sat, 30 Jul 2011 10:35:24 -0400 +Subject: [PATCH] propagate --quiet to send-pack/receive-pack + +Currently, git push --quiet produces some non-error output, e.g.: + + $ git push --quiet + Unpacking objects: 100% (3/3), done. + +Add the --quiet option to send-pack/receive-pack and pass it to +unpack-objects in the receive-pack codepath and to receive-pack in +the push codepath. + +This fixes a bug reported for the fedora git package: + + https://bugzilla.redhat.com/show_bug.cgi?id=725593 + +Reported-by: Jesse Keating +Cc: Todd Zullinger +Signed-off-by: Clemens Buchacher +--- + Documentation/git-receive-pack.txt | 5 ++++- + Documentation/git-send-pack.txt | 5 ++++- + builtin/receive-pack.c | 12 ++++++++++-- + builtin/send-pack.c | 11 ++++++++++- + remote-curl.c | 4 +++- + transport.c | 10 +++++++--- + 6 files changed, 38 insertions(+), 9 deletions(-) + +diff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt +index f34e0ae..23f9a48 100644 +--- a/Documentation/git-receive-pack.txt ++++ b/Documentation/git-receive-pack.txt +@@ -8,7 +8,7 @@ git-receive-pack - Receive what is pushed into the repository + + SYNOPSIS + -------- +-'git-receive-pack' ++'git-receive-pack' [--quiet] + + DESCRIPTION + ----------- +@@ -34,6 +34,9 @@ are not fast-forwards. + + OPTIONS + ------- ++--quiet:: ++ Print only error messages. ++ + :: + The repository to sync into. + +diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt +index 17f8f55..67bcd0c 100644 +--- a/Documentation/git-send-pack.txt ++++ b/Documentation/git-send-pack.txt +@@ -8,7 +8,7 @@ git-send-pack - Push objects over git protocol to another repository + + SYNOPSIS + -------- +-'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=] [--verbose] [--thin] [:] [...] ++'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=] [--quiet] [--verbose] [--thin] [:] [...] + + DESCRIPTION + ----------- +@@ -44,6 +44,9 @@ OPTIONS + the remote repository can lose commits; use it with + care. + ++--quiet:: ++ Print only error messages. ++ + --verbose:: + Run verbosely. + +diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c +index e1a687a..fca26fb 100644 +--- a/builtin/receive-pack.c ++++ b/builtin/receive-pack.c +@@ -636,7 +636,7 @@ static const char *parse_pack_header(struct pack_header *hdr) + + static const char *pack_lockfile; + +-static const char *unpack(void) ++static const char *unpack(int quiet) + { + struct pack_header hdr; + const char *hdr_err; +@@ -653,6 +653,8 @@ static const char *unpack(void) + int code, i = 0; + const char *unpacker[4]; + unpacker[i++] = "unpack-objects"; ++ if (quiet) ++ unpacker[i++] = "-q"; + if (receive_fsck_objects) + unpacker[i++] = "--strict"; + unpacker[i++] = hdr_arg; +@@ -753,6 +755,7 @@ static void add_alternate_refs(void) + + int cmd_receive_pack(int argc, const char **argv, const char *prefix) + { ++ int quiet = 0; + int advertise_refs = 0; + int stateless_rpc = 0; + int i; +@@ -766,6 +769,11 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix) + const char *arg = *argv++; + + if (*arg == '-') { ++ if (!strcmp(arg, "--quiet")) { ++ quiet = 1; ++ continue; ++ } ++ + if (!strcmp(arg, "--advertise-refs")) { + advertise_refs = 1; + continue; +@@ -814,7 +822,7 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix) + const char *unpack_status = NULL; + + if (!delete_only(commands)) +- unpack_status = unpack(); ++ unpack_status = unpack(quiet); + execute_commands(commands, unpack_status); + if (pack_lockfile) + unlink_or_warn(pack_lockfile); +diff --git a/builtin/send-pack.c b/builtin/send-pack.c +index c1f6ddd..40a1675 100644 +--- a/builtin/send-pack.c ++++ b/builtin/send-pack.c +@@ -439,6 +439,10 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix) + args.force_update = 1; + continue; + } ++ if (!strcmp(arg, "--quiet")) { ++ args.quiet = 1; ++ continue; ++ } + if (!strcmp(arg, "--verbose")) { + args.verbose = 1; + continue; +@@ -488,8 +492,13 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix) + fd[0] = 0; + fd[1] = 1; + } else { +- conn = git_connect(fd, dest, receivepack, ++ struct strbuf sb = STRBUF_INIT; ++ strbuf_addstr(&sb, receivepack); ++ if (args.quiet) ++ strbuf_addstr(&sb, " --quiet"); ++ conn = git_connect(fd, dest, sb.buf, + args.verbose ? CONNECT_VERBOSE : 0); ++ strbuf_release(&sb); + } + + memset(&extra_have, 0, sizeof(extra_have)); +diff --git a/remote-curl.c b/remote-curl.c +index b5be25c..1da0ff4 100644 +--- a/remote-curl.c ++++ b/remote-curl.c +@@ -764,7 +764,9 @@ static int push_git(struct discovery *heads, int nr_spec, char **specs) + argv[argc++] = "--thin"; + if (options.dry_run) + argv[argc++] = "--dry-run"; +- if (options.verbosity > 1) ++ if (options.verbosity < 0) ++ argv[argc++] = "--quiet"; ++ else if (options.verbosity > 1) + argv[argc++] = "--verbose"; + argv[argc++] = url; + for (i = 0; i < nr_spec; i++) +diff --git a/transport.c b/transport.c +index c9c8056..98c5778 100644 +--- a/transport.c ++++ b/transport.c +@@ -482,14 +482,18 @@ static int set_git_option(struct git_transport_options *opts, + static int connect_setup(struct transport *transport, int for_push, int verbose) + { + struct git_transport_data *data = transport->data; ++ struct strbuf sb = STRBUF_INIT; + + if (data->conn) + return 0; + +- data->conn = git_connect(data->fd, transport->url, +- for_push ? data->options.receivepack : +- data->options.uploadpack, ++ strbuf_addstr(&sb, for_push ? data->options.receivepack : ++ data->options.uploadpack); ++ if (for_push && transport->verbose < 0) ++ strbuf_addstr(&sb, " --quiet"); ++ data->conn = git_connect(data->fd, transport->url, sb.buf, + verbose ? CONNECT_VERBOSE : 0); ++ strbuf_release(&sb); + + return 0; + } +-- +1.7.6.rc1 + diff --git a/git.spec b/git.spec index 7eabe22..50a181d 100644 --- a/git.spec +++ b/git.spec @@ -69,7 +69,7 @@ Name: git Version: 1.7.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -87,6 +87,8 @@ Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch Patch2: git-1.6-update-contrib-hooks-path.patch # https://bugzilla.redhat.com/600411 Patch3: git-1.7-el5-emacs-support.patch +# https://bugzilla.redhat.com/725593 +Patch4: 0001-propagate-quiet-to-send-pack-receive-pack.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -288,6 +290,7 @@ Requires: emacs-git = %{version}-%{release} %if %{emacs_old} %patch3 -p1 %endif +%patch4 -p1 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -522,6 +525,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Aug 05 2011 Todd Zullinger - 1.7.6-5 +- Fix git push --quiet, thanks to Clemens Buchacher (#725593) + * Tue Jul 26 2011 Todd Zullinger - 1.7.6-4 - Drop git-arch on fedora >= 16, the tla package has been retired - Rework most spec file dist conditionals to make future changes easier From 3f997b4b46f3f6e2a4e2e1a404aba0527060f8a9 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 5 Aug 2011 16:29:26 -0400 Subject: [PATCH 213/842] Obsolete git-arch as needed --- git.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/git.spec b/git.spec index 50a181d..dfed7cd 100644 --- a/git.spec +++ b/git.spec @@ -114,6 +114,11 @@ Requires: zlib >= 1.2 Provides: git-core = %{version}-%{release} Obsoletes: git-core <= %{git_core_version} +# Obsolete git-arch as needed +%if ! %{arch_support} +Obsoletes: git-arch < %{version}-%{release} +%endif + %description Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations @@ -527,6 +532,7 @@ rm -rf %{buildroot} %changelog * Fri Aug 05 2011 Todd Zullinger - 1.7.6-5 - Fix git push --quiet, thanks to Clemens Buchacher (#725593) +- Obsolete git-arch as needed * Tue Jul 26 2011 Todd Zullinger - 1.7.6-4 - Drop git-arch on fedora >= 16, the tla package has been retired From e86aa5543f5ee5c72836b33d7b337c61e0edbfe2 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 26 Aug 2011 10:13:53 -0400 Subject: [PATCH 214/842] Update to 1.7.6.1 --- ...gate-quiet-to-send-pack-receive-pack.patch | 201 ------------------ git.spec | 10 +- sources | 2 +- 3 files changed, 6 insertions(+), 207 deletions(-) delete mode 100644 0001-propagate-quiet-to-send-pack-receive-pack.patch diff --git a/0001-propagate-quiet-to-send-pack-receive-pack.patch b/0001-propagate-quiet-to-send-pack-receive-pack.patch deleted file mode 100644 index 59f8879..0000000 --- a/0001-propagate-quiet-to-send-pack-receive-pack.patch +++ /dev/null @@ -1,201 +0,0 @@ -From c513fc653a2f88fd29e30ffcdd8aaf7741222cc7 Mon Sep 17 00:00:00 2001 -From: Clemens Buchacher -Date: Sat, 30 Jul 2011 10:35:24 -0400 -Subject: [PATCH] propagate --quiet to send-pack/receive-pack - -Currently, git push --quiet produces some non-error output, e.g.: - - $ git push --quiet - Unpacking objects: 100% (3/3), done. - -Add the --quiet option to send-pack/receive-pack and pass it to -unpack-objects in the receive-pack codepath and to receive-pack in -the push codepath. - -This fixes a bug reported for the fedora git package: - - https://bugzilla.redhat.com/show_bug.cgi?id=725593 - -Reported-by: Jesse Keating -Cc: Todd Zullinger -Signed-off-by: Clemens Buchacher ---- - Documentation/git-receive-pack.txt | 5 ++++- - Documentation/git-send-pack.txt | 5 ++++- - builtin/receive-pack.c | 12 ++++++++++-- - builtin/send-pack.c | 11 ++++++++++- - remote-curl.c | 4 +++- - transport.c | 10 +++++++--- - 6 files changed, 38 insertions(+), 9 deletions(-) - -diff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt -index f34e0ae..23f9a48 100644 ---- a/Documentation/git-receive-pack.txt -+++ b/Documentation/git-receive-pack.txt -@@ -8,7 +8,7 @@ git-receive-pack - Receive what is pushed into the repository - - SYNOPSIS - -------- --'git-receive-pack' -+'git-receive-pack' [--quiet] - - DESCRIPTION - ----------- -@@ -34,6 +34,9 @@ are not fast-forwards. - - OPTIONS - ------- -+--quiet:: -+ Print only error messages. -+ - :: - The repository to sync into. - -diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt -index 17f8f55..67bcd0c 100644 ---- a/Documentation/git-send-pack.txt -+++ b/Documentation/git-send-pack.txt -@@ -8,7 +8,7 @@ git-send-pack - Push objects over git protocol to another repository - - SYNOPSIS - -------- --'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=] [--verbose] [--thin] [:] [...] -+'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=] [--quiet] [--verbose] [--thin] [:] [...] - - DESCRIPTION - ----------- -@@ -44,6 +44,9 @@ OPTIONS - the remote repository can lose commits; use it with - care. - -+--quiet:: -+ Print only error messages. -+ - --verbose:: - Run verbosely. - -diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c -index e1a687a..fca26fb 100644 ---- a/builtin/receive-pack.c -+++ b/builtin/receive-pack.c -@@ -636,7 +636,7 @@ static const char *parse_pack_header(struct pack_header *hdr) - - static const char *pack_lockfile; - --static const char *unpack(void) -+static const char *unpack(int quiet) - { - struct pack_header hdr; - const char *hdr_err; -@@ -653,6 +653,8 @@ static const char *unpack(void) - int code, i = 0; - const char *unpacker[4]; - unpacker[i++] = "unpack-objects"; -+ if (quiet) -+ unpacker[i++] = "-q"; - if (receive_fsck_objects) - unpacker[i++] = "--strict"; - unpacker[i++] = hdr_arg; -@@ -753,6 +755,7 @@ static void add_alternate_refs(void) - - int cmd_receive_pack(int argc, const char **argv, const char *prefix) - { -+ int quiet = 0; - int advertise_refs = 0; - int stateless_rpc = 0; - int i; -@@ -766,6 +769,11 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix) - const char *arg = *argv++; - - if (*arg == '-') { -+ if (!strcmp(arg, "--quiet")) { -+ quiet = 1; -+ continue; -+ } -+ - if (!strcmp(arg, "--advertise-refs")) { - advertise_refs = 1; - continue; -@@ -814,7 +822,7 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix) - const char *unpack_status = NULL; - - if (!delete_only(commands)) -- unpack_status = unpack(); -+ unpack_status = unpack(quiet); - execute_commands(commands, unpack_status); - if (pack_lockfile) - unlink_or_warn(pack_lockfile); -diff --git a/builtin/send-pack.c b/builtin/send-pack.c -index c1f6ddd..40a1675 100644 ---- a/builtin/send-pack.c -+++ b/builtin/send-pack.c -@@ -439,6 +439,10 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix) - args.force_update = 1; - continue; - } -+ if (!strcmp(arg, "--quiet")) { -+ args.quiet = 1; -+ continue; -+ } - if (!strcmp(arg, "--verbose")) { - args.verbose = 1; - continue; -@@ -488,8 +492,13 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix) - fd[0] = 0; - fd[1] = 1; - } else { -- conn = git_connect(fd, dest, receivepack, -+ struct strbuf sb = STRBUF_INIT; -+ strbuf_addstr(&sb, receivepack); -+ if (args.quiet) -+ strbuf_addstr(&sb, " --quiet"); -+ conn = git_connect(fd, dest, sb.buf, - args.verbose ? CONNECT_VERBOSE : 0); -+ strbuf_release(&sb); - } - - memset(&extra_have, 0, sizeof(extra_have)); -diff --git a/remote-curl.c b/remote-curl.c -index b5be25c..1da0ff4 100644 ---- a/remote-curl.c -+++ b/remote-curl.c -@@ -764,7 +764,9 @@ static int push_git(struct discovery *heads, int nr_spec, char **specs) - argv[argc++] = "--thin"; - if (options.dry_run) - argv[argc++] = "--dry-run"; -- if (options.verbosity > 1) -+ if (options.verbosity < 0) -+ argv[argc++] = "--quiet"; -+ else if (options.verbosity > 1) - argv[argc++] = "--verbose"; - argv[argc++] = url; - for (i = 0; i < nr_spec; i++) -diff --git a/transport.c b/transport.c -index c9c8056..98c5778 100644 ---- a/transport.c -+++ b/transport.c -@@ -482,14 +482,18 @@ static int set_git_option(struct git_transport_options *opts, - static int connect_setup(struct transport *transport, int for_push, int verbose) - { - struct git_transport_data *data = transport->data; -+ struct strbuf sb = STRBUF_INIT; - - if (data->conn) - return 0; - -- data->conn = git_connect(data->fd, transport->url, -- for_push ? data->options.receivepack : -- data->options.uploadpack, -+ strbuf_addstr(&sb, for_push ? data->options.receivepack : -+ data->options.uploadpack); -+ if (for_push && transport->verbose < 0) -+ strbuf_addstr(&sb, " --quiet"); -+ data->conn = git_connect(data->fd, transport->url, sb.buf, - verbose ? CONNECT_VERBOSE : 0); -+ strbuf_release(&sb); - - return 0; - } --- -1.7.6.rc1 - diff --git a/git.spec b/git.spec index dfed7cd..7bd1a81 100644 --- a/git.spec +++ b/git.spec @@ -68,8 +68,8 @@ %endif Name: git -Version: 1.7.6 -Release: 5%{?dist} +Version: 1.7.6.1 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -87,8 +87,6 @@ Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch Patch2: git-1.6-update-contrib-hooks-path.patch # https://bugzilla.redhat.com/600411 Patch3: git-1.7-el5-emacs-support.patch -# https://bugzilla.redhat.com/725593 -Patch4: 0001-propagate-quiet-to-send-pack-receive-pack.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -295,7 +293,6 @@ Requires: emacs-git = %{version}-%{release} %if %{emacs_old} %patch3 -p1 %endif -%patch4 -p1 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -530,6 +527,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Aug 26 2011 Todd Zullinger - 1.7.6.1-1 +- Update to 1.7.6.1 + * Fri Aug 05 2011 Todd Zullinger - 1.7.6-5 - Fix git push --quiet, thanks to Clemens Buchacher (#725593) - Obsolete git-arch as needed diff --git a/sources b/sources index 9c931b7..488926d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9e0a438eb71e89eedb61f89470ed32a0 git-1.7.6.tar.bz2 +d1e00772cc9dc6c571999feb9e8771ab git-1.7.6.1.tar.bz2 From ea3f2530c36f09e078442ae15b27d1590019d969 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 26 Aug 2011 10:14:43 -0400 Subject: [PATCH 215/842] Include gpg signature for tarball in SRPM --- git-1.7.6.1.tar.bz2.sign | 8 ++++++++ git.spec | 22 ++++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 git-1.7.6.1.tar.bz2.sign diff --git a/git-1.7.6.1.tar.bz2.sign b/git-1.7.6.1.tar.bz2.sign new file mode 100644 index 0000000..b7ffb45 --- /dev/null +++ b/git-1.7.6.1.tar.bz2.sign @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) +Comment: See http://www.kernel.org/signature.html for info + +iD8DBQBOVZCyyGugalF9Dw4RAmGsAKCS1gD8soK84X5rSX0/nlcdTde90wCdEG8e +P1MrSqSH3yuGkFzFieprZSA= +=/XaV +-----END PGP SIGNATURE----- diff --git a/git.spec b/git.spec index 7bd1a81..db94acd 100644 --- a/git.spec +++ b/git.spec @@ -75,11 +75,12 @@ License: GPLv2 Group: Development/Tools URL: http://git-scm.com/ Source0: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2 -Source1: git-init.el -Source2: git.xinetd.in -Source3: git.conf.httpd -Source4: git-gui.desktop -Source5: gitweb.conf.in +Source1: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2.sign +Source2: git-init.el +Source3: git.xinetd.in +Source4: git.conf.httpd +Source5: git-gui.desktop +Source6: gitweb.conf.in Patch0: git-1.5-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch @@ -361,14 +362,14 @@ for elc in %{buildroot}%{elispdir}/*.elc ; do install -pm 644 contrib/emacs/$(basename $elc .elc).el \ %{buildroot}%{elispdir} done -install -Dpm 644 %{SOURCE1} \ +install -Dpm 644 %{SOURCE2} \ %{buildroot}%{_emacs_sitestartdir}/git-init.el %endif mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d -install -pm 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf +install -pm 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf sed "s|@PROJECTROOT@|%{_var}/lib/git|g" \ - %{SOURCE5} > %{buildroot}%{_sysconfdir}/gitweb.conf + %{SOURCE6} > %{buildroot}%{_sysconfdir}/gitweb.conf find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';' @@ -397,7 +398,7 @@ perl -p \ %if %{enable_ipv6} -e "s|^}|$enable_ipv6\n$&|;" \ %endif - %{SOURCE2} > %{buildroot}%{_sysconfdir}/xinetd.d/git + %{SOURCE3} > %{buildroot}%{_sysconfdir}/xinetd.d/git mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d install -pm 644 contrib/completion/git-completion.bash %{buildroot}%{_sysconfdir}/bash_completion.d/git @@ -415,7 +416,7 @@ desktop-file-install \ %if %{use_desktop_vendor} --vendor fedora \ %endif - --dir=%{buildroot}%{_datadir}/applications %{SOURCE4} + --dir=%{buildroot}%{_datadir}/applications %{SOURCE5} # quiet some rpmlint complaints chmod -R g-w %{buildroot} @@ -529,6 +530,7 @@ rm -rf %{buildroot} %changelog * Fri Aug 26 2011 Todd Zullinger - 1.7.6.1-1 - Update to 1.7.6.1 +- Include gpg signature for tarball in SRPM * Fri Aug 05 2011 Todd Zullinger - 1.7.6-5 - Fix git push --quiet, thanks to Clemens Buchacher (#725593) From f9d4e65b8a8c9f62d5a6142b1a6c211313a94bf7 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 29 Aug 2011 20:46:16 -0400 Subject: [PATCH 216/842] Build with PCRE support (#734269) --- git.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index db94acd..f522db0 100644 --- a/git.spec +++ b/git.spec @@ -69,7 +69,7 @@ Name: git Version: 1.7.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -97,6 +97,7 @@ BuildRequires: emacs BuildRequires: %{libcurl_devel} BuildRequires: expat-devel BuildRequires: gettext +BuildRequires: pcre-devel BuildRequires: openssl-devel BuildRequires: zlib-devel >= 1.2 %{!?_without_docs:BuildRequires: asciidoc > 6.0.3, xmlto} @@ -303,6 +304,7 @@ CFLAGS = %{optflags} BLK_SHA1 = 1 NEEDS_CRYPTO_WITH_SSL = 1 NO_PYTHON = 1 +USE_LIBPCRE = 1 ETC_GITCONFIG = %{_sysconfdir}/gitconfig DESTDIR = %{buildroot} INSTALL = install -p @@ -528,6 +530,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Aug 29 2011 Todd Zullinger - 1.7.6.1-2 +- Build with PCRE support (#734269) + * Fri Aug 26 2011 Todd Zullinger - 1.7.6.1-1 - Update to 1.7.6.1 - Include gpg signature for tarball in SRPM From 2768b1571ec981ed987551be79099140e58be4ac Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 7 Sep 2011 10:39:36 -0400 Subject: [PATCH 217/842] Update to 1.7.6.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This update fixes an incompatibility caused by the git push --quiet fix¹ included in 1.7.6.1. Unfortunately, the "fix" was reverted. A proper fix for git push --quiet is being worked on for a future release. Also worthy of note is that the source tarball for 1.7.6.2 is not available due to the recent intrusion at kernel.org. Instead, the tarball was generated using 'make dist' from the git tree. The v1.7.6.2 tag was verified using Junio's GPG key and compared against the 1.7.6.1 tarball to verify the diff. ¹ http://thread.gmane.org/gmane.comp.version-control.git/180652 --- git.spec | 17 +++++++++++++---- sources | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index f522db0..0fa61b6 100644 --- a/git.spec +++ b/git.spec @@ -68,14 +68,18 @@ %endif Name: git -Version: 1.7.6.1 -Release: 2%{?dist} +Version: 1.7.6.2 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools URL: http://git-scm.com/ -Source0: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2 -Source1: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2.sign +# Due to a recent intrusion at kernel.org, tarballs for 1.7.6.2 are not +# available. Instead, make dist was used in a git clone after verifying and +# checking out the v1.7.6.2 tag. +Source0: %{name}-%{version}.tar.bz2 +#Source0: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2 +#Source1: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2.sign Source2: git-init.el Source3: git.xinetd.in Source4: git.conf.httpd @@ -530,6 +534,11 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Sep 07 2011 Todd Zullinger - 1.7.6.2-1 +- Update to 1.7.6.2 +- Fixes incompatibility caused by git push --quiet fix + http://thread.gmane.org/gmane.comp.version-control.git/180652 + * Mon Aug 29 2011 Todd Zullinger - 1.7.6.1-2 - Build with PCRE support (#734269) diff --git a/sources b/sources index 488926d..8e409aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d1e00772cc9dc6c571999feb9e8771ab git-1.7.6.1.tar.bz2 +674f57c6d8b833031d53cc1fa2c08071 git-1.7.6.2.tar.bz2 From f8faec03bd41627fb60e26004b1727d30fabe94a Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 26 Sep 2011 10:52:49 +0200 Subject: [PATCH 218/842] Update to 1.7.6.4 Signed-off-by: Adam Tkac --- .gitignore | 1 + git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 119e105..7c90320 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ *.tar.bz2 /.build*.log /git-*/ +/git-1.7.6.4.tar.gz diff --git a/git.spec b/git.spec index 0fa61b6..7e4df1e 100644 --- a/git.spec +++ b/git.spec @@ -68,7 +68,7 @@ %endif Name: git -Version: 1.7.6.2 +Version: 1.7.6.4 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -77,7 +77,7 @@ URL: http://git-scm.com/ # Due to a recent intrusion at kernel.org, tarballs for 1.7.6.2 are not # available. Instead, make dist was used in a git clone after verifying and # checking out the v1.7.6.2 tag. -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.gz #Source0: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2 #Source1: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2.sign Source2: git-init.el @@ -534,6 +534,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Sep 26 2011 Adam Tkac - 1.7.6.4-1 +- update to 1.7.6.4 + * Wed Sep 07 2011 Todd Zullinger - 1.7.6.2-1 - Update to 1.7.6.2 - Fixes incompatibility caused by git push --quiet fix diff --git a/sources b/sources index 8e409aa..c12a311 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -674f57c6d8b833031d53cc1fa2c08071 git-1.7.6.2.tar.bz2 +e0b7afcc0e5e43bbb82f85598ae34bd8 git-1.7.6.4.tar.gz From 303956ba461a9390d0dfbdc30b51ba94439d0d6b Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 20 Oct 2011 17:01:35 +0200 Subject: [PATCH 219/842] Update to 1.7.7 - git-1.6-update-contrib-hooks-path.patch is no longer needed Signed-off-by: Adam Tkac --- .gitignore | 1 + git-1.6-update-contrib-hooks-path.patch | 43 ------------------------- git.spec | 11 ++++--- sources | 2 +- 4 files changed, 8 insertions(+), 49 deletions(-) delete mode 100644 git-1.6-update-contrib-hooks-path.patch diff --git a/.gitignore b/.gitignore index 7c90320..ec2e06e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /.build*.log /git-*/ /git-1.7.6.4.tar.gz +/git-1.7.7.tar.gz diff --git a/git-1.6-update-contrib-hooks-path.patch b/git-1.6-update-contrib-hooks-path.patch deleted file mode 100644 index a4220ad..0000000 --- a/git-1.6-update-contrib-hooks-path.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1963c852acc5d8c521a3e4f3b9ceb313d26a473c Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Mon, 22 Jun 2009 08:00:29 -0400 -Subject: [PATCH] Update path to contrib/hooks/post-receive-email - ---- - contrib/hooks/post-receive-email | 6 +++--- - templates/hooks--post-receive.sample | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email -index 2a66063..4835ada 100755 ---- a/contrib/hooks/post-receive-email -+++ b/contrib/hooks/post-receive-email -@@ -10,12 +10,12 @@ - # This hook is stored in the contrib/hooks directory. Your distribution - # will have put this somewhere standard. You should make this script - # executable then link to it in the repository you would like to use it in. --# For example, on debian the hook is stored in --# /usr/share/doc/git-core/contrib/hooks/post-receive-email: -+# For example, on fedora the hook is stored in -+# /usr/share/git-core/contrib/hooks/post-receive-email: - # - # chmod a+x post-receive-email - # cd /path/to/your/repository.git --# ln -sf /usr/share/doc/git-core/contrib/hooks/post-receive-email hooks/post-receive -+# ln -sf /usr/share/git-core/contrib/hooks/post-receive-email hooks/post-receive - # - # This hook script assumes it is enabled on the central repository of a - # project, with all users pushing only to it and not between each other. It -diff --git a/templates/hooks--post-receive.sample b/templates/hooks--post-receive.sample -index 18d2e0f..cf57878 100755 ---- a/templates/hooks--post-receive.sample -+++ b/templates/hooks--post-receive.sample -@@ -12,4 +12,4 @@ - # see contrib/hooks/ for a sample, or uncomment the next line and - # rename the file to "post-receive". - --#. /usr/share/doc/git-core/contrib/hooks/post-receive-email -+#. /usr/share/git-core/contrib/hooks/post-receive-email --- -1.6.3.2 - diff --git a/git.spec b/git.spec index 7e4df1e..c674273 100644 --- a/git.spec +++ b/git.spec @@ -68,8 +68,8 @@ %endif Name: git -Version: 1.7.6.4 -Release: 1%{?dist} +Version: 1.7.7 +Release: 0%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -88,8 +88,6 @@ Source6: gitweb.conf.in Patch0: git-1.5-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# https://bugzilla.redhat.com/500137 -Patch2: git-1.6-update-contrib-hooks-path.patch # https://bugzilla.redhat.com/600411 Patch3: git-1.7-el5-emacs-support.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -295,7 +293,6 @@ Requires: emacs-git = %{version}-%{release} %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %if %{emacs_old} %patch3 -p1 %endif @@ -534,6 +531,10 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Oct 20 2011 Adam Tkac - 1.7.7-1 +- update to 1.7.7 + - git-1.6-update-contrib-hooks-path.patch is no longer needed + * Mon Sep 26 2011 Adam Tkac - 1.7.6.4-1 - update to 1.7.6.4 diff --git a/sources b/sources index c12a311..370af69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e0b7afcc0e5e43bbb82f85598ae34bd8 git-1.7.6.4.tar.gz +5d645884e688921e773186783b65ce33 git-1.7.7.tar.gz From 3ca22f60aea2cd7d263aece73106b40e75967120 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 20 Oct 2011 17:02:24 +0200 Subject: [PATCH 220/842] Corrected release tag, it should be 1.dist Signed-off-by: Adam Tkac --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index c674273..63d073d 100644 --- a/git.spec +++ b/git.spec @@ -69,7 +69,7 @@ Name: git Version: 1.7.7 -Release: 0%{?dist} +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools From 42bde9f9f9d42a287c3dfe81b838fb0e6e5c022c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 26 Oct 2011 18:50:11 -0500 Subject: [PATCH 221/842] - Rebuilt for glibc bug#747377 --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 63d073d..40d7afe 100644 --- a/git.spec +++ b/git.spec @@ -69,7 +69,7 @@ Name: git Version: 1.7.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -531,6 +531,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Oct 26 2011 Fedora Release Engineering - 1.7.7-2 +- Rebuilt for glibc bug#747377 + * Thu Oct 20 2011 Adam Tkac - 1.7.7-1 - update to 1.7.7 - git-1.6-update-contrib-hooks-path.patch is no longer needed From 77a1f9c77c08b6f67a46cb5825b8676d30e2ecfe Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Tue, 1 Nov 2011 13:42:54 +0100 Subject: [PATCH 222/842] Update to 1.7.7.1 Signed-off-by: Adam Tkac --- .gitignore | 1 + git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ec2e06e..26249b8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /git-*/ /git-1.7.6.4.tar.gz /git-1.7.7.tar.gz +/git-1.7.7.1.tar.gz diff --git a/git.spec b/git.spec index 40d7afe..857dd9f 100644 --- a/git.spec +++ b/git.spec @@ -68,8 +68,8 @@ %endif Name: git -Version: 1.7.7 -Release: 2%{?dist} +Version: 1.7.7.1 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -531,6 +531,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Nov 01 2011 Adam Tkac - 1.7.7.1-1 +- update to 1.7.7.1 + * Wed Oct 26 2011 Fedora Release Engineering - 1.7.7-2 - Rebuilt for glibc bug#747377 diff --git a/sources b/sources index 370af69..ba0f78b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5d645884e688921e773186783b65ce33 git-1.7.7.tar.gz +7cfb3e7ea585037272a7ad8e35f4ac0a git-1.7.7.1.tar.gz From f8dd26fdf9a499f60de40bd7d0957983775a4400 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 7 Nov 2011 18:34:53 +0100 Subject: [PATCH 223/842] Update to 1.7.7.2 Signed-off-by: Adam Tkac --- .gitignore | 1 + git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 26249b8..f091f1b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /git-1.7.6.4.tar.gz /git-1.7.7.tar.gz /git-1.7.7.1.tar.gz +/git-1.7.7.2.tar.gz diff --git a/git.spec b/git.spec index 857dd9f..d1c9479 100644 --- a/git.spec +++ b/git.spec @@ -68,7 +68,7 @@ %endif Name: git -Version: 1.7.7.1 +Version: 1.7.7.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -531,6 +531,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Nov 07 2011 Adam Tkac - 1.7.7.2-1 +- update to 1.7.7.2 + * Tue Nov 01 2011 Adam Tkac - 1.7.7.1-1 - update to 1.7.7.1 diff --git a/sources b/sources index ba0f78b..1226b64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7cfb3e7ea585037272a7ad8e35f4ac0a git-1.7.7.1.tar.gz +400d85fd17bdb7f8923dbf3b3a2ca671 git-1.7.7.2.tar.gz From 63f76de575dd5a2322ecb2995dc59a0fab3dec18 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 10 Nov 2011 12:28:10 +0100 Subject: [PATCH 224/842] Update to 1.7.7.3 Signed-off-by: Adam Tkac --- .gitignore | 1 + git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f091f1b..82c711c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /git-1.7.7.tar.gz /git-1.7.7.1.tar.gz /git-1.7.7.2.tar.gz +/git-1.7.7.3.tar.gz diff --git a/git.spec b/git.spec index d1c9479..9a268f8 100644 --- a/git.spec +++ b/git.spec @@ -68,7 +68,7 @@ %endif Name: git -Version: 1.7.7.2 +Version: 1.7.7.3 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -531,6 +531,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Nov 10 2011 Adam Tkac - 1.7.7.3-1 +- update to 1.7.7.3 + * Mon Nov 07 2011 Adam Tkac - 1.7.7.2-1 - update to 1.7.7.2 diff --git a/sources b/sources index 1226b64..524129e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -400d85fd17bdb7f8923dbf3b3a2ca671 git-1.7.7.2.tar.gz +da2b3c226d8e99d8f66e708129f57a0a git-1.7.7.3.tar.gz From ddcead8de9b07c09d46cd151199fc096fedd2a5b Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Tue, 29 Nov 2011 15:34:07 +0100 Subject: [PATCH 225/842] Update to 1.7.7.4 Signed-off-by: Adam Tkac --- .gitignore | 1 + git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 82c711c..bd8b24c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /git-1.7.7.1.tar.gz /git-1.7.7.2.tar.gz /git-1.7.7.3.tar.gz +/git-1.7.7.4.tar.gz diff --git a/git.spec b/git.spec index 9a268f8..b48fd34 100644 --- a/git.spec +++ b/git.spec @@ -68,7 +68,7 @@ %endif Name: git -Version: 1.7.7.3 +Version: 1.7.7.4 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -531,6 +531,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Nov 29 2011 Adam Tkac - 1.7.7.4-1 +- update to 1.7.7.4 + * Thu Nov 10 2011 Adam Tkac - 1.7.7.3-1 - update to 1.7.7.3 diff --git a/sources b/sources index 524129e..eb3f688 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -da2b3c226d8e99d8f66e708129f57a0a git-1.7.7.3.tar.gz +2f3277475b8da2eb92cef54c4c641a2c git-1.7.7.4.tar.gz From 435cffdccef0bf6a43c757ec391af8020d0d1f90 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Wed, 7 Dec 2011 15:21:27 +0100 Subject: [PATCH 226/842] Update to 1.7.8 Signed-off-by: Adam Tkac --- .gitignore | 1 + git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bd8b24c..ee5fb3d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /git-1.7.7.2.tar.gz /git-1.7.7.3.tar.gz /git-1.7.7.4.tar.gz +/git-1.7.8.tar.gz diff --git a/git.spec b/git.spec index b48fd34..31067a2 100644 --- a/git.spec +++ b/git.spec @@ -68,7 +68,7 @@ %endif Name: git -Version: 1.7.7.4 +Version: 1.7.8 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -531,6 +531,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Dec 07 2011 Adam Tkac - 1.7.8-1 +- update to 1.7.8 + * Tue Nov 29 2011 Adam Tkac - 1.7.7.4-1 - update to 1.7.7.4 diff --git a/sources b/sources index eb3f688..60e230e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f3277475b8da2eb92cef54c4c641a2c git-1.7.7.4.tar.gz +4a3c03a04dbb857ecc875dae1278b76e git-1.7.8.tar.gz From 2c6f9a68d15912b3fd91820a69c16579839559c4 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Fri, 23 Dec 2011 14:25:21 +0100 Subject: [PATCH 227/842] Update to 1.7.8.1 Signed-off-by: Adam Tkac --- .gitignore | 1 + git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ee5fb3d..a81f918 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /git-1.7.7.3.tar.gz /git-1.7.7.4.tar.gz /git-1.7.8.tar.gz +/git-1.7.8.1.tar.gz diff --git a/git.spec b/git.spec index 31067a2..f7c81a2 100644 --- a/git.spec +++ b/git.spec @@ -68,7 +68,7 @@ %endif Name: git -Version: 1.7.8 +Version: 1.7.8.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -531,6 +531,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Dec 23 2011 Adam Tkac - 1.7.8.1-1 +- update to 1.7.8.1 + * Wed Dec 07 2011 Adam Tkac - 1.7.8-1 - update to 1.7.8 diff --git a/sources b/sources index 60e230e..c952aad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4a3c03a04dbb857ecc875dae1278b76e git-1.7.8.tar.gz +617fe0301390e98cfc5d665b2702254a git-1.7.8.1.tar.gz From e4983519c0b37815fcec59d671d03c47e8fed568 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 2 Jan 2012 14:45:46 +0100 Subject: [PATCH 228/842] Update to 1.7.8.2 Signed-off-by: Adam Tkac --- .gitignore | 1 + git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a81f918..16d40d5 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /git-1.7.7.4.tar.gz /git-1.7.8.tar.gz /git-1.7.8.1.tar.gz +/git-1.7.8.2.tar.gz diff --git a/git.spec b/git.spec index f7c81a2..2da8b80 100644 --- a/git.spec +++ b/git.spec @@ -68,7 +68,7 @@ %endif Name: git -Version: 1.7.8.1 +Version: 1.7.8.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -531,6 +531,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Jan 02 2012 Adam Tkac - 1.7.8.2-1 +- update to 1.7.8.2 + * Fri Dec 23 2011 Adam Tkac - 1.7.8.1-1 - update to 1.7.8.1 diff --git a/sources b/sources index c952aad..e83c3b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -617fe0301390e98cfc5d665b2702254a git-1.7.8.1.tar.gz +f9def92c4afb708f69006da841502b80 git-1.7.8.2.tar.gz From 79ad3f2316004cffd924d9c75effca121da6fd14 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 12 Jan 2012 11:02:28 +0100 Subject: [PATCH 229/842] Update to 1.7.8.3 Signed-off-by: Adam Tkac --- .gitignore | 1 + git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 16d40d5..beb6b92 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /git-1.7.8.tar.gz /git-1.7.8.1.tar.gz /git-1.7.8.2.tar.gz +/git-1.7.8.3.tar.gz diff --git a/git.spec b/git.spec index 2da8b80..41e2aa8 100644 --- a/git.spec +++ b/git.spec @@ -68,7 +68,7 @@ %endif Name: git -Version: 1.7.8.2 +Version: 1.7.8.3 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -531,6 +531,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Jan 12 2012 Adam Tkac - 1.7.8.3-1 +- update to 1.7.8.3 + * Mon Jan 02 2012 Adam Tkac - 1.7.8.2-1 - update to 1.7.8.2 diff --git a/sources b/sources index e83c3b6..e97cef7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f9def92c4afb708f69006da841502b80 git-1.7.8.2.tar.gz +7a4bc5160166537d4da5eb48a7670dff git-1.7.8.3.tar.gz From 264271602b14e4ae62f9dd4cf5f98b090c5a0968 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 19 Jan 2012 16:37:37 +0100 Subject: [PATCH 230/842] Update to 1.7.8.4 Signed-off-by: Adam Tkac --- .gitignore | 1 + git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index beb6b92..d8839e4 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /git-1.7.8.1.tar.gz /git-1.7.8.2.tar.gz /git-1.7.8.3.tar.gz +/git-1.7.8.4.tar.gz diff --git a/git.spec b/git.spec index 41e2aa8..a94b192 100644 --- a/git.spec +++ b/git.spec @@ -68,7 +68,7 @@ %endif Name: git -Version: 1.7.8.3 +Version: 1.7.8.4 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -531,6 +531,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Jan 19 2012 Adam Tkac - 1.7.8.4-1 +- update to 1.7.8.4 + * Thu Jan 12 2012 Adam Tkac - 1.7.8.3-1 - update to 1.7.8.3 diff --git a/sources b/sources index e97cef7..74ff791 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7a4bc5160166537d4da5eb48a7670dff git-1.7.8.3.tar.gz +e6c3319d76d52a830af395046fc56143 git-1.7.8.4.tar.gz From f574a8e3504c1e944a27b02c984ea7bfed4066e4 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 30 Jan 2012 12:55:02 +0100 Subject: [PATCH 231/842] Update to 1.7.9 Signed-off-by: Adam Tkac --- .gitignore | 1 + git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d8839e4..9107987 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /git-1.7.8.2.tar.gz /git-1.7.8.3.tar.gz /git-1.7.8.4.tar.gz +/git-1.7.9.tar.gz diff --git a/git.spec b/git.spec index a94b192..979772e 100644 --- a/git.spec +++ b/git.spec @@ -68,7 +68,7 @@ %endif Name: git -Version: 1.7.8.4 +Version: 1.7.9 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -531,6 +531,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Jan 30 2012 Adam Tkac - 1.7.9-1 +- update to 1.7.9 + * Thu Jan 19 2012 Adam Tkac - 1.7.8.4-1 - update to 1.7.8.4 diff --git a/sources b/sources index 74ff791..1009d31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e6c3319d76d52a830af395046fc56143 git-1.7.8.4.tar.gz +d94314eb49622a945b22595b36b7fc47 git-1.7.9.tar.gz From df0d1ad6ab4e589c6884a784d27d624815d802eb Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 30 Jan 2012 15:39:46 +0100 Subject: [PATCH 232/842] Package git translations. Signed-off-by: Adam Tkac --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 979772e..0e0b1b3 100644 --- a/git.spec +++ b/git.spec @@ -421,6 +421,9 @@ desktop-file-install \ %endif --dir=%{buildroot}%{_datadir}/applications %{SOURCE5} +# find translations +%find_lang %{name} %{name}.lang + # quiet some rpmlint complaints chmod -R g-w %{buildroot} find %{buildroot} -name git-mergetool--lib | xargs chmod a-x @@ -433,7 +436,7 @@ find contrib -type f | xargs chmod -x rm -rf %{buildroot} -%files -f bin-man-doc-files +%files -f bin-man-doc-files -f %{name}.lang %defattr(-,root,root) %{_datadir}/git-core/ %dir %{gitcoredir} From 837c7a2f9ab6f39eb682db7619dcbae36f8b74f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 10 Feb 2012 15:00:06 +0100 Subject: [PATCH 233/842] Rebuild against PCRE 8.30 --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 0e0b1b3..08a6ed2 100644 --- a/git.spec +++ b/git.spec @@ -69,7 +69,7 @@ Name: git Version: 1.7.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -534,6 +534,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Feb 10 2012 Petr Pisar - 1.7.9-2 +- Rebuild against PCRE 8.30 + * Mon Jan 30 2012 Adam Tkac - 1.7.9-1 - update to 1.7.9 From c57f3832a5eb10af1ca0468e7a58e78d37368601 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 15 Feb 2012 10:53:11 -0500 Subject: [PATCH 234/842] Update to 1.7.9.1 Use git-core.googlecode.com for source URL, as that's where Junio is posting official tarballs now. The gpg signatures are now available on that site in the comments for each tarball. For example, the signature for 1.7.9.1 and download link can be found at: http://code.google.com/p/git-core/downloads/detail?name=git-1.7.9.1.tar.gz&can=2&q= --- git-1.7.6.1.tar.bz2.sign | 8 -------- git.spec | 14 ++++++-------- sources | 2 +- 3 files changed, 7 insertions(+), 17 deletions(-) delete mode 100644 git-1.7.6.1.tar.bz2.sign diff --git a/git-1.7.6.1.tar.bz2.sign b/git-1.7.6.1.tar.bz2.sign deleted file mode 100644 index b7ffb45..0000000 --- a/git-1.7.6.1.tar.bz2.sign +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) -Comment: See http://www.kernel.org/signature.html for info - -iD8DBQBOVZCyyGugalF9Dw4RAmGsAKCS1gD8soK84X5rSX0/nlcdTde90wCdEG8e -P1MrSqSH3yuGkFzFieprZSA= -=/XaV ------END PGP SIGNATURE----- diff --git a/git.spec b/git.spec index 08a6ed2..7f1210d 100644 --- a/git.spec +++ b/git.spec @@ -68,18 +68,13 @@ %endif Name: git -Version: 1.7.9 -Release: 2%{?dist} +Version: 1.7.9.1 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools URL: http://git-scm.com/ -# Due to a recent intrusion at kernel.org, tarballs for 1.7.6.2 are not -# available. Instead, make dist was used in a git clone after verifying and -# checking out the v1.7.6.2 tag. -Source0: %{name}-%{version}.tar.gz -#Source0: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2 -#Source1: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2.sign +Source0: http://git-core.googlecode.com/files/%{name}-%{version}.tar.gz Source2: git-init.el Source3: git.xinetd.in Source4: git.conf.httpd @@ -534,6 +529,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Feb 15 2012 Todd Zullinger - 1.7.9.1-1 +- Update to 1.7.9.1 + * Fri Feb 10 2012 Petr Pisar - 1.7.9-2 - Rebuild against PCRE 8.30 diff --git a/sources b/sources index 1009d31..421ec6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d94314eb49622a945b22595b36b7fc47 git-1.7.9.tar.gz +b88ae610f8e5f55779899550ec3b37b8 git-1.7.9.1.tar.gz From 0f66986cd1c5b18c3161088e581073861f16fec8 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 15 Feb 2012 10:56:14 -0500 Subject: [PATCH 235/842] Fix EPEL builds - rpm doesn't accept mutiple -f options in %files While we don't push these packages to EPEL regularly, making sure they continue to build for when we do update is convenient. It also allows people running EL systems to easily stay up to date. --- git.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 7f1210d..a809837 100644 --- a/git.spec +++ b/git.spec @@ -418,6 +418,7 @@ desktop-file-install \ # find translations %find_lang %{name} %{name}.lang +cat %{name}.lang >> bin-man-doc-files # quiet some rpmlint complaints chmod -R g-w %{buildroot} @@ -431,7 +432,7 @@ find contrib -type f | xargs chmod -x rm -rf %{buildroot} -%files -f bin-man-doc-files -f %{name}.lang +%files -f bin-man-doc-files %defattr(-,root,root) %{_datadir}/git-core/ %dir %{gitcoredir} @@ -531,6 +532,7 @@ rm -rf %{buildroot} %changelog * Wed Feb 15 2012 Todd Zullinger - 1.7.9.1-1 - Update to 1.7.9.1 +- Fix EPEL builds (rpm doesn't accept mutiple -f options in %files) * Fri Feb 10 2012 Petr Pisar - 1.7.9-2 - Rebuild against PCRE 8.30 From 31ba44f1e055917b6055efcda76c6e862e75b015 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 15 Feb 2012 11:14:37 -0500 Subject: [PATCH 236/842] Fix gitignore and remove cruft With the change upstream from .bz2 to .gz, the pattern match failed and fedpkg added each individual tarball to gitignore when new-sources was called. Drop this and the entries that were added as a result. --- .gitignore | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 9107987..a8b6c5d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,5 @@ *~ *.rpm -*.tar.bz2 +*.tar.gz /.build*.log /git-*/ -/git-1.7.6.4.tar.gz -/git-1.7.7.tar.gz -/git-1.7.7.1.tar.gz -/git-1.7.7.2.tar.gz -/git-1.7.7.3.tar.gz -/git-1.7.7.4.tar.gz -/git-1.7.8.tar.gz -/git-1.7.8.1.tar.gz -/git-1.7.8.2.tar.gz -/git-1.7.8.3.tar.gz -/git-1.7.8.4.tar.gz -/git-1.7.9.tar.gz From 9a7bebb27e1f9263f6b21b2ba352de840c2b6fd4 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 8 Mar 2012 17:37:50 +0100 Subject: [PATCH 237/842] Update to 1.7.9.3 Signed-off-by: Adam Tkac --- git.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index a809837..76823e6 100644 --- a/git.spec +++ b/git.spec @@ -68,7 +68,7 @@ %endif Name: git -Version: 1.7.9.1 +Version: 1.7.9.3 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -530,6 +530,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Mar 08 2012 Adam Tkac - 1.7.9.3-1 +- update to 1.7.9.3 + * Wed Feb 15 2012 Todd Zullinger - 1.7.9.1-1 - Update to 1.7.9.1 - Fix EPEL builds (rpm doesn't accept mutiple -f options in %files) diff --git a/sources b/sources index 421ec6a..2aff5ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b88ae610f8e5f55779899550ec3b37b8 git-1.7.9.1.tar.gz +f93b976649216d731fd9f9befb90a58c git-1.7.9.3.tar.gz From 0bd649ac8863e5261305745af2f35236be9350dc Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Fri, 30 Mar 2012 10:26:21 +0200 Subject: [PATCH 238/842] Update to 1.7.9.5 Signed-off-by: Adam Tkac --- git.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 76823e6..37dca99 100644 --- a/git.spec +++ b/git.spec @@ -68,7 +68,7 @@ %endif Name: git -Version: 1.7.9.3 +Version: 1.7.9.5 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -530,6 +530,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Mar 30 2012 Adam Tkac - 1.7.9.5-1 +- update to 1.7.9.5 + * Thu Mar 08 2012 Adam Tkac - 1.7.9.3-1 - update to 1.7.9.3 diff --git a/sources b/sources index 2aff5ba..c2d25a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f93b976649216d731fd9f9befb90a58c git-1.7.9.3.tar.gz +094ddc0175d7c5112c7ac99ca7079882 git-1.7.9.5.tar.gz From 874fda64b647c55bd6490ca998feb7a2f7ceb7a0 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Tue, 10 Apr 2012 14:15:52 +0200 Subject: [PATCH 239/842] Update to 1.7.10 Signed-off-by: Adam Tkac --- git.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 37dca99..8da5f5c 100644 --- a/git.spec +++ b/git.spec @@ -68,7 +68,7 @@ %endif Name: git -Version: 1.7.9.5 +Version: 1.7.10 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -530,6 +530,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Apr 10 2012 Adam Tkac - 1.7.10-1 +- update to 1.7.10 + * Fri Mar 30 2012 Adam Tkac - 1.7.9.5-1 - update to 1.7.9.5 diff --git a/sources b/sources index c2d25a2..579a495 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -094ddc0175d7c5112c7ac99ca7079882 git-1.7.9.5.tar.gz +ab2716db51580037c7ebda4c8e9d56eb git-1.7.10.tar.gz From def158a1a5fd08b5b772b1e45c77fd6ef3dcff07 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 3 May 2012 11:22:22 +0200 Subject: [PATCH 240/842] Update to 1.7.10.1 Signed-off-by: Adam Tkac --- git.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 8da5f5c..da71508 100644 --- a/git.spec +++ b/git.spec @@ -68,7 +68,7 @@ %endif Name: git -Version: 1.7.10 +Version: 1.7.10.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -530,6 +530,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu May 03 2012 Adam Tkac - 1.7.10.1-1 +- update to 1.7.10.1 + * Tue Apr 10 2012 Adam Tkac - 1.7.10-1 - update to 1.7.10 diff --git a/sources b/sources index 579a495..8c5df02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ab2716db51580037c7ebda4c8e9d56eb git-1.7.10.tar.gz +41da844a1b8cc2d92864381e2fdeb0e1 git-1.7.10.1.tar.gz From 771a5e586c9061a2b141f3c641091f11c93c2899 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 14 May 2012 14:34:43 +0200 Subject: [PATCH 241/842] Update to 1.7.10.2 Signed-off-by: Adam Tkac --- git.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index da71508..918cdaa 100644 --- a/git.spec +++ b/git.spec @@ -68,7 +68,7 @@ %endif Name: git -Version: 1.7.10.1 +Version: 1.7.10.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -530,6 +530,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon May 14 2012 Adam Tkac - 1.7.10.2-1 +- update to 1.7.10.2 + * Thu May 03 2012 Adam Tkac - 1.7.10.1-1 - update to 1.7.10.1 diff --git a/sources b/sources index 8c5df02..bcaff5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -41da844a1b8cc2d92864381e2fdeb0e1 git-1.7.10.1.tar.gz +2e2ee53243ab8e7cf10f15c5229c3fce git-1.7.10.2.tar.gz From 5cc3f45e90a8958292ac44f659e4315740187542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 7 Jun 2012 21:58:21 +0200 Subject: [PATCH 242/842] Perl 5.16 rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 918cdaa..1163513 100644 --- a/git.spec +++ b/git.spec @@ -69,7 +69,7 @@ Name: git Version: 1.7.10.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -530,6 +530,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Jun 07 2012 Petr Pisar - 1.7.10.2-2 +- Perl 5.16 rebuild + * Mon May 14 2012 Adam Tkac - 1.7.10.2-1 - update to 1.7.10.2 From 693fb4918f887344feacaad2b55d44736a1f4b81 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Fri, 15 Jun 2012 12:30:29 +0200 Subject: [PATCH 243/842] Update to 1.7.10.4 Signed-off-by: Adam Tkac --- git.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 1163513..fe3b073 100644 --- a/git.spec +++ b/git.spec @@ -68,8 +68,8 @@ %endif Name: git -Version: 1.7.10.2 -Release: 2%{?dist} +Version: 1.7.10.4 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -530,6 +530,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Jun 15 2012 Adam Tkac - 1.7.10.4-1 +- update to 1.7.10.4 + * Thu Jun 07 2012 Petr Pisar - 1.7.10.2-2 - Perl 5.16 rebuild diff --git a/sources b/sources index bcaff5d..198cf35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2e2ee53243ab8e7cf10f15c5229c3fce git-1.7.10.2.tar.gz +68319d593d051ef76c26e945bbd2d7ac git-1.7.10.4.tar.gz From a4c46cbe3695d7be8b5b2f9518a6a084c623f134 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 28 Jun 2012 14:56:12 +0200 Subject: [PATCH 244/842] Perl 5.16 rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index fe3b073..ed3ba11 100644 --- a/git.spec +++ b/git.spec @@ -69,7 +69,7 @@ Name: git Version: 1.7.10.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -530,6 +530,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Jun 28 2012 Petr Pisar - 1.7.10.4-2 +- Perl 5.16 rebuild + * Fri Jun 15 2012 Adam Tkac - 1.7.10.4-1 - update to 1.7.10.4 From 244f64d88bbf0df7dba8b0d52d5ffc69bf2099e0 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 16 Jul 2012 11:37:15 +0200 Subject: [PATCH 245/842] Update to 1.7.11.2 Signed-off-by: Adam Tkac --- git.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index ed3ba11..5658ec6 100644 --- a/git.spec +++ b/git.spec @@ -68,8 +68,8 @@ %endif Name: git -Version: 1.7.10.4 -Release: 2%{?dist} +Version: 1.7.11.2 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -530,6 +530,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Jul 16 2012 Adam Tkac - 1.7.11.2-1 +- update to 1.7.11.2 + * Thu Jun 28 2012 Petr Pisar - 1.7.10.4-2 - Perl 5.16 rebuild diff --git a/sources b/sources index 198cf35..6100c5a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -68319d593d051ef76c26e945bbd2d7ac git-1.7.10.4.tar.gz +91e01a22032f5d0ca2941ae7fd49d587 git-1.7.11.2.tar.gz From 9de31a50e1c027be28aabfbe885186ba8587009f Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 25 Jul 2012 17:44:40 -0400 Subject: [PATCH 246/842] Split perl(Git::SVN) into its own package (#843182) Upstream split some of the bits from git-svn.perl into separate files for ease of maintenance. We don't want to package these in the main perl-Git package, as it causes core git to grow an unwanted dependency on subversion. --- git.spec | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 5658ec6..2419bc4 100644 --- a/git.spec +++ b/git.spec @@ -69,7 +69,7 @@ Name: git Version: 1.7.11.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -257,6 +257,18 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi %description -n perl-Git Perl interface to Git. +%package -n perl-Git-SVN +Summary: Perl interface to Git::SVN +Group: Development/Libraries +%if %{noarch_sub} +BuildArch: noarch +%endif +Requires: git = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + +%description -n perl-Git-SVN +Perl interface to Git. + %if %{emacs_support} %package -n emacs-git Summary: Git version control system support for Emacs @@ -378,7 +390,10 @@ find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ' %endif (find %{buildroot}{%{_bindir},%{_libexecdir}} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e s@^%{buildroot}@@) > bin-man-doc-files -(find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) >> perl-files +(find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) >> perl-git-files +# Split out Git::SVN files +grep Git/SVN perl-git-files > perl-git-svn-files +sed -i "/Git\/SVN/ d" perl-git-files %if %{!?_without_docs:1}0 (find %{buildroot}%{_mandir} -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool|git-daemon|Git" | sed -e s@^%{buildroot}@@ -e 's/$/*/' ) >> bin-man-doc-files %else @@ -492,10 +507,15 @@ rm -rf %{buildroot} %{!?_without_docs: %{_mandir}/man1/*gitk*.1*} %{!?_without_docs: %doc Documentation/*gitk*.html } -%files -n perl-Git -f perl-files +%files -n perl-Git -f perl-git-files %defattr(-,root,root) +%exclude %{_mandir}/man3/*Git*SVN*.3pm* %{!?_without_docs: %{_mandir}/man3/*Git*.3pm*} +%files -n perl-Git-SVN -f perl-git-svn-files +%defattr(-,root,root) +%{!?_without_docs: %{_mandir}/man3/*Git*SVN*.3pm*} + %if %{emacs_support} %files -n emacs-git %defattr(-,root,root) @@ -530,6 +550,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Jul 25 2012 Todd Zullinger - 1.7.11.2-2 +- Split perl(Git::SVN) into its own package (#843182) + * Mon Jul 16 2012 Adam Tkac - 1.7.11.2-1 - update to 1.7.11.2 From 9459f1d94958104cc52450fd3716e2615bf933d0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 27 Jul 2012 00:14:28 -0500 Subject: [PATCH 247/842] Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 2419bc4..32b7277 100644 --- a/git.spec +++ b/git.spec @@ -69,7 +69,7 @@ Name: git Version: 1.7.11.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -550,6 +550,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Jul 27 2012 Fedora Release Engineering - 1.7.11.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Wed Jul 25 2012 Todd Zullinger - 1.7.11.2-2 - Split perl(Git::SVN) into its own package (#843182) From d5319fe4f2a22b791d4d20b1ca459483ea946ed6 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Tue, 7 Aug 2012 17:39:50 +0200 Subject: [PATCH 248/842] Update to 1.7.11.4 Signed-off-by: Adam Tkac --- git.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 32b7277..37dcff5 100644 --- a/git.spec +++ b/git.spec @@ -68,7 +68,7 @@ %endif Name: git -Version: 1.7.11.2 +Version: 1.7.11.4 Release: 3%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -550,6 +550,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Aug 07 2012 Adam Tkac - 1.7.11.4-1 +- update to 1.7.11.4 + * Fri Jul 27 2012 Fedora Release Engineering - 1.7.11.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 6100c5a..9c8c776 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -91e01a22032f5d0ca2941ae7fd49d587 git-1.7.11.2.tar.gz +21c7100cddee8579233a924111e829ab git-1.7.11.4.tar.gz From b75eb604aa348a51e3578f82500723f943043221 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 15 Aug 2012 20:40:48 -0400 Subject: [PATCH 249/842] Update to 1.7.11.5 --- git.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 37dcff5..2dc4b48 100644 --- a/git.spec +++ b/git.spec @@ -68,8 +68,8 @@ %endif Name: git -Version: 1.7.11.4 -Release: 3%{?dist} +Version: 1.7.11.5 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -550,6 +550,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Aug 15 2012 Todd Zullinger - 1.7.11.5-1 +- Update to 1.7.11.5 + * Tue Aug 07 2012 Adam Tkac - 1.7.11.4-1 - update to 1.7.11.4 diff --git a/sources b/sources index 9c8c776..a9bd585 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -21c7100cddee8579233a924111e829ab git-1.7.11.4.tar.gz +9985d35c11531d546426ebefb327c847 git-1.7.11.5.tar.gz From a7c401f55bad00c6bc4ea0c7bf27b48c201396bc Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 15 Aug 2012 14:37:16 -0400 Subject: [PATCH 250/842] Add git-p4 subpackage (#844008) This requires dropping NO_PYTHON from the build options and manually removing the python remote-helper files. --- git.spec | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 2dc4b48..c8e7368 100644 --- a/git.spec +++ b/git.spec @@ -43,10 +43,12 @@ %global docbook_suppress_sp 0 %endif -# Enable ipv6 for git-daemon and use desktop --vendor option on EL <= 5 +# Enable ipv6 for git-daemon, use desktop --vendor option and setup python +# macros on EL <= 5 %if 0%{?rhel} && 0%{?rhel} <= 5 %global enable_ipv6 1 %global use_desktop_vendor 1 +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %else %global enable_ipv6 1 %global use_desktop_vendor 1 @@ -139,6 +141,7 @@ Requires: git-cvs = %{version}-%{release} Requires: git-email = %{version}-%{release} Requires: git-gui = %{version}-%{release} Requires: git-svn = %{version}-%{release} +Requires: git-p4 = %{version}-%{release} Requires: gitk = %{version}-%{release} Requires: perl-Git = %{version}-%{release} %if %{emacs_support} @@ -171,6 +174,16 @@ Requires: git = %{version}-%{release} %description -n gitweb Simple web interface to track changes in git repositories +%package p4 +Summary: Git tools for working with Perforce depots +Group: Development/Tools +%if %{noarch_sub} +BuildArch: noarch +%endif +BuildRequires: python +Requires: git = %{version}-%{release} +%description p4 +%{summary}. %package svn Summary: Git tools for importing Subversion repositories @@ -311,7 +324,6 @@ V = 1 CFLAGS = %{optflags} BLK_SHA1 = 1 NEEDS_CRYPTO_WITH_SSL = 1 -NO_PYTHON = 1 USE_LIBPCRE = 1 ETC_GITCONFIG = %{_sysconfdir}/gitconfig DESTDIR = %{buildroot} @@ -385,17 +397,21 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';' find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';' +# Remove remote-helper python libraries and scripts, these are not ready for +# use yet +rm -rf %{buildroot}%{python_sitelib} %{buildroot}%{gitcoredir}/git-remote-testgit + %if ! %{arch_support} find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' %endif -(find %{buildroot}{%{_bindir},%{_libexecdir}} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e s@^%{buildroot}@@) > bin-man-doc-files +(find %{buildroot}{%{_bindir},%{_libexecdir}} -type f | grep -vE "archimport|p4|svn|cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e s@^%{buildroot}@@) > bin-man-doc-files (find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) >> perl-git-files # Split out Git::SVN files grep Git/SVN perl-git-files > perl-git-svn-files sed -i "/Git\/SVN/ d" perl-git-files %if %{!?_without_docs:1}0 -(find %{buildroot}%{_mandir} -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool|git-daemon|Git" | sed -e s@^%{buildroot}@@ -e 's/$/*/' ) >> bin-man-doc-files +(find %{buildroot}%{_mandir} -type f | grep -vE "archimport|p4|svn|git-cvs|email|gitk|git-gui|git-citool|git-daemon|Git" | sed -e s@^%{buildroot}@@ -e 's/$/*/' ) >> bin-man-doc-files %else rm -rf %{buildroot}%{_mandir} %endif @@ -456,6 +472,13 @@ rm -rf %{buildroot} %{!?_without_docs: %doc Documentation/howto Documentation/technical} %{_sysconfdir}/bash_completion.d +%files p4 +%defattr(-,root,root) +%{gitcoredir}/*p4* +%{gitcoredir}/mergetools/p4merge +%doc Documentation/*p4*.txt +%{!?_without_docs: %{_mandir}/man1/*p4*.1*} +%{!?_without_docs: %doc Documentation/*p4*.html } %files svn %defattr(-,root,root) @@ -552,6 +575,7 @@ rm -rf %{buildroot} %changelog * Wed Aug 15 2012 Todd Zullinger - 1.7.11.5-1 - Update to 1.7.11.5 +- Add git-p4 subpackage (#844008) * Tue Aug 07 2012 Adam Tkac - 1.7.11.4-1 - update to 1.7.11.4 From 2009a4551e10881845c33e6c18b381aba8965fba Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Wed, 22 Aug 2012 11:40:12 +0200 Subject: [PATCH 251/842] Update to 1.7.12 Signed-off-by: Adam Tkac --- git.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index c8e7368..e183ac1 100644 --- a/git.spec +++ b/git.spec @@ -70,7 +70,7 @@ %endif Name: git -Version: 1.7.11.5 +Version: 1.7.12 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -573,6 +573,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Aug 22 2012 Adam Tkac - 1.7.12-1 +- update to 1.7.12 + * Wed Aug 15 2012 Todd Zullinger - 1.7.11.5-1 - Update to 1.7.11.5 - Add git-p4 subpackage (#844008) diff --git a/sources b/sources index a9bd585..2cf7105 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9985d35c11531d546426ebefb327c847 git-1.7.11.5.tar.gz +ceb1a6b17a3e33bbc70eadf8fce5876c git-1.7.12.tar.gz From 172fa45d2024d4a024489eee6749efa6ee725a3e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 15 Aug 2012 20:26:42 -0400 Subject: [PATCH 252/842] Install git-prompt.sh in %{_sysconfdir}/profile.d With git-1.7.12, __git_ps1 has moved to a separate script. This is to accommodate newer bash-completion which allows for dynamic loading of completion files. Having git-prompt.sh in profile.d ensures that the functions needed for git in the prompt are present regardless of whether bash-completion is installed or loaded. --- git.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index e183ac1..ab9f3e2 100644 --- a/git.spec +++ b/git.spec @@ -71,7 +71,7 @@ Name: git Version: 1.7.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -429,8 +429,11 @@ perl -p \ %endif %{SOURCE3} > %{buildroot}%{_sysconfdir}/xinetd.d/git +# Setup bash completion and git prompt mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d install -pm 644 contrib/completion/git-completion.bash %{buildroot}%{_sysconfdir}/bash_completion.d/git +mkdir -p %{buildroot}%{_sysconfdir}/profile.d +install -pm 644 contrib/completion/git-prompt.sh %{buildroot}%{_sysconfdir}/profile.d # Move contrib/hooks out of %%docdir and make them executable mkdir -p %{buildroot}%{_datadir}/git-core/contrib @@ -471,6 +474,7 @@ rm -rf %{buildroot} %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} %{!?_without_docs: %doc Documentation/howto Documentation/technical} %{_sysconfdir}/bash_completion.d +%{_sysconfdir}/profile.d %files p4 %defattr(-,root,root) @@ -573,6 +577,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Aug 23 2012 Todd Zullinger - 1.7.12-2 +- Install git-prompt.sh which provides __git_ps1() + * Wed Aug 22 2012 Adam Tkac - 1.7.12-1 - update to 1.7.12 From 7fba5bee2ca88a7cc627b389a16d0f01f23ced9a Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 27 Sep 2012 18:10:11 +0200 Subject: [PATCH 253/842] Update to 1.7.12.1 - cvsimport should skip more characters (#850640) Signed-off-by: Adam Tkac --- ...-strip-all-inappropriate-tag-strings.patch | 71 +++++++++++++++++++ git.spec | 11 ++- sources | 2 +- 3 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 0001-cvsimport-strip-all-inappropriate-tag-strings.patch diff --git a/0001-cvsimport-strip-all-inappropriate-tag-strings.patch b/0001-cvsimport-strip-all-inappropriate-tag-strings.patch new file mode 100644 index 0000000..db85fe9 --- /dev/null +++ b/0001-cvsimport-strip-all-inappropriate-tag-strings.patch @@ -0,0 +1,71 @@ +From 70b67b0792375c59f60f3e24f2d6757b24dc719c Mon Sep 17 00:00:00 2001 +From: Ken Dreyer +Date: Thu, 6 Sep 2012 10:36:53 -0600 +Subject: [PATCH] cvsimport: strip all inappropriate tag strings + +Certain characters such as "?" can be present in a CVS tag name, but +git does not allow these characters in tags. If git-cvsimport +encounters a CVS tag that git cannot handle, cvsimport will error and +refuse to continue the import beyond that point. + +When importing CVS tags, strip all the inappropriate strings from the +tag names as we translate them to git tag names. + +Provide more debugging information to the user if we've altered the +tag and the "git tag" command still fails. Also, warn the user if we +end up skipping an (unusable) tag altogether. + +Signed-off-by: Ken Dreyer +Signed-off-by: Junio C Hamano +--- + git-cvsimport.perl | 33 ++++++++++++++++++++++++++++++--- + 1 file changed, 30 insertions(+), 3 deletions(-) + +diff --git a/git-cvsimport.perl b/git-cvsimport.perl +index 8d41610..8032f23 100755 +--- a/git-cvsimport.perl ++++ b/git-cvsimport.perl +@@ -889,10 +889,37 @@ sub commit { + $xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY ** + $xtag =~ tr/_/\./ if ( $opt_u ); + $xtag =~ s/[\/]/$opt_s/g; +- $xtag =~ s/\[//g; + +- system('git' , 'tag', '-f', $xtag, $cid) == 0 +- or die "Cannot create tag $xtag: $!\n"; ++ # See refs.c for these rules. ++ # Tag cannot contain bad chars. (See bad_ref_char in refs.c.) ++ $xtag =~ s/[ ~\^:\\\*\?\[]//g; ++ # Other bad strings for tags: ++ # (See check_refname_component in refs.c.) ++ 1 while $xtag =~ s/ ++ (?: \.\. # Tag cannot contain '..'. ++ | \@{ # Tag cannot contain '@{'. ++ | ^ - # Tag cannot begin with '-'. ++ | \.lock $ # Tag cannot end with '.lock'. ++ | ^ \. # Tag cannot begin... ++ | \. $ # ...or end with '.' ++ )//xg; ++ # Tag cannot be empty. ++ if ($xtag eq '') { ++ warn("warning: ignoring tag '$tag'", ++ " with invalid tagname\n"); ++ return; ++ } ++ ++ if (system('git' , 'tag', '-f', $xtag, $cid) != 0) { ++ # We did our best to sanitize the tag, but still failed ++ # for whatever reason. Bail out, and give the user ++ # enough information to understand if/how we should ++ # improve the translation in the future. ++ if ($tag ne $xtag) { ++ print "Translated '$tag' tag to '$xtag'\n"; ++ } ++ die "Cannot create tag $xtag: $!\n"; ++ } + + print "Created tag '$xtag' on '$branch'\n" if $opt_v; + } +-- +1.7.12 + diff --git a/git.spec b/git.spec index ab9f3e2..d110a86 100644 --- a/git.spec +++ b/git.spec @@ -70,8 +70,8 @@ %endif Name: git -Version: 1.7.12 -Release: 2%{?dist} +Version: 1.7.12.1 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -87,6 +87,8 @@ Patch0: git-1.5-gitweb-home-link.patch Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://bugzilla.redhat.com/600411 Patch3: git-1.7-el5-emacs-support.patch +Patch4: 0001-cvsimport-strip-all-inappropriate-tag-strings.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -316,6 +318,7 @@ Requires: emacs-git = %{version}-%{release} %if %{emacs_old} %patch3 -p1 %endif +%patch4 -p1 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -577,6 +580,10 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Sep 27 2012 Adam Tkac - 1.7.12.1-1 +- update to 1.7.12.1 +- cvsimport should skip more characters (#850640) + * Thu Aug 23 2012 Todd Zullinger - 1.7.12-2 - Install git-prompt.sh which provides __git_ps1() diff --git a/sources b/sources index 2cf7105..ebd32f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ceb1a6b17a3e33bbc70eadf8fce5876c git-1.7.12.tar.gz +1c16e94ca43c2811806567ed6e73d704 git-1.7.12.1.tar.gz From 4985e02df93d22701393d287f3549dc48619198e Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 25 Oct 2012 16:24:34 +0200 Subject: [PATCH 254/842] move git-prompt.sh into usr/share/git-core/contrib/completion (#854061) Signed-off-by: Adam Tkac --- git.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index d110a86..fa72b86 100644 --- a/git.spec +++ b/git.spec @@ -71,7 +71,7 @@ Name: git Version: 1.7.12.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -432,11 +432,9 @@ perl -p \ %endif %{SOURCE3} > %{buildroot}%{_sysconfdir}/xinetd.d/git -# Setup bash completion and git prompt +# Setup bash completion mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d install -pm 644 contrib/completion/git-completion.bash %{buildroot}%{_sysconfdir}/bash_completion.d/git -mkdir -p %{buildroot}%{_sysconfdir}/profile.d -install -pm 644 contrib/completion/git-prompt.sh %{buildroot}%{_sysconfdir}/profile.d # Move contrib/hooks out of %%docdir and make them executable mkdir -p %{buildroot}%{_datadir}/git-core/contrib @@ -446,6 +444,11 @@ pushd contrib > /dev/null ln -s ../../../git-core/contrib/hooks popd > /dev/null +# Install git-prompt.sh +mkdir -p %{buildroot}%{_datadir}/git-core/contrib/completion +install -pm 644 contrib/completion/git-prompt.sh \ + %{buildroot}%{_datadir}/git-core/contrib/completion/ + # install git-gui .desktop file desktop-file-install \ %if %{use_desktop_vendor} @@ -477,7 +480,6 @@ rm -rf %{buildroot} %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} %{!?_without_docs: %doc Documentation/howto Documentation/technical} %{_sysconfdir}/bash_completion.d -%{_sysconfdir}/profile.d %files p4 %defattr(-,root,root) @@ -580,6 +582,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Oct 25 2012 Adam Tkac - 1.7.12.1-2 +- move git-prompt.sh into usr/share/git-core/contrib/completion (#854061) + * Thu Sep 27 2012 Adam Tkac - 1.7.12.1-1 - update to 1.7.12.1 - cvsimport should skip more characters (#850640) From 8c6dafd6139111c1617e42b504d78d7659a60697 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 29 Oct 2012 17:51:27 +0100 Subject: [PATCH 255/842] Update to 1.8.0 - include git-credential-gnome-keyring helper in git pkg - 0001-cvsimport-strip-all-inappropriate-tag-strings.patch was merged Signed-off-by: Adam Tkac --- ...-strip-all-inappropriate-tag-strings.patch | 71 ------------------- git.spec | 30 ++++++-- sources | 2 +- 3 files changed, 27 insertions(+), 76 deletions(-) delete mode 100644 0001-cvsimport-strip-all-inappropriate-tag-strings.patch diff --git a/0001-cvsimport-strip-all-inappropriate-tag-strings.patch b/0001-cvsimport-strip-all-inappropriate-tag-strings.patch deleted file mode 100644 index db85fe9..0000000 --- a/0001-cvsimport-strip-all-inappropriate-tag-strings.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 70b67b0792375c59f60f3e24f2d6757b24dc719c Mon Sep 17 00:00:00 2001 -From: Ken Dreyer -Date: Thu, 6 Sep 2012 10:36:53 -0600 -Subject: [PATCH] cvsimport: strip all inappropriate tag strings - -Certain characters such as "?" can be present in a CVS tag name, but -git does not allow these characters in tags. If git-cvsimport -encounters a CVS tag that git cannot handle, cvsimport will error and -refuse to continue the import beyond that point. - -When importing CVS tags, strip all the inappropriate strings from the -tag names as we translate them to git tag names. - -Provide more debugging information to the user if we've altered the -tag and the "git tag" command still fails. Also, warn the user if we -end up skipping an (unusable) tag altogether. - -Signed-off-by: Ken Dreyer -Signed-off-by: Junio C Hamano ---- - git-cvsimport.perl | 33 ++++++++++++++++++++++++++++++--- - 1 file changed, 30 insertions(+), 3 deletions(-) - -diff --git a/git-cvsimport.perl b/git-cvsimport.perl -index 8d41610..8032f23 100755 ---- a/git-cvsimport.perl -+++ b/git-cvsimport.perl -@@ -889,10 +889,37 @@ sub commit { - $xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY ** - $xtag =~ tr/_/\./ if ( $opt_u ); - $xtag =~ s/[\/]/$opt_s/g; -- $xtag =~ s/\[//g; - -- system('git' , 'tag', '-f', $xtag, $cid) == 0 -- or die "Cannot create tag $xtag: $!\n"; -+ # See refs.c for these rules. -+ # Tag cannot contain bad chars. (See bad_ref_char in refs.c.) -+ $xtag =~ s/[ ~\^:\\\*\?\[]//g; -+ # Other bad strings for tags: -+ # (See check_refname_component in refs.c.) -+ 1 while $xtag =~ s/ -+ (?: \.\. # Tag cannot contain '..'. -+ | \@{ # Tag cannot contain '@{'. -+ | ^ - # Tag cannot begin with '-'. -+ | \.lock $ # Tag cannot end with '.lock'. -+ | ^ \. # Tag cannot begin... -+ | \. $ # ...or end with '.' -+ )//xg; -+ # Tag cannot be empty. -+ if ($xtag eq '') { -+ warn("warning: ignoring tag '$tag'", -+ " with invalid tagname\n"); -+ return; -+ } -+ -+ if (system('git' , 'tag', '-f', $xtag, $cid) != 0) { -+ # We did our best to sanitize the tag, but still failed -+ # for whatever reason. Bail out, and give the user -+ # enough information to understand if/how we should -+ # improve the translation in the future. -+ if ($tag ne $xtag) { -+ print "Translated '$tag' tag to '$xtag'\n"; -+ } -+ die "Cannot create tag $xtag: $!\n"; -+ } - - print "Created tag '$xtag' on '$branch'\n" if $opt_v; - } --- -1.7.12 - diff --git a/git.spec b/git.spec index fa72b86..2d4069e 100644 --- a/git.spec +++ b/git.spec @@ -69,9 +69,16 @@ %global arch_support 0 %endif +# Build gnome-keyring git-credential helper on Fedora and RHEL >= 7 +%if 0%{?rhel} >= 7 || 0%{?fedora} +%global gnome_keyring 1 +%else +%global gnome_keyring 0 +%endif + Name: git -Version: 1.7.12.1 -Release: 2%{?dist} +Version: 1.8.0 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -87,7 +94,6 @@ Patch0: git-1.5-gitweb-home-link.patch Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://bugzilla.redhat.com/600411 Patch3: git-1.7-el5-emacs-support.patch -Patch4: 0001-cvsimport-strip-all-inappropriate-tag-strings.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -102,6 +108,9 @@ BuildRequires: pcre-devel BuildRequires: openssl-devel BuildRequires: zlib-devel >= 1.2 %{!?_without_docs:BuildRequires: asciidoc > 6.0.3, xmlto} +%if %{gnome_keyring} +BuildRequires: libgnome-keyring-devel +%endif Requires: less Requires: openssh-clients @@ -318,7 +327,6 @@ Requires: emacs-git = %{version}-%{release} %if %{emacs_old} %patch3 -p1 %endif -%patch4 -p1 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -368,6 +376,10 @@ make %{?_smp_mflags} all %{!?_without_docs: doc} make -C contrib/emacs %endif +%if %{gnome_keyring} +make -C contrib/credential/gnome-keyring/ +%endif + # Remove shebang from bash-completion script sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash @@ -391,6 +403,11 @@ install -Dpm 644 %{SOURCE2} \ %{buildroot}%{_emacs_sitestartdir}/git-init.el %endif +%if %{gnome_keyring} +install -pm 755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \ + %{buildroot}%{gitcoredir} +%endif + mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d install -pm 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf sed "s|@PROJECTROOT@|%{_var}/lib/git|g" \ @@ -582,6 +599,11 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Oct 29 2012 Adam Tkac - 1.8.0-1 +- update to 1.8.0 +- include git-credential-gnome-keyring helper in git pkg +- 0001-cvsimport-strip-all-inappropriate-tag-strings.patch was merged + * Thu Oct 25 2012 Adam Tkac - 1.7.12.1-2 - move git-prompt.sh into usr/share/git-core/contrib/completion (#854061) diff --git a/sources b/sources index ebd32f8..34857d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1c16e94ca43c2811806567ed6e73d704 git-1.7.12.1.tar.gz +12f4d20f34ae37086d86dd3b9d037bba git-1.8.0.tar.gz From a525ecd701f37bb01087698eafd7679ce319a097 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 29 Nov 2012 15:17:58 +0100 Subject: [PATCH 256/842] Update to 1.8.0.1 - include git-subtree in git rpm (#864651) Signed-off-by: Adam Tkac --- ...-support-in-contrib-subtree-Makefile.patch | 32 +++++++++++++++++++ git.spec | 13 +++++++- sources | 2 +- 3 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 0001-DESTDIR-support-in-contrib-subtree-Makefile.patch diff --git a/0001-DESTDIR-support-in-contrib-subtree-Makefile.patch b/0001-DESTDIR-support-in-contrib-subtree-Makefile.patch new file mode 100644 index 0000000..b62c620 --- /dev/null +++ b/0001-DESTDIR-support-in-contrib-subtree-Makefile.patch @@ -0,0 +1,32 @@ +From 02b6c8d3c07e3ca9aa091d4a865fe036e1794cbd Mon Sep 17 00:00:00 2001 +From: Adam Tkac +Date: Thu, 29 Nov 2012 16:18:03 +0100 +Subject: [PATCH] DESTDIR support in contrib/subtree/Makefile + +Signed-off-by: Adam Tkac +--- + contrib/subtree/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile +index 05cdd5c..36ae3e4 100644 +--- a/contrib/subtree/Makefile ++++ b/contrib/subtree/Makefile +@@ -30,12 +30,12 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH) + doc: $(GIT_SUBTREE_DOC) + + install: $(GIT_SUBTREE) +- $(INSTALL) -m 755 $(GIT_SUBTREE) $(libexecdir) ++ $(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(libexecdir) + + install-doc: install-man + + install-man: $(GIT_SUBTREE_DOC) +- $(INSTALL) -m 644 $^ $(man1dir) ++ $(INSTALL) -m 644 $^ $(DESTDIR)$(man1dir) + + $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML) + xmlto -m $(MANPAGE_NORMAL_XSL) man $^ +-- +1.8.0.1 + diff --git a/git.spec b/git.spec index 2d4069e..b2e6190 100644 --- a/git.spec +++ b/git.spec @@ -77,7 +77,7 @@ %endif Name: git -Version: 1.8.0 +Version: 1.8.0.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -94,6 +94,7 @@ Patch0: git-1.5-gitweb-home-link.patch Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://bugzilla.redhat.com/600411 Patch3: git-1.7-el5-emacs-support.patch +Patch4: 0001-DESTDIR-support-in-contrib-subtree-Makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -327,6 +328,7 @@ Requires: emacs-git = %{version}-%{release} %if %{emacs_old} %patch3 -p1 %endif +%patch4 -p1 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -380,6 +382,8 @@ make -C contrib/emacs make -C contrib/credential/gnome-keyring/ %endif +make -C contrib/subtree/ + # Remove shebang from bash-completion script sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash @@ -408,6 +412,9 @@ install -pm 755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \ %{buildroot}%{gitcoredir} %endif +make -C contrib/subtree install +make -C contrib/subtree install-doc + mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d install -pm 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf sed "s|@PROJECTROOT@|%{_var}/lib/git|g" \ @@ -599,6 +606,10 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Nov 29 2012 Adam Tkac - 1.8.0.1-1 +- update to 1.8.0.1 +- include git-subtree in git rpm (#864651) + * Mon Oct 29 2012 Adam Tkac - 1.8.0-1 - update to 1.8.0 - include git-credential-gnome-keyring helper in git pkg diff --git a/sources b/sources index 34857d3..bce23bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -12f4d20f34ae37086d86dd3b9d037bba git-1.8.0.tar.gz +3d598a31bd8ff04f6a72c65a4cd015a8 git-1.8.0.1.tar.gz From e58da87c25a55894f3e0329b8722988c0616926a Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 6 Dec 2012 15:43:08 +0100 Subject: [PATCH 257/842] don't install some unneeded credential-gnome-keyring stuff Signed-off-by: Adam Tkac --- git.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index b2e6190..4bf3754 100644 --- a/git.spec +++ b/git.spec @@ -78,7 +78,7 @@ Name: git Version: 1.8.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -410,6 +410,8 @@ install -Dpm 644 %{SOURCE2} \ %if %{gnome_keyring} install -pm 755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \ %{buildroot}%{gitcoredir} +# Remove built binary files, otherwise they will be installed in doc +make -C contrib/credential/gnome-keyring/ clean %endif make -C contrib/subtree install @@ -487,7 +489,7 @@ cat %{name}.lang >> bin-man-doc-files # quiet some rpmlint complaints chmod -R g-w %{buildroot} find %{buildroot} -name git-mergetool--lib | xargs chmod a-x -rm -f {Documentation/technical,contrib/emacs}/.gitignore +rm -f {Documentation/technical,contrib/emacs,contrib/credential/gnome-keyring}/.gitignore chmod a-x Documentation/technical/api-index.sh find contrib -type f | xargs chmod -x @@ -606,6 +608,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Dec 06 2012 Adam Tkac - 1.8.0.1-2 +- don't install some unneeded credential-gnome-keyring stuff + * Thu Nov 29 2012 Adam Tkac - 1.8.0.1-1 - update to 1.8.0.1 - include git-subtree in git rpm (#864651) From 3ad1cc6511a2aa9c5cb656261d6a08163fb82402 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Tue, 11 Dec 2012 13:06:47 +0100 Subject: [PATCH 258/842] update to 1.8.0.2 Signed-off-by: Adam Tkac --- git.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 4bf3754..e764c77 100644 --- a/git.spec +++ b/git.spec @@ -77,8 +77,8 @@ %endif Name: git -Version: 1.8.0.1 -Release: 2%{?dist} +Version: 1.8.0.2 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -608,6 +608,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Dec 11 2012 Adam Tkac - 1.8.0.2-1 +- update to 1.8.0.2 + * Thu Dec 06 2012 Adam Tkac - 1.8.0.1-2 - don't install some unneeded credential-gnome-keyring stuff diff --git a/sources b/sources index bce23bd..1b91447 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3d598a31bd8ff04f6a72c65a4cd015a8 git-1.8.0.1.tar.gz +1aca109d4a719fe5bc43d25927fbc7d9 git-1.8.0.2.tar.gz From 0b3a2f327a1a1b71a3be38af26a226ff5a22ff33 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 3 Jan 2013 12:29:58 +0100 Subject: [PATCH 259/842] Update to 1.8.1 Signed-off-by: Adam Tkac --- git.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index e764c77..12be517 100644 --- a/git.spec +++ b/git.spec @@ -77,7 +77,7 @@ %endif Name: git -Version: 1.8.0.2 +Version: 1.8.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -608,6 +608,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Jan 03 2013 Adam Tkac - 1.8.1-1 +- update to 1.8.1 + * Tue Dec 11 2012 Adam Tkac - 1.8.0.2-1 - update to 1.8.0.2 diff --git a/sources b/sources index 1b91447..1449017 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1aca109d4a719fe5bc43d25927fbc7d9 git-1.8.0.2.tar.gz +a2c6f4404c5e432b47474d246ca83c7e git-1.8.1.tar.gz From 879b2766648e96ae7172b97eb30997faf82365f6 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 3 Jan 2013 13:39:37 +0100 Subject: [PATCH 260/842] Build git-svn as arch subpkg due to new git-remote-testsvn binary Signed-off-by: Adam Tkac --- git.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 12be517..9504778 100644 --- a/git.spec +++ b/git.spec @@ -200,9 +200,6 @@ Requires: git = %{version}-%{release} %package svn Summary: Git tools for importing Subversion repositories Group: Development/Tools -%if %{noarch_sub} -BuildArch: noarch -%endif Requires: git = %{version}-%{release}, subversion, perl(Term::ReadKey) %description svn Git tools for importing Subversion repositories. @@ -610,6 +607,7 @@ rm -rf %{buildroot} %changelog * Thu Jan 03 2013 Adam Tkac - 1.8.1-1 - update to 1.8.1 +- build git-svn as arch subpkg due to new git-remote-testsvn binary * Tue Dec 11 2012 Adam Tkac - 1.8.0.2-1 - update to 1.8.0.2 From 2a9cc6c208da9ce83934b5ed0bd213b019cdf91a Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Wed, 30 Jan 2013 13:04:11 +0100 Subject: [PATCH 261/842] Update to 1.8.1.2 - own directories which should be owned (#902517) Signed-off-by: Adam Tkac --- git.spec | 11 ++++++++--- sources | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 9504778..821f695 100644 --- a/git.spec +++ b/git.spec @@ -77,7 +77,7 @@ %endif Name: git -Version: 1.8.1 +Version: 1.8.1.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -432,7 +432,9 @@ find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ' %endif (find %{buildroot}{%{_bindir},%{_libexecdir}} -type f | grep -vE "archimport|p4|svn|cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e s@^%{buildroot}@@) > bin-man-doc-files -(find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) >> perl-git-files +(find %{buildroot}{%{_bindir},%{_libexecdir}} -mindepth 1 -type d | grep -vE "archimport|p4|svn|cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files +(find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) > perl-git-files +(find %{buildroot}%{perl_vendorlib} -mindepth 1 -type d | sed -e 's@^%{buildroot}@%dir @') >> perl-git-files # Split out Git::SVN files grep Git/SVN perl-git-files > perl-git-svn-files sed -i "/Git\/SVN/ d" perl-git-files @@ -498,7 +500,6 @@ rm -rf %{buildroot} %files -f bin-man-doc-files %defattr(-,root,root) %{_datadir}/git-core/ -%dir %{gitcoredir} %doc README COPYING Documentation/*.txt Documentation/RelNotes contrib/ %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} %{!?_without_docs: %doc Documentation/howto Documentation/technical} @@ -605,6 +606,10 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Jan 30 2013 Adam Tkac - 1.8.1.2-1 +- update to 1.8.1.2 +- own directories which should be owned (#902517) + * Thu Jan 03 2013 Adam Tkac - 1.8.1-1 - update to 1.8.1 - build git-svn as arch subpkg due to new git-remote-testsvn binary diff --git a/sources b/sources index 1449017..a34e3f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a2c6f4404c5e432b47474d246ca83c7e git-1.8.1.tar.gz +9f912370a1831c851ff8df171e8a7218 git-1.8.1.2.tar.gz From 166c9f33c3002d0cb20a59fa312c4f838217819d Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Wed, 20 Feb 2013 14:07:29 +0100 Subject: [PATCH 262/842] Update to 1.8.1.4 Signed-off-by: Adam Tkac --- git.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 821f695..4213a41 100644 --- a/git.spec +++ b/git.spec @@ -77,7 +77,7 @@ %endif Name: git -Version: 1.8.1.2 +Version: 1.8.1.4 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -606,6 +606,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Feb 20 2013 Adam Tkac - 1.8.1.4-1 +- update to 1.8.1.4 + * Wed Jan 30 2013 Adam Tkac - 1.8.1.2-1 - update to 1.8.1.2 - own directories which should be owned (#902517) diff --git a/sources b/sources index a34e3f5..7cceae7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9f912370a1831c851ff8df171e8a7218 git-1.8.1.2.tar.gz +60f32ef4a6b3fa2143b81a28704333ed git-1.8.1.4.tar.gz From e313d827cc692d3626ca647c9092372a696b1ba3 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 3 Jan 2013 11:13:45 -0500 Subject: [PATCH 263/842] Update asciidoc requirements, drop unsupported ASCIIDOC7 Since git-1.7.12, asciidoc >= 8.4.1 is a requirement to build the documentation. Update the build requires to reflect this. Note that this means that EL-5 can no longer build documentation as asciidoc-8.1.0 is the latest in EPEL. (It might be worth adding support for using the prebuilt documentation files to enable EL-5 builds to continue working.) --- git.spec | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/git.spec b/git.spec index 4213a41..d69c0ee 100644 --- a/git.spec +++ b/git.spec @@ -54,14 +54,6 @@ %global use_desktop_vendor 1 %endif -# Use asciidoc-7 on EL <= 4. Again, we don't support EL-4, but no need to make -# it more difficult to build a modern git there. -%if 0%{?rhel} && 0%{?rhel} <= 4 -%global asciidoc7 1 -%else -%global asciidoc7 0 -%endif - # Only build git-arch for Fedora < 16, where tla is available %if 0%{?fedora} && 0%{?fedora} < 16 %global arch_support 1 @@ -78,7 +70,7 @@ Name: git Version: 1.8.1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -108,7 +100,7 @@ BuildRequires: gettext BuildRequires: pcre-devel BuildRequires: openssl-devel BuildRequires: zlib-devel >= 1.2 -%{!?_without_docs:BuildRequires: asciidoc > 6.0.3, xmlto} +%{!?_without_docs:BuildRequires: asciidoc >= 8.4.1, xmlto} %if %{gnome_keyring} BuildRequires: libgnome-keyring-devel %endif @@ -353,10 +345,6 @@ echo gitexecdir = %{_bindir} >> config.mak echo DOCBOOK_SUPPRESS_SP = 1 >> config.mak %endif -%if %{asciidoc7} -echo ASCIIDOC7 = 1 >> config.mak -%endif - # Filter bogus perl requires # packed-refs comes from a comment in contrib/hooks/update-paranoid cat << \EOF > %{name}-req @@ -606,6 +594,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Feb 26 2013 Todd Zullinger - 1.8.1.4-2 +- Update asciidoc requirements, drop unsupported ASCIIDOC7 + * Wed Feb 20 2013 Adam Tkac - 1.8.1.4-1 - update to 1.8.1.4 From ff981ceb81aad6d0aef6aef33d5906414b494dc6 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 3 Jan 2013 11:20:23 -0500 Subject: [PATCH 264/842] Define GNU_ROFF to force ASCII apostrophes in man pages (so copy/paste works) When using GNU groff, we want the examples in the man pages to work when copied to the shell. The GNU_ROFF definition enables this. --- git.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git.spec b/git.spec index d69c0ee..5f6e8a7 100644 --- a/git.spec +++ b/git.spec @@ -331,6 +331,7 @@ ETC_GITCONFIG = %{_sysconfdir}/gitconfig DESTDIR = %{buildroot} INSTALL = install -p GITWEB_PROJECTROOT = %{_var}/lib/git +GNU_ROFF = 1 htmldir = %{_docdir}/%{name}-%{version} prefix = %{_prefix} gitwebdir = %{_var}/www/git @@ -596,6 +597,7 @@ rm -rf %{buildroot} %changelog * Tue Feb 26 2013 Todd Zullinger - 1.8.1.4-2 - Update asciidoc requirements, drop unsupported ASCIIDOC7 +- Define GNU_ROFF to force ASCII apostrophes in manpages (so copy/paste works) * Wed Feb 20 2013 Adam Tkac - 1.8.1.4-1 - update to 1.8.1.4 From dae85881cef810bc1a7e822cf4b5edcd3dd7b7f4 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 3 Jan 2013 14:59:27 -0500 Subject: [PATCH 265/842] Install tcsh completion (requires manual setup by users) For now, this just gets the file from contrib installed. If there are enough tcsh users that want it to be more automated, that can come later. For now, the directions in the file must be followed to enable tcsh completion. --- git.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/git.spec b/git.spec index 5f6e8a7..26ded64 100644 --- a/git.spec +++ b/git.spec @@ -450,6 +450,11 @@ perl -p \ mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d install -pm 644 contrib/completion/git-completion.bash %{buildroot}%{_sysconfdir}/bash_completion.d/git +# Install tcsh completion +mkdir -p %{buildroot}%{_datadir}/git-core/contrib/completion +install -pm 644 contrib/completion/git-completion.tcsh \ + %{buildroot}%{_datadir}/git-core/contrib/completion/ + # Move contrib/hooks out of %%docdir and make them executable mkdir -p %{buildroot}%{_datadir}/git-core/contrib mv contrib/hooks %{buildroot}%{_datadir}/git-core/contrib @@ -598,6 +603,7 @@ rm -rf %{buildroot} * Tue Feb 26 2013 Todd Zullinger - 1.8.1.4-2 - Update asciidoc requirements, drop unsupported ASCIIDOC7 - Define GNU_ROFF to force ASCII apostrophes in manpages (so copy/paste works) +- Install tcsh completion (requires manual setup by users) * Wed Feb 20 2013 Adam Tkac - 1.8.1.4-1 - update to 1.8.1.4 From f8c03bb1deb5190aaf5bcf2450b0cd1c2dcd1416 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 4 Jan 2013 22:36:01 -0500 Subject: [PATCH 266/842] Clean up dist conditionals, don't pretend to support EL-4 builds --- git.spec | 142 ++++++++++++------------------------------------------- 1 file changed, 29 insertions(+), 113 deletions(-) diff --git a/git.spec b/git.spec index 26ded64..1e2395a 100644 --- a/git.spec +++ b/git.spec @@ -1,68 +1,31 @@ # Pass --without docs to rpmbuild if you don't want the documentation -# Leave git-* binaries in %{_bindir} on EL <= 5 +# Settings for EL-5 +# - Leave git-* binaries in %{_bindir} +# - Don't use noarch subpackages +# - Use proper libcurl devel package +# - Patch emacs and tweak docbook spaces +# - Explicitly enable ipv6 for git-daemon +# - Define missing python macro %if 0%{?rhel} && 0%{?rhel} <= 5 -%global gitcoredir %{_bindir} -%else -%global gitcoredir %{_libexecdir}/git-core -%endif - -# Build noarch subpackages and use libcurl-devel on Fedora and EL >= 6 -%if 0%{?fedora} || 0%{?rhel} >= 6 -%global noarch_sub 1 -%global libcurl_devel libcurl-devel -%else -%global noarch_sub 0 -%global libcurl_devel curl-devel -%endif - -# Build git-emacs, use perl(Error) and perl(Net::SMTP::SSL), require cvsps, and -# adjust git-core obsolete version on Fedora and EL >= 5. (We don't really -# support EL-4, but folks stuck using it have enough problems, no point making -# it harder on them.) -%if 0%{?fedora} || 0%{?rhel} >= 5 -%global emacs_support 1 -%global git_core_version 1.5.4.3 -%global perl_error 1 -%global perl_net_smtp_ssl 1 -%global require_cvsps 1 -%else -%global emacs_support 0 -%global git_core_version 1.5.4.7-4 -%global perl_error 0 -%global perl_net_smtp_ssl 0 -%global require_cvsps 0 -%endif - -# Patch emacs and tweak docbook spaces on EL-5 -%if 0%{?rhel} == 5 -%global emacs_old 1 +%global gitcoredir %{_bindir} +%global noarch_sub 0 +%global libcurl_devel curl-devel +%global emacs_old 1 %global docbook_suppress_sp 1 -%else -%global emacs_old 0 -%global docbook_suppress_sp 0 -%endif - -# Enable ipv6 for git-daemon, use desktop --vendor option and setup python -# macros on EL <= 5 -%if 0%{?rhel} && 0%{?rhel} <= 5 -%global enable_ipv6 1 -%global use_desktop_vendor 1 +%global enable_ipv6 1 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %else -%global enable_ipv6 1 -%global use_desktop_vendor 1 -%endif - -# Only build git-arch for Fedora < 16, where tla is available -%if 0%{?fedora} && 0%{?fedora} < 16 -%global arch_support 1 -%else -%global arch_support 0 +%global gitcoredir %{_libexecdir}/git-core +%global noarch_sub 1 +%global libcurl_devel libcurl-devel +%global emacs_old 0 +%global docbook_suppress_sp 0 +%global enable_ipv6 0 %endif # Build gnome-keyring git-credential helper on Fedora and RHEL >= 7 -%if 0%{?rhel} >= 7 || 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 7 %global gnome_keyring 1 %else %global gnome_keyring 0 @@ -91,36 +54,30 @@ Patch4: 0001-DESTDIR-support-in-contrib-subtree-Makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -%if %{emacs_support} BuildRequires: emacs -%endif -BuildRequires: %{libcurl_devel} BuildRequires: expat-devel BuildRequires: gettext -BuildRequires: pcre-devel -BuildRequires: openssl-devel -BuildRequires: zlib-devel >= 1.2 %{!?_without_docs:BuildRequires: asciidoc >= 8.4.1, xmlto} +BuildRequires: %{libcurl_devel} %if %{gnome_keyring} BuildRequires: libgnome-keyring-devel %endif +BuildRequires: pcre-devel +BuildRequires: openssl-devel +BuildRequires: zlib-devel >= 1.2 Requires: less Requires: openssh-clients -%if %{perl_error} Requires: perl(Error) -%endif Requires: perl-Git = %{version}-%{release} Requires: rsync Requires: zlib >= 1.2 Provides: git-core = %{version}-%{release} -Obsoletes: git-core <= %{git_core_version} +Obsoletes: git-core <= 1.5.4.3 -# Obsolete git-arch as needed -%if ! %{arch_support} +# Obsolete git-arch Obsoletes: git-arch < %{version}-%{release} -%endif %description Git is a fast, scalable, distributed revision control system with an @@ -138,9 +95,6 @@ Group: Development/Tools BuildArch: noarch %endif Requires: git = %{version}-%{release} -%if %{arch_support} -Requires: git-arch = %{version}-%{release} -%endif Requires: git-cvs = %{version}-%{release} Requires: git-email = %{version}-%{release} Requires: git-gui = %{version}-%{release} @@ -148,10 +102,8 @@ Requires: git-svn = %{version}-%{release} Requires: git-p4 = %{version}-%{release} Requires: gitk = %{version}-%{release} Requires: perl-Git = %{version}-%{release} -%if %{emacs_support} Requires: emacs-git = %{version}-%{release} -%endif -Obsoletes: git <= %{git_core_version} +Obsoletes: git <= 1.5.4.3 %description all Git is a fast, scalable, distributed revision control system with an @@ -203,23 +155,11 @@ Group: Development/Tools BuildArch: noarch %endif Requires: git = %{version}-%{release}, cvs -%if %{require_cvsps} Requires: cvsps Requires: perl-DBD-SQLite -%endif %description cvs Git tools for importing CVS repositories. -%if %{arch_support} -%package arch -Summary: Git tools for importing Arch repositories -Group: Development/Tools -BuildArch: noarch -Requires: git = %{version}-%{release}, tla -%description arch -Git tools for importing Arch repositories. -%endif - %package email Summary: Git tools for sending email Group: Development/Tools @@ -228,9 +168,7 @@ BuildArch: noarch %endif Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} Requires: perl(Authen::SASL) -%if %{perl_net_smtp_ssl} Requires: perl(Net::SMTP::SSL) -%endif %description email Git tools for sending email. @@ -262,10 +200,8 @@ Group: Development/Libraries BuildArch: noarch %endif Requires: git = %{version}-%{release} -%if %{perl_error} BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) Requires: perl(Error) -%endif Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -n perl-Git @@ -283,7 +219,6 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi %description -n perl-Git-SVN Perl interface to Git. -%if %{emacs_support} %package -n emacs-git Summary: Git version control system support for Emacs Group: Applications/Editors @@ -308,7 +243,6 @@ Requires: emacs-git = %{version}-%{release} %description -n emacs-git-el %{summary}. -%endif %prep %setup -q @@ -360,9 +294,7 @@ chmod +x %{__perl_requires} %build make %{?_smp_mflags} all %{!?_without_docs: doc} -%if %{emacs_support} make -C contrib/emacs -%endif %if %{gnome_keyring} make -C contrib/credential/gnome-keyring/ @@ -377,7 +309,6 @@ sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash rm -rf %{buildroot} make %{?_smp_mflags} INSTALLDIRS=vendor install %{!?_without_docs: install-doc} -%if %{emacs_support} %if %{emacs_old} %global _emacs_sitelispdir %{_datadir}/emacs/site-lisp %global _emacs_sitestartdir %{_emacs_sitelispdir}/site-start.d @@ -391,7 +322,6 @@ for elc in %{buildroot}%{elispdir}/*.elc ; do done install -Dpm 644 %{SOURCE2} \ %{buildroot}%{_emacs_sitestartdir}/git-init.el -%endif %if %{gnome_keyring} install -pm 755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \ @@ -416,9 +346,8 @@ find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';' # use yet rm -rf %{buildroot}%{python_sitelib} %{buildroot}%{gitcoredir}/git-remote-testgit -%if ! %{arch_support} +# git-archimport is not supported find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' -%endif (find %{buildroot}{%{_bindir},%{_libexecdir}} -type f | grep -vE "archimport|p4|svn|cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e s@^%{buildroot}@@) > bin-man-doc-files (find %{buildroot}{%{_bindir},%{_libexecdir}} -mindepth 1 -type d | grep -vE "archimport|p4|svn|cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files @@ -469,10 +398,7 @@ install -pm 644 contrib/completion/git-prompt.sh \ %{buildroot}%{_datadir}/git-core/contrib/completion/ # install git-gui .desktop file -desktop-file-install \ -%if %{use_desktop_vendor} - --vendor fedora \ -%endif +desktop-file-install --vendor fedora \ --dir=%{buildroot}%{_datadir}/applications %{SOURCE5} # find translations @@ -522,15 +448,6 @@ rm -rf %{buildroot} %{!?_without_docs: %{_mandir}/man1/*cvs*.1*} %{!?_without_docs: %doc Documentation/*git-cvs*.html } -%if %{arch_support} -%files arch -%defattr(-,root,root) -%doc Documentation/git-archimport.txt -%{gitcoredir}/git-archimport -%{!?_without_docs: %{_mandir}/man1/git-archimport.1*} -%{!?_without_docs: %doc Documentation/git-archimport.html } -%endif - %files email %defattr(-,root,root) %doc Documentation/*email*.txt @@ -566,7 +483,6 @@ rm -rf %{buildroot} %defattr(-,root,root) %{!?_without_docs: %{_mandir}/man3/*Git*SVN*.3pm*} -%if %{emacs_support} %files -n emacs-git %defattr(-,root,root) %doc contrib/emacs/README @@ -577,7 +493,6 @@ rm -rf %{buildroot} %files -n emacs-git-el %defattr(-,root,root) %{elispdir}/*.el -%endif %files daemon %defattr(-,root,root) @@ -604,6 +519,7 @@ rm -rf %{buildroot} - Update asciidoc requirements, drop unsupported ASCIIDOC7 - Define GNU_ROFF to force ASCII apostrophes in manpages (so copy/paste works) - Install tcsh completion (requires manual setup by users) +- Clean up dist conditionals, don't pretend to support EL-4 builds * Wed Feb 20 2013 Adam Tkac - 1.8.1.4-1 - update to 1.8.1.4 From c3202fdeaf93fe4cc90445827ffecd1101c7076c Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 4 Jan 2013 22:41:23 -0500 Subject: [PATCH 267/842] Use prebuilt documentation on EL-5, where asciidoc is too old --- git.spec | 35 ++++++++++++++++++++++++++++++++--- sources | 2 ++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 1e2395a..f8e01d5 100644 --- a/git.spec +++ b/git.spec @@ -6,6 +6,7 @@ # - Use proper libcurl devel package # - Patch emacs and tweak docbook spaces # - Explicitly enable ipv6 for git-daemon +# - Use prebuilt documentation, asciidoc is too old # - Define missing python macro %if 0%{?rhel} && 0%{?rhel} <= 5 %global gitcoredir %{_bindir} @@ -14,6 +15,7 @@ %global emacs_old 1 %global docbook_suppress_sp 1 %global enable_ipv6 1 +%global use_prebuilt_docs 1 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %else %global gitcoredir %{_libexecdir}/git-core @@ -22,6 +24,7 @@ %global emacs_old 0 %global docbook_suppress_sp 0 %global enable_ipv6 0 +%global use_prebuilt_docs 0 %endif # Build gnome-keyring git-credential helper on Fedora and RHEL >= 7 @@ -44,6 +47,8 @@ Source3: git.xinetd.in Source4: git.conf.httpd Source5: git-gui.desktop Source6: gitweb.conf.in +Source10: http://git-core.googlecode.com/files/%{name}-manpages-%{version}.tar.gz +Source11: http://git-core.googlecode.com/files/%{name}-htmldocs-%{version}.tar.gz Patch0: git-1.5-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch @@ -53,11 +58,14 @@ Patch4: 0001-DESTDIR-support-in-contrib-subtree-Makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%if ! %{use_prebuilt_docs} && ! 0%{?_without_docs} +BuildRequires: asciidoc >= 8.4.1 +BuildRequires: xmlto +%endif BuildRequires: desktop-file-utils BuildRequires: emacs BuildRequires: expat-devel BuildRequires: gettext -%{!?_without_docs:BuildRequires: asciidoc >= 8.4.1, xmlto} BuildRequires: %{libcurl_devel} %if %{gnome_keyring} BuildRequires: libgnome-keyring-devel @@ -253,6 +261,15 @@ Requires: emacs-git = %{version}-%{release} %endif %patch4 -p1 +%if %{use_prebuilt_docs} +mkdir -p prebuilt_docs/{html,man} +tar xf %{SOURCE10} -C prebuilt_docs/man +tar xf %{SOURCE11} -C prebuilt_docs/html +# Remove non-html files +find prebuilt_docs/html -type f ! -name '*.html' | xargs rm +find prebuilt_docs/html -type d | xargs rmdir --ignore-fail-on-non-empty +%endif + # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. cat << \EOF > config.mak @@ -292,7 +309,10 @@ EOF chmod +x %{__perl_requires} %build -make %{?_smp_mflags} all %{!?_without_docs: doc} +make %{?_smp_mflags} all +%if ! %{use_prebuilt_docs} && ! 0%{?_without_docs} +make %{?_smp_mflags} doc +%endif make -C contrib/emacs @@ -307,7 +327,13 @@ sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash %install rm -rf %{buildroot} -make %{?_smp_mflags} INSTALLDIRS=vendor install %{!?_without_docs: install-doc} +make %{?_smp_mflags} INSTALLDIRS=vendor install +%if ! %{use_prebuilt_docs} && ! 0%{?_without_docs} +make %{?_smp_mflags} INSTALLDIRS=vendor install-doc +%else +cp -a prebuilt_docs/man/* %{buildroot}%{_mandir} +cp -a prebuilt_docs/html/* Documentation/ +%endif %if %{emacs_old} %global _emacs_sitelispdir %{_datadir}/emacs/site-lisp @@ -331,7 +357,9 @@ make -C contrib/credential/gnome-keyring/ clean %endif make -C contrib/subtree install +%if ! %{use_prebuilt_docs} make -C contrib/subtree install-doc +%endif mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d install -pm 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf @@ -520,6 +548,7 @@ rm -rf %{buildroot} - Define GNU_ROFF to force ASCII apostrophes in manpages (so copy/paste works) - Install tcsh completion (requires manual setup by users) - Clean up dist conditionals, don't pretend to support EL-4 builds +- Use prebuilt documentation on EL-5, where asciidoc is too old * Wed Feb 20 2013 Adam Tkac - 1.8.1.4-1 - update to 1.8.1.4 diff --git a/sources b/sources index 7cceae7..8ffcf44 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ 60f32ef4a6b3fa2143b81a28704333ed git-1.8.1.4.tar.gz +d41cf9afd408246f5da123482d4ff744 git-htmldocs-1.8.1.4.tar.gz +61d19a9d386c686ee06b493a9df6e61c git-manpages-1.8.1.4.tar.gz From 83fc4ea137f2c8137c758ac306c8ba0b3ad5fdbb Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 4 Jan 2013 22:42:16 -0500 Subject: [PATCH 268/842] Respect gitexecdir variable in git-subtree install --- ...Use-gitexecdir-instead-of-libexecdir.patch | 42 +++++++++++++++++++ git.spec | 3 ++ 2 files changed, 45 insertions(+) create mode 100644 0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch diff --git a/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch b/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch new file mode 100644 index 0000000..73ae548 --- /dev/null +++ b/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch @@ -0,0 +1,42 @@ +From 86c3e2b5188579bff1ff981910462ad5e563044b Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Fri, 4 Jan 2013 11:54:21 -0500 +Subject: [PATCH] git-subtree: Use gitexecdir instead of libexecdir + +When the git subtree Makefile includes config.mak from the toplevel, +it's useful to have the same variables set globally applied. Using +gitexecdir instead of libexecdir respects the global settings more +consistently. + +Remove the unused gitdir variable as well. +--- + contrib/subtree/Makefile | 5 ++--- + 1 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile +index 36ae3e4..f87b945 100644 +--- a/contrib/subtree/Makefile ++++ b/contrib/subtree/Makefile +@@ -2,9 +2,8 @@ + -include ../../config.mak + + prefix ?= /usr/local ++gitexecdir ?= $(prefix)/libexec/git-core + mandir ?= $(prefix)/share/man +-libexecdir ?= $(prefix)/libexec/git-core +-gitdir ?= $(shell git --exec-path) + man1dir ?= $(mandir)/man1 + + gitver ?= $(word 3,$(shell git --version)) +@@ -30,7 +29,7 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH) + doc: $(GIT_SUBTREE_DOC) + + install: $(GIT_SUBTREE) +- $(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(libexecdir) ++ $(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(gitexecdir) + + install-doc: install-man + +-- +1.7.6 + diff --git a/git.spec b/git.spec index f8e01d5..d68ee5e 100644 --- a/git.spec +++ b/git.spec @@ -55,6 +55,7 @@ Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://bugzilla.redhat.com/600411 Patch3: git-1.7-el5-emacs-support.patch Patch4: 0001-DESTDIR-support-in-contrib-subtree-Makefile.patch +Patch5: 0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -260,6 +261,7 @@ Requires: emacs-git = %{version}-%{release} %patch3 -p1 %endif %patch4 -p1 +%patch5 -p1 %if %{use_prebuilt_docs} mkdir -p prebuilt_docs/{html,man} @@ -549,6 +551,7 @@ rm -rf %{buildroot} - Install tcsh completion (requires manual setup by users) - Clean up dist conditionals, don't pretend to support EL-4 builds - Use prebuilt documentation on EL-5, where asciidoc is too old +- Respect gitexecdir variable in git-subtree install * Wed Feb 20 2013 Adam Tkac - 1.8.1.4-1 - update to 1.8.1.4 From 2035ea87cbf4131865bb57e6eaf22b2a36a7c3c9 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Tue, 19 Mar 2013 18:01:03 +0100 Subject: [PATCH 269/842] Update to 1.8.2 - 0001-DESTDIR-support-in-contrib-subtree-Makefile.patch has been merged Signed-off-by: Adam Tkac --- ...-support-in-contrib-subtree-Makefile.patch | 32 ------------------- git.spec | 10 +++--- sources | 6 ++-- 3 files changed, 9 insertions(+), 39 deletions(-) delete mode 100644 0001-DESTDIR-support-in-contrib-subtree-Makefile.patch diff --git a/0001-DESTDIR-support-in-contrib-subtree-Makefile.patch b/0001-DESTDIR-support-in-contrib-subtree-Makefile.patch deleted file mode 100644 index b62c620..0000000 --- a/0001-DESTDIR-support-in-contrib-subtree-Makefile.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 02b6c8d3c07e3ca9aa091d4a865fe036e1794cbd Mon Sep 17 00:00:00 2001 -From: Adam Tkac -Date: Thu, 29 Nov 2012 16:18:03 +0100 -Subject: [PATCH] DESTDIR support in contrib/subtree/Makefile - -Signed-off-by: Adam Tkac ---- - contrib/subtree/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile -index 05cdd5c..36ae3e4 100644 ---- a/contrib/subtree/Makefile -+++ b/contrib/subtree/Makefile -@@ -30,12 +30,12 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH) - doc: $(GIT_SUBTREE_DOC) - - install: $(GIT_SUBTREE) -- $(INSTALL) -m 755 $(GIT_SUBTREE) $(libexecdir) -+ $(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(libexecdir) - - install-doc: install-man - - install-man: $(GIT_SUBTREE_DOC) -- $(INSTALL) -m 644 $^ $(man1dir) -+ $(INSTALL) -m 644 $^ $(DESTDIR)$(man1dir) - - $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML) - xmlto -m $(MANPAGE_NORMAL_XSL) man $^ --- -1.8.0.1 - diff --git a/git.spec b/git.spec index d68ee5e..ad635e3 100644 --- a/git.spec +++ b/git.spec @@ -35,8 +35,8 @@ %endif Name: git -Version: 1.8.1.4 -Release: 2%{?dist} +Version: 1.8.2 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -54,7 +54,6 @@ Patch0: git-1.5-gitweb-home-link.patch Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://bugzilla.redhat.com/600411 Patch3: git-1.7-el5-emacs-support.patch -Patch4: 0001-DESTDIR-support-in-contrib-subtree-Makefile.patch Patch5: 0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -260,7 +259,6 @@ Requires: emacs-git = %{version}-%{release} %if %{emacs_old} %patch3 -p1 %endif -%patch4 -p1 %patch5 -p1 %if %{use_prebuilt_docs} @@ -545,6 +543,10 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Mar 19 2013 Adam Tkac - 1.8.2-1 +- update to 1.8.2 +- 0001-DESTDIR-support-in-contrib-subtree-Makefile.patch has been merged + * Tue Feb 26 2013 Todd Zullinger - 1.8.1.4-2 - Update asciidoc requirements, drop unsupported ASCIIDOC7 - Define GNU_ROFF to force ASCII apostrophes in manpages (so copy/paste works) diff --git a/sources b/sources index 8ffcf44..f4eeea2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -60f32ef4a6b3fa2143b81a28704333ed git-1.8.1.4.tar.gz -d41cf9afd408246f5da123482d4ff744 git-htmldocs-1.8.1.4.tar.gz -61d19a9d386c686ee06b493a9df6e61c git-manpages-1.8.1.4.tar.gz +210834d73c857931c3da34a65eb3e597 git-1.8.2.tar.gz +fb7347ac4ac5152090fb0bda601963e5 git-htmldocs-1.8.2.tar.gz +425e9421a1b128cfb46fa46d94cad919 git-manpages-1.8.2.tar.gz From c0b6baf54bdd31e9065ca8d4ee661e0520ee6d40 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 27 Mar 2013 11:38:59 -0400 Subject: [PATCH 270/842] Require perl(Term::ReadKey) for git add --interactive (#928328) --- git.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index ad635e3..898c64e 100644 --- a/git.spec +++ b/git.spec @@ -36,7 +36,7 @@ Name: git Version: 1.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -77,6 +77,7 @@ BuildRequires: zlib-devel >= 1.2 Requires: less Requires: openssh-clients Requires: perl(Error) +Requires: perl(Term::ReadKey) Requires: perl-Git = %{version}-%{release} Requires: rsync Requires: zlib >= 1.2 @@ -543,6 +544,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Mar 27 2013 Todd Zullinger - 1.8.2-2 +- Require perl(Term::ReadKey) for git add --interactive (#928328) + * Tue Mar 19 2013 Adam Tkac - 1.8.2-1 - update to 1.8.2 - 0001-DESTDIR-support-in-contrib-subtree-Makefile.patch has been merged From b1cee327579e86589a94e12bd06d3b34ab23553b Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 28 Mar 2013 15:31:24 -0400 Subject: [PATCH 271/842] Drop DESTDIR from python instlibdir When building packages, we install to DESTDIR but we don't want this to end up hard-coded in the scripts. This needs discussed upstream to find a proper solution. --- ...-Drop-DESTDIR-from-python-instlibdir.patch | 29 +++++++++++++++++++ git.spec | 5 ++++ 2 files changed, 34 insertions(+) create mode 100644 0001-Drop-DESTDIR-from-python-instlibdir.patch diff --git a/0001-Drop-DESTDIR-from-python-instlibdir.patch b/0001-Drop-DESTDIR-from-python-instlibdir.patch new file mode 100644 index 0000000..b6e7120 --- /dev/null +++ b/0001-Drop-DESTDIR-from-python-instlibdir.patch @@ -0,0 +1,29 @@ +From d40d33173dc24d9b7ad6f5071994f90b5f9a71e8 Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Wed, 27 Mar 2013 14:01:57 -0400 +Subject: [PATCH] Drop DESTDIR from python instlibdir + +When building packages, we install to DESTDIR but we don't want this to +end up hard-coded in the scripts. + +This needs discussed upstream to find a proper solution. +--- + git_remote_helpers/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/git_remote_helpers/Makefile b/git_remote_helpers/Makefile +index 3d12232..36d40b5 100644 +--- a/git_remote_helpers/Makefile ++++ b/git_remote_helpers/Makefile +@@ -38,7 +38,7 @@ install: $(pysetupfile) + $(PYTHON_PATH) $(pysetupfile) install --prefix $(DESTDIR_SQ)$(prefix) + + instlibdir: $(pysetupfile) +- @echo "$(DESTDIR_SQ)$(prefix)/$(PYLIBDIR)" ++ @echo "$(prefix)/$(PYLIBDIR)" + + clean: + $(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) clean -a +-- +1.8.1 + diff --git a/git.spec b/git.spec index 898c64e..35ba2c2 100644 --- a/git.spec +++ b/git.spec @@ -55,6 +55,9 @@ Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://bugzilla.redhat.com/600411 Patch3: git-1.7-el5-emacs-support.patch Patch5: 0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch +# This fixes the build when python is enabled. Needs discussion upstream to +# find a proper solution. +Patch6: 0001-Drop-DESTDIR-from-python-instlibdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -261,6 +264,7 @@ Requires: emacs-git = %{version}-%{release} %patch3 -p1 %endif %patch5 -p1 +%patch6 -p1 %if %{use_prebuilt_docs} mkdir -p prebuilt_docs/{html,man} @@ -546,6 +550,7 @@ rm -rf %{buildroot} %changelog * Wed Mar 27 2013 Todd Zullinger - 1.8.2-2 - Require perl(Term::ReadKey) for git add --interactive (#928328) +- Drop DESTDIR from python instlibdir * Tue Mar 19 2013 Adam Tkac - 1.8.2-1 - update to 1.8.2 From 8f066e1e113fa58f6614468575e9497291676ac7 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 28 Mar 2013 15:32:10 -0400 Subject: [PATCH 272/842] Fix bogus changelog dates Recent rpm versions warn about these. Fix them before they become errors. --- git.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 35ba2c2..c1dfa49 100644 --- a/git.spec +++ b/git.spec @@ -551,6 +551,7 @@ rm -rf %{buildroot} * Wed Mar 27 2013 Todd Zullinger - 1.8.2-2 - Require perl(Term::ReadKey) for git add --interactive (#928328) - Drop DESTDIR from python instlibdir +- Fix bogus changelog dates * Tue Mar 19 2013 Adam Tkac - 1.8.2-1 - update to 1.8.2 @@ -1100,7 +1101,7 @@ rm -rf %{buildroot} * Fri Jun 08 2007 James Bowes 1.5.2.1-1 - git-1.5.2.1 -* Tue May 13 2007 Quy Tonthat +* Sun May 13 2007 Quy Tonthat - Added lib files for git-gui - Added Documentation/technical (As needed by Git Users Manual) @@ -1122,7 +1123,7 @@ rm -rf %{buildroot} * Mon Feb 26 2007 Chris Wright 1.5.0.2-1 - git-1.5.0.2 -* Mon Feb 13 2007 Nicolas Pitre +* Tue Feb 13 2007 Nicolas Pitre - Update core package description (Git isn't as stupid as it used to be) * Mon Feb 12 2007 Junio C Hamano @@ -1190,7 +1191,7 @@ rm -rf %{buildroot} * Mon Feb 13 2006 Chris Wright 1.2.0-1 - git-1.2.0 -* Tue Feb 1 2006 Chris Wright 1.1.6-1 +* Wed Feb 1 2006 Chris Wright 1.1.6-1 - git-1.1.6 * Tue Jan 24 2006 Chris Wright 1.1.4-1 @@ -1255,5 +1256,5 @@ rm -rf %{buildroot} * Thu Jul 14 2005 Eric Biederman - Add the man pages, and the --without docs build option -* Wed Jul 7 2005 Chris Wright +* Thu Jul 7 2005 Chris Wright - initial git spec file From 93f7b502632f86c27d9f9c0756ef83ae0be3f795 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 10 Apr 2013 12:08:05 -0500 Subject: [PATCH 273/842] Drop desktop vendor tag. --- git.spec | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index c1dfa49..bea2226 100644 --- a/git.spec +++ b/git.spec @@ -34,9 +34,15 @@ %global gnome_keyring 0 %endif +%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7) +%global with_desktop_vendor_tag 1 +%else +%global with_desktop_vendor_tag 0 +%endif + Name: git Version: 1.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -431,8 +437,11 @@ install -pm 644 contrib/completion/git-prompt.sh \ %{buildroot}%{_datadir}/git-core/contrib/completion/ # install git-gui .desktop file -desktop-file-install --vendor fedora \ - --dir=%{buildroot}%{_datadir}/applications %{SOURCE5} +desktop-file-install \ +%if %{with desktop_vendor_tag} + --vendor fedora \ +%endif + --dir=%{buildroot}%{_datadir}/applications %{SOURCE5} # find translations %find_lang %{name} %{name}.lang @@ -548,6 +557,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Apr 10 2013 Jon Ciesla - 1.8.2-3 +- Drop desktop vendor tag for >= f19. + * Wed Mar 27 2013 Todd Zullinger - 1.8.2-2 - Require perl(Term::ReadKey) for git add --interactive (#928328) - Drop DESTDIR from python instlibdir From b89c4c66e445d77a46ba39c16216d9199c7cf9da Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 14 Apr 2013 06:25:59 -0400 Subject: [PATCH 274/842] Update to 1.8.2.1 --- git.spec | 7 +++++-- sources | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index bea2226..da201e1 100644 --- a/git.spec +++ b/git.spec @@ -41,8 +41,8 @@ %endif Name: git -Version: 1.8.2 -Release: 3%{?dist} +Version: 1.8.2.1 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -557,6 +557,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sun Apr 14 2013 Todd Zullinger - 1.8.2.1-1 +- Update to 1.8.2.1 + * Wed Apr 10 2013 Jon Ciesla - 1.8.2-3 - Drop desktop vendor tag for >= f19. diff --git a/sources b/sources index f4eeea2..b8e9dd0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -210834d73c857931c3da34a65eb3e597 git-1.8.2.tar.gz -fb7347ac4ac5152090fb0bda601963e5 git-htmldocs-1.8.2.tar.gz -425e9421a1b128cfb46fa46d94cad919 git-manpages-1.8.2.tar.gz +3f6ebca116c627490e4ee1f1324d5e65 git-1.8.2.1.tar.gz +e53c46eca9e5f5da8fde35e1edc1d00b git-htmldocs-1.8.2.1.tar.gz +8ec6ab4d8c868305e9a679f5c3d2ccfa git-manpages-1.8.2.1.tar.gz From af4c4fa13c15597a94d9964a8ae1e2110269af10 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 14 Apr 2013 06:28:41 -0400 Subject: [PATCH 275/842] Exclude optional perl(YAML::Any) dependency on EL-5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream took great care to make use of YAML::Any optional¹. It's fine to pull it in on Fedora and EL >= 6, but it's not available for EL-5 so we'll just filter it from the requirements. ¹ git-svn: use YAML format for mergeinfo cache when possible https://github.com/git/git/commit/68f532f4b --- git.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index da201e1..5a1966b 100644 --- a/git.spec +++ b/git.spec @@ -16,6 +16,7 @@ %global docbook_suppress_sp 1 %global enable_ipv6 1 %global use_prebuilt_docs 1 +%global filter_yaml_any 1 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %else %global gitcoredir %{_libexecdir}/git-core @@ -25,6 +26,7 @@ %global docbook_suppress_sp 0 %global enable_ipv6 0 %global use_prebuilt_docs 0 +%global filter_yaml_any 0 %endif # Build gnome-keyring git-credential helper on Fedora and RHEL >= 7 @@ -310,10 +312,15 @@ echo DOCBOOK_SUPPRESS_SP = 1 >> config.mak # Filter bogus perl requires # packed-refs comes from a comment in contrib/hooks/update-paranoid +# YAML::Any is optional and not available on el5 cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} $* |\ -sed -e '/perl(packed-refs)/d' +sed \ +%if %{filter_yaml_any} + -e '/perl(YAML::Any)/d' \ +%endif + -e '/perl(packed-refs)/d' EOF %global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req @@ -559,6 +566,7 @@ rm -rf %{buildroot} %changelog * Sun Apr 14 2013 Todd Zullinger - 1.8.2.1-1 - Update to 1.8.2.1 +- Exclude optional perl(YAML::Any) dependency on EL-5 * Wed Apr 10 2013 Jon Ciesla - 1.8.2-3 - Drop desktop vendor tag for >= f19. From d7389e7fc0880e68b829e664148e742f4f3d3a96 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 30 Apr 2013 14:25:37 -0400 Subject: [PATCH 276/842] use systemd instead of xinetd (bz 737183) --- git.service | 9 +++++++++ git.socket | 9 +++++++++ git.spec | 39 +++++++++++++++++++++++++-------------- 3 files changed, 43 insertions(+), 14 deletions(-) create mode 100644 git.service create mode 100644 git.socket diff --git a/git.service b/git.service new file mode 100644 index 0000000..07cbe6e --- /dev/null +++ b/git.service @@ -0,0 +1,9 @@ +[Unit] +Description=Git Repositories Server Daemon +Documentation=man:git-daemon(1) +Wants=git.socket + +[Service] +User=nobody +ExecStart=/usr/libexec/git-core/git-daemon --base-path=/var/lib/git --export-all --user-path=public_git --syslog --inetd --verbose +StandardInput=socket diff --git a/git.socket b/git.socket new file mode 100644 index 0000000..3dec01d --- /dev/null +++ b/git.socket @@ -0,0 +1,9 @@ +[Unit] +Description=Git Activation Socket + +[Socket] +ListenStream=9418 +Accept=true + +[Install] +WantedBy=sockets.target diff --git a/git.spec b/git.spec index 5a1966b..e23a4c2 100644 --- a/git.spec +++ b/git.spec @@ -44,19 +44,20 @@ Name: git Version: 1.8.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools URL: http://git-scm.com/ Source0: http://git-core.googlecode.com/files/%{name}-%{version}.tar.gz Source2: git-init.el -Source3: git.xinetd.in Source4: git.conf.httpd Source5: git-gui.desktop Source6: gitweb.conf.in Source10: http://git-core.googlecode.com/files/%{name}-manpages-%{version}.tar.gz Source11: http://git-core.googlecode.com/files/%{name}-htmldocs-%{version}.tar.gz +Source12: git.service +Source13: git.socket Patch0: git-1.5-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch @@ -84,6 +85,8 @@ BuildRequires: libgnome-keyring-devel BuildRequires: pcre-devel BuildRequires: openssl-devel BuildRequires: zlib-devel >= 1.2 +# For macros +BuildRequires: systemd Requires: less Requires: openssh-clients @@ -93,6 +96,10 @@ Requires: perl-Git = %{version}-%{release} Requires: rsync Requires: zlib >= 1.2 +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd + Provides: git-core = %{version}-%{release} Obsoletes: git-core <= 1.5.4.3 @@ -409,17 +416,8 @@ rm -rf %{buildroot}%{_mandir} %endif mkdir -p %{buildroot}%{_var}/lib/git -mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d -# On EL <= 5, xinetd does not enable IPv6 by default -enable_ipv6=" # xinetd does not enable IPv6 by default - flags = IPv6" -perl -p \ - -e "s|\@GITCOREDIR\@|%{gitcoredir}|g;" \ - -e "s|\@BASE_PATH\@|%{_var}/lib/git|g;" \ -%if %{enable_ipv6} - -e "s|^}|$enable_ipv6\n$&|;" \ -%endif - %{SOURCE3} > %{buildroot}%{_sysconfdir}/xinetd.d/git +mkdir -p %{buildroot}%{_unitdir} +cp -a %{SOURCE12} %{SOURCE13} %{buildroot}%{_unitdir} # Setup bash completion mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d @@ -465,6 +463,15 @@ find contrib -type f | xargs chmod -x %clean rm -rf %{buildroot} +%post daemon +%systemd_post git.service + +%preun daemon +%systemd_preun git.service + +%postun +%systemd_postun_with_restart git.service + %files -f bin-man-doc-files %defattr(-,root,root) @@ -546,7 +553,8 @@ rm -rf %{buildroot} %files daemon %defattr(-,root,root) %doc Documentation/*daemon*.txt -%config(noreplace)%{_sysconfdir}/xinetd.d/git +%{_unitdir}/git.socket +%{_unitdir}/git.service %{gitcoredir}/git-daemon %{_var}/lib/git %{!?_without_docs: %{_mandir}/man1/*daemon*.1*} @@ -564,6 +572,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Apr 30 2013 Tom Callaway - 1.8.2.1-2 +- switch to systemd instead of xinetd (bz 737183) + * Sun Apr 14 2013 Todd Zullinger - 1.8.2.1-1 - Update to 1.8.2.1 - Exclude optional perl(YAML::Any) dependency on EL-5 From 7d37533bd7814b7aad4733a43dc30d47b8d59de4 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 1 May 2013 11:43:06 -0400 Subject: [PATCH 277/842] conditionalize systemd vs xinetd, cleanup systemd handling (it was not quite right in -2) --- git.spec | 51 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 44 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index e23a4c2..239afa8 100644 --- a/git.spec +++ b/git.spec @@ -29,6 +29,13 @@ %global filter_yaml_any 0 %endif +# Use systemd instead of xinetd on Fedora 19+ and RHEL 7+ +%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 +%global use_systemd 1 +%else +%global use_systemd 0 +%endif + # Build gnome-keyring git-credential helper on Fedora and RHEL >= 7 %if 0%{?fedora} || 0%{?rhel} >= 7 %global gnome_keyring 1 @@ -51,6 +58,7 @@ Group: Development/Tools URL: http://git-scm.com/ Source0: http://git-core.googlecode.com/files/%{name}-%{version}.tar.gz Source2: git-init.el +Source3: git.xinetd.in Source4: git.conf.httpd Source5: git-gui.desktop Source6: gitweb.conf.in @@ -85,8 +93,10 @@ BuildRequires: libgnome-keyring-devel BuildRequires: pcre-devel BuildRequires: openssl-devel BuildRequires: zlib-devel >= 1.2 +%if %{use_systemd} # For macros BuildRequires: systemd +%endif Requires: less Requires: openssh-clients @@ -96,10 +106,6 @@ Requires: perl-Git = %{version}-%{release} Requires: rsync Requires: zlib >= 1.2 -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd - Provides: git-core = %{version}-%{release} Obsoletes: git-core <= 1.5.4.3 @@ -142,7 +148,15 @@ This is a dummy package which brings in all subpackages. %package daemon Summary: Git protocol dæmon Group: Development/Tools -Requires: git = %{version}-%{release}, xinetd +Requires: git = %{version}-%{release} +%if %{use_systemd} +Requires: systemd +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +%else +Requires: xinetd +%endif %description daemon The git dæmon for supporting git:// access to git repositories @@ -416,8 +430,22 @@ rm -rf %{buildroot}%{_mandir} %endif mkdir -p %{buildroot}%{_var}/lib/git +%if %{use_systemd} mkdir -p %{buildroot}%{_unitdir} cp -a %{SOURCE12} %{SOURCE13} %{buildroot}%{_unitdir} +%else +mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d +# On EL <= 5, xinetd does not enable IPv6 by default +enable_ipv6=" # xinetd does not enable IPv6 by default + flags = IPv6" +perl -p \ + -e "s|\@GITCOREDIR\@|%{gitcoredir}|g;" \ + -e "s|\@BASE_PATH\@|%{_var}/lib/git|g;" \ +%if %{enable_ipv6} + -e "s|^}|$enable_ipv6\n$&|;" \ +%endif + %{SOURCE3} > %{buildroot}%{_sysconfdir}/xinetd.d/git +%endif # Setup bash completion mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d @@ -463,15 +491,16 @@ find contrib -type f | xargs chmod -x %clean rm -rf %{buildroot} +%if %{use_systemd} %post daemon %systemd_post git.service %preun daemon %systemd_preun git.service -%postun +%postun daemon %systemd_postun_with_restart git.service - +%endif %files -f bin-man-doc-files %defattr(-,root,root) @@ -553,8 +582,12 @@ rm -rf %{buildroot} %files daemon %defattr(-,root,root) %doc Documentation/*daemon*.txt +%if %{use_systemd} %{_unitdir}/git.socket %{_unitdir}/git.service +%else +%config(noreplace)%{_sysconfdir}/xinetd.d/git +%endif %{gitcoredir}/git-daemon %{_var}/lib/git %{!?_without_docs: %{_mandir}/man1/*daemon*.1*} @@ -572,6 +605,10 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed May 1 2013 Tom Callaway - 1.8.2.1-3 +- conditionalize systemd vs xinetd +- cleanup systemd handling (it was not quite right in -2) + * Tue Apr 30 2013 Tom Callaway - 1.8.2.1-2 - switch to systemd instead of xinetd (bz 737183) From 7f3286eb193ba368a0df685b528edf62729e960c Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 1 May 2013 11:43:40 -0400 Subject: [PATCH 278/842] conditionalize systemd vs xinetd, cleanup systemd handling (it was not quite right in -2) --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 239afa8..a1c89af 100644 --- a/git.spec +++ b/git.spec @@ -51,7 +51,7 @@ Name: git Version: 1.8.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools From 7a9ebd43463202db5cb435e9bc6166867bdebfd4 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 13 May 2013 13:45:22 -0500 Subject: [PATCH 279/842] Fix desktop tag handling. --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index a1c89af..839760e 100644 --- a/git.spec +++ b/git.spec @@ -51,7 +51,7 @@ Name: git Version: 1.8.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -471,7 +471,7 @@ install -pm 644 contrib/completion/git-prompt.sh \ # install git-gui .desktop file desktop-file-install \ -%if %{with desktop_vendor_tag} +%if %{with_desktop_vendor_tag} --vendor fedora \ %endif --dir=%{buildroot}%{_datadir}/applications %{SOURCE5} @@ -605,6 +605,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon May 13 2013 Jon Ciesla - 1.8.2.1-4 +- Fix typo introduced in 1.8.2-3, fixed desktop tag. + * Wed May 1 2013 Tom Callaway - 1.8.2.1-3 - conditionalize systemd vs xinetd - cleanup systemd handling (it was not quite right in -2) From ecb39db941ad907c9154123c7e4d451a8a13870b Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 16 Jun 2013 02:11:44 -0400 Subject: [PATCH 280/842] Update to 1.8.3.1 --- git.spec | 7 +++++-- sources | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index 839760e..c230f22 100644 --- a/git.spec +++ b/git.spec @@ -50,8 +50,8 @@ %endif Name: git -Version: 1.8.2.1 -Release: 4%{?dist} +Version: 1.8.3.1 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -605,6 +605,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Jun 14 2013 Todd Zullinger - 1.8.3.1-1 +- Update to 1.8.3.1 + * Mon May 13 2013 Jon Ciesla - 1.8.2.1-4 - Fix typo introduced in 1.8.2-3, fixed desktop tag. diff --git a/sources b/sources index b8e9dd0..58aaa49 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -3f6ebca116c627490e4ee1f1324d5e65 git-1.8.2.1.tar.gz -e53c46eca9e5f5da8fde35e1edc1d00b git-htmldocs-1.8.2.1.tar.gz -8ec6ab4d8c868305e9a679f5c3d2ccfa git-manpages-1.8.2.1.tar.gz +35401b410e7f248b13e35a1069aca2e2 git-1.8.3.1.tar.gz +bc031fe54e61c1635eba2b08341ece16 git-htmldocs-1.8.3.1.tar.gz +3f801cc82a58c2c2ceeab95975114113 git-manpages-1.8.3.1.tar.gz From bea129cceaa016a660dfe0d2c60e57ad0955ae37 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 16 Jun 2013 02:23:59 -0400 Subject: [PATCH 281/842] Consolidate file exclude regex Rather than maintaining the same list if 3 different places, use a single exclude_re variable for the files we want to exclude from the main package file list. --- git.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index c230f22..b0d688e 100644 --- a/git.spec +++ b/git.spec @@ -416,15 +416,16 @@ rm -rf %{buildroot}%{python_sitelib} %{buildroot}%{gitcoredir}/git-remote-testgi # git-archimport is not supported find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' -(find %{buildroot}{%{_bindir},%{_libexecdir}} -type f | grep -vE "archimport|p4|svn|cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e s@^%{buildroot}@@) > bin-man-doc-files -(find %{buildroot}{%{_bindir},%{_libexecdir}} -mindepth 1 -type d | grep -vE "archimport|p4|svn|cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files +exclude_re="archimport|email|git-citool|git-cvs|git-daemon|git-gui|gitk|p4|svn" +(find %{buildroot}{%{_bindir},%{_libexecdir}} -type f | grep -vE "$exclude_re" | sed -e s@^%{buildroot}@@) > bin-man-doc-files +(find %{buildroot}{%{_bindir},%{_libexecdir}} -mindepth 1 -type d | grep -vE "$exclude_re" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files (find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) > perl-git-files (find %{buildroot}%{perl_vendorlib} -mindepth 1 -type d | sed -e 's@^%{buildroot}@%dir @') >> perl-git-files # Split out Git::SVN files grep Git/SVN perl-git-files > perl-git-svn-files sed -i "/Git\/SVN/ d" perl-git-files %if %{!?_without_docs:1}0 -(find %{buildroot}%{_mandir} -type f | grep -vE "archimport|p4|svn|git-cvs|email|gitk|git-gui|git-citool|git-daemon|Git" | sed -e s@^%{buildroot}@@ -e 's/$/*/' ) >> bin-man-doc-files +(find %{buildroot}%{_mandir} -type f | grep -vE "$exclude_re|Git" | sed -e s@^%{buildroot}@@ -e 's/$/*/' ) >> bin-man-doc-files %else rm -rf %{buildroot}%{_mandir} %endif From 5bc5942c590c8f2da71bf14ec5e358fa9cef170b Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 16 Jun 2013 02:31:53 -0400 Subject: [PATCH 282/842] Add bzr and hg subpackages, thanks to Michael Scherer (#974800) These new remote helpers come from contrib, but they might be useful for folks that must interact with bzr and hg repositories. --- git.spec | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index b0d688e..1294945 100644 --- a/git.spec +++ b/git.spec @@ -145,6 +145,18 @@ and full access to internals. This is a dummy package which brings in all subpackages. +%package bzr +Summary: Git tools for working with bzr repositories +Group: Development/Tools +%if %{noarch_sub} +BuildArch: noarch +%endif +Requires: git = %{version}-%{release} +Requires: bzr + +%description bzr +%{summary}. + %package daemon Summary: Git protocol dæmon Group: Development/Tools @@ -171,6 +183,18 @@ Requires: git = %{version}-%{release} %description -n gitweb Simple web interface to track changes in git repositories +%package hg +Summary: Git tools for working with mercurial repositories +Group: Development/Tools +%if %{noarch_sub} +BuildArch: noarch +%endif +Requires: git = %{version}-%{release} +Requires: mercurial + +%description hg +%{summary}. + %package p4 Summary: Git tools for working with Perforce depots Group: Development/Tools @@ -416,7 +440,7 @@ rm -rf %{buildroot}%{python_sitelib} %{buildroot}%{gitcoredir}/git-remote-testgi # git-archimport is not supported find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' -exclude_re="archimport|email|git-citool|git-cvs|git-daemon|git-gui|gitk|p4|svn" +exclude_re="archimport|email|git-citool|git-cvs|git-daemon|git-gui|git-remote-bzr|git-remote-hg|gitk|p4|svn" (find %{buildroot}{%{_bindir},%{_libexecdir}} -type f | grep -vE "$exclude_re" | sed -e s@^%{buildroot}@@) > bin-man-doc-files (find %{buildroot}{%{_bindir},%{_libexecdir}} -mindepth 1 -type d | grep -vE "$exclude_re" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files (find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) > perl-git-files @@ -448,6 +472,9 @@ perl -p \ %{SOURCE3} > %{buildroot}%{_sysconfdir}/xinetd.d/git %endif +# Install bzr and hg remote helpers from contrib +install -pm 755 contrib/remote-helpers/git-remote-{bzr,hg} %{buildroot}%{gitcoredir} + # Setup bash completion mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d install -pm 644 contrib/completion/git-completion.bash %{buildroot}%{_sysconfdir}/bash_completion.d/git @@ -511,6 +538,14 @@ rm -rf %{buildroot} %{!?_without_docs: %doc Documentation/howto Documentation/technical} %{_sysconfdir}/bash_completion.d +%files bzr +%defattr(-,root,root) +%{gitcoredir}/git-remote-bzr + +%files hg +%defattr(-,root,root) +%{gitcoredir}/git-remote-hg + %files p4 %defattr(-,root,root) %{gitcoredir}/*p4* @@ -608,6 +643,7 @@ rm -rf %{buildroot} %changelog * Fri Jun 14 2013 Todd Zullinger - 1.8.3.1-1 - Update to 1.8.3.1 +- Add bzr and hg subpackages, thanks to Michael Scherer (#974800) * Mon May 13 2013 Jon Ciesla - 1.8.2.1-4 - Fix typo introduced in 1.8.2-3, fixed desktop tag. From 98bc1359b37a04f4592924036958d32a1c78c4c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 15 Jul 2013 11:38:32 +0200 Subject: [PATCH 283/842] Perl 5.18 rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 1294945..c30300e 100644 --- a/git.spec +++ b/git.spec @@ -51,7 +51,7 @@ Name: git Version: 1.8.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -641,6 +641,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Jul 15 2013 Petr Pisar - 1.8.3.1-2 +- Perl 5.18 rebuild + * Fri Jun 14 2013 Todd Zullinger - 1.8.3.1-1 - Update to 1.8.3.1 - Add bzr and hg subpackages, thanks to Michael Scherer (#974800) From 0683113f08adfae0e1ec494a316c817ba7ef838e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 09:24:31 -0500 Subject: [PATCH 284/842] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index c30300e..4d7eb2a 100644 --- a/git.spec +++ b/git.spec @@ -51,7 +51,7 @@ Name: git Version: 1.8.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -641,6 +641,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.8.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Mon Jul 15 2013 Petr Pisar - 1.8.3.1-2 - Perl 5.18 rebuild From 6d6415cb3026c08a855c3bd3a941579174428085 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 5 Oct 2013 12:40:58 -0400 Subject: [PATCH 285/842] Add mercurial version requirement to git-hg, for those rebuilding on EL --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 4d7eb2a..6099b8f 100644 --- a/git.spec +++ b/git.spec @@ -190,7 +190,7 @@ Group: Development/Tools BuildArch: noarch %endif Requires: git = %{version}-%{release} -Requires: mercurial +Requires: mercurial >= 1.8 %description hg %{summary}. @@ -641,6 +641,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sat Oct 05 2013 Todd Zullinger +- Add mercurial version requirement to git-hg, for those rebuilding on EL + * Sat Aug 03 2013 Fedora Release Engineering - 1.8.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 526bc47a2aaf51c910a3a94a4820de8d1aad583b Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 29 Oct 2013 16:59:55 -0400 Subject: [PATCH 286/842] Update to 1.8.4.2 (#1024497) --- ...tree-Use-gitexecdir-instead-of-libexecdir.patch | 14 ++++++++------ git-1.5-gitweb-home-link.patch | 12 ------------ git-1.8-gitweb-home-link.patch | 12 ++++++++++++ git.spec | 9 ++++++--- sources | 6 +++--- 5 files changed, 29 insertions(+), 24 deletions(-) delete mode 100644 git-1.5-gitweb-home-link.patch create mode 100644 git-1.8-gitweb-home-link.patch diff --git a/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch b/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch index 73ae548..af57b28 100644 --- a/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch +++ b/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch @@ -1,4 +1,4 @@ -From 86c3e2b5188579bff1ff981910462ad5e563044b Mon Sep 17 00:00:00 2001 +From a906459c2a89938e911f1650e6ce22315a1ec84d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 4 Jan 2013 11:54:21 -0500 Subject: [PATCH] git-subtree: Use gitexecdir instead of libexecdir @@ -10,11 +10,11 @@ consistently. Remove the unused gitdir variable as well. --- - contrib/subtree/Makefile | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) + contrib/subtree/Makefile | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile -index 36ae3e4..f87b945 100644 +index 435b2de..dc8da19 100644 --- a/contrib/subtree/Makefile +++ b/contrib/subtree/Makefile @@ -2,9 +2,8 @@ @@ -28,15 +28,17 @@ index 36ae3e4..f87b945 100644 man1dir ?= $(mandir)/man1 gitver ?= $(word 3,$(shell git --version)) -@@ -30,7 +29,7 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH) +@@ -30,8 +29,8 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH) doc: $(GIT_SUBTREE_DOC) install: $(GIT_SUBTREE) +- $(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir) - $(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(libexecdir) ++ $(INSTALL) -d -m 755 $(DESTDIR)$(gitexecdir) + $(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(gitexecdir) install-doc: install-man -- -1.7.6 +1.8.3.1 diff --git a/git-1.5-gitweb-home-link.patch b/git-1.5-gitweb-home-link.patch deleted file mode 100644 index 74c8390..0000000 --- a/git-1.5-gitweb-home-link.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up git-1.7.2/gitweb/gitweb.perl.orig git-1.7.2/gitweb/gitweb.perl ---- git-1.7.2/gitweb/gitweb.perl.orig 2010-07-21 23:35:25.000000000 +0200 -+++ git-1.7.2/gitweb/gitweb.perl 2010-07-22 10:49:50.385707086 +0200 -@@ -79,7 +79,7 @@ our $projectroot = "++GITWEB_PROJECTROOT - our $project_maxdepth = "++GITWEB_PROJECT_MAXDEPTH++"; - - # string of the home link on top of all pages --our $home_link_str = "++GITWEB_HOME_LINK_STR++"; -+our $home_link_str = $ENV{'SERVER_NAME'} ? "git://" . $ENV{'SERVER_NAME'} : "projects"; - - # name of your site or organization to appear in page titles - # replace this with something more descriptive for clearer bookmarks diff --git a/git-1.8-gitweb-home-link.patch b/git-1.8-gitweb-home-link.patch new file mode 100644 index 0000000..aeb29e0 --- /dev/null +++ b/git-1.8-gitweb-home-link.patch @@ -0,0 +1,12 @@ +diff -up git-1.8.4.2/gitweb/gitweb.perl.orig git-1.8.4.2/gitweb/gitweb.perl +--- git-1.8.4.2/gitweb/gitweb.perl.orig 2013-10-28 14:17:38.000000000 -0400 ++++ git-1.8.4.2/gitweb/gitweb.perl 2013-10-29 16:49:07.302747507 -0400 +@@ -83,7 +83,7 @@ our $projectroot = "++GITWEB_PROJECTROOT + our $project_maxdepth = "++GITWEB_PROJECT_MAXDEPTH++"; + + # string of the home link on top of all pages +-our $home_link_str = "++GITWEB_HOME_LINK_STR++"; ++our $home_link_str = $ENV{'SERVER_NAME'} ? "git://" . $ENV{'SERVER_NAME'} : "projects"; + + # extra breadcrumbs preceding the home link + our @extra_breadcrumbs = (); diff --git a/git.spec b/git.spec index 6099b8f..e051bb8 100644 --- a/git.spec +++ b/git.spec @@ -50,8 +50,8 @@ %endif Name: git -Version: 1.8.3.1 -Release: 3%{?dist} +Version: 1.8.4.2 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -66,7 +66,7 @@ Source10: http://git-core.googlecode.com/files/%{name}-manpages-%{version} Source11: http://git-core.googlecode.com/files/%{name}-htmldocs-%{version}.tar.gz Source12: git.service Source13: git.socket -Patch0: git-1.5-gitweb-home-link.patch +Patch0: git-1.8-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://bugzilla.redhat.com/600411 @@ -641,6 +641,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Oct 29 2013 Todd Zullinger - 1.8.4.2-1 +- Update to 1.8.4.2 (#1024497) + * Sat Oct 05 2013 Todd Zullinger - Add mercurial version requirement to git-hg, for those rebuilding on EL diff --git a/sources b/sources index 58aaa49..84b079d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -35401b410e7f248b13e35a1069aca2e2 git-1.8.3.1.tar.gz -bc031fe54e61c1635eba2b08341ece16 git-htmldocs-1.8.3.1.tar.gz -3f801cc82a58c2c2ceeab95975114113 git-manpages-1.8.3.1.tar.gz +6f63d103465b86ca0ebe4189ea54731c git-1.8.4.2.tar.gz +c76a6755d109bd2881da6813dac69153 git-htmldocs-1.8.4.2.tar.gz +2b4719ec820d845134b689247abe65e8 git-manpages-1.8.4.2.tar.gz From a9c6aee09c94055a07acda26b1badfd9082d7654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 13 Nov 2013 20:31:42 +0200 Subject: [PATCH 287/842] Fix htmldir when doc dir is unversioned (#993779). --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index e051bb8..6ec930c 100644 --- a/git.spec +++ b/git.spec @@ -51,7 +51,7 @@ Name: git Version: 1.8.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -341,7 +341,7 @@ DESTDIR = %{buildroot} INSTALL = install -p GITWEB_PROJECTROOT = %{_var}/lib/git GNU_ROFF = 1 -htmldir = %{_docdir}/%{name}-%{version} +htmldir = %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} prefix = %{_prefix} gitwebdir = %{_var}/www/git EOF @@ -641,6 +641,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Nov 13 2013 Ville Skyttä - 1.8.4.2-2 +- Fix htmldir when doc dir is unversioned (#993779). + * Tue Oct 29 2013 Todd Zullinger - 1.8.4.2-1 - Update to 1.8.4.2 (#1024497) From a29da9568fa4194b4714b19a320be5d5bb286dd7 Mon Sep 17 00:00:00 2001 From: Ondrej Oprala Date: Wed, 18 Dec 2013 14:54:54 +0100 Subject: [PATCH 288/842] Update to 1.8.5.2 --- ...it-subtree-Use-gitexecdir-instead-of-libexecdir.patch | 2 +- git.spec | 9 ++++++--- sources | 6 +++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch b/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch index af57b28..421710c 100644 --- a/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch +++ b/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch @@ -29,7 +29,7 @@ index 435b2de..dc8da19 100644 gitver ?= $(word 3,$(shell git --version)) @@ -30,8 +29,8 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH) - doc: $(GIT_SUBTREE_DOC) + doc: $(GIT_SUBTREE_DOC) $(GIT_SUBTREE_HTML) install: $(GIT_SUBTREE) - $(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir) diff --git a/git.spec b/git.spec index 6ec930c..134e101 100644 --- a/git.spec +++ b/git.spec @@ -50,8 +50,8 @@ %endif Name: git -Version: 1.8.4.2 -Release: 2%{?dist} +Version: 1.8.5.2 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -317,7 +317,7 @@ Requires: emacs-git = %{version}-%{release} %patch3 -p1 %endif %patch5 -p1 -%patch6 -p1 +#%patch6 -p1 %if %{use_prebuilt_docs} mkdir -p prebuilt_docs/{html,man} @@ -641,6 +641,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Dec 18 2013 Ondrej Oprala - 1.8.5.2-1 +* Update to 1.8.5.2 + * Wed Nov 13 2013 Ville Skyttä - 1.8.4.2-2 - Fix htmldir when doc dir is unversioned (#993779). diff --git a/sources b/sources index 84b079d..be78e4a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -6f63d103465b86ca0ebe4189ea54731c git-1.8.4.2.tar.gz -c76a6755d109bd2881da6813dac69153 git-htmldocs-1.8.4.2.tar.gz -2b4719ec820d845134b689247abe65e8 git-manpages-1.8.4.2.tar.gz +df8519044f9880f3687d863d99245282 git-1.8.5.2.tar.gz +ef4cd0547218bcdbe0a09487f8d3675c git-htmldocs-1.8.5.2.tar.gz +27851cc39808f1be6d3789fae87c8308 git-manpages-1.8.5.2.tar.gz From a0d6c92a2144a38a643dac7fc9c43e2dbbd2b115 Mon Sep 17 00:00:00 2001 From: Ondrej Oprala Date: Thu, 16 Jan 2014 14:35:01 +0100 Subject: [PATCH 289/842] Update to 1.8.5.3 --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 134e101..80f3732 100644 --- a/git.spec +++ b/git.spec @@ -50,7 +50,7 @@ %endif Name: git -Version: 1.8.5.2 +Version: 1.8.5.3 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -641,6 +641,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Jan 16 2014 Ondrej Oprala - 1.8.5.3-1 +* Update to 1.8.5.3 + * Wed Dec 18 2013 Ondrej Oprala - 1.8.5.2-1 * Update to 1.8.5.2 diff --git a/sources b/sources index be78e4a..0100e7b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -df8519044f9880f3687d863d99245282 git-1.8.5.2.tar.gz -ef4cd0547218bcdbe0a09487f8d3675c git-htmldocs-1.8.5.2.tar.gz -27851cc39808f1be6d3789fae87c8308 git-manpages-1.8.5.2.tar.gz +57b966065882f83ef5879620a1e329ca git-1.8.5.3.tar.gz +77f833deb7db71fa275e942d7ec10019 git-htmldocs-1.8.5.3.tar.gz +8602e319e85e031aae9e674306928181 git-manpages-1.8.5.3.tar.gz From d784390dc816839c0f132e7f2f1477ee106f9c1a Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 15 Jan 2014 12:18:52 -0500 Subject: [PATCH 290/842] Remove the unused patch for DESTDIR in the python instlibdir Changes in git-1.8.5 made the files it patched irrelevant. We also no longer need to remove %{python_sitelib} or %{gitcoredir}/git-remote-testgit. --- ...-Drop-DESTDIR-from-python-instlibdir.patch | 29 ------------------- git.spec | 13 +++------ 2 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 0001-Drop-DESTDIR-from-python-instlibdir.patch diff --git a/0001-Drop-DESTDIR-from-python-instlibdir.patch b/0001-Drop-DESTDIR-from-python-instlibdir.patch deleted file mode 100644 index b6e7120..0000000 --- a/0001-Drop-DESTDIR-from-python-instlibdir.patch +++ /dev/null @@ -1,29 +0,0 @@ -From d40d33173dc24d9b7ad6f5071994f90b5f9a71e8 Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Wed, 27 Mar 2013 14:01:57 -0400 -Subject: [PATCH] Drop DESTDIR from python instlibdir - -When building packages, we install to DESTDIR but we don't want this to -end up hard-coded in the scripts. - -This needs discussed upstream to find a proper solution. ---- - git_remote_helpers/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/git_remote_helpers/Makefile b/git_remote_helpers/Makefile -index 3d12232..36d40b5 100644 ---- a/git_remote_helpers/Makefile -+++ b/git_remote_helpers/Makefile -@@ -38,7 +38,7 @@ install: $(pysetupfile) - $(PYTHON_PATH) $(pysetupfile) install --prefix $(DESTDIR_SQ)$(prefix) - - instlibdir: $(pysetupfile) -- @echo "$(DESTDIR_SQ)$(prefix)/$(PYLIBDIR)" -+ @echo "$(prefix)/$(PYLIBDIR)" - - clean: - $(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) clean -a --- -1.8.1 - diff --git a/git.spec b/git.spec index 80f3732..a123d3d 100644 --- a/git.spec +++ b/git.spec @@ -51,7 +51,7 @@ Name: git Version: 1.8.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -72,9 +72,6 @@ Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://bugzilla.redhat.com/600411 Patch3: git-1.7-el5-emacs-support.patch Patch5: 0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch -# This fixes the build when python is enabled. Needs discussion upstream to -# find a proper solution. -Patch6: 0001-Drop-DESTDIR-from-python-instlibdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -317,7 +314,6 @@ Requires: emacs-git = %{version}-%{release} %patch3 -p1 %endif %patch5 -p1 -#%patch6 -p1 %if %{use_prebuilt_docs} mkdir -p prebuilt_docs/{html,man} @@ -433,10 +429,6 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';' find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';' -# Remove remote-helper python libraries and scripts, these are not ready for -# use yet -rm -rf %{buildroot}%{python_sitelib} %{buildroot}%{gitcoredir}/git-remote-testgit - # git-archimport is not supported find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' @@ -641,6 +633,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Jan 16 2014 Todd Zullinger - 1.8.5.3-2 +- Drop unused python DESTIR patch + * Thu Jan 16 2014 Ondrej Oprala - 1.8.5.3-1 * Update to 1.8.5.3 From 39327d26758ae23c7d6ce30f4f0b4387d9d0d603 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 15 Jan 2014 13:07:37 -0500 Subject: [PATCH 291/842] Consolidate settings for Fedora 19+ and EL 7+ This makes it easier to manage the settings and avoids adding a separate if/else section for many of the settings. --- git.spec | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/git.spec b/git.spec index a123d3d..545514d 100644 --- a/git.spec +++ b/git.spec @@ -29,24 +29,15 @@ %global filter_yaml_any 0 %endif -# Use systemd instead of xinetd on Fedora 19+ and RHEL 7+ +# Settings for F-19+ and EL-7+ %if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 -%global use_systemd 1 +%global desktop_vendor_tag 0 +%global gnome_keyring 1 +%global use_systemd 1 %else -%global use_systemd 0 -%endif - -# Build gnome-keyring git-credential helper on Fedora and RHEL >= 7 -%if 0%{?fedora} || 0%{?rhel} >= 7 -%global gnome_keyring 1 -%else -%global gnome_keyring 0 -%endif - -%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7) -%global with_desktop_vendor_tag 1 -%else -%global with_desktop_vendor_tag 0 +%global desktop_vendor_tag 1 +%global gnome_keyring 0 +%global use_systemd 0 %endif Name: git @@ -491,7 +482,7 @@ install -pm 644 contrib/completion/git-prompt.sh \ # install git-gui .desktop file desktop-file-install \ -%if %{with_desktop_vendor_tag} +%if %{desktop_vendor_tag} --vendor fedora \ %endif --dir=%{buildroot}%{_datadir}/applications %{SOURCE5} @@ -635,6 +626,7 @@ rm -rf %{buildroot} %changelog * Thu Jan 16 2014 Todd Zullinger - 1.8.5.3-2 - Drop unused python DESTIR patch +- Consolidate settings for Fedora 19+ and EL 7+ * Thu Jan 16 2014 Ondrej Oprala - 1.8.5.3-1 * Update to 1.8.5.3 From 91c9f34566c4fbf3cd55bfcb689615472a928267 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 15 Jan 2014 13:08:39 -0500 Subject: [PATCH 292/842] Use new rpm filtering on Fedora 19+ and EL 7+ The guidelines recommend using the new filter setup, let's do that. --- git.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/git.spec b/git.spec index 545514d..ebebbce 100644 --- a/git.spec +++ b/git.spec @@ -33,10 +33,12 @@ %if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 %global desktop_vendor_tag 0 %global gnome_keyring 1 +%global use_new_rpm_filters 1 %global use_systemd 1 %else %global desktop_vendor_tag 1 %global gnome_keyring 0 +%global use_new_rpm_filters 0 %global use_systemd 0 %endif @@ -345,6 +347,10 @@ echo DOCBOOK_SUPPRESS_SP = 1 >> config.mak # Filter bogus perl requires # packed-refs comes from a comment in contrib/hooks/update-paranoid # YAML::Any is optional and not available on el5 +%if %{use_new_rpm_filters} +%{?perl_default_filter} +%global __requires_exclude perl\\(VMS|perl\\(Win32|perl\\(packed-refs\\) +%else cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} $* |\ @@ -357,6 +363,7 @@ EOF %global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req chmod +x %{__perl_requires} +%endif %build make %{?_smp_mflags} all @@ -627,6 +634,7 @@ rm -rf %{buildroot} * Thu Jan 16 2014 Todd Zullinger - 1.8.5.3-2 - Drop unused python DESTIR patch - Consolidate settings for Fedora 19+ and EL 7+ +- Use new rpm filtering on Fedora 19+ and EL 7+ * Thu Jan 16 2014 Ondrej Oprala - 1.8.5.3-1 * Update to 1.8.5.3 From 76dc52dfadb6e407f455096040bc223a635fe47a Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 16 Jan 2014 09:17:25 -0500 Subject: [PATCH 293/842] Rebuild with file-5.14-14 (#1026760) An updated file package fixes the issues that caused the git-svn script to not be properly parsed for perl requirements. This was fixed as part of #1051598. --- git.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/git.spec b/git.spec index ebebbce..e97b4ca 100644 --- a/git.spec +++ b/git.spec @@ -635,6 +635,7 @@ rm -rf %{buildroot} - Drop unused python DESTIR patch - Consolidate settings for Fedora 19+ and EL 7+ - Use new rpm filtering on Fedora 19+ and EL 7+ +- Rebuild with file-5.14-14 (#1026760) * Thu Jan 16 2014 Ondrej Oprala - 1.8.5.3-1 * Update to 1.8.5.3 From f5840ed79e5af33dc1958d00c813cf2729dc2105 Mon Sep 17 00:00:00 2001 From: Ondrej Oprala Date: Mon, 17 Feb 2014 14:03:16 +0100 Subject: [PATCH 294/842] Update to 1.9.0 --- git.spec | 7 +++++-- sources | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index e97b4ca..3a8d0f0 100644 --- a/git.spec +++ b/git.spec @@ -43,8 +43,8 @@ %endif Name: git -Version: 1.8.5.3 -Release: 2%{?dist} +Version: 1.9.0 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -631,6 +631,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Feb 17 2014 Ondrej Oprala - 1.9.0-1 +- Update to 1.9.0 + * Thu Jan 16 2014 Todd Zullinger - 1.8.5.3-2 - Drop unused python DESTIR patch - Consolidate settings for Fedora 19+ and EL 7+ diff --git a/sources b/sources index 0100e7b..6f6c19c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -57b966065882f83ef5879620a1e329ca git-1.8.5.3.tar.gz -77f833deb7db71fa275e942d7ec10019 git-htmldocs-1.8.5.3.tar.gz -8602e319e85e031aae9e674306928181 git-manpages-1.8.5.3.tar.gz +e16c14b27c644b8e0dd72bdb5ff77450 git-1.9.0.tar.gz +cc03d2803aed85d9136f0af1e16d460f git-htmldocs-1.9.0.tar.gz +a7c78336e2d3f9a0f5fc120c16fabcba git-manpages-1.9.0.tar.gz From 063e770e712ffc5954944ab377fdc55f7a101480 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 19 May 2014 11:58:17 -0500 Subject: [PATCH 295/842] 1.9.3. --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 3a8d0f0..ab5920a 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 1.9.0 +Version: 1.9.3 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -631,6 +631,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon May 19 2014 Jon Ciesla - 1.9.3-1 +- Update to 1.9.3 + * Mon Feb 17 2014 Ondrej Oprala - 1.9.0-1 - Update to 1.9.0 diff --git a/sources b/sources index 6f6c19c..a31f362 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -e16c14b27c644b8e0dd72bdb5ff77450 git-1.9.0.tar.gz -cc03d2803aed85d9136f0af1e16d460f git-htmldocs-1.9.0.tar.gz -a7c78336e2d3f9a0f5fc120c16fabcba git-manpages-1.9.0.tar.gz +e09c651a08109f7fb06012efffeb3e1e git-1.9.3.tar.gz +bab17049832260b89388d4c5960e8018 git-htmldocs-1.9.3.tar.gz +2b1e658e085f27a3a8b2f49d756c9887 git-manpages-1.9.3.tar.gz From c7908ae443f6c6e2211b95448b26af59adac597c Mon Sep 17 00:00:00 2001 From: Ondrej Oprala Date: Thu, 29 May 2014 13:35:29 +0200 Subject: [PATCH 296/842] Update to 2.0.0 --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index ab5920a..27cf8db 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 1.9.3 +Version: 2.0.0 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -631,6 +631,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu May 29 2014 Ondrej Oprala - 2.0.0-1 +- Update to 2.0.0 + * Mon May 19 2014 Jon Ciesla - 1.9.3-1 - Update to 1.9.3 diff --git a/sources b/sources index a31f362..4804aac 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -e09c651a08109f7fb06012efffeb3e1e git-1.9.3.tar.gz -bab17049832260b89388d4c5960e8018 git-htmldocs-1.9.3.tar.gz -2b1e658e085f27a3a8b2f49d756c9887 git-manpages-1.9.3.tar.gz +a461ea86f5d655e449a3356ac7eb71ec git-2.0.0.tar.gz +da88525f56a76b2e5b7249361eaf7073 git-htmldocs-2.0.0.tar.gz +0285283ceff06249c249fad8e77860d4 git-manpages-2.0.0.tar.gz From fbd993ec8aa7c52c046d864b5510c3f6ec3fc393 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 10:48:01 -0500 Subject: [PATCH 297/842] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 27cf8db..23f3542 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ Name: git Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -631,6 +631,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 2.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu May 29 2014 Ondrej Oprala - 2.0.0-1 - Update to 2.0.0 From 8f2385c01e16f52719dae7c66d6b0248ddd97ab1 Mon Sep 17 00:00:00 2001 From: Ondrej Oprala Date: Tue, 10 Jun 2014 11:02:46 +0200 Subject: [PATCH 298/842] Conditionalize an ancient obsolete for RHELv <= 5 --- git.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 23f3542..5873559 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ Name: git Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -97,7 +97,9 @@ Requires: rsync Requires: zlib >= 1.2 Provides: git-core = %{version}-%{release} +%if 0%{?rhel} && 0%{?rhel} <= 5 Obsoletes: git-core <= 1.5.4.3 +%endif # Obsolete git-arch Obsoletes: git-arch < %{version}-%{release} @@ -631,6 +633,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Jun 10 2014 Ondrej Oprala - 2.0.0-3 +- Conditionalize an ancient obsolete + * Sat Jun 07 2014 Fedora Release Engineering - 2.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From b741f455207027b5e80866066b2c142cbea51007 Mon Sep 17 00:00:00 2001 From: Ondrej Oprala Date: Tue, 10 Jun 2014 11:10:30 +0200 Subject: [PATCH 299/842] Change source URLs, as googlecode doesn't have up-to-date tarballs --- git.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 5873559..90bf583 100644 --- a/git.spec +++ b/git.spec @@ -44,19 +44,19 @@ Name: git Version: 2.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools URL: http://git-scm.com/ -Source0: http://git-core.googlecode.com/files/%{name}-%{version}.tar.gz +Source0: http://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz Source2: git-init.el Source3: git.xinetd.in Source4: git.conf.httpd Source5: git-gui.desktop Source6: gitweb.conf.in -Source10: http://git-core.googlecode.com/files/%{name}-manpages-%{version}.tar.gz -Source11: http://git-core.googlecode.com/files/%{name}-htmldocs-%{version}.tar.gz +Source10: http://www.kernel.org/pub/software/scm/git/%{name}-manpages-%{version}.tar.gz +Source11: http://www.kernel.org/pub/software/scm/git/%{name}-htmldocs-%{version}.tar.gz Source12: git.service Source13: git.socket Patch0: git-1.8-gitweb-home-link.patch @@ -633,6 +633,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Jun 10 2014 Ondrej Oprala - 2.0.0-4 +- Change source URLs, as googlecode doesn't have up-to-date tarballs + * Tue Jun 10 2014 Ondrej Oprala - 2.0.0-3 - Conditionalize an ancient obsolete From fe37c37ff9e47aca10cd341ee704c0d6cb1f4326 Mon Sep 17 00:00:00 2001 From: Ondrej Oprala Date: Fri, 11 Jul 2014 13:27:10 +0200 Subject: [PATCH 300/842] 2.0.1 --- git.spec | 7 +++++-- sources | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index 90bf583..372b789 100644 --- a/git.spec +++ b/git.spec @@ -43,8 +43,8 @@ %endif Name: git -Version: 2.0.0 -Release: 4%{?dist} +Version: 2.0.1 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -633,6 +633,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Jul 11 2014 Ondrej Oprala - 2.0.0-4 - Change source URLs, as googlecode doesn't have up-to-date tarballs diff --git a/sources b/sources index 4804aac..81cbd0c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -a461ea86f5d655e449a3356ac7eb71ec git-2.0.0.tar.gz -da88525f56a76b2e5b7249361eaf7073 git-htmldocs-2.0.0.tar.gz -0285283ceff06249c249fad8e77860d4 git-manpages-2.0.0.tar.gz +981f5937840716cb563be1cc6292c8d7 git-2.0.1.tar.gz +e7d89f0d6c1eedf2e1a477abcab693fa git-htmldocs-2.0.1.tar.gz +b36a03d806207ebd38913fcc4e8053a6 git-manpages-2.0.1.tar.gz From 80fc9e668bceff5ad65986d1aa86e99f3e202eeb Mon Sep 17 00:00:00 2001 From: Ondrej Oprala Date: Mon, 28 Jul 2014 11:13:04 +0200 Subject: [PATCH 301/842] 2.0.3 --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 372b789..3250671 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 2.0.1 +Version: 2.0.3 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -633,6 +633,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Jul 28 2014 Ondrej Oprala Date: Thu, 31 Jul 2014 08:23:28 +0200 Subject: [PATCH 302/842] 2.0.4 --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 3250671..76ffedf 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 2.0.3 +Version: 2.0.4 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -633,6 +633,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Jul 31 2014 Ondrej Oprala Date: Sat, 16 Aug 2014 16:30:42 +0000 Subject: [PATCH 303/842] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 76ffedf..e92bfaf 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ Name: git Version: 2.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -633,6 +633,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 2.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Thu Jul 31 2014 Ondrej Oprala Date: Mon, 18 Aug 2014 10:52:36 +0200 Subject: [PATCH 304/842] 2.1.0 --- ...Use-gitexecdir-instead-of-libexecdir.patch | 44 ------------------- git.spec | 9 ++-- sources | 6 +-- 3 files changed, 8 insertions(+), 51 deletions(-) delete mode 100644 0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch diff --git a/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch b/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch deleted file mode 100644 index 421710c..0000000 --- a/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch +++ /dev/null @@ -1,44 +0,0 @@ -From a906459c2a89938e911f1650e6ce22315a1ec84d Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Fri, 4 Jan 2013 11:54:21 -0500 -Subject: [PATCH] git-subtree: Use gitexecdir instead of libexecdir - -When the git subtree Makefile includes config.mak from the toplevel, -it's useful to have the same variables set globally applied. Using -gitexecdir instead of libexecdir respects the global settings more -consistently. - -Remove the unused gitdir variable as well. ---- - contrib/subtree/Makefile | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile -index 435b2de..dc8da19 100644 ---- a/contrib/subtree/Makefile -+++ b/contrib/subtree/Makefile -@@ -2,9 +2,8 @@ - -include ../../config.mak - - prefix ?= /usr/local -+gitexecdir ?= $(prefix)/libexec/git-core - mandir ?= $(prefix)/share/man --libexecdir ?= $(prefix)/libexec/git-core --gitdir ?= $(shell git --exec-path) - man1dir ?= $(mandir)/man1 - - gitver ?= $(word 3,$(shell git --version)) -@@ -30,8 +29,8 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH) - doc: $(GIT_SUBTREE_DOC) $(GIT_SUBTREE_HTML) - - install: $(GIT_SUBTREE) -- $(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir) -- $(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(libexecdir) -+ $(INSTALL) -d -m 755 $(DESTDIR)$(gitexecdir) -+ $(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(gitexecdir) - - install-doc: install-man - --- -1.8.3.1 - diff --git a/git.spec b/git.spec index e92bfaf..4a3e5c9 100644 --- a/git.spec +++ b/git.spec @@ -43,8 +43,8 @@ %endif Name: git -Version: 2.0.4 -Release: 2%{?dist} +Version: 2.1.0 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -64,7 +64,6 @@ Patch0: git-1.8-gitweb-home-link.patch Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://bugzilla.redhat.com/600411 Patch3: git-1.7-el5-emacs-support.patch -Patch5: 0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -308,7 +307,6 @@ Requires: emacs-git = %{version}-%{release} %if %{emacs_old} %patch3 -p1 %endif -%patch5 -p1 %if %{use_prebuilt_docs} mkdir -p prebuilt_docs/{html,man} @@ -633,6 +631,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Aug 18 2014 Ondrej Oprala - 2.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 19b7d94..a89bf55 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -f072436581ac0c0e9660a0637fd3ae2c git-2.0.4.tar.gz -63361c7aa7424d47b8ccdff09fafe1ba git-htmldocs-2.0.4.tar.gz -b256562b05242250df07f6a91e0887a2 git-manpages-2.0.4.tar.gz +40f059350019ff1f0763b315d0ca5c2e git-2.1.0.tar.gz +920860531676844a232589b21c1fba35 git-htmldocs-2.1.0.tar.gz +3a0745e8302a904c8359e8a5da594cc9 git-manpages-2.1.0.tar.gz From 135a2a656cbee6a1dd33e4da38638bd802ffba3b Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 26 Aug 2014 16:20:16 +0200 Subject: [PATCH 305/842] Disable requires perl(Term::ReadKey) when perl bootstraping --- git.spec | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 4a3e5c9..67f928d 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ Name: git Version: 2.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -90,7 +90,9 @@ BuildRequires: systemd Requires: less Requires: openssh-clients Requires: perl(Error) +%if ! %{defined perl_bootstrap} Requires: perl(Term::ReadKey) +%endif Requires: perl-Git = %{version}-%{release} Requires: rsync Requires: zlib >= 1.2 @@ -126,6 +128,9 @@ Requires: git-svn = %{version}-%{release} Requires: git-p4 = %{version}-%{release} Requires: gitk = %{version}-%{release} Requires: perl-Git = %{version}-%{release} +%if ! %{defined perl_bootstrap} +Requires: perl(Term::ReadKey) +%endif Requires: emacs-git = %{version}-%{release} Obsoletes: git <= 1.5.4.3 @@ -200,7 +205,10 @@ Requires: git = %{version}-%{release} %package svn Summary: Git tools for importing Subversion repositories Group: Development/Tools -Requires: git = %{version}-%{release}, subversion, perl(Term::ReadKey) +Requires: git = %{version}-%{release}, subversion +%if ! %{defined perl_bootstrap} +Requires: perl(Term::ReadKey) +%endif %description svn Git tools for importing Subversion repositories. @@ -349,7 +357,10 @@ echo DOCBOOK_SUPPRESS_SP = 1 >> config.mak # YAML::Any is optional and not available on el5 %if %{use_new_rpm_filters} %{?perl_default_filter} -%global __requires_exclude perl\\(VMS|perl\\(Win32|perl\\(packed-refs\\) +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}perl\\(packed-refs\\) +%if ! %{defined perl_bootstrap} +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}perl\\(Term::ReadKey\\) +%endif %else cat << \EOF > %{name}-req #!/bin/sh @@ -631,6 +642,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Aug 26 2014 Jitka Plesnikova - 2.1.0-2 +- Disable requires perl(Term::ReadKey) when perl bootstraping + * Mon Aug 18 2014 Ondrej Oprala Date: Thu, 28 Aug 2014 20:46:41 +0200 Subject: [PATCH 306/842] Perl 5.20 rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 67f928d..9193784 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ Name: git Version: 2.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -642,6 +642,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Aug 28 2014 Jitka Plesnikova - 2.1.0-3 +- Perl 5.20 rebuild + * Tue Aug 26 2014 Jitka Plesnikova - 2.1.0-2 - Disable requires perl(Term::ReadKey) when perl bootstraping From 091d952b4ee0f6754db1b965be497f65a3a97664 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 8 Sep 2014 10:42:06 +0200 Subject: [PATCH 307/842] Perl 5.20 re-rebuild of bootstrapped packages --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 9193784..b471e46 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ Name: git Version: 2.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -642,6 +642,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Sep 08 2014 Jitka Plesnikova - 2.1.0-4 +- Perl 5.20 re-rebuild of bootstrapped packages + * Thu Aug 28 2014 Jitka Plesnikova - 2.1.0-3 - Perl 5.20 rebuild From 906d8479f79ee89ec399fa5988b11fa037f18d38 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Fri, 24 Oct 2014 13:14:45 +0200 Subject: [PATCH 308/842] Rename git.service into git@.service and bump release --- git.service | 9 --------- git.spec | 16 ++++++++++------ git@.service | 8 ++++++++ 3 files changed, 18 insertions(+), 15 deletions(-) delete mode 100644 git.service create mode 100644 git@.service diff --git a/git.service b/git.service deleted file mode 100644 index 07cbe6e..0000000 --- a/git.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Git Repositories Server Daemon -Documentation=man:git-daemon(1) -Wants=git.socket - -[Service] -User=nobody -ExecStart=/usr/libexec/git-core/git-daemon --base-path=/var/lib/git --export-all --user-path=public_git --syslog --inetd --verbose -StandardInput=socket diff --git a/git.spec b/git.spec index b471e46..636a0fe 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ Name: git Version: 2.1.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -57,7 +57,7 @@ Source5: git-gui.desktop Source6: gitweb.conf.in Source10: http://www.kernel.org/pub/software/scm/git/%{name}-manpages-%{version}.tar.gz Source11: http://www.kernel.org/pub/software/scm/git/%{name}-htmldocs-%{version}.tar.gz -Source12: git.service +Source12: git@.service Source13: git.socket Patch0: git-1.8-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 @@ -522,13 +522,13 @@ rm -rf %{buildroot} %if %{use_systemd} %post daemon -%systemd_post git.service +%systemd_post git@.service %preun daemon -%systemd_preun git.service +%systemd_preun git@.service %postun daemon -%systemd_postun_with_restart git.service +%systemd_postun_with_restart git@.service %endif %files -f bin-man-doc-files @@ -621,7 +621,7 @@ rm -rf %{buildroot} %doc Documentation/*daemon*.txt %if %{use_systemd} %{_unitdir}/git.socket -%{_unitdir}/git.service +%{_unitdir}/git@.service %else %config(noreplace)%{_sysconfdir}/xinetd.d/git %endif @@ -642,6 +642,10 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Oct 24 2014 Pierre-Yves Chibon - 2.1.0-5 +- Rename the git.service into git@.service fixing + https://bugzilla.redhat.com/980574 + * Mon Sep 08 2014 Jitka Plesnikova - 2.1.0-4 - Perl 5.20 re-rebuild of bootstrapped packages diff --git a/git@.service b/git@.service new file mode 100644 index 0000000..185ff25 --- /dev/null +++ b/git@.service @@ -0,0 +1,8 @@ +[Unit] +Description=Git Repositories Server Daemon +Documentation=man:git-daemon(1) + +[Service] +User=nobody +ExecStart=-/usr/libexec/git-core/git-daemon --base-path=/var/lib/git --export-all --user-path=public_git --syslog --inetd --verbose +StandardInput=socket From 76631ff7ba9492384dbde4ce215a13cb7c0b2e55 Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Fri, 28 Nov 2014 15:40:43 +0100 Subject: [PATCH 309/842] rebase to 2.2.0 --- git.spec | 7 +++++-- sources | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index 636a0fe..3805aba 100644 --- a/git.spec +++ b/git.spec @@ -43,8 +43,8 @@ %endif Name: git -Version: 2.1.0 -Release: 5%{?dist} +Version: 2.2.0 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -642,6 +642,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Nov 28 2014 Petr Stodulka - 2.2.0-1 +- 2.2.0 + * Fri Oct 24 2014 Pierre-Yves Chibon - 2.1.0-5 - Rename the git.service into git@.service fixing https://bugzilla.redhat.com/980574 diff --git a/sources b/sources index a89bf55..17d6fba 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -40f059350019ff1f0763b315d0ca5c2e git-2.1.0.tar.gz -920860531676844a232589b21c1fba35 git-htmldocs-2.1.0.tar.gz -3a0745e8302a904c8359e8a5da594cc9 git-manpages-2.1.0.tar.gz +e7ec08bf1e01237835f49f07c067e4a2 git-htmldocs-2.2.0.tar.gz +f584e2ecbc6e1485163b56c14ea7ffda git-manpages-2.2.0.tar.gz +2d5bbcc3e887cc4ba499f80420e2d5f7 git-2.2.0.tar.gz From f907d9b7b4964d9336b10c8615b2a6154063954e Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Fri, 28 Nov 2014 16:05:03 +0100 Subject: [PATCH 310/842] remove git-bzr - replaced by git-remote-bzr from separated package --- git.spec | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/git.spec b/git.spec index 3805aba..909a9b5 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ Name: git Version: 2.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -141,18 +141,6 @@ and full access to internals. This is a dummy package which brings in all subpackages. -%package bzr -Summary: Git tools for working with bzr repositories -Group: Development/Tools -%if %{noarch_sub} -BuildArch: noarch -%endif -Requires: git = %{version}-%{release} -Requires: bzr - -%description bzr -%{summary}. - %package daemon Summary: Git protocol dæmon Group: Development/Tools @@ -473,8 +461,9 @@ perl -p \ %{SOURCE3} > %{buildroot}%{_sysconfdir}/xinetd.d/git %endif -# Install bzr and hg remote helpers from contrib -install -pm 755 contrib/remote-helpers/git-remote-{bzr,hg} %{buildroot}%{gitcoredir} +# Install hg remote helpers from contrib +# git-bzr removed - it's replaced by git-remote-bzr from separated package +install -pm 755 contrib/remote-helpers/git-remote-hg %{buildroot}%{gitcoredir} # Setup bash completion mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d @@ -539,10 +528,6 @@ rm -rf %{buildroot} %{!?_without_docs: %doc Documentation/howto Documentation/technical} %{_sysconfdir}/bash_completion.d -%files bzr -%defattr(-,root,root) -%{gitcoredir}/git-remote-bzr - %files hg %defattr(-,root,root) %{gitcoredir}/git-remote-hg @@ -642,6 +627,10 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Nov 28 2014 Petr Stodulka - 2.2.0-2 +- removed git-bzr which is replaced by git-remote-bzr from + separated package + * Fri Nov 28 2014 Petr Stodulka - 2.2.0-1 - 2.2.0 From 4d2eb1f677b63766e3d97ff4cb045e56e1312e60 Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Thu, 11 Dec 2014 12:26:44 +0100 Subject: [PATCH 311/842] removed git-hg subpackage - it's replaced by separated package git-remote-hg --- git.spec | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/git.spec b/git.spec index 909a9b5..4eec430 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ Name: git Version: 2.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -167,18 +167,6 @@ Requires: git = %{version}-%{release} %description -n gitweb Simple web interface to track changes in git repositories -%package hg -Summary: Git tools for working with mercurial repositories -Group: Development/Tools -%if %{noarch_sub} -BuildArch: noarch -%endif -Requires: git = %{version}-%{release} -Requires: mercurial >= 1.8 - -%description hg -%{summary}. - %package p4 Summary: Git tools for working with Perforce depots Group: Development/Tools @@ -461,10 +449,6 @@ perl -p \ %{SOURCE3} > %{buildroot}%{_sysconfdir}/xinetd.d/git %endif -# Install hg remote helpers from contrib -# git-bzr removed - it's replaced by git-remote-bzr from separated package -install -pm 755 contrib/remote-helpers/git-remote-hg %{buildroot}%{gitcoredir} - # Setup bash completion mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d install -pm 644 contrib/completion/git-completion.bash %{buildroot}%{_sysconfdir}/bash_completion.d/git @@ -528,9 +512,6 @@ rm -rf %{buildroot} %{!?_without_docs: %doc Documentation/howto Documentation/technical} %{_sysconfdir}/bash_completion.d -%files hg -%defattr(-,root,root) -%{gitcoredir}/git-remote-hg %files p4 %defattr(-,root,root) @@ -627,8 +608,12 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Dec 11 2014 Petr Stodulka - 2.2.0-3 +- removed subpackage git-hg which is replaced by git-remote-hg from + separated package + * Fri Nov 28 2014 Petr Stodulka - 2.2.0-2 -- removed git-bzr which is replaced by git-remote-bzr from +- removed subpackage git-bzr which is replaced by git-remote-bzr from separated package * Fri Nov 28 2014 Petr Stodulka - 2.2.0-1 From f7dd1f62afbecc1d036170e216900f75150cda78 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 8 Jan 2015 14:46:10 -0600 Subject: [PATCH 312/842] 2.2.1. --- git.spec | 7 +++++-- sources | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index 4eec430..2be6ac1 100644 --- a/git.spec +++ b/git.spec @@ -43,8 +43,8 @@ %endif Name: git -Version: 2.2.0 -Release: 3%{?dist} +Version: 2.2.1 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -608,6 +608,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Jan 08 2015 Jon Ciesla - 2.2.1-1 +- Update to 2.2.1. + * Thu Dec 11 2014 Petr Stodulka - 2.2.0-3 - removed subpackage git-hg which is replaced by git-remote-hg from separated package diff --git a/sources b/sources index 17d6fba..2968a21 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -e7ec08bf1e01237835f49f07c067e4a2 git-htmldocs-2.2.0.tar.gz -f584e2ecbc6e1485163b56c14ea7ffda git-manpages-2.2.0.tar.gz -2d5bbcc3e887cc4ba499f80420e2d5f7 git-2.2.0.tar.gz +ff41fdb094eed1ec430aed8ee9b9849c git-2.2.1.tar.gz +856157dfe3958e9bdd9bfcc3b0a7da01 git-htmldocs-2.2.1.tar.gz +b5ddd262b608804ba4403f0f82d881d7 git-manpages-2.2.1.tar.gz From 7c14b8e24ae91b6e88124e0c12e6edf4981ab454 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 23 Jan 2015 15:04:25 -0600 Subject: [PATCH 313/842] 2.2.2 --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 2be6ac1..df7799e 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 2.2.1 +Version: 2.2.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -608,6 +608,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Jan 23 2015 Jon Ciesla - 2.2.2-1 +- Update to 2.2.2. + * Thu Jan 08 2015 Jon Ciesla - 2.2.1-1 - Update to 2.2.1. diff --git a/sources b/sources index 2968a21..b3f6c62 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -ff41fdb094eed1ec430aed8ee9b9849c git-2.2.1.tar.gz -856157dfe3958e9bdd9bfcc3b0a7da01 git-htmldocs-2.2.1.tar.gz -b5ddd262b608804ba4403f0f82d881d7 git-manpages-2.2.1.tar.gz +4ee47697b6cf5e98f97b2ba44baded79 git-2.2.2.tar.gz +9288780cdcff7d03727246d1b27a4e3c git-htmldocs-2.2.2.tar.gz +a156581a6412876506b931e9f93e42fa git-manpages-2.2.2.tar.gz From f6e299ca4226fc027f3f0af746a275d6de30deba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 29 Jan 2015 15:18:17 +0200 Subject: [PATCH 314/842] Install bash completion to %{_datadir}/bash-completion/completions --- git.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index df7799e..c42749e 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ Name: git Version: 2.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -82,6 +82,7 @@ BuildRequires: libgnome-keyring-devel BuildRequires: pcre-devel BuildRequires: openssl-devel BuildRequires: zlib-devel >= 1.2 +BuildRequires: pkgconfig(bash-completion) %if %{use_systemd} # For macros BuildRequires: systemd @@ -450,8 +451,9 @@ perl -p \ %endif # Setup bash completion -mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d -install -pm 644 contrib/completion/git-completion.bash %{buildroot}%{_sysconfdir}/bash_completion.d/git +bashcompdir=$(pkg-config --variable=completionsdir bash-completion) +install -Dpm 644 contrib/completion/git-completion.bash %{buildroot}$bashcompdir/git +ln -s git %{buildroot}$bashcompdir/gitk # Install tcsh completion mkdir -p %{buildroot}%{_datadir}/git-core/contrib/completion @@ -510,7 +512,7 @@ rm -rf %{buildroot} %doc README COPYING Documentation/*.txt Documentation/RelNotes contrib/ %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} %{!?_without_docs: %doc Documentation/howto Documentation/technical} -%{_sysconfdir}/bash_completion.d +%{_datadir}/bash-completion/ %files p4 @@ -608,6 +610,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Jan 27 2015 Ville Skyttä - 2.2.2-2 +- Install bash completion to %%{_datadir}/bash-completion/completions + * Fri Jan 23 2015 Jon Ciesla - 2.2.2-1 - Update to 2.2.2. From 198019d9432292854c581abe34a1baae97490513 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 6 Feb 2015 11:24:51 -0600 Subject: [PATCH 315/842] 2.3.0. --- git.spec | 7 +++++-- sources | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index c42749e..a9fc77a 100644 --- a/git.spec +++ b/git.spec @@ -43,8 +43,8 @@ %endif Name: git -Version: 2.2.2 -Release: 2%{?dist} +Version: 2.3.0 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -610,6 +610,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Feb 06 2015 Jon Ciesla - 2.3.0-1 +- Update to 2.3.0. + * Tue Jan 27 2015 Ville Skyttä - 2.2.2-2 - Install bash completion to %%{_datadir}/bash-completion/completions diff --git a/sources b/sources index b3f6c62..16c7b70 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -4ee47697b6cf5e98f97b2ba44baded79 git-2.2.2.tar.gz -9288780cdcff7d03727246d1b27a4e3c git-htmldocs-2.2.2.tar.gz -a156581a6412876506b931e9f93e42fa git-manpages-2.2.2.tar.gz +edf994cf34cd3354dadcdfa6b4292335 git-2.3.0.tar.gz +00714647dd5045aaef9f0939548778dc git-htmldocs-2.3.0.tar.gz +620797eb73b281d0706979ae8038bbd7 git-manpages-2.3.0.tar.gz From c0212c4b6b36c8332d32e5b52a6f097e6f7b484c Mon Sep 17 00:00:00 2001 From: Till Maas Date: Sat, 21 Feb 2015 22:15:20 +0100 Subject: [PATCH 316/842] Rebuilt for Fedora 23 Change https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code --- git.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index a9fc77a..7f3d150 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ Name: git Version: 2.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -610,6 +610,10 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sat Feb 21 2015 Till Maas - 2.3.0-2 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + * Fri Feb 06 2015 Jon Ciesla - 2.3.0-1 - Update to 2.3.0. From 50964fb157d4e4b082cebeb835e3d5bab23eaeb0 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 27 Feb 2015 10:17:21 -0600 Subject: [PATCH 317/842] 2.3.1 --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 7f3d150..8e57b53 100644 --- a/git.spec +++ b/git.spec @@ -43,8 +43,8 @@ %endif Name: git -Version: 2.3.0 -Release: 2%{?dist} +Version: 2.3.1 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -610,6 +610,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Feb 27 2015 Jon Ciesla - 2.3.1-1 +- Update to 2.3.1. + * Sat Feb 21 2015 Till Maas - 2.3.0-2 - Rebuilt for Fedora 23 Change https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code From 0b38c187ccad0727dbc75e0651f2eead2e516938 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 27 Feb 2015 10:19:20 -0600 Subject: [PATCH 318/842] Sources. . . From a4406c04a86e6a2dc4109ead6232351c2785bb74 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 27 Feb 2015 10:20:06 -0600 Subject: [PATCH 319/842] Sources. From eca965fb32855d5954cd917757626692a6a79084 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 27 Feb 2015 10:21:18 -0600 Subject: [PATCH 320/842] Attempt #3. --- sources | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 16c7b70..cdd62e0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -edf994cf34cd3354dadcdfa6b4292335 git-2.3.0.tar.gz -00714647dd5045aaef9f0939548778dc git-htmldocs-2.3.0.tar.gz -620797eb73b281d0706979ae8038bbd7 git-manpages-2.3.0.tar.gz +a6673b9c297ff16cd573c4ff0bba34af git-2.3.1.tar.gz +940765ff6483dcdc9f98be9ccdc7e482 git-htmldocs-2.3.1.tar.gz +aed07476a8323fa0be964a310f4be402 git-manpages-2.3.1.tar.gz From 89eab25efed38665cee191b3937829ca7e3115cf Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 9 Mar 2015 10:13:01 -0500 Subject: [PATCH 321/842] 2.3.2. --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 8e57b53..adc1954 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 2.3.1 +Version: 2.3.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -610,6 +610,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Mar 09 2015 Jon Ciesla - 2.3.2-1 +- Update to 2.3.2. + * Fri Feb 27 2015 Jon Ciesla - 2.3.1-1 - Update to 2.3.1. diff --git a/sources b/sources index cdd62e0..e917545 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -a6673b9c297ff16cd573c4ff0bba34af git-2.3.1.tar.gz -940765ff6483dcdc9f98be9ccdc7e482 git-htmldocs-2.3.1.tar.gz -aed07476a8323fa0be964a310f4be402 git-manpages-2.3.1.tar.gz +1e9141d60940eeda6b3d04646b2e8d1a git-2.3.2.tar.gz +a4fc599d19624fece18c739ffaf8f1b2 git-htmldocs-2.3.2.tar.gz +7b29814c5900d7628ab7d7839b014a00 git-manpages-2.3.2.tar.gz From 6c9e6961e5aaa5efc8d9780971da6ea099e30020 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 16 Mar 2015 10:51:38 -0500 Subject: [PATCH 322/842] 2.3.3. --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index adc1954..e7e9198 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 2.3.2 +Version: 2.3.3 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -610,6 +610,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Mar 16 2015 Jon Ciesla - 2.3.3-1 +- Update to 2.3.3. + * Mon Mar 09 2015 Jon Ciesla - 2.3.2-1 - Update to 2.3.2. diff --git a/sources b/sources index e917545..c92c8bd 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -1e9141d60940eeda6b3d04646b2e8d1a git-2.3.2.tar.gz -a4fc599d19624fece18c739ffaf8f1b2 git-htmldocs-2.3.2.tar.gz -7b29814c5900d7628ab7d7839b014a00 git-manpages-2.3.2.tar.gz +65e102c9a3209ec3e241cc398f865da3 git-2.3.3.tar.gz +e03517af2033378584d5b994924e5c90 git-htmldocs-2.3.3.tar.gz +8ecfed37553bcef311cf8b50dac4683e git-manpages-2.3.3.tar.gz From 37c50e0350f170c9e6a73733809e8d4b070ed6fd Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Tue, 24 Mar 2015 12:14:19 +0100 Subject: [PATCH 323/842] update to 2.3.4 --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index e7e9198..fca17f7 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 2.3.3 +Version: 2.3.4 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -610,6 +610,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Mar 24 2015 Petr Stodulka - 2.3.4-1 +- Update to 2.3.4. + * Mon Mar 16 2015 Jon Ciesla - 2.3.3-1 - Update to 2.3.3. diff --git a/sources b/sources index c92c8bd..2827ef7 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -65e102c9a3209ec3e241cc398f865da3 git-2.3.3.tar.gz -e03517af2033378584d5b994924e5c90 git-htmldocs-2.3.3.tar.gz -8ecfed37553bcef311cf8b50dac4683e git-manpages-2.3.3.tar.gz +f156826e36f7c3386d4cd137695a0149 git-htmldocs-2.3.4.tar.gz +4d3dea971fe8d305ca49ed59c7c08932 git-manpages-2.3.4.tar.gz +5ff7103362e1c56a8510fdb2f9cec41e git-2.3.4.tar.gz From 4c972af0d6987c75a1eea8c35101298d119713a7 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 6 Apr 2015 09:23:19 -0500 Subject: [PATCH 324/842] 2.3.5. --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index fca17f7..e013565 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 2.3.4 +Version: 2.3.5 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -610,6 +610,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Apr 06 2015 Jon Ciesla - 2.3.5-1 +- Update to 2.3.5. + * Tue Mar 24 2015 Petr Stodulka - 2.3.4-1 - Update to 2.3.4. diff --git a/sources b/sources index 2827ef7..ad1cae2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -f156826e36f7c3386d4cd137695a0149 git-htmldocs-2.3.4.tar.gz -4d3dea971fe8d305ca49ed59c7c08932 git-manpages-2.3.4.tar.gz -5ff7103362e1c56a8510fdb2f9cec41e git-2.3.4.tar.gz +8101cd7497ee64d1ed07d12541826a30 git-2.3.5.tar.gz +3b6b3b7542a0dab68fa7d429011bed27 git-htmldocs-2.3.5.tar.gz +209ed840bb155bc6fc129675ee7bb0a2 git-manpages-2.3.5.tar.gz From 91bedd4f62a29d9942135e40887165beac4b8918 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 22 Apr 2015 15:52:34 -0500 Subject: [PATCH 325/842] 2.3.6. --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index e013565..8bb661d 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 2.3.5 +Version: 2.3.6 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -610,6 +610,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Apr 22 2015 Jon Ciesla - 2.3.6-1 +- Update to 2.3.6. + * Mon Apr 06 2015 Jon Ciesla - 2.3.5-1 - Update to 2.3.5. diff --git a/sources b/sources index ad1cae2..f98c190 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -8101cd7497ee64d1ed07d12541826a30 git-2.3.5.tar.gz -3b6b3b7542a0dab68fa7d429011bed27 git-htmldocs-2.3.5.tar.gz -209ed840bb155bc6fc129675ee7bb0a2 git-manpages-2.3.5.tar.gz +c29ac45bde67545b7e7941903000f6d3 git-2.3.6.tar.gz +8cba4686ffe682a6c94cdf0257df6deb git-htmldocs-2.3.6.tar.gz +2d78fdfd73c45209f6df3ee3cc5e62c1 git-manpages-2.3.6.tar.gz From 3c09d7bb4c8f95a601243c3798a7162948cb0cee Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 28 Apr 2015 14:18:43 -0500 Subject: [PATCH 326/842] 2.3.7. --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 8bb661d..197e05e 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 2.3.6 +Version: 2.3.7 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -610,6 +610,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Apr 28 2015 Jon Ciesla - 2.3.7-1 +- Update to 2.3.7. + * Wed Apr 22 2015 Jon Ciesla - 2.3.6-1 - Update to 2.3.6. diff --git a/sources b/sources index f98c190..878592c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -c29ac45bde67545b7e7941903000f6d3 git-2.3.6.tar.gz -8cba4686ffe682a6c94cdf0257df6deb git-htmldocs-2.3.6.tar.gz -2d78fdfd73c45209f6df3ee3cc5e62c1 git-manpages-2.3.6.tar.gz +370cc33cc0a77a1242b95cc703228162 git-2.3.7.tar.gz +fc0d11c673b476644b40d973e98d9768 git-htmldocs-2.3.7.tar.gz +4c3b585c74bd937b80e04cba6db71da2 git-manpages-2.3.7.tar.gz From 7adc03f26546b8bd79540867d2f2f2d59223f154 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 1 May 2015 09:42:40 -0500 Subject: [PATCH 327/842] 2.4.0 --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 197e05e..d3974a7 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 2.3.7 +Version: 2.4.0 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -610,6 +610,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri May 01 2015 Jon Ciesla - 2.4.0-1 +- Update to 2.4.0. + * Tue Apr 28 2015 Jon Ciesla - 2.3.7-1 - Update to 2.3.7. diff --git a/sources b/sources index 878592c..96708d4 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -370cc33cc0a77a1242b95cc703228162 git-2.3.7.tar.gz -fc0d11c673b476644b40d973e98d9768 git-htmldocs-2.3.7.tar.gz -4c3b585c74bd937b80e04cba6db71da2 git-manpages-2.3.7.tar.gz +544d3f18ccef6479149490a4c34d53ff git-2.4.0.tar.gz +d4f254f6c54ca077aa161f8768f30db2 git-htmldocs-2.4.0.tar.gz +a41ee7e6fa8a937c2c7197a8c7aa29d2 git-manpages-2.4.0.tar.gz From c3a708ed5b8f546634d7d462944c8915b0337765 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 14 May 2015 15:15:03 -0500 Subject: [PATCH 328/842] 2.4.1 --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index d3974a7..4cfaadb 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 2.4.0 +Version: 2.4.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -610,6 +610,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu May 14 2015 Jon Ciesla - 2.4.1-1 +- Update to 2.4.1. + * Fri May 01 2015 Jon Ciesla - 2.4.0-1 - Update to 2.4.0. diff --git a/sources b/sources index 96708d4..584e26d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -544d3f18ccef6479149490a4c34d53ff git-2.4.0.tar.gz -d4f254f6c54ca077aa161f8768f30db2 git-htmldocs-2.4.0.tar.gz -a41ee7e6fa8a937c2c7197a8c7aa29d2 git-manpages-2.4.0.tar.gz +c72b2dcff11ebd25cb4fa488d6279717 git-2.4.1.tar.gz +c5a682367f47ecd6c8da0a5642f2cccb git-htmldocs-2.4.1.tar.gz +0efa87125e6a436987a43ea75598f45f git-manpages-2.4.1.tar.gz From 74bfccdf68d80a107aae665f2d30229342334fd5 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 26 May 2015 20:45:29 -0500 Subject: [PATCH 329/842] 2.4.2. --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 4cfaadb..17796ca 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 2.4.1 +Version: 2.4.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -610,6 +610,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue May 26 2015 Jon Ciesla - 2.4.2-1 +- Update to 2.4.2. + * Thu May 14 2015 Jon Ciesla - 2.4.1-1 - Update to 2.4.1. diff --git a/sources b/sources index 584e26d..e88886a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -c72b2dcff11ebd25cb4fa488d6279717 git-2.4.1.tar.gz -c5a682367f47ecd6c8da0a5642f2cccb git-htmldocs-2.4.1.tar.gz -0efa87125e6a436987a43ea75598f45f git-manpages-2.4.1.tar.gz +80e127b1bde921479d1a6c3fa697e385 git-2.4.2.tar.gz +35830e0b4c42b96776c94e10e48dc05c git-htmldocs-2.4.2.tar.gz +b52251e6f859a54bf5d5a3b7682fbfbf git-manpages-2.4.2.tar.gz From 6fdc5e57d226d8c8ebe91bc7b85d81d1afe7b405 Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Wed, 3 Jun 2015 22:44:55 +0200 Subject: [PATCH 330/842] new subpackage git-core, which is perl-less and part of original git rpm --- git.spec | 57 ++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 12 deletions(-) diff --git a/git.spec b/git.spec index 17796ca..89da0fb 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ Name: git Version: 2.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -88,20 +88,17 @@ BuildRequires: pkgconfig(bash-completion) BuildRequires: systemd %endif -Requires: less -Requires: openssh-clients +Requires: git-core = %{version}-%{release} Requires: perl(Error) %if ! %{defined perl_bootstrap} Requires: perl(Term::ReadKey) %endif Requires: perl-Git = %{version}-%{release} -Requires: rsync -Requires: zlib >= 1.2 -Provides: git-core = %{version}-%{release} -%if 0%{?rhel} && 0%{?rhel} <= 5 -Obsoletes: git-core <= 1.5.4.3 -%endif +#Provides: git-core = %{version}-%{release} +#%if 0%{?rhel} && 0%{?rhel} <= 5 +#Obsoletes: git-core <= 1.5.4.3 +#%endif # Obsolete git-arch Obsoletes: git-arch < %{version}-%{release} @@ -111,9 +108,9 @@ Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals. -The git rpm installs the core tools with minimal dependencies. To -install all git packages, including tools for integrating with other -SCMs, install the git-all meta-package. +The git rpm installs common set of tools which are usually using with +small amount of dependencies. To install all git packages, including +tools for integrating with other SCMs, install the git-all meta-package. %package all Summary: Meta-package to pull in all git tools @@ -142,6 +139,23 @@ and full access to internals. This is a dummy package which brings in all subpackages. +%package core +Summary: Core package of git with minimal funcionality +Group: Development/Tools +Requires: less +Requires: openssh-clients +Requires: rsync +Requires: zlib >= 1.2 +%description core +Git is a fast, scalable, distributed revision control system with an +unusually rich command set that provides both high-level operations +and full access to internals. + +The git-core rpm installs really the core tools with minimal +dependencies. Install git package for common set of tools. +To install all git packages, including tools for integrating with +other SCMs, install the git-all meta-package. + %package daemon Summary: Git protocol dæmon Group: Development/Tools @@ -491,6 +505,11 @@ rm -f {Documentation/technical,contrib/emacs,contrib/credential/gnome-keyring}/. chmod a-x Documentation/technical/api-index.sh find contrib -type f | xargs chmod -x +# Split core files +not_core_re="git-(add--interactive|am|difftool|instaweb|relink|request-pull|send-mail|submodule)|gitweb|prepare-commit-msg|pre-rebase" +grep -vE "$not_core_re" bin-man-doc-files > bin-man-doc-files-core +sed -ir "/$not_core_re/ d" bin-man-doc-files + %clean rm -rf %{buildroot} @@ -508,6 +527,13 @@ rm -rf %{buildroot} %files -f bin-man-doc-files %defattr(-,root,root) +%{_datadir}/git-core/* +%doc Documentation/*.txt +%{!?_without_docs: %doc Documentation/*.html} +#%{!?_without_docs: %doc Documentation/howto/* Documentation/technical/*} + +%files core -f bin-man-doc-files-core +%defattr(-,root,root) %{_datadir}/git-core/ %doc README COPYING Documentation/*.txt Documentation/RelNotes contrib/ %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} @@ -610,6 +636,13 @@ rm -rf %{buildroot} # No files for you! %changelog +% Wed Jun 03 2015 Petr Stodulka - 2.4.2-2 +- split create subpackage git-core (perl-less) from git package +- git package requires git-core and it has same tool set as + before +- relevant docs are part of git-core package too +- removed proved and obsoletes in git for git-core + * Tue May 26 2015 Jon Ciesla - 2.4.2-1 - Update to 2.4.2. From ebda65b7f3f4de58addc762a19fd1ec8db7384e0 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 5 Jun 2015 12:30:59 +0200 Subject: [PATCH 331/842] Perl 5.22 rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 89da0fb..f01b5f3 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ Name: git Version: 2.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -636,6 +636,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Jun 05 2015 Jitka Plesnikova +- Perl 5.22 rebuild + % Wed Jun 03 2015 Petr Stodulka - 2.4.2-2 - split create subpackage git-core (perl-less) from git package - git package requires git-core and it has same tool set as From d04e5947ce1300b138c0bf89994d94af0f22e035 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Sat, 6 Jun 2015 22:09:56 -0500 Subject: [PATCH 332/842] 2.4.3. --- git.spec | 7 +++++-- sources | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index f01b5f3..0b28b82 100644 --- a/git.spec +++ b/git.spec @@ -43,8 +43,8 @@ %endif Name: git -Version: 2.4.2 -Release: 3%{?dist} +Version: 2.4.3 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -636,6 +636,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sat Jun 06 2015 Jon Ciesla - 2.4.3-1 +- Update to 2.4.3. + * Fri Jun 05 2015 Jitka Plesnikova - Perl 5.22 rebuild diff --git a/sources b/sources index e88886a..538e98a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -80e127b1bde921479d1a6c3fa697e385 git-2.4.2.tar.gz -35830e0b4c42b96776c94e10e48dc05c git-htmldocs-2.4.2.tar.gz -b52251e6f859a54bf5d5a3b7682fbfbf git-manpages-2.4.2.tar.gz +bde9fc7aa40560fe3b1c8b9c6d170db0 git-2.4.3.tar.gz +6c331604b078a86739c5e86e25c03e8a git-htmldocs-2.4.3.tar.gz +a023736d2b193d9d0f206881eba07b05 git-manpages-2.4.3.tar.gz From 8f90cdffe56709bc7cac9980df572d36e425e6d6 Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Mon, 8 Jun 2015 23:24:58 +0200 Subject: [PATCH 333/842] fix occurence of duplicit files and separate doc files to subpackage git-core-doc --- git.spec | 44 +++++++++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/git.spec b/git.spec index 0b28b82..24e826f 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ Name: git Version: 2.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -89,6 +89,7 @@ BuildRequires: systemd %endif Requires: git-core = %{version}-%{release} +Requires: git-core-doc = %{version}-%{release} Requires: perl(Error) %if ! %{defined perl_bootstrap} Requires: perl(Term::ReadKey) @@ -156,6 +157,14 @@ dependencies. Install git package for common set of tools. To install all git packages, including tools for integrating with other SCMs, install the git-all meta-package. +%package core-doc +Summary: Documentation files for git-core +Group: Development/Tools +Requires: git-core = %{version}-%{release} + +%description core-doc +Documentation files for git-core package including man pages. + %package daemon Summary: Git protocol dæmon Group: Development/Tools @@ -419,6 +428,9 @@ make -C contrib/subtree install %if ! %{use_prebuilt_docs} make -C contrib/subtree install-doc %endif +# it's ugly hack, but this file don't need to be copied to this directory +# it's already part of git-core-doc and it's alone here +rm -f %{buildroot}%{_pkgdocdir}/git-subtree.html mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d install -pm 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf @@ -507,8 +519,9 @@ find contrib -type f | xargs chmod -x # Split core files not_core_re="git-(add--interactive|am|difftool|instaweb|relink|request-pull|send-mail|submodule)|gitweb|prepare-commit-msg|pre-rebase" -grep -vE "$not_core_re" bin-man-doc-files > bin-man-doc-files-core -sed -ir "/$not_core_re/ d" bin-man-doc-files +grep -vE "$not_core_re|\/man\/" bin-man-doc-files > bin-files-core +grep -vE "$not_core_re" bin-man-doc-files | grep "\/man\/" > man-doc-files-core +grep -E "$not_core_re" bin-man-doc-files > bin-man-doc-git-files %clean @@ -525,20 +538,25 @@ rm -rf %{buildroot} %systemd_postun_with_restart git@.service %endif -%files -f bin-man-doc-files +%files -f bin-man-doc-git-files %defattr(-,root,root) -%{_datadir}/git-core/* -%doc Documentation/*.txt -%{!?_without_docs: %doc Documentation/*.html} +#%{_datadir}/git-core/* +#%doc Documentation/*.txt +#%{!?_without_docs: %doc Documentation/*.html} #%{!?_without_docs: %doc Documentation/howto/* Documentation/technical/*} -%files core -f bin-man-doc-files-core +%files core -f bin-files-core %defattr(-,root,root) +%doc COPYING %{_datadir}/git-core/ -%doc README COPYING Documentation/*.txt Documentation/RelNotes contrib/ +%{_datadir}/bash-completion/ + +%files core-doc -f man-doc-files-core +%defattr(-,root,root) +%doc README Documentation/*.txt Documentation/RelNotes contrib/ %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} %{!?_without_docs: %doc Documentation/howto Documentation/technical} -%{_datadir}/bash-completion/ +%{!?_without_docs: %doc contrib/subtree/git-subtree.html Documentation/docbook-xsl.css} %files p4 @@ -636,13 +654,17 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Jun 08 2015 Petr Stodulka - 2.4.3-2 +- separate documentation files from git-core package to git-core-doc + including core man pages + * Sat Jun 06 2015 Jon Ciesla - 2.4.3-1 - Update to 2.4.3. * Fri Jun 05 2015 Jitka Plesnikova - Perl 5.22 rebuild -% Wed Jun 03 2015 Petr Stodulka - 2.4.2-2 +* Wed Jun 03 2015 Petr Stodulka - 2.4.2-2 - split create subpackage git-core (perl-less) from git package - git package requires git-core and it has same tool set as before From 16f0ef9cf25d513aa76c4fd76ddd24a3365f4dae Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 9 Jun 2015 17:08:51 +0200 Subject: [PATCH 334/842] Perl 5.22 rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 24e826f..e26aa75 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ Name: git Version: 2.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -654,6 +654,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Jun 09 2015 Jitka Plesnikova - 2.4.3-3 +- Perl 5.22 rebuild + * Mon Jun 08 2015 Petr Stodulka - 2.4.3-2 - separate documentation files from git-core package to git-core-doc including core man pages From 8cb50df866186eb267b23892ec01715b7bf17897 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 10 Jun 2015 15:57:26 +0200 Subject: [PATCH 335/842] Perl 5.22 re-rebuild of bootstrapped packages --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index e26aa75..27b00f9 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ Name: git Version: 2.4.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -654,6 +654,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Jun 10 2015 Jitka Plesnikova - 2.4.3-4 +- Perl 5.22 re-rebuild of bootstrapped packages + * Tue Jun 09 2015 Jitka Plesnikova - 2.4.3-3 - Perl 5.22 rebuild From 0338f401b453cee67020789020d0bf3ad147d0a2 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 16 Jun 2015 20:45:36 -0500 Subject: [PATCH 336/842] 2.4.4. --- git.spec | 7 +++++-- sources | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index 27b00f9..af04add 100644 --- a/git.spec +++ b/git.spec @@ -43,8 +43,8 @@ %endif Name: git -Version: 2.4.3 -Release: 4%{?dist} +Version: 2.4.4 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -654,6 +654,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Jun 16 2015 Jon Ciesla - 2.4.4-1 +- Update to 2.4.4. + * Wed Jun 10 2015 Jitka Plesnikova - 2.4.3-4 - Perl 5.22 re-rebuild of bootstrapped packages diff --git a/sources b/sources index 538e98a..01c6e93 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -bde9fc7aa40560fe3b1c8b9c6d170db0 git-2.4.3.tar.gz -6c331604b078a86739c5e86e25c03e8a git-htmldocs-2.4.3.tar.gz -a023736d2b193d9d0f206881eba07b05 git-manpages-2.4.3.tar.gz +f122606aee328de3e1019cde720cb0aa git-2.4.4.tar.gz +b9f4f31c45ee5c75e8a22cedb743d097 git-htmldocs-2.4.4.tar.gz +285b126907d59647248577a7df01c44c git-manpages-2.4.4.tar.gz From ffa0047cf6fad396e7ee4e818cb0c4c06e09ea2e Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Mon, 22 Jun 2015 19:23:03 +0200 Subject: [PATCH 337/842] fix inifinite loop due to broken symlink and new requires in git-svn --- git-infinite-loop.patch | 39 +++++++++++++++++++++++++++++++++++++++ git.spec | 14 +++++++++++++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 git-infinite-loop.patch diff --git a/git-infinite-loop.patch b/git-infinite-loop.patch new file mode 100644 index 0000000..0eae28f --- /dev/null +++ b/git-infinite-loop.patch @@ -0,0 +1,39 @@ +diff --git a/refs.c b/refs.c +index 67d6745..ddb9a77 100644 +--- a/refs.c ++++ b/refs.c +@@ -1422,6 +1422,7 @@ static struct ref_dir *get_loose_refs(struct ref_cache *refs) + /* We allow "recursive" symbolic refs. Only within reason, though */ + #define MAXDEPTH 5 + #define MAXREFLEN (1024) ++#define MAXRETRIES 5 + + /* + * Called by resolve_gitlink_ref_recursive() after it failed to read +@@ -1576,6 +1577,7 @@ const char *resolve_ref_unsafe(const char *refname, int resolve_flags, unsigned + struct stat st; + char *buf; + int fd; ++ int retries = 0; + + if (--depth < 0) { + errno = ELOOP; +@@ -1612,7 +1614,8 @@ const char *resolve_ref_unsafe(const char *refname, int resolve_flags, unsigned + if (S_ISLNK(st.st_mode)) { + len = readlink(path, buffer, sizeof(buffer)-1); + if (len < 0) { +- if (errno == ENOENT || errno == EINVAL) ++ if ((errno == ENOENT || errno == EINVAL) && ++ retries++ < MAXRETRIES) + /* inconsistent with lstat; retry */ + goto stat_ref; + else +@@ -1645,7 +1648,7 @@ const char *resolve_ref_unsafe(const char *refname, int resolve_flags, unsigned + */ + fd = open(path, O_RDONLY); + if (fd < 0) { +- if (errno == ENOENT) ++ if (errno == ENOENT && retries++ < MAXRETRIES) + /* inconsistent with lstat; retry */ + goto stat_ref; + else diff --git a/git.spec b/git.spec index af04add..78452e4 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ Name: git Version: 2.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -64,6 +64,10 @@ Patch0: git-1.8-gitweb-home-link.patch Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://bugzilla.redhat.com/600411 Patch3: git-1.7-el5-emacs-support.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1204193 +# http://thread.gmane.org/gmane.comp.version-control.git/266145 +# could be removed when update/branch of Michael will be merged in upstream +Patch4: git-infinite-loop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -206,6 +210,7 @@ Requires: git = %{version}-%{release} Summary: Git tools for importing Subversion repositories Group: Development/Tools Requires: git = %{version}-%{release}, subversion +Requires: perl-Digest-MD5 %if ! %{defined perl_bootstrap} Requires: perl(Term::ReadKey) %endif @@ -315,6 +320,7 @@ Requires: emacs-git = %{version}-%{release} %if %{emacs_old} %patch3 -p1 %endif +%patch4 -p1 %if %{use_prebuilt_docs} mkdir -p prebuilt_docs/{html,man} @@ -654,6 +660,12 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Jun 22 2015 Petr Stodulka - 2.4.4-2 +- git-svn - added requires for perl-Digest-MD5 (#1218176) +- solve troubles with infinite loop due to broken symlink (probably + shouldn't be problem here, but it's reproducible manually) + (#1204193) + * Tue Jun 16 2015 Jon Ciesla - 2.4.4-1 - Update to 2.4.4. From 55d5f601ae83b4d913e2d5c72352dce874f9cefa Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 26 Jun 2015 14:50:07 -0500 Subject: [PATCH 338/842] 2.4.5. --- git.spec | 7 +++++-- sources | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index 78452e4..808d1d2 100644 --- a/git.spec +++ b/git.spec @@ -43,8 +43,8 @@ %endif Name: git -Version: 2.4.4 -Release: 2%{?dist} +Version: 2.4.5 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -660,6 +660,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Jun 26 2015 Jon Ciesla - 2.4.5-1 +- Update to 2.4.5. + * Mon Jun 22 2015 Petr Stodulka - 2.4.4-2 - git-svn - added requires for perl-Digest-MD5 (#1218176) - solve troubles with infinite loop due to broken symlink (probably diff --git a/sources b/sources index 01c6e93..ccadaee 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -f122606aee328de3e1019cde720cb0aa git-2.4.4.tar.gz -b9f4f31c45ee5c75e8a22cedb743d097 git-htmldocs-2.4.4.tar.gz -285b126907d59647248577a7df01c44c git-manpages-2.4.4.tar.gz +0083a528f0a85168ca7a59b3ca4190fc git-2.4.5.tar.gz +90152d68934c5f3e38bb18825ac1db87 git-htmldocs-2.4.5.tar.gz +7fb4eb35f71e369970e4b4a36b4745e2 git-manpages-2.4.5.tar.gz From a450dba5a69ec44060ee015aa92d1158d2bd918c Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Thu, 9 Jul 2015 09:14:06 +0200 Subject: [PATCH 339/842] No longer split out emacs-git and emacs-git-el sub-packages --- git.spec | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 808d1d2..fa8a35b 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ Name: git Version: 2.4.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -100,6 +100,15 @@ Requires: perl(Term::ReadKey) %endif Requires: perl-Git = %{version}-%{release} +%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7 +Requires: emacs-filesystem >= %{_emacs_version} +# These can be removed in Fedora 26 +Obsoletes: emacs-git <= 2.4.5 +Obsoletes: emacs-git-el <= 2.4.5 +Provides: emacs-git <= 2.4.5 +Provides: emacs-git-el <= 2.4.5 +%endif + #Provides: git-core = %{version}-%{release} #%if 0%{?rhel} && 0%{?rhel} <= 5 #Obsoletes: git-core <= 1.5.4.3 @@ -134,7 +143,9 @@ Requires: perl-Git = %{version}-%{release} %if ! %{defined perl_bootstrap} Requires: perl(Term::ReadKey) %endif +%if 0%{?rhel} && 0%{?rhel} <= 6 Requires: emacs-git = %{version}-%{release} +%endif Obsoletes: git <= 1.5.4.3 %description all @@ -288,6 +299,7 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi %description -n perl-Git-SVN Perl interface to Git. +%if 0%{?rhel} && 0%{?rhel} <= 6 %package -n emacs-git Summary: Git version control system support for Emacs Group: Applications/Editors @@ -312,6 +324,7 @@ Requires: emacs-git = %{version}-%{release} %description -n emacs-git-el %{summary}. +%endif %prep %setup -q @@ -546,6 +559,10 @@ rm -rf %{buildroot} %files -f bin-man-doc-git-files %defattr(-,root,root) +%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7 +%{elispdir} +%{_emacs_sitestartdir}/git-init.el +%endif #%{_datadir}/git-core/* #%doc Documentation/*.txt #%{!?_without_docs: %doc Documentation/*.html} @@ -623,6 +640,7 @@ rm -rf %{buildroot} %defattr(-,root,root) %{!?_without_docs: %{_mandir}/man3/*Git*SVN*.3pm*} +%if 0%{?rhel} && 0%{?rhel} <= 6 %files -n emacs-git %defattr(-,root,root) %doc contrib/emacs/README @@ -633,6 +651,7 @@ rm -rf %{buildroot} %files -n emacs-git-el %defattr(-,root,root) %{elispdir}/*.el +%endif %files daemon %defattr(-,root,root) @@ -660,6 +679,11 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Jul 7 2015 Jonathan Underwood - 2.4.5-2 +- Comply with modern Emacs packaging guidelines on recent Fedora + No longer split out emacs-git and emacs-git-el sub-packages on recent Fedora + Require emacs-filesystem on recent Fedora (#1234552) + * Fri Jun 26 2015 Jon Ciesla - 2.4.5-1 - Update to 2.4.5. From fda943bf1f54da02e19d822b46072cb0f455f832 Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Thu, 16 Jul 2015 21:27:49 +0200 Subject: [PATCH 340/842] rebase to 2.4.6 --- git.spec | 7 +++++-- sources | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index fa8a35b..12c0c5f 100644 --- a/git.spec +++ b/git.spec @@ -43,8 +43,8 @@ %endif Name: git -Version: 2.4.5 -Release: 2%{?dist} +Version: 2.4.6 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -679,6 +679,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Jul 16 2015 Petr Stodulka - 2.4.6-1 +- New upstream release 2.4.6 + * Tue Jul 7 2015 Jonathan Underwood - 2.4.5-2 - Comply with modern Emacs packaging guidelines on recent Fedora No longer split out emacs-git and emacs-git-el sub-packages on recent Fedora diff --git a/sources b/sources index ccadaee..3ebc21e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -0083a528f0a85168ca7a59b3ca4190fc git-2.4.5.tar.gz -90152d68934c5f3e38bb18825ac1db87 git-htmldocs-2.4.5.tar.gz -7fb4eb35f71e369970e4b4a36b4745e2 git-manpages-2.4.5.tar.gz +af7f48ebe09eef41504241d4a845610b git-2.4.6.tar.gz +f73cdfcab391ad28c618cf5ee280466f git-htmldocs-2.4.6.tar.gz +b4bd9c649e263240035708ac28a7b680 git-manpages-2.4.6.tar.gz From 1d4074d3cc810ea900b2e74eeea784144cbce5db Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 28 Jul 2015 10:39:46 -0500 Subject: [PATCH 341/842] 2.5.0. --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 12c0c5f..f9b182d 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 2.4.6 +Version: 2.5.0 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -679,6 +679,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Jul 28 2015 Jon Ciesla - 2.5.0-1 +- Update to 2.5.0. + * Thu Jul 16 2015 Petr Stodulka - 2.4.6-1 - New upstream release 2.4.6 diff --git a/sources b/sources index 3ebc21e..1506a00 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -af7f48ebe09eef41504241d4a845610b git-2.4.6.tar.gz -f73cdfcab391ad28c618cf5ee280466f git-htmldocs-2.4.6.tar.gz -b4bd9c649e263240035708ac28a7b680 git-manpages-2.4.6.tar.gz +3bc9b0a803ae8ec6c5316cc64f0b7f78 git-2.5.0.tar.gz +9cc1eccae35ae42de047f4ef054fdfdf git-htmldocs-2.5.0.tar.gz +134b049e51420a336049aac21c88a75a git-manpages-2.5.0.tar.gz From 363e4bd87826b025a5f1b6eae6a34e75d7376b17 Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Sat, 29 Aug 2015 16:45:59 +0200 Subject: [PATCH 342/842] Update to 2.5.1 --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index f9b182d..d412331 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 2.5.0 +Version: 2.5.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -679,6 +679,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sat Aug 29 2015 Petr Stodulka - 2.5.1-1 +- Update to 2.5.1 + * Tue Jul 28 2015 Jon Ciesla - 2.5.0-1 - Update to 2.5.0. diff --git a/sources b/sources index 1506a00..41ce675 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -3bc9b0a803ae8ec6c5316cc64f0b7f78 git-2.5.0.tar.gz -9cc1eccae35ae42de047f4ef054fdfdf git-htmldocs-2.5.0.tar.gz -134b049e51420a336049aac21c88a75a git-manpages-2.5.0.tar.gz +97267fa997803d5e6aa92318ea0476f8 git-htmldocs-2.5.1.tar.gz +fbdb976482a00ef596f82079b733adf3 git-manpages-2.5.1.tar.gz +196d3de058d9ba5808a5e608b3af8076 git-2.5.1.tar.gz From 79d36159748b0953e1c6c38dc810707b46320d92 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 11 Sep 2015 08:18:28 -0500 Subject: [PATCH 343/842] 2.5.2 --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index d412331..78d895a 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 2.5.1 +Version: 2.5.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -679,6 +679,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Sep 11 2015 Jon Ciesla - 2.5.2-1 +- Update to 2.5.2. + * Sat Aug 29 2015 Petr Stodulka - 2.5.1-1 - Update to 2.5.1 diff --git a/sources b/sources index 41ce675..7641941 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -97267fa997803d5e6aa92318ea0476f8 git-htmldocs-2.5.1.tar.gz -fbdb976482a00ef596f82079b733adf3 git-manpages-2.5.1.tar.gz -196d3de058d9ba5808a5e608b3af8076 git-2.5.1.tar.gz +12f43302727a5c2318bda3a5e2dd1793 git-2.5.2.tar.gz +882fe9ada0413085e26a8c624eb537ae git-htmldocs-2.5.2.tar.gz +c66b9bdfe2d63705d44acfeefc019dd4 git-manpages-2.5.2.tar.gz From bbabdf92c427faf86b9d1431395f78cf7430f681 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 18 Sep 2015 05:09:59 -0500 Subject: [PATCH 344/842] 2.5.3 --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 78d895a..72b4f46 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 2.5.2 +Version: 2.5.3 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -679,6 +679,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Sep 18 2015 Jon Ciesla - 2.5.3-1 +- Update to 2.5.3. + * Fri Sep 11 2015 Jon Ciesla - 2.5.2-1 - Update to 2.5.2. diff --git a/sources b/sources index 7641941..bb78d87 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -12f43302727a5c2318bda3a5e2dd1793 git-2.5.2.tar.gz -882fe9ada0413085e26a8c624eb537ae git-htmldocs-2.5.2.tar.gz -c66b9bdfe2d63705d44acfeefc019dd4 git-manpages-2.5.2.tar.gz +d908270e8a393169aa02d3ad9cf301ca git-2.5.3.tar.gz +2099f31799e3a3d9f28320c9bbc30297 git-htmldocs-2.5.3.tar.gz +af4bb134ac75accd21c1d229542d4abf git-manpages-2.5.3.tar.gz From 6966d34d3020f078be2b41e2c7810587939f89a4 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 29 Sep 2015 09:33:59 -0500 Subject: [PATCH 345/842] 2.6.0. --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 72b4f46..5791961 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 2.5.3 +Version: 2.6.0 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -679,6 +679,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Sep 29 2015 Jon Ciesla - 2.6.0-1 +- Update to 2.6.0. + * Fri Sep 18 2015 Jon Ciesla - 2.5.3-1 - Update to 2.5.3. diff --git a/sources b/sources index bb78d87..cc3afae 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -d908270e8a393169aa02d3ad9cf301ca git-2.5.3.tar.gz -2099f31799e3a3d9f28320c9bbc30297 git-htmldocs-2.5.3.tar.gz -af4bb134ac75accd21c1d229542d4abf git-manpages-2.5.3.tar.gz +eb76a07148d94802a1745d759716a57e git-2.6.0.tar.gz +18af19719b70aefaae232ca9f59676f4 git-htmldocs-2.6.0.tar.gz +eeb45b981cddb290ac38e5b78f301a7c git-manpages-2.6.0.tar.gz From eeecf762f58dacf85af679548011a1ec887fa76b Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 6 Oct 2015 07:56:52 -0500 Subject: [PATCH 346/842] 2.6.1 --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 5791961..2989f97 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 2.6.0 +Version: 2.6.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -679,6 +679,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Oct 06 2015 Jon Ciesla - 2.6.1-1 +- Update to 2.6.1. + * Tue Sep 29 2015 Jon Ciesla - 2.6.0-1 - Update to 2.6.0. diff --git a/sources b/sources index cc3afae..e3cae80 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -eb76a07148d94802a1745d759716a57e git-2.6.0.tar.gz -18af19719b70aefaae232ca9f59676f4 git-htmldocs-2.6.0.tar.gz -eeb45b981cddb290ac38e5b78f301a7c git-manpages-2.6.0.tar.gz +4c62ee9c5991fe93d99cf2a6b68397fd git-2.6.1.tar.gz +0f60f3992b9756e89f6ece36813a52de git-htmldocs-2.6.1.tar.gz +c3a96d72fa5759f12e8abdccf470d3ae git-manpages-2.6.1.tar.gz From 0c650a61eaca0792b2951d3fad32d6e0cf88ceec Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Sat, 17 Oct 2015 13:34:02 -0500 Subject: [PATCH 347/842] 2.6.2 --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 2989f97..498c3bd 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 2.6.1 +Version: 2.6.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -679,6 +679,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sat Oct 17 2015 Jon Ciesla - 2.6.2-1 +- Update to 2.6.2. + * Tue Oct 06 2015 Jon Ciesla - 2.6.1-1 - Update to 2.6.1. diff --git a/sources b/sources index e3cae80..7517a26 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -4c62ee9c5991fe93d99cf2a6b68397fd git-2.6.1.tar.gz -0f60f3992b9756e89f6ece36813a52de git-htmldocs-2.6.1.tar.gz -c3a96d72fa5759f12e8abdccf470d3ae git-manpages-2.6.1.tar.gz +da293290da69f45a86a311ad3cd43dc8 git-2.6.2.tar.gz +0e8146e8832043cb5f8fcf4bb353db94 git-htmldocs-2.6.2.tar.gz +afe156c6c0764d43960b6cfe6a28f6fb git-manpages-2.6.2.tar.gz From 33a437b21a61d66b94a0023916860a915c533045 Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Tue, 3 Nov 2015 17:18:44 +0100 Subject: [PATCH 348/842] provides failback for the macro _pkgdocdir (#1277550) --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 498c3bd..0d7ed91 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ Name: git Version: 2.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -449,7 +449,7 @@ make -C contrib/subtree install-doc %endif # it's ugly hack, but this file don't need to be copied to this directory # it's already part of git-core-doc and it's alone here -rm -f %{buildroot}%{_pkgdocdir}/git-subtree.html +rm -f %{buildroot}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/git-subtree.html mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d install -pm 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf @@ -679,6 +679,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Nov 03 2015 Petr Stodulka - 2.6.2-2 +- provides failback for the macro _pkgdocdir (#1277550) + * Sat Oct 17 2015 Jon Ciesla - 2.6.2-1 - Update to 2.6.2. From 7d4a2e0e59e336db874d68bc5d65b8493cd83cba Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 6 Nov 2015 07:03:04 -0600 Subject: [PATCH 349/842] 2.6.3 --- git.spec | 7 +++++-- sources | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index 0d7ed91..55b2ffd 100644 --- a/git.spec +++ b/git.spec @@ -43,8 +43,8 @@ %endif Name: git -Version: 2.6.2 -Release: 2%{?dist} +Version: 2.6.3 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -679,6 +679,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Nov 06 2015 Jon Ciesla - 2.6.3-1 +- Update to 2.6.3. + * Tue Nov 03 2015 Petr Stodulka - 2.6.2-2 - provides failback for the macro _pkgdocdir (#1277550) diff --git a/sources b/sources index 7517a26..de3c7c9 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -da293290da69f45a86a311ad3cd43dc8 git-2.6.2.tar.gz -0e8146e8832043cb5f8fcf4bb353db94 git-htmldocs-2.6.2.tar.gz -afe156c6c0764d43960b6cfe6a28f6fb git-manpages-2.6.2.tar.gz +b711be7628a4a2c25f38d859ee81b423 git-2.6.3.tar.gz +5b88e1dfc4a0888ea5162d506b4ee319 git-htmldocs-2.6.3.tar.gz +026d4505dd567492d0ca0f6e4528c44d git-manpages-2.6.3.tar.gz From 0301fd8dd67d32aa2918fdfca4a53adfdb2a3971 Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Fri, 27 Nov 2015 23:00:59 +0100 Subject: [PATCH 350/842] found 2 perl scripts in git-core, move them to git package Resolves: #1284688 --- git.spec | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index 55b2ffd..20ab9b3 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ Name: git Version: 2.6.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -185,9 +185,9 @@ Summary: Git protocol dæmon Group: Development/Tools Requires: git = %{version}-%{release} %if %{use_systemd} -Requires: systemd +Requires: systemd Requires(post): systemd -Requires(preun): systemd +Requires(preun): systemd Requires(postun): systemd %else Requires: xinetd @@ -236,7 +236,7 @@ BuildArch: noarch %endif Requires: git = %{version}-%{release}, cvs Requires: cvsps -Requires: perl-DBD-SQLite +Requires: perl-DBD-SQLite %description cvs Git tools for importing CVS repositories. @@ -563,6 +563,8 @@ rm -rf %{buildroot} %{elispdir} %{_emacs_sitestartdir}/git-init.el %endif +%{_datadir}/git-core/contrib/hooks/update-paranoid +%{_datadir}/git-core/contrib/hooks/setgitperms.perl #%{_datadir}/git-core/* #%doc Documentation/*.txt #%{!?_without_docs: %doc Documentation/*.html} @@ -571,8 +573,11 @@ rm -rf %{buildroot} %files core -f bin-files-core %defattr(-,root,root) %doc COPYING -%{_datadir}/git-core/ +# exlude is best way here because of troubels with symlinks inside git-core/ +%exclude %{_datadir}/git-core/contrib/hooks/update-paranoid +%exclude %{_datadir}/git-core/contrib/hooks/setgitperms.perl %{_datadir}/bash-completion/ +%{_datadir}/git-core/ %files core-doc -f man-doc-files-core %defattr(-,root,root) @@ -679,6 +684,10 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Nov 27 2015 Petr Stodulka - 2.6.3-2 +- found 2 perl scripts in git-core, move them to git package + (#1284688) + * Fri Nov 06 2015 Jon Ciesla - 2.6.3-1 - Update to 2.6.3. From 8e1923e29caf162a292134cd066659c255dc0044 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 9 Dec 2015 07:26:41 -0600 Subject: [PATCH 351/842] 2.6.4. --- git.spec | 7 +++++-- sources | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index 20ab9b3..bd543ee 100644 --- a/git.spec +++ b/git.spec @@ -43,8 +43,8 @@ %endif Name: git -Version: 2.6.3 -Release: 2%{?dist} +Version: 2.6.4 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -684,6 +684,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Dec 09 2015 Jon Ciesla - 2.6.4-1 +- Update to 2.6.4. + * Fri Nov 27 2015 Petr Stodulka - 2.6.3-2 - found 2 perl scripts in git-core, move them to git package (#1284688) diff --git a/sources b/sources index de3c7c9..6f835bc 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -b711be7628a4a2c25f38d859ee81b423 git-2.6.3.tar.gz -5b88e1dfc4a0888ea5162d506b4ee319 git-htmldocs-2.6.3.tar.gz -026d4505dd567492d0ca0f6e4528c44d git-manpages-2.6.3.tar.gz +169409c2f9872797f1efb41fb9a99dc3 git-2.6.4.tar.gz +9ad6c228e9af453f6446619ddc63c8d9 git-htmldocs-2.6.4.tar.gz +6b4c2b4324c4f47fd635cf345cdd42eb git-manpages-2.6.4.tar.gz From 8c329d52ad1daeaf3f557bdc9c8f178166d0a5ab Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 5 Jan 2016 07:43:09 -0600 Subject: [PATCH 352/842] 2.7.0 --- git.spec | 10 +++++++--- sources | 6 +++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/git.spec b/git.spec index bd543ee..93c455e 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 2.6.4 +Version: 2.7.0 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -67,7 +67,7 @@ Patch3: git-1.7-el5-emacs-support.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1204193 # http://thread.gmane.org/gmane.comp.version-control.git/266145 # could be removed when update/branch of Michael will be merged in upstream -Patch4: git-infinite-loop.patch +#Patch4: git-infinite-loop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -333,7 +333,7 @@ Requires: emacs-git = %{version}-%{release} %if %{emacs_old} %patch3 -p1 %endif -%patch4 -p1 +#%patch4 -p1 %if %{use_prebuilt_docs} mkdir -p prebuilt_docs/{html,man} @@ -684,6 +684,10 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Jan 05 2016 Jon Ciesla - 2.7.0-1 +- Update to 2.7.0. +- Infinite loop patch appears obsolete. + * Wed Dec 09 2015 Jon Ciesla - 2.6.4-1 - Update to 2.6.4. diff --git a/sources b/sources index 6f835bc..f4cb511 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -169409c2f9872797f1efb41fb9a99dc3 git-2.6.4.tar.gz -9ad6c228e9af453f6446619ddc63c8d9 git-htmldocs-2.6.4.tar.gz -6b4c2b4324c4f47fd635cf345cdd42eb git-manpages-2.6.4.tar.gz +f3c3ed131e37e5e07cc0b81e9b539908 git-2.7.0.tar.gz +28af913ecdef190cc67406c809c153b9 git-htmldocs-2.7.0.tar.gz +dca693846672e68c31d2eb1fc32e763b git-manpages-2.7.0.tar.gz From 4291a717b18509c8963e8e7b27124eab2545953b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 21:55:30 +0000 Subject: [PATCH 353/842] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 93c455e..047a6fb 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ Name: git Version: 2.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -684,6 +684,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 2.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Jan 05 2016 Jon Ciesla - 2.7.0-1 - Update to 2.7.0. - Infinite loop patch appears obsolete. From f427188b0cd994cd72c72c8c937856603bf935a6 Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Thu, 4 Feb 2016 16:23:20 +0100 Subject: [PATCH 354/842] remove all '.gitignore' files from packages --- git.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 047a6fb..d6b2690 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ Name: git Version: 2.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -532,7 +532,9 @@ cat %{name}.lang >> bin-man-doc-files # quiet some rpmlint complaints chmod -R g-w %{buildroot} find %{buildroot} -name git-mergetool--lib | xargs chmod a-x -rm -f {Documentation/technical,contrib/emacs,contrib/credential/gnome-keyring}/.gitignore +# rm -f {Documentation/technical,contrib/emacs,contrib/credential/gnome-keyring}/.gitignore +# These files probably are not needed +find . -name .gitignore -delete chmod a-x Documentation/technical/api-index.sh find contrib -type f | xargs chmod -x @@ -684,6 +686,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Feb 04 2016 Petr Stodulka - 2.7.0-3 +- remove all '.gitignore' files from packages + * Wed Feb 03 2016 Fedora Release Engineering - 2.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 5325c4e4e9059c76da57accdbdea4f7d7ca57516 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Sat, 6 Feb 2016 21:07:52 -0600 Subject: [PATCH 355/842] 2.7.1 --- git.spec | 7 +++++-- sources | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index d6b2690..20728f9 100644 --- a/git.spec +++ b/git.spec @@ -43,8 +43,8 @@ %endif Name: git -Version: 2.7.0 -Release: 3%{?dist} +Version: 2.7.1 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -686,6 +686,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sat Feb 06 2016 Jon Ciesla - 2.7.1-1 +- Update to 2.7.1. + * Thu Feb 04 2016 Petr Stodulka - 2.7.0-3 - remove all '.gitignore' files from packages diff --git a/sources b/sources index f4cb511..85b2e00 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -f3c3ed131e37e5e07cc0b81e9b539908 git-2.7.0.tar.gz -28af913ecdef190cc67406c809c153b9 git-htmldocs-2.7.0.tar.gz -dca693846672e68c31d2eb1fc32e763b git-manpages-2.7.0.tar.gz +846ac45a1638e9a6ff3a9b790f6c8d99 git-2.7.1.tar.gz +f6ddbee4ef4a6de1b49512ccd552d9e5 git-htmldocs-2.7.1.tar.gz +877d78f96e77f3a047998292376d75a0 git-manpages-2.7.1.tar.gz From e94a7fd7391c2280b17739328437095081c31f12 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 23 Feb 2016 08:01:47 -0600 Subject: [PATCH 356/842] 2.7.2 --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 20728f9..79a9930 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 2.7.1 +Version: 2.7.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -686,6 +686,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Feb 23 2016 Jon Ciesla - 2.7.2-1 +- Update to 2.7.2. + * Sat Feb 06 2016 Jon Ciesla - 2.7.1-1 - Update to 2.7.1. diff --git a/sources b/sources index 85b2e00..5416703 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -846ac45a1638e9a6ff3a9b790f6c8d99 git-2.7.1.tar.gz -f6ddbee4ef4a6de1b49512ccd552d9e5 git-htmldocs-2.7.1.tar.gz -877d78f96e77f3a047998292376d75a0 git-manpages-2.7.1.tar.gz +162ddc6c9b243899ad67ebd6b1c166b1 git-2.7.2.tar.gz +ff18c3296e59f11d71f7baaced4faae5 git-htmldocs-2.7.2.tar.gz +7bb067d6363f537b92c3b8b813ff9ed6 git-manpages-2.7.2.tar.gz From 0c34dab4c969554a01f6551e3e5135f80cd096a3 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 14 Mar 2016 09:46:46 -0400 Subject: [PATCH 357/842] 2.7.3 --- git.spec | 5 ++++- sources | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 79a9930..77d0f9b 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 2.7.2 +Version: 2.7.3 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -686,6 +686,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Mar 14 2016 Jon Ciesla - 2.7.3-1 +- Update to 2.7.3. + * Tue Feb 23 2016 Jon Ciesla - 2.7.2-1 - Update to 2.7.2. diff --git a/sources b/sources index 5416703..1747ce6 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -162ddc6c9b243899ad67ebd6b1c166b1 git-2.7.2.tar.gz -ff18c3296e59f11d71f7baaced4faae5 git-htmldocs-2.7.2.tar.gz -7bb067d6363f537b92c3b8b813ff9ed6 git-manpages-2.7.2.tar.gz +cf6ed3510f0d7784da5e9f4e64c6a43e git-2.7.3.tar.gz +38a56ab3dc7d04f792052f5f4fb92b16 git-htmldocs-2.7.3.tar.gz +5ef6160f8f3ca36095c64c99c977e1f6 git-manpages-2.7.3.tar.gz From caed48f0ed1ccdfb945fa267dae797c9be9a5d4f Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Fri, 18 Mar 2016 01:24:52 +0000 Subject: [PATCH 358/842] Update to 2.7.4 (CVE-2016-2315 CVE-2016-2324) --- git.spec | 6 +++++- sources | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 77d0f9b..b5d792f 100644 --- a/git.spec +++ b/git.spec @@ -43,7 +43,7 @@ %endif Name: git -Version: 2.7.3 +Version: 2.7.4 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -686,6 +686,10 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Mar 18 2016 David Woodhouse - 2.7.4-1 +- Update to 2.7.4 (for CVE-2016-2315, CVE-2016-2324) + Resolves: #1318220 + * Mon Mar 14 2016 Jon Ciesla - 2.7.3-1 - Update to 2.7.3. diff --git a/sources b/sources index 1747ce6..cb124dc 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -cf6ed3510f0d7784da5e9f4e64c6a43e git-2.7.3.tar.gz -38a56ab3dc7d04f792052f5f4fb92b16 git-htmldocs-2.7.3.tar.gz -5ef6160f8f3ca36095c64c99c977e1f6 git-manpages-2.7.3.tar.gz +c64012d491e24c7d65cd389f75383d91 git-2.7.4.tar.gz +8cb6a341e1add5c622488ff44093bbe6 git-htmldocs-2.7.4.tar.gz +58020dc13a5801c49f7986fef7027535 git-manpages-2.7.4.tar.gz From 185b89b8d418351d8d810a4ddc38a70f6ecdcb6c Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 16 Mar 2016 17:17:13 -0400 Subject: [PATCH 359/842] Conditionalize bash-completion pkg-config usage for EL <= 6 Using pkg-config for the bash-completion path isn't an option on older EL systems. To allow rebuilding of current git on those systems, the bash-completion pkg-config bits are conditionalized similar to other areas where Fedora and older EL differ. --- git.spec | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index b5d792f..ce99e26 100644 --- a/git.spec +++ b/git.spec @@ -31,11 +31,17 @@ # Settings for F-19+ and EL-7+ %if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 +%global bashcomp_pkgconfig 1 +%global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) +%global bashcomproot %(dirname %{bashcompdir} 2>/dev/null) %global desktop_vendor_tag 0 %global gnome_keyring 1 %global use_new_rpm_filters 1 %global use_systemd 1 %else +%global bashcomp_pkgconfig 0 +%global bashcompdir %{_sysconfdir}/bash_completion.d +%global bashcomproot %{bashcompdir} %global desktop_vendor_tag 1 %global gnome_keyring 0 %global use_new_rpm_filters 0 @@ -86,7 +92,9 @@ BuildRequires: libgnome-keyring-devel BuildRequires: pcre-devel BuildRequires: openssl-devel BuildRequires: zlib-devel >= 1.2 +%if %{bashcomp_pkgconfig} BuildRequires: pkgconfig(bash-completion) +%endif %if %{use_systemd} # For macros BuildRequires: systemd @@ -496,9 +504,8 @@ perl -p \ %endif # Setup bash completion -bashcompdir=$(pkg-config --variable=completionsdir bash-completion) -install -Dpm 644 contrib/completion/git-completion.bash %{buildroot}$bashcompdir/git -ln -s git %{buildroot}$bashcompdir/gitk +install -Dpm 644 contrib/completion/git-completion.bash %{buildroot}%{bashcompdir}/git +ln -s git %{buildroot}%{bashcompdir}/gitk # Install tcsh completion mkdir -p %{buildroot}%{_datadir}/git-core/contrib/completion @@ -578,7 +585,7 @@ rm -rf %{buildroot} # exlude is best way here because of troubels with symlinks inside git-core/ %exclude %{_datadir}/git-core/contrib/hooks/update-paranoid %exclude %{_datadir}/git-core/contrib/hooks/setgitperms.perl -%{_datadir}/bash-completion/ +%{bashcomproot} %{_datadir}/git-core/ %files core-doc -f man-doc-files-core @@ -686,6 +693,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Mar 22 2016 Todd Zullinger +- Conditionalize bash-completion pkg-config usage for EL <= 6 (bug 1320210) + * Fri Mar 18 2016 David Woodhouse - 2.7.4-1 - Update to 2.7.4 (for CVE-2016-2315, CVE-2016-2324) Resolves: #1318220 From 63f895c570bcd06e328d3d4f916cbff4cd00b08e Mon Sep 17 00:00:00 2001 From: Konrad Scherer Date: Tue, 22 Mar 2016 11:59:59 -0400 Subject: [PATCH 360/842] Improve el5 and el6 support (bug 1320210) Workaround missing git subtree documentation in prebuilt docs, dropping a redundant listing of Documentation/docbook-xsl.css, Only add git-cvsserver binary once if the core dir matches the bin dir as it does on el5. Signed-off-by: Konrad Scherer --- git.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index ce99e26..9313a1b 100644 --- a/git.spec +++ b/git.spec @@ -593,7 +593,9 @@ rm -rf %{buildroot} %doc README Documentation/*.txt Documentation/RelNotes contrib/ %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} %{!?_without_docs: %doc Documentation/howto Documentation/technical} -%{!?_without_docs: %doc contrib/subtree/git-subtree.html Documentation/docbook-xsl.css} +%if ! %{use_prebuilt_docs} +%{!?_without_docs: %doc contrib/subtree/git-subtree.html} +%endif %files p4 @@ -614,7 +616,9 @@ rm -rf %{buildroot} %files cvs %defattr(-,root,root) %doc Documentation/*git-cvs*.txt +%if "%{gitcoredir}" != "%{_bindir}" %{_bindir}/git-cvsserver +%endif %{gitcoredir}/*cvs* %{!?_without_docs: %{_mandir}/man1/*cvs*.1*} %{!?_without_docs: %doc Documentation/*git-cvs*.html } @@ -693,6 +697,11 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Mar 22 2016 Konrad Scherer +- Workaround missing git subtree documentation in prebuilt docs (bug 1320210) +- Only add git-cvsserver binary once if the core dir matches the bin dir as it + does on el5 (bug 1320210) + * Tue Mar 22 2016 Todd Zullinger - Conditionalize bash-completion pkg-config usage for EL <= 6 (bug 1320210) From 68864de6d0f34df2c5623bc80d00a148236f163c Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 27 Mar 2016 16:45:33 -0400 Subject: [PATCH 361/842] Ignore mockbuild output (results_git dir) --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a8b6c5d..fb22a75 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ *.tar.gz /.build*.log /git-*/ +/results_git/ From a823c54d04289fc13ecf8a2cf3931d47d24be407 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 16 Mar 2016 17:38:07 -0400 Subject: [PATCH 362/842] Use https for URL / Source as well as smaller tar.xz files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using https URL's for source files provides a little more security for those downloading the code. Packagers, of course, should be verifying the GPG signature files before pushing new releases to Fedora's source cache¹. While we're changing the source URL's, we might as well use the smaller tar.xz files which upstream provides. (This requires minor adjustments to the unpacking of prebuilt html and man tarballs; tar on el5 does not know how to automatically filter via xz.) ¹ Replace .xz with .sign for the signatures, which are made against the uncompressed tarballs. --- .gitignore | 2 +- git.spec | 17 ++++++++++------- sources | 6 +++--- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index fb22a75..7b240da 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ *~ *.rpm -*.tar.gz +*.tar.xz /.build*.log /git-*/ /results_git/ diff --git a/git.spec b/git.spec index 9313a1b..db5914e 100644 --- a/git.spec +++ b/git.spec @@ -50,19 +50,19 @@ Name: git Version: 2.7.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools -URL: http://git-scm.com/ -Source0: http://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz +URL: https://git-scm.com/ +Source0: https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.xz Source2: git-init.el Source3: git.xinetd.in Source4: git.conf.httpd Source5: git-gui.desktop Source6: gitweb.conf.in -Source10: http://www.kernel.org/pub/software/scm/git/%{name}-manpages-%{version}.tar.gz -Source11: http://www.kernel.org/pub/software/scm/git/%{name}-htmldocs-%{version}.tar.gz +Source10: https://www.kernel.org/pub/software/scm/git/%{name}-manpages-%{version}.tar.xz +Source11: https://www.kernel.org/pub/software/scm/git/%{name}-htmldocs-%{version}.tar.xz Source12: git@.service Source13: git.socket Patch0: git-1.8-gitweb-home-link.patch @@ -345,8 +345,8 @@ Requires: emacs-git = %{version}-%{release} %if %{use_prebuilt_docs} mkdir -p prebuilt_docs/{html,man} -tar xf %{SOURCE10} -C prebuilt_docs/man -tar xf %{SOURCE11} -C prebuilt_docs/html +xz -dc %{SOURCE10} | tar xf - -C prebuilt_docs/man +xz -dc %{SOURCE11} | tar xf - -C prebuilt_docs/html # Remove non-html files find prebuilt_docs/html -type f ! -name '*.html' | xargs rm find prebuilt_docs/html -type d | xargs rmdir --ignore-fail-on-non-empty @@ -697,6 +697,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sun Mar 27 2016 Todd Zullinger - 2.7.4-2 +- Use https for URL / Source and smaller tar.xz files + * Tue Mar 22 2016 Konrad Scherer - Workaround missing git subtree documentation in prebuilt docs (bug 1320210) - Only add git-cvsserver binary once if the core dir matches the bin dir as it diff --git a/sources b/sources index cb124dc..f029bfa 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -c64012d491e24c7d65cd389f75383d91 git-2.7.4.tar.gz -8cb6a341e1add5c622488ff44093bbe6 git-htmldocs-2.7.4.tar.gz -58020dc13a5801c49f7986fef7027535 git-manpages-2.7.4.tar.gz +b0219fcb6d73104361f4fbdba3741d00 git-2.7.4.tar.xz +d37654c45897afa4501fe7bc138b576f git-htmldocs-2.7.4.tar.xz +52507ee81f9aac0abf85160398cd3e81 git-manpages-2.7.4.tar.xz From f5bc9a83835bae48836be2b3426ee87842c698fc Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 27 Mar 2016 15:04:55 -0400 Subject: [PATCH 363/842] Check upstream GPG signatures in %prep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Many years ago, the GPG signature file was included in the source list¹. A compromise at kernel.org caused the tarballs to move to googlecode.com for a number of releases and the signatures were not provided in an easily downloaded format². When the source location was moved back to kernel.org, the signature file had already been removed from the spec file and was not re-added³. There is an effort underway to make GPG signature verification a requirement when upstream provides signatures⁴. Regardless of whether this becomes a requirement in the packaging guidelines, verification of upstream signatures makes good sense. It also makes the process easier for git package maintainers, who are (or should be ;) doing this manually for each upstream git release. While adding the signatures to the source list, all non-upstream source files were moved to Source10 and above. This should make it easier to add new upstream source files in the future, avoiding the need for tedious (and error-prone) renumbering of existing sources. Remove the unused entry for Patch14 also. ¹ ea3f253 Include gpg signature for tarball in SRPM (2011-08-26) ² c57f383 Update to 1.7.9.1 (2012-02-15) ³ b741f45 Change source URLs, as googlecode doesn't have up-to-date tarballs (2014-06-10) ⁴ https://fedorahosted.org/fpc/ticket/610 https://fedoraproject.org/wiki/PackagingDrafts:GPGSignatures https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/2TBK4LLNRH73QJQSXWFPCQYHGTSJ3C7P/ --- .gitignore | 2 + git.spec | 72 +++++++--- gpgkey-junio.asc | 360 +++++++++++++++++++++++++++++++++++++++++++++++ sources | 3 + 4 files changed, 415 insertions(+), 22 deletions(-) create mode 100644 gpgkey-junio.asc diff --git a/.gitignore b/.gitignore index 7b240da..c6d0c92 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ *~ +*.gpg *.rpm +*.sign *.tar.xz /.build*.log /git-*/ diff --git a/git.spec b/git.spec index db5914e..60cd6b7 100644 --- a/git.spec +++ b/git.spec @@ -56,24 +56,36 @@ License: GPLv2 Group: Development/Tools URL: https://git-scm.com/ Source0: https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.xz -Source2: git-init.el -Source3: git.xinetd.in -Source4: git.conf.httpd -Source5: git-gui.desktop -Source6: gitweb.conf.in -Source10: https://www.kernel.org/pub/software/scm/git/%{name}-manpages-%{version}.tar.xz -Source11: https://www.kernel.org/pub/software/scm/git/%{name}-htmldocs-%{version}.tar.xz -Source12: git@.service -Source13: git.socket +Source1: https://www.kernel.org/pub/software/scm/git/%{name}-htmldocs-%{version}.tar.xz +Source2: https://www.kernel.org/pub/software/scm/git/%{name}-manpages-%{version}.tar.xz +Source3: https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.sign +Source4: https://www.kernel.org/pub/software/scm/git/%{name}-htmldocs-%{version}.tar.sign +Source5: https://www.kernel.org/pub/software/scm/git/%{name}-manpages-%{version}.tar.sign + +# Junio C Hamano's key is used to sign git releases, it can be found in the +# junio-gpg-pub tag within git. +# +# (Note that the tagged blob in git contains a version of the key with an +# expired signing subkey. The subkey expiration has been extended on the +# public keyservers, but the blob in git has not been updated.) +# +# 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=7214aea37915ee2c4f6369eb9dea520aec7d855b +Source9: gpgkey-junio.asc + +# Local sources begin at 10 to allow for additional future upstream sources +Source10: git-init.el +Source11: git.xinetd.in +Source12: git.conf.httpd +Source13: git-gui.desktop +Source14: gitweb.conf.in +Source15: git@.service +Source16: git.socket Patch0: git-1.8-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://bugzilla.redhat.com/600411 Patch3: git-1.7-el5-emacs-support.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1204193 -# http://thread.gmane.org/gmane.comp.version-control.git/266145 -# could be removed when update/branch of Michael will be merged in upstream -#Patch4: git-infinite-loop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -85,6 +97,7 @@ BuildRequires: desktop-file-utils BuildRequires: emacs BuildRequires: expat-devel BuildRequires: gettext +BuildRequires: gnupg2 BuildRequires: %{libcurl_devel} %if %{gnome_keyring} BuildRequires: libgnome-keyring-devel @@ -335,18 +348,32 @@ Requires: emacs-git = %{version}-%{release} %endif %prep +# Verify GPG signatures +gpghome="$(mktemp -qd)" # Ensure we don't use any existing gpg keyrings +key="%{SOURCE9}" +# Ignore noisy output from GnuPG 2.0, used on EL <= 7 +# https://bugs.gnupg.org/gnupg/issue1555 +gpg2 --dearmor --quiet --batch --yes $key >/dev/null +for src in %{SOURCE0} %{SOURCE1} %{SOURCE2}; do + # Upstream signs the uncompressed tarballs + tar=${src/%.xz/} + xz -dc $src > $tar + gpgv2 --homedir "$gpghome" --quiet --keyring $key.gpg $tar.sign $tar + rm -f $tar +done +rm -rf "$gpghome" # Cleanup tmp gpg home dir + %setup -q %patch0 -p1 %patch1 -p1 %if %{emacs_old} %patch3 -p1 %endif -#%patch4 -p1 %if %{use_prebuilt_docs} mkdir -p prebuilt_docs/{html,man} -xz -dc %{SOURCE10} | tar xf - -C prebuilt_docs/man -xz -dc %{SOURCE11} | tar xf - -C prebuilt_docs/html +xz -dc %{SOURCE1} | tar xf - -C prebuilt_docs/html +xz -dc %{SOURCE2} | tar xf - -C prebuilt_docs/man # Remove non-html files find prebuilt_docs/html -type f ! -name '*.html' | xargs rm find prebuilt_docs/html -type d | xargs rmdir --ignore-fail-on-non-empty @@ -441,7 +468,7 @@ for elc in %{buildroot}%{elispdir}/*.elc ; do install -pm 644 contrib/emacs/$(basename $elc .elc).el \ %{buildroot}%{elispdir} done -install -Dpm 644 %{SOURCE2} \ +install -Dpm 644 %{SOURCE10} \ %{buildroot}%{_emacs_sitestartdir}/git-init.el %if %{gnome_keyring} @@ -460,9 +487,9 @@ make -C contrib/subtree install-doc rm -f %{buildroot}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/git-subtree.html mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d -install -pm 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf +install -pm 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf sed "s|@PROJECTROOT@|%{_var}/lib/git|g" \ - %{SOURCE6} > %{buildroot}%{_sysconfdir}/gitweb.conf + %{SOURCE14} > %{buildroot}%{_sysconfdir}/gitweb.conf find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';' @@ -488,7 +515,7 @@ rm -rf %{buildroot}%{_mandir} mkdir -p %{buildroot}%{_var}/lib/git %if %{use_systemd} mkdir -p %{buildroot}%{_unitdir} -cp -a %{SOURCE12} %{SOURCE13} %{buildroot}%{_unitdir} +cp -a %{SOURCE15} %{SOURCE16} %{buildroot}%{_unitdir} %else mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d # On EL <= 5, xinetd does not enable IPv6 by default @@ -500,7 +527,7 @@ perl -p \ %if %{enable_ipv6} -e "s|^}|$enable_ipv6\n$&|;" \ %endif - %{SOURCE3} > %{buildroot}%{_sysconfdir}/xinetd.d/git + %{SOURCE11} > %{buildroot}%{_sysconfdir}/xinetd.d/git %endif # Setup bash completion @@ -530,7 +557,7 @@ desktop-file-install \ %if %{desktop_vendor_tag} --vendor fedora \ %endif - --dir=%{buildroot}%{_datadir}/applications %{SOURCE5} + --dir=%{buildroot}%{_datadir}/applications %{SOURCE13} # find translations %find_lang %{name} %{name}.lang @@ -699,6 +726,7 @@ rm -rf %{buildroot} %changelog * Sun Mar 27 2016 Todd Zullinger - 2.7.4-2 - Use https for URL / Source and smaller tar.xz files +- Check upstream GPG signatures in %%prep * Tue Mar 22 2016 Konrad Scherer - Workaround missing git subtree documentation in prebuilt docs (bug 1320210) diff --git a/gpgkey-junio.asc b/gpgkey-junio.asc new file mode 100644 index 0000000..7214aea --- /dev/null +++ b/gpgkey-junio.asc @@ -0,0 +1,360 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQINBE6GdewBEADE3szNmKeUAUad22z1tWkLjLzyDcJpF7IzEnLs8bD1y0I6iqH0 +169ru5iXKn29wc+YAuxWorb4P5a2i2B/vs32hJy/rXE7dpvsAqlHLSGSDUJXiFzM +Bb9SfJO0EY2r+vqzeQgSUmhp/b4dAXVnMATFM37V83H/mq8REl5Wwb2rxP3pcv6W +F6i51+tPEWIUgo1N74QkR4wdLcPztDO9v7ZIaFKl+2GEGkx6Z+YjECTqQuyushjq +41K3UVmv+AmLhJYKA78HY5KqCkXrz8rCgoi+Ih+ZT2sgjx637yT84Dr/QDh7BkIB +blmpRQ+yoJlVDWI5/bI8rcdrPz+NmxaJ7dKEBg0qTclbwquacpwG1DCCD8NgQrwL +WVLGVdsT2qwek+KkmOs+iNBXY1TgKPAeuv0ZDKKYrCwYpN1K90oXk431g79bKsH5 +8Tybg5uW+e2i+H5gnDeyl481HOt8aHOPu9qIB/zIek6lDH69q3nGcf7k3prxDf3I +qYy6CPcpjTfpN4i/7gxQDNI+AIgbs21EE5Kg1TPUe0XgfdJMtIF+D6wTjbrLtDnn +09Iwz0SfIZR52IrZHxUlFXZFjk10RXYATtdMqEFgYgjYvYXxL9EEr7T5Dgso+qaE +wV0rrg0VDKrf/afrjGOeffumlhBhJnBnns1T+p65Vz5hyQl7SFKLw+Ix7wARAQAB +tCJKdW5pbyBDIEhhbWFubyA8Z2l0c3RlckBwb2JveC5jb20+iQI4BBMBAgAiBQJO +hnXsAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAg0E5acTZgp+dxD/4l +rBl79z7SK7RUNapxiosr/1VVf2/fWHKqGmjbZscc/8Z8gbN8lzan/8siXtGxhpxt +t/F3X0ag4cQGB7IvQ4eaEJN0yYmccgdjPvt1OkHFTywrg6MjSx5kTk6IjO3Ngcof +te3VVcdGwOc3Q+HyG1Pb5N2VBL7iR2va+NyRIxtMSq+WVaC9YRgK8lhrkFM7zTS1 +S/80W6l3ZL0TaGxg2Ys8cbfVruefPLr8SHh+TEssij55/sebLPsqyP+aGXfYc5FJ +VcFnYxp6FdKovODLEEjR97HaTo3z68jSHQWCDJDp1vYpjqdnTGCSwnL2isYeCcuj +dLLKOAlbKu2aiP/+rZOmZfbxNK7dWnhg/Z7YC+dq5Mt/W+4EcaRvf5MYe3V7PGoL +XURi5dewQD35PtxfT1Zj0KQHzZ9m81IE3s0zjTAHSVqwFXcue4Jwr9SZLEjKSUQF +jMHoK2VwTFKu6UA6JS0gQwPwyHYfdOxAm0dEUTcJqrWOJHjHu2WNyqzI+sh9lP1P +S4l0vsVwdyTCkWos0mVNlSiYq8fZ5/fcUcM4Tb4AJlvV1p1t+/dNNDgf/qWmMkQc +hyLVCQi3zPFtbAFPDp+PVcninjkyjB7chyRGSp0aN6mFmnrDxjDg3zz7DWe3Q6PI +790RF4EQY738+WcoKhpuJfcAArfQ2xgKr55VSs7glYkCOwQTAQIAJQIbAwYLCQgH +AwIGFQgCCQoLBBYCAwECHgECF4AFAk6GeOUCGQEACgkQINBOWnE2YKdUxRAAq/kE +aXw5mxp1GNUasudAKdXhtNOtbwGqQjC5lPuJMaiESpuf9NGBpm+1cUQiw6SjWtIZ +B/n7QOEJpz1OI+FBLIf7wGtgRgl0YwfUYsU6JL0H/Yjl1Boh2L9ZJ/qd5cYOumy5 +yld3VknI1diLngz+MqSxGR5Vg/SP1J5q4NpiRAHM+IEgHwR1izn//iWAKuo+nqyM +T0uWbSM/7cEH+jAqF1wF7jOrYFIXabSahvNls0mTLljn85kug0k7qitOYfYKcHY+ +Z8+I3YeLubKfiyjqhcPeCSEXBPsI+XJYzjpV9xaovOAAwvG/zswt1fShmqzZwc1n +Z5CKDcWzQTResA9XYJ9aXrnrn2j/auQjvZYyjUjhlApcL7SRa6WWS+T4XjTRRZD0 +maZJkrXAerPER7Ms+c7qsUFDlrry1VA0VufMmUdFgtV3P8ovnBBUlIiiOTqjzcAt +b9MYe2vzDmyUMU0AhChy8lWJZ6IbH9kcc8Wjjo4FpmNjvsh+RucpnwYnv1MO83Er +CfPaLywBBv9dLZCVaiH82uVnsY91QGWyPou78doLZS6jNt4BspKnL+1VphQ+ZRVh +guEsPDOyYpJvL5/fXcWZ7ASozKpLIxDVF9SXlGSPhR4NgjUlQV9CfMi55nfHiQZG +F5FO/SdxlXsf1k82xZ0pD5sNejLQLvxPRCjWwCCIRgQQEQIABgUCToZ4eQAKCRDA +xtmk8xGbmhJjAJ9YdwIYsa0q1i0kCLOWlXNTMRpXmACgivss4zsxTs+UsHKpNm2P +e6t655OJAhwEEAECAAYFAk6KMDYACgkQvkvAx/ZRq3vafQ/+KgazXW7OCf1BMSGy +sl9jZYIgWp9KP0SR6AG7WWEG8nHbfEaSrUyM4i1x4F2vAbsfqQLEkJSI+6z8L9rP +7/vgWxC1Zx58txQnV+p4h3L5gLC5wTAgLFL54E5pr13KdeGE8Nn0ve49qITJZ278 +ZGkIqAir6MO+tDPR+/Oj6beh5dQT/N/otMrcSEzCoRN1QwcQltNduISXKpyMnpRO +t9riz8aaJkY1dupxrn8Xr53GrphKEH8DLH9Pwe8PjBfKcOtY05OQTkOgq1wKCDMq +rP6DMpffLvdHyPZ3otkyaMEx35gWIQ3mByckCB8OQlf9zM2vFBvgR7GpJ43dGcBS +RmpjnzYCVFXohR+T0jfPU2qTDki5OpmyHlS6xinFtACw2sbUof2PkaZgLxS4AU4T +Ju8M7lPM/RUL/yf+lOnfgl0y5CSPJOo0SxAIL+UORhlpxrw8uB9SPWn2+64Qvha+ +Mksp2/UU7hjFbYPywL+sE1a2LsX3s/lchJUmLvC42x6iYpcJqcOTSy6DHHRqU1Mc +FcmEWQ9dmD6g1pdxBiv0riA6VlhYNgDik67sZC2dMaGLoCdoIWgFH1D96xV4ousg +oF+jlV1xtxs+KCnjvEmTITBP/5o50UQ4sxcd6Br+I/6cGWL4mTe3IulxxN9yupSw +TPLBu17W3ON4ZE8vv9vk5AziB+mJAhwEEAECAAYFAk6KL/oACgkQyx8mb86fmYF5 +qw/8CQi20QzdVxDL2WfMIo5J7AOrpKQhbDbmScURKW3AmH8BLI/tFP+FpZ2PwFMh +9xWmtdr3zm/NKVYHP1BpCKNk2hiAQtWGAlzO8YYKAw1v0ZNNOjyOOpeA4XIBrwIK +7lMi8NJlitWuJqavnPYnptpfNuvRl2JWTqd+MZp738aTOBXwz/6GqnWRaH47La1g +DzXtK5nc7pB1p5BUelhAUZE+W0uBxZxBr3P66A7EEwfDtixsiWJK1p0LRtJwzPQu +CQw9oxhTUIghutUZ5N507SySvYT7kLbm0pr6T+3AYgu5a7f13qBOd8JMLjIbd5vQ +y0aTD9RNf9R+vNUErBOo009s2Mdh83DU87P3QzbeNd/nUrW57fwMVzLhaqhlX8nz +eTS9Yv9+/6UkqouI+uMUaroEgBIt+VTSUR+MML28ii4CEJc+n9YgXWMEsvsSKv5C +xQVM2TBlYYNJY73K99k3jG+maVI4uX25ZsYlmO+L/hSD/XM1ROrHfNUfyhHILUkI +Vyx2nOApFYpTUPV7iyJCDnF0eImuX4e7gJ2JPNY1f5rPAeOJvRbJs/oStkTnfc+v +ZDi3KOWxAIPaAjB1atFxWp+hxuxDHzhFMVgfnJ5cZDTgrBb3ftkE+0rdyHfLMM+g +EnxbQIJ2r6S9KQZAJJC6kIXyPRi/49Wp7Eqfx/KZfnllhBWJAhwEEAECAAYFAk6K +MMQACgkQjBrnPN6EHHdj1A//ahy751AcOwddYNooUAkvSUoOUkiDPH3gtToQ9Acv +uda6ZuKw+v7+kV6JAICrjL2zVfo65lYDcsrepnHDaGS70kPA9A5CFoh7ba+KQyBS +Zvdzc5MQlN1uwUNI8+BzCSlctdCaTQFtDVNr8iXQBVQVpMCoLw5+OEp6oC/dH2E+ +PhuYSJxpwMvTtLpNhV7K6kPY2nPPG33GSC0zQT2G7NeGqffKKlfPHprJfYtnKqCS +vrfkvgOAJWTgJTBIBHuUMQxLVVMJtgY4dEiCS4/X9m+Xtor971pc+/FX1cVAEm27 +rEQSq+kn+lQsXCTINPx12wQf2HRSwgruvDQ0rVMgBwBAD7jTZYR2xfXw/DTqiYuL +NVcLmZZ450kxvxBvUReTOPeCKqQC1N5eQSIqIEzIuN8AF51ddxdGXA6EZCy5CfGm +Z89bSj8Hv9yXSTdQY5rrp0OpF05XE1c7U8dJUvUlEZLi7lLFvL5l1etoixFUeEnN +td/dSkPK5tXj+ryDrnSn6Y8YNrj2gqt8ZVqLoi9ADQh6EwGe6AOWW2sJvVOwlAHs +MVTz2+uLXNuM7pjT9N2W1AsR0KZeDGqEZ4H03c8/awidtnqAkaUV4eRRLAIYN3Vp +TC0P8m4Rm89t72H1ZebzGrHGN1lMI+G3wVoEGsNKbuxCGo76xnBQWNU8Egn99jyJ +VYeJAhwEEAECAAYFAk6KTm8ACgkQvaBghUk7rOTXDxAAun7VtPSqHqmWbjlZ6lAM +HhoWFlpIETpa433WyA7FeruqshPEJlxQXXkgOyD/WXyZqVmh16pWZXdviJWuT0YE +nnt2oNXfRwuyo8MJUuJfzubx7tYOwVFGMQ0U6anzRdiez5CWP8tw9hCOQIKDqJI3 +qMMCcqLOzvNS/Ho8iXULlJ+k8bD5yyZUzbsy4JimR3YPKWJi9rXpcpFiQGLeHGPN +wvmUn/bW26KNHFBOlBVxUvkOSiZusT/xVEGfDCsu1BFsEF1Iigaa3IYZXNcMLVEy +pfbc8GozoU2+T6/TQw8uPwXhJXzKUsk1OJacgJtVvQfJGWy0SXWrlBv46ZokFnVv +fNjKgRhvYYmfojK/kJ0lE6Jm5PZOqmgmUabZXDjOIngODvJ2e2lcaxUu8MTNS/XY +5gZQqv/8Q/5ptjeVB19OGjpWQ1hWyK53sDOzTMqA+5LzD+Lub8ETuFnkY3bW5VnB +1B77uhskv4DKH5jsiOSAKik1rYOF0M06Pjumk7FTCB4bkwlzdsyjEzsyrOBjg8Ml +ckmNmwI1vRonhriyqxuJNFyhE/OSLyXlSObRztHJsXII+Mui3eQ2M1mTpr6EZe5o +Sy0Z/Yb1gX/tNZNZ0KEKBLUChTyKAYK0Kc6rKZsfN4laXZoZaQjbUpbTOJCRgbwJ +nR/AHLo8fIcqMZdj0biHUmWJAhwEEAECAAYFAk6KQ/kACgkQTQotlCAJATJeTBAA +5CaaZtuQgsJVXmPlwuk1Wqfjo7fsfgqM0miqQ7wiab1S9tcYVI+UGl7iotjsWG+A +oS5XtbEBZ/wxCpX8Ram+PIsr0SkTdJarSPy+U+kTLKguygYwtuXft4gxnInA9cuZ +dBbBbTh3i+YF2i289J0GErqYLbzlklLjstrjEjliWXI8FapvK+rqMUMvol6jerOJ +DeULk1VTgcNITmbnel8EiGLNdCdwOz9KEzD1Nhl1NoXB61SAGciMl4ssezkVC7LX +omaMWrp7RXfozrggGaiu28Gl2CW4yvJ7alR7nU/nyrtFqy3cIGTAD8UpZWd1AcYf +dt1Hh3q45qyoIZg3+M3bsZis5X+0eiGFH550bw5SvkHeCzorQmNKSTWjalxYu7PK +uJv5pk7Z9dZmFUTyvkGeBPYwNq/WDXNrBtpy9REPc4Z5jbOTpnSLC+qFVUWIl+a7 +0Tlw45uDp8lOWu/CD6pbpHTkxSxwHIM04K0fdoMFvzkmenOx98/FSuLnCYbJzV3g +oANL6biHk1w5RhRb5LDeTtiHayMxEeBCkL/06PUA26OCoFbmq53PGlhKQnQxuiPt +g9gwJYMkkiMUrW6p8s+xIwZKeXbjAFFParPYx7rFzjbD2VlzedzlUgN5g20izT5k +l+/n1oUxggmWnO0cTuO5LBxKDdp21oqhhOvCY7vN2u6JAhwEEwECAAYFAk6KVo8A +CgkQIx9wyqsxaFDoMg//ZOZXcgMIVBfFX2GLiFPfBclysUP/CWn6o7ZYeshhLWTY +kIPxvLn7nPFHob83mX/iPXYnQWZggahWu148ysKmMvulYeNEwvcl85QULyJRNx3G +H0PG3dfVavFxgOHeHBIGUlkLGcqHFjDM4HqaRAbQ2CkHk/Ds5NiHVT45/rIL+M3l +A+leFxNQ2hl68nsRL2B54ml9/bQx1PhLuDTGT7EMxkgLMv9cspqpT/nIoT/3Nq7E +IrN51PZDixpBcxalz3NXtkirAKLXI1XKlRDKrzL27PZiXZTRWZCbNdpf1kkjauD2 +RN9KOXT9izvbC6PrJM8/cikOCpYaWfRUe8yXAxqFP7NK7z+8vL6TFPRnBwF5DTNE +oHdf+7jBbXwV01f/At6YtcBBvNDGOKZQE3lw6Bjqace/z1IIeYggq6ffq9h554O+ +0skye7NqViZh2y5Kd2TrYZksdhRgfRcMDJkvXj3rINcoaWf91u5Y51gFfHB/KiKn +rTIn94bmLh7omcZjx5dde9IpZtk3i0REg+LoG2G85U409AoPHbnbhXwbmX/ROp1j +dl02ewbLAo1GzX2E+NnaKoIgEI6yXpQgP/bDeTJrOq4B4FGHbLv0jdfDwgAcOz7D +xrmsDbqivcKS8ncYSlEndnIE/X+RlKMCKGHcpht2dwpfxNzs6xqeJLtNwdkuVBmJ +AhwEEwECAAYFAk6KVqcACgkQZrFaRl4fnslDchAAuFk3mX3Fs4ibFZKd/wOm+Rgq +WwmwTxbu//5e6NVb6wi4Rh0T8zDVlNHxXKUuL5u1Ywnjee1JPxn1xHJRYh5Teb1z +rZVD50NtF2QDzJdWnsCEp6zVkI791+pI3yd2oZOpaUU4jdjfvukExKl2y4HsR8RY +7b0G5OxIHdOyEmS4wtKr1iaoCXzunMi1y4jukBxo/RsBuipizn7QbEkTnuL2tMpv +oLbXJh6lIZ8pHcM0DIrlATGGB51k01+ChabSKWZhlObZG1vNWwi8/5uxHsUvULLE +fqXeDPRimrX9gL+HbUkXqUq4kyXVbqXwdqD+hfETr1aWeal4NYYhwWU90x5171aD +lw509mmQYeehpWY2Tm3VV+uY1BjYEym5bbTCWYxSS1vu1illFboZWyDUaOzarT/m +TxaHm6qsMhcKj4bfAxfG6+t8cNHwYhbpNLmn1gA3J/HKPlHagavJQZcYK7qjkUwo +UD1l2+KrK+qEskHXzRZ19CZehkO7+II5jghZlZGSi/T2OibOmyuPMYKo2Mx9dizg +08aD+H+A/c6BBKLpZr6dAlJwLI6JpyEoxKsWfqhbT22ml5P9CydMFy07ZNrleX23 +Pp4aB6oEvI6806RTVi36pIrUTdtwpfHY9vVOQpbYDCagfX7EDusGIDguzOSycllg +hAM0A5oMlDWWWAoqHLGJARwEEAECAAYFAk6KZssACgkQb4/yn8cykmFRLggAq0+u ++mbzSBMrGtrdo3AmYObe9QkfK/G4iNG4nrO+lbJUFGbbkWrmjF4TTPA78UCKsyqx +uGq01R2SnMdHUlg7awOepA5u9WQiWxJJ0znqWgTK7mLXPVAuMmkV3HriAzoGNGez +gYvGWW1NGc3jaw4snDBNx6yD1jVKmnECCLa8cks0GA6qy9bf3DQrASeuQWJ6L0yh +sR2IiyZd1ppsLW6B531dNWlR44fm6nPl029OKw+bUxATfjeYpD11CU78UQ+fQimF ++8seXAb5J0zN4kWV3ldJBoks8q1e+6NQadTeKg1tioCVFDx8J/UAL4AEsIV+jUua +JBufd+JpVcXsTUoVOrQgSnVuaW8gQyBIYW1hbm8gPGp1bmlvQHBvYm94LmNvbT6J +AjgEEwECACIFAk6GeL4CGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJECDQ +TlpxNmCn6GMQAJ0V0jmyQ7Lvi5FBBgNTdY8qfVbLFxEUVAsKf2x9QxhsOcL2heQR +Vkp10JKv4/VQLfDwr6Pv98FQchXlBmFiySAbVihUVC+VJ3FhyKBtI14RXT6Nkwd1 +8PXDvWXy2fKeiK9GPDWkufac0h/giz0T1xP7CHxDErQATMmYbkinyyM+xd1Nir6D +UYcHJQIK2Dg2VPChkI0XXCQETLDbrC9fDwWg1vP36PQZ+nw/cIRt+2xkq8HHUzB7 +kOnXHqPt1kb/Ry8hZwPnfV7g/V0MogoMLtz233pqwuguLXP7zY3jTwAZZ9VTpuCT +sdVWXJDlznMNurYi1yurCNuUvq/O/9JC8WBtdVUuvFZGjRZWfP24W57iq/qz8CV6 +dThq5r4WygE83tMC3DaarNJ4f9dQUA4KpL7j2EMXkgoXcEy1mieUCypdNiZj96hV +8Q7apSLk2V4jtvLkJfzX053glqRJI35SX8OkSazZGYZHX6QfZlvznnrCF5x/xBzh +bfr2Geo4rxL0BQsp2DQodqUCB23QzsPhWWffYtkATaD5vovGeQ9Acd1u72jH3DO8 +tVMH85jMO4f+oc0h3lnkPS4F33QqlnErRo/IRm6jCsI/NgMZUYdh0EY5Iiq/e8e+ +u8gdo0akkwHlNvR4KrYrK/1K4h+i+UBIbJDZpqT/iH+yhJRQ3CAan8KSiEYEEBEC +AAYFAk6Gee0ACgkQwMbZpPMRm5olWwCeIfUIBkx+J5CWi8lLt/QiWJbmXTUAn34X +sZP8NxiyYyw+BO8q/XSjOUk2iQIcBBABAgAGBQJOijA2AAoJEL5LwMf2Uat7pRwP +/3cb2a04QUP+5NUS8sDULlEFZAUTQcnlKgiWFOVQwzASDespiXPL0sqw/A+yZKAG +M176KjomyD6zBeLrtvIMWhWKUd8jvHtlQsXlgv36NBz6rmSnbQQ+TWK6QomMETsO +VQ+ZfX+aR7EEy9WkaDgJiWtfigMISGyzZ/jITF3eiBJV1hXSKKn128iuhwNwg02T +TCPoxECehy+lHr0u1MG20gcnaQdk1KCC75pIIb0VxWMqjiBgU2xZwWPzSMlDZgiU +00YVFTR3746VeLw9ywb+JsqDplNJwES1P7EqCNASjzt/jWShLtDrryGgDivrWDRN +hCjqBaukqxssdox2EXOYXNCtUcEvYtfPcYneLTa81MaRQ8cRYDdkcI/WGAv8vGaq +NhC6nrmlJIyWi7Ql0VPV83inZxEnR5KLdPocoU7uPMpT2Omp0HL+arhU6+f8Cf4J +M8v/MMpMwmh6IlCaJxjqkYev23yfMlnP5xM9MrHDsNmMSyIJ/VlPutszSJzAyXM1 +KRpxaJyPokegYl0YTptAONHOt4KJhgag7bkveK+RwDRs1BvK/KXIZSbDpnCCfE/L +PARg80SKo+etZQkkZcHyPZEb9iZssp4Rm44NgfHBuWJ7QACkRXbThzaoba6ThwKl +9oHRBi4+WEDymZf3aa0g7EWB3OjHfDVr3xp6QgmP1M8viQIcBBABAgAGBQJOii/6 +AAoJEMsfJm/On5mBr+sQAI3KA94kGfUqfpHjohh4ExBW/13GDa2sxmTNEMSTNtfF +qlNqYuGbyBkCnDrQP2xBhJIVwo62pZgcPmBdRc4KYOexed1eesVijIJolz5hScMP +aZO9yUCZvhQ1UkqmARuDJ6wzuAL8wIJoIAfFBknJFd945ztmxNrLWlWgWseUHcJv +HIC54rFkNvJY0UbOJyRjNFjJ6VueQ7HSJKqagrUExAxVD5VUFxgyLZg91zWi2eYN +f/uloLKBvd5PD6vCZcLmQUm7uyhWW6PQYUtUNq6/3y4NKOoGVWsB21e//cYzuXzP +0wGQ+Cdso86I3HjL9TVO+ZUx0KBHdIXZfLyrNC6Kiz1f+69Qj7sutq7qhmqR1tcF ++cnKnMMtkxeI6v6+gsm9+0ZMZGFlhsfTzq/nChdR205wtMvWx654rpeJjPyzZXBW +N+9A/Khqv9abLnAYKYVUwoVH1qhkkvWxk78WMc+YFjRpeDboum9RRVN8yG/ktsVx +h59oh0qiiLLsQf3cXiPH8kUw9sKKWJ8UjM2UCi3o/6tjh+DlMPLQ4/CeRMlGr58h +QXqePg1b8YCzNuOg0X6CF9YNVdW6lSRNjjDJSH1W56BAhBIW1xZVil5KamijkbGa +Mbfj3kijPvfLf9n9KfuveU8z7PzTSuzhh/UzRYyoQh1qG9DBZp5KWJVljG4qFZ0o +iQIcBBABAgAGBQJOijDEAAoJEIwa5zzehBx3Nj8QAKI4kYCz+z/DcBB/1uYEMC6P +DlE5wSS/4RAVpDDyhXeTw2OR9N/Req60dO/anBD4MLkKaSDul9SSMgsFo3JM54Ke +DqzoMDA12+rzdK3sH6pewWt5JYMQuhE0Y9T8VMq6FhUVPdcIEPBFdyIA7SYf8g+C +UmWBvMxsT+krS4zttOm/B1kOJr5F15rZMAk83F9goUrys1GbAVggFbzWxrJbvXnc +9va72V7rNklFDGwtNJ2lAqUU1Dqtva0vBSnOqPlP0UaC2Ad+rf26Wkvfh6YACEX2 +1NBvt9HfJKCMBx3lKbhDjhDjFcny9BvEEH5cmQGtFmjYy7SnyPE6V1ikzw9DIK/d +tZyDR5jHZZeSotngq3f5eBUY0XQV7QYh27wYDSsRmBgPmuERhueX9bajMdtoDm4q +PLq4aXxhWtTowvGjfk4GG4UBi9So8lWU1yZbFHp0yeerG1sZN/wMtgSVy4MzHrwD +rQgGRJ3n4x3S/x8jS73NoJAbmrngIno7lUogwNg6uhMCNFpGCzGBLWMu1zY+oDFo +BOAleNyLoYhAXiBGKL66qwfoWKwOeX/jUawbxcnzyGQBmnA8Z9djv6bxU3/sDp5l +RvJ48TruHPol01lMUOMfalUL9H+IjEZmcpsToNadxbxuRLchFECeNSien/QD1XaT +M4gm3xFCG8YpnHGPDo5viQIcBBABAgAGBQJOik5vAAoJEL2gYIVJO6zkkZ8P/2w+ +5xUoHYbYJ5P+2j07HUV6M7YtxZOb6vIHoWGCYSNWRKjFy5MeUhMW+JNU++W6MOt9 +Ru7MDUFzrHPKKjtg2eK2rVJ/29aavrl/ywIs4MMPF9P76vYsr2jzPgvsnlAp8VAK +bhzZRB6pE+tBMz9OE0IqPNcrkbKM7KpuJulMOCeQF8QC6YsPI6vxI4QKteC3vHBk +x8tT8QCvSMDyqk/jmYtuBABlfnzDtwRPabVHy40/KtHObr3Na4MXrZ4Y4/Xh1UMs +eXblaA76YGRStJwP3VjEW+hqp9271VgxxG14c2jJ5mYTjBHgDGlpLHdFNi2ugmh9 +A1jSk3lR3qsTzigRdjRT2n6JwlARDTLiWzFGbFgd+8OTs+Qc0MwKygQ853t/GWqS +00Ra4edNl1pnIC12QspQdzZ3axXB90sE6llnu2CjfLFLxn1qLH0cgEs3KFeWMPkY +39cK7Eff7eTdji/3q8dsq0k5V65CKIDavS79vgSN25jltPv7CiC7YAJCuiMF0Eno +YannyLvRvFsViBBzlEw/aPAN7tZ/SUUFcwtg8WGOKf0O6U1afqXKY7yQMFcVE7bZ +IdH3joh1JZ3TPQoHWkLTQD0MLrpXekCctHNB1TvSVQPndE9HTit2OejcgZzPfv4q +29Rc0RIAEMfqjwST8dAhNu1WPiqzpnEnxzKT3hhiiQIcBBABAgAGBQJOikP5AAoJ +EE0KLZQgCQEy8jcP/jfkVp1XGIl5y2XTOVtCdRMd9UUmb4xAJ+R5/XruEn/hpxDh +1UZQ/NzRsN2opKDaTRVe8zMZOVjmS8DUrMj5vGOoITNXZg5kbltJKb5qEKID5dV3 +H3s4C97ITrIa1CXPdGxSEwQzJumxPB3U8sJM9m+mbFuNdxQ9UyT+FDVuD3PUqmm5 +j/D9FZTkRu7+sb2U5Wwh432MaI8AlOOGBH2l6jkn/IkwddfzK/ZNg//pGZMVZ4wr +juOGsvafZ2t3bCPHxByymEJvWW2y+nZPqO3Zhdj5xFbRYx/MuwbKfMP10bYBLf8K +gu8y5/1RY8q7GJEFqakHDielkY8Q444wxfLIGGdLUmzwyHW9/btxKEfYKPEsZ0gQ +/WDXc3aA5Zd/yaq69VPjtmSA9q74AKJBhdBki2RGv4lUVyp+bgifcVgUV6/ICB+D +KjJzb9xico3E5QbH7exSXo56hBuvY9VapRAS1MMrOOcnxD6/PXyS4TTNAd6okJx9 +xbTDG8JQlQwJB95wMGHbbjioJKCulOKX+r0J+DLmpek1MoD4xe3cf6qMmvPuI54E +F4vcofswTpb/lbMz1gdH5Yv7IY6uLf8tsj1XiVspvUQ15E2GKsrWBJo3D8n8Sxv6 +FuS7EPksXHSFDgERWoeEXBFr9W8DXOJ24zEl0sKAzAGsW18gzXP2gvzbMGAEiQIc +BBMBAgAGBQJOilaPAAoJECMfcMqrMWhQHsgP/1qrkoPzPTgxQ3JK2KQaygp+JoN5 +WQxNPbgzh0u8BUu2KjD1Fx8gYF/PefD8BAjyKYObMGKnO2pJX6QypjscuAPuGTE/ +TLhN32i5TbrtGFV4fRjDz2iqPQg6diIGIDkQmxPflU0YVZVUjUQhR+jYW11qqKNR +UJYm3s6FRx2D1t6HboSurEArU3s+s9oCP/KL/kUADhENKllv5QkyMmk93B6Ic7BN +47D90eQt7Sf8QI8bqlqwR9WeQhfIqNL1/dz/KW/uIFBgmffymYbvB0YeFMbfETOA +ySw3K10I0f2JMockRIEiaj5pRypV1wwjr1NabjLurSrxeSpvsKys8K0fQB2BLfb9 +NPYA9jhpbCZGrqL1yTQ4RRG8kd9RTad9lh39y1Ab2IK5zy4UZCZhUTYFQRFtTRgH +4nW2noHRfdfqYxYwkrZLj88nVh8xMqZjJ93dXW/zwar4zovS+ccsdhAWsJVWypMb +nYL0YDU2Na4y0tLvGTrop5xp8hlXGaC5ciREdFOivNWMCknSoInRtO74teB92xIi +nrPR0Cvg3GLaiw1584b0jkNumUwvJMnFzf20vL8s7D+VUjGXR4tS5l8MAbwohNq1 +daaGcGNTUJ7KJwvMDEWS2QFroiJf/DgZHyvkmm0yW6hs/DhktuE7KvtfaliXxT/6 +eOnppMYm2g9MOf0yiQIcBBMBAgAGBQJOilanAAoJEGaxWkZeH57JahEQAM8e+vjN +HNwIYBgAXiHuUiDjaRvAYJSOqvTqdwJr1jJ4gHpovqKCayboCwvT05Ul9X2ZkC26 +/umXN+eE93RR2cUYOSOkc62g7l1De/GKEl6Lk6pp5jhk97rTzQ5MD7qmuHBYFZNi +AaSSuabRZLdaWMy7BlCMgP+jeULfBQXSoOjyu/TPDQP2XBcmt01vUoQGMPGBFgm6 ++QTZdH9CKbgSGtjc4q/JsVx24oeDrqcUzCd9LLvNlOMIjFdS55ksmTmZLEnRL3a+ +v9Iwr2HfX0U1/ofGaIxUPiroC8QwNvHxtdIdCWJWIn3m0E8/BUGgIN/RRR8IDD6m +VSW+gIio2gUMg3qDaRFVbOVE6WGBgt3Yl4uN4ArdTzh4wkc4sTMUeQKPTU8BKQcu +p4gSmYpUYy4RPS7d+ZRVrzLol2eLhrLSU3KXG5ZR9cNTSD3aHiivw1cz0q9fcHpQ +OHKbUybTiQmy48LfRHNrBRNxAQULZnRZpL5JtZhOwjYXl5DdLnJNnucFFRbYiLQc +4i5dx4VJRZ0lwtWyCg8InIRTC9jNl0LK2FfPDDUKoDOiqBY3JO31UnswLPb2gxCB +lDHwX/b3/iWkLQRqxV+kXd5F7rvTLyumFFNRgZaHnHOCrhxLBWtnqRnj7uPm0+4+ +yWe/wUo3PoMWkESPFkDfNxhGBOfBps16hK/SiQEcBBABAgAGBQJOimbLAAoJEG+P +8p/HMpJh/s4IAJa/Fd6ATQ5dagjZHlcny1P1hLA+wucw94jXRnrLGoZWEbA6wuR8 +gpOpNhyXSiDeHkc0VRRCB63WJbNdg65E5oMsoqmgZx0wePOxVJCVxuYMWXKj/Wg3 +oxN08qL8cpKdXTi5ynWA5X0qt8pvEOmRbiom+YtTqgVOzq5lcHFgM649XegL0A+5 +6ULA2CsSCXhvsJUD9ZoSwsJP8oXRsUVEZjQsLEpL+2PQvDTq4gcHEq2CcHZbe1sI +wIj99PI/PH+yuXIp0yF5Cn8cIG9/z+5SRmZDSr8x1ffMYeRli5HXPvSI/8j4h69i +QAFVfW9F+lx9t0wfNESjCdesADusZaobRpy0H0p1bmlvIEMgSGFtYW5vIDxqY2hA +Z29vZ2xlLmNvbT6JAjgEEwECACIFAk6GeNUCGwMGCwkIBwMCBhUIAgkKCwQWAgMB +Ah4BAheAAAoJECDQTlpxNmCnhLIP/2yVDUiRirP5Vc+eYcJAWG6thwcPy3WIYGqJ +fEj6CkDVjcvVAv5qPR+mVbgq4Q9snvGVh0sDgn4z2SCTC3cm5/D6UzWlAz21IHrb +usBvFTJzOPgAWNn2/wamrJndc8N7w2Scj9XheWGyv57cAck+vfnldpwyQUZzdG3D +Wq4VWCsQK213NQPrG2uHBhhUBgCcqvrn3jdS0wuxVeQkt+OrxzU1k4Ki/1LBJvQ3 +0iQSFLKKF3/3ZnY0fh34HVBMjJZqAvcY03wtdcQcr7H6gD+duEZsWDtuqHFRbh3Y +lrEo/LhTed921KYxuLLXp5R8xtszK8HSO0t/pQWvEXlsmdiSIbXwNwtJpfsexvLw +hXNlBkdi+THn7ukrZIGx16Tdu7em6c/d1YsmgzD5WabkGTRiXunHO+xhBaE9Xv62 +mCCVRIVC4h5cWvCNVc/xD4+H2c7S8ohp5NyfUhK6rZdqiqGQsf5nDUj+u5G2TYMl +tmyDkEEZ8DboGRlYleU7qHfd6Y/CQnQVqeXNG0xOpn/hGJNe/kbUv+XKlfWKrp8X +ZX5ZOHYmYQrJj7aXT/X1dEA19oOJhQugG8kR0JwhcttpFOqN6b7vRka8CIJoY7nZ +i9SEGj5cKCO5yNyqHGIXfBzbiTOPVnJyvBsNrtWN+1kACk3TUInfyZcalleJZlTi +GMnHjXAJiEYEEBECAAYFAk6Gee0ACgkQwMbZpPMRm5pp5QCfaR46cq4RrdRCk2lW +v1jZBIlSzisAnAgKVV3U3btQGaXmRn7oDcHDUF8DiQIcBBABAgAGBQJOijA2AAoJ +EL5LwMf2Uat7tIAQAM7PNzpPu4VGFA3h+KE2zOSYBtIFpuS97GNtPbFEHLueXl4d +UjoLEFaB97GF0ccXDWu0J5+m+bsz2LD/BAWYvmOvxj4w8Y0c0P5KNOsOkyObRTkN +CKm0Q/LzZbTpD4P9RosNSOMLiBeYV8llgNR8DXcnkw5TNssqHnOTte91vfRqIBDJ +qB+a24o1PF6BsLZkVeEsR5FqaKWcAIJ8edfapOYyaDwkLT+XlVkhfzS1NgxRcNCX +EySNhdelq0WtnCnKFWLDjZNll7IH8xon48fBo1qJldDldFIV7m2/GWDfe5DhoGux +Y6JRnk8fuXOPIkZLlfQh1PpRn6vHl8pNJIzAnJ3NvLaUlxtvPV/zQyVHgIb96qpe +BvlCY44QAjUAc4Iubf1Lv2Sdf0ckngg4eiT97UqFl9A8FPLYiVk3k7xt3Jt/cMHU +bYC5hmel/8S8t3+iCO886I7Tcz+49V+MEiVo9/PPPLcDXb+tRY/hh8cWbSZOrkfc +/xXRm8J2+LBPZCny9mpVoRwxSCdnhTk0OjTRY9uCUPbWB6FEcqYZEhgxSQhaG0el +zE6nxbxiYNWXfFHYX/3HkzhfPh0SrPkuIBRSkVEXGZ4dypjcv8BV2251BtXkVdFA +h6PmNNa0pjdcn1jfI8Xp0M9mWxkYItAGVIY3aVfg9xtWyouk3pGf5uGTp6triQIc +BBABAgAGBQJOii/6AAoJEMsfJm/On5mBC48QAKpWGxIAjR1pVPw/CcYX66azidY2 +iTYAcFwFthtFqokvSfZj4Nz30dzMo5LCaOsmhxlUsJISmwvM5m5gurWM7edzwLn6 +bM+DELWyJJ3XQcKU5kNw1+un1PScAnkfsUsu6t++KXMtO//dkDD4B9WqeIbcSMLE +GSlCYxz7Cik6gzMGPuERNWlQ5Plmos2HfzI5ATXzoUSr6YBcc0l67cD0lgeU8ICt +nHeafcJ8gIUIR5o3JMljBG9YvAzubCpKp957hE23kj+tngAtlMCIM4jeR8AVE7Xk +3fvlMD4vT1XoUCyHXCMKjmViCsnPlwVpZeYhUgBsLBA3NzFj4+XPKiAjZpaVCxXo +6t6qTf0XS97BmlPLIPl6Q5+pfSw6PELxWLrgIcfEaX0Jnfv7zEayK+kQiWnBAXja +UfvVPbN/W4o28XTt2zg40RvWpu0hYU+2YmsDJ5vCtiR7GJDoSegJKdIi89Vmjjxx +325HMjCcp0GgMtF6EOvGUXgAK5Bg1zEfdLO37jEXIb+rHu2vR+f8FJD9t0mAJu6H +7ZY0e5KJDyQMPDsiZumEfmboqDb3VTG9+35N6drtn20IafLKcNXokM3CC1/NHfj3 +b4K/6i8sUFc0c7fPXb42SSypRb/K5GlEcxRPRLGmraypvESmkQYLNIDCcfuXnru6 +q5xigN3rkJUWmEXpiQIcBBABAgAGBQJOijDEAAoJEIwa5zzehBx3FtsP/0BQozuW +jBvk7OndhzIJdPc/QAVW5noFn1ZQ/zw6SzPBGiclMuuoEd+rdRP17IEqUOBQ3Y+1 +fFgQHxpHW7HdhwhoxlVfeoD5n0xgWkFAEReFHpJG03VlcXyKqx1eC4Bgqk8ao+d1 +RcbC1lbgiZHAB/MvACLG5nmPi5EqGy4UeXp3a80JtcQf5C2/acRz2t3y4uzph9QM +fXclh+/av5C9Ce+ENjwmZJqWPx9wkf6VCLZcLIQY7OsWzXuaHZ7/dUzHOXBGYmsu +sf0pdsVnli1XtMeH3OOLY1NtlOKzI3jR/rV2gfUjL9nvrOSTxNXJT5MfiaLXtvKv +LOihXE5UnSEHGUPCkJBUrGwWuB+OgVnJtZp+YnLi19vmQ1vaOcqc5R3BpL+IWKgp +TC6JoQeBCeqfkP5t6Ow6eAg6g5h6bHkqY6fFXl47wlkvKvMFdpsoqDuW4RJ+FhhZ +8Y7bIdVgE2hagYxm60BdnqdRJMlBDTqx8n8Ne+z8OAgWlq+bdBYe9X17EPIOQmWR +/OpzGo82mNtqTFnOAu94qmZhLbKYcVssCAw75wnEzlHQ2jm7H3UOmMtjlL4I3htG +xs/M/5lotImPM3okfUtMrog2tHKEzfM/Pb/zdM8PGT+fDG+kMcnnuB2xE85Y1mi/ +XWAJcNlSGjaLpVihtS77P+fgp1uK2m18gWotiQIcBBABAgAGBQJOik5vAAoJEL2g +YIVJO6zkAFAP/2+IUCHekKDQ9V+7+R8OD0UdKqTIvZ1IJS9Ipa0KJ9zJfScDjSbG +Iy6MpxOUq/TH0bppdrTTlWjCRD+puVAi8yKZbQ75iFSl5fBP8eXQfSFSn4w+p6lV +6toYZu4pvldmN/bH5LUFJOXiCw0ixTOQD58JyTRaAh3c0WZyqbYD3abPerUIhxKk +1GMKOgt1pGLfjjMNyETF59IkDyvi15BxFuI87ukn1UU+Qayb2DYrCe+nDO1Jvgpl +bUJturTiRZVMlHMMDi01KGlZWGCp1i4pbuISoUG9KWeKsJfpeqr0rg30u5w4xVgF +G6Y53y4N+R91Y6IkFNTADMBmsg50V/EZBUGxMahEeFU0MRKuUY38FowVbmspoSOh +jepFD1Zikh3WLCo30niHU4iK41CVnb/s6ZEORuSFZF4zzxGb8+IQW5LxSmEMCqyK +ZkvMdKyUGOjGGce2Jlly9PK0izGS18ncUFcdqPaxDgQLf+Xt0gkKILSCZ0PRmf1l +RgPceZK2k+x04QtyX6DLGN9+KL8lrU0IV/5IEA73nHTi5ujcUAwF89ZVBLIzpQd4 +cfEY2QkqZSbLzKKr+ewqLLq02S6uar1ahW6xISTpd4Rzy4kYis/x1WOwPWkM9lFl +WioBKxP5KzxkU4Z+qcW7Xd/oycVcI8QL9czKfHb/gJJtSCwWEqyti/LtiQIcBBAB +AgAGBQJOikP5AAoJEE0KLZQgCQEyISQP/0Jl1W3uY7blKbp13DBb3OrgerqAJlHW +zyToGi2SY/vvO6BCTBAzyjBhanLClfdYq/AkLkom3UmyirfTcuO8UD/EobYCJ+aA +8u/EGKaaIyaXVNyZMDtI9ngO4A9MWLzC8a6PNm9LizPom7LB6/ZXgpBCNUg7hxzZ +HYy1Y7G7Nu4qnHgmsE4YRz3fgE/81lwzSXWqBmiQUmN5zt/5dPWcGxSs5m9CQebB +7+anupqJYo7Sy1vwCaeWlu3zlnDPhrGZqXNkF3TIKnP9USk20vZvshfjs+3u+uxo +sdl0Ou6kHIJd6Akf4+UsrNnwp39giVCuBddmyzsMjXtYsbRZwNLmqJDLm09DQPs3 +R1GPj6Rw01o9JCZSI3Sfprt84HDNj+HRuA88YmOisXp79ANlo6Emko/ws73+haq1 +drZb0uLINIjfiY5kXw0FfkVxE/5Zu/uc1XxJHwNtvvC+DpRk815KdtVGs1bUtvH2 +gCckQEagO4M4YX4TPLk8+qS6xpVVa0r/IUWNrX123OYUcE/ENXKtZk7XaHFmAlEn +BA5A5l7XosxzLjMviN3VruuoowW7KyHneXyJ5tIhdrPMFV8otDmiJky7r0b5y5gs +hlDHwH/rfTADOyHH7cD858JuUtyklSMFeZcopR/1KYQKqcR6hulLjOeVj5Oy7hic +IU4ZNIGF53jkiQIcBBMBAgAGBQJOilaPAAoJECMfcMqrMWhQ8jwQAIyVYWu5Oks6 +30FZlX0k4J18fwmjmYUl108sg01qCIt7sWXEyMFwmruxiYzmCN6IIAFFKQEMF3NV +yxJwbna+aCH/rRr0R9UUzjzgFgJV8twi8sStQc/FKl+HGPfreBN3/77WuMP9N0fA +5OIb3uGc10cmm0PIP2RLMTAyHGcyGxXszKm+ERPTderN/1tLd0G5k7tV3L0W0zzx +hHwQQzF7Mu7d2wGzJhebRN8NbHgBFpjNIa/LAkUKLdmaMbt9RuvCP6+9WvcWSVLl +tpW5bTWRUGHSeYvvK759fHoz8TI6uiDO18X7PY3dz6l5YFeP5QO3cSqcc38aiaz5 +H4CsR8UqUQrxOAnhkbJJPUhXvBrv8pwRv6sukPK3FJkHk441zRxrWnXgE262SO9F +CkfReL1BZM+fslUZbzAP2F2KdFz4ugfv8JFsS+RRKBRM31whDRwxAYx4KpWexXFH +tkZbcbZGLcAKxci39qTMJ0jf6E5rbnIZbot2I+3d4KGqczITTV+mevhbLqoCtF0m +/Wu0j4vFk/8dzPm9kvkOBeqNEalyz2obmmotvadhTzX4W6XrD47mAZn8db6UNIW5 +f+yhiE7aBKBScz1DFqjOcx2H86S+sGY4oRsOL1NZBWPBGZtqjPxFnpN4ZtpTA+fz +nEhlkCMmftUnvN6xyYlVq/Fc1+In2tdfiQIcBBMBAgAGBQJOilanAAoJEGaxWkZe +H57JrwIP/3Wi7G7Y95HjeXQ9VrD+Ji6A9jNRaCmq2EzxjB0wLOUl36qzUlBxwcaN +7ZQmrgI2h6uj0StlOe+lJuzxvOs8j+FsX+GvS5o3wDb8EEYGRFvVXdhWf2PHjqvP +7nQEX5GxaHfo090fxDFmOzIQSYXm5m3QBMSRCNJvmFjsJ8CAq8sNSgOodVIoatOz +b4JM1pSjcdu/j/0l8ktcsB7SGeMm3D3+jpOrh41iNb/fzEKHJWKMxGqK2p0dVKxl +iwSXGmUfUMZlcicxAsfSeZzQs0ih7b9ulheyopx4iHYlz2ivVxZ3KSGkyzFI6yCC +xJXfJ1qhlO/q7/3IEWE2C6Vrkm4gUSAR/skqHSky+6fkGqyTkE6HO+WphDVgZuyG +/Fdi45+oBY/bLiZPnFWe756liQzda0TOJu+lFU0/YaF4hqwlljQEkkm0Vs4bj5xd +CHjtq4jygU7Lc4Zm6V8I4TuVNcgyhfheB4yK+3YrArfw7IcX3ptnPOFCslMfR252 +ArSeEeHRpTar4UGH/P/RF+OjbrOZd/UwxyjdQAqQf+dXjp4oKsZJ+SYMV2MqsXzq +uU5NBXb2ykQOW+UCcBZp8et9HfVYQFzLlqrBrr219j5OhtpSDE6C6Qhsw9FKQc3h +Pp2KzIQKyWSOQ6W6B5cKdbCea8HnqAb0rTk24UoMj9SjQd4xaS02iQEcBBABAgAG +BQJOimbLAAoJEG+P8p/HMpJhxCEIALGSwNfNGitvAHBF0apo5SsbGCrqIXMafoko +belD1YdfmEieDEmith587PSkTQdujVdPvgP3oSTwPoeu0c6nhA/IT5ipHX1hdLw8 +YefXdfRXnPpz6PRggfB+llDGURUXXWi5DDEeAZVcl7x2MwbhfDSkHoJI7Aj9HQ41 +ZDVOFnsxQ0t9fTpN66M7+6Wu4qHe+bg5GzJyIG1wVj7R6tGLA8sa7pMkiQqVK7ix +jcmga2Op/JMzTJ31qmIaSPANoL3fVKIQUT/Y/6D7XALt7VQuhObLK/ZGkvVOCSiE +aIQDo5pLfg2DGgf4j6rFZ8M2fvIHRpWo+gzo6bKOmbvnGo1MW525Ag0ETolKOQEQ +APJeT06GqZitCBwaWOaIYnud2XMy1eaI1imVzbJlWDbkgQSqcAulR9l/OfXVXefR +4oAGLEtU2wwlDRgtWzNLYSfWPdn2tVp5RKsmEGQ5ieK7dvNw09hpq5J4Olz476/D +2Xhyrb8O7i8sH3ZuMdFqxqx9+INewS/Nrv+5NCVDoCaD7pSJDvTJbN+VCUmP2cJN +RHZDOIRypqiRSIlvw5T2IdE4+cfUrpJNAEx/0f0HbaY78CSWcqYeoDIW4mAfhvp0 +f1mcvbwfmxcDz2mtBLnQA6CGfS5EM1P+eSqjZyh/XT6j1VhDgWVWbz6okYskbn3z +CCdLfZrb3P467ktaok2XSaMtr5eiuFKnPobr5R3ggmEdJRgngwfiMbs/cXdmXVMT +IMIHDYkDglu9GFrcX9CxdrHkiXSyLRwwTrv393KisDRlL3At3f/alW9MD0iNZqtf +EtNjBnLw8krIxrV+6OJLo1KhNmTQlujkSyVAusxGLt00TVq13kt7gD9tcVKxD5Lk +4iS+0gktdhWCbeWoMeTSFCiO25CFGy24roQuM+OzBWo1vWOY1EJPOnZO24xqla12 +CLvdg4cXNgjQ9n1mjKWEYcLx0eikFNcmB2JBlZTB4qMzOQ/uHQkUVSPMd6f/sqRQ +WZma+8k6b/6g9DfBx5djQGLxkUHc48hUDlxEcGl7s4wpABEBAAGJBEQEGAECAA8C +GwIFAlQfYz4FCQd3TGgCKcFdIAQZAQIABgUCTolKOQAKCRCwteiGlq/my6SlEADL +AJoqajQcfvvI2Sqiuacq1EGvPyO3Hrx7/+mr8DIKuCEpSH3WIsZiOLf8TWpB7uns +17tYCfe4VmzbbOs0ogMbG0wwJBMLQ17gEC8yHU3PDPMEILKKuzVxwuPmAqSgWQp9 +OjlTk1Y3Odg8zy6JvW5jm91Gogna8nsknKQ11xbmh3jZO1aw7EfbNOnhJE2ZfxA9 +pFt87E92UqxunR4g7qST4vHqAS9YC0R1rnFJ3U/DIrtJ8Zp1Ob7xHDlR4/WRG24p +A+buxEEHRyhcNUekWL+cxYfNXG/80qEsCTMhsY5XqsvyKFWFcaoSCIPlD5B1to2y +Iu0ejmeIHOlufO9KikFhw5+2uFw80NjRFhdhv/kllSJ38kFYrBX7NEQSduC2xgNv +AUQOcJUgbJcCjHJqz9LdvXiLNq2qAg3GJi7GkNj7DU7lHLCM5N0s9RaUvliEfVb+ +DBt3IaIviyHS/9/M3LS8pHnM+3WEgIQD1i8IjuTdvvg7p6IMHl8whE+Q2vq5tlZ7 +RPrHh4vYSNIVFcgSZuacCH3el2lYWtcf5J/UsqEFnOiOBSxBT+vMHZH3hLtXHRn6 +3OANnx8l7jtlQR/MlxzLIa979ACwsuBNZHBE/cxJrWsLjC5a0MMyT92vD0KmZ4V5 +EWfSgMgGj+baYG/5Q0DFJ2KNETO89GLBE6Zr9FrBVwkQINBOWnE2YKe+LA/+KwRD +8gJO3JlrckdFw2aUBE2NEsOza+GhK3U3UOwJZ7RzHJ/jFkSaWue0v3mthZeklmeF +9PVVfx9dZVp2M8NCJEkQ7AwE8TIp/qqcunOyMMWfUUNVE/T4ZlQc+6267Jdx547/ +lhvT3DAnZRTjGS+FQtk0BK9IQUl1oVepgyNK3cLlLvqKvOLNXJHuYP3uU46BrqU8 +ZGjTv8nwyTH/t3asBpiQypdt3XyoPl2xYd2Pxt9tfwuRoL6rY2gqKswrkwwchG1V +wXXu5hQecUIPHow4BX7qHMOe8IXTXEtzJRjzvz9OpwfeNEBC48KeTt+JjHFZ9Kp8 +oYGoqLnlVuas7nBGvlH825GIYp5WHW8pY8KriZaiEnCzzS9MbczlqNaFhy5e41ZJ +UbkR1xaegLKmp/zKLy5WE3ATuDsDif6yCQTh5DHi7v75RCHqguieb7g/mz+F1KR2 +psTlPFOkVVQyB+HHJIRFN81g08Gg/0UxvE2rScxpozTjkdOIpm6hQKVOzTlEOPPF +jah9dWnmaAzqF1ihL1nxOwoP30z9CWR9x2lvS1pY1q7evBQsri7bxlXjcox8ODWa +vPW26p4SgQF9S0t6Zf/p3w/FseLJXaPEYZTkIFELvmSebALni653dQJlhBF72Qxc +mal7K7p+HI72Vw5shRYbmhlYrNUM0yLpmKVLprw= +=K5VA +-----END PGP PUBLIC KEY BLOCK----- diff --git a/sources b/sources index f029bfa..bcef26e 100644 --- a/sources +++ b/sources @@ -1,3 +1,6 @@ b0219fcb6d73104361f4fbdba3741d00 git-2.7.4.tar.xz d37654c45897afa4501fe7bc138b576f git-htmldocs-2.7.4.tar.xz 52507ee81f9aac0abf85160398cd3e81 git-manpages-2.7.4.tar.xz +ed0dffdb32bc3c49673947ed99d421af git-2.7.4.tar.sign +717564d0ffd3cc2416df28ff73234be3 git-htmldocs-2.7.4.tar.sign +d5d42db9e7923a0ce8a0b0210d62d5e5 git-manpages-2.7.4.tar.sign From 1b7f6045f2cfbb4563af8c6ada1bad21bf65a56f Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Tue, 29 Mar 2016 14:32:11 -0400 Subject: [PATCH 364/842] Update to 2.8.0 - Use license macro for COPYING --- git.spec | 13 +++++++++---- sources | 12 ++++++------ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/git.spec b/git.spec index 60cd6b7..a294be4 100644 --- a/git.spec +++ b/git.spec @@ -49,8 +49,8 @@ %endif Name: git -Version: 2.7.4 -Release: 2%{?dist} +Version: 2.8.0 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -608,7 +608,8 @@ rm -rf %{buildroot} %files core -f bin-files-core %defattr(-,root,root) -%doc COPYING +%{!?_licensedir:%global license %doc} +%license COPYING # exlude is best way here because of troubels with symlinks inside git-core/ %exclude %{_datadir}/git-core/contrib/hooks/update-paranoid %exclude %{_datadir}/git-core/contrib/hooks/setgitperms.perl @@ -617,7 +618,7 @@ rm -rf %{buildroot} %files core-doc -f man-doc-files-core %defattr(-,root,root) -%doc README Documentation/*.txt Documentation/RelNotes contrib/ +%doc README.md Documentation/*.txt Documentation/RelNotes contrib/ %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} %{!?_without_docs: %doc Documentation/howto Documentation/technical} %if ! %{use_prebuilt_docs} @@ -724,6 +725,10 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Mar 29 2016 Neal Gompa - 2.8.0-1 +- Update to 2.8.0 +- Use license macro for COPYING + * Sun Mar 27 2016 Todd Zullinger - 2.7.4-2 - Use https for URL / Source and smaller tar.xz files - Check upstream GPG signatures in %%prep diff --git a/sources b/sources index bcef26e..36adb01 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -b0219fcb6d73104361f4fbdba3741d00 git-2.7.4.tar.xz -d37654c45897afa4501fe7bc138b576f git-htmldocs-2.7.4.tar.xz -52507ee81f9aac0abf85160398cd3e81 git-manpages-2.7.4.tar.xz -ed0dffdb32bc3c49673947ed99d421af git-2.7.4.tar.sign -717564d0ffd3cc2416df28ff73234be3 git-htmldocs-2.7.4.tar.sign -d5d42db9e7923a0ce8a0b0210d62d5e5 git-manpages-2.7.4.tar.sign +01477f0b97ccab20b986f2808f4d7a97 git-2.8.0.tar.xz +07902ab3c46f96a5173fd3157c958cb1 git-htmldocs-2.8.0.tar.xz +d67a7db0f363e8c3b2960cd84ad0373f git-manpages-2.8.0.tar.xz +f195caa1f5f22d17571dd4f5ecde6533 git-2.8.0.tar.sign +e5250055b938ff3da2bf454fb5433c5a git-htmldocs-2.8.0.tar.sign +c1e2a0652ca325d1e15aa1cfd9fdbb23 git-manpages-2.8.0.tar.sign From 75fe565d2ad61b196121385a982dcb3de55b7647 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 5 Apr 2016 08:44:06 -0400 Subject: [PATCH 365/842] 2.8.1 --- git.spec | 5 ++++- sources | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index a294be4..d23b2cd 100644 --- a/git.spec +++ b/git.spec @@ -49,7 +49,7 @@ %endif Name: git -Version: 2.8.0 +Version: 2.8.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -725,6 +725,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Apr 05 2016 Jon Ciesla - 2.8.1-1 +- Update to 2.8.1. + * Tue Mar 29 2016 Neal Gompa - 2.8.0-1 - Update to 2.8.0 - Use license macro for COPYING diff --git a/sources b/sources index 36adb01..6cb02d7 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -01477f0b97ccab20b986f2808f4d7a97 git-2.8.0.tar.xz -07902ab3c46f96a5173fd3157c958cb1 git-htmldocs-2.8.0.tar.xz -d67a7db0f363e8c3b2960cd84ad0373f git-manpages-2.8.0.tar.xz -f195caa1f5f22d17571dd4f5ecde6533 git-2.8.0.tar.sign -e5250055b938ff3da2bf454fb5433c5a git-htmldocs-2.8.0.tar.sign -c1e2a0652ca325d1e15aa1cfd9fdbb23 git-manpages-2.8.0.tar.sign +5d828f6dbe1a5f4d27568f74b58598e2 git-2.8.1.tar.sign +443b5e501eda9b8441331a8e61578e6a git-2.8.1.tar.xz +cb41cd740d4855a22d1180aac659d2c7 git-htmldocs-2.8.1.tar.sign +c82d66986e5265fe9bae7d548e73eff6 git-htmldocs-2.8.1.tar.xz +57390a7528818451f8f5b98e09edada3 git-manpages-2.8.1.tar.sign +87bc202c6f6ae32c1c46c2dda3134ed1 git-manpages-2.8.1.tar.xz From 40aebfdc03db94710343ddc1b0e0208a14684ef1 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 6 Apr 2016 11:03:05 -0400 Subject: [PATCH 366/842] Install git-credentials-netrc (#1303358) --- git.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index d23b2cd..01948ad 100644 --- a/git.spec +++ b/git.spec @@ -50,7 +50,7 @@ Name: git Version: 2.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -103,6 +103,7 @@ BuildRequires: %{libcurl_devel} BuildRequires: libgnome-keyring-devel %endif BuildRequires: pcre-devel +BuildRequires: perl(Test) BuildRequires: openssl-devel BuildRequires: zlib-devel >= 1.2 %if %{bashcomp_pkgconfig} @@ -441,6 +442,7 @@ make -C contrib/emacs %if %{gnome_keyring} make -C contrib/credential/gnome-keyring/ %endif +make -C contrib/credential/netrc/ make -C contrib/subtree/ @@ -477,6 +479,8 @@ install -pm 755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \ # Remove built binary files, otherwise they will be installed in doc make -C contrib/credential/gnome-keyring/ clean %endif +install -pm 755 contrib/credential/netrc/git-credential-netrc \ + %{buildroot}%{gitcoredir} make -C contrib/subtree install %if ! %{use_prebuilt_docs} @@ -573,7 +577,7 @@ chmod a-x Documentation/technical/api-index.sh find contrib -type f | xargs chmod -x # Split core files -not_core_re="git-(add--interactive|am|difftool|instaweb|relink|request-pull|send-mail|submodule)|gitweb|prepare-commit-msg|pre-rebase" +not_core_re="git-(add--interactive|am|credential-netrc|difftool|instaweb|relink|request-pull|send-mail|submodule)|gitweb|prepare-commit-msg|pre-rebase" grep -vE "$not_core_re|\/man\/" bin-man-doc-files > bin-files-core grep -vE "$not_core_re" bin-man-doc-files | grep "\/man\/" > man-doc-files-core grep -E "$not_core_re" bin-man-doc-files > bin-man-doc-git-files @@ -725,6 +729,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Apr 06 2016 Paolo Bonzini - 2.8.1-2 +- Install git-credentials-netrc (#1303358) + * Tue Apr 05 2016 Jon Ciesla - 2.8.1-1 - Update to 2.8.1. From 58fa1693f75e7c2bbf4fe4854214bbbda6a527ab Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 11 Apr 2016 13:28:46 -0400 Subject: [PATCH 367/842] Set LDFLAGS for hardened builds (#1289728) Without LDFLAGS the git exectuables were not being linked with the desired settings for hardened builds. --- git.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 01948ad..bf01642 100644 --- a/git.spec +++ b/git.spec @@ -50,7 +50,7 @@ Name: git Version: 2.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -385,6 +385,7 @@ find prebuilt_docs/html -type d | xargs rmdir --ignore-fail-on-non-empty cat << \EOF > config.mak V = 1 CFLAGS = %{optflags} +LDFLAGS = %{__global_ldflags} BLK_SHA1 = 1 NEEDS_CRYPTO_WITH_SSL = 1 USE_LIBPCRE = 1 @@ -729,6 +730,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Apr 11 2016 Todd Zullinger - - 2.8.1-3 +- Set LDFLAGS for hardened builds (#1289728) + * Wed Apr 06 2016 Paolo Bonzini - 2.8.1-2 - Install git-credentials-netrc (#1303358) From a35a98f0cfd521282b6eca4094558958363414e8 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 11 Apr 2016 21:36:26 -0400 Subject: [PATCH 368/842] Fix most recent %changelog entry formatting I updated my vim spec file plugin which improves %changelog generation and didn't notice that my 'spec_chglog_format' config (which included a trailing '-') caused a duplicate '-'. --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index bf01642..a51e21b 100644 --- a/git.spec +++ b/git.spec @@ -730,7 +730,7 @@ rm -rf %{buildroot} # No files for you! %changelog -* Mon Apr 11 2016 Todd Zullinger - - 2.8.1-3 +* Mon Apr 11 2016 Todd Zullinger - 2.8.1-3 - Set LDFLAGS for hardened builds (#1289728) * Wed Apr 06 2016 Paolo Bonzini - 2.8.1-2 From 116ecc2e5d7314c2c26c58f7c497de16dbe43d83 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 29 Apr 2016 19:03:35 -0400 Subject: [PATCH 369/842] Update to 2.8.2 --- git.spec | 7 +++++-- sources | 12 ++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/git.spec b/git.spec index a51e21b..fa85e59 100644 --- a/git.spec +++ b/git.spec @@ -49,8 +49,8 @@ %endif Name: git -Version: 2.8.1 -Release: 3%{?dist} +Version: 2.8.2 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -730,6 +730,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Apr 29 2016 Todd Zullinger - 2.8.2-1 +- Update to 2.8.2 + * Mon Apr 11 2016 Todd Zullinger - 2.8.1-3 - Set LDFLAGS for hardened builds (#1289728) diff --git a/sources b/sources index 6cb02d7..16d995e 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -5d828f6dbe1a5f4d27568f74b58598e2 git-2.8.1.tar.sign -443b5e501eda9b8441331a8e61578e6a git-2.8.1.tar.xz -cb41cd740d4855a22d1180aac659d2c7 git-htmldocs-2.8.1.tar.sign -c82d66986e5265fe9bae7d548e73eff6 git-htmldocs-2.8.1.tar.xz -57390a7528818451f8f5b98e09edada3 git-manpages-2.8.1.tar.sign -87bc202c6f6ae32c1c46c2dda3134ed1 git-manpages-2.8.1.tar.xz +b8edb4ae34828fda6aa2a4478089b107 git-2.8.2.tar.xz +d356048c0945b7c1ce837e9d90e32c6d git-htmldocs-2.8.2.tar.xz +33330463af27eb1238cbc2b4ca100b3a git-manpages-2.8.2.tar.xz +b66a6a9c9bd1a8d7298ea1871fa043dc git-2.8.2.tar.sign +4fa78aac4fd6439d6f2fe5611234d103 git-htmldocs-2.8.2.tar.sign +0ffcc052d7e2cb50d53af218b5d813d3 git-manpages-2.8.2.tar.sign From c320052f0b19d0b62ef6c5b018fe9309e764b7ae Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sun, 15 May 2016 08:52:31 +0200 Subject: [PATCH 370/842] Perl 5.24 rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index fa85e59..e7df8dc 100644 --- a/git.spec +++ b/git.spec @@ -50,7 +50,7 @@ Name: git Version: 2.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -730,6 +730,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sun May 15 2016 Jitka Plesnikova - 2.8.2-2 +- Perl 5.24 rebuild + * Fri Apr 29 2016 Todd Zullinger - 2.8.2-1 - Update to 2.8.2 From 942eb47ddbf303ce289812a1c99f12ab93235e33 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 18 May 2016 18:27:47 +0200 Subject: [PATCH 371/842] Perl 5.24 re-rebuild of bootstrapped packages --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index e7df8dc..0dab663 100644 --- a/git.spec +++ b/git.spec @@ -50,7 +50,7 @@ Name: git Version: 2.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -730,6 +730,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed May 18 2016 Jitka Plesnikova - 2.8.2-3 +- Perl 5.24 re-rebuild of bootstrapped packages + * Sun May 15 2016 Jitka Plesnikova - 2.8.2-2 - Perl 5.24 rebuild From 2ca467acc07df119301364b5c6dc3c23afd6f15d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 18 May 2016 12:38:51 -0400 Subject: [PATCH 372/842] Use perl(MOD::NAME) format for perl-DBD-SQLite and perl-Digest-MD5 deps This form handles changing package names better. If a module is moved into or out of core perl, for example, the requirement can still be found if it uses perl(MOD::NAME). This was brought up in 1337137. --- git.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 0dab663..de4586b 100644 --- a/git.spec +++ b/git.spec @@ -50,7 +50,7 @@ Name: git Version: 2.8.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -243,7 +243,7 @@ Requires: git = %{version}-%{release} Summary: Git tools for importing Subversion repositories Group: Development/Tools Requires: git = %{version}-%{release}, subversion -Requires: perl-Digest-MD5 +Requires: perl(Digest::MD5) %if ! %{defined perl_bootstrap} Requires: perl(Term::ReadKey) %endif @@ -258,7 +258,7 @@ BuildArch: noarch %endif Requires: git = %{version}-%{release}, cvs Requires: cvsps -Requires: perl-DBD-SQLite +Requires: perl(DBD::SQLite) %description cvs Git tools for importing CVS repositories. @@ -730,6 +730,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed May 18 2016 Todd Zullinger - 2.8.2-4 +- Use perl(MOD::NAME) format for perl-DBD-SQLite and perl-Digest-MD5 deps + * Wed May 18 2016 Jitka Plesnikova - 2.8.2-3 - Perl 5.24 re-rebuild of bootstrapped packages From 72c240de2abb68f07e702db21bc841bfdc97bc68 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 18 May 2016 12:42:21 -0400 Subject: [PATCH 373/842] Define __global_ldflags on EL < 7 (#1337137) Building on EL was unintentionally broken by 58fa169 (Set LDFLAGS for hardened builds (#1289728), 2016-04-11). Thanks to Dimitry Andric for reporting this issue. --- git.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/git.spec b/git.spec index de4586b..0817d54 100644 --- a/git.spec +++ b/git.spec @@ -48,6 +48,11 @@ %global use_systemd 0 %endif +# Settings for EL <= 7 +%if 0%{?rhel} && 0%{?rhel} <= 7 +%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} +%endif + Name: git Version: 2.8.2 Release: 4%{?dist} @@ -732,6 +737,7 @@ rm -rf %{buildroot} %changelog * Wed May 18 2016 Todd Zullinger - 2.8.2-4 - Use perl(MOD::NAME) format for perl-DBD-SQLite and perl-Digest-MD5 deps +- Define __global_ldflags on EL < 7 (#1337137) * Wed May 18 2016 Jitka Plesnikova - 2.8.2-3 - Perl 5.24 re-rebuild of bootstrapped packages From 20f7e3b90f2fd6117fbf83c169fae7a86255902b Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 19 May 2016 12:21:55 +0200 Subject: [PATCH 374/842] Perl 5.24 re-rebuild of bootstrapped packages --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 0817d54..d086a24 100644 --- a/git.spec +++ b/git.spec @@ -55,7 +55,7 @@ Name: git Version: 2.8.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -735,6 +735,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu May 19 2016 Jitka Plesnikova - 2.8.2-5 +- Perl 5.24 re-rebuild of bootstrapped packages + * Wed May 18 2016 Todd Zullinger - 2.8.2-4 - Use perl(MOD::NAME) format for perl-DBD-SQLite and perl-Digest-MD5 deps - Define __global_ldflags on EL < 7 (#1337137) From 184b9f323d7c22a6c0e9d53453e053538f628352 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 19 May 2016 15:47:54 -0400 Subject: [PATCH 375/842] Update to 2.8.3 https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.8.3.txt --- git.spec | 7 +++++-- sources | 12 ++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/git.spec b/git.spec index d086a24..f2f2266 100644 --- a/git.spec +++ b/git.spec @@ -54,8 +54,8 @@ %endif Name: git -Version: 2.8.2 -Release: 5%{?dist} +Version: 2.8.3 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -735,6 +735,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu May 19 2016 Todd Zullinger - 2.8.3-1 +- Update to 2.8.3 + * Thu May 19 2016 Jitka Plesnikova - 2.8.2-5 - Perl 5.24 re-rebuild of bootstrapped packages diff --git a/sources b/sources index 16d995e..34e2631 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -b8edb4ae34828fda6aa2a4478089b107 git-2.8.2.tar.xz -d356048c0945b7c1ce837e9d90e32c6d git-htmldocs-2.8.2.tar.xz -33330463af27eb1238cbc2b4ca100b3a git-manpages-2.8.2.tar.xz -b66a6a9c9bd1a8d7298ea1871fa043dc git-2.8.2.tar.sign -4fa78aac4fd6439d6f2fe5611234d103 git-htmldocs-2.8.2.tar.sign -0ffcc052d7e2cb50d53af218b5d813d3 git-manpages-2.8.2.tar.sign +4a9bda9f14e9c5ce3e7a416e43b74a1b git-2.8.3.tar.xz +ca16f82dca7a1943320cbfe2547b3d31 git-htmldocs-2.8.3.tar.xz +553827e1b6c422ecc485499c1a1ae28d git-manpages-2.8.3.tar.xz +ebe15eeee394b3642e8f8c3e811f2c26 git-2.8.3.tar.sign +e7c570e5b703e079e4cb1a543447171c git-htmldocs-2.8.3.tar.sign +72f911fcb7c7d7049362fed8a0c76fbb git-manpages-2.8.3.tar.sign From 6f5b14254a0f431ea69f14f44fc81136f2511c16 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 20 May 2016 11:52:18 +0200 Subject: [PATCH 376/842] Perl 5.24 rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index f2f2266..0110a2d 100644 --- a/git.spec +++ b/git.spec @@ -55,7 +55,7 @@ Name: git Version: 2.8.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -735,6 +735,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri May 20 2016 Jitka Plesnikova - 2.8.3-2 +- Perl 5.24 rebuild + * Thu May 19 2016 Todd Zullinger - 2.8.3-1 - Update to 2.8.3 From f9560e8034244b3d824b6d37ae31aae9c76c589c Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 8 Jun 2016 12:38:36 -0500 Subject: [PATCH 377/842] 2.8.4 --- git.spec | 7 +++++-- sources | 12 ++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/git.spec b/git.spec index 0110a2d..bbfefbd 100644 --- a/git.spec +++ b/git.spec @@ -54,8 +54,8 @@ %endif Name: git -Version: 2.8.3 -Release: 2%{?dist} +Version: 2.8.4 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -735,6 +735,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Jun 08 2016 Jon Ciesla - 2.8.4-1 +- Update to 2.8.4. + * Fri May 20 2016 Jitka Plesnikova - 2.8.3-2 - Perl 5.24 rebuild diff --git a/sources b/sources index 34e2631..66a85f3 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -4a9bda9f14e9c5ce3e7a416e43b74a1b git-2.8.3.tar.xz -ca16f82dca7a1943320cbfe2547b3d31 git-htmldocs-2.8.3.tar.xz -553827e1b6c422ecc485499c1a1ae28d git-manpages-2.8.3.tar.xz -ebe15eeee394b3642e8f8c3e811f2c26 git-2.8.3.tar.sign -e7c570e5b703e079e4cb1a543447171c git-htmldocs-2.8.3.tar.sign -72f911fcb7c7d7049362fed8a0c76fbb git-manpages-2.8.3.tar.sign +24086740ecc71fe99ad2ce92d558f935 git-2.8.4.tar.sign +698bba0af07f41581443718ec3fb2d44 git-2.8.4.tar.xz +4ee2d377097972e5e3245cada44d8de3 git-htmldocs-2.8.4.tar.sign +d1987f82807746243e3ab22222636ece git-htmldocs-2.8.4.tar.xz +8e979d289ca61386873fc576c2e1c677 git-manpages-2.8.4.tar.sign +8340e772d60ccd04a5da88fa9c976dad git-manpages-2.8.4.tar.xz From 3119e08ee403b489bddbe68b7bae6ffa7254f437 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 14 Jun 2016 10:05:22 -0500 Subject: [PATCH 378/842] 2.9.0 --- git.spec | 5 ++++- sources | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index bbfefbd..b8f790e 100644 --- a/git.spec +++ b/git.spec @@ -54,7 +54,7 @@ %endif Name: git -Version: 2.8.4 +Version: 2.9.0 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -735,6 +735,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Jun 14 2016 Jon Ciesla - 2.9.0-1 +- Update to 2.9.0. + * Wed Jun 08 2016 Jon Ciesla - 2.8.4-1 - Update to 2.8.4. diff --git a/sources b/sources index 66a85f3..7081546 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -24086740ecc71fe99ad2ce92d558f935 git-2.8.4.tar.sign -698bba0af07f41581443718ec3fb2d44 git-2.8.4.tar.xz -4ee2d377097972e5e3245cada44d8de3 git-htmldocs-2.8.4.tar.sign -d1987f82807746243e3ab22222636ece git-htmldocs-2.8.4.tar.xz -8e979d289ca61386873fc576c2e1c677 git-manpages-2.8.4.tar.sign -8340e772d60ccd04a5da88fa9c976dad git-manpages-2.8.4.tar.xz +29da8be80da4109b01da8adc538929d7 git-2.9.0.tar.sign +118ef1e3108ef0b858cd13b74395a59c git-2.9.0.tar.xz +e6a47f2586729a454efe841f7419386d git-htmldocs-2.9.0.tar.sign +58fd09c4ca71576ce1c1b0b78ef5006e git-htmldocs-2.9.0.tar.xz +da85839c660e2ba48caf4d8b83930bb5 git-manpages-2.9.0.tar.sign +c840c968062251b768ba9852fd29054c git-manpages-2.9.0.tar.xz From e99ee5b2e56b3397b6e63f5f894d3e7b5983099c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 09:50:19 +0200 Subject: [PATCH 379/842] Mandatory Perl build-requires added --- git.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/git.spec b/git.spec index b8f790e..2791a25 100644 --- a/git.spec +++ b/git.spec @@ -108,6 +108,7 @@ BuildRequires: %{libcurl_devel} BuildRequires: libgnome-keyring-devel %endif BuildRequires: pcre-devel +BuildRequires: perl-generators BuildRequires: perl(Test) BuildRequires: openssl-devel BuildRequires: zlib-devel >= 1.2 From 004252297729b367b8647aa3c17acc03f2500bf2 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 12 Jul 2016 08:48:48 -0500 Subject: [PATCH 380/842] 2.9.1 --- git.spec | 5 ++++- sources | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index 2791a25..66afe9d 100644 --- a/git.spec +++ b/git.spec @@ -54,7 +54,7 @@ %endif Name: git -Version: 2.9.0 +Version: 2.9.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -736,6 +736,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Jul 12 2016 Jon Ciesla - 2.9.1-1 +- Update to 2.9.1. + * Tue Jun 14 2016 Jon Ciesla - 2.9.0-1 - Update to 2.9.0. diff --git a/sources b/sources index 7081546..dccb9e7 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -29da8be80da4109b01da8adc538929d7 git-2.9.0.tar.sign -118ef1e3108ef0b858cd13b74395a59c git-2.9.0.tar.xz -e6a47f2586729a454efe841f7419386d git-htmldocs-2.9.0.tar.sign -58fd09c4ca71576ce1c1b0b78ef5006e git-htmldocs-2.9.0.tar.xz -da85839c660e2ba48caf4d8b83930bb5 git-manpages-2.9.0.tar.sign -c840c968062251b768ba9852fd29054c git-manpages-2.9.0.tar.xz +567840edaa9a9c0a44b2ebff34d82c2e git-2.9.1.tar.sign +b52cf453ac7760538bbc972d6c775a7c git-2.9.1.tar.xz +2d975171e4a44c60549c1dd9c8a2b159 git-htmldocs-2.9.1.tar.sign +3b56eacacf16a5bf1098bfd09985b436 git-htmldocs-2.9.1.tar.xz +d0e10dd47ff84b5ce2368c012192b63b git-manpages-2.9.1.tar.sign +2aa797ff70c704a563c910e04c0f620a git-manpages-2.9.1.tar.xz From 31aba69924f56c8e62adf0aa5d59b727802466c7 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 15 Jul 2016 23:23:57 -0500 Subject: [PATCH 381/842] 2.9.2 --- git.spec | 5 ++++- sources | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index 66afe9d..f34ddbc 100644 --- a/git.spec +++ b/git.spec @@ -54,7 +54,7 @@ %endif Name: git -Version: 2.9.1 +Version: 2.9.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -736,6 +736,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Jul 15 2016 Jon Ciesla - 2.9.2-1 +- Update to 2.9.2. + * Tue Jul 12 2016 Jon Ciesla - 2.9.1-1 - Update to 2.9.1. diff --git a/sources b/sources index dccb9e7..9474658 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -567840edaa9a9c0a44b2ebff34d82c2e git-2.9.1.tar.sign -b52cf453ac7760538bbc972d6c775a7c git-2.9.1.tar.xz -2d975171e4a44c60549c1dd9c8a2b159 git-htmldocs-2.9.1.tar.sign -3b56eacacf16a5bf1098bfd09985b436 git-htmldocs-2.9.1.tar.xz -d0e10dd47ff84b5ce2368c012192b63b git-manpages-2.9.1.tar.sign -2aa797ff70c704a563c910e04c0f620a git-manpages-2.9.1.tar.xz +d56504076adb8f1be194e97b394dc6ec git-2.9.2.tar.sign +dc5eb7ff2ca4641c6038f51ae49cad0f git-2.9.2.tar.xz +5a8dfc7b0afcc380dec9ab768b7b8831 git-htmldocs-2.9.2.tar.sign +1875176e62c2fe552174e3ffa1a67069 git-htmldocs-2.9.2.tar.xz +b4d81963f57c2d0f0be848e8048993d4 git-manpages-2.9.2.tar.sign +c4f415b4fc94cf75a1deb651ba769594 git-manpages-2.9.2.tar.xz From 24278ab333f8452ffd9c31cf8d917b61543393e0 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 15 Aug 2016 08:51:43 -0500 Subject: [PATCH 382/842] 2.9.3 --- git.spec | 5 ++++- sources | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index f34ddbc..6be42ab 100644 --- a/git.spec +++ b/git.spec @@ -54,7 +54,7 @@ %endif Name: git -Version: 2.9.2 +Version: 2.9.3 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -736,6 +736,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Aug 15 2016 Jon Ciesla - 2.9.3-1 +- Update to 2.9.3. + * Fri Jul 15 2016 Jon Ciesla - 2.9.2-1 - Update to 2.9.2. diff --git a/sources b/sources index 9474658..e0eb1b9 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -d56504076adb8f1be194e97b394dc6ec git-2.9.2.tar.sign -dc5eb7ff2ca4641c6038f51ae49cad0f git-2.9.2.tar.xz -5a8dfc7b0afcc380dec9ab768b7b8831 git-htmldocs-2.9.2.tar.sign -1875176e62c2fe552174e3ffa1a67069 git-htmldocs-2.9.2.tar.xz -b4d81963f57c2d0f0be848e8048993d4 git-manpages-2.9.2.tar.sign -c4f415b4fc94cf75a1deb651ba769594 git-manpages-2.9.2.tar.xz +316776336775d25d58888686a4893c86 git-2.9.3.tar.sign +3d32cb5cb5b4f29bd2eb1cde596fc542 git-2.9.3.tar.xz +cf0bf766505aa0674006dba6561c153b git-htmldocs-2.9.3.tar.sign +29378f5a360d86b9f5838ad74680accd git-htmldocs-2.9.3.tar.xz +1b7e97104f3f98cbae9fb475ab37aa19 git-manpages-2.9.3.tar.sign +337165a3b2bbe4814c73075cb6854ca2 git-manpages-2.9.3.tar.xz From ddd981b2f39bc59b043be3d6ccba19aef3254dc8 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 3 Sep 2016 13:34:31 -0400 Subject: [PATCH 383/842] Update to 2.10.0 https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.10.0.txt --- git.spec | 5 ++++- sources | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index 6be42ab..f8c7603 100644 --- a/git.spec +++ b/git.spec @@ -54,7 +54,7 @@ %endif Name: git -Version: 2.9.3 +Version: 2.10.0 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -736,6 +736,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sat Sep 03 2016 Todd Zullinger - 2.10.0-1 +- Update to 2.10.0 + * Mon Aug 15 2016 Jon Ciesla - 2.9.3-1 - Update to 2.9.3. diff --git a/sources b/sources index e0eb1b9..4694c76 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -316776336775d25d58888686a4893c86 git-2.9.3.tar.sign -3d32cb5cb5b4f29bd2eb1cde596fc542 git-2.9.3.tar.xz -cf0bf766505aa0674006dba6561c153b git-htmldocs-2.9.3.tar.sign -29378f5a360d86b9f5838ad74680accd git-htmldocs-2.9.3.tar.xz -1b7e97104f3f98cbae9fb475ab37aa19 git-manpages-2.9.3.tar.sign -337165a3b2bbe4814c73075cb6854ca2 git-manpages-2.9.3.tar.xz +d99fdf256e7c7bc5d2cb428b48d4e038 git-2.10.0.tar.xz +fe88c8c4b764a174980c5cd93a38f558 git-htmldocs-2.10.0.tar.xz +fa20a4c72aee46fa7ca714114583b947 git-manpages-2.10.0.tar.xz +77df014363cbeb7c575e1e701808011f git-2.10.0.tar.sign +cd27d0668d3b28710cecc8b6248abe72 git-htmldocs-2.10.0.tar.sign +c3ee209ad7172ecbd8d073953c5188d8 git-manpages-2.10.0.tar.sign From 2f2b6cc62f183680fea2a3eccf6604af232dd2a3 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 4 Oct 2016 10:02:17 -0500 Subject: [PATCH 384/842] 2.10.1 --- git.spec | 5 ++++- sources | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index f8c7603..a818f09 100644 --- a/git.spec +++ b/git.spec @@ -54,7 +54,7 @@ %endif Name: git -Version: 2.10.0 +Version: 2.10.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -736,6 +736,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Oct 04 2016 Jon Ciesla - 2.10.1-1 +- Update to 2.10.1 + * Sat Sep 03 2016 Todd Zullinger - 2.10.0-1 - Update to 2.10.0 diff --git a/sources b/sources index 4694c76..4305208 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -d99fdf256e7c7bc5d2cb428b48d4e038 git-2.10.0.tar.xz -fe88c8c4b764a174980c5cd93a38f558 git-htmldocs-2.10.0.tar.xz -fa20a4c72aee46fa7ca714114583b947 git-manpages-2.10.0.tar.xz -77df014363cbeb7c575e1e701808011f git-2.10.0.tar.sign -cd27d0668d3b28710cecc8b6248abe72 git-htmldocs-2.10.0.tar.sign -c3ee209ad7172ecbd8d073953c5188d8 git-manpages-2.10.0.tar.sign +a220996c7d303b8145d62c6609281fc5 git-2.10.1.tar.sign +a9e1bf842497fc3a23e86424018b3499 git-2.10.1.tar.xz +d1bb33618ba9331bbb98b95e1d0955cd git-htmldocs-2.10.1.tar.sign +f5abb95dd74f040b3739a663dc681288 git-htmldocs-2.10.1.tar.xz +6ed7da5703e93ca5816fb473c0631d96 git-manpages-2.10.1.tar.sign +db36c72c3bf78fa6060ae64c303dddad git-manpages-2.10.1.tar.xz From 781d911ea8170b7ea4a7d385749bbf900f33f888 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 31 Oct 2016 08:59:33 -0500 Subject: [PATCH 385/842] 2.10.2 --- git.spec | 5 ++++- sources | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index a818f09..eedb32e 100644 --- a/git.spec +++ b/git.spec @@ -54,7 +54,7 @@ %endif Name: git -Version: 2.10.1 +Version: 2.10.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -736,6 +736,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Oct 31 2016 Jon Ciesla - 2.10.2-1 +- Update to 2.10.2 + * Tue Oct 04 2016 Jon Ciesla - 2.10.1-1 - Update to 2.10.1 diff --git a/sources b/sources index 4305208..e47195e 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -a220996c7d303b8145d62c6609281fc5 git-2.10.1.tar.sign -a9e1bf842497fc3a23e86424018b3499 git-2.10.1.tar.xz -d1bb33618ba9331bbb98b95e1d0955cd git-htmldocs-2.10.1.tar.sign -f5abb95dd74f040b3739a663dc681288 git-htmldocs-2.10.1.tar.xz -6ed7da5703e93ca5816fb473c0631d96 git-manpages-2.10.1.tar.sign -db36c72c3bf78fa6060ae64c303dddad git-manpages-2.10.1.tar.xz +4f930501c1669984c248cc99cfc3c1f6 git-2.10.2.tar.sign +3cd1dca37be60668f482545716923b72 git-2.10.2.tar.xz +aa0800cefe3dee03f5d7485ef4a81fc3 git-htmldocs-2.10.2.tar.sign +1e9607ec1d37072ef1dc04c874606805 git-htmldocs-2.10.2.tar.xz +3763b5d0f94a4dc3ccd138b5d3a3f293 git-manpages-2.10.2.tar.sign +6dc2a09d58a7aea20329b56a1efcb058 git-manpages-2.10.2.tar.xz From 1c71dc1833550218434e464af07558dae54aad38 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 30 Nov 2016 12:12:54 -0600 Subject: [PATCH 386/842] 2.11.0 --- git.spec | 5 ++++- sources | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index eedb32e..3c9a3ba 100644 --- a/git.spec +++ b/git.spec @@ -54,7 +54,7 @@ %endif Name: git -Version: 2.10.2 +Version: 2.11.0 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -736,6 +736,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Nov 30 2016 Jon Ciesla - 2.11.0-1 +- Update to 2.11.0 + * Mon Oct 31 2016 Jon Ciesla - 2.10.2-1 - Update to 2.10.2 diff --git a/sources b/sources index e47195e..1d0cafe 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -4f930501c1669984c248cc99cfc3c1f6 git-2.10.2.tar.sign -3cd1dca37be60668f482545716923b72 git-2.10.2.tar.xz -aa0800cefe3dee03f5d7485ef4a81fc3 git-htmldocs-2.10.2.tar.sign -1e9607ec1d37072ef1dc04c874606805 git-htmldocs-2.10.2.tar.xz -3763b5d0f94a4dc3ccd138b5d3a3f293 git-manpages-2.10.2.tar.sign -6dc2a09d58a7aea20329b56a1efcb058 git-manpages-2.10.2.tar.xz +3a5ec03a3ccfb3232702d2bcf624c9f8 git-2.11.0.tar.sign +dd4e3360e28aec5bb902fb34dd7fce3b git-2.11.0.tar.xz +8e74ed0aebce6a3b59469c28fbdbe270 git-htmldocs-2.11.0.tar.sign +202714a68b19c3891a29b5b2cfdfc2cb git-htmldocs-2.11.0.tar.xz +d49d7cfa6228c11b33c46cfe0ece7eda git-manpages-2.11.0.tar.sign +72718851626e5b2267877cc2194a1ac9 git-manpages-2.11.0.tar.xz From c6b850b8474ae860eba7b60df3c3f7df012eec8b Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 3 Feb 2017 07:49:15 -0600 Subject: [PATCH 387/842] 2.11.1 --- git.spec | 5 ++++- sources | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index 3c9a3ba..e437612 100644 --- a/git.spec +++ b/git.spec @@ -54,7 +54,7 @@ %endif Name: git -Version: 2.11.0 +Version: 2.11.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -736,6 +736,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Feb 03 2017 Jon Ciesla - 2.11.1-1 +- Update to 2.11.1 + * Wed Nov 30 2016 Jon Ciesla - 2.11.0-1 - Update to 2.11.0 diff --git a/sources b/sources index 1d0cafe..df604e1 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -3a5ec03a3ccfb3232702d2bcf624c9f8 git-2.11.0.tar.sign -dd4e3360e28aec5bb902fb34dd7fce3b git-2.11.0.tar.xz -8e74ed0aebce6a3b59469c28fbdbe270 git-htmldocs-2.11.0.tar.sign -202714a68b19c3891a29b5b2cfdfc2cb git-htmldocs-2.11.0.tar.xz -d49d7cfa6228c11b33c46cfe0ece7eda git-manpages-2.11.0.tar.sign -72718851626e5b2267877cc2194a1ac9 git-manpages-2.11.0.tar.xz +SHA512 (git-2.11.1.tar.sign) = 602c7523726c38adae6dc2245ed4c0f27b0eed56ebf7ff9959bba1a68e9fbce61359122d860232bc792c902b4f8734dd899d8ed206963d0649ce10da20e30591 +SHA512 (git-2.11.1.tar.xz) = c9d4196ad9c4f656b5a25fe688c06248bfce4fadac38e9bc835e5e9063ab95e3d4b3db4174acea0b3b64c5455adc93d39870f2b6009d2dd6aa0edb5a5f5bda40 +SHA512 (git-htmldocs-2.11.1.tar.sign) = d57dbbe38c583894f4eec5023032aa74bce53f6b377dc09cf183f1807d7ddb2e5b2fc24aa441206778d12db3b264dc0d0e8968931504ea7a1d9008d141ac170a +SHA512 (git-htmldocs-2.11.1.tar.xz) = dee37cfa0870f7289c66c3c58bb86d01324bfd30f4d4a05dedebef98ddb38339c7937bb2caee0e1d35ef579de414e5f280d5fd9f48fb427f497fe2f7d62f7d2a +SHA512 (git-manpages-2.11.1.tar.sign) = 0db1f843618b4d24657ed839490cf10cca2359d4b8796ba05c84942d4daeb56546739cdcbbde283e7eab0d574d33c2133805ae270f1d0afa653ae3e669379a79 +SHA512 (git-manpages-2.11.1.tar.xz) = ffa197ed163031f14882f85124399a7de3b1cadee089cb3d85a6b936215b23243102fd99fdf877f0a8b9d660711e994022cce8893ae27c0295a12dceb41c7f6b From 8efd801b055737ef6aef2fe2c275c133b9bba85d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 10:59:24 +0000 Subject: [PATCH 388/842] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index e437612..a16c8b1 100644 --- a/git.spec +++ b/git.spec @@ -55,7 +55,7 @@ Name: git Version: 2.11.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -736,6 +736,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.11.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 03 2017 Jon Ciesla - 2.11.1-1 - Update to 2.11.1 From 513cd389a5f85dfeb512baef408c56f0bd6227bf Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 16 Dec 2016 22:48:46 -0500 Subject: [PATCH 389/842] Remove rsync requirement from git-core Nothing in git-core requires rsync. Upstream, only git-archimport.perl still requires rsync, which we have not provided since 3f0dc97 (Drop git-arch on fedora >= 16, 2011-07-26). --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index a16c8b1..48400ee 100644 --- a/git.spec +++ b/git.spec @@ -55,7 +55,7 @@ Name: git Version: 2.11.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -188,7 +188,6 @@ Summary: Core package of git with minimal funcionality Group: Development/Tools Requires: less Requires: openssh-clients -Requires: rsync Requires: zlib >= 1.2 %description core Git is a fast, scalable, distributed revision control system with an @@ -736,6 +735,10 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Feb 17 2017 Todd Zullinger - 2.11.1-3 +- Remove unnecessary rsync requirement from git-core + + * Fri Feb 10 2017 Fedora Release Engineering - 2.11.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 8849588b499edcfab75717759a9ea6a38539ab41 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 16 Dec 2016 23:06:23 -0500 Subject: [PATCH 390/842] Move gnome-keyring credential helper from git-core to git We can avoid pulling in libgnome-keyring for git-core installs. Presumably, those who want a minimal git install won't miss a credentials helper which is only useful with a graphical desktop. It is also worth noting that libgnome-keyring is deprecated in favor of libsecret. A credential helper based on libsecret is included in git 2.11.0 but is not shipped in our packages (yet). --- git.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 48400ee..1b2fca7 100644 --- a/git.spec +++ b/git.spec @@ -583,7 +583,7 @@ chmod a-x Documentation/technical/api-index.sh find contrib -type f | xargs chmod -x # Split core files -not_core_re="git-(add--interactive|am|credential-netrc|difftool|instaweb|relink|request-pull|send-mail|submodule)|gitweb|prepare-commit-msg|pre-rebase" +not_core_re="git-(add--interactive|am|credential-(gnome-keyring|netrc)|difftool|instaweb|relink|request-pull|send-mail|submodule)|gitweb|prepare-commit-msg|pre-rebase" grep -vE "$not_core_re|\/man\/" bin-man-doc-files > bin-files-core grep -vE "$not_core_re" bin-man-doc-files | grep "\/man\/" > man-doc-files-core grep -E "$not_core_re" bin-man-doc-files > bin-man-doc-git-files @@ -737,7 +737,7 @@ rm -rf %{buildroot} %changelog * Fri Feb 17 2017 Todd Zullinger - 2.11.1-3 - Remove unnecessary rsync requirement from git-core - +- Move gnome-keyring credential helper from git-core to git * Fri Feb 10 2017 Fedora Release Engineering - 2.11.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 01e0c73c8ae22812fc46d394a7f69fb0081edc56 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 16 Dec 2016 23:31:53 -0500 Subject: [PATCH 391/842] Enable libsecret credential helper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From the upstream commit message which added the helper¹: This is based on the existing gnome-keyring helper, but instead of libgnome-keyring (which was specific to GNOME and is deprecated), it uses libsecret which can support other implementations of XDG Secret Service API. ¹ 87d1353 (contrib: add credential helper for libsecret, 2016-10-09) --- git.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 1b2fca7..217e3bb 100644 --- a/git.spec +++ b/git.spec @@ -36,6 +36,7 @@ %global bashcomproot %(dirname %{bashcompdir} 2>/dev/null) %global desktop_vendor_tag 0 %global gnome_keyring 1 +%global libsecret 1 %global use_new_rpm_filters 1 %global use_systemd 1 %else @@ -44,6 +45,7 @@ %global bashcomproot %{bashcompdir} %global desktop_vendor_tag 1 %global gnome_keyring 0 +%global libsecret 0 %global use_new_rpm_filters 0 %global use_systemd 0 %endif @@ -107,6 +109,9 @@ BuildRequires: %{libcurl_devel} %if %{gnome_keyring} BuildRequires: libgnome-keyring-devel %endif +%if %{libsecret} +BuildRequires: libsecret-devel +%endif BuildRequires: pcre-devel BuildRequires: perl-generators BuildRequires: perl(Test) @@ -448,6 +453,9 @@ make -C contrib/emacs %if %{gnome_keyring} make -C contrib/credential/gnome-keyring/ %endif +%if %{libsecret} +make -C contrib/credential/libsecret/ +%endif make -C contrib/credential/netrc/ make -C contrib/subtree/ @@ -485,6 +493,12 @@ install -pm 755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \ # Remove built binary files, otherwise they will be installed in doc make -C contrib/credential/gnome-keyring/ clean %endif +%if %{libsecret} +install -pm 755 contrib/credential/libsecret/git-credential-libsecret \ + %{buildroot}%{gitcoredir} +# Remove built binary files, otherwise they will be installed in doc +make -C contrib/credential/libsecret/ clean +%endif install -pm 755 contrib/credential/netrc/git-credential-netrc \ %{buildroot}%{gitcoredir} @@ -583,7 +597,7 @@ chmod a-x Documentation/technical/api-index.sh find contrib -type f | xargs chmod -x # Split core files -not_core_re="git-(add--interactive|am|credential-(gnome-keyring|netrc)|difftool|instaweb|relink|request-pull|send-mail|submodule)|gitweb|prepare-commit-msg|pre-rebase" +not_core_re="git-(add--interactive|am|credential-(gnome-keyring|libsecret|netrc)|difftool|instaweb|relink|request-pull|send-mail|submodule)|gitweb|prepare-commit-msg|pre-rebase" grep -vE "$not_core_re|\/man\/" bin-man-doc-files > bin-files-core grep -vE "$not_core_re" bin-man-doc-files | grep "\/man\/" > man-doc-files-core grep -E "$not_core_re" bin-man-doc-files > bin-man-doc-git-files @@ -738,6 +752,7 @@ rm -rf %{buildroot} * Fri Feb 17 2017 Todd Zullinger - 2.11.1-3 - Remove unnecessary rsync requirement from git-core - Move gnome-keyring credential helper from git-core to git +- Enable libsecret credential helper * Fri Feb 10 2017 Fedora Release Engineering - 2.11.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 3041eeb9aaf98a805094edf211bed76836314797 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 16 Dec 2016 23:46:53 -0500 Subject: [PATCH 392/842] Run git test suite Per https://fedoraproject.org/wiki/Packaging:Guidelines#Test_Suites run the tests in %check. --- git.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git.spec b/git.spec index 217e3bb..a5e3b05 100644 --- a/git.spec +++ b/git.spec @@ -602,6 +602,8 @@ grep -vE "$not_core_re|\/man\/" bin-man-doc-files > bin-files-core grep -vE "$not_core_re" bin-man-doc-files | grep "\/man\/" > man-doc-files-core grep -E "$not_core_re" bin-man-doc-files > bin-man-doc-git-files +%check +make test %clean rm -rf %{buildroot} @@ -753,6 +755,7 @@ rm -rf %{buildroot} - Remove unnecessary rsync requirement from git-core - Move gnome-keyring credential helper from git-core to git - Enable libsecret credential helper +- Run git test suite * Fri Feb 10 2017 Fedora Release Engineering - 2.11.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 3164faa3d6fdd83c1002b2dfc9e092d38527ea04 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 17 Dec 2016 02:13:40 -0500 Subject: [PATCH 393/842] Use %{_mandir} in git/git-core file list filters The escaped forward slashes in '\/man\/' stood out as unnecessary. Replace the string with the %{_mandir} macro for a stricter match. --- git.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index a5e3b05..626ec05 100644 --- a/git.spec +++ b/git.spec @@ -598,8 +598,8 @@ find contrib -type f | xargs chmod -x # Split core files not_core_re="git-(add--interactive|am|credential-(gnome-keyring|libsecret|netrc)|difftool|instaweb|relink|request-pull|send-mail|submodule)|gitweb|prepare-commit-msg|pre-rebase" -grep -vE "$not_core_re|\/man\/" bin-man-doc-files > bin-files-core -grep -vE "$not_core_re" bin-man-doc-files | grep "\/man\/" > man-doc-files-core +grep -vE "$not_core_re|%{_mandir}" bin-man-doc-files > bin-files-core +grep -vE "$not_core_re" bin-man-doc-files | grep "%{_mandir}" > man-doc-files-core grep -E "$not_core_re" bin-man-doc-files > bin-man-doc-git-files %check @@ -756,6 +756,7 @@ rm -rf %{buildroot} - Move gnome-keyring credential helper from git-core to git - Enable libsecret credential helper - Run git test suite +- Use %%{_mandir} in git/git-core file list filters * Fri Feb 10 2017 Fedora Release Engineering - 2.11.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 51d2701b11a1a5be78de5f5d9b99090f6694c987 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 17 Dec 2016 02:31:51 -0500 Subject: [PATCH 394/842] Fix version of emacs-git and emacs-git-el provides A provides using '<=' doesn't make much sense. Indeed, rpmlint complains about it: $ rpmlint git ... git.x86_64: W: self-obsoletion emacs-git <= 2.4.5 obsoletes emacs-git <= 2.4.5 git.x86_64: W: self-obsoletion emacs-git-el <= 2.4.5 obsoletes emacs-git-el <= 2.4.5 --- git.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 626ec05..b2cd131 100644 --- a/git.spec +++ b/git.spec @@ -138,8 +138,8 @@ Requires: emacs-filesystem >= %{_emacs_version} # These can be removed in Fedora 26 Obsoletes: emacs-git <= 2.4.5 Obsoletes: emacs-git-el <= 2.4.5 -Provides: emacs-git <= 2.4.5 -Provides: emacs-git-el <= 2.4.5 +Provides: emacs-git = %{version}-%{release} +Provides: emacs-git-el = %{version}-%{release} %endif #Provides: git-core = %{version}-%{release} @@ -757,6 +757,7 @@ rm -rf %{buildroot} - Enable libsecret credential helper - Run git test suite - Use %%{_mandir} in git/git-core file list filters +- Fix version of emacs-git and emacs-git-el provides * Fri Feb 10 2017 Fedora Release Engineering - 2.11.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 4d0be1a2312c4f98a4b9e34353e47190482d0784 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 17 Dec 2016 02:38:22 -0500 Subject: [PATCH 395/842] Fix typo in git-core summary (funcionality -> functionality) Noticed by rpmlint. --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index b2cd131..fb988c9 100644 --- a/git.spec +++ b/git.spec @@ -189,7 +189,7 @@ and full access to internals. This is a dummy package which brings in all subpackages. %package core -Summary: Core package of git with minimal funcionality +Summary: Core package of git with minimal functionality Group: Development/Tools Requires: less Requires: openssh-clients From 7ed4a360587732d75d23737a56c82e7c8cdc62c4 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 17 Dec 2016 03:39:08 -0500 Subject: [PATCH 396/842] Clean up contrib/{credential,subtree} to avoid cruft in git-core-doc --- git.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/git.spec b/git.spec index fb988c9..a38d6a8 100644 --- a/git.spec +++ b/git.spec @@ -519,6 +519,12 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';' find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';' +# Clean up contrib/credential to avoid cruft in the git-core-doc docdir +rm -rf contrib/credential + +# Clean up contrib/subtree to avoid cruft in the git-core-doc docdir +rm -rf contrib/subtree/{INSTALL,Makefile,git-subtree{,.{1,sh,txt,xml}},t} + # git-archimport is not supported find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' @@ -758,6 +764,7 @@ rm -rf %{buildroot} - Run git test suite - Use %%{_mandir} in git/git-core file list filters - Fix version of emacs-git and emacs-git-el provides +- Clean up contrib/{credential,subtree} to avoid cruft in git-core-doc * Fri Feb 10 2017 Fedora Release Engineering - 2.11.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 32280c188005a6d242c5d8deb7649bf23178e7dc Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 17 Dec 2016 03:40:07 -0500 Subject: [PATCH 397/842] Fix a number of macro-in-comment warnings from rpmlint --- git.spec | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/git.spec b/git.spec index a38d6a8..44dc421 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Settings for EL-5 -# - Leave git-* binaries in %{_bindir} +# - Leave git-* binaries in %%{_bindir} # - Don't use noarch subpackages # - Use proper libcurl devel package # - Patch emacs and tweak docbook spaces @@ -142,11 +142,6 @@ Provides: emacs-git = %{version}-%{release} Provides: emacs-git-el = %{version}-%{release} %endif -#Provides: git-core = %{version}-%{release} -#%if 0%{?rhel} && 0%{?rhel} <= 5 -#Obsoletes: git-core <= 1.5.4.3 -#%endif - # Obsolete git-arch Obsoletes: git-arch < %{version}-%{release} @@ -633,10 +628,6 @@ rm -rf %{buildroot} %endif %{_datadir}/git-core/contrib/hooks/update-paranoid %{_datadir}/git-core/contrib/hooks/setgitperms.perl -#%{_datadir}/git-core/* -#%doc Documentation/*.txt -#%{!?_without_docs: %doc Documentation/*.html} -#%{!?_without_docs: %doc Documentation/howto/* Documentation/technical/*} %files core -f bin-files-core %defattr(-,root,root) @@ -765,6 +756,7 @@ rm -rf %{buildroot} - Use %%{_mandir} in git/git-core file list filters - Fix version of emacs-git and emacs-git-el provides - Clean up contrib/{credential,subtree} to avoid cruft in git-core-doc +- Fix a number of macro-in-comment warnings from rpmlint * Fri Feb 10 2017 Fedora Release Engineering - 2.11.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild @@ -1195,7 +1187,7 @@ rm -rf %{buildroot} * Wed Feb 15 2012 Todd Zullinger - 1.7.9.1-1 - Update to 1.7.9.1 -- Fix EPEL builds (rpm doesn't accept mutiple -f options in %files) +- Fix EPEL builds (rpm doesn't accept multiple -f options in %%files) * Fri Feb 10 2012 Petr Pisar - 1.7.9-2 - Rebuild against PCRE 8.30 From ad1da77a0bf030883eb40db2af25d0f06f3200c6 Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Fri, 27 Jan 2017 16:30:54 +0100 Subject: [PATCH 398/842] Remove non-ASCII characters from texts --- git.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 44dc421..1d05651 100644 --- a/git.spec +++ b/git.spec @@ -208,7 +208,7 @@ Requires: git-core = %{version}-%{release} Documentation files for git-core package including man pages. %package daemon -Summary: Git protocol dæmon +Summary: Git protocol daemon Group: Development/Tools Requires: git = %{version}-%{release} %if %{use_systemd} @@ -220,7 +220,7 @@ Requires(postun): systemd Requires: xinetd %endif %description daemon -The git dæmon for supporting git:// access to git repositories +The git daemon for supporting git:// access to git repositories %package -n gitweb Summary: Simple web interface to git repositories From 8fbeb92b396a47370c5c8769fa4a516e0be8037e Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Fri, 27 Jan 2017 16:38:56 +0100 Subject: [PATCH 399/842] Fix requirements of packages - missing libcurl requirement for git-core - git-email & git-cvs should require 'perl(Git)' according to guidelines - perl-generators are required during build only for Fedora 21+ --- git.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/git.spec b/git.spec index 1d05651..c95a120 100644 --- a/git.spec +++ b/git.spec @@ -113,7 +113,9 @@ BuildRequires: libgnome-keyring-devel BuildRequires: libsecret-devel %endif BuildRequires: pcre-devel +%if 0%{?fedora} && 0%{?fedora} >= 21 BuildRequires: perl-generators +%endif BuildRequires: perl(Test) BuildRequires: openssl-devel BuildRequires: zlib-devel >= 1.2 @@ -189,6 +191,7 @@ Group: Development/Tools Requires: less Requires: openssh-clients Requires: zlib >= 1.2 +Requires: libcurl %description core Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations @@ -264,6 +267,7 @@ BuildArch: noarch Requires: git = %{version}-%{release}, cvs Requires: cvsps Requires: perl(DBD::SQLite) +Requires: perl(Git) %description cvs Git tools for importing CVS repositories. @@ -276,6 +280,7 @@ BuildArch: noarch Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} Requires: perl(Authen::SASL) Requires: perl(Net::SMTP::SSL) +Requires: perl(Git) %description email Git tools for sending email. From 6517883454311ccc6d9b387d649467ea11de72b0 Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Fri, 27 Jan 2017 16:46:18 +0100 Subject: [PATCH 400/842] Fix definition of the desktop_vendor_tag macro The macro should be set to 0 even for RHEL-6 system. Previously it was set to 1 for RHEL-6. --- git.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index c95a120..bef51ac 100644 --- a/git.spec +++ b/git.spec @@ -34,7 +34,6 @@ %global bashcomp_pkgconfig 1 %global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) %global bashcomproot %(dirname %{bashcompdir} 2>/dev/null) -%global desktop_vendor_tag 0 %global gnome_keyring 1 %global libsecret 1 %global use_new_rpm_filters 1 @@ -43,13 +42,19 @@ %global bashcomp_pkgconfig 0 %global bashcompdir %{_sysconfdir}/bash_completion.d %global bashcomproot %{bashcompdir} -%global desktop_vendor_tag 1 %global gnome_keyring 0 %global libsecret 0 %global use_new_rpm_filters 0 %global use_systemd 0 %endif +# This one macro is for F19+ and EL-6+ +%if 0%{?fedora} >= 19 || 0%{?rhel} >= 6 +%global desktop_vendor_tag 0 +%else +%global desktop_vendor_tag 1 +%endif + # Settings for EL <= 7 %if 0%{?rhel} && 0%{?rhel} <= 7 %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} From da382eea6e661b4043b44dd9d5518a5023b2963f Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Fri, 27 Jan 2017 16:54:06 +0100 Subject: [PATCH 401/842] Use %{_localstatedir} macro instead of %{_var} Usually in Fedora this change will not change paths in current packages, because both macros has same value now (/var). However, the first one is "more recommended", because some build environments redefine path in this macro for own purposes, in contrast with %{_var} which is usually kept as it is. --- git.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index bef51ac..11046cf 100644 --- a/git.spec +++ b/git.spec @@ -407,11 +407,11 @@ USE_LIBPCRE = 1 ETC_GITCONFIG = %{_sysconfdir}/gitconfig DESTDIR = %{buildroot} INSTALL = install -p -GITWEB_PROJECTROOT = %{_var}/lib/git +GITWEB_PROJECTROOT = %{_localstatedir}/lib/git GNU_ROFF = 1 htmldir = %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} prefix = %{_prefix} -gitwebdir = %{_var}/www/git +gitwebdir = %{_localstatedir}/www/git EOF %if "%{gitcoredir}" == "%{_bindir}" @@ -517,7 +517,7 @@ rm -f %{buildroot}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/gi mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d install -pm 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf -sed "s|@PROJECTROOT@|%{_var}/lib/git|g" \ +sed "s|@PROJECTROOT@|%{_localstatedir}/lib/git|g" \ %{SOURCE14} > %{buildroot}%{_sysconfdir}/gitweb.conf find %{buildroot} -type f -name .packlist -exec rm -f {} ';' @@ -547,7 +547,7 @@ sed -i "/Git\/SVN/ d" perl-git-files rm -rf %{buildroot}%{_mandir} %endif -mkdir -p %{buildroot}%{_var}/lib/git +mkdir -p %{buildroot}%{_localstatedir}/lib/git %if %{use_systemd} mkdir -p %{buildroot}%{_unitdir} cp -a %{SOURCE15} %{SOURCE16} %{buildroot}%{_unitdir} @@ -558,7 +558,7 @@ enable_ipv6=" # xinetd does not enable IPv6 by default flags = IPv6" perl -p \ -e "s|\@GITCOREDIR\@|%{gitcoredir}|g;" \ - -e "s|\@BASE_PATH\@|%{_var}/lib/git|g;" \ + -e "s|\@BASE_PATH\@|%{_localstatedir}/lib/git|g;" \ %if %{enable_ipv6} -e "s|^}|$enable_ipv6\n$&|;" \ %endif @@ -742,7 +742,7 @@ rm -rf %{buildroot} %config(noreplace)%{_sysconfdir}/xinetd.d/git %endif %{gitcoredir}/git-daemon -%{_var}/lib/git +%{_localstatedir}/lib/git %{!?_without_docs: %{_mandir}/man1/*daemon*.1*} %{!?_without_docs: %doc Documentation/*daemon*.html} @@ -751,7 +751,7 @@ rm -rf %{buildroot} %doc gitweb/INSTALL gitweb/README %config(noreplace)%{_sysconfdir}/gitweb.conf %config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf -%{_var}/www/git/ +%{_localstatedir}/www/git/ %files all From babb8edc26404b3bd3508ccce3c85e5e05d97105 Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Fri, 17 Feb 2017 17:52:56 +0100 Subject: [PATCH 402/842] Drop credential-gnome-keyring, but keep support for older OSs Since the libsecret replaces the libgnome-keyring, the libgnome-keyring is not necessary to keep it in the git package. In addition, gnome-keyring is deprecated and according to people from GNOME, they do not expect that anyone would want to use the old library when libsecret is installed. So drop credentials for libgnome-keyring. However, I keep that credential in spec for older systems where it has been originally, but it is split into the separate rpm, so at least it will not be required by the git package. It can be removed later. --- git.spec | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/git.spec b/git.spec index 11046cf..1043f46 100644 --- a/git.spec +++ b/git.spec @@ -34,7 +34,6 @@ %global bashcomp_pkgconfig 1 %global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) %global bashcomproot %(dirname %{bashcompdir} 2>/dev/null) -%global gnome_keyring 1 %global libsecret 1 %global use_new_rpm_filters 1 %global use_systemd 1 @@ -42,12 +41,21 @@ %global bashcomp_pkgconfig 0 %global bashcompdir %{_sysconfdir}/bash_completion.d %global bashcomproot %{bashcompdir} -%global gnome_keyring 0 %global libsecret 0 %global use_new_rpm_filters 0 %global use_systemd 0 %endif +# gnome-keyring is deprecated, however someone would like +# to use it on older fedora instead of libsecret. So that's +# why this ugly solution +# TODO: we should maybe update conditions according to supported systems +%if 0%{?fedora} >= 19 && 0%{?fedora} < 26 || 0%{?rhel} == 7 +%global gnome_keyring 1 +%else +%global gnome_keyring 0 +%endif + # This one macro is for F19+ and EL-6+ %if 0%{?fedora} >= 19 || 0%{?rhel} >= 6 %global desktop_vendor_tag 0 @@ -111,9 +119,6 @@ BuildRequires: expat-devel BuildRequires: gettext BuildRequires: gnupg2 BuildRequires: %{libcurl_devel} -%if %{gnome_keyring} -BuildRequires: libgnome-keyring-devel -%endif %if %{libsecret} BuildRequires: libsecret-devel %endif @@ -168,6 +173,9 @@ Group: Development/Tools BuildArch: noarch %endif Requires: git = %{version}-%{release} +%if %{gnome_keyring} +Requires: git-gnome-keyring = %{version}-%{release} +%endif Requires: git-cvs = %{version}-%{release} Requires: git-email = %{version}-%{release} Requires: git-gui = %{version}-%{release} @@ -363,6 +371,17 @@ Requires: emacs-git = %{version}-%{release} %{summary}. %endif +%if %{gnome_keyring} +%package gnome-keyring +Summary: Git module for working with gnome-keyring +BuildRequires: libgnome-keyring-devel +Requires: git = %{version}-%{release} +Requires: gnome-keyring +%description gnome-keyring +%{summary}. +%endif + + %prep # Verify GPG signatures gpghome="$(mktemp -qd)" # Ensure we don't use any existing gpg keyrings @@ -611,7 +630,8 @@ find contrib -type f | xargs chmod -x not_core_re="git-(add--interactive|am|credential-(gnome-keyring|libsecret|netrc)|difftool|instaweb|relink|request-pull|send-mail|submodule)|gitweb|prepare-commit-msg|pre-rebase" grep -vE "$not_core_re|%{_mandir}" bin-man-doc-files > bin-files-core grep -vE "$not_core_re" bin-man-doc-files | grep "%{_mandir}" > man-doc-files-core -grep -E "$not_core_re" bin-man-doc-files > bin-man-doc-git-files +grep -E "$not_core_re" bin-man-doc-files \ + | grep -v "credential-gnome-keyring" > bin-man-doc-git-files %check make test @@ -753,11 +773,23 @@ rm -rf %{buildroot} %config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf %{_localstatedir}/www/git/ +%if %{gnome_keyring} +%files gnome-keyring +%defattr(-,root,root) +%{gitcoredir}/git-credential-gnome-keyring +%endif + %files all # No files for you! %changelog +* Mon Feb 17 2017 Petr Stodulka - 2.11.1-3 +- remove non-ASCII characters from description and title of packages +- fix requiremets +- fix spec to be compatible for other systems +- remove deprecated credential-gnome-keyring + * Fri Feb 17 2017 Todd Zullinger - 2.11.1-3 - Remove unnecessary rsync requirement from git-core - Move gnome-keyring credential helper from git-core to git From ae64f14a33cc528e4d6922c9e2a2a0fd5eacc073 Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Fri, 17 Feb 2017 18:23:32 +0100 Subject: [PATCH 403/842] fix bogus date --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 1043f46..024fb93 100644 --- a/git.spec +++ b/git.spec @@ -784,7 +784,7 @@ rm -rf %{buildroot} # No files for you! %changelog -* Mon Feb 17 2017 Petr Stodulka - 2.11.1-3 +* Fri Feb 17 2017 Petr Stodulka - 2.11.1-3 - remove non-ASCII characters from description and title of packages - fix requiremets - fix spec to be compatible for other systems From 29bd122462bc340493e98882dcb53eb8a4f9c29f Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 27 Feb 2017 09:40:44 -0600 Subject: [PATCH 404/842] 2.12.0 --- git.spec | 7 +++++-- sources | 12 ++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/git.spec b/git.spec index 024fb93..a22727a 100644 --- a/git.spec +++ b/git.spec @@ -69,8 +69,8 @@ %endif Name: git -Version: 2.11.1 -Release: 3%{?dist} +Version: 2.12.0 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -784,6 +784,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Feb 27 2017 Jon Ciesla - 2.12.0-1 +- Update to 2.12.0 + * Fri Feb 17 2017 Petr Stodulka - 2.11.1-3 - remove non-ASCII characters from description and title of packages - fix requiremets diff --git a/sources b/sources index df604e1..55a4e1b 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -SHA512 (git-2.11.1.tar.sign) = 602c7523726c38adae6dc2245ed4c0f27b0eed56ebf7ff9959bba1a68e9fbce61359122d860232bc792c902b4f8734dd899d8ed206963d0649ce10da20e30591 -SHA512 (git-2.11.1.tar.xz) = c9d4196ad9c4f656b5a25fe688c06248bfce4fadac38e9bc835e5e9063ab95e3d4b3db4174acea0b3b64c5455adc93d39870f2b6009d2dd6aa0edb5a5f5bda40 -SHA512 (git-htmldocs-2.11.1.tar.sign) = d57dbbe38c583894f4eec5023032aa74bce53f6b377dc09cf183f1807d7ddb2e5b2fc24aa441206778d12db3b264dc0d0e8968931504ea7a1d9008d141ac170a -SHA512 (git-htmldocs-2.11.1.tar.xz) = dee37cfa0870f7289c66c3c58bb86d01324bfd30f4d4a05dedebef98ddb38339c7937bb2caee0e1d35ef579de414e5f280d5fd9f48fb427f497fe2f7d62f7d2a -SHA512 (git-manpages-2.11.1.tar.sign) = 0db1f843618b4d24657ed839490cf10cca2359d4b8796ba05c84942d4daeb56546739cdcbbde283e7eab0d574d33c2133805ae270f1d0afa653ae3e669379a79 -SHA512 (git-manpages-2.11.1.tar.xz) = ffa197ed163031f14882f85124399a7de3b1cadee089cb3d85a6b936215b23243102fd99fdf877f0a8b9d660711e994022cce8893ae27c0295a12dceb41c7f6b +SHA512 (git-2.12.0.tar.sign) = 0ce3b678289afbb354cecfc5b990d6a70ed23492ee05c928f20ad89d2042f1912462bf61a56334a56a659a339b053607c818e258a5361d67675d872379addc91 +SHA512 (git-2.12.0.tar.xz) = 8696de600f6800748096de9ccb54a0ba59a9128617fc6c9a5bc48857798a775209b99ad484aef777d5d6b5c3ac172e5e5071740d073e0ac8d52c54561a9bed0b +SHA512 (git-htmldocs-2.12.0.tar.sign) = 38dfe80debed9c2156420d3d0da9c937cff584431ef9a32c91662727e44969cd2995549fff232f425e2511610d7cefd9fba2ac87eba09bbac79b490baefedb92 +SHA512 (git-htmldocs-2.12.0.tar.xz) = 818e9ea13195aaa61768b5f3257591a178b4bc4eb25cf9b426b2b2ce6a1b97956eef5f1d4a99fbd5b730f7cf813d29b0a8a019793b9ff1383b607179eaf3089f +SHA512 (git-manpages-2.12.0.tar.sign) = 9504be45ef59678fdaffbe624a59ba4beeecb10fa64a0d6cc140e33b572d4d39f3199cdef9e2feb04d0d6cfe0918c45e0426716ad6472f8ba45218d568025ecb +SHA512 (git-manpages-2.12.0.tar.xz) = 07e7e85bc165b8c128d9a0192f3a75b36346dd45e0f2d17604e0df83dece79f300141d8c798059a15da441f62cb535d3e2da7c15a975c34d3557542e6f608298 From 4a094073eeb951875b77afa4abbf60b28211d70f Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 21 Mar 2017 09:08:43 -0500 Subject: [PATCH 405/842] 2.12.1 --- git.spec | 5 ++++- sources | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index a22727a..8de5daa 100644 --- a/git.spec +++ b/git.spec @@ -69,7 +69,7 @@ %endif Name: git -Version: 2.12.0 +Version: 2.12.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -784,6 +784,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Mar 21 2017 Gwyn Ciesla - 2.12.1-1 +- Update to 2.12.1 + * Mon Feb 27 2017 Jon Ciesla - 2.12.0-1 - Update to 2.12.0 diff --git a/sources b/sources index 55a4e1b..9a965fc 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -SHA512 (git-2.12.0.tar.sign) = 0ce3b678289afbb354cecfc5b990d6a70ed23492ee05c928f20ad89d2042f1912462bf61a56334a56a659a339b053607c818e258a5361d67675d872379addc91 -SHA512 (git-2.12.0.tar.xz) = 8696de600f6800748096de9ccb54a0ba59a9128617fc6c9a5bc48857798a775209b99ad484aef777d5d6b5c3ac172e5e5071740d073e0ac8d52c54561a9bed0b -SHA512 (git-htmldocs-2.12.0.tar.sign) = 38dfe80debed9c2156420d3d0da9c937cff584431ef9a32c91662727e44969cd2995549fff232f425e2511610d7cefd9fba2ac87eba09bbac79b490baefedb92 -SHA512 (git-htmldocs-2.12.0.tar.xz) = 818e9ea13195aaa61768b5f3257591a178b4bc4eb25cf9b426b2b2ce6a1b97956eef5f1d4a99fbd5b730f7cf813d29b0a8a019793b9ff1383b607179eaf3089f -SHA512 (git-manpages-2.12.0.tar.sign) = 9504be45ef59678fdaffbe624a59ba4beeecb10fa64a0d6cc140e33b572d4d39f3199cdef9e2feb04d0d6cfe0918c45e0426716ad6472f8ba45218d568025ecb -SHA512 (git-manpages-2.12.0.tar.xz) = 07e7e85bc165b8c128d9a0192f3a75b36346dd45e0f2d17604e0df83dece79f300141d8c798059a15da441f62cb535d3e2da7c15a975c34d3557542e6f608298 +SHA512 (git-2.12.1.tar.sign) = 67cf4a4074149e6f1dee87f5ea1e61a65907616c682185d96685eb06fe61366bf64a755ab544bd632dd383e2d45f0abce953dfd72ee5b726cd090697a93952ea +SHA512 (git-2.12.1.tar.xz) = 4f7203782f018e74c7ff273bb4290887524d67f34e794b26ef8f2d4cb98e57d6c95e29e2da7dd92a626228aad3d02befed9a0b5c9f97f43fe1ba52dad6ff5adb +SHA512 (git-htmldocs-2.12.1.tar.sign) = a626ada984db4f1bea86154803af3d853ab528513c498166a4dd5641c759911d5cb035bc3e1ea7e957178dccafe163a2414f7a21e69564d0abecb8a88be01d3e +SHA512 (git-htmldocs-2.12.1.tar.xz) = 76c830360692cff09b36da2ac81572cd660a84f06f3b12360022a268bbd88c48c0f4d29b6b097b6b7459548012d419f53418dfd0cbebc0c7b23db78dc135d208 +SHA512 (git-manpages-2.12.1.tar.sign) = 55cf342b3e9a5084d3fed20ab1934bb30783b8484cbe2a60151f3894a378a367633225a69c6d1420249a6def1a4c00dfd559ee8039868fd6df363b412b1778ca +SHA512 (git-manpages-2.12.1.tar.xz) = d06ad96aa368d2dadf9aeafaa50cefcf8015dcfb2aa0f356c5d70233470aee6aa1e831427e4a05ec8b1646ec8e1b9940d5f70cc331caecbda67e4811c79e1e94 From c0e7801e5827ac9ee04b51f1764d9699019c57ce Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 29 Mar 2017 10:20:49 -0500 Subject: [PATCH 406/842] 2.12.2 --- git.spec | 5 ++++- sources | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index 8de5daa..5307ca2 100644 --- a/git.spec +++ b/git.spec @@ -69,7 +69,7 @@ %endif Name: git -Version: 2.12.1 +Version: 2.12.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -784,6 +784,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Mar 29 2017 Gwyn Ciesla - 2.12.2-1 +- Update to 2.12.2 + * Tue Mar 21 2017 Gwyn Ciesla - 2.12.1-1 - Update to 2.12.1 diff --git a/sources b/sources index 9a965fc..cb28ece 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -SHA512 (git-2.12.1.tar.sign) = 67cf4a4074149e6f1dee87f5ea1e61a65907616c682185d96685eb06fe61366bf64a755ab544bd632dd383e2d45f0abce953dfd72ee5b726cd090697a93952ea -SHA512 (git-2.12.1.tar.xz) = 4f7203782f018e74c7ff273bb4290887524d67f34e794b26ef8f2d4cb98e57d6c95e29e2da7dd92a626228aad3d02befed9a0b5c9f97f43fe1ba52dad6ff5adb -SHA512 (git-htmldocs-2.12.1.tar.sign) = a626ada984db4f1bea86154803af3d853ab528513c498166a4dd5641c759911d5cb035bc3e1ea7e957178dccafe163a2414f7a21e69564d0abecb8a88be01d3e -SHA512 (git-htmldocs-2.12.1.tar.xz) = 76c830360692cff09b36da2ac81572cd660a84f06f3b12360022a268bbd88c48c0f4d29b6b097b6b7459548012d419f53418dfd0cbebc0c7b23db78dc135d208 -SHA512 (git-manpages-2.12.1.tar.sign) = 55cf342b3e9a5084d3fed20ab1934bb30783b8484cbe2a60151f3894a378a367633225a69c6d1420249a6def1a4c00dfd559ee8039868fd6df363b412b1778ca -SHA512 (git-manpages-2.12.1.tar.xz) = d06ad96aa368d2dadf9aeafaa50cefcf8015dcfb2aa0f356c5d70233470aee6aa1e831427e4a05ec8b1646ec8e1b9940d5f70cc331caecbda67e4811c79e1e94 +SHA512 (git-2.12.2.tar.sign) = a2ea094806acbe66387a3213ff89eb31d441aaae3e87a051c6c249747af1f4d2beb3fe04b9b76347bdc654dbc62cf027fd5fe697d1843c967e95e0b06951e107 +SHA512 (git-2.12.2.tar.xz) = 0e980ea6932b43c87892c0628d23bce62dc8fa8be3510e6e8bbd14605526e3b13c8a32ea9fbe8a74c286c4fe0e1fa34e85922edf743a9405a31d5657804b4b8d +SHA512 (git-htmldocs-2.12.2.tar.sign) = 43a4b2fad94d466ac969c7d1310a675ed52ad724ce62d675e01b2991542157c7008f651a5488a2a0043c98b51956be5cc18491337dce0175c0f160764d083b2f +SHA512 (git-htmldocs-2.12.2.tar.xz) = 225aa58becc5d45a8f39333a68b4078147f3d8e31b1653eea181b83f5650c07b10c917596c6ca62b22e812932145fcde6932fa116a9731fda3c263e66f9a560f +SHA512 (git-manpages-2.12.2.tar.sign) = e2e62d46a2b6ddf8a45209380ab10c1ad15788dd0eae617d574f558ee883f14bc9cd82fe995ede54b74eed9d78610f2afe311fcbdcc06055934dd3f0336a593d +SHA512 (git-manpages-2.12.2.tar.xz) = 98991bc14248f95fe837d1fb9f3e451b48825fa2b1cef94cc016dbf796f5e4293c295a7bf1c35244d835d0d66b7008855c475dd3aa7fcabd5be1e382a4ff0c91 From 96b2923f07c6d828433f465be116d22788e0ab8c Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 9 May 2017 21:48:34 -0400 Subject: [PATCH 407/842] Update to 2.13.0 (resolves CVE-2017-8386) --- git.spec | 5 ++++- sources | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index 5307ca2..ddba10f 100644 --- a/git.spec +++ b/git.spec @@ -69,7 +69,7 @@ %endif Name: git -Version: 2.12.2 +Version: 2.13.0 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -784,6 +784,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue May 09 2017 Todd Zullinger - 2.13.0-1 +- Update to 2.13.0 (resolves CVE-2017-8386) + * Wed Mar 29 2017 Gwyn Ciesla - 2.12.2-1 - Update to 2.12.2 diff --git a/sources b/sources index cb28ece..19ccc38 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -SHA512 (git-2.12.2.tar.sign) = a2ea094806acbe66387a3213ff89eb31d441aaae3e87a051c6c249747af1f4d2beb3fe04b9b76347bdc654dbc62cf027fd5fe697d1843c967e95e0b06951e107 -SHA512 (git-2.12.2.tar.xz) = 0e980ea6932b43c87892c0628d23bce62dc8fa8be3510e6e8bbd14605526e3b13c8a32ea9fbe8a74c286c4fe0e1fa34e85922edf743a9405a31d5657804b4b8d -SHA512 (git-htmldocs-2.12.2.tar.sign) = 43a4b2fad94d466ac969c7d1310a675ed52ad724ce62d675e01b2991542157c7008f651a5488a2a0043c98b51956be5cc18491337dce0175c0f160764d083b2f -SHA512 (git-htmldocs-2.12.2.tar.xz) = 225aa58becc5d45a8f39333a68b4078147f3d8e31b1653eea181b83f5650c07b10c917596c6ca62b22e812932145fcde6932fa116a9731fda3c263e66f9a560f -SHA512 (git-manpages-2.12.2.tar.sign) = e2e62d46a2b6ddf8a45209380ab10c1ad15788dd0eae617d574f558ee883f14bc9cd82fe995ede54b74eed9d78610f2afe311fcbdcc06055934dd3f0336a593d -SHA512 (git-manpages-2.12.2.tar.xz) = 98991bc14248f95fe837d1fb9f3e451b48825fa2b1cef94cc016dbf796f5e4293c295a7bf1c35244d835d0d66b7008855c475dd3aa7fcabd5be1e382a4ff0c91 +SHA512 (git-2.13.0.tar.xz) = 709e78ce1a7396c021af5802a89cd4a90802781c4ce4408af50ad8d11a5fc394a108ef24843fb901321e2e0597018111414443ce0d166ca5b1475db503246372 +SHA512 (git-2.13.0.tar.sign) = f9a8fe6d337aba3ac88607f05e4cf282826ea243f0aa765bb6fd0c12cbe81adf1dd3e6c44f755ae92b5393f28b2ed85101b92f55366694f5fef1740c70637ce0 +SHA512 (git-htmldocs-2.13.0.tar.xz) = 053b3584b1bdb6968ce54d97d9c58ec221c604f90c3953c9e850009e9263e71bf970f0f268a35769ea4f0e617811297bc771c20eefab8e600a22d1f4efe7f675 +SHA512 (git-htmldocs-2.13.0.tar.sign) = bb2185ddbf7233cd70f3cc5f4794e5ed0c515d610bf4637fc5f49f61d80777e99d55e43424a71cebc8e292f3b67efcf006d0b95335887f83cf0c30286914c657 +SHA512 (git-manpages-2.13.0.tar.xz) = 175ec2cd9293eedfbdb70445e19966f1dabdbf86beb220b3ed74862a36036101497bf9f322c3635e57bfcb7d2ce9d5efe8bdd6bb3ad73563dfa283c48da6bd1c +SHA512 (git-manpages-2.13.0.tar.sign) = e46d6bf8ddc5f0f1bb35478251bcc42473f114d7deb8ef13c93ee54f40abce19abe9dfb1adaaa7c6027e5b1cfa3ddb1b29e70a467eae5a8d3a3b3d252ff45d61 From e15c234c87b84d0cab29f62a40c8c3efc401aae8 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 17 May 2017 19:14:52 -0400 Subject: [PATCH 408/842] Use default, collision-detecting SHA1 implementation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream changed the default SHA1 implementation in 2.13.0 to one which detects collisions¹. It may be slightly slower than BLK_SHA1 in some cases, but the added safety it provides in the face of the SHAttered² attack should be worth the cost. We overrode the default SHA1 implementation in b796934 (Update to git-1.6.5.rc2 - Enable Linus' block-sha1 implementation.) The main reason was to avoid linking against openssl's libcrypto for most binaries, which saved a measurable amount of space. Using the new DC_SHA1 default provides the same benefit. ¹ https://github.com/git/git/commit/e6b07da278 ² https://shattered.io/ --- git.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index ddba10f..82b81fa 100644 --- a/git.spec +++ b/git.spec @@ -70,7 +70,7 @@ Name: git Version: 2.13.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -420,7 +420,6 @@ cat << \EOF > config.mak V = 1 CFLAGS = %{optflags} LDFLAGS = %{__global_ldflags} -BLK_SHA1 = 1 NEEDS_CRYPTO_WITH_SSL = 1 USE_LIBPCRE = 1 ETC_GITCONFIG = %{_sysconfdir}/gitconfig @@ -784,6 +783,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed May 17 2017 Todd Zullinger - 2.13.0-2 +- Use default, collision-detecting SHA1 implementation + * Tue May 09 2017 Todd Zullinger - 2.13.0-1 - Update to 2.13.0 (resolves CVE-2017-8386) From 1ae87e345a17db7d5d59d4e41598a65561474593 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 5 Jun 2017 00:46:18 +0200 Subject: [PATCH 409/842] Perl 5.26 rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 82b81fa..724bc85 100644 --- a/git.spec +++ b/git.spec @@ -70,7 +70,7 @@ Name: git Version: 2.13.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -783,6 +783,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sun Jun 04 2017 Jitka Plesnikova - 2.13.0-3 +- Perl 5.26 rebuild + * Wed May 17 2017 Todd Zullinger - 2.13.0-2 - Use default, collision-detecting SHA1 implementation From b9d21c3c0e27004f100bb3c0d1693de282f2d24e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 5 Jun 2017 00:18:13 -0400 Subject: [PATCH 410/842] Update to 2.13.1 Upstream maintenance release. Release notes: https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.13.1.txt --- git.spec | 7 +++++-- sources | 12 ++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/git.spec b/git.spec index 724bc85..0954ff9 100644 --- a/git.spec +++ b/git.spec @@ -69,8 +69,8 @@ %endif Name: git -Version: 2.13.0 -Release: 3%{?dist} +Version: 2.13.1 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -783,6 +783,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Jun 05 2017 Todd Zullinger - 2.13.1-1 +- Update to 2.13.1 + * Sun Jun 04 2017 Jitka Plesnikova - 2.13.0-3 - Perl 5.26 rebuild diff --git a/sources b/sources index 19ccc38..91899f3 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -SHA512 (git-2.13.0.tar.xz) = 709e78ce1a7396c021af5802a89cd4a90802781c4ce4408af50ad8d11a5fc394a108ef24843fb901321e2e0597018111414443ce0d166ca5b1475db503246372 -SHA512 (git-2.13.0.tar.sign) = f9a8fe6d337aba3ac88607f05e4cf282826ea243f0aa765bb6fd0c12cbe81adf1dd3e6c44f755ae92b5393f28b2ed85101b92f55366694f5fef1740c70637ce0 -SHA512 (git-htmldocs-2.13.0.tar.xz) = 053b3584b1bdb6968ce54d97d9c58ec221c604f90c3953c9e850009e9263e71bf970f0f268a35769ea4f0e617811297bc771c20eefab8e600a22d1f4efe7f675 -SHA512 (git-htmldocs-2.13.0.tar.sign) = bb2185ddbf7233cd70f3cc5f4794e5ed0c515d610bf4637fc5f49f61d80777e99d55e43424a71cebc8e292f3b67efcf006d0b95335887f83cf0c30286914c657 -SHA512 (git-manpages-2.13.0.tar.xz) = 175ec2cd9293eedfbdb70445e19966f1dabdbf86beb220b3ed74862a36036101497bf9f322c3635e57bfcb7d2ce9d5efe8bdd6bb3ad73563dfa283c48da6bd1c -SHA512 (git-manpages-2.13.0.tar.sign) = e46d6bf8ddc5f0f1bb35478251bcc42473f114d7deb8ef13c93ee54f40abce19abe9dfb1adaaa7c6027e5b1cfa3ddb1b29e70a467eae5a8d3a3b3d252ff45d61 +SHA512 (git-2.13.1.tar.xz) = bc3ed93070ec1768b492009f486a1f82bba838aa94b782c08ad655c89e365a9cd749842e89e7581c5a1246f85da8cb0a5af848b791078203939cf5e5e2ce9acc +SHA512 (git-2.13.1.tar.sign) = 5a7e78ce25fb1662c8136d54781b6a37e4700f2031c2053b8933f5ac8875e3a78d61cf9718987ceb096f8a3709bf65ce37caba40c2490abcf761ce3d0c3b757e +SHA512 (git-htmldocs-2.13.1.tar.xz) = 27f5d270148ba98b98e6e4d853509129b206ee704078bfed0481b7fd0bb51f2640ec3e387b971237502edccf36ae897c35de99acd6864202ae5232444e5e5dd9 +SHA512 (git-htmldocs-2.13.1.tar.sign) = 3b592aefa3e607eed73b65c26dc715b693aa9cbd908ef6aa23ee26b89f5dfb2c3c341042530f5c15804214a197aeeb7e89dd406a62a1c6b54dffd3333f14a795 +SHA512 (git-manpages-2.13.1.tar.xz) = 4dc3cda8aca4dbbdd1c0f38d28866296d08ed1c3fd7b940d355be35734faa4b3927592e69ff82611996621ab38a51d1e218da2919c386bdc59669d083cb33d35 +SHA512 (git-manpages-2.13.1.tar.sign) = f223029afb3a5cb53386a47256fc50ea585683523650f2e160b5095a4d113c6b908fd9807ab57acb32d06b80e96807020951dc3bd24677af56eb3ddca646925b From 086b7a290db3747d9f5f7938c42004d84ea2a80c Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 7 Jun 2017 16:42:33 +0200 Subject: [PATCH 411/842] Perl 5.26 re-rebuild of bootstrapped packages --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 0954ff9..2719ab0 100644 --- a/git.spec +++ b/git.spec @@ -70,7 +70,7 @@ Name: git Version: 2.13.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -783,6 +783,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Jun 07 2017 Jitka Plesnikova - 2.13.1-2 +- Perl 5.26 re-rebuild of bootstrapped packages + * Mon Jun 05 2017 Todd Zullinger - 2.13.1-1 - Update to 2.13.1 From 38b835a543d431514a69c2fa18f3aeae357700bc Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 25 Jun 2017 00:31:18 -0400 Subject: [PATCH 412/842] Update to 2.13.2 --- git.spec | 7 +++++-- sources | 12 ++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/git.spec b/git.spec index 2719ab0..c1984cd 100644 --- a/git.spec +++ b/git.spec @@ -69,8 +69,8 @@ %endif Name: git -Version: 2.13.1 -Release: 2%{?dist} +Version: 2.13.2 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -783,6 +783,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sun Jun 25 2017 Todd Zullinger - 2.13.2-1 +- Update to 2.13.2 + * Wed Jun 07 2017 Jitka Plesnikova - 2.13.1-2 - Perl 5.26 re-rebuild of bootstrapped packages diff --git a/sources b/sources index 91899f3..1c94eb3 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -SHA512 (git-2.13.1.tar.xz) = bc3ed93070ec1768b492009f486a1f82bba838aa94b782c08ad655c89e365a9cd749842e89e7581c5a1246f85da8cb0a5af848b791078203939cf5e5e2ce9acc -SHA512 (git-2.13.1.tar.sign) = 5a7e78ce25fb1662c8136d54781b6a37e4700f2031c2053b8933f5ac8875e3a78d61cf9718987ceb096f8a3709bf65ce37caba40c2490abcf761ce3d0c3b757e -SHA512 (git-htmldocs-2.13.1.tar.xz) = 27f5d270148ba98b98e6e4d853509129b206ee704078bfed0481b7fd0bb51f2640ec3e387b971237502edccf36ae897c35de99acd6864202ae5232444e5e5dd9 -SHA512 (git-htmldocs-2.13.1.tar.sign) = 3b592aefa3e607eed73b65c26dc715b693aa9cbd908ef6aa23ee26b89f5dfb2c3c341042530f5c15804214a197aeeb7e89dd406a62a1c6b54dffd3333f14a795 -SHA512 (git-manpages-2.13.1.tar.xz) = 4dc3cda8aca4dbbdd1c0f38d28866296d08ed1c3fd7b940d355be35734faa4b3927592e69ff82611996621ab38a51d1e218da2919c386bdc59669d083cb33d35 -SHA512 (git-manpages-2.13.1.tar.sign) = f223029afb3a5cb53386a47256fc50ea585683523650f2e160b5095a4d113c6b908fd9807ab57acb32d06b80e96807020951dc3bd24677af56eb3ddca646925b +SHA512 (git-2.13.2.tar.xz) = 07d78ab867179db75738863edf119662b28ea0b15416861cc447d8af1d9d61930873ba5d19205cf3f274aeeedc980acd4c3aceb89633f90c92d84a87216aa1c1 +SHA512 (git-2.13.2.tar.sign) = bb1e6b4449dbb9b9e367a849716310b5821718fff56faeb3a83b2cc35612151cedc70cf517cd907d77fddebf285f3f0aac32610e62fbf1c1bf1fbd0f955ea36d +SHA512 (git-htmldocs-2.13.2.tar.xz) = 95fa6d14b7fa9548a8f9a39dcbd9099684949b6e2519b1478fcebe5e3bba32f87ff8a30d10d27464d7c750231284123efc0f7a52f15c8fcf0e8e3d7948730b3e +SHA512 (git-htmldocs-2.13.2.tar.sign) = fc4cea19eb4ce48c9a97fe92bb52e246089f8c08841aa01365c1fbf8ab6d019154fb585221ee577038736c4a2155db6e2484d31dac7684200d894324659b4716 +SHA512 (git-manpages-2.13.2.tar.xz) = 9b205df22bdd021d3379d95495658e3a679cf2a870c529f757896650bec065ae53bb23404737a11b4f52ff8d3044b71fc27abdeda66895a6fe879db089258416 +SHA512 (git-manpages-2.13.2.tar.sign) = bcc08c3bc53c116f9eb7342853fa07a6c51ff9412ee6457b79edb97e676e6eec5754161844b3c307525611e39112c1217928ed22cc22b0c1a2d5dcd18736c1c8 From 8c3e8ca7b2fbd49852fa6db524c54db978967ea6 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 25 Jun 2017 11:31:00 -0400 Subject: [PATCH 413/842] Skip grep tests which fail intermittently on s390x The grep tests succeed and fail intermittently on s390x. Until that arch is more established and works (or fails) consistently, skip these tests rather than let s390x hold back ever other arch. --- git.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/git.spec b/git.spec index c1984cd..e47db2f 100644 --- a/git.spec +++ b/git.spec @@ -633,6 +633,10 @@ grep -E "$not_core_re" bin-man-doc-files \ | grep -v "credential-gnome-keyring" > bin-man-doc-git-files %check +%ifarch s390x +# Skip grep tests which fail intermittently on s390x +export GIT_SKIP_TESTS="t7810" +%endif make test %clean @@ -785,6 +789,7 @@ rm -rf %{buildroot} %changelog * Sun Jun 25 2017 Todd Zullinger - 2.13.2-1 - Update to 2.13.2 +- Skip grep tests which fail intermittently on s390x * Wed Jun 07 2017 Jitka Plesnikova - 2.13.1-2 - Perl 5.26 re-rebuild of bootstrapped packages From 568aad0c32ecf53a2a11f47e2a3faf265874e667 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 13 Jul 2017 07:49:01 -0500 Subject: [PATCH 414/842] 2.13.3 --- git.spec | 5 ++++- sources | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index e47db2f..8b47cb1 100644 --- a/git.spec +++ b/git.spec @@ -69,7 +69,7 @@ %endif Name: git -Version: 2.13.2 +Version: 2.13.3 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -787,6 +787,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Jul 13 2017 Gwyn Ciesla - 2.13.3-1 +- Update to 2.13.3 + * Sun Jun 25 2017 Todd Zullinger - 2.13.2-1 - Update to 2.13.2 - Skip grep tests which fail intermittently on s390x diff --git a/sources b/sources index 1c94eb3..d8fe020 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -SHA512 (git-2.13.2.tar.xz) = 07d78ab867179db75738863edf119662b28ea0b15416861cc447d8af1d9d61930873ba5d19205cf3f274aeeedc980acd4c3aceb89633f90c92d84a87216aa1c1 -SHA512 (git-2.13.2.tar.sign) = bb1e6b4449dbb9b9e367a849716310b5821718fff56faeb3a83b2cc35612151cedc70cf517cd907d77fddebf285f3f0aac32610e62fbf1c1bf1fbd0f955ea36d -SHA512 (git-htmldocs-2.13.2.tar.xz) = 95fa6d14b7fa9548a8f9a39dcbd9099684949b6e2519b1478fcebe5e3bba32f87ff8a30d10d27464d7c750231284123efc0f7a52f15c8fcf0e8e3d7948730b3e -SHA512 (git-htmldocs-2.13.2.tar.sign) = fc4cea19eb4ce48c9a97fe92bb52e246089f8c08841aa01365c1fbf8ab6d019154fb585221ee577038736c4a2155db6e2484d31dac7684200d894324659b4716 -SHA512 (git-manpages-2.13.2.tar.xz) = 9b205df22bdd021d3379d95495658e3a679cf2a870c529f757896650bec065ae53bb23404737a11b4f52ff8d3044b71fc27abdeda66895a6fe879db089258416 -SHA512 (git-manpages-2.13.2.tar.sign) = bcc08c3bc53c116f9eb7342853fa07a6c51ff9412ee6457b79edb97e676e6eec5754161844b3c307525611e39112c1217928ed22cc22b0c1a2d5dcd18736c1c8 +SHA512 (git-2.13.3.tar.sign) = 82d7379ac88b5c0762cdabf980a302e0acd7fa1d2426a3067c008ce87d79161853e8188ee15f10a1c2900f5d232591fc00c185de0a43012fd142459851ca28e5 +SHA512 (git-2.13.3.tar.xz) = 8a8db4d675c9d8d0e834620c5c7ce7937edd7f4bf1d8a176e1218e5773960e2635c48cb931dfe206b237e2da8371e521acf9c2776847605bea13f8a7304c9f9b +SHA512 (git-htmldocs-2.13.3.tar.sign) = c4cf6cde3f1c3345f9279b4310b277c099b723f2ac22242eadef32ead67810805a965a1657bb7a1ea4dd5f2fdfba7a481ac32adf0d9c1a5d673f5844239a4883 +SHA512 (git-htmldocs-2.13.3.tar.xz) = 6ac9bd2f401bc3330d5a23a4f48afbe224c6d558154281737f6cd83b8ae6b73c32e7fcb491c642f926a9c5f95019964cbe7902c0ec18456b53847fd6c3b7e292 +SHA512 (git-manpages-2.13.3.tar.sign) = 7911827da65381ae3daaca653085e6319320b8b310092b93b889101222976ffcf84e68be45c9e42f9eb393eb7fe73c2e2a871abe333222db5fac3157fe5d7470 +SHA512 (git-manpages-2.13.3.tar.xz) = 9c81335f3d882df1220801ea6fdedea90533c904a1e4dd0394b42721aa31392e6c923568a81c05479fe77a89a974e02fd40b4bcff397c4f739306ba4cb874501 From c0de2acb9241205bd76bbd003aeb24de4c5d3c3d Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Thu, 20 Jul 2017 13:26:07 +0200 Subject: [PATCH 415/842] Keep documentation files under %{_pkgdocdir} (#1357438) Move documentation files from all subpackages into the %{_pkgdocdir} directory, so links inside doc and man files are correct Resolves: #1357438 - excluded *py[co] files from doc/* subdirectories, as these files are not expected to be executed (thanks tmz) --- git.spec | 88 +++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 62 insertions(+), 26 deletions(-) diff --git a/git.spec b/git.spec index 8b47cb1..b0adf30 100644 --- a/git.spec +++ b/git.spec @@ -68,9 +68,12 @@ %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} %endif +# fallback for F17- && RHEL6- +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} + Name: git Version: 2.13.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -619,7 +622,6 @@ cat %{name}.lang >> bin-man-doc-files # quiet some rpmlint complaints chmod -R g-w %{buildroot} find %{buildroot} -name git-mergetool--lib | xargs chmod a-x -# rm -f {Documentation/technical,contrib/emacs,contrib/credential/gnome-keyring}/.gitignore # These files probably are not needed find . -name .gitignore -delete chmod a-x Documentation/technical/api-index.sh @@ -632,6 +634,33 @@ grep -vE "$not_core_re" bin-man-doc-files | grep "%{_mandir}" > man-doc-files-co grep -E "$not_core_re" bin-man-doc-files \ | grep -v "credential-gnome-keyring" > bin-man-doc-git-files +##### DOC +# place doc files into %%{_pkgdocdir} and split them into expected packages +# contrib +not_core_doc_re="(git-(cvs|gui|citool|daemon))|p4|svn|email|gitk|gitweb" +mkdir -p %{buildroot}%{_pkgdocdir}/ +cp -pr README.md Documentation/*.txt Documentation/RelNotes contrib %{buildroot}%{_pkgdocdir}/ +cp -p gitweb/INSTALL %{buildroot}%{_pkgdocdir}/INSTALL.gitweb +cp -p gitweb/README %{buildroot}%{_pkgdocdir}/README.gitweb + +%if ! 0%{?_without_docs} +cp -pr Documentation/*.html Documentation/docbook-xsl.css %{buildroot}%{_pkgdocdir}/ +cp -pr Documentation/{howto,technical} %{buildroot}%{_pkgdocdir}/ +find %{buildroot}%{_pkgdocdir}/{howto,technical} -type f \ + |grep -o "%{_pkgdocdir}.*$" >> man-doc-files-core +%endif + +{ + find %{buildroot}%{_pkgdocdir} -type f -maxdepth 1 \ + | grep -o "%{_pkgdocdir}.*$" \ + | grep -vE "$not_core_doc_re" + find %{buildroot}%{_pkgdocdir}/{contrib,RelNotes} -type f \ + | grep -o "%{_pkgdocdir}.*$" + find %{buildroot}%{_pkgdocdir} -type d | grep -o "%{_pkgdocdir}.*$" \ + | sed "s/^/\%dir /" +} >> man-doc-files-core +##### #DOC + %check %ifarch s390x # Skip grep tests which fail intermittently on s390x @@ -664,6 +693,8 @@ rm -rf %{buildroot} %files core -f bin-files-core %defattr(-,root,root) +#NOTE: this is only use of the %%doc macro in this spec file and should not +# be used elsewhere %{!?_licensedir:%global license %doc} %license COPYING # exlude is best way here because of troubels with symlinks inside git-core/ @@ -674,45 +705,41 @@ rm -rf %{buildroot} %files core-doc -f man-doc-files-core %defattr(-,root,root) -%doc README.md Documentation/*.txt Documentation/RelNotes contrib/ -%{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} -%{!?_without_docs: %doc Documentation/howto Documentation/technical} -%if ! %{use_prebuilt_docs} -%{!?_without_docs: %doc contrib/subtree/git-subtree.html} -%endif - +%exclude %{_pkgdocdir}/contrib/*/*.py[co] +%{_pkgdocdir}/contrib/hooks %files p4 %defattr(-,root,root) %{gitcoredir}/*p4* %{gitcoredir}/mergetools/p4merge -%doc Documentation/*p4*.txt +%{_pkgdocdir}/*p4*.txt %{!?_without_docs: %{_mandir}/man1/*p4*.1*} -%{!?_without_docs: %doc Documentation/*p4*.html } +%{!?_without_docs: %{_pkgdocdir}/*p4*.html } %files svn %defattr(-,root,root) %{gitcoredir}/*svn* -%doc Documentation/*svn*.txt +#NOTE: what about svn-fe +%{_pkgdocdir}/*svn*.txt %{!?_without_docs: %{_mandir}/man1/*svn*.1*} -%{!?_without_docs: %doc Documentation/*svn*.html } +%{!?_without_docs: %{_pkgdocdir}/*svn*.html } %files cvs %defattr(-,root,root) -%doc Documentation/*git-cvs*.txt +%{_pkgdocdir}/*git-cvs*.txt %if "%{gitcoredir}" != "%{_bindir}" %{_bindir}/git-cvsserver %endif %{gitcoredir}/*cvs* %{!?_without_docs: %{_mandir}/man1/*cvs*.1*} -%{!?_without_docs: %doc Documentation/*git-cvs*.html } +%{!?_without_docs: %{_pkgdocdir}/*git-cvs*.html } %files email %defattr(-,root,root) -%doc Documentation/*email*.txt +%{_pkgdocdir}/*email*.txt %{gitcoredir}/*email* %{!?_without_docs: %{_mandir}/man1/*email*.1*} -%{!?_without_docs: %doc Documentation/*email*.html } +%{!?_without_docs: %{_pkgdocdir}/*email*.html } %files gui %defattr(-,root,root) @@ -720,18 +747,20 @@ rm -rf %{buildroot} %{gitcoredir}/git-citool %{_datadir}/applications/*git-gui.desktop %{_datadir}/git-gui/ +%{_pkgdocdir}/git-gui.txt +%{_pkgdocdir}/git-citool.txt %{!?_without_docs: %{_mandir}/man1/git-gui.1*} -%{!?_without_docs: %doc Documentation/git-gui.html} +%{!?_without_docs: %{_pkgdocdir}/git-gui.html} %{!?_without_docs: %{_mandir}/man1/git-citool.1*} -%{!?_without_docs: %doc Documentation/git-citool.html} +%{!?_without_docs: %{_pkgdocdir}/git-citool.html} %files -n gitk %defattr(-,root,root) -%doc Documentation/*gitk*.txt +%{_pkgdocdir}/*gitk*.txt %{_bindir}/*gitk* %{_datadir}/gitk %{!?_without_docs: %{_mandir}/man1/*gitk*.1*} -%{!?_without_docs: %doc Documentation/*gitk*.html } +%{!?_without_docs: %{_pkgdocdir}/*gitk*.html } %files -n perl-Git -f perl-git-files %defattr(-,root,root) @@ -745,7 +774,7 @@ rm -rf %{buildroot} %if 0%{?rhel} && 0%{?rhel} <= 6 %files -n emacs-git %defattr(-,root,root) -%doc contrib/emacs/README +%{_pkgdocdir}/contrib/emacs/README %dir %{elispdir} %{elispdir}/*.elc %{_emacs_sitestartdir}/git-init.el @@ -757,7 +786,7 @@ rm -rf %{buildroot} %files daemon %defattr(-,root,root) -%doc Documentation/*daemon*.txt +%{_pkgdocdir}/git-daemon*.txt %if %{use_systemd} %{_unitdir}/git.socket %{_unitdir}/git@.service @@ -766,12 +795,14 @@ rm -rf %{buildroot} %endif %{gitcoredir}/git-daemon %{_localstatedir}/lib/git -%{!?_without_docs: %{_mandir}/man1/*daemon*.1*} -%{!?_without_docs: %doc Documentation/*daemon*.html} +%{!?_without_docs: %{_mandir}/man1/git-daemon*.1*} +%{!?_without_docs: %{_pkgdocdir}/git-daemon*.html} %files -n gitweb %defattr(-,root,root) -%doc gitweb/INSTALL gitweb/README +%{_pkgdocdir}/*.gitweb +%{_pkgdocdir}/gitweb*.txt +%{!?_without_docs: %{_pkgdocdir}/gitweb*.html} %config(noreplace)%{_sysconfdir}/gitweb.conf %config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf %{_localstatedir}/www/git/ @@ -787,6 +818,11 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Jul 20 2017 Petr Stodulka - 2.13.3-2 +- Move documentation files from all subpackages into the %%{_pkgdocdir} + directory, so links inside doc and man files are correct + Resolves: #1357438 + * Thu Jul 13 2017 Gwyn Ciesla - 2.13.3-1 - Update to 2.13.3 From c13069e1facb880b911cbb75798d9dfec95d61e5 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 20 Jul 2017 19:13:10 -0400 Subject: [PATCH 416/842] Leave git-subtree.html in %_pkgdocdir to avoid broken links The link to git.html in git-subtree.html expects to find git.html in the main docdir. Shipping git-subtree.html in contrib/subtree breaks this link. --- git.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/git.spec b/git.spec index b0adf30..65ae437 100644 --- a/git.spec +++ b/git.spec @@ -532,9 +532,6 @@ make -C contrib/subtree install %if ! %{use_prebuilt_docs} make -C contrib/subtree install-doc %endif -# it's ugly hack, but this file don't need to be copied to this directory -# it's already part of git-core-doc and it's alone here -rm -f %{buildroot}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/git-subtree.html mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d install -pm 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf @@ -549,7 +546,7 @@ find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';' rm -rf contrib/credential # Clean up contrib/subtree to avoid cruft in the git-core-doc docdir -rm -rf contrib/subtree/{INSTALL,Makefile,git-subtree{,.{1,sh,txt,xml}},t} +rm -rf contrib/subtree/{INSTALL,Makefile,git-subtree{,.{1,html,sh,txt,xml}},t} # git-archimport is not supported find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' From 57c799c234c579fc808d072bb61484e26ffeb724 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 20 Jul 2017 19:13:33 -0400 Subject: [PATCH 417/842] Remove git-archimport from git command list We have not supported git-archimport in many years and have removed the files from the documentation. Removing it from the command list ensures that git will not generate a link to the command in the documentation. This avoids leaving a broken link in the html docs. --- git.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git.spec b/git.spec index 65ae437..79e8db4 100644 --- a/git.spec +++ b/git.spec @@ -408,6 +408,9 @@ rm -rf "$gpghome" # Cleanup tmp gpg home dir %patch3 -p1 %endif +# Remove git-archimport from command list +sed -i '/^git-archimport/d' command-list.txt + %if %{use_prebuilt_docs} mkdir -p prebuilt_docs/{html,man} xz -dc %{SOURCE1} | tar xf - -C prebuilt_docs/html From 00daf46570c2f6b092dac09326b2fb1ad56ddcaa Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 20 Jul 2017 21:19:23 -0400 Subject: [PATCH 418/842] Quiet a few more rpmlint complaints A few more hidden files have crept into the files installed under contrib. Remove any .gitattributes, .gitignore, or .perlcriticrc files found. --- git.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 79e8db4..5f34e70 100644 --- a/git.spec +++ b/git.spec @@ -623,7 +623,7 @@ cat %{name}.lang >> bin-man-doc-files chmod -R g-w %{buildroot} find %{buildroot} -name git-mergetool--lib | xargs chmod a-x # These files probably are not needed -find . -name .gitignore -delete +find . -regex '.*/\.\(git\(attributes\|ignore\)\|perlcriticrc\)' -delete chmod a-x Documentation/technical/api-index.sh find contrib -type f | xargs chmod -x @@ -822,6 +822,7 @@ rm -rf %{buildroot} - Move documentation files from all subpackages into the %%{_pkgdocdir} directory, so links inside doc and man files are correct Resolves: #1357438 +- Quiet a few rpmlint complaints regarding hidden files in contrib dir * Thu Jul 13 2017 Gwyn Ciesla - 2.13.3-1 - Update to 2.13.3 From 00a8980c58f90c0a44c94afd56ec1735df98a10e Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Fri, 21 Jul 2017 16:31:01 +0200 Subject: [PATCH 419/842] add test by linkchecker for broken links in doc files Links in docfiles are now automatically checked for correct paths by linkchecker. The test is available only for Fedora 25+ system, because the utility is not available for RHEL. --- git.spec | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/git.spec b/git.spec index 5f34e70..57721bd 100644 --- a/git.spec +++ b/git.spec @@ -71,6 +71,12 @@ # fallback for F17- && RHEL6- %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} +%if 0%{?fedora} && 0%{?fedora} >= 25 +%global test_links 1 +%else +%global test_links 0 +%endif + Name: git Version: 2.13.3 Release: 2%{?dist} @@ -115,6 +121,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if ! %{use_prebuilt_docs} && ! 0%{?_without_docs} BuildRequires: asciidoc >= 8.4.1 BuildRequires: xmlto +%if %{test_links} +BuildRequires: linkchecker +%endif %endif BuildRequires: desktop-file-utils BuildRequires: emacs @@ -662,6 +671,9 @@ find %{buildroot}%{_pkgdocdir}/{howto,technical} -type f \ ##### #DOC %check +%if %{test_links} +find %{buildroot}%{_pkgdocdir} -name "*.html" | xargs linkchecker +%endif %ifarch s390x # Skip grep tests which fail intermittently on s390x export GIT_SKIP_TESTS="t7810" From 7cc97f7b448eb8a3f0d96b3f35de90fcea67616c Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Fri, 21 Jul 2017 16:58:35 +0200 Subject: [PATCH 420/842] Remove explicit libcurl requirement from git-core --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 57721bd..f033ede 100644 --- a/git.spec +++ b/git.spec @@ -216,7 +216,6 @@ Group: Development/Tools Requires: less Requires: openssh-clients Requires: zlib >= 1.2 -Requires: libcurl %description core Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations @@ -835,6 +834,7 @@ rm -rf %{buildroot} directory, so links inside doc and man files are correct Resolves: #1357438 - Quiet a few rpmlint complaints regarding hidden files in contrib dir +- Remove explicit libcurl requirement from git-core * Thu Jul 13 2017 Gwyn Ciesla - 2.13.3-1 - Update to 2.13.3 From 570387156b132a5403b4e6390cf246bf5498afa6 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Sun, 30 Jul 2017 15:06:30 +0200 Subject: [PATCH 421/842] Rebuild with binutils fix for ppc64le (#1475636) --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index f033ede..ec261e7 100644 --- a/git.spec +++ b/git.spec @@ -79,7 +79,7 @@ Name: git Version: 2.13.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -829,6 +829,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sun Jul 30 2017 Florian Weimer - 2.13.3-3 +- Rebuild with binutils fix for ppc64le (#1475636) + * Thu Jul 20 2017 Petr Stodulka - 2.13.3-2 - Move documentation files from all subpackages into the %%{_pkgdocdir} directory, so links inside doc and man files are correct From 903d8f35ed8ae16bece8ae8033f3d3926cc97595 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 22 Jul 2017 14:11:38 -0400 Subject: [PATCH 422/842] Remove EL-5 and old Fedora conditionals EL-5 has been EOL for several months now. We can drop all the conditionals needed to build there, as well as some conditionals for long-expired Fedora releases. Without EL-5 we also no longer use the prebuilt documentation. Remove these sources and simplify the gpg check for the remaining source. --- git.spec | 142 ++++++++----------------------------------------------- sources | 4 -- 2 files changed, 21 insertions(+), 125 deletions(-) diff --git a/git.spec b/git.spec index ec261e7..c9c52d4 100644 --- a/git.spec +++ b/git.spec @@ -1,36 +1,9 @@ # Pass --without docs to rpmbuild if you don't want the documentation -# Settings for EL-5 -# - Leave git-* binaries in %%{_bindir} -# - Don't use noarch subpackages -# - Use proper libcurl devel package -# - Patch emacs and tweak docbook spaces -# - Explicitly enable ipv6 for git-daemon -# - Use prebuilt documentation, asciidoc is too old -# - Define missing python macro -%if 0%{?rhel} && 0%{?rhel} <= 5 -%global gitcoredir %{_bindir} -%global noarch_sub 0 -%global libcurl_devel curl-devel -%global emacs_old 1 -%global docbook_suppress_sp 1 -%global enable_ipv6 1 -%global use_prebuilt_docs 1 -%global filter_yaml_any 1 -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%else %global gitcoredir %{_libexecdir}/git-core -%global noarch_sub 1 -%global libcurl_devel libcurl-devel -%global emacs_old 0 -%global docbook_suppress_sp 0 -%global enable_ipv6 0 -%global use_prebuilt_docs 0 -%global filter_yaml_any 0 -%endif # Settings for F-19+ and EL-7+ -%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 %global bashcomp_pkgconfig 1 %global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) %global bashcomproot %(dirname %{bashcompdir} 2>/dev/null) @@ -50,19 +23,12 @@ # to use it on older fedora instead of libsecret. So that's # why this ugly solution # TODO: we should maybe update conditions according to supported systems -%if 0%{?fedora} >= 19 && 0%{?fedora} < 26 || 0%{?rhel} == 7 +%if ( 0%{?fedora} && 0%{?fedora} < 26 ) || 0%{?rhel} == 7 %global gnome_keyring 1 %else %global gnome_keyring 0 %endif -# This one macro is for F19+ and EL-6+ -%if 0%{?fedora} >= 19 || 0%{?rhel} >= 6 -%global desktop_vendor_tag 0 -%else -%global desktop_vendor_tag 1 -%endif - # Settings for EL <= 7 %if 0%{?rhel} && 0%{?rhel} <= 7 %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} @@ -85,11 +51,7 @@ License: GPLv2 Group: Development/Tools URL: https://git-scm.com/ Source0: https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.xz -Source1: https://www.kernel.org/pub/software/scm/git/%{name}-htmldocs-%{version}.tar.xz -Source2: https://www.kernel.org/pub/software/scm/git/%{name}-manpages-%{version}.tar.xz -Source3: https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.sign -Source4: https://www.kernel.org/pub/software/scm/git/%{name}-htmldocs-%{version}.tar.sign -Source5: https://www.kernel.org/pub/software/scm/git/%{name}-manpages-%{version}.tar.sign +Source1: https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.sign # Junio C Hamano's key is used to sign git releases, it can be found in the # junio-gpg-pub tag within git. @@ -113,12 +75,10 @@ Source16: git.socket Patch0: git-1.8-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# https://bugzilla.redhat.com/600411 -Patch3: git-1.7-el5-emacs-support.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if ! %{use_prebuilt_docs} && ! 0%{?_without_docs} +%if ! 0%{?_without_docs} BuildRequires: asciidoc >= 8.4.1 BuildRequires: xmlto %if %{test_links} @@ -130,12 +90,12 @@ BuildRequires: emacs BuildRequires: expat-devel BuildRequires: gettext BuildRequires: gnupg2 -BuildRequires: %{libcurl_devel} +BuildRequires: libcurl-devel %if %{libsecret} BuildRequires: libsecret-devel %endif BuildRequires: pcre-devel -%if 0%{?fedora} && 0%{?fedora} >= 21 +%if 0%{?fedora} BuildRequires: perl-generators %endif BuildRequires: perl(Test) @@ -157,7 +117,7 @@ Requires: perl(Term::ReadKey) %endif Requires: perl-Git = %{version}-%{release} -%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 Requires: emacs-filesystem >= %{_emacs_version} # These can be removed in Fedora 26 Obsoletes: emacs-git <= 2.4.5 @@ -181,9 +141,7 @@ tools for integrating with other SCMs, install the git-all meta-package. %package all Summary: Meta-package to pull in all git tools Group: Development/Tools -%if %{noarch_sub} BuildArch: noarch -%endif Requires: git = %{version}-%{release} %if %{gnome_keyring} Requires: git-gnome-keyring = %{version}-%{release} @@ -252,9 +210,7 @@ The git daemon for supporting git:// access to git repositories %package -n gitweb Summary: Simple web interface to git repositories Group: Development/Tools -%if %{noarch_sub} BuildArch: noarch -%endif Requires: git = %{version}-%{release} %description -n gitweb @@ -263,9 +219,7 @@ Simple web interface to track changes in git repositories %package p4 Summary: Git tools for working with Perforce depots Group: Development/Tools -%if %{noarch_sub} BuildArch: noarch -%endif BuildRequires: python Requires: git = %{version}-%{release} %description p4 @@ -285,9 +239,7 @@ Git tools for importing Subversion repositories. %package cvs Summary: Git tools for importing CVS repositories Group: Development/Tools -%if %{noarch_sub} BuildArch: noarch -%endif Requires: git = %{version}-%{release}, cvs Requires: cvsps Requires: perl(DBD::SQLite) @@ -298,9 +250,7 @@ Git tools for importing CVS repositories. %package email Summary: Git tools for sending email Group: Development/Tools -%if %{noarch_sub} BuildArch: noarch -%endif Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} Requires: perl(Authen::SASL) Requires: perl(Net::SMTP::SSL) @@ -311,9 +261,7 @@ Git tools for sending email. %package gui Summary: Git GUI tool Group: Development/Tools -%if %{noarch_sub} BuildArch: noarch -%endif Requires: git = %{version}-%{release}, tk >= 8.4 Requires: gitk = %{version}-%{release} %description gui @@ -322,9 +270,7 @@ Git GUI tool. %package -n gitk Summary: Git revision tree visualiser Group: Development/Tools -%if %{noarch_sub} BuildArch: noarch -%endif Requires: git = %{version}-%{release}, tk >= 8.4 %description -n gitk Git revision tree visualiser. @@ -332,9 +278,7 @@ Git revision tree visualiser. %package -n perl-Git Summary: Perl interface to Git Group: Development/Libraries -%if %{noarch_sub} BuildArch: noarch -%endif Requires: git = %{version}-%{release} BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) Requires: perl(Error) @@ -346,9 +290,7 @@ Perl interface to Git. %package -n perl-Git-SVN Summary: Perl interface to Git::SVN Group: Development/Libraries -%if %{noarch_sub} BuildArch: noarch -%endif Requires: git = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -360,12 +302,8 @@ Perl interface to Git. Summary: Git version control system support for Emacs Group: Applications/Editors Requires: git = %{version}-%{release} -%if %{noarch_sub} BuildArch: noarch Requires: emacs(bin) >= %{_emacs_version} -%else -Requires: emacs-common -%endif %description -n emacs-git %{summary}. @@ -373,9 +311,7 @@ Requires: emacs-common %package -n emacs-git-el Summary: Elisp source files for git version control system support for Emacs Group: Applications/Editors -%if %{noarch_sub} BuildArch: noarch -%endif Requires: emacs-git = %{version}-%{release} %description -n emacs-git-el @@ -397,37 +333,23 @@ Requires: gnome-keyring # Verify GPG signatures gpghome="$(mktemp -qd)" # Ensure we don't use any existing gpg keyrings key="%{SOURCE9}" +src="%{SOURCE0}" # Ignore noisy output from GnuPG 2.0, used on EL <= 7 # https://bugs.gnupg.org/gnupg/issue1555 gpg2 --dearmor --quiet --batch --yes $key >/dev/null -for src in %{SOURCE0} %{SOURCE1} %{SOURCE2}; do - # Upstream signs the uncompressed tarballs - tar=${src/%.xz/} - xz -dc $src > $tar - gpgv2 --homedir "$gpghome" --quiet --keyring $key.gpg $tar.sign $tar - rm -f $tar -done -rm -rf "$gpghome" # Cleanup tmp gpg home dir +# Upstream signs the uncompressed tarballs +tar=${src/%.xz/} +xz -dc $src > $tar +gpgv2 --homedir "$gpghome" --quiet --keyring $key.gpg $tar.sign $tar +rm -rf "$tar" "$gpghome" # Cleanup tar files and tmp gpg home dir %setup -q %patch0 -p1 %patch1 -p1 -%if %{emacs_old} -%patch3 -p1 -%endif # Remove git-archimport from command list sed -i '/^git-archimport/d' command-list.txt -%if %{use_prebuilt_docs} -mkdir -p prebuilt_docs/{html,man} -xz -dc %{SOURCE1} | tar xf - -C prebuilt_docs/html -xz -dc %{SOURCE2} | tar xf - -C prebuilt_docs/man -# Remove non-html files -find prebuilt_docs/html -type f ! -name '*.html' | xargs rm -find prebuilt_docs/html -type d | xargs rmdir --ignore-fail-on-non-empty -%endif - # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. cat << \EOF > config.mak @@ -450,11 +372,6 @@ EOF echo gitexecdir = %{_bindir} >> config.mak %endif -%if %{docbook_suppress_sp} -# This is needed for 1.69.1-1.71.0 -echo DOCBOOK_SUPPRESS_SP = 1 >> config.mak -%endif - # Filter bogus perl requires # packed-refs comes from a comment in contrib/hooks/update-paranoid # YAML::Any is optional and not available on el5 @@ -468,11 +385,7 @@ echo DOCBOOK_SUPPRESS_SP = 1 >> config.mak cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} $* |\ -sed \ -%if %{filter_yaml_any} - -e '/perl(YAML::Any)/d' \ -%endif - -e '/perl(packed-refs)/d' +sed -e '/perl(packed-refs)/d' EOF %global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req @@ -481,7 +394,7 @@ chmod +x %{__perl_requires} %build make %{?_smp_mflags} all -%if ! %{use_prebuilt_docs} && ! 0%{?_without_docs} +%if ! 0%{?_without_docs} make %{?_smp_mflags} doc %endif @@ -503,17 +416,13 @@ sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash %install rm -rf %{buildroot} make %{?_smp_mflags} INSTALLDIRS=vendor install -%if ! %{use_prebuilt_docs} && ! 0%{?_without_docs} +%if ! 0%{?_without_docs} make %{?_smp_mflags} INSTALLDIRS=vendor install-doc %else cp -a prebuilt_docs/man/* %{buildroot}%{_mandir} cp -a prebuilt_docs/html/* Documentation/ %endif -%if %{emacs_old} -%global _emacs_sitelispdir %{_datadir}/emacs/site-lisp -%global _emacs_sitestartdir %{_emacs_sitelispdir}/site-start.d -%endif %global elispdir %{_emacs_sitelispdir}/git make -C contrib/emacs install \ emacsdir=%{buildroot}%{elispdir} @@ -540,9 +449,7 @@ install -pm 755 contrib/credential/netrc/git-credential-netrc \ %{buildroot}%{gitcoredir} make -C contrib/subtree install -%if ! %{use_prebuilt_docs} make -C contrib/subtree install-doc -%endif mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d install -pm 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf @@ -582,15 +489,9 @@ mkdir -p %{buildroot}%{_unitdir} cp -a %{SOURCE15} %{SOURCE16} %{buildroot}%{_unitdir} %else mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d -# On EL <= 5, xinetd does not enable IPv6 by default -enable_ipv6=" # xinetd does not enable IPv6 by default - flags = IPv6" perl -p \ -e "s|\@GITCOREDIR\@|%{gitcoredir}|g;" \ -e "s|\@BASE_PATH\@|%{_localstatedir}/lib/git|g;" \ -%if %{enable_ipv6} - -e "s|^}|$enable_ipv6\n$&|;" \ -%endif %{SOURCE11} > %{buildroot}%{_sysconfdir}/xinetd.d/git %endif @@ -617,11 +518,7 @@ install -pm 644 contrib/completion/git-prompt.sh \ %{buildroot}%{_datadir}/git-core/contrib/completion/ # install git-gui .desktop file -desktop-file-install \ -%if %{desktop_vendor_tag} - --vendor fedora \ -%endif - --dir=%{buildroot}%{_datadir}/applications %{SOURCE13} +desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE13} # find translations %find_lang %{name} %{name}.lang @@ -695,7 +592,7 @@ rm -rf %{buildroot} %files -f bin-man-doc-git-files %defattr(-,root,root) -%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 %{elispdir} %{_emacs_sitestartdir}/git-init.el %endif @@ -829,6 +726,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Aug 01 2017 Todd Zullinger +- Remove EL-5 and old Fedora conditionals + * Sun Jul 30 2017 Florian Weimer - 2.13.3-3 - Rebuild with binutils fix for ppc64le (#1475636) diff --git a/sources b/sources index d8fe020..c16e13c 100644 --- a/sources +++ b/sources @@ -1,6 +1,2 @@ SHA512 (git-2.13.3.tar.sign) = 82d7379ac88b5c0762cdabf980a302e0acd7fa1d2426a3067c008ce87d79161853e8188ee15f10a1c2900f5d232591fc00c185de0a43012fd142459851ca28e5 SHA512 (git-2.13.3.tar.xz) = 8a8db4d675c9d8d0e834620c5c7ce7937edd7f4bf1d8a176e1218e5773960e2635c48cb931dfe206b237e2da8371e521acf9c2776847605bea13f8a7304c9f9b -SHA512 (git-htmldocs-2.13.3.tar.sign) = c4cf6cde3f1c3345f9279b4310b277c099b723f2ac22242eadef32ead67810805a965a1657bb7a1ea4dd5f2fdfba7a481ac32adf0d9c1a5d673f5844239a4883 -SHA512 (git-htmldocs-2.13.3.tar.xz) = 6ac9bd2f401bc3330d5a23a4f48afbe224c6d558154281737f6cd83b8ae6b73c32e7fcb491c642f926a9c5f95019964cbe7902c0ec18456b53847fd6c3b7e292 -SHA512 (git-manpages-2.13.3.tar.sign) = 7911827da65381ae3daaca653085e6319320b8b310092b93b889101222976ffcf84e68be45c9e42f9eb393eb7fe73c2e2a871abe333222db5fac3157fe5d7470 -SHA512 (git-manpages-2.13.3.tar.xz) = 9c81335f3d882df1220801ea6fdedea90533c904a1e4dd0394b42721aa31392e6c923568a81c05479fe77a89a974e02fd40b4bcff397c4f739306ba4cb874501 From a25cd0d0220e9aae9cd8c946a9da517ed5c5e9f4 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 1 Aug 2017 16:22:47 -0400 Subject: [PATCH 423/842] Update to 2.13.4 Upstream bugfix release. Release notes: https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.13.4.txt --- git.spec | 7 ++++--- sources | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index c9c52d4..ba54484 100644 --- a/git.spec +++ b/git.spec @@ -44,8 +44,8 @@ %endif Name: git -Version: 2.13.3 -Release: 3%{?dist} +Version: 2.13.4 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -726,7 +726,8 @@ rm -rf %{buildroot} # No files for you! %changelog -* Tue Aug 01 2017 Todd Zullinger +* Tue Aug 01 2017 Todd Zullinger - 2.13.4-1 +- Update to 2.13.4 - Remove EL-5 and old Fedora conditionals * Sun Jul 30 2017 Florian Weimer - 2.13.3-3 diff --git a/sources b/sources index c16e13c..fbf1068 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.13.3.tar.sign) = 82d7379ac88b5c0762cdabf980a302e0acd7fa1d2426a3067c008ce87d79161853e8188ee15f10a1c2900f5d232591fc00c185de0a43012fd142459851ca28e5 -SHA512 (git-2.13.3.tar.xz) = 8a8db4d675c9d8d0e834620c5c7ce7937edd7f4bf1d8a176e1218e5773960e2635c48cb931dfe206b237e2da8371e521acf9c2776847605bea13f8a7304c9f9b +SHA512 (git-2.13.4.tar.sign) = 0849c3a861d632d7413a788913af7e4537c6329535c734b75072e6c3587800addb6ab7be6ea550f46e4c17b717a1bbcc44493292bd1b53b54ab7195d2bc9e2d2 +SHA512 (git-2.13.4.tar.xz) = dbe6c08a6cb4931f0d1c16dabc23595c8e328a397552817ceb29cb1bf38f546e3a6ec9943db06e3adb39b15772f9e79e94c08fb4cd1f1807663602cb132983f5 From 98fb8ee0a814ff1a2853d06c67c857654f68588a Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 22 Jul 2017 13:32:34 -0400 Subject: [PATCH 424/842] Update to 2.14.0 --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index ba54484..604ab3d 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ %endif Name: git -Version: 2.13.4 +Version: 2.14.0 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -726,6 +726,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Aug 04 2017 Todd Zullinger - 2.14.0-1 +- Update to 2.14.0 + * Tue Aug 01 2017 Todd Zullinger - 2.13.4-1 - Update to 2.13.4 - Remove EL-5 and old Fedora conditionals diff --git a/sources b/sources index fbf1068..ee9e485 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.13.4.tar.sign) = 0849c3a861d632d7413a788913af7e4537c6329535c734b75072e6c3587800addb6ab7be6ea550f46e4c17b717a1bbcc44493292bd1b53b54ab7195d2bc9e2d2 -SHA512 (git-2.13.4.tar.xz) = dbe6c08a6cb4931f0d1c16dabc23595c8e328a397552817ceb29cb1bf38f546e3a6ec9943db06e3adb39b15772f9e79e94c08fb4cd1f1807663602cb132983f5 +SHA512 (git-2.14.0.tar.xz) = 4410ec9c40fed8efeba26ae57412975cfc4c78a43d89b0f1a2412e578a14b12e24ac7537f6b5efe83087006f27a49911facb4a9007fbc59e1548d15fd5f22dd9 +SHA512 (git-2.14.0.tar.sign) = d2344e75e716ac44835921fb70406d3278e91d2b0875200a3dcceef975a54509fead2fb652bda977d585ffe909f71fd0ad8c959f54c3c5eced9fdf1be976c1b2 From 595b682e789c35c037d196d4fe315f3ebdf046b2 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 22 Jul 2017 13:33:25 -0400 Subject: [PATCH 425/842] Use pcre2 library The pcre1 library is only maintained for serious bugs and vulnerabilities at this point. Further improvements are happening in pcre2. In a future release git will make this the default library for pcre support. --- git.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 604ab3d..bfc0af0 100644 --- a/git.spec +++ b/git.spec @@ -94,7 +94,7 @@ BuildRequires: libcurl-devel %if %{libsecret} BuildRequires: libsecret-devel %endif -BuildRequires: pcre-devel +BuildRequires: pcre2-devel %if 0%{?fedora} BuildRequires: perl-generators %endif @@ -357,7 +357,7 @@ V = 1 CFLAGS = %{optflags} LDFLAGS = %{__global_ldflags} NEEDS_CRYPTO_WITH_SSL = 1 -USE_LIBPCRE = 1 +USE_LIBPCRE2 = 1 ETC_GITCONFIG = %{_sysconfdir}/gitconfig DESTDIR = %{buildroot} INSTALL = install -p @@ -728,6 +728,7 @@ rm -rf %{buildroot} %changelog * Fri Aug 04 2017 Todd Zullinger - 2.14.0-1 - Update to 2.14.0 +- Use pcre2 library * Tue Aug 01 2017 Todd Zullinger - 2.13.4-1 - Update to 2.13.4 From 3d91c7b1f25dafb4fc72005df6433b2964d5a514 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 3 Aug 2017 18:10:21 -0400 Subject: [PATCH 426/842] git-p4: explicitly require python2 The git-p4 script requires python2. Ensure we require it rather than and unversioned /usr/bin/python. --- git.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index bfc0af0..cde985f 100644 --- a/git.spec +++ b/git.spec @@ -220,7 +220,7 @@ Simple web interface to track changes in git repositories Summary: Git tools for working with Perforce depots Group: Development/Tools BuildArch: noarch -BuildRequires: python +BuildRequires: python2 Requires: git = %{version}-%{release} %description p4 %{summary}. @@ -363,6 +363,7 @@ DESTDIR = %{buildroot} INSTALL = install -p GITWEB_PROJECTROOT = %{_localstatedir}/lib/git GNU_ROFF = 1 +PYTHON_PATH = %{__python2} htmldir = %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} prefix = %{_prefix} gitwebdir = %{_localstatedir}/www/git @@ -729,6 +730,7 @@ rm -rf %{buildroot} * Fri Aug 04 2017 Todd Zullinger - 2.14.0-1 - Update to 2.14.0 - Use pcre2 library +- git-p4: explicitly require python2 * Tue Aug 01 2017 Todd Zullinger - 2.13.4-1 - Update to 2.13.4 From ef7ac1a89e4939fe6682df2f3db67086ded5ad35 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 3 Aug 2017 18:10:21 -0400 Subject: [PATCH 427/842] git-p4: adjust python2 shebang manually Setting 'PYTHON_PATH = %{__python2}' in config.mak should work, but doing so causes the remote svn tests in t9020 (which use a python script to similate svnrdump) to fail. Just fix the git-p4 shebang until the svn test failures can be resolved. --- git.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index cde985f..08a506f 100644 --- a/git.spec +++ b/git.spec @@ -363,7 +363,6 @@ DESTDIR = %{buildroot} INSTALL = install -p GITWEB_PROJECTROOT = %{_localstatedir}/lib/git GNU_ROFF = 1 -PYTHON_PATH = %{__python2} htmldir = %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} prefix = %{_prefix} gitwebdir = %{_localstatedir}/www/git @@ -449,6 +448,11 @@ make -C contrib/credential/libsecret/ clean install -pm 755 contrib/credential/netrc/git-credential-netrc \ %{buildroot}%{gitcoredir} +# Replace shebang in git-p4. Setting PYTHON_PATH = %{__python2} in config.mak +# should be the way to do this, but that causes the python-based remote svn +# tests in t9020 to fail. +sed -i -e '1s|#!.*python|#!%{__python2}|' %{buildroot}%{gitcoredir}/git-p4 + make -C contrib/subtree install make -C contrib/subtree install-doc From 2c6eff99d7b50b87e8a1fe2e4a0489dfd90659b8 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 5 Aug 2017 13:28:47 -0400 Subject: [PATCH 428/842] Remove prebuilt docs cruft from EL-5 days Support for EL-5 was dropped in 903d8f3 (Remove EL-5 and old Fedora conditionals, 2017-07-22). This code became useless cruft at that point. --- git.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/git.spec b/git.spec index 08a506f..24915c3 100644 --- a/git.spec +++ b/git.spec @@ -418,9 +418,6 @@ rm -rf %{buildroot} make %{?_smp_mflags} INSTALLDIRS=vendor install %if ! 0%{?_without_docs} make %{?_smp_mflags} INSTALLDIRS=vendor install-doc -%else -cp -a prebuilt_docs/man/* %{buildroot}%{_mandir} -cp -a prebuilt_docs/html/* Documentation/ %endif %global elispdir %{_emacs_sitelispdir}/git From 65f6b37a14dd51a5e749610da8dab81b6fdf6176 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 5 Aug 2017 14:32:54 -0400 Subject: [PATCH 429/842] Skip more grep tests on s390x These tests fail intermittently on s390x, but work reliably on all other architectures. --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 24915c3..f02fb9c 100644 --- a/git.spec +++ b/git.spec @@ -574,7 +574,7 @@ find %{buildroot}%{_pkgdocdir} -name "*.html" | xargs linkchecker %endif %ifarch s390x # Skip grep tests which fail intermittently on s390x -export GIT_SKIP_TESTS="t7810" +export GIT_SKIP_TESTS="t7008 t7810" %endif make test From 7bf42a704afa2463dd80c4923b343b884e722750 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 6 Aug 2017 13:28:51 -0400 Subject: [PATCH 430/842] Remove unused patch files git-1.7-el5-emacs-support.patch was dropped in 903d8f3 (Remove EL-5 and old Fedora conditionals, 2017-07-22). git-infinite-loop.patch was dropped in f5bc9a8 (Check upstream GPG signatures in %prep, 2016-03-27). --- git-1.7-el5-emacs-support.patch | 252 -------------------------------- git-infinite-loop.patch | 39 ----- 2 files changed, 291 deletions(-) delete mode 100644 git-1.7-el5-emacs-support.patch delete mode 100644 git-infinite-loop.patch diff --git a/git-1.7-el5-emacs-support.patch b/git-1.7-el5-emacs-support.patch deleted file mode 100644 index 25b3c31..0000000 --- a/git-1.7-el5-emacs-support.patch +++ /dev/null @@ -1,252 +0,0 @@ -From 424058e0607b4b3c558d19633090e06e7bd2b851 Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Wed, 2 Feb 2011 21:24:44 -0500 -Subject: [PATCH] Restore vc-git.el for basic compatibility on EL-5 - -This is the vc-git.el from 1.6.4.1, the last version to include it. -Most uses will be better served by the vc-git.el which is provided by -emacs >= 22.2, but on EL-5 we don't have the luxury of a modern emacs. ---- - contrib/emacs/Makefile | 2 +- - contrib/emacs/vc-git.el | 216 +++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 217 insertions(+), 1 deletions(-) - create mode 100644 contrib/emacs/vc-git.el - -diff --git a/contrib/emacs/Makefile b/contrib/emacs/Makefile -index 24d9312..a48540a 100644 ---- a/contrib/emacs/Makefile -+++ b/contrib/emacs/Makefile -@@ -2,7 +2,7 @@ - - EMACS = emacs - --ELC = git.elc git-blame.elc -+ELC = git.elc vc-git.elc git-blame.elc - INSTALL ?= install - INSTALL_ELC = $(INSTALL) -m 644 - prefix ?= $(HOME) -diff --git a/contrib/emacs/vc-git.el b/contrib/emacs/vc-git.el -new file mode 100644 -index 0000000..b8f6be5 ---- /dev/null -+++ b/contrib/emacs/vc-git.el -@@ -0,0 +1,216 @@ -+;;; vc-git.el --- VC backend for the git version control system -+ -+;; Copyright (C) 2006 Alexandre Julliard -+ -+;; This program is free software; you can redistribute it and/or -+;; modify it under the terms of the GNU General Public License as -+;; published by the Free Software Foundation; either version 2 of -+;; the License, or (at your option) any later version. -+;; -+;; This program is distributed in the hope that it will be -+;; useful, but WITHOUT ANY WARRANTY; without even the implied -+;; warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -+;; PURPOSE. See the GNU General Public License for more details. -+;; -+;; You should have received a copy of the GNU General Public -+;; License along with this program; if not, write to the Free -+;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+;; MA 02111-1307 USA -+ -+;;; Commentary: -+ -+;; This file contains a VC backend for the git version control -+;; system. -+;; -+;; To install: put this file on the load-path and add GIT to the list -+;; of supported backends in `vc-handled-backends'; the following line, -+;; placed in your ~/.emacs, will accomplish this: -+;; -+;; (add-to-list 'vc-handled-backends 'GIT) -+;; -+;; TODO -+;; - changelog generation -+;; - working with revisions other than HEAD -+;; -+ -+(eval-when-compile (require 'cl)) -+ -+(defvar git-commits-coding-system 'utf-8 -+ "Default coding system for git commits.") -+ -+(defun vc-git--run-command-string (file &rest args) -+ "Run a git command on FILE and return its output as string." -+ (let* ((ok t) -+ (str (with-output-to-string -+ (with-current-buffer standard-output -+ (unless (eq 0 (apply #'call-process "git" nil '(t nil) nil -+ (append args (list (file-relative-name file))))) -+ (setq ok nil)))))) -+ (and ok str))) -+ -+(defun vc-git--run-command (file &rest args) -+ "Run a git command on FILE, discarding any output." -+ (let ((name (file-relative-name file))) -+ (eq 0 (apply #'call-process "git" nil (get-buffer "*Messages") nil (append args (list name)))))) -+ -+(defun vc-git-registered (file) -+ "Check whether FILE is registered with git." -+ (with-temp-buffer -+ (let* ((dir (file-name-directory file)) -+ (name (file-relative-name file dir))) -+ (and (ignore-errors -+ (when dir (cd dir)) -+ (eq 0 (call-process "git" nil '(t nil) nil "ls-files" "-c" "-z" "--" name))) -+ (let ((str (buffer-string))) -+ (and (> (length str) (length name)) -+ (string= (substring str 0 (1+ (length name))) (concat name "\0")))))))) -+ -+(defun vc-git-state (file) -+ "git-specific version of `vc-state'." -+ (let ((diff (vc-git--run-command-string file "diff-index" "-z" "HEAD" "--"))) -+ (if (and diff (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} [ADMU]\0[^\0]+\0" diff)) -+ 'edited -+ 'up-to-date))) -+ -+(defun vc-git-workfile-version (file) -+ "git-specific version of `vc-workfile-version'." -+ (let ((str (with-output-to-string -+ (with-current-buffer standard-output -+ (call-process "git" nil '(t nil) nil "symbolic-ref" "HEAD"))))) -+ (if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str) -+ (match-string 2 str) -+ str))) -+ -+(defun vc-git-symbolic-commit (commit) -+ "Translate COMMIT string into symbolic form. -+Returns nil if not possible." -+ (and commit -+ (with-temp-buffer -+ (and -+ (zerop -+ (call-process "git" nil '(t nil) nil "name-rev" -+ "--name-only" "--tags" -+ commit)) -+ (goto-char (point-min)) -+ (= (forward-line 2) 1) -+ (bolp) -+ (buffer-substring-no-properties (point-min) (1- (point-max))))))) -+ -+(defun vc-git-previous-version (file rev) -+ "git-specific version of `vc-previous-version'." -+ (let ((default-directory (file-name-directory (expand-file-name file))) -+ (file (file-name-nondirectory file))) -+ (vc-git-symbolic-commit -+ (with-temp-buffer -+ (and -+ (zerop -+ (call-process "git" nil '(t nil) nil "rev-list" -+ "-2" rev "--" file)) -+ (goto-char (point-max)) -+ (bolp) -+ (zerop (forward-line -1)) -+ (not (bobp)) -+ (buffer-substring-no-properties -+ (point) -+ (1- (point-max)))))))) -+ -+(defun vc-git-next-version (file rev) -+ "git-specific version of `vc-next-version'." -+ (let* ((default-directory (file-name-directory -+ (expand-file-name file))) -+ (file (file-name-nondirectory file)) -+ (current-rev -+ (with-temp-buffer -+ (and -+ (zerop -+ (call-process "git" nil '(t nil) nil "rev-list" -+ "-1" rev "--" file)) -+ (goto-char (point-max)) -+ (bolp) -+ (zerop (forward-line -1)) -+ (bobp) -+ (buffer-substring-no-properties -+ (point) -+ (1- (point-max))))))) -+ (and current-rev -+ (vc-git-symbolic-commit -+ (with-temp-buffer -+ (and -+ (zerop -+ (call-process "git" nil '(t nil) nil "rev-list" -+ "HEAD" "--" file)) -+ (goto-char (point-min)) -+ (search-forward current-rev nil t) -+ (zerop (forward-line -1)) -+ (buffer-substring-no-properties -+ (point) -+ (progn (forward-line 1) (1- (point)))))))))) -+ -+(defun vc-git-revert (file &optional contents-done) -+ "Revert FILE to the version stored in the git repository." -+ (if contents-done -+ (vc-git--run-command file "update-index" "--") -+ (vc-git--run-command file "checkout" "HEAD"))) -+ -+(defun vc-git-checkout-model (file) -+ 'implicit) -+ -+(defun vc-git-workfile-unchanged-p (file) -+ (let ((sha1 (vc-git--run-command-string file "hash-object" "--")) -+ (head (vc-git--run-command-string file "ls-tree" "-z" "HEAD" "--"))) -+ (and head -+ (string-match "[0-7]\\{6\\} blob \\([0-9a-f]\\{40\\}\\)\t[^\0]+\0" head) -+ (string= (car (split-string sha1 "\n")) (match-string 1 head))))) -+ -+(defun vc-git-register (file &optional rev comment) -+ "Register FILE into the git version-control system." -+ (vc-git--run-command file "update-index" "--add" "--")) -+ -+(defun vc-git-print-log (file &optional buffer) -+ (let ((name (file-relative-name file)) -+ (coding-system-for-read git-commits-coding-system)) -+ (vc-do-command buffer 'async "git" name "rev-list" "--pretty" "HEAD" "--"))) -+ -+(defun vc-git-diff (file &optional rev1 rev2 buffer) -+ (let ((name (file-relative-name file)) -+ (buf (or buffer "*vc-diff*"))) -+ (if (and rev1 rev2) -+ (vc-do-command buf 0 "git" name "diff-tree" "-p" rev1 rev2 "--") -+ (vc-do-command buf 0 "git" name "diff-index" "-p" (or rev1 "HEAD") "--")) -+ ; git-diff-index doesn't set exit status like diff does -+ (if (vc-git-workfile-unchanged-p file) 0 1))) -+ -+(defun vc-git-checkin (file rev comment) -+ (let ((coding-system-for-write git-commits-coding-system)) -+ (vc-git--run-command file "commit" "-m" comment "--only" "--"))) -+ -+(defun vc-git-checkout (file &optional editable rev destfile) -+ (if destfile -+ (let ((fullname (substring -+ (vc-git--run-command-string file "ls-files" "-z" "--full-name" "--") -+ 0 -1)) -+ (coding-system-for-read 'no-conversion) -+ (coding-system-for-write 'no-conversion)) -+ (with-temp-file destfile -+ (eq 0 (call-process "git" nil t nil "cat-file" "blob" -+ (concat (or rev "HEAD") ":" fullname))))) -+ (vc-git--run-command file "checkout" (or rev "HEAD")))) -+ -+(defun vc-git-annotate-command (file buf &optional rev) -+ ; FIXME: rev is ignored -+ (let ((name (file-relative-name file))) -+ (call-process "git" nil buf nil "blame" name))) -+ -+(defun vc-git-annotate-time () -+ (and (re-search-forward "[0-9a-f]+ (.* \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\) \\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\) \\([-+0-9]+\\) +[0-9]+)" nil t) -+ (vc-annotate-convert-time -+ (apply #'encode-time (mapcar (lambda (match) (string-to-number (match-string match))) '(6 5 4 3 2 1 7)))))) -+ -+;; Not really useful since we can't do anything with the revision yet -+;;(defun vc-annotate-extract-revision-at-line () -+;; (save-excursion -+;; (move-beginning-of-line 1) -+;; (and (looking-at "[0-9a-f]+") -+;; (buffer-substring (match-beginning 0) (match-end 0))))) -+ -+(provide 'vc-git) --- -1.7.3.4 - diff --git a/git-infinite-loop.patch b/git-infinite-loop.patch deleted file mode 100644 index 0eae28f..0000000 --- a/git-infinite-loop.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/refs.c b/refs.c -index 67d6745..ddb9a77 100644 ---- a/refs.c -+++ b/refs.c -@@ -1422,6 +1422,7 @@ static struct ref_dir *get_loose_refs(struct ref_cache *refs) - /* We allow "recursive" symbolic refs. Only within reason, though */ - #define MAXDEPTH 5 - #define MAXREFLEN (1024) -+#define MAXRETRIES 5 - - /* - * Called by resolve_gitlink_ref_recursive() after it failed to read -@@ -1576,6 +1577,7 @@ const char *resolve_ref_unsafe(const char *refname, int resolve_flags, unsigned - struct stat st; - char *buf; - int fd; -+ int retries = 0; - - if (--depth < 0) { - errno = ELOOP; -@@ -1612,7 +1614,8 @@ const char *resolve_ref_unsafe(const char *refname, int resolve_flags, unsigned - if (S_ISLNK(st.st_mode)) { - len = readlink(path, buffer, sizeof(buffer)-1); - if (len < 0) { -- if (errno == ENOENT || errno == EINVAL) -+ if ((errno == ENOENT || errno == EINVAL) && -+ retries++ < MAXRETRIES) - /* inconsistent with lstat; retry */ - goto stat_ref; - else -@@ -1645,7 +1648,7 @@ const char *resolve_ref_unsafe(const char *refname, int resolve_flags, unsigned - */ - fd = open(path, O_RDONLY); - if (fd < 0) { -- if (errno == ENOENT) -+ if (errno == ENOENT && retries++ < MAXRETRIES) - /* inconsistent with lstat; retry */ - goto stat_ref; - else From 271b894dc14ea18364b5692eaa805164666113d7 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Tue, 8 Aug 2017 17:39:59 +0200 Subject: [PATCH 431/842] Add a build-time dependency on python2-devel for p4 --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index f02fb9c..210395d 100644 --- a/git.spec +++ b/git.spec @@ -45,7 +45,7 @@ Name: git Version: 2.14.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -220,7 +220,7 @@ Simple web interface to track changes in git repositories Summary: Git tools for working with Perforce depots Group: Development/Tools BuildArch: noarch -BuildRequires: python2 +BuildRequires: python2-devel Requires: git = %{version}-%{release} %description p4 %{summary}. @@ -728,6 +728,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Aug 08 2017 Iryna Shcherbina - 2.14.0-2 +- Add a build-time dependency on python2-devel for p4 + * Fri Aug 04 2017 Todd Zullinger - 2.14.0-1 - Update to 2.14.0 - Use pcre2 library From abdac9343462d0184b38e9ab32e7d41370e88381 Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Wed, 9 Aug 2017 14:45:18 +0200 Subject: [PATCH 432/842] skip all grep tests on s390x --- git.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 210395d..26dd9c4 100644 --- a/git.spec +++ b/git.spec @@ -574,7 +574,9 @@ find %{buildroot}%{_pkgdocdir} -name "*.html" | xargs linkchecker %endif %ifarch s390x # Skip grep tests which fail intermittently on s390x -export GIT_SKIP_TESTS="t7008 t7810" +## - probably it is because of current troubles with binutils on s390x. Will +## try tests when troubles on s390x will be resolved +export GIT_SKIP_TESTS="t7008 t7810 t7811 t7812 t7813 t7814" %endif make test @@ -730,6 +732,8 @@ rm -rf %{buildroot} %changelog * Tue Aug 08 2017 Iryna Shcherbina - 2.14.0-2 - Add a build-time dependency on python2-devel for p4 + Resolves: #1479713 +- Skip all grep tests on s390x for now because it failes intermittently * Fri Aug 04 2017 Todd Zullinger - 2.14.0-1 - Update to 2.14.0 From 0588f1527399f92292f193a523a652c9abc3a8e2 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 10 Aug 2017 17:40:10 -0400 Subject: [PATCH 433/842] Update to 2.14.1 (resolves CVE-2017-1000117) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From the release announcement¹ A malicious third-party can give a crafted "ssh://..." URL to an unsuspecting victim, and an attempt to visit the URL can result in any program that exists on the victim's machine being executed. Such a URL could be placed in the .gitmodules file of a malicious project, and an unsuspecting victim could be tricked into running "git clone --recurse-submodules" to trigger the vulnerability. Credits to find and fix the issue go to Brian Neel at GitLab, Joern Schneeweisz of Recurity Labs and Jeff King at GitHub. ¹ https://public-inbox.org/git/xmqqh8xf482j.fsf@gitster.mtv.corp.google.com/ --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 26dd9c4..563b400 100644 --- a/git.spec +++ b/git.spec @@ -44,8 +44,8 @@ %endif Name: git -Version: 2.14.0 -Release: 2%{?dist} +Version: 2.14.1 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -730,6 +730,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Aug 10 2017 Todd Zullinger - 2.14.1-1 +- Update to 2.14.1 (resolves CVE-2017-1000117) + * Tue Aug 08 2017 Iryna Shcherbina - 2.14.0-2 - Add a build-time dependency on python2-devel for p4 Resolves: #1479713 diff --git a/sources b/sources index ee9e485..d69199d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.14.0.tar.xz) = 4410ec9c40fed8efeba26ae57412975cfc4c78a43d89b0f1a2412e578a14b12e24ac7537f6b5efe83087006f27a49911facb4a9007fbc59e1548d15fd5f22dd9 -SHA512 (git-2.14.0.tar.sign) = d2344e75e716ac44835921fb70406d3278e91d2b0875200a3dcceef975a54509fead2fb652bda977d585ffe909f71fd0ad8c959f54c3c5eced9fdf1be976c1b2 +SHA512 (git-2.14.1.tar.xz) = bee35ad9c6a0d0588045ec2fe5f6987cb1eeb3961cdf33cd9b51ae52017969131ea4ec09908f9b30944f85b0daa99614fb42c248c9c8dac5f21a90e2866c33b4 +SHA512 (git-2.14.1.tar.sign) = 695509fa3f8f66beb6048682914873ee445bfc9e87192cdeced060c6088681f1cf6dc292c0831a1313c294981b77c99f4bd2da586e0bbb35db1169f42b71549c From f39e78e3c3cd2d6fc557d484e7cbf2197a9f434d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 10 Aug 2017 21:24:54 -0400 Subject: [PATCH 434/842] Rebuild for rpm-4.14 bug (#1480407) --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 563b400..4b57c6e 100644 --- a/git.spec +++ b/git.spec @@ -45,7 +45,7 @@ Name: git Version: 2.14.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -730,6 +730,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Aug 10 2017 Todd Zullinger - 2.14.1-2 +- Rebuild for rpm-4.14 bug (#1480407) + * Thu Aug 10 2017 Todd Zullinger - 2.14.1-1 - Update to 2.14.1 (resolves CVE-2017-1000117) From 7c95c76e49cbfdc42d9ad25449c68eeb8991cff5 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 16 Sep 2017 14:38:03 -0400 Subject: [PATCH 435/842] Update Junio's GPG key MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The expiration of the signing subkey was recently extended. Ensure we're using a current copy of the key to avoid any output from gpg stating that the key is expired. While our current usage of gpgv2 is not affected by the expired signing subkey, anyone importing the key and using 'gpg2 --verify' would see 'Note: This key has expired!' in the output. For reference, here is the process used to update the key: (cd ~/src/git && git cat-file blob junio-gpg-pub | gpg2 --import) fpr='96E07AF25771955980DAD10020D04E5A713660A7' gpg2 --keyserver hkp://keys.gnupg.net --refresh-keys $fpr gpg2 --export-options export-minimal --no-emit-version --armor \ --export $fpr > gpgkey-junio.asc Here is the ouput from gpg2 --list-sigs¹ before: pub rsa4096/20D04E5A713660A7 2011-10-01 [SC] Key fingerprint = 96E0 7AF2 5771 9559 80DA D100 20D0 4E5A 7136 60A7 uid Junio C Hamano sig 3 20D04E5A713660A7 2011-10-01 never Junio C Hamano uid Junio C Hamano sig 3 20D04E5A713660A7 2011-10-01 never Junio C Hamano uid Junio C Hamano sig 3 20D04E5A713660A7 2011-10-01 never Junio C Hamano sub rsa4096/B0B5E88696AFE6CB 2011-10-03 [S] [expired: 2015-09-21] Key fingerprint = E1F0 36B1 FEE7 221F C778 ECEF B0B5 E886 96AF E6CB sig 20D04E5A713660A7 2014-09-21 never Junio C Hamano and after: pub rsa4096/20D04E5A713660A7 2011-10-01 [SC] Key fingerprint = 96E0 7AF2 5771 9559 80DA D100 20D0 4E5A 7136 60A7 uid Junio C Hamano sig 3 20D04E5A713660A7 2011-10-01 never Junio C Hamano uid Junio C Hamano sig 3 20D04E5A713660A7 2011-10-01 never Junio C Hamano uid Junio C Hamano sig 3 20D04E5A713660A7 2011-10-01 never Junio C Hamano sub rsa4096/B0B5E88696AFE6CB 2011-10-03 [S] [expires: 2020-07-26] Key fingerprint = E1F0 36B1 FEE7 221F C778 ECEF B0B5 E886 96AF E6CB sig 20D04E5A713660A7 2017-07-27 never Junio C Hamano sub rsa4096/86B76D5D833262C4 2011-10-01 [E] Key fingerprint = 1843 AEC2 2DD5 6B75 E554 3FEF 86B7 6D5D 8332 62C4 sig 20D04E5A713660A7 2011-10-01 never Junio C Hamano sub rsa4096/7594EEC7B3F7CAC9 2014-09-20 [S] [expires: 2020-07-26] Key fingerprint = DC3D 6C01 251E CA4B 1200 A7EE 7594 EEC7 B3F7 CAC9 sig 20D04E5A713660A7 2017-07-27 never Junio C Hamano ¹ The full gpg2 command used was: gpg2 --no-options --keyid-format long --with-fingerprint --with-subkey-fingerprint --list-options "show-sig-expire show-sig-subpackets show-unusable-uids show-unusable-subkeys no-show-uid-validity" --list-sigs 20D04E5A713660A7 --- gpgkey-junio.asc | 498 +++++++++++++++-------------------------------- 1 file changed, 152 insertions(+), 346 deletions(-) diff --git a/gpgkey-junio.asc b/gpgkey-junio.asc index 7214aea..032428d 100644 --- a/gpgkey-junio.asc +++ b/gpgkey-junio.asc @@ -1,5 +1,4 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 mQINBE6GdewBEADE3szNmKeUAUad22z1tWkLjLzyDcJpF7IzEnLs8bD1y0I6iqH0 169ru5iXKn29wc+YAuxWorb4P5a2i2B/vs32hJy/rXE7dpvsAqlHLSGSDUJXiFzM @@ -12,349 +11,156 @@ WVLGVdsT2qwek+KkmOs+iNBXY1TgKPAeuv0ZDKKYrCwYpN1K90oXk431g79bKsH5 qYy6CPcpjTfpN4i/7gxQDNI+AIgbs21EE5Kg1TPUe0XgfdJMtIF+D6wTjbrLtDnn 09Iwz0SfIZR52IrZHxUlFXZFjk10RXYATtdMqEFgYgjYvYXxL9EEr7T5Dgso+qaE wV0rrg0VDKrf/afrjGOeffumlhBhJnBnns1T+p65Vz5hyQl7SFKLw+Ix7wARAQAB -tCJKdW5pbyBDIEhhbWFubyA8Z2l0c3RlckBwb2JveC5jb20+iQI4BBMBAgAiBQJO -hnXsAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAg0E5acTZgp+dxD/4l -rBl79z7SK7RUNapxiosr/1VVf2/fWHKqGmjbZscc/8Z8gbN8lzan/8siXtGxhpxt -t/F3X0ag4cQGB7IvQ4eaEJN0yYmccgdjPvt1OkHFTywrg6MjSx5kTk6IjO3Ngcof -te3VVcdGwOc3Q+HyG1Pb5N2VBL7iR2va+NyRIxtMSq+WVaC9YRgK8lhrkFM7zTS1 -S/80W6l3ZL0TaGxg2Ys8cbfVruefPLr8SHh+TEssij55/sebLPsqyP+aGXfYc5FJ -VcFnYxp6FdKovODLEEjR97HaTo3z68jSHQWCDJDp1vYpjqdnTGCSwnL2isYeCcuj -dLLKOAlbKu2aiP/+rZOmZfbxNK7dWnhg/Z7YC+dq5Mt/W+4EcaRvf5MYe3V7PGoL -XURi5dewQD35PtxfT1Zj0KQHzZ9m81IE3s0zjTAHSVqwFXcue4Jwr9SZLEjKSUQF -jMHoK2VwTFKu6UA6JS0gQwPwyHYfdOxAm0dEUTcJqrWOJHjHu2WNyqzI+sh9lP1P -S4l0vsVwdyTCkWos0mVNlSiYq8fZ5/fcUcM4Tb4AJlvV1p1t+/dNNDgf/qWmMkQc -hyLVCQi3zPFtbAFPDp+PVcninjkyjB7chyRGSp0aN6mFmnrDxjDg3zz7DWe3Q6PI -790RF4EQY738+WcoKhpuJfcAArfQ2xgKr55VSs7glYkCOwQTAQIAJQIbAwYLCQgH -AwIGFQgCCQoLBBYCAwECHgECF4AFAk6GeOUCGQEACgkQINBOWnE2YKdUxRAAq/kE -aXw5mxp1GNUasudAKdXhtNOtbwGqQjC5lPuJMaiESpuf9NGBpm+1cUQiw6SjWtIZ -B/n7QOEJpz1OI+FBLIf7wGtgRgl0YwfUYsU6JL0H/Yjl1Boh2L9ZJ/qd5cYOumy5 -yld3VknI1diLngz+MqSxGR5Vg/SP1J5q4NpiRAHM+IEgHwR1izn//iWAKuo+nqyM -T0uWbSM/7cEH+jAqF1wF7jOrYFIXabSahvNls0mTLljn85kug0k7qitOYfYKcHY+ -Z8+I3YeLubKfiyjqhcPeCSEXBPsI+XJYzjpV9xaovOAAwvG/zswt1fShmqzZwc1n -Z5CKDcWzQTResA9XYJ9aXrnrn2j/auQjvZYyjUjhlApcL7SRa6WWS+T4XjTRRZD0 -maZJkrXAerPER7Ms+c7qsUFDlrry1VA0VufMmUdFgtV3P8ovnBBUlIiiOTqjzcAt -b9MYe2vzDmyUMU0AhChy8lWJZ6IbH9kcc8Wjjo4FpmNjvsh+RucpnwYnv1MO83Er -CfPaLywBBv9dLZCVaiH82uVnsY91QGWyPou78doLZS6jNt4BspKnL+1VphQ+ZRVh -guEsPDOyYpJvL5/fXcWZ7ASozKpLIxDVF9SXlGSPhR4NgjUlQV9CfMi55nfHiQZG -F5FO/SdxlXsf1k82xZ0pD5sNejLQLvxPRCjWwCCIRgQQEQIABgUCToZ4eQAKCRDA -xtmk8xGbmhJjAJ9YdwIYsa0q1i0kCLOWlXNTMRpXmACgivss4zsxTs+UsHKpNm2P -e6t655OJAhwEEAECAAYFAk6KMDYACgkQvkvAx/ZRq3vafQ/+KgazXW7OCf1BMSGy -sl9jZYIgWp9KP0SR6AG7WWEG8nHbfEaSrUyM4i1x4F2vAbsfqQLEkJSI+6z8L9rP -7/vgWxC1Zx58txQnV+p4h3L5gLC5wTAgLFL54E5pr13KdeGE8Nn0ve49qITJZ278 -ZGkIqAir6MO+tDPR+/Oj6beh5dQT/N/otMrcSEzCoRN1QwcQltNduISXKpyMnpRO -t9riz8aaJkY1dupxrn8Xr53GrphKEH8DLH9Pwe8PjBfKcOtY05OQTkOgq1wKCDMq -rP6DMpffLvdHyPZ3otkyaMEx35gWIQ3mByckCB8OQlf9zM2vFBvgR7GpJ43dGcBS -RmpjnzYCVFXohR+T0jfPU2qTDki5OpmyHlS6xinFtACw2sbUof2PkaZgLxS4AU4T -Ju8M7lPM/RUL/yf+lOnfgl0y5CSPJOo0SxAIL+UORhlpxrw8uB9SPWn2+64Qvha+ -Mksp2/UU7hjFbYPywL+sE1a2LsX3s/lchJUmLvC42x6iYpcJqcOTSy6DHHRqU1Mc -FcmEWQ9dmD6g1pdxBiv0riA6VlhYNgDik67sZC2dMaGLoCdoIWgFH1D96xV4ousg -oF+jlV1xtxs+KCnjvEmTITBP/5o50UQ4sxcd6Br+I/6cGWL4mTe3IulxxN9yupSw -TPLBu17W3ON4ZE8vv9vk5AziB+mJAhwEEAECAAYFAk6KL/oACgkQyx8mb86fmYF5 -qw/8CQi20QzdVxDL2WfMIo5J7AOrpKQhbDbmScURKW3AmH8BLI/tFP+FpZ2PwFMh -9xWmtdr3zm/NKVYHP1BpCKNk2hiAQtWGAlzO8YYKAw1v0ZNNOjyOOpeA4XIBrwIK -7lMi8NJlitWuJqavnPYnptpfNuvRl2JWTqd+MZp738aTOBXwz/6GqnWRaH47La1g -DzXtK5nc7pB1p5BUelhAUZE+W0uBxZxBr3P66A7EEwfDtixsiWJK1p0LRtJwzPQu -CQw9oxhTUIghutUZ5N507SySvYT7kLbm0pr6T+3AYgu5a7f13qBOd8JMLjIbd5vQ -y0aTD9RNf9R+vNUErBOo009s2Mdh83DU87P3QzbeNd/nUrW57fwMVzLhaqhlX8nz -eTS9Yv9+/6UkqouI+uMUaroEgBIt+VTSUR+MML28ii4CEJc+n9YgXWMEsvsSKv5C -xQVM2TBlYYNJY73K99k3jG+maVI4uX25ZsYlmO+L/hSD/XM1ROrHfNUfyhHILUkI -Vyx2nOApFYpTUPV7iyJCDnF0eImuX4e7gJ2JPNY1f5rPAeOJvRbJs/oStkTnfc+v -ZDi3KOWxAIPaAjB1atFxWp+hxuxDHzhFMVgfnJ5cZDTgrBb3ftkE+0rdyHfLMM+g -EnxbQIJ2r6S9KQZAJJC6kIXyPRi/49Wp7Eqfx/KZfnllhBWJAhwEEAECAAYFAk6K -MMQACgkQjBrnPN6EHHdj1A//ahy751AcOwddYNooUAkvSUoOUkiDPH3gtToQ9Acv -uda6ZuKw+v7+kV6JAICrjL2zVfo65lYDcsrepnHDaGS70kPA9A5CFoh7ba+KQyBS -Zvdzc5MQlN1uwUNI8+BzCSlctdCaTQFtDVNr8iXQBVQVpMCoLw5+OEp6oC/dH2E+ -PhuYSJxpwMvTtLpNhV7K6kPY2nPPG33GSC0zQT2G7NeGqffKKlfPHprJfYtnKqCS -vrfkvgOAJWTgJTBIBHuUMQxLVVMJtgY4dEiCS4/X9m+Xtor971pc+/FX1cVAEm27 -rEQSq+kn+lQsXCTINPx12wQf2HRSwgruvDQ0rVMgBwBAD7jTZYR2xfXw/DTqiYuL -NVcLmZZ450kxvxBvUReTOPeCKqQC1N5eQSIqIEzIuN8AF51ddxdGXA6EZCy5CfGm -Z89bSj8Hv9yXSTdQY5rrp0OpF05XE1c7U8dJUvUlEZLi7lLFvL5l1etoixFUeEnN -td/dSkPK5tXj+ryDrnSn6Y8YNrj2gqt8ZVqLoi9ADQh6EwGe6AOWW2sJvVOwlAHs -MVTz2+uLXNuM7pjT9N2W1AsR0KZeDGqEZ4H03c8/awidtnqAkaUV4eRRLAIYN3Vp -TC0P8m4Rm89t72H1ZebzGrHGN1lMI+G3wVoEGsNKbuxCGo76xnBQWNU8Egn99jyJ -VYeJAhwEEAECAAYFAk6KTm8ACgkQvaBghUk7rOTXDxAAun7VtPSqHqmWbjlZ6lAM -HhoWFlpIETpa433WyA7FeruqshPEJlxQXXkgOyD/WXyZqVmh16pWZXdviJWuT0YE -nnt2oNXfRwuyo8MJUuJfzubx7tYOwVFGMQ0U6anzRdiez5CWP8tw9hCOQIKDqJI3 -qMMCcqLOzvNS/Ho8iXULlJ+k8bD5yyZUzbsy4JimR3YPKWJi9rXpcpFiQGLeHGPN -wvmUn/bW26KNHFBOlBVxUvkOSiZusT/xVEGfDCsu1BFsEF1Iigaa3IYZXNcMLVEy -pfbc8GozoU2+T6/TQw8uPwXhJXzKUsk1OJacgJtVvQfJGWy0SXWrlBv46ZokFnVv -fNjKgRhvYYmfojK/kJ0lE6Jm5PZOqmgmUabZXDjOIngODvJ2e2lcaxUu8MTNS/XY -5gZQqv/8Q/5ptjeVB19OGjpWQ1hWyK53sDOzTMqA+5LzD+Lub8ETuFnkY3bW5VnB -1B77uhskv4DKH5jsiOSAKik1rYOF0M06Pjumk7FTCB4bkwlzdsyjEzsyrOBjg8Ml -ckmNmwI1vRonhriyqxuJNFyhE/OSLyXlSObRztHJsXII+Mui3eQ2M1mTpr6EZe5o -Sy0Z/Yb1gX/tNZNZ0KEKBLUChTyKAYK0Kc6rKZsfN4laXZoZaQjbUpbTOJCRgbwJ -nR/AHLo8fIcqMZdj0biHUmWJAhwEEAECAAYFAk6KQ/kACgkQTQotlCAJATJeTBAA -5CaaZtuQgsJVXmPlwuk1Wqfjo7fsfgqM0miqQ7wiab1S9tcYVI+UGl7iotjsWG+A -oS5XtbEBZ/wxCpX8Ram+PIsr0SkTdJarSPy+U+kTLKguygYwtuXft4gxnInA9cuZ -dBbBbTh3i+YF2i289J0GErqYLbzlklLjstrjEjliWXI8FapvK+rqMUMvol6jerOJ -DeULk1VTgcNITmbnel8EiGLNdCdwOz9KEzD1Nhl1NoXB61SAGciMl4ssezkVC7LX -omaMWrp7RXfozrggGaiu28Gl2CW4yvJ7alR7nU/nyrtFqy3cIGTAD8UpZWd1AcYf -dt1Hh3q45qyoIZg3+M3bsZis5X+0eiGFH550bw5SvkHeCzorQmNKSTWjalxYu7PK -uJv5pk7Z9dZmFUTyvkGeBPYwNq/WDXNrBtpy9REPc4Z5jbOTpnSLC+qFVUWIl+a7 -0Tlw45uDp8lOWu/CD6pbpHTkxSxwHIM04K0fdoMFvzkmenOx98/FSuLnCYbJzV3g -oANL6biHk1w5RhRb5LDeTtiHayMxEeBCkL/06PUA26OCoFbmq53PGlhKQnQxuiPt -g9gwJYMkkiMUrW6p8s+xIwZKeXbjAFFParPYx7rFzjbD2VlzedzlUgN5g20izT5k -l+/n1oUxggmWnO0cTuO5LBxKDdp21oqhhOvCY7vN2u6JAhwEEwECAAYFAk6KVo8A -CgkQIx9wyqsxaFDoMg//ZOZXcgMIVBfFX2GLiFPfBclysUP/CWn6o7ZYeshhLWTY -kIPxvLn7nPFHob83mX/iPXYnQWZggahWu148ysKmMvulYeNEwvcl85QULyJRNx3G -H0PG3dfVavFxgOHeHBIGUlkLGcqHFjDM4HqaRAbQ2CkHk/Ds5NiHVT45/rIL+M3l -A+leFxNQ2hl68nsRL2B54ml9/bQx1PhLuDTGT7EMxkgLMv9cspqpT/nIoT/3Nq7E -IrN51PZDixpBcxalz3NXtkirAKLXI1XKlRDKrzL27PZiXZTRWZCbNdpf1kkjauD2 -RN9KOXT9izvbC6PrJM8/cikOCpYaWfRUe8yXAxqFP7NK7z+8vL6TFPRnBwF5DTNE -oHdf+7jBbXwV01f/At6YtcBBvNDGOKZQE3lw6Bjqace/z1IIeYggq6ffq9h554O+ -0skye7NqViZh2y5Kd2TrYZksdhRgfRcMDJkvXj3rINcoaWf91u5Y51gFfHB/KiKn -rTIn94bmLh7omcZjx5dde9IpZtk3i0REg+LoG2G85U409AoPHbnbhXwbmX/ROp1j -dl02ewbLAo1GzX2E+NnaKoIgEI6yXpQgP/bDeTJrOq4B4FGHbLv0jdfDwgAcOz7D -xrmsDbqivcKS8ncYSlEndnIE/X+RlKMCKGHcpht2dwpfxNzs6xqeJLtNwdkuVBmJ -AhwEEwECAAYFAk6KVqcACgkQZrFaRl4fnslDchAAuFk3mX3Fs4ibFZKd/wOm+Rgq -WwmwTxbu//5e6NVb6wi4Rh0T8zDVlNHxXKUuL5u1Ywnjee1JPxn1xHJRYh5Teb1z -rZVD50NtF2QDzJdWnsCEp6zVkI791+pI3yd2oZOpaUU4jdjfvukExKl2y4HsR8RY -7b0G5OxIHdOyEmS4wtKr1iaoCXzunMi1y4jukBxo/RsBuipizn7QbEkTnuL2tMpv -oLbXJh6lIZ8pHcM0DIrlATGGB51k01+ChabSKWZhlObZG1vNWwi8/5uxHsUvULLE -fqXeDPRimrX9gL+HbUkXqUq4kyXVbqXwdqD+hfETr1aWeal4NYYhwWU90x5171aD -lw509mmQYeehpWY2Tm3VV+uY1BjYEym5bbTCWYxSS1vu1illFboZWyDUaOzarT/m -TxaHm6qsMhcKj4bfAxfG6+t8cNHwYhbpNLmn1gA3J/HKPlHagavJQZcYK7qjkUwo -UD1l2+KrK+qEskHXzRZ19CZehkO7+II5jghZlZGSi/T2OibOmyuPMYKo2Mx9dizg -08aD+H+A/c6BBKLpZr6dAlJwLI6JpyEoxKsWfqhbT22ml5P9CydMFy07ZNrleX23 -Pp4aB6oEvI6806RTVi36pIrUTdtwpfHY9vVOQpbYDCagfX7EDusGIDguzOSycllg -hAM0A5oMlDWWWAoqHLGJARwEEAECAAYFAk6KZssACgkQb4/yn8cykmFRLggAq0+u -+mbzSBMrGtrdo3AmYObe9QkfK/G4iNG4nrO+lbJUFGbbkWrmjF4TTPA78UCKsyqx -uGq01R2SnMdHUlg7awOepA5u9WQiWxJJ0znqWgTK7mLXPVAuMmkV3HriAzoGNGez -gYvGWW1NGc3jaw4snDBNx6yD1jVKmnECCLa8cks0GA6qy9bf3DQrASeuQWJ6L0yh -sR2IiyZd1ppsLW6B531dNWlR44fm6nPl029OKw+bUxATfjeYpD11CU78UQ+fQimF -+8seXAb5J0zN4kWV3ldJBoks8q1e+6NQadTeKg1tioCVFDx8J/UAL4AEsIV+jUua -JBufd+JpVcXsTUoVOrQgSnVuaW8gQyBIYW1hbm8gPGp1bmlvQHBvYm94LmNvbT6J -AjgEEwECACIFAk6GeL4CGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJECDQ -TlpxNmCn6GMQAJ0V0jmyQ7Lvi5FBBgNTdY8qfVbLFxEUVAsKf2x9QxhsOcL2heQR -Vkp10JKv4/VQLfDwr6Pv98FQchXlBmFiySAbVihUVC+VJ3FhyKBtI14RXT6Nkwd1 -8PXDvWXy2fKeiK9GPDWkufac0h/giz0T1xP7CHxDErQATMmYbkinyyM+xd1Nir6D -UYcHJQIK2Dg2VPChkI0XXCQETLDbrC9fDwWg1vP36PQZ+nw/cIRt+2xkq8HHUzB7 -kOnXHqPt1kb/Ry8hZwPnfV7g/V0MogoMLtz233pqwuguLXP7zY3jTwAZZ9VTpuCT -sdVWXJDlznMNurYi1yurCNuUvq/O/9JC8WBtdVUuvFZGjRZWfP24W57iq/qz8CV6 -dThq5r4WygE83tMC3DaarNJ4f9dQUA4KpL7j2EMXkgoXcEy1mieUCypdNiZj96hV -8Q7apSLk2V4jtvLkJfzX053glqRJI35SX8OkSazZGYZHX6QfZlvznnrCF5x/xBzh -bfr2Geo4rxL0BQsp2DQodqUCB23QzsPhWWffYtkATaD5vovGeQ9Acd1u72jH3DO8 -tVMH85jMO4f+oc0h3lnkPS4F33QqlnErRo/IRm6jCsI/NgMZUYdh0EY5Iiq/e8e+ -u8gdo0akkwHlNvR4KrYrK/1K4h+i+UBIbJDZpqT/iH+yhJRQ3CAan8KSiEYEEBEC -AAYFAk6Gee0ACgkQwMbZpPMRm5olWwCeIfUIBkx+J5CWi8lLt/QiWJbmXTUAn34X -sZP8NxiyYyw+BO8q/XSjOUk2iQIcBBABAgAGBQJOijA2AAoJEL5LwMf2Uat7pRwP -/3cb2a04QUP+5NUS8sDULlEFZAUTQcnlKgiWFOVQwzASDespiXPL0sqw/A+yZKAG -M176KjomyD6zBeLrtvIMWhWKUd8jvHtlQsXlgv36NBz6rmSnbQQ+TWK6QomMETsO -VQ+ZfX+aR7EEy9WkaDgJiWtfigMISGyzZ/jITF3eiBJV1hXSKKn128iuhwNwg02T -TCPoxECehy+lHr0u1MG20gcnaQdk1KCC75pIIb0VxWMqjiBgU2xZwWPzSMlDZgiU -00YVFTR3746VeLw9ywb+JsqDplNJwES1P7EqCNASjzt/jWShLtDrryGgDivrWDRN -hCjqBaukqxssdox2EXOYXNCtUcEvYtfPcYneLTa81MaRQ8cRYDdkcI/WGAv8vGaq -NhC6nrmlJIyWi7Ql0VPV83inZxEnR5KLdPocoU7uPMpT2Omp0HL+arhU6+f8Cf4J -M8v/MMpMwmh6IlCaJxjqkYev23yfMlnP5xM9MrHDsNmMSyIJ/VlPutszSJzAyXM1 -KRpxaJyPokegYl0YTptAONHOt4KJhgag7bkveK+RwDRs1BvK/KXIZSbDpnCCfE/L -PARg80SKo+etZQkkZcHyPZEb9iZssp4Rm44NgfHBuWJ7QACkRXbThzaoba6ThwKl -9oHRBi4+WEDymZf3aa0g7EWB3OjHfDVr3xp6QgmP1M8viQIcBBABAgAGBQJOii/6 -AAoJEMsfJm/On5mBr+sQAI3KA94kGfUqfpHjohh4ExBW/13GDa2sxmTNEMSTNtfF -qlNqYuGbyBkCnDrQP2xBhJIVwo62pZgcPmBdRc4KYOexed1eesVijIJolz5hScMP -aZO9yUCZvhQ1UkqmARuDJ6wzuAL8wIJoIAfFBknJFd945ztmxNrLWlWgWseUHcJv -HIC54rFkNvJY0UbOJyRjNFjJ6VueQ7HSJKqagrUExAxVD5VUFxgyLZg91zWi2eYN -f/uloLKBvd5PD6vCZcLmQUm7uyhWW6PQYUtUNq6/3y4NKOoGVWsB21e//cYzuXzP -0wGQ+Cdso86I3HjL9TVO+ZUx0KBHdIXZfLyrNC6Kiz1f+69Qj7sutq7qhmqR1tcF -+cnKnMMtkxeI6v6+gsm9+0ZMZGFlhsfTzq/nChdR205wtMvWx654rpeJjPyzZXBW -N+9A/Khqv9abLnAYKYVUwoVH1qhkkvWxk78WMc+YFjRpeDboum9RRVN8yG/ktsVx -h59oh0qiiLLsQf3cXiPH8kUw9sKKWJ8UjM2UCi3o/6tjh+DlMPLQ4/CeRMlGr58h -QXqePg1b8YCzNuOg0X6CF9YNVdW6lSRNjjDJSH1W56BAhBIW1xZVil5KamijkbGa -Mbfj3kijPvfLf9n9KfuveU8z7PzTSuzhh/UzRYyoQh1qG9DBZp5KWJVljG4qFZ0o -iQIcBBABAgAGBQJOijDEAAoJEIwa5zzehBx3Nj8QAKI4kYCz+z/DcBB/1uYEMC6P -DlE5wSS/4RAVpDDyhXeTw2OR9N/Req60dO/anBD4MLkKaSDul9SSMgsFo3JM54Ke -DqzoMDA12+rzdK3sH6pewWt5JYMQuhE0Y9T8VMq6FhUVPdcIEPBFdyIA7SYf8g+C -UmWBvMxsT+krS4zttOm/B1kOJr5F15rZMAk83F9goUrys1GbAVggFbzWxrJbvXnc -9va72V7rNklFDGwtNJ2lAqUU1Dqtva0vBSnOqPlP0UaC2Ad+rf26Wkvfh6YACEX2 -1NBvt9HfJKCMBx3lKbhDjhDjFcny9BvEEH5cmQGtFmjYy7SnyPE6V1ikzw9DIK/d -tZyDR5jHZZeSotngq3f5eBUY0XQV7QYh27wYDSsRmBgPmuERhueX9bajMdtoDm4q -PLq4aXxhWtTowvGjfk4GG4UBi9So8lWU1yZbFHp0yeerG1sZN/wMtgSVy4MzHrwD -rQgGRJ3n4x3S/x8jS73NoJAbmrngIno7lUogwNg6uhMCNFpGCzGBLWMu1zY+oDFo -BOAleNyLoYhAXiBGKL66qwfoWKwOeX/jUawbxcnzyGQBmnA8Z9djv6bxU3/sDp5l -RvJ48TruHPol01lMUOMfalUL9H+IjEZmcpsToNadxbxuRLchFECeNSien/QD1XaT -M4gm3xFCG8YpnHGPDo5viQIcBBABAgAGBQJOik5vAAoJEL2gYIVJO6zkkZ8P/2w+ -5xUoHYbYJ5P+2j07HUV6M7YtxZOb6vIHoWGCYSNWRKjFy5MeUhMW+JNU++W6MOt9 -Ru7MDUFzrHPKKjtg2eK2rVJ/29aavrl/ywIs4MMPF9P76vYsr2jzPgvsnlAp8VAK -bhzZRB6pE+tBMz9OE0IqPNcrkbKM7KpuJulMOCeQF8QC6YsPI6vxI4QKteC3vHBk -x8tT8QCvSMDyqk/jmYtuBABlfnzDtwRPabVHy40/KtHObr3Na4MXrZ4Y4/Xh1UMs -eXblaA76YGRStJwP3VjEW+hqp9271VgxxG14c2jJ5mYTjBHgDGlpLHdFNi2ugmh9 -A1jSk3lR3qsTzigRdjRT2n6JwlARDTLiWzFGbFgd+8OTs+Qc0MwKygQ853t/GWqS -00Ra4edNl1pnIC12QspQdzZ3axXB90sE6llnu2CjfLFLxn1qLH0cgEs3KFeWMPkY -39cK7Eff7eTdji/3q8dsq0k5V65CKIDavS79vgSN25jltPv7CiC7YAJCuiMF0Eno -YannyLvRvFsViBBzlEw/aPAN7tZ/SUUFcwtg8WGOKf0O6U1afqXKY7yQMFcVE7bZ -IdH3joh1JZ3TPQoHWkLTQD0MLrpXekCctHNB1TvSVQPndE9HTit2OejcgZzPfv4q -29Rc0RIAEMfqjwST8dAhNu1WPiqzpnEnxzKT3hhiiQIcBBABAgAGBQJOikP5AAoJ -EE0KLZQgCQEy8jcP/jfkVp1XGIl5y2XTOVtCdRMd9UUmb4xAJ+R5/XruEn/hpxDh -1UZQ/NzRsN2opKDaTRVe8zMZOVjmS8DUrMj5vGOoITNXZg5kbltJKb5qEKID5dV3 -H3s4C97ITrIa1CXPdGxSEwQzJumxPB3U8sJM9m+mbFuNdxQ9UyT+FDVuD3PUqmm5 -j/D9FZTkRu7+sb2U5Wwh432MaI8AlOOGBH2l6jkn/IkwddfzK/ZNg//pGZMVZ4wr -juOGsvafZ2t3bCPHxByymEJvWW2y+nZPqO3Zhdj5xFbRYx/MuwbKfMP10bYBLf8K -gu8y5/1RY8q7GJEFqakHDielkY8Q444wxfLIGGdLUmzwyHW9/btxKEfYKPEsZ0gQ -/WDXc3aA5Zd/yaq69VPjtmSA9q74AKJBhdBki2RGv4lUVyp+bgifcVgUV6/ICB+D -KjJzb9xico3E5QbH7exSXo56hBuvY9VapRAS1MMrOOcnxD6/PXyS4TTNAd6okJx9 -xbTDG8JQlQwJB95wMGHbbjioJKCulOKX+r0J+DLmpek1MoD4xe3cf6qMmvPuI54E -F4vcofswTpb/lbMz1gdH5Yv7IY6uLf8tsj1XiVspvUQ15E2GKsrWBJo3D8n8Sxv6 -FuS7EPksXHSFDgERWoeEXBFr9W8DXOJ24zEl0sKAzAGsW18gzXP2gvzbMGAEiQIc -BBMBAgAGBQJOilaPAAoJECMfcMqrMWhQHsgP/1qrkoPzPTgxQ3JK2KQaygp+JoN5 -WQxNPbgzh0u8BUu2KjD1Fx8gYF/PefD8BAjyKYObMGKnO2pJX6QypjscuAPuGTE/ -TLhN32i5TbrtGFV4fRjDz2iqPQg6diIGIDkQmxPflU0YVZVUjUQhR+jYW11qqKNR -UJYm3s6FRx2D1t6HboSurEArU3s+s9oCP/KL/kUADhENKllv5QkyMmk93B6Ic7BN -47D90eQt7Sf8QI8bqlqwR9WeQhfIqNL1/dz/KW/uIFBgmffymYbvB0YeFMbfETOA -ySw3K10I0f2JMockRIEiaj5pRypV1wwjr1NabjLurSrxeSpvsKys8K0fQB2BLfb9 -NPYA9jhpbCZGrqL1yTQ4RRG8kd9RTad9lh39y1Ab2IK5zy4UZCZhUTYFQRFtTRgH -4nW2noHRfdfqYxYwkrZLj88nVh8xMqZjJ93dXW/zwar4zovS+ccsdhAWsJVWypMb -nYL0YDU2Na4y0tLvGTrop5xp8hlXGaC5ciREdFOivNWMCknSoInRtO74teB92xIi -nrPR0Cvg3GLaiw1584b0jkNumUwvJMnFzf20vL8s7D+VUjGXR4tS5l8MAbwohNq1 -daaGcGNTUJ7KJwvMDEWS2QFroiJf/DgZHyvkmm0yW6hs/DhktuE7KvtfaliXxT/6 -eOnppMYm2g9MOf0yiQIcBBMBAgAGBQJOilanAAoJEGaxWkZeH57JahEQAM8e+vjN -HNwIYBgAXiHuUiDjaRvAYJSOqvTqdwJr1jJ4gHpovqKCayboCwvT05Ul9X2ZkC26 -/umXN+eE93RR2cUYOSOkc62g7l1De/GKEl6Lk6pp5jhk97rTzQ5MD7qmuHBYFZNi -AaSSuabRZLdaWMy7BlCMgP+jeULfBQXSoOjyu/TPDQP2XBcmt01vUoQGMPGBFgm6 -+QTZdH9CKbgSGtjc4q/JsVx24oeDrqcUzCd9LLvNlOMIjFdS55ksmTmZLEnRL3a+ -v9Iwr2HfX0U1/ofGaIxUPiroC8QwNvHxtdIdCWJWIn3m0E8/BUGgIN/RRR8IDD6m -VSW+gIio2gUMg3qDaRFVbOVE6WGBgt3Yl4uN4ArdTzh4wkc4sTMUeQKPTU8BKQcu -p4gSmYpUYy4RPS7d+ZRVrzLol2eLhrLSU3KXG5ZR9cNTSD3aHiivw1cz0q9fcHpQ -OHKbUybTiQmy48LfRHNrBRNxAQULZnRZpL5JtZhOwjYXl5DdLnJNnucFFRbYiLQc -4i5dx4VJRZ0lwtWyCg8InIRTC9jNl0LK2FfPDDUKoDOiqBY3JO31UnswLPb2gxCB -lDHwX/b3/iWkLQRqxV+kXd5F7rvTLyumFFNRgZaHnHOCrhxLBWtnqRnj7uPm0+4+ -yWe/wUo3PoMWkESPFkDfNxhGBOfBps16hK/SiQEcBBABAgAGBQJOimbLAAoJEG+P -8p/HMpJh/s4IAJa/Fd6ATQ5dagjZHlcny1P1hLA+wucw94jXRnrLGoZWEbA6wuR8 -gpOpNhyXSiDeHkc0VRRCB63WJbNdg65E5oMsoqmgZx0wePOxVJCVxuYMWXKj/Wg3 -oxN08qL8cpKdXTi5ynWA5X0qt8pvEOmRbiom+YtTqgVOzq5lcHFgM649XegL0A+5 -6ULA2CsSCXhvsJUD9ZoSwsJP8oXRsUVEZjQsLEpL+2PQvDTq4gcHEq2CcHZbe1sI -wIj99PI/PH+yuXIp0yF5Cn8cIG9/z+5SRmZDSr8x1ffMYeRli5HXPvSI/8j4h69i -QAFVfW9F+lx9t0wfNESjCdesADusZaobRpy0H0p1bmlvIEMgSGFtYW5vIDxqY2hA -Z29vZ2xlLmNvbT6JAjgEEwECACIFAk6GeNUCGwMGCwkIBwMCBhUIAgkKCwQWAgMB -Ah4BAheAAAoJECDQTlpxNmCnhLIP/2yVDUiRirP5Vc+eYcJAWG6thwcPy3WIYGqJ -fEj6CkDVjcvVAv5qPR+mVbgq4Q9snvGVh0sDgn4z2SCTC3cm5/D6UzWlAz21IHrb -usBvFTJzOPgAWNn2/wamrJndc8N7w2Scj9XheWGyv57cAck+vfnldpwyQUZzdG3D -Wq4VWCsQK213NQPrG2uHBhhUBgCcqvrn3jdS0wuxVeQkt+OrxzU1k4Ki/1LBJvQ3 -0iQSFLKKF3/3ZnY0fh34HVBMjJZqAvcY03wtdcQcr7H6gD+duEZsWDtuqHFRbh3Y -lrEo/LhTed921KYxuLLXp5R8xtszK8HSO0t/pQWvEXlsmdiSIbXwNwtJpfsexvLw -hXNlBkdi+THn7ukrZIGx16Tdu7em6c/d1YsmgzD5WabkGTRiXunHO+xhBaE9Xv62 -mCCVRIVC4h5cWvCNVc/xD4+H2c7S8ohp5NyfUhK6rZdqiqGQsf5nDUj+u5G2TYMl -tmyDkEEZ8DboGRlYleU7qHfd6Y/CQnQVqeXNG0xOpn/hGJNe/kbUv+XKlfWKrp8X -ZX5ZOHYmYQrJj7aXT/X1dEA19oOJhQugG8kR0JwhcttpFOqN6b7vRka8CIJoY7nZ -i9SEGj5cKCO5yNyqHGIXfBzbiTOPVnJyvBsNrtWN+1kACk3TUInfyZcalleJZlTi -GMnHjXAJiEYEEBECAAYFAk6Gee0ACgkQwMbZpPMRm5pp5QCfaR46cq4RrdRCk2lW -v1jZBIlSzisAnAgKVV3U3btQGaXmRn7oDcHDUF8DiQIcBBABAgAGBQJOijA2AAoJ -EL5LwMf2Uat7tIAQAM7PNzpPu4VGFA3h+KE2zOSYBtIFpuS97GNtPbFEHLueXl4d -UjoLEFaB97GF0ccXDWu0J5+m+bsz2LD/BAWYvmOvxj4w8Y0c0P5KNOsOkyObRTkN -CKm0Q/LzZbTpD4P9RosNSOMLiBeYV8llgNR8DXcnkw5TNssqHnOTte91vfRqIBDJ -qB+a24o1PF6BsLZkVeEsR5FqaKWcAIJ8edfapOYyaDwkLT+XlVkhfzS1NgxRcNCX -EySNhdelq0WtnCnKFWLDjZNll7IH8xon48fBo1qJldDldFIV7m2/GWDfe5DhoGux -Y6JRnk8fuXOPIkZLlfQh1PpRn6vHl8pNJIzAnJ3NvLaUlxtvPV/zQyVHgIb96qpe -BvlCY44QAjUAc4Iubf1Lv2Sdf0ckngg4eiT97UqFl9A8FPLYiVk3k7xt3Jt/cMHU -bYC5hmel/8S8t3+iCO886I7Tcz+49V+MEiVo9/PPPLcDXb+tRY/hh8cWbSZOrkfc -/xXRm8J2+LBPZCny9mpVoRwxSCdnhTk0OjTRY9uCUPbWB6FEcqYZEhgxSQhaG0el -zE6nxbxiYNWXfFHYX/3HkzhfPh0SrPkuIBRSkVEXGZ4dypjcv8BV2251BtXkVdFA -h6PmNNa0pjdcn1jfI8Xp0M9mWxkYItAGVIY3aVfg9xtWyouk3pGf5uGTp6triQIc -BBABAgAGBQJOii/6AAoJEMsfJm/On5mBC48QAKpWGxIAjR1pVPw/CcYX66azidY2 -iTYAcFwFthtFqokvSfZj4Nz30dzMo5LCaOsmhxlUsJISmwvM5m5gurWM7edzwLn6 -bM+DELWyJJ3XQcKU5kNw1+un1PScAnkfsUsu6t++KXMtO//dkDD4B9WqeIbcSMLE -GSlCYxz7Cik6gzMGPuERNWlQ5Plmos2HfzI5ATXzoUSr6YBcc0l67cD0lgeU8ICt -nHeafcJ8gIUIR5o3JMljBG9YvAzubCpKp957hE23kj+tngAtlMCIM4jeR8AVE7Xk -3fvlMD4vT1XoUCyHXCMKjmViCsnPlwVpZeYhUgBsLBA3NzFj4+XPKiAjZpaVCxXo -6t6qTf0XS97BmlPLIPl6Q5+pfSw6PELxWLrgIcfEaX0Jnfv7zEayK+kQiWnBAXja -UfvVPbN/W4o28XTt2zg40RvWpu0hYU+2YmsDJ5vCtiR7GJDoSegJKdIi89Vmjjxx -325HMjCcp0GgMtF6EOvGUXgAK5Bg1zEfdLO37jEXIb+rHu2vR+f8FJD9t0mAJu6H -7ZY0e5KJDyQMPDsiZumEfmboqDb3VTG9+35N6drtn20IafLKcNXokM3CC1/NHfj3 -b4K/6i8sUFc0c7fPXb42SSypRb/K5GlEcxRPRLGmraypvESmkQYLNIDCcfuXnru6 -q5xigN3rkJUWmEXpiQIcBBABAgAGBQJOijDEAAoJEIwa5zzehBx3FtsP/0BQozuW -jBvk7OndhzIJdPc/QAVW5noFn1ZQ/zw6SzPBGiclMuuoEd+rdRP17IEqUOBQ3Y+1 -fFgQHxpHW7HdhwhoxlVfeoD5n0xgWkFAEReFHpJG03VlcXyKqx1eC4Bgqk8ao+d1 -RcbC1lbgiZHAB/MvACLG5nmPi5EqGy4UeXp3a80JtcQf5C2/acRz2t3y4uzph9QM -fXclh+/av5C9Ce+ENjwmZJqWPx9wkf6VCLZcLIQY7OsWzXuaHZ7/dUzHOXBGYmsu -sf0pdsVnli1XtMeH3OOLY1NtlOKzI3jR/rV2gfUjL9nvrOSTxNXJT5MfiaLXtvKv -LOihXE5UnSEHGUPCkJBUrGwWuB+OgVnJtZp+YnLi19vmQ1vaOcqc5R3BpL+IWKgp -TC6JoQeBCeqfkP5t6Ow6eAg6g5h6bHkqY6fFXl47wlkvKvMFdpsoqDuW4RJ+FhhZ -8Y7bIdVgE2hagYxm60BdnqdRJMlBDTqx8n8Ne+z8OAgWlq+bdBYe9X17EPIOQmWR -/OpzGo82mNtqTFnOAu94qmZhLbKYcVssCAw75wnEzlHQ2jm7H3UOmMtjlL4I3htG -xs/M/5lotImPM3okfUtMrog2tHKEzfM/Pb/zdM8PGT+fDG+kMcnnuB2xE85Y1mi/ -XWAJcNlSGjaLpVihtS77P+fgp1uK2m18gWotiQIcBBABAgAGBQJOik5vAAoJEL2g -YIVJO6zkAFAP/2+IUCHekKDQ9V+7+R8OD0UdKqTIvZ1IJS9Ipa0KJ9zJfScDjSbG -Iy6MpxOUq/TH0bppdrTTlWjCRD+puVAi8yKZbQ75iFSl5fBP8eXQfSFSn4w+p6lV -6toYZu4pvldmN/bH5LUFJOXiCw0ixTOQD58JyTRaAh3c0WZyqbYD3abPerUIhxKk -1GMKOgt1pGLfjjMNyETF59IkDyvi15BxFuI87ukn1UU+Qayb2DYrCe+nDO1Jvgpl -bUJturTiRZVMlHMMDi01KGlZWGCp1i4pbuISoUG9KWeKsJfpeqr0rg30u5w4xVgF -G6Y53y4N+R91Y6IkFNTADMBmsg50V/EZBUGxMahEeFU0MRKuUY38FowVbmspoSOh -jepFD1Zikh3WLCo30niHU4iK41CVnb/s6ZEORuSFZF4zzxGb8+IQW5LxSmEMCqyK -ZkvMdKyUGOjGGce2Jlly9PK0izGS18ncUFcdqPaxDgQLf+Xt0gkKILSCZ0PRmf1l -RgPceZK2k+x04QtyX6DLGN9+KL8lrU0IV/5IEA73nHTi5ujcUAwF89ZVBLIzpQd4 -cfEY2QkqZSbLzKKr+ewqLLq02S6uar1ahW6xISTpd4Rzy4kYis/x1WOwPWkM9lFl -WioBKxP5KzxkU4Z+qcW7Xd/oycVcI8QL9czKfHb/gJJtSCwWEqyti/LtiQIcBBAB -AgAGBQJOikP5AAoJEE0KLZQgCQEyISQP/0Jl1W3uY7blKbp13DBb3OrgerqAJlHW -zyToGi2SY/vvO6BCTBAzyjBhanLClfdYq/AkLkom3UmyirfTcuO8UD/EobYCJ+aA -8u/EGKaaIyaXVNyZMDtI9ngO4A9MWLzC8a6PNm9LizPom7LB6/ZXgpBCNUg7hxzZ -HYy1Y7G7Nu4qnHgmsE4YRz3fgE/81lwzSXWqBmiQUmN5zt/5dPWcGxSs5m9CQebB -7+anupqJYo7Sy1vwCaeWlu3zlnDPhrGZqXNkF3TIKnP9USk20vZvshfjs+3u+uxo -sdl0Ou6kHIJd6Akf4+UsrNnwp39giVCuBddmyzsMjXtYsbRZwNLmqJDLm09DQPs3 -R1GPj6Rw01o9JCZSI3Sfprt84HDNj+HRuA88YmOisXp79ANlo6Emko/ws73+haq1 -drZb0uLINIjfiY5kXw0FfkVxE/5Zu/uc1XxJHwNtvvC+DpRk815KdtVGs1bUtvH2 -gCckQEagO4M4YX4TPLk8+qS6xpVVa0r/IUWNrX123OYUcE/ENXKtZk7XaHFmAlEn -BA5A5l7XosxzLjMviN3VruuoowW7KyHneXyJ5tIhdrPMFV8otDmiJky7r0b5y5gs -hlDHwH/rfTADOyHH7cD858JuUtyklSMFeZcopR/1KYQKqcR6hulLjOeVj5Oy7hic -IU4ZNIGF53jkiQIcBBMBAgAGBQJOilaPAAoJECMfcMqrMWhQ8jwQAIyVYWu5Oks6 -30FZlX0k4J18fwmjmYUl108sg01qCIt7sWXEyMFwmruxiYzmCN6IIAFFKQEMF3NV -yxJwbna+aCH/rRr0R9UUzjzgFgJV8twi8sStQc/FKl+HGPfreBN3/77WuMP9N0fA -5OIb3uGc10cmm0PIP2RLMTAyHGcyGxXszKm+ERPTderN/1tLd0G5k7tV3L0W0zzx -hHwQQzF7Mu7d2wGzJhebRN8NbHgBFpjNIa/LAkUKLdmaMbt9RuvCP6+9WvcWSVLl -tpW5bTWRUGHSeYvvK759fHoz8TI6uiDO18X7PY3dz6l5YFeP5QO3cSqcc38aiaz5 -H4CsR8UqUQrxOAnhkbJJPUhXvBrv8pwRv6sukPK3FJkHk441zRxrWnXgE262SO9F -CkfReL1BZM+fslUZbzAP2F2KdFz4ugfv8JFsS+RRKBRM31whDRwxAYx4KpWexXFH -tkZbcbZGLcAKxci39qTMJ0jf6E5rbnIZbot2I+3d4KGqczITTV+mevhbLqoCtF0m -/Wu0j4vFk/8dzPm9kvkOBeqNEalyz2obmmotvadhTzX4W6XrD47mAZn8db6UNIW5 -f+yhiE7aBKBScz1DFqjOcx2H86S+sGY4oRsOL1NZBWPBGZtqjPxFnpN4ZtpTA+fz -nEhlkCMmftUnvN6xyYlVq/Fc1+In2tdfiQIcBBMBAgAGBQJOilanAAoJEGaxWkZe -H57JrwIP/3Wi7G7Y95HjeXQ9VrD+Ji6A9jNRaCmq2EzxjB0wLOUl36qzUlBxwcaN -7ZQmrgI2h6uj0StlOe+lJuzxvOs8j+FsX+GvS5o3wDb8EEYGRFvVXdhWf2PHjqvP -7nQEX5GxaHfo090fxDFmOzIQSYXm5m3QBMSRCNJvmFjsJ8CAq8sNSgOodVIoatOz -b4JM1pSjcdu/j/0l8ktcsB7SGeMm3D3+jpOrh41iNb/fzEKHJWKMxGqK2p0dVKxl -iwSXGmUfUMZlcicxAsfSeZzQs0ih7b9ulheyopx4iHYlz2ivVxZ3KSGkyzFI6yCC -xJXfJ1qhlO/q7/3IEWE2C6Vrkm4gUSAR/skqHSky+6fkGqyTkE6HO+WphDVgZuyG -/Fdi45+oBY/bLiZPnFWe756liQzda0TOJu+lFU0/YaF4hqwlljQEkkm0Vs4bj5xd -CHjtq4jygU7Lc4Zm6V8I4TuVNcgyhfheB4yK+3YrArfw7IcX3ptnPOFCslMfR252 -ArSeEeHRpTar4UGH/P/RF+OjbrOZd/UwxyjdQAqQf+dXjp4oKsZJ+SYMV2MqsXzq -uU5NBXb2ykQOW+UCcBZp8et9HfVYQFzLlqrBrr219j5OhtpSDE6C6Qhsw9FKQc3h -Pp2KzIQKyWSOQ6W6B5cKdbCea8HnqAb0rTk24UoMj9SjQd4xaS02iQEcBBABAgAG -BQJOimbLAAoJEG+P8p/HMpJhxCEIALGSwNfNGitvAHBF0apo5SsbGCrqIXMafoko -belD1YdfmEieDEmith587PSkTQdujVdPvgP3oSTwPoeu0c6nhA/IT5ipHX1hdLw8 -YefXdfRXnPpz6PRggfB+llDGURUXXWi5DDEeAZVcl7x2MwbhfDSkHoJI7Aj9HQ41 -ZDVOFnsxQ0t9fTpN66M7+6Wu4qHe+bg5GzJyIG1wVj7R6tGLA8sa7pMkiQqVK7ix -jcmga2Op/JMzTJ31qmIaSPANoL3fVKIQUT/Y/6D7XALt7VQuhObLK/ZGkvVOCSiE -aIQDo5pLfg2DGgf4j6rFZ8M2fvIHRpWo+gzo6bKOmbvnGo1MW525Ag0ETolKOQEQ -APJeT06GqZitCBwaWOaIYnud2XMy1eaI1imVzbJlWDbkgQSqcAulR9l/OfXVXefR -4oAGLEtU2wwlDRgtWzNLYSfWPdn2tVp5RKsmEGQ5ieK7dvNw09hpq5J4Olz476/D -2Xhyrb8O7i8sH3ZuMdFqxqx9+INewS/Nrv+5NCVDoCaD7pSJDvTJbN+VCUmP2cJN -RHZDOIRypqiRSIlvw5T2IdE4+cfUrpJNAEx/0f0HbaY78CSWcqYeoDIW4mAfhvp0 -f1mcvbwfmxcDz2mtBLnQA6CGfS5EM1P+eSqjZyh/XT6j1VhDgWVWbz6okYskbn3z -CCdLfZrb3P467ktaok2XSaMtr5eiuFKnPobr5R3ggmEdJRgngwfiMbs/cXdmXVMT -IMIHDYkDglu9GFrcX9CxdrHkiXSyLRwwTrv393KisDRlL3At3f/alW9MD0iNZqtf -EtNjBnLw8krIxrV+6OJLo1KhNmTQlujkSyVAusxGLt00TVq13kt7gD9tcVKxD5Lk -4iS+0gktdhWCbeWoMeTSFCiO25CFGy24roQuM+OzBWo1vWOY1EJPOnZO24xqla12 -CLvdg4cXNgjQ9n1mjKWEYcLx0eikFNcmB2JBlZTB4qMzOQ/uHQkUVSPMd6f/sqRQ -WZma+8k6b/6g9DfBx5djQGLxkUHc48hUDlxEcGl7s4wpABEBAAGJBEQEGAECAA8C -GwIFAlQfYz4FCQd3TGgCKcFdIAQZAQIABgUCTolKOQAKCRCwteiGlq/my6SlEADL -AJoqajQcfvvI2Sqiuacq1EGvPyO3Hrx7/+mr8DIKuCEpSH3WIsZiOLf8TWpB7uns -17tYCfe4VmzbbOs0ogMbG0wwJBMLQ17gEC8yHU3PDPMEILKKuzVxwuPmAqSgWQp9 -OjlTk1Y3Odg8zy6JvW5jm91Gogna8nsknKQ11xbmh3jZO1aw7EfbNOnhJE2ZfxA9 -pFt87E92UqxunR4g7qST4vHqAS9YC0R1rnFJ3U/DIrtJ8Zp1Ob7xHDlR4/WRG24p -A+buxEEHRyhcNUekWL+cxYfNXG/80qEsCTMhsY5XqsvyKFWFcaoSCIPlD5B1to2y -Iu0ejmeIHOlufO9KikFhw5+2uFw80NjRFhdhv/kllSJ38kFYrBX7NEQSduC2xgNv -AUQOcJUgbJcCjHJqz9LdvXiLNq2qAg3GJi7GkNj7DU7lHLCM5N0s9RaUvliEfVb+ -DBt3IaIviyHS/9/M3LS8pHnM+3WEgIQD1i8IjuTdvvg7p6IMHl8whE+Q2vq5tlZ7 -RPrHh4vYSNIVFcgSZuacCH3el2lYWtcf5J/UsqEFnOiOBSxBT+vMHZH3hLtXHRn6 -3OANnx8l7jtlQR/MlxzLIa979ACwsuBNZHBE/cxJrWsLjC5a0MMyT92vD0KmZ4V5 -EWfSgMgGj+baYG/5Q0DFJ2KNETO89GLBE6Zr9FrBVwkQINBOWnE2YKe+LA/+KwRD -8gJO3JlrckdFw2aUBE2NEsOza+GhK3U3UOwJZ7RzHJ/jFkSaWue0v3mthZeklmeF -9PVVfx9dZVp2M8NCJEkQ7AwE8TIp/qqcunOyMMWfUUNVE/T4ZlQc+6267Jdx547/ -lhvT3DAnZRTjGS+FQtk0BK9IQUl1oVepgyNK3cLlLvqKvOLNXJHuYP3uU46BrqU8 -ZGjTv8nwyTH/t3asBpiQypdt3XyoPl2xYd2Pxt9tfwuRoL6rY2gqKswrkwwchG1V -wXXu5hQecUIPHow4BX7qHMOe8IXTXEtzJRjzvz9OpwfeNEBC48KeTt+JjHFZ9Kp8 -oYGoqLnlVuas7nBGvlH825GIYp5WHW8pY8KriZaiEnCzzS9MbczlqNaFhy5e41ZJ -UbkR1xaegLKmp/zKLy5WE3ATuDsDif6yCQTh5DHi7v75RCHqguieb7g/mz+F1KR2 -psTlPFOkVVQyB+HHJIRFN81g08Gg/0UxvE2rScxpozTjkdOIpm6hQKVOzTlEOPPF -jah9dWnmaAzqF1ihL1nxOwoP30z9CWR9x2lvS1pY1q7evBQsri7bxlXjcox8ODWa -vPW26p4SgQF9S0t6Zf/p3w/FseLJXaPEYZTkIFELvmSebALni653dQJlhBF72Qxc -mal7K7p+HI72Vw5shRYbmhlYrNUM0yLpmKVLprw= -=K5VA +tCJKdW5pbyBDIEhhbWFubyA8Z2l0c3RlckBwb2JveC5jb20+iQI7BBMBAgAlAhsD +BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCToZ45QIZAQAKCRAg0E5acTZgp1TF +EACr+QRpfDmbGnUY1Rqy50Ap1eG0061vAapCMLmU+4kxqIRKm5/00YGmb7VxRCLD +pKNa0hkH+ftA4QmnPU4j4UEsh/vAa2BGCXRjB9RixTokvQf9iOXUGiHYv1kn+p3l +xg66bLnKV3dWScjV2IueDP4ypLEZHlWD9I/Unmrg2mJEAcz4gSAfBHWLOf/+JYAq +6j6erIxPS5ZtIz/twQf6MCoXXAXuM6tgUhdptJqG82WzSZMuWOfzmS6DSTuqK05h +9gpwdj5nz4jdh4u5sp+LKOqFw94JIRcE+wj5cljOOlX3Fqi84ADC8b/OzC3V9KGa +rNnBzWdnkIoNxbNBNF6wD1dgn1peueufaP9q5CO9ljKNSOGUClwvtJFrpZZL5Phe +NNFFkPSZpkmStcB6s8RHsyz5zuqxQUOWuvLVUDRW58yZR0WC1Xc/yi+cEFSUiKI5 +OqPNwC1v0xh7a/MObJQxTQCEKHLyVYlnohsf2RxzxaOOjgWmY2O+yH5G5ymfBie/ +Uw7zcSsJ89ovLAEG/10tkJVqIfza5Wexj3VAZbI+i7vx2gtlLqM23gGykqcv7VWm +FD5lFWGC4Sw8M7Jikm8vn99dxZnsBKjMqksjENUX1JeUZI+FHg2CNSVBX0J8yLnm +d8eJBkYXkU79J3GVex/WTzbFnSkPmw16MtAu/E9EKNbAILQgSnVuaW8gQyBIYW1h +bm8gPGp1bmlvQHBvYm94LmNvbT6JAjgEEwECACIFAk6GeL4CGwMGCwkIBwMCBhUI +AgkKCwQWAgMBAh4BAheAAAoJECDQTlpxNmCn6GMQAJ0V0jmyQ7Lvi5FBBgNTdY8q +fVbLFxEUVAsKf2x9QxhsOcL2heQRVkp10JKv4/VQLfDwr6Pv98FQchXlBmFiySAb +VihUVC+VJ3FhyKBtI14RXT6Nkwd18PXDvWXy2fKeiK9GPDWkufac0h/giz0T1xP7 +CHxDErQATMmYbkinyyM+xd1Nir6DUYcHJQIK2Dg2VPChkI0XXCQETLDbrC9fDwWg +1vP36PQZ+nw/cIRt+2xkq8HHUzB7kOnXHqPt1kb/Ry8hZwPnfV7g/V0MogoMLtz2 +33pqwuguLXP7zY3jTwAZZ9VTpuCTsdVWXJDlznMNurYi1yurCNuUvq/O/9JC8WBt +dVUuvFZGjRZWfP24W57iq/qz8CV6dThq5r4WygE83tMC3DaarNJ4f9dQUA4KpL7j +2EMXkgoXcEy1mieUCypdNiZj96hV8Q7apSLk2V4jtvLkJfzX053glqRJI35SX8Ok +SazZGYZHX6QfZlvznnrCF5x/xBzhbfr2Geo4rxL0BQsp2DQodqUCB23QzsPhWWff +YtkATaD5vovGeQ9Acd1u72jH3DO8tVMH85jMO4f+oc0h3lnkPS4F33QqlnErRo/I +Rm6jCsI/NgMZUYdh0EY5Iiq/e8e+u8gdo0akkwHlNvR4KrYrK/1K4h+i+UBIbJDZ +pqT/iH+yhJRQ3CAan8KStB9KdW5pbyBDIEhhbWFubyA8amNoQGdvb2dsZS5jb20+ +iQI4BBMBAgAiBQJOhnjVAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAg +0E5acTZgp4SyD/9slQ1IkYqz+VXPnmHCQFhurYcHD8t1iGBqiXxI+gpA1Y3L1QL+ +aj0fplW4KuEPbJ7xlYdLA4J+M9kgkwt3Jufw+lM1pQM9tSB627rAbxUyczj4AFjZ +9v8GpqyZ3XPDe8NknI/V4Xlhsr+e3AHJPr355XacMkFGc3Rtw1quFVgrECttdzUD +6xtrhwYYVAYAnKr65943UtMLsVXkJLfjq8c1NZOCov9SwSb0N9IkEhSyihd/92Z2 +NH4d+B1QTIyWagL3GNN8LXXEHK+x+oA/nbhGbFg7bqhxUW4d2JaxKPy4U3nfdtSm +Mbiy16eUfMbbMyvB0jtLf6UFrxF5bJnYkiG18DcLSaX7Hsby8IVzZQZHYvkx5+7p +K2SBsdek3bu3punP3dWLJoMw+Vmm5Bk0Yl7pxzvsYQWhPV7+tpgglUSFQuIeXFrw +jVXP8Q+Ph9nO0vKIaeTcn1ISuq2XaoqhkLH+Zw1I/ruRtk2DJbZsg5BBGfA26BkZ +WJXlO6h33emPwkJ0FanlzRtMTqZ/4RiTXv5G1L/lypX1iq6fF2V+WTh2JmEKyY+2 +l0/19XRANfaDiYULoBvJEdCcIXLbaRTqjem+70ZGvAiCaGO52YvUhBo+XCgjucjc +qhxiF3wc24kzj1ZycrwbDa7VjftZAApN01CJ38mXGpZXiWZU4hjJx41wCbkCDQRO +iUo5ARAA8l5PToapmK0IHBpY5ohie53ZczLV5ojWKZXNsmVYNuSBBKpwC6VH2X85 +9dVd59HigAYsS1TbDCUNGC1bM0thJ9Y92fa1WnlEqyYQZDmJ4rt283DT2Gmrkng6 +XPjvr8PZeHKtvw7uLywfdm4x0WrGrH34g17BL82u/7k0JUOgJoPulIkO9Mls35UJ +SY/Zwk1EdkM4hHKmqJFIiW/DlPYh0Tj5x9Sukk0ATH/R/QdtpjvwJJZyph6gMhbi +YB+G+nR/WZy9vB+bFwPPaa0EudADoIZ9LkQzU/55KqNnKH9dPqPVWEOBZVZvPqiR +iyRuffMIJ0t9mtvc/jruS1qiTZdJoy2vl6K4Uqc+huvlHeCCYR0lGCeDB+Ixuz9x +d2ZdUxMgwgcNiQOCW70YWtxf0LF2seSJdLItHDBOu/f3cqKwNGUvcC3d/9qVb0wP +SI1mq18S02MGcvDySsjGtX7o4kujUqE2ZNCW6ORLJUC6zEYu3TRNWrXeS3uAP21x +UrEPkuTiJL7SCS12FYJt5agx5NIUKI7bkIUbLbiuhC4z47MFajW9Y5jUQk86dk7b +jGqVrXYIu92Dhxc2CND2fWaMpYRhwvHR6KQU1yYHYkGVlMHiozM5D+4dCRRVI8x3 +p/+ypFBZmZr7yTpv/qD0N8HHl2NAYvGRQdzjyFQOXERwaXuzjCkAEQEAAYkERAQY +AQIADwIbAgUCVB9jPgUJB3dMaAIpwV0gBBkBAgAGBQJOiUo5AAoJELC16IaWr+bL +pKUQAMsAmipqNBx++8jZKqK5pyrUQa8/I7cevHv/6avwMgq4ISlIfdYixmI4t/xN +akHu6ezXu1gJ97hWbNts6zSiAxsbTDAkEwtDXuAQLzIdTc8M8wQgsoq7NXHC4+YC +pKBZCn06OVOTVjc52DzPLom9bmOb3UaiCdryeyScpDXXFuaHeNk7VrDsR9s06eEk +TZl/ED2kW3zsT3ZSrG6dHiDupJPi8eoBL1gLRHWucUndT8Miu0nxmnU5vvEcOVHj +9ZEbbikD5u7EQQdHKFw1R6RYv5zFh81cb/zSoSwJMyGxjleqy/IoVYVxqhIIg+UP +kHW2jbIi7R6OZ4gc6W5870qKQWHDn7a4XDzQ2NEWF2G/+SWVInfyQVisFfs0RBJ2 +4LbGA28BRA5wlSBslwKMcmrP0t29eIs2raoCDcYmLsaQ2PsNTuUcsIzk3Sz1FpS+ +WIR9Vv4MG3choi+LIdL/38zctLykecz7dYSAhAPWLwiO5N2++DunogweXzCET5Da ++rm2VntE+seHi9hI0hUVyBJm5pwIfd6XaVha1x/kn9SyoQWc6I4FLEFP68wdkfeE +u1cdGfrc4A2fHyXuO2VBH8yXHMshr3v0ALCy4E1kcET9zEmtawuMLlrQwzJP3a8P +QqZnhXkRZ9KAyAaP5tpgb/lDQMUnYo0RM7z0YsETpmv0WsFXCRAg0E5acTZgp74s +D/4rBEPyAk7cmWtyR0XDZpQETY0Sw7Nr4aErdTdQ7AlntHMcn+MWRJpa57S/ea2F +l6SWZ4X09VV/H11lWnYzw0IkSRDsDATxMin+qpy6c7IwxZ9RQ1UT9PhmVBz7rbrs +l3Hnjv+WG9PcMCdlFOMZL4VC2TQEr0hBSXWhV6mDI0rdwuUu+oq84s1cke5g/e5T +joGupTxkaNO/yfDJMf+3dqwGmJDKl23dfKg+XbFh3Y/G321/C5GgvqtjaCoqzCuT +DByEbVXBde7mFB5xQg8ejDgFfuocw57whdNcS3MlGPO/P06nB940QELjwp5O34mM +cVn0qnyhgaioueVW5qzucEa+UfzbkYhinlYdbyljwquJlqIScLPNL0xtzOWo1oWH +Ll7jVklRuRHXFp6Asqan/MovLlYTcBO4OwOJ/rIJBOHkMeLu/vlEIeqC6J5vuD+b +P4XUpHamxOU8U6RVVDIH4cckhEU3zWDTwaD/RTG8TatJzGmjNOOR04imbqFApU7N +OUQ488WNqH11aeZoDOoXWKEvWfE7Cg/fTP0JZH3HaW9LWljWrt68FCyuLtvGVeNy +jHw4NZq89bbqnhKBAX1LS3pl/+nfD8Wx4sldo8RhlOQgUQu+ZJ5sAueLrnd1AmWE +EXvZDFyZqXsrun4cjvZXDmyFFhuaGVis1QzTIumYpUumvIkERAQYAQIADwIbAgUC +WXolxwUJEJR2CwIpwV0gBBkBAgAGBQJOiUo5AAoJELC16IaWr+bLpKUQAMsAmipq +NBx++8jZKqK5pyrUQa8/I7cevHv/6avwMgq4ISlIfdYixmI4t/xNakHu6ezXu1gJ +97hWbNts6zSiAxsbTDAkEwtDXuAQLzIdTc8M8wQgsoq7NXHC4+YCpKBZCn06OVOT +Vjc52DzPLom9bmOb3UaiCdryeyScpDXXFuaHeNk7VrDsR9s06eEkTZl/ED2kW3zs +T3ZSrG6dHiDupJPi8eoBL1gLRHWucUndT8Miu0nxmnU5vvEcOVHj9ZEbbikD5u7E +QQdHKFw1R6RYv5zFh81cb/zSoSwJMyGxjleqy/IoVYVxqhIIg+UPkHW2jbIi7R6O +Z4gc6W5870qKQWHDn7a4XDzQ2NEWF2G/+SWVInfyQVisFfs0RBJ24LbGA28BRA5w +lSBslwKMcmrP0t29eIs2raoCDcYmLsaQ2PsNTuUcsIzk3Sz1FpS+WIR9Vv4MG3ch +oi+LIdL/38zctLykecz7dYSAhAPWLwiO5N2++DunogweXzCET5Da+rm2VntE+seH +i9hI0hUVyBJm5pwIfd6XaVha1x/kn9SyoQWc6I4FLEFP68wdkfeEu1cdGfrc4A2f +HyXuO2VBH8yXHMshr3v0ALCy4E1kcET9zEmtawuMLlrQwzJP3a8PQqZnhXkRZ9KA +yAaP5tpgb/lDQMUnYo0RM7z0YsETpmv0WsFXCRAg0E5acTZgp2XoD/wJiq+drfb+ +IljjLScNgQbH2vq5lXub4rD5j83waVfkh60eFCo8hu1dBkaWyHs81gFPKIPRHYJJ +19B6g/nFOW7bZPbzhZzdICTejz2ITi8ipSgTsRGQMeQ+vGzlxH7dItmo0MeU2Pbf +pfTn1tB6wafHtMLaZafDIskh1RkAMFsWoEK305PtyuTSkGDGTKnA9yBX4CpKHZDR +1iYqZU+HQ0aDjiZaEl/m8S2siF6zz1PG1BFDtKDjg7+nKT1wriKfndEIksxrxxY0 +Kqfif2rUu1Kzc2FrtRQY6hguz2HASpcPLr3c6ru5e9SXqaWtfBuXkYzQ0temrFnY +3Oj/rlt5PxcB29XVuB4/CxfPgBVCHVaLOMkJtE/C9GQ5Vzb0k8OxAXClF1EXA9bT +Wri0unw/kt64cL04ZqKUlXmPDzzMdASFIq0pvEzfvIFBdrY3xNPFULEuAbxGhFoR +6iOYJzDRXbl6114IsGnVR3MdFbBQVi6isrFn16JC4yXqUXEHB+oTUTrBv5J/bWu3 +gq3O4MwAprHyTAviUvC9Iq71orXe3iAGbnaeCkPmdmxL9y5UjwXo3OaYN2Axppwd +B6j3QAIyJOkjjOCJRumQx3mKR0F464Xif3S7gcrelIYthz0JVkXg4bucUj7L/8Rl +cCAAru4p1TL+VpEBciclDjJSBVRX8nX9dLkCDQROhnXsARAA8ZueozuaZ1UR9dwb +Bt/KNag/ZiaaV4X9Jm+nQTkT9W92CTWpJ0LcVT10pVzQGDUrWLPW1sJ/ka2JjhH8 +tDFnpKjgaoBwxH+dJLWWs4RXfPXbefCAPliBaOwRZNVyK+FEnUhEHi+z2+KEoOQG +J/AtzpU+0958VgYfWhG2rRH4lDBSopC1VS3WxC+xQcxJMqR30ArJQ5avoIAAFQc6 +qzCAZ/4nbaPO1Kxdsf6ndj9jyZfaVH++OKS/cs1/nDW0JXdGH+oEFvf69FFFvwgl +OKqTw78nMhiMd2Oz1fzIwJa3uKib+JIaEhWrAAIw188lCGIcO8jJmgBP5RDlTezO +q3mA74WgwnFnxJ/LIx9N/1mvdr1ce26DMeUQBIfGBNimRxGZADg5VuKZwysmh9/J +Y/KWtHYe+0VwA+l9VzxsIs6Zo36wQTxr1DRrHSKSWmOChGmdPr924b31NA1geHZi +Qd2j8QughbVQNEARnG8Neo1HgPti1CYFjLPOp6R2j8w/fSeEPkpsPZmT38k+Tucs +pmFzsCKedGlI5BgkHB7be44rDZFOdmxQ9iXECa/KOuySHKhTXYTwJ8QvgTdEA7Qs +l0/sMQtVL4fRP/69yTxEA0RHxFG95ft0mq89Sgpty1IcdVxPNmenPerR6KVH4jos +G7cb/vFMqV09p7Sn6a89VHTG+Y8AEQEAAYkCHwQYAQIACQUCToZ17AIbDAAKCRAg +0E5acTZgpxSmD/4+nZhEFmZYlhPJXvUM4dVqk2x3eXpWhibltChkPoPaJFgZIfrC +5T8cU5Nn9G+/T3Oytzj8u/PTnCLK2xw94w6e00vSFaV+5FWZ757bOaFd13CuavOF +wxEKmulCJX4mZGSQsyF/DZEgG79FJpiiiykvgDSBCGQSga1saWMLxtsAaFj5KTb+ +ZnRLkfYd6WdWgkmUV8rDJVl6OXDGLmVIWm6zqkzT+XnxJvIgURB8zUqLbIjoR7ru +ziD5r2SU1IzK0dcGTAsPmLjTtpE97fmRU8Qsdmnkc6pyOeS2BUFQaYErGqf7HqkW +X4+4+0gW9m0mwroTXnWwMG95A1knyRsvyDerz3bHNzXbGBSvl/HJ8qQruKWQytiF +PgpFa6v7pEfEzXa6QGHxGF2y6tFxTk9LOIyHI393QLZRlt+oQNACj8NQS93MhBn7 +9rKu+YJMNf4yGDFxnPFEScuQH4BCyKztXSIzLJurxRS3h6QKGxD/O1BKaiMibcBC +H1nXFeWB2JpRZBndtS58aX9nQQIeXXODCaWJhWRknEg7U3GAgxFyAk4HnVTreFgm +leZsKT3khM69kzlZundZ1JRgSQlekDzBHcsdN4UZMGkzLYdA/0mAr1K45RkNVQuF +rk73kgYUx+4g64xkqFzSbj9jqvo2/4gH2cbnrY6ShQ+kwjEdAXLP3BGbl7kCDQRU +HbogARAAmJzYPpBprZD5rZEP++T/JS7JYzJPSCMFxppxSCy6RwTP7Tfu8Bg8Tgy2 +P6T2dkH5qez2S6+TpOUJ7b/4PmArVWk7uQmo7dkzrMh/gGA6ra44xyLfHdpFZaKu +/TjbAlKIxbWxQ9Z3+VvUpFkIJ7R2EWGNTGgpDXd6FKe+E0LoM5PEOlAQ2pgJ9a+J +35ukDV7LSLaslrAoEIYsVkIuFs0HOIgP/N7fqlCft9rJo5OifqxlG2xB/M0wEl5n +A1mAbj4I6N2BI1ft/6jWq853GJ3iX0F8BUoL3EfaFLgUN8nViXe7H4iJrgJ0HUXx +AvyRW9IkfbCd/eT8OVkHzBLK6dLi/1IoOdpkqxciH2p8YayT+I/gsgnCadU2hSDW +oOf2MB19xs6IpMF1LpG/oSsV8SvVbvBLtoAJShWh7dseUnNw9Xfp69kMjJCE4Quv +3d/l1I4DiDFpAiuXYJLs+q7OtHEUK/GARn+CYJP165JP0owYwZXE8/ZawtOsAUQr +GvtF8QgB5TO4FadB7zJ/oSsfZ8u3T6mqoYPFl7gS9J/MgF1w0oAwIp+eZkW4iqtm +zbjGhCb8CjRVOhDRxkp4E8Pz7egdHW3gdUgVcSTxmxppO+AS/JuVeuym+zAz9OTi +0mbFMjS0AqX0oGLFANeLlRhxP7xOoWj/fw8DC3cifwsUo0CTJPsAEQEAAYkERAQY +AQIADwIbAgUCWXol2AUJCwAGNgIpwV0gBBkBAgAGBQJUHbogAAoJEHWU7sez98rJ +qH8P/Ane/hZ2oajsqBbSSZZ8VVZksrC1v7XqBzLqcibsXtVRw4O/6pEsD/hRSDvb +JptUJecwGL94Qe2RVlaUH/63ODrjcOJG9dMJmLChLlzp9PN7nl79nzupjuiR/jRp +NH6pa4yCWKAj8t5e6evU+7aOUksxxRWHlAvEtnxsOqkOBAz3Nx0WYpD+h9ScrvLq +BjJSXYpgkNiLRqXONOb7vf9LQxzvPTxin+z520o9tT2KYoKc1GQ9NClzCVgdYm/R +g9DRN06SJ3ockLsKZkQ8fzjkP6qiMCNgE+iA0iP9FoHJpPeQ3fbO7z6NpklIKcEz +SXaVKH+o7uxAFmGo9fmkkOOOPt38BNjtfEkKcr/ZxlVK5WExc8gUgBAbhlgVRpCy +yNAos3sFclSjv55zUAyROLANShw/NryH5+K1yk6xZYlZa9m+RI5tu48oafsGChPM +R6E7ZHPRCw2OA5rlJfGZzTNfuxsHVeIzFJ7uAFkE6diOE9VyJ07e1a4z+NcZ9kAv +0hKrpl/jt5tcDtj7oHHeiq4yC1I3XSBt2gm+OoQEk03rnBp28E/z5Ksv6dZEaGx+ +a7yO6ld0l7yHzKxcJuhWSlce5K76UON4v1YuqnBz9eRo7LsHo9/AhFphgeewqzyi +C8O5NEk9XiSGLPK34DpqJDU9CrFIpYZj6XPFuYGQ+Gnm/U3nCRAg0E5acTZgpz8Y +D/9Hh8JWHRWhQf2a53WIlCqERNV+J6wWItmACncTyaLjJJkj7f1Ka3iZ8vo1WWWY +463m8y1hf1aNgr2trYZ6kOSwGP+BWKrRakn6/jKaL42QbUvHyR4PnGNuFYyv5thW +7988XsoKRo5GBPQzk/F+6IkKzNDgv1/i1GnVgWJmH1wg1ssMGN1fYlu43z+lKemf +0ss9pQqPtV8W+wrViO4MvWVQ/CcicsDvgA5pM9sLeIBXX3nsdo/TWdEJu4JEvsA8 +MN/q09qkGU14Ptzfze2k63nHheA2OnTOo9agQEL7N05a9zzSoXj39CubObjnTjr4 +QmqWVkkHPKWV3R1ULQle65U4zELdYfU1wXoH2AZVW+02SNZTGlRjCyoV9O01QSt3 +Rlyzajy+3gwDLnczqV0CUF7WgL0V0LYYCavjXhdc+oFsYN6kU3D31ZgOMrxauoIB +LWSzqJ83Fm6tmL0OLJuFpi8FvV9NYkqux3ECL3iTpttyEpWPKo9ZlxEgusrK2uTE +2S6rhy7zkf/3/raGgtEjIQ7E1zuR52ENlIN/djnSfkLf6OmkhgBgSs/HixC4zFtz +Dk2VltUXhUURXRl9Op+8Atrv44JfLpFehdVDjbKrFmOiW948c0LoB0g73ujnjBFO ++qTu3PzPD4ihBUJ3cNLoadoOQ9gzW/I9rkykw5jpk0sCMg== +=z4yI -----END PGP PUBLIC KEY BLOCK----- From 5f2c65c7b0d0acf7dbb6cdaf22dbe78e0a5ccd38 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 26 Sep 2017 10:28:22 -0400 Subject: [PATCH 436/842] Update to 2.14.2 In addition to bug fixes, this release contains a security fix to harden "git shell" against an unsafe user input, which "git cvsserver" copes with poorly. References: http://seclists.org/oss-sec/2017/q3/534 https://public-inbox.org/git/xmqqy3p29ekj.fsf@gitster.mtv.corp.google.com/ --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 4b57c6e..9dddfb4 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ %endif Name: git -Version: 2.14.1 +Version: 2.14.2 Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -730,6 +730,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Sep 26 2017 Todd Zullinger - 2.14.2-2 +- Update to 2.14.2 + * Thu Aug 10 2017 Todd Zullinger - 2.14.1-2 - Rebuild for rpm-4.14 bug (#1480407) diff --git a/sources b/sources index d69199d..78cc8c9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.14.1.tar.xz) = bee35ad9c6a0d0588045ec2fe5f6987cb1eeb3961cdf33cd9b51ae52017969131ea4ec09908f9b30944f85b0daa99614fb42c248c9c8dac5f21a90e2866c33b4 -SHA512 (git-2.14.1.tar.sign) = 695509fa3f8f66beb6048682914873ee445bfc9e87192cdeced060c6088681f1cf6dc292c0831a1313c294981b77c99f4bd2da586e0bbb35db1169f42b71549c +SHA512 (git-2.14.2.tar.xz) = fe99486e0aef8d73dace3081bbd62bc6d08bc13868b98c905f7833458fdfc464eea504ae2961f4a2f38892cb0e76b533a50a2cacdf07c9ad9f8106e7ac1c353c +SHA512 (git-2.14.2.tar.sign) = 0f905e6c1dc0473f1241031c381932ba4d51a1a907340e3fbfc96edf2c730518f68ae044ca29b448fa66260d710ec6834511ab9fcc27cdd9444f0c0b6980ee50 From d157da4208f2a59169844272752d8d794c6b4b56 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 23 Oct 2017 10:12:29 -0400 Subject: [PATCH 437/842] Update to 2.14.3 --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 9dddfb4..62ef4fc 100644 --- a/git.spec +++ b/git.spec @@ -44,8 +44,8 @@ %endif Name: git -Version: 2.14.2 -Release: 2%{?dist} +Version: 2.14.3 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -730,6 +730,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Oct 23 2017 Todd Zullinger - 2.14.3-1 +- Update to 2.14.3 + * Tue Sep 26 2017 Todd Zullinger - 2.14.2-2 - Update to 2.14.2 diff --git a/sources b/sources index 78cc8c9..9477487 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.14.2.tar.xz) = fe99486e0aef8d73dace3081bbd62bc6d08bc13868b98c905f7833458fdfc464eea504ae2961f4a2f38892cb0e76b533a50a2cacdf07c9ad9f8106e7ac1c353c -SHA512 (git-2.14.2.tar.sign) = 0f905e6c1dc0473f1241031c381932ba4d51a1a907340e3fbfc96edf2c730518f68ae044ca29b448fa66260d710ec6834511ab9fcc27cdd9444f0c0b6980ee50 +SHA512 (git-2.14.3.tar.xz) = e32e9ff904cbc2a77d78ca08953e3b69ac527c333a898dd053806e3d7e684ad4ae153ae7663b7ff9c16e2414c3189878a2e6c95fe9320b4af6cb1e7fa5102643 +SHA512 (git-2.14.3.tar.sign) = e0b6ab097cb12202fe033fd898a9063b78ac9f650161e24ef059057b3606100d8a847b2b48c7a07ab79af5d46f2ed0193af3d1f6da723851752ba1383d2c483d From 6e4a41c073f8b61dc8af1f7b13423758b002cbfd Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 30 Oct 2017 11:38:18 -0400 Subject: [PATCH 438/842] Update to 2.15.0 --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 62ef4fc..694e91f 100644 --- a/git.spec +++ b/git.spec @@ -44,7 +44,7 @@ %endif Name: git -Version: 2.14.3 +Version: 2.15.0 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -730,6 +730,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Oct 30 2017 Todd Zullinger - 2.15.0-1 +- Update to 2.15.0 + * Mon Oct 23 2017 Todd Zullinger - 2.14.3-1 - Update to 2.14.3 diff --git a/sources b/sources index 9477487..4018bdd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.14.3.tar.xz) = e32e9ff904cbc2a77d78ca08953e3b69ac527c333a898dd053806e3d7e684ad4ae153ae7663b7ff9c16e2414c3189878a2e6c95fe9320b4af6cb1e7fa5102643 -SHA512 (git-2.14.3.tar.sign) = e0b6ab097cb12202fe033fd898a9063b78ac9f650161e24ef059057b3606100d8a847b2b48c7a07ab79af5d46f2ed0193af3d1f6da723851752ba1383d2c483d +SHA512 (git-2.15.0.tar.xz) = 994704b440ebce104a99d815dd713af3173f29e70646d7135c3fcd1ac4694a26e499f0732843606c397cbf6108809eb397546c837623a4adbe1ccb2fc825cb64 +SHA512 (git-2.15.0.tar.sign) = 0f80a3fa630044d518adca8257de7d3699d0affc557032794fc26e0490c1fbb1516e99953dbc90642e1bd6c4adb70f7e88bc052750c659f8135ca7a75094247f From 7dbcd332fcc00efc962aea20d93c27f73466c4aa Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 7 Nov 2017 12:08:47 -0500 Subject: [PATCH 439/842] Fix git-clone memory exhaustion (CVE-2017-15298) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cherry-pick upstream patch from a937b37e76 (revision: quit pruning diff more quickly when possible, 2017-10-13)¹. Resolves: #1510455, #1510457 ¹ https://github.com/git/git/commit/a937b37e76 --- ...uning-diff-more-quickly-when-possibl.patch | 128 ++++++++++++++++++ git.spec | 11 +- 2 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 0001-revision-quit-pruning-diff-more-quickly-when-possibl.patch diff --git a/0001-revision-quit-pruning-diff-more-quickly-when-possibl.patch b/0001-revision-quit-pruning-diff-more-quickly-when-possibl.patch new file mode 100644 index 0000000..f2136f6 --- /dev/null +++ b/0001-revision-quit-pruning-diff-more-quickly-when-possibl.patch @@ -0,0 +1,128 @@ +From a937b37e766479c8e780b17cce9c4b252fd97e40 Mon Sep 17 00:00:00 2001 +From: Jeff King +Date: Fri, 13 Oct 2017 11:27:45 -0400 +Subject: [PATCH] revision: quit pruning diff more quickly when possible + +When the revision traversal machinery is given a pathspec, +we must compute the parent-diff for each commit to determine +which ones are TREESAME. We set the QUICK diff flag to avoid +looking at more entries than we need; we really just care +whether there are any changes at all. + +But there is one case where we want to know a bit more: if +--remove-empty is set, we care about finding cases where the +change consists only of added entries (in which case we may +prune the parent in try_to_simplify_commit()). To cover that +case, our file_add_remove() callback does not quit the diff +upon seeing an added entry; it keeps looking for other types +of entries. + +But this means when --remove-empty is not set (and it is not +by default), we compute more of the diff than is necessary. +You can see this in a pathological case where a commit adds +a very large number of entries, and we limit based on a +broad pathspec. E.g.: + + perl -e ' + chomp(my $blob = `git hash-object -w --stdin remove_empty_trees. This callback parameter could be +passed to the "add_remove" and "change" callbacks, but +there's not much point. They already receive the +diff_options struct, and doing it this way avoids having to +update the function signature of the other callbacks +(arguably the format_callback and output_prefix functions +could benefit from the same simplification). + +Signed-off-by: Jeff King +Signed-off-by: Junio C Hamano +--- + diff.h | 1 + + revision.c | 16 +++++++++++++--- + 2 files changed, 14 insertions(+), 3 deletions(-) + +diff --git a/diff.h b/diff.h +index e9ccb38c26..fe5c287a70 100644 +--- a/diff.h ++++ b/diff.h +@@ -180,6 +180,7 @@ struct diff_options { + pathchange_fn_t pathchange; + change_fn_t change; + add_remove_fn_t add_remove; ++ void *change_fn_data; + diff_format_fn_t format_callback; + void *format_callback_data; + diff_prefix_fn_t output_prefix; +diff --git a/revision.c b/revision.c +index 771d079f6e..7c23ab7afe 100644 +--- a/revision.c ++++ b/revision.c +@@ -394,8 +394,16 @@ static struct commit *one_relevant_parent(const struct rev_info *revs, + * if the whole diff is removal of old data, and otherwise + * REV_TREE_DIFFERENT (of course if the trees are the same we + * want REV_TREE_SAME). +- * That means that once we get to REV_TREE_DIFFERENT, we do not +- * have to look any further. ++ * ++ * The only time we care about the distinction is when ++ * remove_empty_trees is in effect, in which case we care only about ++ * whether the whole change is REV_TREE_NEW, or if there's another type ++ * of change. Which means we can stop the diff early in either of these ++ * cases: ++ * ++ * 1. We're not using remove_empty_trees at all. ++ * ++ * 2. We saw anything except REV_TREE_NEW. + */ + static int tree_difference = REV_TREE_SAME; + +@@ -406,9 +414,10 @@ static void file_add_remove(struct diff_options *options, + const char *fullpath, unsigned dirty_submodule) + { + int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD; ++ struct rev_info *revs = options->change_fn_data; + + tree_difference |= diff; +- if (tree_difference == REV_TREE_DIFFERENT) ++ if (!revs->remove_empty_trees || tree_difference != REV_TREE_NEW) + DIFF_OPT_SET(options, HAS_CHANGES); + } + +@@ -1346,6 +1355,7 @@ void init_revisions(struct rev_info *revs, const char *prefix) + DIFF_OPT_SET(&revs->pruning, QUICK); + revs->pruning.add_remove = file_add_remove; + revs->pruning.change = file_change; ++ revs->pruning.change_fn_data = revs; + revs->sort_order = REV_SORT_IN_GRAPH_ORDER; + revs->dense = 1; + revs->prefix = prefix; +-- +2.15.0 + diff --git a/git.spec b/git.spec index 694e91f..5e595f9 100644 --- a/git.spec +++ b/git.spec @@ -45,7 +45,7 @@ Name: git Version: 2.15.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -76,6 +76,10 @@ Patch0: git-1.8-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch +# https://bugzilla.redhat.com/1510455 (CVE-2017-15298) +# https://github.com/git/git/commit/a937b37e76 +Patch2: 0001-revision-quit-pruning-diff-more-quickly-when-possibl.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if ! 0%{?_without_docs} @@ -346,6 +350,7 @@ rm -rf "$tar" "$gpghome" # Cleanup tar files and tmp gpg home dir %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 # Remove git-archimport from command list sed -i '/^git-archimport/d' command-list.txt @@ -730,6 +735,10 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Nov 07 2017 Todd Zullinger - 2.15.0-2 +- Fix git-clone memory exhaustion (CVE-2017-15298) + Resolves: #1510455, #1510457 + * Mon Oct 30 2017 Todd Zullinger - 2.15.0-1 - Update to 2.15.0 From 6ef5f1f7232aa68a28afd0481aa90d1960ec086b Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 10 Nov 2017 00:48:10 -0500 Subject: [PATCH 440/842] Disable cross-directory hardlinks We cannot be sure that users installing the git package have not mounted the git bin and lib dirs on different file systems. The cost is a small amount of extra disk space (1.25M in the current build). --- git.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git.spec b/git.spec index 5e595f9..56891f9 100644 --- a/git.spec +++ b/git.spec @@ -368,6 +368,7 @@ DESTDIR = %{buildroot} INSTALL = install -p GITWEB_PROJECTROOT = %{_localstatedir}/lib/git GNU_ROFF = 1 +NO_CROSS_DIRECTORY_HARDLINKS = 1 htmldir = %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} prefix = %{_prefix} gitwebdir = %{_localstatedir}/www/git @@ -738,6 +739,7 @@ rm -rf %{buildroot} * Tue Nov 07 2017 Todd Zullinger - 2.15.0-2 - Fix git-clone memory exhaustion (CVE-2017-15298) Resolves: #1510455, #1510457 +- Disable cross-directory hardlinks * Mon Oct 30 2017 Todd Zullinger - 2.15.0-1 - Update to 2.15.0 From aa0ed7a703879ed8643d2a063a66b5598029d562 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 10 Nov 2017 00:48:10 -0500 Subject: [PATCH 441/842] Drop ancient obsoletes for git and git-arch The git-all subpackage added an obsoletes for older git packages in 0c4a11c (git 1.5.4.3 and include krh's change to rename git-core to git, 2008-02-23). The git-arch subpackage was obsoleted many years ago in 3f997b4 (Obsolete git-arch as needed, 2011-08-05). We don't need to carry either of these obsoletes any longer. --- git.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 56891f9..c064152 100644 --- a/git.spec +++ b/git.spec @@ -130,9 +130,6 @@ Provides: emacs-git = %{version}-%{release} Provides: emacs-git-el = %{version}-%{release} %endif -# Obsolete git-arch -Obsoletes: git-arch < %{version}-%{release} - %description Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations @@ -163,7 +160,6 @@ Requires: perl(Term::ReadKey) %if 0%{?rhel} && 0%{?rhel} <= 6 Requires: emacs-git = %{version}-%{release} %endif -Obsoletes: git <= 1.5.4.3 %description all Git is a fast, scalable, distributed revision control system with an @@ -740,6 +736,7 @@ rm -rf %{buildroot} - Fix git-clone memory exhaustion (CVE-2017-15298) Resolves: #1510455, #1510457 - Disable cross-directory hardlinks +- Drop ancient obsoletes for git and git-arch * Mon Oct 30 2017 Todd Zullinger - 2.15.0-1 - Update to 2.15.0 From 382ccf9f8c3b4373602751632108b1c90b52d680 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 10 Nov 2017 00:48:10 -0500 Subject: [PATCH 442/842] Update summary/description of numerous subpackages Use '%{summary}.' as the %description for all subpackages where the summary and description matched. This is one less place to change if/when we update a summary/description in the future. While looking at rpmlint complaints, gitk had a spelling warning because the summary/description used the British English spelling of "visualiser." Rather than simply change that to the American English spelling, change the summary/description to match the gitk documentation. Do the same for git-gui. Using %summary fixes the %description for perl-Git-SVN, which previously used the %description from perl-Git mistakenly. Also improve/clarify the summary of git-gnome-keyring, git-send-email, and git-svn. --- git.spec | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/git.spec b/git.spec index c064152..0832206 100644 --- a/git.spec +++ b/git.spec @@ -160,7 +160,6 @@ Requires: perl(Term::ReadKey) %if 0%{?rhel} && 0%{?rhel} <= 6 Requires: emacs-git = %{version}-%{release} %endif - %description all Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations @@ -188,7 +187,6 @@ other SCMs, install the git-all meta-package. Summary: Documentation files for git-core Group: Development/Tools Requires: git-core = %{version}-%{release} - %description core-doc Documentation files for git-core package including man pages. @@ -212,9 +210,8 @@ Summary: Simple web interface to git repositories Group: Development/Tools BuildArch: noarch Requires: git = %{version}-%{release} - %description -n gitweb -Simple web interface to track changes in git repositories +%{summary}. %package p4 Summary: Git tools for working with Perforce depots @@ -226,7 +223,7 @@ Requires: git = %{version}-%{release} %{summary}. %package svn -Summary: Git tools for importing Subversion repositories +Summary: Git tools for interacting with Subversion repositories Group: Development/Tools Requires: git = %{version}-%{release}, subversion Requires: perl(Digest::MD5) @@ -234,7 +231,7 @@ Requires: perl(Digest::MD5) Requires: perl(Term::ReadKey) %endif %description svn -Git tools for importing Subversion repositories. +%{summary}. %package cvs Summary: Git tools for importing CVS repositories @@ -245,10 +242,10 @@ Requires: cvsps Requires: perl(DBD::SQLite) Requires: perl(Git) %description cvs -Git tools for importing CVS repositories. +%{summary}. %package email -Summary: Git tools for sending email +Summary: Git tools for sending patches via email Group: Development/Tools BuildArch: noarch Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} @@ -256,24 +253,24 @@ Requires: perl(Authen::SASL) Requires: perl(Net::SMTP::SSL) Requires: perl(Git) %description email -Git tools for sending email. +%{summary}. %package gui -Summary: Git GUI tool +Summary: Graphical interface to Git Group: Development/Tools BuildArch: noarch Requires: git = %{version}-%{release}, tk >= 8.4 Requires: gitk = %{version}-%{release} %description gui -Git GUI tool. +%{summary}. %package -n gitk -Summary: Git revision tree visualiser +Summary: Git repository browser Group: Development/Tools BuildArch: noarch Requires: git = %{version}-%{release}, tk >= 8.4 %description -n gitk -Git revision tree visualiser. +%{summary}. %package -n perl-Git Summary: Perl interface to Git @@ -283,9 +280,8 @@ Requires: git = %{version}-%{release} BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) Requires: perl(Error) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) - %description -n perl-Git -Perl interface to Git. +%{summary}. %package -n perl-Git-SVN Summary: Perl interface to Git::SVN @@ -293,9 +289,8 @@ Group: Development/Libraries BuildArch: noarch Requires: git = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) - %description -n perl-Git-SVN -Perl interface to Git. +%{summary}. %if 0%{?rhel} && 0%{?rhel} <= 6 %package -n emacs-git @@ -304,7 +299,6 @@ Group: Applications/Editors Requires: git = %{version}-%{release} BuildArch: noarch Requires: emacs(bin) >= %{_emacs_version} - %description -n emacs-git %{summary}. @@ -313,14 +307,13 @@ Summary: Elisp source files for git version control system support for Em Group: Applications/Editors BuildArch: noarch Requires: emacs-git = %{version}-%{release} - %description -n emacs-git-el %{summary}. %endif %if %{gnome_keyring} %package gnome-keyring -Summary: Git module for working with gnome-keyring +Summary: Git helper for accessing credentials via gnome-keyring BuildRequires: libgnome-keyring-devel Requires: git = %{version}-%{release} Requires: gnome-keyring @@ -737,6 +730,7 @@ rm -rf %{buildroot} Resolves: #1510455, #1510457 - Disable cross-directory hardlinks - Drop ancient obsoletes for git and git-arch +- Update summary/description of numerous subpackages * Mon Oct 30 2017 Todd Zullinger - 2.15.0-1 - Update to 2.15.0 From 71cf98e0822f04d14702c25801b1538d6816b07e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 10 Nov 2017 00:48:10 -0500 Subject: [PATCH 443/842] Fix shebang in a few places to silence rpmlint complaints --- git.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/git.spec b/git.spec index 0832206..0c35525 100644 --- a/git.spec +++ b/git.spec @@ -408,6 +408,14 @@ make -C contrib/subtree/ # Remove shebang from bash-completion script sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash +# Fix shebang in a few places to silence rpmlint complaints +sed -i -e '1s|#! */usr/bin/env python$|#!%{__python2}|' \ + contrib/fast-import/import-zips.py \ + contrib/hg-to-git/hg-to-git.py \ + contrib/hooks/multimail/git_multimail.py \ + contrib/hooks/multimail/migrate-mailhook-config \ + contrib/hooks/multimail/post-receive.example + %install rm -rf %{buildroot} make %{?_smp_mflags} INSTALLDIRS=vendor install @@ -731,6 +739,7 @@ rm -rf %{buildroot} - Disable cross-directory hardlinks - Drop ancient obsoletes for git and git-arch - Update summary/description of numerous subpackages +- Fix shebang in a few places to silence rpmlint complaints * Mon Oct 30 2017 Todd Zullinger - 2.15.0-1 - Update to 2.15.0 From d24b9418f8487fa939d5b7bd75b0ba398510e63d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 10 Nov 2017 17:17:22 -0500 Subject: [PATCH 444/842] Fix t9020-remote-svn failure when setting PYTHON_PATH In ef7ac1a (git-p4: adjust python2 shebang manually, 2017-08-03) we dropped PYTHON_PATH due to failures in t9020-remote-svn. Digging deeper, the issue appears to be caused by the test calling a script which has a hard-coded #!/usr/bin/python shebang. On newer fedora releases, /usr/bin/python is python3. Replacing the shebang in contrib/svn-fe/svnrdump_sim.py (the script the test calls) with #!%{__python2} allows the test to succeed while setting PYTHON_PATH in config.mak, as desired. --- git.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/git.spec b/git.spec index 0c35525..8a819de 100644 --- a/git.spec +++ b/git.spec @@ -358,6 +358,7 @@ INSTALL = install -p GITWEB_PROJECTROOT = %{_localstatedir}/lib/git GNU_ROFF = 1 NO_CROSS_DIRECTORY_HARDLINKS = 1 +PYTHON_PATH = %{__python2} htmldir = %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} prefix = %{_prefix} gitwebdir = %{_localstatedir}/www/git @@ -414,7 +415,8 @@ sed -i -e '1s|#! */usr/bin/env python$|#!%{__python2}|' \ contrib/hg-to-git/hg-to-git.py \ contrib/hooks/multimail/git_multimail.py \ contrib/hooks/multimail/migrate-mailhook-config \ - contrib/hooks/multimail/post-receive.example + contrib/hooks/multimail/post-receive.example \ + contrib/svn-fe/svnrdump_sim.py %install rm -rf %{buildroot} @@ -448,11 +450,6 @@ make -C contrib/credential/libsecret/ clean install -pm 755 contrib/credential/netrc/git-credential-netrc \ %{buildroot}%{gitcoredir} -# Replace shebang in git-p4. Setting PYTHON_PATH = %{__python2} in config.mak -# should be the way to do this, but that causes the python-based remote svn -# tests in t9020 to fail. -sed -i -e '1s|#!.*python|#!%{__python2}|' %{buildroot}%{gitcoredir}/git-p4 - make -C contrib/subtree install make -C contrib/subtree install-doc @@ -740,6 +737,7 @@ rm -rf %{buildroot} - Drop ancient obsoletes for git and git-arch - Update summary/description of numerous subpackages - Fix shebang in a few places to silence rpmlint complaints +- Fix t9020-remote-svn failure when setting PYTHON_PATH * Mon Oct 30 2017 Todd Zullinger - 2.15.0-1 - Update to 2.15.0 From 76189e1ea42fa3e499125d545bfd9464be3830b8 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 10 Nov 2017 00:48:10 -0500 Subject: [PATCH 445/842] Add rpmlint config to silence unneeded warnings After this change, the only rpmlint issues are incorrect-fsf-address errors: git-gui.noarch: E: incorrect-fsf-address /usr/libexec/git-core/git-gui git-gui.noarch: E: incorrect-fsf-address /usr/libexec/git-core/git-citool git.x86_64: E: incorrect-fsf-address /usr/share/emacs/site-lisp/git/git.el git-core-doc.x86_64: E: incorrect-fsf-address /usr/share/doc/git/contrib/hg-to-git/hg-to-git.py git-core-doc.x86_64: E: incorrect-fsf-address /usr/share/doc/git/contrib/emacs/git.el git-core-doc.x86_64: E: incorrect-fsf-address /usr/share/doc/git/contrib/fast-import/import-directories.perl git-debuginfo.x86_64: E: incorrect-fsf-address /usr/src/debug/git-2.15.0/trace.c These issues will be fixed in the next upstream release, with the following commits: https://github.com/git/git/commit/484257925f https://github.com/git/git/commit/63100874c1 --- .rpmlint | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .rpmlint diff --git a/.rpmlint b/.rpmlint new file mode 100644 index 0000000..319e939 --- /dev/null +++ b/.rpmlint @@ -0,0 +1,17 @@ +from Config import * + +# the dictionary is a bit limited +addFilter("git.* spelling-error %description .* subpackages") + +# We're not misusing %{buildroot} here +addFilter("git\.(spec|src):.* rpm-buildroot-usage %prep DESTDIR = %{buildroot}") + +# 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-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 doc/manpage warnings where we don't expect any documentation +addFilter("git-(all|core|gnome-keyring)\..*: W: no-documentation") +addFilter("git-core\..*: W: no-manual-page-for-binary") From 054dd6179a150413858b4c3c00983a6e51beed1b Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 11 Nov 2017 17:48:02 -0500 Subject: [PATCH 446/842] Rename %gitcoredir to %gitexecdir; upstream uses the latter Using the same variable make it clearer that we're referring to the same thing as upstream when the Makefile uses gitexecdir. Remove a stale conditional in git-cvs for handling the case where git's binaries are stored in %{_bindir}. This support was dropped after EL-5's support ended. Most similar conditionals were removed in 903d8f3 (Remove EL-5 and old Fedora conditionals, 2017-07-22). Also remove the conditional setting of 'gitexecdir = %{_bindir}' which was only used on EL-5 to prevent moving the git binaries during the update to git-1.6. --- git.spec | 35 +++++++++++++++-------------------- git.xinetd.in | 2 +- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/git.spec b/git.spec index 8a819de..48fb3c5 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation -%global gitcoredir %{_libexecdir}/git-core +%global gitexecdir %{_libexecdir}/git-core # Settings for F-19+ and EL-7+ %if 0%{?fedora} || 0%{?rhel} >= 7 @@ -364,10 +364,6 @@ prefix = %{_prefix} gitwebdir = %{_localstatedir}/www/git EOF -%if "%{gitcoredir}" == "%{_bindir}" -echo gitexecdir = %{_bindir} >> config.mak -%endif - # Filter bogus perl requires # packed-refs comes from a comment in contrib/hooks/update-paranoid # YAML::Any is optional and not available on el5 @@ -437,18 +433,18 @@ install -Dpm 644 %{SOURCE10} \ %if %{gnome_keyring} install -pm 755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \ - %{buildroot}%{gitcoredir} + %{buildroot}%{gitexecdir} # Remove built binary files, otherwise they will be installed in doc make -C contrib/credential/gnome-keyring/ clean %endif %if %{libsecret} install -pm 755 contrib/credential/libsecret/git-credential-libsecret \ - %{buildroot}%{gitcoredir} + %{buildroot}%{gitexecdir} # Remove built binary files, otherwise they will be installed in doc make -C contrib/credential/libsecret/ clean %endif install -pm 755 contrib/credential/netrc/git-credential-netrc \ - %{buildroot}%{gitcoredir} + %{buildroot}%{gitexecdir} make -C contrib/subtree install make -C contrib/subtree install-doc @@ -492,7 +488,7 @@ cp -a %{SOURCE15} %{SOURCE16} %{buildroot}%{_unitdir} %else mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d perl -p \ - -e "s|\@GITCOREDIR\@|%{gitcoredir}|g;" \ + -e "s|\@GITEXECDIR\@|%{gitexecdir}|g;" \ -e "s|\@BASE_PATH\@|%{_localstatedir}/lib/git|g;" \ %{SOURCE11} > %{buildroot}%{_sysconfdir}/xinetd.d/git %endif @@ -622,15 +618,15 @@ rm -rf %{buildroot} %files p4 %defattr(-,root,root) -%{gitcoredir}/*p4* -%{gitcoredir}/mergetools/p4merge +%{gitexecdir}/*p4* +%{gitexecdir}/mergetools/p4merge %{_pkgdocdir}/*p4*.txt %{!?_without_docs: %{_mandir}/man1/*p4*.1*} %{!?_without_docs: %{_pkgdocdir}/*p4*.html } %files svn %defattr(-,root,root) -%{gitcoredir}/*svn* +%{gitexecdir}/*svn* #NOTE: what about svn-fe %{_pkgdocdir}/*svn*.txt %{!?_without_docs: %{_mandir}/man1/*svn*.1*} @@ -639,24 +635,22 @@ rm -rf %{buildroot} %files cvs %defattr(-,root,root) %{_pkgdocdir}/*git-cvs*.txt -%if "%{gitcoredir}" != "%{_bindir}" %{_bindir}/git-cvsserver -%endif -%{gitcoredir}/*cvs* +%{gitexecdir}/*cvs* %{!?_without_docs: %{_mandir}/man1/*cvs*.1*} %{!?_without_docs: %{_pkgdocdir}/*git-cvs*.html } %files email %defattr(-,root,root) %{_pkgdocdir}/*email*.txt -%{gitcoredir}/*email* +%{gitexecdir}/*email* %{!?_without_docs: %{_mandir}/man1/*email*.1*} %{!?_without_docs: %{_pkgdocdir}/*email*.html } %files gui %defattr(-,root,root) -%{gitcoredir}/git-gui* -%{gitcoredir}/git-citool +%{gitexecdir}/git-gui* +%{gitexecdir}/git-citool %{_datadir}/applications/*git-gui.desktop %{_datadir}/git-gui/ %{_pkgdocdir}/git-gui.txt @@ -705,7 +699,7 @@ rm -rf %{buildroot} %else %config(noreplace)%{_sysconfdir}/xinetd.d/git %endif -%{gitcoredir}/git-daemon +%{gitexecdir}/git-daemon %{_localstatedir}/lib/git %{!?_without_docs: %{_mandir}/man1/git-daemon*.1*} %{!?_without_docs: %{_pkgdocdir}/git-daemon*.html} @@ -722,7 +716,7 @@ rm -rf %{buildroot} %if %{gnome_keyring} %files gnome-keyring %defattr(-,root,root) -%{gitcoredir}/git-credential-gnome-keyring +%{gitexecdir}/git-credential-gnome-keyring %endif @@ -738,6 +732,7 @@ rm -rf %{buildroot} - Update summary/description of numerous subpackages - Fix shebang in a few places to silence rpmlint complaints - Fix t9020-remote-svn failure when setting PYTHON_PATH +- Rename %%gitcoredir to %%gitexecdir; upstream uses the latter * Mon Oct 30 2017 Todd Zullinger - 2.15.0-1 - Update to 2.15.0 diff --git a/git.xinetd.in b/git.xinetd.in index 540e070..d4ca95d 100644 --- a/git.xinetd.in +++ b/git.xinetd.in @@ -8,7 +8,7 @@ service git socket_type = stream wait = no user = nobody - server = @GITCOREDIR@/git-daemon + server = @GITEXECDIR@/git-daemon server_args = --base-path=@BASE_PATH@ --export-all --user-path=public_git --syslog --inetd --verbose log_on_failure += USERID } From cb7fab7e6ca421bc486147273f9804919b1f5046 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 10 Nov 2017 20:40:48 -0500 Subject: [PATCH 447/842] Move commands which no longer require perl into git-core Commands which required perl were moved from git-core to git in 6fdc5e5 (new subpackage git-core, which is perl-less and part of original git rpm, 2015-06-03). This was with git-2.4.2. Since then, a number of commands have been partially or entirely rewritten upstream and no longer require perl. Move them back to git-core. - git-am was converted to a builtin in 2.6.0, 783d7e865e (builtin-am: remove redirection to git-am.sh, 2015-08-04) - git-submodule's dependence on perl was removed in 2.10.0, 74703a1e4d (submodule: rewrite `module_list` shell function in C, 2015-09-02) - git-relink was removed in 2.12.0, ed21e30fef (relink: retire the command, 2017-01-25) Additionally, two sample hooks (pre-rebase and prepare-commit-msg) were intended to be excluded from git-core due to their perl dependencies, but were included due to the way the exclusion via %files lists are created. List them explicitly in the git %files section and exclude them from git-core. --- git.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 48fb3c5..8a047fa 100644 --- a/git.spec +++ b/git.spec @@ -531,7 +531,7 @@ chmod a-x Documentation/technical/api-index.sh find contrib -type f | xargs chmod -x # Split core files -not_core_re="git-(add--interactive|am|credential-(gnome-keyring|libsecret|netrc)|difftool|instaweb|relink|request-pull|send-mail|submodule)|gitweb|prepare-commit-msg|pre-rebase" +not_core_re="git-(add--interactive|credential-(gnome-keyring|libsecret|netrc)|difftool|instaweb|request-pull|send-mail)|gitweb" grep -vE "$not_core_re|%{_mandir}" bin-man-doc-files > bin-files-core grep -vE "$not_core_re" bin-man-doc-files | grep "%{_mandir}" > man-doc-files-core grep -E "$not_core_re" bin-man-doc-files \ @@ -598,6 +598,8 @@ rm -rf %{buildroot} %endif %{_datadir}/git-core/contrib/hooks/update-paranoid %{_datadir}/git-core/contrib/hooks/setgitperms.perl +%{_datadir}/git-core/templates/hooks/pre-rebase.sample +%{_datadir}/git-core/templates/hooks/prepare-commit-msg.sample %files core -f bin-files-core %defattr(-,root,root) @@ -605,9 +607,11 @@ rm -rf %{buildroot} # be used elsewhere %{!?_licensedir:%global license %doc} %license COPYING -# exlude is best way here because of troubels with symlinks inside git-core/ +# exlude is best way here because of troubles with symlinks inside git-core/ %exclude %{_datadir}/git-core/contrib/hooks/update-paranoid %exclude %{_datadir}/git-core/contrib/hooks/setgitperms.perl +%exclude %{_datadir}/git-core/templates/hooks/pre-rebase.sample +%exclude %{_datadir}/git-core/templates/hooks/prepare-commit-msg.sample %{bashcomproot} %{_datadir}/git-core/ @@ -733,6 +737,7 @@ rm -rf %{buildroot} - Fix shebang in a few places to silence rpmlint complaints - Fix t9020-remote-svn failure when setting PYTHON_PATH - Rename %%gitcoredir to %%gitexecdir; upstream uses the latter +- Move commands which no longer require perl into git-core * Mon Oct 30 2017 Todd Zullinger - 2.15.0-1 - Update to 2.15.0 From 339c6b6d5c0ed41700a2760deb889ff5b9b6b6ed Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 11 Nov 2017 13:05:03 -0500 Subject: [PATCH 448/842] Move filter-branch out of core, it needs perl now MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A change to the git filter-branch command in git-2.15 added a perl dependency, bd2c79fbfe (filter-branch: stash away ref map in a branch, 2017-09-21)¹. This dependency is only present when using the option --state-branch, which means many users of filter-branch will never notice the perl dependency. However, without moving the tool from git-core to git, any users running filter-branch with the --state-branch option might find that the command fails badly, potentially leaving their repository in a broken state. This is not an acceptable trade-off, in my opinion. I'm not sure if it's worthwhile to suggest a patch upstream to better handle users running with the --state-branch option when perl is not installed, allowing us to safely ship git filter-branch in git-core for use on systems without perl. ¹ https://github.com/git/git/commit/bd2c79fbfe --- git.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 8a047fa..ceab34f 100644 --- a/git.spec +++ b/git.spec @@ -531,7 +531,7 @@ chmod a-x Documentation/technical/api-index.sh find contrib -type f | xargs chmod -x # Split core files -not_core_re="git-(add--interactive|credential-(gnome-keyring|libsecret|netrc)|difftool|instaweb|request-pull|send-mail)|gitweb" +not_core_re="git-(add--interactive|credential-(gnome-keyring|libsecret|netrc)|difftool|filter-branch|instaweb|request-pull|send-mail)|gitweb" grep -vE "$not_core_re|%{_mandir}" bin-man-doc-files > bin-files-core grep -vE "$not_core_re" bin-man-doc-files | grep "%{_mandir}" > man-doc-files-core grep -E "$not_core_re" bin-man-doc-files \ @@ -738,6 +738,7 @@ rm -rf %{buildroot} - Fix t9020-remote-svn failure when setting PYTHON_PATH - Rename %%gitcoredir to %%gitexecdir; upstream uses the latter - Move commands which no longer require perl into git-core +- Move filter-branch out of core, it needs perl now * Mon Oct 30 2017 Todd Zullinger - 2.15.0-1 - Update to 2.15.0 From 6dc62852839d0dc9b9c510d29c723de35a77911a Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 10 Nov 2017 00:48:10 -0500 Subject: [PATCH 449/842] Improve test suite coverage 3041eeb (Run git test suite, 2016-12-16) enabled the test suite, but many of the tests were skipped due to missing requirements. Improve the test suite coverage by ensuring as many requirements are present as possible. Also add an option to run the test suite with multiple jobs using the %{?_smp_mflags} macro. This cut the test suite run time roughly in half in local testing. The -O option to 'make' helps ensure the output of each job is collected together rather than interspersed with output from other jobs. Sadly, the tests fail when run in parallel in koji, so this is disabled by default. It is included to speed up local builds. To enable in rpmbuild and mock, use either "--with parallel_tests" or "--define 'parallel_tests 1'" arguments. This is only supported on Fedora, as it requires make >= 4.0, which neither EL6 nor EL7 satisfy. Disable 2 failing tests which run with a limited stack on aarch64, arm*, and ppc* architectures. Some debugging with the affected hardware is needed. Similarly, disable "git svn branch tests" globally for both t9128-git-svn-cmd-branch and t9167-git-svn-cmd-branch-subproject because they fail randomly. The bug seems likely to be in the subversion perl bindings, but requires more testing. The failure output from a manual run (./t9128-git-svn-cmd-branch.sh -v -x -d): ++ git svn branch a Copying file:///home/tmz/rpmbuild/BUILD/git-2.14.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///home/tmz/rpmbuild/BUILD/git-2.14.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a... Found possible branch point: file:///home/tmz/rpmbuild/BUILD/git-2.14.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///home/tmz/rpmbuild/BUILD/git-2.14.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a, 2 Found branch parent: (refs/remotes/origin/a) bb43a88ce94511096d7d774f4d5feae281603eb0 Following parent with do_switch Successfully followed parent r3 = 2e27ee45dadc098239114bc13a6ae6cf6122d16f (refs/remotes/origin/a) error: git-svn died of signal 11 + test_eval_ret_=139 + want_trace + test t = t + test t = t + set +x error: last command exited with $?=139 not ok 3 - git svn branch tests The failure in t9167-git-svn-cmd-branch-subproject is similar. --- git.spec | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index ceab34f..e3b876b 100644 --- a/git.spec +++ b/git.spec @@ -43,6 +43,19 @@ %global test_links 0 %endif +# Allow tests to run in parallel. Disabled by default due to unresolved +# failures when building in koji. Enabling it speeds up the test suite quite a +# bit though. The -O (--output-sync) option requires make > 4.0, which is not +# available on EL <= 7. Without it, running the tests in parallel causes the +# output to be rather unweildy, so restrict parallel tests to Fedora. +# +# Pass "--with parallel_tests" or "--define 'parallel_tests 1'" to +# rpmbuild/mock. +%bcond_with parallel_tests +%if %{with parallel_tests} && 0%{?fedora} +%global make_test_opts -O %{?_smp_mflags} +%endif + Name: git Version: 2.15.0 Release: 2%{?dist} @@ -113,6 +126,36 @@ BuildRequires: pkgconfig(bash-completion) BuildRequires: systemd %endif +# Test suite requirements +%if 0%{?fedora} && 0%{?fedora} >= 27 +# Needed by t5540-http-push-webdav.sh +BuildRequires: apr-util-bdb +%endif +BuildRequires: cvs +BuildRequires: cvsps +BuildRequires: gnupg +%if 0%{?fedora} || ( 0%{?rhel} && 0%{?rhel} == 7 && %{_arch} != ppc64 ) +BuildRequires: highlight +%endif +BuildRequires: httpd +%if 0%{?fedora} +BuildRequires: jgit +%endif +BuildRequires: pcre +BuildRequires: perl(CGI) +BuildRequires: perl(CGI::Carp) +BuildRequires: perl(CGI::Util) +BuildRequires: perl(DBD::SQLite) +BuildRequires: perl(Digest::MD5) +BuildRequires: perl(IO::Pty) +BuildRequires: perl(Mail::Address) +BuildRequires: perl(Memoize) +BuildRequires: perl(Test::More) +BuildRequires: perl(Time::HiRes) +BuildRequires: subversion +BuildRequires: subversion-perl +BuildRequires: time + Requires: git-core = %{version}-%{release} Requires: git-core-doc = %{version}-%{release} Requires: perl(Error) @@ -568,13 +611,39 @@ find %{buildroot}%{_pkgdocdir}/{howto,technical} -type f \ %if %{test_links} find %{buildroot}%{_pkgdocdir} -name "*.html" | xargs linkchecker %endif + +# Tests to skip on all releases and architectures +# t9128-git-svn-cmd-branch - "branch tests" fails randomnly +# t9167-git-svn-cmd-branch-subproject - "branch tests" fails randomnly +GIT_SKIP_TESTS="t9128.3 t9167.3" + +%ifarch aarch64 %{arm} %{power64} +# Skip tests which fail on aarch64, arm, and ppc +# +# The following 2 tests use run_with_limited_cmdline, which calls ulimit -s 128 +# to limit the maximum stack size. +# t5541.33 '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.33 t5551.25" +%endif + %ifarch s390x # Skip grep tests which fail intermittently on s390x ## - probably it is because of current troubles with binutils on s390x. Will ## try tests when troubles on s390x will be resolved -export GIT_SKIP_TESTS="t7008 t7810 t7811 t7812 t7813 t7814" +GIT_SKIP_TESTS="$GIT_SKIP_TESTS t7008 t7810 t7811 t7812 t7813 t7814" %endif -make test + +export GIT_SKIP_TESTS + +# Set LANG so various UTF-8 tests are run +export LANG=en_US.UTF-8 + +# Set SVNSERVE_PORT to run svnserve tests +export SVNSERVE_PORT=9000 + +# Run the tests +make %{?make_test_opts} test %clean rm -rf %{buildroot} @@ -739,6 +808,7 @@ rm -rf %{buildroot} - Rename %%gitcoredir to %%gitexecdir; upstream uses the latter - Move commands which no longer require perl into git-core - Move filter-branch out of core, it needs perl now +- Improve test suite coverage * Mon Oct 30 2017 Todd Zullinger - 2.15.0-1 - Update to 2.15.0 From 2fd0c5cf45ba70eaaf9d93c40ad1742f2af58349 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 11 Nov 2017 23:20:53 -0500 Subject: [PATCH 450/842] Remove unneeded cleanup of shebang in bash-completion script In older versions of git, the bash-completion script began with a needless #!bash, which we removed before installation. This and other unneeded shebangs were removed upstream in 1.9.0, 11d62145b9 (remove #!interpreter line from shell libraries, 2013-11-25). --- git.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/git.spec b/git.spec index e3b876b..4affaf2 100644 --- a/git.spec +++ b/git.spec @@ -445,9 +445,6 @@ make -C contrib/credential/netrc/ make -C contrib/subtree/ -# Remove shebang from bash-completion script -sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash - # Fix shebang in a few places to silence rpmlint complaints sed -i -e '1s|#! */usr/bin/env python$|#!%{__python2}|' \ contrib/fast-import/import-zips.py \ From 99aec7086b0b6f44570a7b803089b19ffcb39748 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 11 Nov 2017 23:29:46 -0500 Subject: [PATCH 451/842] Remove stale comment regarding perl YAML::Any filtering The code to filter the spurious YAML::Any requires was removed in 903d8f3 (Remove EL-5 and old Fedora conditionals, 2017-07-22). The comment was simply missed. --- git.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/git.spec b/git.spec index 4affaf2..4ca1939 100644 --- a/git.spec +++ b/git.spec @@ -409,7 +409,6 @@ EOF # Filter bogus perl requires # packed-refs comes from a comment in contrib/hooks/update-paranoid -# YAML::Any is optional and not available on el5 %if %{use_new_rpm_filters} %{?perl_default_filter} %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}perl\\(packed-refs\\) From 08602e223bfdf7d5d5e4899958540bae923d1027 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 21 Nov 2017 22:50:59 -0500 Subject: [PATCH 452/842] Add tcl/tk BuildRequires The git-gui build tries to use tclsh to generate an index file. It falls back to a static list, which is why this wasn't noticed before. It's not a real problem, but git may soon also try to test that wish is installed before building and installing git-gui and gitk, so this helps prepare for that future. --- git.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/git.spec b/git.spec index 4ca1939..1afacda 100644 --- a/git.spec +++ b/git.spec @@ -118,6 +118,8 @@ BuildRequires: perl-generators BuildRequires: perl(Test) BuildRequires: openssl-devel BuildRequires: zlib-devel >= 1.2 +BuildRequires: tcl +BuildRequires: tk %if %{bashcomp_pkgconfig} BuildRequires: pkgconfig(bash-completion) %endif @@ -793,6 +795,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Nov 21 2017 Todd Zullinger +- Add tcl/tk BuildRequires + * Tue Nov 07 2017 Todd Zullinger - 2.15.0-2 - Fix git-clone memory exhaustion (CVE-2017-15298) Resolves: #1510455, #1510457 From 030dee6148a87d718ccdcb73083b6685f373d743 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 15 Nov 2017 23:32:35 -0500 Subject: [PATCH 453/842] Enable support for release candidate builds Building release candidates helps test the upstream code before it's final. Make it easier to create such builds by defining an rcrev macro, which is commented out by default. --- git.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 1afacda..ff1ba81 100644 --- a/git.spec +++ b/git.spec @@ -56,15 +56,18 @@ %global make_test_opts -O %{?_smp_mflags} %endif +# Define for release candidates +#global rcrev .rc0 + Name: git Version: 2.15.0 -Release: 2%{?dist} +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools URL: https://git-scm.com/ -Source0: https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.xz -Source1: https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.sign +Source0: https://www.kernel.org/pub/software/scm/git/%{?rcrev:testing/}%{name}-%{version}%{?rcrev}.tar.xz +Source1: https://www.kernel.org/pub/software/scm/git/%{?rcrev:testing/}%{name}-%{version}%{?rcrev}.tar.sign # Junio C Hamano's key is used to sign git releases, it can be found in the # junio-gpg-pub tag within git. @@ -381,7 +384,7 @@ xz -dc $src > $tar gpgv2 --homedir "$gpghome" --quiet --keyring $key.gpg $tar.sign $tar rm -rf "$tar" "$gpghome" # Cleanup tar files and tmp gpg home dir -%setup -q +%setup -q -n %{name}-%{version}%{?rcrev} %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -797,6 +800,7 @@ rm -rf %{buildroot} %changelog * Tue Nov 21 2017 Todd Zullinger - Add tcl/tk BuildRequires +- Enable support for release candidate builds * Tue Nov 07 2017 Todd Zullinger - 2.15.0-2 - Fix git-clone memory exhaustion (CVE-2017-15298) From 0f50b14ee4d80756e0e238ce857625ea96181a40 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 21 Nov 2017 15:45:54 -0500 Subject: [PATCH 454/842] Add .mailmap for git shortlog output Use the name/address from the %changelog where author names on commits differed. This makes git shortlog output more consistent. --- .mailmap | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..88615c5 --- /dev/null +++ b/.mailmap @@ -0,0 +1,18 @@ + + + + + + +James Bowes + +Josh Boyer + + + + + + + + + From 3baa69d782e19b7ed07232b57312a207a537135a Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 28 Nov 2017 21:23:34 -0500 Subject: [PATCH 455/842] Update to 2.15.1 https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.15.1.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index ff1ba81..715fa2e 100644 --- a/git.spec +++ b/git.spec @@ -60,8 +60,8 @@ #global rcrev .rc0 Name: git -Version: 2.15.0 -Release: 2%{?rcrev}%{?dist} +Version: 2.15.1 +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -798,6 +798,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Nov 28 2017 Todd Zullinger - 2.15.1-1 +- Update to 2.15.1 + * Tue Nov 21 2017 Todd Zullinger - Add tcl/tk BuildRequires - Enable support for release candidate builds diff --git a/sources b/sources index 4018bdd..13092a2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.15.0.tar.xz) = 994704b440ebce104a99d815dd713af3173f29e70646d7135c3fcd1ac4694a26e499f0732843606c397cbf6108809eb397546c837623a4adbe1ccb2fc825cb64 -SHA512 (git-2.15.0.tar.sign) = 0f80a3fa630044d518adca8257de7d3699d0affc557032794fc26e0490c1fbb1516e99953dbc90642e1bd6c4adb70f7e88bc052750c659f8135ca7a75094247f +SHA512 (git-2.15.1.tar.xz) = dcf300b28e41f7757d866e768d641137718b43eb6d12a2cfff99fb429775e0cab87bbff48147b8588bc0f69e92eb5ca2ad1f75c8cf5205e41853d8e8652f900b +SHA512 (git-2.15.1.tar.sign) = a65038b036cd7a8ecedb83cc46f9c380726481d1ac2f6e0cc932f6f8a8c6c3872782387f882a22be8895abd8709470305a6fb7f228d55ea78632f840ae7045c6 From 1b01c1c177a38e95515d7200cc5a8a2c3b35f5a6 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 29 Nov 2017 11:10:22 -0500 Subject: [PATCH 456/842] Fix debuginfo for gnome-keyring and libsecret credential helpers We used to remove the contrib/credential tree from the build dir to avoid binaries and other cruft from ending up in the doc dir. Doing so prevented debuginfo from being generated for the credential helpers we install. The following warnings were printed during the debuginfo extraction: cpio: git-2.15.1/contrib/credential/gnome-keyring: Cannot stat: No such file or directory cpio: git-2.15.1/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c: Cannot stat: No such file or directory cpio: git-2.15.1/contrib/credential/libsecret: Cannot stat: No such file or directory cpio: git-2.15.1/contrib/credential/libsecret/git-credential-libsecret.c: Cannot stat: No such file or directory Keep contrib/credential in the build dir; remove it from the buildroot instead. --- git.spec | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/git.spec b/git.spec index 715fa2e..d8732f9 100644 --- a/git.spec +++ b/git.spec @@ -61,7 +61,7 @@ Name: git Version: 2.15.1 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -478,14 +478,10 @@ install -Dpm 644 %{SOURCE10} \ %if %{gnome_keyring} install -pm 755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \ %{buildroot}%{gitexecdir} -# Remove built binary files, otherwise they will be installed in doc -make -C contrib/credential/gnome-keyring/ clean %endif %if %{libsecret} install -pm 755 contrib/credential/libsecret/git-credential-libsecret \ %{buildroot}%{gitexecdir} -# Remove built binary files, otherwise they will be installed in doc -make -C contrib/credential/libsecret/ clean %endif install -pm 755 contrib/credential/netrc/git-credential-netrc \ %{buildroot}%{gitexecdir} @@ -502,9 +498,6 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';' find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';' -# Clean up contrib/credential to avoid cruft in the git-core-doc docdir -rm -rf contrib/credential - # Clean up contrib/subtree to avoid cruft in the git-core-doc docdir rm -rf contrib/subtree/{INSTALL,Makefile,git-subtree{,.{1,html,sh,txt,xml}},t} @@ -587,6 +580,8 @@ grep -E "$not_core_re" bin-man-doc-files \ not_core_doc_re="(git-(cvs|gui|citool|daemon))|p4|svn|email|gitk|gitweb" mkdir -p %{buildroot}%{_pkgdocdir}/ cp -pr README.md Documentation/*.txt Documentation/RelNotes contrib %{buildroot}%{_pkgdocdir}/ +# Remove contrib/credential, it has nothing useful for documentation +rm -rf %{buildroot}%{_pkgdocdir}/contrib/credential/ cp -p gitweb/INSTALL %{buildroot}%{_pkgdocdir}/INSTALL.gitweb cp -p gitweb/README %{buildroot}%{_pkgdocdir}/README.gitweb @@ -798,6 +793,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Nov 29 2017 Todd Zullinger - 2.15.1-2 +- Fix debuginfo for gnome-keyring and libsecret credential helpers + * Tue Nov 28 2017 Todd Zullinger - 2.15.1-1 - Update to 2.15.1 From 4079ad14b1882fcf2d6a8f3f407d22210b1f67d9 Mon Sep 17 00:00:00 2001 From: Ben Harper Date: Thu, 30 Nov 2017 18:48:54 +0000 Subject: [PATCH 457/842] fix typo in comment --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index d8732f9..f5ff951 100644 --- a/git.spec +++ b/git.spec @@ -672,7 +672,7 @@ rm -rf %{buildroot} # be used elsewhere %{!?_licensedir:%global license %doc} %license COPYING -# exlude is best way here because of troubles with symlinks inside git-core/ +# exclude is best way here because of troubles with symlinks inside git-core/ %exclude %{_datadir}/git-core/contrib/hooks/update-paranoid %exclude %{_datadir}/git-core/contrib/hooks/setgitperms.perl %exclude %{_datadir}/git-core/templates/hooks/pre-rebase.sample From 2e7d4595e521114fa6b11974249db8722b04b72f Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 30 Nov 2017 16:40:38 -0500 Subject: [PATCH 458/842] Include verbose logs in build output for 'make test' failures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When building in koji or copr and a test fails, the verbose output from the tests can be very useful in determining the cause. Print the output from failing tests, borrowing heavily from the upstream code¹ used when running tests in Travis CI². This could be done inline in %check rather than in a separate script. The downside is that rpm would include each command invocation of the loop in the output, which adds a lot of useless text to the already copious build output. ¹ https://git.kernel.org/pub/scm/git/git.git/plain/ci/print-test-failures.sh ² https://travis-ci.org/git/git --- git.spec | 15 +++++++++++++-- print-failed-test-output | 11 +++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 print-failed-test-output diff --git a/git.spec b/git.spec index f5ff951..f072ebc 100644 --- a/git.spec +++ b/git.spec @@ -61,7 +61,7 @@ Name: git Version: 2.15.1 -Release: 2%{?rcrev}%{?dist} +Release: 3%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -88,6 +88,10 @@ Source13: git-gui.desktop Source14: gitweb.conf.in Source15: git@.service Source16: git.socket + +# Script to print test failure output (used in %%check) +Source99: print-failed-test-output + Patch0: git-1.8-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch @@ -389,6 +393,9 @@ rm -rf "$tar" "$gpghome" # Cleanup tar files and tmp gpg home dir %patch1 -p1 %patch2 -p1 +# Install print-failed-test-output script +install -p -m 755 %{SOURCE99} print-failed-test-output + # Remove git-archimport from command list sed -i '/^git-archimport/d' command-list.txt @@ -639,7 +646,8 @@ export LANG=en_US.UTF-8 export SVNSERVE_PORT=9000 # Run the tests -make %{?make_test_opts} test +GIT_TEST_OPTS='--verbose-log' make %{?make_test_opts} test || \ + ./print-failed-test-output %clean rm -rf %{buildroot} @@ -793,6 +801,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Nov 30 2017 Todd Zullinger - 2.15.1-3 +- Include verbose logs in build output for 'make test' failures + * Wed Nov 29 2017 Todd Zullinger - 2.15.1-2 - Fix debuginfo for gnome-keyring and libsecret credential helpers diff --git a/print-failed-test-output b/print-failed-test-output new file mode 100644 index 0000000..f095b86 --- /dev/null +++ b/print-failed-test-output @@ -0,0 +1,11 @@ +#!/bin/sh + +# Print output from failing tests +dashes=$(printf "%80s" '' | tr ' ' '-') +for exit_file in t/test-results/*.exit; do + [ "$(cat "$exit_file")" -eq 0 ] && continue + out_file="${exit_file%exit}out" + printf '\n%s\n%s\n%s\n' "$dashes" "$out_file" "$dashes" + cat "$out_file" +done +exit 1 From 53fdd5334a2afc8e7c63790e667bbf64cd8049c9 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 1 Dec 2017 21:16:54 -0500 Subject: [PATCH 459/842] Use %autosetup macro to unpack and patch source MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using %autosetup frees us from having to manage %patch entries. It does require that all patches use the same strip level (-p1 in our case). There is also a mildly annoying bug in EL-6¹ which chokes on the patch invocation if a blank line doesn't follow %autosetup. A comment should prevent any problems. The %autosetup -S option is deliberately avoided, to prevent needless bootstrapping problems. ¹ https://bugzilla.redhat.com/1310704 --- git.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index f072ebc..c1a41a7 100644 --- a/git.spec +++ b/git.spec @@ -388,10 +388,9 @@ xz -dc $src > $tar gpgv2 --homedir "$gpghome" --quiet --keyring $key.gpg $tar.sign $tar rm -rf "$tar" "$gpghome" # Cleanup tar files and tmp gpg home dir -%setup -q -n %{name}-%{version}%{?rcrev} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +# Ensure a blank line follows autosetup, el6 chokes otherwise +# https://bugzilla.redhat.com/1310704 +%autosetup -p1 -n %{name}-%{version}%{?rcrev} # Install print-failed-test-output script install -p -m 755 %{SOURCE99} print-failed-test-output @@ -803,6 +802,7 @@ rm -rf %{buildroot} %changelog * Thu Nov 30 2017 Todd Zullinger - 2.15.1-3 - Include verbose logs in build output for 'make test' failures +- Use %%autosetup macro to unpack and patch source * Wed Nov 29 2017 Todd Zullinger - 2.15.1-2 - Fix debuginfo for gnome-keyring and libsecret credential helpers From 340e1bd03dd74e7d6079f48369060182812d3389 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 20 Dec 2017 09:20:11 -0500 Subject: [PATCH 460/842] Remove second make invocation for doc build/install In c3202fd ("Use prebuilt documentation on EL-5, where asciidoc is too old", 2013-01-04) the make targets to build and install the documentation were split into separate make calls to handle prebuilt docs on EL-5 where asciidoc was too old to build the documentation. Support for EL-5 was removed in 903d8f3 ("Remove EL-5 and old Fedora conditionals", 2017-07-22), making the separate make calls unneeded. --- git.spec | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/git.spec b/git.spec index c1a41a7..a46a4ac 100644 --- a/git.spec +++ b/git.spec @@ -438,10 +438,7 @@ chmod +x %{__perl_requires} %endif %build -make %{?_smp_mflags} all -%if ! 0%{?_without_docs} -make %{?_smp_mflags} doc -%endif +make %{?_smp_mflags} all %{!?_without_docs:doc} make -C contrib/emacs @@ -466,10 +463,7 @@ sed -i -e '1s|#! */usr/bin/env python$|#!%{__python2}|' \ %install rm -rf %{buildroot} -make %{?_smp_mflags} INSTALLDIRS=vendor install -%if ! 0%{?_without_docs} -make %{?_smp_mflags} INSTALLDIRS=vendor install-doc -%endif +make %{?_smp_mflags} INSTALLDIRS=vendor install %{!?_without_docs:install-doc} %global elispdir %{_emacs_sitelispdir}/git make -C contrib/emacs install \ @@ -492,8 +486,7 @@ install -pm 755 contrib/credential/libsecret/git-credential-libsecret \ install -pm 755 contrib/credential/netrc/git-credential-netrc \ %{buildroot}%{gitexecdir} -make -C contrib/subtree install -make -C contrib/subtree install-doc +make -C contrib/subtree install %{!?_without_docs:install-doc} mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d install -pm 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf @@ -803,6 +796,7 @@ rm -rf %{buildroot} * Thu Nov 30 2017 Todd Zullinger - 2.15.1-3 - Include verbose logs in build output for 'make test' failures - Use %%autosetup macro to unpack and patch source +- Remove second make invocation for doc build/install * Wed Nov 29 2017 Todd Zullinger - 2.15.1-2 - Fix debuginfo for gnome-keyring and libsecret credential helpers From 675b3bad861fef5bbf2e813f4927cade79c891af Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 20 Dec 2017 12:57:25 -0500 Subject: [PATCH 461/842] Fix builds using '--without docs' Use '%bcond_without docs' and the corresponding %{with ...} syntax. Fix a number of areas where builds failed due to broken %if conditions. --- git.spec | 57 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/git.spec b/git.spec index a46a4ac..c9c5bd5 100644 --- a/git.spec +++ b/git.spec @@ -1,4 +1,5 @@ # Pass --without docs to rpmbuild if you don't want the documentation +%bcond_without docs %global gitexecdir %{_libexecdir}/git-core @@ -102,7 +103,7 @@ Patch2: 0001-revision-quit-pruning-diff-more-quickly-when-possibl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if ! 0%{?_without_docs} +%if %{with docs} BuildRequires: asciidoc >= 8.4.1 BuildRequires: xmlto %if %{test_links} @@ -438,7 +439,7 @@ chmod +x %{__perl_requires} %endif %build -make %{?_smp_mflags} all %{!?_without_docs:doc} +make %{?_smp_mflags} all %{?with_docs:doc} make -C contrib/emacs @@ -463,7 +464,7 @@ sed -i -e '1s|#! */usr/bin/env python$|#!%{__python2}|' \ %install rm -rf %{buildroot} -make %{?_smp_mflags} INSTALLDIRS=vendor install %{!?_without_docs:install-doc} +make %{?_smp_mflags} INSTALLDIRS=vendor install %{?with_docs:install-doc} %global elispdir %{_emacs_sitelispdir}/git make -C contrib/emacs install \ @@ -486,7 +487,7 @@ install -pm 755 contrib/credential/libsecret/git-credential-libsecret \ install -pm 755 contrib/credential/netrc/git-credential-netrc \ %{buildroot}%{gitexecdir} -make -C contrib/subtree install %{!?_without_docs:install-doc} +make -C contrib/subtree install %{?with_docs:install-doc} mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d install -pm 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf @@ -511,7 +512,7 @@ exclude_re="archimport|email|git-citool|git-cvs|git-daemon|git-gui|git-remote-bz # Split out Git::SVN files grep Git/SVN perl-git-files > perl-git-svn-files sed -i "/Git\/SVN/ d" perl-git-files -%if %{!?_without_docs:1}0 +%if %{with docs} (find %{buildroot}%{_mandir} -type f | grep -vE "$exclude_re|Git" | sed -e s@^%{buildroot}@@ -e 's/$/*/' ) >> bin-man-doc-files %else rm -rf %{buildroot}%{_mandir} @@ -569,7 +570,10 @@ find contrib -type f | xargs chmod -x # Split core files not_core_re="git-(add--interactive|credential-(gnome-keyring|libsecret|netrc)|difftool|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} grep -vE "$not_core_re" bin-man-doc-files | grep "%{_mandir}" > man-doc-files-core +%endif grep -E "$not_core_re" bin-man-doc-files \ | grep -v "credential-gnome-keyring" > bin-man-doc-git-files @@ -584,7 +588,7 @@ rm -rf %{buildroot}%{_pkgdocdir}/contrib/credential/ cp -p gitweb/INSTALL %{buildroot}%{_pkgdocdir}/INSTALL.gitweb cp -p gitweb/README %{buildroot}%{_pkgdocdir}/README.gitweb -%if ! 0%{?_without_docs} +%if %{with docs} cp -pr Documentation/*.html Documentation/docbook-xsl.css %{buildroot}%{_pkgdocdir}/ cp -pr Documentation/{howto,technical} %{buildroot}%{_pkgdocdir}/ find %{buildroot}%{_pkgdocdir}/{howto,technical} -type f \ @@ -603,7 +607,7 @@ find %{buildroot}%{_pkgdocdir}/{howto,technical} -type f \ ##### #DOC %check -%if %{test_links} +%if %{with docs} && %{test_links} find %{buildroot}%{_pkgdocdir} -name "*.html" | xargs linkchecker %endif @@ -690,31 +694,31 @@ rm -rf %{buildroot} %{gitexecdir}/*p4* %{gitexecdir}/mergetools/p4merge %{_pkgdocdir}/*p4*.txt -%{!?_without_docs: %{_mandir}/man1/*p4*.1*} -%{!?_without_docs: %{_pkgdocdir}/*p4*.html } +%{?with_docs:%{_mandir}/man1/*p4*.1*} +%{?with_docs:%{_pkgdocdir}/*p4*.html} %files svn %defattr(-,root,root) %{gitexecdir}/*svn* #NOTE: what about svn-fe %{_pkgdocdir}/*svn*.txt -%{!?_without_docs: %{_mandir}/man1/*svn*.1*} -%{!?_without_docs: %{_pkgdocdir}/*svn*.html } +%{?with_docs:%{_mandir}/man1/*svn*.1*} +%{?with_docs:%{_pkgdocdir}/*svn*.html} %files cvs %defattr(-,root,root) %{_pkgdocdir}/*git-cvs*.txt %{_bindir}/git-cvsserver %{gitexecdir}/*cvs* -%{!?_without_docs: %{_mandir}/man1/*cvs*.1*} -%{!?_without_docs: %{_pkgdocdir}/*git-cvs*.html } +%{?with_docs:%{_mandir}/man1/*cvs*.1*} +%{?with_docs:%{_pkgdocdir}/*git-cvs*.html} %files email %defattr(-,root,root) %{_pkgdocdir}/*email*.txt %{gitexecdir}/*email* -%{!?_without_docs: %{_mandir}/man1/*email*.1*} -%{!?_without_docs: %{_pkgdocdir}/*email*.html } +%{?with_docs:%{_mandir}/man1/*email*.1*} +%{?with_docs:%{_pkgdocdir}/*email*.html} %files gui %defattr(-,root,root) @@ -724,27 +728,27 @@ rm -rf %{buildroot} %{_datadir}/git-gui/ %{_pkgdocdir}/git-gui.txt %{_pkgdocdir}/git-citool.txt -%{!?_without_docs: %{_mandir}/man1/git-gui.1*} -%{!?_without_docs: %{_pkgdocdir}/git-gui.html} -%{!?_without_docs: %{_mandir}/man1/git-citool.1*} -%{!?_without_docs: %{_pkgdocdir}/git-citool.html} +%{?with_docs:%{_mandir}/man1/git-gui.1*} +%{?with_docs:%{_pkgdocdir}/git-gui.html} +%{?with_docs:%{_mandir}/man1/git-citool.1*} +%{?with_docs:%{_pkgdocdir}/git-citool.html} %files -n gitk %defattr(-,root,root) %{_pkgdocdir}/*gitk*.txt %{_bindir}/*gitk* %{_datadir}/gitk -%{!?_without_docs: %{_mandir}/man1/*gitk*.1*} -%{!?_without_docs: %{_pkgdocdir}/*gitk*.html } +%{?with_docs:%{_mandir}/man1/*gitk*.1*} +%{?with_docs:%{_pkgdocdir}/*gitk*.html} %files -n perl-Git -f perl-git-files %defattr(-,root,root) %exclude %{_mandir}/man3/*Git*SVN*.3pm* -%{!?_without_docs: %{_mandir}/man3/*Git*.3pm*} +%{?with_docs:%{_mandir}/man3/*Git*.3pm*} %files -n perl-Git-SVN -f perl-git-svn-files %defattr(-,root,root) -%{!?_without_docs: %{_mandir}/man3/*Git*SVN*.3pm*} +%{?with_docs:%{_mandir}/man3/*Git*SVN*.3pm*} %if 0%{?rhel} && 0%{?rhel} <= 6 %files -n emacs-git @@ -770,14 +774,14 @@ rm -rf %{buildroot} %endif %{gitexecdir}/git-daemon %{_localstatedir}/lib/git -%{!?_without_docs: %{_mandir}/man1/git-daemon*.1*} -%{!?_without_docs: %{_pkgdocdir}/git-daemon*.html} +%{?with_docs:%{_mandir}/man1/git-daemon*.1*} +%{?with_docs:%{_pkgdocdir}/git-daemon*.html} %files -n gitweb %defattr(-,root,root) %{_pkgdocdir}/*.gitweb %{_pkgdocdir}/gitweb*.txt -%{!?_without_docs: %{_pkgdocdir}/gitweb*.html} +%{?with_docs:%{_pkgdocdir}/gitweb*.html} %config(noreplace)%{_sysconfdir}/gitweb.conf %config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf %{_localstatedir}/www/git/ @@ -797,6 +801,7 @@ rm -rf %{buildroot} - Include verbose logs in build output for 'make test' failures - Use %%autosetup macro to unpack and patch source - Remove second make invocation for doc build/install +- Fix builds using '--without docs' * Wed Nov 29 2017 Todd Zullinger - 2.15.1-2 - Fix debuginfo for gnome-keyring and libsecret credential helpers From 15d075cb09ab8b9b2621a82db9ece8493829b88f Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 20 Dec 2017 13:24:12 -0500 Subject: [PATCH 462/842] Mark git-core-docs package noarch Nothing arch-specific should be included in the git-core-docs package. --- git.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git.spec b/git.spec index c9c5bd5..e1a2b4b 100644 --- a/git.spec +++ b/git.spec @@ -239,6 +239,7 @@ other SCMs, install the git-all meta-package. %package core-doc Summary: Documentation files for git-core Group: Development/Tools +BuildArch: noarch Requires: git-core = %{version}-%{release} %description core-doc Documentation files for git-core package including man pages. @@ -802,6 +803,7 @@ rm -rf %{buildroot} - Use %%autosetup macro to unpack and patch source - Remove second make invocation for doc build/install - Fix builds using '--without docs' +- Mark git-core-docs sub-package noarch * Wed Nov 29 2017 Todd Zullinger - 2.15.1-2 - Fix debuginfo for gnome-keyring and libsecret credential helpers From db2eb1dae4e86a198ac34200573035e8218a288f Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 30 Nov 2017 17:46:45 -0500 Subject: [PATCH 463/842] Avoid failures in svnserve tests when run in parallel Setting SVNSERVE_PORT enables several tests which require a local svnserve daemon to be run (in t9113 & t9126). The tests share setup of the local svnserve via `start_svnserve()`. The function uses svnserve's `--listen-once` option, which causes svnserve to accept one connection on the port, serve it, and exit. When running the tests in parallel this fails if one test tries to start svnserve while the other is still running. Use the test number as the svnserve port (similar to httpd tests) to avoid port conflicts. Set GIT_TEST_SVNSERVE to enable these tests. The change should make it into 2.16 or 2.17. Until then, setting GIT_TEST_SVNSERVE will disable the svnserve tests. There are only a few tests affected and this allows more testing with parallel test runs, so it's a reasonable trade. Once an upstream release with these changes arrives, we'll begin running these tests without any further changes. --- git.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index e1a2b4b..9f92187 100644 --- a/git.spec +++ b/git.spec @@ -639,8 +639,8 @@ export GIT_SKIP_TESTS # Set LANG so various UTF-8 tests are run export LANG=en_US.UTF-8 -# Set SVNSERVE_PORT to run svnserve tests -export SVNSERVE_PORT=9000 +# Run git svn tests which use svnserve +export GIT_TEST_SVNSERVE=true # Run the tests GIT_TEST_OPTS='--verbose-log' make %{?make_test_opts} test || \ @@ -804,6 +804,7 @@ rm -rf %{buildroot} - Remove second make invocation for doc build/install - Fix builds using '--without docs' - Mark git-core-docs sub-package noarch +- Avoid failures in svnserve tests when run in parallel * Wed Nov 29 2017 Todd Zullinger - 2.15.1-2 - Fix debuginfo for gnome-keyring and libsecret credential helpers From 62688d0cccb1e4e0eb8d1c3b2d80806528ffe741 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 22 Dec 2017 16:41:13 -0500 Subject: [PATCH 464/842] Run tests in parallel by default on Fedora An option to enable parallel test runs was added in 6dc6285 ("Improve test suite coverage", 2017-11-10). After further improvements it seems to be reliable for use in koji builds. It is still disabled for EPEL builds because make lacks support for the -O (--output-sync) option. Without this option the output is much less readable. In the future we may be able to move to using 'prove' as the default test harness which might allow us to run in parallel without requiring the -O option. --- git.spec | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/git.spec b/git.spec index 9f92187..6c4b140 100644 --- a/git.spec +++ b/git.spec @@ -44,16 +44,11 @@ %global test_links 0 %endif -# Allow tests to run in parallel. Disabled by default due to unresolved -# failures when building in koji. Enabling it speeds up the test suite quite a -# bit though. The -O (--output-sync) option requires make > 4.0, which is not -# available on EL <= 7. Without it, running the tests in parallel causes the -# output to be rather unweildy, so restrict parallel tests to Fedora. -# -# Pass "--with parallel_tests" or "--define 'parallel_tests 1'" to -# rpmbuild/mock. -%bcond_with parallel_tests -%if %{with parallel_tests} && 0%{?fedora} +# Run tests in parallel. This speeds up the test suite quite a bit. The +# -O (--output-sync) option requires make > 4.0, which is not available on +# EL <= 7. Without it, running the tests in parallel causes the output to +# be rather unweildy, so restrict parallel tests to Fedora. +%if 0%{?fedora} %global make_test_opts -O %{?_smp_mflags} %endif @@ -805,6 +800,7 @@ rm -rf %{buildroot} - Fix builds using '--without docs' - Mark git-core-docs sub-package noarch - Avoid failures in svnserve tests when run in parallel +- Run tests in parallel by default on Fedora * Wed Nov 29 2017 Todd Zullinger - 2.15.1-2 - Fix debuginfo for gnome-keyring and libsecret credential helpers From 84015970a03269ff18d59184f2493c9d6688349f Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 22 Dec 2017 17:09:04 -0500 Subject: [PATCH 465/842] Skip 'git svn branch' tests which fail intermittently All tests which call 'git svn branch' fail intermittently with SIGSEGV in the subversion bindings. The failures are not remotely consistent. Until we can enable shell tracing (-x) in the test suite by default to attempt to further debug the failure, disable these tests. --- git.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 6c4b140..aa91be4 100644 --- a/git.spec +++ b/git.spec @@ -608,9 +608,9 @@ find %{buildroot}%{_pkgdocdir} -name "*.html" | xargs linkchecker %endif # Tests to skip on all releases and architectures -# t9128-git-svn-cmd-branch - "branch tests" fails randomnly -# t9167-git-svn-cmd-branch-subproject - "branch tests" fails randomnly -GIT_SKIP_TESTS="t9128.3 t9167.3" +# - tests in t9128, t9141, and t9167 which call 'git svn branch' fail +# intermittently with SIGSEGV in the subversion bindings +GIT_SKIP_TESTS="t9128.[34] t9141.[34] t9167.3" %ifarch aarch64 %{arm} %{power64} # Skip tests which fail on aarch64, arm, and ppc @@ -801,6 +801,7 @@ rm -rf %{buildroot} - Mark git-core-docs sub-package noarch - Avoid failures in svnserve tests when run in parallel - Run tests in parallel by default on Fedora +- Skip 'git svn branch' tests which fail intermittently * Wed Nov 29 2017 Todd Zullinger - 2.15.1-2 - Fix debuginfo for gnome-keyring and libsecret credential helpers From ebf9643f6d6269e489831f8ee9ed1ca86cc493d5 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 22 Dec 2017 19:14:31 -0500 Subject: [PATCH 466/842] Re-enable grep tests on s390x The tests appear to work reliably now, after a number of test builds. If not, this is easily reverted. (The newly added test output may also help determine the root cause.) --- git.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/git.spec b/git.spec index aa91be4..2b8bb20 100644 --- a/git.spec +++ b/git.spec @@ -622,13 +622,6 @@ GIT_SKIP_TESTS="t9128.[34] t9141.[34] t9167.3" GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5541.33 t5551.25" %endif -%ifarch s390x -# Skip grep tests which fail intermittently on s390x -## - probably it is because of current troubles with binutils on s390x. Will -## try tests when troubles on s390x will be resolved -GIT_SKIP_TESTS="$GIT_SKIP_TESTS t7008 t7810 t7811 t7812 t7813 t7814" -%endif - export GIT_SKIP_TESTS # Set LANG so various UTF-8 tests are run @@ -802,6 +795,7 @@ rm -rf %{buildroot} - Avoid failures in svnserve tests when run in parallel - Run tests in parallel by default on Fedora - Skip 'git svn branch' tests which fail intermittently +- Re-enable grep tests on s390x * Wed Nov 29 2017 Todd Zullinger - 2.15.1-2 - Fix debuginfo for gnome-keyring and libsecret credential helpers From cd265cb40c3d411fd4d970e6d04192599a45bfa9 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 30 Dec 2017 17:34:44 -0500 Subject: [PATCH 467/842] Fix perl requires filtering on EL-6 When building release candidates the path to the perl requires filter script is wrong. Correct it. It's tempting to use the output of `pwd` to avoid future changes to the build dir breaking it, but the call occurs prior to unpacking and thus `pwd` is not suitable. --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 2b8bb20..9f7f201 100644 --- a/git.spec +++ b/git.spec @@ -430,7 +430,7 @@ cat << \EOF > %{name}-req sed -e '/perl(packed-refs)/d' EOF -%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req +%global __perl_requires %{_builddir}/%{name}-%{version}%{?rcrev}/%{name}-req chmod +x %{__perl_requires} %endif @@ -786,6 +786,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sat Dec 30 2017 Todd Zullinger +- Fix perl requires filtering on EL-6 + * Thu Nov 30 2017 Todd Zullinger - 2.15.1-3 - Include verbose logs in build output for 'make test' failures - Use %%autosetup macro to unpack and patch source From 6611083041482a66057adf9487fb47cd10610fe4 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 7 Jan 2018 15:38:26 -0500 Subject: [PATCH 468/842] Explicitly enable tests which may be skipped opportunistically Ensure these tests are not skipped if some dependency or other condition is not met. We prefer to see the failure(s) in order to fix the underlying issue(s). Disable t9115-git-svn-dcommit-funky-renames on ppc-arches because it frequently fails. The port it uses (9115) is already in use. It is unclear if this is due to an issue in the test suite or a conflict with some other process on the build host. Add mod_dav_svn BuildRequires for t9115-git-svn-dcommit-funky-renames (GIT_SVN_TEST_HTTPD). --- git.spec | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 9f7f201..9b9f5fc 100644 --- a/git.spec +++ b/git.spec @@ -146,6 +146,7 @@ BuildRequires: httpd %if 0%{?fedora} BuildRequires: jgit %endif +BuildRequires: mod_dav_svn BuildRequires: pcre BuildRequires: perl(CGI) BuildRequires: perl(CGI::Carp) @@ -622,12 +623,26 @@ GIT_SKIP_TESTS="t9128.[34] t9141.[34] t9167.3" GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5541.33 t5551.25" %endif +%ifarch %{power64} +# Skip tests which fail on ppc +# +# t9115-git-svn-dcommit-funky-renames is disabled because it frequently fails. +# The port it uses (9115) is already in use. It is unclear if this is +# due to an issue in the test suite or a conflict with some other process on +# the build host. It only appears to occur on ppc-arches. +GIT_SKIP_TESTS="$GIT_SKIP_TESTS t9115" +%endif + export GIT_SKIP_TESTS # Set LANG so various UTF-8 tests are run export LANG=en_US.UTF-8 -# Run git svn tests which use svnserve +# Explicitly enable tests which may be skipped opportunistically +# (Check for variables set via test_tristate in the test suite) +export GIT_SVN_TEST_HTTPD=true +export GIT_TEST_GIT_DAEMON=true +export GIT_TEST_HTTPD=true export GIT_TEST_SVNSERVE=true # Run the tests @@ -786,6 +801,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sun Jan 07 2018 Todd Zullinger +- Explicitly enable tests which may be skipped opportunistically + * Sat Dec 30 2017 Todd Zullinger - Fix perl requires filtering on EL-6 From 6af316afb79cb39501f1519a2ed762d44a3d3bd1 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 8 Jan 2018 17:00:13 -0500 Subject: [PATCH 469/842] Avoid excluding non-existent .py[co] files in %doc Starting with rpm-build-4.13.0 (in F-22), brp-python-bytecompile excludes files under /usr/share/doc by default. Restrict the %files %exclude to EL <= 7 to avoid spurious 'File not found' warnings from rpm-build. --- git.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/git.spec b/git.spec index 9b9f5fc..beef4de 100644 --- a/git.spec +++ b/git.spec @@ -690,7 +690,10 @@ rm -rf %{buildroot} %files core-doc -f man-doc-files-core %defattr(-,root,root) +%if 0%{?rhel} && 0%{?rhel} <= 7 +# .py files are only bytecompiled on EL <= 7 %exclude %{_pkgdocdir}/contrib/*/*.py[co] +%endif %{_pkgdocdir}/contrib/hooks %files p4 @@ -801,6 +804,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Jan 08 2018 Todd Zullinger +- Avoid excluding non-existent .py[co] files in %%doc + * Sun Jan 07 2018 Todd Zullinger - Explicitly enable tests which may be skipped opportunistically From 2d1c8b10e93709c6879bc5f9dee2e692ba119ff8 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 9 Jan 2018 15:01:17 -0500 Subject: [PATCH 470/842] Remove obsolete gnome-keyring credential helper The gnome-keyring credential helper was removed in Fedora 26, but remained in builds for older Fedora and EL-7 releases. No official release has shipped the gnome-keyring subpackage since 2.11.1-3. Obsolete it to ensure a clean upgrade path for any users who have it installed. The Obsoletes can be removed after rawhide is branched for Fedora 29. --- git.spec | 47 ++++++----------------------------------------- 1 file changed, 6 insertions(+), 41 deletions(-) diff --git a/git.spec b/git.spec index beef4de..e46f095 100644 --- a/git.spec +++ b/git.spec @@ -20,16 +20,6 @@ %global use_systemd 0 %endif -# gnome-keyring is deprecated, however someone would like -# to use it on older fedora instead of libsecret. So that's -# why this ugly solution -# TODO: we should maybe update conditions according to supported systems -%if ( 0%{?fedora} && 0%{?fedora} < 26 ) || 0%{?rhel} == 7 -%global gnome_keyring 1 -%else -%global gnome_keyring 0 -%endif - # Settings for EL <= 7 %if 0%{?rhel} && 0%{?rhel} <= 7 %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} @@ -179,6 +169,9 @@ Provides: emacs-git = %{version}-%{release} Provides: emacs-git-el = %{version}-%{release} %endif +# Obsolete gnome-keyring credential helper (remove in Fedora 29) +Obsoletes: git-gnome-keyring < 2.11.1-4 + %description Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations @@ -193,9 +186,6 @@ Summary: Meta-package to pull in all git tools Group: Development/Tools BuildArch: noarch Requires: git = %{version}-%{release} -%if %{gnome_keyring} -Requires: git-gnome-keyring = %{version}-%{release} -%endif Requires: git-cvs = %{version}-%{release} Requires: git-email = %{version}-%{release} Requires: git-gui = %{version}-%{release} @@ -361,17 +351,6 @@ Requires: emacs-git = %{version}-%{release} %{summary}. %endif -%if %{gnome_keyring} -%package gnome-keyring -Summary: Git helper for accessing credentials via gnome-keyring -BuildRequires: libgnome-keyring-devel -Requires: git = %{version}-%{release} -Requires: gnome-keyring -%description gnome-keyring -%{summary}. -%endif - - %prep # Verify GPG signatures gpghome="$(mktemp -qd)" # Ensure we don't use any existing gpg keyrings @@ -440,9 +419,6 @@ make %{?_smp_mflags} all %{?with_docs:doc} make -C contrib/emacs -%if %{gnome_keyring} -make -C contrib/credential/gnome-keyring/ -%endif %if %{libsecret} make -C contrib/credential/libsecret/ %endif @@ -473,10 +449,6 @@ done install -Dpm 644 %{SOURCE10} \ %{buildroot}%{_emacs_sitestartdir}/git-init.el -%if %{gnome_keyring} -install -pm 755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \ - %{buildroot}%{gitexecdir} -%endif %if %{libsecret} install -pm 755 contrib/credential/libsecret/git-credential-libsecret \ %{buildroot}%{gitexecdir} @@ -565,14 +537,13 @@ chmod a-x Documentation/technical/api-index.sh find contrib -type f | xargs chmod -x # Split core files -not_core_re="git-(add--interactive|credential-(gnome-keyring|libsecret|netrc)|difftool|filter-branch|instaweb|request-pull|send-mail)|gitweb" +not_core_re="git-(add--interactive|credential-(libsecret|netrc)|difftool|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} grep -vE "$not_core_re" bin-man-doc-files | grep "%{_mandir}" > man-doc-files-core %endif -grep -E "$not_core_re" bin-man-doc-files \ - | grep -v "credential-gnome-keyring" > bin-man-doc-git-files +grep -E "$not_core_re" bin-man-doc-files > bin-man-doc-git-files ##### DOC # place doc files into %%{_pkgdocdir} and split them into expected packages @@ -793,19 +764,13 @@ rm -rf %{buildroot} %config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf %{_localstatedir}/www/git/ -%if %{gnome_keyring} -%files gnome-keyring -%defattr(-,root,root) -%{gitexecdir}/git-credential-gnome-keyring -%endif - - %files all # No files for you! %changelog * Mon Jan 08 2018 Todd Zullinger - Avoid excluding non-existent .py[co] files in %%doc +- Remove obsolete gnome-keyring credential helper * Sun Jan 07 2018 Todd Zullinger - Explicitly enable tests which may be skipped opportunistically From f0946b65f2d74d48b213ae8dd433bc4be8cd7cd0 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 12 Jan 2018 00:18:21 -0500 Subject: [PATCH 471/842] Update BuildRequires for tests The acl and perl(HTTP::Date) requirements are pulled in by other packages on Fedora so they were not noticed when the test requirements were updated in 6dc6285 ("Improve test suite coverage", 2017-11-10). The highlight package is available in EPEL for EL-6 (on all supported architectures). Extend the conditional to only exclude it on ppc64 for EL-7. --- git.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index e46f095..59f53b9 100644 --- a/git.spec +++ b/git.spec @@ -122,6 +122,7 @@ BuildRequires: systemd %endif # Test suite requirements +BuildRequires: acl %if 0%{?fedora} && 0%{?fedora} >= 27 # Needed by t5540-http-push-webdav.sh BuildRequires: apr-util-bdb @@ -129,7 +130,7 @@ BuildRequires: apr-util-bdb BuildRequires: cvs BuildRequires: cvsps BuildRequires: gnupg -%if 0%{?fedora} || ( 0%{?rhel} && 0%{?rhel} == 7 && %{_arch} != ppc64 ) +%if 0%{?fedora} || ( 0%{?rhel} && ( 0%{?rhel} == 6 || 0%{?rhel} == 7 && %{_arch} != ppc64 )) BuildRequires: highlight %endif BuildRequires: httpd @@ -143,6 +144,7 @@ BuildRequires: perl(CGI::Carp) BuildRequires: perl(CGI::Util) BuildRequires: perl(DBD::SQLite) BuildRequires: perl(Digest::MD5) +BuildRequires: perl(HTTP::Date) BuildRequires: perl(IO::Pty) BuildRequires: perl(Mail::Address) BuildRequires: perl(Memoize) @@ -768,6 +770,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Jan 11 2018 Todd Zullinger +- Update BuildRequires for tests + * Mon Jan 08 2018 Todd Zullinger - Avoid excluding non-existent .py[co] files in %%doc - Remove obsolete gnome-keyring credential helper From 049553f03cf18cf2e19c0baa7d7d4bc51b2fa347 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 12 Jan 2018 02:13:20 -0500 Subject: [PATCH 472/842] Add %{emacs_filesystem} to simplify emacs support Use a single macro rather than testing for %{fedora} and %{rhel} versions repeatedly. The "dist" logic is best kept at the start of the spec file (as much as possible). Cleanup a few comments related to "dist" checks while we're at it. --- git.spec | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/git.spec b/git.spec index 59f53b9..abe243c 100644 --- a/git.spec +++ b/git.spec @@ -3,11 +3,12 @@ %global gitexecdir %{_libexecdir}/git-core -# Settings for F-19+ and EL-7+ +# Settings for Fedora and EL >= 7 %if 0%{?fedora} || 0%{?rhel} >= 7 %global bashcomp_pkgconfig 1 %global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) %global bashcomproot %(dirname %{bashcompdir} 2>/dev/null) +%global emacs_filesystem 1 %global libsecret 1 %global use_new_rpm_filters 1 %global use_systemd 1 @@ -15,9 +16,11 @@ %global bashcomp_pkgconfig 0 %global bashcompdir %{_sysconfdir}/bash_completion.d %global bashcomproot %{bashcompdir} +%global emacs_filesystem 0 %global libsecret 0 %global use_new_rpm_filters 0 %global use_systemd 0 +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} %endif # Settings for EL <= 7 @@ -25,10 +28,8 @@ %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} %endif -# fallback for F17- && RHEL6- -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} - -%if 0%{?fedora} && 0%{?fedora} >= 25 +# Test links in HTML documentation on Fedora (linkchecker is not in EL) +%if 0%{?fedora} %global test_links 1 %else %global test_links 0 @@ -162,13 +163,8 @@ Requires: perl(Term::ReadKey) %endif Requires: perl-Git = %{version}-%{release} -%if 0%{?fedora} || 0%{?rhel} >= 7 +%if %{emacs_filesystem} Requires: emacs-filesystem >= %{_emacs_version} -# These can be removed in Fedora 26 -Obsoletes: emacs-git <= 2.4.5 -Obsoletes: emacs-git-el <= 2.4.5 -Provides: emacs-git = %{version}-%{release} -Provides: emacs-git-el = %{version}-%{release} %endif # Obsolete gnome-keyring credential helper (remove in Fedora 29) @@ -198,7 +194,7 @@ Requires: perl-Git = %{version}-%{release} %if ! %{defined perl_bootstrap} Requires: perl(Term::ReadKey) %endif -%if 0%{?rhel} && 0%{?rhel} <= 6 +%if ! %{emacs_filesystem} Requires: emacs-git = %{version}-%{release} %endif %description all @@ -334,7 +330,7 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi %description -n perl-Git-SVN %{summary}. -%if 0%{?rhel} && 0%{?rhel} <= 6 +%if ! %{emacs_filesystem} %package -n emacs-git Summary: Git version control system support for Emacs Group: Applications/Editors @@ -638,7 +634,7 @@ rm -rf %{buildroot} %files -f bin-man-doc-git-files %defattr(-,root,root) -%if 0%{?fedora} || 0%{?rhel} >= 7 +%if %{emacs_filesystem} %{elispdir} %{_emacs_sitestartdir}/git-init.el %endif @@ -730,7 +726,7 @@ rm -rf %{buildroot} %defattr(-,root,root) %{?with_docs:%{_mandir}/man3/*Git*SVN*.3pm*} -%if 0%{?rhel} && 0%{?rhel} <= 6 +%if ! %{emacs_filesystem} %files -n emacs-git %defattr(-,root,root) %{_pkgdocdir}/contrib/emacs/README @@ -770,6 +766,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Jan 12 2018 Todd Zullinger +- Add %%{emacs_filesystem} to simplify emacs support + * Thu Jan 11 2018 Todd Zullinger - Update BuildRequires for tests From 76ecad7439038ddf93de96c208aa6274e472d07d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 12 Jan 2018 23:15:21 -0500 Subject: [PATCH 473/842] Use .in template for git@.service to ensure paths are substituted The paths don't change often, but if they do this is one less place which will need to be updated. It also makes it easier for anyone rebuilding the packages to change the defaults. --- git.spec | 10 +++++++--- git@.service | 8 -------- git@.service.in | 8 ++++++++ 3 files changed, 15 insertions(+), 11 deletions(-) delete mode 100644 git@.service create mode 100644 git@.service.in diff --git a/git.spec b/git.spec index abe243c..95cc481 100644 --- a/git.spec +++ b/git.spec @@ -73,7 +73,7 @@ Source11: git.xinetd.in Source12: git.conf.httpd Source13: git-gui.desktop Source14: gitweb.conf.in -Source15: git@.service +Source15: git@.service.in Source16: git.socket # Script to print test failure output (used in %%check) @@ -487,8 +487,11 @@ rm -rf %{buildroot}%{_mandir} mkdir -p %{buildroot}%{_localstatedir}/lib/git %if %{use_systemd} -mkdir -p %{buildroot}%{_unitdir} -cp -a %{SOURCE15} %{SOURCE16} %{buildroot}%{_unitdir} +install -Dp -m 0644 %{SOURCE16} %{buildroot}%{_unitdir}/git.socket +perl -p \ + -e "s|\@GITEXECDIR\@|%{gitexecdir}|g;" \ + -e "s|\@BASE_PATH\@|%{_localstatedir}/lib/git|g;" \ + %{SOURCE15} > %{buildroot}%{_unitdir}/git@.service %else mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d perl -p \ @@ -768,6 +771,7 @@ rm -rf %{buildroot} %changelog * Fri Jan 12 2018 Todd Zullinger - Add %%{emacs_filesystem} to simplify emacs support +- Use .in template for git@.service to ensure paths are substituted * Thu Jan 11 2018 Todd Zullinger - Update BuildRequires for tests diff --git a/git@.service b/git@.service deleted file mode 100644 index 185ff25..0000000 --- a/git@.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Git Repositories Server Daemon -Documentation=man:git-daemon(1) - -[Service] -User=nobody -ExecStart=-/usr/libexec/git-core/git-daemon --base-path=/var/lib/git --export-all --user-path=public_git --syslog --inetd --verbose -StandardInput=socket diff --git a/git@.service.in b/git@.service.in new file mode 100644 index 0000000..bb93b78 --- /dev/null +++ b/git@.service.in @@ -0,0 +1,8 @@ +[Unit] +Description=Git Repositories Server Daemon +Documentation=man:git-daemon(1) + +[Service] +User=nobody +ExecStart=-@GITEXECDIR@/git-daemon --base-path=@BASE_PATH@ --export-all --user-path=public_git --syslog --inetd --verbose +StandardInput=socket From 6adaa76501005485593307d254c41919e825dc48 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 18 Jan 2018 01:14:41 -0500 Subject: [PATCH 474/842] Update to 2.16.0 Move fsmonitor-watchman sample hook out of git-core to avoid a perl dependency. --- ...uning-diff-more-quickly-when-possibl.patch | 128 ------------------ git.spec | 13 +- sources | 4 +- 3 files changed, 9 insertions(+), 136 deletions(-) delete mode 100644 0001-revision-quit-pruning-diff-more-quickly-when-possibl.patch diff --git a/0001-revision-quit-pruning-diff-more-quickly-when-possibl.patch b/0001-revision-quit-pruning-diff-more-quickly-when-possibl.patch deleted file mode 100644 index f2136f6..0000000 --- a/0001-revision-quit-pruning-diff-more-quickly-when-possibl.patch +++ /dev/null @@ -1,128 +0,0 @@ -From a937b37e766479c8e780b17cce9c4b252fd97e40 Mon Sep 17 00:00:00 2001 -From: Jeff King -Date: Fri, 13 Oct 2017 11:27:45 -0400 -Subject: [PATCH] revision: quit pruning diff more quickly when possible - -When the revision traversal machinery is given a pathspec, -we must compute the parent-diff for each commit to determine -which ones are TREESAME. We set the QUICK diff flag to avoid -looking at more entries than we need; we really just care -whether there are any changes at all. - -But there is one case where we want to know a bit more: if ---remove-empty is set, we care about finding cases where the -change consists only of added entries (in which case we may -prune the parent in try_to_simplify_commit()). To cover that -case, our file_add_remove() callback does not quit the diff -upon seeing an added entry; it keeps looking for other types -of entries. - -But this means when --remove-empty is not set (and it is not -by default), we compute more of the diff than is necessary. -You can see this in a pathological case where a commit adds -a very large number of entries, and we limit based on a -broad pathspec. E.g.: - - perl -e ' - chomp(my $blob = `git hash-object -w --stdin remove_empty_trees. This callback parameter could be -passed to the "add_remove" and "change" callbacks, but -there's not much point. They already receive the -diff_options struct, and doing it this way avoids having to -update the function signature of the other callbacks -(arguably the format_callback and output_prefix functions -could benefit from the same simplification). - -Signed-off-by: Jeff King -Signed-off-by: Junio C Hamano ---- - diff.h | 1 + - revision.c | 16 +++++++++++++--- - 2 files changed, 14 insertions(+), 3 deletions(-) - -diff --git a/diff.h b/diff.h -index e9ccb38c26..fe5c287a70 100644 ---- a/diff.h -+++ b/diff.h -@@ -180,6 +180,7 @@ struct diff_options { - pathchange_fn_t pathchange; - change_fn_t change; - add_remove_fn_t add_remove; -+ void *change_fn_data; - diff_format_fn_t format_callback; - void *format_callback_data; - diff_prefix_fn_t output_prefix; -diff --git a/revision.c b/revision.c -index 771d079f6e..7c23ab7afe 100644 ---- a/revision.c -+++ b/revision.c -@@ -394,8 +394,16 @@ static struct commit *one_relevant_parent(const struct rev_info *revs, - * if the whole diff is removal of old data, and otherwise - * REV_TREE_DIFFERENT (of course if the trees are the same we - * want REV_TREE_SAME). -- * That means that once we get to REV_TREE_DIFFERENT, we do not -- * have to look any further. -+ * -+ * The only time we care about the distinction is when -+ * remove_empty_trees is in effect, in which case we care only about -+ * whether the whole change is REV_TREE_NEW, or if there's another type -+ * of change. Which means we can stop the diff early in either of these -+ * cases: -+ * -+ * 1. We're not using remove_empty_trees at all. -+ * -+ * 2. We saw anything except REV_TREE_NEW. - */ - static int tree_difference = REV_TREE_SAME; - -@@ -406,9 +414,10 @@ static void file_add_remove(struct diff_options *options, - const char *fullpath, unsigned dirty_submodule) - { - int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD; -+ struct rev_info *revs = options->change_fn_data; - - tree_difference |= diff; -- if (tree_difference == REV_TREE_DIFFERENT) -+ if (!revs->remove_empty_trees || tree_difference != REV_TREE_NEW) - DIFF_OPT_SET(options, HAS_CHANGES); - } - -@@ -1346,6 +1355,7 @@ void init_revisions(struct rev_info *revs, const char *prefix) - DIFF_OPT_SET(&revs->pruning, QUICK); - revs->pruning.add_remove = file_add_remove; - revs->pruning.change = file_change; -+ revs->pruning.change_fn_data = revs; - revs->sort_order = REV_SORT_IN_GRAPH_ORDER; - revs->dense = 1; - revs->prefix = prefix; --- -2.15.0 - diff --git a/git.spec b/git.spec index 95cc481..292984e 100644 --- a/git.spec +++ b/git.spec @@ -47,8 +47,8 @@ #global rcrev .rc0 Name: git -Version: 2.15.1 -Release: 3%{?rcrev}%{?dist} +Version: 2.16.0 +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -83,10 +83,6 @@ Patch0: git-1.8-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# https://bugzilla.redhat.com/1510455 (CVE-2017-15298) -# https://github.com/git/git/commit/a937b37e76 -Patch2: 0001-revision-quit-pruning-diff-more-quickly-when-possibl.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if %{with docs} @@ -643,6 +639,7 @@ rm -rf %{buildroot} %endif %{_datadir}/git-core/contrib/hooks/update-paranoid %{_datadir}/git-core/contrib/hooks/setgitperms.perl +%{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample %{_datadir}/git-core/templates/hooks/pre-rebase.sample %{_datadir}/git-core/templates/hooks/prepare-commit-msg.sample @@ -655,6 +652,7 @@ rm -rf %{buildroot} # exclude is best way here because of troubles with symlinks inside git-core/ %exclude %{_datadir}/git-core/contrib/hooks/update-paranoid %exclude %{_datadir}/git-core/contrib/hooks/setgitperms.perl +%exclude %{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample %exclude %{_datadir}/git-core/templates/hooks/pre-rebase.sample %exclude %{_datadir}/git-core/templates/hooks/prepare-commit-msg.sample %{bashcomproot} @@ -769,6 +767,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Jan 18 2018 Todd Zullinger - 2.16.0-1 +- Update to 2.16.0 + * Fri Jan 12 2018 Todd Zullinger - Add %%{emacs_filesystem} to simplify emacs support - Use .in template for git@.service to ensure paths are substituted diff --git a/sources b/sources index 13092a2..1555ad6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.15.1.tar.xz) = dcf300b28e41f7757d866e768d641137718b43eb6d12a2cfff99fb429775e0cab87bbff48147b8588bc0f69e92eb5ca2ad1f75c8cf5205e41853d8e8652f900b -SHA512 (git-2.15.1.tar.sign) = a65038b036cd7a8ecedb83cc46f9c380726481d1ac2f6e0cc932f6f8a8c6c3872782387f882a22be8895abd8709470305a6fb7f228d55ea78632f840ae7045c6 +SHA512 (git-2.16.0.tar.xz) = 11f8f3b5e015cbf7aa768ae66c8a4a81417d78736c10e6e24a2b83b7c3ade3afaa6934ca156c5bb9c3da80cf445549601d494bab86611d7eec7865dbfdcbd812 +SHA512 (git-2.16.0.tar.sign) = af4522517146026f20323e4c551badbd77f50a48aecaa5614048c5fc7176838fee203897c885e8703731e90b80f1b126e20b829034a7f5c1ce54405742d7b252 From 62f562d630dba2884e31d4d168ceff5f06b9d7b0 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 18 Jan 2018 01:14:55 -0500 Subject: [PATCH 475/842] Use 'prove' as test harness, enable shell tracing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With 'prove' as the test harness the tests can be run in parallel on EPEL as well as Fedora targets. Move GIT_TEST_OPTS to config.mak along with the new test options and enable shell tracing (-x). The output from failures when tracing is enabled should allow us to more easily diagnose test failures. Explicitly use /bin/bash as the shell for the test suite; it allows using "-x" reliably across the whole test suite. This is made possible by changes included in 2.16.0 thanks to Jeff King¹, particularly: 3f824e91c8 t/Makefile: introduce TEST_SHELL_PATH f5ba2de6bc test-lib: make "-x" work with "--verbose-log" 90c8a1db9d test-lib: silence "-x" cleanup under bash ¹ https://github.com/gitster/git/tree/jk/test-suite-tracing --- git.spec | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/git.spec b/git.spec index 292984e..8d325d9 100644 --- a/git.spec +++ b/git.spec @@ -35,14 +35,6 @@ %global test_links 0 %endif -# Run tests in parallel. This speeds up the test suite quite a bit. The -# -O (--output-sync) option requires make > 4.0, which is not available on -# EL <= 7. Without it, running the tests in parallel causes the output to -# be rather unweildy, so restrict parallel tests to Fedora. -%if 0%{?fedora} -%global make_test_opts -O %{?_smp_mflags} -%endif - # Define for release candidates #global rcrev .rc0 @@ -124,6 +116,7 @@ BuildRequires: acl # Needed by t5540-http-push-webdav.sh BuildRequires: apr-util-bdb %endif +BuildRequires: bash BuildRequires: cvs BuildRequires: cvsps BuildRequires: gnupg @@ -136,6 +129,7 @@ BuildRequires: jgit %endif BuildRequires: mod_dav_svn BuildRequires: pcre +BuildRequires: perl(App::Prove) BuildRequires: perl(CGI) BuildRequires: perl(CGI::Carp) BuildRequires: perl(CGI::Util) @@ -387,6 +381,11 @@ PYTHON_PATH = %{__python2} htmldir = %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} prefix = %{_prefix} gitwebdir = %{_localstatedir}/www/git + +# Test options +DEFAULT_TEST_TARGET = prove +GIT_PROVE_OPTS = --verbose --normalize %{?_smp_mflags} +GIT_TEST_OPTS = -x --verbose-log EOF # Filter bogus perl requires @@ -613,9 +612,11 @@ export GIT_TEST_GIT_DAEMON=true export GIT_TEST_HTTPD=true export GIT_TEST_SVNSERVE=true +# Use bash for the tests +export TEST_SHELL_PATH=/bin/bash + # Run the tests -GIT_TEST_OPTS='--verbose-log' make %{?make_test_opts} test || \ - ./print-failed-test-output +make test || ./print-failed-test-output %clean rm -rf %{buildroot} @@ -769,6 +770,7 @@ rm -rf %{buildroot} %changelog * Thu Jan 18 2018 Todd Zullinger - 2.16.0-1 - Update to 2.16.0 +- Use 'prove' as test harness, enable shell tracing * Fri Jan 12 2018 Todd Zullinger - Add %%{emacs_filesystem} to simplify emacs support From a9982274b4a09738d13927068984ffac12ca7efb Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 18 Jan 2018 10:34:30 -0500 Subject: [PATCH 476/842] Disable t5000-tar-tree.sh on x86 in f28 This test was passing as recently as last week. Something seems to have changed or broken in the x86 arch of f28 since then. Disable the test until the issue is determined and resolved. --- git.spec | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/git.spec b/git.spec index 8d325d9..fe74f07 100644 --- a/git.spec +++ b/git.spec @@ -590,6 +590,19 @@ GIT_SKIP_TESTS="t9128.[34] t9141.[34] t9167.3" GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5541.33 t5551.25" %endif +%ifarch %{ix86} +# Skip tests which fail on x86 +# +# t5000-tar-tree fails on x86 in f28: +# ++ git archive --remote=. --format=tar.gz HEAD +# remote: fatal: Unknown archive format 'tar.gz' +# fatal: The remote end hung up unexpectedly +# There must be something broken or changed in f28 to cause this +%if 0%{?fedora} && 0%{?fedora} == 28 +GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5000" +%endif +%endif + %ifarch %{power64} # Skip tests which fail on ppc # @@ -771,6 +784,7 @@ rm -rf %{buildroot} * Thu Jan 18 2018 Todd Zullinger - 2.16.0-1 - Update to 2.16.0 - Use 'prove' as test harness, enable shell tracing +- Disable t5000-tar-tree.sh on x86 in f28 * Fri Jan 12 2018 Todd Zullinger - Add %%{emacs_filesystem} to simplify emacs support From 8368c37a746b906a4b2c82a3f1c3bc53dc02d42e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 22 Jan 2018 12:46:37 -0500 Subject: [PATCH 477/842] Update to 2.16.1 This release fixes an issue which only affects users on case-insensitive file systems and repositories which contain paths that differ only in case. Such circumstances result in a segmentation fault in various git commands. --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index fe74f07..145e91a 100644 --- a/git.spec +++ b/git.spec @@ -39,7 +39,7 @@ #global rcrev .rc0 Name: git -Version: 2.16.0 +Version: 2.16.1 Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -781,6 +781,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Jan 22 2018 Todd Zullinger - 2.16.1-1 +- Update to 2.16.1 + * Thu Jan 18 2018 Todd Zullinger - 2.16.0-1 - Update to 2.16.0 - Use 'prove' as test harness, enable shell tracing diff --git a/sources b/sources index 1555ad6..37fed9f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.16.0.tar.xz) = 11f8f3b5e015cbf7aa768ae66c8a4a81417d78736c10e6e24a2b83b7c3ade3afaa6934ca156c5bb9c3da80cf445549601d494bab86611d7eec7865dbfdcbd812 -SHA512 (git-2.16.0.tar.sign) = af4522517146026f20323e4c551badbd77f50a48aecaa5614048c5fc7176838fee203897c885e8703731e90b80f1b126e20b829034a7f5c1ce54405742d7b252 +SHA512 (git-2.16.1.tar.xz) = 09e30ada7bcf41f78f15784908062c10162d58d2fd7a68ad27e42fd49dc37eb0e82c19ad21db31034a189a8cdd009013a29f943e1ae5d5ab5688c913d2a4d42a +SHA512 (git-2.16.1.tar.sign) = 0bb930bc09a60d748f5cef655a67d2895550224deb6a78ce526bdba50670828fac4251c19b0607fd26b4041aa76339475fecd937ac946345f8c87b23752dbe86 From 7ac1fbccc9d97fb3b45236bd0a69867c40310fe1 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 22 Jan 2018 13:51:45 -0500 Subject: [PATCH 478/842] Avoid python dependency in git-core (#1536471) Move contrib/hooks/multimail from git-core to git and use python3 rather than python2. We still use python2 as the default PYTHON_PATH because not all of the python scripts in git support python3. None of the other scripts are included in git-core though. Primarily, python2 is used by git-p4 and contrib/svn-fe/svnrdump_sim.py (which is used by t9020-remote-svn.sh). Converting git-p4 to python3 is not a trivial matter of fixing a few print statements. A simple conversion using python3's 2to3 tool results in a large number of test failures. Add a python3-devel BuildRequires for %{__python3} and add python2-devel to the tests section since t9020-remote-svn.sh uses python2. (We already BR python2-devel in git-p4, but having it in the tests section ensures we don't remove it if/when git-p4 supports python3.) --- git.spec | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/git.spec b/git.spec index 145e91a..91ed278 100644 --- a/git.spec +++ b/git.spec @@ -3,6 +3,13 @@ %global gitexecdir %{_libexecdir}/git-core +# Settings for Fedora and EL > 7 +%if 0%{?fedora} || 0%{?rhel} > 7 +%global with_python3 1 +%else +%global with_python3 0 +%endif + # Settings for Fedora and EL >= 7 %if 0%{?fedora} || 0%{?rhel} >= 7 %global bashcomp_pkgconfig 1 @@ -141,6 +148,10 @@ BuildRequires: perl(Mail::Address) BuildRequires: perl(Memoize) BuildRequires: perl(Test::More) BuildRequires: perl(Time::HiRes) +BuildRequires: python2-devel +%if 0%{?with_python3} +BuildRequires: python3-devel +%endif BuildRequires: subversion BuildRequires: subversion-perl BuildRequires: time @@ -420,6 +431,9 @@ make -C contrib/credential/netrc/ make -C contrib/subtree/ # Fix shebang in a few places to silence rpmlint complaints +# +# The multimail hook is installed with git-core. Use python3 to avoid an +# unnecessary python2 dependency. sed -i -e '1s|#! */usr/bin/env python$|#!%{__python2}|' \ contrib/fast-import/import-zips.py \ contrib/hg-to-git/hg-to-git.py \ @@ -427,6 +441,12 @@ sed -i -e '1s|#! */usr/bin/env python$|#!%{__python2}|' \ contrib/hooks/multimail/migrate-mailhook-config \ contrib/hooks/multimail/post-receive.example \ contrib/svn-fe/svnrdump_sim.py +%if 0%{?with_python3} +sed -i -e '1s|#!%{__python2}$|#!%{__python3}|' \ + contrib/hooks/multimail/git_multimail.py \ + contrib/hooks/multimail/migrate-mailhook-config \ + contrib/hooks/multimail/post-receive.example +%endif %install rm -rf %{buildroot} @@ -651,6 +671,7 @@ rm -rf %{buildroot} %{elispdir} %{_emacs_sitestartdir}/git-init.el %endif +%{_datadir}/git-core/contrib/hooks/multimail %{_datadir}/git-core/contrib/hooks/update-paranoid %{_datadir}/git-core/contrib/hooks/setgitperms.perl %{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample @@ -664,6 +685,7 @@ rm -rf %{buildroot} %{!?_licensedir:%global license %doc} %license COPYING # exclude is best way here because of troubles with symlinks inside git-core/ +%exclude %{_datadir}/git-core/contrib/hooks/multimail %exclude %{_datadir}/git-core/contrib/hooks/update-paranoid %exclude %{_datadir}/git-core/contrib/hooks/setgitperms.perl %exclude %{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample @@ -783,6 +805,7 @@ rm -rf %{buildroot} %changelog * Mon Jan 22 2018 Todd Zullinger - 2.16.1-1 - Update to 2.16.1 +- Avoid python dependency in git-core (#1536471) * Thu Jan 18 2018 Todd Zullinger - 2.16.0-1 - Update to 2.16.0 From a51e1362a262cc4a7eddbd678e10477e1c11f2a5 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 29 Jan 2018 21:12:00 -0500 Subject: [PATCH 479/842] git-svn: avoid segfaults in 'git svn branch' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Re-enable t9128, t9141, and t9167 which were disabled due to these random segfaults. The bug has also been reported against the subversion perl bindings in Debian¹. Hopefully this will reach upstream subversion if a fix is made to subversion. ¹ https://bugs.debian.org/888791 --- ...-destruction-order-to-avoid-segfault.patch | 40 +++++++++++++++++++ git.spec | 12 ++++-- 2 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 0001-git-svn-control-destruction-order-to-avoid-segfault.patch diff --git a/0001-git-svn-control-destruction-order-to-avoid-segfault.patch b/0001-git-svn-control-destruction-order-to-avoid-segfault.patch new file mode 100644 index 0000000..8518dd5 --- /dev/null +++ b/0001-git-svn-control-destruction-order-to-avoid-segfault.patch @@ -0,0 +1,40 @@ +From 7f6f75e97acd25f8e95ce431e16d2e1c2093845d Mon Sep 17 00:00:00 2001 +From: Eric Wong +Date: Mon, 29 Jan 2018 23:11:07 +0000 +Subject: [PATCH] git-svn: control destruction order to avoid segfault + +It seems necessary to control destruction ordering to avoid a +segfault with SVN 1.9.5 when using "git svn branch". I've also +reported the problem against libsvn-perl to Debian [Bug #888791], +but releasing the SVN::Client instance can be beneficial anyways to +save memory. + +ref: https://bugs.debian.org/888791 +Tested-by: Todd Zullinger +Reported-by: brian m. carlson +Signed-off-by: Eric Wong +Signed-off-by: Junio C Hamano +Signed-off-by: Todd Zullinger +--- + git-svn.perl | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/git-svn.perl b/git-svn.perl +index aa242d4f4f..b012980246 100755 +--- a/git-svn.perl ++++ b/git-svn.perl +@@ -1199,6 +1199,11 @@ sub cmd_branch { + $ctx->copy($src, $rev, $dst) + unless $_dry_run; + ++ # Release resources held by ctx before creating another SVN::Ra ++ # so destruction is orderly. This seems necessary with SVN 1.9.5 ++ # to avoid segfaults. ++ $ctx = undef; ++ + $gs->fetch_all; + } + +-- +2.16.1 + diff --git a/git.spec b/git.spec index 91ed278..88520ac 100644 --- a/git.spec +++ b/git.spec @@ -47,7 +47,7 @@ Name: git Version: 2.16.1 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -81,6 +81,8 @@ Source99: print-failed-test-output Patch0: git-1.8-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch +# https://public-inbox.org/git/20180129231653.GA22834@starla/ +Patch2: 0001-git-svn-control-destruction-order-to-avoid-segfault.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -596,9 +598,7 @@ find %{buildroot}%{_pkgdocdir} -name "*.html" | xargs linkchecker %endif # Tests to skip on all releases and architectures -# - tests in t9128, t9141, and t9167 which call 'git svn branch' fail -# intermittently with SIGSEGV in the subversion bindings -GIT_SKIP_TESTS="t9128.[34] t9141.[34] t9167.3" +GIT_SKIP_TESTS="" %ifarch aarch64 %{arm} %{power64} # Skip tests which fail on aarch64, arm, and ppc @@ -803,6 +803,10 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Jan 29 2018 Todd Zullinger - 2.16.1-2 +- git-svn: avoid segfaults in 'git svn branch', re-enable t9128, t9141, and + t9167 + * Mon Jan 22 2018 Todd Zullinger - 2.16.1-1 - Update to 2.16.1 - Avoid python dependency in git-core (#1536471) From b30f47c653188f335da71a1b946f4e7703a06d1d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 31 Jan 2018 15:34:50 -0500 Subject: [PATCH 480/842] Drop obsolete BuildRoot, Group, %clean, and buildroot cleanup No supported releases of Fedora or EPEL require these tags, sections, or commands. --- git.spec | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/git.spec b/git.spec index 88520ac..80c67b7 100644 --- a/git.spec +++ b/git.spec @@ -50,7 +50,6 @@ Version: 2.16.1 Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 -Group: Development/Tools URL: https://git-scm.com/ Source0: https://www.kernel.org/pub/software/scm/git/%{?rcrev:testing/}%{name}-%{version}%{?rcrev}.tar.xz Source1: https://www.kernel.org/pub/software/scm/git/%{?rcrev:testing/}%{name}-%{version}%{?rcrev}.tar.sign @@ -84,8 +83,6 @@ Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://public-inbox.org/git/20180129231653.GA22834@starla/ Patch2: 0001-git-svn-control-destruction-order-to-avoid-segfault.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - %if %{with docs} BuildRequires: asciidoc >= 8.4.1 BuildRequires: xmlto @@ -184,7 +181,6 @@ tools for integrating with other SCMs, install the git-all meta-package. %package all Summary: Meta-package to pull in all git tools -Group: Development/Tools BuildArch: noarch Requires: git = %{version}-%{release} Requires: git-cvs = %{version}-%{release} @@ -209,7 +205,6 @@ This is a dummy package which brings in all subpackages. %package core Summary: Core package of git with minimal functionality -Group: Development/Tools Requires: less Requires: openssh-clients Requires: zlib >= 1.2 @@ -225,7 +220,6 @@ other SCMs, install the git-all meta-package. %package core-doc Summary: Documentation files for git-core -Group: Development/Tools BuildArch: noarch Requires: git-core = %{version}-%{release} %description core-doc @@ -233,7 +227,6 @@ Documentation files for git-core package including man pages. %package daemon Summary: Git protocol daemon -Group: Development/Tools Requires: git = %{version}-%{release} %if %{use_systemd} Requires: systemd @@ -248,7 +241,6 @@ The git daemon for supporting git:// access to git repositories %package -n gitweb Summary: Simple web interface to git repositories -Group: Development/Tools BuildArch: noarch Requires: git = %{version}-%{release} %description -n gitweb @@ -256,7 +248,6 @@ Requires: git = %{version}-%{release} %package p4 Summary: Git tools for working with Perforce depots -Group: Development/Tools BuildArch: noarch BuildRequires: python2-devel Requires: git = %{version}-%{release} @@ -265,7 +256,6 @@ Requires: git = %{version}-%{release} %package svn Summary: Git tools for interacting with Subversion repositories -Group: Development/Tools Requires: git = %{version}-%{release}, subversion Requires: perl(Digest::MD5) %if ! %{defined perl_bootstrap} @@ -276,7 +266,6 @@ Requires: perl(Term::ReadKey) %package cvs Summary: Git tools for importing CVS repositories -Group: Development/Tools BuildArch: noarch Requires: git = %{version}-%{release}, cvs Requires: cvsps @@ -287,7 +276,6 @@ Requires: perl(Git) %package email Summary: Git tools for sending patches via email -Group: Development/Tools BuildArch: noarch Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} Requires: perl(Authen::SASL) @@ -298,7 +286,6 @@ Requires: perl(Git) %package gui Summary: Graphical interface to Git -Group: Development/Tools BuildArch: noarch Requires: git = %{version}-%{release}, tk >= 8.4 Requires: gitk = %{version}-%{release} @@ -307,7 +294,6 @@ Requires: gitk = %{version}-%{release} %package -n gitk Summary: Git repository browser -Group: Development/Tools BuildArch: noarch Requires: git = %{version}-%{release}, tk >= 8.4 %description -n gitk @@ -315,7 +301,6 @@ Requires: git = %{version}-%{release}, tk >= 8.4 %package -n perl-Git Summary: Perl interface to Git -Group: Development/Libraries BuildArch: noarch Requires: git = %{version}-%{release} BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) @@ -326,7 +311,6 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi %package -n perl-Git-SVN Summary: Perl interface to Git::SVN -Group: Development/Libraries BuildArch: noarch Requires: git = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -336,7 +320,6 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi %if ! %{emacs_filesystem} %package -n emacs-git Summary: Git version control system support for Emacs -Group: Applications/Editors Requires: git = %{version}-%{release} BuildArch: noarch Requires: emacs(bin) >= %{_emacs_version} @@ -345,7 +328,6 @@ Requires: emacs(bin) >= %{_emacs_version} %package -n emacs-git-el Summary: Elisp source files for git version control system support for Emacs -Group: Applications/Editors BuildArch: noarch Requires: emacs-git = %{version}-%{release} %description -n emacs-git-el @@ -451,7 +433,6 @@ sed -i -e '1s|#!%{__python2}$|#!%{__python3}|' \ %endif %install -rm -rf %{buildroot} make %{?_smp_mflags} INSTALLDIRS=vendor install %{?with_docs:install-doc} %global elispdir %{_emacs_sitelispdir}/git @@ -651,9 +632,6 @@ export TEST_SHELL_PATH=/bin/bash # Run the tests make test || ./print-failed-test-output -%clean -rm -rf %{buildroot} - %if %{use_systemd} %post daemon %systemd_post git@.service @@ -806,6 +784,7 @@ rm -rf %{buildroot} * Mon Jan 29 2018 Todd Zullinger - 2.16.1-2 - git-svn: avoid segfaults in 'git svn branch', re-enable t9128, t9141, and t9167 +- Drop obsolete BuildRoot, Group, %%clean, and buildroot cleanup * Mon Jan 22 2018 Todd Zullinger - 2.16.1-1 - Update to 2.16.1 From 78864b8eb35f1fd4f416e3dc39a13053227496ae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 12:33:55 +0000 Subject: [PATCH 481/842] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 80c67b7..698601c 100644 --- a/git.spec +++ b/git.spec @@ -47,7 +47,7 @@ Name: git Version: 2.16.1 -Release: 2%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist}.1 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -781,6 +781,9 @@ make test || ./print-failed-test-output # No files for you! %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.16.1-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Jan 29 2018 Todd Zullinger - 2.16.1-2 - git-svn: avoid segfaults in 'git svn branch', re-enable t9128, t9141, and t9167 From f9c3604c48871ebdf4790ad7bbf70940a1b97310 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 7 Feb 2018 13:57:20 -0500 Subject: [PATCH 482/842] Order %files and %packages sections by name Adding new sections or finding existing sections should be easier. Sort the %files and %packages sections by name. --- git.spec | 251 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 127 insertions(+), 124 deletions(-) diff --git a/git.spec b/git.spec index 698601c..185e900 100644 --- a/git.spec +++ b/git.spec @@ -47,7 +47,7 @@ Name: git Version: 2.16.1 -Release: 2%{?rcrev}%{?dist}.1 +Release: 3%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -186,8 +186,8 @@ Requires: git = %{version}-%{release} Requires: git-cvs = %{version}-%{release} Requires: git-email = %{version}-%{release} Requires: git-gui = %{version}-%{release} -Requires: git-svn = %{version}-%{release} Requires: git-p4 = %{version}-%{release} +Requires: git-svn = %{version}-%{release} Requires: gitk = %{version}-%{release} Requires: perl-Git = %{version}-%{release} %if ! %{defined perl_bootstrap} @@ -225,6 +225,16 @@ Requires: git-core = %{version}-%{release} %description core-doc Documentation files for git-core package including man pages. +%package cvs +Summary: Git tools for importing CVS repositories +BuildArch: noarch +Requires: git = %{version}-%{release}, cvs +Requires: cvsps +Requires: perl(DBD::SQLite) +Requires: perl(Git) +%description cvs +%{summary}. + %package daemon Summary: Git protocol daemon Requires: git = %{version}-%{release} @@ -239,41 +249,6 @@ Requires: xinetd %description daemon The git daemon for supporting git:// access to git repositories -%package -n gitweb -Summary: Simple web interface to git repositories -BuildArch: noarch -Requires: git = %{version}-%{release} -%description -n gitweb -%{summary}. - -%package p4 -Summary: Git tools for working with Perforce depots -BuildArch: noarch -BuildRequires: python2-devel -Requires: git = %{version}-%{release} -%description p4 -%{summary}. - -%package svn -Summary: Git tools for interacting with Subversion repositories -Requires: git = %{version}-%{release}, subversion -Requires: perl(Digest::MD5) -%if ! %{defined perl_bootstrap} -Requires: perl(Term::ReadKey) -%endif -%description svn -%{summary}. - -%package cvs -Summary: Git tools for importing CVS repositories -BuildArch: noarch -Requires: git = %{version}-%{release}, cvs -Requires: cvsps -Requires: perl(DBD::SQLite) -Requires: perl(Git) -%description cvs -%{summary}. - %package email Summary: Git tools for sending patches via email BuildArch: noarch @@ -284,6 +259,37 @@ Requires: perl(Git) %description email %{summary}. +%if ! %{emacs_filesystem} +%package -n emacs-git +Summary: Git version control system support for Emacs +Requires: git = %{version}-%{release} +BuildArch: noarch +Requires: emacs(bin) >= %{_emacs_version} +%description -n emacs-git +%{summary}. + +%package -n emacs-git-el +Summary: Elisp source files for git version control system support for Emacs +BuildArch: noarch +Requires: emacs-git = %{version}-%{release} +%description -n emacs-git-el +%{summary}. +%endif + +%package -n gitk +Summary: Git repository browser +BuildArch: noarch +Requires: git = %{version}-%{release}, tk >= 8.4 +%description -n gitk +%{summary}. + +%package -n gitweb +Summary: Simple web interface to git repositories +BuildArch: noarch +Requires: git = %{version}-%{release} +%description -n gitweb +%{summary}. + %package gui Summary: Graphical interface to Git BuildArch: noarch @@ -292,11 +298,12 @@ Requires: gitk = %{version}-%{release} %description gui %{summary}. -%package -n gitk -Summary: Git repository browser +%package p4 +Summary: Git tools for working with Perforce depots BuildArch: noarch -Requires: git = %{version}-%{release}, tk >= 8.4 -%description -n gitk +BuildRequires: python2-devel +Requires: git = %{version}-%{release} +%description p4 %{summary}. %package -n perl-Git @@ -317,22 +324,15 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi %description -n perl-Git-SVN %{summary}. -%if ! %{emacs_filesystem} -%package -n emacs-git -Summary: Git version control system support for Emacs -Requires: git = %{version}-%{release} -BuildArch: noarch -Requires: emacs(bin) >= %{_emacs_version} -%description -n emacs-git -%{summary}. - -%package -n emacs-git-el -Summary: Elisp source files for git version control system support for Emacs -BuildArch: noarch -Requires: emacs-git = %{version}-%{release} -%description -n emacs-git-el -%{summary}. +%package svn +Summary: Git tools for interacting with Subversion repositories +Requires: git = %{version}-%{release}, subversion +Requires: perl(Digest::MD5) +%if ! %{defined perl_bootstrap} +Requires: perl(Term::ReadKey) %endif +%description svn +%{summary}. %prep # Verify GPG signatures @@ -656,6 +656,9 @@ make test || ./print-failed-test-output %{_datadir}/git-core/templates/hooks/pre-rebase.sample %{_datadir}/git-core/templates/hooks/prepare-commit-msg.sample +%files all +# No files for you! + %files core -f bin-files-core %defattr(-,root,root) #NOTE: this is only use of the %%doc macro in this spec file and should not @@ -680,22 +683,6 @@ make test || ./print-failed-test-output %endif %{_pkgdocdir}/contrib/hooks -%files p4 -%defattr(-,root,root) -%{gitexecdir}/*p4* -%{gitexecdir}/mergetools/p4merge -%{_pkgdocdir}/*p4*.txt -%{?with_docs:%{_mandir}/man1/*p4*.1*} -%{?with_docs:%{_pkgdocdir}/*p4*.html} - -%files svn -%defattr(-,root,root) -%{gitexecdir}/*svn* -#NOTE: what about svn-fe -%{_pkgdocdir}/*svn*.txt -%{?with_docs:%{_mandir}/man1/*svn*.1*} -%{?with_docs:%{_pkgdocdir}/*svn*.html} - %files cvs %defattr(-,root,root) %{_pkgdocdir}/*git-cvs*.txt @@ -704,56 +691,6 @@ make test || ./print-failed-test-output %{?with_docs:%{_mandir}/man1/*cvs*.1*} %{?with_docs:%{_pkgdocdir}/*git-cvs*.html} -%files email -%defattr(-,root,root) -%{_pkgdocdir}/*email*.txt -%{gitexecdir}/*email* -%{?with_docs:%{_mandir}/man1/*email*.1*} -%{?with_docs:%{_pkgdocdir}/*email*.html} - -%files gui -%defattr(-,root,root) -%{gitexecdir}/git-gui* -%{gitexecdir}/git-citool -%{_datadir}/applications/*git-gui.desktop -%{_datadir}/git-gui/ -%{_pkgdocdir}/git-gui.txt -%{_pkgdocdir}/git-citool.txt -%{?with_docs:%{_mandir}/man1/git-gui.1*} -%{?with_docs:%{_pkgdocdir}/git-gui.html} -%{?with_docs:%{_mandir}/man1/git-citool.1*} -%{?with_docs:%{_pkgdocdir}/git-citool.html} - -%files -n gitk -%defattr(-,root,root) -%{_pkgdocdir}/*gitk*.txt -%{_bindir}/*gitk* -%{_datadir}/gitk -%{?with_docs:%{_mandir}/man1/*gitk*.1*} -%{?with_docs:%{_pkgdocdir}/*gitk*.html} - -%files -n perl-Git -f perl-git-files -%defattr(-,root,root) -%exclude %{_mandir}/man3/*Git*SVN*.3pm* -%{?with_docs:%{_mandir}/man3/*Git*.3pm*} - -%files -n perl-Git-SVN -f perl-git-svn-files -%defattr(-,root,root) -%{?with_docs:%{_mandir}/man3/*Git*SVN*.3pm*} - -%if ! %{emacs_filesystem} -%files -n emacs-git -%defattr(-,root,root) -%{_pkgdocdir}/contrib/emacs/README -%dir %{elispdir} -%{elispdir}/*.elc -%{_emacs_sitestartdir}/git-init.el - -%files -n emacs-git-el -%defattr(-,root,root) -%{elispdir}/*.el -%endif - %files daemon %defattr(-,root,root) %{_pkgdocdir}/git-daemon*.txt @@ -768,6 +705,34 @@ make test || ./print-failed-test-output %{?with_docs:%{_mandir}/man1/git-daemon*.1*} %{?with_docs:%{_pkgdocdir}/git-daemon*.html} +%if ! %{emacs_filesystem} +%files -n emacs-git +%defattr(-,root,root) +%{_pkgdocdir}/contrib/emacs/README +%dir %{elispdir} +%{elispdir}/*.elc +%{_emacs_sitestartdir}/git-init.el + +%files -n emacs-git-el +%defattr(-,root,root) +%{elispdir}/*.el +%endif + +%files email +%defattr(-,root,root) +%{_pkgdocdir}/*email*.txt +%{gitexecdir}/*email* +%{?with_docs:%{_mandir}/man1/*email*.1*} +%{?with_docs:%{_pkgdocdir}/*email*.html} + +%files -n gitk +%defattr(-,root,root) +%{_pkgdocdir}/*gitk*.txt +%{_bindir}/*gitk* +%{_datadir}/gitk +%{?with_docs:%{_mandir}/man1/*gitk*.1*} +%{?with_docs:%{_pkgdocdir}/*gitk*.html} + %files -n gitweb %defattr(-,root,root) %{_pkgdocdir}/*.gitweb @@ -777,10 +742,48 @@ make test || ./print-failed-test-output %config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf %{_localstatedir}/www/git/ -%files all -# No files for you! +%files gui +%defattr(-,root,root) +%{gitexecdir}/git-gui* +%{gitexecdir}/git-citool +%{_datadir}/applications/*git-gui.desktop +%{_datadir}/git-gui/ +%{_pkgdocdir}/git-gui.txt +%{_pkgdocdir}/git-citool.txt +%{?with_docs:%{_mandir}/man1/git-gui.1*} +%{?with_docs:%{_pkgdocdir}/git-gui.html} +%{?with_docs:%{_mandir}/man1/git-citool.1*} +%{?with_docs:%{_pkgdocdir}/git-citool.html} + +%files p4 +%defattr(-,root,root) +%{gitexecdir}/*p4* +%{gitexecdir}/mergetools/p4merge +%{_pkgdocdir}/*p4*.txt +%{?with_docs:%{_mandir}/man1/*p4*.1*} +%{?with_docs:%{_pkgdocdir}/*p4*.html} + +%files -n perl-Git -f perl-git-files +%defattr(-,root,root) +%exclude %{_mandir}/man3/*Git*SVN*.3pm* +%{?with_docs:%{_mandir}/man3/*Git*.3pm*} + +%files -n perl-Git-SVN -f perl-git-svn-files +%defattr(-,root,root) +%{?with_docs:%{_mandir}/man3/*Git*SVN*.3pm*} + +%files svn +%defattr(-,root,root) +%{gitexecdir}/*svn* +#NOTE: what about svn-fe +%{_pkgdocdir}/*svn*.txt +%{?with_docs:%{_mandir}/man1/*svn*.1*} +%{?with_docs:%{_pkgdocdir}/*svn*.html} %changelog +* Wed Feb 07 2018 Todd Zullinger - 2.16.1-3 +- Order %%files and %%packages sections by name + * Wed Feb 07 2018 Fedora Release Engineering - 2.16.1-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From ff200cac041e55b574fbd76559feff7f49edb0d8 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 7 Feb 2018 14:01:16 -0500 Subject: [PATCH 483/842] Remove obsolete %defattr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The use of %defattr has been unneeded since rpm-4.4. It was removed from the guidelines 6 years ago¹. It was kept to allow builds on EL-5, which has been EOL since March of last year. ¹ https://pagure.io/packaging-committee/issue/77 %defattr is no longer needed in Fedora --- git.spec | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/git.spec b/git.spec index 185e900..284a650 100644 --- a/git.spec +++ b/git.spec @@ -644,7 +644,6 @@ make test || ./print-failed-test-output %endif %files -f bin-man-doc-git-files -%defattr(-,root,root) %if %{emacs_filesystem} %{elispdir} %{_emacs_sitestartdir}/git-init.el @@ -660,7 +659,6 @@ make test || ./print-failed-test-output # No files for you! %files core -f bin-files-core -%defattr(-,root,root) #NOTE: this is only use of the %%doc macro in this spec file and should not # be used elsewhere %{!?_licensedir:%global license %doc} @@ -676,7 +674,6 @@ make test || ./print-failed-test-output %{_datadir}/git-core/ %files core-doc -f man-doc-files-core -%defattr(-,root,root) %if 0%{?rhel} && 0%{?rhel} <= 7 # .py files are only bytecompiled on EL <= 7 %exclude %{_pkgdocdir}/contrib/*/*.py[co] @@ -684,7 +681,6 @@ make test || ./print-failed-test-output %{_pkgdocdir}/contrib/hooks %files cvs -%defattr(-,root,root) %{_pkgdocdir}/*git-cvs*.txt %{_bindir}/git-cvsserver %{gitexecdir}/*cvs* @@ -692,7 +688,6 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/*git-cvs*.html} %files daemon -%defattr(-,root,root) %{_pkgdocdir}/git-daemon*.txt %if %{use_systemd} %{_unitdir}/git.socket @@ -707,26 +702,22 @@ make test || ./print-failed-test-output %if ! %{emacs_filesystem} %files -n emacs-git -%defattr(-,root,root) %{_pkgdocdir}/contrib/emacs/README %dir %{elispdir} %{elispdir}/*.elc %{_emacs_sitestartdir}/git-init.el %files -n emacs-git-el -%defattr(-,root,root) %{elispdir}/*.el %endif %files email -%defattr(-,root,root) %{_pkgdocdir}/*email*.txt %{gitexecdir}/*email* %{?with_docs:%{_mandir}/man1/*email*.1*} %{?with_docs:%{_pkgdocdir}/*email*.html} %files -n gitk -%defattr(-,root,root) %{_pkgdocdir}/*gitk*.txt %{_bindir}/*gitk* %{_datadir}/gitk @@ -734,7 +725,6 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/*gitk*.html} %files -n gitweb -%defattr(-,root,root) %{_pkgdocdir}/*.gitweb %{_pkgdocdir}/gitweb*.txt %{?with_docs:%{_pkgdocdir}/gitweb*.html} @@ -743,7 +733,6 @@ make test || ./print-failed-test-output %{_localstatedir}/www/git/ %files gui -%defattr(-,root,root) %{gitexecdir}/git-gui* %{gitexecdir}/git-citool %{_datadir}/applications/*git-gui.desktop @@ -756,7 +745,6 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-citool.html} %files p4 -%defattr(-,root,root) %{gitexecdir}/*p4* %{gitexecdir}/mergetools/p4merge %{_pkgdocdir}/*p4*.txt @@ -764,16 +752,13 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/*p4*.html} %files -n perl-Git -f perl-git-files -%defattr(-,root,root) %exclude %{_mandir}/man3/*Git*SVN*.3pm* %{?with_docs:%{_mandir}/man3/*Git*.3pm*} %files -n perl-Git-SVN -f perl-git-svn-files -%defattr(-,root,root) %{?with_docs:%{_mandir}/man3/*Git*SVN*.3pm*} %files svn -%defattr(-,root,root) %{gitexecdir}/*svn* #NOTE: what about svn-fe %{_pkgdocdir}/*svn*.txt @@ -783,6 +768,7 @@ make test || ./print-failed-test-output %changelog * Wed Feb 07 2018 Todd Zullinger - 2.16.1-3 - Order %%files and %%packages sections by name +- Remove obsolete %%defattr * Wed Feb 07 2018 Fedora Release Engineering - 2.16.1-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From cfcd10ad9153ec8b899938230179ad5ca359cf2b Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 7 Feb 2018 14:38:34 -0500 Subject: [PATCH 484/842] Don't package contrib/svn-fe in %doc --- git.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 284a650..915fc0a 100644 --- a/git.spec +++ b/git.spec @@ -550,8 +550,8 @@ grep -E "$not_core_re" bin-man-doc-files > bin-man-doc-git-files not_core_doc_re="(git-(cvs|gui|citool|daemon))|p4|svn|email|gitk|gitweb" mkdir -p %{buildroot}%{_pkgdocdir}/ cp -pr README.md Documentation/*.txt Documentation/RelNotes contrib %{buildroot}%{_pkgdocdir}/ -# Remove contrib/credential, it has nothing useful for documentation -rm -rf %{buildroot}%{_pkgdocdir}/contrib/credential/ +# Remove contrib/{credential,svn-fe}, they have nothing useful for documentation +rm -rf %{buildroot}%{_pkgdocdir}/contrib/{credential,svn-fe}/ cp -p gitweb/INSTALL %{buildroot}%{_pkgdocdir}/INSTALL.gitweb cp -p gitweb/README %{buildroot}%{_pkgdocdir}/README.gitweb @@ -760,7 +760,6 @@ make test || ./print-failed-test-output %files svn %{gitexecdir}/*svn* -#NOTE: what about svn-fe %{_pkgdocdir}/*svn*.txt %{?with_docs:%{_mandir}/man1/*svn*.1*} %{?with_docs:%{_pkgdocdir}/*svn*.html} @@ -769,6 +768,7 @@ make test || ./print-failed-test-output * Wed Feb 07 2018 Todd Zullinger - 2.16.1-3 - Order %%files and %%packages sections by name - Remove obsolete %%defattr +- Don't package contrib/svn-fe in %%doc * Wed Feb 07 2018 Fedora Release Engineering - 2.16.1-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 144ee1f802000b226276bcce74c04ec88f498ac7 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 8 Feb 2018 13:13:57 -0500 Subject: [PATCH 485/842] lint: ignore obsolete-not-provided git-gnome-keyring The git-gnome-keyring package was obsoleted in 2d1c8b1 ("Remove obsolete gnome-keyring credential helper", 2018-01-09). Silence the rpmlint warning. --- .rpmlint | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.rpmlint b/.rpmlint index 319e939..61b6a32 100644 --- a/.rpmlint +++ b/.rpmlint @@ -15,3 +15,6 @@ addFilter("git-gui.noarch: W: desktopfile-without-binary /usr/share/applications # ignore no doc/manpage warnings where we don't expect any documentation addFilter("git-(all|core|gnome-keyring)\..*: W: no-documentation") addFilter("git-core\..*: W: no-manual-page-for-binary") + +# nothing provides git-gnome-keyring, it's simply obsolete +addFilter("git.* obsolete-not-provided git-gnome-keyring") From 986b772e5516e1a4a762931959576dcf070722e8 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 7 Feb 2018 14:17:52 -0500 Subject: [PATCH 486/842] Split 'git subtree' into a separate package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While 'git subtree' does not pull in any additional dependencies, having it in a separate package may help avoid confusion that it is a core git command. This came up recently on the git list¹. Another recent thread leaves the impression that 'git subtree' is in maintenance mode². This implies that it is unlikely to move out of contib in the near future. ¹ https://public-inbox.org/git/alpine.LFD.2.21.1802070801470.19185@android-a172fe96dd584b41/ ² https://public-inbox.org/git/CADfK3RWXDuE=hYD==4sHXO1iJeOiVDOp7hBqhBtSn7gnQ+x7Qg@mail.gmail.com/ --- .rpmlint | 1 + git.spec | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.rpmlint b/.rpmlint index 61b6a32..08c9108 100644 --- a/.rpmlint +++ b/.rpmlint @@ -2,6 +2,7 @@ from Config import * # the dictionary is a bit limited addFilter("git.* spelling-error %description .* subpackages") +addFilter("git-subtree.* spelling-error %description .* (subdirectory|subproject|subtree)") # We're not misusing %{buildroot} here addFilter("git\.(spec|src):.* rpm-buildroot-usage %prep DESTDIR = %{buildroot}") diff --git a/git.spec b/git.spec index 915fc0a..8d0a478 100644 --- a/git.spec +++ b/git.spec @@ -187,6 +187,7 @@ Requires: git-cvs = %{version}-%{release} Requires: git-email = %{version}-%{release} Requires: git-gui = %{version}-%{release} Requires: git-p4 = %{version}-%{release} +Requires: git-subtree = %{version}-%{release} Requires: git-svn = %{version}-%{release} Requires: gitk = %{version}-%{release} Requires: perl-Git = %{version}-%{release} @@ -324,6 +325,14 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi %description -n perl-Git-SVN %{summary}. +%package subtree +Summary: Git tools to merge and split repositories +Requires: git-core = %{version}-%{release} +%description subtree +Git subtrees allow subprojects to be included within a subdirectory +of the main project, optionally including the subproject's entire +history. + %package svn Summary: Git tools for interacting with Subversion repositories Requires: git = %{version}-%{release}, subversion @@ -464,12 +473,14 @@ find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';' find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';' # Clean up contrib/subtree to avoid cruft in the git-core-doc docdir +# Move git-subtree.txt to Documentation so it can be installed later in docdir +mv contrib/subtree/git-subtree.txt Documentation/ rm -rf contrib/subtree/{INSTALL,Makefile,git-subtree{,.{1,html,sh,txt,xml}},t} # git-archimport is not supported find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' -exclude_re="archimport|email|git-citool|git-cvs|git-daemon|git-gui|git-remote-bzr|git-remote-hg|gitk|p4|svn" +exclude_re="archimport|email|git-citool|git-cvs|git-daemon|git-gui|git-remote-bzr|git-remote-hg|git-subtree|gitk|p4|svn" (find %{buildroot}{%{_bindir},%{_libexecdir}} -type f | grep -vE "$exclude_re" | sed -e s@^%{buildroot}@@) > bin-man-doc-files (find %{buildroot}{%{_bindir},%{_libexecdir}} -mindepth 1 -type d | grep -vE "$exclude_re" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files (find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) > perl-git-files @@ -547,7 +558,7 @@ grep -E "$not_core_re" bin-man-doc-files > bin-man-doc-git-files ##### DOC # place doc files into %%{_pkgdocdir} and split them into expected packages # contrib -not_core_doc_re="(git-(cvs|gui|citool|daemon))|p4|svn|email|gitk|gitweb" +not_core_doc_re="(git-(cvs|gui|citool|daemon|subtree))|p4|svn|email|gitk|gitweb" mkdir -p %{buildroot}%{_pkgdocdir}/ cp -pr README.md Documentation/*.txt Documentation/RelNotes contrib %{buildroot}%{_pkgdocdir}/ # Remove contrib/{credential,svn-fe}, they have nothing useful for documentation @@ -758,6 +769,12 @@ make test || ./print-failed-test-output %files -n perl-Git-SVN -f perl-git-svn-files %{?with_docs:%{_mandir}/man3/*Git*SVN*.3pm*} +%files subtree +%{gitexecdir}/git-subtree +%{_pkgdocdir}/git-subtree.txt +%{?with_docs:%{_mandir}/man1/git-subtree.1*} +%{?with_docs:%{_pkgdocdir}/git-subtree.html} + %files svn %{gitexecdir}/*svn* %{_pkgdocdir}/*svn*.txt @@ -769,6 +786,7 @@ make test || ./print-failed-test-output - Order %%files and %%packages sections by name - Remove obsolete %%defattr - Don't package contrib/svn-fe in %%doc +- Split git-subtree into a separate package * Wed Feb 07 2018 Fedora Release Engineering - 2.16.1-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 0164091753933d10bc79adea310e24dc886fbb85 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 16 Feb 2018 13:50:09 -0500 Subject: [PATCH 487/842] Update to 2.16.2 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.16.2.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 8d0a478..d5e48d1 100644 --- a/git.spec +++ b/git.spec @@ -46,8 +46,8 @@ #global rcrev .rc0 Name: git -Version: 2.16.1 -Release: 3%{?rcrev}%{?dist} +Version: 2.16.2 +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -782,6 +782,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/*svn*.html} %changelog +* Fri Feb 16 2018 Todd Zullinger - 2.16.2-1 +- Update to 2.16.2 + * Wed Feb 07 2018 Todd Zullinger - 2.16.1-3 - Order %%files and %%packages sections by name - Remove obsolete %%defattr diff --git a/sources b/sources index 37fed9f..2a17568 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.16.1.tar.xz) = 09e30ada7bcf41f78f15784908062c10162d58d2fd7a68ad27e42fd49dc37eb0e82c19ad21db31034a189a8cdd009013a29f943e1ae5d5ab5688c913d2a4d42a -SHA512 (git-2.16.1.tar.sign) = 0bb930bc09a60d748f5cef655a67d2895550224deb6a78ce526bdba50670828fac4251c19b0607fd26b4041aa76339475fecd937ac946345f8c87b23752dbe86 +SHA512 (git-2.16.2.tar.xz) = ff1bf4b94c09de26acf85b97003582002c232e5861a896d8c2d8dc011cb3d4966b1eb0e74ef94f80426d50bb465bf6c9b6edda13b1e4143f0eb38ee01f4890e4 +SHA512 (git-2.16.2.tar.sign) = 4b5a521e766ce45809fb040657367493403e74eab884fc7572abc691635f197d592ae0801209a801be1d56b5e5ad868515ff7e80e4b562db53f60ecf6c92622c From 04982344f33e08549ce552ec91b2d9b46d83f312 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 16 Feb 2018 13:52:46 -0500 Subject: [PATCH 488/842] Add gawk, gcc, make, and sed BuildRequires The guidelines require all required packages to be explicitly listed. This list may not be complete, but it's a start. Additionally, a proposed change for Fedora 29 removes gcc from the default BuildRoot. While at it, sort a few BuildRequires in alphabetical order. --- git.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index d5e48d1..017f48a 100644 --- a/git.spec +++ b/git.spec @@ -93,28 +93,32 @@ BuildRequires: linkchecker BuildRequires: desktop-file-utils BuildRequires: emacs BuildRequires: expat-devel +BuildRequires: gawk +BuildRequires: gcc BuildRequires: gettext BuildRequires: gnupg2 BuildRequires: libcurl-devel %if %{libsecret} BuildRequires: libsecret-devel %endif +BuildRequires: make +BuildRequires: openssl-devel BuildRequires: pcre2-devel +BuildRequires: perl(Test) %if 0%{?fedora} BuildRequires: perl-generators %endif -BuildRequires: perl(Test) -BuildRequires: openssl-devel -BuildRequires: zlib-devel >= 1.2 -BuildRequires: tcl -BuildRequires: tk %if %{bashcomp_pkgconfig} BuildRequires: pkgconfig(bash-completion) %endif +BuildRequires: sed %if %{use_systemd} # For macros BuildRequires: systemd %endif +BuildRequires: tcl +BuildRequires: tk +BuildRequires: zlib-devel >= 1.2 # Test suite requirements BuildRequires: acl @@ -784,6 +788,7 @@ make test || ./print-failed-test-output %changelog * Fri Feb 16 2018 Todd Zullinger - 2.16.2-1 - Update to 2.16.2 +- Add gawk, gcc, make, and sed BuildRequires * Wed Feb 07 2018 Todd Zullinger - 2.16.1-3 - Order %%files and %%packages sections by name From 0609eef4e2dd628e7dc7fe4ade3ec04a11f89204 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 23 Feb 2018 23:00:28 -0500 Subject: [PATCH 489/842] Improve hardening flags for EL-6 & EL-7 Ensure all binaries are hardened when building on EL-6 & EL-7. On EL-7 use the %{_hardened_build} macro. On EL-6 update %{optflags} and set %{__global_ldflags}. For EL-7 this could also be put in the existing Fedora and EL >= 7 condition, e.g.: %{!?_hardened_build: %global _hardened_build 1}. I think this is a bit uglier than needed and is better in an %if condition which only applied to EL-7. --- git.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 017f48a..0586bfb 100644 --- a/git.spec +++ b/git.spec @@ -30,9 +30,15 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} %endif -# Settings for EL <= 7 -%if 0%{?rhel} && 0%{?rhel} <= 7 -%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} +# Hardening flags for EL-7 +%if 0%{?rhel} == 7 +%global _hardened_build 1 +%endif + +# Hardening flags for EL-6 +%if 0%{?rhel} == 6 +%global optflags %{optflags} -fPIC -pie +%global __global_ldflags -Wl,-z,relro -Wl,-z,now %endif # Test links in HTML documentation on Fedora (linkchecker is not in EL) @@ -786,6 +792,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/*svn*.html} %changelog +* Fri Feb 23 2018 Todd Zullinger +- Improve hardening flags for EL-6 & EL-7 + * Fri Feb 16 2018 Todd Zullinger - 2.16.2-1 - Update to 2.16.2 - Add gawk, gcc, make, and sed BuildRequires From d56cfc6775f499f166df6033a96fb70d7e8a0937 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 15 Mar 2018 00:10:49 -0400 Subject: [PATCH 490/842] Use symlinks instead of hardlinks for installed binaries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A recent discussion on the git list¹ suggested that using symlinks should be clearer and have no drawbacks (except on filesystems where symlinks are not well supported, e.g. on Windows). This shrinks the git-core package by nearly 25% and saves almost 6MB in the debuginfo package. See also 6ef5f1f ("Disable cross-directory hardlinks", 2017-11-10). ¹ https://public-inbox.org/git/87y3iwp2z0.fsf@evledraar.gmail.com/#t --- .rpmlint | 3 +++ git.spec | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.rpmlint b/.rpmlint index 08c9108..8066d36 100644 --- a/.rpmlint +++ b/.rpmlint @@ -10,6 +10,9 @@ addFilter("git\.(spec|src):.* rpm-buildroot-usage %prep DESTDIR = %{buildroot}") # 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 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 0586bfb..a3a5f75 100644 --- a/git.spec +++ b/git.spec @@ -391,6 +391,7 @@ INSTALL = install -p GITWEB_PROJECTROOT = %{_localstatedir}/lib/git GNU_ROFF = 1 NO_CROSS_DIRECTORY_HARDLINKS = 1 +NO_INSTALL_HARDLINKS = 1 PYTHON_PATH = %{__python2} htmldir = %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} prefix = %{_prefix} @@ -454,6 +455,11 @@ sed -i -e '1s|#!%{__python2}$|#!%{__python3}|' \ %install make %{?_smp_mflags} INSTALLDIRS=vendor install %{?with_docs:install-doc} +# symlink %%{gitexecdir} copies of git, git-shell, and git-upload-pack +for i in git git-shell git-upload-pack; do + ln -sf ../../bin/$i %{buildroot}%{gitexecdir}/$i +done + %global elispdir %{_emacs_sitelispdir}/git make -C contrib/emacs install \ emacsdir=%{buildroot}%{elispdir} @@ -491,7 +497,7 @@ rm -rf contrib/subtree/{INSTALL,Makefile,git-subtree{,.{1,html,sh,txt,xml}},t} find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' exclude_re="archimport|email|git-citool|git-cvs|git-daemon|git-gui|git-remote-bzr|git-remote-hg|git-subtree|gitk|p4|svn" -(find %{buildroot}{%{_bindir},%{_libexecdir}} -type f | grep -vE "$exclude_re" | sed -e s@^%{buildroot}@@) > bin-man-doc-files +(find %{buildroot}{%{_bindir},%{_libexecdir}} -type f -o -type l | grep -vE "$exclude_re" | sed -e s@^%{buildroot}@@) > bin-man-doc-files (find %{buildroot}{%{_bindir},%{_libexecdir}} -mindepth 1 -type d | grep -vE "$exclude_re" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files (find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) > perl-git-files (find %{buildroot}%{perl_vendorlib} -mindepth 1 -type d | sed -e 's@^%{buildroot}@%dir @') >> perl-git-files @@ -792,6 +798,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/*svn*.html} %changelog +* Thu Mar 15 2018 Todd Zullinger +- Use symlinks instead of hardlinks for installed binaries + * Fri Feb 23 2018 Todd Zullinger - Improve hardening flags for EL-6 & EL-7 From f3c13faa206935a844e09c7dc9d78d6325100ced Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 16 Feb 2018 15:22:57 -0500 Subject: [PATCH 491/842] Update to 2.17.0-rc0 The perl install process was updated to remove the need for ExtUtils::MakeMaker. The main change for us is setting perllibdir to keep the files installed in %{perl_vendorlib}. Manpages for non-public portions of the Git perl modules are no longer built. Anyone who wishes to make use of these modules can read the source files or use pod2man. Set NO_PERL_CPAN_FALLBACKS to ensure we don't package the bundled fallback modules. Also drop now-unneeded commands to remove *.bs, .packlist, and perllocal.pod files. The new install method does not produce these artifacts. --- .rpmlint | 1 + ...-destruction-order-to-avoid-segfault.patch | 40 ------------------- git.spec | 26 ++++++------ sources | 4 +- 4 files changed, 15 insertions(+), 56 deletions(-) delete mode 100644 0001-git-svn-control-destruction-order-to-avoid-segfault.patch diff --git a/.rpmlint b/.rpmlint index 8066d36..caf2fb7 100644 --- a/.rpmlint +++ b/.rpmlint @@ -18,6 +18,7 @@ addFilter("git-gui.noarch: W: desktopfile-without-binary /usr/share/applications # ignore no doc/manpage warnings where we don't expect any documentation addFilter("git-(all|core|gnome-keyring)\..*: W: no-documentation") +addFilter("perl-Git-SVN.noarch: W: no-documentation") addFilter("git-core\..*: W: no-manual-page-for-binary") # nothing provides git-gnome-keyring, it's simply obsolete diff --git a/0001-git-svn-control-destruction-order-to-avoid-segfault.patch b/0001-git-svn-control-destruction-order-to-avoid-segfault.patch deleted file mode 100644 index 8518dd5..0000000 --- a/0001-git-svn-control-destruction-order-to-avoid-segfault.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 7f6f75e97acd25f8e95ce431e16d2e1c2093845d Mon Sep 17 00:00:00 2001 -From: Eric Wong -Date: Mon, 29 Jan 2018 23:11:07 +0000 -Subject: [PATCH] git-svn: control destruction order to avoid segfault - -It seems necessary to control destruction ordering to avoid a -segfault with SVN 1.9.5 when using "git svn branch". I've also -reported the problem against libsvn-perl to Debian [Bug #888791], -but releasing the SVN::Client instance can be beneficial anyways to -save memory. - -ref: https://bugs.debian.org/888791 -Tested-by: Todd Zullinger -Reported-by: brian m. carlson -Signed-off-by: Eric Wong -Signed-off-by: Junio C Hamano -Signed-off-by: Todd Zullinger ---- - git-svn.perl | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/git-svn.perl b/git-svn.perl -index aa242d4f4f..b012980246 100755 ---- a/git-svn.perl -+++ b/git-svn.perl -@@ -1199,6 +1199,11 @@ sub cmd_branch { - $ctx->copy($src, $rev, $dst) - unless $_dry_run; - -+ # Release resources held by ctx before creating another SVN::Ra -+ # so destruction is orderly. This seems necessary with SVN 1.9.5 -+ # to avoid segfaults. -+ $ctx = undef; -+ - $gs->fetch_all; - } - --- -2.16.1 - diff --git a/git.spec b/git.spec index a3a5f75..2617b8c 100644 --- a/git.spec +++ b/git.spec @@ -49,11 +49,11 @@ %endif # Define for release candidates -#global rcrev .rc0 +%global rcrev .rc0 Name: git -Version: 2.16.2 -Release: 1%{?rcrev}%{?dist} +Version: 2.17.0 +Release: 0.0%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -86,8 +86,6 @@ Source99: print-failed-test-output Patch0: git-1.8-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# https://public-inbox.org/git/20180129231653.GA22834@starla/ -Patch2: 0001-git-svn-control-destruction-order-to-avoid-segfault.patch %if %{with docs} BuildRequires: asciidoc >= 8.4.1 @@ -320,8 +318,8 @@ Requires: git = %{version}-%{release} %package -n perl-Git Summary: Perl interface to Git BuildArch: noarch +BuildRequires: perl(Error) Requires: git = %{version}-%{release} -BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) Requires: perl(Error) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -n perl-Git @@ -392,9 +390,11 @@ GITWEB_PROJECTROOT = %{_localstatedir}/lib/git GNU_ROFF = 1 NO_CROSS_DIRECTORY_HARDLINKS = 1 NO_INSTALL_HARDLINKS = 1 +NO_PERL_CPAN_FALLBACKS = 1 PYTHON_PATH = %{__python2} htmldir = %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} prefix = %{_prefix} +perllibdir = %{perl_vendorlib} gitwebdir = %{_localstatedir}/www/git # Test options @@ -453,7 +453,7 @@ sed -i -e '1s|#!%{__python2}$|#!%{__python3}|' \ %endif %install -make %{?_smp_mflags} INSTALLDIRS=vendor install %{?with_docs:install-doc} +make %{?_smp_mflags} install %{?with_docs:install-doc} # symlink %%{gitexecdir} copies of git, git-shell, and git-upload-pack for i in git git-shell git-upload-pack; do @@ -484,10 +484,6 @@ install -pm 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf sed "s|@PROJECTROOT@|%{_localstatedir}/lib/git|g" \ %{SOURCE14} > %{buildroot}%{_sysconfdir}/gitweb.conf -find %{buildroot} -type f -name .packlist -exec rm -f {} ';' -find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';' -find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';' - # Clean up contrib/subtree to avoid cruft in the git-core-doc docdir # Move git-subtree.txt to Documentation so it can be installed later in docdir mv contrib/subtree/git-subtree.txt Documentation/ @@ -779,11 +775,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/*p4*.html} %files -n perl-Git -f perl-git-files -%exclude %{_mandir}/man3/*Git*SVN*.3pm* -%{?with_docs:%{_mandir}/man3/*Git*.3pm*} +%{?with_docs:%{_mandir}/man3/Git.3pm*} %files -n perl-Git-SVN -f perl-git-svn-files -%{?with_docs:%{_mandir}/man3/*Git*SVN*.3pm*} %files subtree %{gitexecdir}/git-subtree @@ -798,6 +792,10 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/*svn*.html} %changelog +* Thu Mar 15 2018 Todd Zullinger - 2.17.0-0.0.rc0 +- Update to 2.17.0-rc0 +- Adjust for simplified perl install + * Thu Mar 15 2018 Todd Zullinger - Use symlinks instead of hardlinks for installed binaries diff --git a/sources b/sources index 2a17568..478724d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.16.2.tar.xz) = ff1bf4b94c09de26acf85b97003582002c232e5861a896d8c2d8dc011cb3d4966b1eb0e74ef94f80426d50bb465bf6c9b6edda13b1e4143f0eb38ee01f4890e4 -SHA512 (git-2.16.2.tar.sign) = 4b5a521e766ce45809fb040657367493403e74eab884fc7572abc691635f197d592ae0801209a801be1d56b5e5ad868515ff7e80e4b562db53f60ecf6c92622c +SHA512 (git-2.17.0.rc0.tar.xz) = 2c444ac785f451719e5b37c1541b371d892a9f346c3f5adaf99166b70e7d0f3e4932f26ac11bc13b20eaa9d3d32b46bb6e17d99b2438a6e41aeebd7853a14b29 +SHA512 (git-2.17.0.rc0.tar.sign) = 049e1bcb8147502d827c16852f920ce4ce907664aebc3cf5edd234006cabbf4f6443ffb58adac3fcbc6b3db0c6ff31a809f023f91c9d1d2ae75033243f0aac59 From 098a42523b5027bc79090db679b11a747b322407 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 15 Mar 2018 21:25:12 -0400 Subject: [PATCH 492/842] Require git-core rather than git for git-daemon A git-daemon install should require nothing more than git-core. This allows running the daemon on systems or containers with a minimal install. --- git.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 2617b8c..6923989 100644 --- a/git.spec +++ b/git.spec @@ -246,7 +246,7 @@ Requires: perl(Git) %package daemon Summary: Git protocol daemon -Requires: git = %{version}-%{release} +Requires: git-core = %{version}-%{release} %if %{use_systemd} Requires: systemd Requires(post): systemd @@ -795,6 +795,7 @@ make test || ./print-failed-test-output * Thu Mar 15 2018 Todd Zullinger - 2.17.0-0.0.rc0 - Update to 2.17.0-rc0 - Adjust for simplified perl install +- Require git-core rather than git for git-daemon * Thu Mar 15 2018 Todd Zullinger - Use symlinks instead of hardlinks for installed binaries From 556b4a03d383b53bf472301365d9a60f33f55a2e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 15 Mar 2018 22:00:01 -0400 Subject: [PATCH 493/842] Rename gitweb httpd config file The gitweb httpd config file was added long before git gained support for smart http, in c97cf8e ("Add git-daemon and gitweb packages", 2007-08-04). Now, users who want to enable git's smart http support with apache will often want to use /etc/httpd/conf.d/git.conf as the path. Make this easier by giving the gitweb httpd config file a more logical name going forward. Keep the current config file name in previous releases. --- git.spec | 18 +++++++++++++----- git.conf.httpd => gitweb-httpd.conf | 0 2 files changed, 13 insertions(+), 5 deletions(-) rename git.conf.httpd => gitweb-httpd.conf (100%) diff --git a/git.spec b/git.spec index 6923989..17b20a0 100644 --- a/git.spec +++ b/git.spec @@ -3,6 +3,13 @@ %global gitexecdir %{_libexecdir}/git-core +# Settings for Fedora >= 29 and EL > 7 +%if 0%{?fedora} >= 29 || 0%{?rhel} > 7 +%global gitweb_httpd_conf gitweb.conf +%else +%global gitweb_httpd_conf git.conf +%endif + # Settings for Fedora and EL > 7 %if 0%{?fedora} || 0%{?rhel} > 7 %global with_python3 1 @@ -74,8 +81,8 @@ Source9: gpgkey-junio.asc # Local sources begin at 10 to allow for additional future upstream sources Source10: git-init.el Source11: git.xinetd.in -Source12: git.conf.httpd -Source13: git-gui.desktop +Source12: git-gui.desktop +Source13: gitweb-httpd.conf Source14: gitweb.conf.in Source15: git@.service.in Source16: git.socket @@ -480,7 +487,7 @@ install -pm 755 contrib/credential/netrc/git-credential-netrc \ make -C contrib/subtree install %{?with_docs:install-doc} mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d -install -pm 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf +install -pm 0644 %{SOURCE13} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{gitweb_httpd_conf} sed "s|@PROJECTROOT@|%{_localstatedir}/lib/git|g" \ %{SOURCE14} > %{buildroot}%{_sysconfdir}/gitweb.conf @@ -544,7 +551,7 @@ install -pm 644 contrib/completion/git-prompt.sh \ %{buildroot}%{_datadir}/git-core/contrib/completion/ # install git-gui .desktop file -desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE13} +desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE12} # find translations %find_lang %{name} %{name}.lang @@ -752,7 +759,7 @@ make test || ./print-failed-test-output %{_pkgdocdir}/gitweb*.txt %{?with_docs:%{_pkgdocdir}/gitweb*.html} %config(noreplace)%{_sysconfdir}/gitweb.conf -%config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf +%config(noreplace)%{_sysconfdir}/httpd/conf.d/%{gitweb_httpd_conf} %{_localstatedir}/www/git/ %files gui @@ -796,6 +803,7 @@ make test || ./print-failed-test-output - Update to 2.17.0-rc0 - Adjust for simplified perl install - Require git-core rather than git for git-daemon +- Rename gitweb httpd config file * Thu Mar 15 2018 Todd Zullinger - Use symlinks instead of hardlinks for installed binaries diff --git a/git.conf.httpd b/gitweb-httpd.conf similarity index 100% rename from git.conf.httpd rename to gitweb-httpd.conf From 440594446eae48ab9e5b0f2b6ec5a950d5dffb11 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 15 Mar 2018 22:14:47 -0400 Subject: [PATCH 494/842] Install contrib/diff-highlight (#1550251) The script is installed at /usr/share/git-core/contrib/diff-highlight. Documentation is in /usr/share/doc/git/contrib/diff-highlight/README. --- git.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/git.spec b/git.spec index 17b20a0..618657c 100644 --- a/git.spec +++ b/git.spec @@ -439,6 +439,8 @@ make -C contrib/credential/libsecret/ %endif make -C contrib/credential/netrc/ +make -C contrib/diff-highlight/ + make -C contrib/subtree/ # Fix shebang in a few places to silence rpmlint complaints @@ -491,6 +493,11 @@ install -pm 0644 %{SOURCE13} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{gitweb_ht sed "s|@PROJECTROOT@|%{_localstatedir}/lib/git|g" \ %{SOURCE14} > %{buildroot}%{_sysconfdir}/gitweb.conf +# install contrib/diff-highlight and clean up to avoid cruft in git-core-doc +install -Dpm 0755 contrib/diff-highlight/diff-highlight \ + %{buildroot}%{_datadir}/git-core/contrib/diff-highlight +rm -rf contrib/diff-highlight/{Makefile,diff-highlight,*.perl,t} + # Clean up contrib/subtree to avoid cruft in the git-core-doc docdir # Move git-subtree.txt to Documentation so it can be installed later in docdir mv contrib/subtree/git-subtree.txt Documentation/ @@ -678,6 +685,7 @@ make test || ./print-failed-test-output %{elispdir} %{_emacs_sitestartdir}/git-init.el %endif +%{_datadir}/git-core/contrib/diff-highlight %{_datadir}/git-core/contrib/hooks/multimail %{_datadir}/git-core/contrib/hooks/update-paranoid %{_datadir}/git-core/contrib/hooks/setgitperms.perl @@ -694,6 +702,7 @@ make test || ./print-failed-test-output %{!?_licensedir:%global license %doc} %license COPYING # exclude is best way here because of troubles with symlinks inside git-core/ +%exclude %{_datadir}/git-core/contrib/diff-highlight %exclude %{_datadir}/git-core/contrib/hooks/multimail %exclude %{_datadir}/git-core/contrib/hooks/update-paranoid %exclude %{_datadir}/git-core/contrib/hooks/setgitperms.perl @@ -804,6 +813,7 @@ make test || ./print-failed-test-output - Adjust for simplified perl install - Require git-core rather than git for git-daemon - Rename gitweb httpd config file +- Install contrib/diff-highlight (#1550251) * Thu Mar 15 2018 Todd Zullinger - Use symlinks instead of hardlinks for installed binaries From 0b3c85937b4f56ed3708dd4a54351e8206757bd1 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 16 Mar 2018 21:30:23 -0400 Subject: [PATCH 495/842] Add findutils BuildRequires, improve 'find | xargs' calls Ensure find and xargs are required. While findutils is currently in the default buildroot, we should still be explicit about the requirement. Also improve the 'find | xargs' calls to handle files which may contain spaces, quotes, or other characters which might cause spurious failures. --- git.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 618657c..5be37c9 100644 --- a/git.spec +++ b/git.spec @@ -104,6 +104,7 @@ BuildRequires: linkchecker BuildRequires: desktop-file-utils BuildRequires: emacs BuildRequires: expat-devel +BuildRequires: findutils BuildRequires: gawk BuildRequires: gcc BuildRequires: gettext @@ -566,11 +567,11 @@ cat %{name}.lang >> bin-man-doc-files # quiet some rpmlint complaints chmod -R g-w %{buildroot} -find %{buildroot} -name git-mergetool--lib | xargs chmod a-x +chmod a-x %{buildroot}%{gitexecdir}/git-mergetool--lib # These files probably are not needed find . -regex '.*/\.\(git\(attributes\|ignore\)\|perlcriticrc\)' -delete chmod a-x Documentation/technical/api-index.sh -find contrib -type f | xargs chmod -x +find contrib -type f -print0 | xargs -r0 chmod -x # Split core files not_core_re="git-(add--interactive|credential-(libsecret|netrc)|difftool|filter-branch|instaweb|request-pull|send-mail)|gitweb" @@ -612,7 +613,7 @@ find %{buildroot}%{_pkgdocdir}/{howto,technical} -type f \ %check %if %{with docs} && %{test_links} -find %{buildroot}%{_pkgdocdir} -name "*.html" | xargs linkchecker +find %{buildroot}%{_pkgdocdir} -name "*.html" -print0 | xargs -r0 linkchecker %endif # Tests to skip on all releases and architectures @@ -808,6 +809,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/*svn*.html} %changelog +* Fri Mar 16 2018 Todd Zullinger +- Add findutils BuildRequires, improve 'find | xargs' calls + * Thu Mar 15 2018 Todd Zullinger - 2.17.0-0.0.rc0 - Update to 2.17.0-rc0 - Adjust for simplified perl install From ee1ed8296995484bb4ba93d6562023e33dd2dec4 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 21 Mar 2018 16:01:18 -0400 Subject: [PATCH 496/842] Update to 2.17.0-rc1 --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 5be37c9..5489901 100644 --- a/git.spec +++ b/git.spec @@ -56,11 +56,11 @@ %endif # Define for release candidates -%global rcrev .rc0 +%global rcrev .rc1 Name: git Version: 2.17.0 -Release: 0.0%{?rcrev}%{?dist} +Release: 0.1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -809,6 +809,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/*svn*.html} %changelog +* Wed Mar 21 2018 Todd Zullinger - 2.17.0-0.1.rc1 +- Update to 2.17.0-rc1 + * Fri Mar 16 2018 Todd Zullinger - Add findutils BuildRequires, improve 'find | xargs' calls diff --git a/sources b/sources index 478724d..aecc08d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.17.0.rc0.tar.xz) = 2c444ac785f451719e5b37c1541b371d892a9f346c3f5adaf99166b70e7d0f3e4932f26ac11bc13b20eaa9d3d32b46bb6e17d99b2438a6e41aeebd7853a14b29 -SHA512 (git-2.17.0.rc0.tar.sign) = 049e1bcb8147502d827c16852f920ce4ce907664aebc3cf5edd234006cabbf4f6443ffb58adac3fcbc6b3db0c6ff31a809f023f91c9d1d2ae75033243f0aac59 +SHA512 (git-2.17.0.rc1.tar.xz) = 9ee9f917ff9a8398ae08cc7767be63605f9edc6a86ccdcd1a2238703b170e14a358e27d43d126317461bdb0f4ba9ad67fdcd77fcae69bf1d82f5341ce59d1bf5 +SHA512 (git-2.17.0.rc1.tar.sign) = ea69bbd9807e6dcb0ff6129710122a426e3633000c5057c6c2e85345038523dbcd1c5a8667493a389fa6b785a115ca3f582aa1f54e9695b472d3d7ab516677e6 From 28cb1fda8480fe5dd2e34a30b07d9fa6335917eb Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 22 Mar 2018 01:38:31 -0400 Subject: [PATCH 497/842] Drop .py extension from contrib/hooks/multimail/git_multimail.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fedora 28 prints a deprecation notice if /usr/bin/python is called in an rpm build¹, which is done by default when byte-compiling python files outside of %{_libdir}/pythonX.X. Avoid the issue by dropping the .py extension from the multimail hook script. The hook script is not used as a module and therefore has no need to use the extension or be byte-compiled. ¹ https://fedoraproject.org/wiki/Changes/Avoid_usr_bin_python_in_RPM_Build --- git.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 5489901..85a57ac 100644 --- a/git.spec +++ b/git.spec @@ -60,7 +60,7 @@ Name: git Version: 2.17.0 -Release: 0.1%{?rcrev}%{?dist} +Release: 0.1%{?rcrev}%{?dist}.1 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -545,6 +545,9 @@ mkdir -p %{buildroot}%{_datadir}/git-core/contrib/completion install -pm 644 contrib/completion/git-completion.tcsh \ %{buildroot}%{_datadir}/git-core/contrib/completion/ +# Drop .py extension from git_multimail to avoid byte-compiling +mv contrib/hooks/multimail/git_multimail{.py,} + # Move contrib/hooks out of %%docdir and make them executable mkdir -p %{buildroot}%{_datadir}/git-core/contrib mv contrib/hooks %{buildroot}%{_datadir}/git-core/contrib @@ -809,6 +812,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/*svn*.html} %changelog +* Thu Mar 22 2018 Todd Zullinger - 2.17.0-0.1.rc1.1 +- Drop .py extension from contrib/hooks/multimail/git_multimail.py + * Wed Mar 21 2018 Todd Zullinger - 2.17.0-0.1.rc1 - Update to 2.17.0-rc1 From c538f218251f12c5987a518931522e4bd26244a0 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 22 Mar 2018 01:48:06 -0400 Subject: [PATCH 498/842] Remove unnecessary "chmod +x contrib/hooks/*" Using a simple glob in contrib/hooks/* to match contributed hook scripts was valid when it was added in 762cf11 ("Update to git-1.6.3.3 - Move contributed hooks to %{_datadir}/git-core/contrib/hooks (bug 500137)", 2009-06-28). With the addition of the multimail directory in git-1.8.4 it was no longer doing what was intended. However, the scripts in contrib/hooks all ship with the execute bit set, making the "chmod +x" unnecessary. If we did descend into the multimail directory with a chmod (whether via "chmod -R" or "find | xargs ..."), we would need to exclude the non-script files within that directory. --- git.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 85a57ac..4b1d88b 100644 --- a/git.spec +++ b/git.spec @@ -548,10 +548,9 @@ install -pm 644 contrib/completion/git-completion.tcsh \ # Drop .py extension from git_multimail to avoid byte-compiling mv contrib/hooks/multimail/git_multimail{.py,} -# Move contrib/hooks out of %%docdir and make them executable +# Move contrib/hooks out of %%docdir mkdir -p %{buildroot}%{_datadir}/git-core/contrib mv contrib/hooks %{buildroot}%{_datadir}/git-core/contrib -chmod +x %{buildroot}%{_datadir}/git-core/contrib/hooks/* pushd contrib > /dev/null ln -s ../../../git-core/contrib/hooks popd > /dev/null @@ -814,6 +813,7 @@ make test || ./print-failed-test-output %changelog * Thu Mar 22 2018 Todd Zullinger - 2.17.0-0.1.rc1.1 - Drop .py extension from contrib/hooks/multimail/git_multimail.py +- Remove unnecessary "chmod +x contrib/hooks/*" * Wed Mar 21 2018 Todd Zullinger - 2.17.0-0.1.rc1 - Update to 2.17.0-rc1 From 6f880575854be2fa9476830688ead4f23f15ceef Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 27 Mar 2018 12:28:18 -0400 Subject: [PATCH 499/842] Add missing perl(Mail::Address) requirement (#1561086) When setting NO_PERL_CPAN_FALLBACKS to avoid bundled perl modules, we must take care to ensure the dependencies are required. The code which handles modules via Git::LoadCPAN prevents the normal perl dependency generator from identifying them. Thankfully, there should not be many modules loaded this way. Prior to 2.17.0 and NO_PERL_CPAN_FALLBACKS we were falling back to not using Mail::Address, which is partly why the lack of the dependency wasn't spotted with rpmdiff with and without NO_PERL_CPAN_FALLBACKS. --- git.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 4b1d88b..dcfcd69 100644 --- a/git.spec +++ b/git.spec @@ -60,7 +60,7 @@ Name: git Version: 2.17.0 -Release: 0.1%{?rcrev}%{?dist}.1 +Release: 0.1%{?rcrev}%{?dist}.2 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -271,6 +271,7 @@ Summary: Git tools for sending patches via email BuildArch: noarch Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} Requires: perl(Authen::SASL) +Requires: perl(Mail::Address) Requires: perl(Net::SMTP::SSL) Requires: perl(Git) %description email @@ -811,6 +812,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/*svn*.html} %changelog +* Tue Mar 27 2018 Todd Zullinger - 2.17.0-0.1.rc1.2 +- Add missing perl(Mail::Address) requirement (#1561086) + * Thu Mar 22 2018 Todd Zullinger - 2.17.0-0.1.rc1.1 - Drop .py extension from contrib/hooks/multimail/git_multimail.py - Remove unnecessary "chmod +x contrib/hooks/*" From 9cd8ee74c876c6269372c4af5758baf9be53e872 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Wed, 14 Mar 2018 11:27:46 +0000 Subject: [PATCH 500/842] Disable CVS support on EL > 7 The cvs package will be dropped in the next RHEL release. Disable the git-cvs subpackage when %{rhel} > 7. --- git.spec | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/git.spec b/git.spec index dcfcd69..890b9c5 100644 --- a/git.spec +++ b/git.spec @@ -37,6 +37,13 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} %endif +# Disable cvs subpackage on EL > 7 +%if 0%{?rhel} > 7 +%global with_cvs 0 +%else +%global with_cvs 1 +%endif + # Hardening flags for EL-7 %if 0%{?rhel} == 7 %global _hardened_build 1 @@ -139,8 +146,10 @@ BuildRequires: acl BuildRequires: apr-util-bdb %endif BuildRequires: bash +%if %{with_cvs} BuildRequires: cvs BuildRequires: cvsps +%endif BuildRequires: gnupg %if 0%{?fedora} || ( 0%{?rhel} && ( 0%{?rhel} == 6 || 0%{?rhel} == 7 && %{_arch} != ppc64 )) BuildRequires: highlight @@ -199,7 +208,9 @@ tools for integrating with other SCMs, install the git-all meta-package. Summary: Meta-package to pull in all git tools BuildArch: noarch Requires: git = %{version}-%{release} +%if %{with_cvs} Requires: git-cvs = %{version}-%{release} +%endif Requires: git-email = %{version}-%{release} Requires: git-gui = %{version}-%{release} Requires: git-p4 = %{version}-%{release} @@ -242,6 +253,7 @@ Requires: git-core = %{version}-%{release} %description core-doc Documentation files for git-core package including man pages. +%if %{with_cvs} %package cvs Summary: Git tools for importing CVS repositories BuildArch: noarch @@ -251,6 +263,7 @@ Requires: perl(DBD::SQLite) Requires: perl(Git) %description cvs %{summary}. +%endif %package daemon Summary: Git protocol daemon @@ -384,6 +397,11 @@ install -p -m 755 %{SOURCE99} print-failed-test-output # Remove git-archimport from command list sed -i '/^git-archimport/d' command-list.txt +%if ! %{with_cvs} +# Remove git-cvs* from command list +sed -i '/^git-cvs/d' command-list.txt +%endif + # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. cat << \EOF > config.mak @@ -508,6 +526,11 @@ rm -rf contrib/subtree/{INSTALL,Makefile,git-subtree{,.{1,html,sh,txt,xml}},t} # git-archimport is not supported find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' +%if ! %{with_cvs} +# Remove git-cvs* from %%{_bindir} and %%{gitexecdir} +find %{buildroot}{%{_bindir},%{gitexecdir}} -type f -name 'git-cvs*' -exec rm -f {} ';' +%endif + exclude_re="archimport|email|git-citool|git-cvs|git-daemon|git-gui|git-remote-bzr|git-remote-hg|git-subtree|gitk|p4|svn" (find %{buildroot}{%{_bindir},%{_libexecdir}} -type f -o -type l | grep -vE "$exclude_re" | sed -e s@^%{buildroot}@@) > bin-man-doc-files (find %{buildroot}{%{_bindir},%{_libexecdir}} -mindepth 1 -type d | grep -vE "$exclude_re" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files @@ -722,13 +745,19 @@ make test || ./print-failed-test-output %exclude %{_pkgdocdir}/contrib/*/*.py[co] %endif %{_pkgdocdir}/contrib/hooks +%if ! %{with_cvs} +%{?with_docs:%{_mandir}/man1/*cvs*.1*} +%{?with_docs:%{_pkgdocdir}/git-cvs*} +%endif +%if %{with_cvs} %files cvs %{_pkgdocdir}/*git-cvs*.txt %{_bindir}/git-cvsserver %{gitexecdir}/*cvs* %{?with_docs:%{_mandir}/man1/*cvs*.1*} %{?with_docs:%{_pkgdocdir}/*git-cvs*.html} +%endif %files daemon %{_pkgdocdir}/git-daemon*.txt @@ -812,6 +841,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/*svn*.html} %changelog +* Tue Mar 27 2018 Joe Orton +- Disable CVS support on EL > 7 + * Tue Mar 27 2018 Todd Zullinger - 2.17.0-0.1.rc1.2 - Add missing perl(Mail::Address) requirement (#1561086) From 081aa7dea3fc7fb33e877ef9f849d900b45ad55a Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 27 Mar 2018 16:02:38 -0400 Subject: [PATCH 501/842] Allow cvs subpackage to be toggled via --with/--without The previous commit disabled the cvs subpackage on EL > 7. Convert to the %bcond_with(out) macro to allow the subpackage to be toggled easily via a --with/--without option at build time. --- git.spec | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/git.spec b/git.spec index 890b9c5..34a5ec3 100644 --- a/git.spec +++ b/git.spec @@ -37,11 +37,12 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} %endif -# Disable cvs subpackage on EL > 7 +# Allow cvs subpackage to be toggled via --with/--without +# Disable cvs subpackage by default on EL > 7 %if 0%{?rhel} > 7 -%global with_cvs 0 +%bcond_with cvs %else -%global with_cvs 1 +%bcond_without cvs %endif # Hardening flags for EL-7 @@ -146,7 +147,7 @@ BuildRequires: acl BuildRequires: apr-util-bdb %endif BuildRequires: bash -%if %{with_cvs} +%if %{with cvs} BuildRequires: cvs BuildRequires: cvsps %endif @@ -208,7 +209,7 @@ tools for integrating with other SCMs, install the git-all meta-package. Summary: Meta-package to pull in all git tools BuildArch: noarch Requires: git = %{version}-%{release} -%if %{with_cvs} +%if %{with cvs} Requires: git-cvs = %{version}-%{release} %endif Requires: git-email = %{version}-%{release} @@ -253,7 +254,7 @@ Requires: git-core = %{version}-%{release} %description core-doc Documentation files for git-core package including man pages. -%if %{with_cvs} +%if %{with cvs} %package cvs Summary: Git tools for importing CVS repositories BuildArch: noarch @@ -397,7 +398,7 @@ install -p -m 755 %{SOURCE99} print-failed-test-output # Remove git-archimport from command list sed -i '/^git-archimport/d' command-list.txt -%if ! %{with_cvs} +%if ! %{with cvs} # Remove git-cvs* from command list sed -i '/^git-cvs/d' command-list.txt %endif @@ -526,7 +527,7 @@ rm -rf contrib/subtree/{INSTALL,Makefile,git-subtree{,.{1,html,sh,txt,xml}},t} # git-archimport is not supported find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' -%if ! %{with_cvs} +%if ! %{with cvs} # Remove git-cvs* from %%{_bindir} and %%{gitexecdir} find %{buildroot}{%{_bindir},%{gitexecdir}} -type f -name 'git-cvs*' -exec rm -f {} ';' %endif @@ -745,12 +746,12 @@ make test || ./print-failed-test-output %exclude %{_pkgdocdir}/contrib/*/*.py[co] %endif %{_pkgdocdir}/contrib/hooks -%if ! %{with_cvs} +%if ! %{with cvs} %{?with_docs:%{_mandir}/man1/*cvs*.1*} %{?with_docs:%{_pkgdocdir}/git-cvs*} %endif -%if %{with_cvs} +%if %{with cvs} %files cvs %{_pkgdocdir}/*git-cvs*.txt %{_bindir}/git-cvsserver @@ -841,6 +842,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/*svn*.html} %changelog +* Tue Mar 27 2018 Todd Zullinger +- Allow cvs subpackage to be toggled via --with/--without + * Tue Mar 27 2018 Joe Orton - Disable CVS support on EL > 7 From 336bc7765ed7a005ecd69089ec1ca02011352d26 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 28 Mar 2018 16:06:32 -0400 Subject: [PATCH 502/842] Update to 2.17.0-rc2 --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 34a5ec3..17ea6ae 100644 --- a/git.spec +++ b/git.spec @@ -64,11 +64,11 @@ %endif # Define for release candidates -%global rcrev .rc1 +%global rcrev .rc2 Name: git Version: 2.17.0 -Release: 0.1%{?rcrev}%{?dist}.2 +Release: 0.2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -842,6 +842,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/*svn*.html} %changelog +* Wed Mar 28 2018 Todd Zullinger - 2.17.0-0.2.rc2 +- Update to 2.17.0-rc2 + * Tue Mar 27 2018 Todd Zullinger - Allow cvs subpackage to be toggled via --with/--without diff --git a/sources b/sources index aecc08d..aa121a9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.17.0.rc1.tar.xz) = 9ee9f917ff9a8398ae08cc7767be63605f9edc6a86ccdcd1a2238703b170e14a358e27d43d126317461bdb0f4ba9ad67fdcd77fcae69bf1d82f5341ce59d1bf5 -SHA512 (git-2.17.0.rc1.tar.sign) = ea69bbd9807e6dcb0ff6129710122a426e3633000c5057c6c2e85345038523dbcd1c5a8667493a389fa6b785a115ca3f582aa1f54e9695b472d3d7ab516677e6 +SHA512 (git-2.17.0.rc2.tar.xz) = 59896d52b4df7f88a85ff896a0c875419827ae4e1650b9a4beeae0674d859b11ec259638854f9a2efd14f9adec5271e461ae941184468cd1c1d92afb292c7964 +SHA512 (git-2.17.0.rc2.tar.sign) = e85f2d40531fa9e7a9ea26b84905bf4c87b967513b5f6140fbfd4641fac216f2f65a633a8d2ff063bf61776088f01a45e8ff00b55006ffba4fb251da2e1c9f88 From 5cc54546f62b5dfedf6ae70dba825a8296122e7a Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 29 Mar 2018 16:26:10 -0400 Subject: [PATCH 503/842] Fix incorrect comment about multimail hook The multimail contrib hook was moved from git-core to git in 7ac1fbc ("Avoid python dependency in git-core (#1536471)", 2018-01-22). --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 17ea6ae..ba04e9d 100644 --- a/git.spec +++ b/git.spec @@ -466,7 +466,7 @@ make -C contrib/subtree/ # Fix shebang in a few places to silence rpmlint complaints # -# The multimail hook is installed with git-core. Use python3 to avoid an +# The multimail hook is installed with git. Use python3 to avoid an # unnecessary python2 dependency. sed -i -e '1s|#! */usr/bin/env python$|#!%{__python2}|' \ contrib/fast-import/import-zips.py \ From 32f8d8d33b0bb02c0935df925db0f98996ba8d12 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 2 Apr 2018 15:43:08 -0400 Subject: [PATCH 504/842] Update to 2.17.0 https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.17.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index ba04e9d..ee60d3e 100644 --- a/git.spec +++ b/git.spec @@ -64,11 +64,11 @@ %endif # Define for release candidates -%global rcrev .rc2 +#global rcrev .rc0 Name: git Version: 2.17.0 -Release: 0.2%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -842,6 +842,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/*svn*.html} %changelog +* Mon Apr 02 2018 Todd Zullinger - 2.17.0-1 +- Update to 2.17.0 + * Wed Mar 28 2018 Todd Zullinger - 2.17.0-0.2.rc2 - Update to 2.17.0-rc2 diff --git a/sources b/sources index aa121a9..77a39fe 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.17.0.rc2.tar.xz) = 59896d52b4df7f88a85ff896a0c875419827ae4e1650b9a4beeae0674d859b11ec259638854f9a2efd14f9adec5271e461ae941184468cd1c1d92afb292c7964 -SHA512 (git-2.17.0.rc2.tar.sign) = e85f2d40531fa9e7a9ea26b84905bf4c87b967513b5f6140fbfd4641fac216f2f65a633a8d2ff063bf61776088f01a45e8ff00b55006ffba4fb251da2e1c9f88 +SHA512 (git-2.17.0.tar.xz) = dab1c1d5d384b36720abc049a66ba60631e17958b214cfbec467be7adc02e82190e5282554da71797892c16bfe52d65b6244a281f504385083125bcb98ec7ee9 +SHA512 (git-2.17.0.tar.sign) = b86cd002910256976c5c94214ebc0d80ea67f94d110e3fb85802c9ae2edf56e1ccc77a46164986ff5ad4d8efea0ffd73fa487ebb2c55d75d8af5d2f326755237 From 73282c0771ee8a5107874b51ba23795d58447cdb Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 28 Mar 2018 21:33:18 -0400 Subject: [PATCH 505/842] Allow git-p4 subpackage to be toggled via --with/--without Currently, git-p4 requires python2, which is approaching its end of life. Prepare for building on releases without python2. --- git.spec | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/git.spec b/git.spec index ee60d3e..70faa18 100644 --- a/git.spec +++ b/git.spec @@ -45,6 +45,9 @@ %bcond_without cvs %endif +# Allow p4 subpackage to be toggled via --with/--without +%bcond_without p4 + # Hardening flags for EL-7 %if 0%{?rhel} == 7 %global _hardened_build 1 @@ -214,7 +217,9 @@ Requires: git-cvs = %{version}-%{release} %endif Requires: git-email = %{version}-%{release} Requires: git-gui = %{version}-%{release} +%if %{with p4} Requires: git-p4 = %{version}-%{release} +%endif Requires: git-subtree = %{version}-%{release} Requires: git-svn = %{version}-%{release} Requires: gitk = %{version}-%{release} @@ -330,6 +335,7 @@ Requires: gitk = %{version}-%{release} %description gui %{summary}. +%if %{with p4} %package p4 Summary: Git tools for working with Perforce depots BuildArch: noarch @@ -337,6 +343,7 @@ BuildRequires: python2-devel Requires: git = %{version}-%{release} %description p4 %{summary}. +%endif %package -n perl-Git Summary: Perl interface to Git @@ -403,6 +410,11 @@ sed -i '/^git-archimport/d' command-list.txt sed -i '/^git-cvs/d' command-list.txt %endif +%if ! %{with p4} +# Remove git-p4 from command list +sed -i '/^git-p4/d' command-list.txt +%endif + # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. cat << \EOF > config.mak @@ -532,6 +544,11 @@ find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ' find %{buildroot}{%{_bindir},%{gitexecdir}} -type f -name 'git-cvs*' -exec rm -f {} ';' %endif +%if ! %{with p4} +# Remove *p4* from %%{_bindir} and %%{gitexecdir} +find %{buildroot}{%{_bindir},%{gitexecdir}} -type f -name '*p4*' -exec rm -f {} ';' +%endif + exclude_re="archimport|email|git-citool|git-cvs|git-daemon|git-gui|git-remote-bzr|git-remote-hg|git-subtree|gitk|p4|svn" (find %{buildroot}{%{_bindir},%{_libexecdir}} -type f -o -type l | grep -vE "$exclude_re" | sed -e s@^%{buildroot}@@) > bin-man-doc-files (find %{buildroot}{%{_bindir},%{_libexecdir}} -mindepth 1 -type d | grep -vE "$exclude_re" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files @@ -750,6 +767,10 @@ make test || ./print-failed-test-output %{?with_docs:%{_mandir}/man1/*cvs*.1*} %{?with_docs:%{_pkgdocdir}/git-cvs*} %endif +%if ! %{with p4} +%{?with_docs:%{_mandir}/man1/*p4*.1*} +%{?with_docs:%{_pkgdocdir}/*p4*} +%endif %if %{with cvs} %files cvs @@ -817,12 +838,14 @@ make test || ./print-failed-test-output %{?with_docs:%{_mandir}/man1/git-citool.1*} %{?with_docs:%{_pkgdocdir}/git-citool.html} +%if %{with p4} %files p4 %{gitexecdir}/*p4* %{gitexecdir}/mergetools/p4merge %{_pkgdocdir}/*p4*.txt %{?with_docs:%{_mandir}/man1/*p4*.1*} %{?with_docs:%{_pkgdocdir}/*p4*.html} +%endif %files -n perl-Git -f perl-git-files %{?with_docs:%{_mandir}/man3/Git.3pm*} @@ -842,6 +865,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/*svn*.html} %changelog +* Mon Apr 02 2018 Todd Zullinger +- Allow git-p4 subpackage to be toggled via --with/--without + * Mon Apr 02 2018 Todd Zullinger - 2.17.0-1 - Update to 2.17.0 From 07e03fdaa0f0c5ab1f8b31c5c3cfb6e46df2ff22 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 2 Apr 2018 17:41:16 -0400 Subject: [PATCH 506/842] Use %bcond_(with|without) to enable/disable python3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The with_python3 macro was added in 7ac1fbc ("Avoid python dependency in git-core (#1536471)", 2018-01-22) and followed the example from a devel list request¹. The %bcond_(with|without) macro allows enabling or disabling of python3 via the command line, modulemd file, etc. Use it. ¹ https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/UG6XYG3EPLMLA5N47AK63NCF2Y6MDWFJ/ --- git.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 70faa18..a48ed73 100644 --- a/git.spec +++ b/git.spec @@ -12,9 +12,9 @@ # Settings for Fedora and EL > 7 %if 0%{?fedora} || 0%{?rhel} > 7 -%global with_python3 1 +%bcond_without python3 %else -%global with_python3 0 +%bcond_with python3 %endif # Settings for Fedora and EL >= 7 @@ -177,7 +177,7 @@ BuildRequires: perl(Memoize) BuildRequires: perl(Test::More) BuildRequires: perl(Time::HiRes) BuildRequires: python2-devel -%if 0%{?with_python3} +%if %{with python3} BuildRequires: python3-devel %endif BuildRequires: subversion @@ -487,7 +487,7 @@ sed -i -e '1s|#! */usr/bin/env python$|#!%{__python2}|' \ contrib/hooks/multimail/migrate-mailhook-config \ contrib/hooks/multimail/post-receive.example \ contrib/svn-fe/svnrdump_sim.py -%if 0%{?with_python3} +%if %{with python3} sed -i -e '1s|#!%{__python2}$|#!%{__python3}|' \ contrib/hooks/multimail/git_multimail.py \ contrib/hooks/multimail/migrate-mailhook-config \ @@ -867,6 +867,7 @@ make test || ./print-failed-test-output %changelog * Mon Apr 02 2018 Todd Zullinger - Allow git-p4 subpackage to be toggled via --with/--without +- Use %%bcond_(with|without) to enable/disable python3 * Mon Apr 02 2018 Todd Zullinger - 2.17.0-1 - Update to 2.17.0 From a4b4f7caded5d834a3d4dcfafc70ed3c2b4fc6b4 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 28 Mar 2018 21:36:31 -0400 Subject: [PATCH 507/842] Add support for disabling python2 Python 2 end of life is approaching, prepare for dropping it along with all python2 scripts and subpackages requiring it. Helped-by: Sebastian Kisela Helped-by: Pavel Cahyna --- git.spec | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index a48ed73..9c0aa7c 100644 --- a/git.spec +++ b/git.spec @@ -3,6 +3,13 @@ %global gitexecdir %{_libexecdir}/git-core +# Settings for Fedora > 29 and EL > 7 +%if 0%{?fedora} > 29 || 0%{?rhel} > 7 +%bcond_with python2 +%else +%bcond_without python2 +%endif + # Settings for Fedora >= 29 and EL > 7 %if 0%{?fedora} >= 29 || 0%{?rhel} > 7 %global gitweb_httpd_conf gitweb.conf @@ -46,7 +53,12 @@ %endif # Allow p4 subpackage to be toggled via --with/--without +# Disable by default if we lack python2 support +%if ! %{with python2} +%bcond_with p4 +%else %bcond_without p4 +%endif # Hardening flags for EL-7 %if 0%{?rhel} == 7 @@ -176,7 +188,9 @@ BuildRequires: perl(Mail::Address) BuildRequires: perl(Memoize) BuildRequires: perl(Test::More) BuildRequires: perl(Time::HiRes) +%if %{with python2} BuildRequires: python2-devel +%endif %if %{with python3} BuildRequires: python3-devel %endif @@ -431,7 +445,11 @@ GNU_ROFF = 1 NO_CROSS_DIRECTORY_HARDLINKS = 1 NO_INSTALL_HARDLINKS = 1 NO_PERL_CPAN_FALLBACKS = 1 +%if %{with python2} PYTHON_PATH = %{__python2} +%else +NO_PYTHON = 1 +%endif htmldir = %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} prefix = %{_prefix} perllibdir = %{perl_vendorlib} @@ -480,15 +498,17 @@ make -C contrib/subtree/ # # The multimail hook is installed with git. Use python3 to avoid an # unnecessary python2 dependency. -sed -i -e '1s|#! */usr/bin/env python$|#!%{__python2}|' \ +%if %{with python2} +sed -i -e '1s@#! */usr/bin/env python$@#!%{__python2}@' \ contrib/fast-import/import-zips.py \ contrib/hg-to-git/hg-to-git.py \ contrib/hooks/multimail/git_multimail.py \ contrib/hooks/multimail/migrate-mailhook-config \ contrib/hooks/multimail/post-receive.example \ contrib/svn-fe/svnrdump_sim.py +%endif %if %{with python3} -sed -i -e '1s|#!%{__python2}$|#!%{__python3}|' \ +sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \ contrib/hooks/multimail/git_multimail.py \ contrib/hooks/multimail/migrate-mailhook-config \ contrib/hooks/multimail/post-receive.example @@ -868,6 +888,7 @@ make test || ./print-failed-test-output * Mon Apr 02 2018 Todd Zullinger - Allow git-p4 subpackage to be toggled via --with/--without - Use %%bcond_(with|without) to enable/disable python3 +- Add support for disabling python2 * Mon Apr 02 2018 Todd Zullinger - 2.17.0-1 - Update to 2.17.0 From b3c76729a349ae2f39c60cb11a183ddb86f7c885 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 6 Apr 2018 15:03:24 -0400 Subject: [PATCH 508/842] Tighten file exclusion pattern The bare p4 entry was a bit concerning; it's easy to imagine false positives from such a short string. Remove git-remote-(bzr|hg) from the pattern. The scripts and placeholders were removed in git-2.0.0. While here, group all the git-* patterns and be more explicit with the svn files. --- git.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index 9c0aa7c..8311ca2 100644 --- a/git.spec +++ b/git.spec @@ -569,7 +569,7 @@ find %{buildroot}{%{_bindir},%{gitexecdir}} -type f -name 'git-cvs*' -exec rm -f find %{buildroot}{%{_bindir},%{gitexecdir}} -type f -name '*p4*' -exec rm -f {} ';' %endif -exclude_re="archimport|email|git-citool|git-cvs|git-daemon|git-gui|git-remote-bzr|git-remote-hg|git-subtree|gitk|p4|svn" +exclude_re="archimport|email|git-(citool|cvs|daemon|gui|p4|subtree|(remote-test)?svn)|gitk|p4merge" (find %{buildroot}{%{_bindir},%{_libexecdir}} -type f -o -type l | grep -vE "$exclude_re" | sed -e s@^%{buildroot}@@) > bin-man-doc-files (find %{buildroot}{%{_bindir},%{_libexecdir}} -mindepth 1 -type d | grep -vE "$exclude_re" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files (find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) > perl-git-files @@ -879,10 +879,11 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-subtree.html} %files svn -%{gitexecdir}/*svn* -%{_pkgdocdir}/*svn*.txt -%{?with_docs:%{_mandir}/man1/*svn*.1*} -%{?with_docs:%{_pkgdocdir}/*svn*.html} +%{gitexecdir}/git-remote-testsvn +%{gitexecdir}/git-svn +%{_pkgdocdir}/git-svn.txt +%{?with_docs:%{_mandir}/man1/git-svn.1*} +%{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog * Mon Apr 02 2018 Todd Zullinger From b5fac2ab8dc1bd2bfec26d556108a9dcda106f14 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 7 Apr 2018 19:21:23 -0400 Subject: [PATCH 509/842] Remove Git::LoadCPAN to ensure we use only system perl modules Git tries very hard to rely on as few non-core modules as possible. The few that it does (currently Error and Mail::Address) are bundled. We've disabled such bundling since it became an option in 2.17.0. Go a step further and remove the Git::LoadCPAN wrapper. This allows rpm's automatic dependency generator to find and add the needed requirements. With this change we can remove the manual 'Requires:' for perl(Error) and perl(Mail::Address). 'Requires: perl(Error)' in the main git package has been unneeded for many years. It was added in edddb83 ("Update to latest upstream release. Fix some bugs at the same time", 2007-11-27), which was git-1.5.3.6. It was needed for 'git svn' and 'git remote'. 'git svn' requires perl(Git), which in turn requires perl(Error). In git-1.5.5, 'git remote' was converted to a builtin command in C rather than perl, removing the perl(Error) dependency. Lastly, move the 'BuildRequires: perl(Error)' from perl-Git to the main list of BuildRequires. --- git.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 8311ca2..3e638c9 100644 --- a/git.spec +++ b/git.spec @@ -139,6 +139,7 @@ BuildRequires: libsecret-devel BuildRequires: make BuildRequires: openssl-devel BuildRequires: pcre2-devel +BuildRequires: perl(Error) BuildRequires: perl(Test) %if 0%{?fedora} BuildRequires: perl-generators @@ -200,7 +201,6 @@ BuildRequires: time Requires: git-core = %{version}-%{release} Requires: git-core-doc = %{version}-%{release} -Requires: perl(Error) %if ! %{defined perl_bootstrap} Requires: perl(Term::ReadKey) %endif @@ -304,7 +304,6 @@ Summary: Git tools for sending patches via email BuildArch: noarch Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} Requires: perl(Authen::SASL) -Requires: perl(Mail::Address) Requires: perl(Net::SMTP::SSL) Requires: perl(Git) %description email @@ -362,9 +361,7 @@ Requires: git = %{version}-%{release} %package -n perl-Git Summary: Perl interface to Git BuildArch: noarch -BuildRequires: perl(Error) Requires: git = %{version}-%{release} -Requires: perl(Error) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -n perl-Git %{summary}. @@ -480,6 +477,11 @@ EOF chmod +x %{__perl_requires} %endif +# Remove Git::LoadCPAN to ensure we use only system perl modules. This also +# allows the dependencies to be automatically processed by rpm. +rm -rf perl/Git/LoadCPAN{.pm,/} +grep -rlZ '^use Git::LoadCPAN::' | xargs -r0 sed -i 's/Git::LoadCPAN:://g' + %build make %{?_smp_mflags} all %{?with_docs:doc} @@ -886,6 +888,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sat Apr 07 2018 Todd Zullinger +- Remove Git::LoadCPAN to ensure we use only system perl modules + * Mon Apr 02 2018 Todd Zullinger - Allow git-p4 subpackage to be toggled via --with/--without - Use %%bcond_(with|without) to enable/disable python3 From 5eb603d7e00b2b664ac50d46a3fd6cabc3c887e2 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 8 Apr 2018 18:02:12 -0400 Subject: [PATCH 510/842] Clean up redundant and unneeded Requires Move all Requires to their own lines for better readability. We can safely drop the 'perl(Git)' requires from the cvs and email packages because the perl rpm dependency generator already add it. We can also drop 'perl-Git = %{version}-%{release}' from the email package because it requires 'git = %{version}-%{release}' which in turn requires the matching 'perl-Git' package. --- git.spec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index 3e638c9..38786bc 100644 --- a/git.spec +++ b/git.spec @@ -277,10 +277,10 @@ Documentation files for git-core package including man pages. %package cvs Summary: Git tools for importing CVS repositories BuildArch: noarch -Requires: git = %{version}-%{release}, cvs +Requires: git = %{version}-%{release} +Requires: cvs Requires: cvsps Requires: perl(DBD::SQLite) -Requires: perl(Git) %description cvs %{summary}. %endif @@ -302,10 +302,9 @@ The git daemon for supporting git:// access to git repositories %package email Summary: Git tools for sending patches via email BuildArch: noarch -Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} +Requires: git = %{version}-%{release} Requires: perl(Authen::SASL) Requires: perl(Net::SMTP::SSL) -Requires: perl(Git) %description email %{summary}. @@ -329,7 +328,8 @@ Requires: emacs-git = %{version}-%{release} %package -n gitk Summary: Git repository browser BuildArch: noarch -Requires: git = %{version}-%{release}, tk >= 8.4 +Requires: git = %{version}-%{release} +Requires: tk >= 8.4 %description -n gitk %{summary}. @@ -343,8 +343,8 @@ Requires: git = %{version}-%{release} %package gui Summary: Graphical interface to Git BuildArch: noarch -Requires: git = %{version}-%{release}, tk >= 8.4 Requires: gitk = %{version}-%{release} +Requires: tk >= 8.4 %description gui %{summary}. @@ -384,11 +384,12 @@ history. %package svn Summary: Git tools for interacting with Subversion repositories -Requires: git = %{version}-%{release}, subversion +Requires: git = %{version}-%{release} Requires: perl(Digest::MD5) %if ! %{defined perl_bootstrap} Requires: perl(Term::ReadKey) %endif +Requires: subversion %description svn %{summary}. @@ -888,6 +889,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sun Apr 08 2018 Todd Zullinger +- Clean up redundant and unneeded Requires + * Sat Apr 07 2018 Todd Zullinger - Remove Git::LoadCPAN to ensure we use only system perl modules From e72bed93ca31108c148cae01180756581050da44 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 9 Apr 2018 22:00:06 -0400 Subject: [PATCH 511/842] git-svn: avoid uninitialized value warning This issue has been present since 2.11.0, but only became visible with the addition of the 'use warnings' pragma in 2.17.0. --- ...-svn-avoid-warning-on-undef-readline.patch | 49 +++++++++++++++++++ git.spec | 5 ++ 2 files changed, 54 insertions(+) create mode 100644 0001-git-svn-avoid-warning-on-undef-readline.patch diff --git a/0001-git-svn-avoid-warning-on-undef-readline.patch b/0001-git-svn-avoid-warning-on-undef-readline.patch new file mode 100644 index 0000000..a274887 --- /dev/null +++ b/0001-git-svn-avoid-warning-on-undef-readline.patch @@ -0,0 +1,49 @@ +From 51db2715876580acdb28b17079c9f6cb784da849 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= + +Date: Fri, 6 Apr 2018 13:15:14 +0000 +Subject: [PATCH] git-svn: avoid warning on undef readline() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Change code in Git.pm that sometimes calls chomp() on undef to only do +so the value is defined. + +This code has been chomping undef values ever since it was added in +b26098fc2f ("git-svn: reduce scope of input record separator change", +2016-10-14), but started warning due to the introduction of "use +warnings" to Git.pm in my f0e19cb7ce ("Git.pm: add the "use warnings" +pragma", 2018-02-25) released with 2.17.0. + +Since this function will return undef in those cases it's still +possible that the code using it will warn if it does a chomp of its +own, as the code added in b26098fc2f ("git-svn: reduce scope of input +record separator change", 2016-10-14) might do, but since git-svn has +"use warnings" already that's clearly not a codepath that's going to +warn. + +See https://public-inbox.org/git/86h8oobl36.fsf@phe.ftfl.ca/ for the +original report. + +Reported-by: Joseph Mingrone +Signed-off-by: Ævar Arnfjörð Bjarmason +Improved-by: Eric Wong +Signed-off-by: Junio C Hamano +--- + perl/Git.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/perl/Git.pm b/perl/Git.pm +index d2c5a8d238b87..d453e4b83b827 100644 +--- a/perl/Git.pm ++++ b/perl/Git.pm +@@ -549,7 +549,7 @@ sub get_record { + my ($fh, $rs) = @_; + local $/ = $rs; + my $rec = <$fh>; +- chomp $rec if defined $rs; ++ chomp $rec if defined $rec; + $rec; + } + diff --git a/git.spec b/git.spec index 38786bc..1902e10 100644 --- a/git.spec +++ b/git.spec @@ -116,6 +116,8 @@ Source99: print-failed-test-output Patch0: git-1.8-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch +# https://github.com/gitster/git/commit/51db271.patch +Patch2: 0001-git-svn-avoid-warning-on-undef-readline.patch %if %{with docs} BuildRequires: asciidoc >= 8.4.1 @@ -889,6 +891,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Apr 09 2018 Todd Zullinger +- git-svn: avoid uninitialized value warning + * Sun Apr 08 2018 Todd Zullinger - Clean up redundant and unneeded Requires From f25fef61e0e0f3c11f5139a859c6c7682d06b8ab Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 9 Apr 2018 22:04:17 -0400 Subject: [PATCH 512/842] daemon: fix condition for redirecting stderr We don't currently use the --log-destination option in the git-daemon systemd service or xinetd files. With this patch in place, we can. --- ...fix-condition-for-redirecting-stderr.patch | 30 +++++++++++++++++++ git.spec | 3 ++ 2 files changed, 33 insertions(+) create mode 100644 0001-daemon.c-fix-condition-for-redirecting-stderr.patch diff --git a/0001-daemon.c-fix-condition-for-redirecting-stderr.patch b/0001-daemon.c-fix-condition-for-redirecting-stderr.patch new file mode 100644 index 0000000..7afee92 --- /dev/null +++ b/0001-daemon.c-fix-condition-for-redirecting-stderr.patch @@ -0,0 +1,30 @@ +From e67d906d735166f2068f1e4cc393220483a97f30 Mon Sep 17 00:00:00 2001 +From: Lucas Werkmeister +Date: Wed, 4 Apr 2018 00:13:07 +0200 +Subject: [PATCH] daemon.c: fix condition for redirecting stderr + +Since the --log-destination option was added in 0c591cacb ("daemon: add +--log-destination=(stderr|syslog|none)", 2018-02-04) with the explicit +goal of allowing logging to stderr when running in inetd mode, we should +not always redirect stderr to /dev/null in inetd mode, but rather only +when stderr is not being used for logging. + +Signed-off-by: Lucas Werkmeister +Signed-off-by: Junio C Hamano +--- + daemon.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/daemon.c b/daemon.c +index fb538e3678997..7857169055385 100644 +--- a/daemon.c ++++ b/daemon.c +@@ -1462,7 +1462,7 @@ int cmd_main(int argc, const char **argv) + die("base-path '%s' does not exist or is not a directory", + base_path); + +- if (inetd_mode) { ++ if (log_destination != LOG_DESTINATION_STDERR) { + if (!freopen("/dev/null", "w", stderr)) + die_errno("failed to redirect stderr to /dev/null"); + } diff --git a/git.spec b/git.spec index 1902e10..9f88574 100644 --- a/git.spec +++ b/git.spec @@ -118,6 +118,8 @@ Patch0: git-1.8-gitweb-home-link.patch Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://github.com/gitster/git/commit/51db271.patch Patch2: 0001-git-svn-avoid-warning-on-undef-readline.patch +# https://github.com/gitster/git/commit/e67d906.patch +Patch3: 0001-daemon.c-fix-condition-for-redirecting-stderr.patch %if %{with docs} BuildRequires: asciidoc >= 8.4.1 @@ -892,6 +894,7 @@ make test || ./print-failed-test-output %changelog * Mon Apr 09 2018 Todd Zullinger +- daemon: fix condition for redirecting stderr - git-svn: avoid uninitialized value warning * Sun Apr 08 2018 Todd Zullinger From c1f934e01666370aa9f396dd9b11b983afab12a6 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 3 Apr 2018 23:35:46 -0400 Subject: [PATCH 513/842] daemon: use --log-destination=stderr with systemd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using stderr rather than syslog should be a mild improvement with the systemd journal. The reasons are detailed in the upstream commit 0c591cacba ("daemon: add --log-destination=(stderr|syslog|none)", 2018-02-04)¹: The combination of --inetd with --log-destination=stderr is useful, for instance, when running `git daemon` as an instanced systemd service (with associated socket unit). In this case, log messages sent via syslog are received by the journal daemon, but run the risk of being processed at a time when the `git daemon` process has already exited (especially if the process was very short-lived, e.g. due to client error), so that the journal daemon can no longer read its cgroup and attach the message to the correct systemd unit (see systemd/systemd#2913 [1]). Logging to stderr instead can solve this problem, because systemd can connect stderr directly to the journal daemon, which then already knows which unit is associated with this stream. [1]: https://github.com/systemd/systemd/issues/2913 While here, wrap the git-daemon command line to improve readability. ¹ https://github.com/git/git/commit/0c591cacba --- git.spec | 1 + git@.service.in | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 9f88574..c3e46bc 100644 --- a/git.spec +++ b/git.spec @@ -894,6 +894,7 @@ make test || ./print-failed-test-output %changelog * Mon Apr 09 2018 Todd Zullinger +- daemon: use --log-destination=stderr with systemd - daemon: fix condition for redirecting stderr - git-svn: avoid uninitialized value warning diff --git a/git@.service.in b/git@.service.in index bb93b78..7abcfeb 100644 --- a/git@.service.in +++ b/git@.service.in @@ -4,5 +4,7 @@ Documentation=man:git-daemon(1) [Service] User=nobody -ExecStart=-@GITEXECDIR@/git-daemon --base-path=@BASE_PATH@ --export-all --user-path=public_git --syslog --inetd --verbose +ExecStart=-@GITEXECDIR@/git-daemon --base-path=@BASE_PATH@ --export-all \ + --user-path=public_git --inetd --log-destination=stderr --verbose StandardInput=socket +StandardError=journal From eeb72615738d12e3e00f464f82628676a2c7b979 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 10 Apr 2018 10:08:55 -0400 Subject: [PATCH 514/842] Require perl-generators on EL > 7 Add a %{use_perl_generators} macro to control this requirement. --- git.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index c3e46bc..9477fc1 100644 --- a/git.spec +++ b/git.spec @@ -20,8 +20,10 @@ # Settings for Fedora and EL > 7 %if 0%{?fedora} || 0%{?rhel} > 7 %bcond_without python3 +%global use_perl_generators 1 %else %bcond_with python3 +%global use_perl_generators 0 %endif # Settings for Fedora and EL >= 7 @@ -83,7 +85,7 @@ Name: git Version: 2.17.0 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -145,7 +147,7 @@ BuildRequires: openssl-devel BuildRequires: pcre2-devel BuildRequires: perl(Error) BuildRequires: perl(Test) -%if 0%{?fedora} +%if %{use_perl_generators} BuildRequires: perl-generators %endif %if %{bashcomp_pkgconfig} @@ -893,6 +895,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Apr 10 2018 Todd Zullinger - 2.17.0-2 +- Require perl-generators on EL > 7 + * Mon Apr 09 2018 Todd Zullinger - daemon: use --log-destination=stderr with systemd - daemon: fix condition for redirecting stderr From 1a82d92cd438a697f781ab13b988ed29a9708610 Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Fri, 13 Apr 2018 17:24:20 +0200 Subject: [PATCH 515/842] Conform to the Packaging Guidelines for Perl Add BuildRequires: perl-interpreter (or perl on systems that do not provide perl-interpreter) since perl is invoked during the build process. (https://fedoraproject.org/wiki/Packaging:Perl#Build_Dependencies, https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modules) Probably no functional change, since perl is being brought in via other deps. --- git.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/git.spec b/git.spec index 9477fc1..6e24092 100644 --- a/git.spec +++ b/git.spec @@ -21,9 +21,11 @@ %if 0%{?fedora} || 0%{?rhel} > 7 %bcond_without python3 %global use_perl_generators 1 +%global use_perl_interpreter 1 %else %bcond_with python3 %global use_perl_generators 0 +%global use_perl_interpreter 0 %endif # Settings for Fedora and EL >= 7 @@ -150,6 +152,11 @@ BuildRequires: perl(Test) %if %{use_perl_generators} BuildRequires: perl-generators %endif +%if %{use_perl_interpreter} +BuildRequires: perl-interpreter +%else +BuildRequires: perl +%endif %if %{bashcomp_pkgconfig} BuildRequires: pkgconfig(bash-completion) %endif @@ -895,6 +902,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Apr 13 2018 Pavel Cahyna +- Use BuildRequires: perl-interpreter per the packaging guidelines + * Tue Apr 10 2018 Todd Zullinger - 2.17.0-2 - Require perl-generators on EL > 7 From 34c24408842e5b5dd7cd43926e45f8b2b31962ca Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Fri, 13 Apr 2018 17:30:53 +0200 Subject: [PATCH 516/842] Update conditions for future RHEL --- git.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 6e24092..498d683 100644 --- a/git.spec +++ b/git.spec @@ -75,8 +75,8 @@ %global __global_ldflags -Wl,-z,relro -Wl,-z,now %endif -# Test links in HTML documentation on Fedora (linkchecker is not in EL) -%if 0%{?fedora} +# Test links in HTML documentation on Fedora (linkchecker is not in EL <= 7) +%if 0%{?fedora} || 0%{?rhel} > 7 %global test_links 1 %else %global test_links 0 @@ -181,7 +181,7 @@ BuildRequires: cvs BuildRequires: cvsps %endif BuildRequires: gnupg -%if 0%{?fedora} || ( 0%{?rhel} && ( 0%{?rhel} == 6 || 0%{?rhel} == 7 && %{_arch} != ppc64 )) +%if 0%{?fedora} || ( 0%{?rhel} && ( 0%{?rhel} == 6 || 0%{?rhel} >= 7 && %{_arch} != ppc64 )) BuildRequires: highlight %endif BuildRequires: httpd @@ -904,6 +904,7 @@ make test || ./print-failed-test-output %changelog * Fri Apr 13 2018 Pavel Cahyna - Use BuildRequires: perl-interpreter per the packaging guidelines +- Update conditions for future RHEL * Tue Apr 10 2018 Todd Zullinger - 2.17.0-2 - Require perl-generators on EL > 7 From da74a8e523528fa538c3d925c51fd22f711e0561 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 16 Apr 2018 11:18:51 -0400 Subject: [PATCH 517/842] Move linkcheck macro to existing fedora/rhel > 7 block The spec file is a bit easier to read with as few conditional blocks as required. Use %bcond_(with|without) to allow easier toggling of the link checking. --- git.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/git.spec b/git.spec index 498d683..f4866dd 100644 --- a/git.spec +++ b/git.spec @@ -20,10 +20,13 @@ # Settings for Fedora and EL > 7 %if 0%{?fedora} || 0%{?rhel} > 7 %bcond_without python3 +# linkchcker is not available on EL <= 7 +%bcond_without linkcheck %global use_perl_generators 1 %global use_perl_interpreter 1 %else %bcond_with python3 +%bcond_with linkcheck %global use_perl_generators 0 %global use_perl_interpreter 0 %endif @@ -75,13 +78,6 @@ %global __global_ldflags -Wl,-z,relro -Wl,-z,now %endif -# Test links in HTML documentation on Fedora (linkchecker is not in EL <= 7) -%if 0%{?fedora} || 0%{?rhel} > 7 -%global test_links 1 -%else -%global test_links 0 -%endif - # Define for release candidates #global rcrev .rc0 @@ -128,7 +124,7 @@ Patch3: 0001-daemon.c-fix-condition-for-redirecting-stderr.patch %if %{with docs} BuildRequires: asciidoc >= 8.4.1 BuildRequires: xmlto -%if %{test_links} +%if %{with linkcheck} BuildRequires: linkchecker %endif %endif @@ -692,7 +688,8 @@ find %{buildroot}%{_pkgdocdir}/{howto,technical} -type f \ ##### #DOC %check -%if %{with docs} && %{test_links} +%if %{with docs} && %{with linkcheck} +# Test links in HTML documentation find %{buildroot}%{_pkgdocdir} -name "*.html" -print0 | xargs -r0 linkchecker %endif @@ -902,6 +899,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Apr 16 2018 Todd Zullinger +- Move linkcheck macro to existing fedora/rhel > 7 block + * Fri Apr 13 2018 Pavel Cahyna - Use BuildRequires: perl-interpreter per the packaging guidelines - Update conditions for future RHEL From 6eb92cebdc74144c933b26b1e35d4eb16f6dca44 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 16 Apr 2018 11:47:00 -0400 Subject: [PATCH 518/842] Re-enable t5000-tar-tree.sh test on f28 The unknown, but temporary, breakage in fedora-28-x86_64 buildroots appears to be resolved. The test was disabled in a998227 ("Disable t5000-tar-tree.sh on x86 in f28", 2018-01-18). --- git.spec | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/git.spec b/git.spec index f4866dd..c8cc645 100644 --- a/git.spec +++ b/git.spec @@ -83,7 +83,7 @@ Name: git Version: 2.17.0 -Release: 2%{?rcrev}%{?dist} +Release: 3%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -706,19 +706,6 @@ GIT_SKIP_TESTS="" GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5541.33 t5551.25" %endif -%ifarch %{ix86} -# Skip tests which fail on x86 -# -# t5000-tar-tree fails on x86 in f28: -# ++ git archive --remote=. --format=tar.gz HEAD -# remote: fatal: Unknown archive format 'tar.gz' -# fatal: The remote end hung up unexpectedly -# There must be something broken or changed in f28 to cause this -%if 0%{?fedora} && 0%{?fedora} == 28 -GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5000" -%endif -%endif - %ifarch %{power64} # Skip tests which fail on ppc # @@ -899,8 +886,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog -* Mon Apr 16 2018 Todd Zullinger +* Mon Apr 16 2018 Todd Zullinger 2.17.0-3 - Move linkcheck macro to existing fedora/rhel > 7 block +- Re-enable t5000-tar-tree.sh test on f28 * Fri Apr 13 2018 Pavel Cahyna - Use BuildRequires: perl-interpreter per the packaging guidelines From ebd4261f9fa318e208675e66622882080bbdb617 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 22 Apr 2018 17:00:14 -0400 Subject: [PATCH 519/842] Fix formatting of changelog release string While it's acceptable with or without the hyphen, all other entries use a hyphen. Keep it consistent. --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index c8cc645..782e8d9 100644 --- a/git.spec +++ b/git.spec @@ -886,7 +886,7 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog -* Mon Apr 16 2018 Todd Zullinger 2.17.0-3 +* Mon Apr 16 2018 Todd Zullinger - 2.17.0-3 - Move linkcheck macro to existing fedora/rhel > 7 block - Re-enable t5000-tar-tree.sh test on f28 From b717510550f48a7817b8bc56eb0d079e6702ff60 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 24 May 2018 14:03:46 -0400 Subject: [PATCH 520/842] Fix segfault in rev-parse with invalid input (#1581678) --- ...lookup-ed-commit-references-for-NULL.patch | 68 +++++++++++++++++++ git.spec | 8 ++- 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 0001-rev-parse-check-lookup-ed-commit-references-for-NULL.patch diff --git a/0001-rev-parse-check-lookup-ed-commit-references-for-NULL.patch b/0001-rev-parse-check-lookup-ed-commit-references-for-NULL.patch new file mode 100644 index 0000000..7a78bff --- /dev/null +++ b/0001-rev-parse-check-lookup-ed-commit-references-for-NULL.patch @@ -0,0 +1,68 @@ +From 3aa1681c8661b2f798277a55ab33ce7ba787288c Mon Sep 17 00:00:00 2001 +From: Elijah Newren +Date: Wed, 23 May 2018 23:27:33 -0700 +Subject: [PATCH] rev-parse: check lookup'ed commit references for NULL + +Commits 2122f8b963d4 ("rev-parse: Add support for the ^! and ^@ syntax", +2008-07-26) and 3dd4e7320d ("Teach rev-parse the ... syntax.", 2006-07-04) +taught rev-parse new syntax, and used lookup_commit_reference() as part of +their logic. Neither usage checked the returned commit to see if it was +non-NULL before using it. Check for NULL and ensure an appropriate error +is reported to the user. + +Reported by Florian Weimer and Todd Zullinger. + +Helped-by: Jeff King +Signed-off-by: Elijah Newren +--- + builtin/rev-parse.c | 8 ++++++-- + t/t6101-rev-parse-parents.sh | 8 ++++++++ + 2 files changed, 14 insertions(+), 2 deletions(-) + +diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c +index a1e680b5e9..a0a0ace38d 100644 +--- a/builtin/rev-parse.c ++++ b/builtin/rev-parse.c +@@ -282,6 +282,10 @@ static int try_difference(const char *arg) + struct commit *a, *b; + a = lookup_commit_reference(&start_oid); + b = lookup_commit_reference(&end_oid); ++ if (!a || !b) { ++ *dotdot = '.'; ++ return 0; ++ } + exclude = get_merge_bases(a, b); + while (exclude) { + struct commit *commit = pop_commit(&exclude); +@@ -328,12 +332,12 @@ static int try_parent_shorthands(const char *arg) + return 0; + + *dotdot = 0; +- if (get_oid_committish(arg, &oid)) { ++ if (get_oid_committish(arg, &oid) || ++ !(commit = lookup_commit_reference(&oid))) { + *dotdot = '^'; + return 0; + } + +- commit = lookup_commit_reference(&oid); + if (exclude_parent && + exclude_parent > commit_list_count(commit->parents)) { + *dotdot = '^'; +diff --git a/t/t6101-rev-parse-parents.sh b/t/t6101-rev-parse-parents.sh +index 8c617981a3..7683e4a114 100755 +--- a/t/t6101-rev-parse-parents.sh ++++ b/t/t6101-rev-parse-parents.sh +@@ -214,4 +214,12 @@ test_expect_success 'rev-list merge^-1x (garbage after ^-1)' ' + test_must_fail git rev-list merge^-1x + ' + ++test_expect_success 'rev-parse $garbage^@ does not segfault' ' ++ test_must_fail git rev-parse $EMPTY_TREE^@ ++' ++ ++test_expect_success 'rev-parse $garbage...$garbage does not segfault' ' ++ test_must_fail git rev-parse $EMPTY_TREE...$EMPTY_BLOB ++' ++ + test_done diff --git a/git.spec b/git.spec index 782e8d9..50ca2b7 100644 --- a/git.spec +++ b/git.spec @@ -83,7 +83,7 @@ Name: git Version: 2.17.0 -Release: 3%{?rcrev}%{?dist} +Release: 4%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -120,6 +120,9 @@ Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch Patch2: 0001-git-svn-avoid-warning-on-undef-readline.patch # https://github.com/gitster/git/commit/e67d906.patch Patch3: 0001-daemon.c-fix-condition-for-redirecting-stderr.patch +# https://bugzilla.redhat.com/1581678 +# https://public-inbox.org/git/20180524062733.5412-1-newren@gmail.com/ +Patch4: 0001-rev-parse-check-lookup-ed-commit-references-for-NULL.patch %if %{with docs} BuildRequires: asciidoc >= 8.4.1 @@ -886,6 +889,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu May 24 2018 Todd Zullinger - 2.17.0-4 +- Fix segfault in rev-parse with invalid input (#1581678) + * Mon Apr 16 2018 Todd Zullinger - 2.17.0-3 - Move linkcheck macro to existing fedora/rhel > 7 block - Re-enable t5000-tar-tree.sh test on f28 From de617607d01756782aef397c13a9a5cc764b643d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 24 May 2018 21:44:08 -0400 Subject: [PATCH 521/842] Move TEST_SHELL_PATH setting to config.mak There's no need to manually export this. Set it via the method documented in the Makefile, like other settings. --- git.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 50ca2b7..4652728 100644 --- a/git.spec +++ b/git.spec @@ -469,6 +469,7 @@ gitwebdir = %{_localstatedir}/www/git DEFAULT_TEST_TARGET = prove GIT_PROVE_OPTS = --verbose --normalize %{?_smp_mflags} GIT_TEST_OPTS = -x --verbose-log +TEST_SHELL_PATH = /bin/bash EOF # Filter bogus perl requires @@ -731,9 +732,6 @@ export GIT_TEST_GIT_DAEMON=true export GIT_TEST_HTTPD=true export GIT_TEST_SVNSERVE=true -# Use bash for the tests -export TEST_SHELL_PATH=/bin/bash - # Run the tests make test || ./print-failed-test-output @@ -891,6 +889,7 @@ make test || ./print-failed-test-output %changelog * Thu May 24 2018 Todd Zullinger - 2.17.0-4 - Fix segfault in rev-parse with invalid input (#1581678) +- Move TEST_SHELL_PATH setting to config.mak * Mon Apr 16 2018 Todd Zullinger - 2.17.0-3 - Move linkcheck macro to existing fedora/rhel > 7 block From 676f6fab114a13517c6693be0a907553e6464001 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 25 May 2018 10:20:48 -0400 Subject: [PATCH 522/842] Improve debug output when 'make test' fails If 'make test' fails before running any tests, the debug output from print-failed-test-output is confusing: + ./print-failed-test-output cat: t/test-results/*.exit: No such file or directory ./print-failed-test-output: line 6: [: : integer expression expected -------------------------------------------------------------------------------- t/test-results/*.out -------------------------------------------------------------------------------- cat: t/test-results/*.out: No such file or directory Use the bash failglob option to imrpve the output: + ./print-failed-test-output ./print-failed-test-output: line 12: no match: t/test-results/*.exit --- print-failed-test-output | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/print-failed-test-output b/print-failed-test-output index f095b86..68fa9ee 100644 --- a/print-failed-test-output +++ b/print-failed-test-output @@ -1,4 +1,6 @@ -#!/bin/sh +#!/bin/bash + +shopt -s failglob # Print output from failing tests dashes=$(printf "%80s" '' | tr ' ' '-') From 9a5cabc9ef558a2285b3a81e0af4a34cd62ddfd8 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 29 May 2018 13:08:24 -0400 Subject: [PATCH 523/842] Update to 2.17.1 (CVE-2018-11233, CVE-2018-11235) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes two security issues, described in the 2.13.7 release notes¹: * Submodule "names" come from the untrusted .gitmodules file, but we blindly append them to $GIT_DIR/modules to create our on-disk repo paths. This means you can do bad things by putting "../" into the name. We now enforce some rules for submodule names which will cause Git to ignore these malicious names (CVE-2018-11235). Credit for finding this vulnerability and the proof of concept from which the test script was adapted goes to Etienne Stalmans. * It was possible to trick the code that sanity-checks paths on NTFS into reading random piece of memory (CVE-2018-11233). ¹ https://mirrors.edge.kernel.org/pub/software/scm/git/docs/RelNotes/2.13.7.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 4652728..ebced47 100644 --- a/git.spec +++ b/git.spec @@ -82,8 +82,8 @@ #global rcrev .rc0 Name: git -Version: 2.17.0 -Release: 4%{?rcrev}%{?dist} +Version: 2.17.1 +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -887,6 +887,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue May 29 2018 Todd Zullinger - 2.17.1-1 +- Update to 2.17.1 (CVE-2018-11233, CVE-2018-11235) + * Thu May 24 2018 Todd Zullinger - 2.17.0-4 - Fix segfault in rev-parse with invalid input (#1581678) - Move TEST_SHELL_PATH setting to config.mak diff --git a/sources b/sources index 77a39fe..09e10ec 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.17.0.tar.xz) = dab1c1d5d384b36720abc049a66ba60631e17958b214cfbec467be7adc02e82190e5282554da71797892c16bfe52d65b6244a281f504385083125bcb98ec7ee9 -SHA512 (git-2.17.0.tar.sign) = b86cd002910256976c5c94214ebc0d80ea67f94d110e3fb85802c9ae2edf56e1ccc77a46164986ff5ad4d8efea0ffd73fa487ebb2c55d75d8af5d2f326755237 +SHA512 (git-2.17.1.tar.xz) = 77c27569d40fbae1842130baa0cdda674a02e384631bd8fb1f2ddf67ce372dd4903b2ce6b4283a4ae506cdedd5daa55baa2afe6a6689528511e24e4beb864960 +SHA512 (git-2.17.1.tar.sign) = 90fd436a1df4a154afa36a4aaea8fa447db703ca42197f5f4507c81f96076d5f20006c265506326958f5e0b670b72b11bc37ae4bebbfee0f6ba9d9274cf71017 From 20fad240e8a4dc9e669aeee12cf834633de9d0f2 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 25 May 2018 19:43:12 -0400 Subject: [PATCH 524/842] packfile: Correct zlib buffer handling on aarch64 (#1582555) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A recent zlib build with optimization for ARM exposed an issue in git's packfile handling. Thanks to Pavel Cahyna for the initial report and debugging and Jeremy Linton for further diagnosis and the subsequent patch. The patch is currently being discussed upstream¹. Until it is accepted, apply it only on aarch64 to avoid any unexpected issues with other arches. ¹ https://public-inbox.org/git/20180525231713.23047-1-lintonrjeremy@gmail.com/T/#u --- ...ackfile-Correct-zlib-buffer-handling.patch | 50 +++++++++++++++++++ git.spec | 22 +++++++- 2 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 0001-packfile-Correct-zlib-buffer-handling.patch diff --git a/0001-packfile-Correct-zlib-buffer-handling.patch b/0001-packfile-Correct-zlib-buffer-handling.patch new file mode 100644 index 0000000..7de2b9a --- /dev/null +++ b/0001-packfile-Correct-zlib-buffer-handling.patch @@ -0,0 +1,50 @@ +From 0255347aed203301302e3f8e39fa87349e178019 Mon Sep 17 00:00:00 2001 +From: Jeremy Linton +Date: Fri, 25 May 2018 17:56:01 -0500 +Subject: [PATCH] packfile: Correct zlib buffer handling + +The buffer being passed to zlib includes a null terminator that +git needs to keep in place. unpack_compressed_entry() attempts to +detect the case that the source buffer hasn't been fully consumed +by checking to see if the destination buffer has been over consumed. + +This yields two problems, first a single byte overrun won't be detected +properly because the Z_STREAM_END will then be set, but the null +terminator will have been overwritten. The other problem is that +more recent zlib patches have been poisoning the unconsumed portions +of the buffers which also overwrites the null, while correctly +returning length and status. + +Lets rely on the fact that the source buffer will only be fully +consumed when the when the destination buffer is inflated to the +correct size. We can do this by passing zlib the correct buffer size +and properly checking the return status. The latter check actually +already exists if the buffer size is correct. + +Signed-off-by: Jeremy Linton +--- + packfile.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/packfile.c b/packfile.c +index 7c1a2519fc..245eb32041 100644 +--- a/packfile.c ++++ b/packfile.c +@@ -1416,7 +1416,7 @@ static void *unpack_compressed_entry(struct packed_git *p, + return NULL; + memset(&stream, 0, sizeof(stream)); + stream.next_out = buffer; +- stream.avail_out = size + 1; ++ stream.avail_out = size; + + git_inflate_init(&stream); + do { +@@ -1424,7 +1424,7 @@ static void *unpack_compressed_entry(struct packed_git *p, + stream.next_in = in; + st = git_inflate(&stream, Z_FINISH); + if (!stream.avail_out) +- break; /* the payload is larger than it should be */ ++ break; /* done, st indicates if source fully consumed */ + curpos += stream.next_in - in; + } while (st == Z_OK || st == Z_BUF_ERROR); + git_inflate_end(&stream); diff --git a/git.spec b/git.spec index ebced47..15d2b14 100644 --- a/git.spec +++ b/git.spec @@ -83,7 +83,7 @@ Name: git Version: 2.17.1 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -123,6 +123,9 @@ Patch3: 0001-daemon.c-fix-condition-for-redirecting-stderr.patch # https://bugzilla.redhat.com/1581678 # https://public-inbox.org/git/20180524062733.5412-1-newren@gmail.com/ Patch4: 0001-rev-parse-check-lookup-ed-commit-references-for-NULL.patch +# https://bugzilla.redhat.com/1582555 +# https://public-inbox.org/git/20180525231713.23047-1-lintonrjeremy@gmail.com/ +Patch5: 0001-packfile-Correct-zlib-buffer-handling.patch %if %{with docs} BuildRequires: asciidoc >= 8.4.1 @@ -421,7 +424,19 @@ rm -rf "$tar" "$gpghome" # Cleanup tar files and tmp gpg home dir # Ensure a blank line follows autosetup, el6 chokes otherwise # https://bugzilla.redhat.com/1310704 -%autosetup -p1 -n %{name}-%{version}%{?rcrev} +#autosetup -p1 -n %{name}-%{version}%{?rcrev} + +# Setup/apply patches manually to limit the zlib patch to aarch64 +# until it is accepted upstream +%setup -q -n %{name}-%{version}%{?rcrev} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%ifarch aarch64 +%patch5 -p1 +%endif # Install print-failed-test-output script install -p -m 755 %{SOURCE99} print-failed-test-output @@ -887,6 +902,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue May 29 2018 Todd Zullinger - 2.17.1-2 +- packfile: Correct zlib buffer handling (#1582555) + * Tue May 29 2018 Todd Zullinger - 2.17.1-1 - Update to 2.17.1 (CVE-2018-11233, CVE-2018-11235) From 10eda9d47ee6a60f1da6f273a63d67593899404a Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 29 May 2018 16:27:44 -0400 Subject: [PATCH 525/842] Update rpmlint config path The default path was changed from .rpmlint to .rpmlintrc in rpkg (https://pagure.io/rpkg/pull-request/293). --- .rpmlint => git.rpmlintrc | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .rpmlint => git.rpmlintrc (100%) diff --git a/.rpmlint b/git.rpmlintrc similarity index 100% rename from .rpmlint rename to git.rpmlintrc From f179dc950eca54573b1e76251a913e57190b484c Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 30 May 2018 14:03:42 -0400 Subject: [PATCH 526/842] Use %apply_patch for aarch64 zlib patch, return to %autosetup Unfortunately, it appears we need to carry this patch longer than expected. Return to using %autosetup so other patches are easier to manage. Use %apply_patch to manually apply the zlib patch only on aarch64, as that is the only arch where it is required at this time. --- git.spec | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/git.spec b/git.spec index 15d2b14..5680176 100644 --- a/git.spec +++ b/git.spec @@ -83,7 +83,7 @@ Name: git Version: 2.17.1 -Release: 2%{?rcrev}%{?dist} +Release: 3%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -110,6 +110,11 @@ Source14: gitweb.conf.in Source15: git@.service.in Source16: git.socket +# https://bugzilla.redhat.com/1582555 +# https://public-inbox.org/git/20180525231713.23047-1-lintonrjeremy@gmail.com/ +# This patch is applied manually on aarch64 only, until it is accepted # upstream +Source20: 0001-packfile-Correct-zlib-buffer-handling.patch + # Script to print test failure output (used in %%check) Source99: print-failed-test-output @@ -123,9 +128,6 @@ Patch3: 0001-daemon.c-fix-condition-for-redirecting-stderr.patch # https://bugzilla.redhat.com/1581678 # https://public-inbox.org/git/20180524062733.5412-1-newren@gmail.com/ Patch4: 0001-rev-parse-check-lookup-ed-commit-references-for-NULL.patch -# https://bugzilla.redhat.com/1582555 -# https://public-inbox.org/git/20180525231713.23047-1-lintonrjeremy@gmail.com/ -Patch5: 0001-packfile-Correct-zlib-buffer-handling.patch %if %{with docs} BuildRequires: asciidoc >= 8.4.1 @@ -424,18 +426,11 @@ rm -rf "$tar" "$gpghome" # Cleanup tar files and tmp gpg home dir # Ensure a blank line follows autosetup, el6 chokes otherwise # https://bugzilla.redhat.com/1310704 -#autosetup -p1 -n %{name}-%{version}%{?rcrev} +%autosetup -p1 -n %{name}-%{version}%{?rcrev} -# Setup/apply patches manually to limit the zlib patch to aarch64 -# until it is accepted upstream -%setup -q -n %{name}-%{version}%{?rcrev} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 +# Apply aarch64 zlib patch (https://bugzilla.redhat.com/1582555) %ifarch aarch64 -%patch5 -p1 +%apply_patch %{SOURCE20} %endif # Install print-failed-test-output script @@ -902,6 +897,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed May 30 2018 Todd Zullinger - 2.17.1-3 +- Use %%apply_patch for aarch64 zlib patch, return to %%autosetup + * Tue May 29 2018 Todd Zullinger - 2.17.1-2 - packfile: Correct zlib buffer handling (#1582555) From fd929804e709c8c2996c7b5b4f16bc775fef61d8 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 30 May 2018 14:22:59 -0400 Subject: [PATCH 527/842] Disable jgit tests on s390x, they're unreliable Specifically, t5512-ls-remote.sh has a test which starts a jgit daemon. This has failed to exit on a number of occasions, only on s390x. We could disable just that test with "GIT_SKIP_TESTS=t5512.28", but the test number can and does change as more ls-remote tests are added. Dropping the jgit BuildRequires is cleaner and only causes 3 tests to be skipped, the offending t5512 test and two others in t5310-pack-bitmaps. Access to s390x might help better debug this, but it does not occur consistently and may be limited to koji. The issue could be a problem in jgit as well. While looking at a hung build, Kevin Fenzi found a few errors in t5512-ls-remote.out: /usr/bin/build-classpath: Could not find xz-java Java extension for this JVM /usr/bin/build-classpath: error: Some specified jars were not found --- git.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 5680176..09c5f63 100644 --- a/git.spec +++ b/git.spec @@ -189,7 +189,7 @@ BuildRequires: gnupg BuildRequires: highlight %endif BuildRequires: httpd -%if 0%{?fedora} +%if 0%{?fedora} && %{_arch} != s390x BuildRequires: jgit %endif BuildRequires: mod_dav_svn @@ -899,6 +899,7 @@ make test || ./print-failed-test-output %changelog * Wed May 30 2018 Todd Zullinger - 2.17.1-3 - Use %%apply_patch for aarch64 zlib patch, return to %%autosetup +- Disable jgit tests on s390x, they're unreliable * Tue May 29 2018 Todd Zullinger - 2.17.1-2 - packfile: Correct zlib buffer handling (#1582555) From 3f3a0b63092889e5f35fe9b8862d8905813e6511 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 30 May 2018 14:42:00 -0400 Subject: [PATCH 528/842] Use %make_build and %make_install Also drop DESTDIR and INSTALL from config.mak; they are both handled via %make_install. Remove the rpmlint filter for %buildroot usage which was only needed due to DESTDIR's use in config.mak. --- git.rpmlintrc | 3 --- git.spec | 15 +++++++-------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/git.rpmlintrc b/git.rpmlintrc index caf2fb7..9a57745 100644 --- a/git.rpmlintrc +++ b/git.rpmlintrc @@ -4,9 +4,6 @@ from Config import * addFilter("git.* spelling-error %description .* subpackages") addFilter("git-subtree.* spelling-error %description .* (subdirectory|subproject|subtree)") -# We're not misusing %{buildroot} here -addFilter("git\.(spec|src):.* rpm-buildroot-usage %prep DESTDIR = %{buildroot}") - # 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") diff --git a/git.spec b/git.spec index 09c5f63..5456fda 100644 --- a/git.spec +++ b/git.spec @@ -458,8 +458,6 @@ LDFLAGS = %{__global_ldflags} NEEDS_CRYPTO_WITH_SSL = 1 USE_LIBPCRE2 = 1 ETC_GITCONFIG = %{_sysconfdir}/gitconfig -DESTDIR = %{buildroot} -INSTALL = install -p GITWEB_PROJECTROOT = %{_localstatedir}/lib/git GNU_ROFF = 1 NO_CROSS_DIRECTORY_HARDLINKS = 1 @@ -507,18 +505,18 @@ rm -rf perl/Git/LoadCPAN{.pm,/} grep -rlZ '^use Git::LoadCPAN::' | xargs -r0 sed -i 's/Git::LoadCPAN:://g' %build -make %{?_smp_mflags} all %{?with_docs:doc} +%make_build all %{?with_docs:doc} make -C contrib/emacs %if %{libsecret} -make -C contrib/credential/libsecret/ +%make_build -C contrib/credential/libsecret/ %endif make -C contrib/credential/netrc/ -make -C contrib/diff-highlight/ +%make_build -C contrib/diff-highlight/ -make -C contrib/subtree/ +%make_build -C contrib/subtree/ # Fix shebang in a few places to silence rpmlint complaints # @@ -541,7 +539,7 @@ sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \ %endif %install -make %{?_smp_mflags} install %{?with_docs:install-doc} +%make_install %{?with_docs:install-doc} # symlink %%{gitexecdir} copies of git, git-shell, and git-upload-pack for i in git git-shell git-upload-pack; do @@ -565,7 +563,7 @@ install -pm 755 contrib/credential/libsecret/git-credential-libsecret \ install -pm 755 contrib/credential/netrc/git-credential-netrc \ %{buildroot}%{gitexecdir} -make -C contrib/subtree install %{?with_docs:install-doc} +%make_install -C contrib/subtree %{?with_docs:install-doc} mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d install -pm 0644 %{SOURCE13} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{gitweb_httpd_conf} @@ -900,6 +898,7 @@ make test || ./print-failed-test-output * Wed May 30 2018 Todd Zullinger - 2.17.1-3 - Use %%apply_patch for aarch64 zlib patch, return to %%autosetup - Disable jgit tests on s390x, they're unreliable +- Use %make_build and %make_install * Tue May 29 2018 Todd Zullinger - 2.17.1-2 - packfile: Correct zlib buffer handling (#1582555) From d3cc8cceadf18e4d515a09f0f2a4819a37c46462 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 30 May 2018 19:08:11 -0400 Subject: [PATCH 529/842] Update to 2.18.0-rc0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The USE_LIBPCRE setting now defaults to pcre2; use it. It's still valid to set USE_LIBPCRE2, but using the default should be cleaner in the long-run. The (long-unmaintained) emacs support has been dropped upstream in favor of better alternatives. From the upstream commit¹: The git-blame.el mode has been superseded by Emacs's own vc-annotate (invoked by C-x v g). Users of the git.el mode are now much better off using either Magit or the Git backend for Emacs's own VC mode. These modes were added over 10 years ago when Emacs's own Git support was much less mature, and there weren't other mature modes in the wild or shipped with Emacs itself. These days these modes have few if any users, and users of git aren't well served by us shipping these (some OS's install them alongside git by default, which is confusing and leads users astray). ¹ 6d5ed4836d ("git{,-blame}.el: remove old bitrotting Emacs code", 2018-04-11) https://git.kernel.org/pub/scm/git/git.git/commit/?id=6d5ed4836d --- ...fix-condition-for-redirecting-stderr.patch | 30 ----------- ...-svn-avoid-warning-on-undef-readline.patch | 49 ------------------ git-init.el | 5 -- git.spec | 51 +++++++------------ sources | 4 +- 5 files changed, 20 insertions(+), 119 deletions(-) delete mode 100644 0001-daemon.c-fix-condition-for-redirecting-stderr.patch delete mode 100644 0001-git-svn-avoid-warning-on-undef-readline.patch delete mode 100644 git-init.el diff --git a/0001-daemon.c-fix-condition-for-redirecting-stderr.patch b/0001-daemon.c-fix-condition-for-redirecting-stderr.patch deleted file mode 100644 index 7afee92..0000000 --- a/0001-daemon.c-fix-condition-for-redirecting-stderr.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e67d906d735166f2068f1e4cc393220483a97f30 Mon Sep 17 00:00:00 2001 -From: Lucas Werkmeister -Date: Wed, 4 Apr 2018 00:13:07 +0200 -Subject: [PATCH] daemon.c: fix condition for redirecting stderr - -Since the --log-destination option was added in 0c591cacb ("daemon: add ---log-destination=(stderr|syslog|none)", 2018-02-04) with the explicit -goal of allowing logging to stderr when running in inetd mode, we should -not always redirect stderr to /dev/null in inetd mode, but rather only -when stderr is not being used for logging. - -Signed-off-by: Lucas Werkmeister -Signed-off-by: Junio C Hamano ---- - daemon.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/daemon.c b/daemon.c -index fb538e3678997..7857169055385 100644 ---- a/daemon.c -+++ b/daemon.c -@@ -1462,7 +1462,7 @@ int cmd_main(int argc, const char **argv) - die("base-path '%s' does not exist or is not a directory", - base_path); - -- if (inetd_mode) { -+ if (log_destination != LOG_DESTINATION_STDERR) { - if (!freopen("/dev/null", "w", stderr)) - die_errno("failed to redirect stderr to /dev/null"); - } diff --git a/0001-git-svn-avoid-warning-on-undef-readline.patch b/0001-git-svn-avoid-warning-on-undef-readline.patch deleted file mode 100644 index a274887..0000000 --- a/0001-git-svn-avoid-warning-on-undef-readline.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 51db2715876580acdb28b17079c9f6cb784da849 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= - -Date: Fri, 6 Apr 2018 13:15:14 +0000 -Subject: [PATCH] git-svn: avoid warning on undef readline() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Change code in Git.pm that sometimes calls chomp() on undef to only do -so the value is defined. - -This code has been chomping undef values ever since it was added in -b26098fc2f ("git-svn: reduce scope of input record separator change", -2016-10-14), but started warning due to the introduction of "use -warnings" to Git.pm in my f0e19cb7ce ("Git.pm: add the "use warnings" -pragma", 2018-02-25) released with 2.17.0. - -Since this function will return undef in those cases it's still -possible that the code using it will warn if it does a chomp of its -own, as the code added in b26098fc2f ("git-svn: reduce scope of input -record separator change", 2016-10-14) might do, but since git-svn has -"use warnings" already that's clearly not a codepath that's going to -warn. - -See https://public-inbox.org/git/86h8oobl36.fsf@phe.ftfl.ca/ for the -original report. - -Reported-by: Joseph Mingrone -Signed-off-by: Ævar Arnfjörð Bjarmason -Improved-by: Eric Wong -Signed-off-by: Junio C Hamano ---- - perl/Git.pm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/perl/Git.pm b/perl/Git.pm -index d2c5a8d238b87..d453e4b83b827 100644 ---- a/perl/Git.pm -+++ b/perl/Git.pm -@@ -549,7 +549,7 @@ sub get_record { - my ($fh, $rs) = @_; - local $/ = $rs; - my $rec = <$fh>; -- chomp $rec if defined $rs; -+ chomp $rec if defined $rec; - $rec; - } - diff --git a/git-init.el b/git-init.el deleted file mode 100644 index d2a96a7..0000000 --- a/git-init.el +++ /dev/null @@ -1,5 +0,0 @@ -;; Git VC backend -(add-to-list 'vc-handled-backends 'GIT t) -(autoload 'git-status "git" "GIT mode." t) -(autoload 'git-blame-mode "git-blame" - "Minor mode for incremental blame for Git." t) diff --git a/git.spec b/git.spec index 5456fda..5c4cdc3 100644 --- a/git.spec +++ b/git.spec @@ -79,11 +79,11 @@ %endif # Define for release candidates -#global rcrev .rc0 +%global rcrev .rc0 Name: git -Version: 2.17.1 -Release: 3%{?rcrev}%{?dist} +Version: 2.18.0 +Release: 0.0%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -102,7 +102,6 @@ Source1: https://www.kernel.org/pub/software/scm/git/%{?rcrev:testing/}%{ Source9: gpgkey-junio.asc # Local sources begin at 10 to allow for additional future upstream sources -Source10: git-init.el Source11: git.xinetd.in Source12: git-gui.desktop Source13: gitweb-httpd.conf @@ -121,13 +120,9 @@ Source99: print-failed-test-output Patch0: git-1.8-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# https://github.com/gitster/git/commit/51db271.patch -Patch2: 0001-git-svn-avoid-warning-on-undef-readline.patch -# https://github.com/gitster/git/commit/e67d906.patch -Patch3: 0001-daemon.c-fix-condition-for-redirecting-stderr.patch # https://bugzilla.redhat.com/1581678 # https://public-inbox.org/git/20180524062733.5412-1-newren@gmail.com/ -Patch4: 0001-rev-parse-check-lookup-ed-commit-references-for-NULL.patch +Patch2: 0001-rev-parse-check-lookup-ed-commit-references-for-NULL.patch %if %{with docs} BuildRequires: asciidoc >= 8.4.1 @@ -331,15 +326,10 @@ Summary: Git version control system support for Emacs Requires: git = %{version}-%{release} BuildArch: noarch Requires: emacs(bin) >= %{_emacs_version} +Obsoletes: emacs-git-el < 2.18.0-0.0 +Provides: emacs-git-el = %{version}-%{release} %description -n emacs-git %{summary}. - -%package -n emacs-git-el -Summary: Elisp source files for git version control system support for Emacs -BuildArch: noarch -Requires: emacs-git = %{version}-%{release} -%description -n emacs-git-el -%{summary}. %endif %package -n gitk @@ -456,7 +446,7 @@ V = 1 CFLAGS = %{optflags} LDFLAGS = %{__global_ldflags} NEEDS_CRYPTO_WITH_SSL = 1 -USE_LIBPCRE2 = 1 +USE_LIBPCRE = 1 ETC_GITCONFIG = %{_sysconfdir}/gitconfig GITWEB_PROJECTROOT = %{_localstatedir}/lib/git GNU_ROFF = 1 @@ -507,8 +497,6 @@ grep -rlZ '^use Git::LoadCPAN::' | xargs -r0 sed -i 's/Git::LoadCPAN:://g' %build %make_build all %{?with_docs:doc} -make -C contrib/emacs - %if %{libsecret} %make_build -C contrib/credential/libsecret/ %endif @@ -547,14 +535,14 @@ for i in git git-shell git-upload-pack; do done %global elispdir %{_emacs_sitelispdir}/git -make -C contrib/emacs install \ - emacsdir=%{buildroot}%{elispdir} -for elc in %{buildroot}%{elispdir}/*.elc ; do - install -pm 644 contrib/emacs/$(basename $elc .elc).el \ - %{buildroot}%{elispdir} +pushd contrib/emacs >/dev/null +for el in *.el ; do + # Note: No byte-compiling is done. These .el files are one-line stubs + # which only serve to point users to better alternatives. + install -Dpm 644 $el %{buildroot}%{elispdir}/$el + rm -f $el # clean up to avoid cruft in git-core-doc done -install -Dpm 644 %{SOURCE10} \ - %{buildroot}%{_emacs_sitestartdir}/git-init.el +popd >/dev/null %if %{libsecret} install -pm 755 contrib/credential/libsecret/git-credential-libsecret \ @@ -757,7 +745,6 @@ make test || ./print-failed-test-output %files -f bin-man-doc-git-files %if %{emacs_filesystem} %{elispdir} -%{_emacs_sitestartdir}/git-init.el %endif %{_datadir}/git-core/contrib/diff-highlight %{_datadir}/git-core/contrib/hooks/multimail @@ -826,12 +813,7 @@ make test || ./print-failed-test-output %if ! %{emacs_filesystem} %files -n emacs-git %{_pkgdocdir}/contrib/emacs/README -%dir %{elispdir} -%{elispdir}/*.elc -%{_emacs_sitestartdir}/git-init.el - -%files -n emacs-git-el -%{elispdir}/*.el +%{elispdir} %endif %files email @@ -895,6 +877,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed May 30 2018 Todd Zullinger - 2.18.0-0.0.rc0 +- Update to 2.18.0-rc0 + * Wed May 30 2018 Todd Zullinger - 2.17.1-3 - Use %%apply_patch for aarch64 zlib patch, return to %%autosetup - Disable jgit tests on s390x, they're unreliable diff --git a/sources b/sources index 09e10ec..98260ba 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.17.1.tar.xz) = 77c27569d40fbae1842130baa0cdda674a02e384631bd8fb1f2ddf67ce372dd4903b2ce6b4283a4ae506cdedd5daa55baa2afe6a6689528511e24e4beb864960 -SHA512 (git-2.17.1.tar.sign) = 90fd436a1df4a154afa36a4aaea8fa447db703ca42197f5f4507c81f96076d5f20006c265506326958f5e0b670b72b11bc37ae4bebbfee0f6ba9d9274cf71017 +SHA512 (git-2.18.0.rc0.tar.xz) = 94ca43dfc2a9caa5d1a87d8f57558c7abc5ad4557705a0c3cf426f3720d09b9b45d2dc50f1238ddc69388238379addf3f59fd5fd21effd25376401263f0cdb7a +SHA512 (git-2.18.0.rc0.tar.sign) = c0537a5e29ccbbc21a08d0bae22898111fcde9f863e018825454e0aa7e2449bf8ecc20ea0690e0ddcecc9616c9ab9d61a71b758d2a5b5075b80835fadda12030 From 9125e652738865e75f2bddbcc698053eb1e67bf9 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 30 May 2018 19:12:16 -0400 Subject: [PATCH 530/842] Use new INSTALL_SYMLINKS setting Replace NO_CROSS_DIRECTORY_HARDLINKS and NO_INSTALL_HARDLINKS with INSTALL_SYMLINKS. The result is slightly improved; all symlinks will point directly to the target rather than via multiple levels of symlinks. The rationale was covered in slightly more detail in d56cfc6 ("Use symlinks instead of hardlinks for installed binaries", 2018-03-15). Adjust the dangling-relative-symlink filter in the rpmlint config for the new target of the git-difftool symlink. --- git.rpmlintrc | 2 +- git.spec | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/git.rpmlintrc b/git.rpmlintrc index 9a57745..221ca04 100644 --- a/git.rpmlintrc +++ b/git.rpmlintrc @@ -8,7 +8,7 @@ addFilter("git-subtree.* spelling-error %description .* (subdirectory|subproject 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 git") +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 5c4cdc3..9575a0d 100644 --- a/git.spec +++ b/git.spec @@ -448,10 +448,9 @@ LDFLAGS = %{__global_ldflags} NEEDS_CRYPTO_WITH_SSL = 1 USE_LIBPCRE = 1 ETC_GITCONFIG = %{_sysconfdir}/gitconfig +INSTALL_SYMLINKS = 1 GITWEB_PROJECTROOT = %{_localstatedir}/lib/git GNU_ROFF = 1 -NO_CROSS_DIRECTORY_HARDLINKS = 1 -NO_INSTALL_HARDLINKS = 1 NO_PERL_CPAN_FALLBACKS = 1 %if %{with python2} PYTHON_PATH = %{__python2} @@ -529,11 +528,6 @@ sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \ %install %make_install %{?with_docs:install-doc} -# symlink %%{gitexecdir} copies of git, git-shell, and git-upload-pack -for i in git git-shell git-upload-pack; do - ln -sf ../../bin/$i %{buildroot}%{gitexecdir}/$i -done - %global elispdir %{_emacs_sitelispdir}/git pushd contrib/emacs >/dev/null for el in *.el ; do @@ -879,6 +873,7 @@ make test || ./print-failed-test-output %changelog * Wed May 30 2018 Todd Zullinger - 2.18.0-0.0.rc0 - Update to 2.18.0-rc0 +- Use new INSTALL_SYMLINKS setting * Wed May 30 2018 Todd Zullinger - 2.17.1-3 - Use %%apply_patch for aarch64 zlib patch, return to %%autosetup From 572ec3935e19ac1789effb973948a4237a8f1ac5 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 1 Jun 2018 15:38:04 -0400 Subject: [PATCH 531/842] add -p: fix counting empty context lines in edited patches References: https://github.com/gitster/git/commit/f2cb01d35 https://public-inbox.org/git/20180601174644.13055-1-phillip.wood@talktalk.net/ --- ...ng-empty-context-lines-in-edited-pat.patch | 99 +++++++++++++++++++ git.spec | 8 +- 2 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 0001-add-p-fix-counting-empty-context-lines-in-edited-pat.patch diff --git a/0001-add-p-fix-counting-empty-context-lines-in-edited-pat.patch b/0001-add-p-fix-counting-empty-context-lines-in-edited-pat.patch new file mode 100644 index 0000000..6d36fe5 --- /dev/null +++ b/0001-add-p-fix-counting-empty-context-lines-in-edited-pat.patch @@ -0,0 +1,99 @@ +From 5be233541a4fc2e395087fe51a30a3664165e8bc Mon Sep 17 00:00:00 2001 +From: Phillip Wood +Date: Fri, 1 Jun 2018 18:46:44 +0100 +Subject: [PATCH] add -p: fix counting empty context lines in edited patches + +recount_edited_hunk() introduced in commit 2b8ea7f3c7 ("add -p: +calculate offset delta for edited patches", 2018-03-05) required all +context lines to start with a space, empty lines are not counted. This +was intended to avoid any recounting problems if the user had +introduced empty lines at the end when editing the patch. However this +introduced a regression into 'git add -p' as it seems it is common for +editors to strip the trailing whitespace from empty context lines when +patches are edited thereby introducing empty lines that should be +counted. 'git apply' knows how to deal with such empty lines and POSIX +states that whether or not there is an space on an empty context line +is implementation defined [1]. + +Fix the regression by counting lines consist solely of a newline as +well as lines starting with a space as context lines and add a test to +prevent future regressions. + +[1] http://pubs.opengroup.org/onlinepubs/9699919799/utilities/diff.html + +Reported-by: Mahmoud Al-Qudsi +Reported-by: Oliver Joseph Ash +Reported-by: Jeff Felchner +Signed-off-by: Phillip Wood +--- + git-add--interactive.perl | 2 +- + t/t3701-add-interactive.sh | 43 ++++++++++++++++++++++++++++++++++++++ + 2 files changed, 44 insertions(+), 1 deletion(-) + +diff --git a/git-add--interactive.perl b/git-add--interactive.perl +index c1f52e457f..befbe8c749 100755 +--- a/git-add--interactive.perl ++++ b/git-add--interactive.perl +@@ -1055,7 +1055,7 @@ sub recount_edited_hunk { + $o_cnt++; + } elsif ($mode eq '+') { + $n_cnt++; +- } elsif ($mode eq ' ') { ++ } elsif ($mode eq ' ' or $_ eq "\n") { + $o_cnt++; + $n_cnt++; + } +diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh +index b170fb02b8..3e9139dca8 100755 +--- a/t/t3701-add-interactive.sh ++++ b/t/t3701-add-interactive.sh +@@ -175,6 +175,49 @@ test_expect_success 'real edit works' ' + diff_cmp expected output + ' + ++test_expect_success 'setup file' ' ++ test_write_lines a "" b "" c >file && ++ git add file && ++ test_write_lines a "" d "" c >file ++' ++ ++test_expect_success 'setup patch' ' ++ SP=" " && ++ NULL="" && ++ cat >patch <<-EOF ++ @@ -1,4 +1,4 @@ ++ a ++ $NULL ++ -b ++ +f ++ $SP ++ c ++ EOF ++' ++ ++test_expect_success 'setup expected' ' ++ cat >expected <<-EOF ++ diff --git a/file b/file ++ index b5dd6c9..f910ae9 100644 ++ --- a/file ++ +++ b/file ++ @@ -1,5 +1,5 @@ ++ a ++ $SP ++ -f ++ +d ++ $SP ++ c ++ EOF ++' ++ ++test_expect_success 'edit can strip spaces from empty context lines' ' ++ test_write_lines e n q | git add -p 2>error && ++ test_must_be_empty error && ++ git diff >output && ++ diff_cmp expected output ++' ++ + test_expect_success 'skip files similarly as commit -a' ' + git reset && + echo file >.gitignore && diff --git a/git.spec b/git.spec index 9575a0d..62ff341 100644 --- a/git.spec +++ b/git.spec @@ -83,7 +83,7 @@ Name: git Version: 2.18.0 -Release: 0.0%{?rcrev}%{?dist} +Release: 0.0%{?rcrev}.1%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -123,6 +123,9 @@ Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://bugzilla.redhat.com/1581678 # https://public-inbox.org/git/20180524062733.5412-1-newren@gmail.com/ Patch2: 0001-rev-parse-check-lookup-ed-commit-references-for-NULL.patch +# https://github.com/gitster/git/commit/f2cb01d35 +# https://public-inbox.org/git/20180601174644.13055-1-phillip.wood@talktalk.net/ +Patch3: 0001-add-p-fix-counting-empty-context-lines-in-edited-pat.patch %if %{with docs} BuildRequires: asciidoc >= 8.4.1 @@ -871,6 +874,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Jun 01 2018 Todd Zullinger - 2.18.0-0.0.rc0.1 +- add -p: fix counting empty context lines in edited patches + * Wed May 30 2018 Todd Zullinger - 2.18.0-0.0.rc0 - Update to 2.18.0-rc0 - Use new INSTALL_SYMLINKS setting From ce668b9d1e55b55e39a6417205a0549a980cdb93 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 4 Jun 2018 13:39:39 -0400 Subject: [PATCH 532/842] Update to 2.18.0-rc1 --- ...lookup-ed-commit-references-for-NULL.patch | 68 ------------------- git.spec | 12 ++-- sources | 4 +- 3 files changed, 8 insertions(+), 76 deletions(-) delete mode 100644 0001-rev-parse-check-lookup-ed-commit-references-for-NULL.patch diff --git a/0001-rev-parse-check-lookup-ed-commit-references-for-NULL.patch b/0001-rev-parse-check-lookup-ed-commit-references-for-NULL.patch deleted file mode 100644 index 7a78bff..0000000 --- a/0001-rev-parse-check-lookup-ed-commit-references-for-NULL.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 3aa1681c8661b2f798277a55ab33ce7ba787288c Mon Sep 17 00:00:00 2001 -From: Elijah Newren -Date: Wed, 23 May 2018 23:27:33 -0700 -Subject: [PATCH] rev-parse: check lookup'ed commit references for NULL - -Commits 2122f8b963d4 ("rev-parse: Add support for the ^! and ^@ syntax", -2008-07-26) and 3dd4e7320d ("Teach rev-parse the ... syntax.", 2006-07-04) -taught rev-parse new syntax, and used lookup_commit_reference() as part of -their logic. Neither usage checked the returned commit to see if it was -non-NULL before using it. Check for NULL and ensure an appropriate error -is reported to the user. - -Reported by Florian Weimer and Todd Zullinger. - -Helped-by: Jeff King -Signed-off-by: Elijah Newren ---- - builtin/rev-parse.c | 8 ++++++-- - t/t6101-rev-parse-parents.sh | 8 ++++++++ - 2 files changed, 14 insertions(+), 2 deletions(-) - -diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c -index a1e680b5e9..a0a0ace38d 100644 ---- a/builtin/rev-parse.c -+++ b/builtin/rev-parse.c -@@ -282,6 +282,10 @@ static int try_difference(const char *arg) - struct commit *a, *b; - a = lookup_commit_reference(&start_oid); - b = lookup_commit_reference(&end_oid); -+ if (!a || !b) { -+ *dotdot = '.'; -+ return 0; -+ } - exclude = get_merge_bases(a, b); - while (exclude) { - struct commit *commit = pop_commit(&exclude); -@@ -328,12 +332,12 @@ static int try_parent_shorthands(const char *arg) - return 0; - - *dotdot = 0; -- if (get_oid_committish(arg, &oid)) { -+ if (get_oid_committish(arg, &oid) || -+ !(commit = lookup_commit_reference(&oid))) { - *dotdot = '^'; - return 0; - } - -- commit = lookup_commit_reference(&oid); - if (exclude_parent && - exclude_parent > commit_list_count(commit->parents)) { - *dotdot = '^'; -diff --git a/t/t6101-rev-parse-parents.sh b/t/t6101-rev-parse-parents.sh -index 8c617981a3..7683e4a114 100755 ---- a/t/t6101-rev-parse-parents.sh -+++ b/t/t6101-rev-parse-parents.sh -@@ -214,4 +214,12 @@ test_expect_success 'rev-list merge^-1x (garbage after ^-1)' ' - test_must_fail git rev-list merge^-1x - ' - -+test_expect_success 'rev-parse $garbage^@ does not segfault' ' -+ test_must_fail git rev-parse $EMPTY_TREE^@ -+' -+ -+test_expect_success 'rev-parse $garbage...$garbage does not segfault' ' -+ test_must_fail git rev-parse $EMPTY_TREE...$EMPTY_BLOB -+' -+ - test_done diff --git a/git.spec b/git.spec index 62ff341..86cc543 100644 --- a/git.spec +++ b/git.spec @@ -79,11 +79,11 @@ %endif # Define for release candidates -%global rcrev .rc0 +%global rcrev .rc1 Name: git Version: 2.18.0 -Release: 0.0%{?rcrev}.1%{?dist} +Release: 0.1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -120,12 +120,9 @@ Source99: print-failed-test-output Patch0: git-1.8-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# https://bugzilla.redhat.com/1581678 -# https://public-inbox.org/git/20180524062733.5412-1-newren@gmail.com/ -Patch2: 0001-rev-parse-check-lookup-ed-commit-references-for-NULL.patch # https://github.com/gitster/git/commit/f2cb01d35 # https://public-inbox.org/git/20180601174644.13055-1-phillip.wood@talktalk.net/ -Patch3: 0001-add-p-fix-counting-empty-context-lines-in-edited-pat.patch +Patch2: 0001-add-p-fix-counting-empty-context-lines-in-edited-pat.patch %if %{with docs} BuildRequires: asciidoc >= 8.4.1 @@ -874,6 +871,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Jun 04 2018 Todd Zullinger - 2.18.0-0.1.rc1 +- Update to 2.18.0-rc1 + * Fri Jun 01 2018 Todd Zullinger - 2.18.0-0.0.rc0.1 - add -p: fix counting empty context lines in edited patches diff --git a/sources b/sources index 98260ba..274781e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.18.0.rc0.tar.xz) = 94ca43dfc2a9caa5d1a87d8f57558c7abc5ad4557705a0c3cf426f3720d09b9b45d2dc50f1238ddc69388238379addf3f59fd5fd21effd25376401263f0cdb7a -SHA512 (git-2.18.0.rc0.tar.sign) = c0537a5e29ccbbc21a08d0bae22898111fcde9f863e018825454e0aa7e2449bf8ecc20ea0690e0ddcecc9616c9ab9d61a71b758d2a5b5075b80835fadda12030 +SHA512 (git-2.18.0.rc1.tar.xz) = b3910a0aa699785bbe75fa642105151889eecc79534509a64b32f0af192f9fbc9e546b0209b3ae2882ce46af7c45cea7ad1209e5655af708528712bd9c9049d3 +SHA512 (git-2.18.0.rc1.tar.sign) = b47d540d09ae16e6c3c7a8809027562302f3d41e5f687a5ea1ec4ba544b2eeb50d397a11b70d73ab36e8a77cadba4403ecbb8bb4f98ea0cafaa47d0694314980 From 95447ce86a3b6747ea934075bd27f5721419e328 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 4 Jun 2018 23:43:49 -0400 Subject: [PATCH 533/842] Drop flaky & out-of-place netrc credential helper tests The default target in contrib/credential/netrc/Makefile is, and has always been, test. Running 'make -C contrib/credential/netrc/' in %build is not needed. Additionally, the tests recently were changed and require perl-Git to be installed before running. The tests also exit cleanly regardless of any failures encountered, which makes them unreliable. A fix for these issues will be submitted upstream, but rather than apply it here, simply drop the unneeded 'make' call. Ideally, the tests will be run in %check once fixed. This does present a small wrinkle due to the deletion of contrib/credential in %install. Cross that bridge when we get there. :) --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 86cc543..af7f8e7 100644 --- a/git.spec +++ b/git.spec @@ -499,7 +499,6 @@ grep -rlZ '^use Git::LoadCPAN::' | xargs -r0 sed -i 's/Git::LoadCPAN:://g' %if %{libsecret} %make_build -C contrib/credential/libsecret/ %endif -make -C contrib/credential/netrc/ %make_build -C contrib/diff-highlight/ @@ -873,6 +872,7 @@ make test || ./print-failed-test-output %changelog * Mon Jun 04 2018 Todd Zullinger - 2.18.0-0.1.rc1 - Update to 2.18.0-rc1 +- Drop flaky & out-of-place netrc credential helper tests * Fri Jun 01 2018 Todd Zullinger - 2.18.0-0.0.rc0.1 - add -p: fix counting empty context lines in edited patches From 2ea451f1f431bfcc28904ec35dc4d1093151c434 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 6 Jun 2018 23:02:20 -0400 Subject: [PATCH 534/842] Include git-contacts, SubmittingPatches suggests it to users The git-contacts script was added to SubmittingPatches recently. Make it easier for users who read about it in the documentation to make use of the command. --- git.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index af7f8e7..89fbf2c 100644 --- a/git.spec +++ b/git.spec @@ -496,6 +496,8 @@ grep -rlZ '^use Git::LoadCPAN::' | xargs -r0 sed -i 's/Git::LoadCPAN:://g' %build %make_build all %{?with_docs:doc} +%make_build -C contrib/contacts/ all %{?with_docs:doc} + %if %{libsecret} %make_build -C contrib/credential/libsecret/ %endif @@ -527,6 +529,8 @@ sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \ %install %make_install %{?with_docs:install-doc} +%make_install -C contrib/contacts %{?with_docs:install-doc} + %global elispdir %{_emacs_sitelispdir}/git pushd contrib/emacs >/dev/null for el in *.el ; do @@ -643,7 +647,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|credential-(libsecret|netrc)|difftool|filter-branch|instaweb|request-pull|send-mail)|gitweb" +not_core_re="git-(add--interactive|contacts|credential-(libsecret|netrc)|difftool|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} @@ -657,8 +661,8 @@ grep -E "$not_core_re" bin-man-doc-files > bin-man-doc-git-files not_core_doc_re="(git-(cvs|gui|citool|daemon|subtree))|p4|svn|email|gitk|gitweb" mkdir -p %{buildroot}%{_pkgdocdir}/ cp -pr README.md Documentation/*.txt Documentation/RelNotes contrib %{buildroot}%{_pkgdocdir}/ -# Remove contrib/{credential,svn-fe}, they have nothing useful for documentation -rm -rf %{buildroot}%{_pkgdocdir}/contrib/{credential,svn-fe}/ +# Remove contrib/ files/dirs which have nothing useful for documentation +rm -rf %{buildroot}%{_pkgdocdir}/contrib/{contacts,credential,svn-fe}/ cp -p gitweb/INSTALL %{buildroot}%{_pkgdocdir}/INSTALL.gitweb cp -p gitweb/README %{buildroot}%{_pkgdocdir}/README.gitweb @@ -870,6 +874,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Jun 06 2018 Todd Zullinger +- Include git-contacts, SubmittingPatches suggests it to users + * Mon Jun 04 2018 Todd Zullinger - 2.18.0-0.1.rc1 - Update to 2.18.0-rc1 - Drop flaky & out-of-place netrc credential helper tests From c86e52df37ec74957cdac19bdc878f56a0aeeb45 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 6 Jun 2018 23:03:59 -0400 Subject: [PATCH 535/842] Build git-subtree docs in %build We want to build all documentation in the %build phase rather than falling through to the %install phase and building it as a dependency of install-doc. --- git.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 89fbf2c..62e54c3 100644 --- a/git.spec +++ b/git.spec @@ -504,7 +504,7 @@ grep -rlZ '^use Git::LoadCPAN::' | xargs -r0 sed -i 's/Git::LoadCPAN:://g' %make_build -C contrib/diff-highlight/ -%make_build -C contrib/subtree/ +%make_build -C contrib/subtree/ all %{?with_docs:doc} # Fix shebang in a few places to silence rpmlint complaints # @@ -876,6 +876,7 @@ make test || ./print-failed-test-output %changelog * Wed Jun 06 2018 Todd Zullinger - Include git-contacts, SubmittingPatches suggests it to users +- Build git-subtree docs in %%build * Mon Jun 04 2018 Todd Zullinger - 2.18.0-0.1.rc1 - Update to 2.18.0-rc1 From 8169f9d942b587e234beb4addff8d66bdf453071 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 7 Jun 2018 23:36:38 -0400 Subject: [PATCH 536/842] lint: fix macro-in-%changelog warnings These unescaped macros slipped in with 3f3a0b6 ("Use %make_build and %make_install", 2018-05-30). --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 62e54c3..65ff5c3 100644 --- a/git.spec +++ b/git.spec @@ -892,7 +892,7 @@ make test || ./print-failed-test-output * Wed May 30 2018 Todd Zullinger - 2.17.1-3 - Use %%apply_patch for aarch64 zlib patch, return to %%autosetup - Disable jgit tests on s390x, they're unreliable -- Use %make_build and %make_install +- Use %%make_build and %%make_install * Tue May 29 2018 Todd Zullinger - 2.17.1-2 - packfile: Correct zlib buffer handling (#1582555) From 5834e5a5ce630a375b0348fec4954041cba34021 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 13 Jun 2018 17:00:40 -0400 Subject: [PATCH 537/842] Update to 2.18.0-rc2 --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 65ff5c3..99c50be 100644 --- a/git.spec +++ b/git.spec @@ -79,11 +79,11 @@ %endif # Define for release candidates -%global rcrev .rc1 +%global rcrev .rc2 Name: git Version: 2.18.0 -Release: 0.1%{?rcrev}%{?dist} +Release: 0.2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -874,6 +874,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Jun 13 2018 Todd Zullinger - 2.18.0-0.2.rc2 +- Update to 2.18.0-rc2 + * Wed Jun 06 2018 Todd Zullinger - Include git-contacts, SubmittingPatches suggests it to users - Build git-subtree docs in %%build diff --git a/sources b/sources index 274781e..a081fc3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.18.0.rc1.tar.xz) = b3910a0aa699785bbe75fa642105151889eecc79534509a64b32f0af192f9fbc9e546b0209b3ae2882ce46af7c45cea7ad1209e5655af708528712bd9c9049d3 -SHA512 (git-2.18.0.rc1.tar.sign) = b47d540d09ae16e6c3c7a8809027562302f3d41e5f687a5ea1ec4ba544b2eeb50d397a11b70d73ab36e8a77cadba4403ecbb8bb4f98ea0cafaa47d0694314980 +SHA512 (git-2.18.0.rc2.tar.xz) = 928ba97712ac72312445c38fe2313e0908cb0a1896e2b3c826c464431141943e56efe1fcdcdf86b012e3634d9785d255d1b801d1c59fb9011ca0f8558e0383bd +SHA512 (git-2.18.0.rc2.tar.sign) = f76f4cd25ba3bf2c990410a8866f670d299cea593d29849e5a92bbe1a0791f645466cb7978f5b18158e292260d71a3aefb48c015b1d4e7c6835883866ad4a521 From 5cf8e316f12ae5b096384692e1c8d35445cdf1ac Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 13 Jun 2018 18:36:50 -0400 Subject: [PATCH 538/842] Apply upstream zlib buffer handling patch (#1582555) With the patch accepted upstream, apply it to all architectures. --- ...ackfile-Correct-zlib-buffer-handling.patch | 50 ------------------- ...ackfile-correct-zlib-buffer-handling.patch | 38 ++++++++++++++ git.spec | 15 ++---- 3 files changed, 43 insertions(+), 60 deletions(-) delete mode 100644 0001-packfile-Correct-zlib-buffer-handling.patch create mode 100644 0001-packfile-correct-zlib-buffer-handling.patch diff --git a/0001-packfile-Correct-zlib-buffer-handling.patch b/0001-packfile-Correct-zlib-buffer-handling.patch deleted file mode 100644 index 7de2b9a..0000000 --- a/0001-packfile-Correct-zlib-buffer-handling.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0255347aed203301302e3f8e39fa87349e178019 Mon Sep 17 00:00:00 2001 -From: Jeremy Linton -Date: Fri, 25 May 2018 17:56:01 -0500 -Subject: [PATCH] packfile: Correct zlib buffer handling - -The buffer being passed to zlib includes a null terminator that -git needs to keep in place. unpack_compressed_entry() attempts to -detect the case that the source buffer hasn't been fully consumed -by checking to see if the destination buffer has been over consumed. - -This yields two problems, first a single byte overrun won't be detected -properly because the Z_STREAM_END will then be set, but the null -terminator will have been overwritten. The other problem is that -more recent zlib patches have been poisoning the unconsumed portions -of the buffers which also overwrites the null, while correctly -returning length and status. - -Lets rely on the fact that the source buffer will only be fully -consumed when the when the destination buffer is inflated to the -correct size. We can do this by passing zlib the correct buffer size -and properly checking the return status. The latter check actually -already exists if the buffer size is correct. - -Signed-off-by: Jeremy Linton ---- - packfile.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/packfile.c b/packfile.c -index 7c1a2519fc..245eb32041 100644 ---- a/packfile.c -+++ b/packfile.c -@@ -1416,7 +1416,7 @@ static void *unpack_compressed_entry(struct packed_git *p, - return NULL; - memset(&stream, 0, sizeof(stream)); - stream.next_out = buffer; -- stream.avail_out = size + 1; -+ stream.avail_out = size; - - git_inflate_init(&stream); - do { -@@ -1424,7 +1424,7 @@ static void *unpack_compressed_entry(struct packed_git *p, - stream.next_in = in; - st = git_inflate(&stream, Z_FINISH); - if (!stream.avail_out) -- break; /* the payload is larger than it should be */ -+ break; /* done, st indicates if source fully consumed */ - curpos += stream.next_in - in; - } while (st == Z_OK || st == Z_BUF_ERROR); - git_inflate_end(&stream); diff --git a/0001-packfile-correct-zlib-buffer-handling.patch b/0001-packfile-correct-zlib-buffer-handling.patch new file mode 100644 index 0000000..94b646e --- /dev/null +++ b/0001-packfile-correct-zlib-buffer-handling.patch @@ -0,0 +1,38 @@ +From b611396e97cba09c7e1cf900190cf1a9e922546e Mon Sep 17 00:00:00 2001 +From: Jeremy Linton +Date: Wed, 13 Jun 2018 09:22:07 -0500 +Subject: [PATCH] packfile: correct zlib buffer handling + +The buffer being passed to zlib includes a NUL terminator that git +needs to keep in place. unpack_compressed_entry() attempts to detect +the case that the source buffer hasn't been fully consumed by +checking to see if the destination buffer has been over consumed. + +This causes a problem, that more recent zlib patches have been +poisoning the unconsumed portions of the buffer which overwrites +the NUL byte, while correctly returning length and status. + +Let's place the NUL at the end of the buffer after inflate returns +to assure that it doesn't result in problems for git even if its +been overwritten by zlib. + +Signed-off-by: Jeremy Linton +Signed-off-by: Junio C Hamano +--- + packfile.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/packfile.c b/packfile.c +index 4a5fe7ab18838..d55569921793e 100644 +--- a/packfile.c ++++ b/packfile.c +@@ -1422,6 +1422,9 @@ static void *unpack_compressed_entry(struct packed_git *p, + return NULL; + } + ++ /* versions of zlib can clobber unconsumed portion of outbuf */ ++ buffer[size] = '\0'; ++ + return buffer; + } + diff --git a/git.spec b/git.spec index 99c50be..9b4bf9d 100644 --- a/git.spec +++ b/git.spec @@ -109,11 +109,6 @@ Source14: gitweb.conf.in Source15: git@.service.in Source16: git.socket -# https://bugzilla.redhat.com/1582555 -# https://public-inbox.org/git/20180525231713.23047-1-lintonrjeremy@gmail.com/ -# This patch is applied manually on aarch64 only, until it is accepted # upstream -Source20: 0001-packfile-Correct-zlib-buffer-handling.patch - # Script to print test failure output (used in %%check) Source99: print-failed-test-output @@ -123,6 +118,10 @@ Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://github.com/gitster/git/commit/f2cb01d35 # https://public-inbox.org/git/20180601174644.13055-1-phillip.wood@talktalk.net/ Patch2: 0001-add-p-fix-counting-empty-context-lines-in-edited-pat.patch +# https://bugzilla.redhat.com/1582555 +# https://github.com/gitster/git/commit/b611396e97.patch +# https://public-inbox.org/git/20180525231713.23047-1-lintonrjeremy@gmail.com/ +Patch3: 0001-packfile-correct-zlib-buffer-handling.patch %if %{with docs} BuildRequires: asciidoc >= 8.4.1 @@ -418,11 +417,6 @@ rm -rf "$tar" "$gpghome" # Cleanup tar files and tmp gpg home dir # https://bugzilla.redhat.com/1310704 %autosetup -p1 -n %{name}-%{version}%{?rcrev} -# Apply aarch64 zlib patch (https://bugzilla.redhat.com/1582555) -%ifarch aarch64 -%apply_patch %{SOURCE20} -%endif - # Install print-failed-test-output script install -p -m 755 %{SOURCE99} print-failed-test-output @@ -876,6 +870,7 @@ make test || ./print-failed-test-output %changelog * Wed Jun 13 2018 Todd Zullinger - 2.18.0-0.2.rc2 - Update to 2.18.0-rc2 +- Apply upstream zlib buffer handling patch (#1582555) * Wed Jun 06 2018 Todd Zullinger - Include git-contacts, SubmittingPatches suggests it to users From 83950a818e76f6f3c7a911ba0f049e66acf587a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 Jun 2018 10:43:40 +0200 Subject: [PATCH 539/842] Rebuilt for Python 3.7 --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 9b4bf9d..a70b24c 100644 --- a/git.spec +++ b/git.spec @@ -83,7 +83,7 @@ Name: git Version: 2.18.0 -Release: 0.2%{?rcrev}%{?dist} +Release: 0.3%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -868,6 +868,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Jun 19 2018 Miro Hrončok - 2.18.0-0.3.rc2 +- Rebuilt for Python 3.7 + * Wed Jun 13 2018 Todd Zullinger - 2.18.0-0.2.rc2 - Update to 2.18.0-rc2 - Apply upstream zlib buffer handling patch (#1582555) From a66569768e1993d5546aafa1e3c9fd44045c1ed0 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 20 Jun 2018 23:01:18 -0400 Subject: [PATCH 540/842] Update to 2.18.0 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.18.0.txt --- ...ackfile-correct-zlib-buffer-handling.patch | 38 ------------------- git.spec | 11 +++--- sources | 4 +- 3 files changed, 7 insertions(+), 46 deletions(-) delete mode 100644 0001-packfile-correct-zlib-buffer-handling.patch diff --git a/0001-packfile-correct-zlib-buffer-handling.patch b/0001-packfile-correct-zlib-buffer-handling.patch deleted file mode 100644 index 94b646e..0000000 --- a/0001-packfile-correct-zlib-buffer-handling.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b611396e97cba09c7e1cf900190cf1a9e922546e Mon Sep 17 00:00:00 2001 -From: Jeremy Linton -Date: Wed, 13 Jun 2018 09:22:07 -0500 -Subject: [PATCH] packfile: correct zlib buffer handling - -The buffer being passed to zlib includes a NUL terminator that git -needs to keep in place. unpack_compressed_entry() attempts to detect -the case that the source buffer hasn't been fully consumed by -checking to see if the destination buffer has been over consumed. - -This causes a problem, that more recent zlib patches have been -poisoning the unconsumed portions of the buffer which overwrites -the NUL byte, while correctly returning length and status. - -Let's place the NUL at the end of the buffer after inflate returns -to assure that it doesn't result in problems for git even if its -been overwritten by zlib. - -Signed-off-by: Jeremy Linton -Signed-off-by: Junio C Hamano ---- - packfile.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/packfile.c b/packfile.c -index 4a5fe7ab18838..d55569921793e 100644 ---- a/packfile.c -+++ b/packfile.c -@@ -1422,6 +1422,9 @@ static void *unpack_compressed_entry(struct packed_git *p, - return NULL; - } - -+ /* versions of zlib can clobber unconsumed portion of outbuf */ -+ buffer[size] = '\0'; -+ - return buffer; - } - diff --git a/git.spec b/git.spec index a70b24c..19b2630 100644 --- a/git.spec +++ b/git.spec @@ -79,11 +79,11 @@ %endif # Define for release candidates -%global rcrev .rc2 +#global rcrev .rc0 Name: git Version: 2.18.0 -Release: 0.3%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -118,10 +118,6 @@ Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://github.com/gitster/git/commit/f2cb01d35 # https://public-inbox.org/git/20180601174644.13055-1-phillip.wood@talktalk.net/ Patch2: 0001-add-p-fix-counting-empty-context-lines-in-edited-pat.patch -# https://bugzilla.redhat.com/1582555 -# https://github.com/gitster/git/commit/b611396e97.patch -# https://public-inbox.org/git/20180525231713.23047-1-lintonrjeremy@gmail.com/ -Patch3: 0001-packfile-correct-zlib-buffer-handling.patch %if %{with docs} BuildRequires: asciidoc >= 8.4.1 @@ -868,6 +864,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Jun 20 2018 Todd Zullinger - 2.18.0-1 +- Update to 2.18.0 + * Tue Jun 19 2018 Miro Hrončok - 2.18.0-0.3.rc2 - Rebuilt for Python 3.7 diff --git a/sources b/sources index a081fc3..455c835 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.18.0.rc2.tar.xz) = 928ba97712ac72312445c38fe2313e0908cb0a1896e2b3c826c464431141943e56efe1fcdcdf86b012e3634d9785d255d1b801d1c59fb9011ca0f8558e0383bd -SHA512 (git-2.18.0.rc2.tar.sign) = f76f4cd25ba3bf2c990410a8866f670d299cea593d29849e5a92bbe1a0791f645466cb7978f5b18158e292260d71a3aefb48c015b1d4e7c6835883866ad4a521 +SHA512 (git-2.18.0.tar.xz) = db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46 +SHA512 (git-2.18.0.tar.sign) = 24826b20ce8e4e1afdb8d84b39f5914d5e29d289be31dfe9083968831294619221787e080c3a395bc105293a1184410527ac3694c465babd447791b0d019cc9b From bd7ea152d65c2cd500e99d07e7f168c9f562c5f4 Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Mon, 25 Jun 2018 17:24:50 +0200 Subject: [PATCH 541/842] fix build --without cvs 9125e65 ("Use new INSTALL_SYMLINKS setting", 2018-05-30) broke builds using --without cvs. /usr/libexec/git-core/git-cvsserver became a symlink instead of hardlink. Adapt the find command used to exclude 'git-cvs*' files to detect symlinks as well. --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 19b2630..8c3df5e 100644 --- a/git.spec +++ b/git.spec @@ -83,7 +83,7 @@ Name: git Version: 2.18.0 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -560,7 +560,7 @@ find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ' %if ! %{with cvs} # Remove git-cvs* from %%{_bindir} and %%{gitexecdir} -find %{buildroot}{%{_bindir},%{gitexecdir}} -type f -name 'git-cvs*' -exec rm -f {} ';' +find %{buildroot}{%{_bindir},%{gitexecdir}} \( -type f -o -type l \) -name 'git-cvs*' -exec rm -f {} ';' %endif %if ! %{with p4} @@ -864,6 +864,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Jun 25 2018 Pavel Cahyna - 2.18.0-2 +- Fix build --without cvs + * Wed Jun 20 2018 Todd Zullinger - 2.18.0-1 - Update to 2.18.0 From 3a186b000a18a47b944d460d81b8de20f2085d9a Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 29 Jun 2018 21:51:33 +0200 Subject: [PATCH 542/842] Perl 5.28 rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 8c3df5e..b116f14 100644 --- a/git.spec +++ b/git.spec @@ -83,7 +83,7 @@ Name: git Version: 2.18.0 -Release: 2%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist}.1 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -864,6 +864,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Jun 29 2018 Jitka Plesnikova - 2.18.0-2.1 +- Perl 5.28 rebuild + * Mon Jun 25 2018 Pavel Cahyna - 2.18.0-2 - Fix build --without cvs From fb90b0571466ac62f56487504d72ceb5372f2a6a Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sun, 1 Jul 2018 09:00:33 +0200 Subject: [PATCH 543/842] Perl 5.28 re-rebuild of bootstrapped packages --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index b116f14..ca62a6a 100644 --- a/git.spec +++ b/git.spec @@ -83,7 +83,7 @@ Name: git Version: 2.18.0 -Release: 2%{?rcrev}%{?dist}.1 +Release: 2%{?rcrev}%{?dist}.2 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -864,6 +864,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sun Jul 01 2018 Jitka Plesnikova - 2.18.0-2.2 +- Perl 5.28 re-rebuild of bootstrapped packages + * Fri Jun 29 2018 Jitka Plesnikova - 2.18.0-2.1 - Perl 5.28 rebuild From 3e2a92724aa52197d2924ee31dbe5febe8decfc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 3 Jul 2018 12:15:31 +0200 Subject: [PATCH 544/842] Perl 5.28 rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index ca62a6a..50eac1a 100644 --- a/git.spec +++ b/git.spec @@ -83,7 +83,7 @@ Name: git Version: 2.18.0 -Release: 2%{?rcrev}%{?dist}.2 +Release: 2%{?rcrev}%{?dist}.3 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -864,6 +864,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Jul 03 2018 Petr Pisar - 2.18.0-2.3 +- Perl 5.28 rebuild + * Sun Jul 01 2018 Jitka Plesnikova - 2.18.0-2.2 - Perl 5.28 re-rebuild of bootstrapped packages From 98b3cc5061ed7af172ea37450b6dc315cd167e17 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 02:24:10 +0000 Subject: [PATCH 545/842] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 50eac1a..c172b09 100644 --- a/git.spec +++ b/git.spec @@ -83,7 +83,7 @@ Name: git Version: 2.18.0 -Release: 2%{?rcrev}%{?dist}.3 +Release: 2%{?rcrev}%{?dist}.4 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -864,6 +864,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 2.18.0-2.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jul 03 2018 Petr Pisar - 2.18.0-2.3 - Perl 5.28 rebuild From 8f1e2b63b06c5203fd7ae07aa46559249580df9a Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 20 Aug 2018 18:57:52 -0400 Subject: [PATCH 546/842] Remove git-remote-testsvn, make git-svn noarch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A future release of git will likely remove contrib/svn-fe and git-remote-testsvn¹. The git-remote-testsvn binary is the only noarch file in the git-svn package. Seeing that it's utility is very questionable, remove it so git-svn can return to a noarch package. ¹ https://public-inbox.org/git/20180817190310.GA5360@sigill.intra.peff.net/ --- git.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index c172b09..2d35f8b 100644 --- a/git.spec +++ b/git.spec @@ -83,7 +83,7 @@ Name: git Version: 2.18.0 -Release: 2%{?rcrev}%{?dist}.4 +Release: 2%{?rcrev}%{?dist}.5 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -386,6 +386,7 @@ history. %package svn Summary: Git tools for interacting with Subversion repositories +BuildArch: noarch Requires: git = %{version}-%{release} Requires: perl(Digest::MD5) %if ! %{defined perl_bootstrap} @@ -568,7 +569,10 @@ find %{buildroot}{%{_bindir},%{gitexecdir}} \( -type f -o -type l \) -name 'git- find %{buildroot}{%{_bindir},%{gitexecdir}} -type f -name '*p4*' -exec rm -f {} ';' %endif -exclude_re="archimport|email|git-(citool|cvs|daemon|gui|p4|subtree|(remote-test)?svn)|gitk|p4merge" +# Remove unneeded git-remote-testsvn so git-svn can be noarch +rm -f %{buildroot}%{gitexecdir}/git-remote-testsvn + +exclude_re="archimport|email|git-(citool|cvs|daemon|gui|p4|subtree|svn)|gitk|p4merge" (find %{buildroot}{%{_bindir},%{_libexecdir}} -type f -o -type l | grep -vE "$exclude_re" | sed -e s@^%{buildroot}@@) > bin-man-doc-files (find %{buildroot}{%{_bindir},%{_libexecdir}} -mindepth 1 -type d | grep -vE "$exclude_re" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files (find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) > perl-git-files @@ -857,13 +861,15 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/git-subtree.html} %files svn -%{gitexecdir}/git-remote-testsvn %{gitexecdir}/git-svn %{_pkgdocdir}/git-svn.txt %{?with_docs:%{_mandir}/man1/git-svn.1*} %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Aug 20 2018 Todd Zullinger - 2.18.0-2.5 +- Remove git-remote-testsvn, make git-svn noarch + * Fri Jul 13 2018 Fedora Release Engineering - 2.18.0-2.4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 394b8eec1ed6f7cbeaff2df72b3a96937ff534a7 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 20 Aug 2018 19:01:25 -0400 Subject: [PATCH 547/842] Restore fixed contrib/credential/netrc tests --- git.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/git.spec b/git.spec index 2d35f8b..57c51c9 100644 --- a/git.spec +++ b/git.spec @@ -538,6 +538,9 @@ install -pm 755 contrib/credential/libsecret/git-credential-libsecret \ %endif install -pm 755 contrib/credential/netrc/git-credential-netrc \ %{buildroot}%{gitexecdir} +# temporarily move contrib/credential/netrc aside to prevent it from being +# deleted in the docs preparation, so the tests can be run in %%check +mv contrib/credential/netrc . %make_install -C contrib/subtree %{?with_docs:install-doc} @@ -722,6 +725,12 @@ export GIT_TEST_SVNSERVE=true # Run the tests make test || ./print-failed-test-output +# Run contrib/credential/netrc tests +mkdir -p contrib/credential +mv netrc contrib/credential/ +make -C contrib/credential/netrc/ test || \ +make -C contrib/credential/netrc/ testverbose + %if %{use_systemd} %post daemon %systemd_post git@.service @@ -869,6 +878,7 @@ make test || ./print-failed-test-output %changelog * Mon Aug 20 2018 Todd Zullinger - 2.18.0-2.5 - Remove git-remote-testsvn, make git-svn noarch +- Restore fixed contrib/credential/netrc tests * Fri Jul 13 2018 Fedora Release Engineering - 2.18.0-2.4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 218c314f1fe5b66acbae5394c0f10bf17fd18254 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 20 Aug 2018 19:03:47 -0400 Subject: [PATCH 548/842] Update to 2.19.0.rc0 --- ...ng-empty-context-lines-in-edited-pat.patch | 99 ------------------- git.spec | 12 +-- sources | 4 +- 3 files changed, 8 insertions(+), 107 deletions(-) delete mode 100644 0001-add-p-fix-counting-empty-context-lines-in-edited-pat.patch diff --git a/0001-add-p-fix-counting-empty-context-lines-in-edited-pat.patch b/0001-add-p-fix-counting-empty-context-lines-in-edited-pat.patch deleted file mode 100644 index 6d36fe5..0000000 --- a/0001-add-p-fix-counting-empty-context-lines-in-edited-pat.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 5be233541a4fc2e395087fe51a30a3664165e8bc Mon Sep 17 00:00:00 2001 -From: Phillip Wood -Date: Fri, 1 Jun 2018 18:46:44 +0100 -Subject: [PATCH] add -p: fix counting empty context lines in edited patches - -recount_edited_hunk() introduced in commit 2b8ea7f3c7 ("add -p: -calculate offset delta for edited patches", 2018-03-05) required all -context lines to start with a space, empty lines are not counted. This -was intended to avoid any recounting problems if the user had -introduced empty lines at the end when editing the patch. However this -introduced a regression into 'git add -p' as it seems it is common for -editors to strip the trailing whitespace from empty context lines when -patches are edited thereby introducing empty lines that should be -counted. 'git apply' knows how to deal with such empty lines and POSIX -states that whether or not there is an space on an empty context line -is implementation defined [1]. - -Fix the regression by counting lines consist solely of a newline as -well as lines starting with a space as context lines and add a test to -prevent future regressions. - -[1] http://pubs.opengroup.org/onlinepubs/9699919799/utilities/diff.html - -Reported-by: Mahmoud Al-Qudsi -Reported-by: Oliver Joseph Ash -Reported-by: Jeff Felchner -Signed-off-by: Phillip Wood ---- - git-add--interactive.perl | 2 +- - t/t3701-add-interactive.sh | 43 ++++++++++++++++++++++++++++++++++++++ - 2 files changed, 44 insertions(+), 1 deletion(-) - -diff --git a/git-add--interactive.perl b/git-add--interactive.perl -index c1f52e457f..befbe8c749 100755 ---- a/git-add--interactive.perl -+++ b/git-add--interactive.perl -@@ -1055,7 +1055,7 @@ sub recount_edited_hunk { - $o_cnt++; - } elsif ($mode eq '+') { - $n_cnt++; -- } elsif ($mode eq ' ') { -+ } elsif ($mode eq ' ' or $_ eq "\n") { - $o_cnt++; - $n_cnt++; - } -diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh -index b170fb02b8..3e9139dca8 100755 ---- a/t/t3701-add-interactive.sh -+++ b/t/t3701-add-interactive.sh -@@ -175,6 +175,49 @@ test_expect_success 'real edit works' ' - diff_cmp expected output - ' - -+test_expect_success 'setup file' ' -+ test_write_lines a "" b "" c >file && -+ git add file && -+ test_write_lines a "" d "" c >file -+' -+ -+test_expect_success 'setup patch' ' -+ SP=" " && -+ NULL="" && -+ cat >patch <<-EOF -+ @@ -1,4 +1,4 @@ -+ a -+ $NULL -+ -b -+ +f -+ $SP -+ c -+ EOF -+' -+ -+test_expect_success 'setup expected' ' -+ cat >expected <<-EOF -+ diff --git a/file b/file -+ index b5dd6c9..f910ae9 100644 -+ --- a/file -+ +++ b/file -+ @@ -1,5 +1,5 @@ -+ a -+ $SP -+ -f -+ +d -+ $SP -+ c -+ EOF -+' -+ -+test_expect_success 'edit can strip spaces from empty context lines' ' -+ test_write_lines e n q | git add -p 2>error && -+ test_must_be_empty error && -+ git diff >output && -+ diff_cmp expected output -+' -+ - test_expect_success 'skip files similarly as commit -a' ' - git reset && - echo file >.gitignore && diff --git a/git.spec b/git.spec index 57c51c9..5e6ad88 100644 --- a/git.spec +++ b/git.spec @@ -79,11 +79,11 @@ %endif # Define for release candidates -#global rcrev .rc0 +%global rcrev .rc0 Name: git -Version: 2.18.0 -Release: 2%{?rcrev}%{?dist}.5 +Version: 2.19.0 +Release: 0.0%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -115,9 +115,6 @@ Source99: print-failed-test-output Patch0: git-1.8-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# https://github.com/gitster/git/commit/f2cb01d35 -# https://public-inbox.org/git/20180601174644.13055-1-phillip.wood@talktalk.net/ -Patch2: 0001-add-p-fix-counting-empty-context-lines-in-edited-pat.patch %if %{with docs} BuildRequires: asciidoc >= 8.4.1 @@ -876,6 +873,9 @@ make -C contrib/credential/netrc/ testverbose %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Aug 20 2018 Todd Zullinger - 2.19.0-0.0 +- Update to 2.19.0.rc0 + * Mon Aug 20 2018 Todd Zullinger - 2.18.0-2.5 - Remove git-remote-testsvn, make git-svn noarch - Restore fixed contrib/credential/netrc tests diff --git a/sources b/sources index 455c835..7b82473 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.18.0.tar.xz) = db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46 -SHA512 (git-2.18.0.tar.sign) = 24826b20ce8e4e1afdb8d84b39f5914d5e29d289be31dfe9083968831294619221787e080c3a395bc105293a1184410527ac3694c465babd447791b0d019cc9b +SHA512 (git-2.19.0.rc0.tar.xz) = 02efcf54cf7e18e11954db9cefc87b381b2364647408f263ff6e51a4ad69e3251a83090137cccaac4566464bf58feceb0ae53b051b39542b739207589c9ea418 +SHA512 (git-2.19.0.rc0.tar.sign) = d11e091a0946ceafe98bced0e09b1fce83e519602b959e1e37e3b70f07d1456bdebd9a55d3df9ad87fbf9699f47a9a95971a67c28a3510c6a2b278b715860ea8 From dfcc5ccfe1e63ecb20110ee916edf64ffe97ebae Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 28 Aug 2018 16:41:06 -0400 Subject: [PATCH 549/842] Update to 2.19.0.rc1 --- git.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index 5e6ad88..9ef6740 100644 --- a/git.spec +++ b/git.spec @@ -79,11 +79,11 @@ %endif # Define for release candidates -%global rcrev .rc0 +%global rcrev .rc1 Name: git Version: 2.19.0 -Release: 0.0%{?rcrev}%{?dist} +Release: 0.1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -873,7 +873,10 @@ make -C contrib/credential/netrc/ testverbose %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog -* Mon Aug 20 2018 Todd Zullinger - 2.19.0-0.0 +* Tue Aug 28 2018 Todd Zullinger - 2.19.0-0.1.rc1 +- Update to 2.19.0.rc1 + +* Mon Aug 20 2018 Todd Zullinger - 2.19.0-0.0.rc0 - Update to 2.19.0.rc0 * Mon Aug 20 2018 Todd Zullinger - 2.18.0-2.5 diff --git a/sources b/sources index 7b82473..a874389 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.19.0.rc0.tar.xz) = 02efcf54cf7e18e11954db9cefc87b381b2364647408f263ff6e51a4ad69e3251a83090137cccaac4566464bf58feceb0ae53b051b39542b739207589c9ea418 -SHA512 (git-2.19.0.rc0.tar.sign) = d11e091a0946ceafe98bced0e09b1fce83e519602b959e1e37e3b70f07d1456bdebd9a55d3df9ad87fbf9699f47a9a95971a67c28a3510c6a2b278b715860ea8 +SHA512 (git-2.19.0.rc1.tar.xz) = d628387d78a34ee5b182c0f34ae9e0f2ecf63ce6c969400ad0d472b86eef90577046a137261c4ce504ad970a86e46d73302e2cce665f69f35a2e9715cd2cd459 +SHA512 (git-2.19.0.rc1.tar.sign) = 76f0b05a5fe809a88290ba858001f8a96b48318898659adc80f18a27da84e5a78552ed5ef46cdfe89e363c3be841497a666e926f471aea213786a179705c5859 From 4a06e99217cebfb16a5f99ed491b698719a08aab Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 4 Sep 2018 14:17:41 +0200 Subject: [PATCH 550/842] clarify comment for obsolete git-gnome-keyring --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 9ef6740..06e5702 100644 --- a/git.spec +++ b/git.spec @@ -214,7 +214,7 @@ Requires: perl-Git = %{version}-%{release} Requires: emacs-filesystem >= %{_emacs_version} %endif -# Obsolete gnome-keyring credential helper (remove in Fedora 29) +# Obsolete gnome-keyring credential helper (remove after Fedora 29) Obsoletes: git-gnome-keyring < 2.11.1-4 %description From 5032bef9607e8586c53dbf92cd0a7c26670137d7 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 4 Sep 2018 14:18:29 +0200 Subject: [PATCH 551/842] bump release --- git.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 06e5702..51c66d9 100644 --- a/git.spec +++ b/git.spec @@ -83,7 +83,7 @@ Name: git Version: 2.19.0 -Release: 0.1%{?rcrev}%{?dist} +Release: 0.2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -217,6 +217,12 @@ Requires: emacs-filesystem >= %{_emacs_version} # Obsolete gnome-keyring credential helper (remove after Fedora 29) Obsoletes: git-gnome-keyring < 2.11.1-4 +# Obsolete git-p4 if it's disabled +%if %{without p4} +Obsoletes: git-p4 < %{?epoch:%{epoch}:}%{version}-%{release} +Conflicts: git-p4 < %{?epoch:%{epoch}:}%{version}-%{release} +%endif + %description Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations @@ -873,6 +879,9 @@ make -C contrib/credential/netrc/ testverbose %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Sep 04 2018 Nils Philippsen - 2.19.0-0.2.rc1 +- obsolete git-p4 if it's disabled + * Tue Aug 28 2018 Todd Zullinger - 2.19.0-0.1.rc1 - Update to 2.19.0.rc1 From 9c32e2fbfb4866a42fdb805e86a164b5915eab27 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 5 Sep 2018 00:49:13 -0400 Subject: [PATCH 552/842] Ignore rpmlint warning when git-p4 is obsoleted When python2 is not available the git-p4 package is obsoleted. Ignore the subsequent rpmlint "obsolete-not-provided" warning. --- git.rpmlintrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git.rpmlintrc b/git.rpmlintrc index 221ca04..e7911a4 100644 --- a/git.rpmlintrc +++ b/git.rpmlintrc @@ -19,4 +19,5 @@ addFilter("perl-Git-SVN.noarch: W: no-documentation") addFilter("git-core\..*: W: no-manual-page-for-binary") # nothing provides git-gnome-keyring, it's simply obsolete -addFilter("git.* obsolete-not-provided git-gnome-keyring") +# similarly ignore the warning when git-p4 is disabled +addFilter("git.* obsolete-not-provided git-(gnome-keyring|p4)") From 2b5881180171a1d1f2b57023f3b2a0f29b80ff20 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 4 Sep 2018 20:42:26 -0400 Subject: [PATCH 553/842] Update to 2.19.0.rc2 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.19.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 51c66d9..c690689 100644 --- a/git.spec +++ b/git.spec @@ -79,11 +79,11 @@ %endif # Define for release candidates -%global rcrev .rc1 +%global rcrev .rc2 Name: git Version: 2.19.0 -Release: 0.2%{?rcrev}%{?dist} +Release: 0.3%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -879,6 +879,9 @@ make -C contrib/credential/netrc/ testverbose %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Sep 04 2018 Todd Zullinger - 2.19.0-0.3.rc2 +- Update to 2.19.0.rc2 + * Tue Sep 04 2018 Nils Philippsen - 2.19.0-0.2.rc1 - obsolete git-p4 if it's disabled diff --git a/sources b/sources index a874389..35c4541 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.19.0.rc1.tar.xz) = d628387d78a34ee5b182c0f34ae9e0f2ecf63ce6c969400ad0d472b86eef90577046a137261c4ce504ad970a86e46d73302e2cce665f69f35a2e9715cd2cd459 -SHA512 (git-2.19.0.rc1.tar.sign) = 76f0b05a5fe809a88290ba858001f8a96b48318898659adc80f18a27da84e5a78552ed5ef46cdfe89e363c3be841497a666e926f471aea213786a179705c5859 +SHA512 (git-2.19.0.rc2.tar.xz) = 81b9be3c858dea68808ff740afec6185eb84d097960abd8055b030e62a2d6c2d4b43026a3b715034a60ed0434dbdebcf8eb58db66c0bcdc2ee82ca37275588e0 +SHA512 (git-2.19.0.rc2.tar.sign) = 5a954a5eba04e332449030d1c4cc07bd705ce2d20e2a73cc973b3eae6073b07200274a940fe153f7a9860192a321c5afefd43fa56987e1b1b9bbd996c2062d80 From cf5fc1863fd25f6f450b3415cb21b224b18cf500 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 8 Sep 2018 01:26:14 -0400 Subject: [PATCH 554/842] Drop unnecessary Conflicts: when git-p4 is disabled The Obsoletes: tag is sufficient to ensure git-p4 is removed when updating to a newer git which lacks a git-p4 subpackage. --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index c690689..c699524 100644 --- a/git.spec +++ b/git.spec @@ -220,7 +220,6 @@ Obsoletes: git-gnome-keyring < 2.11.1-4 # Obsolete git-p4 if it's disabled %if %{without p4} Obsoletes: git-p4 < %{?epoch:%{epoch}:}%{version}-%{release} -Conflicts: git-p4 < %{?epoch:%{epoch}:}%{version}-%{release} %endif %description @@ -881,6 +880,7 @@ make -C contrib/credential/netrc/ testverbose %changelog * Tue Sep 04 2018 Todd Zullinger - 2.19.0-0.3.rc2 - Update to 2.19.0.rc2 +- Drop unnecessary Conflicts: when git-p4 is disabled * Tue Sep 04 2018 Nils Philippsen - 2.19.0-0.2.rc1 - obsolete git-p4 if it's disabled From 601f4c9e870f774e878d93e3046f8431a2c9d5b7 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 4 Sep 2018 20:39:54 -0400 Subject: [PATCH 555/842] Obsolete git-cvs if it's disabled Similar to git-p4 in 5032bef ("bump release", 2018-09-04), add Obsoletes: for git-cvs when it is disabled. --- git.rpmlintrc | 4 ++-- git.spec | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/git.rpmlintrc b/git.rpmlintrc index e7911a4..ca9c075 100644 --- a/git.rpmlintrc +++ b/git.rpmlintrc @@ -19,5 +19,5 @@ addFilter("perl-Git-SVN.noarch: W: no-documentation") addFilter("git-core\..*: W: no-manual-page-for-binary") # nothing provides git-gnome-keyring, it's simply obsolete -# similarly ignore the warning when git-p4 is disabled -addFilter("git.* obsolete-not-provided git-(gnome-keyring|p4)") +# similarly ignore the warning when git-cvs and git-p4 are disabled +addFilter("git.* obsolete-not-provided git-(cvs|gnome-keyring|p4)") diff --git a/git.spec b/git.spec index c699524..4af2689 100644 --- a/git.spec +++ b/git.spec @@ -214,6 +214,11 @@ Requires: perl-Git = %{version}-%{release} Requires: emacs-filesystem >= %{_emacs_version} %endif +# Obsolete git-cvs if it's disabled +%if %{without cvs} +Obsoletes: git-cvs < %{?epoch:%{epoch}:}%{version}-%{release} +%endif + # Obsolete gnome-keyring credential helper (remove after Fedora 29) Obsoletes: git-gnome-keyring < 2.11.1-4 @@ -881,6 +886,7 @@ make -C contrib/credential/netrc/ testverbose * Tue Sep 04 2018 Todd Zullinger - 2.19.0-0.3.rc2 - Update to 2.19.0.rc2 - Drop unnecessary Conflicts: when git-p4 is disabled +- Obsolete git-cvs if it's disabled * Tue Sep 04 2018 Nils Philippsen - 2.19.0-0.2.rc1 - obsolete git-p4 if it's disabled From 1fe470a26eddbaf2cf3c391489b196da21a08225 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 5 Sep 2018 00:12:06 -0400 Subject: [PATCH 556/842] Remove python2 contrib scripts if python2 is not available Avoid shipping scripts which require python2 when building without python2. The following scripts/directories are removed: contrib/fast-import/import-zips.py contrib/hg-to-git contrib/svn-fe --- git.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 4af2689..79f2d3f 100644 --- a/git.spec +++ b/git.spec @@ -505,9 +505,6 @@ grep -rlZ '^use Git::LoadCPAN::' | xargs -r0 sed -i 's/Git::LoadCPAN:://g' %make_build -C contrib/subtree/ all %{?with_docs:doc} # Fix shebang in a few places to silence rpmlint complaints -# -# The multimail hook is installed with git. Use python3 to avoid an -# unnecessary python2 dependency. %if %{with python2} sed -i -e '1s@#! */usr/bin/env python$@#!%{__python2}@' \ contrib/fast-import/import-zips.py \ @@ -516,7 +513,14 @@ sed -i -e '1s@#! */usr/bin/env python$@#!%{__python2}@' \ contrib/hooks/multimail/migrate-mailhook-config \ contrib/hooks/multimail/post-receive.example \ contrib/svn-fe/svnrdump_sim.py +%else +# Remove contrib/fast-import/import-zips.py, contrib/hg-to-git, and +# contrib/svn-fe which all require python2. +rm -rf contrib/fast-import/import-zips.py contrib/hg-to-git contrib/svn-fe %endif + +# The multimail hook is installed with git. Use python3 to avoid an +# unnecessary python2 dependency, if possible. %if %{with python3} sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \ contrib/hooks/multimail/git_multimail.py \ @@ -887,6 +891,8 @@ make -C contrib/credential/netrc/ testverbose - Update to 2.19.0.rc2 - Drop unnecessary Conflicts: when git-p4 is disabled - Obsolete git-cvs if it's disabled +- Remove contrib/fast-import/import-zips.py, contrib/hg-to-git, and + contrib/svn-fe which all require python2 * Tue Sep 04 2018 Nils Philippsen - 2.19.0-0.2.rc1 - obsolete git-p4 if it's disabled From 3bd04f23dc65884ab509a4c3ad0b87958c2b7a96 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 5 Sep 2018 01:03:37 -0400 Subject: [PATCH 557/842] Drop git-gnome-keyring obsolete for fedora > 30 Add a conditional to allow merging from master to f29. The obsoletes should be removed when f29 is EOL. It was added in 2d1c8b1 ("Remove obsolete gnome-keyring credential helper", 2018-01-09). The comment was improved in 4a06e99 ("clarify comment for obsolete git-gnome-keyring", 2018-09-04). --- git.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git.spec b/git.spec index 79f2d3f..e6671c5 100644 --- a/git.spec +++ b/git.spec @@ -220,7 +220,9 @@ Obsoletes: git-cvs < %{?epoch:%{epoch}:}%{version}-%{release} %endif # Obsolete gnome-keyring credential helper (remove after Fedora 29) +%if 0%{?fedora} && 0%{?fedora} < 30 Obsoletes: git-gnome-keyring < 2.11.1-4 +%endif # Obsolete git-p4 if it's disabled %if %{without p4} @@ -893,6 +895,7 @@ make -C contrib/credential/netrc/ testverbose - Obsolete git-cvs if it's disabled - Remove contrib/fast-import/import-zips.py, contrib/hg-to-git, and contrib/svn-fe which all require python2 +- Drop git-gnome-keyring obsolete for fedora > 30 * Tue Sep 04 2018 Nils Philippsen - 2.19.0-0.2.rc1 - obsolete git-p4 if it's disabled From f8a83b9ea00062a5af93c54831fa83a867fad5c0 Mon Sep 17 00:00:00 2001 From: Sebastian Kisela Date: Thu, 6 Sep 2018 09:33:56 -0400 Subject: [PATCH 558/842] Move instaweb to a subpackage Gives possibility to add dependencies for git-instaweb http daemon, without having to install all dependencies at each git install. Currently, lighttpd is required by the git-instaweb package. The git-instaweb script supports other httpd daemons (httpd, mongoose, plackup [in perl(Plack)], and webrick [in rub-libs]). lighttpd is the default, works without any configuration, and is only ~1M installed. --- git.spec | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index e6671c5..25ec6bb 100644 --- a/git.spec +++ b/git.spec @@ -83,7 +83,7 @@ Name: git Version: 2.19.0 -Release: 0.3%{?rcrev}%{?dist} +Release: 0.4%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -252,6 +252,7 @@ Requires: git-p4 = %{version}-%{release} %endif Requires: git-subtree = %{version}-%{release} Requires: git-svn = %{version}-%{release} +Requires: git-instaweb = %{version}-%{release} Requires: gitk = %{version}-%{release} Requires: perl-Git = %{version}-%{release} %if ! %{defined perl_bootstrap} @@ -359,6 +360,17 @@ Requires: tk >= 8.4 %description gui %{summary}. +%package instaweb +Summary: Repository browser in gitweb +BuildArch: noarch +Requires: git = %{version}-%{release} +Requires: gitweb = %{version}-%{release} +Requires: lighttpd + +%description instaweb +A simple script to set up gitweb and a web server for browsing the local +repository. + %if %{with p4} %package p4 Summary: Git tools for working with Perforce depots @@ -588,7 +600,7 @@ find %{buildroot}{%{_bindir},%{gitexecdir}} -type f -name '*p4*' -exec rm -f {} # Remove unneeded git-remote-testsvn so git-svn can be noarch rm -f %{buildroot}%{gitexecdir}/git-remote-testsvn -exclude_re="archimport|email|git-(citool|cvs|daemon|gui|p4|subtree|svn)|gitk|p4merge" +exclude_re="archimport|email|git-(citool|cvs|daemon|gui|instaweb|p4|subtree|svn)|gitk|p4merge" (find %{buildroot}{%{_bindir},%{_libexecdir}} -type f -o -type l | grep -vE "$exclude_re" | sed -e s@^%{buildroot}@@) > bin-man-doc-files (find %{buildroot}{%{_bindir},%{_libexecdir}} -mindepth 1 -type d | grep -vE "$exclude_re" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files (find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) > perl-git-files @@ -668,7 +680,7 @@ grep -E "$not_core_re" bin-man-doc-files > bin-man-doc-git-files ##### DOC # place doc files into %%{_pkgdocdir} and split them into expected packages # contrib -not_core_doc_re="(git-(cvs|gui|citool|daemon|subtree))|p4|svn|email|gitk|gitweb" +not_core_doc_re="(git-(cvs|gui|citool|daemon|instaweb|subtree))|p4|svn|email|gitk|gitweb" mkdir -p %{buildroot}%{_pkgdocdir}/ cp -pr README.md Documentation/*.txt Documentation/RelNotes contrib %{buildroot}%{_pkgdocdir}/ # Remove contrib/ files/dirs which have nothing useful for documentation @@ -862,6 +874,13 @@ make -C contrib/credential/netrc/ testverbose %{?with_docs:%{_mandir}/man1/git-citool.1*} %{?with_docs:%{_pkgdocdir}/git-citool.html} +%files instaweb +%defattr(-,root,root) +%{gitexecdir}/git-instaweb +%{_pkgdocdir}/git-instaweb.txt +%{?with_docs:%{_mandir}/man1/git-instaweb.1*} +%{?with_docs:%{_pkgdocdir}/git-instaweb.html} + %if %{with p4} %files p4 %{gitexecdir}/*p4* @@ -889,6 +908,9 @@ make -C contrib/credential/netrc/ testverbose %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Sep 06 2018 Sebastian Kisela - 2.19.0-0.4.rc2 +- Move instaweb to a separate subpackage + * Tue Sep 04 2018 Todd Zullinger - 2.19.0-0.3.rc2 - Update to 2.19.0.rc2 - Drop unnecessary Conflicts: when git-p4 is disabled From 6bf3ed4a31a20c6d6fc153e13c9a99c541a63e74 Mon Sep 17 00:00:00 2001 From: Sebastian Kisela Date: Thu, 6 Sep 2018 11:22:49 -0400 Subject: [PATCH 559/842] Fix builds without docs and without cvs and/or p4 When building with options "--without docs --without p4 --without cvs" the build fails with the following errors: error: Installed (but unpackaged) file(s) found: /usr/share/doc/git/git-cvsexportcommit.txt /usr/share/doc/git/git-cvsimport.txt /usr/share/doc/git/git-cvsserver.txt /usr/share/doc/git/git-p4.txt Installed (but unpackaged) file(s) found: /usr/share/doc/git/git-cvsexportcommit.txt /usr/share/doc/git/git-cvsimport.txt /usr/share/doc/git/git-cvsserver.txt /usr/share/doc/git/git-p4.txt The .txt files were not caught by the %files entry in the main git package when cvs/p4 were disabled -- from 9cd8ee7 ("Disable CVS support on EL > 7", 2018-03-14. Those only applied when documentation was not disabled. Remove git-cvs* and git-p4* files from Documentation as well as the %{buildroot}. Simplify the find path by dropping %{_bindir} and %{gitexecdir}. Tighten the git-p4 glob to avoid unintended matches. Drop the conditional inclusion of cvs/p4 docs in the main git package in favor of removing the files entirely. --- git.spec | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/git.spec b/git.spec index 25ec6bb..ba2ac4a 100644 --- a/git.spec +++ b/git.spec @@ -588,13 +588,15 @@ rm -rf contrib/subtree/{INSTALL,Makefile,git-subtree{,.{1,html,sh,txt,xml}},t} find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' %if ! %{with cvs} -# Remove git-cvs* from %%{_bindir} and %%{gitexecdir} -find %{buildroot}{%{_bindir},%{gitexecdir}} \( -type f -o -type l \) -name 'git-cvs*' -exec rm -f {} ';' +# Remove git-cvs* and gitcvs* +find %{buildroot} Documentation \( -type f -o -type l \) \ + \( -name 'git-cvs*' -o -name 'gitcvs*' \) -exec rm -f {} ';' %endif %if ! %{with p4} -# Remove *p4* from %%{_bindir} and %%{gitexecdir} -find %{buildroot}{%{_bindir},%{gitexecdir}} -type f -name '*p4*' -exec rm -f {} ';' +# Remove git-p4* and mergetools/p4merge +find %{buildroot} Documentation -type f -name 'git-p4*' -exec rm -f {} ';' +rm -f %{buildroot}%{gitexecdir}/mergetools/p4merge %endif # Remove unneeded git-remote-testsvn so git-svn can be noarch @@ -804,14 +806,6 @@ make -C contrib/credential/netrc/ testverbose %exclude %{_pkgdocdir}/contrib/*/*.py[co] %endif %{_pkgdocdir}/contrib/hooks -%if ! %{with cvs} -%{?with_docs:%{_mandir}/man1/*cvs*.1*} -%{?with_docs:%{_pkgdocdir}/git-cvs*} -%endif -%if ! %{with p4} -%{?with_docs:%{_mandir}/man1/*p4*.1*} -%{?with_docs:%{_pkgdocdir}/*p4*} -%endif %if %{with cvs} %files cvs @@ -910,6 +904,7 @@ make -C contrib/credential/netrc/ testverbose %changelog * Thu Sep 06 2018 Sebastian Kisela - 2.19.0-0.4.rc2 - Move instaweb to a separate subpackage +- Fix builds without docs and without cvs and/or p4 * Tue Sep 04 2018 Todd Zullinger - 2.19.0-0.3.rc2 - Update to 2.19.0.rc2 From 2ed8c8c53dc742635f05e1fffb48474605833449 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 7 Sep 2018 17:48:50 -0400 Subject: [PATCH 560/842] Fix smart-http test due to changes in cookie sort order in curl-7.61.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With curl-7.61.1 cookies are sorted by creation-time¹. Sort the output used in the 'cookies stored in http.cookiefile when http.savecookies set' test before comparing it to the expected cookies. ¹ https://github.com/curl/curl/commit/e2ef8d6fa ("cookies: support creation-time attribute for cookies", 2018-08-28) --- ...-smart.sh-sort-cookies-before-compar.patch | 38 +++++++++++++++++++ git.spec | 8 +++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch diff --git a/0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch b/0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch new file mode 100644 index 0000000..e8df864 --- /dev/null +++ b/0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch @@ -0,0 +1,38 @@ +From 0f1a223660db65668b3dcac52228cd2d442d6f53 Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +To: Junio C Hamano +Cc: Jeff King , SZEDER Gábor +Date: Fri, 7 Sep 2018 17:26:26 -0400 +Subject: [PATCH] t5551-http-fetch-smart.sh: sort cookies before comparing +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +With curl-7.61.1 cookies are sorted by creation-time¹. Sort the output +used in the 'cookies stored in http.cookiefile when http.savecookies +set' test before comparing it to the expected cookies. + +¹ https://github.com/curl/curl/commit/e2ef8d6fa ("cookies: support + creation-time attribute for cookies", 2018-08-28) + +Signed-off-by: Todd Zullinger +--- + t/t5551-http-fetch-smart.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh +index 771f36f9ff..538656bfef 100755 +--- a/t/t5551-http-fetch-smart.sh ++++ b/t/t5551-http-fetch-smart.sh +@@ -215,7 +215,7 @@ test_expect_success 'cookies stored in http.cookiefile when http.savecookies set + git config http.cookiefile cookies.txt && + git config http.savecookies true && + git ls-remote $HTTPD_URL/smart_cookies/repo.git master && +- tail -3 cookies.txt >cookies_tail.txt && ++ tail -3 cookies.txt | sort >cookies_tail.txt && + test_cmp expect_cookies.txt cookies_tail.txt + ' + +-- +2.19.0.rc2 + diff --git a/git.spec b/git.spec index ba2ac4a..fab376d 100644 --- a/git.spec +++ b/git.spec @@ -83,7 +83,7 @@ Name: git Version: 2.19.0 -Release: 0.4%{?rcrev}%{?dist} +Release: 0.5%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -115,6 +115,9 @@ Source99: print-failed-test-output Patch0: git-1.8-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch +# curl-7.61.1 changes cookie sort order +# https://public-inbox.org/git/20180907232205.31328-1-tmz@pobox.com/ +Patch2: 0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch %if %{with docs} BuildRequires: asciidoc >= 8.4.1 @@ -902,6 +905,9 @@ make -C contrib/credential/netrc/ testverbose %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Sep 07 2018 Todd Zullinger - 2.19.0-0.5.rc2 +- Fix smart-http test due to changes in cookie sort order in curl-7.61.1 + * Thu Sep 06 2018 Sebastian Kisela - 2.19.0-0.4.rc2 - Move instaweb to a separate subpackage - Fix builds without docs and without cvs and/or p4 From 6bd166894f418f3edd8093fdbd1462592f5b283c Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 10 Sep 2018 13:37:28 -0400 Subject: [PATCH 561/842] Add --without tests option to skip tests While rpmbuild and mock have --nocheck to disable the %check section, 'fedpkg mockbuild' lacks this convenient option. Add %bcond_without tests to allow 'fedpkg mockbuild --without tests' to not run the test suite. Disabling the test suite cuts the build time by approximately 60%, which is very useful while working on changes to the packaging. --- git.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/git.spec b/git.spec index fab376d..a59fbf7 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,9 @@ # Pass --without docs to rpmbuild if you don't want the documentation %bcond_without docs +# Pass --without tests to rpmbuild if you don't want to run the tests +%bcond_without tests + %global gitexecdir %{_libexecdir}/git-core # Settings for Fedora > 29 and EL > 7 @@ -712,6 +715,11 @@ find %{buildroot}%{_pkgdocdir}/{howto,technical} -type f \ ##### #DOC %check +%if %{without tests} +echo "*** Skipping tests" +exit 0 +%endif + %if %{with docs} && %{with linkcheck} # Test links in HTML documentation find %{buildroot}%{_pkgdocdir} -name "*.html" -print0 | xargs -r0 linkchecker @@ -907,6 +915,7 @@ make -C contrib/credential/netrc/ testverbose %changelog * Fri Sep 07 2018 Todd Zullinger - 2.19.0-0.5.rc2 - Fix smart-http test due to changes in cookie sort order in curl-7.61.1 +- Add --without tests option to skip tests * Thu Sep 06 2018 Sebastian Kisela - 2.19.0-0.4.rc2 - Move instaweb to a separate subpackage From 93e9ed05e4004d0c8926112b8ca889f72e2fd42d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 10 Sep 2018 22:09:08 -0400 Subject: [PATCH 562/842] Update to 2.19.0 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.19.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index a59fbf7..ef132e1 100644 --- a/git.spec +++ b/git.spec @@ -82,11 +82,11 @@ %endif # Define for release candidates -%global rcrev .rc2 +#global rcrev .rc0 Name: git Version: 2.19.0 -Release: 0.5%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -913,6 +913,9 @@ make -C contrib/credential/netrc/ testverbose %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Sep 10 2018 Todd Zullinger - 2.19.0-1 +- Update to 2.19.0 + * Fri Sep 07 2018 Todd Zullinger - 2.19.0-0.5.rc2 - Fix smart-http test due to changes in cookie sort order in curl-7.61.1 - Add --without tests option to skip tests diff --git a/sources b/sources index 35c4541..742b6c3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.19.0.rc2.tar.xz) = 81b9be3c858dea68808ff740afec6185eb84d097960abd8055b030e62a2d6c2d4b43026a3b715034a60ed0434dbdebcf8eb58db66c0bcdc2ee82ca37275588e0 -SHA512 (git-2.19.0.rc2.tar.sign) = 5a954a5eba04e332449030d1c4cc07bd705ce2d20e2a73cc973b3eae6073b07200274a940fe153f7a9860192a321c5afefd43fa56987e1b1b9bbd996c2062d80 +SHA512 (git-2.19.0.tar.xz) = 305e51f8e22d96847fcdf4169340795aacaf5f4c5b8052cda860a668059d9ef35bb2840c278b7207f3b9f0e1c32915719649edc20bd3cd33b53e97a06159ceac +SHA512 (git-2.19.0.tar.sign) = eaf3f8cf20e0621ccd31e8bd086a33d3e79845836176feebd95e59ea15d9db432ddc201f65e35480d83fc4c753a0ca64bffcad2f5609dcda2517845b4d32aa57 From dc9c346adee7a3a723a2ed40eda93ee96ce1309e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 11 Sep 2018 03:06:06 -0400 Subject: [PATCH 563/842] Filter rpmlint complaint about %{_emacs_version} We BR emacs which requires emacs-common and provides %{_emacs_version}. --- git.rpmlintrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git.rpmlintrc b/git.rpmlintrc index ca9c075..a7cb9f2 100644 --- a/git.rpmlintrc +++ b/git.rpmlintrc @@ -21,3 +21,6 @@ addFilter("git-core\..*: W: no-manual-page-for-binary") # nothing provides git-gnome-keyring, it's simply obsolete # 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}") From 1cb6673d8f12215d41a199d88dc1003b269b1f86 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 12 Sep 2018 15:15:13 -0400 Subject: [PATCH 564/842] Update t5551 w/curl-7.61.1 patch Add a link to the upstream commit and use that patch. The patch content is the same -- only the metadata differs. --- ...p-fetch-smart.sh-sort-cookies-before-compar.patch | 12 ++++-------- git.spec | 1 + 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch b/0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch index e8df864..7cc468b 100644 --- a/0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch +++ b/0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch @@ -1,8 +1,6 @@ -From 0f1a223660db65668b3dcac52228cd2d442d6f53 Mon Sep 17 00:00:00 2001 +From f5b2c9c98eedc2af38efea91e2702fe8a7e70a6a Mon Sep 17 00:00:00 2001 From: Todd Zullinger -To: Junio C Hamano -Cc: Jeff King , SZEDER Gábor -Date: Fri, 7 Sep 2018 17:26:26 -0400 +Date: Fri, 7 Sep 2018 19:22:05 -0400 Subject: [PATCH] t5551-http-fetch-smart.sh: sort cookies before comparing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -16,12 +14,13 @@ set' test before comparing it to the expected cookies. creation-time attribute for cookies", 2018-08-28) Signed-off-by: Todd Zullinger +Signed-off-by: Junio C Hamano --- t/t5551-http-fetch-smart.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh -index 771f36f9ff..538656bfef 100755 +index 771f36f9ff473..538656bfef09b 100755 --- a/t/t5551-http-fetch-smart.sh +++ b/t/t5551-http-fetch-smart.sh @@ -215,7 +215,7 @@ test_expect_success 'cookies stored in http.cookiefile when http.savecookies set @@ -33,6 +32,3 @@ index 771f36f9ff..538656bfef 100755 test_cmp expect_cookies.txt cookies_tail.txt ' --- -2.19.0.rc2 - diff --git a/git.spec b/git.spec index ef132e1..78b6305 100644 --- a/git.spec +++ b/git.spec @@ -120,6 +120,7 @@ Patch0: git-1.8-gitweb-home-link.patch Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # curl-7.61.1 changes cookie sort order # https://public-inbox.org/git/20180907232205.31328-1-tmz@pobox.com/ +# https://github.com/git/git/commit/f5b2c9c98e.patch Patch2: 0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch %if %{with docs} From 32a31b70903f414a8fe63dd04f22c34c3b4f1a1c Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 5 Oct 2018 15:18:02 -0400 Subject: [PATCH 565/842] Update to 2.19.1 (CVE-2018-17456) From the upstream release announcement: These releases fix a security flaw (CVE-2018-17456), which allowed an attacker to execute arbitrary code by crafting a malicious .gitmodules file in a project cloned with --recurse-submodules. When running "git clone --recurse-submodules", Git parses the supplied .gitmodules file for a URL field and blindly passes it as an argument to a "git clone" subprocess. If the URL field is set to a string that begins with a dash, this "git clone" subprocess interprets the URL as an option. This can lead to executing an arbitrary script shipped in the superproject as the user who ran "git clone". In addition to fixing the security issue for the user running "clone", the 2.17.2, 2.18.1 and 2.19.1 releases have an "fsck" check which can be used to detect such malicious repository content when fetching or accepting a push. See "transfer.fsckObjects" in git-config(1). Credit for finding and fixing this vulnerability goes to joernchen and Jeff King, respectively. References: https://public-inbox.org/git/xmqqy3bcuy3l.fsf@gitster-ct.c.googlers.com/ --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 78b6305..6fa174d 100644 --- a/git.spec +++ b/git.spec @@ -85,7 +85,7 @@ #global rcrev .rc0 Name: git -Version: 2.19.0 +Version: 2.19.1 Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -914,6 +914,9 @@ make -C contrib/credential/netrc/ testverbose %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Oct 05 2018 Todd Zullinger - 2.19.1-1 +- Update to 2.19.1 (CVE-2018-17456) + * Mon Sep 10 2018 Todd Zullinger - 2.19.0-1 - Update to 2.19.0 diff --git a/sources b/sources index 742b6c3..b1f2b0f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.19.0.tar.xz) = 305e51f8e22d96847fcdf4169340795aacaf5f4c5b8052cda860a668059d9ef35bb2840c278b7207f3b9f0e1c32915719649edc20bd3cd33b53e97a06159ceac -SHA512 (git-2.19.0.tar.sign) = eaf3f8cf20e0621ccd31e8bd086a33d3e79845836176feebd95e59ea15d9db432ddc201f65e35480d83fc4c753a0ca64bffcad2f5609dcda2517845b4d32aa57 +SHA512 (git-2.19.1.tar.xz) = a1bc1032b1de9eb9ea8b7c385cd009f64247e13066e0a91e9682e35400ded05f88c23b523cca4782f57544060d6ba0f9d3bec944399cda5771a4945c38bb9b98 +SHA512 (git-2.19.1.tar.sign) = ec8a88b27411ca08eaa682536219dd2ffbe2bbeaf88ebcea5c3ec5caa7351de5815139e63d295c1108717d50e76ecbfe3d36b1199ef148a06ebe58f37510e6e9 From 79dbcc83dc4c3fdb2ccaa8a8732c1b8a72207183 Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Mon, 22 Oct 2018 11:43:21 +0200 Subject: [PATCH 566/842] Update condition for the t5540-http-push-webdav test for future RHEL --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 6fa174d..b548a27 100644 --- a/git.spec +++ b/git.spec @@ -86,7 +86,7 @@ Name: git Version: 2.19.1 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -169,7 +169,7 @@ BuildRequires: zlib-devel >= 1.2 # Test suite requirements BuildRequires: acl -%if 0%{?fedora} && 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?rhel} > 7 # Needed by t5540-http-push-webdav.sh BuildRequires: apr-util-bdb %endif @@ -914,6 +914,9 @@ make -C contrib/credential/netrc/ testverbose %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Oct 22 2018 Pavel Cahyna - 2.19.1-2 +- Update condition for the t5540-http-push-webdav test for future RHEL + * Fri Oct 05 2018 Todd Zullinger - 2.19.1-1 - Update to 2.19.1 (CVE-2018-17456) From a91c5fdb8a1a6d4ae1eaa3a0326265be876aaa5e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 11 Oct 2018 12:10:37 -0400 Subject: [PATCH 567/842] Skip test BuildRequires when --without tests is used The chroot is a bit quicker to create and slightly smaller when building '--without tests' if the BuildRequires needed to run the tests are skipped. Add pod2man dependency when documentation is enabled (the default). Since git-2.17.0, pod2man is needed to build Git.3pm. The pod2man command is in perl-podlators on Fedora and EL >= 7, but in perl on EL-6. Use %{_bindir}/pod2man to ensure the dependency is found regardless of what package provides it. The dependency is only missed when building without the test deps, as the many perl requirements pulled in for the test suite bring in pod2man. --- git.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/git.spec b/git.spec index b548a27..b70b034 100644 --- a/git.spec +++ b/git.spec @@ -124,6 +124,8 @@ Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch Patch2: 0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch %if %{with docs} +# pod2man is needed to build Git.3pm +BuildRequires: %{_bindir}/pod2man BuildRequires: asciidoc >= 8.4.1 BuildRequires: xmlto %if %{with linkcheck} @@ -167,6 +169,7 @@ BuildRequires: tcl BuildRequires: tk BuildRequires: zlib-devel >= 1.2 +%if %{with tests} # Test suite requirements BuildRequires: acl %if 0%{?fedora} >= 27 || 0%{?rhel} > 7 @@ -209,6 +212,7 @@ BuildRequires: python3-devel BuildRequires: subversion BuildRequires: subversion-perl BuildRequires: time +%endif # with tests Requires: git-core = %{version}-%{release} Requires: git-core-doc = %{version}-%{release} @@ -914,6 +918,9 @@ make -C contrib/credential/netrc/ testverbose %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Oct 23 2018 Todd Zullinger +- Skip test BuildRequires when --without tests is used + * Mon Oct 22 2018 Pavel Cahyna - 2.19.1-2 - Update condition for the t5540-http-push-webdav test for future RHEL From 4e0f331329c74aa91c00edd3e9bbea4fe204466e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 11 Oct 2018 12:13:24 -0400 Subject: [PATCH 568/842] Simplify gpg verification of Source0 The verification was simplified slightly in 903d8f3 ("Remove EL-5 and old Fedora conditionals", 2017-07-22). Further simplifications: - do away with unneeded variables - drop '--batch' and '>/dev/null' from gpg2 --dearmor - check tarball signature via stdin The "noisy output from GnuPG 2.0" alluded to on EL <= 7 is no longer present. This has been tested in mock for el6, el7, and fedora releases. --- git.spec | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/git.spec b/git.spec index b70b034..57e981b 100644 --- a/git.spec +++ b/git.spec @@ -431,16 +431,12 @@ Requires: subversion %prep # Verify GPG signatures gpghome="$(mktemp -qd)" # Ensure we don't use any existing gpg keyrings -key="%{SOURCE9}" -src="%{SOURCE0}" -# Ignore noisy output from GnuPG 2.0, used on EL <= 7 -# https://bugs.gnupg.org/gnupg/issue1555 -gpg2 --dearmor --quiet --batch --yes $key >/dev/null -# Upstream signs the uncompressed tarballs -tar=${src/%.xz/} -xz -dc $src > $tar -gpgv2 --homedir "$gpghome" --quiet --keyring $key.gpg $tar.sign $tar -rm -rf "$tar" "$gpghome" # Cleanup tar files and tmp gpg home dir +# 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 @@ -920,6 +916,7 @@ make -C contrib/credential/netrc/ testverbose %changelog * Tue Oct 23 2018 Todd Zullinger - Skip test BuildRequires when --without tests is used +- Simplify gpg verification of Source0 * Mon Oct 22 2018 Pavel Cahyna - 2.19.1-2 - Update condition for the t5540-http-push-webdav test for future RHEL From ba93b90998c23793b59ca509c4bae411f5419689 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 11 Oct 2018 12:56:25 -0400 Subject: [PATCH 569/842] Use %{without ...} macro consistently The %{without ...} macro is easier to read than '! %{with ...}', use it consistently. (Note that using %without_* and %_without_* macros is still not advised.) --- git.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index 57e981b..130a111 100644 --- a/git.spec +++ b/git.spec @@ -64,7 +64,7 @@ # Allow p4 subpackage to be toggled via --with/--without # Disable by default if we lack python2 support -%if ! %{with python2} +%if %{without python2} %bcond_with p4 %else %bcond_without p4 @@ -448,12 +448,12 @@ install -p -m 755 %{SOURCE99} print-failed-test-output # Remove git-archimport from command list sed -i '/^git-archimport/d' command-list.txt -%if ! %{with cvs} +%if %{without cvs} # Remove git-cvs* from command list sed -i '/^git-cvs/d' command-list.txt %endif -%if ! %{with p4} +%if %{without p4} # Remove git-p4 from command list sed -i '/^git-p4/d' command-list.txt %endif @@ -594,13 +594,13 @@ rm -rf contrib/subtree/{INSTALL,Makefile,git-subtree{,.{1,html,sh,txt,xml}},t} # git-archimport is not supported find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' -%if ! %{with cvs} +%if %{without cvs} # Remove git-cvs* and gitcvs* find %{buildroot} Documentation \( -type f -o -type l \) \ \( -name 'git-cvs*' -o -name 'gitcvs*' \) -exec rm -f {} ';' %endif -%if ! %{with p4} +%if %{without p4} # Remove git-p4* and mergetools/p4merge find %{buildroot} Documentation -type f -name 'git-p4*' -exec rm -f {} ';' rm -f %{buildroot}%{gitexecdir}/mergetools/p4merge @@ -917,6 +917,7 @@ make -C contrib/credential/netrc/ testverbose * Tue Oct 23 2018 Todd Zullinger - Skip test BuildRequires when --without tests is used - Simplify gpg verification of Source0 +- Use %%{without ...} macro consistently * Mon Oct 22 2018 Pavel Cahyna - 2.19.1-2 - Update condition for the t5540-http-push-webdav test for future RHEL From ac594c4ca597225d1ad14230ef62628cc13dcb0c Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 11 Oct 2018 13:00:10 -0400 Subject: [PATCH 570/842] Add comments to %endif statements Make it easier to tell what %if conditions are being ended. This is particularly useful with nested conditions since we lack any indentation to visually denote the conditional blocks. --- git.spec | 107 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 54 insertions(+), 53 deletions(-) diff --git a/git.spec b/git.spec index 130a111..24ab398 100644 --- a/git.spec +++ b/git.spec @@ -130,8 +130,8 @@ BuildRequires: asciidoc >= 8.4.1 BuildRequires: xmlto %if %{with linkcheck} BuildRequires: linkchecker -%endif -%endif +%endif # with linkcheck +%endif # with docs BuildRequires: desktop-file-utils BuildRequires: emacs BuildRequires: expat-devel @@ -143,7 +143,7 @@ BuildRequires: gnupg2 BuildRequires: libcurl-devel %if %{libsecret} BuildRequires: libsecret-devel -%endif +%endif # libsecret BuildRequires: make BuildRequires: openssl-devel BuildRequires: pcre2-devel @@ -151,20 +151,20 @@ BuildRequires: perl(Error) BuildRequires: perl(Test) %if %{use_perl_generators} BuildRequires: perl-generators -%endif +%endif # use_perl_generators %if %{use_perl_interpreter} BuildRequires: perl-interpreter %else BuildRequires: perl -%endif +%endif # use_perl_interpreter %if %{bashcomp_pkgconfig} BuildRequires: pkgconfig(bash-completion) -%endif +%endif # bashcomp_pkgconfig BuildRequires: sed %if %{use_systemd} # For macros BuildRequires: systemd -%endif +%endif # use_systemd BuildRequires: tcl BuildRequires: tk BuildRequires: zlib-devel >= 1.2 @@ -175,20 +175,20 @@ BuildRequires: acl %if 0%{?fedora} >= 27 || 0%{?rhel} > 7 # Needed by t5540-http-push-webdav.sh BuildRequires: apr-util-bdb -%endif +%endif # fedora >= 27 BuildRequires: bash %if %{with cvs} BuildRequires: cvs BuildRequires: cvsps -%endif +%endif # with cvs BuildRequires: gnupg %if 0%{?fedora} || ( 0%{?rhel} && ( 0%{?rhel} == 6 || 0%{?rhel} >= 7 && %{_arch} != ppc64 )) BuildRequires: highlight -%endif +%endif # fedora, el-6, or el7-ppc64 BuildRequires: httpd %if 0%{?fedora} && %{_arch} != s390x BuildRequires: jgit -%endif +%endif # fedora (except s390x) BuildRequires: mod_dav_svn BuildRequires: pcre BuildRequires: perl(App::Prove) @@ -205,10 +205,10 @@ BuildRequires: perl(Test::More) BuildRequires: perl(Time::HiRes) %if %{with python2} BuildRequires: python2-devel -%endif +%endif # with python2 %if %{with python3} BuildRequires: python3-devel -%endif +%endif # with python3 BuildRequires: subversion BuildRequires: subversion-perl BuildRequires: time @@ -218,27 +218,27 @@ Requires: git-core = %{version}-%{release} Requires: git-core-doc = %{version}-%{release} %if ! %{defined perl_bootstrap} Requires: perl(Term::ReadKey) -%endif +%endif # ! defined perl_bootstrap Requires: perl-Git = %{version}-%{release} %if %{emacs_filesystem} Requires: emacs-filesystem >= %{_emacs_version} -%endif +%endif # emacs_filesystem # Obsolete git-cvs if it's disabled %if %{without cvs} Obsoletes: git-cvs < %{?epoch:%{epoch}:}%{version}-%{release} -%endif +%endif # without cvs # Obsolete gnome-keyring credential helper (remove after Fedora 29) %if 0%{?fedora} && 0%{?fedora} < 30 Obsoletes: git-gnome-keyring < 2.11.1-4 -%endif +%endif # fedora < 30 # Obsolete git-p4 if it's disabled %if %{without p4} Obsoletes: git-p4 < %{?epoch:%{epoch}:}%{version}-%{release} -%endif +%endif # without p4 %description Git is a fast, scalable, distributed revision control system with an @@ -255,12 +255,12 @@ BuildArch: noarch Requires: git = %{version}-%{release} %if %{with cvs} Requires: git-cvs = %{version}-%{release} -%endif +%endif # with cvs Requires: git-email = %{version}-%{release} Requires: git-gui = %{version}-%{release} %if %{with p4} Requires: git-p4 = %{version}-%{release} -%endif +%endif # with p4 Requires: git-subtree = %{version}-%{release} Requires: git-svn = %{version}-%{release} Requires: git-instaweb = %{version}-%{release} @@ -268,10 +268,10 @@ Requires: gitk = %{version}-%{release} Requires: perl-Git = %{version}-%{release} %if ! %{defined perl_bootstrap} Requires: perl(Term::ReadKey) -%endif +%endif # ! defined perl_bootstrap %if ! %{emacs_filesystem} Requires: emacs-git = %{version}-%{release} -%endif +%endif # ! emacs_filesystem %description all Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations @@ -311,7 +311,7 @@ Requires: cvsps Requires: perl(DBD::SQLite) %description cvs %{summary}. -%endif +%endif # with cvs %package daemon Summary: Git protocol daemon @@ -323,7 +323,7 @@ Requires(preun): systemd Requires(postun): systemd %else Requires: xinetd -%endif +%endif # use_systemd %description daemon The git daemon for supporting git:// access to git repositories @@ -346,7 +346,7 @@ Obsoletes: emacs-git-el < 2.18.0-0.0 Provides: emacs-git-el = %{version}-%{release} %description -n emacs-git %{summary}. -%endif +%endif # ! emacs_filesystem %package -n gitk Summary: Git repository browser @@ -390,7 +390,7 @@ BuildRequires: python2-devel Requires: git = %{version}-%{release} %description p4 %{summary}. -%endif +%endif # with p4 %package -n perl-Git Summary: Perl interface to Git @@ -423,7 +423,7 @@ Requires: git = %{version}-%{release} Requires: perl(Digest::MD5) %if ! %{defined perl_bootstrap} Requires: perl(Term::ReadKey) -%endif +%endif # ! defined perl_bootstrap Requires: subversion %description svn %{summary}. @@ -451,12 +451,12 @@ sed -i '/^git-archimport/d' command-list.txt %if %{without cvs} # Remove git-cvs* from command list sed -i '/^git-cvs/d' command-list.txt -%endif +%endif # without cvs %if %{without p4} # Remove git-p4 from command list sed -i '/^git-p4/d' command-list.txt -%endif +%endif # without p4 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -475,7 +475,7 @@ NO_PERL_CPAN_FALLBACKS = 1 PYTHON_PATH = %{__python2} %else NO_PYTHON = 1 -%endif +%endif # with python2 htmldir = %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} prefix = %{_prefix} perllibdir = %{perl_vendorlib} @@ -495,7 +495,7 @@ EOF %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}perl\\(packed-refs\\) %if ! %{defined perl_bootstrap} %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}perl\\(Term::ReadKey\\) -%endif +%endif # ! defined perl_bootstrap %else cat << \EOF > %{name}-req #!/bin/sh @@ -505,7 +505,7 @@ EOF %global __perl_requires %{_builddir}/%{name}-%{version}%{?rcrev}/%{name}-req chmod +x %{__perl_requires} -%endif +%endif # use_new_rpm_filters # Remove Git::LoadCPAN to ensure we use only system perl modules. This also # allows the dependencies to be automatically processed by rpm. @@ -519,7 +519,7 @@ grep -rlZ '^use Git::LoadCPAN::' | xargs -r0 sed -i 's/Git::LoadCPAN:://g' %if %{libsecret} %make_build -C contrib/credential/libsecret/ -%endif +%endif # libsecret %make_build -C contrib/diff-highlight/ @@ -538,7 +538,7 @@ sed -i -e '1s@#! */usr/bin/env python$@#!%{__python2}@' \ # Remove contrib/fast-import/import-zips.py, contrib/hg-to-git, and # contrib/svn-fe which all require python2. rm -rf contrib/fast-import/import-zips.py contrib/hg-to-git contrib/svn-fe -%endif +%endif # with python2 # The multimail hook is installed with git. Use python3 to avoid an # unnecessary python2 dependency, if possible. @@ -547,7 +547,7 @@ sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \ contrib/hooks/multimail/git_multimail.py \ contrib/hooks/multimail/migrate-mailhook-config \ contrib/hooks/multimail/post-receive.example -%endif +%endif # with python3 %install %make_install %{?with_docs:install-doc} @@ -567,7 +567,7 @@ popd >/dev/null %if %{libsecret} install -pm 755 contrib/credential/libsecret/git-credential-libsecret \ %{buildroot}%{gitexecdir} -%endif +%endif # libsecret install -pm 755 contrib/credential/netrc/git-credential-netrc \ %{buildroot}%{gitexecdir} # temporarily move contrib/credential/netrc aside to prevent it from being @@ -598,13 +598,13 @@ find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ' # Remove git-cvs* and gitcvs* find %{buildroot} Documentation \( -type f -o -type l \) \ \( -name 'git-cvs*' -o -name 'gitcvs*' \) -exec rm -f {} ';' -%endif +%endif # without cvs %if %{without p4} # Remove git-p4* and mergetools/p4merge find %{buildroot} Documentation -type f -name 'git-p4*' -exec rm -f {} ';' rm -f %{buildroot}%{gitexecdir}/mergetools/p4merge -%endif +%endif # without p4 # Remove unneeded git-remote-testsvn so git-svn can be noarch rm -f %{buildroot}%{gitexecdir}/git-remote-testsvn @@ -621,7 +621,7 @@ sed -i "/Git\/SVN/ d" perl-git-files (find %{buildroot}%{_mandir} -type f | grep -vE "$exclude_re|Git" | sed -e s@^%{buildroot}@@ -e 's/$/*/' ) >> bin-man-doc-files %else rm -rf %{buildroot}%{_mandir} -%endif +%endif # with docs mkdir -p %{buildroot}%{_localstatedir}/lib/git %if %{use_systemd} @@ -636,7 +636,7 @@ perl -p \ -e "s|\@GITEXECDIR\@|%{gitexecdir}|g;" \ -e "s|\@BASE_PATH\@|%{_localstatedir}/lib/git|g;" \ %{SOURCE11} > %{buildroot}%{_sysconfdir}/xinetd.d/git -%endif +%endif # use_systemd # Setup bash completion install -Dpm 644 contrib/completion/git-completion.bash %{buildroot}%{bashcompdir}/git @@ -683,7 +683,7 @@ grep -vE "$not_core_re|%{_mandir}" bin-man-doc-files > bin-files-core touch man-doc-files-core %if %{with docs} grep -vE "$not_core_re" bin-man-doc-files | grep "%{_mandir}" > man-doc-files-core -%endif +%endif # with docs grep -E "$not_core_re" bin-man-doc-files > bin-man-doc-git-files ##### DOC @@ -702,7 +702,7 @@ cp -pr Documentation/*.html Documentation/docbook-xsl.css %{buildroot}%{_pkgdocd cp -pr Documentation/{howto,technical} %{buildroot}%{_pkgdocdir}/ find %{buildroot}%{_pkgdocdir}/{howto,technical} -type f \ |grep -o "%{_pkgdocdir}.*$" >> man-doc-files-core -%endif +%endif # with docs { find %{buildroot}%{_pkgdocdir} -type f -maxdepth 1 \ @@ -719,12 +719,12 @@ find %{buildroot}%{_pkgdocdir}/{howto,technical} -type f \ %if %{without tests} echo "*** Skipping tests" exit 0 -%endif +%endif # without tests %if %{with docs} && %{with linkcheck} # Test links in HTML documentation find %{buildroot}%{_pkgdocdir} -name "*.html" -print0 | xargs -r0 linkchecker -%endif +%endif # with docs && with linkcheck # Tests to skip on all releases and architectures GIT_SKIP_TESTS="" @@ -737,7 +737,7 @@ GIT_SKIP_TESTS="" # t5541.33 '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.33 t5551.25" -%endif +%endif # aarch64 %%{arm} %%{power64} %ifarch %{power64} # Skip tests which fail on ppc @@ -747,7 +747,7 @@ GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5541.33 t5551.25" # due to an issue in the test suite or a conflict with some other process on # the build host. It only appears to occur on ppc-arches. GIT_SKIP_TESTS="$GIT_SKIP_TESTS t9115" -%endif +%endif # %%{power64} export GIT_SKIP_TESTS @@ -779,12 +779,12 @@ make -C contrib/credential/netrc/ testverbose %postun daemon %systemd_postun_with_restart git@.service -%endif +%endif # use_systemd %files -f bin-man-doc-git-files %if %{emacs_filesystem} %{elispdir} -%endif +%endif # emacs_filesystem %{_datadir}/git-core/contrib/diff-highlight %{_datadir}/git-core/contrib/hooks/multimail %{_datadir}/git-core/contrib/hooks/update-paranoid @@ -816,7 +816,7 @@ make -C contrib/credential/netrc/ testverbose %if 0%{?rhel} && 0%{?rhel} <= 7 # .py files are only bytecompiled on EL <= 7 %exclude %{_pkgdocdir}/contrib/*/*.py[co] -%endif +%endif # rhel <= 7 %{_pkgdocdir}/contrib/hooks %if %{with cvs} @@ -826,7 +826,7 @@ make -C contrib/credential/netrc/ testverbose %{gitexecdir}/*cvs* %{?with_docs:%{_mandir}/man1/*cvs*.1*} %{?with_docs:%{_pkgdocdir}/*git-cvs*.html} -%endif +%endif # with cvs %files daemon %{_pkgdocdir}/git-daemon*.txt @@ -835,7 +835,7 @@ make -C contrib/credential/netrc/ testverbose %{_unitdir}/git@.service %else %config(noreplace)%{_sysconfdir}/xinetd.d/git -%endif +%endif # use_systemd %{gitexecdir}/git-daemon %{_localstatedir}/lib/git %{?with_docs:%{_mandir}/man1/git-daemon*.1*} @@ -845,7 +845,7 @@ make -C contrib/credential/netrc/ testverbose %files -n emacs-git %{_pkgdocdir}/contrib/emacs/README %{elispdir} -%endif +%endif # ! emacs_filesystem %files email %{_pkgdocdir}/*email*.txt @@ -894,7 +894,7 @@ make -C contrib/credential/netrc/ testverbose %{_pkgdocdir}/*p4*.txt %{?with_docs:%{_mandir}/man1/*p4*.1*} %{?with_docs:%{_pkgdocdir}/*p4*.html} -%endif +%endif # with p4 %files -n perl-Git -f perl-git-files %{?with_docs:%{_mandir}/man3/Git.3pm*} @@ -918,6 +918,7 @@ make -C contrib/credential/netrc/ testverbose - Skip test BuildRequires when --without tests is used - Simplify gpg verification of Source0 - Use %%{without ...} macro consistently +- Add comments to %%endif statements * Mon Oct 22 2018 Pavel Cahyna - 2.19.1-2 - Update condition for the t5540-http-push-webdav test for future RHEL From 314daae243197f43104687cc35165ad0ce9c8c99 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 11 Oct 2018 15:10:03 -0400 Subject: [PATCH 571/842] Avoid 'unexpanded macro' warning in mock srpm builds When preparing the srpm in mock or other minimal environments, the use of %{_emacs_version} causes a spurious warning: Possible unexpanded macro in: Requires: emacs-filesystem >= %{_emacs_version} Prevent the warning with a check that the macro is defined before use. (There is another use of %{_emacs_version}, but it only applies to EL-6 where the warning is not present. Just ignore it.) --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 24ab398..21f0ce6 100644 --- a/git.spec +++ b/git.spec @@ -221,7 +221,7 @@ Requires: perl(Term::ReadKey) %endif # ! defined perl_bootstrap Requires: perl-Git = %{version}-%{release} -%if %{emacs_filesystem} +%if %{emacs_filesystem} && %{defined _emacs_version} Requires: emacs-filesystem >= %{_emacs_version} %endif # emacs_filesystem From a6a24cf4210bffe8d11e3423b693b36817680775 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 5 Nov 2018 21:38:35 -0500 Subject: [PATCH 572/842] Add glibc-langpack-en BuildRequires for en_US.UTF-8 locale MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fedora 30 will remove glibc-all-langpacks from the default buildroot¹. Ensure en_US.UTF-8 locale is present for the test suite. Avoid C.UTF-8 until it is more widely used and tested. ¹ https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot --- git.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/git.spec b/git.spec index 21f0ce6..2c45240 100644 --- a/git.spec +++ b/git.spec @@ -25,11 +25,13 @@ %bcond_without python3 # linkchcker is not available on EL <= 7 %bcond_without linkcheck +%global use_glibc_langpack_en 1 %global use_perl_generators 1 %global use_perl_interpreter 1 %else %bcond_with python3 %bcond_with linkcheck +%global use_glibc_langpack_en 0 %global use_perl_generators 0 %global use_perl_interpreter 0 %endif @@ -181,6 +183,9 @@ BuildRequires: bash BuildRequires: cvs BuildRequires: cvsps %endif # with cvs +%if %{use_glibc_langpack_en} +BuildRequires: glibc-langpack-en +%endif # use_glibc_langpack_en BuildRequires: gnupg %if 0%{?fedora} || ( 0%{?rhel} && ( 0%{?rhel} == 6 || 0%{?rhel} >= 7 && %{_arch} != ppc64 )) BuildRequires: highlight @@ -919,6 +924,7 @@ make -C contrib/credential/netrc/ testverbose - Simplify gpg verification of Source0 - Use %%{without ...} macro consistently - Add comments to %%endif statements +- Add glibc-langpack-en BuildRequires for en_US.UTF-8 locale * Mon Oct 22 2018 Pavel Cahyna - 2.19.1-2 - Update condition for the t5540-http-push-webdav test for future RHEL From e46c99bb3b64e96813876d98ba3520d29b5d5268 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 10 Sep 2018 22:09:08 -0400 Subject: [PATCH 573/842] Update to 2.19.2 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.19.2.txt --- ...-smart.sh-sort-cookies-before-compar.patch | 34 ------------------- git.spec | 11 +++--- sources | 4 +-- 3 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch diff --git a/0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch b/0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch deleted file mode 100644 index 7cc468b..0000000 --- a/0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f5b2c9c98eedc2af38efea91e2702fe8a7e70a6a Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Fri, 7 Sep 2018 19:22:05 -0400 -Subject: [PATCH] t5551-http-fetch-smart.sh: sort cookies before comparing -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With curl-7.61.1 cookies are sorted by creation-time¹. Sort the output -used in the 'cookies stored in http.cookiefile when http.savecookies -set' test before comparing it to the expected cookies. - -¹ https://github.com/curl/curl/commit/e2ef8d6fa ("cookies: support - creation-time attribute for cookies", 2018-08-28) - -Signed-off-by: Todd Zullinger -Signed-off-by: Junio C Hamano ---- - t/t5551-http-fetch-smart.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh -index 771f36f9ff473..538656bfef09b 100755 ---- a/t/t5551-http-fetch-smart.sh -+++ b/t/t5551-http-fetch-smart.sh -@@ -215,7 +215,7 @@ test_expect_success 'cookies stored in http.cookiefile when http.savecookies set - git config http.cookiefile cookies.txt && - git config http.savecookies true && - git ls-remote $HTTPD_URL/smart_cookies/repo.git master && -- tail -3 cookies.txt >cookies_tail.txt && -+ tail -3 cookies.txt | sort >cookies_tail.txt && - test_cmp expect_cookies.txt cookies_tail.txt - ' - diff --git a/git.spec b/git.spec index 2c45240..5dc9bfe 100644 --- a/git.spec +++ b/git.spec @@ -87,8 +87,8 @@ #global rcrev .rc0 Name: git -Version: 2.19.1 -Release: 2%{?rcrev}%{?dist} +Version: 2.19.2 +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -120,10 +120,6 @@ Source99: print-failed-test-output Patch0: git-1.8-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# curl-7.61.1 changes cookie sort order -# https://public-inbox.org/git/20180907232205.31328-1-tmz@pobox.com/ -# https://github.com/git/git/commit/f5b2c9c98e.patch -Patch2: 0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch %if %{with docs} # pod2man is needed to build Git.3pm @@ -919,6 +915,9 @@ make -C contrib/credential/netrc/ testverbose %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Nov 21 2018 Todd Zullinger - 2.19.2-1 +- Update to 2.19.2 + * Tue Oct 23 2018 Todd Zullinger - Skip test BuildRequires when --without tests is used - Simplify gpg verification of Source0 diff --git a/sources b/sources index b1f2b0f..4686fe9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.19.1.tar.xz) = a1bc1032b1de9eb9ea8b7c385cd009f64247e13066e0a91e9682e35400ded05f88c23b523cca4782f57544060d6ba0f9d3bec944399cda5771a4945c38bb9b98 -SHA512 (git-2.19.1.tar.sign) = ec8a88b27411ca08eaa682536219dd2ffbe2bbeaf88ebcea5c3ec5caa7351de5815139e63d295c1108717d50e76ecbfe3d36b1199ef148a06ebe58f37510e6e9 +SHA512 (git-2.19.2.tar.xz) = 1d707c1a7a16fe9399592b0354e9023f701b019f36fe775997c46354d40617a80fa04aacc5330825c4f9301c2910ead8b26274a7f3b92e9d790b4705c0d7aa96 +SHA512 (git-2.19.2.tar.sign) = 702c421f312b2a91610b636f9091a1193ef05b3107375b69c9f97c7070143dfe7a01ceeaabe68e06fb06a9e097b8d8846409f76a7b3ce60fc91eb5de72c6538b From 0b6f68c5322cdcf799388bbecc991c505b96af67 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 21 Nov 2018 20:29:30 -0500 Subject: [PATCH 574/842] Update to 2.20.0.rc1 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.20.0.txt --- git.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index 5dc9bfe..2c733fe 100644 --- a/git.spec +++ b/git.spec @@ -84,11 +84,11 @@ %endif # Define for release candidates -#global rcrev .rc0 +%global rcrev .rc1 Name: git -Version: 2.19.2 -Release: 1%{?rcrev}%{?dist} +Version: 2.20.0 +Release: 0.1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -915,6 +915,9 @@ make -C contrib/credential/netrc/ testverbose %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Nov 21 2018 Todd Zullinger - 2.20.0-0.1.rc1 +- Update to 2.20.0.rc1 + * Wed Nov 21 2018 Todd Zullinger - 2.19.2-1 - Update to 2.19.2 diff --git a/sources b/sources index 4686fe9..9c50100 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.19.2.tar.xz) = 1d707c1a7a16fe9399592b0354e9023f701b019f36fe775997c46354d40617a80fa04aacc5330825c4f9301c2910ead8b26274a7f3b92e9d790b4705c0d7aa96 -SHA512 (git-2.19.2.tar.sign) = 702c421f312b2a91610b636f9091a1193ef05b3107375b69c9f97c7070143dfe7a01ceeaabe68e06fb06a9e097b8d8846409f76a7b3ce60fc91eb5de72c6538b +SHA512 (git-2.20.0.rc1.tar.xz) = e00eb0c33dfff8c63170915693032346e52bc6b8410c528b43372d9aef16287e0c2891214d64ce21cab9d393524bda3037961e2f6f07a09532451ef8fa2a63d2 +SHA512 (git-2.20.0.rc1.tar.sign) = 4e89789e984b713b69aeaa1a31da2a6122398c2fd303b9858ebe8a537b25a7dc05415d13304e53a8b7c1576003dac16b311559df9b78779387ddb371f05578d1 From c983514258f3993b7702e547e09ec8729d4f1d0e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 1 Dec 2018 13:45:33 -0500 Subject: [PATCH 575/842] Update to 2.20.0.rc2 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.20.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 2c733fe..f598988 100644 --- a/git.spec +++ b/git.spec @@ -84,11 +84,11 @@ %endif # Define for release candidates -%global rcrev .rc1 +%global rcrev .rc2 Name: git Version: 2.20.0 -Release: 0.1%{?rcrev}%{?dist} +Release: 0.2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -915,6 +915,9 @@ make -C contrib/credential/netrc/ testverbose %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sat Dec 01 2018 Todd Zullinger - 2.20.0-0.2.rc2 +- Update to 2.20.0.rc2 + * Wed Nov 21 2018 Todd Zullinger - 2.20.0-0.1.rc1 - Update to 2.20.0.rc1 diff --git a/sources b/sources index 9c50100..b65391c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.20.0.rc1.tar.xz) = e00eb0c33dfff8c63170915693032346e52bc6b8410c528b43372d9aef16287e0c2891214d64ce21cab9d393524bda3037961e2f6f07a09532451ef8fa2a63d2 -SHA512 (git-2.20.0.rc1.tar.sign) = 4e89789e984b713b69aeaa1a31da2a6122398c2fd303b9858ebe8a537b25a7dc05415d13304e53a8b7c1576003dac16b311559df9b78779387ddb371f05578d1 +SHA512 (git-2.20.0.rc2.tar.xz) = 50441329d5d73fe4436acdf5f06c7c8aa5d63c59f1724c54c1dc44ac928ee11a076e4012c3dbf8a1439233c711775a7e24eba21d41f8dfb90722b1ac8a7f0826 +SHA512 (git-2.20.0.rc2.tar.sign) = dd6273c486776f3922b0055547c5757e2afbab8e663e05a6df7800884c93c906b882bdf8f2418b0f9a7a1c220988216a591c1a4f96c19dd18c872cc14fbd0111 From 4fe38417f1524a5f8861a3f39176329e58e3b1fd Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 9 Dec 2018 10:18:20 -0500 Subject: [PATCH 576/842] Update to 2.20.0 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.20.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index f598988..5535bf3 100644 --- a/git.spec +++ b/git.spec @@ -84,11 +84,11 @@ %endif # Define for release candidates -%global rcrev .rc2 +#global rcrev .rc0 Name: git Version: 2.20.0 -Release: 0.2%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -915,6 +915,9 @@ make -C contrib/credential/netrc/ testverbose %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sun Dec 09 2018 Todd Zullinger - 2.20.0-1 +- Update to 2.20.0 + * Sat Dec 01 2018 Todd Zullinger - 2.20.0-0.2.rc2 - Update to 2.20.0.rc2 diff --git a/sources b/sources index b65391c..9c8c35f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.20.0.rc2.tar.xz) = 50441329d5d73fe4436acdf5f06c7c8aa5d63c59f1724c54c1dc44ac928ee11a076e4012c3dbf8a1439233c711775a7e24eba21d41f8dfb90722b1ac8a7f0826 -SHA512 (git-2.20.0.rc2.tar.sign) = dd6273c486776f3922b0055547c5757e2afbab8e663e05a6df7800884c93c906b882bdf8f2418b0f9a7a1c220988216a591c1a4f96c19dd18c872cc14fbd0111 +SHA512 (git-2.20.0.tar.xz) = b1d9244545564651f6ed23b3227145bc637f6b62bdcd8f9ff354e67662170e5ca7f92ab9d7e2a0e5c3b0a2644c695e42f0fb1a727ba6aae000afa022be807065 +SHA512 (git-2.20.0.tar.sign) = dc1431dff2d47112cef0e72e41cf16d77ea6c019613f391016c5575738c16c933da58af532295faa5cac51e9f7e805d6d14a56200e44ca879d82535c1588639f From e38a5c222ec3d94477565b3ffecbf68add4a5957 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 15 Dec 2018 00:53:32 -0500 Subject: [PATCH 577/842] Update to 2.20.1 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.20.1.txt --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 5535bf3..3b038da 100644 --- a/git.spec +++ b/git.spec @@ -87,7 +87,7 @@ #global rcrev .rc0 Name: git -Version: 2.20.0 +Version: 2.20.1 Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -915,6 +915,9 @@ make -C contrib/credential/netrc/ testverbose %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sat Dec 15 2018 Todd Zullinger - 2.20.1-1 +- Update to 2.20.1 + * Sun Dec 09 2018 Todd Zullinger - 2.20.0-1 - Update to 2.20.0 diff --git a/sources b/sources index 9c8c35f..84fce47 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.20.0.tar.xz) = b1d9244545564651f6ed23b3227145bc637f6b62bdcd8f9ff354e67662170e5ca7f92ab9d7e2a0e5c3b0a2644c695e42f0fb1a727ba6aae000afa022be807065 -SHA512 (git-2.20.0.tar.sign) = dc1431dff2d47112cef0e72e41cf16d77ea6c019613f391016c5575738c16c933da58af532295faa5cac51e9f7e805d6d14a56200e44ca879d82535c1588639f +SHA512 (git-2.20.1.tar.xz) = 3f05ea3a645d4d74c7380b03e2de39f893ff77a05d8b595ce30300d1d4e032f11d84952366096f8effd5fba18dfa5ebb946bc07a984eb7cbbda113cb88202f6c +SHA512 (git-2.20.1.tar.sign) = 2b6f7b757ea1c35dcbb67a5a7cf97e83e6e9806f81453295699c703214bdd061e5bcc1113615927e32359dd205d6181f4899aba41b95586676e62f41262987c4 From 6a5fa7acb33cc654d8b5b517bb4ba9672451e623 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 22:26:02 +0000 Subject: [PATCH 578/842] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 3b038da..a1fcbed 100644 --- a/git.spec +++ b/git.spec @@ -88,7 +88,7 @@ Name: git Version: 2.20.1 -Release: 1%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist}.1 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -915,6 +915,9 @@ make -C contrib/credential/netrc/ testverbose %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.20.1-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Dec 15 2018 Todd Zullinger - 2.20.1-1 - Update to 2.20.1 From 5aaf62d16fbcaa412a736be781533d72f47d177e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 31 Jan 2019 17:48:18 -0500 Subject: [PATCH 579/842] Remove extraneous pcre BuildRequires The pcre BR was added in 6dc6285 ("Improve test suite coverage", 2017-11-10), which seems to have been an oversight. The test suite improvements were worked on over a long period of time. It is quite likely that the pcre BR was needed before 6dc6285 was finalized. Regardless, we began building against pcre2 in 595b682 ("Use pcre2 library", 2017-07-22). Note that pcre remains in the minimal buildroot due to dependencies in glib2 and grep. --- git.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index a1fcbed..7ea1bcf 100644 --- a/git.spec +++ b/git.spec @@ -88,7 +88,7 @@ Name: git Version: 2.20.1 -Release: 1%{?rcrev}%{?dist}.1 +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -191,7 +191,6 @@ BuildRequires: httpd BuildRequires: jgit %endif # fedora (except s390x) BuildRequires: mod_dav_svn -BuildRequires: pcre BuildRequires: perl(App::Prove) BuildRequires: perl(CGI) BuildRequires: perl(CGI::Carp) @@ -915,6 +914,9 @@ make -C contrib/credential/netrc/ testverbose %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Jan 31 2019 Todd Zullinger - 2.20.1-2 +- Remove extraneous pcre BuildRequires + * Thu Jan 31 2019 Fedora Release Engineering - 2.20.1-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From fece8d786bdd1c46796291dcb386c5d7782f3432 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 31 Jan 2019 18:12:42 -0500 Subject: [PATCH 580/842] Add additional BuildRequires for i18n locales used in tests The test suite uses is_IS.UTF-8 and is_IS.ISO8859-1 (via the GETTEXT_LOCALE and GETTEXT_ISO_LOCALE prereq's. Ensure these locales are available. Installing glibc-langpack-is is insufficient as it does not provide is_IS.ISO8859-1, glibc-all-langpacks is also needed. Now that we're installing additional langpacks, update the macro name which was added in a6a24cf ("Add glibc-langpack-en BuildRequires for en_US.UTF-8 locale", 2018-11-05). --- git.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 7ea1bcf..e5cbdf0 100644 --- a/git.spec +++ b/git.spec @@ -25,13 +25,13 @@ %bcond_without python3 # linkchcker is not available on EL <= 7 %bcond_without linkcheck -%global use_glibc_langpack_en 1 +%global use_glibc_langpacks 1 %global use_perl_generators 1 %global use_perl_interpreter 1 %else %bcond_with python3 %bcond_with linkcheck -%global use_glibc_langpack_en 0 +%global use_glibc_langpacks 0 %global use_perl_generators 0 %global use_perl_interpreter 0 %endif @@ -179,9 +179,13 @@ BuildRequires: bash BuildRequires: cvs BuildRequires: cvsps %endif # with cvs -%if %{use_glibc_langpack_en} +%if %{use_glibc_langpacks} +# glibc-all-langpacks and glibc-langpack-is are needed for GETTEXT_LOCALE and +# GETTEXT_ISO_LOCALE test prereq's, glibc-langpack-en ensures en_US.UTF-8. +BuildRequires: glibc-all-langpacks BuildRequires: glibc-langpack-en -%endif # use_glibc_langpack_en +BuildRequires: glibc-langpack-is +%endif # use_glibc_langpacks BuildRequires: gnupg %if 0%{?fedora} || ( 0%{?rhel} && ( 0%{?rhel} == 6 || 0%{?rhel} >= 7 && %{_arch} != ppc64 )) BuildRequires: highlight @@ -916,6 +920,7 @@ make -C contrib/credential/netrc/ testverbose %changelog * Thu Jan 31 2019 Todd Zullinger - 2.20.1-2 - Remove extraneous pcre BuildRequires +- Add additional BuildRequires for i18n locales used in tests * Thu Jan 31 2019 Fedora Release Engineering - 2.20.1-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From bb15dc829e558481ade692b9387dd64bdea749b7 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 1 Feb 2019 01:38:15 -0500 Subject: [PATCH 581/842] Replace gitweb home-link with inline sed One less patch to manage. --- git-1.8-gitweb-home-link.patch | 12 ------------ git.spec | 8 ++++++-- 2 files changed, 6 insertions(+), 14 deletions(-) delete mode 100644 git-1.8-gitweb-home-link.patch diff --git a/git-1.8-gitweb-home-link.patch b/git-1.8-gitweb-home-link.patch deleted file mode 100644 index aeb29e0..0000000 --- a/git-1.8-gitweb-home-link.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up git-1.8.4.2/gitweb/gitweb.perl.orig git-1.8.4.2/gitweb/gitweb.perl ---- git-1.8.4.2/gitweb/gitweb.perl.orig 2013-10-28 14:17:38.000000000 -0400 -+++ git-1.8.4.2/gitweb/gitweb.perl 2013-10-29 16:49:07.302747507 -0400 -@@ -83,7 +83,7 @@ our $projectroot = "++GITWEB_PROJECTROOT - our $project_maxdepth = "++GITWEB_PROJECT_MAXDEPTH++"; - - # string of the home link on top of all pages --our $home_link_str = "++GITWEB_HOME_LINK_STR++"; -+our $home_link_str = $ENV{'SERVER_NAME'} ? "git://" . $ENV{'SERVER_NAME'} : "projects"; - - # extra breadcrumbs preceding the home link - our @extra_breadcrumbs = (); diff --git a/git.spec b/git.spec index e5cbdf0..7e9395f 100644 --- a/git.spec +++ b/git.spec @@ -117,9 +117,8 @@ Source16: git.socket # Script to print test failure output (used in %%check) Source99: print-failed-test-output -Patch0: git-1.8-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 -Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch +Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch %if %{with docs} # pod2man is needed to build Git.3pm @@ -516,6 +515,10 @@ chmod +x %{__perl_requires} rm -rf perl/Git/LoadCPAN{.pm,/} grep -rlZ '^use Git::LoadCPAN::' | xargs -r0 sed -i 's/Git::LoadCPAN:://g' +# Update gitweb default home link string +sed -i 's@"++GITWEB_HOME_LINK_STR++"@$ENV{"SERVER_NAME"} ? "git://" . $ENV{"SERVER_NAME"} : "projects"@' \ + gitweb/gitweb.perl + %build %make_build all %{?with_docs:doc} @@ -921,6 +924,7 @@ make -C contrib/credential/netrc/ testverbose * Thu Jan 31 2019 Todd Zullinger - 2.20.1-2 - Remove extraneous pcre BuildRequires - Add additional BuildRequires for i18n locales used in tests +- Replace gitweb home-link with inline sed * Thu Jan 31 2019 Fedora Release Engineering - 2.20.1-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From a245ca56761340007598508ce142c79b7812dd25 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 1 Feb 2019 11:33:19 -0500 Subject: [PATCH 582/842] print-failed-test-output: minor improvements Drop the subshell used to create the string of dashes (and rename the variable to "sep" at the same time). Replace $(cat file) with the equivalent but faster $(< file). --- print-failed-test-output | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/print-failed-test-output b/print-failed-test-output index 68fa9ee..d0d63aa 100644 --- a/print-failed-test-output +++ b/print-failed-test-output @@ -3,11 +3,11 @@ shopt -s failglob # Print output from failing tests -dashes=$(printf "%80s" '' | tr ' ' '-') +printf -v sep "%0.s-" {1..80} for exit_file in t/test-results/*.exit; do - [ "$(cat "$exit_file")" -eq 0 ] && continue + [ "$(< "$exit_file")" -eq 0 ] && continue out_file="${exit_file%exit}out" - printf '\n%s\n%s\n%s\n' "$dashes" "$out_file" "$dashes" + printf '\n%s\n%s\n%s\n' "$sep" "$out_file" "$sep" cat "$out_file" done exit 1 From a74fadafe7a4ee31971f50d6588788584ed2b04b Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 2 Feb 2019 02:47:15 -0500 Subject: [PATCH 583/842] Add gnupg2-smime and perl JSON BuildRequires for tests In addition to the gnupg2-smime BR, patch an issue which prevents the gpgsm tests from running. Only include gpgsm on Fedora and RHEL > 8. On RHEL < 8 the gnupg2-smime package is too old to run the tests. --- ...uote-path-to-GNUPGHOME-trustlist.txt.patch | 39 ++++++++++++++++++ ...-drop-redundant-killing-of-gpg-agent.patch | 40 +++++++++++++++++++ git.spec | 11 +++++ 3 files changed, 90 insertions(+) create mode 100644 0001-t-lib-gpg-quote-path-to-GNUPGHOME-trustlist.txt.patch create mode 100644 0002-t-lib-gpg-drop-redundant-killing-of-gpg-agent.patch diff --git a/0001-t-lib-gpg-quote-path-to-GNUPGHOME-trustlist.txt.patch b/0001-t-lib-gpg-quote-path-to-GNUPGHOME-trustlist.txt.patch new file mode 100644 index 0000000..7a39316 --- /dev/null +++ b/0001-t-lib-gpg-quote-path-to-GNUPGHOME-trustlist.txt.patch @@ -0,0 +1,39 @@ +From 32ca60bbf5bb3020bbf24036bc61003711ace611 Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Fri, 1 Feb 2019 19:36:41 -0500 +Subject: [PATCH 1/2] t/lib-gpg: quote path to ${GNUPGHOME}/trustlist.txt + +When gpgsm is installed, lib-gpg.sh attempts to update trustlist.txt to +relax the checking of some root certificate requirements. The path to +"${GNUPGHOME}" contains spaces which cause an "ambiguous redirect" +warning when bash is used to run the tests: + + $ bash t7030-verify-tag.sh + /git/t/lib-gpg.sh: line 66: ${GNUPGHOME}/trustlist.txt: ambiguous redirect + ok 1 - create signed tags + ok 2 # skip create signed tags x509 (missing GPGSM) + ... + +No warning is issued when using bash called as /bin/sh, dash, or mksh. + +Quote the path to ensure the redirect works as intended and sets the +GPGSM prereq. While we're here, drop the space after ">>". + +Signed-off-by: Todd Zullinger +--- + t/lib-gpg.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh +index f1277bef4f..207009793b 100755 +--- a/t/lib-gpg.sh ++++ b/t/lib-gpg.sh +@@ -63,7 +63,7 @@ then + cut -d" " -f4 | + tr -d '\n' >"${GNUPGHOME}/trustlist.txt" && + +- echo " S relax" >> ${GNUPGHOME}/trustlist.txt && ++ echo " S relax" >>"${GNUPGHOME}/trustlist.txt" && + (gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) && + echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \ + -u committer@example.com -o /dev/null --sign - 2>&1 && diff --git a/0002-t-lib-gpg-drop-redundant-killing-of-gpg-agent.patch b/0002-t-lib-gpg-drop-redundant-killing-of-gpg-agent.patch new file mode 100644 index 0000000..2c1f4d1 --- /dev/null +++ b/0002-t-lib-gpg-drop-redundant-killing-of-gpg-agent.patch @@ -0,0 +1,40 @@ +From 09436d6a5b6db6ab8e80ab449b3b841883b27d19 Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Sat, 2 Feb 2019 02:31:52 -0500 +Subject: [PATCH 2/2] t/lib-gpg: drop redundant killing of gpg-agent + +In 53fc999306 ("gpg-interface t: extend the existing GPG tests with +GPGSM", 2018-07-20), the gpgconf call which kills gpg-agent was copied +from the existing gpg setup code. + +The reason for killing gpg-agent is given in 29ff1f8f74 ("t: lib-gpg: +flush gpg agent on startup", 2017-07-20): + + When running gpg-relevant tests, a gpg-daemon is spawned for each + GNUPGHOME used. This daemon may stay running after the test and cache + file descriptors for the trash directories, even after the trash + directory is removed. This leads to ENOENT errors when attempting to + create files if tests are run multiple times. + + Add a cleanup script to force flushing the gpg-agent for that GNUPGHOME + (if any) before setting up the GPG relevant-environment. + +Killing gpg-agent once per test is sufficient. + +Signed-off-by: Todd Zullinger +--- + t/lib-gpg.sh | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh +index 207009793b..8d28652b72 100755 +--- a/t/lib-gpg.sh ++++ b/t/lib-gpg.sh +@@ -64,7 +64,6 @@ then + tr -d '\n' >"${GNUPGHOME}/trustlist.txt" && + + echo " S relax" >>"${GNUPGHOME}/trustlist.txt" && +- (gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) && + echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \ + -u committer@example.com -o /dev/null --sign - 2>&1 && + test_set_prereq GPGSM diff --git a/git.spec b/git.spec index 7e9395f..1533f23 100644 --- a/git.spec +++ b/git.spec @@ -119,6 +119,12 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch +# Fix "ambiguous redirect" in t/lib-gpg.sh; it causes gpgsm tests to be skipped +# https://public-inbox.org/git/20190208031746.22683-2-tmz@pobox.com/ +Patch2: 0001-t-lib-gpg-quote-path-to-GNUPGHOME-trustlist.txt.patch +# t/lib-gpg: drop redundant killing of gpg-agent +# https://public-inbox.org/git/20190208031746.22683-3-tmz@pobox.com/ +Patch3: 0002-t-lib-gpg-drop-redundant-killing-of-gpg-agent.patch %if %{with docs} # pod2man is needed to build Git.3pm @@ -186,6 +192,9 @@ BuildRequires: glibc-langpack-en BuildRequires: glibc-langpack-is %endif # use_glibc_langpacks BuildRequires: gnupg +%if 0%{?fedora} || 0%{?rhel} > 8 +BuildRequires: gnupg2-smime +%endif # fedora or el > 8 %if 0%{?fedora} || ( 0%{?rhel} && ( 0%{?rhel} == 6 || 0%{?rhel} >= 7 && %{_arch} != ppc64 )) BuildRequires: highlight %endif # fedora, el-6, or el7-ppc64 @@ -202,6 +211,7 @@ BuildRequires: perl(DBD::SQLite) BuildRequires: perl(Digest::MD5) BuildRequires: perl(HTTP::Date) BuildRequires: perl(IO::Pty) +BuildRequires: perl(JSON) BuildRequires: perl(Mail::Address) BuildRequires: perl(Memoize) BuildRequires: perl(Test::More) @@ -925,6 +935,7 @@ make -C contrib/credential/netrc/ testverbose - Remove extraneous pcre BuildRequires - Add additional BuildRequires for i18n locales used in tests - Replace gitweb home-link with inline sed +- Add gnupg2-smime and perl JSON BuildRequires for tests * Thu Jan 31 2019 Fedora Release Engineering - 2.20.1-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From c9d5e18948621676cb46c1da59756f22dd68116e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 2 Feb 2019 02:50:36 -0500 Subject: [PATCH 584/842] Work around gpg-agent issues in the test suite MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GnuPG2 requires gpg-agent and tries to start it on demand. The agent uses a socket for communication and the path to this socket must be shorter than sun_path [108 characters, per unix(7)]. Adjust the location of the temporary directories used by the test suite by passing the --root option via GIT_TEST_OPTS. One potential downside to this is that we use mktemp to create the directory and this will differ between builds. If/when we want to make our builds entirely reproducible we will need to revisit this. With luck, gnupg will be better behaved by that time¹. An alternate solution I tested was to rename the two problematic tests (t5573 and t7612). This is a brittle solution as new tests may be added which cause the same path length issue for gpg-agent. Also drop the redundant killing of gpg-agent. This doesn't break anything but it can only slow the test suite (however slightly). ¹ A ticket was filed to improve gpg-agent's handling of long paths in GNUPGHOME (but it's nearly 2 years old): https://dev.gnupg.org/T2964. --- git.spec | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/git.spec b/git.spec index 1533f23..4f3fee4 100644 --- a/git.spec +++ b/git.spec @@ -778,6 +778,14 @@ export GIT_TEST_GIT_DAEMON=true export GIT_TEST_HTTPD=true export GIT_TEST_SVNSERVE=true +# Create tmpdir for test output and update GIT_TEST_OPTS +# Also update GIT-BUILD-OPTIONS to keep make from any needless rebuilding +testdir=$(mktemp -d -p /tmp git-t.XXXX) +sed -i "s@^GIT_TEST_OPTS = .*@& --root=$testdir@" config.mak +touch -r GIT-BUILD-OPTIONS ts +sed -i "s@\(GIT_TEST_OPTS='.*\)'@\1 --root=$testdir'@" GIT-BUILD-OPTIONS +touch -r ts GIT-BUILD-OPTIONS + # Run the tests make test || ./print-failed-test-output @@ -787,6 +795,9 @@ mv netrc contrib/credential/ make -C contrib/credential/netrc/ test || \ make -C contrib/credential/netrc/ testverbose +# Clean up test dir +rmdir --ignore-fail-on-non-empty "$testdir" + %if %{use_systemd} %post daemon %systemd_post git@.service @@ -936,6 +947,7 @@ make -C contrib/credential/netrc/ testverbose - Add additional BuildRequires for i18n locales used in tests - Replace gitweb home-link with inline sed - Add gnupg2-smime and perl JSON BuildRequires for tests +- Work around gpg-agent issues in the test suite * Thu Jan 31 2019 Fedora Release Engineering - 2.20.1-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 37cec08b20edb6d226c453864ae7378bcb7c7a17 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 2 Feb 2019 03:05:20 -0500 Subject: [PATCH 585/842] Print config.mak to aid confirmation/verification of settings Having the output of the config.mak file in the build output is very convenient, particularly when building in koji or copr where it is not possible to directly access the buildroot. --- git.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git.spec b/git.spec index 4f3fee4..8ccf240 100644 --- a/git.spec +++ b/git.spec @@ -501,6 +501,9 @@ GIT_TEST_OPTS = -x --verbose-log TEST_SHELL_PATH = /bin/bash EOF +# Print config.mak to aid confirmation/verification of settings +cat config.mak + # Filter bogus perl requires # packed-refs comes from a comment in contrib/hooks/update-paranoid %if %{use_new_rpm_filters} From fcdcff43cd868f093823272adcac235e89aca9aa Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 2 Feb 2019 13:59:01 -0500 Subject: [PATCH 586/842] Drop gnupg BuildRequires on fedora >= 30 Now that Fedora 30 defaults to gnupg2 as /bin/gpg we don't need to install gnupg for the test suite. We already require gnupg2 to verify the source files. --- git.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git.spec b/git.spec index 8ccf240..8b23340 100644 --- a/git.spec +++ b/git.spec @@ -191,7 +191,9 @@ BuildRequires: glibc-all-langpacks BuildRequires: glibc-langpack-en BuildRequires: glibc-langpack-is %endif # use_glibc_langpacks +%if 0%{?fedora} && 0%{?fedora} < 30 BuildRequires: gnupg +%endif # fedora < 30 %if 0%{?fedora} || 0%{?rhel} > 8 BuildRequires: gnupg2-smime %endif # fedora or el > 8 @@ -951,6 +953,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" - Replace gitweb home-link with inline sed - Add gnupg2-smime and perl JSON BuildRequires for tests - Work around gpg-agent issues in the test suite +- Drop gnupg BuildRequires on fedora >= 30 * Thu Jan 31 2019 Fedora Release Engineering - 2.20.1-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From fa926617fe74bc344fa04a51f19d76c3023c260f Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 2 Feb 2019 14:20:27 -0500 Subject: [PATCH 587/842] Add grep patterns for checking skipped tests It is useful to check the output of the test suite for skipped tests. This reveals tests which may have missing BuildRequires or other issues. Doing so can be tedious due to the many legitimate tests we skip. Keep a list of patterns matching tests we skip intentionally. To use this list to process a build.log, run something like the following: $ egrep '# SKIP|skipped:' build.log | egrep -v -f git.skip-test-patterns There should be no output. Any output should be checked and the tests fixed or added to the skip patterns file. --- git.skip-test-patterns | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 git.skip-test-patterns diff --git a/git.skip-test-patterns b/git.skip-test-patterns new file mode 100644 index 0000000..429977f --- /dev/null +++ b/git.skip-test-patterns @@ -0,0 +1,21 @@ +filesystem does not corrupt utf-8 +GIT_SKIP_TESTS +missing AUTOIDENT +missing CASE_INSENSITIVE_FS +missing CLONE_2GB +missing DONTHAVEIT +missing EXPENSIVE +missing !?LAZY_(TRUE|FALSE) +missing MINGW +missing NATIVE_CRLF +missing !PCRE +missing !PTHREADS +missing RFC1991 +missing TAR_NEEDS_PAX_FALLBACK +skipping case insensitive tests +skipping git p4 tests +skipping remote-svn tests, python not available +skipping svn-info test +skipping Windows-(only path|specific) tests +Test requiring writable / skipped +used to test external credential helpers From 10da1716085adcf4ea4c9623f9b295502d850aac Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 5 Feb 2019 20:22:20 -0500 Subject: [PATCH 588/842] Fix formatting of contrib/{contacts,subtree} docs The Makefiles for contrib/{contacts,subtree} don't include various asciidoc, docbook, and xmlto options which are added to docs built from the Documentation dir. Without these options the man page generated for git-contacts has formatting issues. Move the contrib/{contacts,subtree} docs to the Documentation dir to be built along with the other doc files. --- git.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index 8b23340..273cceb 100644 --- a/git.spec +++ b/git.spec @@ -534,10 +534,14 @@ grep -rlZ '^use Git::LoadCPAN::' | xargs -r0 sed -i 's/Git::LoadCPAN:://g' sed -i 's@"++GITWEB_HOME_LINK_STR++"@$ENV{"SERVER_NAME"} ? "git://" . $ENV{"SERVER_NAME"} : "projects"@' \ gitweb/gitweb.perl +# Move contrib/{contacts,subtree} docs to Documentation so they build with the +# proper asciidoc/docbook/xmlto options +mv contrib/{contacts,subtree}/git-*.txt Documentation/ + %build %make_build all %{?with_docs:doc} -%make_build -C contrib/contacts/ all %{?with_docs:doc} +%make_build -C contrib/contacts/ all %if %{libsecret} %make_build -C contrib/credential/libsecret/ @@ -545,7 +549,7 @@ sed -i 's@"++GITWEB_HOME_LINK_STR++"@$ENV{"SERVER_NAME"} ? "git://" . $ENV{"SERV %make_build -C contrib/diff-highlight/ -%make_build -C contrib/subtree/ all %{?with_docs:doc} +%make_build -C contrib/subtree/ all # Fix shebang in a few places to silence rpmlint complaints %if %{with python2} @@ -574,7 +578,7 @@ sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \ %install %make_install %{?with_docs:install-doc} -%make_install -C contrib/contacts %{?with_docs:install-doc} +%make_install -C contrib/contacts %global elispdir %{_emacs_sitelispdir}/git pushd contrib/emacs >/dev/null @@ -596,7 +600,7 @@ install -pm 755 contrib/credential/netrc/git-credential-netrc \ # deleted in the docs preparation, so the tests can be run in %%check mv contrib/credential/netrc . -%make_install -C contrib/subtree %{?with_docs:install-doc} +%make_install -C contrib/subtree mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d install -pm 0644 %{SOURCE13} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{gitweb_httpd_conf} @@ -609,9 +613,7 @@ install -Dpm 0755 contrib/diff-highlight/diff-highlight \ rm -rf contrib/diff-highlight/{Makefile,diff-highlight,*.perl,t} # Clean up contrib/subtree to avoid cruft in the git-core-doc docdir -# Move git-subtree.txt to Documentation so it can be installed later in docdir -mv contrib/subtree/git-subtree.txt Documentation/ -rm -rf contrib/subtree/{INSTALL,Makefile,git-subtree{,.{1,html,sh,txt,xml}},t} +rm -rf contrib/subtree/{INSTALL,Makefile,git-subtree*,t} # git-archimport is not supported find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' @@ -954,6 +956,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" - Add gnupg2-smime and perl JSON BuildRequires for tests - Work around gpg-agent issues in the test suite - Drop gnupg BuildRequires on fedora >= 30 +- Fix formatting of contrib/{contacts,subtree} docs * Thu Jan 31 2019 Fedora Release Engineering - 2.20.1-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 95fc1fa70e0f38fb3ef9c1610a388157582c5ad2 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 6 Feb 2019 21:04:09 -0500 Subject: [PATCH 589/842] Use build_cflags/build_ldflags instead of optflags/__global_ldflags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The build_cflags and build_ldflags macros replace the deprecated optflags and __global_ldflags macros, per buildflags.md in redhat-rpm-config¹. Note: EPEL provides these macros for compatibility. ¹ https://src.fedoraproject.org/rpms/redhat-rpm-config/blob/master/f/buildflags.md --- git.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 273cceb..eac8ea8 100644 --- a/git.spec +++ b/git.spec @@ -79,8 +79,8 @@ # Hardening flags for EL-6 %if 0%{?rhel} == 6 -%global optflags %{optflags} -fPIC -pie -%global __global_ldflags -Wl,-z,relro -Wl,-z,now +%global build_cflags %{build_cflags} -fPIC -pie +%global build_ldflags -Wl,-z,relro -Wl,-z,now %endif # Define for release candidates @@ -477,8 +477,8 @@ sed -i '/^git-p4/d' command-list.txt # Otherwise it will rebuild in %%install due to flags changes. cat << \EOF > config.mak V = 1 -CFLAGS = %{optflags} -LDFLAGS = %{__global_ldflags} +CFLAGS = %{build_cflags} +LDFLAGS = %{build_ldflags} NEEDS_CRYPTO_WITH_SSL = 1 USE_LIBPCRE = 1 ETC_GITCONFIG = %{_sysconfdir}/gitconfig @@ -957,6 +957,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" - Work around gpg-agent issues in the test suite - Drop gnupg BuildRequires on fedora >= 30 - Fix formatting of contrib/{contacts,subtree} docs +- Use %%{build_cflags} and %%{build_ldflags} * Thu Jan 31 2019 Fedora Release Engineering - 2.20.1-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From a643ff944ce6b674c16ea25ecbcb97087fa4ae21 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 6 Feb 2019 21:47:17 -0500 Subject: [PATCH 590/842] Drop unneeded TEST_SHELL_PATH make variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TEST_SHELL_PATH was added in 62f562d ("Use 'prove' as test harness, enable shell tracing", 2018-01-18). Shortly afterward, upstream commit a5bf824f3b ("t: prevent '-x' tracing from interfering with test helpers' stderr", 2018-02-25)¹ removed the need to use bash to get the benefits of running the test suite with '-x' tracing. ¹ https://github.com/git/git/commit/a5bf824f3b --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index eac8ea8..2695912 100644 --- a/git.spec +++ b/git.spec @@ -500,7 +500,6 @@ gitwebdir = %{_localstatedir}/www/git DEFAULT_TEST_TARGET = prove GIT_PROVE_OPTS = --verbose --normalize %{?_smp_mflags} GIT_TEST_OPTS = -x --verbose-log -TEST_SHELL_PATH = /bin/bash EOF # Print config.mak to aid confirmation/verification of settings @@ -958,6 +957,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" - Drop gnupg BuildRequires on fedora >= 30 - Fix formatting of contrib/{contacts,subtree} docs - Use %%{build_cflags} and %%{build_ldflags} +- Drop unneeded TEST_SHELL_PATH make variable * Thu Jan 31 2019 Fedora Release Engineering - 2.20.1-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 74154edcfe4637f16694ff58b48030b27d248bfe Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 7 Feb 2019 03:13:04 -0500 Subject: [PATCH 591/842] Update to 2.21.0.rc0 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.21.0.txt --- git.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index 2695912..1474136 100644 --- a/git.spec +++ b/git.spec @@ -84,11 +84,11 @@ %endif # Define for release candidates -#global rcrev .rc0 +%global rcrev .rc0 Name: git -Version: 2.20.1 -Release: 2%{?rcrev}%{?dist} +Version: 2.21.0 +Release: 0.0%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -948,6 +948,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Feb 07 2019 Todd Zullinger - 2.21.0-0.0.rc0 +- Update to 2.21.0.rc0 + * Thu Jan 31 2019 Todd Zullinger - 2.20.1-2 - Remove extraneous pcre BuildRequires - Add additional BuildRequires for i18n locales used in tests diff --git a/sources b/sources index 84fce47..62cebde 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.20.1.tar.xz) = 3f05ea3a645d4d74c7380b03e2de39f893ff77a05d8b595ce30300d1d4e032f11d84952366096f8effd5fba18dfa5ebb946bc07a984eb7cbbda113cb88202f6c -SHA512 (git-2.20.1.tar.sign) = 2b6f7b757ea1c35dcbb67a5a7cf97e83e6e9806f81453295699c703214bdd061e5bcc1113615927e32359dd205d6181f4899aba41b95586676e62f41262987c4 +SHA512 (git-2.21.0.rc0.tar.xz) = 8edd38460737b2a49dd6b27d211a4775f1b77df7bb502142341a96a25db05f5e9ec7f9788203414b2c275b0664cefefc7b9e3d4925fb3ed9acce02c4918b340a +SHA512 (git-2.21.0.rc0.tar.sign) = 99e7092367092a4cce08b771cfe658eb768af7b2ad1f9ad6179467bf9612b25dbf02117f7c56b75517e97e40234113ead8fb22820f0e909dd55eb6fb391af8af From aefb4197758fe336b15aa1b4c01d699065907418 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 11 Feb 2019 23:07:37 -0500 Subject: [PATCH 592/842] Remove %changelog entries prior to 2017 The git history serves as the repository for the old entries. The changelog was roughly 40% of the total lines in the spec file. --- git.spec | 1037 +----------------------------------------------------- 1 file changed, 1 insertion(+), 1036 deletions(-) diff --git a/git.spec b/git.spec index 1474136..24c1fb1 100644 --- a/git.spec +++ b/git.spec @@ -950,6 +950,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Thu Feb 07 2019 Todd Zullinger - 2.21.0-0.0.rc0 - Update to 2.21.0.rc0 +- Remove %%changelog entries prior to 2017 * Thu Jan 31 2019 Todd Zullinger - 2.20.1-2 - Remove extraneous pcre BuildRequires @@ -1314,1039 +1315,3 @@ rmdir --ignore-fail-on-non-empty "$testdir" * Fri Feb 03 2017 Jon Ciesla - 2.11.1-1 - Update to 2.11.1 - -* Wed Nov 30 2016 Jon Ciesla - 2.11.0-1 -- Update to 2.11.0 - -* Mon Oct 31 2016 Jon Ciesla - 2.10.2-1 -- Update to 2.10.2 - -* Tue Oct 04 2016 Jon Ciesla - 2.10.1-1 -- Update to 2.10.1 - -* Sat Sep 03 2016 Todd Zullinger - 2.10.0-1 -- Update to 2.10.0 - -* Mon Aug 15 2016 Jon Ciesla - 2.9.3-1 -- Update to 2.9.3. - -* Fri Jul 15 2016 Jon Ciesla - 2.9.2-1 -- Update to 2.9.2. - -* Tue Jul 12 2016 Jon Ciesla - 2.9.1-1 -- Update to 2.9.1. - -* Tue Jun 14 2016 Jon Ciesla - 2.9.0-1 -- Update to 2.9.0. - -* Wed Jun 08 2016 Jon Ciesla - 2.8.4-1 -- Update to 2.8.4. - -* Fri May 20 2016 Jitka Plesnikova - 2.8.3-2 -- Perl 5.24 rebuild - -* Thu May 19 2016 Todd Zullinger - 2.8.3-1 -- Update to 2.8.3 - -* Thu May 19 2016 Jitka Plesnikova - 2.8.2-5 -- Perl 5.24 re-rebuild of bootstrapped packages - -* Wed May 18 2016 Todd Zullinger - 2.8.2-4 -- Use perl(MOD::NAME) format for perl-DBD-SQLite and perl-Digest-MD5 deps -- Define __global_ldflags on EL < 7 (#1337137) - -* Wed May 18 2016 Jitka Plesnikova - 2.8.2-3 -- Perl 5.24 re-rebuild of bootstrapped packages - -* Sun May 15 2016 Jitka Plesnikova - 2.8.2-2 -- Perl 5.24 rebuild - -* Fri Apr 29 2016 Todd Zullinger - 2.8.2-1 -- Update to 2.8.2 - -* Mon Apr 11 2016 Todd Zullinger - 2.8.1-3 -- Set LDFLAGS for hardened builds (#1289728) - -* Wed Apr 06 2016 Paolo Bonzini - 2.8.1-2 -- Install git-credentials-netrc (#1303358) - -* Tue Apr 05 2016 Jon Ciesla - 2.8.1-1 -- Update to 2.8.1. - -* Tue Mar 29 2016 Neal Gompa - 2.8.0-1 -- Update to 2.8.0 -- Use license macro for COPYING - -* Sun Mar 27 2016 Todd Zullinger - 2.7.4-2 -- Use https for URL / Source and smaller tar.xz files -- Check upstream GPG signatures in %%prep - -* Tue Mar 22 2016 Konrad Scherer -- Workaround missing git subtree documentation in prebuilt docs (bug 1320210) -- Only add git-cvsserver binary once if the core dir matches the bin dir as it - does on el5 (bug 1320210) - -* Tue Mar 22 2016 Todd Zullinger -- Conditionalize bash-completion pkg-config usage for EL <= 6 (bug 1320210) - -* Fri Mar 18 2016 David Woodhouse - 2.7.4-1 -- Update to 2.7.4 (for CVE-2016-2315, CVE-2016-2324) - Resolves: #1318220 - -* Mon Mar 14 2016 Jon Ciesla - 2.7.3-1 -- Update to 2.7.3. - -* Tue Feb 23 2016 Jon Ciesla - 2.7.2-1 -- Update to 2.7.2. - -* Sat Feb 06 2016 Jon Ciesla - 2.7.1-1 -- Update to 2.7.1. - -* Thu Feb 04 2016 Petr Stodulka - 2.7.0-3 -- remove all '.gitignore' files from packages - -* Wed Feb 03 2016 Fedora Release Engineering - 2.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jan 05 2016 Jon Ciesla - 2.7.0-1 -- Update to 2.7.0. -- Infinite loop patch appears obsolete. - -* Wed Dec 09 2015 Jon Ciesla - 2.6.4-1 -- Update to 2.6.4. - -* Fri Nov 27 2015 Petr Stodulka - 2.6.3-2 -- found 2 perl scripts in git-core, move them to git package - (#1284688) - -* Fri Nov 06 2015 Jon Ciesla - 2.6.3-1 -- Update to 2.6.3. - -* Tue Nov 03 2015 Petr Stodulka - 2.6.2-2 -- provides failback for the macro _pkgdocdir (#1277550) - -* Sat Oct 17 2015 Jon Ciesla - 2.6.2-1 -- Update to 2.6.2. - -* Tue Oct 06 2015 Jon Ciesla - 2.6.1-1 -- Update to 2.6.1. - -* Tue Sep 29 2015 Jon Ciesla - 2.6.0-1 -- Update to 2.6.0. - -* Fri Sep 18 2015 Jon Ciesla - 2.5.3-1 -- Update to 2.5.3. - -* Fri Sep 11 2015 Jon Ciesla - 2.5.2-1 -- Update to 2.5.2. - -* Sat Aug 29 2015 Petr Stodulka - 2.5.1-1 -- Update to 2.5.1 - -* Tue Jul 28 2015 Jon Ciesla - 2.5.0-1 -- Update to 2.5.0. - -* Thu Jul 16 2015 Petr Stodulka - 2.4.6-1 -- New upstream release 2.4.6 - -* Tue Jul 7 2015 Jonathan Underwood - 2.4.5-2 -- Comply with modern Emacs packaging guidelines on recent Fedora - No longer split out emacs-git and emacs-git-el sub-packages on recent Fedora - Require emacs-filesystem on recent Fedora (#1234552) - -* Fri Jun 26 2015 Jon Ciesla - 2.4.5-1 -- Update to 2.4.5. - -* Mon Jun 22 2015 Petr Stodulka - 2.4.4-2 -- git-svn - added requires for perl-Digest-MD5 (#1218176) -- solve troubles with infinite loop due to broken symlink (probably - shouldn't be problem here, but it's reproducible manually) - (#1204193) - -* Tue Jun 16 2015 Jon Ciesla - 2.4.4-1 -- Update to 2.4.4. - -* Wed Jun 10 2015 Jitka Plesnikova - 2.4.3-4 -- Perl 5.22 re-rebuild of bootstrapped packages - -* Tue Jun 09 2015 Jitka Plesnikova - 2.4.3-3 -- Perl 5.22 rebuild - -* Mon Jun 08 2015 Petr Stodulka - 2.4.3-2 -- separate documentation files from git-core package to git-core-doc - including core man pages - -* Sat Jun 06 2015 Jon Ciesla - 2.4.3-1 -- Update to 2.4.3. - -* Fri Jun 05 2015 Jitka Plesnikova -- Perl 5.22 rebuild - -* Wed Jun 03 2015 Petr Stodulka - 2.4.2-2 -- split create subpackage git-core (perl-less) from git package -- git package requires git-core and it has same tool set as - before -- relevant docs are part of git-core package too -- removed proved and obsoletes in git for git-core - -* Tue May 26 2015 Jon Ciesla - 2.4.2-1 -- Update to 2.4.2. - -* Thu May 14 2015 Jon Ciesla - 2.4.1-1 -- Update to 2.4.1. - -* Fri May 01 2015 Jon Ciesla - 2.4.0-1 -- Update to 2.4.0. - -* Tue Apr 28 2015 Jon Ciesla - 2.3.7-1 -- Update to 2.3.7. - -* Wed Apr 22 2015 Jon Ciesla - 2.3.6-1 -- Update to 2.3.6. - -* Mon Apr 06 2015 Jon Ciesla - 2.3.5-1 -- Update to 2.3.5. - -* Tue Mar 24 2015 Petr Stodulka - 2.3.4-1 -- Update to 2.3.4. - -* Mon Mar 16 2015 Jon Ciesla - 2.3.3-1 -- Update to 2.3.3. - -* Mon Mar 09 2015 Jon Ciesla - 2.3.2-1 -- Update to 2.3.2. - -* Fri Feb 27 2015 Jon Ciesla - 2.3.1-1 -- Update to 2.3.1. - -* Sat Feb 21 2015 Till Maas - 2.3.0-2 -- Rebuilt for Fedora 23 Change - https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code - -* Fri Feb 06 2015 Jon Ciesla - 2.3.0-1 -- Update to 2.3.0. - -* Tue Jan 27 2015 Ville Skyttä - 2.2.2-2 -- Install bash completion to %%{_datadir}/bash-completion/completions - -* Fri Jan 23 2015 Jon Ciesla - 2.2.2-1 -- Update to 2.2.2. - -* Thu Jan 08 2015 Jon Ciesla - 2.2.1-1 -- Update to 2.2.1. - -* Thu Dec 11 2014 Petr Stodulka - 2.2.0-3 -- removed subpackage git-hg which is replaced by git-remote-hg from - separated package - -* Fri Nov 28 2014 Petr Stodulka - 2.2.0-2 -- removed subpackage git-bzr which is replaced by git-remote-bzr from - separated package - -* Fri Nov 28 2014 Petr Stodulka - 2.2.0-1 -- 2.2.0 - -* Fri Oct 24 2014 Pierre-Yves Chibon - 2.1.0-5 -- Rename the git.service into git@.service fixing - https://bugzilla.redhat.com/980574 - -* Mon Sep 08 2014 Jitka Plesnikova - 2.1.0-4 -- Perl 5.20 re-rebuild of bootstrapped packages - -* Thu Aug 28 2014 Jitka Plesnikova - 2.1.0-3 -- Perl 5.20 rebuild - -* Tue Aug 26 2014 Jitka Plesnikova - 2.1.0-2 -- Disable requires perl(Term::ReadKey) when perl bootstraping - -* Mon Aug 18 2014 Ondrej Oprala - 2.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Thu Jul 31 2014 Ondrej Oprala - 2.0.0-4 -- Change source URLs, as googlecode doesn't have up-to-date tarballs - -* Tue Jun 10 2014 Ondrej Oprala - 2.0.0-3 -- Conditionalize an ancient obsolete - -* Sat Jun 07 2014 Fedora Release Engineering - 2.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 29 2014 Ondrej Oprala - 2.0.0-1 -- Update to 2.0.0 - -* Mon May 19 2014 Jon Ciesla - 1.9.3-1 -- Update to 1.9.3 - -* Mon Feb 17 2014 Ondrej Oprala - 1.9.0-1 -- Update to 1.9.0 - -* Thu Jan 16 2014 Todd Zullinger - 1.8.5.3-2 -- Drop unused python DESTIR patch -- Consolidate settings for Fedora 19+ and EL 7+ -- Use new rpm filtering on Fedora 19+ and EL 7+ -- Rebuild with file-5.14-14 (#1026760) - -* Thu Jan 16 2014 Ondrej Oprala - 1.8.5.3-1 -* Update to 1.8.5.3 - -* Wed Dec 18 2013 Ondrej Oprala - 1.8.5.2-1 -* Update to 1.8.5.2 - -* Wed Nov 13 2013 Ville Skyttä - 1.8.4.2-2 -- Fix htmldir when doc dir is unversioned (#993779). - -* Tue Oct 29 2013 Todd Zullinger - 1.8.4.2-1 -- Update to 1.8.4.2 (#1024497) - -* Sat Oct 05 2013 Todd Zullinger -- Add mercurial version requirement to git-hg, for those rebuilding on EL - -* Sat Aug 03 2013 Fedora Release Engineering - 1.8.3.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Jul 15 2013 Petr Pisar - 1.8.3.1-2 -- Perl 5.18 rebuild - -* Fri Jun 14 2013 Todd Zullinger - 1.8.3.1-1 -- Update to 1.8.3.1 -- Add bzr and hg subpackages, thanks to Michael Scherer (#974800) - -* Mon May 13 2013 Jon Ciesla - 1.8.2.1-4 -- Fix typo introduced in 1.8.2-3, fixed desktop tag. - -* Wed May 1 2013 Tom Callaway - 1.8.2.1-3 -- conditionalize systemd vs xinetd -- cleanup systemd handling (it was not quite right in -2) - -* Tue Apr 30 2013 Tom Callaway - 1.8.2.1-2 -- switch to systemd instead of xinetd (bz 737183) - -* Sun Apr 14 2013 Todd Zullinger - 1.8.2.1-1 -- Update to 1.8.2.1 -- Exclude optional perl(YAML::Any) dependency on EL-5 - -* Wed Apr 10 2013 Jon Ciesla - 1.8.2-3 -- Drop desktop vendor tag for >= f19. - -* Wed Mar 27 2013 Todd Zullinger - 1.8.2-2 -- Require perl(Term::ReadKey) for git add --interactive (#928328) -- Drop DESTDIR from python instlibdir -- Fix bogus changelog dates - -* Tue Mar 19 2013 Adam Tkac - 1.8.2-1 -- update to 1.8.2 -- 0001-DESTDIR-support-in-contrib-subtree-Makefile.patch has been merged - -* Tue Feb 26 2013 Todd Zullinger - 1.8.1.4-2 -- Update asciidoc requirements, drop unsupported ASCIIDOC7 -- Define GNU_ROFF to force ASCII apostrophes in manpages (so copy/paste works) -- Install tcsh completion (requires manual setup by users) -- Clean up dist conditionals, don't pretend to support EL-4 builds -- Use prebuilt documentation on EL-5, where asciidoc is too old -- Respect gitexecdir variable in git-subtree install - -* Wed Feb 20 2013 Adam Tkac - 1.8.1.4-1 -- update to 1.8.1.4 - -* Wed Jan 30 2013 Adam Tkac - 1.8.1.2-1 -- update to 1.8.1.2 -- own directories which should be owned (#902517) - -* Thu Jan 03 2013 Adam Tkac - 1.8.1-1 -- update to 1.8.1 -- build git-svn as arch subpkg due to new git-remote-testsvn binary - -* Tue Dec 11 2012 Adam Tkac - 1.8.0.2-1 -- update to 1.8.0.2 - -* Thu Dec 06 2012 Adam Tkac - 1.8.0.1-2 -- don't install some unneeded credential-gnome-keyring stuff - -* Thu Nov 29 2012 Adam Tkac - 1.8.0.1-1 -- update to 1.8.0.1 -- include git-subtree in git rpm (#864651) - -* Mon Oct 29 2012 Adam Tkac - 1.8.0-1 -- update to 1.8.0 -- include git-credential-gnome-keyring helper in git pkg -- 0001-cvsimport-strip-all-inappropriate-tag-strings.patch was merged - -* Thu Oct 25 2012 Adam Tkac - 1.7.12.1-2 -- move git-prompt.sh into usr/share/git-core/contrib/completion (#854061) - -* Thu Sep 27 2012 Adam Tkac - 1.7.12.1-1 -- update to 1.7.12.1 -- cvsimport should skip more characters (#850640) - -* Thu Aug 23 2012 Todd Zullinger - 1.7.12-2 -- Install git-prompt.sh which provides __git_ps1() - -* Wed Aug 22 2012 Adam Tkac - 1.7.12-1 -- update to 1.7.12 - -* Wed Aug 15 2012 Todd Zullinger - 1.7.11.5-1 -- Update to 1.7.11.5 -- Add git-p4 subpackage (#844008) - -* Tue Aug 07 2012 Adam Tkac - 1.7.11.4-1 -- update to 1.7.11.4 - -* Fri Jul 27 2012 Fedora Release Engineering - 1.7.11.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed Jul 25 2012 Todd Zullinger - 1.7.11.2-2 -- Split perl(Git::SVN) into its own package (#843182) - -* Mon Jul 16 2012 Adam Tkac - 1.7.11.2-1 -- update to 1.7.11.2 - -* Thu Jun 28 2012 Petr Pisar - 1.7.10.4-2 -- Perl 5.16 rebuild - -* Fri Jun 15 2012 Adam Tkac - 1.7.10.4-1 -- update to 1.7.10.4 - -* Thu Jun 07 2012 Petr Pisar - 1.7.10.2-2 -- Perl 5.16 rebuild - -* Mon May 14 2012 Adam Tkac - 1.7.10.2-1 -- update to 1.7.10.2 - -* Thu May 03 2012 Adam Tkac - 1.7.10.1-1 -- update to 1.7.10.1 - -* Tue Apr 10 2012 Adam Tkac - 1.7.10-1 -- update to 1.7.10 - -* Fri Mar 30 2012 Adam Tkac - 1.7.9.5-1 -- update to 1.7.9.5 - -* Thu Mar 08 2012 Adam Tkac - 1.7.9.3-1 -- update to 1.7.9.3 - -* Wed Feb 15 2012 Todd Zullinger - 1.7.9.1-1 -- Update to 1.7.9.1 -- Fix EPEL builds (rpm doesn't accept multiple -f options in %%files) - -* Fri Feb 10 2012 Petr Pisar - 1.7.9-2 -- Rebuild against PCRE 8.30 - -* Mon Jan 30 2012 Adam Tkac - 1.7.9-1 -- update to 1.7.9 - -* Thu Jan 19 2012 Adam Tkac - 1.7.8.4-1 -- update to 1.7.8.4 - -* Thu Jan 12 2012 Adam Tkac - 1.7.8.3-1 -- update to 1.7.8.3 - -* Mon Jan 02 2012 Adam Tkac - 1.7.8.2-1 -- update to 1.7.8.2 - -* Fri Dec 23 2011 Adam Tkac - 1.7.8.1-1 -- update to 1.7.8.1 - -* Wed Dec 07 2011 Adam Tkac - 1.7.8-1 -- update to 1.7.8 - -* Tue Nov 29 2011 Adam Tkac - 1.7.7.4-1 -- update to 1.7.7.4 - -* Thu Nov 10 2011 Adam Tkac - 1.7.7.3-1 -- update to 1.7.7.3 - -* Mon Nov 07 2011 Adam Tkac - 1.7.7.2-1 -- update to 1.7.7.2 - -* Tue Nov 01 2011 Adam Tkac - 1.7.7.1-1 -- update to 1.7.7.1 - -* Wed Oct 26 2011 Fedora Release Engineering - 1.7.7-2 -- Rebuilt for glibc bug#747377 - -* Thu Oct 20 2011 Adam Tkac - 1.7.7-1 -- update to 1.7.7 - - git-1.6-update-contrib-hooks-path.patch is no longer needed - -* Mon Sep 26 2011 Adam Tkac - 1.7.6.4-1 -- update to 1.7.6.4 - -* Wed Sep 07 2011 Todd Zullinger - 1.7.6.2-1 -- Update to 1.7.6.2 -- Fixes incompatibility caused by git push --quiet fix - http://thread.gmane.org/gmane.comp.version-control.git/180652 - -* Mon Aug 29 2011 Todd Zullinger - 1.7.6.1-2 -- Build with PCRE support (#734269) - -* Fri Aug 26 2011 Todd Zullinger - 1.7.6.1-1 -- Update to 1.7.6.1 -- Include gpg signature for tarball in SRPM - -* Fri Aug 05 2011 Todd Zullinger - 1.7.6-5 -- Fix git push --quiet, thanks to Clemens Buchacher (#725593) -- Obsolete git-arch as needed - -* Tue Jul 26 2011 Todd Zullinger - 1.7.6-4 -- Drop git-arch on fedora >= 16, the tla package has been retired -- Rework most spec file dist conditionals to make future changes easier - -* Thu Jul 21 2011 Petr Sabata - 1.7.6-3 -- Perl mass rebuild - -* Wed Jul 20 2011 Petr Sabata - 1.7.6-2 -- Perl mass rebuild - -* Wed Jun 29 2011 Adam Tkac - 1.7.6-1 -- update to 1.7.6 - -* Mon Jun 20 2011 Marcela Mašláňová - 1.7.5.4-2 -- Perl mass rebuild - -* Thu Jun 09 2011 Adam Tkac - 1.7.5.4-1 -- update to 1.7.5.4 - -* Tue May 24 2011 Adam Tkac - 1.7.5.2-1 -- update to 1.7.5.2 - -* Thu May 05 2011 Adam Tkac - 1.7.5.1-1 -- update to 1.7.5.1 - -* Wed Apr 27 2011 Adam Tkac - 1.7.5-1 -- update to 1.7.5 - -* Mon Apr 11 2011 Adam Tkac - 1.7.4.4-1 -- update to 1.7.4.4 - -* Mon Mar 28 2011 Adam Tkac - 1.7.4.2-1 -- update to 1.7.4.2 -- move man3/Git.3pm file to perl-Git subpkg (#664889) -- add perl-DBD-SQLite dependency to git-cvs (#602410) - -* Sun Feb 13 2011 Todd Zullinger - 1.7.4.1-1 -- Update to 1.7.4.1 -- Clean up documentation settings (the defaults changed in 1.7.4) -- Improve EL-5 compatibility, thanks to Kevin Fenzi for emacs testing - -* Tue Feb 08 2011 Fedora Release Engineering - 1.7.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jan 31 2011 Adam Tkac - 1.7.4-1 -- update to 1.7.4 - -* Wed Jan 19 2011 Adam Tkac - 1.7.3.5-1 -- update to 1.7.3.5 - -* Thu Dec 16 2010 Adam Tkac - 1.7.3.4-1 -- update to 1.7.3.4 - -* Mon Dec 06 2010 Adam Tkac - 1.7.3.3-1 -- update to 1.7.3.3 - -* Fri Oct 22 2010 Adam Tkac - 1.7.3.2-1 -- update to 1.7.3.2 - -* Thu Sep 30 2010 Adam Tkac - 1.7.3.1-1 -- update to 1.7.3.1 - -* Wed Sep 29 2010 jkeating - 1.7.3-3 -- Rebuilt for gcc bug 634757 - -* Mon Sep 20 2010 Todd Zullinger - 1.7.3-2 -- Ensure the release notes are included in %%doc - -* Sun Sep 19 2010 Todd Zullinger - 1.7.3-1 -- Update to 1.7.3 - -* Tue Sep 07 2010 Adam Tkac - 1.7.2.3-1 -- update to 1.7.2.3 - -* Fri Aug 20 2010 Adam Tkac - 1.7.2.2-1 -- update to 1.7.2.2 - -* Fri Jul 30 2010 Thomas Spura - 1.7.2.1-2 -- cherry-pick: "Do not unquote + into ' ' in URLs" - -* Thu Jul 29 2010 Todd Zullinger - 1.7.2.1-1 -- Update to git-1.7.2.1 - -* Thu Jul 22 2010 Adam Tkac - 1.7.2-1 -- update to 1.7.2 - -* Fri Jul 02 2010 Adam Tkac - 1.7.1.1-1 -- update to 1.7.1.1 - -* Fri Jun 25 2010 Adam Tkac - 1.7.1-2 -- rebuild against new perl - -* Tue May 04 2010 Todd Zullinger - 1.7.1-1 -- git-1.7.1 -- Fix conditionals for EL-6 -- Comply with Emacs add-on packaging guidelines (#573423), Jonathan Underwood - - Place elisp source files in separate emacs-git-el package - - Place git support files in own directory under site-lisp - - Use Emacs packaging macros - -* Thu Apr 29 2010 Marcela Maslanova - 1.7.0.1-2 -- Mass rebuild with perl-5.12.0 - -* Mon Mar 01 2010 Todd Zullinger - 1.7.0.1-1 -- git-1.7.0.1 - -* Sat Feb 13 2010 Todd Zullinger - 1.7.0-1 -- git-1.7.0 -- Link imap-send with libcrypto (#565147) -- Disable building of unused python remote helper libs - -* Tue Jan 26 2010 Todd Zullinger - 1.6.6.1-1 -- git-1.6.6.1 -- Use %%{gitcoredir}/git-daemon as xinetd server option, for SELinux (#529682) -- Make %%{_var}/lib/git the default gitweb projectroot (#556299) -- Include gitweb/INSTALL file as documentation, the gitweb README refers to it -- Ship a short example gitweb config file (%%{_sysconfdir}/gitweb.conf) -- Remove long fixed xinetd IPv6 workaround on Fedora (#557528) -- Install missing gitweb.js (#558740) - -* Wed Dec 23 2009 Todd Zullinger - 1.6.6-1 -- git-1.6.6 - -* Fri Dec 11 2009 Todd Zullinger - 1.6.5.6-1 -- git-1.6.5.6 - -* Sun Dec 06 2009 Todd Zullinger - 1.6.5.5-1 -- git-1.6.5.5 - -* Fri Dec 4 2009 Stepan Kasal - 1.6.5.3-2 -- rebuild against perl 5.10.1 - -* Sat Nov 21 2009 Todd Zullinger - 1.6.5.3-1 -- git-1.6.5.3 -- Only BR perl(Error) on Fedora and RHEL >= 5 -- Use config.mak to set build options -- Improve compatibility with EPEL -- Replace $RPM_BUILD_ROOT with %%{buildroot} -- Fix Obsoletes for those rebuilding on EL-4 - -* Mon Oct 26 2009 Todd Zullinger - 1.6.5.2-1 -- git-1.6.5.2 -- Drop asciidoc --unsafe option, it should not be needed anymore -- Don't use install -t/-T, they're not compatible with older coreutils -- Don't use -perm /a+x with find, it's incompatible with older findutils - -* Sat Oct 17 2009 Todd Zullinger - 1.6.5.1-1 -- git-1.6.5.1 - -* Sun Oct 11 2009 Todd Zullinger - 1.6.5-1 -- git-1.6.5 - -* Mon Sep 28 2009 Todd Zullinger - 1.6.5-0.2.rc2 -- git-1.6.5.rc2 -- Enable Linus' block-sha1 implementation - -* Wed Sep 16 2009 Todd Zullinger - 1.6.4.4-1 -- git-1.6.4.4 - -* Sun Sep 13 2009 Todd Zullinger - 1.6.4.3-1 -- git-1.6.4.3 - -* Sun Aug 30 2009 Todd Zullinger - 1.6.4.2-1 -- git-1.6.4.2 - -* Sat Aug 22 2009 Todd Zullinger - 1.6.4.1-1 -- git-1.6.4.1 - -* Fri Aug 21 2009 Tomas Mraz - 1.6.4-2 -- rebuilt with new openssl - -* Wed Jul 29 2009 Todd Zullinger - 1.6.4-1 -- git-1.6.4 - -* Fri Jul 24 2009 Fedora Release Engineering - 1.6.3.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Sun Jun 28 2009 Todd Zullinger - 1.6.3.3-1 -- git-1.6.3.3 -- Move contributed hooks to %%{_datadir}/git-core/contrib/hooks (bug 500137) -- Fix rpmlint warnings about Summary and git-mergetool--lib missing shebang - -* Fri Jun 19 2009 Todd Zullinger - 1.6.3.2-3 -- Temporarily disable asciidoc's safe mode until bug 506953 is fixed - -* Fri Jun 19 2009 Todd Zullinger - 1.6.3.2-2 -- Fix git-daemon hang on invalid input (CVE-2009-2108, bug 505761) - -* Fri Jun 05 2009 Todd Zullinger - 1.6.3.2-1 -- git-1.6.3.2 -- Require emacs >= 22.2 for emacs support (bug 495312) -- Add a .desktop file for git-gui (bug 498801) -- Set ASCIIDOC8 and ASCIIDOC_NO_ROFF to correct documentation issues, - the sed hack to fix bug 485161 should no longer be needed -- Escape newline in git-daemon xinetd description (bug 502393) -- Add xinetd to git-daemon Requires (bug 504105) -- Organize BuildRequires/Requires, drop redundant expat Requires -- Only build noarch subpackages on Fedora >= 10 -- Only build emacs and arch subpackages on Fedora -- Handle curl/libcurl naming for EPEL and Fedora - -* Fri Apr 03 2009 Todd Zullinger - 1.6.2.2-1 -- git-1.6.2.2 -- Include contrib/ dir in %%doc (bug 492490) -- Don't set DOCBOOK_XSL_172, fix the '\&.ft' with sed (bug 485161) -- Ignore Branches output from cvsps-2.2b1 (bug 490602) -- Remove shebang from bash-completion script -- Include README in gitweb subpackage - -* Mon Mar 09 2009 Todd Zullinger - 1.6.2-1 -- git-1.6.2 -- Include contrib/emacs/README in emacs subpackage -- Drop upstreamed git-web--browse patch - -* Tue Feb 24 2009 Todd Zullinger - 1.6.1.3-2 -- Require perl(Authen::SASL) in git-email (bug 483062) -- Build many of the subpackages as noarch -- Update URL field - -* Mon Feb 09 2009 Todd Zullinger 1.6.1.3-1 -- git-1.6.1.3 -- Set htmldir so "git help -w " works -- Patch git-web--browse to not use "/sbin/start" to browse -- Include git-daemon documentation in the git-daemon package - -* Thu Jan 29 2009 Josh Boyer 1.6.1.2-1 -- git-1.6.1.2 - -* Mon Jan 26 2009 Todd Zullinger 1.6.1.1-1 -- git-1.6.1.1 -- Make compile more verbose - -* Fri Jan 16 2009 Tomas Mraz 1.6.1-2 -- rebuild with new openssl - -* Sat Jan 03 2009 Todd Zullinger 1.6.1-1 -- Install git-* commands in %%{_libexecdir}/git-core, the upstream default -- Remove libcurl from Requires, rpm will pick this up automatically -- Consolidate build/install options in %%make_git (Roland McGrath) -- Include DirectoryIndex in gitweb httpd-config (bug 471692) -- Define DOCBOOK_XSL_172 to fix minor manpage issues -- Rename %%{_var}/lib/git-daemon to %%{_var}/lib/git -- Preserve timestamps on installed files -- Quiet some rpmlint complaints -- Use macros more consistently - -* Sat Dec 20 2008 Todd Zullinger 1.6.0.6-1 -- git-1.6.0.6 -- Fixes a local privilege escalation bug in gitweb - (http://article.gmane.org/gmane.comp.version-control.git/103624) -- Add gitk Requires to git-gui (bug 476308) - -* Thu Dec 11 2008 Josh Boyer 1.6.0.5-1 -- git-1.6.0.5 - -* Mon Nov 17 2008 Seth Vidal -- switch from /srv/git to /var/lib/git-daemon for packaging rules compliance - -* Fri Nov 14 2008 Josh Boyer 1.6.0.4-1 -- git-1.6.0.4 - -* Wed Oct 22 2008 Josh Boyer 1.6.0.3-1 -- git-1.6.0.3 -- Drop curl requirement in favor of libcurl (bug 449388) -- Add requires for SMTP-SSL perl module to make git-send-email work (bug 443615) - -* Thu Aug 28 2008 James Bowes 1.6.0.1-1 -- git-1.6.0.1 - -* Thu Jul 24 2008 James Bowes 1.5.6-4 -- git-1.5.6.4 - -* Thu Jun 19 2008 James Bowes 1.5.6-1 -- git-1.5.6 - -* Tue Jun 3 2008 Stepan Kasal 1.5.5.3-2 -- use tar.bz2 instead of tar.gz - -* Wed May 28 2008 James Bowes 1.5.5.3-1 -- git-1.5.5.3 - -* Mon May 26 2008 James Bowes 1.5.5.2-1 -- git-1.5.5.2 - -* Mon Apr 21 2008 James Bowes 1.5.5.1-1 -- git-1.5.5.1 - -* Wed Apr 09 2008 James Bowes 1.5.5-1 -- git-1.5.5 - -* Fri Apr 04 2008 James Bowes 1.5.4.5-3 -- Remove the last two requires on git-core. - -* Wed Apr 02 2008 James Bowes 1.5.4.5-2 -- Remove a patch that's already upstream. - -* Fri Mar 28 2008 James Bowes 1.5.4.5-1 -- git-1.5.4.5 - -* Wed Mar 26 2008 James Bowes 1.5.4.4-4 -- Own /etc/bash_completion.d in case bash-completion isn't installed. - -* Tue Mar 25 2008 James Bowes 1.5.4.4-3 -- Include the sample hooks from contrib/hooks as docs (bug 321151). -- Install the bash completion script from contrib (bug 433255). -- Include the html docs in the 'core' package again (bug 434271). - -* Wed Mar 19 2008 James Bowes 1.5.4.4-2 -- Obsolete git <= 1.5.4.3, to catch going from F8 to rawhide/F9 - -* Thu Mar 13 2008 James Bowes 1.5.4.4-1 -- git-1.5.4.4 - -* Mon Mar 3 2008 Tom "spot" Callaway 1.5.4.3-3 -- rebuild for new perl (again) - -* Sun Feb 24 2008 Bernardo Innocenti 1.5.4.3-2 -- Do not silently overwrite /etc/httpd/conf.d/git.conf - -* Sat Feb 23 2008 James Bowes 1.5.4.3-1 -- git-1.5.4.3 -- Include Kristian Høgsberg's changes to rename git-core to - git and git to git-all. - -* Sun Feb 17 2008 James Bowes 1.5.4.2-1 -- git-1.5.4.2 - -* Mon Feb 11 2008 Jeremy Katz - 1.5.4.1-2 -- Add upstream patch (e62a641de17b172ffc4d3a803085c8afbfbec3d1) to have - gitweb rss feeds point be commitdiffs instead of commit - -* Sun Feb 10 2008 James Bowes 1.5.4.1-1 -- git-1.5.4.1 - -* Tue Feb 05 2008 Tom "spot" Callaway 1.5.4-3 -- rebuild for new perl - -* Sun Feb 03 2008 James Bowes 1.5.4-1 -- Add BuidRequires on gettext. - -* Sat Feb 02 2008 James Bowes 1.5.4-1 -- git-1.5.4 - -* Tue Jan 08 2008 James Bowes 1.5.3.8-1 -- git-1.5.3.8 - -* Fri Dec 21 2007 James Bowes 1.5.3.7-2 -- Have git metapackage require explicit versions (bug 247214) - -* Mon Dec 03 2007 Josh Boyer 1.5.3.7-1 -- git-1.5.3.7 - -* Tue Nov 27 2007 Josh Boyer 1.5.3.6-1 -- git-1.5.3.6 -- git-core requires perl(Error) (bug 367861) -- git-svn requires perl(Term:ReadKey) (bug 261361) -- git-email requires perl-Git (bug 333061) - -* Wed Oct 24 2007 Lubomir Kundrak 1.5.3.4-2 -- git-Perl requires Error package - -* Tue Oct 09 2007 James Bowes 1.5.3.4-1 -- git-1.5.3.4 - -* Sun Sep 30 2007 James Bowes 1.5.3.3-1 -- git-1.5.3.3 - -* Wed Sep 26 2007 James Bowes 1.5.3.2-1 -- git-1.5.3.2 - -* Thu Sep 06 2007 Josh Boyer 1.5.3.1-2 -- Include git-gui and git-citool docs - -* Thu Sep 06 2007 Josh Boyer 1.5.3.1-1 -- git-1.5.3.1-1 - -* Thu Aug 23 2007 James Bowes 1.5.2.5-1 -- git-1.5.2.5-1 - -* Fri Aug 03 2007 Josh Boyer 1.5.2.4-1 -- git-1.5.2.4-1 - -* Tue Jul 03 2007 Josh Boyer 1.5.2.2-3 -- Add git-daemon and gitweb packages - -* Thu Jun 21 2007 Josh Boyer 1.5.2.2-2 -- Add emacs-git package (#235431) - -* Mon Jun 18 2007 James Bowes 1.5.2.2-1 -- git-1.5.2.2 - -* Fri Jun 08 2007 James Bowes 1.5.2.1-1 -- git-1.5.2.1 - -* Sun May 13 2007 Quy Tonthat -- Added lib files for git-gui -- Added Documentation/technical (As needed by Git Users Manual) - -* Tue May 8 2007 Quy Tonthat -- Added howto files - -* Fri Mar 30 2007 Chris Wright 1.5.0.6-1 -- git-1.5.0.6 - -* Mon Mar 19 2007 Chris Wright 1.5.0.5-1 -- git-1.5.0.5 - -* Tue Mar 13 2007 Chris Wright 1.5.0.3-1 -- git-1.5.0.3 - -* Fri Mar 2 2007 Chris Wright 1.5.0.2-2 -- BuildRequires perl-devel as of perl-5.8.8-14 (bz 230680) - -* Mon Feb 26 2007 Chris Wright 1.5.0.2-1 -- git-1.5.0.2 - -* Tue Feb 13 2007 Nicolas Pitre -- Update core package description (Git isn't as stupid as it used to be) - -* Mon Feb 12 2007 Junio C Hamano -- Add git-gui and git-citool. - -* Sun Dec 10 2006 Chris Wright 1.4.4.2-2 -- no need to install manpages executable (bz 216790) -- use bytes for git-cvsserver - -* Sun Dec 10 2006 Chris Wright 1.4.4.2-1 -- git-1.4.4.2 - -* Mon Nov 6 2006 Jindrich Novy 1.4.2.4-2 -- rebuild against the new curl - -* Tue Oct 17 2006 Chris Wright 1.4.2.4-1 -- git-1.4.2.4 - -* Wed Oct 4 2006 Chris Wright 1.4.2.3-1 -- git-1.4.2.3 - -* Fri Sep 22 2006 Chris Wright 1.4.2.1-1 -- git-1.4.2.1 - -* Mon Sep 11 2006 Chris Wright 1.4.2-1 -- git-1.4.2 - -* Thu Jul 6 2006 Chris Wright 1.4.1-1 -- git-1.4.1 - -* Tue Jun 13 2006 Chris Wright 1.4.0-1 -- git-1.4.0 - -* Thu May 4 2006 Chris Wright 1.3.3-1 -- git-1.3.3 -- enable git-email building, prereqs have been relaxed - -* Thu May 4 2006 Chris Wright 1.3.2-1 -- git-1.3.2 - -* Fri Apr 28 2006 Chris Wright 1.3.1-1 -- git-1.3.1 - -* Wed Apr 19 2006 Chris Wright 1.3.0-1 -- git-1.3.0 - -* Mon Apr 10 2006 Chris Wright 1.2.6-1 -- git-1.2.6 - -* Wed Apr 5 2006 Chris Wright 1.2.5-1 -- git-1.2.5 - -* Wed Mar 1 2006 Chris Wright 1.2.4-1 -- git-1.2.4 - -* Wed Feb 22 2006 Chris Wright 1.2.3-1 -- git-1.2.3 - -* Tue Feb 21 2006 Chris Wright 1.2.2-1 -- git-1.2.2 - -* Thu Feb 16 2006 Chris Wright 1.2.1-1 -- git-1.2.1 - -* Mon Feb 13 2006 Chris Wright 1.2.0-1 -- git-1.2.0 - -* Wed Feb 1 2006 Chris Wright 1.1.6-1 -- git-1.1.6 - -* Tue Jan 24 2006 Chris Wright 1.1.4-1 -- git-1.1.4 - -* Sun Jan 15 2006 Chris Wright 1.1.2-1 -- git-1.1.2 - -* Tue Jan 10 2006 Chris Wright 1.1.1-1 -- git-1.1.1 - -* Tue Jan 10 2006 Chris Wright 1.1.0-1 -- Update to latest git-1.1.0 (drop git-email for now) -- Now creates multiple packages: -- git-core, git-svn, git-cvs, git-arch, gitk - -* Mon Nov 14 2005 H. Peter Anvin 0.99.9j-1 -- Change subpackage names to git- instead of git-core- -- Create empty root package which brings in all subpackages -- Rename git-tk -> gitk - -* Thu Nov 10 2005 Chris Wright 0.99.9g-1 -- zlib dependency fix -- Minor cleanups from split -- Move arch import to separate package as well - -* Tue Sep 27 2005 Jim Radford -- Move programs with non-standard dependencies (svn, cvs, email) - into separate packages - -* Tue Sep 27 2005 H. Peter Anvin -- parallelize build -- COPTS -> CFLAGS - -* Fri Sep 16 2005 Chris Wright 0.99.6-1 -- update to 0.99.6 - -* Fri Sep 16 2005 Horst H. von Brand -- Linus noticed that less is required, added to the dependencies - -* Sun Sep 11 2005 Horst H. von Brand -- Updated dependencies -- Don't assume manpages are gzipped - -* Thu Aug 18 2005 Chris Wright 0.99.4-4 -- drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires -- use RPM_OPT_FLAGS in spec file, drop patch0 - -* Wed Aug 17 2005 Tom "spot" Callaway 0.99.4-3 -- use dist tag to differentiate between branches -- use rpm optflags by default (patch0) -- own %%{_datadir}/git-core/ - -* Mon Aug 15 2005 Chris Wright -- update spec file to fix Buildroot, Requires, and drop Vendor - -* Sun Aug 07 2005 Horst H. von Brand -- Redid the description -- Cut overlong make line, loosened changelog a bit -- I think Junio (or perhaps OSDL?) should be vendor... - -* Thu Jul 14 2005 Eric Biederman -- Add the man pages, and the --without docs build option - -* Thu Jul 7 2005 Chris Wright -- initial git spec file From f506af1ff5fb429dcd57fcc16d13d9dfe9f08f13 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 13 Feb 2019 22:39:18 -0500 Subject: [PATCH 593/842] Update to 2.21.0.rc1 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.21.0.txt --- ...uote-path-to-GNUPGHOME-trustlist.txt.patch | 39 ------------------ ...-drop-redundant-killing-of-gpg-agent.patch | 40 ------------------- git.spec | 13 +++--- sources | 4 +- 4 files changed, 7 insertions(+), 89 deletions(-) delete mode 100644 0001-t-lib-gpg-quote-path-to-GNUPGHOME-trustlist.txt.patch delete mode 100644 0002-t-lib-gpg-drop-redundant-killing-of-gpg-agent.patch diff --git a/0001-t-lib-gpg-quote-path-to-GNUPGHOME-trustlist.txt.patch b/0001-t-lib-gpg-quote-path-to-GNUPGHOME-trustlist.txt.patch deleted file mode 100644 index 7a39316..0000000 --- a/0001-t-lib-gpg-quote-path-to-GNUPGHOME-trustlist.txt.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 32ca60bbf5bb3020bbf24036bc61003711ace611 Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Fri, 1 Feb 2019 19:36:41 -0500 -Subject: [PATCH 1/2] t/lib-gpg: quote path to ${GNUPGHOME}/trustlist.txt - -When gpgsm is installed, lib-gpg.sh attempts to update trustlist.txt to -relax the checking of some root certificate requirements. The path to -"${GNUPGHOME}" contains spaces which cause an "ambiguous redirect" -warning when bash is used to run the tests: - - $ bash t7030-verify-tag.sh - /git/t/lib-gpg.sh: line 66: ${GNUPGHOME}/trustlist.txt: ambiguous redirect - ok 1 - create signed tags - ok 2 # skip create signed tags x509 (missing GPGSM) - ... - -No warning is issued when using bash called as /bin/sh, dash, or mksh. - -Quote the path to ensure the redirect works as intended and sets the -GPGSM prereq. While we're here, drop the space after ">>". - -Signed-off-by: Todd Zullinger ---- - t/lib-gpg.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh -index f1277bef4f..207009793b 100755 ---- a/t/lib-gpg.sh -+++ b/t/lib-gpg.sh -@@ -63,7 +63,7 @@ then - cut -d" " -f4 | - tr -d '\n' >"${GNUPGHOME}/trustlist.txt" && - -- echo " S relax" >> ${GNUPGHOME}/trustlist.txt && -+ echo " S relax" >>"${GNUPGHOME}/trustlist.txt" && - (gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) && - echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \ - -u committer@example.com -o /dev/null --sign - 2>&1 && diff --git a/0002-t-lib-gpg-drop-redundant-killing-of-gpg-agent.patch b/0002-t-lib-gpg-drop-redundant-killing-of-gpg-agent.patch deleted file mode 100644 index 2c1f4d1..0000000 --- a/0002-t-lib-gpg-drop-redundant-killing-of-gpg-agent.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 09436d6a5b6db6ab8e80ab449b3b841883b27d19 Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Sat, 2 Feb 2019 02:31:52 -0500 -Subject: [PATCH 2/2] t/lib-gpg: drop redundant killing of gpg-agent - -In 53fc999306 ("gpg-interface t: extend the existing GPG tests with -GPGSM", 2018-07-20), the gpgconf call which kills gpg-agent was copied -from the existing gpg setup code. - -The reason for killing gpg-agent is given in 29ff1f8f74 ("t: lib-gpg: -flush gpg agent on startup", 2017-07-20): - - When running gpg-relevant tests, a gpg-daemon is spawned for each - GNUPGHOME used. This daemon may stay running after the test and cache - file descriptors for the trash directories, even after the trash - directory is removed. This leads to ENOENT errors when attempting to - create files if tests are run multiple times. - - Add a cleanup script to force flushing the gpg-agent for that GNUPGHOME - (if any) before setting up the GPG relevant-environment. - -Killing gpg-agent once per test is sufficient. - -Signed-off-by: Todd Zullinger ---- - t/lib-gpg.sh | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh -index 207009793b..8d28652b72 100755 ---- a/t/lib-gpg.sh -+++ b/t/lib-gpg.sh -@@ -64,7 +64,6 @@ then - tr -d '\n' >"${GNUPGHOME}/trustlist.txt" && - - echo " S relax" >>"${GNUPGHOME}/trustlist.txt" && -- (gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) && - echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \ - -u committer@example.com -o /dev/null --sign - 2>&1 && - test_set_prereq GPGSM diff --git a/git.spec b/git.spec index 24c1fb1..69479c2 100644 --- a/git.spec +++ b/git.spec @@ -84,11 +84,11 @@ %endif # Define for release candidates -%global rcrev .rc0 +%global rcrev .rc1 Name: git Version: 2.21.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 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# Fix "ambiguous redirect" in t/lib-gpg.sh; it causes gpgsm tests to be skipped -# https://public-inbox.org/git/20190208031746.22683-2-tmz@pobox.com/ -Patch2: 0001-t-lib-gpg-quote-path-to-GNUPGHOME-trustlist.txt.patch -# t/lib-gpg: drop redundant killing of gpg-agent -# https://public-inbox.org/git/20190208031746.22683-3-tmz@pobox.com/ -Patch3: 0002-t-lib-gpg-drop-redundant-killing-of-gpg-agent.patch %if %{with docs} # pod2man is needed to build Git.3pm @@ -948,6 +942,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Feb 13 2019 Todd Zullinger - 2.21.0-0.1.rc1 +- Update to 2.21.0.rc1 + * Thu Feb 07 2019 Todd Zullinger - 2.21.0-0.0.rc0 - Update to 2.21.0.rc0 - Remove %%changelog entries prior to 2017 diff --git a/sources b/sources index 62cebde..57e60c6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.21.0.rc0.tar.xz) = 8edd38460737b2a49dd6b27d211a4775f1b77df7bb502142341a96a25db05f5e9ec7f9788203414b2c275b0664cefefc7b9e3d4925fb3ed9acce02c4918b340a -SHA512 (git-2.21.0.rc0.tar.sign) = 99e7092367092a4cce08b771cfe658eb768af7b2ad1f9ad6179467bf9612b25dbf02117f7c56b75517e97e40234113ead8fb22820f0e909dd55eb6fb391af8af +SHA512 (git-2.21.0.rc1.tar.xz) = 4d8a4981e66b3d3f990b7901c037112ab25bd2a9b1eea8fc3b7b51cea9155edea8a73dedd3d15966239826a9b9162e4f58f87c41bc653ef1d8c5572913e9e49e +SHA512 (git-2.21.0.rc1.tar.sign) = 7e706a8551334c692634373b3647a5d45a983dd24bf96dafbffa9d447b60588e1e154d7b030bc863b5d12427293149516c591ce144cd8849de17dad870940553 From 233359ed666459b64870497e5da67f9accac1339 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 15 Feb 2019 19:11:25 -0500 Subject: [PATCH 594/842] Set SOURCE_DATE_EPOCH and TZ to improve build reproducibility The documentation tools respect these variables when generating dates in the man and html docs. This is a small step toward making the package builds reproducible. An alternate method to set SOURCE_DATE_EPOCH would be to set the rpm %source_date_epoch_from_changelog macro. Using the version file from the tarball is a little nicer as the date is printed in the man pages. We'd still need to set TZ anyway, as the html documentation sets the 'last updated' footer entry based on the timestamp of the corresponding txt file. [Note: It is possible to avoid the 'last updated' footer entirely by setting the asciidoc footer-style attribute to none. This would need to be done via sed or a patch, as there's not currently a way to set this in config.mak -- but perhaps there should be.] Reference: https://reproducible-builds.org/specs/source-date-epoch/ --- git.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/git.spec b/git.spec index 69479c2..38c087b 100644 --- a/git.spec +++ b/git.spec @@ -532,6 +532,10 @@ sed -i 's@"++GITWEB_HOME_LINK_STR++"@$ENV{"SERVER_NAME"} ? "git://" . $ENV{"SERV mv contrib/{contacts,subtree}/git-*.txt Documentation/ %build +# Improve build reproducibility +export TZ=UTC +export SOURCE_DATE_EPOCH=$(date -r version +%%s 2>/dev/null) + %make_build all %{?with_docs:doc} %make_build -C contrib/contacts/ all @@ -942,6 +946,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Feb 15 2019 Todd Zullinger +- Set SOURCE_DATE_EPOCH and TZ to improve build reproducibility + * Wed Feb 13 2019 Todd Zullinger - 2.21.0-0.1.rc1 - Update to 2.21.0.rc1 From 42b4954b73400e486427b7770b6745552ffdbf42 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 19 Feb 2019 18:51:40 -0500 Subject: [PATCH 595/842] Update to 2.21.0.rc2 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.21.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 38c087b..1fd1ad2 100644 --- a/git.spec +++ b/git.spec @@ -84,11 +84,11 @@ %endif # Define for release candidates -%global rcrev .rc1 +%global rcrev .rc2 Name: git Version: 2.21.0 -Release: 0.1%{?rcrev}%{?dist} +Release: 0.2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -946,6 +946,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Feb 19 2019 Todd Zullinger - 2.21.0-0.2.rc2 +- Update to 2.21.0.rc2 + * Fri Feb 15 2019 Todd Zullinger - Set SOURCE_DATE_EPOCH and TZ to improve build reproducibility diff --git a/sources b/sources index 57e60c6..8747cc5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.21.0.rc1.tar.xz) = 4d8a4981e66b3d3f990b7901c037112ab25bd2a9b1eea8fc3b7b51cea9155edea8a73dedd3d15966239826a9b9162e4f58f87c41bc653ef1d8c5572913e9e49e -SHA512 (git-2.21.0.rc1.tar.sign) = 7e706a8551334c692634373b3647a5d45a983dd24bf96dafbffa9d447b60588e1e154d7b030bc863b5d12427293149516c591ce144cd8849de17dad870940553 +SHA512 (git-2.21.0.rc2.tar.xz) = 9d97af084d1159893fc9da3c6c62ac6c30a06a910e9d76ef303449f808cf95e54b1c7d08f7250455e9b9bcfe5cdf9b66dc425e2f5d653908587c07db9b29f747 +SHA512 (git-2.21.0.rc2.tar.sign) = 46f3bd721263ca85cff0466343046a468c05a8a210c5bcfd14350a8cc29d873fdbf1cbd771f4b4ddfd5a6b90d0427cf5e7deffcd380b2371c2b56c4a76ccb4db From 050797604f9f00f27a4831f9fd183cc02ecf0b09 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 24 Feb 2019 13:29:30 -0500 Subject: [PATCH 596/842] Update to 2.21.0 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.21.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 1fd1ad2..209a561 100644 --- a/git.spec +++ b/git.spec @@ -84,11 +84,11 @@ %endif # Define for release candidates -%global rcrev .rc2 +#global rcrev .rc0 Name: git Version: 2.21.0 -Release: 0.2%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -946,6 +946,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sun Feb 24 2019 Todd Zullinger - 2.21.0-1 +- Update to 2.21.0 + * Tue Feb 19 2019 Todd Zullinger - 2.21.0-0.2.rc2 - Update to 2.21.0.rc2 diff --git a/sources b/sources index 8747cc5..985255b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.21.0.rc2.tar.xz) = 9d97af084d1159893fc9da3c6c62ac6c30a06a910e9d76ef303449f808cf95e54b1c7d08f7250455e9b9bcfe5cdf9b66dc425e2f5d653908587c07db9b29f747 -SHA512 (git-2.21.0.rc2.tar.sign) = 46f3bd721263ca85cff0466343046a468c05a8a210c5bcfd14350a8cc29d873fdbf1cbd771f4b4ddfd5a6b90d0427cf5e7deffcd380b2371c2b56c4a76ccb4db +SHA512 (git-2.21.0.tar.xz) = 83f57c3950a07f6773a3aea66611d22daba0e5599e5d8f0751a16f6fdbeab0f3844d942a39a5642051212df99d1d4513253c36829b1454b4f0977cc6026fd973 +SHA512 (git-2.21.0.tar.sign) = fbde8164e0c6d5f1447849ab573d5fe6d3585c1c463b75a81ce3f65cba0559cb84a2c63f13663e5c7fe5119e607a304e52cb13183babc40da72421a5c1a5db1b From 530061ce99a36be8b050092907394f772b392d82 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 23 Feb 2019 11:51:12 -0500 Subject: [PATCH 597/842] Move gitweb manpages to gitweb package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The gitweb manpages should be installed with the gitweb package. This discrepancy was noted by Robert P. J. Day on the git list¹. ¹ https://public-inbox.org/git/alpine.LFD.2.21.1902230756280.24879@localhost.localdomain/ --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 209a561..50eeb22 100644 --- a/git.spec +++ b/git.spec @@ -630,7 +630,7 @@ rm -f %{buildroot}%{gitexecdir}/mergetools/p4merge # Remove unneeded git-remote-testsvn so git-svn can be noarch rm -f %{buildroot}%{gitexecdir}/git-remote-testsvn -exclude_re="archimport|email|git-(citool|cvs|daemon|gui|instaweb|p4|subtree|svn)|gitk|p4merge" +exclude_re="archimport|email|git-(citool|cvs|daemon|gui|instaweb|p4|subtree|svn)|gitk|gitweb|p4merge" (find %{buildroot}{%{_bindir},%{_libexecdir}} -type f -o -type l | grep -vE "$exclude_re" | sed -e s@^%{buildroot}@@) > bin-man-doc-files (find %{buildroot}{%{_bindir},%{_libexecdir}} -mindepth 1 -type d | grep -vE "$exclude_re" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files (find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) > perl-git-files @@ -895,6 +895,8 @@ rmdir --ignore-fail-on-non-empty "$testdir" %files -n gitweb %{_pkgdocdir}/*.gitweb %{_pkgdocdir}/gitweb*.txt +%{?with_docs:%{_mandir}/man1/gitweb.1*} +%{?with_docs:%{_mandir}/man5/gitweb.conf.5*} %{?with_docs:%{_pkgdocdir}/gitweb*.html} %config(noreplace)%{_sysconfdir}/gitweb.conf %config(noreplace)%{_sysconfdir}/httpd/conf.d/%{gitweb_httpd_conf} @@ -948,6 +950,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Sun Feb 24 2019 Todd Zullinger - 2.21.0-1 - Update to 2.21.0 +- Move gitweb manpages to gitweb package * Tue Feb 19 2019 Todd Zullinger - 2.21.0-0.2.rc2 - Update to 2.21.0.rc2 From e17874a9b14b10561d16cbb7ad1fa4311e8abafe Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 23 Feb 2019 17:07:24 -0500 Subject: [PATCH 598/842] Link git-citool to git-gui The git-gui Makefile does not follow the INSTALL_SYMLINKS setting. Until it does, manually symlink git-citool to git-gui. Test that the files are identical before linking, to avoid issues if they begin to differ in the future. --- git.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/git.spec b/git.spec index 50eeb22..2156ad8 100644 --- a/git.spec +++ b/git.spec @@ -686,6 +686,13 @@ install -pm 644 contrib/completion/git-prompt.sh \ # install git-gui .desktop file desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE12} +# symlink git-citool to git-gui if they are identical +pushd %{buildroot}%{gitexecdir} >/dev/null +if cmp -s git-gui git-citool 2>/dev/null; then + ln -svf git-gui git-citool +fi +popd >/dev/null + # find translations %find_lang %{name} %{name}.lang cat %{name}.lang >> bin-man-doc-files @@ -951,6 +958,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" * Sun Feb 24 2019 Todd Zullinger - 2.21.0-1 - Update to 2.21.0 - Move gitweb manpages to gitweb package +- Link git-citool to git-gui if they are identical * Tue Feb 19 2019 Todd Zullinger - 2.21.0-0.2.rc2 - Update to 2.21.0.rc2 From 03148fb477fc7b54a21d1f990edad272bc17ac43 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 13 May 2019 15:15:53 -0400 Subject: [PATCH 599/842] Update to 2.22.0-rc0 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.22.0.txt --- git.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index 2156ad8..2e61c38 100644 --- a/git.spec +++ b/git.spec @@ -84,11 +84,11 @@ %endif # Define for release candidates -#global rcrev .rc0 +%global rcrev .rc0 Name: git -Version: 2.21.0 -Release: 1%{?rcrev}%{?dist} +Version: 2.22.0 +Release: 0.0%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -955,6 +955,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon May 13 2019 Todd Zullinger - 2.22.0-0.0.rc0 +- Update to 2.22.0-rc0 + * Sun Feb 24 2019 Todd Zullinger - 2.21.0-1 - Update to 2.21.0 - Move gitweb manpages to gitweb package diff --git a/sources b/sources index 985255b..733ae27 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.21.0.tar.xz) = 83f57c3950a07f6773a3aea66611d22daba0e5599e5d8f0751a16f6fdbeab0f3844d942a39a5642051212df99d1d4513253c36829b1454b4f0977cc6026fd973 -SHA512 (git-2.21.0.tar.sign) = fbde8164e0c6d5f1447849ab573d5fe6d3585c1c463b75a81ce3f65cba0559cb84a2c63f13663e5c7fe5119e607a304e52cb13183babc40da72421a5c1a5db1b +SHA512 (git-2.22.0.rc0.tar.xz) = f3a928fbb36693917ed268d6ed6f47dcf0c56e2976a2d0bf0b9d209cb48ca309d0568f230752a765cd8d4f264db57b93542a481a5bf30bd1cec5eea7246c6342 +SHA512 (git-2.22.0.rc0.tar.sign) = 188b89b5813f1820a18a29c4df6cc72f5208ade8d628a0948cb6fc11651b6ff7199900932a8af962b0729c260ce9081e1b491b0099f1940e15218b245b00da00 From 8d801b24a1e2d5459a1304981a675113c7f14e95 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 13 May 2019 15:19:34 -0400 Subject: [PATCH 600/842] Ensure a consistent format for test output When run with or without a controlling terminal, keep the test output the same. --- git.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 2e61c38..5a53553 100644 --- a/git.spec +++ b/git.spec @@ -492,7 +492,7 @@ gitwebdir = %{_localstatedir}/www/git # Test options DEFAULT_TEST_TARGET = prove -GIT_PROVE_OPTS = --verbose --normalize %{?_smp_mflags} +GIT_PROVE_OPTS = --verbose --normalize %{?_smp_mflags} --formatter=TAP::Formatter::File GIT_TEST_OPTS = -x --verbose-log EOF @@ -957,6 +957,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Mon May 13 2019 Todd Zullinger - 2.22.0-0.0.rc0 - Update to 2.22.0-rc0 +- Ensure a consistent format for test output * Sun Feb 24 2019 Todd Zullinger - 2.21.0-1 - Update to 2.21.0 From 51610991b8dcc0341bb645071334195e95779c18 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 13 May 2019 21:13:24 -0400 Subject: [PATCH 601/842] Improve JGIT test prereq (jgit on Fedora >= 30 is broken) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Running jgit on Fedora >= 30 results in an immediate failure¹: $ jgit --version /usr/bin/build-classpath: Could not find xz-java Java extension for this JVM /usr/bin/build-classpath: error: Some specified jars were not found Error: Could not find or load main class org.springframework.boot.loader.JarLauncher Skip the jgit tests if 'jgit --version' fails. This way we'll begin running them again once the issue is resolved -- without having to make any further changes to the git package. Also exclude jgit on i386 arch, as upstream eclipse has dropped support. We could adjust the conditional to only exclude on Fedora >= 30 and i386, but the added complexity is not worth the effort. ¹ jgit bug report: https://bugzilla.redhat.com/1709624 --- ...-try-harder-to-ensure-a-working-jgit.patch | 40 +++++++++++++++++++ git.skip-test-patterns | 1 + git.spec | 9 ++++- 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 0001-test-lib-try-harder-to-ensure-a-working-jgit.patch diff --git a/0001-test-lib-try-harder-to-ensure-a-working-jgit.patch b/0001-test-lib-try-harder-to-ensure-a-working-jgit.patch new file mode 100644 index 0000000..fe92096 --- /dev/null +++ b/0001-test-lib-try-harder-to-ensure-a-working-jgit.patch @@ -0,0 +1,40 @@ +From aeb950b03f0ef22bdfee09b505349521e68b7e54 Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Tue, 14 May 2019 01:47:25 +0000 +Subject: [PATCH] test-lib: try harder to ensure a working jgit + +The JGIT prereq uses 'type jgit' to determine whether jgit is present. +While this should be sufficient, if the jgit found is broken we'll waste +time running tests which fail due to no fault of our own. + +Use 'jgit --version' instead, to catch some badly broken jgit +installations. + +Signed-off-by: Todd Zullinger +--- +I ran into such a broken jgit on Fedora >= 30¹. This is clearly a +problem in the Fedora jgit package which will hopefully be resolved +soon. But it may be good to avoid wasting time debugging tests which +fail due to such a broken tool which is outside of our control. + +¹ https://bugzilla.redhat.com/1709624 + + t/test-lib.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/test-lib.sh b/t/test-lib.sh +index 908ddb9c46..599fd70e14 100644 +--- a/t/test-lib.sh ++++ b/t/test-lib.sh +@@ -1522,7 +1522,7 @@ test_lazy_prereq NOT_ROOT ' + ' + + test_lazy_prereq JGIT ' +- type jgit ++ jgit --version + ' + + # SANITY is about "can you correctly predict what the filesystem would +-- +2.20.1 + diff --git a/git.skip-test-patterns b/git.skip-test-patterns index 429977f..5aaebef 100644 --- a/git.skip-test-patterns +++ b/git.skip-test-patterns @@ -5,6 +5,7 @@ missing CASE_INSENSITIVE_FS missing CLONE_2GB missing DONTHAVEIT missing EXPENSIVE +missing JGIT missing !?LAZY_(TRUE|FALSE) missing MINGW missing NATIVE_CRLF diff --git a/git.spec b/git.spec index 5a53553..19d8ec2 100644 --- a/git.spec +++ b/git.spec @@ -120,6 +120,10 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch +# https://bugzilla.redhat.com/1709624 +# https://public-inbox.org/git/20190514020520.GI3654@pobox.com/ +Patch1: 0001-test-lib-try-harder-to-ensure-a-working-jgit.patch + %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -195,9 +199,9 @@ BuildRequires: gnupg2-smime BuildRequires: highlight %endif # fedora, el-6, or el7-ppc64 BuildRequires: httpd -%if 0%{?fedora} && %{_arch} != s390x +%if 0%{?fedora} && ! ( %{_arch} == i386 || %{_arch} == s390x ) BuildRequires: jgit -%endif # fedora (except s390x) +%endif # fedora (except i386 and s390x) BuildRequires: mod_dav_svn BuildRequires: perl(App::Prove) BuildRequires: perl(CGI) @@ -958,6 +962,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" * Mon May 13 2019 Todd Zullinger - 2.22.0-0.0.rc0 - Update to 2.22.0-rc0 - Ensure a consistent format for test output +- Improve JGIT test prereq (jgit on Fedora >= 30 is broken) * Sun Feb 24 2019 Todd Zullinger - 2.21.0-1 - Update to 2.21.0 From 40e1625e1a032c535b9a58b51e97605446d5b484 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 14 May 2019 01:18:46 -0400 Subject: [PATCH 602/842] Add perl(JSON::PP) BuildRequires for trace2 tests The JSON::PP perl module is used by t0212-trace2-event. It is available on all supported Fedora and EPEL releases. --- git.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git.spec b/git.spec index 19d8ec2..ca6057f 100644 --- a/git.spec +++ b/git.spec @@ -212,6 +212,7 @@ BuildRequires: perl(Digest::MD5) BuildRequires: perl(HTTP::Date) BuildRequires: perl(IO::Pty) BuildRequires: perl(JSON) +BuildRequires: perl(JSON::PP) BuildRequires: perl(Mail::Address) BuildRequires: perl(Memoize) BuildRequires: perl(Test::More) @@ -963,6 +964,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" - Update to 2.22.0-rc0 - Ensure a consistent format for test output - Improve JGIT test prereq (jgit on Fedora >= 30 is broken) +- Add perl(JSON::PP) BuildRequires for trace2 tests * Sun Feb 24 2019 Todd Zullinger - 2.21.0-1 - Update to 2.21.0 From ba20d6b2a20526f8b015390cd9124ce90c66fe0c Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 19 May 2019 16:40:01 -0400 Subject: [PATCH 603/842] Update to 2.22.0-rc1 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.22.0.txt --- ...-try-harder-to-ensure-a-working-jgit.patch | 40 ------------------- git.spec | 8 +--- sources | 4 +- 3 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 0001-test-lib-try-harder-to-ensure-a-working-jgit.patch diff --git a/0001-test-lib-try-harder-to-ensure-a-working-jgit.patch b/0001-test-lib-try-harder-to-ensure-a-working-jgit.patch deleted file mode 100644 index fe92096..0000000 --- a/0001-test-lib-try-harder-to-ensure-a-working-jgit.patch +++ /dev/null @@ -1,40 +0,0 @@ -From aeb950b03f0ef22bdfee09b505349521e68b7e54 Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Tue, 14 May 2019 01:47:25 +0000 -Subject: [PATCH] test-lib: try harder to ensure a working jgit - -The JGIT prereq uses 'type jgit' to determine whether jgit is present. -While this should be sufficient, if the jgit found is broken we'll waste -time running tests which fail due to no fault of our own. - -Use 'jgit --version' instead, to catch some badly broken jgit -installations. - -Signed-off-by: Todd Zullinger ---- -I ran into such a broken jgit on Fedora >= 30¹. This is clearly a -problem in the Fedora jgit package which will hopefully be resolved -soon. But it may be good to avoid wasting time debugging tests which -fail due to such a broken tool which is outside of our control. - -¹ https://bugzilla.redhat.com/1709624 - - t/test-lib.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/t/test-lib.sh b/t/test-lib.sh -index 908ddb9c46..599fd70e14 100644 ---- a/t/test-lib.sh -+++ b/t/test-lib.sh -@@ -1522,7 +1522,7 @@ test_lazy_prereq NOT_ROOT ' - ' - - test_lazy_prereq JGIT ' -- type jgit -+ jgit --version - ' - - # SANITY is about "can you correctly predict what the filesystem would --- -2.20.1 - diff --git a/git.spec b/git.spec index ca6057f..adbcde8 100644 --- a/git.spec +++ b/git.spec @@ -84,11 +84,11 @@ %endif # Define for release candidates -%global rcrev .rc0 +%global rcrev .rc1 Name: git Version: 2.22.0 -Release: 0.0%{?rcrev}%{?dist} +Release: 0.1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -120,10 +120,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/1709624 -# https://public-inbox.org/git/20190514020520.GI3654@pobox.com/ -Patch1: 0001-test-lib-try-harder-to-ensure-a-working-jgit.patch - %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man diff --git a/sources b/sources index 733ae27..4cbcacd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.22.0.rc0.tar.xz) = f3a928fbb36693917ed268d6ed6f47dcf0c56e2976a2d0bf0b9d209cb48ca309d0568f230752a765cd8d4f264db57b93542a481a5bf30bd1cec5eea7246c6342 -SHA512 (git-2.22.0.rc0.tar.sign) = 188b89b5813f1820a18a29c4df6cc72f5208ade8d628a0948cb6fc11651b6ff7199900932a8af962b0729c260ce9081e1b491b0099f1940e15218b245b00da00 +SHA512 (git-2.22.0.rc1.tar.xz) = c3d878f7b5b4c4d67d4c8f20ab07a54c2bb4c2646feedc4a670e28849bb544177ab7aab6458bc982774c954b6c05b8e83acf3b9c5eeecccb34776cac16cfe1e1 +SHA512 (git-2.22.0.rc1.tar.sign) = a900071d502ec2eaa6c5befd33c4fd62f5fa7be56aafb6e432193ad3d3810846fd191a831b97fc5e64bfbd839968a101ee5ae7f1c318d23a6c062cd220a3bce6 From 554467c6490fae5dfb60577d85109856fd01acb7 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 20 May 2019 11:54:46 -0400 Subject: [PATCH 604/842] Update changelog for 2.22.0-rc1 --- git.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git.spec b/git.spec index adbcde8..4f7485f 100644 --- a/git.spec +++ b/git.spec @@ -956,6 +956,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sun May 19 2019 Todd Zullinger - 2.22.0-0.1.rc1 +- Update to 2.22.0-rc1 + * Mon May 13 2019 Todd Zullinger - 2.22.0-0.0.rc0 - Update to 2.22.0-rc0 - Ensure a consistent format for test output From 9524a99a051f07c1311e33fde73f5d5c39afbdae Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 24 May 2019 11:55:20 -0400 Subject: [PATCH 605/842] Apply upstream fixes for diff-parseopt issues on s390x References: https://public-inbox.org/git/20190523150416.GL3654@pobox.com/#t https://public-inbox.org/git/20190524092442.701-1-pclouds@gmail.com/T/ --- ...rrect-variable-types-that-are-used-b.patch | 128 ++++++++++++ ...seopt-restore-U-no-argument-behavior.patch | 183 ++++++++++++++++++ ...eck-empty-value-in-OPT_INTEGER-and-O.patch | 63 ++++++ git.spec | 10 +- 4 files changed, 383 insertions(+), 1 deletion(-) create mode 100644 0001-diff-parseopt-correct-variable-types-that-are-used-b.patch create mode 100644 0002-diff-parseopt-restore-U-no-argument-behavior.patch create mode 100644 0003-parse-options-check-empty-value-in-OPT_INTEGER-and-O.patch diff --git a/0001-diff-parseopt-correct-variable-types-that-are-used-b.patch b/0001-diff-parseopt-correct-variable-types-that-are-used-b.patch new file mode 100644 index 0000000..be0e181 --- /dev/null +++ b/0001-diff-parseopt-correct-variable-types-that-are-used-b.patch @@ -0,0 +1,128 @@ +From 64144ae182fb4f01fbbce0e3005057ff95aacc58 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= + +Date: Fri, 24 May 2019 16:24:40 +0700 +Subject: [PATCH 1/3] diff-parseopt: correct variable types that are used by + parseopt +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Most number-related OPT_ macros store the value in an 'int' +variable. Many of the variables in 'struct diff_options' have a +different type, but during the conversion to using parse_options() I +failed to notice and correct. + +The problem was reported on s360x which is a big-endian +architechture. The variable to store '-w' option in this case is +xdl_opts, 'long' type, 8 bytes. But since parse_options() assumes +'int' (4 bytes), it will store bits in the wrong part of xdl_opts. The +problem was found on little-endian platforms because parse_options() +will accidentally store at the right part of xdl_opts. + +There aren't much to say about the type change (except that 'int' for +xdl_opts should still be big enough, since Windows' long is the same +size as 'int' and nobody has complained so far). Some safety checks may +be implemented in the future to prevent class of bugs. + +Reported-by: Todd Zullinger +Signed-off-by: Nguyễn Thái Ngọc Duy +--- + diff.h | 70 +++++++++++++++++++++++++++++----------------------------- + 1 file changed, 35 insertions(+), 35 deletions(-) + +diff --git a/diff.h b/diff.h +index b20cbcc091..4527daf6b7 100644 +--- a/diff.h ++++ b/diff.h +@@ -65,39 +65,39 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data) + + #define DIFF_FLAGS_INIT { 0 } + struct diff_flags { +- unsigned recursive; +- unsigned tree_in_recursive; +- unsigned binary; +- unsigned text; +- unsigned full_index; +- unsigned silent_on_remove; +- unsigned find_copies_harder; +- unsigned follow_renames; +- unsigned rename_empty; +- unsigned has_changes; +- unsigned quick; +- unsigned no_index; +- unsigned allow_external; +- unsigned exit_with_status; +- unsigned reverse_diff; +- unsigned check_failed; +- unsigned relative_name; +- unsigned ignore_submodules; +- unsigned dirstat_cumulative; +- unsigned dirstat_by_file; +- unsigned allow_textconv; +- unsigned textconv_set_via_cmdline; +- unsigned diff_from_contents; +- unsigned dirty_submodules; +- unsigned ignore_untracked_in_submodules; +- unsigned ignore_dirty_submodules; +- unsigned override_submodule_config; +- unsigned dirstat_by_line; +- unsigned funccontext; +- unsigned default_follow_renames; +- unsigned stat_with_summary; +- unsigned suppress_diff_headers; +- unsigned dual_color_diffed_diffs; ++ unsigned int recursive; ++ unsigned int tree_in_recursive; ++ unsigned int binary; ++ unsigned int text; ++ unsigned int full_index; ++ unsigned int silent_on_remove; ++ unsigned int find_copies_harder; ++ unsigned int follow_renames; ++ unsigned int rename_empty; ++ unsigned int has_changes; ++ unsigned int quick; ++ unsigned int no_index; ++ unsigned int allow_external; ++ unsigned int exit_with_status; ++ unsigned int reverse_diff; ++ unsigned int check_failed; ++ unsigned int relative_name; ++ unsigned int ignore_submodules; ++ unsigned int dirstat_cumulative; ++ unsigned int dirstat_by_file; ++ unsigned int allow_textconv; ++ unsigned int textconv_set_via_cmdline; ++ unsigned int diff_from_contents; ++ unsigned int dirty_submodules; ++ unsigned int ignore_untracked_in_submodules; ++ unsigned int ignore_dirty_submodules; ++ unsigned int override_submodule_config; ++ unsigned int dirstat_by_line; ++ unsigned int funccontext; ++ unsigned int default_follow_renames; ++ unsigned int stat_with_summary; ++ unsigned int suppress_diff_headers; ++ unsigned int dual_color_diffed_diffs; + }; + + static inline void diff_flags_or(struct diff_flags *a, +@@ -151,7 +151,7 @@ struct diff_options { + int skip_stat_unmatch; + int line_termination; + int output_format; +- unsigned pickaxe_opts; ++ unsigned int pickaxe_opts; + int rename_score; + int rename_limit; + int needed_rename_limit; +@@ -169,7 +169,7 @@ struct diff_options { + const char *prefix; + int prefix_length; + const char *stat_sep; +- long xdl_opts; ++ int xdl_opts; + + /* see Documentation/diff-options.txt */ + char **anchors; diff --git a/0002-diff-parseopt-restore-U-no-argument-behavior.patch b/0002-diff-parseopt-restore-U-no-argument-behavior.patch new file mode 100644 index 0000000..b29c262 --- /dev/null +++ b/0002-diff-parseopt-restore-U-no-argument-behavior.patch @@ -0,0 +1,183 @@ +From 23f586f2524569218de43c10cd41c3d271198a9e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= + +Date: Fri, 24 May 2019 16:24:41 +0700 +Subject: [PATCH 2/3] diff-parseopt: restore -U (no argument) behavior +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Before d473e2e0e8 (diff.c: convert -U|--unified, 2019-01-27), -U and +--unified are implemented with a custom parser opt_arg() in diff.c. I +didn't check this code carefully and not realize that it's the +equivalent of PARSE_OPT_NONEG | PARSE_OPT_OPTARG. + +In other words, if -U is specified without any argument, the option +should be accepted, and the default value should be used. Without +PARSE_OPT_OPTARG, parse_options() will reject this case and cause a +regression. + +Reported-by: Bryan Turner +Signed-off-by: Nguyễn Thái Ngọc Duy +--- + diff.c | 10 +++++---- + t/t4013-diff-various.sh | 2 ++ + t/t4013/diff.diff_-U1_initial..side | 29 ++++++++++++++++++++++++++ + t/t4013/diff.diff_-U2_initial..side | 31 ++++++++++++++++++++++++++++ + t/t4013/diff.diff_-U_initial..side | 32 +++++++++++++++++++++++++++++ + 5 files changed, 100 insertions(+), 4 deletions(-) + create mode 100644 t/t4013/diff.diff_-U1_initial..side + create mode 100644 t/t4013/diff.diff_-U2_initial..side + create mode 100644 t/t4013/diff.diff_-U_initial..side + +diff --git a/diff.c b/diff.c +index 4d3cf83a27..80ddc11671 100644 +--- a/diff.c ++++ b/diff.c +@@ -5211,9 +5211,11 @@ static int diff_opt_unified(const struct option *opt, + + BUG_ON_OPT_NEG(unset); + +- options->context = strtol(arg, &s, 10); +- if (*s) +- return error(_("%s expects a numerical value"), "--unified"); ++ if (arg) { ++ options->context = strtol(arg, &s, 10); ++ if (*s) ++ return error(_("%s expects a numerical value"), "--unified"); ++ } + enable_patch_output(&options->output_format); + + return 0; +@@ -5272,7 +5274,7 @@ static void prep_parse_options(struct diff_options *options) + DIFF_FORMAT_PATCH, DIFF_FORMAT_NO_OUTPUT), + OPT_CALLBACK_F('U', "unified", options, N_(""), + N_("generate diffs with lines context"), +- PARSE_OPT_NONEG, diff_opt_unified), ++ PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_unified), + OPT_BOOL('W', "function-context", &options->flags.funccontext, + N_("generate diffs with lines context")), + OPT_BIT_F(0, "raw", &options->output_format, +diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh +index 9f8f0e84ad..a9054d2db1 100755 +--- a/t/t4013-diff-various.sh ++++ b/t/t4013-diff-various.sh +@@ -338,6 +338,8 @@ format-patch --inline --stdout initial..master^^ + format-patch --stdout --cover-letter -n initial..master^ + + diff --abbrev initial..side ++diff -U initial..side ++diff -U1 initial..side + diff -r initial..side + diff --stat initial..side + diff -r --stat initial..side +diff --git a/t/t4013/diff.diff_-U1_initial..side b/t/t4013/diff.diff_-U1_initial..side +new file mode 100644 +index 0000000000..b69f8f048a +--- /dev/null ++++ b/t/t4013/diff.diff_-U1_initial..side +@@ -0,0 +1,29 @@ ++$ git diff -U1 initial..side ++diff --git a/dir/sub b/dir/sub ++index 35d242b..7289e35 100644 ++--- a/dir/sub +++++ b/dir/sub ++@@ -2 +2,3 @@ A ++ B +++1 +++2 ++diff --git a/file0 b/file0 ++index 01e79c3..f4615da 100644 ++--- a/file0 +++++ b/file0 ++@@ -3 +3,4 @@ ++ 3 +++A +++B +++C ++diff --git a/file3 b/file3 ++new file mode 100644 ++index 0000000..7289e35 ++--- /dev/null +++++ b/file3 ++@@ -0,0 +1,4 @@ +++A +++B +++1 +++2 ++$ +diff --git a/t/t4013/diff.diff_-U2_initial..side b/t/t4013/diff.diff_-U2_initial..side +new file mode 100644 +index 0000000000..8ffe04f203 +--- /dev/null ++++ b/t/t4013/diff.diff_-U2_initial..side +@@ -0,0 +1,31 @@ ++$ git diff -U2 initial..side ++diff --git a/dir/sub b/dir/sub ++index 35d242b..7289e35 100644 ++--- a/dir/sub +++++ b/dir/sub ++@@ -1,2 +1,4 @@ ++ A ++ B +++1 +++2 ++diff --git a/file0 b/file0 ++index 01e79c3..f4615da 100644 ++--- a/file0 +++++ b/file0 ++@@ -2,2 +2,5 @@ ++ 2 ++ 3 +++A +++B +++C ++diff --git a/file3 b/file3 ++new file mode 100644 ++index 0000000..7289e35 ++--- /dev/null +++++ b/file3 ++@@ -0,0 +1,4 @@ +++A +++B +++1 +++2 ++$ +diff --git a/t/t4013/diff.diff_-U_initial..side b/t/t4013/diff.diff_-U_initial..side +new file mode 100644 +index 0000000000..c66c0dd5c6 +--- /dev/null ++++ b/t/t4013/diff.diff_-U_initial..side +@@ -0,0 +1,32 @@ ++$ git diff -U initial..side ++diff --git a/dir/sub b/dir/sub ++index 35d242b..7289e35 100644 ++--- a/dir/sub +++++ b/dir/sub ++@@ -1,2 +1,4 @@ ++ A ++ B +++1 +++2 ++diff --git a/file0 b/file0 ++index 01e79c3..f4615da 100644 ++--- a/file0 +++++ b/file0 ++@@ -1,3 +1,6 @@ ++ 1 ++ 2 ++ 3 +++A +++B +++C ++diff --git a/file3 b/file3 ++new file mode 100644 ++index 0000000..7289e35 ++--- /dev/null +++++ b/file3 ++@@ -0,0 +1,4 @@ +++A +++B +++1 +++2 ++$ diff --git a/0003-parse-options-check-empty-value-in-OPT_INTEGER-and-O.patch b/0003-parse-options-check-empty-value-in-OPT_INTEGER-and-O.patch new file mode 100644 index 0000000..f9ecde5 --- /dev/null +++ b/0003-parse-options-check-empty-value-in-OPT_INTEGER-and-O.patch @@ -0,0 +1,63 @@ +From 9709e02ba78d2408269fc81bd27691714ed26e26 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= + +Date: Fri, 24 May 2019 16:24:42 +0700 +Subject: [PATCH 3/3] parse-options: check empty value in OPT_INTEGER and + OPT_ABBREV +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When parsing the argument for OPT_INTEGER and OPT_ABBREV, we check if we +can parse the entire argument to a number with "if (*s)". There is one +missing check: if "arg" is empty to begin with, we fail to notice. + +This could happen with long option by writing like + + git diff --inter-hunk-context= blah blah + +Before 16ed6c97cc (diff-parseopt: convert --inter-hunk-context, +2019-03-24), --inter-hunk-context is handled by a custom parser +opt_arg() and does detect this correctly. + +This restores the bahvior for --inter-hunk-context and make sure all +other integer options are handled the same (sane) way. For OPT_ABBREV +this is new behavior. But it makes it consistent with the rest. + +PS. OPT_MAGNITUDE has similar code but git_parse_ulong() does detect +empty "arg". So it's good to go. + +Signed-off-by: Nguyễn Thái Ngọc Duy +--- + parse-options-cb.c | 3 +++ + parse-options.c | 3 +++ + 2 files changed, 6 insertions(+) + +diff --git a/parse-options-cb.c b/parse-options-cb.c +index 4b95d04a37..a3de795c58 100644 +--- a/parse-options-cb.c ++++ b/parse-options-cb.c +@@ -16,6 +16,9 @@ int parse_opt_abbrev_cb(const struct option *opt, const char *arg, int unset) + if (!arg) { + v = unset ? 0 : DEFAULT_ABBREV; + } else { ++ if (!*arg) ++ return error(_("option `%s' expects a numerical value"), ++ opt->long_name); + v = strtol(arg, (char **)&arg, 10); + if (*arg) + return error(_("option `%s' expects a numerical value"), +diff --git a/parse-options.c b/parse-options.c +index 987e27cb91..87b26a1d92 100644 +--- a/parse-options.c ++++ b/parse-options.c +@@ -195,6 +195,9 @@ static enum parse_opt_result get_value(struct parse_opt_ctx_t *p, + } + if (get_arg(p, opt, flags, &arg)) + return -1; ++ if (!*arg) ++ return error(_("%s expects a numerical value"), ++ optname(opt, flags)); + *(int *)opt->value = strtol(arg, (char **)&s, 10); + if (*s) + return error(_("%s expects a numerical value"), diff --git a/git.spec b/git.spec index 4f7485f..aea3e25 100644 --- a/git.spec +++ b/git.spec @@ -88,7 +88,7 @@ Name: git Version: 2.22.0 -Release: 0.1%{?rcrev}%{?dist} +Release: 0.2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -120,6 +120,11 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch +# https://public-inbox.org/git/20190524092442.701-1-pclouds@gmail.com/T/ +Patch1: 0001-diff-parseopt-correct-variable-types-that-are-used-b.patch +Patch2: 0002-diff-parseopt-restore-U-no-argument-behavior.patch +Patch3: 0003-parse-options-check-empty-value-in-OPT_INTEGER-and-O.patch + %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -956,6 +961,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri May 24 2019 Todd Zullinger - 2.22.0-0.2.rc1 +- Apply upstream fixes for diff-parseopt issues on s390x + * Sun May 19 2019 Todd Zullinger - 2.22.0-0.1.rc1 - Update to 2.22.0-rc1 From 763b9e71e9cd0d434932694a1d25d56111d42178 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 30 May 2019 21:00:55 -0400 Subject: [PATCH 606/842] Update to 2.22.0-rc2 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.22.0.txt --- ...rrect-variable-types-that-are-used-b.patch | 128 ------------ ...seopt-restore-U-no-argument-behavior.patch | 183 ------------------ ...eck-empty-value-in-OPT_INTEGER-and-O.patch | 63 ------ git.spec | 12 +- sources | 4 +- 5 files changed, 7 insertions(+), 383 deletions(-) delete mode 100644 0001-diff-parseopt-correct-variable-types-that-are-used-b.patch delete mode 100644 0002-diff-parseopt-restore-U-no-argument-behavior.patch delete mode 100644 0003-parse-options-check-empty-value-in-OPT_INTEGER-and-O.patch diff --git a/0001-diff-parseopt-correct-variable-types-that-are-used-b.patch b/0001-diff-parseopt-correct-variable-types-that-are-used-b.patch deleted file mode 100644 index be0e181..0000000 --- a/0001-diff-parseopt-correct-variable-types-that-are-used-b.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 64144ae182fb4f01fbbce0e3005057ff95aacc58 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= - -Date: Fri, 24 May 2019 16:24:40 +0700 -Subject: [PATCH 1/3] diff-parseopt: correct variable types that are used by - parseopt -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Most number-related OPT_ macros store the value in an 'int' -variable. Many of the variables in 'struct diff_options' have a -different type, but during the conversion to using parse_options() I -failed to notice and correct. - -The problem was reported on s360x which is a big-endian -architechture. The variable to store '-w' option in this case is -xdl_opts, 'long' type, 8 bytes. But since parse_options() assumes -'int' (4 bytes), it will store bits in the wrong part of xdl_opts. The -problem was found on little-endian platforms because parse_options() -will accidentally store at the right part of xdl_opts. - -There aren't much to say about the type change (except that 'int' for -xdl_opts should still be big enough, since Windows' long is the same -size as 'int' and nobody has complained so far). Some safety checks may -be implemented in the future to prevent class of bugs. - -Reported-by: Todd Zullinger -Signed-off-by: Nguyễn Thái Ngọc Duy ---- - diff.h | 70 +++++++++++++++++++++++++++++----------------------------- - 1 file changed, 35 insertions(+), 35 deletions(-) - -diff --git a/diff.h b/diff.h -index b20cbcc091..4527daf6b7 100644 ---- a/diff.h -+++ b/diff.h -@@ -65,39 +65,39 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data) - - #define DIFF_FLAGS_INIT { 0 } - struct diff_flags { -- unsigned recursive; -- unsigned tree_in_recursive; -- unsigned binary; -- unsigned text; -- unsigned full_index; -- unsigned silent_on_remove; -- unsigned find_copies_harder; -- unsigned follow_renames; -- unsigned rename_empty; -- unsigned has_changes; -- unsigned quick; -- unsigned no_index; -- unsigned allow_external; -- unsigned exit_with_status; -- unsigned reverse_diff; -- unsigned check_failed; -- unsigned relative_name; -- unsigned ignore_submodules; -- unsigned dirstat_cumulative; -- unsigned dirstat_by_file; -- unsigned allow_textconv; -- unsigned textconv_set_via_cmdline; -- unsigned diff_from_contents; -- unsigned dirty_submodules; -- unsigned ignore_untracked_in_submodules; -- unsigned ignore_dirty_submodules; -- unsigned override_submodule_config; -- unsigned dirstat_by_line; -- unsigned funccontext; -- unsigned default_follow_renames; -- unsigned stat_with_summary; -- unsigned suppress_diff_headers; -- unsigned dual_color_diffed_diffs; -+ unsigned int recursive; -+ unsigned int tree_in_recursive; -+ unsigned int binary; -+ unsigned int text; -+ unsigned int full_index; -+ unsigned int silent_on_remove; -+ unsigned int find_copies_harder; -+ unsigned int follow_renames; -+ unsigned int rename_empty; -+ unsigned int has_changes; -+ unsigned int quick; -+ unsigned int no_index; -+ unsigned int allow_external; -+ unsigned int exit_with_status; -+ unsigned int reverse_diff; -+ unsigned int check_failed; -+ unsigned int relative_name; -+ unsigned int ignore_submodules; -+ unsigned int dirstat_cumulative; -+ unsigned int dirstat_by_file; -+ unsigned int allow_textconv; -+ unsigned int textconv_set_via_cmdline; -+ unsigned int diff_from_contents; -+ unsigned int dirty_submodules; -+ unsigned int ignore_untracked_in_submodules; -+ unsigned int ignore_dirty_submodules; -+ unsigned int override_submodule_config; -+ unsigned int dirstat_by_line; -+ unsigned int funccontext; -+ unsigned int default_follow_renames; -+ unsigned int stat_with_summary; -+ unsigned int suppress_diff_headers; -+ unsigned int dual_color_diffed_diffs; - }; - - static inline void diff_flags_or(struct diff_flags *a, -@@ -151,7 +151,7 @@ struct diff_options { - int skip_stat_unmatch; - int line_termination; - int output_format; -- unsigned pickaxe_opts; -+ unsigned int pickaxe_opts; - int rename_score; - int rename_limit; - int needed_rename_limit; -@@ -169,7 +169,7 @@ struct diff_options { - const char *prefix; - int prefix_length; - const char *stat_sep; -- long xdl_opts; -+ int xdl_opts; - - /* see Documentation/diff-options.txt */ - char **anchors; diff --git a/0002-diff-parseopt-restore-U-no-argument-behavior.patch b/0002-diff-parseopt-restore-U-no-argument-behavior.patch deleted file mode 100644 index b29c262..0000000 --- a/0002-diff-parseopt-restore-U-no-argument-behavior.patch +++ /dev/null @@ -1,183 +0,0 @@ -From 23f586f2524569218de43c10cd41c3d271198a9e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= - -Date: Fri, 24 May 2019 16:24:41 +0700 -Subject: [PATCH 2/3] diff-parseopt: restore -U (no argument) behavior -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Before d473e2e0e8 (diff.c: convert -U|--unified, 2019-01-27), -U and ---unified are implemented with a custom parser opt_arg() in diff.c. I -didn't check this code carefully and not realize that it's the -equivalent of PARSE_OPT_NONEG | PARSE_OPT_OPTARG. - -In other words, if -U is specified without any argument, the option -should be accepted, and the default value should be used. Without -PARSE_OPT_OPTARG, parse_options() will reject this case and cause a -regression. - -Reported-by: Bryan Turner -Signed-off-by: Nguyễn Thái Ngọc Duy ---- - diff.c | 10 +++++---- - t/t4013-diff-various.sh | 2 ++ - t/t4013/diff.diff_-U1_initial..side | 29 ++++++++++++++++++++++++++ - t/t4013/diff.diff_-U2_initial..side | 31 ++++++++++++++++++++++++++++ - t/t4013/diff.diff_-U_initial..side | 32 +++++++++++++++++++++++++++++ - 5 files changed, 100 insertions(+), 4 deletions(-) - create mode 100644 t/t4013/diff.diff_-U1_initial..side - create mode 100644 t/t4013/diff.diff_-U2_initial..side - create mode 100644 t/t4013/diff.diff_-U_initial..side - -diff --git a/diff.c b/diff.c -index 4d3cf83a27..80ddc11671 100644 ---- a/diff.c -+++ b/diff.c -@@ -5211,9 +5211,11 @@ static int diff_opt_unified(const struct option *opt, - - BUG_ON_OPT_NEG(unset); - -- options->context = strtol(arg, &s, 10); -- if (*s) -- return error(_("%s expects a numerical value"), "--unified"); -+ if (arg) { -+ options->context = strtol(arg, &s, 10); -+ if (*s) -+ return error(_("%s expects a numerical value"), "--unified"); -+ } - enable_patch_output(&options->output_format); - - return 0; -@@ -5272,7 +5274,7 @@ static void prep_parse_options(struct diff_options *options) - DIFF_FORMAT_PATCH, DIFF_FORMAT_NO_OUTPUT), - OPT_CALLBACK_F('U', "unified", options, N_(""), - N_("generate diffs with lines context"), -- PARSE_OPT_NONEG, diff_opt_unified), -+ PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_unified), - OPT_BOOL('W', "function-context", &options->flags.funccontext, - N_("generate diffs with lines context")), - OPT_BIT_F(0, "raw", &options->output_format, -diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh -index 9f8f0e84ad..a9054d2db1 100755 ---- a/t/t4013-diff-various.sh -+++ b/t/t4013-diff-various.sh -@@ -338,6 +338,8 @@ format-patch --inline --stdout initial..master^^ - format-patch --stdout --cover-letter -n initial..master^ - - diff --abbrev initial..side -+diff -U initial..side -+diff -U1 initial..side - diff -r initial..side - diff --stat initial..side - diff -r --stat initial..side -diff --git a/t/t4013/diff.diff_-U1_initial..side b/t/t4013/diff.diff_-U1_initial..side -new file mode 100644 -index 0000000000..b69f8f048a ---- /dev/null -+++ b/t/t4013/diff.diff_-U1_initial..side -@@ -0,0 +1,29 @@ -+$ git diff -U1 initial..side -+diff --git a/dir/sub b/dir/sub -+index 35d242b..7289e35 100644 -+--- a/dir/sub -++++ b/dir/sub -+@@ -2 +2,3 @@ A -+ B -++1 -++2 -+diff --git a/file0 b/file0 -+index 01e79c3..f4615da 100644 -+--- a/file0 -++++ b/file0 -+@@ -3 +3,4 @@ -+ 3 -++A -++B -++C -+diff --git a/file3 b/file3 -+new file mode 100644 -+index 0000000..7289e35 -+--- /dev/null -++++ b/file3 -+@@ -0,0 +1,4 @@ -++A -++B -++1 -++2 -+$ -diff --git a/t/t4013/diff.diff_-U2_initial..side b/t/t4013/diff.diff_-U2_initial..side -new file mode 100644 -index 0000000000..8ffe04f203 ---- /dev/null -+++ b/t/t4013/diff.diff_-U2_initial..side -@@ -0,0 +1,31 @@ -+$ git diff -U2 initial..side -+diff --git a/dir/sub b/dir/sub -+index 35d242b..7289e35 100644 -+--- a/dir/sub -++++ b/dir/sub -+@@ -1,2 +1,4 @@ -+ A -+ B -++1 -++2 -+diff --git a/file0 b/file0 -+index 01e79c3..f4615da 100644 -+--- a/file0 -++++ b/file0 -+@@ -2,2 +2,5 @@ -+ 2 -+ 3 -++A -++B -++C -+diff --git a/file3 b/file3 -+new file mode 100644 -+index 0000000..7289e35 -+--- /dev/null -++++ b/file3 -+@@ -0,0 +1,4 @@ -++A -++B -++1 -++2 -+$ -diff --git a/t/t4013/diff.diff_-U_initial..side b/t/t4013/diff.diff_-U_initial..side -new file mode 100644 -index 0000000000..c66c0dd5c6 ---- /dev/null -+++ b/t/t4013/diff.diff_-U_initial..side -@@ -0,0 +1,32 @@ -+$ git diff -U initial..side -+diff --git a/dir/sub b/dir/sub -+index 35d242b..7289e35 100644 -+--- a/dir/sub -++++ b/dir/sub -+@@ -1,2 +1,4 @@ -+ A -+ B -++1 -++2 -+diff --git a/file0 b/file0 -+index 01e79c3..f4615da 100644 -+--- a/file0 -++++ b/file0 -+@@ -1,3 +1,6 @@ -+ 1 -+ 2 -+ 3 -++A -++B -++C -+diff --git a/file3 b/file3 -+new file mode 100644 -+index 0000000..7289e35 -+--- /dev/null -++++ b/file3 -+@@ -0,0 +1,4 @@ -++A -++B -++1 -++2 -+$ diff --git a/0003-parse-options-check-empty-value-in-OPT_INTEGER-and-O.patch b/0003-parse-options-check-empty-value-in-OPT_INTEGER-and-O.patch deleted file mode 100644 index f9ecde5..0000000 --- a/0003-parse-options-check-empty-value-in-OPT_INTEGER-and-O.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 9709e02ba78d2408269fc81bd27691714ed26e26 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= - -Date: Fri, 24 May 2019 16:24:42 +0700 -Subject: [PATCH 3/3] parse-options: check empty value in OPT_INTEGER and - OPT_ABBREV -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When parsing the argument for OPT_INTEGER and OPT_ABBREV, we check if we -can parse the entire argument to a number with "if (*s)". There is one -missing check: if "arg" is empty to begin with, we fail to notice. - -This could happen with long option by writing like - - git diff --inter-hunk-context= blah blah - -Before 16ed6c97cc (diff-parseopt: convert --inter-hunk-context, -2019-03-24), --inter-hunk-context is handled by a custom parser -opt_arg() and does detect this correctly. - -This restores the bahvior for --inter-hunk-context and make sure all -other integer options are handled the same (sane) way. For OPT_ABBREV -this is new behavior. But it makes it consistent with the rest. - -PS. OPT_MAGNITUDE has similar code but git_parse_ulong() does detect -empty "arg". So it's good to go. - -Signed-off-by: Nguyễn Thái Ngọc Duy ---- - parse-options-cb.c | 3 +++ - parse-options.c | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/parse-options-cb.c b/parse-options-cb.c -index 4b95d04a37..a3de795c58 100644 ---- a/parse-options-cb.c -+++ b/parse-options-cb.c -@@ -16,6 +16,9 @@ int parse_opt_abbrev_cb(const struct option *opt, const char *arg, int unset) - if (!arg) { - v = unset ? 0 : DEFAULT_ABBREV; - } else { -+ if (!*arg) -+ return error(_("option `%s' expects a numerical value"), -+ opt->long_name); - v = strtol(arg, (char **)&arg, 10); - if (*arg) - return error(_("option `%s' expects a numerical value"), -diff --git a/parse-options.c b/parse-options.c -index 987e27cb91..87b26a1d92 100644 ---- a/parse-options.c -+++ b/parse-options.c -@@ -195,6 +195,9 @@ static enum parse_opt_result get_value(struct parse_opt_ctx_t *p, - } - if (get_arg(p, opt, flags, &arg)) - return -1; -+ if (!*arg) -+ return error(_("%s expects a numerical value"), -+ optname(opt, flags)); - *(int *)opt->value = strtol(arg, (char **)&s, 10); - if (*s) - return error(_("%s expects a numerical value"), diff --git a/git.spec b/git.spec index aea3e25..bd58147 100644 --- a/git.spec +++ b/git.spec @@ -84,11 +84,11 @@ %endif # Define for release candidates -%global rcrev .rc1 +%global rcrev .rc2 Name: git Version: 2.22.0 -Release: 0.2%{?rcrev}%{?dist} +Release: 0.3%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -120,11 +120,6 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# https://public-inbox.org/git/20190524092442.701-1-pclouds@gmail.com/T/ -Patch1: 0001-diff-parseopt-correct-variable-types-that-are-used-b.patch -Patch2: 0002-diff-parseopt-restore-U-no-argument-behavior.patch -Patch3: 0003-parse-options-check-empty-value-in-OPT_INTEGER-and-O.patch - %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -961,6 +956,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu May 30 2019 Todd Zullinger - 2.22.0-0.3.rc2 +- Update to 2.22.0-rc1 + * Fri May 24 2019 Todd Zullinger - 2.22.0-0.2.rc1 - Apply upstream fixes for diff-parseopt issues on s390x diff --git a/sources b/sources index 4cbcacd..1ae8aaf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.22.0.rc1.tar.xz) = c3d878f7b5b4c4d67d4c8f20ab07a54c2bb4c2646feedc4a670e28849bb544177ab7aab6458bc982774c954b6c05b8e83acf3b9c5eeecccb34776cac16cfe1e1 -SHA512 (git-2.22.0.rc1.tar.sign) = a900071d502ec2eaa6c5befd33c4fd62f5fa7be56aafb6e432193ad3d3810846fd191a831b97fc5e64bfbd839968a101ee5ae7f1c318d23a6c062cd220a3bce6 +SHA512 (git-2.22.0.rc2.tar.xz) = 7222181a478a1d7306732e2404cf0569ed2545864cc059c9a48760cd5b7c85d44ff2d2a38b5c40e4aaf5eae51b822272b3865c8b0e0116888116a66a125d9f6f +SHA512 (git-2.22.0.rc2.tar.sign) = 05df9349ed3959e61220c0c017b1c203edb6a8c9b0408b90e77986981e0cc59b8eecafcc0cd099c487f4a2b537d63ecf0f0a6c0149957db050f14c1b5ffb505a From 2fb7861861091b4addd48e3ddf345eab5dbb4f55 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sat, 1 Jun 2019 20:21:17 +0200 Subject: [PATCH 607/842] Perl 5.30 rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index bd58147..52a2182 100644 --- a/git.spec +++ b/git.spec @@ -88,7 +88,7 @@ Name: git Version: 2.22.0 -Release: 0.3%{?rcrev}%{?dist} +Release: 0.4%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -956,6 +956,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sat Jun 01 2019 Jitka Plesnikova - 2.22.0-0.4.rc2 +- Perl 5.30 rebuild + * Thu May 30 2019 Todd Zullinger - 2.22.0-0.3.rc2 - Update to 2.22.0-rc1 From 9528c261f52ace06c232e435b7acb21edbec00b3 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sun, 2 Jun 2019 22:59:52 +0200 Subject: [PATCH 608/842] Perl 5.30 re-rebuild of bootstrapped packages --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 52a2182..6518cb9 100644 --- a/git.spec +++ b/git.spec @@ -88,7 +88,7 @@ Name: git Version: 2.22.0 -Release: 0.4%{?rcrev}%{?dist} +Release: 0.5%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -956,6 +956,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sun Jun 02 2019 Jitka Plesnikova - 2.22.0-0.5.rc2 +- Perl 5.30 re-rebuild of bootstrapped packages + * Sat Jun 01 2019 Jitka Plesnikova - 2.22.0-0.4.rc2 - Perl 5.30 rebuild From 21cae1e2e47d98f5c3aafb143a2eeb49d7e41dfe Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 3 Jun 2019 19:20:50 -0400 Subject: [PATCH 609/842] Update to 2.22.0-rc3 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.22.0.txt --- git.spec | 4 ++-- sources | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 6518cb9..f65db33 100644 --- a/git.spec +++ b/git.spec @@ -84,11 +84,11 @@ %endif # Define for release candidates -%global rcrev .rc2 +%global rcrev .rc3 Name: git Version: 2.22.0 -Release: 0.5%{?rcrev}%{?dist} +Release: 0.6%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ diff --git a/sources b/sources index 1ae8aaf..e19f6ca 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.22.0.rc2.tar.xz) = 7222181a478a1d7306732e2404cf0569ed2545864cc059c9a48760cd5b7c85d44ff2d2a38b5c40e4aaf5eae51b822272b3865c8b0e0116888116a66a125d9f6f -SHA512 (git-2.22.0.rc2.tar.sign) = 05df9349ed3959e61220c0c017b1c203edb6a8c9b0408b90e77986981e0cc59b8eecafcc0cd099c487f4a2b537d63ecf0f0a6c0149957db050f14c1b5ffb505a +SHA512 (git-2.22.0.rc3.tar.xz) = 5b3afad675526b0a14caaa78dacae132445bf155abad00db65c5d667f04aa00394c6fa09883cd22e95dcfd7ea3ab6b5177b579c0c6999ca3cee2ad46bdaca6aa +SHA512 (git-2.22.0.rc3.tar.sign) = ba3a979adf57121879c8112295e0024f223b631126cc8b40e71284aee3c0b9f6e151cb5876e223855cb20babb174f1c0f7af96765ae1b78cf5339a5d7c28b796 From 910a5f715161ca520f60ca0ff189f1276c7dffb7 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 4 Jun 2019 14:49:05 +0200 Subject: [PATCH 610/842] Perl 5.30 re-rebuild updated packages --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index f65db33..58cce4c 100644 --- a/git.spec +++ b/git.spec @@ -88,7 +88,7 @@ Name: git Version: 2.22.0 -Release: 0.6%{?rcrev}%{?dist} +Release: 0.7%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -956,6 +956,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Jun 04 2019 Jitka Plesnikova - 2.22.0-0.7.rc3 +- Perl 5.30 re-rebuild updated packages + * Sun Jun 02 2019 Jitka Plesnikova - 2.22.0-0.5.rc2 - Perl 5.30 re-rebuild of bootstrapped packages From 666aaebbc9fb373d084d5b448003953651ccd92d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 4 Jun 2019 11:30:03 -0400 Subject: [PATCH 611/842] Add changelog entry for 2.22.0-0.6.rc3 I failed to add this entry in 21cae1e ("Update to 2.22.0-rc3", 2019-06-03). --- git.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git.spec b/git.spec index 58cce4c..1c0e168 100644 --- a/git.spec +++ b/git.spec @@ -959,6 +959,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" * Tue Jun 04 2019 Jitka Plesnikova - 2.22.0-0.7.rc3 - Perl 5.30 re-rebuild updated packages +* Mon Jun 03 2019 Todd Zullinger - 2.22.0-0.6.rc3 +- Update to 2.22.0-rc3 + * Sun Jun 02 2019 Jitka Plesnikova - 2.22.0-0.5.rc2 - Perl 5.30 re-rebuild of bootstrapped packages From b5ef6c9e8b9b5bb62c761f2cddf9857c33204507 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 7 Jun 2019 17:48:29 -0400 Subject: [PATCH 612/842] Update to 2.22.0 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.22.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 1c0e168..2d78e9e 100644 --- a/git.spec +++ b/git.spec @@ -84,11 +84,11 @@ %endif # Define for release candidates -%global rcrev .rc3 +#global rcrev .rc0 Name: git Version: 2.22.0 -Release: 0.7%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -956,6 +956,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Jun 07 2019 Todd Zullinger - 2.22.0-1 +- Update to 2.22.0 + * Tue Jun 04 2019 Jitka Plesnikova - 2.22.0-0.7.rc3 - Perl 5.30 re-rebuild updated packages diff --git a/sources b/sources index e19f6ca..6926a1a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.22.0.rc3.tar.xz) = 5b3afad675526b0a14caaa78dacae132445bf155abad00db65c5d667f04aa00394c6fa09883cd22e95dcfd7ea3ab6b5177b579c0c6999ca3cee2ad46bdaca6aa -SHA512 (git-2.22.0.rc3.tar.sign) = ba3a979adf57121879c8112295e0024f223b631126cc8b40e71284aee3c0b9f6e151cb5876e223855cb20babb174f1c0f7af96765ae1b78cf5339a5d7c28b796 +SHA512 (git-2.22.0.tar.xz) = 75b3dcac36f80281effcd099944de34050a35f3599ce42f86ce60455b6c952039fb0f6438d296e0cc9c0651d4a17f467780dc475669227d3c98ddefe91723d42 +SHA512 (git-2.22.0.tar.sign) = e6834bbe486c0374ce2de7a5922ee0c040153405e8dc03c677f29fde4bb8c3aff04549055ad122657e5bb0c7308544eca3530be9024dd891c4986d179ac53eb0 From edc147ffe0178fd20356d155217d0ff9bbef2fcc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 03:26:35 +0000 Subject: [PATCH 613/842] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 2d78e9e..49f1391 100644 --- a/git.spec +++ b/git.spec @@ -88,7 +88,7 @@ Name: git Version: 2.22.0 -Release: 1%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist}.1 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -956,6 +956,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.22.0-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Jun 07 2019 Todd Zullinger - 2.22.0-1 - Update to 2.22.0 From e733d5d89810021c8a5f7f82b3ee81f7b6f21356 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 13 Jun 2019 13:28:31 -0400 Subject: [PATCH 614/842] completion: do not cache if --git-completion-helper fails "git --git-completion-helper" could fail if the command checks for a repo before parse_options(). If the result is cached, later on when the user moves to a worktree with repo, tab completion will still fail. Avoid this by detecting errors and not cache the completion output. --- ...t-cache-if-git-completion-helper-fai.patch | 51 +++++++++++++++++++ git.spec | 10 +++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 0001-completion-do-not-cache-if-git-completion-helper-fai.patch diff --git a/0001-completion-do-not-cache-if-git-completion-helper-fai.patch b/0001-completion-do-not-cache-if-git-completion-helper-fai.patch new file mode 100644 index 0000000..66940c2 --- /dev/null +++ b/0001-completion-do-not-cache-if-git-completion-helper-fai.patch @@ -0,0 +1,51 @@ +From 69702523afb4de692b415648e53fcfb1b4630f18 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= + +Date: Wed, 12 Jun 2019 15:56:06 +0700 +Subject: [PATCH] completion: do not cache if --git-completion-helper fails +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +"git --git-completion-helper" could fail if the command checks for +a repo before parse_options(). If the result is cached, later on when +the user moves to a worktree with repo, tab completion will still fail. + +Avoid this by detecting errors and not cache the completion output. We +can try again and hopefully succeed next time (e.g. when a repo is +found). + +Of course if --git-completion-helper fails permanently because of other +reasons (*), this will slow down completion. But I don't see any better +option to handle that case. + +(*) one of those cases is if __gitcomp_builtin is called on a command + that does not support --git-completion-helper. And we do have a + generic call + + __git_complete_common "$command" + + but this case is protected with __git_support_parseopt_helper so we're + good. + +Reported-by: Felipe Contreras +Signed-off-by: Nguyễn Thái Ngọc Duy +Signed-off-by: Junio C Hamano +--- + contrib/completion/git-completion.bash | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash +index 499e56f83d0a0..00cc695e3d748 100644 +--- a/contrib/completion/git-completion.bash ++++ b/contrib/completion/git-completion.bash +@@ -400,7 +400,8 @@ __gitcomp_builtin () + if [ -z "$options" ]; then + # leading and trailing spaces are significant to make + # option removal work correctly. +- options=" $incl $(__git ${cmd/_/ } --git-completion-helper) " ++ options=" $incl $(__git ${cmd/_/ } --git-completion-helper) " || return ++ + for i in $excl; do + options="${options/ $i / }" + done diff --git a/git.spec b/git.spec index 49f1391..6ffacae 100644 --- a/git.spec +++ b/git.spec @@ -88,7 +88,7 @@ Name: git Version: 2.22.0 -Release: 1%{?rcrev}%{?dist}.1 +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -120,6 +120,11 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch +# Don't cache completion results if --git-completion-helper fails +# https://public-inbox.org/git/20190612085606.12144-1-pclouds@gmail.com/ +# https://github.com/gitster/git/commit/69702523a.patch +Patch1: 0001-completion-do-not-cache-if-git-completion-helper-fai.patch + %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -956,6 +961,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Jul 25 2019 Todd Zullinger - 2.22.0-2 +- completion: do not cache if --git-completion-helper fails + * Thu Jul 25 2019 Fedora Release Engineering - 2.22.0-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From b52ad890acc2e743ae2464c8e1e17f51b05f6c2a Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 13 Jun 2019 13:34:34 -0400 Subject: [PATCH 615/842] avoid trailing comments in spec file Spec file comments are only officially supported at the start of a line. Trailing comments only worked unintentionally and rpm >= 4.15 warns about such comments. Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/CKQCK5MDN6PFGAD4YOMXTO3SDAUKTCUT/ --- git.spec | 172 +++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 115 insertions(+), 57 deletions(-) diff --git a/git.spec b/git.spec index 6ffacae..d9c2c5b 100644 --- a/git.spec +++ b/git.spec @@ -132,8 +132,10 @@ BuildRequires: asciidoc >= 8.4.1 BuildRequires: xmlto %if %{with linkcheck} BuildRequires: linkchecker -%endif # with linkcheck -%endif # with docs +%endif +# endif with linkcheck +%endif +# endif with docs BuildRequires: desktop-file-utils BuildRequires: emacs BuildRequires: expat-devel @@ -145,7 +147,8 @@ BuildRequires: gnupg2 BuildRequires: libcurl-devel %if %{libsecret} BuildRequires: libsecret-devel -%endif # libsecret +%endif +# endif libsecret BuildRequires: make BuildRequires: openssl-devel BuildRequires: pcre2-devel @@ -153,20 +156,24 @@ BuildRequires: perl(Error) BuildRequires: perl(Test) %if %{use_perl_generators} BuildRequires: perl-generators -%endif # use_perl_generators +%endif +# endif use_perl_generators %if %{use_perl_interpreter} BuildRequires: perl-interpreter %else BuildRequires: perl -%endif # use_perl_interpreter +%endif +# endif use_perl_interpreter %if %{bashcomp_pkgconfig} BuildRequires: pkgconfig(bash-completion) -%endif # bashcomp_pkgconfig +%endif +# endif bashcomp_pkgconfig BuildRequires: sed %if %{use_systemd} # For macros BuildRequires: systemd -%endif # use_systemd +%endif +# endif use_systemd BuildRequires: tcl BuildRequires: tk BuildRequires: zlib-devel >= 1.2 @@ -177,32 +184,39 @@ BuildRequires: acl %if 0%{?fedora} >= 27 || 0%{?rhel} > 7 # Needed by t5540-http-push-webdav.sh BuildRequires: apr-util-bdb -%endif # fedora >= 27 +%endif +# endif fedora >= 27 BuildRequires: bash %if %{with cvs} BuildRequires: cvs BuildRequires: cvsps -%endif # with cvs +%endif +# endif with cvs %if %{use_glibc_langpacks} # glibc-all-langpacks and glibc-langpack-is are needed for GETTEXT_LOCALE and # GETTEXT_ISO_LOCALE test prereq's, glibc-langpack-en ensures en_US.UTF-8. BuildRequires: glibc-all-langpacks BuildRequires: glibc-langpack-en BuildRequires: glibc-langpack-is -%endif # use_glibc_langpacks +%endif +# endif use_glibc_langpacks %if 0%{?fedora} && 0%{?fedora} < 30 BuildRequires: gnupg -%endif # fedora < 30 +%endif +# endif fedora < 30 %if 0%{?fedora} || 0%{?rhel} > 8 BuildRequires: gnupg2-smime -%endif # fedora or el > 8 +%endif +# endif fedora or el > 8 %if 0%{?fedora} || ( 0%{?rhel} && ( 0%{?rhel} == 6 || 0%{?rhel} >= 7 && %{_arch} != ppc64 )) BuildRequires: highlight -%endif # fedora, el-6, or el7-ppc64 +%endif +# endif fedora, el-6, or el7-ppc64 BuildRequires: httpd %if 0%{?fedora} && ! ( %{_arch} == i386 || %{_arch} == s390x ) BuildRequires: jgit -%endif # fedora (except i386 and s390x) +%endif +# endif fedora (except i386 and s390x) BuildRequires: mod_dav_svn BuildRequires: perl(App::Prove) BuildRequires: perl(CGI) @@ -220,40 +234,48 @@ BuildRequires: perl(Test::More) BuildRequires: perl(Time::HiRes) %if %{with python2} BuildRequires: python2-devel -%endif # with python2 +%endif +# endif with python2 %if %{with python3} BuildRequires: python3-devel -%endif # with python3 +%endif +# endif with python3 BuildRequires: subversion BuildRequires: subversion-perl BuildRequires: time -%endif # with tests +%endif +# endif with tests Requires: git-core = %{version}-%{release} Requires: git-core-doc = %{version}-%{release} %if ! %{defined perl_bootstrap} Requires: perl(Term::ReadKey) -%endif # ! defined perl_bootstrap +%endif +# endif ! defined perl_bootstrap Requires: perl-Git = %{version}-%{release} %if %{emacs_filesystem} && %{defined _emacs_version} Requires: emacs-filesystem >= %{_emacs_version} -%endif # emacs_filesystem +%endif +# endif emacs_filesystem # Obsolete git-cvs if it's disabled %if %{without cvs} Obsoletes: git-cvs < %{?epoch:%{epoch}:}%{version}-%{release} -%endif # without cvs +%endif +# endif without cvs # Obsolete gnome-keyring credential helper (remove after Fedora 29) %if 0%{?fedora} && 0%{?fedora} < 30 Obsoletes: git-gnome-keyring < 2.11.1-4 -%endif # fedora < 30 +%endif +# endif fedora < 30 # Obsolete git-p4 if it's disabled %if %{without p4} Obsoletes: git-p4 < %{?epoch:%{epoch}:}%{version}-%{release} -%endif # without p4 +%endif +# endif without p4 %description Git is a fast, scalable, distributed revision control system with an @@ -270,12 +292,14 @@ BuildArch: noarch Requires: git = %{version}-%{release} %if %{with cvs} Requires: git-cvs = %{version}-%{release} -%endif # with cvs +%endif +# endif with cvs Requires: git-email = %{version}-%{release} Requires: git-gui = %{version}-%{release} %if %{with p4} Requires: git-p4 = %{version}-%{release} -%endif # with p4 +%endif +# endif with p4 Requires: git-subtree = %{version}-%{release} Requires: git-svn = %{version}-%{release} Requires: git-instaweb = %{version}-%{release} @@ -283,10 +307,12 @@ Requires: gitk = %{version}-%{release} Requires: perl-Git = %{version}-%{release} %if ! %{defined perl_bootstrap} Requires: perl(Term::ReadKey) -%endif # ! defined perl_bootstrap +%endif +# endif ! defined perl_bootstrap %if ! %{emacs_filesystem} Requires: emacs-git = %{version}-%{release} -%endif # ! emacs_filesystem +%endif +# endif ! emacs_filesystem %description all Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations @@ -326,7 +352,8 @@ Requires: cvsps Requires: perl(DBD::SQLite) %description cvs %{summary}. -%endif # with cvs +%endif +# endif with cvs %package daemon Summary: Git protocol daemon @@ -338,7 +365,8 @@ Requires(preun): systemd Requires(postun): systemd %else Requires: xinetd -%endif # use_systemd +%endif +# endif use_systemd %description daemon The git daemon for supporting git:// access to git repositories @@ -361,7 +389,8 @@ Obsoletes: emacs-git-el < 2.18.0-0.0 Provides: emacs-git-el = %{version}-%{release} %description -n emacs-git %{summary}. -%endif # ! emacs_filesystem +%endif +# endif ! emacs_filesystem %package -n gitk Summary: Git repository browser @@ -405,7 +434,8 @@ BuildRequires: python2-devel Requires: git = %{version}-%{release} %description p4 %{summary}. -%endif # with p4 +%endif +# endif with p4 %package -n perl-Git Summary: Perl interface to Git @@ -438,7 +468,8 @@ Requires: git = %{version}-%{release} Requires: perl(Digest::MD5) %if ! %{defined perl_bootstrap} Requires: perl(Term::ReadKey) -%endif # ! defined perl_bootstrap +%endif +# endif ! defined perl_bootstrap Requires: subversion %description svn %{summary}. @@ -466,12 +497,14 @@ sed -i '/^git-archimport/d' command-list.txt %if %{without cvs} # Remove git-cvs* from command list sed -i '/^git-cvs/d' command-list.txt -%endif # without cvs +%endif +# endif without cvs %if %{without p4} # Remove git-p4 from command list sed -i '/^git-p4/d' command-list.txt -%endif # without p4 +%endif +# endif without p4 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -490,7 +523,8 @@ NO_PERL_CPAN_FALLBACKS = 1 PYTHON_PATH = %{__python2} %else NO_PYTHON = 1 -%endif # with python2 +%endif +# endif with python2 htmldir = %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} prefix = %{_prefix} perllibdir = %{perl_vendorlib} @@ -512,7 +546,8 @@ cat config.mak %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}perl\\(packed-refs\\) %if ! %{defined perl_bootstrap} %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}perl\\(Term::ReadKey\\) -%endif # ! defined perl_bootstrap +%endif +# endif ! defined perl_bootstrap %else cat << \EOF > %{name}-req #!/bin/sh @@ -522,7 +557,8 @@ EOF %global __perl_requires %{_builddir}/%{name}-%{version}%{?rcrev}/%{name}-req chmod +x %{__perl_requires} -%endif # use_new_rpm_filters +%endif +# endif use_new_rpm_filters # Remove Git::LoadCPAN to ensure we use only system perl modules. This also # allows the dependencies to be automatically processed by rpm. @@ -548,7 +584,8 @@ export SOURCE_DATE_EPOCH=$(date -r version +%%s 2>/dev/null) %if %{libsecret} %make_build -C contrib/credential/libsecret/ -%endif # libsecret +%endif +# endif libsecret %make_build -C contrib/diff-highlight/ @@ -567,7 +604,8 @@ sed -i -e '1s@#! */usr/bin/env python$@#!%{__python2}@' \ # Remove contrib/fast-import/import-zips.py, contrib/hg-to-git, and # contrib/svn-fe which all require python2. rm -rf contrib/fast-import/import-zips.py contrib/hg-to-git contrib/svn-fe -%endif # with python2 +%endif +# endif with python2 # The multimail hook is installed with git. Use python3 to avoid an # unnecessary python2 dependency, if possible. @@ -576,7 +614,8 @@ sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \ contrib/hooks/multimail/git_multimail.py \ contrib/hooks/multimail/migrate-mailhook-config \ contrib/hooks/multimail/post-receive.example -%endif # with python3 +%endif +# endif with python3 %install %make_install %{?with_docs:install-doc} @@ -596,7 +635,8 @@ popd >/dev/null %if %{libsecret} install -pm 755 contrib/credential/libsecret/git-credential-libsecret \ %{buildroot}%{gitexecdir} -%endif # libsecret +%endif +# endif libsecret install -pm 755 contrib/credential/netrc/git-credential-netrc \ %{buildroot}%{gitexecdir} # temporarily move contrib/credential/netrc aside to prevent it from being @@ -625,13 +665,15 @@ find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ' # Remove git-cvs* and gitcvs* find %{buildroot} Documentation \( -type f -o -type l \) \ \( -name 'git-cvs*' -o -name 'gitcvs*' \) -exec rm -f {} ';' -%endif # without cvs +%endif +# endif without cvs %if %{without p4} # Remove git-p4* and mergetools/p4merge find %{buildroot} Documentation -type f -name 'git-p4*' -exec rm -f {} ';' rm -f %{buildroot}%{gitexecdir}/mergetools/p4merge -%endif # without p4 +%endif +# endif without p4 # Remove unneeded git-remote-testsvn so git-svn can be noarch rm -f %{buildroot}%{gitexecdir}/git-remote-testsvn @@ -648,7 +690,8 @@ sed -i "/Git\/SVN/ d" perl-git-files (find %{buildroot}%{_mandir} -type f | grep -vE "$exclude_re|Git" | sed -e s@^%{buildroot}@@ -e 's/$/*/' ) >> bin-man-doc-files %else rm -rf %{buildroot}%{_mandir} -%endif # with docs +%endif +# endif with docs mkdir -p %{buildroot}%{_localstatedir}/lib/git %if %{use_systemd} @@ -663,7 +706,8 @@ perl -p \ -e "s|\@GITEXECDIR\@|%{gitexecdir}|g;" \ -e "s|\@BASE_PATH\@|%{_localstatedir}/lib/git|g;" \ %{SOURCE11} > %{buildroot}%{_sysconfdir}/xinetd.d/git -%endif # use_systemd +%endif +# endif use_systemd # Setup bash completion install -Dpm 644 contrib/completion/git-completion.bash %{buildroot}%{bashcompdir}/git @@ -717,7 +761,8 @@ grep -vE "$not_core_re|%{_mandir}" bin-man-doc-files > bin-files-core touch man-doc-files-core %if %{with docs} grep -vE "$not_core_re" bin-man-doc-files | grep "%{_mandir}" > man-doc-files-core -%endif # with docs +%endif +# endif with docs grep -E "$not_core_re" bin-man-doc-files > bin-man-doc-git-files ##### DOC @@ -736,7 +781,8 @@ cp -pr Documentation/*.html Documentation/docbook-xsl.css %{buildroot}%{_pkgdocd cp -pr Documentation/{howto,technical} %{buildroot}%{_pkgdocdir}/ find %{buildroot}%{_pkgdocdir}/{howto,technical} -type f \ |grep -o "%{_pkgdocdir}.*$" >> man-doc-files-core -%endif # with docs +%endif +# endif with docs { find %{buildroot}%{_pkgdocdir} -type f -maxdepth 1 \ @@ -753,12 +799,14 @@ find %{buildroot}%{_pkgdocdir}/{howto,technical} -type f \ %if %{without tests} echo "*** Skipping tests" exit 0 -%endif # without tests +%endif +# endif without tests %if %{with docs} && %{with linkcheck} # Test links in HTML documentation find %{buildroot}%{_pkgdocdir} -name "*.html" -print0 | xargs -r0 linkchecker -%endif # with docs && with linkcheck +%endif +# endif with docs && with linkcheck # Tests to skip on all releases and architectures GIT_SKIP_TESTS="" @@ -771,7 +819,8 @@ GIT_SKIP_TESTS="" # t5541.33 '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.33 t5551.25" -%endif # aarch64 %%{arm} %%{power64} +%endif +# endif aarch64 %%{arm} %%{power64} %ifarch %{power64} # Skip tests which fail on ppc @@ -781,7 +830,8 @@ GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5541.33 t5551.25" # due to an issue in the test suite or a conflict with some other process on # the build host. It only appears to occur on ppc-arches. GIT_SKIP_TESTS="$GIT_SKIP_TESTS t9115" -%endif # %%{power64} +%endif +# endif %%{power64} export GIT_SKIP_TESTS @@ -824,12 +874,14 @@ rmdir --ignore-fail-on-non-empty "$testdir" %postun daemon %systemd_postun_with_restart git@.service -%endif # use_systemd +%endif +# endif use_systemd %files -f bin-man-doc-git-files %if %{emacs_filesystem} %{elispdir} -%endif # emacs_filesystem +%endif +# endif emacs_filesystem %{_datadir}/git-core/contrib/diff-highlight %{_datadir}/git-core/contrib/hooks/multimail %{_datadir}/git-core/contrib/hooks/update-paranoid @@ -861,7 +913,8 @@ rmdir --ignore-fail-on-non-empty "$testdir" %if 0%{?rhel} && 0%{?rhel} <= 7 # .py files are only bytecompiled on EL <= 7 %exclude %{_pkgdocdir}/contrib/*/*.py[co] -%endif # rhel <= 7 +%endif +# endif rhel <= 7 %{_pkgdocdir}/contrib/hooks %if %{with cvs} @@ -871,7 +924,8 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{gitexecdir}/*cvs* %{?with_docs:%{_mandir}/man1/*cvs*.1*} %{?with_docs:%{_pkgdocdir}/*git-cvs*.html} -%endif # with cvs +%endif +# endif with cvs %files daemon %{_pkgdocdir}/git-daemon*.txt @@ -880,7 +934,8 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{_unitdir}/git@.service %else %config(noreplace)%{_sysconfdir}/xinetd.d/git -%endif # use_systemd +%endif +# endif use_systemd %{gitexecdir}/git-daemon %{_localstatedir}/lib/git %{?with_docs:%{_mandir}/man1/git-daemon*.1*} @@ -890,7 +945,8 @@ rmdir --ignore-fail-on-non-empty "$testdir" %files -n emacs-git %{_pkgdocdir}/contrib/emacs/README %{elispdir} -%endif # ! emacs_filesystem +%endif +# endif ! emacs_filesystem %files email %{_pkgdocdir}/*email*.txt @@ -941,7 +997,8 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{_pkgdocdir}/*p4*.txt %{?with_docs:%{_mandir}/man1/*p4*.1*} %{?with_docs:%{_pkgdocdir}/*p4*.html} -%endif # with p4 +%endif +# endif with p4 %files -n perl-Git -f perl-git-files %{?with_docs:%{_mandir}/man3/Git.3pm*} @@ -963,6 +1020,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Thu Jul 25 2019 Todd Zullinger - 2.22.0-2 - completion: do not cache if --git-completion-helper fails +- avoid trailing comments in spec file * Thu Jul 25 2019 Fedora Release Engineering - 2.22.0-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 8faf6223eab6ab1121f94c7e4bfd58579aeafe3b Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 29 Jul 2019 10:49:30 -0400 Subject: [PATCH 616/842] drop jgit BR on Fedora > 30 With the move of java packages to modules, jgit looks likely to become unavailable as a BuildRequires in Fedora soon. Avoid it on Fedora > 30 for now. This affects 3 tests, 2 for packfile format (t5310-pack-bitmaps) and 1 of ls-remote (t5512-ls-remote). --- git.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index d9c2c5b..f19fc2d 100644 --- a/git.spec +++ b/git.spec @@ -213,7 +213,7 @@ BuildRequires: highlight %endif # endif fedora, el-6, or el7-ppc64 BuildRequires: httpd -%if 0%{?fedora} && ! ( %{_arch} == i386 || %{_arch} == s390x ) +%if 0%{?fedora} && ! ( 0%{?fedora} > 30 || %{_arch} == i386 || %{_arch} == s390x ) BuildRequires: jgit %endif # endif fedora (except i386 and s390x) @@ -1021,6 +1021,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" * Thu Jul 25 2019 Todd Zullinger - 2.22.0-2 - completion: do not cache if --git-completion-helper fails - avoid trailing comments in spec file +- drop jgit on Fedora > 30 * Thu Jul 25 2019 Fedora Release Engineering - 2.22.0-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From f4c8506a970619d8d8d2f671ee1d4b3e89a0cd9e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 29 Jul 2019 19:45:29 -0400 Subject: [PATCH 617/842] Update to 2.23.0-rc0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adjust the test to skip in t5541-http-push-smart as another test was added before the failing test. Apply a patch from Jeff King which fixes a failure in the newly-added t0016-oidmap on big endian systems like s390x¹. Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.23.0.txt ¹ https://public-inbox.org/git/20190731012336.GA13880@sigill.intra.peff.net/ --- ...t-cache-if-git-completion-helper-fai.patch | 51 ------- 0001-t-sort-output-of-hashmap-iteration.patch | 140 ++++++++++++++++++ git.spec | 21 +-- sources | 4 +- 4 files changed, 154 insertions(+), 62 deletions(-) delete mode 100644 0001-completion-do-not-cache-if-git-completion-helper-fai.patch create mode 100644 0001-t-sort-output-of-hashmap-iteration.patch diff --git a/0001-completion-do-not-cache-if-git-completion-helper-fai.patch b/0001-completion-do-not-cache-if-git-completion-helper-fai.patch deleted file mode 100644 index 66940c2..0000000 --- a/0001-completion-do-not-cache-if-git-completion-helper-fai.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 69702523afb4de692b415648e53fcfb1b4630f18 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= - -Date: Wed, 12 Jun 2019 15:56:06 +0700 -Subject: [PATCH] completion: do not cache if --git-completion-helper fails -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -"git --git-completion-helper" could fail if the command checks for -a repo before parse_options(). If the result is cached, later on when -the user moves to a worktree with repo, tab completion will still fail. - -Avoid this by detecting errors and not cache the completion output. We -can try again and hopefully succeed next time (e.g. when a repo is -found). - -Of course if --git-completion-helper fails permanently because of other -reasons (*), this will slow down completion. But I don't see any better -option to handle that case. - -(*) one of those cases is if __gitcomp_builtin is called on a command - that does not support --git-completion-helper. And we do have a - generic call - - __git_complete_common "$command" - - but this case is protected with __git_support_parseopt_helper so we're - good. - -Reported-by: Felipe Contreras -Signed-off-by: Nguyễn Thái Ngọc Duy -Signed-off-by: Junio C Hamano ---- - contrib/completion/git-completion.bash | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash -index 499e56f83d0a0..00cc695e3d748 100644 ---- a/contrib/completion/git-completion.bash -+++ b/contrib/completion/git-completion.bash -@@ -400,7 +400,8 @@ __gitcomp_builtin () - if [ -z "$options" ]; then - # leading and trailing spaces are significant to make - # option removal work correctly. -- options=" $incl $(__git ${cmd/_/ } --git-completion-helper) " -+ options=" $incl $(__git ${cmd/_/ } --git-completion-helper) " || return -+ - for i in $excl; do - options="${options/ $i / }" - done diff --git a/0001-t-sort-output-of-hashmap-iteration.patch b/0001-t-sort-output-of-hashmap-iteration.patch new file mode 100644 index 0000000..20ad308 --- /dev/null +++ b/0001-t-sort-output-of-hashmap-iteration.patch @@ -0,0 +1,140 @@ +From e1e7a77141bda8f2ab02f5ed8b0030cba793ec2d Mon Sep 17 00:00:00 2001 +From: Jeff King +Date: Tue, 30 Jul 2019 21:23:37 -0400 +Subject: [PATCH] t: sort output of hashmap iteration + +The iteration order of a hashmap is undefined, and may depend on things +like the exact set of items added, or the table has been grown or +shrunk. In the case of an oidmap, it even depends on endianness, because +we take the oid hash by casting sha1 bytes directly into an unsigned +int. + +Let's sort the test-tool output from any hash iterators. In the case of +t0011, this is just future-proofing. But for t0016, it actually fixes a +reported failure on the big-endian s390 and nonstop ports. + +I didn't bother to teach the helper functions to optionally sort output. +They are short enough that it's simpler to just repeat them inline for +the iteration tests than it is to add a --sort option. + +Reported-by: Randall S. Becker +Signed-off-by: Jeff King +Signed-off-by: Junio C Hamano +--- + t/t0011-hashmap.sh | 58 ++++++++++++++++++++++++++++------------------ + t/t0016-oidmap.sh | 30 +++++++++++++++--------- + 2 files changed, 55 insertions(+), 33 deletions(-) + +diff --git a/t/t0011-hashmap.sh b/t/t0011-hashmap.sh +index 9c96b3e3b10a9..5343ffd3f92c1 100755 +--- a/t/t0011-hashmap.sh ++++ b/t/t0011-hashmap.sh +@@ -170,31 +170,45 @@ NULL + ' + + test_expect_success 'iterate' ' +- +-test_hashmap "put key1 value1 +-put key2 value2 +-put fooBarFrotz value3 +-iterate" "NULL +-NULL +-NULL +-key2 value2 +-key1 value1 +-fooBarFrotz value3" +- ++ test-tool hashmap >actual.raw <<-\EOF && ++ put key1 value1 ++ put key2 value2 ++ put fooBarFrotz value3 ++ iterate ++ EOF ++ ++ cat >expect <<-\EOF && ++ NULL ++ NULL ++ NULL ++ fooBarFrotz value3 ++ key1 value1 ++ key2 value2 ++ EOF ++ ++ sort actual && ++ test_cmp expect actual + ' + + test_expect_success 'iterate (case insensitive)' ' +- +-test_hashmap "put key1 value1 +-put key2 value2 +-put fooBarFrotz value3 +-iterate" "NULL +-NULL +-NULL +-fooBarFrotz value3 +-key2 value2 +-key1 value1" ignorecase +- ++ test-tool hashmap ignorecase >actual.raw <<-\EOF && ++ put key1 value1 ++ put key2 value2 ++ put fooBarFrotz value3 ++ iterate ++ EOF ++ ++ cat >expect <<-\EOF && ++ NULL ++ NULL ++ NULL ++ fooBarFrotz value3 ++ key1 value1 ++ key2 value2 ++ EOF ++ ++ sort actual && ++ test_cmp expect actual + ' + + test_expect_success 'grow / shrink' ' +diff --git a/t/t0016-oidmap.sh b/t/t0016-oidmap.sh +index bbe719e950968..31f8276ba82ba 100755 +--- a/t/t0016-oidmap.sh ++++ b/t/t0016-oidmap.sh +@@ -86,17 +86,25 @@ NULL" + ' + + test_expect_success 'iterate' ' +- +-test_oidmap "put one 1 +-put two 2 +-put three 3 +-iterate" "NULL +-NULL +-NULL +-$(git rev-parse two) 2 +-$(git rev-parse one) 1 +-$(git rev-parse three) 3" +- ++ test-tool oidmap >actual.raw <<-\EOF && ++ put one 1 ++ put two 2 ++ put three 3 ++ iterate ++ EOF ++ ++ # sort "expect" too so we do not rely on the order of particular oids ++ sort >expect <<-EOF && ++ NULL ++ NULL ++ NULL ++ $(git rev-parse one) 1 ++ $(git rev-parse two) 2 ++ $(git rev-parse three) 3 ++ EOF ++ ++ sort actual && ++ test_cmp expect actual + ' + + test_done diff --git a/git.spec b/git.spec index f19fc2d..4c8cb17 100644 --- a/git.spec +++ b/git.spec @@ -84,11 +84,11 @@ %endif # Define for release candidates -#global rcrev .rc0 +%global rcrev .rc0 Name: git -Version: 2.22.0 -Release: 2%{?rcrev}%{?dist} +Version: 2.23.0 +Release: 0.0%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -120,10 +120,10 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# Don't cache completion results if --git-completion-helper fails -# https://public-inbox.org/git/20190612085606.12144-1-pclouds@gmail.com/ -# https://github.com/gitster/git/commit/69702523a.patch -Patch1: 0001-completion-do-not-cache-if-git-completion-helper-fai.patch +# Fix t0016-oidmap test failure on s390x +# https://github.com/gitster/git/commit/e1e7a77141.patch +# https://public-inbox.org/git/20190731012336.GA13880@sigill.intra.peff.net/ +Patch1: 0001-t-sort-output-of-hashmap-iteration.patch %if %{with docs} # pod2man is needed to build Git.3pm @@ -816,9 +816,9 @@ GIT_SKIP_TESTS="" # # The following 2 tests use run_with_limited_cmdline, which calls ulimit -s 128 # to limit the maximum stack size. -# t5541.33 'push 2000 tags over http' +# t5541.34 '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.33 t5551.25" +GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5541.34 t5551.25" %endif # endif aarch64 %%{arm} %%{power64} @@ -1018,6 +1018,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Jul 29 2019 Todd Zullinger - 2.23.0-0.0.rc0 +- Update to 2.23.0-rc0 + * Thu Jul 25 2019 Todd Zullinger - 2.22.0-2 - completion: do not cache if --git-completion-helper fails - avoid trailing comments in spec file diff --git a/sources b/sources index 6926a1a..98965e9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.22.0.tar.xz) = 75b3dcac36f80281effcd099944de34050a35f3599ce42f86ce60455b6c952039fb0f6438d296e0cc9c0651d4a17f467780dc475669227d3c98ddefe91723d42 -SHA512 (git-2.22.0.tar.sign) = e6834bbe486c0374ce2de7a5922ee0c040153405e8dc03c677f29fde4bb8c3aff04549055ad122657e5bb0c7308544eca3530be9024dd891c4986d179ac53eb0 +SHA512 (git-2.23.0.rc0.tar.xz) = 909d7de2210d754587840759455a0b8d04397ad510fee1009adf5910e89c763ae7434899cb24914d87b07b73ed26c74c5031f6f7df04f7eaacdd105958b8c665 +SHA512 (git-2.23.0.rc0.tar.sign) = 5739a9fe7d6435f620d542a7569bea1ebfc671570b18ce598f35548093cb453b0a1af9e73b92efcef2648d7c3755c922f7ad3ca4399db5174aebac4ee813a936 From eb2423a5cb4347211d17f3bddf7093418de3afcb Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 2 Aug 2019 18:13:22 -0400 Subject: [PATCH 618/842] Update to 2.23.0-rc1 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.23.0.txt --- 0001-t-sort-output-of-hashmap-iteration.patch | 140 ------------------ git.spec | 12 +- sources | 4 +- 3 files changed, 7 insertions(+), 149 deletions(-) delete mode 100644 0001-t-sort-output-of-hashmap-iteration.patch diff --git a/0001-t-sort-output-of-hashmap-iteration.patch b/0001-t-sort-output-of-hashmap-iteration.patch deleted file mode 100644 index 20ad308..0000000 --- a/0001-t-sort-output-of-hashmap-iteration.patch +++ /dev/null @@ -1,140 +0,0 @@ -From e1e7a77141bda8f2ab02f5ed8b0030cba793ec2d Mon Sep 17 00:00:00 2001 -From: Jeff King -Date: Tue, 30 Jul 2019 21:23:37 -0400 -Subject: [PATCH] t: sort output of hashmap iteration - -The iteration order of a hashmap is undefined, and may depend on things -like the exact set of items added, or the table has been grown or -shrunk. In the case of an oidmap, it even depends on endianness, because -we take the oid hash by casting sha1 bytes directly into an unsigned -int. - -Let's sort the test-tool output from any hash iterators. In the case of -t0011, this is just future-proofing. But for t0016, it actually fixes a -reported failure on the big-endian s390 and nonstop ports. - -I didn't bother to teach the helper functions to optionally sort output. -They are short enough that it's simpler to just repeat them inline for -the iteration tests than it is to add a --sort option. - -Reported-by: Randall S. Becker -Signed-off-by: Jeff King -Signed-off-by: Junio C Hamano ---- - t/t0011-hashmap.sh | 58 ++++++++++++++++++++++++++++------------------ - t/t0016-oidmap.sh | 30 +++++++++++++++--------- - 2 files changed, 55 insertions(+), 33 deletions(-) - -diff --git a/t/t0011-hashmap.sh b/t/t0011-hashmap.sh -index 9c96b3e3b10a9..5343ffd3f92c1 100755 ---- a/t/t0011-hashmap.sh -+++ b/t/t0011-hashmap.sh -@@ -170,31 +170,45 @@ NULL - ' - - test_expect_success 'iterate' ' -- --test_hashmap "put key1 value1 --put key2 value2 --put fooBarFrotz value3 --iterate" "NULL --NULL --NULL --key2 value2 --key1 value1 --fooBarFrotz value3" -- -+ test-tool hashmap >actual.raw <<-\EOF && -+ put key1 value1 -+ put key2 value2 -+ put fooBarFrotz value3 -+ iterate -+ EOF -+ -+ cat >expect <<-\EOF && -+ NULL -+ NULL -+ NULL -+ fooBarFrotz value3 -+ key1 value1 -+ key2 value2 -+ EOF -+ -+ sort actual && -+ test_cmp expect actual - ' - - test_expect_success 'iterate (case insensitive)' ' -- --test_hashmap "put key1 value1 --put key2 value2 --put fooBarFrotz value3 --iterate" "NULL --NULL --NULL --fooBarFrotz value3 --key2 value2 --key1 value1" ignorecase -- -+ test-tool hashmap ignorecase >actual.raw <<-\EOF && -+ put key1 value1 -+ put key2 value2 -+ put fooBarFrotz value3 -+ iterate -+ EOF -+ -+ cat >expect <<-\EOF && -+ NULL -+ NULL -+ NULL -+ fooBarFrotz value3 -+ key1 value1 -+ key2 value2 -+ EOF -+ -+ sort actual && -+ test_cmp expect actual - ' - - test_expect_success 'grow / shrink' ' -diff --git a/t/t0016-oidmap.sh b/t/t0016-oidmap.sh -index bbe719e950968..31f8276ba82ba 100755 ---- a/t/t0016-oidmap.sh -+++ b/t/t0016-oidmap.sh -@@ -86,17 +86,25 @@ NULL" - ' - - test_expect_success 'iterate' ' -- --test_oidmap "put one 1 --put two 2 --put three 3 --iterate" "NULL --NULL --NULL --$(git rev-parse two) 2 --$(git rev-parse one) 1 --$(git rev-parse three) 3" -- -+ test-tool oidmap >actual.raw <<-\EOF && -+ put one 1 -+ put two 2 -+ put three 3 -+ iterate -+ EOF -+ -+ # sort "expect" too so we do not rely on the order of particular oids -+ sort >expect <<-EOF && -+ NULL -+ NULL -+ NULL -+ $(git rev-parse one) 1 -+ $(git rev-parse two) 2 -+ $(git rev-parse three) 3 -+ EOF -+ -+ sort actual && -+ test_cmp expect actual - ' - - test_done diff --git a/git.spec b/git.spec index 4c8cb17..2efd51e 100644 --- a/git.spec +++ b/git.spec @@ -84,11 +84,11 @@ %endif # Define for release candidates -%global rcrev .rc0 +%global rcrev .rc1 Name: git Version: 2.23.0 -Release: 0.0%{?rcrev}%{?dist} +Release: 0.1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -120,11 +120,6 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# Fix t0016-oidmap test failure on s390x -# https://github.com/gitster/git/commit/e1e7a77141.patch -# https://public-inbox.org/git/20190731012336.GA13880@sigill.intra.peff.net/ -Patch1: 0001-t-sort-output-of-hashmap-iteration.patch - %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -1018,6 +1013,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Aug 02 2019 Todd Zullinger - 2.23.0-0.1.rc1 +- Update to 2.23.0-rc1 + * Mon Jul 29 2019 Todd Zullinger - 2.23.0-0.0.rc0 - Update to 2.23.0-rc0 diff --git a/sources b/sources index 98965e9..1e9b848 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.23.0.rc0.tar.xz) = 909d7de2210d754587840759455a0b8d04397ad510fee1009adf5910e89c763ae7434899cb24914d87b07b73ed26c74c5031f6f7df04f7eaacdd105958b8c665 -SHA512 (git-2.23.0.rc0.tar.sign) = 5739a9fe7d6435f620d542a7569bea1ebfc671570b18ce598f35548093cb453b0a1af9e73b92efcef2648d7c3755c922f7ad3ca4399db5174aebac4ee813a936 +SHA512 (git-2.23.0.rc1.tar.xz) = 189e390efe87df65e8b24bee33a214d7d2d795719f34b521f4181fbc7f88513c43ebc02108f3227ce7a2c28876521f1de5ba50e06234d1a5f5e251660dc04964 +SHA512 (git-2.23.0.rc1.tar.sign) = 28001f2721a5b3124b4c42e330bb03aad61a7e6a246b3f691daf9a036ac73381aafef9f878880d8d23cb46814cfc4800010e82b24f14988a3b6ebafdcc461351 From 300a3d79f29bb34599c910bdd9cd4ac29ccfa910 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 11 Aug 2019 15:03:42 -0400 Subject: [PATCH 619/842] Update to 2.23.0-rc2 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.23.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 2efd51e..ccb7316 100644 --- a/git.spec +++ b/git.spec @@ -84,11 +84,11 @@ %endif # Define for release candidates -%global rcrev .rc1 +%global rcrev .rc2 Name: git Version: 2.23.0 -Release: 0.1%{?rcrev}%{?dist} +Release: 0.2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1013,6 +1013,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sun Aug 11 2019 Todd Zullinger - 2.23.0-0.2.rc2 +- Update to 2.23.0-rc2 + * Fri Aug 02 2019 Todd Zullinger - 2.23.0-0.1.rc1 - Update to 2.23.0-rc1 diff --git a/sources b/sources index 1e9b848..81b8506 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.23.0.rc1.tar.xz) = 189e390efe87df65e8b24bee33a214d7d2d795719f34b521f4181fbc7f88513c43ebc02108f3227ce7a2c28876521f1de5ba50e06234d1a5f5e251660dc04964 -SHA512 (git-2.23.0.rc1.tar.sign) = 28001f2721a5b3124b4c42e330bb03aad61a7e6a246b3f691daf9a036ac73381aafef9f878880d8d23cb46814cfc4800010e82b24f14988a3b6ebafdcc461351 +SHA512 (git-2.23.0.rc2.tar.xz) = 5ce0581982858e80f12ce35a1e64803392b88d63cc79e45ab9c6f930324e248128d3ee9a158ded08b80e97fa01146759cec214bd6316b1cc51c19dc37d770a39 +SHA512 (git-2.23.0.rc2.tar.sign) = fc048e0b9685b2f4ef85eaf7c5a558b9972c247f698ce6c6746f726480baadc4efe04a5ae5b9919a848f8c73c8fb56df080932779beef9a659270e65bdfc6087 From 20f4fd72683da7ece90fcfd7f52a1f9e126ddf9c Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 16 Aug 2019 17:05:49 -0400 Subject: [PATCH 620/842] Update to 2.23.0 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.23.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index ccb7316..6e19374 100644 --- a/git.spec +++ b/git.spec @@ -84,11 +84,11 @@ %endif # Define for release candidates -%global rcrev .rc2 +#global rcrev .rc0 Name: git Version: 2.23.0 -Release: 0.2%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1013,6 +1013,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Aug 16 2019 Todd Zullinger - 2.23.0-1 +- Update to 2.23.0 + * Sun Aug 11 2019 Todd Zullinger - 2.23.0-0.2.rc2 - Update to 2.23.0-rc2 diff --git a/sources b/sources index 81b8506..4beda38 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.23.0.rc2.tar.xz) = 5ce0581982858e80f12ce35a1e64803392b88d63cc79e45ab9c6f930324e248128d3ee9a158ded08b80e97fa01146759cec214bd6316b1cc51c19dc37d770a39 -SHA512 (git-2.23.0.rc2.tar.sign) = fc048e0b9685b2f4ef85eaf7c5a558b9972c247f698ce6c6746f726480baadc4efe04a5ae5b9919a848f8c73c8fb56df080932779beef9a659270e65bdfc6087 +SHA512 (git-2.23.0.tar.xz) = c0bb29b3689ec2e157f90df849599ca149a08fc0c69f6a68b1f3219b6335d521983e6ed58cd364b86398e4dcf9e84892fb9eded79a1c97b74150edca299cf671 +SHA512 (git-2.23.0.tar.sign) = 7fbae475901966604f9d6a5a1a62cb01d7fcb696bf742f3bd9fff3ac667233744ee42f9df5fbca3ee4106282384dea16aab86430ae30fceed8959b7700a27614 From 8040cda9193bbf008005dfd75828a61356ef7b44 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 18 Oct 2019 23:14:21 -0400 Subject: [PATCH 621/842] update to 2.24.0-rc0 https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.24.0.txt --- git.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index 6e19374..f65d331 100644 --- a/git.spec +++ b/git.spec @@ -84,11 +84,11 @@ %endif # Define for release candidates -#global rcrev .rc0 +%global rcrev .rc0 Name: git -Version: 2.23.0 -Release: 1%{?rcrev}%{?dist} +Version: 2.24.0 +Release: 0.0%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1013,6 +1013,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sat Oct 19 2019 Todd Zullinger - 2.24.0-0.0.rc0 +- update to 2.24.0-rc0 + * Fri Aug 16 2019 Todd Zullinger - 2.23.0-1 - Update to 2.23.0 diff --git a/sources b/sources index 4beda38..9adf696 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.23.0.tar.xz) = c0bb29b3689ec2e157f90df849599ca149a08fc0c69f6a68b1f3219b6335d521983e6ed58cd364b86398e4dcf9e84892fb9eded79a1c97b74150edca299cf671 -SHA512 (git-2.23.0.tar.sign) = 7fbae475901966604f9d6a5a1a62cb01d7fcb696bf742f3bd9fff3ac667233744ee42f9df5fbca3ee4106282384dea16aab86430ae30fceed8959b7700a27614 +SHA512 (git-2.24.0.rc0.tar.xz) = 94aa91496bd34f691a1de2bb9610a77b949b26a73cad3dab84f15461c6b3ffa1f6a272f6ea2248b7cf50797e7ccc27ca3cd033980f37b95bf9339a33ffb358f8 +SHA512 (git-2.24.0.rc0.tar.sign) = b322c9a22a99e6bf8b13cfa17dcc3f6c7260fbdd0b515bca850cb8b3a1419da35f3beb73638ad7d148234cf875398e374605ad4840df416bcbcc220edfb007fe From 61b7079c2f92b5909010f3a5b94354e88045db32 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 19 Oct 2019 19:57:53 -0400 Subject: [PATCH 622/842] fix t0500-progress-display on big-endian arches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks to SZEDER Gábor for a quick patch. --- ...x-test-failures-on-big-endian-system.patch | 55 +++++++++++++++++++ git.spec | 4 ++ 2 files changed, 59 insertions(+) create mode 100644 0001-test-progress-fix-test-failures-on-big-endian-system.patch diff --git a/0001-test-progress-fix-test-failures-on-big-endian-system.patch b/0001-test-progress-fix-test-failures-on-big-endian-system.patch new file mode 100644 index 0000000..ba00b70 --- /dev/null +++ b/0001-test-progress-fix-test-failures-on-big-endian-system.patch @@ -0,0 +1,55 @@ +From 1ac77295ff34b80bd8c17887f9a84b8557a9c0cd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?SZEDER=20G=C3=A1bor?= +Date: Sun, 20 Oct 2019 01:37:06 +0200 +Subject: [PATCH] test-progress: fix test failures on big-endian systems +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In 't0500-progress-display.sh' all tests running 'test-tool progress +--total=' fail on big-endian systems, e.g. like this: + + |+ test-tool progress --total=3 Working hard + |[...] + |+ test_i18ncmp expect out + |--- expect 2019-10-18 23:07:54.765523916 +0000 + |+++ out 2019-10-18 23:07:54.773523916 +0000 + |@@ -1,4 +1,2 @@ + |-Working hard: 33% (1/3) + |-Working hard: 66% (2/3) + |-Working hard: 100% (3/3) + |-Working hard: 100% (3/3), done. + |+Working hard: 0% (1/12884901888) + |+Working hard: 0% (3/12884901888), done. + +The reason for that bogus value is that '--total's parameter is parsed +via parse-options's OPT_INTEGER into a uint64_t variable [1], so the +two bits of 3 end up in the "wrong" bytes on big-endian systems +(12884901888 = 0x300000000). + +Change the type of that variable from uint64_t to int, to match what +parse-options expects; in the tests of the progress output we won't +use values that don't fit into an int anyway. + +[1] start_progress() expects the total number as an uint64_t, that's + why I chose the same type when declaring the variable holding the + value given on the command line. + +Signed-off-by: SZEDER Gábor +--- + t/helper/test-progress.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/helper/test-progress.c b/t/helper/test-progress.c +index 4e9f7fafdf..42b96cb103 100644 +--- a/t/helper/test-progress.c ++++ b/t/helper/test-progress.c +@@ -29,7 +29,7 @@ void progress_test_force_update(void); + + int cmd__progress(int argc, const char **argv) + { +- uint64_t total = 0; ++ int total = 0; + const char *title; + struct strbuf line = STRBUF_INIT; + struct progress *progress; diff --git a/git.spec b/git.spec index f65d331..29d50c4 100644 --- a/git.spec +++ b/git.spec @@ -120,6 +120,9 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch +# https://public-inbox.org/git/20191019233706.GM29845@szeder.dev/ +Patch1: 0001-test-progress-fix-test-failures-on-big-endian-system.patch + %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -1015,6 +1018,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Sat Oct 19 2019 Todd Zullinger - 2.24.0-0.0.rc0 - update to 2.24.0-rc0 +- fix t0500-progress-display on big-endian arches * Fri Aug 16 2019 Todd Zullinger - 2.23.0-1 - Update to 2.23.0 From 8b2d34ca4f6955287a829206db85f2a55ae3c5f0 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 24 Oct 2019 12:58:28 -0400 Subject: [PATCH 623/842] update to 2.24.0-rc1 Adjust skipped test number in t5541-http-push-smart.sh (skipped on aarch64, %{arm}, and %{power64}). A new test was added in upstream 6f1194246a ("remote-curl: pass on atomic capability to remote side", 2019-10-16), resulting in the "push 2000 tags over http" test number changing. Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.24.0.txt --- ...x-test-failures-on-big-endian-system.patch | 55 ------------------- git.spec | 14 ++--- sources | 4 +- 3 files changed, 9 insertions(+), 64 deletions(-) delete mode 100644 0001-test-progress-fix-test-failures-on-big-endian-system.patch diff --git a/0001-test-progress-fix-test-failures-on-big-endian-system.patch b/0001-test-progress-fix-test-failures-on-big-endian-system.patch deleted file mode 100644 index ba00b70..0000000 --- a/0001-test-progress-fix-test-failures-on-big-endian-system.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 1ac77295ff34b80bd8c17887f9a84b8557a9c0cd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?SZEDER=20G=C3=A1bor?= -Date: Sun, 20 Oct 2019 01:37:06 +0200 -Subject: [PATCH] test-progress: fix test failures on big-endian systems -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In 't0500-progress-display.sh' all tests running 'test-tool progress ---total=' fail on big-endian systems, e.g. like this: - - |+ test-tool progress --total=3 Working hard - |[...] - |+ test_i18ncmp expect out - |--- expect 2019-10-18 23:07:54.765523916 +0000 - |+++ out 2019-10-18 23:07:54.773523916 +0000 - |@@ -1,4 +1,2 @@ - |-Working hard: 33% (1/3) - |-Working hard: 66% (2/3) - |-Working hard: 100% (3/3) - |-Working hard: 100% (3/3), done. - |+Working hard: 0% (1/12884901888) - |+Working hard: 0% (3/12884901888), done. - -The reason for that bogus value is that '--total's parameter is parsed -via parse-options's OPT_INTEGER into a uint64_t variable [1], so the -two bits of 3 end up in the "wrong" bytes on big-endian systems -(12884901888 = 0x300000000). - -Change the type of that variable from uint64_t to int, to match what -parse-options expects; in the tests of the progress output we won't -use values that don't fit into an int anyway. - -[1] start_progress() expects the total number as an uint64_t, that's - why I chose the same type when declaring the variable holding the - value given on the command line. - -Signed-off-by: SZEDER Gábor ---- - t/helper/test-progress.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/t/helper/test-progress.c b/t/helper/test-progress.c -index 4e9f7fafdf..42b96cb103 100644 ---- a/t/helper/test-progress.c -+++ b/t/helper/test-progress.c -@@ -29,7 +29,7 @@ void progress_test_force_update(void); - - int cmd__progress(int argc, const char **argv) - { -- uint64_t total = 0; -+ int total = 0; - const char *title; - struct strbuf line = STRBUF_INIT; - struct progress *progress; diff --git a/git.spec b/git.spec index 29d50c4..5ebe9cd 100644 --- a/git.spec +++ b/git.spec @@ -84,11 +84,11 @@ %endif # Define for release candidates -%global rcrev .rc0 +%global rcrev .rc1 Name: git Version: 2.24.0 -Release: 0.0%{?rcrev}%{?dist} +Release: 0.1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -120,9 +120,6 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# https://public-inbox.org/git/20191019233706.GM29845@szeder.dev/ -Patch1: 0001-test-progress-fix-test-failures-on-big-endian-system.patch - %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -814,9 +811,9 @@ GIT_SKIP_TESTS="" # # The following 2 tests use run_with_limited_cmdline, which calls ulimit -s 128 # to limit the maximum stack size. -# t5541.34 'push 2000 tags over http' +# t5541.35 '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.34 t5551.25" +GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5541.35 t5551.25" %endif # endif aarch64 %%{arm} %%{power64} @@ -1016,6 +1013,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Oct 24 2019 Todd Zullinger - 2.24.0-0.1.rc1 +- update to 2.24.0-rc1 + * Sat Oct 19 2019 Todd Zullinger - 2.24.0-0.0.rc0 - update to 2.24.0-rc0 - fix t0500-progress-display on big-endian arches diff --git a/sources b/sources index 9adf696..c1a3bbf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.24.0.rc0.tar.xz) = 94aa91496bd34f691a1de2bb9610a77b949b26a73cad3dab84f15461c6b3ffa1f6a272f6ea2248b7cf50797e7ccc27ca3cd033980f37b95bf9339a33ffb358f8 -SHA512 (git-2.24.0.rc0.tar.sign) = b322c9a22a99e6bf8b13cfa17dcc3f6c7260fbdd0b515bca850cb8b3a1419da35f3beb73638ad7d148234cf875398e374605ad4840df416bcbcc220edfb007fe +SHA512 (git-2.24.0.rc1.tar.xz) = 02a52e3e2dafde7966e0f3a81c43702b87265f990b829012317ba03ef70bdd56b1ca715e002d89eb7a3c44d04ebecb587e13808b8a6882a4b2650e86ae82fa7a +SHA512 (git-2.24.0.rc1.tar.sign) = 6d851e10c5866b456e3ec81cf57a4e517ab53a5ff48cf22fbd4ce45b3408312fd3b991fd58dee6202daa44a0d1b5a39be10862c2bdc6a2632c59c5e0d626c9fb From 33ecb7860bb29161df134313f0099bb7768c0cf3 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 24 Oct 2019 14:50:44 -0400 Subject: [PATCH 624/842] skip failing test in t7812-grep-icase-non-ascii on s390x The "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. Reference: https://public-inbox.org/git/20191020002648.GZ10893@pobox.com/ --- git.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/git.spec b/git.spec index 5ebe9cd..5be40ef 100644 --- a/git.spec +++ b/git.spec @@ -828,6 +828,16 @@ 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 @@ -1015,6 +1025,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Thu Oct 24 2019 Todd Zullinger - 2.24.0-0.1.rc1 - update to 2.24.0-rc1 +- skip failing test in t7812-grep-icase-non-ascii on s390x * Sat Oct 19 2019 Todd Zullinger - 2.24.0-0.0.rc0 - update to 2.24.0-rc0 From 16e19ee3561f67a2186abbcd066b0a940fdc0875 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 24 Oct 2019 12:59:13 -0400 Subject: [PATCH 625/842] gitk: add Requires: git-gui (#1765113) While this could arguably be a Recommends: rather than Requires:, we chose the latter for a few reasons. The user experience when running gitk and selecting "Start git gui" from the menu is quite poor. No indication is shown to the user graphically. The only hint as to why git gui did not start is output to stdout (and is not terribly helpful for users who may be using gitk and git-gui because they are unfamiliar with the command-line). There are no additional dependencies pulled in by git-gui which are not already dependencies of gitk. And the git-gui package is relatively small. Lastly, the default behavior of Recommends: is the same as Requires: at this time. If/when any of these things change, we may revisit whether moving to Recommends: makes more sense. Thanks to Vasiliy Glazov and Pavel Cahyna for reporting the issue and helping to determine the proper resolution. --- git.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git.spec b/git.spec index 5be40ef..ee18dce 100644 --- a/git.spec +++ b/git.spec @@ -391,6 +391,7 @@ Provides: emacs-git-el = %{version}-%{release} Summary: Git repository browser BuildArch: noarch Requires: git = %{version}-%{release} +Requires: git-gui = %{version}-%{release} Requires: tk >= 8.4 %description -n gitk %{summary}. @@ -1026,6 +1027,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" * Thu Oct 24 2019 Todd Zullinger - 2.24.0-0.1.rc1 - update to 2.24.0-rc1 - skip failing test in t7812-grep-icase-non-ascii on s390x +- gitk: add Requires: git-gui (#1765113) * Sat Oct 19 2019 Todd Zullinger - 2.24.0-0.0.rc0 - update to 2.24.0-rc0 From 185a1896d78af75ca5706152235fcf98fce4e81d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 27 Oct 2019 14:33:40 -0400 Subject: [PATCH 626/842] disable linkcheck test on all EL releases The linkchecker package is not available for any EL release, including EL-8. --- git.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index ee18dce..850c4e0 100644 --- a/git.spec +++ b/git.spec @@ -6,6 +6,14 @@ %global gitexecdir %{_libexecdir}/git-core +# Settings for Fedora +%if 0%{?fedora} +# linkchecker is not available on EL +%bcond_without linkcheck +%else +%bcond_with linkcheck +%endif + # Settings for Fedora > 29 and EL > 7 %if 0%{?fedora} > 29 || 0%{?rhel} > 7 %bcond_with python2 @@ -23,14 +31,11 @@ # Settings for Fedora and EL > 7 %if 0%{?fedora} || 0%{?rhel} > 7 %bcond_without python3 -# linkchcker is not available on EL <= 7 -%bcond_without linkcheck %global use_glibc_langpacks 1 %global use_perl_generators 1 %global use_perl_interpreter 1 %else %bcond_with python3 -%bcond_with linkcheck %global use_glibc_langpacks 0 %global use_perl_generators 0 %global use_perl_interpreter 0 @@ -88,7 +93,7 @@ Name: git Version: 2.24.0 -Release: 0.1%{?rcrev}%{?dist} +Release: 0.1%{?rcrev}%{?dist}.1 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1024,6 +1029,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sun Oct 27 2019 Todd Zullinger - 2.24.0-0.1.rc1.1 +- disable linkchecker on all EL releases + * Thu Oct 24 2019 Todd Zullinger - 2.24.0-0.1.rc1 - update to 2.24.0-rc1 - skip failing test in t7812-grep-icase-non-ascii on s390x From deddf0503117917d45ad378a7afbcf8e1ea5f3c6 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 30 Oct 2019 23:22:01 -0400 Subject: [PATCH 627/842] update to 2.24.0-rc2 https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.24.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 850c4e0..439def2 100644 --- a/git.spec +++ b/git.spec @@ -89,11 +89,11 @@ %endif # Define for release candidates -%global rcrev .rc1 +%global rcrev .rc2 Name: git Version: 2.24.0 -Release: 0.1%{?rcrev}%{?dist}.1 +Release: 0.2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1029,6 +1029,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Oct 31 2019 Todd Zullinger - 2.24.0-0.2.rc2 +- update to 2.24.0-rc2 + * Sun Oct 27 2019 Todd Zullinger - 2.24.0-0.1.rc1.1 - disable linkchecker on all EL releases diff --git a/sources b/sources index c1a3bbf..6f5c756 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.24.0.rc1.tar.xz) = 02a52e3e2dafde7966e0f3a81c43702b87265f990b829012317ba03ef70bdd56b1ca715e002d89eb7a3c44d04ebecb587e13808b8a6882a4b2650e86ae82fa7a -SHA512 (git-2.24.0.rc1.tar.sign) = 6d851e10c5866b456e3ec81cf57a4e517ab53a5ff48cf22fbd4ce45b3408312fd3b991fd58dee6202daa44a0d1b5a39be10862c2bdc6a2632c59c5e0d626c9fb +SHA512 (git-2.24.0.rc2.tar.xz) = fd6776e1e045feeb461f014ee6cd42934cc10aec33eb12b0df4b1093aee3d83f1efd6f36b859f45c7136f4179e2559dba3f9da11fe33d5b4770d4a2d25a317b8 +SHA512 (git-2.24.0.rc2.tar.sign) = cbfa54999e454256934c8ed8f71bb08d09224f7d06a2b3101c8333ea1632e21f04cbda1e72da385baf9353dd8b9c61693049c8e17df7deb4cc2e72c7154b1f22 From 763ae19326763412b5db16236b93804a16890aa3 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 4 Nov 2019 01:08:17 -0500 Subject: [PATCH 628/842] update to 2.24.0 Include the new "Git Code of Conduct" document in git-core-doc. Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.24.0.txt --- git.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index 439def2..ff72aab 100644 --- a/git.spec +++ b/git.spec @@ -89,11 +89,11 @@ %endif # Define for release candidates -%global rcrev .rc2 +#global rcrev .rc0 Name: git Version: 2.24.0 -Release: 0.2%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -771,7 +771,7 @@ grep -E "$not_core_re" bin-man-doc-files > bin-man-doc-git-files # contrib not_core_doc_re="(git-(cvs|gui|citool|daemon|instaweb|subtree))|p4|svn|email|gitk|gitweb" mkdir -p %{buildroot}%{_pkgdocdir}/ -cp -pr README.md Documentation/*.txt Documentation/RelNotes contrib %{buildroot}%{_pkgdocdir}/ +cp -pr CODE_OF_CONDUCT.md README.md Documentation/*.txt Documentation/RelNotes contrib %{buildroot}%{_pkgdocdir}/ # Remove contrib/ files/dirs which have nothing useful for documentation rm -rf %{buildroot}%{_pkgdocdir}/contrib/{contacts,credential,svn-fe}/ cp -p gitweb/INSTALL %{buildroot}%{_pkgdocdir}/INSTALL.gitweb @@ -1029,6 +1029,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Nov 04 2019 Todd Zullinger - 2.24.0-1 +- update to 2.24.0 + * Thu Oct 31 2019 Todd Zullinger - 2.24.0-0.2.rc2 - update to 2.24.0-rc2 diff --git a/sources b/sources index 6f5c756..a939b41 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.24.0.rc2.tar.xz) = fd6776e1e045feeb461f014ee6cd42934cc10aec33eb12b0df4b1093aee3d83f1efd6f36b859f45c7136f4179e2559dba3f9da11fe33d5b4770d4a2d25a317b8 -SHA512 (git-2.24.0.rc2.tar.sign) = cbfa54999e454256934c8ed8f71bb08d09224f7d06a2b3101c8333ea1632e21f04cbda1e72da385baf9353dd8b9c61693049c8e17df7deb4cc2e72c7154b1f22 +SHA512 (git-2.24.0.tar.xz) = 31c8c001fdea3b1e3e732cc42299979f1329d564f76d3950c90a0090afc1fa1ba50bdb7f86da92066843887986cc73a34c13dd651566d1af9036ecbe8aee42c3 +SHA512 (git-2.24.0.tar.sign) = 155d713905d6296f7be010ca50f07de310604957ee6514fd4d68fab5866ac91e9ea42bcda5ac7f8b73c9c2a0cfba7e9afc7b0c38e1783e21209031eb75d69933 From 39a7618fa8416caabd8e41f4524d1f78946599b1 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 3 Dec 2019 21:43:31 -0500 Subject: [PATCH 629/842] restore jgit BR for use in tests This effectively reverts 8faf622 (drop jgit BR on Fedora > 30, 2019-07-29). The jgit package is available once again; use it to allow some compatibility tests to be run. Resolves: https://bugzilla.redhat.com/1766626 --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index ff72aab..1b4969c 100644 --- a/git.spec +++ b/git.spec @@ -93,7 +93,7 @@ Name: git Version: 2.24.0 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -213,7 +213,7 @@ BuildRequires: highlight %endif # endif fedora, el-6, or el7-ppc64 BuildRequires: httpd -%if 0%{?fedora} && ! ( 0%{?fedora} > 30 || %{_arch} == i386 || %{_arch} == s390x ) +%if 0%{?fedora} && ! ( %{_arch} == i386 || %{_arch} == s390x ) BuildRequires: jgit %endif # endif fedora (except i386 and s390x) @@ -1029,6 +1029,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Dec 04 2019 Todd Zullinger - 2.24.0-2 +- restore jgit BR for use in tests + * Mon Nov 04 2019 Todd Zullinger - 2.24.0-1 - update to 2.24.0 From da087ee7194b07c7d21c962eba08e49321aee186 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 10 Dec 2019 13:23:30 -0500 Subject: [PATCH 630/842] update to 2.24.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Per the upstream release announcement¹, this release fixes "various security flaws, which allowed an attacker to overwrite arbitrary paths, remotely execute code, and/or overwrite files in the .git/ directory etc. See the release notes attached for the list for their descriptions and CVE identifiers." Refer to the 2.14.6 release notes² for details on these vulnerabilities. ¹ https://lore.kernel.org/git/xmqqr21cqcn9.fsf@gitster-ct.c.googlers.com/ ² https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.14.6.txt --- git.spec | 8 ++++++-- sources | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 1b4969c..0267e78 100644 --- a/git.spec +++ b/git.spec @@ -92,8 +92,8 @@ #global rcrev .rc0 Name: git -Version: 2.24.0 -Release: 2%{?rcrev}%{?dist} +Version: 2.24.1 +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1029,6 +1029,10 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Dec 10 2019 Todd Zullinger - 2.24.1-1 +- update to 2.24.1 (CVE-2019-1348, CVE-2019-1349, CVE-2019-1350, CVE-2019-1351, + CVE-2019-1352, CVE-2019-1353, CVE-2019-1354, and CVE-2019-1387) + * Wed Dec 04 2019 Todd Zullinger - 2.24.0-2 - restore jgit BR for use in tests diff --git a/sources b/sources index a939b41..e0d08d5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.24.0.tar.xz) = 31c8c001fdea3b1e3e732cc42299979f1329d564f76d3950c90a0090afc1fa1ba50bdb7f86da92066843887986cc73a34c13dd651566d1af9036ecbe8aee42c3 -SHA512 (git-2.24.0.tar.sign) = 155d713905d6296f7be010ca50f07de310604957ee6514fd4d68fab5866ac91e9ea42bcda5ac7f8b73c9c2a0cfba7e9afc7b0c38e1783e21209031eb75d69933 +SHA512 (git-2.24.1.tar.xz) = 010c13d4023c142876d0e075a394b74bef422944d8ca602325d0b2b47bf28b1d534283c7f295751113c83fdfcc0c91f97090e8f906560d44b04a94607fd8fcf7 +SHA512 (git-2.24.1.tar.sign) = 078b41f47f9609798ba2b9a00a2d09c359904da92d3a9d32d3f4fc442f79950e91a0c4df02987258e31e7d33ebfc09711b2f3b6923585799053c2efeab896390 From 743dd47b9ac1e6b76c531a2948c6a3673646178f Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 19 Dec 2019 01:49:10 -0500 Subject: [PATCH 631/842] fix git-daemon systemd scriptlets (#1785088) When upgrading or reinstalling git-daemon, the rpm %postun scriptlet runs the %systemd_postun_with_restart macro with git@.service as the argument. The macro calls 'systemctl try-restart git@.service' which produces an error: $ dnf -y update git-daemon [...] Running scriptlet: git-daemon-2.24.1-1.fc31.x86_64 2/2 Failed to try-restart git@.service: Unit name git@.service is missing the instance name. See system logs and 'systemctl status git@.service' for details. Until systemd-242, the error was hidden because the systemd scriptlets directed all output to /dev/null. That was changed in systemd commit b0ca726585 (rpm: avoid hiding errors from systemd commands, 2019-03-20), exposing this bug in the git-daemon scriptlets. The misconfiguration also leaves a stale symlink in /etc/systemd if git.socket is enabled. Removing the git-daemon package and installing again later results in git.socket being enabled. Neither of these are the expected nor intended outcomes. Replace git@.service with git.socket in the systemd scriptlets. The issue was introduced in 906d847 (Rename git.service into git@.service and bump release, 2014-10-24). It went unnoticed until now largely because the systemd scriptlets hid their output. --- git.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 0267e78..b7af5f2 100644 --- a/git.spec +++ b/git.spec @@ -93,7 +93,7 @@ Name: git Version: 2.24.1 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -878,13 +878,13 @@ rmdir --ignore-fail-on-non-empty "$testdir" %if %{use_systemd} %post daemon -%systemd_post git@.service +%systemd_post git.socket %preun daemon -%systemd_preun git@.service +%systemd_preun git.socket %postun daemon -%systemd_postun_with_restart git@.service +%systemd_postun_with_restart git.socket %endif # endif use_systemd @@ -1029,6 +1029,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Dec 19 2019 Todd Zullinger - 2.24.1-2 +- fix git-daemon systemd scriptlets (#1785088) + * Tue Dec 10 2019 Todd Zullinger - 2.24.1-1 - update to 2.24.1 (CVE-2019-1348, CVE-2019-1349, CVE-2019-1350, CVE-2019-1351, CVE-2019-1352, CVE-2019-1353, CVE-2019-1354, and CVE-2019-1387) From 4eed98f371c650b8814a90c74c8bab9616bd4ca4 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 25 Dec 2019 19:15:28 -0500 Subject: [PATCH 632/842] update to 2.25.0-rc0 https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.25.0.txt --- git.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index b7af5f2..a7bec6f 100644 --- a/git.spec +++ b/git.spec @@ -89,11 +89,11 @@ %endif # Define for release candidates -#global rcrev .rc0 +%global rcrev .rc0 Name: git -Version: 2.24.1 -Release: 2%{?rcrev}%{?dist} +Version: 2.25.0 +Release: 0.0%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1029,6 +1029,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Dec 25 2019 Todd Zullinger - 2.25.0-0.0.rc0 +- update to 2.25.0-rc0 + * Thu Dec 19 2019 Todd Zullinger - 2.24.1-2 - fix git-daemon systemd scriptlets (#1785088) diff --git a/sources b/sources index e0d08d5..cdbc81c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.24.1.tar.xz) = 010c13d4023c142876d0e075a394b74bef422944d8ca602325d0b2b47bf28b1d534283c7f295751113c83fdfcc0c91f97090e8f906560d44b04a94607fd8fcf7 -SHA512 (git-2.24.1.tar.sign) = 078b41f47f9609798ba2b9a00a2d09c359904da92d3a9d32d3f4fc442f79950e91a0c4df02987258e31e7d33ebfc09711b2f3b6923585799053c2efeab896390 +SHA512 (git-2.25.0.rc0.tar.xz) = a0ac7ca947670a3db24e58c77b292faf2f4a610ce7d64b2a4053f18a19ca19ba12d75c17c0f3c18667afc93e03e2d1d7ae48f450087c1d97c7356c32558418a5 +SHA512 (git-2.25.0.rc0.tar.sign) = cc5c9cb3c540c30ef5b08608e2efe8f2c8cadb4217b48d72ee4a15b95e91fa7adf11eef84395a4fb8a60eb62a362dfcc37e0638447eb67a8ca8dfd9f76af4556 From 8f50e00fabd2962440988f367d1f15fc41c49c84 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 2 Jan 2020 20:57:01 -0500 Subject: [PATCH 633/842] update to 2.25.0-rc1 https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.25.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index a7bec6f..e15c81d 100644 --- a/git.spec +++ b/git.spec @@ -89,11 +89,11 @@ %endif # Define for release candidates -%global rcrev .rc0 +%global rcrev .rc1 Name: git Version: 2.25.0 -Release: 0.0%{?rcrev}%{?dist} +Release: 0.1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1029,6 +1029,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Jan 03 2020 Todd Zullinger - 2.25.0-0.1.rc1 +- update to 2.25.0-rc1 + * Wed Dec 25 2019 Todd Zullinger - 2.25.0-0.0.rc0 - update to 2.25.0-rc0 diff --git a/sources b/sources index cdbc81c..82177b0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.25.0.rc0.tar.xz) = a0ac7ca947670a3db24e58c77b292faf2f4a610ce7d64b2a4053f18a19ca19ba12d75c17c0f3c18667afc93e03e2d1d7ae48f450087c1d97c7356c32558418a5 -SHA512 (git-2.25.0.rc0.tar.sign) = cc5c9cb3c540c30ef5b08608e2efe8f2c8cadb4217b48d72ee4a15b95e91fa7adf11eef84395a4fb8a60eb62a362dfcc37e0638447eb67a8ca8dfd9f76af4556 +SHA512 (git-2.25.0.rc1.tar.xz) = 2644a9bf986745509ab74792a488d4d6d49ed97cde17e62157cf613a44aec02fa153c3c7aa336d0418c2116ea22aaa647876998af8701cd6136db026cc49b885 +SHA512 (git-2.25.0.rc1.tar.sign) = b8faa6e319322aacbb1d10754f88947683284e211e9cc94508f0082a1d82919acbffde6ed4d66f3a3eef72f48771dc59e44c41dc3b836acba3ebdf1e89b8c635 From 9b287b4f639ff71c26b69b22f4a093253fcd004e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 2 Jan 2020 23:07:28 -0500 Subject: [PATCH 634/842] only add highlight test BR for ppc64le/x86_64 on EL7+ The highlight package is not available for aarch64 or s390x in EL7+. Simplify the conditional (a little) by only listing the 2 known architectures where highlight is available for EL7+. It's not worth adding much complexity for a dependency that is only used in 3 tests for the gitweb subpackage. --- git.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index e15c81d..140f4a1 100644 --- a/git.spec +++ b/git.spec @@ -208,10 +208,10 @@ BuildRequires: gnupg BuildRequires: gnupg2-smime %endif # endif fedora or el > 8 -%if 0%{?fedora} || ( 0%{?rhel} && ( 0%{?rhel} == 6 || 0%{?rhel} >= 7 && %{_arch} != ppc64 )) +%if 0%{?fedora} || 0%{?rhel} == 6 || ( 0%{?rhel} >= 7 && ( %{_arch} == ppc64le || %{_arch} == x86_64 ) ) BuildRequires: highlight %endif -# endif fedora, el-6, or el7-ppc64 +# endif fedora, el-6, or el7+ (ppc64le/x86_64) BuildRequires: httpd %if 0%{?fedora} && ! ( %{_arch} == i386 || %{_arch} == s390x ) BuildRequires: jgit @@ -1031,6 +1031,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Fri Jan 03 2020 Todd Zullinger - 2.25.0-0.1.rc1 - update to 2.25.0-rc1 +- only add highlight test BR for ppc64le/x86_64 on EL7+ * Wed Dec 25 2019 Todd Zullinger - 2.25.0-0.0.rc0 - update to 2.25.0-rc0 From 1c6dee8c16d22b7643baa4cf59d3980f9e3233de Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 8 Jan 2020 20:08:17 -0500 Subject: [PATCH 635/842] update to 2.25.0-rc2 https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.25.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 140f4a1..fbc1189 100644 --- a/git.spec +++ b/git.spec @@ -89,11 +89,11 @@ %endif # Define for release candidates -%global rcrev .rc1 +%global rcrev .rc2 Name: git Version: 2.25.0 -Release: 0.1%{?rcrev}%{?dist} +Release: 0.2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1029,6 +1029,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Jan 09 2020 Todd Zullinger - 2.25.0-0.2.rc2 +- update to 2.25.0-rc2 + * Fri Jan 03 2020 Todd Zullinger - 2.25.0-0.1.rc1 - update to 2.25.0-rc1 - only add highlight test BR for ppc64le/x86_64 on EL7+ diff --git a/sources b/sources index 82177b0..f3f7201 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.25.0.rc1.tar.xz) = 2644a9bf986745509ab74792a488d4d6d49ed97cde17e62157cf613a44aec02fa153c3c7aa336d0418c2116ea22aaa647876998af8701cd6136db026cc49b885 -SHA512 (git-2.25.0.rc1.tar.sign) = b8faa6e319322aacbb1d10754f88947683284e211e9cc94508f0082a1d82919acbffde6ed4d66f3a3eef72f48771dc59e44c41dc3b836acba3ebdf1e89b8c635 +SHA512 (git-2.25.0.rc2.tar.xz) = f6f36dea3df8dcd875f6c97c2f1bceeb1762639c6072213634d88c60befdb8e97201b8d80981f2368a8317b1c2d445d3a3c55a294f02f4c2c1631acea3b83fec +SHA512 (git-2.25.0.rc2.tar.sign) = 7f5a982e9f54c573412d85fd846bfaae907088e661d1355c31d7df7ed4b0be01d4e32fc1b40e78b4ff51c66d42a2c9c874112eaf75fbbdbeef672b4a4e232ae0 From 715a141ade7029ba79bf2428a83b4432d91ce657 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 10 Jan 2020 17:46:09 -0500 Subject: [PATCH 636/842] remove useless use of cat for printing config.mak This `cat config.mak` was added in 37cec08 (Print config.mak to aid confirmation/verification of settings, 2019-02-02). Replace it by piping the earlier cat through tee so we get a copy of the config on stdout as well as written to config.mak. --- git.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index fbc1189..641a3a8 100644 --- a/git.spec +++ b/git.spec @@ -509,7 +509,8 @@ sed -i '/^git-p4/d' command-list.txt # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. -cat << \EOF > config.mak +# Pipe to tee to aid confirmation/verification of settings. +cat << \EOF | tee config.mak V = 1 CFLAGS = %{build_cflags} LDFLAGS = %{build_ldflags} @@ -537,9 +538,6 @@ GIT_PROVE_OPTS = --verbose --normalize %{?_smp_mflags} --formatter=TAP::Formatte GIT_TEST_OPTS = -x --verbose-log EOF -# Print config.mak to aid confirmation/verification of settings -cat config.mak - # Filter bogus perl requires # packed-refs comes from a comment in contrib/hooks/update-paranoid %if %{use_new_rpm_filters} From 79d00e3416bf7aa38dbdfd6346ab21ff7cfb1333 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 13 Jan 2020 20:07:53 -0500 Subject: [PATCH 637/842] update to 2.25.0 https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.25.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 641a3a8..8b68b98 100644 --- a/git.spec +++ b/git.spec @@ -89,11 +89,11 @@ %endif # Define for release candidates -%global rcrev .rc2 +#global rcrev .rc0 Name: git Version: 2.25.0 -Release: 0.2%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1027,6 +1027,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Jan 14 2020 Todd Zullinger - 2.25.0-1 +- update to 2.25.0 + * Thu Jan 09 2020 Todd Zullinger - 2.25.0-0.2.rc2 - update to 2.25.0-rc2 diff --git a/sources b/sources index f3f7201..44d7716 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.25.0.rc2.tar.xz) = f6f36dea3df8dcd875f6c97c2f1bceeb1762639c6072213634d88c60befdb8e97201b8d80981f2368a8317b1c2d445d3a3c55a294f02f4c2c1631acea3b83fec -SHA512 (git-2.25.0.rc2.tar.sign) = 7f5a982e9f54c573412d85fd846bfaae907088e661d1355c31d7df7ed4b0be01d4e32fc1b40e78b4ff51c66d42a2c9c874112eaf75fbbdbeef672b4a4e232ae0 +SHA512 (git-2.25.0.tar.xz) = 8bbada0451fe0a3314e1b9a43a74135115449aa41f5b3e7f960279e4a7fe6069c36e78825fc4b60d06806e3a6fa8158f327cb8a3801686ac22a35e3704244191 +SHA512 (git-2.25.0.tar.sign) = 77e531271e5edd985b6b527119c8418ca6773f8863b8940e1425ded96f42d00873f868f20b08d9fe989dddd6a8501dda17d53add9b3dd924c9912e57838cc6e7 From d34bc424d9cdce6b503193f0438ea70d2dd62f09 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 14 Jan 2020 23:34:53 +0000 Subject: [PATCH 638/842] Use make_build macro when running tests This will make it possible for buildroots to inject arguments to make by redefining the %__make macro. For example, the test target uses gcc to compile fuzz-commit-graph.c, so one thing this change will allow us to do is to pass CC=clang to make if we want to try to build with clang. --- git.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 8b68b98..c44782f 100644 --- a/git.spec +++ b/git.spec @@ -93,7 +93,7 @@ Name: git Version: 2.25.0 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -863,13 +863,13 @@ sed -i "s@\(GIT_TEST_OPTS='.*\)'@\1 --root=$testdir'@" GIT-BUILD-OPTIONS touch -r ts GIT-BUILD-OPTIONS # Run the tests -make test || ./print-failed-test-output +%make_build test || ./print-failed-test-output # Run contrib/credential/netrc tests mkdir -p contrib/credential mv netrc contrib/credential/ -make -C contrib/credential/netrc/ test || \ -make -C contrib/credential/netrc/ testverbose +%make_build -C contrib/credential/netrc/ test || \ +%make_build -C contrib/credential/netrc/ testverbose # Clean up test dir rmdir --ignore-fail-on-non-empty "$testdir" @@ -1027,6 +1027,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Jan 14 2020 Tom Stellard - 2.25.0-2 +- Use make_build macro when running tests + * Tue Jan 14 2020 Todd Zullinger - 2.25.0-1 - update to 2.25.0 From 151fc8f21e234e60fcb3f9174b70587f020a11a5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 21:56:13 +0000 Subject: [PATCH 639/842] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index c44782f..481bba6 100644 --- a/git.spec +++ b/git.spec @@ -93,7 +93,7 @@ Name: git Version: 2.25.0 -Release: 2%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist}.1 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1027,6 +1027,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.25.0-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Jan 14 2020 Tom Stellard - 2.25.0-2 - Use make_build macro when running tests From 5c3ad97a83dfd45a2075af79757963abcae9e5bf Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 17 Feb 2020 02:09:41 -0500 Subject: [PATCH 640/842] update to 2.25.1 https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.25.1.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 481bba6..96c4a94 100644 --- a/git.spec +++ b/git.spec @@ -92,8 +92,8 @@ #global rcrev .rc0 Name: git -Version: 2.25.0 -Release: 2%{?rcrev}%{?dist}.1 +Version: 2.25.1 +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1027,6 +1027,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Feb 17 2020 Todd Zullinger - 2.25.1-1 +- update to 2.25.1 + * Tue Jan 28 2020 Fedora Release Engineering - 2.25.0-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 44d7716..3717187 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.25.0.tar.xz) = 8bbada0451fe0a3314e1b9a43a74135115449aa41f5b3e7f960279e4a7fe6069c36e78825fc4b60d06806e3a6fa8158f327cb8a3801686ac22a35e3704244191 -SHA512 (git-2.25.0.tar.sign) = 77e531271e5edd985b6b527119c8418ca6773f8863b8940e1425ded96f42d00873f868f20b08d9fe989dddd6a8501dda17d53add9b3dd924c9912e57838cc6e7 +SHA512 (git-2.25.1.tar.xz) = 15241143acfd8542d85d2709ac3c80dbd6e8d5234438f70c4f33cc71a2bdec3e32938df7f6351e2746d570b021d3bd0b70474ea4beec0c51d1fc45f9c287b344 +SHA512 (git-2.25.1.tar.sign) = 29a4fd59227d74b233416fa17ce184c0f57d824fdfc4554e37aa9dd06176fdfa0e7cbade77c661d5d9aa1e62d206f7f4816a690984845baa3ca691069de65a6b From 9d91bab9c84e52f912b7a03562be0320a30f62bb Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 19 Feb 2020 13:47:31 -0500 Subject: [PATCH 641/842] split libsecret credential helper into a subpackage (#1804741) The libsecret package added a weak dependency on gnome-keyring in 4976bb0 (Recommend gnome-keyring, 2019-09-06). This pulls in a bit more than we would like with the git package. Move the libsecret credential helper to a subpackage. --- git.spec | 46 +++++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/git.spec b/git.spec index 96c4a94..1ed920f 100644 --- a/git.spec +++ b/git.spec @@ -43,19 +43,19 @@ # Settings for Fedora and EL >= 7 %if 0%{?fedora} || 0%{?rhel} >= 7 +%bcond_without libsecret %global bashcomp_pkgconfig 1 %global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) %global bashcomproot %(dirname %{bashcompdir} 2>/dev/null) %global emacs_filesystem 1 -%global libsecret 1 %global use_new_rpm_filters 1 %global use_systemd 1 %else +%bcond_with libsecret %global bashcomp_pkgconfig 0 %global bashcompdir %{_sysconfdir}/bash_completion.d %global bashcomproot %{bashcompdir} %global emacs_filesystem 0 -%global libsecret 0 %global use_new_rpm_filters 0 %global use_systemd 0 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} @@ -93,7 +93,7 @@ Name: git Version: 2.25.1 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -145,10 +145,6 @@ BuildRequires: gcc BuildRequires: gettext BuildRequires: gnupg2 BuildRequires: libcurl-devel -%if %{libsecret} -BuildRequires: libsecret-devel -%endif -# endif libsecret BuildRequires: make BuildRequires: openssl-devel BuildRequires: pcre2-devel @@ -290,6 +286,10 @@ tools for integrating with other SCMs, install the git-all meta-package. Summary: Meta-package to pull in all git tools BuildArch: noarch Requires: git = %{version}-%{release} +%if %{with libsecret} +Requires: git-credential-libsecret = %{version}-%{release} +%endif +# endif with libsecret %if %{with cvs} Requires: git-cvs = %{version}-%{release} %endif @@ -342,6 +342,16 @@ Requires: git-core = %{version}-%{release} %description core-doc Documentation files for git-core package including man pages. +%if %{with libsecret} +%package credential-libsecret +Summary: Git helper for accessing credentials via libsecret +BuildRequires: libsecret-devel +Requires: git = %{version}-%{release} +%description credential-libsecret +%{summary}. +%endif +# endif with libsecret + %if %{with cvs} %package cvs Summary: Git tools for importing CVS repositories @@ -581,10 +591,10 @@ export SOURCE_DATE_EPOCH=$(date -r version +%%s 2>/dev/null) %make_build -C contrib/contacts/ all -%if %{libsecret} +%if %{with libsecret} %make_build -C contrib/credential/libsecret/ %endif -# endif libsecret +# endif with libsecret %make_build -C contrib/diff-highlight/ @@ -631,11 +641,11 @@ for el in *.el ; do done popd >/dev/null -%if %{libsecret} +%if %{with libsecret} install -pm 755 contrib/credential/libsecret/git-credential-libsecret \ %{buildroot}%{gitexecdir} %endif -# endif libsecret +# endif with libsecret install -pm 755 contrib/credential/netrc/git-credential-netrc \ %{buildroot}%{gitexecdir} # temporarily move contrib/credential/netrc aside to prevent it from being @@ -677,7 +687,7 @@ rm -f %{buildroot}%{gitexecdir}/mergetools/p4merge # Remove unneeded git-remote-testsvn so git-svn can be noarch rm -f %{buildroot}%{gitexecdir}/git-remote-testsvn -exclude_re="archimport|email|git-(citool|cvs|daemon|gui|instaweb|p4|subtree|svn)|gitk|gitweb|p4merge" +exclude_re="archimport|email|git-(citool|credential-libsecret|cvs|daemon|gui|instaweb|p4|subtree|svn)|gitk|gitweb|p4merge" (find %{buildroot}{%{_bindir},%{_libexecdir}} -type f -o -type l | grep -vE "$exclude_re" | sed -e s@^%{buildroot}@@) > bin-man-doc-files (find %{buildroot}{%{_bindir},%{_libexecdir}} -mindepth 1 -type d | grep -vE "$exclude_re" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files (find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) > perl-git-files @@ -755,7 +765,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-(libsecret|netrc)|difftool|filter-branch|instaweb|request-pull|send-mail)|gitweb" +not_core_re="git-(add--interactive|contacts|credential-netrc|difftool|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} @@ -926,6 +936,13 @@ rmdir --ignore-fail-on-non-empty "$testdir" # endif rhel <= 7 %{_pkgdocdir}/contrib/hooks +%if %{with libsecret} +%files credential-libsecret +%defattr(-,root,root) +%{gitexecdir}/git-credential-libsecret +%endif +# endif with libsecret + %if %{with cvs} %files cvs %{_pkgdocdir}/*git-cvs*.txt @@ -1027,6 +1044,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Feb 19 2020 Todd Zullinger - 2.25.1-2 +- split libsecret credential helper into a subpackage (#1804741) + * Mon Feb 17 2020 Todd Zullinger - 2.25.1-1 - update to 2.25.1 From bed4f32f5e7d85e652cc20982950d51ee9e6b4ef Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 19 Feb 2020 14:42:24 -0500 Subject: [PATCH 642/842] consolidate macros for Fedora/EPEL Fedora 29 has reached its end of life. Consolidate the macros which applied to f29 or newer. --- git.spec | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/git.spec b/git.spec index 1ed920f..bafcbe2 100644 --- a/git.spec +++ b/git.spec @@ -14,28 +14,18 @@ %bcond_with linkcheck %endif -# Settings for Fedora > 29 and EL > 7 -%if 0%{?fedora} > 29 || 0%{?rhel} > 7 -%bcond_with python2 -%else -%bcond_without python2 -%endif - -# Settings for Fedora >= 29 and EL > 7 -%if 0%{?fedora} >= 29 || 0%{?rhel} > 7 -%global gitweb_httpd_conf gitweb.conf -%else -%global gitweb_httpd_conf git.conf -%endif - # Settings for Fedora and EL > 7 %if 0%{?fedora} || 0%{?rhel} > 7 +%bcond_with python2 %bcond_without python3 +%global gitweb_httpd_conf gitweb.conf %global use_glibc_langpacks 1 %global use_perl_generators 1 %global use_perl_interpreter 1 %else +%bcond_without python2 %bcond_with python3 +%global gitweb_httpd_conf git.conf %global use_glibc_langpacks 0 %global use_perl_generators 0 %global use_perl_interpreter 0 @@ -1046,6 +1036,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Wed Feb 19 2020 Todd Zullinger - 2.25.1-2 - split libsecret credential helper into a subpackage (#1804741) +- consolidate macros for Fedora/EPEL * Mon Feb 17 2020 Todd Zullinger - 2.25.1-1 - update to 2.25.1 From e07c54d1401764a334cf2094f87f42014900c731 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 19 Feb 2020 14:44:50 -0500 Subject: [PATCH 643/842] remove unneeded gnome-keyring obsoletes Fedora 29 has reached its end of life. We no longer need to obsolete the gnome-keyring subpackage. --- git.spec | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/git.spec b/git.spec index bafcbe2..320265a 100644 --- a/git.spec +++ b/git.spec @@ -251,12 +251,6 @@ Obsoletes: git-cvs < %{?epoch:%{epoch}:}%{version}-%{release} %endif # endif without cvs -# Obsolete gnome-keyring credential helper (remove after Fedora 29) -%if 0%{?fedora} && 0%{?fedora} < 30 -Obsoletes: git-gnome-keyring < 2.11.1-4 -%endif -# endif fedora < 30 - # Obsolete git-p4 if it's disabled %if %{without p4} Obsoletes: git-p4 < %{?epoch:%{epoch}:}%{version}-%{release} @@ -1037,6 +1031,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" * Wed Feb 19 2020 Todd Zullinger - 2.25.1-2 - split libsecret credential helper into a subpackage (#1804741) - consolidate macros for Fedora/EPEL +- remove unneeded gnome-keyring obsoletes * Mon Feb 17 2020 Todd Zullinger - 2.25.1-1 - update to 2.25.1 From 9a7edd4b7a49517c37eb088a9592d90f8568d33f Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 22 Feb 2020 13:02:01 -0500 Subject: [PATCH 644/842] work around issue on s390x with gcc10 (#1799408) When git is built with gcc10 on s390x, the diff builtin fails many tests. Use -mtune=zEC12 as a workaround until the issue is fixed (in gcc and/or git). Many thanks to Jakub Jelinek for doing the hard work to track this down. --- git.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 320265a..f340701 100644 --- a/git.spec +++ b/git.spec @@ -83,7 +83,7 @@ Name: git Version: 2.25.1 -Release: 2%{?rcrev}%{?dist} +Release: 3%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -501,6 +501,11 @@ sed -i '/^git-p4/d' command-list.txt %endif # endif without p4 +# Work around issue on s390x with gcc10 (#1799408) +%if 0%{?fedora} >= 32 && %{_arch} == s390x +%global build_cflags %(echo %build_cflags | sed 's/-mtune=z13/-mtune=zEC12/') +%endif + # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. # Pipe to tee to aid confirmation/verification of settings. @@ -1028,6 +1033,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sat Feb 22 2020 Todd Zullinger - 2.25.1-3 +- work around issue on s390x with gcc10 (#1799408) + * Wed Feb 19 2020 Todd Zullinger - 2.25.1-2 - split libsecret credential helper into a subpackage (#1804741) - consolidate macros for Fedora/EPEL From e942c8d036312d9652181e99138f54a730116d4b Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 25 Feb 2020 22:46:21 -0500 Subject: [PATCH 645/842] use Asciidoctor to build documentation when possible MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Asciidoctor project is more actively maintained than asciidoc. Use it for building the documentation on Fedora. Asciidoctor is not currently available for EL-6 or EL-8, though it is in EPEL for EL-7. Exclude all EL builds for now, until we can reliably use it on EL-7 and EL-8 (including CentOS-Stream, ideally). This is made possible by the excellent work of both the Git and Asciidoctor communities. Thanks in particular to brian m. carlson, Martin Ågren, Jeff King, and Dan Allen. --- git.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index f340701..02655e1 100644 --- a/git.spec +++ b/git.spec @@ -8,9 +8,11 @@ # Settings for Fedora %if 0%{?fedora} +%bcond_without asciidoctor # linkchecker is not available on EL %bcond_without linkcheck %else +%bcond_with asciidoctor %bcond_with linkcheck %endif @@ -83,7 +85,7 @@ Name: git Version: 2.25.1 -Release: 3%{?rcrev}%{?dist} +Release: 4%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -118,7 +120,13 @@ Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man +%if %{with asciidoctor} +BuildRequires: docbook5-style-xsl +BuildRequires: rubygem-asciidoctor +%else BuildRequires: asciidoc >= 8.4.1 +%endif +# endif with asciidoctor BuildRequires: xmlto %if %{with linkcheck} BuildRequires: linkchecker @@ -526,6 +534,10 @@ PYTHON_PATH = %{__python2} NO_PYTHON = 1 %endif # endif with python2 +%if %{with asciidoctor} +USE_ASCIIDOCTOR = 1 +%endif +# endif with asciidoctor htmldir = %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} prefix = %{_prefix} perllibdir = %{perl_vendorlib} @@ -1033,6 +1045,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Feb 26 2020 Todd Zullinger - 2.25.1-4 +- use Asciidoctor to build documentation when possible + * Sat Feb 22 2020 Todd Zullinger - 2.25.1-3 - work around issue on s390x with gcc10 (#1799408) From 7428a574028e1559bdf1d79fd362f319ac3936cc Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 5 Mar 2020 21:30:08 -0500 Subject: [PATCH 646/842] update to 2.26.0-rc0 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.26.0.txt --- git.spec | 11 ++++++++--- sources | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index 02655e1..f1caa9c 100644 --- a/git.spec +++ b/git.spec @@ -81,11 +81,11 @@ %endif # Define for release candidates -#global rcrev .rc0 +%global rcrev .rc0 Name: git -Version: 2.25.1 -Release: 4%{?rcrev}%{?dist} +Version: 2.26.0 +Release: 0.0%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -597,6 +597,8 @@ export SOURCE_DATE_EPOCH=$(date -r version +%%s 2>/dev/null) %endif # endif with libsecret +%make_build -C contrib/credential/netrc/ + %make_build -C contrib/diff-highlight/ %make_build -C contrib/subtree/ all @@ -1045,6 +1047,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Mar 06 2020 Todd Zullinger - 2.26.0-0.0.rc0 +- update to 2.26.0-rc0 + * Wed Feb 26 2020 Todd Zullinger - 2.25.1-4 - use Asciidoctor to build documentation when possible diff --git a/sources b/sources index 3717187..4450f6e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.25.1.tar.xz) = 15241143acfd8542d85d2709ac3c80dbd6e8d5234438f70c4f33cc71a2bdec3e32938df7f6351e2746d570b021d3bd0b70474ea4beec0c51d1fc45f9c287b344 -SHA512 (git-2.25.1.tar.sign) = 29a4fd59227d74b233416fa17ce184c0f57d824fdfc4554e37aa9dd06176fdfa0e7cbade77c661d5d9aa1e62d206f7f4816a690984845baa3ca691069de65a6b +SHA512 (git-2.26.0.rc0.tar.xz) = 05e26e5ab3f8a08e760a41ec0409982eee0b6b3f5164a6c5e608d67e9805a447d0ff2e29f6d768228321fa66a2a7ac83708535d1f2076d1fcf6db844c7c425f9 +SHA512 (git-2.26.0.rc0.tar.sign) = 92a665e1410578496804c06eaab644567e800d251310178ac2c27234258c9cdc064b6373560de708f651da6e76f7dbca9e84564f2fc2077494e44f2e6735f099 From edfc06e98341a1fa77a1400b5a43e005f678aa6f Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 10 Mar 2020 11:37:16 -0400 Subject: [PATCH 647/842] update to 2.26.0-rc1 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.26.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index f1caa9c..120772c 100644 --- a/git.spec +++ b/git.spec @@ -81,11 +81,11 @@ %endif # Define for release candidates -%global rcrev .rc0 +%global rcrev .rc1 Name: git Version: 2.26.0 -Release: 0.0%{?rcrev}%{?dist} +Release: 0.1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1047,6 +1047,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Mar 10 2020 Todd Zullinger - 2.26.0-0.1.rc1 +- update to 2.26.0-rc1 + * Fri Mar 06 2020 Todd Zullinger - 2.26.0-0.0.rc0 - update to 2.26.0-rc0 diff --git a/sources b/sources index 4450f6e..c87bd3e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.26.0.rc0.tar.xz) = 05e26e5ab3f8a08e760a41ec0409982eee0b6b3f5164a6c5e608d67e9805a447d0ff2e29f6d768228321fa66a2a7ac83708535d1f2076d1fcf6db844c7c425f9 -SHA512 (git-2.26.0.rc0.tar.sign) = 92a665e1410578496804c06eaab644567e800d251310178ac2c27234258c9cdc064b6373560de708f651da6e76f7dbca9e84564f2fc2077494e44f2e6735f099 +SHA512 (git-2.26.0.rc1.tar.xz) = 6d98cc4ed7793e44f182bafc3452b7c280cb6dfcfb6826e8f3bfb2297c66af6ff1f134fd208b8448154db2ca38f4b4f1ab1165c19aca66a04cde705ea835f233 +SHA512 (git-2.26.0.rc1.tar.sign) = 76b764b60eb83cab762aacd4efd9e2790fc3f95a874f29272127e9a3063524a044e5b26ba98533318837ec0fb42e83102cb96129c57c687173caf5a3003e4a88 From 90d09bcb8523d1561dadf7b7e416645057d0bb27 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 10 Mar 2020 23:46:37 -0400 Subject: [PATCH 648/842] adjust make test options The make test call was changed to use %make_build in d34bc42 (Use make_build macro when running tests, 2020-01-14) in order to allow the options to be more easily overridden. This enabled the -O option by default, which causes the test output to be printed only after all the tests have run. That makes following the progress in both interactive and copr/koji builds difficult. Replace %make_build with %__make to drop the unwanted -O option but still allow the make command to be overridden. --- git.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 120772c..b183caf 100644 --- a/git.spec +++ b/git.spec @@ -876,7 +876,7 @@ sed -i "s@\(GIT_TEST_OPTS='.*\)'@\1 --root=$testdir'@" GIT-BUILD-OPTIONS touch -r ts GIT-BUILD-OPTIONS # Run the tests -%make_build test || ./print-failed-test-output +%__make test || ./print-failed-test-output # Run contrib/credential/netrc tests mkdir -p contrib/credential @@ -1049,6 +1049,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Tue Mar 10 2020 Todd Zullinger - 2.26.0-0.1.rc1 - update to 2.26.0-rc1 +- adjust make test options * Fri Mar 06 2020 Todd Zullinger - 2.26.0-0.0.rc0 - update to 2.26.0-rc0 From 27b717774c20c436b004f4b1ff6a240e9cfcf99c Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 10 Mar 2020 23:52:43 -0400 Subject: [PATCH 649/842] add missing build deps for tests A recent change to the perl packaging split many modules from the base perl-interpreter package. Add the missing test dependencies. A few non-perl packages are also added, as they are no longer pulled into the buildroot automatically, but were not properly required. --- git.spec | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/git.spec b/git.spec index b183caf..ffe1557 100644 --- a/git.spec +++ b/git.spec @@ -135,6 +135,7 @@ BuildRequires: linkchecker %endif # endif with docs BuildRequires: desktop-file-utils +BuildRequires: diffutils BuildRequires: emacs BuildRequires: expat-devel BuildRequires: findutils @@ -147,6 +148,7 @@ BuildRequires: make BuildRequires: openssl-devel BuildRequires: pcre2-devel BuildRequires: perl(Error) +BuildRequires: perl(lib) BuildRequires: perl(Test) %if %{use_perl_generators} BuildRequires: perl-generators @@ -218,12 +220,19 @@ BuildRequires: perl(CGI::Carp) BuildRequires: perl(CGI::Util) BuildRequires: perl(DBD::SQLite) BuildRequires: perl(Digest::MD5) +BuildRequires: perl(Fcntl) +BuildRequires: perl(File::Basename) +BuildRequires: perl(File::Copy) +BuildRequires: perl(File::Find) +BuildRequires: perl(filetest) BuildRequires: perl(HTTP::Date) BuildRequires: perl(IO::Pty) BuildRequires: perl(JSON) BuildRequires: perl(JSON::PP) BuildRequires: perl(Mail::Address) BuildRequires: perl(Memoize) +BuildRequires: perl(POSIX) +BuildRequires: perl(Term::ReadLine) BuildRequires: perl(Test::More) BuildRequires: perl(Time::HiRes) %if %{with python2} @@ -236,7 +245,9 @@ BuildRequires: python3-devel # endif with python3 BuildRequires: subversion BuildRequires: subversion-perl +BuildRequires: tar BuildRequires: time +BuildRequires: zip %endif # endif with tests @@ -1050,6 +1061,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" * Tue Mar 10 2020 Todd Zullinger - 2.26.0-0.1.rc1 - update to 2.26.0-rc1 - adjust make test options +- add missing build deps for tests * Fri Mar 06 2020 Todd Zullinger - 2.26.0-0.0.rc0 - update to 2.26.0-rc0 From 33714131a9387ebb89a1c3093d8e68c8a0669b63 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 12 Mar 2020 17:44:08 -0400 Subject: [PATCH 650/842] remove s390x gcc10 workaround (#1799408) The workaround added in 9a7edd4 (work around issue on s390x with gcc10 (#1799408), 2020-02-22) is no loner needed. The issue is fixed in gcc-10.0.1-0.9. --- git.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/git.spec b/git.spec index ffe1557..0db6ff0 100644 --- a/git.spec +++ b/git.spec @@ -85,7 +85,7 @@ Name: git Version: 2.26.0 -Release: 0.1%{?rcrev}%{?dist} +Release: 0.2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -520,11 +520,6 @@ sed -i '/^git-p4/d' command-list.txt %endif # endif without p4 -# Work around issue on s390x with gcc10 (#1799408) -%if 0%{?fedora} >= 32 && %{_arch} == s390x -%global build_cflags %(echo %build_cflags | sed 's/-mtune=z13/-mtune=zEC12/') -%endif - # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. # Pipe to tee to aid confirmation/verification of settings. @@ -1058,6 +1053,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Mar 12 2020 Todd Zullinger - 2.26.0-0.2.rc1 +- remove s390x gcc10 workaround (#1799408) + * Tue Mar 10 2020 Todd Zullinger - 2.26.0-0.1.rc1 - update to 2.26.0-rc1 - adjust make test options From cedf775a27a70602bcb44ca1c24b3706d1c12f82 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 16 Mar 2020 19:57:24 -0400 Subject: [PATCH 651/842] update to 2.26.0-rc2 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.26.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 0db6ff0..b97168f 100644 --- a/git.spec +++ b/git.spec @@ -81,11 +81,11 @@ %endif # Define for release candidates -%global rcrev .rc1 +%global rcrev .rc2 Name: git Version: 2.26.0 -Release: 0.2%{?rcrev}%{?dist} +Release: 0.3%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1053,6 +1053,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Mar 16 2020 Todd Zullinger - 2.26.0-0.3.rc2 +- update to 2.26.0-rc2 + * Thu Mar 12 2020 Todd Zullinger - 2.26.0-0.2.rc1 - remove s390x gcc10 workaround (#1799408) diff --git a/sources b/sources index c87bd3e..3e03f7a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.26.0.rc1.tar.xz) = 6d98cc4ed7793e44f182bafc3452b7c280cb6dfcfb6826e8f3bfb2297c66af6ff1f134fd208b8448154db2ca38f4b4f1ab1165c19aca66a04cde705ea835f233 -SHA512 (git-2.26.0.rc1.tar.sign) = 76b764b60eb83cab762aacd4efd9e2790fc3f95a874f29272127e9a3063524a044e5b26ba98533318837ec0fb42e83102cb96129c57c687173caf5a3003e4a88 +SHA512 (git-2.26.0.rc2.tar.xz) = 399356ff6c003282264758b130d9ae430e290d09a44df8e259651455e76f1f51d54ffaea59a7fbb70611e4213c475eb07b13f52e8199d25660af63bf2257dd48 +SHA512 (git-2.26.0.rc2.tar.sign) = b3edd90ea9922b3baa8e57730aed7fcc10acb535422b51cc6cb594d74e4176f1af1f42424c66b0fa9c5bd7908d3bc24553bb08140c7d309187930e1bf45f9a53 From b0fbda3bc799ade56fa9be40e8f2ac401f27beaa Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 22 Mar 2020 23:32:32 -0400 Subject: [PATCH 652/842] update to 2.26.0 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.26.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index b97168f..d78a887 100644 --- a/git.spec +++ b/git.spec @@ -81,11 +81,11 @@ %endif # Define for release candidates -%global rcrev .rc2 +#global rcrev .rc0 Name: git Version: 2.26.0 -Release: 0.3%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1053,6 +1053,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sun Mar 22 2020 Todd Zullinger - 2.26.0-1 +- update to 2.26.0 + * Mon Mar 16 2020 Todd Zullinger - 2.26.0-0.3.rc2 - update to 2.26.0-rc2 diff --git a/sources b/sources index 3e03f7a..9b45185 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.26.0.rc2.tar.xz) = 399356ff6c003282264758b130d9ae430e290d09a44df8e259651455e76f1f51d54ffaea59a7fbb70611e4213c475eb07b13f52e8199d25660af63bf2257dd48 -SHA512 (git-2.26.0.rc2.tar.sign) = b3edd90ea9922b3baa8e57730aed7fcc10acb535422b51cc6cb594d74e4176f1af1f42424c66b0fa9c5bd7908d3bc24553bb08140c7d309187930e1bf45f9a53 +SHA512 (git-2.26.0.tar.xz) = bf8a832211782a9446d041a54da254f2586b894375191fb1a6dc7a6594856ca43230fa1ea804b54daceb68caa8d20c02bdbdbf7b2fa1761ce05a11a26b122a9b +SHA512 (git-2.26.0.tar.sign) = b60b547d0043695a0efe1495941fb374beea975befcdbd01a288641bd3fd460ef43b40a6dc0332a6906591a59764aa019506bcaf67b9a993b042deba7bbe40ae From 64b70dd0af09ddd46ad2137453161198346b1da3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 2 Apr 2020 12:53:40 +0200 Subject: [PATCH 653/842] Fix string quoting for rpm >= 4.16 --- git.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index d78a887..d82cee2 100644 --- a/git.spec +++ b/git.spec @@ -204,12 +204,12 @@ BuildRequires: gnupg BuildRequires: gnupg2-smime %endif # endif fedora or el > 8 -%if 0%{?fedora} || 0%{?rhel} == 6 || ( 0%{?rhel} >= 7 && ( %{_arch} == ppc64le || %{_arch} == x86_64 ) ) +%if 0%{?fedora} || 0%{?rhel} == 6 || ( 0%{?rhel} >= 7 && ( "%{_arch}" == "ppc64le" || "%{_arch}" == "x86_64" ) ) BuildRequires: highlight %endif # endif fedora, el-6, or el7+ (ppc64le/x86_64) BuildRequires: httpd -%if 0%{?fedora} && ! ( %{_arch} == i386 || %{_arch} == s390x ) +%if 0%{?fedora} && ! ( "%{_arch}" == "i386" || "%{_arch}" == "s390x" ) BuildRequires: jgit %endif # endif fedora (except i386 and s390x) From e8ddd85759af7103f55b8303b22e4b915b715251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 2 Apr 2020 13:29:11 +0200 Subject: [PATCH 654/842] Bump release --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index d82cee2..e66629f 100644 --- a/git.spec +++ b/git.spec @@ -85,7 +85,7 @@ Name: git Version: 2.26.0 -Release: 1%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist}.1 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1053,6 +1053,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Apr 02 2020 Björn Esser - 2.26.0-1.1 +- Fix string quoting for rpm >= 4.16 + * Sun Mar 22 2020 Todd Zullinger - 2.26.0-1 - update to 2.26.0 From c2ee27a40e51cc7bff54799ec546b60748c81e96 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 4 Apr 2020 12:13:48 -0400 Subject: [PATCH 655/842] fix issue with fast-forward rebases when rebase.abbreviateCommands is set Quoting from the upstream patch: Jan Alexander Steffens reported that when `rebase.abbreviateCommands' is set, the merge backend fails to fast forward. This is because the backend generates a todo list with only a `noop', and since this command has no abbreviated form, it is replaced by a comment mark. The sequencer then interprets it as if there is nothing to do, and fails. References: https://github.com/git/git/commit/68e7090f31 https://lore.kernel.org/git/9b4bc756764d87c9f34c11e6ec2fc6482f531805.camel@gmail.com/ --- ...abbreviate-a-command-if-it-doesn-t-h.patch | 58 +++++++++++++++++ ...-with-rebase.abbreviateCommands-true.patch | 64 +++++++++++++++++++ git.spec | 12 +++- 3 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 0001-sequencer-don-t-abbreviate-a-command-if-it-doesn-t-h.patch create mode 100644 0002-t3432-test-merge-with-rebase.abbreviateCommands-true.patch diff --git a/0001-sequencer-don-t-abbreviate-a-command-if-it-doesn-t-h.patch b/0001-sequencer-don-t-abbreviate-a-command-if-it-doesn-t-h.patch new file mode 100644 index 0000000..e5a2058 --- /dev/null +++ b/0001-sequencer-don-t-abbreviate-a-command-if-it-doesn-t-h.patch @@ -0,0 +1,58 @@ +From 68e7090f31b4d4f2c7b9a25240af61149fbebb5c Mon Sep 17 00:00:00 2001 +From: Alban Gruin +Date: Mon, 30 Mar 2020 14:42:35 +0200 +Subject: [PATCH 1/2] sequencer: don't abbreviate a command if it doesn't have + a short form + +When the sequencer is requested to abbreviate commands, it will replace +those that do not have a short form (eg. `noop') by a comment mark. +`noop' serves no purpose, except when fast-forwarding (ie. by running +`git rebase'). Removing it will break this command when +`rebase.abbreviateCommands' is set to true. + +Teach todo_list_to_strbuf() to check if a command has an actual +short form, and to ignore it if not. + +Signed-off-by: Alban Gruin +Signed-off-by: Junio C Hamano +--- + sequencer.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/sequencer.c b/sequencer.c +index e528225e78..c2f97f94ba 100644 +--- a/sequencer.c ++++ b/sequencer.c +@@ -1564,7 +1564,7 @@ static const char *command_to_string(const enum todo_command command) + + static char command_to_char(const enum todo_command command) + { +- if (command < TODO_COMMENT && todo_command_info[command].c) ++ if (command < TODO_COMMENT) + return todo_command_info[command].c; + return comment_line_char; + } +@@ -4947,6 +4947,8 @@ static void todo_list_to_strbuf(struct repository *r, struct todo_list *todo_lis + max = num; + + for (item = todo_list->items, i = 0; i < max; i++, item++) { ++ char cmd; ++ + /* if the item is not a command write it and continue */ + if (item->command >= TODO_COMMENT) { + strbuf_addf(buf, "%.*s\n", item->arg_len, +@@ -4955,8 +4957,9 @@ static void todo_list_to_strbuf(struct repository *r, struct todo_list *todo_lis + } + + /* add command to the buffer */ +- if (flags & TODO_LIST_ABBREVIATE_CMDS) +- strbuf_addch(buf, command_to_char(item->command)); ++ cmd = command_to_char(item->command); ++ if ((flags & TODO_LIST_ABBREVIATE_CMDS) && cmd) ++ strbuf_addch(buf, cmd); + else + strbuf_addstr(buf, command_to_string(item->command)); + +-- +2.26.0 + diff --git a/0002-t3432-test-merge-with-rebase.abbreviateCommands-true.patch b/0002-t3432-test-merge-with-rebase.abbreviateCommands-true.patch new file mode 100644 index 0000000..662fd3b --- /dev/null +++ b/0002-t3432-test-merge-with-rebase.abbreviateCommands-true.patch @@ -0,0 +1,64 @@ +From de9f1d3ef45ec885339d04f9e34293eb2de8605d Mon Sep 17 00:00:00 2001 +From: Alban Gruin +Date: Mon, 30 Mar 2020 14:42:36 +0200 +Subject: [PATCH 2/2] t3432: test `--merge' with `rebase.abbreviateCommands = + true', too + +When fast forwarding, `git --merge' should act the same whether +`rebase.abbreviateCommands' is set or not, but so far it was not the +case. This duplicates the tests ensuring that `--merge' works when fast +forwarding to check if it also works with abbreviated commands. + +Signed-off-by: Alban Gruin +Signed-off-by: Junio C Hamano +--- + t/t3432-rebase-fast-forward.sh | 24 +++++++++++++++++++----- + 1 file changed, 19 insertions(+), 5 deletions(-) + +diff --git a/t/t3432-rebase-fast-forward.sh b/t/t3432-rebase-fast-forward.sh +index 6c9d4a1375..6f0452c0ea 100755 +--- a/t/t3432-rebase-fast-forward.sh ++++ b/t/t3432-rebase-fast-forward.sh +@@ -28,10 +28,12 @@ test_rebase_same_head () { + shift && + cmp_f="$1" && + shift && +- test_rebase_same_head_ $status_n $what_n $cmp_n " --apply" "$*" && +- test_rebase_same_head_ $status_f $what_f $cmp_f " --apply --no-ff" "$*" +- test_rebase_same_head_ $status_n $what_n $cmp_n " --merge" "$*" && +- test_rebase_same_head_ $status_f $what_f $cmp_f " --merge --no-ff" "$*" ++ test_rebase_same_head_ $status_n $what_n $cmp_n 0 " --apply" "$*" && ++ test_rebase_same_head_ $status_f $what_f $cmp_f 0 " --apply --no-ff" "$*" ++ test_rebase_same_head_ $status_n $what_n $cmp_n 0 " --merge" "$*" && ++ test_rebase_same_head_ $status_f $what_f $cmp_f 0 " --merge --no-ff" "$*" ++ test_rebase_same_head_ $status_n $what_n $cmp_n 1 " --merge" "$*" && ++ test_rebase_same_head_ $status_f $what_f $cmp_f 1 " --merge --no-ff" "$*" + } + + test_rebase_same_head_ () { +@@ -41,9 +43,21 @@ test_rebase_same_head_ () { + shift && + cmp="$1" && + shift && ++ abbreviate="$1" && ++ shift && + flag="$1" + shift && +- test_expect_$status "git rebase$flag $* with $changes is $what with $cmp HEAD" " ++ if test $abbreviate -eq 1 ++ then ++ msg="git rebase$flag $* (rebase.abbreviateCommands = true) with $changes is $what with $cmp HEAD" ++ else ++ msg="git rebase$flag $* with $changes is $what with $cmp HEAD" ++ fi && ++ test_expect_$status "$msg" " ++ if test $abbreviate -eq 1 ++ then ++ test_config rebase.abbreviateCommands true ++ fi && + oldhead=\$(git rev-parse HEAD) && + test_when_finished 'git reset --hard \$oldhead' && + cp .git/logs/HEAD expect && +-- +2.26.0 + diff --git a/git.spec b/git.spec index e66629f..4869759 100644 --- a/git.spec +++ b/git.spec @@ -85,7 +85,7 @@ Name: git Version: 2.26.0 -Release: 1%{?rcrev}%{?dist}.1 +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -117,6 +117,13 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch +# Fix issue with fast-forward rebases when rebase.abbreviateCommands is set +# https://lore.kernel.org/git/9b4bc756764d87c9f34c11e6ec2fc6482f531805.camel@gmail.com/ +# https://github.com/git/git/commit/68e7090f31 +Patch1: 0001-sequencer-don-t-abbreviate-a-command-if-it-doesn-t-h.patch +# https://github.com/git/git/commit/de9f1d3ef4 +Patch2: 0002-t3432-test-merge-with-rebase.abbreviateCommands-true.patch + %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -1053,6 +1060,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sat Apr 04 2020 Todd Zullinger - 2.26.0-2 +- fix issue with fast-forward rebases when rebase.abbreviateCommands is set + * Thu Apr 02 2020 Björn Esser - 2.26.0-1.1 - Fix string quoting for rpm >= 4.16 From 5c331b2580873051c5175c97432036d49be72f68 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 5 Apr 2020 11:15:11 -0400 Subject: [PATCH 656/842] fix/quiet rpmlint issues from libsecret split When the libsecret credential helper was split out in 9d91bab (split libsecret credential helper into a subpackage (#1804741), 2020-02-19), a few rpmlint errors & warnings crept in. Update the rpmlintrc file to ignore the no-documentation warning for the libsecret subpackage (replacing the gnome-keyring entry which is no longer needed). Fix an errant tab added to the spec file. Moving the libsecret credential helper to a subpackage left no binaries in the main git package, so rpmlint complains. Fixing this requires a bit more investigation and care. --- git.rpmlintrc | 2 +- git.spec | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/git.rpmlintrc b/git.rpmlintrc index a7cb9f2..b2d9407 100644 --- a/git.rpmlintrc +++ b/git.rpmlintrc @@ -14,7 +14,7 @@ addFilter("git\..*: W: dangling-relative-symlink /usr/libexec/git-core/git-difft addFilter("git-gui.noarch: W: desktopfile-without-binary /usr/share/applications/git-gui.desktop git") # ignore no doc/manpage warnings where we don't expect any documentation -addFilter("git-(all|core|gnome-keyring)\..*: W: no-documentation") +addFilter("git-(all|core|credential-libsecret)\..*: W: no-documentation") addFilter("perl-Git-SVN.noarch: W: no-documentation") addFilter("git-core\..*: W: no-manual-page-for-binary") diff --git a/git.spec b/git.spec index 4869759..4902707 100644 --- a/git.spec +++ b/git.spec @@ -297,7 +297,7 @@ Summary: Meta-package to pull in all git tools BuildArch: noarch Requires: git = %{version}-%{release} %if %{with libsecret} -Requires: git-credential-libsecret = %{version}-%{release} +Requires: git-credential-libsecret = %{version}-%{release} %endif # endif with libsecret %if %{with cvs} @@ -1062,6 +1062,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Sat Apr 04 2020 Todd Zullinger - 2.26.0-2 - fix issue with fast-forward rebases when rebase.abbreviateCommands is set +- fix/quiet rpmlint issues from libsecret split * Thu Apr 02 2020 Björn Esser - 2.26.0-1.1 - Fix string quoting for rpm >= 4.16 From 580a5d35185005f06bbbbef7e22e46dca19b2678 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 14 Apr 2020 17:43:46 -0400 Subject: [PATCH 657/842] update to 2.26.1 (CVE-2020-5260) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From the upstream release notes¹: With a crafted URL that contains a newline in it, the credential helper machinery can be fooled to give credential information for a wrong host. The attack has been made impossible by forbidding a newline character in any value passed via the credential protocol. ¹ https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.17.4.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 4902707..17e395a 100644 --- a/git.spec +++ b/git.spec @@ -84,8 +84,8 @@ #global rcrev .rc0 Name: git -Version: 2.26.0 -Release: 2%{?rcrev}%{?dist} +Version: 2.26.1 +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1060,6 +1060,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Apr 14 2020 Todd Zullinger - 2.26.1-1 +- update to 2.26.1 (CVE-2020-5260) + * Sat Apr 04 2020 Todd Zullinger - 2.26.0-2 - fix issue with fast-forward rebases when rebase.abbreviateCommands is set - fix/quiet rpmlint issues from libsecret split diff --git a/sources b/sources index 9b45185..556c663 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.26.0.tar.xz) = bf8a832211782a9446d041a54da254f2586b894375191fb1a6dc7a6594856ca43230fa1ea804b54daceb68caa8d20c02bdbdbf7b2fa1761ce05a11a26b122a9b -SHA512 (git-2.26.0.tar.sign) = b60b547d0043695a0efe1495941fb374beea975befcdbd01a288641bd3fd460ef43b40a6dc0332a6906591a59764aa019506bcaf67b9a993b042deba7bbe40ae +SHA512 (git-2.26.1.tar.xz) = 1defa0d94e26e474abd47ec8a0c43c05152e10a5aca5f1aee7480ef0db9f5abd03275fefb7c4e0ee816199c87c0b2a13c164c5f7aa5ff36cafdacf27b3573785 +SHA512 (git-2.26.1.tar.sign) = 9bf881b4d5f99ea4aaa9e77e0c753d8cd466cfc15c18f8a2392da6402c349f27c7e6d7c3844d46ec9e329a534029919bbfedb150a24d21bd27f24667726ee6d5 From e22c1de4910ad0a5d531b2a572143f5be61a9b2e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 20 Apr 2020 14:59:34 -0400 Subject: [PATCH 658/842] update to 2.26.2 (CVE-2020-11008) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From the upstream release notes¹: With a crafted URL that contains a newline or empty host, or lacks a scheme, the credential helper machinery can be fooled into providing credential information that is not appropriate for the protocol in use and host being contacted. Unlike the vulnerability CVE-2020-5260 fixed in v2.17.4, the credentials are not for a host of the attacker's choosing; instead, they are for some unspecified host (based on how the configured credential helper handles an absent "host" parameter). The attack has been made impossible by refusing to work with under-specified credential patterns. ¹ https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.17.5.txt --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 17e395a..bebca5a 100644 --- a/git.spec +++ b/git.spec @@ -84,7 +84,7 @@ #global rcrev .rc0 Name: git -Version: 2.26.1 +Version: 2.26.2 Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -1060,6 +1060,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Apr 20 2020 Todd Zullinger - 2.26.2-1 +- update to 2.26.2 (CVE-2020-11008) + * Tue Apr 14 2020 Todd Zullinger - 2.26.1-1 - update to 2.26.1 (CVE-2020-5260) diff --git a/sources b/sources index 556c663..551ebf0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.26.1.tar.xz) = 1defa0d94e26e474abd47ec8a0c43c05152e10a5aca5f1aee7480ef0db9f5abd03275fefb7c4e0ee816199c87c0b2a13c164c5f7aa5ff36cafdacf27b3573785 -SHA512 (git-2.26.1.tar.sign) = 9bf881b4d5f99ea4aaa9e77e0c753d8cd466cfc15c18f8a2392da6402c349f27c7e6d7c3844d46ec9e329a534029919bbfedb150a24d21bd27f24667726ee6d5 +SHA512 (git-2.26.2.tar.xz) = 5d92d07b171c5cd6e89a29c1211c73c1c900cd51c74d690aebfb4a3d0e93b541b09b42b6d6a1a82f5c3d953096771f9a8605c63be139f559f58698c1a0eabcfc +SHA512 (git-2.26.2.tar.sign) = c53a607eda0bf83bf3593e8d68b833ef3ee99976434a97def5dcc25f31e79ff3e79f832b61508509d43d3111df106dde80ff6c9f7ada34ae53e7b4da17b06ed7 From 24de439725ffdf8450225b399bffc115c46e6d4d Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Thu, 21 May 2020 13:37:09 -0500 Subject: [PATCH 659/842] Minor conditional fixes for ELN Signed-off-by: Merlin Mathesius --- git.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index bebca5a..a5b1529 100644 --- a/git.spec +++ b/git.spec @@ -8,14 +8,19 @@ # Settings for Fedora %if 0%{?fedora} -%bcond_without asciidoctor # linkchecker is not available on EL %bcond_without linkcheck %else -%bcond_with asciidoctor %bcond_with linkcheck %endif +# Settings for Fedora and EL >= 9 +%if 0%{?fedora} || 0%{?rhel} >= 9 +%bcond_without asciidoctor +%else +%bcond_with asciidoctor +%endif + # Settings for Fedora and EL > 7 %if 0%{?fedora} || 0%{?rhel} > 7 %bcond_with python2 @@ -85,7 +90,7 @@ Name: git Version: 2.26.2 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1060,6 +1065,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu May 21 2020 Merlin Mathesius - 2.26.2-2 +- Minor conditional fixes for ELN + * Mon Apr 20 2020 Todd Zullinger - 2.26.2-1 - update to 2.26.2 (CVE-2020-11008) From 1a2db2d667d8d719eb893ad64f1b35f066bbe597 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 20 May 2020 23:11:17 -0400 Subject: [PATCH 660/842] update to 2.27.0-rc1 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.27.0.txt --- ...validation-error-with-older-asciidoc.patch | 48 ++++++++++++++ ...abbreviate-a-command-if-it-doesn-t-h.patch | 58 ----------------- ...-with-rebase.abbreviateCommands-true.patch | 64 ------------------- git.spec | 19 +++--- sources | 4 +- 5 files changed, 60 insertions(+), 133 deletions(-) create mode 100644 0001-gitfaq-avoid-validation-error-with-older-asciidoc.patch delete mode 100644 0001-sequencer-don-t-abbreviate-a-command-if-it-doesn-t-h.patch delete mode 100644 0002-t3432-test-merge-with-rebase.abbreviateCommands-true.patch diff --git a/0001-gitfaq-avoid-validation-error-with-older-asciidoc.patch b/0001-gitfaq-avoid-validation-error-with-older-asciidoc.patch new file mode 100644 index 0000000..0572687 --- /dev/null +++ b/0001-gitfaq-avoid-validation-error-with-older-asciidoc.patch @@ -0,0 +1,48 @@ +From a2df654cfa807d96932d43b6695791a3af90596a Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Mon, 18 May 2020 20:06:23 -0400 +Subject: [PATCH] gitfaq: avoid validation error with older asciidoc + +When building with asciidoc-8.4.5 (as found on CentOS/Red Hat 6), the +period in the "[[files-in-.gitignore-are-tracked]]" anchor is not +properly parsed as a section: + + WARNING: gitfaq.txt: line 245: missing [[files-in-.gitignore-are-tracked]] section + +The resulting XML file fails to validate with xmlto: + + xmlto: /git/Documentation/gitfaq.xml does not validate (status 3) + xmlto: Fix document syntax or use --skip-validation option + /git/Documentation/gitfaq.xml:3: element refentry: validity error : + Element refentry content does not follow the DTD, expecting + (beginpage? , indexterm* , refentryinfo? , refmeta? , (remark | link + | olink | ulink)* , refnamediv+ , refsynopsisdiv? , (refsect1+ | + refsection+)), got (refmeta refnamediv refsynopsisdiv refsect1 + refsect1 refsect1 refsect1 variablelist refsect1 refsect1 ) + Document /git/Documentation/gitfaq.xml does not validate + +Let's avoid breaking users of platforms which ship an old version of +asciidoc, since the cost to do so is quite low. + +Reported-by: Son Luong Ngoc +Signed-off-by: Todd Zullinger +--- + Documentation/gitfaq.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt +index 370d62dae4..9cd7a592ac 100644 +--- a/Documentation/gitfaq.txt ++++ b/Documentation/gitfaq.txt +@@ -223,7 +223,7 @@ a file checked into the repository which is a template or set of defaults which + can then be copied alongside and modified as appropriate. This second, modified + file is usually ignored to prevent accidentally committing it. + +-[[files-in-.gitignore-are-tracked]] ++[[files-in-gitignore-are-tracked]] + I asked Git to ignore various files, yet they are still tracked:: + A `gitignore` file ensures that certain file(s) which are not + tracked by Git remain untracked. However, sometimes particular +-- +2.26.1 + diff --git a/0001-sequencer-don-t-abbreviate-a-command-if-it-doesn-t-h.patch b/0001-sequencer-don-t-abbreviate-a-command-if-it-doesn-t-h.patch deleted file mode 100644 index e5a2058..0000000 --- a/0001-sequencer-don-t-abbreviate-a-command-if-it-doesn-t-h.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 68e7090f31b4d4f2c7b9a25240af61149fbebb5c Mon Sep 17 00:00:00 2001 -From: Alban Gruin -Date: Mon, 30 Mar 2020 14:42:35 +0200 -Subject: [PATCH 1/2] sequencer: don't abbreviate a command if it doesn't have - a short form - -When the sequencer is requested to abbreviate commands, it will replace -those that do not have a short form (eg. `noop') by a comment mark. -`noop' serves no purpose, except when fast-forwarding (ie. by running -`git rebase'). Removing it will break this command when -`rebase.abbreviateCommands' is set to true. - -Teach todo_list_to_strbuf() to check if a command has an actual -short form, and to ignore it if not. - -Signed-off-by: Alban Gruin -Signed-off-by: Junio C Hamano ---- - sequencer.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/sequencer.c b/sequencer.c -index e528225e78..c2f97f94ba 100644 ---- a/sequencer.c -+++ b/sequencer.c -@@ -1564,7 +1564,7 @@ static const char *command_to_string(const enum todo_command command) - - static char command_to_char(const enum todo_command command) - { -- if (command < TODO_COMMENT && todo_command_info[command].c) -+ if (command < TODO_COMMENT) - return todo_command_info[command].c; - return comment_line_char; - } -@@ -4947,6 +4947,8 @@ static void todo_list_to_strbuf(struct repository *r, struct todo_list *todo_lis - max = num; - - for (item = todo_list->items, i = 0; i < max; i++, item++) { -+ char cmd; -+ - /* if the item is not a command write it and continue */ - if (item->command >= TODO_COMMENT) { - strbuf_addf(buf, "%.*s\n", item->arg_len, -@@ -4955,8 +4957,9 @@ static void todo_list_to_strbuf(struct repository *r, struct todo_list *todo_lis - } - - /* add command to the buffer */ -- if (flags & TODO_LIST_ABBREVIATE_CMDS) -- strbuf_addch(buf, command_to_char(item->command)); -+ cmd = command_to_char(item->command); -+ if ((flags & TODO_LIST_ABBREVIATE_CMDS) && cmd) -+ strbuf_addch(buf, cmd); - else - strbuf_addstr(buf, command_to_string(item->command)); - --- -2.26.0 - diff --git a/0002-t3432-test-merge-with-rebase.abbreviateCommands-true.patch b/0002-t3432-test-merge-with-rebase.abbreviateCommands-true.patch deleted file mode 100644 index 662fd3b..0000000 --- a/0002-t3432-test-merge-with-rebase.abbreviateCommands-true.patch +++ /dev/null @@ -1,64 +0,0 @@ -From de9f1d3ef45ec885339d04f9e34293eb2de8605d Mon Sep 17 00:00:00 2001 -From: Alban Gruin -Date: Mon, 30 Mar 2020 14:42:36 +0200 -Subject: [PATCH 2/2] t3432: test `--merge' with `rebase.abbreviateCommands = - true', too - -When fast forwarding, `git --merge' should act the same whether -`rebase.abbreviateCommands' is set or not, but so far it was not the -case. This duplicates the tests ensuring that `--merge' works when fast -forwarding to check if it also works with abbreviated commands. - -Signed-off-by: Alban Gruin -Signed-off-by: Junio C Hamano ---- - t/t3432-rebase-fast-forward.sh | 24 +++++++++++++++++++----- - 1 file changed, 19 insertions(+), 5 deletions(-) - -diff --git a/t/t3432-rebase-fast-forward.sh b/t/t3432-rebase-fast-forward.sh -index 6c9d4a1375..6f0452c0ea 100755 ---- a/t/t3432-rebase-fast-forward.sh -+++ b/t/t3432-rebase-fast-forward.sh -@@ -28,10 +28,12 @@ test_rebase_same_head () { - shift && - cmp_f="$1" && - shift && -- test_rebase_same_head_ $status_n $what_n $cmp_n " --apply" "$*" && -- test_rebase_same_head_ $status_f $what_f $cmp_f " --apply --no-ff" "$*" -- test_rebase_same_head_ $status_n $what_n $cmp_n " --merge" "$*" && -- test_rebase_same_head_ $status_f $what_f $cmp_f " --merge --no-ff" "$*" -+ test_rebase_same_head_ $status_n $what_n $cmp_n 0 " --apply" "$*" && -+ test_rebase_same_head_ $status_f $what_f $cmp_f 0 " --apply --no-ff" "$*" -+ test_rebase_same_head_ $status_n $what_n $cmp_n 0 " --merge" "$*" && -+ test_rebase_same_head_ $status_f $what_f $cmp_f 0 " --merge --no-ff" "$*" -+ test_rebase_same_head_ $status_n $what_n $cmp_n 1 " --merge" "$*" && -+ test_rebase_same_head_ $status_f $what_f $cmp_f 1 " --merge --no-ff" "$*" - } - - test_rebase_same_head_ () { -@@ -41,9 +43,21 @@ test_rebase_same_head_ () { - shift && - cmp="$1" && - shift && -+ abbreviate="$1" && -+ shift && - flag="$1" - shift && -- test_expect_$status "git rebase$flag $* with $changes is $what with $cmp HEAD" " -+ if test $abbreviate -eq 1 -+ then -+ msg="git rebase$flag $* (rebase.abbreviateCommands = true) with $changes is $what with $cmp HEAD" -+ else -+ msg="git rebase$flag $* with $changes is $what with $cmp HEAD" -+ fi && -+ test_expect_$status "$msg" " -+ if test $abbreviate -eq 1 -+ then -+ test_config rebase.abbreviateCommands true -+ fi && - oldhead=\$(git rev-parse HEAD) && - test_when_finished 'git reset --hard \$oldhead' && - cp .git/logs/HEAD expect && --- -2.26.0 - diff --git a/git.spec b/git.spec index a5b1529..848a23a 100644 --- a/git.spec +++ b/git.spec @@ -86,11 +86,11 @@ %endif # Define for release candidates -#global rcrev .rc0 +%global rcrev .rc1 Name: git -Version: 2.26.2 -Release: 2%{?rcrev}%{?dist} +Version: 2.27.0 +Release: 0.1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -122,12 +122,10 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# Fix issue with fast-forward rebases when rebase.abbreviateCommands is set -# https://lore.kernel.org/git/9b4bc756764d87c9f34c11e6ec2fc6482f531805.camel@gmail.com/ -# https://github.com/git/git/commit/68e7090f31 -Patch1: 0001-sequencer-don-t-abbreviate-a-command-if-it-doesn-t-h.patch -# https://github.com/git/git/commit/de9f1d3ef4 -Patch2: 0002-t3432-test-merge-with-rebase.abbreviateCommands-true.patch +# Fix doc build on EL-6 with old asciidoc +# https://lore.kernel.org/git/CAL3xRKdwOASiGys%2B7Uu_OA5kBPrTdAURfEw3UQ%2BrguTXT%2BC6JQ@mail.gmail.com/ +# https://lore.kernel.org/git/20200519045301.GY24220@pobox.com/ +Patch1: 0001-gitfaq-avoid-validation-error-with-older-asciidoc.patch %if %{with docs} # pod2man is needed to build Git.3pm @@ -1065,6 +1063,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu May 21 2020 Todd Zullinger - 2.27.0-0.1.rc1 +- update to 2.27.0-rc1 + * Thu May 21 2020 Merlin Mathesius - 2.26.2-2 - Minor conditional fixes for ELN diff --git a/sources b/sources index 551ebf0..4632aa9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.26.2.tar.xz) = 5d92d07b171c5cd6e89a29c1211c73c1c900cd51c74d690aebfb4a3d0e93b541b09b42b6d6a1a82f5c3d953096771f9a8605c63be139f559f58698c1a0eabcfc -SHA512 (git-2.26.2.tar.sign) = c53a607eda0bf83bf3593e8d68b833ef3ee99976434a97def5dcc25f31e79ff3e79f832b61508509d43d3111df106dde80ff6c9f7ada34ae53e7b4da17b06ed7 +SHA512 (git-2.27.0.rc1.tar.xz) = 88a0f0895cea0b689c91962cab85d87914aebd43a83eff29aaeca160f45203767b54ab6f5c1c27982005aa7dfb14789efa6d6069833e09a874fac9a322ab9080 +SHA512 (git-2.27.0.rc1.tar.sign) = 66f19f27e5dd7e1f915af89034986f8ee339fdbf96f62c9858ff00fad5e9e6956078a2205e7cd27efefc071db001597007c8ec9af3d3a4cc5cca0183a47c6b70 From e79e6b9e089c8ffb76a52090e9842d38cc505283 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 26 May 2020 14:52:46 -0400 Subject: [PATCH 661/842] update to 2.27.0-rc2 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.27.0.txt --- ...validation-error-with-older-asciidoc.patch | 48 ------------------- git.spec | 12 ++--- sources | 4 +- 3 files changed, 7 insertions(+), 57 deletions(-) delete mode 100644 0001-gitfaq-avoid-validation-error-with-older-asciidoc.patch diff --git a/0001-gitfaq-avoid-validation-error-with-older-asciidoc.patch b/0001-gitfaq-avoid-validation-error-with-older-asciidoc.patch deleted file mode 100644 index 0572687..0000000 --- a/0001-gitfaq-avoid-validation-error-with-older-asciidoc.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a2df654cfa807d96932d43b6695791a3af90596a Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Mon, 18 May 2020 20:06:23 -0400 -Subject: [PATCH] gitfaq: avoid validation error with older asciidoc - -When building with asciidoc-8.4.5 (as found on CentOS/Red Hat 6), the -period in the "[[files-in-.gitignore-are-tracked]]" anchor is not -properly parsed as a section: - - WARNING: gitfaq.txt: line 245: missing [[files-in-.gitignore-are-tracked]] section - -The resulting XML file fails to validate with xmlto: - - xmlto: /git/Documentation/gitfaq.xml does not validate (status 3) - xmlto: Fix document syntax or use --skip-validation option - /git/Documentation/gitfaq.xml:3: element refentry: validity error : - Element refentry content does not follow the DTD, expecting - (beginpage? , indexterm* , refentryinfo? , refmeta? , (remark | link - | olink | ulink)* , refnamediv+ , refsynopsisdiv? , (refsect1+ | - refsection+)), got (refmeta refnamediv refsynopsisdiv refsect1 - refsect1 refsect1 refsect1 variablelist refsect1 refsect1 ) - Document /git/Documentation/gitfaq.xml does not validate - -Let's avoid breaking users of platforms which ship an old version of -asciidoc, since the cost to do so is quite low. - -Reported-by: Son Luong Ngoc -Signed-off-by: Todd Zullinger ---- - Documentation/gitfaq.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt -index 370d62dae4..9cd7a592ac 100644 ---- a/Documentation/gitfaq.txt -+++ b/Documentation/gitfaq.txt -@@ -223,7 +223,7 @@ a file checked into the repository which is a template or set of defaults which - can then be copied alongside and modified as appropriate. This second, modified - file is usually ignored to prevent accidentally committing it. - --[[files-in-.gitignore-are-tracked]] -+[[files-in-gitignore-are-tracked]] - I asked Git to ignore various files, yet they are still tracked:: - A `gitignore` file ensures that certain file(s) which are not - tracked by Git remain untracked. However, sometimes particular --- -2.26.1 - diff --git a/git.spec b/git.spec index 848a23a..1b2db5f 100644 --- a/git.spec +++ b/git.spec @@ -86,11 +86,11 @@ %endif # Define for release candidates -%global rcrev .rc1 +%global rcrev .rc2 Name: git Version: 2.27.0 -Release: 0.1%{?rcrev}%{?dist} +Release: 0.2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -122,11 +122,6 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# Fix doc build on EL-6 with old asciidoc -# https://lore.kernel.org/git/CAL3xRKdwOASiGys%2B7Uu_OA5kBPrTdAURfEw3UQ%2BrguTXT%2BC6JQ@mail.gmail.com/ -# https://lore.kernel.org/git/20200519045301.GY24220@pobox.com/ -Patch1: 0001-gitfaq-avoid-validation-error-with-older-asciidoc.patch - %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -1063,6 +1058,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue May 26 2020 Todd Zullinger - 2.27.0-0.2.rc2 +- update to 2.27.0-rc2 + * Thu May 21 2020 Todd Zullinger - 2.27.0-0.1.rc1 - update to 2.27.0-rc1 diff --git a/sources b/sources index 4632aa9..071d841 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.27.0.rc1.tar.xz) = 88a0f0895cea0b689c91962cab85d87914aebd43a83eff29aaeca160f45203767b54ab6f5c1c27982005aa7dfb14789efa6d6069833e09a874fac9a322ab9080 -SHA512 (git-2.27.0.rc1.tar.sign) = 66f19f27e5dd7e1f915af89034986f8ee339fdbf96f62c9858ff00fad5e9e6956078a2205e7cd27efefc071db001597007c8ec9af3d3a4cc5cca0183a47c6b70 +SHA512 (git-2.27.0.rc2.tar.xz) = 02cb439255c6861ec0fe17705539c97e80c4eab6671797039d65357cce4802fb11575036b96e0054ad6b75c4d730779cb59a2e1fb66261a9f02e75d091d38f4f +SHA512 (git-2.27.0.rc2.tar.sign) = 2658ea642ac2962c81881dd68771cf0f65c87cce1a1cc48d337852d5522121532069e01951c72f0a02c908c8b93474be3a1996be56cce68f7b3ba70c90ebd82c From 29f9b2024d0ae436d9a3593c3a59b787ff2bd0f8 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 1 Jun 2020 19:37:50 -0400 Subject: [PATCH 662/842] update to 2.27.0 Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.27.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 1b2db5f..543b90b 100644 --- a/git.spec +++ b/git.spec @@ -86,11 +86,11 @@ %endif # Define for release candidates -%global rcrev .rc2 +#global rcrev .rc0 Name: git Version: 2.27.0 -Release: 0.2%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1058,6 +1058,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Jun 01 2020 Todd Zullinger - 2.27.0-1 +- update to 2.27.0 + * Tue May 26 2020 Todd Zullinger - 2.27.0-0.2.rc2 - update to 2.27.0-rc2 diff --git a/sources b/sources index 071d841..e93cebc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.27.0.rc2.tar.xz) = 02cb439255c6861ec0fe17705539c97e80c4eab6671797039d65357cce4802fb11575036b96e0054ad6b75c4d730779cb59a2e1fb66261a9f02e75d091d38f4f -SHA512 (git-2.27.0.rc2.tar.sign) = 2658ea642ac2962c81881dd68771cf0f65c87cce1a1cc48d337852d5522121532069e01951c72f0a02c908c8b93474be3a1996be56cce68f7b3ba70c90ebd82c +SHA512 (git-2.27.0.tar.xz) = 8ddea44503db7caf1f6080e64555541aa64a7b8761fd6541965ee244d9c4a47befccda1a239f11d86c2ad0ff24923d084f65712f5f2d6cfa178573e3471c6c33 +SHA512 (git-2.27.0.tar.sign) = ef158f08dc42660483739ccdf0fb0985537cd354031d17484546a68062a8ba38c22cb1451ea17d397f7cde162d091c9b5d7344dda338f6dd1900228ad49d2ada From 8169cdf554eab8c78df451be65edec070a08d1d0 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 23 Jun 2020 10:13:40 +0200 Subject: [PATCH 663/842] Perl 5.32 rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 543b90b..d26e677 100644 --- a/git.spec +++ b/git.spec @@ -90,7 +90,7 @@ Name: git Version: 2.27.0 -Release: 1%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist}.1 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1058,6 +1058,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Jun 23 2020 Jitka Plesnikova - 2.27.0-1.1 +- Perl 5.32 rebuild + * Mon Jun 01 2020 Todd Zullinger - 2.27.0-1 - update to 2.27.0 From 9c1c244fd714d33d5932f85cfaddb65dde3ea118 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 26 Jun 2020 16:20:55 +0200 Subject: [PATCH 664/842] Perl 5.32 re-rebuild of bootstrapped packages --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index d26e677..e8430c0 100644 --- a/git.spec +++ b/git.spec @@ -90,7 +90,7 @@ Name: git Version: 2.27.0 -Release: 1%{?rcrev}%{?dist}.1 +Release: 1%{?rcrev}%{?dist}.2 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1058,6 +1058,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Jun 26 2020 Jitka Plesnikova - 2.27.0-1.2 +- Perl 5.32 re-rebuild of bootstrapped packages + * Tue Jun 23 2020 Jitka Plesnikova - 2.27.0-1.1 - Perl 5.32 rebuild From a773853481f04d561d18e816364cda0fcbf85c73 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 9 Jul 2020 18:59:02 -0400 Subject: [PATCH 665/842] update to 2.28.0-rc0 Release notes: https://github.com/git/git/raw/v2.28.0-rc0/Documentation/RelNotes/2.28.0.txt Update git.skip-test-patterns to catch the 2GB clone test. The output of the skipped test was changed (for the better) in upstream commit d63ae31962 (t5608: avoid say() and use "skip_all" instead for consistency, 2020-05-22). --- git.skip-test-patterns | 2 +- git.spec | 9 ++++++--- sources | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/git.skip-test-patterns b/git.skip-test-patterns index 5aaebef..f80cadf 100644 --- a/git.skip-test-patterns +++ b/git.skip-test-patterns @@ -1,8 +1,8 @@ +expensive 2GB clone test; enable with GIT_TEST_CLONE_2GB=true filesystem does not corrupt utf-8 GIT_SKIP_TESTS missing AUTOIDENT missing CASE_INSENSITIVE_FS -missing CLONE_2GB missing DONTHAVEIT missing EXPENSIVE missing JGIT diff --git a/git.spec b/git.spec index e8430c0..aab6bc9 100644 --- a/git.spec +++ b/git.spec @@ -86,11 +86,11 @@ %endif # Define for release candidates -#global rcrev .rc0 +%global rcrev .rc0 Name: git -Version: 2.27.0 -Release: 1%{?rcrev}%{?dist}.2 +Version: 2.28.0 +Release: 0.0%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1058,6 +1058,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Jul 09 2020 Todd Zullinger - 2.28.0-0.0.rc0 +- update to 2.28.0-rc0 + * Fri Jun 26 2020 Jitka Plesnikova - 2.27.0-1.2 - Perl 5.32 re-rebuild of bootstrapped packages diff --git a/sources b/sources index e93cebc..d4fc5f7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.27.0.tar.xz) = 8ddea44503db7caf1f6080e64555541aa64a7b8761fd6541965ee244d9c4a47befccda1a239f11d86c2ad0ff24923d084f65712f5f2d6cfa178573e3471c6c33 -SHA512 (git-2.27.0.tar.sign) = ef158f08dc42660483739ccdf0fb0985537cd354031d17484546a68062a8ba38c22cb1451ea17d397f7cde162d091c9b5d7344dda338f6dd1900228ad49d2ada +SHA512 (git-2.28.0.rc0.tar.xz) = bdfcbb7c99c28868700ad0d3d2fdb783c93478adfc6cfdfa0c04f6eaef0080950b2856f6ea65567ac3b78493126a327ca31323f832668bc45b3ff6cbfd05b417 +SHA512 (git-2.28.0.rc0.tar.sign) = e2bc33bc2918386b3357ddc65d0c7a009f5a6d0c53621186f99d0c3de35a2f96649cc1d183d0f7731859f1a6d99855790dc2ce8b1db1c83cad14163a4e89cb9d From b1fa2c8b0469848a022e341dec7652c58887ae84 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 17 Jul 2020 20:14:43 -0400 Subject: [PATCH 666/842] update to 2.28.0-rc1 Release notes: https://github.com/git/git/raw/1e1a30b64a/Documentation/RelNotes/2.28.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index aab6bc9..40288f8 100644 --- a/git.spec +++ b/git.spec @@ -86,11 +86,11 @@ %endif # Define for release candidates -%global rcrev .rc0 +%global rcrev .rc1 Name: git Version: 2.28.0 -Release: 0.0%{?rcrev}%{?dist} +Release: 0.1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1058,6 +1058,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sat Jul 18 2020 Todd Zullinger - 2.28.0-0.1.rc1 +- update to 2.28.0-rc1 + * Thu Jul 09 2020 Todd Zullinger - 2.28.0-0.0.rc0 - update to 2.28.0-rc0 diff --git a/sources b/sources index d4fc5f7..b184e89 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.28.0.rc0.tar.xz) = bdfcbb7c99c28868700ad0d3d2fdb783c93478adfc6cfdfa0c04f6eaef0080950b2856f6ea65567ac3b78493126a327ca31323f832668bc45b3ff6cbfd05b417 -SHA512 (git-2.28.0.rc0.tar.sign) = e2bc33bc2918386b3357ddc65d0c7a009f5a6d0c53621186f99d0c3de35a2f96649cc1d183d0f7731859f1a6d99855790dc2ce8b1db1c83cad14163a4e89cb9d +SHA512 (git-2.28.0.rc1.tar.xz) = 90108e7fb3d40ee61898f9a08837d97405f9131897319f56d97be7b20d56b2c42aebe2fc59b558baa205f670285fbee0c9a93951a6c2a496c1324122086032e7 +SHA512 (git-2.28.0.rc1.tar.sign) = 42b6a54eae12df79dde16f1a1313c1170daa9446a1f540f03270c3131336b3cfeb4c4c655079bc6fda4c8ec5e02aed2fc0ccc95b41243de069000b1a37212762 From 495c6f3ba73cf288f4e87d0b1d2e523f5904d89c Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 22 Jul 2020 13:41:37 -0400 Subject: [PATCH 667/842] update to 2.28.0-rc2 Release notes: https://github.com/git/git/raw/v2.28.0-rc2/Documentation/RelNotes/2.28.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 40288f8..9619ef4 100644 --- a/git.spec +++ b/git.spec @@ -86,11 +86,11 @@ %endif # Define for release candidates -%global rcrev .rc1 +%global rcrev .rc2 Name: git Version: 2.28.0 -Release: 0.1%{?rcrev}%{?dist} +Release: 0.2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1058,6 +1058,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Jul 22 2020 Todd Zullinger - 2.28.0-0.2.rc2 +- update to 2.28.0-rc2 + * Sat Jul 18 2020 Todd Zullinger - 2.28.0-0.1.rc1 - update to 2.28.0-rc1 diff --git a/sources b/sources index b184e89..94566a6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.28.0.rc1.tar.xz) = 90108e7fb3d40ee61898f9a08837d97405f9131897319f56d97be7b20d56b2c42aebe2fc59b558baa205f670285fbee0c9a93951a6c2a496c1324122086032e7 -SHA512 (git-2.28.0.rc1.tar.sign) = 42b6a54eae12df79dde16f1a1313c1170daa9446a1f540f03270c3131336b3cfeb4c4c655079bc6fda4c8ec5e02aed2fc0ccc95b41243de069000b1a37212762 +SHA512 (git-2.28.0.rc2.tar.xz) = 8d2f2c143611b7cb02729f530444a7aa69fe02b468d73682645d696b8ed12db8c4bb6854b0fd54b8b536d95cc7f50375b5d3bf5b22ba8b6058cf384f093469ca +SHA512 (git-2.28.0.rc2.tar.sign) = 1e1d3c9f7d206b2bd3fc6693f6222f041dfc6d034e5ff4b4aa52d0ce0062c6c33a2c5a1e5a5e612dac77c307c39469d48f515b3805935b10caa33024091c5560 From b5802f9607b5f2829140a701db9b8dca0c755a47 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 20:03:13 +0000 Subject: [PATCH 668/842] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 9619ef4..f674b65 100644 --- a/git.spec +++ b/git.spec @@ -90,7 +90,7 @@ Name: git Version: 2.28.0 -Release: 0.2%{?rcrev}%{?dist} +Release: 0.3%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1058,6 +1058,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.28.0-0.3.rc2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 22 2020 Todd Zullinger - 2.28.0-0.2.rc2 - update to 2.28.0-rc2 From 4ba9ba21884addc3dbb0ee1b67f67e70cafeb2d7 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 27 Jul 2020 14:40:27 -0400 Subject: [PATCH 669/842] update to 2.28.0 Release notes: https://github.com/git/git/raw/v2.28.0/Documentation/RelNotes/2.28.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index f674b65..381fe31 100644 --- a/git.spec +++ b/git.spec @@ -86,11 +86,11 @@ %endif # Define for release candidates -%global rcrev .rc2 +#global rcrev .rc0 Name: git Version: 2.28.0 -Release: 0.3%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1058,6 +1058,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Jul 27 2020 Todd Zullinger - 2.28.0-1 +- update to 2.28.0 + * Mon Jul 27 2020 Fedora Release Engineering - 2.28.0-0.3.rc2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 94566a6..1d08be9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.28.0.rc2.tar.xz) = 8d2f2c143611b7cb02729f530444a7aa69fe02b468d73682645d696b8ed12db8c4bb6854b0fd54b8b536d95cc7f50375b5d3bf5b22ba8b6058cf384f093469ca -SHA512 (git-2.28.0.rc2.tar.sign) = 1e1d3c9f7d206b2bd3fc6693f6222f041dfc6d034e5ff4b4aa52d0ce0062c6c33a2c5a1e5a5e612dac77c307c39469d48f515b3805935b10caa33024091c5560 +SHA512 (git-2.28.0.tar.xz) = a6159c0a15e3c5f9603157d4010664a6d74e7d65b9fe97a03b36fac12607248ed57980d96565841e88eae343001c167222232737d3af812608c8db011941df1a +SHA512 (git-2.28.0.tar.sign) = 1af9fde8650307712c99fcb58f031aba3e5efa56977989023db3f0977e6a9d0a8c1f6f32a8eb698932f9b9cc2bd6f6b04f16619294e8cbfb2e9c11fb994214f2 From 425f3a39fa0e3c11476d9c5d260d6af0878490fc Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 5 Oct 2020 19:59:56 -0400 Subject: [PATCH 670/842] update to 2.29.0-rc0 Delete references to contrib/svn-fe, it was deleted in upstream commit fc47391e24 (drop vcs-svn experiment, 2020-08-13). Release notes: https://github.com/git/git/raw/v2.29.0-rc0/Documentation/RelNotes/2.29.0.txt --- git.spec | 20 +++++++++++--------- sources | 4 ++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/git.spec b/git.spec index 381fe31..89cc229 100644 --- a/git.spec +++ b/git.spec @@ -86,11 +86,11 @@ %endif # Define for release candidates -#global rcrev .rc0 +%global rcrev .rc0 Name: git -Version: 2.28.0 -Release: 1%{?rcrev}%{?dist} +Version: 2.29.0 +Release: 0.0%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -621,12 +621,11 @@ sed -i -e '1s@#! */usr/bin/env python$@#!%{__python2}@' \ contrib/hg-to-git/hg-to-git.py \ contrib/hooks/multimail/git_multimail.py \ contrib/hooks/multimail/migrate-mailhook-config \ - contrib/hooks/multimail/post-receive.example \ - contrib/svn-fe/svnrdump_sim.py + contrib/hooks/multimail/post-receive.example %else -# Remove contrib/fast-import/import-zips.py, contrib/hg-to-git, and -# contrib/svn-fe which all require python2. -rm -rf contrib/fast-import/import-zips.py contrib/hg-to-git contrib/svn-fe +# Remove contrib/fast-import/import-zips.py and contrib/hg-to-git which all +# require python2. +rm -rf contrib/fast-import/import-zips.py contrib/hg-to-git %endif # endif with python2 @@ -795,7 +794,7 @@ not_core_doc_re="(git-(cvs|gui|citool|daemon|instaweb|subtree))|p4|svn|email|git mkdir -p %{buildroot}%{_pkgdocdir}/ cp -pr CODE_OF_CONDUCT.md README.md Documentation/*.txt Documentation/RelNotes contrib %{buildroot}%{_pkgdocdir}/ # Remove contrib/ files/dirs which have nothing useful for documentation -rm -rf %{buildroot}%{_pkgdocdir}/contrib/{contacts,credential,svn-fe}/ +rm -rf %{buildroot}%{_pkgdocdir}/contrib/{contacts,credential}/ cp -p gitweb/INSTALL %{buildroot}%{_pkgdocdir}/INSTALL.gitweb cp -p gitweb/README %{buildroot}%{_pkgdocdir}/README.gitweb @@ -1058,6 +1057,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Oct 05 2020 Todd Zullinger - 2.29.0-0.0.rc0 +- update to 2.29.0-rc0 + * Mon Jul 27 2020 Todd Zullinger - 2.28.0-1 - update to 2.28.0 diff --git a/sources b/sources index 1d08be9..90b5f11 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.28.0.tar.xz) = a6159c0a15e3c5f9603157d4010664a6d74e7d65b9fe97a03b36fac12607248ed57980d96565841e88eae343001c167222232737d3af812608c8db011941df1a -SHA512 (git-2.28.0.tar.sign) = 1af9fde8650307712c99fcb58f031aba3e5efa56977989023db3f0977e6a9d0a8c1f6f32a8eb698932f9b9cc2bd6f6b04f16619294e8cbfb2e9c11fb994214f2 +SHA512 (git-2.29.0.rc0.tar.xz) = 81f28ef88fe4fd11c31bfde70062f8c5cbf4a661d85d21480c74660d296c3989a8e9490503048caf27b2f29dabb6dae28a4097f9f03d13ab932b964b3f4d6f46 +SHA512 (git-2.29.0.rc0.tar.sign) = 9b5a801f6dbab1367b3f22871efd750a4e845a97829559441432cd19a858acdf1c1d292a0f7ecf7a52d8a00d5fa553a692af700ba42b34ac1b123e8f89bb4669 From 29f5c9d8032847443d361baca907912acd9e627d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 9 Oct 2020 16:16:03 -0400 Subject: [PATCH 671/842] update to 2.29.0-rc1 Release notes: https://github.com/git/git/raw/v2.29.0-rc1/Documentation/RelNotes/2.29.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 89cc229..66d3168 100644 --- a/git.spec +++ b/git.spec @@ -86,11 +86,11 @@ %endif # Define for release candidates -%global rcrev .rc0 +%global rcrev .rc1 Name: git Version: 2.29.0 -Release: 0.0%{?rcrev}%{?dist} +Release: 0.1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1057,6 +1057,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Oct 09 2020 Todd Zullinger - 2.29.0-0.1.rc1 +- update to 2.29.0-rc1 + * Mon Oct 05 2020 Todd Zullinger - 2.29.0-0.0.rc0 - update to 2.29.0-rc0 diff --git a/sources b/sources index 90b5f11..054e87e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.29.0.rc0.tar.xz) = 81f28ef88fe4fd11c31bfde70062f8c5cbf4a661d85d21480c74660d296c3989a8e9490503048caf27b2f29dabb6dae28a4097f9f03d13ab932b964b3f4d6f46 -SHA512 (git-2.29.0.rc0.tar.sign) = 9b5a801f6dbab1367b3f22871efd750a4e845a97829559441432cd19a858acdf1c1d292a0f7ecf7a52d8a00d5fa553a692af700ba42b34ac1b123e8f89bb4669 +SHA512 (git-2.29.0.rc1.tar.xz) = e976c5c652f32cc5bb83cc128460c200dd30f722371d180dffabff389310fceafb11ce51075b90ca77469c882d57ca617005ceae1f79a1489c00024032e6f4f8 +SHA512 (git-2.29.0.rc1.tar.sign) = e0c83c9e1bd4940145a6be8e36ec3f106d10190aa86bf61b35af736a869be8e8e3652ec94e7420ebf6f592788d3a2298f332bd2b600f14380f885fb29e48d0e0 From cdea01ae5527a817cf665f1e870cbfaa09883bb1 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 10 Oct 2020 10:13:31 -0400 Subject: [PATCH 672/842] drop emacs-git stub for fedora >= 34 (#1882360) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since git-2.18.0, the emacs files shipped in git have been stub files which merely point users to better options. Stop shipping these stubs with Fedora 34 and later. Drop the emacs BuildRequires on Fedora >= 34. Elsewhere, replace it with emacs-common. We need macros.emacs for %{_emacs_sitelispdir} anywhere we ship the stub .el files¹. The full emacs BR _was_ necessary prior to git-2.18.0, as /usr/bin/emacs was used to byte compile the .el files. It traces all the way back to e46bac5 (Add emacs-git package from Ville (#235431), 2007-06-22). ¹ It might be nice if there were an emacs-rpm-macros for this. But emacs-common is a lot lighter than emacs, so it's still a nice improvement. Per `dnf install` in a current f33 container image: $ dnf install emacs ... Install 193 Packages Total download size: 164 M Installed size: 544 M $ dnf install emacs-common ... Install 7 Packages Total download size: 36 M Installed size: 89 M --- git.spec | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/git.spec b/git.spec index 66d3168..c90480c 100644 --- a/git.spec +++ b/git.spec @@ -6,6 +6,13 @@ %global gitexecdir %{_libexecdir}/git-core +# Settings for Fedora >= 34 +%if 0%{?fedora} >= 34 +%bcond_with emacs +%else +%bcond_without emacs +%endif + # Settings for Fedora %if 0%{?fedora} # linkchecker is not available on EL @@ -141,7 +148,10 @@ BuildRequires: linkchecker # endif with docs BuildRequires: desktop-file-utils BuildRequires: diffutils -BuildRequires: emacs +%if %{with emacs} +BuildRequires: emacs-common +%endif +# endif emacs-common BuildRequires: expat-devel BuildRequires: findutils BuildRequires: gawk @@ -264,10 +274,16 @@ Requires: perl(Term::ReadKey) # endif ! defined perl_bootstrap Requires: perl-Git = %{version}-%{release} -%if %{emacs_filesystem} && %{defined _emacs_version} +%if %{with emacs} && %{emacs_filesystem} && %{defined _emacs_version} Requires: emacs-filesystem >= %{_emacs_version} %endif -# endif emacs_filesystem +# endif with emacs && emacs_filesystem + +# Obsolete emacs-git if it's disabled +%if %{without emacs} +Obsoletes: emacs-git < %{?epoch:%{epoch}:}%{version}-%{release} +%endif +# endif without emacs # Obsolete git-cvs if it's disabled %if %{without cvs} @@ -317,10 +333,10 @@ Requires: perl-Git = %{version}-%{release} Requires: perl(Term::ReadKey) %endif # endif ! defined perl_bootstrap -%if ! %{emacs_filesystem} +%if %{with emacs} && ! %{emacs_filesystem} Requires: emacs-git = %{version}-%{release} %endif -# endif ! emacs_filesystem +# endif with emacs && ! emacs_filesystem %description all Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations @@ -397,7 +413,7 @@ Requires: perl(Net::SMTP::SSL) %description email %{summary}. -%if ! %{emacs_filesystem} +%if %{with emacs} && ! %{emacs_filesystem} %package -n emacs-git Summary: Git version control system support for Emacs Requires: git = %{version}-%{release} @@ -408,7 +424,7 @@ Provides: emacs-git-el = %{version}-%{release} %description -n emacs-git %{summary}. %endif -# endif ! emacs_filesystem +# endif with emacs && ! emacs_filesystem %package -n gitk Summary: Git repository browser @@ -644,6 +660,7 @@ sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \ %make_install -C contrib/contacts +%if %{with emacs} %global elispdir %{_emacs_sitelispdir}/git pushd contrib/emacs >/dev/null for el in *.el ; do @@ -653,6 +670,8 @@ for el in *.el ; do rm -f $el # clean up to avoid cruft in git-core-doc done popd >/dev/null +%endif +# endif with emacs %if %{with libsecret} install -pm 755 contrib/credential/libsecret/git-credential-libsecret \ @@ -910,10 +929,10 @@ rmdir --ignore-fail-on-non-empty "$testdir" # endif use_systemd %files -f bin-man-doc-git-files -%if %{emacs_filesystem} +%if %{with emacs} && %{emacs_filesystem} %{elispdir} %endif -# endif emacs_filesystem +# endif with emacs && emacs_filesystem %{_datadir}/git-core/contrib/diff-highlight %{_datadir}/git-core/contrib/hooks/multimail %{_datadir}/git-core/contrib/hooks/update-paranoid @@ -980,12 +999,12 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_mandir}/man1/git-daemon*.1*} %{?with_docs:%{_pkgdocdir}/git-daemon*.html} -%if ! %{emacs_filesystem} +%if %{with emacs} && ! %{emacs_filesystem} %files -n emacs-git %{_pkgdocdir}/contrib/emacs/README %{elispdir} %endif -# endif ! emacs_filesystem +# endif with emacs && ! emacs_filesystem %files email %{_pkgdocdir}/*email*.txt @@ -1059,6 +1078,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Fri Oct 09 2020 Todd Zullinger - 2.29.0-0.1.rc1 - update to 2.29.0-rc1 +- drop emacs-git stub for fedora >= 34 (#1882360) * Mon Oct 05 2020 Todd Zullinger - 2.29.0-0.0.rc0 - update to 2.29.0-rc0 From 58dc6bb36a79726ca510aab470bf32d8e9876689 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 10 Oct 2020 11:23:56 -0400 Subject: [PATCH 673/842] adjust python hashbang in contrib/hg-to-git, it supports python3 The hg-to-git.py script in contrib grew python3 support in upstream commit d17ae00c97 (hg-to-git: make it compatible with both python3 and python2, 2019-09-18), which was released in git-2.24.0. Move it from the python2-only conditionals. (This leaves contrib/fast-import/import-zips.py as the sole python script which is _not_ python3-compatible. It seems to need only minimal fixes for python2/python3 compatibility -- per some light testing.) --- git.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index c90480c..dd071c6 100644 --- a/git.spec +++ b/git.spec @@ -634,21 +634,21 @@ export SOURCE_DATE_EPOCH=$(date -r version +%%s 2>/dev/null) %if %{with python2} sed -i -e '1s@#! */usr/bin/env python$@#!%{__python2}@' \ contrib/fast-import/import-zips.py \ - contrib/hg-to-git/hg-to-git.py \ contrib/hooks/multimail/git_multimail.py \ contrib/hooks/multimail/migrate-mailhook-config \ contrib/hooks/multimail/post-receive.example %else -# Remove contrib/fast-import/import-zips.py and contrib/hg-to-git which all -# require python2. -rm -rf contrib/fast-import/import-zips.py contrib/hg-to-git +# Remove contrib/fast-import/import-zips.py which requires python2. +rm -rf contrib/fast-import/import-zips.py %endif # endif with python2 # The multimail hook is installed with git. Use python3 to avoid an -# unnecessary python2 dependency, if possible. +# unnecessary python2 dependency, if possible. Also fix contrib/hg-to-git +# while here. %if %{with python3} sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \ + contrib/hg-to-git/hg-to-git.py \ contrib/hooks/multimail/git_multimail.py \ contrib/hooks/multimail/migrate-mailhook-config \ contrib/hooks/multimail/post-receive.example @@ -1079,6 +1079,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" * Fri Oct 09 2020 Todd Zullinger - 2.29.0-0.1.rc1 - update to 2.29.0-rc1 - drop emacs-git stub for fedora >= 34 (#1882360) +- adjust python hashbang in contrib/hg-to-git, it supports python3 * Mon Oct 05 2020 Todd Zullinger - 2.29.0-0.0.rc0 - update to 2.29.0-rc0 From 126d6526c9f8921f8c79e35e6912159c3e14b65e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 15 Oct 2020 16:56:50 -0400 Subject: [PATCH 674/842] update to 2.29.0-rc2 Release notes: https://github.com/git/git/raw/v2.29.0-rc2/Documentation/RelNotes/2.29.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index dd071c6..0a6e414 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.29.0 -Release: 0.1%{?rcrev}%{?dist} +Release: 0.2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1076,6 +1076,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Oct 15 2020 Todd Zullinger - 2.29.0-0.2.rc2 +- update to 2.29.0-rc2 + * Fri Oct 09 2020 Todd Zullinger - 2.29.0-0.1.rc1 - update to 2.29.0-rc1 - drop emacs-git stub for fedora >= 34 (#1882360) diff --git a/sources b/sources index 054e87e..c0972a7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.29.0.rc1.tar.xz) = e976c5c652f32cc5bb83cc128460c200dd30f722371d180dffabff389310fceafb11ce51075b90ca77469c882d57ca617005ceae1f79a1489c00024032e6f4f8 -SHA512 (git-2.29.0.rc1.tar.sign) = e0c83c9e1bd4940145a6be8e36ec3f106d10190aa86bf61b35af736a869be8e8e3652ec94e7420ebf6f592788d3a2298f332bd2b600f14380f885fb29e48d0e0 +SHA512 (git-2.29.0.rc2.tar.xz) = 8fdbf2ced17e38aba0075ee84d527578bccd45c5bc21a4f17f19fb9da753550b865520fcd32b763e4d76f1b529bdc271658ac37097af11aca66eae64db166301 +SHA512 (git-2.29.0.rc2.tar.sign) = 388c74b85e3a0764ff948236d70a18ad4465312b1c434e95b78fac796e763527c5e62ff47ebcaa71492f531284dc3fd7246b8ffd723bbea6200ce81e22c1d0ee From 08f0612fd8cc2fd00945559d847de9932eff606a Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 19 Oct 2020 21:34:21 -0400 Subject: [PATCH 675/842] update to 2.29.0 Release notes: https://github.com/git/git/raw/v2.29.0/Documentation/RelNotes/2.29.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 0a6e414..5a189ba 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.29.0 -Release: 0.2%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1076,6 +1076,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Oct 19 2020 Todd Zullinger - 2.29.0-1 +- update to 2.29.0 + * Thu Oct 15 2020 Todd Zullinger - 2.29.0-0.2.rc2 - update to 2.29.0-rc2 diff --git a/sources b/sources index c0972a7..0abb923 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.29.0.rc2.tar.xz) = 8fdbf2ced17e38aba0075ee84d527578bccd45c5bc21a4f17f19fb9da753550b865520fcd32b763e4d76f1b529bdc271658ac37097af11aca66eae64db166301 -SHA512 (git-2.29.0.rc2.tar.sign) = 388c74b85e3a0764ff948236d70a18ad4465312b1c434e95b78fac796e763527c5e62ff47ebcaa71492f531284dc3fd7246b8ffd723bbea6200ce81e22c1d0ee +SHA512 (git-2.29.0.tar.xz) = 7efca642d78403d15435bc1d44379b328432a36cfeeaa229b6f83e6e6ce52ca0e8fb7de05a8b04d0d2d257d0935e6424e419b892b97777cfcd91d90e0fc7c335 +SHA512 (git-2.29.0.tar.sign) = 8fff0138e7c5256edf1def35997a9982aa7a47ddc2a367a9735a62f4cbfb451845e8306b70b416609f2f6fb4dbf33ff795b2e011fd9b2c9d94b8bbd666d1fa88 From f3a190b8dad5e95cb1da48014557e675a149611b Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 24 Oct 2020 22:02:35 -0400 Subject: [PATCH 676/842] update to 2.29.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The update to 2.29.1 is pointless on its own¹, but a subsequent commit will add some additional post-release fixes for 2.29. Once we're pushing an update, we might as well pick up the latest point release to avoid anyone wondering why we've skipped an update. Release notes: https://github.com/git/git/raw/v2.29.1/Documentation/RelNotes/2.29.1.txt ¹ The only change in 2.29.1 is a Makefile fix for users of the non-default SKIP_DASHED_BUILT_INS installation option. --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 5a189ba..0951479 100644 --- a/git.spec +++ b/git.spec @@ -96,7 +96,7 @@ #global rcrev .rc0 Name: git -Version: 2.29.0 +Version: 2.29.1 Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -1076,6 +1076,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sat Oct 24 2020 Todd Zullinger - 2.29.1-1 +- update to 2.29.1 + * Mon Oct 19 2020 Todd Zullinger - 2.29.0-1 - update to 2.29.0 diff --git a/sources b/sources index 0abb923..0aed137 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.29.0.tar.xz) = 7efca642d78403d15435bc1d44379b328432a36cfeeaa229b6f83e6e6ce52ca0e8fb7de05a8b04d0d2d257d0935e6424e419b892b97777cfcd91d90e0fc7c335 -SHA512 (git-2.29.0.tar.sign) = 8fff0138e7c5256edf1def35997a9982aa7a47ddc2a367a9735a62f4cbfb451845e8306b70b416609f2f6fb4dbf33ff795b2e011fd9b2c9d94b8bbd666d1fa88 +SHA512 (git-2.29.1.tar.xz) = 4c72afd33a83b93769bdd16350925f4776a2c92bdbffd951bf8b0bb0fc6a474b3f54b08fc4252cc5b1a029d9d21e1f8993d49e991af89ee9b676c6d18d696822 +SHA512 (git-2.29.1.tar.sign) = 34274d5b0cd7f44c3e3c23341d67c3b8f7cfe7c8cc54a5d47d58ad10f9e1346df9e1c2a5e231d4b3a1270780de9004998d49e26d077f734847b9f95814b3ab0f From 79a4aef788ef0571af4b111879977f9508727c20 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 23 Oct 2020 23:10:29 -0400 Subject: [PATCH 677/842] fix bugs in am/rebase handling of committer ident/date Quoting from Jeff King's commit message: Commit e8cbe2118a (am: stop exporting GIT_COMMITTER_DATE, 2020-08-17) rewrote the code for setting the committer date to use fmt_ident(), rather than setting an environment variable and letting commit_tree() handle it. But it introduced two bugs: - we use the author email string instead of the committer email - when parsing the committer ident, we used the wrong variable to compute the length of the email, resulting in it always being a zero-length string The regression affected both am and rebase. Apply the upstream fixes. References: https://lore.kernel.org/git/20201023070747.GA2198273@coredump.intra.peff.net/ --- ....0-committer-date-is-author-date-fix.patch | 206 ++++++++++++++++++ git.spec | 10 + 2 files changed, 216 insertions(+) create mode 100644 git-2.29.0-committer-date-is-author-date-fix.patch diff --git a/git-2.29.0-committer-date-is-author-date-fix.patch b/git-2.29.0-committer-date-is-author-date-fix.patch new file mode 100644 index 0000000..a562f07 --- /dev/null +++ b/git-2.29.0-committer-date-is-author-date-fix.patch @@ -0,0 +1,206 @@ +From 56706dba33f5d4457395c651cf1cd033c6c03c7a Mon Sep 17 00:00:00 2001 +From: Jeff King +Date: Fri, 23 Oct 2020 03:08:43 -0400 +Subject: [PATCH 1/3] t3436: check --committer-date-is-author-date result more + carefully + +After running "rebase --committer-date-is-author-date", we confirm that +the committer date is the same as the author date. However, we don't +look at any other parts of the committer ident line to make sure we +didn't screw them up. And indeed, there are a few bugs here. Depending +on the rebase backend in use, we may accidentally use the author email +instead of the committer's, or even an empty string. + +Let's teach our test_ctime_is_atime helper to check the committer name +and email, which reveals several failing tests. + +Signed-off-by: Jeff King +Signed-off-by: Junio C Hamano +--- + t/t3436-rebase-more-options.sh | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/t/t3436-rebase-more-options.sh b/t/t3436-rebase-more-options.sh +index 996e82787e..6f2f49717b 100755 +--- a/t/t3436-rebase-more-options.sh ++++ b/t/t3436-rebase-more-options.sh +@@ -65,31 +65,31 @@ test_expect_success '--ignore-whitespace is remembered when continuing' ' + ' + + test_ctime_is_atime () { +- git log $1 --format=%ai >authortime && +- git log $1 --format=%ci >committertime && ++ git log $1 --format="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> %ai" >authortime && ++ git log $1 --format="%cn <%ce> %ci" >committertime && + test_cmp authortime committertime + } + +-test_expect_success '--committer-date-is-author-date works with apply backend' ' ++test_expect_failure '--committer-date-is-author-date works with apply backend' ' + GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author && + git rebase --apply --committer-date-is-author-date HEAD^ && + test_ctime_is_atime -1 + ' + +-test_expect_success '--committer-date-is-author-date works with merge backend' ' ++test_expect_failure '--committer-date-is-author-date works with merge backend' ' + GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author && + git rebase -m --committer-date-is-author-date HEAD^ && + test_ctime_is_atime -1 + ' + +-test_expect_success '--committer-date-is-author-date works with rebase -r' ' ++test_expect_failure '--committer-date-is-author-date works with rebase -r' ' + git checkout side && + GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 && + git rebase -r --root --committer-date-is-author-date && + test_ctime_is_atime + ' + +-test_expect_success '--committer-date-is-author-date works when forking merge' ' ++test_expect_failure '--committer-date-is-author-date works when forking merge' ' + git checkout side && + GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 && + PATH="./test-bin:$PATH" git rebase -r --root --strategy=test \ +@@ -145,7 +145,7 @@ test_expect_success '--reset-author-date works with rebase -r' ' + test_atime_is_ignored + ' + +-test_expect_success '--reset-author-date with --committer-date-is-author-date works' ' ++test_expect_failure '--reset-author-date with --committer-date-is-author-date works' ' + test_must_fail git rebase -m --committer-date-is-author-date \ + --reset-author-date --onto commit2^^ commit2^ commit3 && + git checkout --theirs foo && + +From 16b0bb99eac5ebd02a5dcabdff2cfc390e9d92ef Mon Sep 17 00:00:00 2001 +From: Jeff King +Date: Fri, 23 Oct 2020 03:09:39 -0400 +Subject: [PATCH 2/3] am: fix broken email with --committer-date-is-author-date + +Commit e8cbe2118a (am: stop exporting GIT_COMMITTER_DATE, 2020-08-17) +rewrote the code for setting the committer date to use fmt_ident(), +rather than setting an environment variable and letting commit_tree() +handle it. But it introduced two bugs: + + - we use the author email string instead of the committer email + + - when parsing the committer ident, we used the wrong variable to + compute the length of the email, resulting in it always being a + zero-length string + +This commit fixes both, which causes our test of this option via the +rebase "apply" backend to now succeed. + +Signed-off-by: Jeff King +Signed-off-by: Junio C Hamano +--- + builtin/am.c | 4 ++-- + t/t3436-rebase-more-options.sh | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/builtin/am.c b/builtin/am.c +index 896cd0f827..af931e588c 100644 +--- a/builtin/am.c ++++ b/builtin/am.c +@@ -161,7 +161,7 @@ static void am_state_init(struct am_state *state) + state->committer_name = + xmemdupz(id.name_begin, id.name_end - id.name_begin); + state->committer_email = +- xmemdupz(id.mail_begin, id.mail_end - id.mail_end); ++ xmemdupz(id.mail_begin, id.mail_end - id.mail_begin); + } + + /** +@@ -1595,7 +1595,7 @@ static void do_commit(const struct am_state *state) + + if (state->committer_date_is_author_date) + committer = fmt_ident(state->committer_name, +- state->author_email, WANT_COMMITTER_IDENT, ++ state->committer_email, WANT_COMMITTER_IDENT, + state->ignore_date ? NULL + : state->author_date, + IDENT_STRICT); +diff --git a/t/t3436-rebase-more-options.sh b/t/t3436-rebase-more-options.sh +index 6f2f49717b..3fda2235bd 100755 +--- a/t/t3436-rebase-more-options.sh ++++ b/t/t3436-rebase-more-options.sh +@@ -70,7 +70,7 @@ test_ctime_is_atime () { + test_cmp authortime committertime + } + +-test_expect_failure '--committer-date-is-author-date works with apply backend' ' ++test_expect_success '--committer-date-is-author-date works with apply backend' ' + GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author && + git rebase --apply --committer-date-is-author-date HEAD^ && + test_ctime_is_atime -1 + +From 5f35edd9d7ebca17f205b338d340cc6ce214644a Mon Sep 17 00:00:00 2001 +From: Jeff King +Date: Fri, 23 Oct 2020 03:10:15 -0400 +Subject: [PATCH 3/3] rebase: fix broken email with + --committer-date-is-author-date + +Commit 7573cec52c (rebase -i: support --committer-date-is-author-date, +2020-08-17) copied the committer ident-parsing code from builtin/am.c. +And in doing so, it copied a bug in which we always set the email to an +empty string. We fixed the version in git-am in the previous commit; +this commit fixes the copied code. + +Reported-by: VenomVendor +Signed-off-by: Jeff King +Signed-off-by: Junio C Hamano +--- + sequencer.c | 2 +- + t/t3436-rebase-more-options.sh | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/sequencer.c b/sequencer.c +index 4ccb5451a9..9dcd3db3ef 100644 +--- a/sequencer.c ++++ b/sequencer.c +@@ -4369,7 +4369,7 @@ static int init_committer(struct replay_opts *opts) + opts->committer_name = + xmemdupz(id.name_begin, id.name_end - id.name_begin); + opts->committer_email = +- xmemdupz(id.mail_begin, id.mail_end - id.mail_end); ++ xmemdupz(id.mail_begin, id.mail_end - id.mail_begin); + + return 0; + } +diff --git a/t/t3436-rebase-more-options.sh b/t/t3436-rebase-more-options.sh +index 3fda2235bd..eaaf4c8d1d 100755 +--- a/t/t3436-rebase-more-options.sh ++++ b/t/t3436-rebase-more-options.sh +@@ -76,20 +76,20 @@ test_expect_success '--committer-date-is-author-date works with apply backend' ' + test_ctime_is_atime -1 + ' + +-test_expect_failure '--committer-date-is-author-date works with merge backend' ' ++test_expect_success '--committer-date-is-author-date works with merge backend' ' + GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author && + git rebase -m --committer-date-is-author-date HEAD^ && + test_ctime_is_atime -1 + ' + +-test_expect_failure '--committer-date-is-author-date works with rebase -r' ' ++test_expect_success '--committer-date-is-author-date works with rebase -r' ' + git checkout side && + GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 && + git rebase -r --root --committer-date-is-author-date && + test_ctime_is_atime + ' + +-test_expect_failure '--committer-date-is-author-date works when forking merge' ' ++test_expect_success '--committer-date-is-author-date works when forking merge' ' + git checkout side && + GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 && + PATH="./test-bin:$PATH" git rebase -r --root --strategy=test \ +@@ -145,7 +145,7 @@ test_expect_success '--reset-author-date works with rebase -r' ' + test_atime_is_ignored + ' + +-test_expect_failure '--reset-author-date with --committer-date-is-author-date works' ' ++test_expect_success '--reset-author-date with --committer-date-is-author-date works' ' + test_must_fail git rebase -m --committer-date-is-author-date \ + --reset-author-date --onto commit2^^ commit2^ commit3 && + git checkout --theirs foo && diff --git a/git.spec b/git.spec index 0951479..e69fef3 100644 --- a/git.spec +++ b/git.spec @@ -129,6 +129,15 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch +# Fix bugs in am/rebase handling of committer ident/date discussed at +# https://lore.kernel.org/git/20201023070747.GA2198273@coredump.intra.peff.net/ +# +# The following three commits make up the patch +# https://github.com/git/git/commit/56706dba33f5d4457395c651cf1cd033c6c03c7a +# https://github.com/git/git/commit/16b0bb99eac5ebd02a5dcabdff2cfc390e9d92ef +# https://github.com/git/git/commit/5f35edd9d7ebca17f205b338d340cc6ce214644a +Patch1: git-2.29.0-committer-date-is-author-date-fix.patch + %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -1078,6 +1087,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Sat Oct 24 2020 Todd Zullinger - 2.29.1-1 - update to 2.29.1 +- fix bugs in am/rebase handling of committer ident/date * Mon Oct 19 2020 Todd Zullinger - 2.29.0-1 - update to 2.29.0 From 8fc9bc0302a99d8af6bc3bae0d84b3bbf310cd8a Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 29 Oct 2020 18:45:12 -0400 Subject: [PATCH 678/842] update to 2.29.2 Quoting the release notes: In 2.29, "--committer-date-is-author-date" option of "rebase" and "am" subcommands lost the e-mail address by mistake, which has been corrected. Release notes: https://github.com/git/git/raw/v2.29.2/Documentation/RelNotes/2.29.2.txt --- ....0-committer-date-is-author-date-fix.patch | 206 ------------------ git.spec | 14 +- sources | 4 +- 3 files changed, 6 insertions(+), 218 deletions(-) delete mode 100644 git-2.29.0-committer-date-is-author-date-fix.patch diff --git a/git-2.29.0-committer-date-is-author-date-fix.patch b/git-2.29.0-committer-date-is-author-date-fix.patch deleted file mode 100644 index a562f07..0000000 --- a/git-2.29.0-committer-date-is-author-date-fix.patch +++ /dev/null @@ -1,206 +0,0 @@ -From 56706dba33f5d4457395c651cf1cd033c6c03c7a Mon Sep 17 00:00:00 2001 -From: Jeff King -Date: Fri, 23 Oct 2020 03:08:43 -0400 -Subject: [PATCH 1/3] t3436: check --committer-date-is-author-date result more - carefully - -After running "rebase --committer-date-is-author-date", we confirm that -the committer date is the same as the author date. However, we don't -look at any other parts of the committer ident line to make sure we -didn't screw them up. And indeed, there are a few bugs here. Depending -on the rebase backend in use, we may accidentally use the author email -instead of the committer's, or even an empty string. - -Let's teach our test_ctime_is_atime helper to check the committer name -and email, which reveals several failing tests. - -Signed-off-by: Jeff King -Signed-off-by: Junio C Hamano ---- - t/t3436-rebase-more-options.sh | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/t/t3436-rebase-more-options.sh b/t/t3436-rebase-more-options.sh -index 996e82787e..6f2f49717b 100755 ---- a/t/t3436-rebase-more-options.sh -+++ b/t/t3436-rebase-more-options.sh -@@ -65,31 +65,31 @@ test_expect_success '--ignore-whitespace is remembered when continuing' ' - ' - - test_ctime_is_atime () { -- git log $1 --format=%ai >authortime && -- git log $1 --format=%ci >committertime && -+ git log $1 --format="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> %ai" >authortime && -+ git log $1 --format="%cn <%ce> %ci" >committertime && - test_cmp authortime committertime - } - --test_expect_success '--committer-date-is-author-date works with apply backend' ' -+test_expect_failure '--committer-date-is-author-date works with apply backend' ' - GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author && - git rebase --apply --committer-date-is-author-date HEAD^ && - test_ctime_is_atime -1 - ' - --test_expect_success '--committer-date-is-author-date works with merge backend' ' -+test_expect_failure '--committer-date-is-author-date works with merge backend' ' - GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author && - git rebase -m --committer-date-is-author-date HEAD^ && - test_ctime_is_atime -1 - ' - --test_expect_success '--committer-date-is-author-date works with rebase -r' ' -+test_expect_failure '--committer-date-is-author-date works with rebase -r' ' - git checkout side && - GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 && - git rebase -r --root --committer-date-is-author-date && - test_ctime_is_atime - ' - --test_expect_success '--committer-date-is-author-date works when forking merge' ' -+test_expect_failure '--committer-date-is-author-date works when forking merge' ' - git checkout side && - GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 && - PATH="./test-bin:$PATH" git rebase -r --root --strategy=test \ -@@ -145,7 +145,7 @@ test_expect_success '--reset-author-date works with rebase -r' ' - test_atime_is_ignored - ' - --test_expect_success '--reset-author-date with --committer-date-is-author-date works' ' -+test_expect_failure '--reset-author-date with --committer-date-is-author-date works' ' - test_must_fail git rebase -m --committer-date-is-author-date \ - --reset-author-date --onto commit2^^ commit2^ commit3 && - git checkout --theirs foo && - -From 16b0bb99eac5ebd02a5dcabdff2cfc390e9d92ef Mon Sep 17 00:00:00 2001 -From: Jeff King -Date: Fri, 23 Oct 2020 03:09:39 -0400 -Subject: [PATCH 2/3] am: fix broken email with --committer-date-is-author-date - -Commit e8cbe2118a (am: stop exporting GIT_COMMITTER_DATE, 2020-08-17) -rewrote the code for setting the committer date to use fmt_ident(), -rather than setting an environment variable and letting commit_tree() -handle it. But it introduced two bugs: - - - we use the author email string instead of the committer email - - - when parsing the committer ident, we used the wrong variable to - compute the length of the email, resulting in it always being a - zero-length string - -This commit fixes both, which causes our test of this option via the -rebase "apply" backend to now succeed. - -Signed-off-by: Jeff King -Signed-off-by: Junio C Hamano ---- - builtin/am.c | 4 ++-- - t/t3436-rebase-more-options.sh | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/builtin/am.c b/builtin/am.c -index 896cd0f827..af931e588c 100644 ---- a/builtin/am.c -+++ b/builtin/am.c -@@ -161,7 +161,7 @@ static void am_state_init(struct am_state *state) - state->committer_name = - xmemdupz(id.name_begin, id.name_end - id.name_begin); - state->committer_email = -- xmemdupz(id.mail_begin, id.mail_end - id.mail_end); -+ xmemdupz(id.mail_begin, id.mail_end - id.mail_begin); - } - - /** -@@ -1595,7 +1595,7 @@ static void do_commit(const struct am_state *state) - - if (state->committer_date_is_author_date) - committer = fmt_ident(state->committer_name, -- state->author_email, WANT_COMMITTER_IDENT, -+ state->committer_email, WANT_COMMITTER_IDENT, - state->ignore_date ? NULL - : state->author_date, - IDENT_STRICT); -diff --git a/t/t3436-rebase-more-options.sh b/t/t3436-rebase-more-options.sh -index 6f2f49717b..3fda2235bd 100755 ---- a/t/t3436-rebase-more-options.sh -+++ b/t/t3436-rebase-more-options.sh -@@ -70,7 +70,7 @@ test_ctime_is_atime () { - test_cmp authortime committertime - } - --test_expect_failure '--committer-date-is-author-date works with apply backend' ' -+test_expect_success '--committer-date-is-author-date works with apply backend' ' - GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author && - git rebase --apply --committer-date-is-author-date HEAD^ && - test_ctime_is_atime -1 - -From 5f35edd9d7ebca17f205b338d340cc6ce214644a Mon Sep 17 00:00:00 2001 -From: Jeff King -Date: Fri, 23 Oct 2020 03:10:15 -0400 -Subject: [PATCH 3/3] rebase: fix broken email with - --committer-date-is-author-date - -Commit 7573cec52c (rebase -i: support --committer-date-is-author-date, -2020-08-17) copied the committer ident-parsing code from builtin/am.c. -And in doing so, it copied a bug in which we always set the email to an -empty string. We fixed the version in git-am in the previous commit; -this commit fixes the copied code. - -Reported-by: VenomVendor -Signed-off-by: Jeff King -Signed-off-by: Junio C Hamano ---- - sequencer.c | 2 +- - t/t3436-rebase-more-options.sh | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/sequencer.c b/sequencer.c -index 4ccb5451a9..9dcd3db3ef 100644 ---- a/sequencer.c -+++ b/sequencer.c -@@ -4369,7 +4369,7 @@ static int init_committer(struct replay_opts *opts) - opts->committer_name = - xmemdupz(id.name_begin, id.name_end - id.name_begin); - opts->committer_email = -- xmemdupz(id.mail_begin, id.mail_end - id.mail_end); -+ xmemdupz(id.mail_begin, id.mail_end - id.mail_begin); - - return 0; - } -diff --git a/t/t3436-rebase-more-options.sh b/t/t3436-rebase-more-options.sh -index 3fda2235bd..eaaf4c8d1d 100755 ---- a/t/t3436-rebase-more-options.sh -+++ b/t/t3436-rebase-more-options.sh -@@ -76,20 +76,20 @@ test_expect_success '--committer-date-is-author-date works with apply backend' ' - test_ctime_is_atime -1 - ' - --test_expect_failure '--committer-date-is-author-date works with merge backend' ' -+test_expect_success '--committer-date-is-author-date works with merge backend' ' - GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author && - git rebase -m --committer-date-is-author-date HEAD^ && - test_ctime_is_atime -1 - ' - --test_expect_failure '--committer-date-is-author-date works with rebase -r' ' -+test_expect_success '--committer-date-is-author-date works with rebase -r' ' - git checkout side && - GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 && - git rebase -r --root --committer-date-is-author-date && - test_ctime_is_atime - ' - --test_expect_failure '--committer-date-is-author-date works when forking merge' ' -+test_expect_success '--committer-date-is-author-date works when forking merge' ' - git checkout side && - GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 && - PATH="./test-bin:$PATH" git rebase -r --root --strategy=test \ -@@ -145,7 +145,7 @@ test_expect_success '--reset-author-date works with rebase -r' ' - test_atime_is_ignored - ' - --test_expect_failure '--reset-author-date with --committer-date-is-author-date works' ' -+test_expect_success '--reset-author-date with --committer-date-is-author-date works' ' - test_must_fail git rebase -m --committer-date-is-author-date \ - --reset-author-date --onto commit2^^ commit2^ commit3 && - git checkout --theirs foo && diff --git a/git.spec b/git.spec index e69fef3..6081678 100644 --- a/git.spec +++ b/git.spec @@ -96,7 +96,7 @@ #global rcrev .rc0 Name: git -Version: 2.29.1 +Version: 2.29.2 Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -129,15 +129,6 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# Fix bugs in am/rebase handling of committer ident/date discussed at -# https://lore.kernel.org/git/20201023070747.GA2198273@coredump.intra.peff.net/ -# -# The following three commits make up the patch -# https://github.com/git/git/commit/56706dba33f5d4457395c651cf1cd033c6c03c7a -# https://github.com/git/git/commit/16b0bb99eac5ebd02a5dcabdff2cfc390e9d92ef -# https://github.com/git/git/commit/5f35edd9d7ebca17f205b338d340cc6ce214644a -Patch1: git-2.29.0-committer-date-is-author-date-fix.patch - %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -1085,6 +1076,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Oct 29 2020 Todd Zullinger - 2.29.2-1 +- update to 2.29.2 + * Sat Oct 24 2020 Todd Zullinger - 2.29.1-1 - update to 2.29.1 - fix bugs in am/rebase handling of committer ident/date diff --git a/sources b/sources index 0aed137..61331f5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.29.1.tar.xz) = 4c72afd33a83b93769bdd16350925f4776a2c92bdbffd951bf8b0bb0fc6a474b3f54b08fc4252cc5b1a029d9d21e1f8993d49e991af89ee9b676c6d18d696822 -SHA512 (git-2.29.1.tar.sign) = 34274d5b0cd7f44c3e3c23341d67c3b8f7cfe7c8cc54a5d47d58ad10f9e1346df9e1c2a5e231d4b3a1270780de9004998d49e26d077f734847b9f95814b3ab0f +SHA512 (git-2.29.2.tar.xz) = 34117628c6d43ac0940c43bffaa1bda7f12af863728f391492725a3e57d1bbda523cf7734e90f463fe9a9ae4e70fc1cc2523643dbb3c27377d98dc4736b0ea62 +SHA512 (git-2.29.2.tar.sign) = 781f0f12d061ca5d3576a23f90df7646fb03cc4a735a41c0118022a1124a053cdea439905efd69cd6cb0161dfe40b93b4c8c99ddac4bc484ecee14881e7ed0af From 6b303b47954304f26e695f1d2560e913083b8848 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 7 Nov 2020 02:02:08 -0500 Subject: [PATCH 679/842] apply upstream patch to resolve git log segfault (#1791810) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A change in git-2.24.0¹ resulted in a segfault when combining the incompatible (and nonsensical) --follow and -L git log options. (These options were used by the GitLens plugin for VS Code until recently².) The upstream fix returns an error when these options are combined rather than a segfault. ¹ a2bb801f6a (line-log: avoid unnecessary full tree diffs, 2019-08-21) https://github.com/git/git/commit/a2bb801f6a ² Fixed in GitLens >= 10.2.3 https://github.com/eamodio/vscode-gitlens/issues/1139 --- ...ose-L-used-with-pathspec-as-an-error.patch | 78 +++++++++++++++++++ git.spec | 9 ++- 2 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 0001-log-diagnose-L-used-with-pathspec-as-an-error.patch 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 new file mode 100644 index 0000000..0f99aba --- /dev/null +++ b/0001-log-diagnose-L-used-with-pathspec-as-an-error.patch @@ -0,0 +1,78 @@ +From 39664cb0aca42f240468ddf84fe75df4172ab63f Mon Sep 17 00:00:00 2001 +From: Junio C Hamano +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 +Signed-off-by: Junio C Hamano +--- + 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: 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 6081678..5188290 100644 --- a/git.spec +++ b/git.spec @@ -97,7 +97,7 @@ Name: git Version: 2.29.2 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -129,6 +129,10 @@ 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-used-with-pathspec-as-an-error.patch + %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -1076,6 +1080,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sat Nov 07 2020 Todd Zullinger - 2.29.2-2 +- apply upstream patch to resolve git log segfault (#1791810) + * Thu Oct 29 2020 Todd Zullinger - 2.29.2-1 - update to 2.29.2 From 1faa4b11312e356a850e522a128056cb5735dcd4 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 25 Nov 2020 20:55:44 -0500 Subject: [PATCH 680/842] apply upstream patch to resolve git fast-import memory leak (#1900335) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A change in git-2.27.0¹ caused fast-import to leak memory and crash in some cases. Apply the upstream fix², which didn't quite make it into git-2.29.0. ¹ ddddf8d7e2 (fast-import: permit reading multiple marks files, 2020-02-22) https://github.com/git/git/commit/ddddf8d7e2 ² 3f018ec716 (fast-import: fix over-allocation of marks storage, 2020-10-15) https://github.com/git/git/commit/3f018ec716 --- ...fix-over-allocation-of-marks-storage.patch | 221 ++++++++++++++++++ git.spec | 9 +- 2 files changed, 229 insertions(+), 1 deletion(-) create mode 100644 0001-fast-import-fix-over-allocation-of-marks-storage.patch diff --git a/0001-fast-import-fix-over-allocation-of-marks-storage.patch b/0001-fast-import-fix-over-allocation-of-marks-storage.patch new file mode 100644 index 0000000..eff5fb2 --- /dev/null +++ b/0001-fast-import-fix-over-allocation-of-marks-storage.patch @@ -0,0 +1,221 @@ +From 3f018ec716292b4d757385686f42f57af3bca685 Mon Sep 17 00:00:00 2001 +From: Jeff King +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 +Signed-off-by: Jeff King +Signed-off-by: Junio C Hamano +--- + 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 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 \ ++ actual && ++ echo "$new" >expect && ++ test_cmp expect actual ++' ++ ++test_done diff --git a/git.spec b/git.spec index 5188290..ad1623e 100644 --- a/git.spec +++ b/git.spec @@ -97,7 +97,7 @@ Name: git Version: 2.29.2 -Release: 2%{?rcrev}%{?dist} +Release: 3%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -133,6 +133,10 @@ Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://lore.kernel.org/git/xmqqy2jglv29.fsf_-_@gitster.c.googlers.com/ Patch1: https://github.com/git/git/commit/39664cb0ac.patch#/0001-log-diagnose-L-used-with-pathspec-as-an-error.patch +# 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-over-allocation-of-marks-storage.patch + %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -1080,6 +1084,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Nov 25 2020 Todd Zullinger - 2.29.2-3 +- apply upstream patch to resolve git fast-import memory leak (#1900335) + * Sat Nov 07 2020 Todd Zullinger - 2.29.2-2 - apply upstream patch to resolve git log segfault (#1791810) From c22491b4e8c68ba24ce2db899b6ac2e2995fb500 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 26 Nov 2020 00:07:19 -0500 Subject: [PATCH 681/842] add epel-rpm-macros BuildRequires on EL-7 (#1872865) We intend to support building on all supported Fedora and EPEL releases from the Rawhide branch. On EL-7, the %build_cflags and %build_ldflags macros are not present without installing epel-rpm-macros. Add a build requirement to ensure these macros are available when building on EL-7. --- git.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/git.spec b/git.spec index ad1623e..2ef6a9a 100644 --- a/git.spec +++ b/git.spec @@ -160,6 +160,11 @@ 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 +BuildRequires: epel-rpm-macros +%endif +# endif rhel == 7 BuildRequires: expat-devel BuildRequires: findutils BuildRequires: gawk @@ -1086,6 +1091,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Wed Nov 25 2020 Todd Zullinger - 2.29.2-3 - apply upstream patch to resolve git fast-import memory leak (#1900335) +- add epel-rpm-macros BuildRequires on EL-7 (#1872865) * Sat Nov 07 2020 Todd Zullinger - 2.29.2-2 - apply upstream patch to resolve git log segfault (#1791810) From 858ea85cce6a24418da268407ed675751dc68f4c Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 6 Dec 2020 13:56:02 -0500 Subject: [PATCH 682/842] 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. --- git.rpmlintrc | 3 --- git.spec | 7 +++++-- 2 files changed, 5 insertions(+), 5 deletions(-) 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 - 2.29.2-4 +- move git-difftool to git-core, it does not require perl + * Wed Nov 25 2020 Todd Zullinger - 2.29.2-3 - apply upstream patch to resolve git fast-import memory leak (#1900335) - add epel-rpm-macros BuildRequires on EL-7 (#1872865) From ce1d42aa54d30f4410570a93a90ef8894e459cef Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 6 Dec 2020 14:39:05 -0500 Subject: [PATCH 683/842] 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. --- git.rpmlintrc | 4 ++++ 1 file changed, 4 insertions(+) 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") From 528c7a0575f5049888fadde7c9b28a6b6bce5c60 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 14 Dec 2020 15:09:47 -0500 Subject: [PATCH 684/842] update to 2.30.0-rc0 Release notes: https://github.com/git/git/raw/v2.30.0-rc0/Documentation/RelNotes/2.30.0.txt --- ...fix-over-allocation-of-marks-storage.patch | 221 ------------------ ...ose-L-used-with-pathspec-as-an-error.patch | 78 ------- git.spec | 17 +- sources | 4 +- 4 files changed, 8 insertions(+), 312 deletions(-) delete mode 100644 0001-fast-import-fix-over-allocation-of-marks-storage.patch delete mode 100644 0001-log-diagnose-L-used-with-pathspec-as-an-error.patch 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 -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 -Signed-off-by: Jeff King -Signed-off-by: Junio C Hamano ---- - 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 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 \ -+ 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 -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 -Signed-off-by: Junio C Hamano ---- - 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: 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-used-with-pathspec-as-an-error.patch - -# 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-over-allocation-of-marks-storage.patch - %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 - 2.30.0-0.0.rc0 +- update to 2.30.0-rc0 + * Sun Dec 06 2020 Todd Zullinger - 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 From 9e220daf74ebee477e1cb04a6af4758e4f6dbf41 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 18 Dec 2020 23:40:05 -0500 Subject: [PATCH 685/842] update to 2.30.0-rc1 Release notes: https://github.com/git/git/raw/v2.30.0-rc1/Documentation/RelNotes/2.30.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) 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 - 2.30.0-0.1.rc1 +- update to 2.30.0-rc1 + * Mon Dec 14 2020 Todd Zullinger - 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 From 8fef3782c3057d868f57f847dec67e1c38b02a21 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 23 Dec 2020 19:01:29 -0500 Subject: [PATCH 686/842] update to 2.30.0-rc2 Release notes: https://github.com/git/git/raw/v2.30.0-rc2/Documentation/RelNotes/2.30.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) 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 - 2.30.0-0.2.rc2 +- update to 2.30.0-rc2 + * Sat Dec 19 2020 Todd Zullinger - 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 From c93103f5ad8d0e0ce9c5ae05b28d7488d2e4a1d2 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 28 Dec 2020 15:02:16 -0500 Subject: [PATCH 687/842] update to 2.30.0 Release notes: https://github.com/git/git/raw/v2.30.0/Documentation/RelNotes/2.30.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) 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 - 2.30.0-1 +- update to 2.30.0 + * Wed Dec 23 2020 Todd Zullinger - 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 From cb12da19d4f919c8bef348ebdedee1e9a44bd3e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 08:07:04 +0000 Subject: [PATCH 688/842] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 - 2.30.0-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Dec 28 2020 Todd Zullinger - 2.30.0-1 - update to 2.30.0 From 50e6f6ece0fe90b3f97f60e92f8015b2d283f3a9 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 27 Jan 2021 11:53:45 -0500 Subject: [PATCH 689/842] 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 uid Junio C Hamano uid Junio C Hamano -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@alchemists.io/T/#u --- gpgkey-junio.asc | 186 +++++++++++++++++++++-------------------------- 1 file changed, 82 insertions(+), 104 deletions(-) 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 @@ d2ZdUxMgwgcNiQOCW70YWtxf0LF2seSJdLItHDBOu/f3cqKwNGUvcC3d/9qVb0wP SI1mq18S02MGcvDySsjGtX7o4kujUqE2ZNCW6ORLJUC6zEYu3TRNWrXeS3uAP21x UrEPkuTiJL7SCS12FYJt5agx5NIUKI7bkIUbLbiuhC4z47MFajW9Y5jUQk86dk7b jGqVrXYIu92Dhxc2CND2fWaMpYRhwvHR6KQU1yYHYkGVlMHiozM5D+4dCRRVI8x3 -p/+ypFBZmZr7yTpv/qD0N8HHl2NAYvGRQdzjyFQOXERwaXuzjCkAEQEAAYkERAQY -AQIADwIbAgUCVB9jPgUJB3dMaAIpwV0gBBkBAgAGBQJOiUo5AAoJELC16IaWr+bL -pKUQAMsAmipqNBx++8jZKqK5pyrUQa8/I7cevHv/6avwMgq4ISlIfdYixmI4t/xN -akHu6ezXu1gJ97hWbNts6zSiAxsbTDAkEwtDXuAQLzIdTc8M8wQgsoq7NXHC4+YC -pKBZCn06OVOTVjc52DzPLom9bmOb3UaiCdryeyScpDXXFuaHeNk7VrDsR9s06eEk -TZl/ED2kW3zsT3ZSrG6dHiDupJPi8eoBL1gLRHWucUndT8Miu0nxmnU5vvEcOVHj -9ZEbbikD5u7EQQdHKFw1R6RYv5zFh81cb/zSoSwJMyGxjleqy/IoVYVxqhIIg+UP -kHW2jbIi7R6OZ4gc6W5870qKQWHDn7a4XDzQ2NEWF2G/+SWVInfyQVisFfs0RBJ2 -4LbGA28BRA5wlSBslwKMcmrP0t29eIs2raoCDcYmLsaQ2PsNTuUcsIzk3Sz1FpS+ -WIR9Vv4MG3choi+LIdL/38zctLykecz7dYSAhAPWLwiO5N2++DunogweXzCET5Da -+rm2VntE+seHi9hI0hUVyBJm5pwIfd6XaVha1x/kn9SyoQWc6I4FLEFP68wdkfeE -u1cdGfrc4A2fHyXuO2VBH8yXHMshr3v0ALCy4E1kcET9zEmtawuMLlrQwzJP3a8P -QqZnhXkRZ9KAyAaP5tpgb/lDQMUnYo0RM7z0YsETpmv0WsFXCRAg0E5acTZgp74s -D/4rBEPyAk7cmWtyR0XDZpQETY0Sw7Nr4aErdTdQ7AlntHMcn+MWRJpa57S/ea2F -l6SWZ4X09VV/H11lWnYzw0IkSRDsDATxMin+qpy6c7IwxZ9RQ1UT9PhmVBz7rbrs -l3Hnjv+WG9PcMCdlFOMZL4VC2TQEr0hBSXWhV6mDI0rdwuUu+oq84s1cke5g/e5T -joGupTxkaNO/yfDJMf+3dqwGmJDKl23dfKg+XbFh3Y/G321/C5GgvqtjaCoqzCuT -DByEbVXBde7mFB5xQg8ejDgFfuocw57whdNcS3MlGPO/P06nB940QELjwp5O34mM -cVn0qnyhgaioueVW5qzucEa+UfzbkYhinlYdbyljwquJlqIScLPNL0xtzOWo1oWH -Ll7jVklRuRHXFp6Asqan/MovLlYTcBO4OwOJ/rIJBOHkMeLu/vlEIeqC6J5vuD+b -P4XUpHamxOU8U6RVVDIH4cckhEU3zWDTwaD/RTG8TatJzGmjNOOR04imbqFApU7N -OUQ488WNqH11aeZoDOoXWKEvWfE7Cg/fTP0JZH3HaW9LWljWrt68FCyuLtvGVeNy -jHw4NZq89bbqnhKBAX1LS3pl/+nfD8Wx4sldo8RhlOQgUQu+ZJ5sAueLrnd1AmWE -EXvZDFyZqXsrun4cjvZXDmyFFhuaGVis1QzTIumYpUumvIkERAQYAQIADwIbAgUC -WXolxwUJEJR2CwIpwV0gBBkBAgAGBQJOiUo5AAoJELC16IaWr+bLpKUQAMsAmipq -NBx++8jZKqK5pyrUQa8/I7cevHv/6avwMgq4ISlIfdYixmI4t/xNakHu6ezXu1gJ -97hWbNts6zSiAxsbTDAkEwtDXuAQLzIdTc8M8wQgsoq7NXHC4+YCpKBZCn06OVOT -Vjc52DzPLom9bmOb3UaiCdryeyScpDXXFuaHeNk7VrDsR9s06eEkTZl/ED2kW3zs -T3ZSrG6dHiDupJPi8eoBL1gLRHWucUndT8Miu0nxmnU5vvEcOVHj9ZEbbikD5u7E -QQdHKFw1R6RYv5zFh81cb/zSoSwJMyGxjleqy/IoVYVxqhIIg+UPkHW2jbIi7R6O -Z4gc6W5870qKQWHDn7a4XDzQ2NEWF2G/+SWVInfyQVisFfs0RBJ24LbGA28BRA5w -lSBslwKMcmrP0t29eIs2raoCDcYmLsaQ2PsNTuUcsIzk3Sz1FpS+WIR9Vv4MG3ch -oi+LIdL/38zctLykecz7dYSAhAPWLwiO5N2++DunogweXzCET5Da+rm2VntE+seH -i9hI0hUVyBJm5pwIfd6XaVha1x/kn9SyoQWc6I4FLEFP68wdkfeEu1cdGfrc4A2f -HyXuO2VBH8yXHMshr3v0ALCy4E1kcET9zEmtawuMLlrQwzJP3a8PQqZnhXkRZ9KA -yAaP5tpgb/lDQMUnYo0RM7z0YsETpmv0WsFXCRAg0E5acTZgp2XoD/wJiq+drfb+ -IljjLScNgQbH2vq5lXub4rD5j83waVfkh60eFCo8hu1dBkaWyHs81gFPKIPRHYJJ -19B6g/nFOW7bZPbzhZzdICTejz2ITi8ipSgTsRGQMeQ+vGzlxH7dItmo0MeU2Pbf -pfTn1tB6wafHtMLaZafDIskh1RkAMFsWoEK305PtyuTSkGDGTKnA9yBX4CpKHZDR -1iYqZU+HQ0aDjiZaEl/m8S2siF6zz1PG1BFDtKDjg7+nKT1wriKfndEIksxrxxY0 -Kqfif2rUu1Kzc2FrtRQY6hguz2HASpcPLr3c6ru5e9SXqaWtfBuXkYzQ0temrFnY -3Oj/rlt5PxcB29XVuB4/CxfPgBVCHVaLOMkJtE/C9GQ5Vzb0k8OxAXClF1EXA9bT -Wri0unw/kt64cL04ZqKUlXmPDzzMdASFIq0pvEzfvIFBdrY3xNPFULEuAbxGhFoR -6iOYJzDRXbl6114IsGnVR3MdFbBQVi6isrFn16JC4yXqUXEHB+oTUTrBv5J/bWu3 -gq3O4MwAprHyTAviUvC9Iq71orXe3iAGbnaeCkPmdmxL9y5UjwXo3OaYN2Axppwd -B6j3QAIyJOkjjOCJRumQx3mKR0F464Xif3S7gcrelIYthz0JVkXg4bucUj7L/8Rl -cCAAru4p1TL+VpEBciclDjJSBVRX8nX9dLkCDQROhnXsARAA8ZueozuaZ1UR9dwb -Bt/KNag/ZiaaV4X9Jm+nQTkT9W92CTWpJ0LcVT10pVzQGDUrWLPW1sJ/ka2JjhH8 -tDFnpKjgaoBwxH+dJLWWs4RXfPXbefCAPliBaOwRZNVyK+FEnUhEHi+z2+KEoOQG -J/AtzpU+0958VgYfWhG2rRH4lDBSopC1VS3WxC+xQcxJMqR30ArJQ5avoIAAFQc6 -qzCAZ/4nbaPO1Kxdsf6ndj9jyZfaVH++OKS/cs1/nDW0JXdGH+oEFvf69FFFvwgl -OKqTw78nMhiMd2Oz1fzIwJa3uKib+JIaEhWrAAIw188lCGIcO8jJmgBP5RDlTezO -q3mA74WgwnFnxJ/LIx9N/1mvdr1ce26DMeUQBIfGBNimRxGZADg5VuKZwysmh9/J -Y/KWtHYe+0VwA+l9VzxsIs6Zo36wQTxr1DRrHSKSWmOChGmdPr924b31NA1geHZi -Qd2j8QughbVQNEARnG8Neo1HgPti1CYFjLPOp6R2j8w/fSeEPkpsPZmT38k+Tucs -pmFzsCKedGlI5BgkHB7be44rDZFOdmxQ9iXECa/KOuySHKhTXYTwJ8QvgTdEA7Qs -l0/sMQtVL4fRP/69yTxEA0RHxFG95ft0mq89Sgpty1IcdVxPNmenPerR6KVH4jos -G7cb/vFMqV09p7Sn6a89VHTG+Y8AEQEAAYkCHwQYAQIACQUCToZ17AIbDAAKCRAg -0E5acTZgpxSmD/4+nZhEFmZYlhPJXvUM4dVqk2x3eXpWhibltChkPoPaJFgZIfrC -5T8cU5Nn9G+/T3Oytzj8u/PTnCLK2xw94w6e00vSFaV+5FWZ757bOaFd13CuavOF -wxEKmulCJX4mZGSQsyF/DZEgG79FJpiiiykvgDSBCGQSga1saWMLxtsAaFj5KTb+ -ZnRLkfYd6WdWgkmUV8rDJVl6OXDGLmVIWm6zqkzT+XnxJvIgURB8zUqLbIjoR7ru -ziD5r2SU1IzK0dcGTAsPmLjTtpE97fmRU8Qsdmnkc6pyOeS2BUFQaYErGqf7HqkW -X4+4+0gW9m0mwroTXnWwMG95A1knyRsvyDerz3bHNzXbGBSvl/HJ8qQruKWQytiF -PgpFa6v7pEfEzXa6QGHxGF2y6tFxTk9LOIyHI393QLZRlt+oQNACj8NQS93MhBn7 -9rKu+YJMNf4yGDFxnPFEScuQH4BCyKztXSIzLJurxRS3h6QKGxD/O1BKaiMibcBC -H1nXFeWB2JpRZBndtS58aX9nQQIeXXODCaWJhWRknEg7U3GAgxFyAk4HnVTreFgm -leZsKT3khM69kzlZundZ1JRgSQlekDzBHcsdN4UZMGkzLYdA/0mAr1K45RkNVQuF -rk73kgYUx+4g64xkqFzSbj9jqvo2/4gH2cbnrY6ShQ+kwjEdAXLP3BGbl7kCDQRU -HbogARAAmJzYPpBprZD5rZEP++T/JS7JYzJPSCMFxppxSCy6RwTP7Tfu8Bg8Tgy2 -P6T2dkH5qez2S6+TpOUJ7b/4PmArVWk7uQmo7dkzrMh/gGA6ra44xyLfHdpFZaKu -/TjbAlKIxbWxQ9Z3+VvUpFkIJ7R2EWGNTGgpDXd6FKe+E0LoM5PEOlAQ2pgJ9a+J -35ukDV7LSLaslrAoEIYsVkIuFs0HOIgP/N7fqlCft9rJo5OifqxlG2xB/M0wEl5n -A1mAbj4I6N2BI1ft/6jWq853GJ3iX0F8BUoL3EfaFLgUN8nViXe7H4iJrgJ0HUXx -AvyRW9IkfbCd/eT8OVkHzBLK6dLi/1IoOdpkqxciH2p8YayT+I/gsgnCadU2hSDW -oOf2MB19xs6IpMF1LpG/oSsV8SvVbvBLtoAJShWh7dseUnNw9Xfp69kMjJCE4Quv -3d/l1I4DiDFpAiuXYJLs+q7OtHEUK/GARn+CYJP165JP0owYwZXE8/ZawtOsAUQr -GvtF8QgB5TO4FadB7zJ/oSsfZ8u3T6mqoYPFl7gS9J/MgF1w0oAwIp+eZkW4iqtm -zbjGhCb8CjRVOhDRxkp4E8Pz7egdHW3gdUgVcSTxmxppO+AS/JuVeuym+zAz9OTi -0mbFMjS0AqX0oGLFANeLlRhxP7xOoWj/fw8DC3cifwsUo0CTJPsAEQEAAYkERAQY -AQIADwIbAgUCWXol2AUJCwAGNgIpwV0gBBkBAgAGBQJUHbogAAoJEHWU7sez98rJ -qH8P/Ane/hZ2oajsqBbSSZZ8VVZksrC1v7XqBzLqcibsXtVRw4O/6pEsD/hRSDvb -JptUJecwGL94Qe2RVlaUH/63ODrjcOJG9dMJmLChLlzp9PN7nl79nzupjuiR/jRp -NH6pa4yCWKAj8t5e6evU+7aOUksxxRWHlAvEtnxsOqkOBAz3Nx0WYpD+h9ScrvLq -BjJSXYpgkNiLRqXONOb7vf9LQxzvPTxin+z520o9tT2KYoKc1GQ9NClzCVgdYm/R -g9DRN06SJ3ockLsKZkQ8fzjkP6qiMCNgE+iA0iP9FoHJpPeQ3fbO7z6NpklIKcEz -SXaVKH+o7uxAFmGo9fmkkOOOPt38BNjtfEkKcr/ZxlVK5WExc8gUgBAbhlgVRpCy -yNAos3sFclSjv55zUAyROLANShw/NryH5+K1yk6xZYlZa9m+RI5tu48oafsGChPM -R6E7ZHPRCw2OA5rlJfGZzTNfuxsHVeIzFJ7uAFkE6diOE9VyJ07e1a4z+NcZ9kAv -0hKrpl/jt5tcDtj7oHHeiq4yC1I3XSBt2gm+OoQEk03rnBp28E/z5Ksv6dZEaGx+ -a7yO6ld0l7yHzKxcJuhWSlce5K76UON4v1YuqnBz9eRo7LsHo9/AhFphgeewqzyi -C8O5NEk9XiSGLPK34DpqJDU9CrFIpYZj6XPFuYGQ+Gnm/U3nCRAg0E5acTZgpz8Y -D/9Hh8JWHRWhQf2a53WIlCqERNV+J6wWItmACncTyaLjJJkj7f1Ka3iZ8vo1WWWY -463m8y1hf1aNgr2trYZ6kOSwGP+BWKrRakn6/jKaL42QbUvHyR4PnGNuFYyv5thW -7988XsoKRo5GBPQzk/F+6IkKzNDgv1/i1GnVgWJmH1wg1ssMGN1fYlu43z+lKemf -0ss9pQqPtV8W+wrViO4MvWVQ/CcicsDvgA5pM9sLeIBXX3nsdo/TWdEJu4JEvsA8 -MN/q09qkGU14Ptzfze2k63nHheA2OnTOo9agQEL7N05a9zzSoXj39CubObjnTjr4 -QmqWVkkHPKWV3R1ULQle65U4zELdYfU1wXoH2AZVW+02SNZTGlRjCyoV9O01QSt3 -Rlyzajy+3gwDLnczqV0CUF7WgL0V0LYYCavjXhdc+oFsYN6kU3D31ZgOMrxauoIB -LWSzqJ83Fm6tmL0OLJuFpi8FvV9NYkqux3ECL3iTpttyEpWPKo9ZlxEgusrK2uTE -2S6rhy7zkf/3/raGgtEjIQ7E1zuR52ENlIN/djnSfkLf6OmkhgBgSs/HixC4zFtz -Dk2VltUXhUURXRl9Op+8Atrv44JfLpFehdVDjbKrFmOiW948c0LoB0g73ujnjBFO -+qTu3PzPD4ihBUJ3cNLoadoOQ9gzW/I9rkykw5jpk0sCMg== -=z4yI +p/+ypFBZmZr7yTpv/qD0N8HHl2NAYvGRQdzjyFQOXERwaXuzjCkAEQEAAYkEWwQY +AQoAJgIbAhYhBJbgevJXcZVZgNrRACDQTlpxNmCnBQJeHMcfBQkenRjmAinBXSAE +GQECAAYFAk6JSjkACgkQsLXohpav5sukpRAAywCaKmo0HH77yNkqormnKtRBrz8j +tx68e//pq/AyCrghKUh91iLGYji3/E1qQe7p7Ne7WAn3uFZs22zrNKIDGxtMMCQT +C0Ne4BAvMh1NzwzzBCCyirs1ccLj5gKkoFkKfTo5U5NWNznYPM8uib1uY5vdRqIJ +2vJ7JJykNdcW5od42TtWsOxH2zTp4SRNmX8QPaRbfOxPdlKsbp0eIO6kk+Lx6gEv +WAtEda5xSd1PwyK7SfGadTm+8Rw5UeP1kRtuKQPm7sRBB0coXDVHpFi/nMWHzVxv +/NKhLAkzIbGOV6rL8ihVhXGqEgiD5Q+QdbaNsiLtHo5niBzpbnzvSopBYcOftrhc +PNDY0RYXYb/5JZUid/JBWKwV+zREEnbgtsYDbwFEDnCVIGyXAoxyas/S3b14izat +qgINxiYuxpDY+w1O5RywjOTdLPUWlL5YhH1W/gwbdyGiL4sh0v/fzNy0vKR5zPt1 +hICEA9YvCI7k3b74O6eiDB5fMIRPkNr6ubZWe0T6x4eL2EjSFRXIEmbmnAh93pdp +WFrXH+Sf1LKhBZzojgUsQU/rzB2R94S7Vx0Z+tzgDZ8fJe47ZUEfzJccyyGve/QA +sLLgTWRwRP3MSa1rC4wuWtDDMk/drw9CpmeFeRFn0oDIBo/m2mBv+UNAxSdijREz +vPRiwROma/RawVcJECDQTlpxNmCnTLQP/A1WNmgPCCyFqp812Zvgh0pAqceaM+dg +FlvNi5j5Jyw7/hicx2e0BXgKt64TEodphknCFzZIFDq3jJSdLt1l9NHpiLVM0Hf0 +cLFGF3eRHOID7PeGJGztLJ0CGhhSXaPh7nNLK0G9zXCAasedpowX4ZUntv+p/+Fr +jQ8eSgyyljvrlywK+tH07F1W6t6eMNOw7/AHx7fkOux4CDem1FsNbhZWX8YPUATo +vP1YLBXcrQgpJPpypG6up56D70ewTs4l+qNOISr3phG2egeEhYNwv6GUv8aelh69 +iaUHscT+DOXrFKq+RSHBMzGFFTrDJFDSu3d3A5Rg8KxJMcOxc00L3GMPchrFiJH7 +QShAQdU/ocF0MAA6n56g/QynxafFI/MRMXVTmF+lMBW/kK63pD3AJkIgvdLdht5o +s7aKlddPrmIulaELIDdF2MSicMmgWJcqFkqZH2HIC+gx26Fafn2vfiUqsEc4NTpZ +qhf66F9UjPKfYFfLhbGrmq/giAk1qjiGnBzCUQ9hXVqpmFfnVDjmQrk8KB9skDms +PJgZ4hzmj5AarCpFtDmE4W7Tvi/xqgrFZkPX/SDhTWInJGcWaOTvlc5dkjAxKT6X +LUGLScJHxhaovTGVzq1GWhhNCFhCs4AkWqPKhYfeZuWiuiMLZaEyJPfTufT7Svab +pOhlaD1YY8fvuQINBE6GdewBEADxm56jO5pnVRH13BsG38o1qD9mJppXhf0mb6dB +ORP1b3YJNaknQtxVPXSlXNAYNStYs9bWwn+RrYmOEfy0MWekqOBqgHDEf50ktZaz +hFd89dt58IA+WIFo7BFk1XIr4USdSEQeL7Pb4oSg5AYn8C3OlT7T3nxWBh9aEbat +EfiUMFKikLVVLdbEL7FBzEkypHfQCslDlq+ggAAVBzqrMIBn/idto87UrF2x/qd2 +P2PJl9pUf744pL9yzX+cNbQld0Yf6gQW9/r0UUW/CCU4qpPDvycyGIx3Y7PV/MjA +lre4qJv4khoSFasAAjDXzyUIYhw7yMmaAE/lEOVN7M6reYDvhaDCcWfEn8sjH03/ +Wa92vVx7boMx5RAEh8YE2KZHEZkAODlW4pnDKyaH38lj8pa0dh77RXAD6X1XPGwi +zpmjfrBBPGvUNGsdIpJaY4KEaZ0+v3bhvfU0DWB4dmJB3aPxC6CFtVA0QBGcbw16 +jUeA+2LUJgWMs86npHaPzD99J4Q+Smw9mZPfyT5O5yymYXOwIp50aUjkGCQcHtt7 +jisNkU52bFD2JcQJr8o67JIcqFNdhPAnxC+BN0QDtCyXT+wxC1Uvh9E//r3JPEQD +REfEUb3l+3Sarz1KCm3LUhx1XE82Z6c96tHopUfiOiwbtxv+8UypXT2ntKfprz1U +dMb5jwARAQABiQIfBBgBAgAJBQJOhnXsAhsMAAoJECDQTlpxNmCnFKYP/j6dmEQW +ZliWE8le9Qzh1WqTbHd5elaGJuW0KGQ+g9okWBkh+sLlPxxTk2f0b79Pc7K3OPy7 +89OcIsrbHD3jDp7TS9IVpX7kVZnvnts5oV3XcK5q84XDEQqa6UIlfiZkZJCzIX8N +kSAbv0UmmKKLKS+ANIEIZBKBrWxpYwvG2wBoWPkpNv5mdEuR9h3pZ1aCSZRXysMl +WXo5cMYuZUhabrOqTNP5efEm8iBREHzNSotsiOhHuu7OIPmvZJTUjMrR1wZMCw+Y +uNO2kT3t+ZFTxCx2aeRzqnI55LYFQVBpgSsap/seqRZfj7j7SBb2bSbCuhNedbAw +b3kDWSfJGy/IN6vPdsc3NdsYFK+X8cnypCu4pZDK2IU+CkVrq/ukR8TNdrpAYfEY +XbLq0XFOT0s4jIcjf3dAtlGW36hA0AKPw1BL3cyEGfv2sq75gkw1/jIYMXGc8URJ +y5AfgELIrO1dIjMsm6vFFLeHpAobEP87UEpqIyJtwEIfWdcV5YHYmlFkGd21Lnxp +f2dBAh5dc4MJpYmFZGScSDtTcYCDEXICTgedVOt4WCaV5mwpPeSEzr2TOVm6d1nU +lGBJCV6QPMEdyx03hRkwaTMth0D/SYCvUrjlGQ1VC4WuTveSBhTH7iDrjGSoXNJu +P2Oq+jb/iAfZxuetjpKFD6TCMR0Bcs/cEZuXuQINBFQduiABEACYnNg+kGmtkPmt +kQ/75P8lLsljMk9IIwXGmnFILLpHBM/tN+7wGDxODLY/pPZ2Qfmp7PZLr5Ok5Qnt +v/g+YCtVaTu5Cajt2TOsyH+AYDqtrjjHIt8d2kVloq79ONsCUojFtbFD1nf5W9Sk +WQgntHYRYY1MaCkNd3oUp74TQugzk8Q6UBDamAn1r4nfm6QNXstItqyWsCgQhixW +Qi4WzQc4iA/83t+qUJ+32smjk6J+rGUbbEH8zTASXmcDWYBuPgjo3YEjV+3/qNar +zncYneJfQXwFSgvcR9oUuBQ3ydWJd7sfiImuAnQdRfEC/JFb0iR9sJ395Pw5WQfM +Esrp0uL/Uig52mSrFyIfanxhrJP4j+CyCcJp1TaFINag5/YwHX3GzoikwXUukb+h +KxXxK9Vu8Eu2gAlKFaHt2x5Sc3D1d+nr2QyMkIThC6/d3+XUjgOIMWkCK5dgkuz6 +rs60cRQr8YBGf4Jgk/Xrkk/SjBjBlcTz9lrC06wBRCsa+0XxCAHlM7gVp0HvMn+h +Kx9ny7dPqaqhg8WXuBL0n8yAXXDSgDAin55mRbiKq2bNuMaEJvwKNFU6ENHGSngT +w/Pt6B0dbeB1SBVxJPGbGmk74BL8m5V67Kb7MDP05OLSZsUyNLQCpfSgYsUA14uV +GHE/vE6haP9/DwMLdyJ/CxSjQJMk+wARAQABiQRbBBgBCgAmAhsCFiEEluB68ldx +lVmA2tEAINBOWnE2YKcFAl4cxyAFCRkIqP8CKcFdIAQZAQIABgUCVB26IAAKCRB1 +lO7Hs/fKyah/D/wJ3v4WdqGo7KgW0kmWfFVWZLKwtb+16gcy6nIm7F7VUcODv+qR +LA/4UUg72yabVCXnMBi/eEHtkVZWlB/+tzg643DiRvXTCZiwoS5c6fTze55e/Z87 +qY7okf40aTR+qWuMgligI/LeXunr1Pu2jlJLMcUVh5QLxLZ8bDqpDgQM9zcdFmKQ +/ofUnK7y6gYyUl2KYJDYi0alzjTm+73/S0Mc7z08Yp/s+dtKPbU9imKCnNRkPTQp +cwlYHWJv0YPQ0TdOkid6HJC7CmZEPH845D+qojAjYBPogNIj/RaByaT3kN32zu8+ +jaZJSCnBM0l2lSh/qO7sQBZhqPX5pJDjjj7d/ATY7XxJCnK/2cZVSuVhMXPIFIAQ +G4ZYFUaQssjQKLN7BXJUo7+ec1AMkTiwDUocPza8h+fitcpOsWWJWWvZvkSObbuP +KGn7BgoTzEehO2Rz0QsNjgOa5SXxmc0zX7sbB1XiMxSe7gBZBOnYjhPVcidO3tWu +M/jXGfZAL9ISq6Zf47ebXA7Y+6Bx3oquMgtSN10gbdoJvjqEBJNN65wadvBP8+Sr +L+nWRGhsfmu8jupXdJe8h8ysXCboVkpXHuSu+lDjeL9WLqpwc/XkaOy7B6PfwIRa +YYHnsKs8ogvDuTRJPV4khizyt+A6aiQ1PQqxSKWGY+lzxbmBkPhp5v1N5wkQINBO +WnE2YKdkRQ//ZKvUegOZTtfivAZI888o4Ocpig3CFxJGlXa52JUnDhYFFpRtXRTP +gIdQ0zBvhNjmBnELNv5/D1ubnjqWBTaJpZgUXIljJufuWL7VdD57nAAMw2VLvNUe +38iytUYTAPevaJtLQ4jfj3E9MYH4tcMBmlZ75ZKqiHHH+7+V5J8TD/S01xROK7H1 +kGkXo49deB7K9oT4uno8kE5+AgmEMI80XiKjfQkh6tiG5I0W58DLeAOIxCRkm3kH +Bi22PpuAKhRelRQnAF9dLdlhZECy5eYl7JKQzOS/dQ0Z3zg+HuDBRyhrmV/go/9C +npFGUZBa+FOC1GMO07GKH8tZY99D5tDCAH6r6S+RrYS690mWpjXhqouBtJezld+X +dsgKwgKHk3IEM4m916O0E75kiNk/AD7vZowwEBvPsgN+CDXCPgH4J5x0p9uyxnKH +omLBd7cuJpio6gf4O1KTl1tlVGcb8f+AUR/MIe70NXyEtpYWMiPW3/0dKwt9APgW +KSX0c8Mp2XKH/vAEDx86XTfBNrnXyUanOQhbLQciYzolJjiPrB0C2NgFFFXSHPwC +ikyT5n2RehAJVmg3eufB1ZOKQgo7ue3ynkW4JidgyCUtsoYSmipl9Nhw1hA3ZNK1 +FVCx7tcmy0ZHFO+PV+p17oAC8ZCxSRE0oTeHKcgpF5+DRhQM/+UnmKg= +=7hTI -----END PGP PUBLIC KEY BLOCK----- From 3913289de2c79ff2ba1ec89f12499fd0b7ea16fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Mon, 8 Feb 2021 15:55:29 +0100 Subject: [PATCH 690/842] add rhel 9 conditional to require httpd instead of lighttpd in git-instaweb --- git.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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ý - 2.30.0-2 +- add rhel 9 conditional to require httpd instead of lighttpd in git-instaweb + * Tue Jan 26 2021 Fedora Release Engineering - 2.30.0-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 0cb8e1a37845c98ca9691942ee2296246db732d6 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 8 Feb 2021 22:05:08 -0500 Subject: [PATCH 691/842] update to 2.30.1 Release notes: https://github.com/git/git/raw/v2.30.1/Documentation/RelNotes/2.30.1.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) 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 - 2.30.1-1 +- update to 2.30.1 + * Mon Feb 08 2021 Ondřej Pohořelský - 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 From 9163954e0f609af7a8b38c7d569b3a781066cec6 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 18 Feb 2021 01:52:02 -0500 Subject: [PATCH 692/842] 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. --- git.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) 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 +- re-enable t7812-grep-icase-non-ascii on s390x + * Tue Feb 09 2021 Todd Zullinger - 2.30.1-1 - update to 2.30.1 From 8d486728064e3a61c040d24aff44a21a74f0d64d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Mon, 1 Feb 2021 16:33:48 +0100 Subject: [PATCH 693/842] 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. --- git.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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ý - re-enable t7812-grep-icase-non-ascii on s390x From 5662337240a54677ee453b27645f5e3ef7dc9842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:13:48 +0100 Subject: [PATCH 694/842] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- git.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 - 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ý Date: Tue, 2 Mar 2021 13:17:44 -0500 Subject: [PATCH 695/842] 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_signatures 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. --- git.spec | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) 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=7214aea37915ee2c4f6369eb9dea520aec7d855b -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 +xz -dc '%{SOURCE0}' | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data=- -# Ensure a blank line follows autosetup, el6 chokes otherwise -# https://bugzilla.redhat.com/1310704 %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 - 2.30.1-3 +- use %%{gpgverify} macro to verify tarball signature + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.30.1-2.1 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From adc702ecfc48f7650c2f49d643528f745a6425be Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 25 Feb 2021 22:40:20 -0500 Subject: [PATCH 696/842] update to 2.31.0-rc0 Release notes: https://github.com/git/git/raw/v2.31.0-rc0/Documentation/RelNotes/2.31.0.txt --- git.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index 6fa4261..195109d 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.30.1 -Release: 3%{?rcrev}%{?dist} +Version: 2.31.0 +Release: 0.0%{?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 02 2021 Todd Zullinger - 2.31.0-0.0.rc0 +- update to 2.31.0-rc0 + * Tue Mar 02 2021 Todd Zullinger - 2.30.1-3 - use %%{gpgverify} macro to verify tarball signature diff --git a/sources b/sources index 8265a5c..e5fae2c 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.31.0.rc0.tar.xz) = 3c8d495cc1adb18f5918d99b02b6d3a969d4a44ab44ad908831eae0b2cf2d139fe8e7f1c61788a3254f4acc178cd2b5973ce13733bf639c73f156b4987a6e8f2 +SHA512 (git-2.31.0.rc0.tar.sign) = 1ddce0cbe6d2077a585804f03cdf3aca25dc802a373914f11b8da19c827e9d1c7e95d27a48f46450fe11b997cc044aef6bf15a37fcf95fc3429fab32220735cb From 91eeb429368a28c6796bd4f400900e12979f2c3c Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 3 Mar 2021 10:22:27 -0500 Subject: [PATCH 697/842] update to 2.31.0-rc1 Release notes: https://github.com/git/git/raw/v2.31.0-rc1/Documentation/RelNotes/2.31.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 195109d..88fe928 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.31.0 -Release: 0.0%{?rcrev}%{?dist} +Release: 0.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 +* Wed Mar 03 2021 Todd Zullinger - 2.31.0-0.1.rc1 +- update to 2.31.0-rc1 + * Tue Mar 02 2021 Todd Zullinger - 2.31.0-0.0.rc0 - update to 2.31.0-rc0 diff --git a/sources b/sources index e5fae2c..e769ca1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.31.0.rc0.tar.xz) = 3c8d495cc1adb18f5918d99b02b6d3a969d4a44ab44ad908831eae0b2cf2d139fe8e7f1c61788a3254f4acc178cd2b5973ce13733bf639c73f156b4987a6e8f2 -SHA512 (git-2.31.0.rc0.tar.sign) = 1ddce0cbe6d2077a585804f03cdf3aca25dc802a373914f11b8da19c827e9d1c7e95d27a48f46450fe11b997cc044aef6bf15a37fcf95fc3429fab32220735cb +SHA512 (git-2.31.0.rc1.tar.xz) = 80c662b8e4b1af901bf8506f252d88851675ded77e86688d8a28db1e31b389ff3ec2cafa8b0ce9c816973ec9b2fb2ab29b0ac56d80584d2bc49f3430a6af5eaf +SHA512 (git-2.31.0.rc1.tar.sign) = 063355f016f4349716206fb070fd8615b5b3f216c88f44c000e57e6941d25acfa5c0db8381587e7c175b1b1901ccb49cccbc5c3d95ec8623195b25d84f9e8949 From cb2e458a1913e3a42ddb8548e8bf5293d64df776 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 9 Mar 2021 13:42:18 -0500 Subject: [PATCH 698/842] update to 2.31.0-rc2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This release includes a fix for CVE-2021-21300¹ in addition to the other changes along the path to the final 2.31.0 release. Release notes: https://github.com/git/git/raw/v2.31.0-rc2/Documentation/RelNotes/2.31.0.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. --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 88fe928..00285af 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.31.0 -Release: 0.1%{?rcrev}%{?dist} +Release: 0.2%{?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 - 2.31.0-0.2.rc2 +- update to 2.31.0-rc2 + * Wed Mar 03 2021 Todd Zullinger - 2.31.0-0.1.rc1 - update to 2.31.0-rc1 diff --git a/sources b/sources index e769ca1..0c6d1b2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.31.0.rc1.tar.xz) = 80c662b8e4b1af901bf8506f252d88851675ded77e86688d8a28db1e31b389ff3ec2cafa8b0ce9c816973ec9b2fb2ab29b0ac56d80584d2bc49f3430a6af5eaf -SHA512 (git-2.31.0.rc1.tar.sign) = 063355f016f4349716206fb070fd8615b5b3f216c88f44c000e57e6941d25acfa5c0db8381587e7c175b1b1901ccb49cccbc5c3d95ec8623195b25d84f9e8949 +SHA512 (git-2.31.0.rc2.tar.xz) = 0e717c27320d6747e5f7c928765c91859a22f5a5de02a99bab2f0923283b5da2fd755a50ba527160ca23ffa8daf087dc4014441a58100cffbabe58fb7d9b64c3 +SHA512 (git-2.31.0.rc2.tar.sign) = 4630ddd6186f72363b1bb2c5ed6dfebf428a5f4079286c91cfa75c0ec1cc1ddaee40a739fad6dccf3ad6a001764ae031a7d538e7ab4349a473e3bc7d95047ad6 From a085ac4d92464d1afcb3f9e679668ba8812c8479 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 9 Mar 2021 15:59:32 -0500 Subject: [PATCH 699/842] add 'missing UTF8_NFD_TO_NFC' to git.skip-test-patterns The UTF8_NFD_TO_NFC prereq was added to t0021-conversion and t2006-checkout-index-basic in upstream commit 684dd4c2b4 (checkout: fix bug that makes checkout follow symlinks in leading path, 2020-12-10), to test the fixes for CVE-2021-21300. Fedora's supported systems do not appear to "convert decomposed utf-8 (nfd) to precomposed utf-8 (nfc)" which is what the prereq covers. Ignore the skipped tests which use the UTF8_NFD_TO_NFC prereq when looking for missing test dependencies and/or incorrectly skipped tests. --- git.skip-test-patterns | 1 + 1 file changed, 1 insertion(+) diff --git a/git.skip-test-patterns b/git.skip-test-patterns index f80cadf..28a66b8 100644 --- a/git.skip-test-patterns +++ b/git.skip-test-patterns @@ -13,6 +13,7 @@ missing !PCRE missing !PTHREADS missing RFC1991 missing TAR_NEEDS_PAX_FALLBACK +missing UTF8_NFD_TO_NFC skipping case insensitive tests skipping git p4 tests skipping remote-svn tests, python not available From ce53345a7da5c219b6e3376169215a0eb5f5c3f2 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 15 Mar 2021 16:04:01 -0400 Subject: [PATCH 700/842] update to 2.31.0 Release notes: https://github.com/git/git/raw/v2.31.0/Documentation/RelNotes/2.31.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 00285af..6d6d55e 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.31.0 -Release: 0.2%{?rcrev}%{?dist} +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 +* Mon Mar 15 2021 Todd Zullinger - 2.31.0-1 +- update to 2.31.0 + * Tue Mar 09 2021 Todd Zullinger - 2.31.0-0.2.rc2 - update to 2.31.0-rc2 diff --git a/sources b/sources index 0c6d1b2..043f8c9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.31.0.rc2.tar.xz) = 0e717c27320d6747e5f7c928765c91859a22f5a5de02a99bab2f0923283b5da2fd755a50ba527160ca23ffa8daf087dc4014441a58100cffbabe58fb7d9b64c3 -SHA512 (git-2.31.0.rc2.tar.sign) = 4630ddd6186f72363b1bb2c5ed6dfebf428a5f4079286c91cfa75c0ec1cc1ddaee40a739fad6dccf3ad6a001764ae031a7d538e7ab4349a473e3bc7d95047ad6 +SHA512 (git-2.31.0.tar.xz) = b8f7608d4349c983c426494227b0ec9d032e67c775382a32675418f629f365817ac99a61c24e3a380bc5eb65351058dbf55d526890055acf58ad4f028022f513 +SHA512 (git-2.31.0.tar.sign) = 228cce4cc4d43d83fae68ff93d5d77b0601779756812c8eaa374c39ac2a5757bdeea4b5ce9950c4bb9661d09fee88f5d73c309f74a1728e66d1eeeec341295e0 From 4971df866e6ed71f42567f15a6443c2dce09b07c Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 19 Mar 2021 16:41:05 -0400 Subject: [PATCH 701/842] fix git bisect with annotaged tags As git bisect was migrated from shell to C, the bisect_state conversion lost the ability to handle annotated tags. This was not intentional. It is fixed in upstream commit 7730f85594 (bisect: peel annotated tags to commits, 2021-03-16). References: https://lore.kernel.org/git/878s6nz1sg.fsf@igel.home/ https://github.com/git/git/commit/7730f85594.patch --- ...isect-peel-annotated-tags-to-commits.patch | 83 +++++++++++++++++++ git.spec | 8 +- 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 0001-bisect-peel-annotated-tags-to-commits.patch diff --git a/0001-bisect-peel-annotated-tags-to-commits.patch b/0001-bisect-peel-annotated-tags-to-commits.patch new file mode 100644 index 0000000..447c6fe --- /dev/null +++ b/0001-bisect-peel-annotated-tags-to-commits.patch @@ -0,0 +1,83 @@ +From 7730f85594d4595605934e39d1d816ab663d8fa8 Mon Sep 17 00:00:00 2001 +From: Jeff King +Date: Tue, 16 Mar 2021 11:15:55 -0400 +Subject: [PATCH] bisect: peel annotated tags to commits + +This patch fixes a bug where git-bisect doesn't handle receiving +annotated tags as "git bisect good ", etc. It's a regression in +27257bc466 (bisect--helper: reimplement `bisect_state` & `bisect_head` +shell functions in C, 2020-10-15). + +The original shell code called: + + sha=$(git rev-parse --verify "$rev^{commit}") || + die "$(eval_gettext "Bad rev input: \$rev")" + +which will peel the input to a commit (or complain if that's not +possible). But the C code just calls get_oid(), which will yield the oid +of the tag. + +The fix is to peel to a commit. The error message here is a little +non-idiomatic for Git (since it starts with a capital). I've mostly left +it, as it matches the other converted messages (like the "Bad rev input" +we print when get_oid() fails), though I did add an indication that it +was the peeling that was the problem. It might be worth taking a pass +through this converted code to modernize some of the error messages. + +Note also that the test does a bare "grep" (not i18ngrep) on the +expected "X is the first bad commit" output message. This matches the +rest of the test script. + +Signed-off-by: Jeff King +Signed-off-by: Junio C Hamano +--- + builtin/bisect--helper.c | 9 ++++++++- + t/t6030-bisect-porcelain.sh | 12 ++++++++++++ + 2 files changed, 20 insertions(+), 1 deletion(-) + +diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c +index 709eb713a3ba4..81569530e4f08 100644 +--- a/builtin/bisect--helper.c ++++ b/builtin/bisect--helper.c +@@ -875,12 +875,19 @@ static enum bisect_error bisect_state(struct bisect_terms *terms, const char **a + */ + + for (; argc; argc--, argv++) { ++ struct commit *commit; ++ + if (get_oid(*argv, &oid)){ + error(_("Bad rev input: %s"), *argv); + oid_array_clear(&revs); + return BISECT_FAILED; + } +- oid_array_append(&revs, &oid); ++ ++ commit = lookup_commit_reference(the_repository, &oid); ++ if (!commit) ++ die(_("Bad rev input (not a commit): %s"), *argv); ++ ++ oid_array_append(&revs, &commit->object.oid); + } + + if (strbuf_read_file(&buf, git_path_bisect_expected_rev(), 0) < the_hash_algo->hexsz || +diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh +index 52614eefc7e76..9abcee05548d3 100755 +--- a/t/t6030-bisect-porcelain.sh ++++ b/t/t6030-bisect-porcelain.sh +@@ -936,4 +936,16 @@ test_expect_success 'git bisect reset cleans bisection state properly' ' + test_path_is_missing ".git/BISECT_START" + ' + ++test_expect_success 'bisect handles annotated tags' ' ++ test_commit commit-one && ++ git tag -m foo tag-one && ++ test_commit commit-two && ++ git tag -m foo tag-two && ++ git bisect start && ++ git bisect good tag-one && ++ git bisect bad tag-two >output && ++ bad=$(git rev-parse --verify tag-two^{commit}) && ++ grep "$bad is the first bad commit" output ++' ++ + test_done diff --git a/git.spec b/git.spec index 6d6d55e..c6414a9 100644 --- a/git.spec +++ b/git.spec @@ -97,7 +97,7 @@ Name: git Version: 2.31.0 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -129,6 +129,9 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch +# https://lore.kernel.org/git/878s6nz1sg.fsf@igel.home/ +Patch1: https://github.com/git/git/commit/7730f85594.patch#/0001-bisect-peel-annotated-tags-to-commits.patch + %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -1070,6 +1073,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Mar 19 2021 Todd Zullinger - 2.31.0-2 +- fix git bisect with annotaged tags + * Mon Mar 15 2021 Todd Zullinger - 2.31.0-1 - update to 2.31.0 From e4b60c52ef4c51499a5b90b6c856a30344a89e43 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 27 Mar 2021 00:20:43 -0400 Subject: [PATCH 702/842] update to 2.31.1 Release notes: https://github.com/git/git/raw/v2.31.1/Documentation/RelNotes/2.31.1.txt --- ...isect-peel-annotated-tags-to-commits.patch | 83 ------------------- git.spec | 10 +-- sources | 4 +- 3 files changed, 7 insertions(+), 90 deletions(-) delete mode 100644 0001-bisect-peel-annotated-tags-to-commits.patch diff --git a/0001-bisect-peel-annotated-tags-to-commits.patch b/0001-bisect-peel-annotated-tags-to-commits.patch deleted file mode 100644 index 447c6fe..0000000 --- a/0001-bisect-peel-annotated-tags-to-commits.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 7730f85594d4595605934e39d1d816ab663d8fa8 Mon Sep 17 00:00:00 2001 -From: Jeff King -Date: Tue, 16 Mar 2021 11:15:55 -0400 -Subject: [PATCH] bisect: peel annotated tags to commits - -This patch fixes a bug where git-bisect doesn't handle receiving -annotated tags as "git bisect good ", etc. It's a regression in -27257bc466 (bisect--helper: reimplement `bisect_state` & `bisect_head` -shell functions in C, 2020-10-15). - -The original shell code called: - - sha=$(git rev-parse --verify "$rev^{commit}") || - die "$(eval_gettext "Bad rev input: \$rev")" - -which will peel the input to a commit (or complain if that's not -possible). But the C code just calls get_oid(), which will yield the oid -of the tag. - -The fix is to peel to a commit. The error message here is a little -non-idiomatic for Git (since it starts with a capital). I've mostly left -it, as it matches the other converted messages (like the "Bad rev input" -we print when get_oid() fails), though I did add an indication that it -was the peeling that was the problem. It might be worth taking a pass -through this converted code to modernize some of the error messages. - -Note also that the test does a bare "grep" (not i18ngrep) on the -expected "X is the first bad commit" output message. This matches the -rest of the test script. - -Signed-off-by: Jeff King -Signed-off-by: Junio C Hamano ---- - builtin/bisect--helper.c | 9 ++++++++- - t/t6030-bisect-porcelain.sh | 12 ++++++++++++ - 2 files changed, 20 insertions(+), 1 deletion(-) - -diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c -index 709eb713a3ba4..81569530e4f08 100644 ---- a/builtin/bisect--helper.c -+++ b/builtin/bisect--helper.c -@@ -875,12 +875,19 @@ static enum bisect_error bisect_state(struct bisect_terms *terms, const char **a - */ - - for (; argc; argc--, argv++) { -+ struct commit *commit; -+ - if (get_oid(*argv, &oid)){ - error(_("Bad rev input: %s"), *argv); - oid_array_clear(&revs); - return BISECT_FAILED; - } -- oid_array_append(&revs, &oid); -+ -+ commit = lookup_commit_reference(the_repository, &oid); -+ if (!commit) -+ die(_("Bad rev input (not a commit): %s"), *argv); -+ -+ oid_array_append(&revs, &commit->object.oid); - } - - if (strbuf_read_file(&buf, git_path_bisect_expected_rev(), 0) < the_hash_algo->hexsz || -diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh -index 52614eefc7e76..9abcee05548d3 100755 ---- a/t/t6030-bisect-porcelain.sh -+++ b/t/t6030-bisect-porcelain.sh -@@ -936,4 +936,16 @@ test_expect_success 'git bisect reset cleans bisection state properly' ' - test_path_is_missing ".git/BISECT_START" - ' - -+test_expect_success 'bisect handles annotated tags' ' -+ test_commit commit-one && -+ git tag -m foo tag-one && -+ test_commit commit-two && -+ git tag -m foo tag-two && -+ git bisect start && -+ git bisect good tag-one && -+ git bisect bad tag-two >output && -+ bad=$(git rev-parse --verify tag-two^{commit}) && -+ grep "$bad is the first bad commit" output -+' -+ - test_done diff --git a/git.spec b/git.spec index c6414a9..6aba386 100644 --- a/git.spec +++ b/git.spec @@ -96,8 +96,8 @@ #global rcrev .rc0 Name: git -Version: 2.31.0 -Release: 2%{?rcrev}%{?dist} +Version: 2.31.1 +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -129,9 +129,6 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# https://lore.kernel.org/git/878s6nz1sg.fsf@igel.home/ -Patch1: https://github.com/git/git/commit/7730f85594.patch#/0001-bisect-peel-annotated-tags-to-commits.patch - %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -1073,6 +1070,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sat Mar 27 2021 Todd Zullinger - 2.31.1-1 +- update to 2.31.1 + * Fri Mar 19 2021 Todd Zullinger - 2.31.0-2 - fix git bisect with annotaged tags diff --git a/sources b/sources index 043f8c9..c9311bd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.31.0.tar.xz) = b8f7608d4349c983c426494227b0ec9d032e67c775382a32675418f629f365817ac99a61c24e3a380bc5eb65351058dbf55d526890055acf58ad4f028022f513 -SHA512 (git-2.31.0.tar.sign) = 228cce4cc4d43d83fae68ff93d5d77b0601779756812c8eaa374c39ac2a5757bdeea4b5ce9950c4bb9661d09fee88f5d73c309f74a1728e66d1eeeec341295e0 +SHA512 (git-2.31.1.tar.xz) = 9aa334a3e8519700ff5d112153ec42677722980094caa9d22aa91afdb65166bd9a98fa445c0d327c428ebfa73bf4832e9b3836109a1d9319feafe3191cfd170e +SHA512 (git-2.31.1.tar.sign) = 0a721876f9869d1dc9a43e7f83f8e63a3d8fa932ff2d2e69bb98f3e314e2e9a896c2171cb6a020d6c6e929fdf1af736dbeb3f25f93fb4d359a9aaa5b859069c3 From 7e7f589af7d6a287e9eadb53dd5d5316a1aa73a0 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 6 Apr 2021 09:58:48 -0400 Subject: [PATCH 703/842] remove two stray %defattr macros from %%files sections All %defattr macros were removed in ff200ca (Remove obsolete %defattr, 2018-02-07). Two were subsequently added in f8a83b9 (Move instaweb to a subpackage, 2018-09-06) and 9d91bab (split libsecret credential helper into a subpackage (#1804741), 2020-02-19). Remove both entries and (hopefully) avoid adding new entries in the future. --- git.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 6aba386..ebf8e24 100644 --- a/git.spec +++ b/git.spec @@ -97,7 +97,7 @@ Name: git Version: 2.31.1 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -964,7 +964,6 @@ rmdir --ignore-fail-on-non-empty "$testdir" %if %{with libsecret} %files credential-libsecret -%defattr(-,root,root) %{gitexecdir}/git-credential-libsecret %endif # endif with libsecret @@ -1036,7 +1035,6 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-citool.html} %files instaweb -%defattr(-,root,root) %{gitexecdir}/git-instaweb %{_pkgdocdir}/git-instaweb.txt %{?with_docs:%{_mandir}/man1/git-instaweb.1*} @@ -1070,6 +1068,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Apr 06 2021 Todd Zullinger - 2.31.1-2 +- remove two stray %%defattr macros from %%files sections + * Sat Mar 27 2021 Todd Zullinger - 2.31.1-1 - update to 2.31.1 From bf80478210ced9425aafb16d3a2ead35338341d7 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 21 Apr 2021 09:23:44 -0400 Subject: [PATCH 704/842] apply upstream patch to fix clone --bare segfault If core.bare=false is set in the global git config, git clone --bare results in a segfault. Fix it. Resolves: rhbz#1952030 Upstream-patch: https://github.com/git/git/commit/75555676ad Upstream-report: https://lore.kernel.org/git/D99DD9AD-54E5-4357-BA50-8B9CAE23084E@amazon.com/ --- ...handle-bare-clones-when-core.bare-se.patch | 81 +++++++++++++++++++ git.spec | 11 ++- 2 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 0001-builtin-init-db-handle-bare-clones-when-core.bare-se.patch diff --git a/0001-builtin-init-db-handle-bare-clones-when-core.bare-se.patch b/0001-builtin-init-db-handle-bare-clones-when-core.bare-se.patch new file mode 100644 index 0000000..b8bc81b --- /dev/null +++ b/0001-builtin-init-db-handle-bare-clones-when-core.bare-se.patch @@ -0,0 +1,81 @@ +From 7fc363e4e64f095553e1a1ceed27caef3a33effd Mon Sep 17 00:00:00 2001 +From: "brian m. carlson" +Date: Wed, 10 Mar 2021 01:11:20 +0000 +Subject: [PATCH] builtin/init-db: handle bare clones when core.bare set to + false + +In 552955ed7f ("clone: use more conventional config/option layering", +2020-10-01), clone learned to read configuration options earlier in its +execution, before creating the new repository. However, that led to a +problem: if the core.bare setting is set to false in the global config, +cloning a bare repository segfaults. This happens because the +repository is falsely thought to be non-bare, but clone has set the work +tree to NULL, which is then dereferenced. + +The code to initialize the repository already considers the fact that a +user might want to override the --bare option for git init, but it +doesn't take into account clone, which uses a different option. Let's +just check that the work tree is not NULL, since that's how clone +indicates that the repository is bare. This is also the case for git +init, so we won't be regressing that case. + +Reported-by: Joseph Vusich +Signed-off-by: brian m. carlson +Signed-off-by: Junio C Hamano +(cherry picked from commit 75555676ad3908b0f847a9ae154c35e12114c82f) +--- + builtin/init-db.c | 4 ++-- + t/t5606-clone-options.sh | 8 ++++++++ + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/builtin/init-db.c b/builtin/init-db.c +index dcc45bef51..f82efe4aff 100644 +--- a/builtin/init-db.c ++++ b/builtin/init-db.c +@@ -212,6 +212,7 @@ static int create_default_files(const char *template_path, + int reinit; + int filemode; + struct strbuf err = STRBUF_INIT; ++ const char *work_tree = get_git_work_tree(); + + /* Just look for `init.templatedir` */ + init_db_template_dir = NULL; /* re-set in case it was set before */ +@@ -235,7 +236,7 @@ static int create_default_files(const char *template_path, + * We must make sure command-line options continue to override any + * values we might have just re-read from the config. + */ +- is_bare_repository_cfg = init_is_bare_repository; ++ is_bare_repository_cfg = init_is_bare_repository || !work_tree; + if (init_shared_repository != -1) + set_shared_repository(init_shared_repository); + +@@ -299,7 +300,6 @@ static int create_default_files(const char *template_path, + if (is_bare_repository()) + git_config_set("core.bare", "true"); + else { +- const char *work_tree = get_git_work_tree(); + git_config_set("core.bare", "false"); + /* allow template config file to override the default */ + if (log_all_ref_updates == LOG_REFS_UNSET) +diff --git a/t/t5606-clone-options.sh b/t/t5606-clone-options.sh +index 1da6ddb2c5..428b0aac93 100755 +--- a/t/t5606-clone-options.sh ++++ b/t/t5606-clone-options.sh +@@ -104,6 +104,14 @@ test_expect_success 'redirected clone -v does show progress' ' + + ' + ++test_expect_success 'clone does not segfault with --bare and core.bare=false' ' ++ test_config_global core.bare false && ++ git clone --bare parent clone-bare && ++ echo true >expect && ++ git -C clone-bare rev-parse --is-bare-repository >actual && ++ test_cmp expect actual ++' ++ + test_expect_success 'chooses correct default initial branch name' ' + GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \ + git -c init.defaultBranch=foo init --bare empty && +-- +2.31.1 + diff --git a/git.spec b/git.spec index ebf8e24..76c25c7 100644 --- a/git.spec +++ b/git.spec @@ -97,7 +97,7 @@ Name: git Version: 2.31.1 -Release: 2%{?rcrev}%{?dist} +Release: 3%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -129,6 +129,11 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch +# https://bugzilla.redhat.com/1952030 +# https://lore.kernel.org/git/D99DD9AD-54E5-4357-BA50-8B9CAE23084E@amazon.com/ +# https://github.com/git/git/commit/75555676ad +Patch1: 0001-builtin-init-db-handle-bare-clones-when-core.bare-se.patch + %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -1068,6 +1073,10 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Apr 21 2021 Todd Zullinger - 2.31.1-3 +- apply upstream patch to fix clone --bare segfault + Resolves: rhbz#1952030 + * Tue Apr 06 2021 Todd Zullinger - 2.31.1-2 - remove two stray %%defattr macros from %%files sections From d6f2c616bc6d910caf9925ae6fa416d10e381434 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 21 May 2021 23:58:49 +0200 Subject: [PATCH 705/842] Perl 5.34 rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 76c25c7..14b6e17 100644 --- a/git.spec +++ b/git.spec @@ -97,7 +97,7 @@ Name: git Version: 2.31.1 -Release: 3%{?rcrev}%{?dist} +Release: 3%{?rcrev}%{?dist}.1 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1073,6 +1073,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri May 21 2021 Jitka Plesnikova - 2.31.1-3.1 +- Perl 5.34 rebuild + * Wed Apr 21 2021 Todd Zullinger - 2.31.1-3 - apply upstream patch to fix clone --bare segfault Resolves: rhbz#1952030 From b1bd88b45bacb150f7df5e0977b935f2e7a85a9d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 16 May 2021 16:44:47 -0400 Subject: [PATCH 706/842] clean up various dist conditionals Remove all conditionals for EL-6; it is EOL as of November 2020. Replace a number of `EL > 7` with `EL >= 8` to make the intention clearer. The next version of RHEL is no longer shrouded in mystery. Drop conditionals which apply only to long-obsolete Fedora releases. --- git.spec | 120 +++++++++---------------------------------------------- 1 file changed, 19 insertions(+), 101 deletions(-) diff --git a/git.spec b/git.spec index 14b6e17..0addff1 100644 --- a/git.spec +++ b/git.spec @@ -28,8 +28,8 @@ %bcond_with asciidoctor %endif -# Settings for Fedora and EL > 7 -%if 0%{?fedora} || 0%{?rhel} > 7 +# Settings for Fedora and EL >= 8 +%if 0%{?fedora} || 0%{?rhel} >= 8 %bcond_with python2 %bcond_without python3 %global gitweb_httpd_conf gitweb.conf @@ -47,32 +47,21 @@ # Settings for Fedora and EL >= 7 %if 0%{?fedora} || 0%{?rhel} >= 7 -%bcond_without libsecret -%global bashcomp_pkgconfig 1 %global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) %global bashcomproot %(dirname %{bashcompdir} 2>/dev/null) -%global emacs_filesystem 1 -%global use_new_rpm_filters 1 -%global use_systemd 1 -%else -%bcond_with libsecret -%global bashcomp_pkgconfig 0 -%global bashcompdir %{_sysconfdir}/bash_completion.d -%global bashcomproot %{bashcompdir} -%global emacs_filesystem 0 -%global use_new_rpm_filters 0 -%global use_systemd 0 -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} %endif # Allow cvs subpackage to be toggled via --with/--without -# Disable cvs subpackage by default on EL > 7 -%if 0%{?rhel} > 7 +# Disable cvs subpackage by default on EL >= 8 +%if 0%{?rhel} >= 8 %bcond_with cvs %else %bcond_without cvs %endif +# Allow credential-libsecret subpackage to be toggled via --with/--without +%bcond_without libsecret + # Allow p4 subpackage to be toggled via --with/--without # Disable by default if we lack python2 support %if %{without python2} @@ -86,12 +75,6 @@ %global _hardened_build 1 %endif -# Hardening flags for EL-6 -%if 0%{?rhel} == 6 -%global build_cflags %{build_cflags} -fPIC -pie -%global build_ldflags -Wl,-z,relro -Wl,-z,now -%endif - # Define for release candidates #global rcrev .rc0 @@ -186,16 +169,10 @@ BuildRequires: perl-interpreter BuildRequires: perl %endif # endif use_perl_interpreter -%if %{bashcomp_pkgconfig} BuildRequires: pkgconfig(bash-completion) -%endif -# endif bashcomp_pkgconfig BuildRequires: sed -%if %{use_systemd} # For macros BuildRequires: systemd -%endif -# endif use_systemd BuildRequires: tcl BuildRequires: tk BuildRequires: xz @@ -204,7 +181,7 @@ BuildRequires: zlib-devel >= 1.2 %if %{with tests} # Test suite requirements BuildRequires: acl -%if 0%{?fedora} >= 27 || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} >= 8 # Needed by t5540-http-push-webdav.sh BuildRequires: apr-util-bdb %endif @@ -223,18 +200,14 @@ BuildRequires: glibc-langpack-en BuildRequires: glibc-langpack-is %endif # endif use_glibc_langpacks -%if 0%{?fedora} && 0%{?fedora} < 30 -BuildRequires: gnupg -%endif -# endif fedora < 30 -%if 0%{?fedora} || 0%{?rhel} > 8 +%if 0%{?fedora} || 0%{?rhel} >= 9 BuildRequires: gnupg2-smime %endif -# endif fedora or el > 8 -%if 0%{?fedora} || 0%{?rhel} == 6 || ( 0%{?rhel} >= 7 && ( "%{_arch}" == "ppc64le" || "%{_arch}" == "x86_64" ) ) +# endif fedora or el >= 9 +%if 0%{?fedora} || ( 0%{?rhel} >= 7 && ( "%{_arch}" == "ppc64le" || "%{_arch}" == "x86_64" ) ) BuildRequires: highlight %endif -# endif fedora, el-6, or el7+ (ppc64le/x86_64) +# endif fedora or el7+ (ppc64le/x86_64) BuildRequires: httpd %if 0%{?fedora} && ! ( "%{_arch}" == "i386" || "%{_arch}" == "s390x" ) BuildRequires: jgit @@ -286,10 +259,10 @@ Requires: perl(Term::ReadKey) # endif ! defined perl_bootstrap Requires: perl-Git = %{version}-%{release} -%if %{with emacs} && %{emacs_filesystem} && %{defined _emacs_version} +%if %{with emacs} && %{defined _emacs_version} Requires: emacs-filesystem >= %{_emacs_version} %endif -# endif with emacs && emacs_filesystem +# endif with emacs && defined _emacs_version # Obsolete emacs-git if it's disabled %if %{without emacs} @@ -346,10 +319,6 @@ Requires: perl-Git = %{version}-%{release} Requires: perl(Term::ReadKey) %endif # endif ! defined perl_bootstrap -%if %{with emacs} && ! %{emacs_filesystem} -Requires: emacs-git = %{version}-%{release} -%endif -# endif with emacs && ! emacs_filesystem %description all Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations @@ -405,15 +374,10 @@ Requires: perl(DBD::SQLite) %package daemon Summary: Git protocol daemon Requires: git-core = %{version}-%{release} -%if %{use_systemd} Requires: systemd Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -%else -Requires: xinetd -%endif -# endif use_systemd %description daemon The git daemon for supporting git:// access to git repositories @@ -426,19 +390,6 @@ Requires: perl(Net::SMTP::SSL) %description email %{summary}. -%if %{with emacs} && ! %{emacs_filesystem} -%package -n emacs-git -Summary: Git version control system support for Emacs -Requires: git = %{version}-%{release} -BuildArch: noarch -Requires: emacs(bin) >= %{_emacs_version} -Obsoletes: emacs-git-el < 2.18.0-0.0 -Provides: emacs-git-el = %{version}-%{release} -%description -n emacs-git -%{summary}. -%endif -# endif with emacs && ! emacs_filesystem - %package -n gitk Summary: Git repository browser BuildArch: noarch @@ -587,24 +538,12 @@ EOF # Filter bogus perl requires # packed-refs comes from a comment in contrib/hooks/update-paranoid -%if %{use_new_rpm_filters} %{?perl_default_filter} %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}perl\\(packed-refs\\) %if ! %{defined perl_bootstrap} %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}perl\\(Term::ReadKey\\) %endif # endif ! defined perl_bootstrap -%else -cat << \EOF > %{name}-req -#!/bin/sh -%{__perl_requires} $* |\ -sed -e '/perl(packed-refs)/d' -EOF - -%global __perl_requires %{_builddir}/%{name}-%{version}%{?rcrev}/%{name}-req -chmod +x %{__perl_requires} -%endif -# endif use_new_rpm_filters # Remove Git::LoadCPAN to ensure we use only system perl modules. This also # allows the dependencies to be automatically processed by rpm. @@ -744,20 +683,11 @@ rm -rf %{buildroot}%{_mandir} # endif with docs mkdir -p %{buildroot}%{_localstatedir}/lib/git -%if %{use_systemd} install -Dp -m 0644 %{SOURCE16} %{buildroot}%{_unitdir}/git.socket perl -p \ -e "s|\@GITEXECDIR\@|%{gitexecdir}|g;" \ -e "s|\@BASE_PATH\@|%{_localstatedir}/lib/git|g;" \ %{SOURCE15} > %{buildroot}%{_unitdir}/git@.service -%else -mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d -perl -p \ - -e "s|\@GITEXECDIR\@|%{gitexecdir}|g;" \ - -e "s|\@BASE_PATH\@|%{_localstatedir}/lib/git|g;" \ - %{SOURCE11} > %{buildroot}%{_sysconfdir}/xinetd.d/git -%endif -# endif use_systemd # Setup bash completion install -Dpm 644 contrib/completion/git-completion.bash %{buildroot}%{bashcompdir}/git @@ -915,7 +845,6 @@ mv netrc contrib/credential/ # Clean up test dir rmdir --ignore-fail-on-non-empty "$testdir" -%if %{use_systemd} %post daemon %systemd_post git.socket @@ -924,14 +853,12 @@ rmdir --ignore-fail-on-non-empty "$testdir" %postun daemon %systemd_postun_with_restart git.socket -%endif -# endif use_systemd %files -f bin-man-doc-git-files -%if %{with emacs} && %{emacs_filesystem} +%if %{with emacs} %{elispdir} %endif -# endif with emacs && emacs_filesystem +# endif with emacs %{_datadir}/git-core/contrib/diff-highlight %{_datadir}/git-core/contrib/hooks/multimail %{_datadir}/git-core/contrib/hooks/update-paranoid @@ -985,25 +912,13 @@ rmdir --ignore-fail-on-non-empty "$testdir" %files daemon %{_pkgdocdir}/git-daemon*.txt -%if %{use_systemd} %{_unitdir}/git.socket %{_unitdir}/git@.service -%else -%config(noreplace)%{_sysconfdir}/xinetd.d/git -%endif -# endif use_systemd %{gitexecdir}/git-daemon %{_localstatedir}/lib/git %{?with_docs:%{_mandir}/man1/git-daemon*.1*} %{?with_docs:%{_pkgdocdir}/git-daemon*.html} -%if %{with emacs} && ! %{emacs_filesystem} -%files -n emacs-git -%{_pkgdocdir}/contrib/emacs/README -%{elispdir} -%endif -# endif with emacs && ! emacs_filesystem - %files email %{_pkgdocdir}/*email*.txt %{gitexecdir}/*email* @@ -1076,6 +991,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" * Fri May 21 2021 Jitka Plesnikova - 2.31.1-3.1 - Perl 5.34 rebuild +* Sun May 16 2021 Todd Zullinger +- clean up various dist conditionals + * Wed Apr 21 2021 Todd Zullinger - 2.31.1-3 - apply upstream patch to fix clone --bare segfault Resolves: rhbz#1952030 From e67c091cc64fa368eb9a853273e3d2f7cd6381c4 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 17 May 2021 09:30:01 -0400 Subject: [PATCH 707/842] update to 2.32.0-rc0 Release notes: https://github.com/git/git/raw/v2.32.0-rc0/Documentation/RelNotes/2.32.0.txt --- ...handle-bare-clones-when-core.bare-se.patch | 81 ------------------- git.spec | 14 ++-- sources | 4 +- 3 files changed, 8 insertions(+), 91 deletions(-) delete mode 100644 0001-builtin-init-db-handle-bare-clones-when-core.bare-se.patch diff --git a/0001-builtin-init-db-handle-bare-clones-when-core.bare-se.patch b/0001-builtin-init-db-handle-bare-clones-when-core.bare-se.patch deleted file mode 100644 index b8bc81b..0000000 --- a/0001-builtin-init-db-handle-bare-clones-when-core.bare-se.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 7fc363e4e64f095553e1a1ceed27caef3a33effd Mon Sep 17 00:00:00 2001 -From: "brian m. carlson" -Date: Wed, 10 Mar 2021 01:11:20 +0000 -Subject: [PATCH] builtin/init-db: handle bare clones when core.bare set to - false - -In 552955ed7f ("clone: use more conventional config/option layering", -2020-10-01), clone learned to read configuration options earlier in its -execution, before creating the new repository. However, that led to a -problem: if the core.bare setting is set to false in the global config, -cloning a bare repository segfaults. This happens because the -repository is falsely thought to be non-bare, but clone has set the work -tree to NULL, which is then dereferenced. - -The code to initialize the repository already considers the fact that a -user might want to override the --bare option for git init, but it -doesn't take into account clone, which uses a different option. Let's -just check that the work tree is not NULL, since that's how clone -indicates that the repository is bare. This is also the case for git -init, so we won't be regressing that case. - -Reported-by: Joseph Vusich -Signed-off-by: brian m. carlson -Signed-off-by: Junio C Hamano -(cherry picked from commit 75555676ad3908b0f847a9ae154c35e12114c82f) ---- - builtin/init-db.c | 4 ++-- - t/t5606-clone-options.sh | 8 ++++++++ - 2 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/builtin/init-db.c b/builtin/init-db.c -index dcc45bef51..f82efe4aff 100644 ---- a/builtin/init-db.c -+++ b/builtin/init-db.c -@@ -212,6 +212,7 @@ static int create_default_files(const char *template_path, - int reinit; - int filemode; - struct strbuf err = STRBUF_INIT; -+ const char *work_tree = get_git_work_tree(); - - /* Just look for `init.templatedir` */ - init_db_template_dir = NULL; /* re-set in case it was set before */ -@@ -235,7 +236,7 @@ static int create_default_files(const char *template_path, - * We must make sure command-line options continue to override any - * values we might have just re-read from the config. - */ -- is_bare_repository_cfg = init_is_bare_repository; -+ is_bare_repository_cfg = init_is_bare_repository || !work_tree; - if (init_shared_repository != -1) - set_shared_repository(init_shared_repository); - -@@ -299,7 +300,6 @@ static int create_default_files(const char *template_path, - if (is_bare_repository()) - git_config_set("core.bare", "true"); - else { -- const char *work_tree = get_git_work_tree(); - git_config_set("core.bare", "false"); - /* allow template config file to override the default */ - if (log_all_ref_updates == LOG_REFS_UNSET) -diff --git a/t/t5606-clone-options.sh b/t/t5606-clone-options.sh -index 1da6ddb2c5..428b0aac93 100755 ---- a/t/t5606-clone-options.sh -+++ b/t/t5606-clone-options.sh -@@ -104,6 +104,14 @@ test_expect_success 'redirected clone -v does show progress' ' - - ' - -+test_expect_success 'clone does not segfault with --bare and core.bare=false' ' -+ test_config_global core.bare false && -+ git clone --bare parent clone-bare && -+ echo true >expect && -+ git -C clone-bare rev-parse --is-bare-repository >actual && -+ test_cmp expect actual -+' -+ - test_expect_success 'chooses correct default initial branch name' ' - GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \ - git -c init.defaultBranch=foo init --bare empty && --- -2.31.1 - diff --git a/git.spec b/git.spec index 0addff1..40026a5 100644 --- a/git.spec +++ b/git.spec @@ -76,11 +76,11 @@ %endif # Define for release candidates -#global rcrev .rc0 +%global rcrev .rc0 Name: git -Version: 2.31.1 -Release: 3%{?rcrev}%{?dist}.1 +Version: 2.32.0 +Release: 0.0%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -112,11 +112,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/1952030 -# https://lore.kernel.org/git/D99DD9AD-54E5-4357-BA50-8B9CAE23084E@amazon.com/ -# https://github.com/git/git/commit/75555676ad -Patch1: 0001-builtin-init-db-handle-bare-clones-when-core.bare-se.patch - %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -991,6 +986,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" * Fri May 21 2021 Jitka Plesnikova - 2.31.1-3.1 - Perl 5.34 rebuild +* Mon May 17 2021 Todd Zullinger - 2.32.0-0.0.rc0 +- update to 2.32.0-rc0 + * Sun May 16 2021 Todd Zullinger - clean up various dist conditionals diff --git a/sources b/sources index c9311bd..7269c5b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.31.1.tar.xz) = 9aa334a3e8519700ff5d112153ec42677722980094caa9d22aa91afdb65166bd9a98fa445c0d327c428ebfa73bf4832e9b3836109a1d9319feafe3191cfd170e -SHA512 (git-2.31.1.tar.sign) = 0a721876f9869d1dc9a43e7f83f8e63a3d8fa932ff2d2e69bb98f3e314e2e9a896c2171cb6a020d6c6e929fdf1af736dbeb3f25f93fb4d359a9aaa5b859069c3 +SHA512 (git-2.32.0.rc0.tar.xz) = f75fda443e3640eff21c7be57726e08360141191ac9ffc2f456574e19e4c2cc20403fb32bf45034c03b519f1a385e152e603cf08c6da622f05593b2c4444206f +SHA512 (git-2.32.0.rc0.tar.sign) = 3ab67290db6ac93f51156f811003c7940ac36bd27b5a296909746752e195569ebecaf45eaa848e47653328ab7726e150bbdf54d300175e9c66f2245570b04f2a From 3c9cdffa290d9e27afc83714ce60b834f7ad7be2 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 17 May 2021 10:38:14 -0400 Subject: [PATCH 708/842] add 'missing WINDOWS' to git.skip-test-patterns We're unlikely to provide the 'WINDOWS' prerequisite in our builds. Nor are we likely to care about the tests which are skipped as a result. (Also, 'missing WINDOWS' is not a phrase I thought I'd ever write.) --- git.skip-test-patterns | 1 + 1 file changed, 1 insertion(+) diff --git a/git.skip-test-patterns b/git.skip-test-patterns index 28a66b8..e9db37f 100644 --- a/git.skip-test-patterns +++ b/git.skip-test-patterns @@ -14,6 +14,7 @@ missing !PTHREADS missing RFC1991 missing TAR_NEEDS_PAX_FALLBACK missing UTF8_NFD_TO_NFC +missing WINDOWS skipping case insensitive tests skipping git p4 tests skipping remote-svn tests, python not available From 0f6131b58c206ca89a2ee9ba0edf87b674ac4b3c Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 22 May 2021 10:16:34 -0400 Subject: [PATCH 709/842] update to 2.32.0-rc1 Release notes: https://github.com/git/git/raw/v2.32.0-rc1/Documentation/RelNotes/2.32.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 40026a5..6bcf2bf 100644 --- a/git.spec +++ b/git.spec @@ -76,11 +76,11 @@ %endif # Define for release candidates -%global rcrev .rc0 +%global rcrev .rc1 Name: git Version: 2.32.0 -Release: 0.0%{?rcrev}%{?dist} +Release: 0.1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -983,6 +983,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sat May 22 2021 Todd Zullinger - 2.32.0-0.1.rc1 +- update to 2.32.0-rc1 + * Fri May 21 2021 Jitka Plesnikova - 2.31.1-3.1 - Perl 5.34 rebuild diff --git a/sources b/sources index 7269c5b..d479188 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.32.0.rc0.tar.xz) = f75fda443e3640eff21c7be57726e08360141191ac9ffc2f456574e19e4c2cc20403fb32bf45034c03b519f1a385e152e603cf08c6da622f05593b2c4444206f -SHA512 (git-2.32.0.rc0.tar.sign) = 3ab67290db6ac93f51156f811003c7940ac36bd27b5a296909746752e195569ebecaf45eaa848e47653328ab7726e150bbdf54d300175e9c66f2245570b04f2a +SHA512 (git-2.32.0.rc1.tar.xz) = 15120245b6279fc1ab8a8c4dde3856641b31b65accac0ace37e57f2e74c8a060973197b59cfbe06f50f9827cdab627a20e07700ac6a9cad5cb8a19877cd27afa +SHA512 (git-2.32.0.rc1.tar.sign) = dd5fa1d06b4bb796edc72f2b04ca2a919ec8f099259a6067f92c3d56f7cad82482b8b5d225c1dc72b0d6087c3c3e48f34eece348e584cb81a87ca64ea934b573 From cfa294748184492919dc615ef364df411b490fb7 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 22 May 2021 11:11:23 -0400 Subject: [PATCH 710/842] re-enable git-p4 with python3 The git-p4 subpackage has been disabled in Fedora 30 via a4b4f7c (Add support for disabling python2, 2018-03-28). Git 2.17.0 was the current release at that time. The git-p4 script subsequently gained python3 support which was released in Git 2.27.0 (2020-05-31). Adjust the python2/python3 conditionals and re-enable git-p4 when either of them are available. Put python3 first in the various conditionals, as that is our primary supported python. We only include python2 to aid in building for EL7. While here, remove the "# endif" comments within the config.mak output. --- git.spec | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/git.spec b/git.spec index 6bcf2bf..a81fcf8 100644 --- a/git.spec +++ b/git.spec @@ -63,11 +63,11 @@ %bcond_without libsecret # Allow p4 subpackage to be toggled via --with/--without -# Disable by default if we lack python2 support -%if %{without python2} -%bcond_with p4 -%else +# Disable by default if we lack python2 or python3 support +%if %{with python2} || %{with python3} %bcond_without p4 +%else +%bcond_with p4 %endif # Hardening flags for EL-7 @@ -230,12 +230,13 @@ BuildRequires: perl(POSIX) BuildRequires: perl(Term::ReadLine) BuildRequires: perl(Test::More) BuildRequires: perl(Time::HiRes) +%if %{with python3} +BuildRequires: python3-devel +%else %if %{with python2} BuildRequires: python2-devel %endif # endif with python2 -%if %{with python3} -BuildRequires: python3-devel %endif # endif with python3 BuildRequires: subversion @@ -428,7 +429,15 @@ repository. %package p4 Summary: Git tools for working with Perforce depots BuildArch: noarch +%if %{with python3} +BuildRequires: python3-devel +%else +%if %{with python2} BuildRequires: python2-devel +%endif +# endif with python2 +%endif +# endif with python3 Requires: git = %{version}-%{release} %description p4 %{summary}. @@ -510,16 +519,18 @@ INSTALL_SYMLINKS = 1 GITWEB_PROJECTROOT = %{_localstatedir}/lib/git GNU_ROFF = 1 NO_PERL_CPAN_FALLBACKS = 1 +%if %{with python3} +PYTHON_PATH = %{__python3} +%else %if %{with python2} PYTHON_PATH = %{__python2} %else NO_PYTHON = 1 %endif -# endif with python2 +%endif %if %{with asciidoctor} USE_ASCIIDOCTOR = 1 %endif -# endif with asciidoctor htmldir = %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} prefix = %{_prefix} perllibdir = %{perl_vendorlib} @@ -985,6 +996,8 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Sat May 22 2021 Todd Zullinger - 2.32.0-0.1.rc1 - update to 2.32.0-rc1 +- rearrange python2/python3 conditionals +- re-enable git-p4 with python3 * Fri May 21 2021 Jitka Plesnikova - 2.31.1-3.1 - Perl 5.34 rebuild From 851ee286f88766a0c23cd9100d8e1c371cb196e0 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 22 May 2021 11:29:44 -0400 Subject: [PATCH 711/842] add coreutils BuildRequires We use a number of tools from coreutils, be explicit about the dependency. --- git.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git.spec b/git.spec index a81fcf8..d36ba7c 100644 --- a/git.spec +++ b/git.spec @@ -129,6 +129,7 @@ BuildRequires: linkchecker # endif with linkcheck %endif # endif with docs +BuildRequires: coreutils BuildRequires: desktop-file-utils BuildRequires: diffutils %if %{with emacs} @@ -998,6 +999,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" - update to 2.32.0-rc1 - rearrange python2/python3 conditionals - re-enable git-p4 with python3 +- add coreutils BuildRequires * Fri May 21 2021 Jitka Plesnikova - 2.31.1-3.1 - Perl 5.34 rebuild From da79638e4ae2d8af2245bc9db0b3435d8f39763e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 22 May 2021 14:34:38 -0400 Subject: [PATCH 712/842] remove unneeded NEEDS_CRYPTO_WITH_SSL The NEEDS_CRYPTO_WITH_SSL Makefile knob was added in 7878348 (Update to git-1.7.0 - Link imap-send with libcrypto (#565147) - Disable building of unused python remote helper libs, 2010-02-15). It is no longer needed. I'm not sure when it stopped being necessary, though I am sure I tried removing once before in the 11 years since it was added. Builds on Fedora and EL7/EL8 all properly pick up the -lssl -lcrypto flags when compiling git-imap-send. Incidentally, git-imap-send has used libcurl for handling IMAP rather than low-level OpenSSL-based functions on Fedora since upstream commit dbba42bb32 (imap-send: use curl by default when possible, 2017-09-14). This applies to EL8 as well. On EL7, libcurl is too old (>= 7.34.0 is required). --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index d36ba7c..775f89c 100644 --- a/git.spec +++ b/git.spec @@ -513,7 +513,6 @@ cat << \EOF | tee config.mak V = 1 CFLAGS = %{build_cflags} LDFLAGS = %{build_ldflags} -NEEDS_CRYPTO_WITH_SSL = 1 USE_LIBPCRE = 1 ETC_GITCONFIG = %{_sysconfdir}/gitconfig INSTALL_SYMLINKS = 1 @@ -1000,6 +999,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" - rearrange python2/python3 conditionals - re-enable git-p4 with python3 - add coreutils BuildRequires +- remove unneeded NEEDS_CRYPTO_WITH_SSL * Fri May 21 2021 Jitka Plesnikova - 2.31.1-3.1 - Perl 5.34 rebuild From 1d9a879da8ab0b8d167b453eb581a385a4555fcb Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 24 May 2021 09:58:31 +0200 Subject: [PATCH 713/842] Perl 5.34 re-rebuild of bootstrapped packages --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 775f89c..ffcd628 100644 --- a/git.spec +++ b/git.spec @@ -80,7 +80,7 @@ Name: git Version: 2.32.0 -Release: 0.1%{?rcrev}%{?dist} +Release: 0.2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -994,6 +994,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon May 24 2021 Jitka Plesnikova - 2.32.0-0.2.rc1 +- Perl 5.34 re-rebuild of bootstrapped packages + * Sat May 22 2021 Todd Zullinger - 2.32.0-0.1.rc1 - update to 2.32.0-rc1 - rearrange python2/python3 conditionals From 02138d4e5cb5d26b65610ff59b3d9bc45d7594bd Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 28 May 2021 10:27:29 -0400 Subject: [PATCH 714/842] update to 2.32.0-rc2 Release notes: https://github.com/git/git/raw/v2.32.0-rc2/Documentation/RelNotes/2.32.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index ffcd628..d877548 100644 --- a/git.spec +++ b/git.spec @@ -76,11 +76,11 @@ %endif # Define for release candidates -%global rcrev .rc1 +%global rcrev .rc2 Name: git Version: 2.32.0 -Release: 0.2%{?rcrev}%{?dist} +Release: 0.3%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -994,6 +994,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri May 28 2021 Todd Zullinger - 2.32.0-0.3.rc2 +- update to 2.32.0-rc2 + * Mon May 24 2021 Jitka Plesnikova - 2.32.0-0.2.rc1 - Perl 5.34 re-rebuild of bootstrapped packages diff --git a/sources b/sources index d479188..b850c53 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.32.0.rc1.tar.xz) = 15120245b6279fc1ab8a8c4dde3856641b31b65accac0ace37e57f2e74c8a060973197b59cfbe06f50f9827cdab627a20e07700ac6a9cad5cb8a19877cd27afa -SHA512 (git-2.32.0.rc1.tar.sign) = dd5fa1d06b4bb796edc72f2b04ca2a919ec8f099259a6067f92c3d56f7cad82482b8b5d225c1dc72b0d6087c3c3e48f34eece348e584cb81a87ca64ea934b573 +SHA512 (git-2.32.0.rc2.tar.xz) = 1e9d96d4c54882f571dd5fd075ebe842ecd4da24cf97d06fd65f9fa81baa55b1d74237164b9cae64249c242b90e375f71dc52d6b1d700cf2d6abb7e18c1c1206 +SHA512 (git-2.32.0.rc2.tar.sign) = 428b2bda35e77a6d67a774dc5f0b78f1886553259ad9311bd6db545e6f7d4cfa85246c590573d939af39c9fa39edc0e7b675be02e4a0b8bc079425309628154c From c052174f853846753c32d1b2d4d53c8d596a9e65 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 2 Jun 2021 11:06:13 -0400 Subject: [PATCH 715/842] update to 2.32.0-rc3 Release notes: https://github.com/git/git/raw/v2.32.0-rc3/Documentation/RelNotes/2.32.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index d877548..f252b5b 100644 --- a/git.spec +++ b/git.spec @@ -76,11 +76,11 @@ %endif # Define for release candidates -%global rcrev .rc2 +%global rcrev .rc3 Name: git Version: 2.32.0 -Release: 0.3%{?rcrev}%{?dist} +Release: 0.4%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -994,6 +994,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Jun 02 2021 Todd Zullinger - 2.32.0-0.4.rc3 +- update to 2.32.0-rc3 + * Fri May 28 2021 Todd Zullinger - 2.32.0-0.3.rc2 - update to 2.32.0-rc2 diff --git a/sources b/sources index b850c53..29a77e3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.32.0.rc2.tar.xz) = 1e9d96d4c54882f571dd5fd075ebe842ecd4da24cf97d06fd65f9fa81baa55b1d74237164b9cae64249c242b90e375f71dc52d6b1d700cf2d6abb7e18c1c1206 -SHA512 (git-2.32.0.rc2.tar.sign) = 428b2bda35e77a6d67a774dc5f0b78f1886553259ad9311bd6db545e6f7d4cfa85246c590573d939af39c9fa39edc0e7b675be02e4a0b8bc079425309628154c +SHA512 (git-2.32.0.rc3.tar.xz) = 567873b78120476ea1072ce89c1370a3678796e9afe1871cbf7983c290b75d54d2c0192e44de8c265c1f24bf393adc92edfa159a7c82b000e1caa39ebd5eec5d +SHA512 (git-2.32.0.rc3.tar.sign) = 08715484598a103c45be2c893faf2e4aff94e4a133e3f57c48a11b7383a557cce3631a6cef9b1b90e6955c9e49e3bf2c344d7f24c68f5115173c57a74e96a08c From 407b015e7a5dda9b1dccb7e377770f549de56275 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 3 Jun 2021 19:25:52 -0400 Subject: [PATCH 716/842] drop jgit BR on Fedora >= 35 With the impending removal of a large chunk of the Java package set, jgit will become unavailable as a BuildRequires in Fedora soon. Remove the build dependency on Fedora >= 35. As noted in 8faf622 (drop jgit BR on Fedora > 30, 2019-07-29), this affects 3 tests, 2 for packfile format (t5310-pack-bitmaps) and 1 of ls-remote (t5512-ls-remote). --- git.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index f252b5b..a226e5d 100644 --- a/git.spec +++ b/git.spec @@ -80,7 +80,7 @@ Name: git Version: 2.32.0 -Release: 0.4%{?rcrev}%{?dist} +Release: 0.5%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -205,7 +205,7 @@ BuildRequires: highlight %endif # endif fedora or el7+ (ppc64le/x86_64) BuildRequires: httpd -%if 0%{?fedora} && ! ( "%{_arch}" == "i386" || "%{_arch}" == "s390x" ) +%if 0%{?fedora} && ! ( 0%{?fedora} >= 35 || "%{_arch}" == "i386" || "%{_arch}" == "s390x" ) BuildRequires: jgit %endif # endif fedora (except i386 and s390x) @@ -994,6 +994,10 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Jun 03 2021 Todd Zullinger - 2.32.0-0.5.rc3 +- drop jgit on Fedora >= 35 + Resolves: rhbz#1965808 + * Wed Jun 02 2021 Todd Zullinger - 2.32.0-0.4.rc3 - update to 2.32.0-rc3 From c2eba54e84dc2436d4305ad8ca81098451d05d5e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 6 Jun 2021 11:34:56 -0400 Subject: [PATCH 717/842] update to 2.32.0 Release notes: https://github.com/git/git/raw/v2.32.0/Documentation/RelNotes/2.32.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index a226e5d..54fec61 100644 --- a/git.spec +++ b/git.spec @@ -76,11 +76,11 @@ %endif # Define for release candidates -%global rcrev .rc3 +#global rcrev .rc0 Name: git Version: 2.32.0 -Release: 0.5%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -994,6 +994,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sun Jun 06 2021 Todd Zullinger - 2.32.0-1 +- update to 2.32.0 + * Thu Jun 03 2021 Todd Zullinger - 2.32.0-0.5.rc3 - drop jgit on Fedora >= 35 Resolves: rhbz#1965808 diff --git a/sources b/sources index 29a77e3..56ef012 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.32.0.rc3.tar.xz) = 567873b78120476ea1072ce89c1370a3678796e9afe1871cbf7983c290b75d54d2c0192e44de8c265c1f24bf393adc92edfa159a7c82b000e1caa39ebd5eec5d -SHA512 (git-2.32.0.rc3.tar.sign) = 08715484598a103c45be2c893faf2e4aff94e4a133e3f57c48a11b7383a557cce3631a6cef9b1b90e6955c9e49e3bf2c344d7f24c68f5115173c57a74e96a08c +SHA512 (git-2.32.0.tar.xz) = 1ab3e7022ccee411d14a7da5c37d6259ef5c0f85ebed8f49698e25c65cbc7a46f8096919fcb6568360bfe284dd7475b596eee1a167db966096255a405853837c +SHA512 (git-2.32.0.tar.sign) = 0f21129c6993a2b1742152829a33064205fb148bd3e26fd3a5f996c31ff920c9f0f22e259d2159eef24b75ac3a592c3152277e5046506e1aabc765bc25f583b9 From 7099f641de7fb23a20a97a62ff6577ae3e9a8dd8 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 6 Jun 2021 11:36:55 -0400 Subject: [PATCH 718/842] add perl(File::Compare) BuildRequires MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Documentation/cmd-list.perl script requires File::Compare to generate various cmds-$area.txt file which are included in the main git help. This has been broken since File::Compare was split from the main perl package in 3b63b8c (Subpackage File::Compare, 2020-01-06)¹. The result is a broken git man/html page. In git(1), the output is: HIGH-LEVEL COMMANDS (PORCELAIN) We separate the porcelain commands into the main commands and some ancillary user utilities. Main porcelain commands Unresolved directive in git.txt - include::cmds-mainporcelain.txt[] Ancillary Commands Manipulators: Unresolved directive in git.txt - include::cmds-ancillarymanipulators.txt[] Interrogators: Unresolved directive in git.txt - include::cmds-ancillaryinterrogators.txt[] ... This is logged during the build: make[1]: Entering directory '/builddir/build/BUILD/git-2.32.0.rc3/Documentation' rm -f cmd-list.made && \ /usr/bin/perl ./cmd-list.perl ../command-list.txt cmds-ancillaryinterrogators.txt cmds-ancillarymanipulators.txt cmds-mainporcelain.txt cmds-plumbinginterrogators.txt cmds-plumbingmanipulators.txt cmds-synchingrepositories.txt cmds-synchelpers.txt cmds-guide.txt cmds-purehelpers.txt cmds-foreignscminterface.txt && \ date >cmd-list.made Can't locate File/Compare.pm in @INC (you may need to install the File::Compare module) (@INC contains: /usr/local/lib64/perl5/5.32 /usr/local/share/perl5/5.32 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at ./cmd-list.perl line 3. BEGIN failed--compilation aborted at ./cmd-list.perl line 3. make[1]: Leaving directory '/builddir/build/BUILD/git-2.32.0.rc3/Documentation' This should probably cause a make error rather than generating incomplete documentation. I'll try to report this upstream (ideally with a patch to resolve it). It's also worth remembering to search the build logs for such failures. "Can't locate .* in @INC" and "BEGIN failed" are good strings to search. ¹ https://src.fedoraproject.org/rpms/perl/c/3b63b8c --- git.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git.spec b/git.spec index 54fec61..e3d4f03 100644 --- a/git.spec +++ b/git.spec @@ -122,6 +122,7 @@ BuildRequires: rubygem-asciidoctor BuildRequires: asciidoc >= 8.4.1 %endif # endif with asciidoctor +BuildRequires: perl(File::Compare) BuildRequires: xmlto %if %{with linkcheck} BuildRequires: linkchecker @@ -996,6 +997,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Sun Jun 06 2021 Todd Zullinger - 2.32.0-1 - update to 2.32.0 +- add perl(File::Compare) BuildRequires * Thu Jun 03 2021 Todd Zullinger - 2.32.0-0.5.rc3 - drop jgit on Fedora >= 35 From a1de5bd2d60ccd07e58c89fa4d16c5c4cc11ebd7 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 6 Jun 2021 12:09:37 -0400 Subject: [PATCH 719/842] fix var to enable git-svn tests with httpd Upstream commit 3b072c577b (tests: replace test_tristate with "git env--helper", 2019-06-21) semi-broke the git-svn tests which require httpd. This was subsequently fixed in upstream commit 6a20b62d7e (t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests, 2019-09-06). The upstream fix also adjusted the variable name to follow the preferred naming scheme, i.e. GIT_SVN_TEST_ -> GIT_TEST_SVN_. Fix the variable in %check to indicate that we want those tests to run. We were still running the tests because we had all the necessary dependencies. But we want to ensure that we don't skip them opportunistically if those dependencies ever change. Update comment which suggest a method for (manually) checking such variables in the test suite. --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index e3d4f03..d01b350 100644 --- a/git.spec +++ b/git.spec @@ -826,11 +826,13 @@ export GIT_SKIP_TESTS export LANG=en_US.UTF-8 # Explicitly enable tests which may be skipped opportunistically -# (Check for variables set via test_tristate in the test suite) -export GIT_SVN_TEST_HTTPD=true +# Check for variables set via test_bool_env in the test suite: +# git grep 'test_bool_env GIT_' -- t/{lib-,t[0-9]}*.sh | +# sed -r 's/.* (GIT_[^ ]+) .*/\1/g' | sort -u export GIT_TEST_GIT_DAEMON=true export GIT_TEST_HTTPD=true export GIT_TEST_SVNSERVE=true +export GIT_TEST_SVN_HTTPD=true # Create tmpdir for test output and update GIT_TEST_OPTS # Also update GIT-BUILD-OPTIONS to keep make from any needless rebuilding @@ -998,6 +1000,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" * Sun Jun 06 2021 Todd Zullinger - 2.32.0-1 - update to 2.32.0 - add perl(File::Compare) BuildRequires +- fix var to enable git-svn tests with httpd * Thu Jun 03 2021 Todd Zullinger - 2.32.0-0.5.rc3 - drop jgit on Fedora >= 35 From 6deecbd62e7a6d2c09507413855729e53ab81a7f Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 6 Jun 2021 12:15:16 -0400 Subject: [PATCH 720/842] remove %changelog entries prior to 2019 The git history serves as the repository for the old entries. The changelog was roughly 20% of the total lines in the spec file. --- git.spec | 351 +------------------------------------------------------ 1 file changed, 1 insertion(+), 350 deletions(-) diff --git a/git.spec b/git.spec index d01b350..d06043b 100644 --- a/git.spec +++ b/git.spec @@ -1001,6 +1001,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" - update to 2.32.0 - add perl(File::Compare) BuildRequires - fix var to enable git-svn tests with httpd +- remove %%changelog entries prior to 2019 * Thu Jun 03 2021 Todd Zullinger - 2.32.0-0.5.rc3 - drop jgit on Fedora >= 35 @@ -1326,353 +1327,3 @@ rmdir --ignore-fail-on-non-empty "$testdir" * Thu Jan 31 2019 Fedora Release Engineering - 2.20.1-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Dec 15 2018 Todd Zullinger - 2.20.1-1 -- Update to 2.20.1 - -* Sun Dec 09 2018 Todd Zullinger - 2.20.0-1 -- Update to 2.20.0 - -* Sat Dec 01 2018 Todd Zullinger - 2.20.0-0.2.rc2 -- Update to 2.20.0.rc2 - -* Wed Nov 21 2018 Todd Zullinger - 2.20.0-0.1.rc1 -- Update to 2.20.0.rc1 - -* Wed Nov 21 2018 Todd Zullinger - 2.19.2-1 -- Update to 2.19.2 - -* Tue Oct 23 2018 Todd Zullinger -- Skip test BuildRequires when --without tests is used -- Simplify gpg verification of Source0 -- Use %%{without ...} macro consistently -- Add comments to %%endif statements -- Add glibc-langpack-en BuildRequires for en_US.UTF-8 locale - -* Mon Oct 22 2018 Pavel Cahyna - 2.19.1-2 -- Update condition for the t5540-http-push-webdav test for future RHEL - -* Fri Oct 05 2018 Todd Zullinger - 2.19.1-1 -- Update to 2.19.1 (CVE-2018-17456) - -* Mon Sep 10 2018 Todd Zullinger - 2.19.0-1 -- Update to 2.19.0 - -* Fri Sep 07 2018 Todd Zullinger - 2.19.0-0.5.rc2 -- Fix smart-http test due to changes in cookie sort order in curl-7.61.1 -- Add --without tests option to skip tests - -* Thu Sep 06 2018 Sebastian Kisela - 2.19.0-0.4.rc2 -- Move instaweb to a separate subpackage -- Fix builds without docs and without cvs and/or p4 - -* Tue Sep 04 2018 Todd Zullinger - 2.19.0-0.3.rc2 -- Update to 2.19.0.rc2 -- Drop unnecessary Conflicts: when git-p4 is disabled -- Obsolete git-cvs if it's disabled -- Remove contrib/fast-import/import-zips.py, contrib/hg-to-git, and - contrib/svn-fe which all require python2 -- Drop git-gnome-keyring obsolete for fedora > 30 - -* Tue Sep 04 2018 Nils Philippsen - 2.19.0-0.2.rc1 -- obsolete git-p4 if it's disabled - -* Tue Aug 28 2018 Todd Zullinger - 2.19.0-0.1.rc1 -- Update to 2.19.0.rc1 - -* Mon Aug 20 2018 Todd Zullinger - 2.19.0-0.0.rc0 -- Update to 2.19.0.rc0 - -* Mon Aug 20 2018 Todd Zullinger - 2.18.0-2.5 -- Remove git-remote-testsvn, make git-svn noarch -- Restore fixed contrib/credential/netrc tests - -* Fri Jul 13 2018 Fedora Release Engineering - 2.18.0-2.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jul 03 2018 Petr Pisar - 2.18.0-2.3 -- Perl 5.28 rebuild - -* Sun Jul 01 2018 Jitka Plesnikova - 2.18.0-2.2 -- Perl 5.28 re-rebuild of bootstrapped packages - -* Fri Jun 29 2018 Jitka Plesnikova - 2.18.0-2.1 -- Perl 5.28 rebuild - -* Mon Jun 25 2018 Pavel Cahyna - 2.18.0-2 -- Fix build --without cvs - -* Wed Jun 20 2018 Todd Zullinger - 2.18.0-1 -- Update to 2.18.0 - -* Tue Jun 19 2018 Miro Hrončok - 2.18.0-0.3.rc2 -- Rebuilt for Python 3.7 - -* Wed Jun 13 2018 Todd Zullinger - 2.18.0-0.2.rc2 -- Update to 2.18.0-rc2 -- Apply upstream zlib buffer handling patch (#1582555) - -* Wed Jun 06 2018 Todd Zullinger -- Include git-contacts, SubmittingPatches suggests it to users -- Build git-subtree docs in %%build - -* Mon Jun 04 2018 Todd Zullinger - 2.18.0-0.1.rc1 -- Update to 2.18.0-rc1 -- Drop flaky & out-of-place netrc credential helper tests - -* Fri Jun 01 2018 Todd Zullinger - 2.18.0-0.0.rc0.1 -- add -p: fix counting empty context lines in edited patches - -* Wed May 30 2018 Todd Zullinger - 2.18.0-0.0.rc0 -- Update to 2.18.0-rc0 -- Use new INSTALL_SYMLINKS setting - -* Wed May 30 2018 Todd Zullinger - 2.17.1-3 -- Use %%apply_patch for aarch64 zlib patch, return to %%autosetup -- Disable jgit tests on s390x, they're unreliable -- Use %%make_build and %%make_install - -* Tue May 29 2018 Todd Zullinger - 2.17.1-2 -- packfile: Correct zlib buffer handling (#1582555) - -* Tue May 29 2018 Todd Zullinger - 2.17.1-1 -- Update to 2.17.1 (CVE-2018-11233, CVE-2018-11235) - -* Thu May 24 2018 Todd Zullinger - 2.17.0-4 -- Fix segfault in rev-parse with invalid input (#1581678) -- Move TEST_SHELL_PATH setting to config.mak - -* Mon Apr 16 2018 Todd Zullinger - 2.17.0-3 -- Move linkcheck macro to existing fedora/rhel > 7 block -- Re-enable t5000-tar-tree.sh test on f28 - -* Fri Apr 13 2018 Pavel Cahyna -- Use BuildRequires: perl-interpreter per the packaging guidelines -- Update conditions for future RHEL - -* Tue Apr 10 2018 Todd Zullinger - 2.17.0-2 -- Require perl-generators on EL > 7 - -* Mon Apr 09 2018 Todd Zullinger -- daemon: use --log-destination=stderr with systemd -- daemon: fix condition for redirecting stderr -- git-svn: avoid uninitialized value warning - -* Sun Apr 08 2018 Todd Zullinger -- Clean up redundant and unneeded Requires - -* Sat Apr 07 2018 Todd Zullinger -- Remove Git::LoadCPAN to ensure we use only system perl modules - -* Mon Apr 02 2018 Todd Zullinger -- Allow git-p4 subpackage to be toggled via --with/--without -- Use %%bcond_(with|without) to enable/disable python3 -- Add support for disabling python2 - -* Mon Apr 02 2018 Todd Zullinger - 2.17.0-1 -- Update to 2.17.0 - -* Wed Mar 28 2018 Todd Zullinger - 2.17.0-0.2.rc2 -- Update to 2.17.0-rc2 - -* Tue Mar 27 2018 Todd Zullinger -- Allow cvs subpackage to be toggled via --with/--without - -* Tue Mar 27 2018 Joe Orton -- Disable CVS support on EL > 7 - -* Tue Mar 27 2018 Todd Zullinger - 2.17.0-0.1.rc1.2 -- Add missing perl(Mail::Address) requirement (#1561086) - -* Thu Mar 22 2018 Todd Zullinger - 2.17.0-0.1.rc1.1 -- Drop .py extension from contrib/hooks/multimail/git_multimail.py -- Remove unnecessary "chmod +x contrib/hooks/*" - -* Wed Mar 21 2018 Todd Zullinger - 2.17.0-0.1.rc1 -- Update to 2.17.0-rc1 - -* Fri Mar 16 2018 Todd Zullinger -- Add findutils BuildRequires, improve 'find | xargs' calls - -* Thu Mar 15 2018 Todd Zullinger - 2.17.0-0.0.rc0 -- Update to 2.17.0-rc0 -- Adjust for simplified perl install -- Require git-core rather than git for git-daemon -- Rename gitweb httpd config file -- Install contrib/diff-highlight (#1550251) - -* Thu Mar 15 2018 Todd Zullinger -- Use symlinks instead of hardlinks for installed binaries - -* Fri Feb 23 2018 Todd Zullinger -- Improve hardening flags for EL-6 & EL-7 - -* Fri Feb 16 2018 Todd Zullinger - 2.16.2-1 -- Update to 2.16.2 -- Add gawk, gcc, make, and sed BuildRequires - -* Wed Feb 07 2018 Todd Zullinger - 2.16.1-3 -- Order %%files and %%packages sections by name -- Remove obsolete %%defattr -- Don't package contrib/svn-fe in %%doc -- Split git-subtree into a separate package - -* Wed Feb 07 2018 Fedora Release Engineering - 2.16.1-2.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Jan 29 2018 Todd Zullinger - 2.16.1-2 -- git-svn: avoid segfaults in 'git svn branch', re-enable t9128, t9141, and - t9167 -- Drop obsolete BuildRoot, Group, %%clean, and buildroot cleanup - -* Mon Jan 22 2018 Todd Zullinger - 2.16.1-1 -- Update to 2.16.1 -- Avoid python dependency in git-core (#1536471) - -* Thu Jan 18 2018 Todd Zullinger - 2.16.0-1 -- Update to 2.16.0 -- Use 'prove' as test harness, enable shell tracing -- Disable t5000-tar-tree.sh on x86 in f28 - -* Fri Jan 12 2018 Todd Zullinger -- Add %%{emacs_filesystem} to simplify emacs support -- Use .in template for git@.service to ensure paths are substituted - -* Thu Jan 11 2018 Todd Zullinger -- Update BuildRequires for tests - -* Mon Jan 08 2018 Todd Zullinger -- Avoid excluding non-existent .py[co] files in %%doc -- Remove obsolete gnome-keyring credential helper - -* Sun Jan 07 2018 Todd Zullinger -- Explicitly enable tests which may be skipped opportunistically - -* Sat Dec 30 2017 Todd Zullinger -- Fix perl requires filtering on EL-6 - -* Thu Nov 30 2017 Todd Zullinger - 2.15.1-3 -- Include verbose logs in build output for 'make test' failures -- Use %%autosetup macro to unpack and patch source -- Remove second make invocation for doc build/install -- Fix builds using '--without docs' -- Mark git-core-docs sub-package noarch -- Avoid failures in svnserve tests when run in parallel -- Run tests in parallel by default on Fedora -- Skip 'git svn branch' tests which fail intermittently -- Re-enable grep tests on s390x - -* Wed Nov 29 2017 Todd Zullinger - 2.15.1-2 -- Fix debuginfo for gnome-keyring and libsecret credential helpers - -* Tue Nov 28 2017 Todd Zullinger - 2.15.1-1 -- Update to 2.15.1 - -* Tue Nov 21 2017 Todd Zullinger -- Add tcl/tk BuildRequires -- Enable support for release candidate builds - -* Tue Nov 07 2017 Todd Zullinger - 2.15.0-2 -- Fix git-clone memory exhaustion (CVE-2017-15298) - Resolves: #1510455, #1510457 -- Disable cross-directory hardlinks -- Drop ancient obsoletes for git and git-arch -- Update summary/description of numerous subpackages -- Fix shebang in a few places to silence rpmlint complaints -- Fix t9020-remote-svn failure when setting PYTHON_PATH -- Rename %%gitcoredir to %%gitexecdir; upstream uses the latter -- Move commands which no longer require perl into git-core -- Move filter-branch out of core, it needs perl now -- Improve test suite coverage - -* Mon Oct 30 2017 Todd Zullinger - 2.15.0-1 -- Update to 2.15.0 - -* Mon Oct 23 2017 Todd Zullinger - 2.14.3-1 -- Update to 2.14.3 - -* Tue Sep 26 2017 Todd Zullinger - 2.14.2-2 -- Update to 2.14.2 - -* Thu Aug 10 2017 Todd Zullinger - 2.14.1-2 -- Rebuild for rpm-4.14 bug (#1480407) - -* Thu Aug 10 2017 Todd Zullinger - 2.14.1-1 -- Update to 2.14.1 (resolves CVE-2017-1000117) - -* Tue Aug 08 2017 Iryna Shcherbina - 2.14.0-2 -- Add a build-time dependency on python2-devel for p4 - Resolves: #1479713 -- Skip all grep tests on s390x for now because it failes intermittently - -* Fri Aug 04 2017 Todd Zullinger - 2.14.0-1 -- Update to 2.14.0 -- Use pcre2 library -- git-p4: explicitly require python2 - -* Tue Aug 01 2017 Todd Zullinger - 2.13.4-1 -- Update to 2.13.4 -- Remove EL-5 and old Fedora conditionals - -* Sun Jul 30 2017 Florian Weimer - 2.13.3-3 -- Rebuild with binutils fix for ppc64le (#1475636) - -* Thu Jul 20 2017 Petr Stodulka - 2.13.3-2 -- Move documentation files from all subpackages into the %%{_pkgdocdir} - directory, so links inside doc and man files are correct - Resolves: #1357438 -- Quiet a few rpmlint complaints regarding hidden files in contrib dir -- Remove explicit libcurl requirement from git-core - -* Thu Jul 13 2017 Gwyn Ciesla - 2.13.3-1 -- Update to 2.13.3 - -* Sun Jun 25 2017 Todd Zullinger - 2.13.2-1 -- Update to 2.13.2 -- Skip grep tests which fail intermittently on s390x - -* Wed Jun 07 2017 Jitka Plesnikova - 2.13.1-2 -- Perl 5.26 re-rebuild of bootstrapped packages - -* Mon Jun 05 2017 Todd Zullinger - 2.13.1-1 -- Update to 2.13.1 - -* Sun Jun 04 2017 Jitka Plesnikova - 2.13.0-3 -- Perl 5.26 rebuild - -* Wed May 17 2017 Todd Zullinger - 2.13.0-2 -- Use default, collision-detecting SHA1 implementation - -* Tue May 09 2017 Todd Zullinger - 2.13.0-1 -- Update to 2.13.0 (resolves CVE-2017-8386) - -* Wed Mar 29 2017 Gwyn Ciesla - 2.12.2-1 -- Update to 2.12.2 - -* Tue Mar 21 2017 Gwyn Ciesla - 2.12.1-1 -- Update to 2.12.1 - -* Mon Feb 27 2017 Jon Ciesla - 2.12.0-1 -- Update to 2.12.0 - -* Fri Feb 17 2017 Petr Stodulka - 2.11.1-3 -- remove non-ASCII characters from description and title of packages -- fix requiremets -- fix spec to be compatible for other systems -- remove deprecated credential-gnome-keyring - -* Fri Feb 17 2017 Todd Zullinger - 2.11.1-3 -- Remove unnecessary rsync requirement from git-core -- Move gnome-keyring credential helper from git-core to git -- Enable libsecret credential helper -- Run git test suite -- Use %%{_mandir} in git/git-core file list filters -- Fix version of emacs-git and emacs-git-el provides -- Clean up contrib/{credential,subtree} to avoid cruft in git-core-doc -- Fix a number of macro-in-comment warnings from rpmlint - -* Fri Feb 10 2017 Fedora Release Engineering - 2.11.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 03 2017 Jon Ciesla - 2.11.1-1 -- Update to 2.11.1 From a35d388291eeffb6a7d75dc41926078449cfdaae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 01:39:37 +0000 Subject: [PATCH 721/842] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index d06043b..3be65ef 100644 --- a/git.spec +++ b/git.spec @@ -80,7 +80,7 @@ Name: git Version: 2.32.0 -Release: 1%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist}.1 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -997,6 +997,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.32.0-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sun Jun 06 2021 Todd Zullinger - 2.32.0-1 - update to 2.32.0 - add perl(File::Compare) BuildRequires From 0d6049db8bc783edd13111eedf9d8745c8074b91 Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:02:41 +0200 Subject: [PATCH 722/842] Rebuilt with OpenSSL 3.0.0 --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 3be65ef..145ea40 100644 --- a/git.spec +++ b/git.spec @@ -80,7 +80,7 @@ Name: git Version: 2.32.0 -Release: 1%{?rcrev}%{?dist}.1 +Release: 1%{?rcrev}%{?dist}.2 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -997,6 +997,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Sep 14 2021 Sahana Prasad - 2.32.0-1.2 +- Rebuilt with OpenSSL 3.0.0 + * Thu Jul 22 2021 Fedora Release Engineering - 2.32.0-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From f291bcfd279d847cba918323b98eb64686d66062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Mon, 27 Sep 2021 18:48:27 +0200 Subject: [PATCH 723/842] update to 2.33.0 contrib/hooks/multimail is no longer distributed with git The multimail hook was removed from the git contrib tree. From the upstream commit f74d11471f (multimail: stop shipping a copy, 2021-06-10): The multimail project is developed independently and has its own project page. Traditionally, we shipped a copy in contrib/. However, such a copy is prone to become stale, and users are much better served to be directed to the actual project instead. --- git.spec | 27 +++++++++------------------ sources | 4 ++-- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/git.spec b/git.spec index 145ea40..2044845 100644 --- a/git.spec +++ b/git.spec @@ -79,8 +79,8 @@ #global rcrev .rc0 Name: git -Version: 2.32.0 -Release: 1%{?rcrev}%{?dist}.2 +Version: 2.33.0 +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -588,25 +588,17 @@ export SOURCE_DATE_EPOCH=$(date -r version +%%s 2>/dev/null) # Fix shebang in a few places to silence rpmlint complaints %if %{with python2} sed -i -e '1s@#! */usr/bin/env python$@#!%{__python2}@' \ - contrib/fast-import/import-zips.py \ - contrib/hooks/multimail/git_multimail.py \ - contrib/hooks/multimail/migrate-mailhook-config \ - contrib/hooks/multimail/post-receive.example + contrib/fast-import/import-zips.py %else # Remove contrib/fast-import/import-zips.py which requires python2. rm -rf contrib/fast-import/import-zips.py %endif # endif with python2 -# The multimail hook is installed with git. Use python3 to avoid an -# unnecessary python2 dependency, if possible. Also fix contrib/hg-to-git -# while here. +# Use python3 to avoid an unnecessary python2 dependency, if possible. %if %{with python3} sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \ - contrib/hg-to-git/hg-to-git.py \ - contrib/hooks/multimail/git_multimail.py \ - contrib/hooks/multimail/migrate-mailhook-config \ - contrib/hooks/multimail/post-receive.example + contrib/hg-to-git/hg-to-git.py %endif # endif with python3 @@ -705,9 +697,6 @@ mkdir -p %{buildroot}%{_datadir}/git-core/contrib/completion install -pm 644 contrib/completion/git-completion.tcsh \ %{buildroot}%{_datadir}/git-core/contrib/completion/ -# Drop .py extension from git_multimail to avoid byte-compiling -mv contrib/hooks/multimail/git_multimail{.py,} - # Move contrib/hooks out of %%docdir mkdir -p %{buildroot}%{_datadir}/git-core/contrib mv contrib/hooks %{buildroot}%{_datadir}/git-core/contrib @@ -869,7 +858,6 @@ rmdir --ignore-fail-on-non-empty "$testdir" %endif # endif with emacs %{_datadir}/git-core/contrib/diff-highlight -%{_datadir}/git-core/contrib/hooks/multimail %{_datadir}/git-core/contrib/hooks/update-paranoid %{_datadir}/git-core/contrib/hooks/setgitperms.perl %{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample @@ -886,7 +874,6 @@ rmdir --ignore-fail-on-non-empty "$testdir" %license COPYING # exclude is best way here because of troubles with symlinks inside git-core/ %exclude %{_datadir}/git-core/contrib/diff-highlight -%exclude %{_datadir}/git-core/contrib/hooks/multimail %exclude %{_datadir}/git-core/contrib/hooks/update-paranoid %exclude %{_datadir}/git-core/contrib/hooks/setgitperms.perl %exclude %{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample @@ -997,6 +984,10 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Sep 27 2021 Ondřej Pohořelský - 2.33.0-1 +- update to 2.33.0 +- contrib/hooks/multimail is no longer distributed with git + * Tue Sep 14 2021 Sahana Prasad - 2.32.0-1.2 - Rebuilt with OpenSSL 3.0.0 diff --git a/sources b/sources index 56ef012..9d2e906 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.32.0.tar.xz) = 1ab3e7022ccee411d14a7da5c37d6259ef5c0f85ebed8f49698e25c65cbc7a46f8096919fcb6568360bfe284dd7475b596eee1a167db966096255a405853837c -SHA512 (git-2.32.0.tar.sign) = 0f21129c6993a2b1742152829a33064205fb148bd3e26fd3a5f996c31ff920c9f0f22e259d2159eef24b75ac3a592c3152277e5046506e1aabc765bc25f583b9 +SHA512 (git-2.33.0.tar.xz) = 1abbcdf9ff640c95934b6a78341baa76ac3a5838c4751f513f334fdf5a3760c730e309f05ad16ffec115896e3e0c750c116683f6a787d92757ee9d916a346bfd +SHA512 (git-2.33.0.tar.sign) = 5d6788588a1cb87874ac09d4b0a30b0280d00872617aff2dbae3d1f25eda35095d00b0451c03f262da6c991c46c228f4dcdf02456805b497ffd8ba5bddd942fe From 5507b1a1874912d544dd6f8d45f23565b5d83001 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 12 Oct 2021 20:42:06 -0400 Subject: [PATCH 724/842] update to 2.33.1 Release notes: https://github.com/git/git/raw/v2.33.1/Documentation/RelNotes/2.33.1.txt --- 0001-doc-add-bundle-format-to-TECH_DOCS.patch | 28 +++++++++++++++++++ git.spec | 9 +++++- sources | 4 +-- 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 0001-doc-add-bundle-format-to-TECH_DOCS.patch diff --git a/0001-doc-add-bundle-format-to-TECH_DOCS.patch b/0001-doc-add-bundle-format-to-TECH_DOCS.patch new file mode 100644 index 0000000..6f03eb1 --- /dev/null +++ b/0001-doc-add-bundle-format-to-TECH_DOCS.patch @@ -0,0 +1,28 @@ +From c221f23ebe2defeb31cfcab6387f8985b5c863bb Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Tue, 12 Oct 2021 21:00:55 -0400 +Subject: [PATCH] doc: add bundle-format to TECH_DOCS + +A link to the bundle-format was added in 5c8273d57c (bundle doc: rewrite +the "DESCRIPTION" section, 2021-07-31). + +Ensure `technical/bundle-format.html` is created to avoid a broken link +in `git-bundle.html`. + +Signed-off-by: Todd Zullinger +--- + Documentation/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Documentation/Makefile b/Documentation/Makefile +index f5605b7767..2021568cd5 100644 +--- a/Documentation/Makefile ++++ b/Documentation/Makefile +@@ -90,6 +90,7 @@ SP_ARTICLES += $(API_DOCS) + TECH_DOCS += MyFirstContribution + TECH_DOCS += MyFirstObjectWalk + TECH_DOCS += SubmittingPatches ++TECH_DOCS += technical/bundle-format + TECH_DOCS += technical/hash-function-transition + TECH_DOCS += technical/http-protocol + TECH_DOCS += technical/index-format diff --git a/git.spec b/git.spec index 2044845..85cea81 100644 --- a/git.spec +++ b/git.spec @@ -79,7 +79,7 @@ #global rcrev .rc0 Name: git -Version: 2.33.0 +Version: 2.33.1 Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -112,6 +112,10 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch +# fix the broken link in git-bundle.html +# https://lore.kernel.org/git/20211013032852.959985-1-tmz@pobox.com/ +Patch1: 0001-doc-add-bundle-format-to-TECH_DOCS.patch + %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -984,6 +988,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Oct 13 2021 Todd Zullinger - 2.33.1-1 +- update to 2.33.1 + * Mon Sep 27 2021 Ondřej Pohořelský - 2.33.0-1 - update to 2.33.0 - contrib/hooks/multimail is no longer distributed with git diff --git a/sources b/sources index 9d2e906..3340d14 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.33.0.tar.xz) = 1abbcdf9ff640c95934b6a78341baa76ac3a5838c4751f513f334fdf5a3760c730e309f05ad16ffec115896e3e0c750c116683f6a787d92757ee9d916a346bfd -SHA512 (git-2.33.0.tar.sign) = 5d6788588a1cb87874ac09d4b0a30b0280d00872617aff2dbae3d1f25eda35095d00b0451c03f262da6c991c46c228f4dcdf02456805b497ffd8ba5bddd942fe +SHA512 (git-2.33.1.tar.xz) = 16d417183232e1057bea754d59cdf4bbacc5f1527d1de6ee04cdd293a2512bfa7208e20f6130816605528b59cb1bc3188c5bddf1a42c1413095ee74e44dd2f91 +SHA512 (git-2.33.1.tar.sign) = b1a8d3b4ebbf5db43eb1234446b903d62637999390e59f94b9793bf8c8c302ff6d7b74f48cdfe3b4a304f767641ccba96479ddf5a19c6e6d4861da1e568e9760 From fe0920e1287f6981f05d91121d1e6a8d24b1fb54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Thu, 11 Nov 2021 16:19:59 +0100 Subject: [PATCH 725/842] add Perl requires to git-email Resolves: rhbz#2020487 In git version 2.33.0, git-send-email.perl has optimized modules loading[1]. This resulted in perl.req not detecting requires properly, because it doesn't detect requires that are not at the start of new line. This commit adds explicit Requires into the spec file. [1]https://github.com/git/git/commit/f4dc9432fd287bde9100488943baf3c6a04d90d1 --- git.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 85cea81..04f5b52 100644 --- a/git.spec +++ b/git.spec @@ -80,7 +80,7 @@ Name: git Version: 2.33.1 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -389,6 +389,16 @@ BuildArch: noarch Requires: git = %{version}-%{release} Requires: perl(Authen::SASL) Requires: perl(Net::SMTP::SSL) +Requires: perl(Cwd) +Requires: perl(File::Spec::Functions) +Requires: perl(File::Temp) +Requires: perl(Mail::Address) +Requires: perl(Net::Domain) +Requires: perl(Net::SMTP) +Requires: perl(POSIX) +Requires: perl(Term::ANSIColor) +Requires: perl(Term::ReadLine) +Requires: perl(Text::ParseWords) %description email %{summary}. @@ -988,6 +998,10 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Nov 11 2021 Ondřej Pohořelský - 2.33.1-2 +- add Perl requires to git-email +- Resolves: rhbz#2020487 + * Wed Oct 13 2021 Todd Zullinger - 2.33.1-1 - update to 2.33.1 From 4414f619e31357a8fa1dcbb8cafa710bd3728954 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 13 Nov 2021 21:04:39 -0500 Subject: [PATCH 726/842] add more git-email perl dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There were a few dependencies missing prior to the change in git-2.33 which Ondřej fixed in the previous commit. Of the few dependencies being added, only Email::Address and Sys::Hostname weren't already pulled in by other dependencies when installing git-email. They each have fallback options, so they aren't critical to the function of the application. (We could use Recommends here, if we wanted -- though neither pull in any additional packages at this time.) --- git.spec | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 04f5b52..56340e0 100644 --- a/git.spec +++ b/git.spec @@ -80,7 +80,7 @@ Name: git Version: 2.33.1 -Release: 2%{?rcrev}%{?dist} +Release: 3%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -388,14 +388,20 @@ Summary: Git tools for sending patches via email BuildArch: noarch Requires: git = %{version}-%{release} Requires: perl(Authen::SASL) -Requires: perl(Net::SMTP::SSL) Requires: perl(Cwd) +Requires: perl(Email::Valid) +Requires: perl(File::Spec) Requires: perl(File::Spec::Functions) Requires: perl(File::Temp) +Requires: perl(IO::Socket::SSL) Requires: perl(Mail::Address) +Requires: perl(MIME::Base64) +Requires: perl(MIME::QuotedPrint) Requires: perl(Net::Domain) Requires: perl(Net::SMTP) +Requires: perl(Net::SMTP::SSL) Requires: perl(POSIX) +Requires: perl(Sys::Hostname) Requires: perl(Term::ANSIColor) Requires: perl(Term::ReadLine) Requires: perl(Text::ParseWords) @@ -998,6 +1004,10 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sun Nov 14 2021 Todd Zullinger - 2.33.1-3 +- add more git-email perl dependencies +- Resolves: rhbz#2020487 + * Thu Nov 11 2021 Ondřej Pohořelský - 2.33.1-2 - add Perl requires to git-email - Resolves: rhbz#2020487 From e8896ce365d7e63e4458daa3907192af86e57a9f Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 15 Nov 2021 17:58:58 -0500 Subject: [PATCH 727/842] update to 2.34.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Release notes: https://github.com/git/git/raw/v2.34.0/Documentation/RelNotes/2.34.0.txt Add `BuildRequires: openssh` for the `ssh-keygen` command; it is needed to test the newly-added ssh signing support¹. Refer to the `gpg.format` and `gpg.ssh.*` variables in git-config(1) for details. [Unfortunately, openssh-8.7 has a bug in the requisite `ssh-keygen -Y find-principals` command, which will limit the usefulness of this feature on Fedora 35/36 until openssh is either rebased to 8.8 or the patch² is backported. The git testsuite has been taught to skip the tests when this bug is present, in upstream ca7a5bf4bd (t/lib-gpg: avoid broken versions of ssh-keygen, 2021-11-10), but that won't help users who try out this new feature. Hopefully we can get openssh-8.7 in Fedora 35 & 36 patched or updated before too long.] We have `Requires: openssh-clients` in git-core already. The openssh-clients package requires openssh so we don't _need_ to add an install-time requirement to ensure the `ssh-keygen` command is available. Ignore RUNTIME_PREFIX and SYMLINKS_WINDOWS test prerequisites when looking for missing test suite BuildRequires³. The RUNTIME_PREFIX prerequisite was added in b7d11a0f5d (tests: exercise the RUNTIME_PREFIX feature, 2021-07-24)⁴. It is used to build binaries which can be easily relocated, which we don't need in our builds. The SYMLINKS_WINDOWS prerequisite was added in 3e7d4888e5 (mingw: align symlinks-related rmdir() behavior with Linux, 2021-08-02)⁵. It is, as the name implies, Windows-specific. ¹ https://github.com/git/git/commit/b5726a5d9c (ssh signing: preliminary refactoring and clean-up, 2021-09-10) and the commits which follow. ² https://github.com/openssh/openssh-portable/commit/ca0e455b93, https://github.com/openssh/openssh-portable/commit/4afe431da9, and https://www.mail-archive.com/source-changes@openbsd.org/msg127496.html (plus the replies, which point out the typo in the first patch) ³ fa92661 (Add grep patterns for checking skipped tests, 2019-02-02) ⁴ https://github.com/git/git/commit/b7d11a0f5d ⁵ https://github.com/git/git/commit/3e7d4888e5 --- 0001-doc-add-bundle-format-to-TECH_DOCS.patch | 28 ------------------- git.skip-test-patterns | 2 ++ git.spec | 12 ++++---- sources | 4 +-- 4 files changed, 10 insertions(+), 36 deletions(-) delete mode 100644 0001-doc-add-bundle-format-to-TECH_DOCS.patch diff --git a/0001-doc-add-bundle-format-to-TECH_DOCS.patch b/0001-doc-add-bundle-format-to-TECH_DOCS.patch deleted file mode 100644 index 6f03eb1..0000000 --- a/0001-doc-add-bundle-format-to-TECH_DOCS.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c221f23ebe2defeb31cfcab6387f8985b5c863bb Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Tue, 12 Oct 2021 21:00:55 -0400 -Subject: [PATCH] doc: add bundle-format to TECH_DOCS - -A link to the bundle-format was added in 5c8273d57c (bundle doc: rewrite -the "DESCRIPTION" section, 2021-07-31). - -Ensure `technical/bundle-format.html` is created to avoid a broken link -in `git-bundle.html`. - -Signed-off-by: Todd Zullinger ---- - Documentation/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Documentation/Makefile b/Documentation/Makefile -index f5605b7767..2021568cd5 100644 ---- a/Documentation/Makefile -+++ b/Documentation/Makefile -@@ -90,6 +90,7 @@ SP_ARTICLES += $(API_DOCS) - TECH_DOCS += MyFirstContribution - TECH_DOCS += MyFirstObjectWalk - TECH_DOCS += SubmittingPatches -+TECH_DOCS += technical/bundle-format - TECH_DOCS += technical/hash-function-transition - TECH_DOCS += technical/http-protocol - TECH_DOCS += technical/index-format diff --git a/git.skip-test-patterns b/git.skip-test-patterns index e9db37f..1f1f8b1 100644 --- a/git.skip-test-patterns +++ b/git.skip-test-patterns @@ -12,6 +12,8 @@ missing NATIVE_CRLF missing !PCRE missing !PTHREADS missing RFC1991 +missing RUNTIME_PREFIX +missing SYMLINKS_WINDOWS missing TAR_NEEDS_PAX_FALLBACK missing UTF8_NFD_TO_NFC missing WINDOWS diff --git a/git.spec b/git.spec index 56340e0..5889387 100644 --- a/git.spec +++ b/git.spec @@ -79,8 +79,8 @@ #global rcrev .rc0 Name: git -Version: 2.33.1 -Release: 3%{?rcrev}%{?dist} +Version: 2.34.0 +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -112,10 +112,6 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# fix the broken link in git-bundle.html -# https://lore.kernel.org/git/20211013032852.959985-1-tmz@pobox.com/ -Patch1: 0001-doc-add-bundle-format-to-TECH_DOCS.patch - %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -215,6 +211,7 @@ BuildRequires: jgit %endif # endif fedora (except i386 and s390x) BuildRequires: mod_dav_svn +BuildRequires: openssh BuildRequires: perl(App::Prove) BuildRequires: perl(CGI) BuildRequires: perl(CGI::Carp) @@ -1004,6 +1001,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Nov 15 2021 Todd Zullinger - 2.34.0-1 +- update to 2.34.0 + * Sun Nov 14 2021 Todd Zullinger - 2.33.1-3 - add more git-email perl dependencies - Resolves: rhbz#2020487 diff --git a/sources b/sources index 3340d14..87b8ed3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.33.1.tar.xz) = 16d417183232e1057bea754d59cdf4bbacc5f1527d1de6ee04cdd293a2512bfa7208e20f6130816605528b59cb1bc3188c5bddf1a42c1413095ee74e44dd2f91 -SHA512 (git-2.33.1.tar.sign) = b1a8d3b4ebbf5db43eb1234446b903d62637999390e59f94b9793bf8c8c302ff6d7b74f48cdfe3b4a304f767641ccba96479ddf5a19c6e6d4861da1e568e9760 +SHA512 (git-2.34.0.tar.xz) = 3102c1ebe408eb549ebd0f9b1420663ed04a2720e4dc676c1854a9e7b8306bb49dc931b734aa7eb612eb7adc2ad92730c0d2dd704dbd859ba61e5ceba909fcc3 +SHA512 (git-2.34.0.tar.sign) = 28713fe9b0c8bfac4937b31cdf54ff427c784547932c2002032fa1ae40757d6fdfd291ce9ea24eeecf480816643359530cf93b4e9d4fac40b1deb987577a3de3 From 7453454dadcb1eb88f0202c7b6418a3757804b21 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 24 Nov 2021 21:42:11 -0500 Subject: [PATCH 728/842] update to 2.34.1 Release notes: https://github.com/git/git/raw/v2.34.1/Documentation/RelNotes/2.34.1.txt --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 5889387..45d25c1 100644 --- a/git.spec +++ b/git.spec @@ -79,7 +79,7 @@ #global rcrev .rc0 Name: git -Version: 2.34.0 +Version: 2.34.1 Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -1001,6 +1001,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Nov 25 2021 Todd Zullinger - 2.34.1-1 +- update to 2.34.1 + * Mon Nov 15 2021 Todd Zullinger - 2.34.0-1 - update to 2.34.0 diff --git a/sources b/sources index 87b8ed3..9c138f8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.34.0.tar.xz) = 3102c1ebe408eb549ebd0f9b1420663ed04a2720e4dc676c1854a9e7b8306bb49dc931b734aa7eb612eb7adc2ad92730c0d2dd704dbd859ba61e5ceba909fcc3 -SHA512 (git-2.34.0.tar.sign) = 28713fe9b0c8bfac4937b31cdf54ff427c784547932c2002032fa1ae40757d6fdfd291ce9ea24eeecf480816643359530cf93b4e9d4fac40b1deb987577a3de3 +SHA512 (git-2.34.1.tar.xz) = a1a8e9e6f64b1da25508fbd2f783564dcdbe181fb5ff1ebab3bdac6db6094e18acc334479a1abf22ac17ce4f733cc3e10a664db9ab234cd523735a3f027b42db +SHA512 (git-2.34.1.tar.sign) = a1111276e18da1a7b360e3ed3b8460034ea413b116482b0b66342f8873a9dd02a90f3f5bc7ad1e4b3c7f39ed55926a8155064b849e6e6bdf9478cb85b93f10b5 From a7d2f7e53e982258913020f1bf245f8dd58e2a1f Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 25 Nov 2021 05:52:09 -0500 Subject: [PATCH 729/842] fix gpgsm issues with gnupg-2.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The output of gpgsm changed slightly in gnupg-2.3, causing the git tests for x509 signatures to be skipped. Update the tests to use the machine-parseable --with-colons output. It also appears that we need to reload the gpg-agent in order to pick up the changes the test library makes to the trustlist.txt file. It might be better to store that file with the other gpg files in the test suite rather than generating it. While we're at it, reload all the gpg components rather than just gpg-agent. Adjust the earlier gpgconf kill to use the 'all' keyword as well. Next up, gpgsm removed a debug line from it's output which exposes a problem in git's gpg-interface code. The git code presumes that the '[GNUPG:] SIG_CREATED' line will follow a newline. That is no longer true. The debug line was removed from GnuPG in a6d2f3133 (sm: Replace some debug message by log_error or log_info, 2020-04-21). Finally, a minor bug in gpgsm causes the error message returned when a certificate is not found to differ from previous versions¹. Extend the grep pattern in the test suite to catch both error messages. ¹ https://lists.gnupg.org/pipermail/gnupg-devel/2021-November/034991.html --- ...ith-colons-when-parsing-gpgsm-output.patch | 47 ++++++++++++++++++ ...-gpg-components-after-updating-trust.patch | 31 ++++++++++++ ...ll-gpg-components-not-just-gpg-agent.patch | 40 ++++++++++++++++ ...02-match-gpgsm-output-from-GnuPG-2.3.patch | 33 +++++++++++++ ...tch-SIG_CREATED-if-it-s-the-first-li.patch | 48 +++++++++++++++++++ git.spec | 8 ++++ 6 files changed, 207 insertions(+) create mode 100644 0001-t-lib-gpg-use-with-colons-when-parsing-gpgsm-output.patch create mode 100644 0002-t-lib-gpg-reload-gpg-components-after-updating-trust.patch create mode 100644 0003-t-lib-gpg-kill-all-gpg-components-not-just-gpg-agent.patch create mode 100644 0004-t4202-match-gpgsm-output-from-GnuPG-2.3.patch create mode 100644 0005-gpg-interface-match-SIG_CREATED-if-it-s-the-first-li.patch diff --git a/0001-t-lib-gpg-use-with-colons-when-parsing-gpgsm-output.patch b/0001-t-lib-gpg-use-with-colons-when-parsing-gpgsm-output.patch new file mode 100644 index 0000000..5c003a5 --- /dev/null +++ b/0001-t-lib-gpg-use-with-colons-when-parsing-gpgsm-output.patch @@ -0,0 +1,47 @@ +From e155951262e6dea419db8b9010342b08b487f96a Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Thu, 25 Nov 2021 05:05:08 -0500 +Subject: [PATCH] t/lib-gpg: use --with-colons when parsing gpgsm output +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The output of `gpgsm -K` changed in gnupg-2.3¹, breaking the parsing +used by the GPGSM prereq. + +Use the `--with-colons` options for stable, machine-parseable output. +This allows the grep/cut/tr pipeline (and the subsequent echo which +appends ' S relax') to be replaced with a single call to awk to create +the ${GNUPGHOME}/trustlist.txt file. + +¹ https://dev.gnupg.org/rGe7d70923901e is the change in 2.3, while + https://dev.gnupg.org/rG9c57de75cf36 is the similar change in 2.2. + + The latter says: Here in 2.2 we keep the string "fingerprint:" and no + not change it to "sha1 fpr" as we did in master (2.3). (sic) + +Signed-off-by: Todd Zullinger +--- + t/lib-gpg.sh | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh +index a3f285f515..cbbf74e725 100644 +--- a/t/lib-gpg.sh ++++ b/t/lib-gpg.sh +@@ -72,12 +72,10 @@ test_lazy_prereq GPGSM ' + --passphrase-fd 0 --pinentry-mode loopback \ + --import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 && + +- gpgsm --homedir "${GNUPGHOME}" -K | +- grep fingerprint: | +- cut -d" " -f4 | +- tr -d "\\n" >"${GNUPGHOME}/trustlist.txt" && ++ gpgsm --homedir "${GNUPGHOME}" -K --with-colons | ++ awk -F ":" "/^fpr:/ {printf \"%s S relax\\n\", \$10}" \ ++ >"${GNUPGHOME}/trustlist.txt" && + +- echo " S relax" >>"${GNUPGHOME}/trustlist.txt" && + echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \ + -u committer@example.com -o /dev/null --sign - + ' diff --git a/0002-t-lib-gpg-reload-gpg-components-after-updating-trust.patch b/0002-t-lib-gpg-reload-gpg-components-after-updating-trust.patch new file mode 100644 index 0000000..2c27b74 --- /dev/null +++ b/0002-t-lib-gpg-reload-gpg-components-after-updating-trust.patch @@ -0,0 +1,31 @@ +From 93299b9b221da01d4055528f7c760d04ee83b82b Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Thu, 25 Nov 2021 08:07:32 -0500 +Subject: [PATCH] t/lib-gpg: reload gpg components after updating trustlist + +With gpgsm from gnupg-2.3, the changes to the trustlist.txt do not +appear to be picked up without refreshing the gpg-agent. Use the 'all' +keyword to reload all of the gpg components. The scdaemon is started as +a child of gpg-agent, for example. + +We used to have a --kill at this spot, but I removed it in 2e285e7803 +(t/lib-gpg: drop redundant killing of gpg-agent, 2019-02-07). It seems +like it might be necessary (again) for 2.3. + +Signed-off-by: Todd Zullinger +--- + t/lib-gpg.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh +index cbbf74e725..d675698a2d 100644 +--- a/t/lib-gpg.sh ++++ b/t/lib-gpg.sh +@@ -75,6 +75,7 @@ test_lazy_prereq GPGSM ' + gpgsm --homedir "${GNUPGHOME}" -K --with-colons | + awk -F ":" "/^fpr:/ {printf \"%s S relax\\n\", \$10}" \ + >"${GNUPGHOME}/trustlist.txt" && ++ (gpgconf --reload all || : ) && + + echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \ + -u committer@example.com -o /dev/null --sign - diff --git a/0003-t-lib-gpg-kill-all-gpg-components-not-just-gpg-agent.patch b/0003-t-lib-gpg-kill-all-gpg-components-not-just-gpg-agent.patch new file mode 100644 index 0000000..2905564 --- /dev/null +++ b/0003-t-lib-gpg-kill-all-gpg-components-not-just-gpg-agent.patch @@ -0,0 +1,40 @@ +From da340dd76714474126f73f6b53087da0ffd4e8d8 Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Fri, 26 Nov 2021 21:11:54 -0500 +Subject: [PATCH] t/lib-gpg: kill all gpg components, not just gpg-agent + +The gpg-agent is one of several processes that newer releases of GnuPG +start automatically. Issue a kill to each of them to ensure they do not +affect separate tests. (Yes, the separate GNUPGHOME should do that +already. If we find that is case, we could drop the --kill entirely.) + +In terms of compatibility, the 'all' keyword was added to the --kill & +--reload options in GnuPG 2.1.18. Debian and RHEL are often used as +indicators of how a change might affect older systems we often try to +support. + + - Debian Strech (old old stable), which has limited security support + until June 2022, has GnuPG 2.1.18 (or 2.2.x in backports). + + - CentOS/RHEL 7, which is supported until June 2024, has GnuPG + 2.0.22, which lacks the --kill option, so the change won't have + any impact. + +Signed-off-by: Todd Zullinger +--- + t/lib-gpg.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh +index d675698a2d..2bb309a8c1 100644 +--- a/t/lib-gpg.sh ++++ b/t/lib-gpg.sh +@@ -40,7 +40,7 @@ test_lazy_prereq GPG ' + # > lib-gpg/ownertrust + mkdir "$GNUPGHOME" && + chmod 0700 "$GNUPGHOME" && +- (gpgconf --kill gpg-agent || : ) && ++ (gpgconf --kill all || : ) && + gpg --homedir "${GNUPGHOME}" --import \ + "$TEST_DIRECTORY"/lib-gpg/keyring.gpg && + gpg --homedir "${GNUPGHOME}" --import-ownertrust \ diff --git a/0004-t4202-match-gpgsm-output-from-GnuPG-2.3.patch b/0004-t4202-match-gpgsm-output-from-GnuPG-2.3.patch new file mode 100644 index 0000000..005ace7 --- /dev/null +++ b/0004-t4202-match-gpgsm-output-from-GnuPG-2.3.patch @@ -0,0 +1,33 @@ +From d1efcac68414b80cc0fd7b7e3b4781f313d98697 Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Sat, 27 Nov 2021 05:31:13 -0500 +Subject: [PATCH] t4202: match gpgsm output from GnuPG 2.3 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In GnuPG 2.3, the output from gpgsm when a certificate is not found +differs from that of earlier versions. This appears to be a bug¹, but +there are several releases in use now which have this output. Extend +the grep pattern to catch it rather than failing the test. + +¹ https://lists.gnupg.org/pipermail/gnupg-devel/2021-November/034991.html + +Signed-off-by: Todd Zullinger +--- + t/t4202-log.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/t4202-log.sh b/t/t4202-log.sh +index 7884e3d46b..c69f9ac469 100755 +--- a/t/t4202-log.sh ++++ b/t/t4202-log.sh +@@ -1851,7 +1851,7 @@ test_expect_success GPGSM 'log --graph --show-signature for merged tag x509 miss + git merge --no-ff -m msg signed_tag_x509_nokey && + GNUPGHOME=. git log --graph --show-signature -n1 plain-x509-nokey >actual && + grep "^|\\\ merged tag" actual && +- grep "^| | gpgsm: certificate not found" actual ++ grep -Ei "^| | gpgsm:( failed to find the)? certificate:? not found" actual + ' + + test_expect_success GPGSM 'log --graph --show-signature for merged tag x509 bad signature' ' diff --git a/0005-gpg-interface-match-SIG_CREATED-if-it-s-the-first-li.patch b/0005-gpg-interface-match-SIG_CREATED-if-it-s-the-first-li.patch new file mode 100644 index 0000000..458af9d --- /dev/null +++ b/0005-gpg-interface-match-SIG_CREATED-if-it-s-the-first-li.patch @@ -0,0 +1,48 @@ +From edb5eafc9945b2d400c2d777a9750cee06ab500f Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Sat, 27 Nov 2021 02:55:47 -0500 +Subject: [PATCH] gpg-interface: match SIG_CREATED if it's the first line + +In `sign_buffer_gpg`, "\n[GNUPG:] SIG_CREATED " in the gpg status output +is used to signal a successful signature. This fails if "SIG_CREATED" +is the first line in the gpg output, as is the case with `gpgsm` in +GnuPG 2.3. + +In earlier versions of GnuPG, there was a debug line in the `gpgsm` +output which allowed the check in `sign_buffer_gpg` to work. This debug +line was removed from GnuPG in a6d2f3133 (sm: Replace some debug message +by log_error or log_info, 2020-04-21). + +The result is the `gpgsm --status-fd` output for a signing operation +starts with "[GNUPG:] SIG_CREATED" and we mistakenly report "gpg failed +to sign the data" to the user. The `gpg` command has other `[GNUPG:]` +output for signing operations, so it is not affected by this issue. +It's best not to rely on something as subtle and out of our control as +the order if the gnupg status messages. + +This likely went unnoticed because the GPGSM test prereq was failing for +a different reason with GnuPG 2.3. No tests failed, they were simply +skipped due to the missing GPGSM prereq. + +Signed-off-by: Todd Zullinger +--- + gpg-interface.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/gpg-interface.c b/gpg-interface.c +index 3e7255a2a9..d179dfb3ab 100644 +--- a/gpg-interface.c ++++ b/gpg-interface.c +@@ -859,6 +859,12 @@ static int sign_buffer_gpg(struct strbuf *buffer, struct strbuf *signature, + + bottom = signature->len; + ++ /* ++ * Ensure gpg_status begins with a newline or we'll fail to match if ++ * the SIG_CREATED line is at the start of the gpg output. ++ */ ++ strbuf_addch(&gpg_status, '\n'); ++ + /* + * When the username signingkey is bad, program could be terminated + * because gpg exits without reading and then write gets SIGPIPE. diff --git a/git.spec b/git.spec index 45d25c1..6b12273 100644 --- a/git.spec +++ b/git.spec @@ -112,6 +112,13 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch +# Fix a few tests and issues with gnupg-2.3 +Patch1: 0001-t-lib-gpg-use-with-colons-when-parsing-gpgsm-output.patch +Patch2: 0002-t-lib-gpg-reload-gpg-components-after-updating-trust.patch +Patch3: 0003-t-lib-gpg-kill-all-gpg-components-not-just-gpg-agent.patch +Patch4: 0004-t4202-match-gpgsm-output-from-GnuPG-2.3.patch +Patch5: 0005-gpg-interface-match-SIG_CREATED-if-it-s-the-first-li.patch + %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -1003,6 +1010,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Thu Nov 25 2021 Todd Zullinger - 2.34.1-1 - update to 2.34.1 +- fix gpgsm issues with gnupg-2.3 * Mon Nov 15 2021 Todd Zullinger - 2.34.0-1 - update to 2.34.0 From ef2bab7f59005c9e1215490d66faca6ea0fe0055 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 10 Jan 2022 17:49:49 -0500 Subject: [PATCH 730/842] update to 2.35.0-rc0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add openssh-clients BuildRequires, for ssh-add. Upstream 350a2518c8 (ssh signing: support non ssh-* keytypes, 2021-11-19), added `ssh-add` as a requirement of t7528-signed-commit-ssh's "sign commits using literal public keys with ssh-agent" test. Replace the openssh BR added in e8896ce (update to 2.34.0, 2021-11-15) with openssh-clients. The latter requires the former. Apply Taylor Blau's patch to fix a use-after-free bug in fmt-merge-msg¹. Add `missing !LONG_IS_64BIT,EXPENSIVE` to git.skip-test-patterns. It is used in t1051-large-conversion after upstream 596b5e77c9 (clean/smudge: allow clean filters to process extremely large files, 2021-11-02). Release notes: https://github.com/git/git/raw/v2.35.0-rc0/Documentation/RelNotes/2.35.0.txt ¹ https://lore.kernel.org/git/CAHk-=whXPxWL7z3GiPkaDt+yygrRmagrYUnib7Lx=Vvrqx2ufg@mail.gmail.com/ --- ...event-use-after-free-with-signed-tag.patch | 199 ++++++++++++++++++ git.skip-test-patterns | 2 +- git.spec | 15 +- sources | 4 +- 4 files changed, 213 insertions(+), 7 deletions(-) create mode 100644 0001-fmt-merge-msg-prevent-use-after-free-with-signed-tag.patch diff --git a/0001-fmt-merge-msg-prevent-use-after-free-with-signed-tag.patch b/0001-fmt-merge-msg-prevent-use-after-free-with-signed-tag.patch new file mode 100644 index 0000000..72cd990 --- /dev/null +++ b/0001-fmt-merge-msg-prevent-use-after-free-with-signed-tag.patch @@ -0,0 +1,199 @@ +From mboxrd@z Thu Jan 1 00:00:00 1970 +Return-Path: +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on + aws-us-west-2-korg-lkml-1.web.codeaurora.org +Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) + by smtp.lore.kernel.org (Postfix) with ESMTP id 4EF60C433EF + for ; Mon, 10 Jan 2022 21:19:15 +0000 (UTC) +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1343852AbiAJVTN (ORCPT ); + Mon, 10 Jan 2022 16:19:13 -0500 +Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45246 "EHLO + lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S240793AbiAJVTJ (ORCPT ); + Mon, 10 Jan 2022 16:19:09 -0500 +Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) + by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D57E9C06173F + for ; Mon, 10 Jan 2022 13:19:08 -0800 (PST) +Received: by mail-io1-xd32.google.com with SMTP id h23so19409080iol.11 + for ; Mon, 10 Jan 2022 13:19:08 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=ttaylorr-com.20210112.gappssmtp.com; s=20210112; + h=date:from:to:cc:subject:message-id:references:mime-version + :content-disposition:in-reply-to; + bh=FTrKkNrsW7oFf2weWFjBUCeY4AzPYNFulnRyLyCVrk8=; + b=z+XM3REbAP5x9W9gK6pBjzm9BHigJ0mkHwdcjCN9VQSWk7aIMxsxwVauiC4+Y15Py4 + e4kEWLSahtCS62N2410rXTW5F4IiCjrtU+iZztr+gz2IfLpV70e3CO2WaIRGNPRJm2g0 + Gl1+Y32Gk2jkmZ7w/ue8yng54F8FHEvg5joJFj19bMoWF0kd16ny2U+SjCfurbJu7Qpm + 7qMJtWStXIt8SBVaYdqvMjIylr3zDEvOolaSUBxXZYmD51XjQJXFL4DaYTvT6RIRsBZF + gcdEfTKQ3MdH7Dr8AbiaERh3vNXQ9oKb1cHL7aodKSAS6/NpSSvKMxmW+7n4yICL7hsM + b8pQ== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20210112; + h=x-gm-message-state:date:from:to:cc:subject:message-id:references + :mime-version:content-disposition:in-reply-to; + bh=FTrKkNrsW7oFf2weWFjBUCeY4AzPYNFulnRyLyCVrk8=; + b=YyvJy1w+MELo/HMukbimTZO7p+9odhEtnD9F2+GB68WqNtHOSqLj+FNJKrl2cWUWPM + Oec5Mop17BPiDQ5du2gbK9mEJMae9wPoqUhJijzgbcfyH8nAHG8XgBD8PYhzcdaKiwZW + 1/rhWRpyqsAmRKRnXBk+qXOydG6sbeJqYIDiHxHV/MWXzXK8L1tw0TN6x+ovUHJ8tOuu + ZStLc+f7IV9gr3soTs3R4sloQluxitDfe4RReEpc0HDcPxG0V91aiT4MxULStqcCqUbz + I1S0PJMehkw5RIZvrW8GpPjBGFao6X30hvxBN1Skq/nq1rUbbIwat343WUGUC/LogIAV + Wd5A== +X-Gm-Message-State: AOAM533g0jVnFyUCJsyN7y07jhNAhfATafqgniWHcVni8kH1UQ43T/Cd + 76bWXlo05ji/88mEupUArvoHr60/63d4qA== +X-Google-Smtp-Source: ABdhPJwh3a+flp+ajvTa6YBvQY7iqlxqOUdkFKcfZ3ahJTw9JXb3F4kXsRKSfwjHXJ9SQm7cyHyn1Q== +X-Received: by 2002:a05:6638:3009:: with SMTP id r9mr861119jak.262.1641849548063; + Mon, 10 Jan 2022 13:19:08 -0800 (PST) +Received: from localhost (104-178-186-189.lightspeed.milwwi.sbcglobal.net. [104.178.186.189]) + by smtp.gmail.com with ESMTPSA id t6sm5035566iov.39.2022.01.10.13.19.07 + (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); + Mon, 10 Jan 2022 13:19:07 -0800 (PST) +Date: Mon, 10 Jan 2022 16:19:06 -0500 +From: Taylor Blau +To: git@vger.kernel.org +Cc: Junio C Hamano , + Linus Torvalds , + Fabian Stelzer +Subject: [PATCH] fmt-merge-msg: prevent use-after-free with signed tags +Message-ID: <6e08b73d602853b3de71257117e85e32b96b5c19.1641849502.git.me@ttaylorr.com> +References: +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Disposition: inline +In-Reply-To: +Precedence: bulk +List-ID: +X-Mailing-List: git@vger.kernel.org + +When merging a signed tag, fmt_merge_msg_sigs() is responsible for +populating the body of the merge message with the names of the signed +tags, their signatures, and the validity of those signatures. + +In 02769437e1 (ssh signing: use sigc struct to pass payload, +2021-12-09), check_signature() was taught to pass the object payload via +the sigc struct instead of passing the payload buffer separately. + +In effect, 02769437e1 causes buf, and sigc.payload to point at the same +region in memory. This causes a problem for fmt_tag_signature(), which +wants to read from this location, since it is freed beforehand by +signature_check_clear() (which frees it via sigc's `payload` member). + +That makes the subsequent use in fmt_tag_signature() a use-after-free. + +As a result, merge messages did not contain the body of any signed tags. +Luckily, they tend not to contain garbage, either, since the result of +strstr()-ing the object buffer in fmt_tag_signature() is guarded: + + const char *tag_body = strstr(buf, "\n\n"); + if (tag_body) { + tag_body += 2; + strbuf_add(tagbuf, tag_body, buf + len - tag_body); + } + +Unfortunately, the tests in t6200 did not catch this at the time because +they do not search for the body of signed tags in fmt-merge-msg's +output. + +Resolve this by waiting to call signature_check_clear() until after its +contents can be safely discarded. Harden ourselves against any future +regressions in this area by making sure we can find signed tag messages +in the output of fmt-merge-msg, too. + +Reported-by: Linus Torvalds +Signed-off-by: Taylor Blau +--- + fmt-merge-msg.c | 2 +- + t/t6200-fmt-merge-msg.sh | 8 ++++++++ + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c +index e5c0aff2bf..baca57d5b6 100644 +--- a/fmt-merge-msg.c ++++ b/fmt-merge-msg.c +@@ -541,7 +541,6 @@ static void fmt_merge_msg_sigs(struct strbuf *out) + else + strbuf_addstr(&sig, sigc.output); + } +- signature_check_clear(&sigc); + + if (!tag_number++) { + fmt_tag_signature(&tagbuf, &sig, buf, len); +@@ -565,6 +564,7 @@ static void fmt_merge_msg_sigs(struct strbuf *out) + } + strbuf_release(&payload); + strbuf_release(&sig); ++ signature_check_clear(&sigc); + next: + free(origbuf); + } +diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh +index 7544245f90..5a221f8ef1 100755 +--- a/t/t6200-fmt-merge-msg.sh ++++ b/t/t6200-fmt-merge-msg.sh +@@ -126,6 +126,7 @@ test_expect_success GPG 'message for merging local tag signed by good key' ' + git fetch . signed-good-tag && + git fmt-merge-msg <.git/FETCH_HEAD >actual && + grep "^Merge tag ${apos}signed-good-tag${apos}" actual && ++ grep "^signed-tag-msg" actual && + grep "^# gpg: Signature made" actual && + grep "^# gpg: Good signature from" actual + ' +@@ -135,6 +136,7 @@ test_expect_success GPG 'message for merging local tag signed by unknown key' ' + git fetch . signed-good-tag && + GNUPGHOME=. git fmt-merge-msg <.git/FETCH_HEAD >actual && + grep "^Merge tag ${apos}signed-good-tag${apos}" actual && ++ grep "^signed-tag-msg" actual && + grep "^# gpg: Signature made" actual && + grep -E "^# gpg: Can${apos}t check signature: (public key not found|No public key)" actual + ' +@@ -145,6 +147,7 @@ test_expect_success GPGSSH 'message for merging local tag signed by good ssh key + git fetch . signed-good-ssh-tag && + git fmt-merge-msg <.git/FETCH_HEAD >actual && + grep "^Merge tag ${apos}signed-good-ssh-tag${apos}" actual && ++ grep "^signed-ssh-tag-msg" actual && + grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual && + ! grep "${GPGSSH_BAD_SIGNATURE}" actual + ' +@@ -155,6 +158,7 @@ test_expect_success GPGSSH 'message for merging local tag signed by unknown ssh + git fetch . signed-untrusted-ssh-tag && + git fmt-merge-msg <.git/FETCH_HEAD >actual && + grep "^Merge tag ${apos}signed-untrusted-ssh-tag${apos}" actual && ++ grep "^signed-ssh-tag-msg-untrusted" actual && + grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual && + ! grep "${GPGSSH_BAD_SIGNATURE}" actual && + grep "${GPGSSH_KEY_NOT_TRUSTED}" actual +@@ -166,6 +170,7 @@ test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'message for merging local tag sign + git fetch . expired-signed && + git fmt-merge-msg <.git/FETCH_HEAD >actual && + grep "^Merge tag ${apos}expired-signed${apos}" actual && ++ grep "^expired-signed" actual && + ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual + ' + +@@ -175,6 +180,7 @@ test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'message for merging local tag sign + git fetch . notyetvalid-signed && + git fmt-merge-msg <.git/FETCH_HEAD >actual && + grep "^Merge tag ${apos}notyetvalid-signed${apos}" actual && ++ grep "^notyetvalid-signed" actual && + ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual + ' + +@@ -184,6 +190,7 @@ test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'message for merging local tag sign + git fetch . timeboxedvalid-signed && + git fmt-merge-msg <.git/FETCH_HEAD >actual && + grep "^Merge tag ${apos}timeboxedvalid-signed${apos}" actual && ++ grep "^timeboxedvalid-signed" actual && + grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual && + ! grep "${GPGSSH_BAD_SIGNATURE}" actual + ' +@@ -194,6 +201,7 @@ test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'message for merging local tag sign + git fetch . timeboxedinvalid-signed && + git fmt-merge-msg <.git/FETCH_HEAD >actual && + grep "^Merge tag ${apos}timeboxedinvalid-signed${apos}" actual && ++ grep "^timeboxedinvalid-signed" actual && + ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual + ' + +-- +2.34.1.455.gd6eb6fd089 + diff --git a/git.skip-test-patterns b/git.skip-test-patterns index 1f1f8b1..bd44452 100644 --- a/git.skip-test-patterns +++ b/git.skip-test-patterns @@ -4,7 +4,7 @@ GIT_SKIP_TESTS missing AUTOIDENT missing CASE_INSENSITIVE_FS missing DONTHAVEIT -missing EXPENSIVE +missing ([!]LONG_IS_64BIT,)?EXPENSIVE missing JGIT missing !?LAZY_(TRUE|FALSE) missing MINGW diff --git a/git.spec b/git.spec index 6b12273..ea1b95b 100644 --- a/git.spec +++ b/git.spec @@ -76,11 +76,11 @@ %endif # Define for release candidates -#global rcrev .rc0 +%global rcrev .rc0 Name: git -Version: 2.34.1 -Release: 1%{?rcrev}%{?dist} +Version: 2.35.0 +Release: 0.0%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -119,6 +119,10 @@ Patch3: 0003-t-lib-gpg-kill-all-gpg-components-not-just-gpg-agent.patch Patch4: 0004-t4202-match-gpgsm-output-from-GnuPG-2.3.patch Patch5: 0005-gpg-interface-match-SIG_CREATED-if-it-s-the-first-li.patch +# Fix tag message contents +# https://lore.kernel.org/git/CAHk-=whXPxWL7z3GiPkaDt+yygrRmagrYUnib7Lx=Vvrqx2ufg@mail.gmail.com/ +Patch6: https://lore.kernel.org/git/6e08b73d602853b3de71257117e85e32b96b5c19.1641849502.git.me@ttaylorr.com/raw#/0001-fmt-merge-msg-prevent-use-after-free-with-signed-tag.patch + %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -218,7 +222,7 @@ BuildRequires: jgit %endif # endif fedora (except i386 and s390x) BuildRequires: mod_dav_svn -BuildRequires: openssh +BuildRequires: openssh-clients BuildRequires: perl(App::Prove) BuildRequires: perl(CGI) BuildRequires: perl(CGI::Carp) @@ -1008,6 +1012,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Jan 10 2022 Todd Zullinger - 2.35.0-0.0.rc0 +- update to 2.35.0-rc0 + * Thu Nov 25 2021 Todd Zullinger - 2.34.1-1 - update to 2.34.1 - fix gpgsm issues with gnupg-2.3 diff --git a/sources b/sources index 9c138f8..4e6eca9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.34.1.tar.xz) = a1a8e9e6f64b1da25508fbd2f783564dcdbe181fb5ff1ebab3bdac6db6094e18acc334479a1abf22ac17ce4f733cc3e10a664db9ab234cd523735a3f027b42db -SHA512 (git-2.34.1.tar.sign) = a1111276e18da1a7b360e3ed3b8460034ea413b116482b0b66342f8873a9dd02a90f3f5bc7ad1e4b3c7f39ed55926a8155064b849e6e6bdf9478cb85b93f10b5 +SHA512 (git-2.35.0.rc0.tar.xz) = 9aa5d89d7981c73d32e9023dfc61a62e63688c3172cba4bee145b2ff4f5f7bc497435d1b4b535089c698893feabc6057a6522676e52bd3355327dfc0b6b8ba56 +SHA512 (git-2.35.0.rc0.tar.sign) = fe4e74de26c0268d36f4fecfa2a2e014e4025c16c931366d1f6f70417661aa250e4ccb8d583c1060559e554e0f5eb770901f246f729f9a55ecbd08c11c6f1119 From 9d7a08be77521c05a65cdc450bc96e41f974f193 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 14 Jan 2022 20:04:04 -0500 Subject: [PATCH 731/842] update to 2.35.0-rc1 Release notes: https://github.com/git/git/raw/v2.35.0-rc1/Documentation/RelNotes/2.35.0.txt --- ...event-use-after-free-with-signed-tag.patch | 199 ------------------ git.spec | 11 +- sources | 4 +- 3 files changed, 7 insertions(+), 207 deletions(-) delete mode 100644 0001-fmt-merge-msg-prevent-use-after-free-with-signed-tag.patch diff --git a/0001-fmt-merge-msg-prevent-use-after-free-with-signed-tag.patch b/0001-fmt-merge-msg-prevent-use-after-free-with-signed-tag.patch deleted file mode 100644 index 72cd990..0000000 --- a/0001-fmt-merge-msg-prevent-use-after-free-with-signed-tag.patch +++ /dev/null @@ -1,199 +0,0 @@ -From mboxrd@z Thu Jan 1 00:00:00 1970 -Return-Path: -X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on - aws-us-west-2-korg-lkml-1.web.codeaurora.org -Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) - by smtp.lore.kernel.org (Postfix) with ESMTP id 4EF60C433EF - for ; Mon, 10 Jan 2022 21:19:15 +0000 (UTC) -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1343852AbiAJVTN (ORCPT ); - Mon, 10 Jan 2022 16:19:13 -0500 -Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45246 "EHLO - lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S240793AbiAJVTJ (ORCPT ); - Mon, 10 Jan 2022 16:19:09 -0500 -Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) - by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D57E9C06173F - for ; Mon, 10 Jan 2022 13:19:08 -0800 (PST) -Received: by mail-io1-xd32.google.com with SMTP id h23so19409080iol.11 - for ; Mon, 10 Jan 2022 13:19:08 -0800 (PST) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=ttaylorr-com.20210112.gappssmtp.com; s=20210112; - h=date:from:to:cc:subject:message-id:references:mime-version - :content-disposition:in-reply-to; - bh=FTrKkNrsW7oFf2weWFjBUCeY4AzPYNFulnRyLyCVrk8=; - b=z+XM3REbAP5x9W9gK6pBjzm9BHigJ0mkHwdcjCN9VQSWk7aIMxsxwVauiC4+Y15Py4 - e4kEWLSahtCS62N2410rXTW5F4IiCjrtU+iZztr+gz2IfLpV70e3CO2WaIRGNPRJm2g0 - Gl1+Y32Gk2jkmZ7w/ue8yng54F8FHEvg5joJFj19bMoWF0kd16ny2U+SjCfurbJu7Qpm - 7qMJtWStXIt8SBVaYdqvMjIylr3zDEvOolaSUBxXZYmD51XjQJXFL4DaYTvT6RIRsBZF - gcdEfTKQ3MdH7Dr8AbiaERh3vNXQ9oKb1cHL7aodKSAS6/NpSSvKMxmW+7n4yICL7hsM - b8pQ== -X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=1e100.net; s=20210112; - h=x-gm-message-state:date:from:to:cc:subject:message-id:references - :mime-version:content-disposition:in-reply-to; - bh=FTrKkNrsW7oFf2weWFjBUCeY4AzPYNFulnRyLyCVrk8=; - b=YyvJy1w+MELo/HMukbimTZO7p+9odhEtnD9F2+GB68WqNtHOSqLj+FNJKrl2cWUWPM - Oec5Mop17BPiDQ5du2gbK9mEJMae9wPoqUhJijzgbcfyH8nAHG8XgBD8PYhzcdaKiwZW - 1/rhWRpyqsAmRKRnXBk+qXOydG6sbeJqYIDiHxHV/MWXzXK8L1tw0TN6x+ovUHJ8tOuu - ZStLc+f7IV9gr3soTs3R4sloQluxitDfe4RReEpc0HDcPxG0V91aiT4MxULStqcCqUbz - I1S0PJMehkw5RIZvrW8GpPjBGFao6X30hvxBN1Skq/nq1rUbbIwat343WUGUC/LogIAV - Wd5A== -X-Gm-Message-State: AOAM533g0jVnFyUCJsyN7y07jhNAhfATafqgniWHcVni8kH1UQ43T/Cd - 76bWXlo05ji/88mEupUArvoHr60/63d4qA== -X-Google-Smtp-Source: ABdhPJwh3a+flp+ajvTa6YBvQY7iqlxqOUdkFKcfZ3ahJTw9JXb3F4kXsRKSfwjHXJ9SQm7cyHyn1Q== -X-Received: by 2002:a05:6638:3009:: with SMTP id r9mr861119jak.262.1641849548063; - Mon, 10 Jan 2022 13:19:08 -0800 (PST) -Received: from localhost (104-178-186-189.lightspeed.milwwi.sbcglobal.net. [104.178.186.189]) - by smtp.gmail.com with ESMTPSA id t6sm5035566iov.39.2022.01.10.13.19.07 - (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); - Mon, 10 Jan 2022 13:19:07 -0800 (PST) -Date: Mon, 10 Jan 2022 16:19:06 -0500 -From: Taylor Blau -To: git@vger.kernel.org -Cc: Junio C Hamano , - Linus Torvalds , - Fabian Stelzer -Subject: [PATCH] fmt-merge-msg: prevent use-after-free with signed tags -Message-ID: <6e08b73d602853b3de71257117e85e32b96b5c19.1641849502.git.me@ttaylorr.com> -References: -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Disposition: inline -In-Reply-To: -Precedence: bulk -List-ID: -X-Mailing-List: git@vger.kernel.org - -When merging a signed tag, fmt_merge_msg_sigs() is responsible for -populating the body of the merge message with the names of the signed -tags, their signatures, and the validity of those signatures. - -In 02769437e1 (ssh signing: use sigc struct to pass payload, -2021-12-09), check_signature() was taught to pass the object payload via -the sigc struct instead of passing the payload buffer separately. - -In effect, 02769437e1 causes buf, and sigc.payload to point at the same -region in memory. This causes a problem for fmt_tag_signature(), which -wants to read from this location, since it is freed beforehand by -signature_check_clear() (which frees it via sigc's `payload` member). - -That makes the subsequent use in fmt_tag_signature() a use-after-free. - -As a result, merge messages did not contain the body of any signed tags. -Luckily, they tend not to contain garbage, either, since the result of -strstr()-ing the object buffer in fmt_tag_signature() is guarded: - - const char *tag_body = strstr(buf, "\n\n"); - if (tag_body) { - tag_body += 2; - strbuf_add(tagbuf, tag_body, buf + len - tag_body); - } - -Unfortunately, the tests in t6200 did not catch this at the time because -they do not search for the body of signed tags in fmt-merge-msg's -output. - -Resolve this by waiting to call signature_check_clear() until after its -contents can be safely discarded. Harden ourselves against any future -regressions in this area by making sure we can find signed tag messages -in the output of fmt-merge-msg, too. - -Reported-by: Linus Torvalds -Signed-off-by: Taylor Blau ---- - fmt-merge-msg.c | 2 +- - t/t6200-fmt-merge-msg.sh | 8 ++++++++ - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c -index e5c0aff2bf..baca57d5b6 100644 ---- a/fmt-merge-msg.c -+++ b/fmt-merge-msg.c -@@ -541,7 +541,6 @@ static void fmt_merge_msg_sigs(struct strbuf *out) - else - strbuf_addstr(&sig, sigc.output); - } -- signature_check_clear(&sigc); - - if (!tag_number++) { - fmt_tag_signature(&tagbuf, &sig, buf, len); -@@ -565,6 +564,7 @@ static void fmt_merge_msg_sigs(struct strbuf *out) - } - strbuf_release(&payload); - strbuf_release(&sig); -+ signature_check_clear(&sigc); - next: - free(origbuf); - } -diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh -index 7544245f90..5a221f8ef1 100755 ---- a/t/t6200-fmt-merge-msg.sh -+++ b/t/t6200-fmt-merge-msg.sh -@@ -126,6 +126,7 @@ test_expect_success GPG 'message for merging local tag signed by good key' ' - git fetch . signed-good-tag && - git fmt-merge-msg <.git/FETCH_HEAD >actual && - grep "^Merge tag ${apos}signed-good-tag${apos}" actual && -+ grep "^signed-tag-msg" actual && - grep "^# gpg: Signature made" actual && - grep "^# gpg: Good signature from" actual - ' -@@ -135,6 +136,7 @@ test_expect_success GPG 'message for merging local tag signed by unknown key' ' - git fetch . signed-good-tag && - GNUPGHOME=. git fmt-merge-msg <.git/FETCH_HEAD >actual && - grep "^Merge tag ${apos}signed-good-tag${apos}" actual && -+ grep "^signed-tag-msg" actual && - grep "^# gpg: Signature made" actual && - grep -E "^# gpg: Can${apos}t check signature: (public key not found|No public key)" actual - ' -@@ -145,6 +147,7 @@ test_expect_success GPGSSH 'message for merging local tag signed by good ssh key - git fetch . signed-good-ssh-tag && - git fmt-merge-msg <.git/FETCH_HEAD >actual && - grep "^Merge tag ${apos}signed-good-ssh-tag${apos}" actual && -+ grep "^signed-ssh-tag-msg" actual && - grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual && - ! grep "${GPGSSH_BAD_SIGNATURE}" actual - ' -@@ -155,6 +158,7 @@ test_expect_success GPGSSH 'message for merging local tag signed by unknown ssh - git fetch . signed-untrusted-ssh-tag && - git fmt-merge-msg <.git/FETCH_HEAD >actual && - grep "^Merge tag ${apos}signed-untrusted-ssh-tag${apos}" actual && -+ grep "^signed-ssh-tag-msg-untrusted" actual && - grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual && - ! grep "${GPGSSH_BAD_SIGNATURE}" actual && - grep "${GPGSSH_KEY_NOT_TRUSTED}" actual -@@ -166,6 +170,7 @@ test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'message for merging local tag sign - git fetch . expired-signed && - git fmt-merge-msg <.git/FETCH_HEAD >actual && - grep "^Merge tag ${apos}expired-signed${apos}" actual && -+ grep "^expired-signed" actual && - ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual - ' - -@@ -175,6 +180,7 @@ test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'message for merging local tag sign - git fetch . notyetvalid-signed && - git fmt-merge-msg <.git/FETCH_HEAD >actual && - grep "^Merge tag ${apos}notyetvalid-signed${apos}" actual && -+ grep "^notyetvalid-signed" actual && - ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual - ' - -@@ -184,6 +190,7 @@ test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'message for merging local tag sign - git fetch . timeboxedvalid-signed && - git fmt-merge-msg <.git/FETCH_HEAD >actual && - grep "^Merge tag ${apos}timeboxedvalid-signed${apos}" actual && -+ grep "^timeboxedvalid-signed" actual && - grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual && - ! grep "${GPGSSH_BAD_SIGNATURE}" actual - ' -@@ -194,6 +201,7 @@ test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'message for merging local tag sign - git fetch . timeboxedinvalid-signed && - git fmt-merge-msg <.git/FETCH_HEAD >actual && - grep "^Merge tag ${apos}timeboxedinvalid-signed${apos}" actual && -+ grep "^timeboxedinvalid-signed" actual && - ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual - ' - --- -2.34.1.455.gd6eb6fd089 - diff --git a/git.spec b/git.spec index ea1b95b..fb6a98d 100644 --- a/git.spec +++ b/git.spec @@ -76,11 +76,11 @@ %endif # Define for release candidates -%global rcrev .rc0 +%global rcrev .rc1 Name: git Version: 2.35.0 -Release: 0.0%{?rcrev}%{?dist} +Release: 0.1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -119,10 +119,6 @@ Patch3: 0003-t-lib-gpg-kill-all-gpg-components-not-just-gpg-agent.patch Patch4: 0004-t4202-match-gpgsm-output-from-GnuPG-2.3.patch Patch5: 0005-gpg-interface-match-SIG_CREATED-if-it-s-the-first-li.patch -# Fix tag message contents -# https://lore.kernel.org/git/CAHk-=whXPxWL7z3GiPkaDt+yygrRmagrYUnib7Lx=Vvrqx2ufg@mail.gmail.com/ -Patch6: https://lore.kernel.org/git/6e08b73d602853b3de71257117e85e32b96b5c19.1641849502.git.me@ttaylorr.com/raw#/0001-fmt-merge-msg-prevent-use-after-free-with-signed-tag.patch - %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -1012,6 +1008,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sat Jan 15 2022 Todd Zullinger - 2.35.0-0.1.rc1 +- update to 2.35.0-rc1 + * Mon Jan 10 2022 Todd Zullinger - 2.35.0-0.0.rc0 - update to 2.35.0-rc0 diff --git a/sources b/sources index 4e6eca9..84bfe82 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.35.0.rc0.tar.xz) = 9aa5d89d7981c73d32e9023dfc61a62e63688c3172cba4bee145b2ff4f5f7bc497435d1b4b535089c698893feabc6057a6522676e52bd3355327dfc0b6b8ba56 -SHA512 (git-2.35.0.rc0.tar.sign) = fe4e74de26c0268d36f4fecfa2a2e014e4025c16c931366d1f6f70417661aa250e4ccb8d583c1060559e554e0f5eb770901f246f729f9a55ecbd08c11c6f1119 +SHA512 (git-2.35.0.rc1.tar.xz) = fe7fdf5dfa9f3c7ac89158fd73520335cb0c10ab992258dbb88ee1a90b03f4f8bfbe490dcf704770e91245e162014deb400f3b507dd6fda4f52b01c16081b2cd +SHA512 (git-2.35.0.rc1.tar.sign) = 0644ef1e80a3ef84edbe699c1fe50df451aa335b9a0881786e5dac73079e2b94111c9cfd140eb6bee1c2342e06d6c0a27e968fbd1bc5a2ca76892d6cbaa4bc83 From a8bfca0241b9008882609f05cbcc56466bd37856 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 19 Jan 2022 18:02:12 -0500 Subject: [PATCH 732/842] update to 2.35.0-rc2 Release notes: https://github.com/git/git/raw/v2.35.0-rc2/Documentation/RelNotes/2.35.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index fb6a98d..6658bce 100644 --- a/git.spec +++ b/git.spec @@ -76,11 +76,11 @@ %endif # Define for release candidates -%global rcrev .rc1 +%global rcrev .rc2 Name: git Version: 2.35.0 -Release: 0.1%{?rcrev}%{?dist} +Release: 0.2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1008,6 +1008,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Jan 19 2022 Todd Zullinger - 2.35.0-0.2.rc2 +- update to 2.35.0-rc2 + * Sat Jan 15 2022 Todd Zullinger - 2.35.0-0.1.rc1 - update to 2.35.0-rc1 diff --git a/sources b/sources index 84bfe82..debc1e5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.35.0.rc1.tar.xz) = fe7fdf5dfa9f3c7ac89158fd73520335cb0c10ab992258dbb88ee1a90b03f4f8bfbe490dcf704770e91245e162014deb400f3b507dd6fda4f52b01c16081b2cd -SHA512 (git-2.35.0.rc1.tar.sign) = 0644ef1e80a3ef84edbe699c1fe50df451aa335b9a0881786e5dac73079e2b94111c9cfd140eb6bee1c2342e06d6c0a27e968fbd1bc5a2ca76892d6cbaa4bc83 +SHA512 (git-2.35.0.rc2.tar.xz) = 5eb758cbf37c632f89f03eca65bf36f7f2490fbfb3d54c396d906b45a7ab96735f928abe300d7bcacdfdd33b59b1901a4c92f27f30dfe82c4fb1e8d690568dc3 +SHA512 (git-2.35.0.rc2.tar.sign) = fc9d96ea3f58f3c34f121477597e4f5b4a9c50e0d3ee42d021a276f5f1ca9a524c437a3fee8c78b6f09095ff411ab2f919444c53152e9bb44e5211437c18f415 From ce97e98127806a33bcb42d1873af5aa11b77cdaa Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 21 Jan 2022 15:07:05 -0500 Subject: [PATCH 733/842] checkout: avoid BUG() when hitting a broken repository (rhbz#2042920) The git checkout command crashes when run multiple times, if `.git/refs/remotes/origin/HEAD` is manually copied into `.git/refs/heads/$branch-name`. Strictly, this is repository corruption, but it has been silently tolerated until upstream 9081a421 (checkout: fix "branch info" memory leaks, 2021-11-16), which added some sanity checking of the data. Loosen the check via Junio's upstream commit 519947b69a (checkout: avoid BUG() when hitting a broken repository, 2022-01-21). --- ...BUG-when-hitting-a-broken-repository.patch | 74 +++++++++++++++++++ git.spec | 9 ++- 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 0001-checkout-avoid-BUG-when-hitting-a-broken-repository.patch diff --git a/0001-checkout-avoid-BUG-when-hitting-a-broken-repository.patch b/0001-checkout-avoid-BUG-when-hitting-a-broken-repository.patch new file mode 100644 index 0000000..d04d487 --- /dev/null +++ b/0001-checkout-avoid-BUG-when-hitting-a-broken-repository.patch @@ -0,0 +1,74 @@ +From 519947b69a9ea1461d5f5afc762823835295b3b2 Mon Sep 17 00:00:00 2001 +From: Junio C Hamano +Date: Fri, 21 Jan 2022 16:58:30 -0800 +Subject: [PATCH] checkout: avoid BUG() when hitting a broken repository +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When 9081a421 (checkout: fix "branch info" memory leaks, 2021-11-16) +cleaned up existing memory leaks, we added an unrelated sanity check +to ensure that a local branch is truly local and not a symref to +elsewhere that dies with BUG() otherwise. This was misguided in two +ways. First of all, such a tightening did not belong to a leak-fix +patch. And the condition it detected was *not* a bug in our program +but a problem in user data, where warning() or die() would have been +more appropriate. + +As the condition is not fatal (the result of computing the local +branch name in the code that is involved in the faulty check is only +used as a textual label for the commit), let's revert the code to +the original state, i.e. strip "refs/heads/" to compute the local +branch name if possible, and otherwise leave it NULL. The consumer +of the information in merge_working_tree() is prepared to see NULL +in there and act accordingly. + +cf. https://bugzilla.redhat.com/show_bug.cgi?id=2042920 + +Reported-by: Petr Šplíchal +Reported-by: Todd Zullinger +Helped-by: Ævar Arnfjörð Bjarmason +Signed-off-by: Junio C Hamano +--- + builtin/checkout.c | 3 --- + t/t2018-checkout-branch.sh | 13 +++++++++++++ + 2 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/builtin/checkout.c b/builtin/checkout.c +index 43d0275187fc8f..1fb34d537d9e91 100644 +--- a/builtin/checkout.c ++++ b/builtin/checkout.c +@@ -1094,9 +1094,6 @@ static int switch_branches(const struct checkout_opts *opts, + const char *p; + if (skip_prefix(old_branch_info.path, prefix, &p)) + old_branch_info.name = xstrdup(p); +- else +- BUG("should be able to skip past '%s' in '%s'!", +- prefix, old_branch_info.path); + } + + if (opts->new_orphan_branch && opts->orphan_from_empty_tree) { +diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh +index 93be1c0eae5ead..5dda5ad4cbcb07 100755 +--- a/t/t2018-checkout-branch.sh ++++ b/t/t2018-checkout-branch.sh +@@ -85,6 +85,19 @@ test_expect_success 'setup' ' + git branch -m branch1 + ' + ++test_expect_success 'checkout a branch without refs/heads/* prefix' ' ++ git clone --no-tags . repo-odd-prefix && ++ ( ++ cd repo-odd-prefix && ++ ++ origin=$(git symbolic-ref refs/remotes/origin/HEAD) && ++ git symbolic-ref refs/heads/a-branch "$origin" && ++ ++ git checkout -f a-branch && ++ git checkout -f a-branch ++ ) ++' ++ + test_expect_success 'checkout -b to a new branch, set to HEAD' ' + test_when_finished " + git checkout branch1 && diff --git a/git.spec b/git.spec index 6658bce..7f280db 100644 --- a/git.spec +++ b/git.spec @@ -80,7 +80,7 @@ Name: git Version: 2.35.0 -Release: 0.2%{?rcrev}%{?dist} +Release: 0.2%{?rcrev}%{?dist}.1 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -119,6 +119,10 @@ Patch3: 0003-t-lib-gpg-kill-all-gpg-components-not-just-gpg-agent.patch Patch4: 0004-t4202-match-gpgsm-output-from-GnuPG-2.3.patch Patch5: 0005-gpg-interface-match-SIG_CREATED-if-it-s-the-first-li.patch +# checkout: avoid BUG() when hitting a broken repository +# https://bugzilla.redhat.com/2042920 +Patch6: https://github.com/git/git/commit/519947b69a.patch#/0001-checkout-avoid-BUG-when-hitting-a-broken-repository.patch + %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -1008,6 +1012,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Jan 20 2022 Todd Zullinger - 2.35.0-0.2.rc2.1 +- checkout: avoid BUG() when hitting a broken repository (rhbz#2042920) + * Wed Jan 19 2022 Todd Zullinger - 2.35.0-0.2.rc2 - update to 2.35.0-rc2 From 601fe503aabd0aeb45589b153b8c23819966dfa6 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 20 Jan 2022 12:33:32 -0500 Subject: [PATCH 734/842] fix compilation on EL7 Git now requires C99 support and a zlib with uncompress2 by default. On EL7, gcc-4.8.5 requires a flag to enable C99 support. Compilation also fails without -fPIC on EL7, for reasons of which I am not entirely clear. (I do not like making a change I cannot justify or explain properly, but it is better than dropping EL7 support until I have time to learn the reason(s).) Update the %build_cflags macro when building on EL7 to enable C99 support and set -fPIC. Define NO_UNCOMPRESS2 to use compat/zlib-uncompress2.c. --- git.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 7f280db..778e231 100644 --- a/git.spec +++ b/git.spec @@ -39,6 +39,7 @@ %else %bcond_without python2 %bcond_with python3 +%global build_cflags %{build_cflags} -fPIC -std=gnu99 %global gitweb_httpd_conf git.conf %global use_glibc_langpacks 0 %global use_perl_generators 0 @@ -80,7 +81,7 @@ Name: git Version: 2.35.0 -Release: 0.2%{?rcrev}%{?dist}.1 +Release: 0.2%{?rcrev}%{?dist}.2 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -548,6 +549,9 @@ INSTALL_SYMLINKS = 1 GITWEB_PROJECTROOT = %{_localstatedir}/lib/git GNU_ROFF = 1 NO_PERL_CPAN_FALLBACKS = 1 +%if 0%{?rhel} && 0%{?rhel} < 8 +NO_UNCOMPRESS2 = 1 +%endif %if %{with python3} PYTHON_PATH = %{__python3} %else @@ -1012,6 +1016,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Jan 21 2022 Todd Zullinger - 2.35.0-0.2.rc2.2 +- fix compilation on EL7 + * Thu Jan 20 2022 Todd Zullinger - 2.35.0-0.2.rc2.1 - checkout: avoid BUG() when hitting a broken repository (rhbz#2042920) From 32a3ec7045053427f28f40500aad489b420325d4 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 22 Jan 2022 12:49:44 -0500 Subject: [PATCH 735/842] remove contrib/scalar to avoid cruft in git-core-doc The scalar command is being worked on incrementally upstream. As it matures, we may consider building and distributing it. Whether that will happen before it graduates from contrib or not is anyone's guess. For the moment, remove it to avoid cruft in git-core-doc. --- git.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 778e231..75ca4f4 100644 --- a/git.spec +++ b/git.spec @@ -81,7 +81,7 @@ Name: git Version: 2.35.0 -Release: 0.2%{?rcrev}%{?dist}.2 +Release: 0.2%{?rcrev}%{?dist}.3 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -675,6 +675,9 @@ install -Dpm 0755 contrib/diff-highlight/diff-highlight \ %{buildroot}%{_datadir}/git-core/contrib/diff-highlight rm -rf contrib/diff-highlight/{Makefile,diff-highlight,*.perl,t} +# Remove contrib/scalar to avoid cruft in the git-core-doc docdir +rm -rf contrib/scalar + # Clean up contrib/subtree to avoid cruft in the git-core-doc docdir rm -rf contrib/subtree/{INSTALL,Makefile,git-subtree*,t} @@ -1016,6 +1019,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sat Jan 22 2022 Todd Zullinger - 2.35.0-0.2.rc2.3 +- remove contrib/scalar to avoid cruft in git-core-doc + * Fri Jan 21 2022 Todd Zullinger - 2.35.0-0.2.rc2.2 - fix compilation on EL7 From 4eb061b2091db583f5b6d759e78d3aa6d32a75c4 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 24 Jan 2022 15:31:20 -0500 Subject: [PATCH 736/842] update to 2.35.0 Release notes: https://github.com/git/git/raw/v2.35.0/Documentation/RelNotes/2.35.0.txt --- ...BUG-when-hitting-a-broken-repository.patch | 74 ------------------- git.spec | 11 ++- sources | 4 +- 3 files changed, 7 insertions(+), 82 deletions(-) delete mode 100644 0001-checkout-avoid-BUG-when-hitting-a-broken-repository.patch diff --git a/0001-checkout-avoid-BUG-when-hitting-a-broken-repository.patch b/0001-checkout-avoid-BUG-when-hitting-a-broken-repository.patch deleted file mode 100644 index d04d487..0000000 --- a/0001-checkout-avoid-BUG-when-hitting-a-broken-repository.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 519947b69a9ea1461d5f5afc762823835295b3b2 Mon Sep 17 00:00:00 2001 -From: Junio C Hamano -Date: Fri, 21 Jan 2022 16:58:30 -0800 -Subject: [PATCH] checkout: avoid BUG() when hitting a broken repository -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When 9081a421 (checkout: fix "branch info" memory leaks, 2021-11-16) -cleaned up existing memory leaks, we added an unrelated sanity check -to ensure that a local branch is truly local and not a symref to -elsewhere that dies with BUG() otherwise. This was misguided in two -ways. First of all, such a tightening did not belong to a leak-fix -patch. And the condition it detected was *not* a bug in our program -but a problem in user data, where warning() or die() would have been -more appropriate. - -As the condition is not fatal (the result of computing the local -branch name in the code that is involved in the faulty check is only -used as a textual label for the commit), let's revert the code to -the original state, i.e. strip "refs/heads/" to compute the local -branch name if possible, and otherwise leave it NULL. The consumer -of the information in merge_working_tree() is prepared to see NULL -in there and act accordingly. - -cf. https://bugzilla.redhat.com/show_bug.cgi?id=2042920 - -Reported-by: Petr Šplíchal -Reported-by: Todd Zullinger -Helped-by: Ævar Arnfjörð Bjarmason -Signed-off-by: Junio C Hamano ---- - builtin/checkout.c | 3 --- - t/t2018-checkout-branch.sh | 13 +++++++++++++ - 2 files changed, 13 insertions(+), 3 deletions(-) - -diff --git a/builtin/checkout.c b/builtin/checkout.c -index 43d0275187fc8f..1fb34d537d9e91 100644 ---- a/builtin/checkout.c -+++ b/builtin/checkout.c -@@ -1094,9 +1094,6 @@ static int switch_branches(const struct checkout_opts *opts, - const char *p; - if (skip_prefix(old_branch_info.path, prefix, &p)) - old_branch_info.name = xstrdup(p); -- else -- BUG("should be able to skip past '%s' in '%s'!", -- prefix, old_branch_info.path); - } - - if (opts->new_orphan_branch && opts->orphan_from_empty_tree) { -diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh -index 93be1c0eae5ead..5dda5ad4cbcb07 100755 ---- a/t/t2018-checkout-branch.sh -+++ b/t/t2018-checkout-branch.sh -@@ -85,6 +85,19 @@ test_expect_success 'setup' ' - git branch -m branch1 - ' - -+test_expect_success 'checkout a branch without refs/heads/* prefix' ' -+ git clone --no-tags . repo-odd-prefix && -+ ( -+ cd repo-odd-prefix && -+ -+ origin=$(git symbolic-ref refs/remotes/origin/HEAD) && -+ git symbolic-ref refs/heads/a-branch "$origin" && -+ -+ git checkout -f a-branch && -+ git checkout -f a-branch -+ ) -+' -+ - test_expect_success 'checkout -b to a new branch, set to HEAD' ' - test_when_finished " - git checkout branch1 && diff --git a/git.spec b/git.spec index 75ca4f4..14f4c3b 100644 --- a/git.spec +++ b/git.spec @@ -77,11 +77,11 @@ %endif # Define for release candidates -%global rcrev .rc2 +#global rcrev .rc0 Name: git Version: 2.35.0 -Release: 0.2%{?rcrev}%{?dist}.3 +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -120,10 +120,6 @@ Patch3: 0003-t-lib-gpg-kill-all-gpg-components-not-just-gpg-agent.patch Patch4: 0004-t4202-match-gpgsm-output-from-GnuPG-2.3.patch Patch5: 0005-gpg-interface-match-SIG_CREATED-if-it-s-the-first-li.patch -# checkout: avoid BUG() when hitting a broken repository -# https://bugzilla.redhat.com/2042920 -Patch6: https://github.com/git/git/commit/519947b69a.patch#/0001-checkout-avoid-BUG-when-hitting-a-broken-repository.patch - %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -1019,6 +1015,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Jan 24 2022 Todd Zullinger - 2.35.0-1 +- update to 2.35.0 + * Sat Jan 22 2022 Todd Zullinger - 2.35.0-0.2.rc2.3 - remove contrib/scalar to avoid cruft in git-core-doc diff --git a/sources b/sources index debc1e5..21febdd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.35.0.rc2.tar.xz) = 5eb758cbf37c632f89f03eca65bf36f7f2490fbfb3d54c396d906b45a7ab96735f928abe300d7bcacdfdd33b59b1901a4c92f27f30dfe82c4fb1e8d690568dc3 -SHA512 (git-2.35.0.rc2.tar.sign) = fc9d96ea3f58f3c34f121477597e4f5b4a9c50e0d3ee42d021a276f5f1ca9a524c437a3fee8c78b6f09095ff411ab2f919444c53152e9bb44e5211437c18f415 +SHA512 (git-2.35.0.tar.xz) = ae391e1cda7b4e7d49e09e7412cd2da8d643c71f20967fd7b600be00a13d3b126c2bc3a2deece935742084ecbbd1eb51455b10365e0d65423979241e9e7b94a9 +SHA512 (git-2.35.0.tar.sign) = 8aeb47662e51f2d64150101b2e0887c9f6bfe42b312d52cde3e9d0b2467febea7bd4e9ba2e2df2121728a574e3d02a42ef7f2220486211bde8f936e848da4510 From 1dc07e7d5daaacc47013f1a646d81f79379176b6 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 24 Jan 2022 15:33:49 -0500 Subject: [PATCH 737/842] set path to linker script in %_package_note_file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The package-notes feature¹ creates a linker script in %{buildsubdir}. Unfortunately, %{buildsubdir} is not set in %prep, leaving us with an incorrect path to the linker script. The build then fails with: /usr/bin/ld: cannot open linker script file /builddir/build/BUILD/.package_note-git-2.35.0-0.2.rc2.fc36.3.x86_64.ld: No such file or directory Set the path to the linker script via %_package_note_file, per suggestion by Zbigniew Jędrzejewski-Szmek². References: ¹ https://fedoraproject.org/wiki/Changes/Package_information_on_ELF_objects ² https://bugzilla.redhat.com/2044028#c10 --- git.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/git.spec b/git.spec index 14f4c3b..1baa4ef 100644 --- a/git.spec +++ b/git.spec @@ -76,6 +76,9 @@ %global _hardened_build 1 %endif +# Set path to the package-notes linker script +%global _package_note_file %{_builddir}/%{name}-%{version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld + # Define for release candidates #global rcrev .rc0 @@ -1017,6 +1020,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Mon Jan 24 2022 Todd Zullinger - 2.35.0-1 - update to 2.35.0 +- set path to linker script in %%_package_note_file * Sat Jan 22 2022 Todd Zullinger - 2.35.0-0.2.rc2.3 - remove contrib/scalar to avoid cruft in git-core-doc From 9e214cd4d018c3be1f38bd2b4aa949a8b7f0a3a4 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 29 Jan 2022 00:20:45 -0500 Subject: [PATCH 738/842] update to 2.35.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Per the upstream release notes¹: Git 2.35 shipped with a regression that broke use of "rebase" and "stash" in a secondary worktree. This maintenance release ought to fix it. ¹ https://github.com/git/git/raw/v2.35.1/Documentation/RelNotes/2.35.1.txt --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 1baa4ef..b8ea26b 100644 --- a/git.spec +++ b/git.spec @@ -83,7 +83,7 @@ #global rcrev .rc0 Name: git -Version: 2.35.0 +Version: 2.35.1 Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -1018,6 +1018,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sat Jan 29 2022 Todd Zullinger - 2.35.1-1 +- update to 2.35.1 + * Mon Jan 24 2022 Todd Zullinger - 2.35.0-1 - update to 2.35.0 - set path to linker script in %%_package_note_file diff --git a/sources b/sources index 21febdd..4095968 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.35.0.tar.xz) = ae391e1cda7b4e7d49e09e7412cd2da8d643c71f20967fd7b600be00a13d3b126c2bc3a2deece935742084ecbbd1eb51455b10365e0d65423979241e9e7b94a9 -SHA512 (git-2.35.0.tar.sign) = 8aeb47662e51f2d64150101b2e0887c9f6bfe42b312d52cde3e9d0b2467febea7bd4e9ba2e2df2121728a574e3d02a42ef7f2220486211bde8f936e848da4510 +SHA512 (git-2.35.1.tar.xz) = 926c6813ef61931e1a1c43dfd7b15e20dc5878c1752876bd08f039249c9ed09f20f096b2f01947de9c9522c942e9fa8c1363d7d31a488bbe3f93c0cff31fcbcb +SHA512 (git-2.35.1.tar.sign) = 27adbb0628a18ae13ce76c2812c2f2a8a9da002105ca1f550a864ae769a27efa697ab7cbd8582e69be99d8731fe2f53895321c3a71990ffbcfe1e7f2064fd9b7 From 0b5afcebda0b34f5fb5860355c6ceef770f3feb1 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 4 Apr 2022 23:43:05 -0400 Subject: [PATCH 739/842] update to 2.36.0-rc0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The %_package_note_file definition added in 1dc07e7 (set path to linker script in %_package_note_file, 2022-01-24) does not support release candidates. Fix it. Add 'fsmonitor--daemon is not supported on this platform' and 'missing !REFFILES' to git.skip-test-patterns to match new test prerequisites which are not relevant for our builds. Adjust number of t5541 "push 2000 tags over http" test. It was shifted from 35 to 36 by upstream c36c62859a (tests: use "test_hook" for misc "mkdir -p" and "chmod" cases, 2022-03-17). Replace `%__make test` with `%__make -C t all` to avoid re-compiling in %check. This is an issue I have yet to fully diagnose. I suspect that it is related to the nice work Ævar Arnfjörð Bjarmason has done upstream to improve the efficiency and correctness of the build process. Work around it for the moment. Release notes: https://github.com/git/git/raw/v2.36.0-rc0/Documentation/RelNotes/2.36.0.txt --- ...-litdd-in-credential-cache-fsmonitor.patch | 102 ++++++++++++++++++ ...ith-colons-when-parsing-gpgsm-output.patch | 47 -------- ...-gpg-components-after-updating-trust.patch | 31 ------ ...ll-gpg-components-not-just-gpg-agent.patch | 40 ------- ...02-match-gpgsm-output-from-GnuPG-2.3.patch | 33 ------ ...tch-SIG_CREATED-if-it-s-the-first-li.patch | 48 --------- git.skip-test-patterns | 2 + git.spec | 29 +++-- sources | 4 +- 9 files changed, 120 insertions(+), 216 deletions(-) create mode 100644 0001-doc-replace-with-litdd-in-credential-cache-fsmonitor.patch delete mode 100644 0001-t-lib-gpg-use-with-colons-when-parsing-gpgsm-output.patch delete mode 100644 0002-t-lib-gpg-reload-gpg-components-after-updating-trust.patch delete mode 100644 0003-t-lib-gpg-kill-all-gpg-components-not-just-gpg-agent.patch delete mode 100644 0004-t4202-match-gpgsm-output-from-GnuPG-2.3.patch delete mode 100644 0005-gpg-interface-match-SIG_CREATED-if-it-s-the-first-li.patch diff --git a/0001-doc-replace-with-litdd-in-credential-cache-fsmonitor.patch b/0001-doc-replace-with-litdd-in-credential-cache-fsmonitor.patch new file mode 100644 index 0000000..6982207 --- /dev/null +++ b/0001-doc-replace-with-litdd-in-credential-cache-fsmonitor.patch @@ -0,0 +1,102 @@ +From f3ea4bed2acb129db66c4c9a22dae71576d58066 Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Wed, 6 Apr 2022 14:41:22 -0400 +Subject: [PATCH] doc: replace "--" with {litdd} in credential-cache/fsmonitor + +Asciidoc renders `--` as em-dash. This is not appropriate for command +names. It also breaks linkgit links to these commands. + +Fix git-credential-cache--daemon and git-fsmonitor--daemon. The latter +was added 3248486920 (fsmonitor: document builtin fsmonitor, 2022-03-25) +and included several links. A check for broken links in the HTML docs +turned this up. + +Manually inspecting the other Documentation/git-*--*.txt files turned up +the issue in git-credential-cache--daemon. + +While here, quote `git credential-cache--daemon` in the synopsis to +match the vast majority of our other documentation. + +Signed-off-by: Todd Zullinger +Signed-off-by: Junio C Hamano +--- + Documentation/config/core.txt | 2 +- + Documentation/git-credential-cache--daemon.txt | 6 +++--- + Documentation/git-fsmonitor--daemon.txt | 12 ++++++------ + Documentation/git-update-index.txt | 2 +- + 4 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/Documentation/config/core.txt b/Documentation/config/core.txt +index 889522956e45bb..e67392cc838499 100644 +--- a/Documentation/config/core.txt ++++ b/Documentation/config/core.txt +@@ -63,7 +63,7 @@ core.protectNTFS:: + + core.fsmonitor:: + If set to true, enable the built-in file system monitor +- daemon for this working directory (linkgit:git-fsmonitor--daemon[1]). ++ daemon for this working directory (linkgit:git-fsmonitor{litdd}daemon[1]). + + + Like hook-based file system monitors, the built-in file system monitor + can speed up Git commands that need to refresh the Git index +diff --git a/Documentation/git-credential-cache--daemon.txt b/Documentation/git-credential-cache--daemon.txt +index 7051c6bdf8f542..01e1c214dd82e1 100644 +--- a/Documentation/git-credential-cache--daemon.txt ++++ b/Documentation/git-credential-cache--daemon.txt +@@ -1,5 +1,5 @@ +-git-credential-cache--daemon(1) +-=============================== ++git-credential-cache{litdd}daemon(1) ++==================================== + + NAME + ---- +@@ -8,7 +8,7 @@ git-credential-cache--daemon - Temporarily store user credentials in memory + SYNOPSIS + -------- + [verse] +-git credential-cache--daemon [--debug] ++'git credential-cache{litdd}daemon' [--debug] + + DESCRIPTION + ----------- +diff --git a/Documentation/git-fsmonitor--daemon.txt b/Documentation/git-fsmonitor--daemon.txt +index 0fedf5a4565f79..cc142fb8612c72 100644 +--- a/Documentation/git-fsmonitor--daemon.txt ++++ b/Documentation/git-fsmonitor--daemon.txt +@@ -1,5 +1,5 @@ +-git-fsmonitor--daemon(1) +-======================== ++git-fsmonitor{litdd}daemon(1) ++============================= + + NAME + ---- +@@ -8,10 +8,10 @@ git-fsmonitor--daemon - A Built-in File System Monitor + SYNOPSIS + -------- + [verse] +-'git fsmonitor--daemon' start +-'git fsmonitor--daemon' run +-'git fsmonitor--daemon' stop +-'git fsmonitor--daemon' status ++'git fsmonitor{litdd}daemon' start ++'git fsmonitor{litdd}daemon' run ++'git fsmonitor{litdd}daemon' stop ++'git fsmonitor{litdd}daemon' status + + DESCRIPTION + ----------- +diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt +index 64315e2e8c2d3f..5ea2f2c60e45a3 100644 +--- a/Documentation/git-update-index.txt ++++ b/Documentation/git-update-index.txt +@@ -528,7 +528,7 @@ This feature is intended to speed up git operations for repos that have + large working directories. + + It enables git to work together with a file system monitor (see +-linkgit:git-fsmonitor--daemon[1] ++linkgit:git-fsmonitor{litdd}daemon[1] + and the + "fsmonitor-watchman" section of linkgit:githooks[5]) that can + inform it as to what files have been modified. This enables git to avoid diff --git a/0001-t-lib-gpg-use-with-colons-when-parsing-gpgsm-output.patch b/0001-t-lib-gpg-use-with-colons-when-parsing-gpgsm-output.patch deleted file mode 100644 index 5c003a5..0000000 --- a/0001-t-lib-gpg-use-with-colons-when-parsing-gpgsm-output.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e155951262e6dea419db8b9010342b08b487f96a Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Thu, 25 Nov 2021 05:05:08 -0500 -Subject: [PATCH] t/lib-gpg: use --with-colons when parsing gpgsm output -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The output of `gpgsm -K` changed in gnupg-2.3¹, breaking the parsing -used by the GPGSM prereq. - -Use the `--with-colons` options for stable, machine-parseable output. -This allows the grep/cut/tr pipeline (and the subsequent echo which -appends ' S relax') to be replaced with a single call to awk to create -the ${GNUPGHOME}/trustlist.txt file. - -¹ https://dev.gnupg.org/rGe7d70923901e is the change in 2.3, while - https://dev.gnupg.org/rG9c57de75cf36 is the similar change in 2.2. - - The latter says: Here in 2.2 we keep the string "fingerprint:" and no - not change it to "sha1 fpr" as we did in master (2.3). (sic) - -Signed-off-by: Todd Zullinger ---- - t/lib-gpg.sh | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh -index a3f285f515..cbbf74e725 100644 ---- a/t/lib-gpg.sh -+++ b/t/lib-gpg.sh -@@ -72,12 +72,10 @@ test_lazy_prereq GPGSM ' - --passphrase-fd 0 --pinentry-mode loopback \ - --import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 && - -- gpgsm --homedir "${GNUPGHOME}" -K | -- grep fingerprint: | -- cut -d" " -f4 | -- tr -d "\\n" >"${GNUPGHOME}/trustlist.txt" && -+ gpgsm --homedir "${GNUPGHOME}" -K --with-colons | -+ awk -F ":" "/^fpr:/ {printf \"%s S relax\\n\", \$10}" \ -+ >"${GNUPGHOME}/trustlist.txt" && - -- echo " S relax" >>"${GNUPGHOME}/trustlist.txt" && - echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \ - -u committer@example.com -o /dev/null --sign - - ' diff --git a/0002-t-lib-gpg-reload-gpg-components-after-updating-trust.patch b/0002-t-lib-gpg-reload-gpg-components-after-updating-trust.patch deleted file mode 100644 index 2c27b74..0000000 --- a/0002-t-lib-gpg-reload-gpg-components-after-updating-trust.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 93299b9b221da01d4055528f7c760d04ee83b82b Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Thu, 25 Nov 2021 08:07:32 -0500 -Subject: [PATCH] t/lib-gpg: reload gpg components after updating trustlist - -With gpgsm from gnupg-2.3, the changes to the trustlist.txt do not -appear to be picked up without refreshing the gpg-agent. Use the 'all' -keyword to reload all of the gpg components. The scdaemon is started as -a child of gpg-agent, for example. - -We used to have a --kill at this spot, but I removed it in 2e285e7803 -(t/lib-gpg: drop redundant killing of gpg-agent, 2019-02-07). It seems -like it might be necessary (again) for 2.3. - -Signed-off-by: Todd Zullinger ---- - t/lib-gpg.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh -index cbbf74e725..d675698a2d 100644 ---- a/t/lib-gpg.sh -+++ b/t/lib-gpg.sh -@@ -75,6 +75,7 @@ test_lazy_prereq GPGSM ' - gpgsm --homedir "${GNUPGHOME}" -K --with-colons | - awk -F ":" "/^fpr:/ {printf \"%s S relax\\n\", \$10}" \ - >"${GNUPGHOME}/trustlist.txt" && -+ (gpgconf --reload all || : ) && - - echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \ - -u committer@example.com -o /dev/null --sign - diff --git a/0003-t-lib-gpg-kill-all-gpg-components-not-just-gpg-agent.patch b/0003-t-lib-gpg-kill-all-gpg-components-not-just-gpg-agent.patch deleted file mode 100644 index 2905564..0000000 --- a/0003-t-lib-gpg-kill-all-gpg-components-not-just-gpg-agent.patch +++ /dev/null @@ -1,40 +0,0 @@ -From da340dd76714474126f73f6b53087da0ffd4e8d8 Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Fri, 26 Nov 2021 21:11:54 -0500 -Subject: [PATCH] t/lib-gpg: kill all gpg components, not just gpg-agent - -The gpg-agent is one of several processes that newer releases of GnuPG -start automatically. Issue a kill to each of them to ensure they do not -affect separate tests. (Yes, the separate GNUPGHOME should do that -already. If we find that is case, we could drop the --kill entirely.) - -In terms of compatibility, the 'all' keyword was added to the --kill & ---reload options in GnuPG 2.1.18. Debian and RHEL are often used as -indicators of how a change might affect older systems we often try to -support. - - - Debian Strech (old old stable), which has limited security support - until June 2022, has GnuPG 2.1.18 (or 2.2.x in backports). - - - CentOS/RHEL 7, which is supported until June 2024, has GnuPG - 2.0.22, which lacks the --kill option, so the change won't have - any impact. - -Signed-off-by: Todd Zullinger ---- - t/lib-gpg.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh -index d675698a2d..2bb309a8c1 100644 ---- a/t/lib-gpg.sh -+++ b/t/lib-gpg.sh -@@ -40,7 +40,7 @@ test_lazy_prereq GPG ' - # > lib-gpg/ownertrust - mkdir "$GNUPGHOME" && - chmod 0700 "$GNUPGHOME" && -- (gpgconf --kill gpg-agent || : ) && -+ (gpgconf --kill all || : ) && - gpg --homedir "${GNUPGHOME}" --import \ - "$TEST_DIRECTORY"/lib-gpg/keyring.gpg && - gpg --homedir "${GNUPGHOME}" --import-ownertrust \ diff --git a/0004-t4202-match-gpgsm-output-from-GnuPG-2.3.patch b/0004-t4202-match-gpgsm-output-from-GnuPG-2.3.patch deleted file mode 100644 index 005ace7..0000000 --- a/0004-t4202-match-gpgsm-output-from-GnuPG-2.3.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d1efcac68414b80cc0fd7b7e3b4781f313d98697 Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Sat, 27 Nov 2021 05:31:13 -0500 -Subject: [PATCH] t4202: match gpgsm output from GnuPG 2.3 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In GnuPG 2.3, the output from gpgsm when a certificate is not found -differs from that of earlier versions. This appears to be a bug¹, but -there are several releases in use now which have this output. Extend -the grep pattern to catch it rather than failing the test. - -¹ https://lists.gnupg.org/pipermail/gnupg-devel/2021-November/034991.html - -Signed-off-by: Todd Zullinger ---- - t/t4202-log.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/t/t4202-log.sh b/t/t4202-log.sh -index 7884e3d46b..c69f9ac469 100755 ---- a/t/t4202-log.sh -+++ b/t/t4202-log.sh -@@ -1851,7 +1851,7 @@ test_expect_success GPGSM 'log --graph --show-signature for merged tag x509 miss - git merge --no-ff -m msg signed_tag_x509_nokey && - GNUPGHOME=. git log --graph --show-signature -n1 plain-x509-nokey >actual && - grep "^|\\\ merged tag" actual && -- grep "^| | gpgsm: certificate not found" actual -+ grep -Ei "^| | gpgsm:( failed to find the)? certificate:? not found" actual - ' - - test_expect_success GPGSM 'log --graph --show-signature for merged tag x509 bad signature' ' diff --git a/0005-gpg-interface-match-SIG_CREATED-if-it-s-the-first-li.patch b/0005-gpg-interface-match-SIG_CREATED-if-it-s-the-first-li.patch deleted file mode 100644 index 458af9d..0000000 --- a/0005-gpg-interface-match-SIG_CREATED-if-it-s-the-first-li.patch +++ /dev/null @@ -1,48 +0,0 @@ -From edb5eafc9945b2d400c2d777a9750cee06ab500f Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Sat, 27 Nov 2021 02:55:47 -0500 -Subject: [PATCH] gpg-interface: match SIG_CREATED if it's the first line - -In `sign_buffer_gpg`, "\n[GNUPG:] SIG_CREATED " in the gpg status output -is used to signal a successful signature. This fails if "SIG_CREATED" -is the first line in the gpg output, as is the case with `gpgsm` in -GnuPG 2.3. - -In earlier versions of GnuPG, there was a debug line in the `gpgsm` -output which allowed the check in `sign_buffer_gpg` to work. This debug -line was removed from GnuPG in a6d2f3133 (sm: Replace some debug message -by log_error or log_info, 2020-04-21). - -The result is the `gpgsm --status-fd` output for a signing operation -starts with "[GNUPG:] SIG_CREATED" and we mistakenly report "gpg failed -to sign the data" to the user. The `gpg` command has other `[GNUPG:]` -output for signing operations, so it is not affected by this issue. -It's best not to rely on something as subtle and out of our control as -the order if the gnupg status messages. - -This likely went unnoticed because the GPGSM test prereq was failing for -a different reason with GnuPG 2.3. No tests failed, they were simply -skipped due to the missing GPGSM prereq. - -Signed-off-by: Todd Zullinger ---- - gpg-interface.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/gpg-interface.c b/gpg-interface.c -index 3e7255a2a9..d179dfb3ab 100644 ---- a/gpg-interface.c -+++ b/gpg-interface.c -@@ -859,6 +859,12 @@ static int sign_buffer_gpg(struct strbuf *buffer, struct strbuf *signature, - - bottom = signature->len; - -+ /* -+ * Ensure gpg_status begins with a newline or we'll fail to match if -+ * the SIG_CREATED line is at the start of the gpg output. -+ */ -+ strbuf_addch(&gpg_status, '\n'); -+ - /* - * When the username signingkey is bad, program could be terminated - * because gpg exits without reading and then write gets SIGPIPE. diff --git a/git.skip-test-patterns b/git.skip-test-patterns index bd44452..234d37a 100644 --- a/git.skip-test-patterns +++ b/git.skip-test-patterns @@ -1,5 +1,6 @@ expensive 2GB clone test; enable with GIT_TEST_CLONE_2GB=true filesystem does not corrupt utf-8 +fsmonitor--daemon is not supported on this platform GIT_SKIP_TESTS missing AUTOIDENT missing CASE_INSENSITIVE_FS @@ -11,6 +12,7 @@ missing MINGW missing NATIVE_CRLF missing !PCRE missing !PTHREADS +missing !REFFILES missing RFC1991 missing RUNTIME_PREFIX missing SYMLINKS_WINDOWS diff --git a/git.spec b/git.spec index b8ea26b..e105b6c 100644 --- a/git.spec +++ b/git.spec @@ -76,15 +76,15 @@ %global _hardened_build 1 %endif -# Set path to the package-notes linker script -%global _package_note_file %{_builddir}/%{name}-%{version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld - # 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.35.1 -Release: 1%{?rcrev}%{?dist} +Version: 2.36.0 +Release: 0.0%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -116,12 +116,8 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# Fix a few tests and issues with gnupg-2.3 -Patch1: 0001-t-lib-gpg-use-with-colons-when-parsing-gpgsm-output.patch -Patch2: 0002-t-lib-gpg-reload-gpg-components-after-updating-trust.patch -Patch3: 0003-t-lib-gpg-kill-all-gpg-components-not-just-gpg-agent.patch -Patch4: 0004-t4202-match-gpgsm-output-from-GnuPG-2.3.patch -Patch5: 0005-gpg-interface-match-SIG_CREATED-if-it-s-the-first-li.patch +# https://lore.kernel.org/git/20220406184122.4126898-1-tmz@pobox.com/ +Patch1: https://github.com/git/git/commit/f3ea4bed2.patch#/0001-doc-replace-with-litdd-in-credential-cache-fsmonitor.patch %if %{with docs} # pod2man is needed to build Git.3pm @@ -826,9 +822,9 @@ GIT_SKIP_TESTS="" # # The following 2 tests use run_with_limited_cmdline, which calls ulimit -s 128 # to limit the maximum stack size. -# t5541.35 'push 2000 tags over http' +# 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.35 t5551.25" +GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5541.36 t5551.25" %endif # endif aarch64 %%{arm} %%{power64} @@ -866,7 +862,7 @@ sed -i "s@\(GIT_TEST_OPTS='.*\)'@\1 --root=$testdir'@" GIT-BUILD-OPTIONS touch -r ts GIT-BUILD-OPTIONS # Run the tests -%__make test || ./print-failed-test-output +%__make -C t all || ./print-failed-test-output # Run contrib/credential/netrc tests mkdir -p contrib/credential @@ -1018,6 +1014,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Apr 05 2022 Todd Zullinger - 2.36.0-0.0.rc0 +- update to 2.36.0-rc0 + * Sat Jan 29 2022 Todd Zullinger - 2.35.1-1 - update to 2.35.1 diff --git a/sources b/sources index 4095968..567d1db 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.35.1.tar.xz) = 926c6813ef61931e1a1c43dfd7b15e20dc5878c1752876bd08f039249c9ed09f20f096b2f01947de9c9522c942e9fa8c1363d7d31a488bbe3f93c0cff31fcbcb -SHA512 (git-2.35.1.tar.sign) = 27adbb0628a18ae13ce76c2812c2f2a8a9da002105ca1f550a864ae769a27efa697ab7cbd8582e69be99d8731fe2f53895321c3a71990ffbcfe1e7f2064fd9b7 +SHA512 (git-2.36.0.rc0.tar.xz) = 7417784582f17e9579fbae984a175af814ff6bd9b28b48d0405b8c4342566a4e138df0f544ee7fbccf25419a50c3848fb9d0830feb9848a2f41cae2c969989c4 +SHA512 (git-2.36.0.rc0.tar.sign) = f1c8217687c993a32a3b8b38cde242440e6c3de4093dffd68bd9d483f103d20701856254e9bc92c2945c75405dd2c67e4c66076c05b469bbf4b21b7752888358 From 25830241e697031e1debac8298151b00a013e835 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 8 Apr 2022 13:42:17 -0400 Subject: [PATCH 740/842] use httpd-core for tests on Fedora >= 37 The httpd package was slimmed down per rhbz#2070517. Use the new httpd-core package for the test suite requirements on F37+. While here, adjust a nearby '# endif' comment to match reality. --- git.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index e105b6c..287ef90 100644 --- a/git.spec +++ b/git.spec @@ -189,7 +189,7 @@ BuildRequires: acl # Needed by t5540-http-push-webdav.sh BuildRequires: apr-util-bdb %endif -# endif fedora >= 27 +# endif fedora or rhel >= 8 BuildRequires: bash %if %{with cvs} BuildRequires: cvs @@ -212,7 +212,12 @@ BuildRequires: gnupg2-smime BuildRequires: highlight %endif # endif fedora or el7+ (ppc64le/x86_64) +%if 0%{?fedora} >= 37 +BuildRequires: httpd-core +%else BuildRequires: httpd +%endif +# endif fedora >= 37 %if 0%{?fedora} && ! ( 0%{?fedora} >= 35 || "%{_arch}" == "i386" || "%{_arch}" == "s390x" ) BuildRequires: jgit %endif @@ -1016,6 +1021,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Tue Apr 05 2022 Todd Zullinger - 2.36.0-0.0.rc0 - update to 2.36.0-rc0 +- use httpd-core for tests on Fedora >= 37 * Sat Jan 29 2022 Todd Zullinger - 2.35.1-1 - update to 2.35.1 From d1736385d567d30b7931bc1e8a26112ad05a3aec Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 4 Apr 2022 23:43:05 -0400 Subject: [PATCH 741/842] update to 2.36.0-rc1 Release notes: https://github.com/git/git/raw/v2.36.0-rc1/Documentation/RelNotes/2.36.0.txt --- ...-litdd-in-credential-cache-fsmonitor.patch | 102 ------------------ git.spec | 10 +- sources | 4 +- 3 files changed, 7 insertions(+), 109 deletions(-) delete mode 100644 0001-doc-replace-with-litdd-in-credential-cache-fsmonitor.patch diff --git a/0001-doc-replace-with-litdd-in-credential-cache-fsmonitor.patch b/0001-doc-replace-with-litdd-in-credential-cache-fsmonitor.patch deleted file mode 100644 index 6982207..0000000 --- a/0001-doc-replace-with-litdd-in-credential-cache-fsmonitor.patch +++ /dev/null @@ -1,102 +0,0 @@ -From f3ea4bed2acb129db66c4c9a22dae71576d58066 Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Wed, 6 Apr 2022 14:41:22 -0400 -Subject: [PATCH] doc: replace "--" with {litdd} in credential-cache/fsmonitor - -Asciidoc renders `--` as em-dash. This is not appropriate for command -names. It also breaks linkgit links to these commands. - -Fix git-credential-cache--daemon and git-fsmonitor--daemon. The latter -was added 3248486920 (fsmonitor: document builtin fsmonitor, 2022-03-25) -and included several links. A check for broken links in the HTML docs -turned this up. - -Manually inspecting the other Documentation/git-*--*.txt files turned up -the issue in git-credential-cache--daemon. - -While here, quote `git credential-cache--daemon` in the synopsis to -match the vast majority of our other documentation. - -Signed-off-by: Todd Zullinger -Signed-off-by: Junio C Hamano ---- - Documentation/config/core.txt | 2 +- - Documentation/git-credential-cache--daemon.txt | 6 +++--- - Documentation/git-fsmonitor--daemon.txt | 12 ++++++------ - Documentation/git-update-index.txt | 2 +- - 4 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/Documentation/config/core.txt b/Documentation/config/core.txt -index 889522956e45bb..e67392cc838499 100644 ---- a/Documentation/config/core.txt -+++ b/Documentation/config/core.txt -@@ -63,7 +63,7 @@ core.protectNTFS:: - - core.fsmonitor:: - If set to true, enable the built-in file system monitor -- daemon for this working directory (linkgit:git-fsmonitor--daemon[1]). -+ daemon for this working directory (linkgit:git-fsmonitor{litdd}daemon[1]). - + - Like hook-based file system monitors, the built-in file system monitor - can speed up Git commands that need to refresh the Git index -diff --git a/Documentation/git-credential-cache--daemon.txt b/Documentation/git-credential-cache--daemon.txt -index 7051c6bdf8f542..01e1c214dd82e1 100644 ---- a/Documentation/git-credential-cache--daemon.txt -+++ b/Documentation/git-credential-cache--daemon.txt -@@ -1,5 +1,5 @@ --git-credential-cache--daemon(1) --=============================== -+git-credential-cache{litdd}daemon(1) -+==================================== - - NAME - ---- -@@ -8,7 +8,7 @@ git-credential-cache--daemon - Temporarily store user credentials in memory - SYNOPSIS - -------- - [verse] --git credential-cache--daemon [--debug] -+'git credential-cache{litdd}daemon' [--debug] - - DESCRIPTION - ----------- -diff --git a/Documentation/git-fsmonitor--daemon.txt b/Documentation/git-fsmonitor--daemon.txt -index 0fedf5a4565f79..cc142fb8612c72 100644 ---- a/Documentation/git-fsmonitor--daemon.txt -+++ b/Documentation/git-fsmonitor--daemon.txt -@@ -1,5 +1,5 @@ --git-fsmonitor--daemon(1) --======================== -+git-fsmonitor{litdd}daemon(1) -+============================= - - NAME - ---- -@@ -8,10 +8,10 @@ git-fsmonitor--daemon - A Built-in File System Monitor - SYNOPSIS - -------- - [verse] --'git fsmonitor--daemon' start --'git fsmonitor--daemon' run --'git fsmonitor--daemon' stop --'git fsmonitor--daemon' status -+'git fsmonitor{litdd}daemon' start -+'git fsmonitor{litdd}daemon' run -+'git fsmonitor{litdd}daemon' stop -+'git fsmonitor{litdd}daemon' status - - DESCRIPTION - ----------- -diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt -index 64315e2e8c2d3f..5ea2f2c60e45a3 100644 ---- a/Documentation/git-update-index.txt -+++ b/Documentation/git-update-index.txt -@@ -528,7 +528,7 @@ This feature is intended to speed up git operations for repos that have - large working directories. - - It enables git to work together with a file system monitor (see --linkgit:git-fsmonitor--daemon[1] -+linkgit:git-fsmonitor{litdd}daemon[1] - and the - "fsmonitor-watchman" section of linkgit:githooks[5]) that can - inform it as to what files have been modified. This enables git to avoid diff --git a/git.spec b/git.spec index 287ef90..08dc543 100644 --- a/git.spec +++ b/git.spec @@ -77,14 +77,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.36.0 -Release: 0.0%{?rcrev}%{?dist} +Release: 0.1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -116,9 +116,6 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# https://lore.kernel.org/git/20220406184122.4126898-1-tmz@pobox.com/ -Patch1: https://github.com/git/git/commit/f3ea4bed2.patch#/0001-doc-replace-with-litdd-in-credential-cache-fsmonitor.patch - %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -1019,6 +1016,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Apr 08 2022 Todd Zullinger - 2.36.0-0.1.rc1 +- update to 2.36.0-rc1 + * Tue Apr 05 2022 Todd Zullinger - 2.36.0-0.0.rc0 - update to 2.36.0-rc0 - use httpd-core for tests on Fedora >= 37 diff --git a/sources b/sources index 567d1db..0d98a58 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.36.0.rc0.tar.xz) = 7417784582f17e9579fbae984a175af814ff6bd9b28b48d0405b8c4342566a4e138df0f544ee7fbccf25419a50c3848fb9d0830feb9848a2f41cae2c969989c4 -SHA512 (git-2.36.0.rc0.tar.sign) = f1c8217687c993a32a3b8b38cde242440e6c3de4093dffd68bd9d483f103d20701856254e9bc92c2945c75405dd2c67e4c66076c05b469bbf4b21b7752888358 +SHA512 (git-2.36.0.rc1.tar.xz) = 48c17b4071128bc8d5e79545cbf835cd8bcca5d204fcd7e81a7207254ae3ff47a52edc2cbd132f27c575860cd53e354e6b5f277753b91d51ffd7e6313ee5e6f2 +SHA512 (git-2.36.0.rc1.tar.sign) = c7de5cd63425cf4ae4f6e38805461296de737b637f0d0008ac6e6d260c3623d5c576cb97d04673aee21cd8bb1294c5e618c9a5f8ad3ffd2a43a936ada05d8ebd From 4787e39b4029c1a9e195c61404dce160091e6652 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 12 Apr 2022 21:02:44 -0400 Subject: [PATCH 742/842] update to 2.36.0-rc2 (CVE-2022-24765) Regarding CVE-2022-24765, the release announcement says: On multi-user machines, Git users might find themselves unexpectedly in a Git worktree, e.g. when another user created a repository in `C:\.git`, in a mounted network drive or in a scratch space. Merely having a Git-aware prompt that runs `git status` (or `git diff`) and navigating to a directory which is supposedly not a Git worktree, or opening such a directory in an editor or IDE such as VS Code or Atom, will potentially run commands defined by that other user. The new `safe.directory` setting may be used in either the system or global configuration to list directories which git should consider safe even if they are owned by someone other than the current user. Release notes: https://github.com/git/git/raw/v2.36.0-rc2/Documentation/RelNotes/2.36.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 08dc543..39cd06c 100644 --- a/git.spec +++ b/git.spec @@ -77,14 +77,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.36.0 -Release: 0.1%{?rcrev}%{?dist} +Release: 0.2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1016,6 +1016,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Apr 13 2022 Todd Zullinger - 2.36.0-0.2.rc2 +- update to 2.36.0-rc2 (CVE-2022-24765) + * Fri Apr 08 2022 Todd Zullinger - 2.36.0-0.1.rc1 - update to 2.36.0-rc1 diff --git a/sources b/sources index 0d98a58..134454c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.36.0.rc1.tar.xz) = 48c17b4071128bc8d5e79545cbf835cd8bcca5d204fcd7e81a7207254ae3ff47a52edc2cbd132f27c575860cd53e354e6b5f277753b91d51ffd7e6313ee5e6f2 -SHA512 (git-2.36.0.rc1.tar.sign) = c7de5cd63425cf4ae4f6e38805461296de737b637f0d0008ac6e6d260c3623d5c576cb97d04673aee21cd8bb1294c5e618c9a5f8ad3ffd2a43a936ada05d8ebd +SHA512 (git-2.36.0.rc2.tar.xz) = dfdd49fc7d25c6e2c4291afd5e9c234f4180226d9219cb6e70328dfdeb585a982a2f3b375ede578570825fff9f68ea126b3342512644906dc4333f9f953fe4a3 +SHA512 (git-2.36.0.rc2.tar.sign) = 8b7abfabd47f2be269717e6eb832bcdecf502efc11caa8533a3851e7fbd21e41644322d0784e73efc4dfd5bf4bc1b1094f8dedbd72758e7522b12d045507618c From f0106d7c9a6f80916f456831a4e985b08605d7fc Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 12 Apr 2022 22:50:19 -0400 Subject: [PATCH 743/842] disable failing tests on s390x on EL8 These tests fail on s390x, but only with EL8. They succeed on Fedora and EL9. This suggests the issue is not with git. Skip them to avoid blocking the Fedora releases which we care most about while still allowing builds in COPR and elsewhere for all Fedora/EPEL releases. --- git.spec | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/git.spec b/git.spec index 39cd06c..16a265a 100644 --- a/git.spec +++ b/git.spec @@ -841,6 +841,26 @@ GIT_SKIP_TESTS="$GIT_SKIP_TESTS t9115" %endif # endif %%{power64} +%ifarch s390x && 0%{?rhel} == 8 +# Skip tests which fail on s390x on rhel-8 +# +# The following tests fail on s390x & el8. The cause should be investigated. +# However, it's a lower priority since the same tests work consistently on +# s390x with Fedora and RHEL-9. The failures seem to originate in t5300. +# +# t5300.10 'unpack without delta' +# t5300.12 'unpack with REF_DELTA' +# t5300.14 'unpack with OFS_DELTA' +# t5303.5 'create corruption in data of first object' +# t5303.7 '... and loose copy of second object allows for partial recovery' +# t5303.11 'create corruption in data of first delta' +# t6300.35 'basic atom: head objectsize:disk' +# t6300.91 'basic atom: tag objectsize:disk' +# t6300.92 'basic atom: tag *objectsize:disk' +GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5300.{10,12,14} t5303.{5,7,11} t6300.{35,91,92}" +%endif +# endif s390x && rhel == 8 + export GIT_SKIP_TESTS # Set LANG so various UTF-8 tests are run @@ -1018,6 +1038,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Wed Apr 13 2022 Todd Zullinger - 2.36.0-0.2.rc2 - update to 2.36.0-rc2 (CVE-2022-24765) +- disable failing tests on s390x on EL8 * Fri Apr 08 2022 Todd Zullinger - 2.36.0-0.1.rc1 - update to 2.36.0-rc1 From 59a5ed4cff3a6d1b398ca56cd04542b60b97a87a Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 13 Apr 2022 21:35:36 -0400 Subject: [PATCH 744/842] usability improvements on top of CVE-2022-24765 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Per the release announcement¹, these patches... address usability issues in the recent releases 'v2.35.2', 'v2.34.2', 'v2.33.2', 'v2.32.1', 'v2.31.2', and 'v2.30.3', where each "safe" directory has to be listed on the safe.directory configuration variables. A broader escape hatch has been added so that the value '*' can be used to declare "my colleagues and their repositories I may ever visit are all trustworthy". ¹ https://lore.kernel.org/git/xmqq1qy04iqa.fsf@gitster.g/ --- 0001-t0033-add-tests-for-safe.directory.patch | 72 +++++++++++++++ ...safe.directory-key-not-being-checked.patch | 48 ++++++++++ ...opt-out-of-check-with-safe.directory.patch | 88 +++++++++++++++++++ git.spec | 10 ++- 4 files changed, 217 insertions(+), 1 deletion(-) create mode 100644 0001-t0033-add-tests-for-safe.directory.patch create mode 100644 0002-setup-fix-safe.directory-key-not-being-checked.patch create mode 100644 0003-setup-opt-out-of-check-with-safe.directory.patch diff --git a/0001-t0033-add-tests-for-safe.directory.patch b/0001-t0033-add-tests-for-safe.directory.patch new file mode 100644 index 0000000..6774b37 --- /dev/null +++ b/0001-t0033-add-tests-for-safe.directory.patch @@ -0,0 +1,72 @@ +From e47363e5a8bdf5144059d664c45c0975243ef05b Mon Sep 17 00:00:00 2001 +From: Derrick Stolee +Date: Wed, 13 Apr 2022 15:32:29 +0000 +Subject: [PATCH 1/3] t0033: add tests for safe.directory + +It is difficult to change the ownership on a directory in our test +suite, so insert a new GIT_TEST_ASSUME_DIFFERENT_OWNER environment +variable to trick Git into thinking we are in a differently-owned +directory. This allows us to test that the config is parsed correctly. + +Signed-off-by: Derrick Stolee +Signed-off-by: Junio C Hamano +--- + setup.c | 3 ++- + t/t0033-safe-directory.sh | 34 ++++++++++++++++++++++++++++++++++ + 2 files changed, 36 insertions(+), 1 deletion(-) + create mode 100755 t/t0033-safe-directory.sh + +diff --git a/setup.c b/setup.c +index 95d5b00940..3c6ed17af9 100644 +--- a/setup.c ++++ b/setup.c +@@ -1053,7 +1053,8 @@ static int ensure_valid_ownership(const char *path) + { + struct safe_directory_data data = { .path = path }; + +- if (is_path_owned_by_current_user(path)) ++ if (!git_env_bool("GIT_TEST_ASSUME_DIFFERENT_OWNER", 0) && ++ is_path_owned_by_current_user(path)) + return 1; + + read_very_early_config(safe_directory_cb, &data); +diff --git a/t/t0033-safe-directory.sh b/t/t0033-safe-directory.sh +new file mode 100755 +index 0000000000..9380ff3d01 +--- /dev/null ++++ b/t/t0033-safe-directory.sh +@@ -0,0 +1,34 @@ ++#!/bin/sh ++ ++test_description='verify safe.directory checks' ++ ++. ./test-lib.sh ++ ++GIT_TEST_ASSUME_DIFFERENT_OWNER=1 ++export GIT_TEST_ASSUME_DIFFERENT_OWNER ++ ++expect_rejected_dir () { ++ test_must_fail git status 2>err && ++ grep "safe.directory" err ++} ++ ++test_expect_success 'safe.directory is not set' ' ++ expect_rejected_dir ++' ++ ++test_expect_success 'safe.directory does not match' ' ++ git config --global safe.directory bogus && ++ expect_rejected_dir ++' ++ ++test_expect_success 'safe.directory matches' ' ++ git config --global --add safe.directory "$(pwd)" && ++ git status ++' ++ ++test_expect_success 'safe.directory matches, but is reset' ' ++ git config --global --add safe.directory "" && ++ expect_rejected_dir ++' ++ ++test_done diff --git a/0002-setup-fix-safe.directory-key-not-being-checked.patch b/0002-setup-fix-safe.directory-key-not-being-checked.patch new file mode 100644 index 0000000..d53a5f2 --- /dev/null +++ b/0002-setup-fix-safe.directory-key-not-being-checked.patch @@ -0,0 +1,48 @@ +From bb50ec3cc300eeff3aba7a2bea145aabdb477d31 Mon Sep 17 00:00:00 2001 +From: Matheus Valadares +Date: Wed, 13 Apr 2022 15:32:30 +0000 +Subject: [PATCH 2/3] setup: fix safe.directory key not being checked + +It seems that nothing is ever checking to make sure the safe directories +in the configs actually have the key safe.directory, so some unrelated +config that has a value with a certain directory would also make it a +safe directory. + +Signed-off-by: Matheus Valadares +Signed-off-by: Derrick Stolee +Signed-off-by: Junio C Hamano +--- + setup.c | 3 +++ + t/t0033-safe-directory.sh | 5 +++++ + 2 files changed, 8 insertions(+) + +diff --git a/setup.c b/setup.c +index 3c6ed17af9..4b9f073617 100644 +--- a/setup.c ++++ b/setup.c +@@ -1034,6 +1034,9 @@ static int safe_directory_cb(const char *key, const char *value, void *d) + { + struct safe_directory_data *data = d; + ++ if (strcmp(key, "safe.directory")) ++ return 0; ++ + if (!value || !*value) + data->is_safe = 0; + else { +diff --git a/t/t0033-safe-directory.sh b/t/t0033-safe-directory.sh +index 9380ff3d01..6f33c0dfef 100755 +--- a/t/t0033-safe-directory.sh ++++ b/t/t0033-safe-directory.sh +@@ -21,6 +21,11 @@ test_expect_success 'safe.directory does not match' ' + expect_rejected_dir + ' + ++test_expect_success 'path exist as different key' ' ++ git config --global foo.bar "$(pwd)" && ++ expect_rejected_dir ++' ++ + test_expect_success 'safe.directory matches' ' + git config --global --add safe.directory "$(pwd)" && + git status diff --git a/0003-setup-opt-out-of-check-with-safe.directory.patch b/0003-setup-opt-out-of-check-with-safe.directory.patch new file mode 100644 index 0000000..b734d9e --- /dev/null +++ b/0003-setup-opt-out-of-check-with-safe.directory.patch @@ -0,0 +1,88 @@ +From 0f85c4a30b072a26d74af8bbf63cc8f6a5dfc1b8 Mon Sep 17 00:00:00 2001 +From: Derrick Stolee +Date: Wed, 13 Apr 2022 15:32:31 +0000 +Subject: [PATCH 3/3] setup: opt-out of check with safe.directory=* + +With the addition of the safe.directory in 8959555ce +(setup_git_directory(): add an owner check for the top-level directory, +2022-03-02) released in v2.35.2, we are receiving feedback from a +variety of users about the feature. + +Some users have a very large list of shared repositories and find it +cumbersome to add this config for every one of them. + +In a more difficult case, certain workflows involve running Git commands +within containers. The container boundary prevents any global or system +config from communicating `safe.directory` values from the host into the +container. Further, the container almost always runs as a different user +than the owner of the directory in the host. + +To simplify the reactions necessary for these users, extend the +definition of the safe.directory config value to include a possible '*' +value. This value implies that all directories are safe, providing a +single setting to opt-out of this protection. + +Note that an empty assignment of safe.directory clears all previous +values, and this is already the case with the "if (!value || !*value)" +condition. + +Signed-off-by: Derrick Stolee +Signed-off-by: Junio C Hamano +--- + Documentation/config/safe.txt | 7 +++++++ + setup.c | 6 ++++-- + t/t0033-safe-directory.sh | 10 ++++++++++ + 3 files changed, 21 insertions(+), 2 deletions(-) + +diff --git a/Documentation/config/safe.txt b/Documentation/config/safe.txt +index 63597b2df8..6d764fe0cc 100644 +--- a/Documentation/config/safe.txt ++++ b/Documentation/config/safe.txt +@@ -19,3 +19,10 @@ line option `-c safe.directory=`. + The value of this setting is interpolated, i.e. `~/` expands to a + path relative to the home directory and `%(prefix)/` expands to a + path relative to Git's (runtime) prefix. +++ ++To completely opt-out of this security check, set `safe.directory` to the ++string `*`. This will allow all repositories to be treated as if their ++directory was listed in the `safe.directory` list. If `safe.directory=*` ++is set in system config and you want to re-enable this protection, then ++initialize your list with an empty value before listing the repositories ++that you deem safe. +diff --git a/setup.c b/setup.c +index 4b9f073617..aad9ace0af 100644 +--- a/setup.c ++++ b/setup.c +@@ -1037,9 +1037,11 @@ static int safe_directory_cb(const char *key, const char *value, void *d) + if (strcmp(key, "safe.directory")) + return 0; + +- if (!value || !*value) ++ if (!value || !*value) { + data->is_safe = 0; +- else { ++ } else if (!strcmp(value, "*")) { ++ data->is_safe = 1; ++ } else { + const char *interpolated = NULL; + + if (!git_config_pathname(&interpolated, key, value) && +diff --git a/t/t0033-safe-directory.sh b/t/t0033-safe-directory.sh +index 6f33c0dfef..239d93f4d2 100755 +--- a/t/t0033-safe-directory.sh ++++ b/t/t0033-safe-directory.sh +@@ -36,4 +36,14 @@ test_expect_success 'safe.directory matches, but is reset' ' + expect_rejected_dir + ' + ++test_expect_success 'safe.directory=*' ' ++ git config --global --add safe.directory "*" && ++ git status ++' ++ ++test_expect_success 'safe.directory=*, but is reset' ' ++ git config --global --add safe.directory "" && ++ expect_rejected_dir ++' ++ + test_done diff --git a/git.spec b/git.spec index 16a265a..4060513 100644 --- a/git.spec +++ b/git.spec @@ -84,7 +84,7 @@ Name: git Version: 2.36.0 -Release: 0.2%{?rcrev}%{?dist} +Release: 0.3%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -116,6 +116,11 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch +# Usability improvements on top of CVE-2022-24765 +Patch1: 0001-t0033-add-tests-for-safe.directory.patch +Patch2: 0002-setup-fix-safe.directory-key-not-being-checked.patch +Patch3: 0003-setup-opt-out-of-check-with-safe.directory.patch + %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -1036,6 +1041,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Apr 14 2022 Todd Zullinger - 2.36.0-0.3.rc2 +- usability improvements on top of CVE-2022-24765 + * Wed Apr 13 2022 Todd Zullinger - 2.36.0-0.2.rc2 - update to 2.36.0-rc2 (CVE-2022-24765) - disable failing tests on s390x on EL8 From dbec023603a5a5ced85a0192a02bc88f39ac820c Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 18 Apr 2022 14:11:02 -0400 Subject: [PATCH 745/842] update to 2.36.0 Release notes: https://github.com/git/git/raw/v2.36.0/Documentation/RelNotes/2.36.0.txt --- 0001-t0033-add-tests-for-safe.directory.patch | 72 --------------- ...safe.directory-key-not-being-checked.patch | 48 ---------- ...opt-out-of-check-with-safe.directory.patch | 88 ------------------- git.spec | 12 ++- sources | 4 +- 5 files changed, 7 insertions(+), 217 deletions(-) delete mode 100644 0001-t0033-add-tests-for-safe.directory.patch delete mode 100644 0002-setup-fix-safe.directory-key-not-being-checked.patch delete mode 100644 0003-setup-opt-out-of-check-with-safe.directory.patch diff --git a/0001-t0033-add-tests-for-safe.directory.patch b/0001-t0033-add-tests-for-safe.directory.patch deleted file mode 100644 index 6774b37..0000000 --- a/0001-t0033-add-tests-for-safe.directory.patch +++ /dev/null @@ -1,72 +0,0 @@ -From e47363e5a8bdf5144059d664c45c0975243ef05b Mon Sep 17 00:00:00 2001 -From: Derrick Stolee -Date: Wed, 13 Apr 2022 15:32:29 +0000 -Subject: [PATCH 1/3] t0033: add tests for safe.directory - -It is difficult to change the ownership on a directory in our test -suite, so insert a new GIT_TEST_ASSUME_DIFFERENT_OWNER environment -variable to trick Git into thinking we are in a differently-owned -directory. This allows us to test that the config is parsed correctly. - -Signed-off-by: Derrick Stolee -Signed-off-by: Junio C Hamano ---- - setup.c | 3 ++- - t/t0033-safe-directory.sh | 34 ++++++++++++++++++++++++++++++++++ - 2 files changed, 36 insertions(+), 1 deletion(-) - create mode 100755 t/t0033-safe-directory.sh - -diff --git a/setup.c b/setup.c -index 95d5b00940..3c6ed17af9 100644 ---- a/setup.c -+++ b/setup.c -@@ -1053,7 +1053,8 @@ static int ensure_valid_ownership(const char *path) - { - struct safe_directory_data data = { .path = path }; - -- if (is_path_owned_by_current_user(path)) -+ if (!git_env_bool("GIT_TEST_ASSUME_DIFFERENT_OWNER", 0) && -+ is_path_owned_by_current_user(path)) - return 1; - - read_very_early_config(safe_directory_cb, &data); -diff --git a/t/t0033-safe-directory.sh b/t/t0033-safe-directory.sh -new file mode 100755 -index 0000000000..9380ff3d01 ---- /dev/null -+++ b/t/t0033-safe-directory.sh -@@ -0,0 +1,34 @@ -+#!/bin/sh -+ -+test_description='verify safe.directory checks' -+ -+. ./test-lib.sh -+ -+GIT_TEST_ASSUME_DIFFERENT_OWNER=1 -+export GIT_TEST_ASSUME_DIFFERENT_OWNER -+ -+expect_rejected_dir () { -+ test_must_fail git status 2>err && -+ grep "safe.directory" err -+} -+ -+test_expect_success 'safe.directory is not set' ' -+ expect_rejected_dir -+' -+ -+test_expect_success 'safe.directory does not match' ' -+ git config --global safe.directory bogus && -+ expect_rejected_dir -+' -+ -+test_expect_success 'safe.directory matches' ' -+ git config --global --add safe.directory "$(pwd)" && -+ git status -+' -+ -+test_expect_success 'safe.directory matches, but is reset' ' -+ git config --global --add safe.directory "" && -+ expect_rejected_dir -+' -+ -+test_done diff --git a/0002-setup-fix-safe.directory-key-not-being-checked.patch b/0002-setup-fix-safe.directory-key-not-being-checked.patch deleted file mode 100644 index d53a5f2..0000000 --- a/0002-setup-fix-safe.directory-key-not-being-checked.patch +++ /dev/null @@ -1,48 +0,0 @@ -From bb50ec3cc300eeff3aba7a2bea145aabdb477d31 Mon Sep 17 00:00:00 2001 -From: Matheus Valadares -Date: Wed, 13 Apr 2022 15:32:30 +0000 -Subject: [PATCH 2/3] setup: fix safe.directory key not being checked - -It seems that nothing is ever checking to make sure the safe directories -in the configs actually have the key safe.directory, so some unrelated -config that has a value with a certain directory would also make it a -safe directory. - -Signed-off-by: Matheus Valadares -Signed-off-by: Derrick Stolee -Signed-off-by: Junio C Hamano ---- - setup.c | 3 +++ - t/t0033-safe-directory.sh | 5 +++++ - 2 files changed, 8 insertions(+) - -diff --git a/setup.c b/setup.c -index 3c6ed17af9..4b9f073617 100644 ---- a/setup.c -+++ b/setup.c -@@ -1034,6 +1034,9 @@ static int safe_directory_cb(const char *key, const char *value, void *d) - { - struct safe_directory_data *data = d; - -+ if (strcmp(key, "safe.directory")) -+ return 0; -+ - if (!value || !*value) - data->is_safe = 0; - else { -diff --git a/t/t0033-safe-directory.sh b/t/t0033-safe-directory.sh -index 9380ff3d01..6f33c0dfef 100755 ---- a/t/t0033-safe-directory.sh -+++ b/t/t0033-safe-directory.sh -@@ -21,6 +21,11 @@ test_expect_success 'safe.directory does not match' ' - expect_rejected_dir - ' - -+test_expect_success 'path exist as different key' ' -+ git config --global foo.bar "$(pwd)" && -+ expect_rejected_dir -+' -+ - test_expect_success 'safe.directory matches' ' - git config --global --add safe.directory "$(pwd)" && - git status diff --git a/0003-setup-opt-out-of-check-with-safe.directory.patch b/0003-setup-opt-out-of-check-with-safe.directory.patch deleted file mode 100644 index b734d9e..0000000 --- a/0003-setup-opt-out-of-check-with-safe.directory.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 0f85c4a30b072a26d74af8bbf63cc8f6a5dfc1b8 Mon Sep 17 00:00:00 2001 -From: Derrick Stolee -Date: Wed, 13 Apr 2022 15:32:31 +0000 -Subject: [PATCH 3/3] setup: opt-out of check with safe.directory=* - -With the addition of the safe.directory in 8959555ce -(setup_git_directory(): add an owner check for the top-level directory, -2022-03-02) released in v2.35.2, we are receiving feedback from a -variety of users about the feature. - -Some users have a very large list of shared repositories and find it -cumbersome to add this config for every one of them. - -In a more difficult case, certain workflows involve running Git commands -within containers. The container boundary prevents any global or system -config from communicating `safe.directory` values from the host into the -container. Further, the container almost always runs as a different user -than the owner of the directory in the host. - -To simplify the reactions necessary for these users, extend the -definition of the safe.directory config value to include a possible '*' -value. This value implies that all directories are safe, providing a -single setting to opt-out of this protection. - -Note that an empty assignment of safe.directory clears all previous -values, and this is already the case with the "if (!value || !*value)" -condition. - -Signed-off-by: Derrick Stolee -Signed-off-by: Junio C Hamano ---- - Documentation/config/safe.txt | 7 +++++++ - setup.c | 6 ++++-- - t/t0033-safe-directory.sh | 10 ++++++++++ - 3 files changed, 21 insertions(+), 2 deletions(-) - -diff --git a/Documentation/config/safe.txt b/Documentation/config/safe.txt -index 63597b2df8..6d764fe0cc 100644 ---- a/Documentation/config/safe.txt -+++ b/Documentation/config/safe.txt -@@ -19,3 +19,10 @@ line option `-c safe.directory=`. - The value of this setting is interpolated, i.e. `~/` expands to a - path relative to the home directory and `%(prefix)/` expands to a - path relative to Git's (runtime) prefix. -++ -+To completely opt-out of this security check, set `safe.directory` to the -+string `*`. This will allow all repositories to be treated as if their -+directory was listed in the `safe.directory` list. If `safe.directory=*` -+is set in system config and you want to re-enable this protection, then -+initialize your list with an empty value before listing the repositories -+that you deem safe. -diff --git a/setup.c b/setup.c -index 4b9f073617..aad9ace0af 100644 ---- a/setup.c -+++ b/setup.c -@@ -1037,9 +1037,11 @@ static int safe_directory_cb(const char *key, const char *value, void *d) - if (strcmp(key, "safe.directory")) - return 0; - -- if (!value || !*value) -+ if (!value || !*value) { - data->is_safe = 0; -- else { -+ } else if (!strcmp(value, "*")) { -+ data->is_safe = 1; -+ } else { - const char *interpolated = NULL; - - if (!git_config_pathname(&interpolated, key, value) && -diff --git a/t/t0033-safe-directory.sh b/t/t0033-safe-directory.sh -index 6f33c0dfef..239d93f4d2 100755 ---- a/t/t0033-safe-directory.sh -+++ b/t/t0033-safe-directory.sh -@@ -36,4 +36,14 @@ test_expect_success 'safe.directory matches, but is reset' ' - expect_rejected_dir - ' - -+test_expect_success 'safe.directory=*' ' -+ git config --global --add safe.directory "*" && -+ git status -+' -+ -+test_expect_success 'safe.directory=*, but is reset' ' -+ git config --global --add safe.directory "" && -+ expect_rejected_dir -+' -+ - test_done diff --git a/git.spec b/git.spec index 4060513..250761b 100644 --- a/git.spec +++ b/git.spec @@ -77,14 +77,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.36.0 -Release: 0.3%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -116,11 +116,6 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# Usability improvements on top of CVE-2022-24765 -Patch1: 0001-t0033-add-tests-for-safe.directory.patch -Patch2: 0002-setup-fix-safe.directory-key-not-being-checked.patch -Patch3: 0003-setup-opt-out-of-check-with-safe.directory.patch - %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -1041,6 +1036,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Apr 18 2022 Todd Zullinger - 2.36.0-1 +- update to 2.36.0 + * Thu Apr 14 2022 Todd Zullinger - 2.36.0-0.3.rc2 - usability improvements on top of CVE-2022-24765 diff --git a/sources b/sources index 134454c..07711e7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.36.0.rc2.tar.xz) = dfdd49fc7d25c6e2c4291afd5e9c234f4180226d9219cb6e70328dfdeb585a982a2f3b375ede578570825fff9f68ea126b3342512644906dc4333f9f953fe4a3 -SHA512 (git-2.36.0.rc2.tar.sign) = 8b7abfabd47f2be269717e6eb832bcdecf502efc11caa8533a3851e7fbd21e41644322d0784e73efc4dfd5bf4bc1b1094f8dedbd72758e7522b12d045507618c +SHA512 (git-2.36.0.tar.xz) = dce0d7dbe684af070271830a01bf1b9cc289182f5106f6e3303b1b3a0d5dc74bebf6ac0174373db05a28f5acc62acb095bc9385dabeeecc1d6e8567dce29b766 +SHA512 (git-2.36.0.tar.sign) = 51343a6443a95db4e896687987876d5259fe8e52fc14bbaa87314f7e3be3e36655d087c6453ca8208face5b28db10b503e5e52487cfa3f3664d2b4a761561815 From b76548f9c23d21ad96a1c319f0b2f28363b83bf0 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 18 Apr 2022 14:11:02 -0400 Subject: [PATCH 746/842] update to 2.36.1 Release notes: https://github.com/git/git/raw/v2.36.1/Documentation/RelNotes/2.36.1.txt --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 250761b..347ebd0 100644 --- a/git.spec +++ b/git.spec @@ -83,7 +83,7 @@ %global _package_note_file %{_builddir}/%{name}-%{version}%{?rcrev}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.36.0 +Version: 2.36.1 Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -1036,6 +1036,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri May 06 2022 Todd Zullinger - 2.36.1-1 +- update to 2.36.1 + * Mon Apr 18 2022 Todd Zullinger - 2.36.0-1 - update to 2.36.0 diff --git a/sources b/sources index 07711e7..2a46fa9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.36.0.tar.xz) = dce0d7dbe684af070271830a01bf1b9cc289182f5106f6e3303b1b3a0d5dc74bebf6ac0174373db05a28f5acc62acb095bc9385dabeeecc1d6e8567dce29b766 -SHA512 (git-2.36.0.tar.sign) = 51343a6443a95db4e896687987876d5259fe8e52fc14bbaa87314f7e3be3e36655d087c6453ca8208face5b28db10b503e5e52487cfa3f3664d2b4a761561815 +SHA512 (git-2.36.1.tar.xz) = 459432bd0c1d5a87c828a6fbf6d3473f14bf6b95783b3f27ea4f3af1ba9fd0e712a96a41276a16c6ebeb7ac3583a5f445eedd0a9e19fe160c2c8e309ec58818e +SHA512 (git-2.36.1.tar.sign) = 60e8ca4b1219020c79405cffb1612dc027fd67a5af1780d937795a6f12f9231a8bfdfb2f53aee2f61c1acfb01f0d8fc626fbf3467bb7c435aebf4fcbd441b08b From 09bd4bb5d8b7a78570107d6bcdda99d6377bfea6 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 1 Jun 2022 08:18:21 +0200 Subject: [PATCH 747/842] Perl 5.36 rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 347ebd0..b5a5e85 100644 --- a/git.spec +++ b/git.spec @@ -84,7 +84,7 @@ Name: git Version: 2.36.1 -Release: 1%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist}.1 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1036,6 +1036,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Jun 01 2022 Jitka Plesnikova - 2.36.1-1.1 +- Perl 5.36 rebuild + * Fri May 06 2022 Todd Zullinger - 2.36.1-1 - update to 2.36.1 From a35db90ce1c19abf5ada66e8a315c93e7f1709d8 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 3 Jun 2022 13:30:49 +0200 Subject: [PATCH 748/842] Perl 5.36 re-rebuild of bootstrapped packages --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index b5a5e85..d0f0503 100644 --- a/git.spec +++ b/git.spec @@ -84,7 +84,7 @@ Name: git Version: 2.36.1 -Release: 1%{?rcrev}%{?dist}.1 +Release: 1%{?rcrev}%{?dist}.2 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1036,6 +1036,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Jun 03 2022 Jitka Plesnikova - 2.36.1-1.2 +- Perl 5.36 re-rebuild of bootstrapped packages + * Wed Jun 01 2022 Jitka Plesnikova - 2.36.1-1.1 - Perl 5.36 rebuild From 81908fa387158fd68ea07e8e08d6ac718e19b1fc Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 14 Jun 2022 01:18:56 -0400 Subject: [PATCH 749/842] update to 2.37.0-rc0 Release notes: https://github.com/git/git/raw/v2.37.0-rc0/Documentation/RelNotes/2.37.0.txt --- git.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index d0f0503..0555712 100644 --- a/git.spec +++ b/git.spec @@ -77,14 +77,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.36.1 -Release: 1%{?rcrev}%{?dist}.2 +Version: 2.37.0 +Release: 0.0%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1036,6 +1036,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Jun 14 2022 Todd Zullinger - 2.37.0-0.0.rc0 +- update to 2.37.0-rc0 + * Fri Jun 03 2022 Jitka Plesnikova - 2.36.1-1.2 - Perl 5.36 re-rebuild of bootstrapped packages diff --git a/sources b/sources index 2a46fa9..a0e2d2e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.36.1.tar.xz) = 459432bd0c1d5a87c828a6fbf6d3473f14bf6b95783b3f27ea4f3af1ba9fd0e712a96a41276a16c6ebeb7ac3583a5f445eedd0a9e19fe160c2c8e309ec58818e -SHA512 (git-2.36.1.tar.sign) = 60e8ca4b1219020c79405cffb1612dc027fd67a5af1780d937795a6f12f9231a8bfdfb2f53aee2f61c1acfb01f0d8fc626fbf3467bb7c435aebf4fcbd441b08b +SHA512 (git-2.37.0.rc0.tar.xz) = bcb69bc211ea4a439260dca6b61afeb0ea1f61ad892f169d990454038ad83e28eccbf9d1da6d9f4deb56b1016d8cca6a431374e8f3401c33a6ca99f403391790 +SHA512 (git-2.37.0.rc0.tar.sign) = 6d3443504b012d580209afee938c99f4ae6ee34257a17e7f58adf640f42c54140f6873f4a15ca36ffa06d5d9740ecbab6fa39c8331f5e9bbfdbd522e30f24c0e From 70428fb2e85e754ccad0b3fc051c40c9aad77656 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 13 Jun 2022 23:49:48 -0400 Subject: [PATCH 750/842] fix GIT_SKIP_TESTS for EL8 s390x The GIT_SKIP_TESTS variable does not support brace expansion. It was my mistake thinking that it did. List the tests to skip properly. If we had a longer list and *really* wanted to use brace expansion, we could do something like this: GIT_SKIP_TESTS="$GIT_SKIP_TESTS $(echo t5300.{10,12,14} t5303.{5,7,11} t6300.{35,91,92})" In this case, that's more characters _and_ more complexity, so it makes no sense to use it. (Even if it were shorter, it doesn't necessarily justify the extra complexity.) Expand the list of tests to skip to cover those which fail due to the earlier skipped tests. Additionally, GIT_SKIP_TESTS is (unintentionally) set on systems other than EL8. Fix the conditional to only skip these tests on s390x on EL8. --- git.spec | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 0555712..41f02f3 100644 --- a/git.spec +++ b/git.spec @@ -841,7 +841,7 @@ GIT_SKIP_TESTS="$GIT_SKIP_TESTS t9115" %endif # endif %%{power64} -%ifarch s390x && 0%{?rhel} == 8 +%if 0%{?rhel} == 8 && "%{_arch}" == "s390x" # Skip tests which fail on s390x on rhel-8 # # The following tests fail on s390x & el8. The cause should be investigated. @@ -850,16 +850,26 @@ GIT_SKIP_TESTS="$GIT_SKIP_TESTS t9115" # # t5300.10 'unpack without delta' # t5300.12 'unpack with REF_DELTA' +# t5300.13 'unpack with REF_DELTA' # t5300.14 'unpack with OFS_DELTA' +# t5300.18 'compare delta flavors' +# t5300.20 'use packed deltified (REF_DELTA) objects' +# t5300.23 'verify pack' +# t5300.24 'verify pack -v' +# t5300.25 'verify-pack catches mismatched .idx and .pack files' +# t5300.29 'verify-pack catches a corrupted sum of the index file itself' +# t5300.30 'build pack index for an existing pack' +# t5300.45 'make sure index-pack detects the SHA1 collision' +# t5300.46 'make sure index-pack detects the SHA1 collision (large blobs)' # t5303.5 'create corruption in data of first object' # t5303.7 '... and loose copy of second object allows for partial recovery' # t5303.11 'create corruption in data of first delta' # t6300.35 'basic atom: head objectsize:disk' # t6300.91 'basic atom: tag objectsize:disk' # t6300.92 'basic atom: tag *objectsize:disk' -GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5300.{10,12,14} t5303.{5,7,11} t6300.{35,91,92}" +GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5300.1[02348] t5300.2[03459] t5300.30 t5300.4[56] t5303.[57] t5303.11 t6300.35 t6300.9[12]" %endif -# endif s390x && rhel == 8 +# endif rhel == 8 && arch == s390x export GIT_SKIP_TESTS @@ -1038,6 +1048,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Tue Jun 14 2022 Todd Zullinger - 2.37.0-0.0.rc0 - update to 2.37.0-rc0 +- fix GIT_SKIP_TESTS for EL8 s390x * Fri Jun 03 2022 Jitka Plesnikova - 2.36.1-1.2 - Perl 5.36 re-rebuild of bootstrapped packages From 33956465a148eec72f465deb3c32e143e41496ea Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 13 Jun 2022 23:45:30 -0400 Subject: [PATCH 751/842] remove --with/--without emacs build conditional The emacs bcond support was added cdea01a (drop emacs-git stub for fedora >= 34 (#1882360), 2020-10-10). Now that Fedora 34 is EOL, we no longer need the conditional. --- git.spec | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/git.spec b/git.spec index 41f02f3..65ba831 100644 --- a/git.spec +++ b/git.spec @@ -6,13 +6,6 @@ %global gitexecdir %{_libexecdir}/git-core -# Settings for Fedora >= 34 -%if 0%{?fedora} >= 34 -%bcond_with emacs -%else -%bcond_without emacs -%endif - # Settings for Fedora %if 0%{?fedora} # linkchecker is not available on EL @@ -137,10 +130,6 @@ BuildRequires: linkchecker BuildRequires: coreutils BuildRequires: desktop-file-utils BuildRequires: diffutils -%if %{with emacs} -BuildRequires: emacs-common -%endif -# endif emacs-common %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. @@ -267,17 +256,6 @@ Requires: perl(Term::ReadKey) # endif ! defined perl_bootstrap Requires: perl-Git = %{version}-%{release} -%if %{with emacs} && %{defined _emacs_version} -Requires: emacs-filesystem >= %{_emacs_version} -%endif -# endif with emacs && defined _emacs_version - -# Obsolete emacs-git if it's disabled -%if %{without emacs} -Obsoletes: emacs-git < %{?epoch:%{epoch}:}%{version}-%{release} -%endif -# endif without emacs - # Obsolete git-cvs if it's disabled %if %{without cvs} Obsoletes: git-cvs < %{?epoch:%{epoch}:}%{version}-%{release} @@ -636,19 +614,6 @@ sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \ %make_install -C contrib/contacts -%if %{with emacs} -%global elispdir %{_emacs_sitelispdir}/git -pushd contrib/emacs >/dev/null -for el in *.el ; do - # Note: No byte-compiling is done. These .el files are one-line stubs - # which only serve to point users to better alternatives. - install -Dpm 644 $el %{buildroot}%{elispdir}/$el - rm -f $el # clean up to avoid cruft in git-core-doc -done -popd >/dev/null -%endif -# endif with emacs - %if %{with libsecret} install -pm 755 contrib/credential/libsecret/git-credential-libsecret \ %{buildroot}%{gitexecdir} @@ -915,10 +880,6 @@ rmdir --ignore-fail-on-non-empty "$testdir" %systemd_postun_with_restart git.socket %files -f bin-man-doc-git-files -%if %{with emacs} -%{elispdir} -%endif -# endif with emacs %{_datadir}/git-core/contrib/diff-highlight %{_datadir}/git-core/contrib/hooks/update-paranoid %{_datadir}/git-core/contrib/hooks/setgitperms.perl @@ -1049,6 +1010,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" * Tue Jun 14 2022 Todd Zullinger - 2.37.0-0.0.rc0 - update to 2.37.0-rc0 - fix GIT_SKIP_TESTS for EL8 s390x +- remove --with/--without emacs build conditional * Fri Jun 03 2022 Jitka Plesnikova - 2.36.1-1.2 - Perl 5.36 re-rebuild of bootstrapped packages From 7d205ab48d41596df2a37bd4742ecad8fc4b3e6c Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 17 Jun 2022 22:55:42 -0400 Subject: [PATCH 752/842] update to 2.37.0-rc1 Add 'missing FSMONITOR_DAEMON' and 'You must set env var GIT_TEST_ALLOW_SUDO=YES in order to run this test' to git.skip-test-patterns to cover new test prerequisites. Release notes: https://github.com/git/git/raw/v2.37.0-rc1/Documentation/RelNotes/2.37.0.txt --- git.skip-test-patterns | 2 ++ git.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/git.skip-test-patterns b/git.skip-test-patterns index 234d37a..1a1139f 100644 --- a/git.skip-test-patterns +++ b/git.skip-test-patterns @@ -6,6 +6,7 @@ missing AUTOIDENT missing CASE_INSENSITIVE_FS missing DONTHAVEIT missing ([!]LONG_IS_64BIT,)?EXPENSIVE +missing FSMONITOR_DAEMON missing JGIT missing !?LAZY_(TRUE|FALSE) missing MINGW @@ -26,3 +27,4 @@ skipping svn-info test skipping Windows-(only path|specific) tests Test requiring writable / skipped used to test external credential helpers +You must set env var GIT_TEST_ALLOW_SUDO=YES in order to run this test diff --git a/git.spec b/git.spec index 65ba831..d58e164 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.37.0 -Release: 0.0%{?rcrev}%{?dist} +Release: 0.1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1007,6 +1007,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Jun 17 2022 Todd Zullinger - 2.37.0-0.1.rc1 +- update to 2.37.0-rc1 + * Tue Jun 14 2022 Todd Zullinger - 2.37.0-0.0.rc0 - update to 2.37.0-rc0 - fix GIT_SKIP_TESTS for EL8 s390x diff --git a/sources b/sources index a0e2d2e..aed88fa 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.37.0.rc0.tar.xz) = bcb69bc211ea4a439260dca6b61afeb0ea1f61ad892f169d990454038ad83e28eccbf9d1da6d9f4deb56b1016d8cca6a431374e8f3401c33a6ca99f403391790 -SHA512 (git-2.37.0.rc0.tar.sign) = 6d3443504b012d580209afee938c99f4ae6ee34257a17e7f58adf640f42c54140f6873f4a15ca36ffa06d5d9740ecbab6fa39c8331f5e9bbfdbd522e30f24c0e +SHA512 (git-2.37.0.rc1.tar.xz) = 4a2ddb7d4be9bcfcdcc181693d09bd4b34db0b44d22c3df6bcbb82f99950dfa2a19aebe0d877386be1c731cc307c891e85fe48c50c7988299ee92ed3aad95d11 +SHA512 (git-2.37.0.rc1.tar.sign) = 0b622b99e0f2a56784e50c395661cc305e6a30b8bb8b5bf41d202929fe140ae3b32d8502089f316d8662d2c704060122c7b35debc2d7413c66a662a144ce2469 From 8b14c0b19ff01e4193995083fd72a5252cced4df Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 22 Jun 2022 15:51:09 -0400 Subject: [PATCH 753/842] update to 2.37.0-rc2 Release notes: https://github.com/git/git/raw/v2.37.0-rc2/Documentation/RelNotes/2.37.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index d58e164..6552e98 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.37.0 -Release: 0.1%{?rcrev}%{?dist} +Release: 0.2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1007,6 +1007,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Jun 22 2022 Todd Zullinger - 2.37.0-0.2.rc2 +- update to 2.37.0-rc2 + * Fri Jun 17 2022 Todd Zullinger - 2.37.0-0.1.rc1 - update to 2.37.0-rc1 diff --git a/sources b/sources index aed88fa..1f84e38 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.37.0.rc1.tar.xz) = 4a2ddb7d4be9bcfcdcc181693d09bd4b34db0b44d22c3df6bcbb82f99950dfa2a19aebe0d877386be1c731cc307c891e85fe48c50c7988299ee92ed3aad95d11 -SHA512 (git-2.37.0.rc1.tar.sign) = 0b622b99e0f2a56784e50c395661cc305e6a30b8bb8b5bf41d202929fe140ae3b32d8502089f316d8662d2c704060122c7b35debc2d7413c66a662a144ce2469 +SHA512 (git-2.37.0.rc2.tar.xz) = 1b81180f2ed4566a74bc37d47fa9790eb70048c43b5204a9eda03d6fe6dd8c273ccb464d2490877b6ada901845edc9ec7cc1a6d73c064be5d426ff9b9e64e1e5 +SHA512 (git-2.37.0.rc2.tar.sign) = 6b71e9495a4b758029ff37dca304c57161e60d88587f43dff32abf4c0dc218a329a16b16831e39eb0be3b6d61da1f91f7a9444eea38af4dfed4da8c0b6f80821 From eab9894931e14536f8965a8e524fc83e0a1fd2b1 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 27 Jun 2022 15:07:38 -0400 Subject: [PATCH 754/842] update to 2.37.0 Release notes: https://github.com/git/git/raw/v2.37.0/Documentation/RelNotes/2.37.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 6552e98..4863e00 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.37.0 -Release: 0.2%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1007,6 +1007,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Jun 27 2022 Todd Zullinger - 2.37.0-1 +- update to 2.37.0 + * Wed Jun 22 2022 Todd Zullinger - 2.37.0-0.2.rc2 - update to 2.37.0-rc2 diff --git a/sources b/sources index 1f84e38..d351812 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.37.0.rc2.tar.xz) = 1b81180f2ed4566a74bc37d47fa9790eb70048c43b5204a9eda03d6fe6dd8c273ccb464d2490877b6ada901845edc9ec7cc1a6d73c064be5d426ff9b9e64e1e5 -SHA512 (git-2.37.0.rc2.tar.sign) = 6b71e9495a4b758029ff37dca304c57161e60d88587f43dff32abf4c0dc218a329a16b16831e39eb0be3b6d61da1f91f7a9444eea38af4dfed4da8c0b6f80821 +SHA512 (git-2.37.0.tar.xz) = 2ae3c845c9d0e0f5245e47f95c958c86a4aa2c47dfe31bff6fc81b2434d2e9402b7eced18700c04ba7158ed6a72807a81c4cde6a26dd30c969b4267b8fce4d0a +SHA512 (git-2.37.0.tar.sign) = f2f8816cacf0abc66e52123618192ae87153492a95d2390fe457ca9b8910a261c4d2225937b45658a1c3d7e6a4dc4f05527831c232461b955be600d981e756e3 From 47478b1513a0ad0755d75d49c35bc6801722f3ac Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 12 Jul 2022 13:33:11 -0400 Subject: [PATCH 755/842] update to 2.37.1 (CVE-2022-29187) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From the release notes for 2.30.5¹: This release contains minor fix-ups for the changes that went into Git 2.30.3 and 2.30.4, addressing CVE-2022-29187. * The safety check that verifies a safe ownership of the Git worktree is now extended to also cover the ownership of the Git directory (and the `.git` file, if there is any). Carlo Marcelo Arenas Belón (1): setup: tighten ownership checks post CVE-2022-24765 Additionally, from the release notes for 2.37.1²: * Rewrite of "git add -i" in C that appeared in Git 2.25 didn't correctly record a removed file to the index, which is an old regression but has become widely known because the C version has become the default in the latest release. ¹ https://github.com/git/git/raw/v2.37.1/Documentation/RelNotes/2.30.5.txt ² https://github.com/git/git/raw/v2.37.1/Documentation/RelNotes/2.37.1.txt --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 4863e00..8c50c7f 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.37.0 +Version: 2.37.1 Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -1007,6 +1007,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Jul 12 2022 Todd Zullinger - 2.37.1-1 +- update to 2.37.1 (CVE-2022-29187) + * Mon Jun 27 2022 Todd Zullinger - 2.37.0-1 - update to 2.37.0 diff --git a/sources b/sources index d351812..45b2c13 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.37.0.tar.xz) = 2ae3c845c9d0e0f5245e47f95c958c86a4aa2c47dfe31bff6fc81b2434d2e9402b7eced18700c04ba7158ed6a72807a81c4cde6a26dd30c969b4267b8fce4d0a -SHA512 (git-2.37.0.tar.sign) = f2f8816cacf0abc66e52123618192ae87153492a95d2390fe457ca9b8910a261c4d2225937b45658a1c3d7e6a4dc4f05527831c232461b955be600d981e756e3 +SHA512 (git-2.37.1.tar.xz) = 3c9cad6b4757f425ee53996d8d80db2226b246513cbcec9011022e02e4235d7ec38c7c1aada73bb3c9279a91d1aaf8664633356ce1dce847e0d371f702a5b766 +SHA512 (git-2.37.1.tar.sign) = 204b84321e0eadcde81d4e2dc134d53706a569c77dd34a1919543ec3b0561b828eb6525a12cd3fba7238e03e9e26708d6d2b64cd1a4d902ee4d6e680339603a9 From 0266063d10ccdc4ba3f65595b15a8de474d50538 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 06:16:03 +0000 Subject: [PATCH 756/842] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 8c50c7f..42fb2b8 100644 --- a/git.spec +++ b/git.spec @@ -77,7 +77,7 @@ Name: git Version: 2.37.1 -Release: 1%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist}.1 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1007,6 +1007,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.37.1-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Jul 12 2022 Todd Zullinger - 2.37.1-1 - update to 2.37.1 (CVE-2022-29187) From 3eb6f047dca4b5670c71d48c094b1ce601f5db44 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 23 Jul 2022 15:28:15 -0400 Subject: [PATCH 757/842] require systemd-rpm-macros rather than systemd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The `BuildRequires: systemd` was added in d7389e7 (use systemd instead of xinetd (bz 737183), 2013-04-30). Since then, the systemd macros have been split into a subpackage¹. Adjust our BuildRequires (with an exception for EL-7). Replace `Requires*: systemd` in git-daemon with %{?systemd_requires}. ¹ https://src.fedoraproject.org/rpms/systemd/c/c9030f0 (Split out the rpm macros into systemd-rpm-macros subpackage, 2018-11-02), --- git.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/git.spec b/git.spec index 42fb2b8..e7a699d 100644 --- a/git.spec +++ b/git.spec @@ -77,7 +77,7 @@ Name: git Version: 2.37.1 -Release: 1%{?rcrev}%{?dist}.1 +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -161,8 +161,11 @@ BuildRequires: perl # endif use_perl_interpreter BuildRequires: pkgconfig(bash-completion) BuildRequires: sed -# For macros +%if 0%{?fedora} || 0%{?rhel} >= 8 +BuildRequires: systemd-rpm-macros +%else BuildRequires: systemd +%endif BuildRequires: tcl BuildRequires: tk BuildRequires: xz @@ -360,10 +363,7 @@ Requires: perl(DBD::SQLite) %package daemon Summary: Git protocol daemon Requires: git-core = %{version}-%{release} -Requires: systemd -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +%{?systemd_requires} %description daemon The git daemon for supporting git:// access to git repositories @@ -1007,6 +1007,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sat Jul 23 2022 Todd Zullinger - 2.37.1-2 +- require systemd-rpm-macros rather than systemd + * Thu Jul 21 2022 Fedora Release Engineering - 2.37.1-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 5c57e78875da2b7b029c2323cba7c6925a4d7cf4 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 11 Aug 2022 14:22:53 -0400 Subject: [PATCH 758/842] update to 2.37.2 This is an upstream bugfix release. Release notes: https://github.com/git/git/raw/v2.37.2/Documentation/RelNotes/2.37.2.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index e7a699d..af92750 100644 --- a/git.spec +++ b/git.spec @@ -76,8 +76,8 @@ %global _package_note_file %{_builddir}/%{name}-%{version}%{?rcrev}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.37.1 -Release: 2%{?rcrev}%{?dist} +Version: 2.37.2 +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1007,6 +1007,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Aug 11 2022 Todd Zullinger - 2.37.2-1 +- update to 2.37.2 + * Sat Jul 23 2022 Todd Zullinger - 2.37.1-2 - require systemd-rpm-macros rather than systemd diff --git a/sources b/sources index 45b2c13..c4e406c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.37.1.tar.xz) = 3c9cad6b4757f425ee53996d8d80db2226b246513cbcec9011022e02e4235d7ec38c7c1aada73bb3c9279a91d1aaf8664633356ce1dce847e0d371f702a5b766 -SHA512 (git-2.37.1.tar.sign) = 204b84321e0eadcde81d4e2dc134d53706a569c77dd34a1919543ec3b0561b828eb6525a12cd3fba7238e03e9e26708d6d2b64cd1a4d902ee4d6e680339603a9 +SHA512 (git-2.37.2.tar.xz) = a26d83f4eeb71d49c427ced9509861f7677e13e806da729f369ca39b795f8417b789a0adec859f44716f7fbc1190f7d1e6e518e774ad95c89e88442ac125b9c2 +SHA512 (git-2.37.2.tar.sign) = 8ae911329f57df76e1fe9932ded46bf7a37350ae609802afa54da9d7c05be4d13907cae8585b8824b575d177a20dc11f3e555c820beb2cbf6d65509777faabda From 3bf0a72eb1e3c5b367f03440f246fda9c7b822c1 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 14 Aug 2022 14:13:49 -0400 Subject: [PATCH 759/842] consolidate git-archimport removal in %prep We have not shipped git-archimport since 3f0dc97 (Drop git-arch on fedora >= 16, 2011-07-26). Replace the scattered references to it in the spec file with a small group of commands in %prep to remove it entirely. --- git.spec | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/git.spec b/git.spec index af92750..35651f6 100644 --- a/git.spec +++ b/git.spec @@ -77,7 +77,7 @@ Name: git Version: 2.37.2 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -496,8 +496,10 @@ xz -dc '%{SOURCE0}' | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1 # Install print-failed-test-output script install -p -m 755 %{SOURCE99} print-failed-test-output -# Remove git-archimport from command list +# Remove git-archimport +sed -i '/^SCRIPT_PERL += git-archimport\.perl$/d' Makefile sed -i '/^git-archimport/d' command-list.txt +rm git-archimport.perl Documentation/git-archimport.txt %if %{without cvs} # Remove git-cvs* from command list @@ -643,9 +645,6 @@ rm -rf contrib/scalar # Clean up contrib/subtree to avoid cruft in the git-core-doc docdir rm -rf contrib/subtree/{INSTALL,Makefile,git-subtree*,t} -# git-archimport is not supported -find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' - %if %{without cvs} # Remove git-cvs* and gitcvs* find %{buildroot} Documentation \( -type f -o -type l \) \ @@ -663,7 +662,7 @@ rm -f %{buildroot}%{gitexecdir}/mergetools/p4merge # Remove unneeded git-remote-testsvn so git-svn can be noarch rm -f %{buildroot}%{gitexecdir}/git-remote-testsvn -exclude_re="archimport|email|git-(citool|credential-libsecret|cvs|daemon|gui|instaweb|p4|subtree|svn)|gitk|gitweb|p4merge" +exclude_re="email|git-(citool|credential-libsecret|cvs|daemon|gui|instaweb|p4|subtree|svn)|gitk|gitweb|p4merge" (find %{buildroot}{%{_bindir},%{_libexecdir}} -type f -o -type l | grep -vE "$exclude_re" | sed -e s@^%{buildroot}@@) > bin-man-doc-files (find %{buildroot}{%{_bindir},%{_libexecdir}} -mindepth 1 -type d | grep -vE "$exclude_re" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files (find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) > perl-git-files @@ -1007,6 +1006,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sun Aug 14 2022 Todd Zullinger - 2.37.2-2 +- consolidate git-archimport removal in %%prep + * Thu Aug 11 2022 Todd Zullinger - 2.37.2-1 - update to 2.37.2 From c1a92d4bda57e39d25b1c908fd6c6ea1719b7f1c Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 30 Aug 2022 21:09:04 -0400 Subject: [PATCH 760/842] update to 2.37.3 This is an upstream bugfix release. Release notes: https://github.com/git/git/raw/v2.37.3/Documentation/RelNotes/2.37.3.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 35651f6..51023d9 100644 --- a/git.spec +++ b/git.spec @@ -76,8 +76,8 @@ %global _package_note_file %{_builddir}/%{name}-%{version}%{?rcrev}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.37.2 -Release: 2%{?rcrev}%{?dist} +Version: 2.37.3 +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 +* Tue Aug 30 2022 Todd Zullinger - 2.37.3-1 +- update to 2.37.3 + * Sun Aug 14 2022 Todd Zullinger - 2.37.2-2 - consolidate git-archimport removal in %%prep diff --git a/sources b/sources index c4e406c..4f304df 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.37.2.tar.xz) = a26d83f4eeb71d49c427ced9509861f7677e13e806da729f369ca39b795f8417b789a0adec859f44716f7fbc1190f7d1e6e518e774ad95c89e88442ac125b9c2 -SHA512 (git-2.37.2.tar.sign) = 8ae911329f57df76e1fe9932ded46bf7a37350ae609802afa54da9d7c05be4d13907cae8585b8824b575d177a20dc11f3e555c820beb2cbf6d65509777faabda +SHA512 (git-2.37.3.tar.xz) = 9120050b01d8ac8d9f9e85f19cb84dc90c28f3beadc3ea94da94845f2eb5e35aa83eee8447a7ecef5190b8eb5d01be621be2e82bb3020e51e05037cd1fa9b58f +SHA512 (git-2.37.3.tar.sign) = ca2b0396c7d5f47822578f654588580b101ce97e0a4913071b6987cdbb470e3fad456b967cf6ec5928c85d56aa8a8eeff123e0e9aaa4ce1cbfc79c30a2af3b03 From cbc4c3e411cc105150a1d9444dd327a6a5aec6f5 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 21 Aug 2022 19:27:34 -0400 Subject: [PATCH 761/842] remove %changelog entries prior to 2020 The git history serves as the repository for the old entries. The changelog was roughly 20% of the total lines in the spec file. --- git.spec | 250 +------------------------------------------------------ 1 file changed, 1 insertion(+), 249 deletions(-) diff --git a/git.spec b/git.spec index 51023d9..f234f02 100644 --- a/git.spec +++ b/git.spec @@ -1008,6 +1008,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Tue Aug 30 2022 Todd Zullinger - 2.37.3-1 - update to 2.37.3 +- remove %%changelog entries prior to 2020 * Sun Aug 14 2022 Todd Zullinger - 2.37.2-2 - consolidate git-archimport removal in %%prep @@ -1198,252 +1199,3 @@ rmdir --ignore-fail-on-non-empty "$testdir" * Tue Jan 26 2021 Fedora Release Engineering - 2.30.0-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Dec 28 2020 Todd Zullinger - 2.30.0-1 -- update to 2.30.0 - -* Wed Dec 23 2020 Todd Zullinger - 2.30.0-0.2.rc2 -- update to 2.30.0-rc2 - -* Sat Dec 19 2020 Todd Zullinger - 2.30.0-0.1.rc1 -- update to 2.30.0-rc1 - -* Mon Dec 14 2020 Todd Zullinger - 2.30.0-0.0.rc0 -- update to 2.30.0-rc0 - -* Sun Dec 06 2020 Todd Zullinger - 2.29.2-4 -- move git-difftool to git-core, it does not require perl - -* Wed Nov 25 2020 Todd Zullinger - 2.29.2-3 -- apply upstream patch to resolve git fast-import memory leak (#1900335) -- add epel-rpm-macros BuildRequires on EL-7 (#1872865) - -* Sat Nov 07 2020 Todd Zullinger - 2.29.2-2 -- apply upstream patch to resolve git log segfault (#1791810) - -* Thu Oct 29 2020 Todd Zullinger - 2.29.2-1 -- update to 2.29.2 - -* Sat Oct 24 2020 Todd Zullinger - 2.29.1-1 -- update to 2.29.1 -- fix bugs in am/rebase handling of committer ident/date - -* Mon Oct 19 2020 Todd Zullinger - 2.29.0-1 -- update to 2.29.0 - -* Thu Oct 15 2020 Todd Zullinger - 2.29.0-0.2.rc2 -- update to 2.29.0-rc2 - -* Fri Oct 09 2020 Todd Zullinger - 2.29.0-0.1.rc1 -- update to 2.29.0-rc1 -- drop emacs-git stub for fedora >= 34 (#1882360) -- adjust python hashbang in contrib/hg-to-git, it supports python3 - -* Mon Oct 05 2020 Todd Zullinger - 2.29.0-0.0.rc0 -- update to 2.29.0-rc0 - -* Mon Jul 27 2020 Todd Zullinger - 2.28.0-1 -- update to 2.28.0 - -* Mon Jul 27 2020 Fedora Release Engineering - 2.28.0-0.3.rc2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 22 2020 Todd Zullinger - 2.28.0-0.2.rc2 -- update to 2.28.0-rc2 - -* Sat Jul 18 2020 Todd Zullinger - 2.28.0-0.1.rc1 -- update to 2.28.0-rc1 - -* Thu Jul 09 2020 Todd Zullinger - 2.28.0-0.0.rc0 -- update to 2.28.0-rc0 - -* Fri Jun 26 2020 Jitka Plesnikova - 2.27.0-1.2 -- Perl 5.32 re-rebuild of bootstrapped packages - -* Tue Jun 23 2020 Jitka Plesnikova - 2.27.0-1.1 -- Perl 5.32 rebuild - -* Mon Jun 01 2020 Todd Zullinger - 2.27.0-1 -- update to 2.27.0 - -* Tue May 26 2020 Todd Zullinger - 2.27.0-0.2.rc2 -- update to 2.27.0-rc2 - -* Thu May 21 2020 Todd Zullinger - 2.27.0-0.1.rc1 -- update to 2.27.0-rc1 - -* Thu May 21 2020 Merlin Mathesius - 2.26.2-2 -- Minor conditional fixes for ELN - -* Mon Apr 20 2020 Todd Zullinger - 2.26.2-1 -- update to 2.26.2 (CVE-2020-11008) - -* Tue Apr 14 2020 Todd Zullinger - 2.26.1-1 -- update to 2.26.1 (CVE-2020-5260) - -* Sat Apr 04 2020 Todd Zullinger - 2.26.0-2 -- fix issue with fast-forward rebases when rebase.abbreviateCommands is set -- fix/quiet rpmlint issues from libsecret split - -* Thu Apr 02 2020 Björn Esser - 2.26.0-1.1 -- Fix string quoting for rpm >= 4.16 - -* Sun Mar 22 2020 Todd Zullinger - 2.26.0-1 -- update to 2.26.0 - -* Mon Mar 16 2020 Todd Zullinger - 2.26.0-0.3.rc2 -- update to 2.26.0-rc2 - -* Thu Mar 12 2020 Todd Zullinger - 2.26.0-0.2.rc1 -- remove s390x gcc10 workaround (#1799408) - -* Tue Mar 10 2020 Todd Zullinger - 2.26.0-0.1.rc1 -- update to 2.26.0-rc1 -- adjust make test options -- add missing build deps for tests - -* Fri Mar 06 2020 Todd Zullinger - 2.26.0-0.0.rc0 -- update to 2.26.0-rc0 - -* Wed Feb 26 2020 Todd Zullinger - 2.25.1-4 -- use Asciidoctor to build documentation when possible - -* Sat Feb 22 2020 Todd Zullinger - 2.25.1-3 -- work around issue on s390x with gcc10 (#1799408) - -* Wed Feb 19 2020 Todd Zullinger - 2.25.1-2 -- split libsecret credential helper into a subpackage (#1804741) -- consolidate macros for Fedora/EPEL -- remove unneeded gnome-keyring obsoletes - -* Mon Feb 17 2020 Todd Zullinger - 2.25.1-1 -- update to 2.25.1 - -* Tue Jan 28 2020 Fedora Release Engineering - 2.25.0-2.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Jan 14 2020 Tom Stellard - 2.25.0-2 -- Use make_build macro when running tests - -* Tue Jan 14 2020 Todd Zullinger - 2.25.0-1 -- update to 2.25.0 - -* Thu Jan 09 2020 Todd Zullinger - 2.25.0-0.2.rc2 -- update to 2.25.0-rc2 - -* Fri Jan 03 2020 Todd Zullinger - 2.25.0-0.1.rc1 -- update to 2.25.0-rc1 -- only add highlight test BR for ppc64le/x86_64 on EL7+ - -* Wed Dec 25 2019 Todd Zullinger - 2.25.0-0.0.rc0 -- update to 2.25.0-rc0 - -* Thu Dec 19 2019 Todd Zullinger - 2.24.1-2 -- fix git-daemon systemd scriptlets (#1785088) - -* Tue Dec 10 2019 Todd Zullinger - 2.24.1-1 -- update to 2.24.1 (CVE-2019-1348, CVE-2019-1349, CVE-2019-1350, CVE-2019-1351, - CVE-2019-1352, CVE-2019-1353, CVE-2019-1354, and CVE-2019-1387) - -* Wed Dec 04 2019 Todd Zullinger - 2.24.0-2 -- restore jgit BR for use in tests - -* Mon Nov 04 2019 Todd Zullinger - 2.24.0-1 -- update to 2.24.0 - -* Thu Oct 31 2019 Todd Zullinger - 2.24.0-0.2.rc2 -- update to 2.24.0-rc2 - -* Sun Oct 27 2019 Todd Zullinger - 2.24.0-0.1.rc1.1 -- disable linkchecker on all EL releases - -* Thu Oct 24 2019 Todd Zullinger - 2.24.0-0.1.rc1 -- update to 2.24.0-rc1 -- skip failing test in t7812-grep-icase-non-ascii on s390x -- gitk: add Requires: git-gui (#1765113) - -* Sat Oct 19 2019 Todd Zullinger - 2.24.0-0.0.rc0 -- update to 2.24.0-rc0 -- fix t0500-progress-display on big-endian arches - -* Fri Aug 16 2019 Todd Zullinger - 2.23.0-1 -- Update to 2.23.0 - -* Sun Aug 11 2019 Todd Zullinger - 2.23.0-0.2.rc2 -- Update to 2.23.0-rc2 - -* Fri Aug 02 2019 Todd Zullinger - 2.23.0-0.1.rc1 -- Update to 2.23.0-rc1 - -* Mon Jul 29 2019 Todd Zullinger - 2.23.0-0.0.rc0 -- Update to 2.23.0-rc0 - -* Thu Jul 25 2019 Todd Zullinger - 2.22.0-2 -- completion: do not cache if --git-completion-helper fails -- avoid trailing comments in spec file -- drop jgit on Fedora > 30 - -* Thu Jul 25 2019 Fedora Release Engineering - 2.22.0-1.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Jun 07 2019 Todd Zullinger - 2.22.0-1 -- Update to 2.22.0 - -* Tue Jun 04 2019 Jitka Plesnikova - 2.22.0-0.7.rc3 -- Perl 5.30 re-rebuild updated packages - -* Mon Jun 03 2019 Todd Zullinger - 2.22.0-0.6.rc3 -- Update to 2.22.0-rc3 - -* Sun Jun 02 2019 Jitka Plesnikova - 2.22.0-0.5.rc2 -- Perl 5.30 re-rebuild of bootstrapped packages - -* Sat Jun 01 2019 Jitka Plesnikova - 2.22.0-0.4.rc2 -- Perl 5.30 rebuild - -* Thu May 30 2019 Todd Zullinger - 2.22.0-0.3.rc2 -- Update to 2.22.0-rc1 - -* Fri May 24 2019 Todd Zullinger - 2.22.0-0.2.rc1 -- Apply upstream fixes for diff-parseopt issues on s390x - -* Sun May 19 2019 Todd Zullinger - 2.22.0-0.1.rc1 -- Update to 2.22.0-rc1 - -* Mon May 13 2019 Todd Zullinger - 2.22.0-0.0.rc0 -- Update to 2.22.0-rc0 -- Ensure a consistent format for test output -- Improve JGIT test prereq (jgit on Fedora >= 30 is broken) -- Add perl(JSON::PP) BuildRequires for trace2 tests - -* Sun Feb 24 2019 Todd Zullinger - 2.21.0-1 -- Update to 2.21.0 -- Move gitweb manpages to gitweb package -- Link git-citool to git-gui if they are identical - -* Tue Feb 19 2019 Todd Zullinger - 2.21.0-0.2.rc2 -- Update to 2.21.0.rc2 - -* Fri Feb 15 2019 Todd Zullinger -- Set SOURCE_DATE_EPOCH and TZ to improve build reproducibility - -* Wed Feb 13 2019 Todd Zullinger - 2.21.0-0.1.rc1 -- Update to 2.21.0.rc1 - -* Thu Feb 07 2019 Todd Zullinger - 2.21.0-0.0.rc0 -- Update to 2.21.0.rc0 -- Remove %%changelog entries prior to 2017 - -* Thu Jan 31 2019 Todd Zullinger - 2.20.1-2 -- Remove extraneous pcre BuildRequires -- Add additional BuildRequires for i18n locales used in tests -- Replace gitweb home-link with inline sed -- Add gnupg2-smime and perl JSON BuildRequires for tests -- Work around gpg-agent issues in the test suite -- Drop gnupg BuildRequires on fedora >= 30 -- Fix formatting of contrib/{contacts,subtree} docs -- Use %%{build_cflags} and %%{build_ldflags} -- Drop unneeded TEST_SHELL_PATH make variable - -* Thu Jan 31 2019 Fedora Release Engineering - 2.20.1-1.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 0d294dd61006522f5434a82f76ad186aa19d052c Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 19 Aug 2022 21:52:40 -0400 Subject: [PATCH 762/842] tests: try harder to find open ports for apache, git, and svn When running multiple builds, we frequently see failures due to port conflicts, particularly with httpd tests. Retry with a different port when the test function start_httpd() fails to reduce these spurious failures. We should not need to skip t9115-git-svn-dcommit-funky-renames as a result. Remove it from GIT_SKIP_TESTS. Similarly, adjust the git-daemon and svnserve start functions. --- ...try-harder-to-find-a-port-for-apache.patch | 73 +++++++++++++++ ...git-daemon-try-harder-to-find-a-port.patch | 88 +++++++++++++++++++ ...ib-git-svn-try-harder-to-find-a-port.patch | 85 ++++++++++++++++++ git.spec | 22 ++--- 4 files changed, 257 insertions(+), 11 deletions(-) create mode 100644 0001-t-lib-httpd-try-harder-to-find-a-port-for-apache.patch create mode 100644 0002-t-lib-git-daemon-try-harder-to-find-a-port.patch create mode 100644 0003-t-lib-git-svn-try-harder-to-find-a-port.patch diff --git a/0001-t-lib-httpd-try-harder-to-find-a-port-for-apache.patch b/0001-t-lib-httpd-try-harder-to-find-a-port-for-apache.patch new file mode 100644 index 0000000..f7c1509 --- /dev/null +++ b/0001-t-lib-httpd-try-harder-to-find-a-port-for-apache.patch @@ -0,0 +1,73 @@ +From aedeaaf788bd8a7fc5a1887196b6f6d8a5c31362 Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Sun, 21 Aug 2022 13:49:57 -0400 +Subject: [PATCH] t/lib-httpd: try harder to find a port for apache +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When running multiple builds concurrently, tests which run daemons, like +apache httpd, sometimes conflict with each other, leading to spurious +failures: + + ++ /usr/sbin/httpd -d '/tmp/git-t.ck9I/trash directory.t9118-git-svn-funky-branch-names/httpd' \ + -f /builddir/build/BUILD/git-2.37.2/t/lib-httpd/apache.conf -DDAV -DSVN -c 'Listen 127.0.0.1:9118' \ + -k start + (98)Address already in use: AH00072: make_sock: could not bind to address 127.0.0.1:9118 + no listening sockets available, shutting down + AH00015: Unable to open logs + ++ test 1 -ne 0 + +Try a bit harder to find an open port to use to avoid these intermittent +failures. If we fail to start httpd, increment the port number and try +again. By default, we make 3 attempts. This may be overridden by +setting GIT_TEST_START_HTTPD_TRIES to a different value. + +Helped-by: Ondřej Pohořelský +Signed-off-by: Todd Zullinger +--- + t/lib-httpd.sh | 29 ++++++++++++++++++----------- + 1 file changed, 18 insertions(+), 11 deletions(-) + +diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh +index 1f6b9b08d1..9279dcd659 100644 +--- a/t/lib-httpd.sh ++++ b/t/lib-httpd.sh +@@ -175,19 +175,26 @@ prepare_httpd() { + } + + start_httpd() { +- prepare_httpd >&3 2>&4 +- + test_atexit stop_httpd + +- "$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \ +- -f "$TEST_PATH/apache.conf" $HTTPD_PARA \ +- -c "Listen 127.0.0.1:$LIB_HTTPD_PORT" -k start \ +- >&3 2>&4 +- if test $? -ne 0 +- then +- cat "$HTTPD_ROOT_PATH"/error.log >&4 2>/dev/null +- test_skip_or_die GIT_TEST_HTTPD "web server setup failed" +- fi ++ i=0 ++ while test $i -lt ${GIT_TEST_START_HTTPD_TRIES:-3} ++ do ++ i=$(($i + 1)) ++ prepare_httpd >&3 2>&4 ++ say >&3 "Starting httpd on port $LIB_HTTPD_PORT" ++ "$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \ ++ -f "$TEST_PATH/apache.conf" $HTTPD_PARA \ ++ -c "Listen 127.0.0.1:$LIB_HTTPD_PORT" -k start \ ++ >&3 2>&4 ++ test $? -eq 0 && return ++ LIB_HTTPD_PORT=$(($LIB_HTTPD_PORT + 1)) ++ export LIB_HTTPD_PORT ++ # clean up modules symlink, prepare_httpd will re-create it ++ rm -f "$HTTPD_ROOT_PATH/modules" ++ done ++ cat "$HTTPD_ROOT_PATH"/error.log >&4 2>/dev/null ++ test_skip_or_die GIT_TEST_HTTPD "web server setup failed" + } + + stop_httpd() { diff --git a/0002-t-lib-git-daemon-try-harder-to-find-a-port.patch b/0002-t-lib-git-daemon-try-harder-to-find-a-port.patch new file mode 100644 index 0000000..4540b63 --- /dev/null +++ b/0002-t-lib-git-daemon-try-harder-to-find-a-port.patch @@ -0,0 +1,88 @@ +From 16750d024ce038b019ab2e9ee5639901e445af37 Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Fri, 26 Aug 2022 18:28:44 -0400 +Subject: [PATCH] t/lib-git-daemon: try harder to find a port + +As with the previous commit, try harder to find an open port to avoid +intermittent failures on busy/shared build systems. + +By default, we make 3 attempts. This may be overridden by setting +GIT_TEST_START_GIT_DAEMON_TRIES to a different value. + +Signed-off-by: Todd Zullinger +--- + t/lib-git-daemon.sh | 60 ++++++++++++++++++++++++++++----------------- + 1 file changed, 37 insertions(+), 23 deletions(-) + +diff --git a/t/lib-git-daemon.sh b/t/lib-git-daemon.sh +index e62569222b..c3e8dda9ff 100644 +--- a/t/lib-git-daemon.sh ++++ b/t/lib-git-daemon.sh +@@ -51,30 +51,44 @@ start_git_daemon() { + registered_stop_git_daemon_atexit_handler=AlreadyDone + fi + +- say >&3 "Starting git daemon ..." +- mkfifo git_daemon_output +- ${LIB_GIT_DAEMON_COMMAND:-git daemon} \ +- --listen=127.0.0.1 --port="$LIB_GIT_DAEMON_PORT" \ +- --reuseaddr --verbose --pid-file="$GIT_DAEMON_PIDFILE" \ +- --base-path="$GIT_DAEMON_DOCUMENT_ROOT_PATH" \ +- "$@" "$GIT_DAEMON_DOCUMENT_ROOT_PATH" \ +- >&3 2>git_daemon_output & +- GIT_DAEMON_PID=$! +- { +- read -r line <&7 +- printf "%s\n" "$line" >&4 +- cat <&7 >&4 & +- } 7&3 "Starting git daemon on port $LIB_GIT_DAEMON_PORT ..." ++ mkfifo git_daemon_output ++ ${LIB_GIT_DAEMON_COMMAND:-git daemon} \ ++ --listen=127.0.0.1 --port="$LIB_GIT_DAEMON_PORT" \ ++ --reuseaddr --verbose --pid-file="$GIT_DAEMON_PIDFILE" \ ++ --base-path="$GIT_DAEMON_DOCUMENT_ROOT_PATH" \ ++ "$@" "$GIT_DAEMON_DOCUMENT_ROOT_PATH" \ ++ >&3 2>git_daemon_output & ++ GIT_DAEMON_PID=$! ++ { ++ read -r line <&7 ++ printf "%s\n" "$line" >&4 ++ cat <&7 >&4 & ++ } 7 +Date: Fri, 26 Aug 2022 18:28:44 -0400 +Subject: [PATCH] t/lib-git-svn: try harder to find a port + +As with the previous commits, try harder to find an open port to avoid +intermittent failures on busy/shared build systems. + +By default, we make 3 attempts. This may be overridden by setting +GIT_TEST_START_SVNSERVE_TRIES to a different value. + +Run svnserve in daemon mode and use 'test_atexit' to stop it. This is +cleaner than running in the foreground with --listen-once and having to +manage the PID ourselves. + +Signed-off-by: Todd Zullinger +--- + t/lib-git-svn.sh | 34 +++++++++++++++++++++++++---- + t/t9113-git-svn-dcommit-new-file.sh | 1 - + 2 files changed, 30 insertions(+), 5 deletions(-) + +diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh +index ea28971e8e..04e660e2ba 100644 +--- a/t/lib-git-svn.sh ++++ b/t/lib-git-svn.sh +@@ -17,6 +17,7 @@ fi + GIT_DIR=$PWD/.git + GIT_SVN_DIR=$GIT_DIR/svn/refs/remotes/git-svn + SVN_TREE=$GIT_SVN_DIR/svn-tree ++SVNSERVE_PIDFILE="$PWD"/daemon.pid + test_set_port SVNSERVE_PORT + + svn >/dev/null 2>&1 +@@ -119,10 +120,35 @@ require_svnserve () { + } + + start_svnserve () { +- svnserve --listen-port $SVNSERVE_PORT \ +- --root "$rawsvnrepo" \ +- --listen-once \ +- --listen-host 127.0.0.1 & ++ test_atexit stop_svnserve ++ ++ i=0 ++ while test $i -lt ${GIT_TEST_START_SVNSERVE_TRIES:-3} ++ do ++ say >&3 "Starting svnserve on port $SVNSERVE_PORT ..." ++ svnserve --listen-port $SVNSERVE_PORT \ ++ --root "$rawsvnrepo" \ ++ --daemon --pid-file="$SVNSERVE_PIDFILE" \ ++ --listen-host 127.0.0.1 ++ ret=$? ++ # increment port and retry if unsuccessful ++ if test $ret -ne 0 ++ then ++ SVNSERVE_PORT=$(($SVNSERVE_PORT + 1)) ++ export SVNSERVE_PORT ++ else ++ break ++ fi ++ done ++} ++ ++stop_svnserve () { ++ say >&3 "Stopping svnserve ..." ++ SVNSERVE_PID="$(cat "$SVNSERVE_PIDFILE")" ++ if test -n "$SVNSERVE_PID" ++ then ++ kill "$SVNSERVE_PID" 2>/dev/null ++ fi + } + + prepare_utf8_locale () { +diff --git a/t/t9113-git-svn-dcommit-new-file.sh b/t/t9113-git-svn-dcommit-new-file.sh +index e8479cec7a..5925891f5d 100755 +--- a/t/t9113-git-svn-dcommit-new-file.sh ++++ b/t/t9113-git-svn-dcommit-new-file.sh +@@ -28,7 +28,6 @@ test_expect_success 'create files in new directory with dcommit' " + echo hello > git-new-dir/world && + git update-index --add git-new-dir/world && + git commit -m hello && +- start_svnserve && + git svn dcommit + " + diff --git a/git.spec b/git.spec index f234f02..2d1fab2 100644 --- a/git.spec +++ b/git.spec @@ -109,6 +109,16 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch +# https://bugzilla.redhat.com/2114531 +# tests: try harder to find open ports for apache, git, and svn +# +# https://github.com/tmzullinger/git/commit/aedeaaf788 +Patch1: 0001-t-lib-httpd-try-harder-to-find-a-port-for-apache.patch +# https://github.com/tmzullinger/git/commit/16750d024c +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 + %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -794,17 +804,6 @@ GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5541.36 t5551.25" %endif # endif aarch64 %%{arm} %%{power64} -%ifarch %{power64} -# Skip tests which fail on ppc -# -# t9115-git-svn-dcommit-funky-renames is disabled because it frequently fails. -# The port it uses (9115) is already in use. It is unclear if this is -# due to an issue in the test suite or a conflict with some other process on -# the build host. It only appears to occur on ppc-arches. -GIT_SKIP_TESTS="$GIT_SKIP_TESTS t9115" -%endif -# endif %%{power64} - %if 0%{?rhel} == 8 && "%{_arch}" == "s390x" # Skip tests which fail on s390x on rhel-8 # @@ -1009,6 +1008,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" * Tue Aug 30 2022 Todd Zullinger - 2.37.3-1 - update to 2.37.3 - remove %%changelog entries prior to 2020 +- tests: try harder to find open ports for apache, git, and svn * Sun Aug 14 2022 Todd Zullinger - 2.37.2-2 - consolidate git-archimport removal in %%prep From ea59aa363719d7f73903a7ec9f0f53d775bf1614 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 16 Sep 2022 00:21:22 -0400 Subject: [PATCH 763/842] 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 764/842] 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 765/842] 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 766/842] 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 767/842] 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 768/842] 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 769/842] 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 770/842] 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 From 1ea41cbd46d4ac427d42fa8c129f56a67fe688ce Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 7 Nov 2022 19:02:33 -0500 Subject: [PATCH 771/842] don't ship contrib/persistent-https as documentation This is Go source code which requires compilation to be used. It is licensed differently than git; shipping it changes the License tag. Let's avoid it for now. If it turns out to be widely used, we can restore it later (and ship it in binary form). --- git.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 4ab882b..86ce212 100644 --- a/git.spec +++ b/git.spec @@ -77,7 +77,7 @@ Name: git Version: 2.38.1 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -650,6 +650,10 @@ install -Dpm 0755 contrib/diff-highlight/diff-highlight \ %{buildroot}%{_datadir}/git-core/contrib/diff-highlight rm -rf contrib/diff-highlight/{Makefile,diff-highlight,*.perl,t} +# Remove contrib/persistent-https; a) this code requires compilation; and b) it +# is licensed differently than git +rm -rf contrib/persistent-https + # Remove contrib/scalar to avoid cruft in the git-core-doc docdir rm -rf contrib/scalar @@ -1006,6 +1010,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Nov 07 2022 Todd Zullinger - 2.38.1-2 +- don't ship contrib/persistent-https as documentation + * Tue Oct 18 2022 Todd Zullinger - 2.38.1-1 - update to 2.38.1 (CVE-2022-39253, CVE-2022-39260) From ef75bcdbad7337c032a7db4cd9c370c42a6e9442 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 7 Nov 2022 18:22:02 -0500 Subject: [PATCH 772/842] update license data and convert to SPDX format The license data was gathered from the 2.38.1 tarball. The licensecheck tool was run: find -type f -regextype egrep ! -regex '^(Documentation/.*\.txt$|(t/(chainlint|perf/p[0-9]{4}|t[0-9]{4}).*))' \ -exec licensecheck --shortname-scheme spdx {} + | LANG=C sort >licensecheck The contents were reviewed, removing files which are not shipped or were UNKNOWN to licensecheck. Of the UNKNOWN files, most lacked a specific license header and are thus treated as GPL-2.0-only. The code in reftable/ is licensed as BSD 3-Clause per reftable/LICENSE. --- git.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 86ce212..69e852c 100644 --- a/git.spec +++ b/git.spec @@ -79,7 +79,7 @@ Name: git Version: 2.38.1 Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System -License: GPLv2 +License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ Source0: https://www.kernel.org/pub/software/scm/git/%{?rcrev:testing/}%{name}-%{version}%{?rcrev}.tar.xz Source1: https://www.kernel.org/pub/software/scm/git/%{?rcrev:testing/}%{name}-%{version}%{?rcrev}.tar.sign @@ -1012,6 +1012,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Mon Nov 07 2022 Todd Zullinger - 2.38.1-2 - don't ship contrib/persistent-https as documentation +- update license data and convert to SPDX format * Tue Oct 18 2022 Todd Zullinger - 2.38.1-1 - update to 2.38.1 (CVE-2022-39253, CVE-2022-39260) From d0191b8ca59b4bd0394eb39373af871eb3b1ddef Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 12 Nov 2022 13:14:22 -0500 Subject: [PATCH 773/842] use %bash_completions_dir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A %bash_completions_dir macros was added to redhat-rpm-config recently¹. It is available for all supported Fedora releases. Define it if missing, to support EL <= 9. This is likely to become part of the packaging guideline soon². ¹ https://src.fedoraproject.org/rpms/redhat-rpm-config/c/483a3b (Add macros.shell-completions, 2022-06-25) ² https://pagure.io/packaging-committee/issue/1202 --- git.rpmlintrc | 3 +++ git.spec | 21 +++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/git.rpmlintrc b/git.rpmlintrc index b83cb0a..8b09c35 100644 --- a/git.rpmlintrc +++ b/git.rpmlintrc @@ -5,6 +5,9 @@ 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") +# gitk requires git, which provides the symlink target +addFilter("gitk\.noarch: W: dangling-relative-symlink /usr/share/bash-completion/completions/gitk 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 69e852c..1e05b82 100644 --- a/git.spec +++ b/git.spec @@ -39,12 +39,6 @@ %global use_perl_interpreter 0 %endif -# Settings for Fedora and EL >= 7 -%if 0%{?fedora} || 0%{?rhel} >= 7 -%global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) -%global bashcomproot %(dirname %{bashcompdir} 2>/dev/null) -%endif - # Allow cvs subpackage to be toggled via --with/--without # Disable cvs subpackage by default on EL >= 8 %if 0%{?rhel} >= 8 @@ -69,6 +63,9 @@ %global _hardened_build 1 %endif +# Define %%bash_completions_dir for EL <= 9 +%{?!bash_completions_dir:%global bash_completions_dir %{_datadir}/bash-completion/completions} + # Define for release candidates #global rcrev .rc0 @@ -77,7 +74,7 @@ Name: git Version: 2.38.1 -Release: 2%{?rcrev}%{?dist} +Release: 3%{?rcrev}%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -700,8 +697,8 @@ perl -p \ %{SOURCE15} > %{buildroot}%{_unitdir}/git@.service # Setup bash completion -install -Dpm 644 contrib/completion/git-completion.bash %{buildroot}%{bashcompdir}/git -ln -s git %{buildroot}%{bashcompdir}/gitk +install -Dpm 644 contrib/completion/git-completion.bash %{buildroot}%{bash_completions_dir}/git +ln -s git %{buildroot}%{bash_completions_dir}/gitk # Install tcsh completion mkdir -p %{buildroot}%{_datadir}/git-core/contrib/completion @@ -905,7 +902,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %exclude %{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample %exclude %{_datadir}/git-core/templates/hooks/pre-rebase.sample %exclude %{_datadir}/git-core/templates/hooks/prepare-commit-msg.sample -%{bashcomproot} +%{bash_completions_dir}/git %{_datadir}/git-core/ %files core-doc -f man-doc-files-core @@ -951,6 +948,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{_pkgdocdir}/*gitk*.txt %{_bindir}/*gitk* %{_datadir}/gitk +%{bash_completions_dir}/gitk %{?with_docs:%{_mandir}/man1/*gitk*.1*} %{?with_docs:%{_pkgdocdir}/*gitk*.html} @@ -1010,6 +1008,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sat Nov 12 2022 Todd Zullinger - 2.38.1-3 +- use %%bash_completions_dir + * Mon Nov 07 2022 Todd Zullinger - 2.38.1-2 - don't ship contrib/persistent-https as documentation - update license data and convert to SPDX format From 7d21254b0248a0b04f653b74069624ff4f6702d6 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 23 Nov 2022 12:47:16 -0500 Subject: [PATCH 774/842] update to 2.39.0-rc0 Add mod_http2 BuildRequires for t5559-http-fetch-smart-http2; skip it on EL7, which lacks it. Ignore the expected 'missing HTTP2' output from t5551-http-fetch-smart. Use a strict pattern to avoid unintended matches. Sadly, we must also disable t5559 for now. It fails very often across all architectures. The most common failure is "large fetch-pack requests can be sent using chunked encoding" (t5559.30), but earlier tests have also failed. Until these failures are understood and resolved, the entire test is disabled globally. (It's also disabled for EL-7, which is redundant now but won't be after we re-enable the test globally in the near future.) We can't simply skip the mod_http2 dependency here because we set GIT_TEST_HTTPD=true. Per upstream 73c49a4474 (t: run t5551 tests with both HTTP and HTTP/2, 2022-11-11): If HTTP/2 isn't supported on a given platform, then t5559 should bail during the webserver setup, and gracefully skip all tests (unless GIT_TEST_HTTPD has been changed from "auto" to "yes", where the point is to complain when webserver setup fails). Also ignore the 'missing BUILTIN_TXT_$builtin' output which comes from upstream a0c3244796 (doc SYNOPSIS & -h: use "-" to separate words in labels, not "_", 2022-10-13). We may want to loosen this in the future, but for now ignore it because it doesn't help us identify missing test dependencies. Release notes: https://github.com/git/git/raw/v2.39.0-rc0/Documentation/RelNotes/2.39.0.txt --- git.skip-test-patterns | 2 ++ git.spec | 24 ++++++++++++++++++++---- sources | 4 ++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/git.skip-test-patterns b/git.skip-test-patterns index 1a1139f..12b247d 100644 --- a/git.skip-test-patterns +++ b/git.skip-test-patterns @@ -1,8 +1,10 @@ +^ok 1 # SKIP enable client-side http/2 \(missing HTTP2\)$ expensive 2GB clone test; enable with GIT_TEST_CLONE_2GB=true filesystem does not corrupt utf-8 fsmonitor--daemon is not supported on this platform GIT_SKIP_TESTS missing AUTOIDENT +missing BUILTIN_TXT_ missing CASE_INSENSITIVE_FS missing DONTHAVEIT missing ([!]LONG_IS_64BIT,)?EXPENSIVE diff --git a/git.spec b/git.spec index 1e05b82..84b152c 100644 --- a/git.spec +++ b/git.spec @@ -67,14 +67,14 @@ %{?!bash_completions_dir:%global bash_completions_dir %{_datadir}/bash-completion/completions} # 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.38.1 -Release: 3%{?rcrev}%{?dist} +Version: 2.39.0 +Release: 0.0%{?rcrev}%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -184,6 +184,8 @@ BuildRequires: acl %if 0%{?fedora} || 0%{?rhel} >= 8 # Needed by t5540-http-push-webdav.sh BuildRequires: apr-util-bdb +# Needed by t5559-http-fetch-smart-http2.sh +BuildRequires: mod_http2 %endif # endif fedora or rhel >= 8 BuildRequires: bash @@ -793,7 +795,17 @@ find %{buildroot}%{_pkgdocdir} -name "*.html" -print0 | xargs -r0 linkchecker # endif with docs && with linkcheck # Tests to skip on all releases and architectures -GIT_SKIP_TESTS="" +# +# t5559-http-fetch-smart-http2 runs t5551-http-fetch-smart with +# HTTP_PROTO=HTTP/2. Unfortunately, it fails quite regularly. +# https://lore.kernel.org/git/Y4fUntdlc1mqwad5@pobox.com/ +GIT_SKIP_TESTS="t5559" + +%if 0%{?rhel} && 0%{?rhel} < 8 +# Skip tests which require mod_http2 on el7 +GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5559" +%endif +# endif rhel < 8 %ifarch aarch64 %{arm} %{power64} # Skip tests which fail on aarch64, arm, and ppc @@ -1008,6 +1020,10 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Nov 23 2022 Todd Zullinger - 2.39.0-0.0.rc0 +- update to 2.39.0-rc0 +- add mod_http2 BuildRequires for tests + * Sat Nov 12 2022 Todd Zullinger - 2.38.1-3 - use %%bash_completions_dir diff --git a/sources b/sources index 3f9c27f..0ca8e36 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.38.1.tar.xz) = e62ca6f54f01d2e4ccffb5f94e8e5cd2f3e098b766d909c694a8daf4d00d5cdeb9cc5ff8e9bc55d888406f292ba99433d334d4da9689c0ce5d7299a3c67c90e0 -SHA512 (git-2.38.1.tar.sign) = a10fa332d5d5ea96bf6a0ed0c2a568212dd033acd539d07efbb73def13dd0144640a5a17477ea5cfe4104f1fa166237d7b251de275307eac7b91c6e60ca3de5d +SHA512 (git-2.39.0.rc0.tar.xz) = da92b6b8ec804712f035cb4017ab5d277ca3149749921455cc362a11f7cb96d4347d1eb9e7d02fc31bc0c06f3bdc5ef7c4f40d02f9b92f42e708a2f474e28ea6 +SHA512 (git-2.39.0.rc0.tar.sign) = 04b3e0a9558cb423073e8c7e869e7c616df1f691dac147bf4c30253cf9c66f9b4f030618a232381b8468b9c575d0751b7744725efc7c3d7ebd92739e868d697c From 13887794b7b7988f6d4f3811461eb4974494e0a8 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 30 Nov 2022 01:27:59 -0500 Subject: [PATCH 775/842] update to 2.39.0-rc1 Release notes: https://github.com/git/git/raw/v2.39.0-rc1/Documentation/RelNotes/2.39.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 84b152c..cc7f53c 100644 --- a/git.spec +++ b/git.spec @@ -67,14 +67,14 @@ %{?!bash_completions_dir:%global bash_completions_dir %{_datadir}/bash-completion/completions} # 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.39.0 -Release: 0.0%{?rcrev}%{?dist} +Release: 0.1%{?rcrev}%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -1020,6 +1020,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Nov 30 2022 Todd Zullinger - 2.39.0-0.1.rc1 +- update to 2.39.0-rc1 + * Wed Nov 23 2022 Todd Zullinger - 2.39.0-0.0.rc0 - update to 2.39.0-rc0 - add mod_http2 BuildRequires for tests diff --git a/sources b/sources index 0ca8e36..dd6112a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.39.0.rc0.tar.xz) = da92b6b8ec804712f035cb4017ab5d277ca3149749921455cc362a11f7cb96d4347d1eb9e7d02fc31bc0c06f3bdc5ef7c4f40d02f9b92f42e708a2f474e28ea6 -SHA512 (git-2.39.0.rc0.tar.sign) = 04b3e0a9558cb423073e8c7e869e7c616df1f691dac147bf4c30253cf9c66f9b4f030618a232381b8468b9c575d0751b7744725efc7c3d7ebd92739e868d697c +SHA512 (git-2.39.0.rc1.tar.xz) = c90496689cf4ef5bd0efe85ac1f52b53527603596bef064470bd6c30f6b5d067e001d4a2f2cbe10f57235f8a74b733d59bc8cd8051f6fa9475b6dfb4df67577e +SHA512 (git-2.39.0.rc1.tar.sign) = bda17f54aa43b73376ebda0f6213a1ce5c2c882dccc605e564b9ec7b9058e9f24c6d4dd34496750a866baf60098607b1cabbacfff678f00e7e032efb328be76e From 0af3adfcb1998701eaa7c8e695a745ede98056a0 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 2 Dec 2022 23:12:17 -0500 Subject: [PATCH 776/842] include test-results & "trash" directory contents in build output When a build fails, the contents of t/test-results and the trash directories can be quite useful for debugging. This is particularly true when the failures occur only in Koji, where we can't get a shell and poke around. Create a compressed tarball and encode it with base64 to allow it to be output along with the normal build output. Include instruction on how to extract the base64-encoded content from the build log inline. The tar archive is compressed with zstd which provides a good balance of speed and size. The compression level of 17 was chosen after a number of tests against real test failures, as opposed to entirely random selection. ;) --- git.spec | 3 ++- print-failed-test-output | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index cc7f53c..4c7d9bf 100644 --- a/git.spec +++ b/git.spec @@ -257,6 +257,7 @@ BuildRequires: subversion-perl BuildRequires: tar BuildRequires: time BuildRequires: zip +BuildRequires: zstd %endif # endif with tests @@ -864,7 +865,7 @@ export GIT_TEST_SVN_HTTPD=true # Create tmpdir for test output and update GIT_TEST_OPTS # Also update GIT-BUILD-OPTIONS to keep make from any needless rebuilding -testdir=$(mktemp -d -p /tmp git-t.XXXX) +export testdir=$(mktemp -d -p /tmp git-t.XXXX) sed -i "s@^GIT_TEST_OPTS = .*@& --root=$testdir@" config.mak touch -r GIT-BUILD-OPTIONS ts sed -i "s@\(GIT_TEST_OPTS='.*\)'@\1 --root=$testdir'@" GIT-BUILD-OPTIONS diff --git a/print-failed-test-output b/print-failed-test-output index d0d63aa..4e65662 100644 --- a/print-failed-test-output +++ b/print-failed-test-output @@ -10,4 +10,17 @@ for exit_file in t/test-results/*.exit; do printf '\n%s\n%s\n%s\n' "$sep" "$out_file" "$sep" cat "$out_file" done + +# tar up test-results & $testdir, then print base64 encoded output +# +# copy $testdir contents to test-results to avoid absolute paths with tar +cp -a $testdir/* t/test-results/ +begin='-----BEGIN BASE64 MESSAGE-----' +end='-----END BASE64 MESSAGE-----' +printf '\n%s\n' 'test-results and trash directory output follows; decode via:' +printf '%s\n' "sed -n '/^${begin}$/,/^${end}$/{/^${begin}$/!{/^${end}$/!p}}' build.log | base64 -d >output.tar.zst" +printf '%s\n' "$begin" +tar -C t -cf - test-results/ | zstdmt -17 | base64 +printf '%s\n' "$end" + exit 1 From 54729198f5bbec2a25b853008f3e7ef912e6a35a Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 5 Dec 2022 23:31:37 -0500 Subject: [PATCH 777/842] update to 2.39.0-rc2 Release notes: https://github.com/git/git/raw/v2.39.0-rc2/Documentation/RelNotes/2.39.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 4c7d9bf..c755f88 100644 --- a/git.spec +++ b/git.spec @@ -67,14 +67,14 @@ %{?!bash_completions_dir:%global bash_completions_dir %{_datadir}/bash-completion/completions} # 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.39.0 -Release: 0.1%{?rcrev}%{?dist} +Release: 0.2%{?rcrev}%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -1021,6 +1021,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Dec 05 2022 Todd Zullinger - 2.39.0-0.2.rc2 +- update to 2.39.0-rc2 + * Wed Nov 30 2022 Todd Zullinger - 2.39.0-0.1.rc1 - update to 2.39.0-rc1 diff --git a/sources b/sources index dd6112a..253c5b3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.39.0.rc1.tar.xz) = c90496689cf4ef5bd0efe85ac1f52b53527603596bef064470bd6c30f6b5d067e001d4a2f2cbe10f57235f8a74b733d59bc8cd8051f6fa9475b6dfb4df67577e -SHA512 (git-2.39.0.rc1.tar.sign) = bda17f54aa43b73376ebda0f6213a1ce5c2c882dccc605e564b9ec7b9058e9f24c6d4dd34496750a866baf60098607b1cabbacfff678f00e7e032efb328be76e +SHA512 (git-2.39.0.rc2.tar.xz) = 31b6fda1fcbed027f20140066f77283bae1179da015fd01b3bee61ab4b313603b229b13b84680030ca65c4b9435133f209b9cc832caf9cff30824da816c3f687 +SHA512 (git-2.39.0.rc2.tar.sign) = ac6f40422717756d25f7e2d8a24c0b05d12985da4c4d733755c031c20819e157b0d97199443447900f772d235cfc7e4fefe4ea23506ab709db24347420bd3440 From 66efed4a986d32010a21db8b3352ee2f6960c29a Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 12 Dec 2022 13:27:10 -0500 Subject: [PATCH 778/842] update to 2.39.0 Release notes: https://github.com/git/git/raw/v2.39.0/Documentation/RelNotes/2.39.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index c755f88..adb440b 100644 --- a/git.spec +++ b/git.spec @@ -67,14 +67,14 @@ %{?!bash_completions_dir:%global bash_completions_dir %{_datadir}/bash-completion/completions} # 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.39.0 -Release: 0.2%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -1021,6 +1021,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Dec 12 2022 Todd Zullinger - 2.39.0-1 +- update to 2.39.0 + * Mon Dec 05 2022 Todd Zullinger - 2.39.0-0.2.rc2 - update to 2.39.0-rc2 diff --git a/sources b/sources index 253c5b3..01d2443 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.39.0.rc2.tar.xz) = 31b6fda1fcbed027f20140066f77283bae1179da015fd01b3bee61ab4b313603b229b13b84680030ca65c4b9435133f209b9cc832caf9cff30824da816c3f687 -SHA512 (git-2.39.0.rc2.tar.sign) = ac6f40422717756d25f7e2d8a24c0b05d12985da4c4d733755c031c20819e157b0d97199443447900f772d235cfc7e4fefe4ea23506ab709db24347420bd3440 +SHA512 (git-2.39.0.tar.xz) = f072cae7738279b1c0f8202e83a243ff0164b03d3be22895aa875caa265150a5773e1f062724b3eb82bc64b163730b6f451b82fa0c904167a8fa53ced5d3b1df +SHA512 (git-2.39.0.tar.sign) = 61f8b98c86ecada0784aa9d86bb7c88ed3fb836dee8ee91c16bdf6fba56226c6db424debd2b0f1485b67bdbb5261626b8ff9f362e32d7b93449461f0f873559a From ce294eae022e5c0fe88a552ea7eaca86ce0bc05e Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 13 Jan 2023 09:35:22 +0100 Subject: [PATCH 779/842] Remove perl(MODULE_COMPAT), it will be replaced by generators --- git.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/git.spec b/git.spec index adb440b..ca029e2 100644 --- a/git.spec +++ b/git.spec @@ -464,7 +464,6 @@ Requires: git = %{version}-%{release} Summary: Perl interface to Git BuildArch: noarch Requires: git = %{version}-%{release} -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -n perl-Git %{summary}. @@ -472,7 +471,6 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi Summary: Perl interface to Git::SVN BuildArch: noarch Requires: git = %{version}-%{release} -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -n perl-Git-SVN %{summary}. From 6fcfc2d4a26144fa85e5077518efc5418c68e96d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 17 Jan 2023 14:43:57 -0500 Subject: [PATCH 780/842] require perl(MODULE_COMPAT) for Fedora < 38 and RHEL ce294ea (Remove perl(MODULE_COMPAT), it will be replaced by generators, 2023-01-13) removed the `Requires: perl(:MODULE_COMPAT_*)` entirely. This is not suitable for merging to older Fedora or RHEL releases. Make the requirement conditional. --- git.spec | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/git.spec b/git.spec index ca029e2..6988bb2 100644 --- a/git.spec +++ b/git.spec @@ -14,6 +14,13 @@ %bcond_with linkcheck %endif +# Settings for Fedora >= 38 +%if 0%{?fedora} >= 38 +%bcond_with perl_modcompat +%else +%bcond_without perl_modcompat +%endif + # Settings for Fedora and EL >= 9 %if 0%{?fedora} || 0%{?rhel} >= 9 %bcond_without asciidoctor @@ -464,6 +471,9 @@ Requires: git = %{version}-%{release} Summary: Perl interface to Git BuildArch: noarch Requires: git = %{version}-%{release} +%if %{with perl_modcompat} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +%endif %description -n perl-Git %{summary}. @@ -471,6 +481,9 @@ Requires: git = %{version}-%{release} Summary: Perl interface to Git::SVN BuildArch: noarch Requires: git = %{version}-%{release} +%if %{with perl_modcompat} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +%endif %description -n perl-Git-SVN %{summary}. From 029feecb34445b7f33405f2796c1138713fbfc94 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 17 Jan 2023 14:46:44 -0500 Subject: [PATCH 781/842] update to 2.39.1 (CVE-2022-41903, CVE-2022-23521) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From the release notes for 2.30.7¹: * CVE-2022-41903: git log has the ability to display commits using an arbitrary format with its --format specifiers. This functionality is also exposed to git archive via the export-subst gitattribute. When processing the padding operators (e.g., %<(, %<|(, %>(, %>>(, or %><( ), an integer overflow can occur in pretty.c::format_and_pad_commit() where a size_t is improperly stored as an int, and then added as an offset to a subsequent memcpy() call. This overflow can be triggered directly by a user running a command which invokes the commit formatting machinery (e.g., git log --format=...). It may also be triggered indirectly through git archive via the export-subst mechanism, which expands format specifiers inside of files within the repository during a git archive. This integer overflow can result in arbitrary heap writes, which may result in remote code execution. * CVE-2022-23521: gitattributes are a mechanism to allow defining attributes for paths. These attributes can be defined by adding a `.gitattributes` file to the repository, which contains a set of file patterns and the attributes that should be set for paths matching this pattern. When parsing gitattributes, multiple integer overflows can occur when there is a huge number of path patterns, a huge number of attributes for a single pattern, or when the declared attribute names are huge. These overflows can be triggered via a crafted `.gitattributes` file that may be part of the commit history. Git silently splits lines longer than 2KB when parsing gitattributes from a file, but not when parsing them from the index. Consequentially, the failure mode depends on whether the file exists in the working tree, the index or both. This integer overflow can result in arbitrary heap reads and writes, which may result in remote code execution. Credit for finding CVE-2022-41903 goes to Joern Schneeweisz of GitLab. An initial fix was authored by Markus Vervier of X41 D-Sec. Credit for finding CVE-2022-23521 goes to Markus Vervier and Eric Sesterhenn of X41 D-Sec. This work was sponsored by OSTIF. The proposed fixes have been polished and extended to cover additional findings by Patrick Steinhardt of GitLab, with help from others on the Git security mailing list. ¹ https://github.com/git/git/raw/v2.39.1/Documentation/RelNotes/2.30.7.txt --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 6988bb2..ddd935b 100644 --- a/git.spec +++ b/git.spec @@ -80,7 +80,7 @@ %global _package_note_file %{_builddir}/%{name}-%{version}%{?rcrev}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.39.0 +Version: 2.39.1 Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT @@ -1032,6 +1032,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Jan 17 2023 Todd Zullinger - 2.39.1-1 +- update to 2.39.1 (CVE-2022-41903, CVE-2022-23521) + * Mon Dec 12 2022 Todd Zullinger - 2.39.0-1 - update to 2.39.0 diff --git a/sources b/sources index 01d2443..7924f69 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.39.0.tar.xz) = f072cae7738279b1c0f8202e83a243ff0164b03d3be22895aa875caa265150a5773e1f062724b3eb82bc64b163730b6f451b82fa0c904167a8fa53ced5d3b1df -SHA512 (git-2.39.0.tar.sign) = 61f8b98c86ecada0784aa9d86bb7c88ed3fb836dee8ee91c16bdf6fba56226c6db424debd2b0f1485b67bdbb5261626b8ff9f362e32d7b93449461f0f873559a +SHA512 (git-2.39.1.tar.xz) = b1821a814947f01adf98206a7e9a01da9daa617b1192e8ef6968b05af8d874f028fb26b5f828a9c48f734ef2c276f4d23bdc898ba46fb7aaa96dbe68081037e9 +SHA512 (git-2.39.1.tar.sign) = b6295e186263654b686fd0f0814a68dfbd04635ff4d613a09fa9d13897b584d06611903bc0205ecee6f01932c4065d20671bd91f8e6239a5f9c6a2fc6c38b87d From 04a6af281b191f6a72c3af164ed24a6e09c30823 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 04:55:02 +0000 Subject: [PATCH 782/842] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index ddd935b..373235d 100644 --- a/git.spec +++ b/git.spec @@ -81,7 +81,7 @@ Name: git Version: 2.39.1 -Release: 1%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist}.1 Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -1032,6 +1032,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.39.1-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Jan 17 2023 Todd Zullinger - 2.39.1-1 - update to 2.39.1 (CVE-2022-41903, CVE-2022-23521) From 7c34cecc4c6ede0c67c5359bc3a0d26955533d4d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 3 Feb 2023 15:56:49 -0500 Subject: [PATCH 783/842] drop perl Email::Valid dep on RHEL (#2166718) The git send-email command uses Email::Valid to check addresses. If Email::Valid is not present, it falls back to a more basic regex match (which is not nearly as thorough as the checks Email::Valid performs). While Fedora (and EPEL 7/8 provide perl-Email-Valid, RHEL does not and does not wish to add the dependency. Make it easier for RHEL to fork & sync from us by making the dependency conditional. References: https://bugzilla.redhat.com/2020487 https://bugzilla.redhat.com/2046203 http://public-inbox.org/git/20220620004427.3586240-1-trawets@amazon.com/T/#u 4414f61 (add more git-email perl dependencies, 2021-11-13) --- git.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 373235d..127f94a 100644 --- a/git.spec +++ b/git.spec @@ -81,7 +81,7 @@ Name: git Version: 2.39.1 -Release: 1%{?rcrev}%{?dist}.1 +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -390,7 +390,10 @@ BuildArch: noarch Requires: git = %{version}-%{release} Requires: perl(Authen::SASL) Requires: perl(Cwd) +%if ! 0%{?rhel} +# RHEL lacks perl-Email-Valid (rhbz#2166718) Requires: perl(Email::Valid) +%endif Requires: perl(File::Spec) Requires: perl(File::Spec::Functions) Requires: perl(File::Temp) @@ -1032,6 +1035,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Feb 03 2023 Todd Zullinger - 2.39.1-2 +- drop perl Email::Valid dep on RHEL (#2166718) + * Thu Jan 19 2023 Fedora Release Engineering - 2.39.1-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 4583821b534986dc2dcde28855d99ae16bc14fd6 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 14 Feb 2023 13:15:01 -0500 Subject: [PATCH 784/842] update to 2.39.2 (CVE-2023-22490, CVE-2023-23946) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From the release notes for 2.30.8¹: * CVE-2023-22490: Using a specially-crafted repository, Git can be tricked into using its local clone optimization even when using a non-local transport. Though Git will abort local clones whose source $GIT_DIR/objects directory contains symbolic links (c.f., CVE-2022-39253), the objects directory itself may still be a symbolic link. These two may be combined to include arbitrary files based on known paths on the victim's filesystem within the malicious repository's working copy, allowing for data exfiltration in a similar manner as CVE-2022-39253. * CVE-2023-23946: By feeding a crafted input to "git apply", a path outside the working tree can be overwritten as the user who is running "git apply". * A mismatched type in `attr.c::read_attr_from_index()` which could cause Git to errantly reject attributes on Windows and 32-bit Linux has been corrected. Credit for finding CVE-2023-22490 goes to yvvdwf, and the fix was developed by Taylor Blau, with additional help from others on the Git security mailing list. Credit for finding CVE-2023-23946 goes to Joern Schneeweisz, and the fix was developed by Patrick Steinhardt. ¹ https://github.com/git/git/raw/v2.39.2/Documentation/RelNotes/2.30.8.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 127f94a..2496456 100644 --- a/git.spec +++ b/git.spec @@ -80,8 +80,8 @@ %global _package_note_file %{_builddir}/%{name}-%{version}%{?rcrev}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.39.1 -Release: 2%{?rcrev}%{?dist} +Version: 2.39.2 +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -1035,6 +1035,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Feb 14 2023 Todd Zullinger - 2.39.2-1 +- update to 2.39.2 (CVE-2023-22490, CVE-2023-23946) + * Fri Feb 03 2023 Todd Zullinger - 2.39.1-2 - drop perl Email::Valid dep on RHEL (#2166718) diff --git a/sources b/sources index 7924f69..9fd818d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.39.1.tar.xz) = b1821a814947f01adf98206a7e9a01da9daa617b1192e8ef6968b05af8d874f028fb26b5f828a9c48f734ef2c276f4d23bdc898ba46fb7aaa96dbe68081037e9 -SHA512 (git-2.39.1.tar.sign) = b6295e186263654b686fd0f0814a68dfbd04635ff4d613a09fa9d13897b584d06611903bc0205ecee6f01932c4065d20671bd91f8e6239a5f9c6a2fc6c38b87d +SHA512 (git-2.39.2.tar.xz) = fdca70bee19401c5c7a6d2f3d70bd80b6ba99f6a9f97947de31d4366ee3a78a18d5298abb25727ec8ef67131bca673e48dff2a5a050b6e032884ab04066b20cb +SHA512 (git-2.39.2.tar.sign) = 9d2641d179f809e55bf44fe9fed9d955e88461fc2cb4120ec3b1cd42944a6715ae9e080ea2e8d53e5e68335b7b4577aa363c836d2af56fbca3820d931b985cd9 From f5940a719d37e6d90b5298dcf993fa3ebf5ed56a Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 24 Feb 2023 16:37:12 -0500 Subject: [PATCH 785/842] update to 2.40.0-rc0 Release notes: https://github.com/git/git/raw/v2.40.0-rc0/Documentation/RelNotes/2.40.0.txt --- git.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index 2496456..c03c12f 100644 --- a/git.spec +++ b/git.spec @@ -74,14 +74,14 @@ %{?!bash_completions_dir:%global bash_completions_dir %{_datadir}/bash-completion/completions} # 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.39.2 -Release: 1%{?rcrev}%{?dist} +Version: 2.40.0 +Release: 0.0%{?rcrev}%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -1035,6 +1035,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Feb 24 2023 Todd Zullinger - 2.40.0-0.0.rc0 +- update to 2.40.0-rc0 + * Tue Feb 14 2023 Todd Zullinger - 2.39.2-1 - update to 2.39.2 (CVE-2023-22490, CVE-2023-23946) diff --git a/sources b/sources index 9fd818d..542036e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.39.2.tar.xz) = fdca70bee19401c5c7a6d2f3d70bd80b6ba99f6a9f97947de31d4366ee3a78a18d5298abb25727ec8ef67131bca673e48dff2a5a050b6e032884ab04066b20cb -SHA512 (git-2.39.2.tar.sign) = 9d2641d179f809e55bf44fe9fed9d955e88461fc2cb4120ec3b1cd42944a6715ae9e080ea2e8d53e5e68335b7b4577aa363c836d2af56fbca3820d931b985cd9 +SHA512 (git-2.40.0.rc0.tar.xz) = 123d400cce9a66f7399fe9e74b79e8ec709b7ca45d4cf8296af27ad1b866fccebc6493cc056c08d4678d3720bace60193d55ff6014137965317c16e65536ac20 +SHA512 (git-2.40.0.rc0.tar.sign) = 7a763b0581534b1e019dbf05b3a06def0f9eb73f9eb2fee5022d5fed59147d47ddca586581b754df61cc5c14e022b5b2096e23e0db037cdff1960f412e0b4dec From 01d712d89bb9c8f519f214707413282d8536b2e4 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 1 Mar 2023 13:16:22 -0500 Subject: [PATCH 786/842] update to 2.40.0-rc1 Apply upstream patch to resolve issues in range-diff on non-x86 arches. Release notes: https://github.com/git/git/raw/v2.40.0-rc1/Documentation/RelNotes/2.40.0.txt --- ...-compiler-warning-when-char-is-unsig.patch | 40 +++++++++++++++++++ git.spec | 12 +++++- sources | 4 +- 3 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 0001-range-diff-avoid-compiler-warning-when-char-is-unsig.patch diff --git a/0001-range-diff-avoid-compiler-warning-when-char-is-unsig.patch b/0001-range-diff-avoid-compiler-warning-when-char-is-unsig.patch new file mode 100644 index 0000000..f3a9ab9 --- /dev/null +++ b/0001-range-diff-avoid-compiler-warning-when-char-is-unsig.patch @@ -0,0 +1,40 @@ +From d9165bef5810df216e0eb4fac62d59cbf19446e4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ren=C3=A9=20Scharfe?= +Date: Tue, 28 Feb 2023 17:13:27 +0100 +Subject: [PATCH] range-diff: avoid compiler warning when char is unsigned +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Since 2b15969f61 (range-diff: let '--abbrev' option takes effect, +2023-02-20), GCC 11.3 on Ubuntu 22.04 on aarch64 warns (and errors +out if the make variable DEVELOPER is set): + +range-diff.c: In function ‘output_pair_header’: +range-diff.c:388:20: error: comparison is always false due to limited range of data type [-Werror=type-limits] + 388 | if (abbrev < 0) + | ^ +cc1: all warnings being treated as errors + +That's because char is unsigned on that platform. Use int instead, just +like in struct diff_options, to copy the value faithfully. + +Signed-off-by: René Scharfe +Signed-off-by: Junio C Hamano +--- + range-diff.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/range-diff.c b/range-diff.c +index 086365dffb..4bd65ab749 100644 +--- a/range-diff.c ++++ b/range-diff.c +@@ -383,7 +383,7 @@ static void output_pair_header(struct diff_options *diffopt, + const char *color_new = diff_get_color_opt(diffopt, DIFF_FILE_NEW); + const char *color_commit = diff_get_color_opt(diffopt, DIFF_COMMIT); + const char *color; +- char abbrev = diffopt->abbrev; ++ int abbrev = diffopt->abbrev; + + if (abbrev < 0) + abbrev = DEFAULT_ABBREV; diff --git a/git.spec b/git.spec index c03c12f..e875ca6 100644 --- a/git.spec +++ b/git.spec @@ -74,14 +74,14 @@ %{?!bash_completions_dir:%global bash_completions_dir %{_datadir}/bash-completion/completions} # 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.40.0 -Release: 0.0%{?rcrev}%{?dist} +Release: 0.1%{?rcrev}%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -123,6 +123,11 @@ 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 +# Avoid range-diff issues on non-x86 arches +# https://github.com/git/git/commit/d9165bef58 +# https://lore.kernel.org/git/Y%2F+paI8WGSmEbv%2Fw@pobox.com/ +Patch4: 0001-range-diff-avoid-compiler-warning-when-char-is-unsig.patch + %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -1035,6 +1040,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Mar 01 2023 Todd Zullinger - 2.40.0-0.1.rc1 +- update to 2.40.0-rc1 + * Fri Feb 24 2023 Todd Zullinger - 2.40.0-0.0.rc0 - update to 2.40.0-rc0 diff --git a/sources b/sources index 542036e..f222e62 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.40.0.rc0.tar.xz) = 123d400cce9a66f7399fe9e74b79e8ec709b7ca45d4cf8296af27ad1b866fccebc6493cc056c08d4678d3720bace60193d55ff6014137965317c16e65536ac20 -SHA512 (git-2.40.0.rc0.tar.sign) = 7a763b0581534b1e019dbf05b3a06def0f9eb73f9eb2fee5022d5fed59147d47ddca586581b754df61cc5c14e022b5b2096e23e0db037cdff1960f412e0b4dec +SHA512 (git-2.40.0.rc1.tar.xz) = edff125736d498d964ec876a30a2bd4b0a115df58747e8f2c94c7c45fb5b112925336fecc7cbb2f2037e9f890d10753e988499be222fc41a176fec68f2a157fc +SHA512 (git-2.40.0.rc1.tar.sign) = aabee9d1810fd93858ad884ae0aaefb5a6965543715e02f8abf787cfc47794f53d6527399787e8aca20ceb9e8b6df4c9d1be2cbbd517ecb11eae3c05e77ffcb5 From b8be89a815f8345043583f447f7811e7f445b407 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 7 Mar 2023 14:59:23 -0500 Subject: [PATCH 787/842] update to 2.40.0-rc2 Release notes: https://github.com/git/git/raw/v2.40.0-rc2/Documentation/RelNotes/2.40.0.txt --- ...-compiler-warning-when-char-is-unsig.patch | 40 ------------------- git.spec | 12 +++--- sources | 4 +- 3 files changed, 7 insertions(+), 49 deletions(-) delete mode 100644 0001-range-diff-avoid-compiler-warning-when-char-is-unsig.patch diff --git a/0001-range-diff-avoid-compiler-warning-when-char-is-unsig.patch b/0001-range-diff-avoid-compiler-warning-when-char-is-unsig.patch deleted file mode 100644 index f3a9ab9..0000000 --- a/0001-range-diff-avoid-compiler-warning-when-char-is-unsig.patch +++ /dev/null @@ -1,40 +0,0 @@ -From d9165bef5810df216e0eb4fac62d59cbf19446e4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ren=C3=A9=20Scharfe?= -Date: Tue, 28 Feb 2023 17:13:27 +0100 -Subject: [PATCH] range-diff: avoid compiler warning when char is unsigned -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Since 2b15969f61 (range-diff: let '--abbrev' option takes effect, -2023-02-20), GCC 11.3 on Ubuntu 22.04 on aarch64 warns (and errors -out if the make variable DEVELOPER is set): - -range-diff.c: In function ‘output_pair_header’: -range-diff.c:388:20: error: comparison is always false due to limited range of data type [-Werror=type-limits] - 388 | if (abbrev < 0) - | ^ -cc1: all warnings being treated as errors - -That's because char is unsigned on that platform. Use int instead, just -like in struct diff_options, to copy the value faithfully. - -Signed-off-by: René Scharfe -Signed-off-by: Junio C Hamano ---- - range-diff.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/range-diff.c b/range-diff.c -index 086365dffb..4bd65ab749 100644 ---- a/range-diff.c -+++ b/range-diff.c -@@ -383,7 +383,7 @@ static void output_pair_header(struct diff_options *diffopt, - const char *color_new = diff_get_color_opt(diffopt, DIFF_FILE_NEW); - const char *color_commit = diff_get_color_opt(diffopt, DIFF_COMMIT); - const char *color; -- char abbrev = diffopt->abbrev; -+ int abbrev = diffopt->abbrev; - - if (abbrev < 0) - abbrev = DEFAULT_ABBREV; diff --git a/git.spec b/git.spec index e875ca6..d5a3c2c 100644 --- a/git.spec +++ b/git.spec @@ -74,14 +74,14 @@ %{?!bash_completions_dir:%global bash_completions_dir %{_datadir}/bash-completion/completions} # 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.40.0 -Release: 0.1%{?rcrev}%{?dist} +Release: 0.2%{?rcrev}%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -123,11 +123,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 -# Avoid range-diff issues on non-x86 arches -# https://github.com/git/git/commit/d9165bef58 -# https://lore.kernel.org/git/Y%2F+paI8WGSmEbv%2Fw@pobox.com/ -Patch4: 0001-range-diff-avoid-compiler-warning-when-char-is-unsig.patch - %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -1040,6 +1035,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Mar 07 2023 Todd Zullinger - 2.40.0-0.2.rc2 +- update to 2.40.0-rc2 + * Wed Mar 01 2023 Todd Zullinger - 2.40.0-0.1.rc1 - update to 2.40.0-rc1 diff --git a/sources b/sources index f222e62..c7bdf9d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.40.0.rc1.tar.xz) = edff125736d498d964ec876a30a2bd4b0a115df58747e8f2c94c7c45fb5b112925336fecc7cbb2f2037e9f890d10753e988499be222fc41a176fec68f2a157fc -SHA512 (git-2.40.0.rc1.tar.sign) = aabee9d1810fd93858ad884ae0aaefb5a6965543715e02f8abf787cfc47794f53d6527399787e8aca20ceb9e8b6df4c9d1be2cbbd517ecb11eae3c05e77ffcb5 +SHA512 (git-2.40.0.rc2.tar.xz) = e038ddc97b95a0e2e50fcc35308041586e4c40891ce9e491b922a9fe0c40fd816387d84266acfd55565f90c4b6d794880952d6ce8ea19e68ef5451ace9a76548 +SHA512 (git-2.40.0.rc2.tar.sign) = 5a0c16b11293ccea1c90612b2076e202c23ce8bd16584ab5416397906b2bddf21b23397ef0bf5517093e85986bfd258233e45f0509b2336dc7e566e99cf1d32b From 459d08b118c60a6999fa523472714965e6e1de3a Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 13 Mar 2023 12:57:10 -0400 Subject: [PATCH 788/842] update to 2.40.0 Release notes: https://github.com/git/git/raw/v2.40.0/Documentation/RelNotes/2.40.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index d5a3c2c..f12729c 100644 --- a/git.spec +++ b/git.spec @@ -74,14 +74,14 @@ %{?!bash_completions_dir:%global bash_completions_dir %{_datadir}/bash-completion/completions} # 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.40.0 -Release: 0.2%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -1035,6 +1035,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Mar 13 2023 Todd Zullinger - 2.40.0-1 +- update to 2.40.0 + * Tue Mar 07 2023 Todd Zullinger - 2.40.0-0.2.rc2 - update to 2.40.0-rc2 diff --git a/sources b/sources index c7bdf9d..fe20049 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.40.0.rc2.tar.xz) = e038ddc97b95a0e2e50fcc35308041586e4c40891ce9e491b922a9fe0c40fd816387d84266acfd55565f90c4b6d794880952d6ce8ea19e68ef5451ace9a76548 -SHA512 (git-2.40.0.rc2.tar.sign) = 5a0c16b11293ccea1c90612b2076e202c23ce8bd16584ab5416397906b2bddf21b23397ef0bf5517093e85986bfd258233e45f0509b2336dc7e566e99cf1d32b +SHA512 (git-2.40.0.tar.xz) = a2720f8f9a0258c0bb5e23badcfd68a147682e45a5d039a42c47128296c508109d5039029db89311a35db97a9008585e84ed11b400846502c9be913d67f0fd90 +SHA512 (git-2.40.0.tar.sign) = 30376e2487abb247d32b080b37c008dca59067f94f93769197fc2c096ac6a433598578af852f6b343a18e57587f7ff9eac30899393abae0658d68317a5b2fe65 From b477fc33188a26bbde2836491875dca2446d8009 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 25 Apr 2023 13:12:02 -0400 Subject: [PATCH 789/842] update to 2.40.1 (CVE-2023-25652, CVE-2023-25815, CVE-2023-29007) Refer to the release notes for 2.30.9 for details of each CVE as well as the following security advisories from the git project: https://github.com/git/git/security/advisories/GHSA-2hvf-7c8p-28fx (CVE-2023-25652) https://github.com/git/git/security/advisories/GHSA-v48j-4xgg-4844 (CVE-2023-29007) (At this time there is no upstream advisory for CVE-2023-25815. This issue does not affect the Fedora packages as we do not use the runtime prefix support.) Release notes: https://github.com/git/git/raw/v2.30.9/Documentation/RelNotes/2.30.9.txt https://github.com/git/git/raw/v2.40.1/Documentation/RelNotes/2.40.1.txt --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index f12729c..2e013b3 100644 --- a/git.spec +++ b/git.spec @@ -80,7 +80,7 @@ %global _package_note_file %{_builddir}/%{name}-%{version}%{?rcrev}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.40.0 +Version: 2.40.1 Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT @@ -1035,6 +1035,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Apr 25 2023 Todd Zullinger - 2.40.1-1 +- update to 2.40.1 (CVE-2023-25652, CVE-2023-25815, CVE-2023-29007) + * Mon Mar 13 2023 Todd Zullinger - 2.40.0-1 - update to 2.40.0 diff --git a/sources b/sources index fe20049..0ab8e9c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.40.0.tar.xz) = a2720f8f9a0258c0bb5e23badcfd68a147682e45a5d039a42c47128296c508109d5039029db89311a35db97a9008585e84ed11b400846502c9be913d67f0fd90 -SHA512 (git-2.40.0.tar.sign) = 30376e2487abb247d32b080b37c008dca59067f94f93769197fc2c096ac6a433598578af852f6b343a18e57587f7ff9eac30899393abae0658d68317a5b2fe65 +SHA512 (git-2.40.1.tar.xz) = 9ab41c64c6e666c314683bc4925535e037d43f947b8d327ff7d0379ac12899f4effcc2fe4e47b1ce652ad7140aa4f01f3b99f9cc0cf854cfeface1a5d3e1893e +SHA512 (git-2.40.1.tar.sign) = b8becacee3736bf2f5c661da4d3f86042544717556e8924a4f385c4966886ffe7558ef05bf5ce58c38e404c477b299f952fd83ed249802ddaf6bd4bf9f3885f8 From d050347835c141152fe4e78cdb3a9d7c849cff9b Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 12 May 2023 21:07:56 -0400 Subject: [PATCH 790/842] use tilde versioning for release candidates All supported released of Fedora and EPEL support the tilde notation. Reference: https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/ --- git.spec | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index 2e013b3..c778286 100644 --- a/git.spec +++ b/git.spec @@ -73,20 +73,23 @@ # Define %%bash_completions_dir for EL <= 9 %{?!bash_completions_dir:%global bash_completions_dir %{_datadir}/bash-completion/completions} -# Define for release candidates -#global rcrev .rc0 +# Adjust Source URL path for release candidates +%global rcpath %(test "%{version}" = "%{real_version}" || echo testing/) # Set path to the package-notes linker script -%global _package_note_file %{_builddir}/%{name}-%{version}%{?rcrev}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld +%global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git Version: 2.40.1 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ -Source0: https://www.kernel.org/pub/software/scm/git/%{?rcrev:testing/}%{name}-%{version}%{?rcrev}.tar.xz -Source1: https://www.kernel.org/pub/software/scm/git/%{?rcrev:testing/}%{name}-%{version}%{?rcrev}.tar.sign + +# Note: real_version must be defined _after_ Version +%global real_version %(echo %{version} | tr '~' '.') +Source0: https://www.kernel.org/pub/software/scm/git/%{rcpath}%{name}-%{real_version}.tar.xz +Source1: https://www.kernel.org/pub/software/scm/git/%{rcpath}%{name}-%{real_version}.tar.sign # Junio C Hamano's key is used to sign git releases, it can be found in the # junio-gpg-pub tag within git. @@ -516,7 +519,7 @@ Requires: subversion # Verify GPG signatures xz -dc '%{SOURCE0}' | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data=- -%autosetup -p1 -n %{name}-%{version}%{?rcrev} +%autosetup -p1 -n %{name}-%{real_version} # Install print-failed-test-output script install -p -m 755 %{SOURCE99} print-failed-test-output @@ -1035,6 +1038,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri May 12 2023 Todd Zullinger - 2.40.1-2 +- use tilde versioning for release candidates + * Tue Apr 25 2023 Todd Zullinger - 2.40.1-1 - update to 2.40.1 (CVE-2023-25652, CVE-2023-25815, CVE-2023-29007) From 08d76e08ab2ee8ec274df2cce2248f2d00a53806 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 15 May 2023 22:56:47 -0400 Subject: [PATCH 791/842] update to 2.41.0-rc0 Release notes: https://github.com/git/git/raw/v2.41.0-rc0/Documentation/RelNotes/2.41.0.txt --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index c778286..4682eb9 100644 --- a/git.spec +++ b/git.spec @@ -80,8 +80,8 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.40.1 -Release: 2%{?dist} +Version: 2.41.0~rc0 +Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -1038,6 +1038,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon May 15 2023 Todd Zullinger - 2.41.0~rc0-1 +- update to 2.41.0-rc0 + * Fri May 12 2023 Todd Zullinger - 2.40.1-2 - use tilde versioning for release candidates diff --git a/sources b/sources index 0ab8e9c..53dbdb6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.40.1.tar.xz) = 9ab41c64c6e666c314683bc4925535e037d43f947b8d327ff7d0379ac12899f4effcc2fe4e47b1ce652ad7140aa4f01f3b99f9cc0cf854cfeface1a5d3e1893e -SHA512 (git-2.40.1.tar.sign) = b8becacee3736bf2f5c661da4d3f86042544717556e8924a4f385c4966886ffe7558ef05bf5ce58c38e404c477b299f952fd83ed249802ddaf6bd4bf9f3885f8 +SHA512 (git-2.41.0.rc0.tar.xz) = c553c793055c9457e1223659d96e4972167f5d4286b50e6c6d02a876bff0359b5c8da486bcf7e6bac8b94fe791c78d41ff7ce57c4919514170ab01f6753a6d71 +SHA512 (git-2.41.0.rc0.tar.sign) = 11282774744481e37bfbf0c1fed05c72f237f8b2a120f9bfca9fdb4a0672a1f05dfaa53d55d402d786580591c81cf5751bc0611601f594f3e32760e412c06c00 From 3f9ea1c48989a7299dfd4b731371c3ee0dc636ff Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 19 May 2023 14:38:52 -0400 Subject: [PATCH 792/842] update to 2.41.0-rc1 Release notes: https://github.com/git/git/raw/v2.41.0-rc1/Documentation/RelNotes/2.41.0.txt --- 0001-t-lib-httpd-try-harder-to-find-a-port-for-apache.patch | 6 +++--- 0002-t-lib-git-daemon-try-harder-to-find-a-port.patch | 2 +- 0003-t-lib-git-svn-try-harder-to-find-a-port.patch | 2 +- git.spec | 5 ++++- sources | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/0001-t-lib-httpd-try-harder-to-find-a-port-for-apache.patch b/0001-t-lib-httpd-try-harder-to-find-a-port-for-apache.patch index f7c1509..733f9c0 100644 --- a/0001-t-lib-httpd-try-harder-to-find-a-port-for-apache.patch +++ b/0001-t-lib-httpd-try-harder-to-find-a-port-for-apache.patch @@ -1,4 +1,4 @@ -From aedeaaf788bd8a7fc5a1887196b6f6d8a5c31362 Mon Sep 17 00:00:00 2001 +From 89ccbc15948db9ddbf74530e3fd66dd78ae897ae Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 21 Aug 2022 13:49:57 -0400 Subject: [PATCH] t/lib-httpd: try harder to find a port for apache @@ -30,10 +30,10 @@ Signed-off-by: Todd Zullinger 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh -index 1f6b9b08d1..9279dcd659 100644 +index 2fb1b2ae56..4afdf5a6aa 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh -@@ -175,19 +175,26 @@ prepare_httpd() { +@@ -206,19 +206,26 @@ enable_cgipassauth () { } start_httpd() { diff --git a/0002-t-lib-git-daemon-try-harder-to-find-a-port.patch b/0002-t-lib-git-daemon-try-harder-to-find-a-port.patch index 4540b63..37637bc 100644 --- a/0002-t-lib-git-daemon-try-harder-to-find-a-port.patch +++ b/0002-t-lib-git-daemon-try-harder-to-find-a-port.patch @@ -1,4 +1,4 @@ -From 16750d024ce038b019ab2e9ee5639901e445af37 Mon Sep 17 00:00:00 2001 +From e90e1068ddc9cfa3badd23b16a46c57ed6d8308a Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 26 Aug 2022 18:28:44 -0400 Subject: [PATCH] t/lib-git-daemon: try harder to find a port diff --git a/0003-t-lib-git-svn-try-harder-to-find-a-port.patch b/0003-t-lib-git-svn-try-harder-to-find-a-port.patch index 56624e2..905174e 100644 --- a/0003-t-lib-git-svn-try-harder-to-find-a-port.patch +++ b/0003-t-lib-git-svn-try-harder-to-find-a-port.patch @@ -1,4 +1,4 @@ -From aa5105dc115b43edc6c9c11714b092583f1221aa Mon Sep 17 00:00:00 2001 +From 41423d666fd52eaa6aa2b44a0de1b81d0857ca06 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 26 Aug 2022 18:28:44 -0400 Subject: [PATCH] t/lib-git-svn: try harder to find a port diff --git a/git.spec b/git.spec index 4682eb9..78e7721 100644 --- a/git.spec +++ b/git.spec @@ -80,7 +80,7 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.41.0~rc0 +Version: 2.41.0~rc1 Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT @@ -1038,6 +1038,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri May 19 2023 Todd Zullinger - 2.41.0~rc1-1 +- update to 2.41.0-rc1 + * Mon May 15 2023 Todd Zullinger - 2.41.0~rc0-1 - update to 2.41.0-rc0 diff --git a/sources b/sources index 53dbdb6..bd57bbd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.41.0.rc0.tar.xz) = c553c793055c9457e1223659d96e4972167f5d4286b50e6c6d02a876bff0359b5c8da486bcf7e6bac8b94fe791c78d41ff7ce57c4919514170ab01f6753a6d71 -SHA512 (git-2.41.0.rc0.tar.sign) = 11282774744481e37bfbf0c1fed05c72f237f8b2a120f9bfca9fdb4a0672a1f05dfaa53d55d402d786580591c81cf5751bc0611601f594f3e32760e412c06c00 +SHA512 (git-2.41.0.rc1.tar.xz) = a93e169344d5ff6bb40bbd670e6f3a755a827f6b26089018f27892b4a0831349aa0c0019f8b573950359dfc271dd9317d31667b49d8aa343f2e079051c805ef0 +SHA512 (git-2.41.0.rc1.tar.sign) = 842ab4b4ba6d306c9de220426399ae1d3d32ae19029ad498e6e821ed4d79dfc68bc85beabdb56e39ff8dfd4bd8e6b2049bd919f9d5f0d03794f5a8a7ee36fa24 From a297238a545e63768f983e59f39149cf3c6dd6b5 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 24 May 2023 17:50:22 -0400 Subject: [PATCH 793/842] update to 2.41.0-rc2 Release notes: https://github.com/git/git/raw/v2.41.0-rc2/Documentation/RelNotes/2.41.0.txt --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 78e7721..784a2e4 100644 --- a/git.spec +++ b/git.spec @@ -80,7 +80,7 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.41.0~rc1 +Version: 2.41.0~rc2 Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT @@ -1038,6 +1038,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed May 24 2023 Todd Zullinger - 2.41.0~rc2-1 +- update to 2.41.0-rc2 + * Fri May 19 2023 Todd Zullinger - 2.41.0~rc1-1 - update to 2.41.0-rc1 diff --git a/sources b/sources index bd57bbd..b7764f2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.41.0.rc1.tar.xz) = a93e169344d5ff6bb40bbd670e6f3a755a827f6b26089018f27892b4a0831349aa0c0019f8b573950359dfc271dd9317d31667b49d8aa343f2e079051c805ef0 -SHA512 (git-2.41.0.rc1.tar.sign) = 842ab4b4ba6d306c9de220426399ae1d3d32ae19029ad498e6e821ed4d79dfc68bc85beabdb56e39ff8dfd4bd8e6b2049bd919f9d5f0d03794f5a8a7ee36fa24 +SHA512 (git-2.41.0.rc2.tar.xz) = 0f833dfd06a48e7a85f9b6b5133747624a3494de722160d0187a7e2e97465409849c55cdf25706ce58fa8f3079eafb9a0c3dc9658d91f207308de90560b30d57 +SHA512 (git-2.41.0.rc2.tar.sign) = e6695fe689cc6c3c1abeb9bb8bcf684f90dbd7d073e031bec704a7ecf25f7f22fa6ef9319bbc894baede42db06192cb9a8fdda3ec5eade7d6defb9dbf07a1b4b From 9e3c6109b5e750d2d0877cf2c84167c3dca1914e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 24 May 2023 21:26:16 -0400 Subject: [PATCH 794/842] git.skip-test-patterns: ignore 'skip all tests in t5559' We added t5559-http-fetch-smart-http2 to GIT_SKIP_TESTS in 7d21254 (update to 2.39.0-rc0, 2022-11-23). Update git.skip-test-patterns to reflect this. --- git.skip-test-patterns | 1 + 1 file changed, 1 insertion(+) diff --git a/git.skip-test-patterns b/git.skip-test-patterns index 12b247d..a310f5a 100644 --- a/git.skip-test-patterns +++ b/git.skip-test-patterns @@ -22,6 +22,7 @@ missing SYMLINKS_WINDOWS missing TAR_NEEDS_PAX_FALLBACK missing UTF8_NFD_TO_NFC missing WINDOWS +skipped: skip all tests in t5559 skipping case insensitive tests skipping git p4 tests skipping remote-svn tests, python not available From bae778cbc1db8aa2dad565de1f968c6677aafa06 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 1 Jun 2023 10:20:55 -0400 Subject: [PATCH 795/842] fix Source URL handling Move %rcpath definition added d050347 (use tilde versioning for release candidates, 2023-05-12) after %real_version. Otherwise, it is not parsed correctly. (I'm pretty sure it worked in the past, but it certainly doesn't now.) --- git.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 784a2e4..1488eb3 100644 --- a/git.spec +++ b/git.spec @@ -73,9 +73,6 @@ # Define %%bash_completions_dir for EL <= 9 %{?!bash_completions_dir:%global bash_completions_dir %{_datadir}/bash-completion/completions} -# Adjust Source URL path for release candidates -%global rcpath %(test "%{version}" = "%{real_version}" || echo testing/) - # Set path to the package-notes linker script %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld @@ -88,6 +85,10 @@ URL: https://git-scm.com/ # Note: real_version must be defined _after_ Version %global real_version %(echo %{version} | tr '~' '.') + +# Adjust Source URL path for release candidates +%global rcpath %(test "%{version}" = "%{real_version}" || echo testing/) + Source0: https://www.kernel.org/pub/software/scm/git/%{rcpath}%{name}-%{real_version}.tar.xz Source1: https://www.kernel.org/pub/software/scm/git/%{rcpath}%{name}-%{real_version}.tar.sign From ee7f0d47a7a5bbcc3640435ffa29a07495e0695b Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 1 Jun 2023 10:24:28 -0400 Subject: [PATCH 796/842] update to 2.41.0 Release notes: https://github.com/git/git/raw/v2.41.0/Documentation/RelNotes/2.41.0.txt --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 1488eb3..0fc1d29 100644 --- a/git.spec +++ b/git.spec @@ -77,7 +77,7 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.41.0~rc2 +Version: 2.41.0 Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT @@ -1039,6 +1039,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Jun 01 2023 Todd Zullinger - 2.41.0-1 +- update to 2.41.0 + * Wed May 24 2023 Todd Zullinger - 2.41.0~rc2-1 - update to 2.41.0-rc2 diff --git a/sources b/sources index b7764f2..d13f7c2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.41.0.rc2.tar.xz) = 0f833dfd06a48e7a85f9b6b5133747624a3494de722160d0187a7e2e97465409849c55cdf25706ce58fa8f3079eafb9a0c3dc9658d91f207308de90560b30d57 -SHA512 (git-2.41.0.rc2.tar.sign) = e6695fe689cc6c3c1abeb9bb8bcf684f90dbd7d073e031bec704a7ecf25f7f22fa6ef9319bbc894baede42db06192cb9a8fdda3ec5eade7d6defb9dbf07a1b4b +SHA512 (git-2.41.0.tar.xz) = a215bc6d89afbddd56adac901c24ea2b7f98a37bf6a6a2756893947012ffaa850e76247a3445a5ab13ab5a462f39986fec33eed086148aba5eb554dc1799fee0 +SHA512 (git-2.41.0.tar.sign) = 140f088254997e05bb444ed25f18ae9cadec9c24081acfc66670f153cbeecd2cdb722b07b5678da95c578dd29ad81dcf683264a503b37d63400f0746bbfa8762 From 2600353fc110e5eaa2b714b2cbc28a57251e1fc5 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 6 Jul 2023 12:01:33 -0400 Subject: [PATCH 797/842] Fix file dependencies Installation path macros must not be used in file dependencies: https://docs.fedoraproject.org/en-US/packaging-guidelines/#_file_and_directory_dependencies --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 0fc1d29..75c41fd 100644 --- a/git.spec +++ b/git.spec @@ -129,7 +129,7 @@ Patch3: 0003-t-lib-git-svn-try-harder-to-find-a-port.patch %if %{with docs} # pod2man is needed to build Git.3pm -BuildRequires: %{_bindir}/pod2man +BuildRequires: /usr/bin/pod2man %if %{with asciidoctor} BuildRequires: docbook5-style-xsl BuildRequires: rubygem-asciidoctor From be8516cba36a4b157091e2c8203de434d20da12f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 23:01:21 +0000 Subject: [PATCH 798/842] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 75c41fd..7d49676 100644 --- a/git.spec +++ b/git.spec @@ -78,7 +78,7 @@ Name: git Version: 2.41.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -1039,6 +1039,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.41.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jun 01 2023 Todd Zullinger - 2.41.0-1 - update to 2.41.0 From ac4f507599c0a479e2a25e492c21c4d4e5b51379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Tue, 3 Oct 2023 15:31:37 +0200 Subject: [PATCH 799/842] update to 2.42.0 --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 7d49676..850c7f7 100644 --- a/git.spec +++ b/git.spec @@ -77,8 +77,8 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.41.0 -Release: 2%{?dist} +Version: 2.42.0 +Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -1039,6 +1039,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Oct 03 2023 Ondřej Pohořelský - 2.42.0-1 +- update to 2.42.0 + * Wed Jul 19 2023 Fedora Release Engineering - 2.41.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index d13f7c2..bbad81c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.41.0.tar.xz) = a215bc6d89afbddd56adac901c24ea2b7f98a37bf6a6a2756893947012ffaa850e76247a3445a5ab13ab5a462f39986fec33eed086148aba5eb554dc1799fee0 -SHA512 (git-2.41.0.tar.sign) = 140f088254997e05bb444ed25f18ae9cadec9c24081acfc66670f153cbeecd2cdb722b07b5678da95c578dd29ad81dcf683264a503b37d63400f0746bbfa8762 +SHA512 (git-2.42.0.tar.xz) = afe5bca3c084d4ddd66f20afa820ba10f61007f66846108929e0d4ee7b7eaa896fcf00917dead16881d840f674dec6dd0e353a05e62a31016694af3d7d22a51d +SHA512 (git-2.42.0.tar.sign) = 847914db4f035095643cf38af87e53be82b0d10c0fdcb862f5015df01662c15d6d77410e4f4aaa5ad510d9d82c830a0218465d10905f3ec048929b1c02be6d5d From 7edc80fb3b509faf1180a2694b93c41b263c3b12 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Wed, 1 Nov 2023 21:22:49 +0000 Subject: [PATCH 800/842] remove explicit BR for apr-util-bdb (#2247532) --- git.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 850c7f7..0c0317e 100644 --- a/git.spec +++ b/git.spec @@ -78,7 +78,7 @@ Name: git Version: 2.42.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -192,9 +192,11 @@ BuildRequires: zlib-devel >= 1.2 %if %{with tests} # Test suite requirements BuildRequires: acl -%if 0%{?fedora} || 0%{?rhel} >= 8 -# Needed by t5540-http-push-webdav.sh +%if (0%{?fedora} && 0%{?fedora} < 40) || (0%{?rhel} >= 8 && 0%{?rhel} < 10) +# Needed by t5540-http-push-webdav.sh; recent httpd obviates this BuildRequires: apr-util-bdb +%endif +%if 0%{?fedora} || 0%{?rhel} >= 8 # Needed by t5559-http-fetch-smart-http2.sh BuildRequires: mod_http2 %endif @@ -1039,6 +1041,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Nov 1 2023 Joe Orton - 2.42.0-2 +- remove explicit BR for apr-util-bdb (#2247532) + * Tue Oct 03 2023 Ondřej Pohořelský - 2.42.0-1 - update to 2.42.0 From 3b9b7132ccf307840fc3cd24868c8f61ca6c30b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Tue, 14 Nov 2023 15:15:16 +0100 Subject: [PATCH 801/842] update to 2.42.1 --- ...oid-duplicate-specification-warnings.patch | 86 +++++++++++++++++++ git.spec | 10 ++- sources | 4 +- 3 files changed, 96 insertions(+), 4 deletions(-) create mode 100644 0001-send-email-avoid-duplicate-specification-warnings.patch diff --git a/0001-send-email-avoid-duplicate-specification-warnings.patch b/0001-send-email-avoid-duplicate-specification-warnings.patch new file mode 100644 index 0000000..3dee265 --- /dev/null +++ b/0001-send-email-avoid-duplicate-specification-warnings.patch @@ -0,0 +1,86 @@ +From 0fdc014acc342dace179ba698e58fcb138fb86de Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Tue, 14 Nov 2023 11:38:19 -0500 +Subject: [PATCH] send-email: avoid duplicate specification warnings + +With perl-Getopt-Long >= 2.55, a warning is issued for options which are +specified more than once. In addition to causing users to see warnings, +this results in test failures which compare the output. An example, +from t9001-send-email.37: + + | +++ diff -u expect actual + | --- expect 2023-11-14 10:38:23.854346488 +0000 + | +++ actual 2023-11-14 10:38:23.848346466 +0000 + | @@ -1,2 +1,7 @@ + | +Duplicate specification "no-chain-reply-to" for option "no-chain-reply-to" + | +Duplicate specification "to-cover|to-cover!" for option "to-cover" + | +Duplicate specification "cc-cover|cc-cover!" for option "cc-cover" + | +Duplicate specification "no-thread" for option "no-thread" + | +Duplicate specification "no-to-cover" for option "no-to-cover" + | fatal: longline.patch:35 is longer than 998 characters + | warning: no patches were sent + | error: last command exited with $?=1 + | not ok 37 - reject long lines + +Remove the duplicate option specs. + +Signed-off-by: Todd Zullinger +--- + git-send-email.perl | 16 +++------------- + 1 file changed, 3 insertions(+), 13 deletions(-) + +diff --git a/git-send-email.perl b/git-send-email.perl +index affbb88509..3c678c8998 100755 +--- a/git-send-email.perl ++++ b/git-send-email.perl +@@ -503,7 +503,6 @@ sub config_regexp { + "bcc=s" => \@getopt_bcc, + "no-bcc" => \$no_bcc, + "chain-reply-to!" => \$chain_reply_to, +- "no-chain-reply-to" => sub {$chain_reply_to = 0}, + "sendmail-cmd=s" => \$sendmail_cmd, + "smtp-server=s" => \$smtp_server, + "smtp-server-option=s" => \@smtp_server_options, +@@ -518,36 +517,27 @@ sub config_regexp { + "smtp-auth=s" => \$smtp_auth, + "no-smtp-auth" => sub {$smtp_auth = 'none'}, + "annotate!" => \$annotate, +- "no-annotate" => sub {$annotate = 0}, + "compose" => \$compose, + "quiet" => \$quiet, + "cc-cmd=s" => \$cc_cmd, + "header-cmd=s" => \$header_cmd, + "no-header-cmd" => \$no_header_cmd, + "suppress-from!" => \$suppress_from, +- "no-suppress-from" => sub {$suppress_from = 0}, + "suppress-cc=s" => \@suppress_cc, +- "signed-off-cc|signed-off-by-cc!" => \$signed_off_by_cc, +- "no-signed-off-cc|no-signed-off-by-cc" => sub {$signed_off_by_cc = 0}, +- "cc-cover|cc-cover!" => \$cover_cc, +- "no-cc-cover" => sub {$cover_cc = 0}, +- "to-cover|to-cover!" => \$cover_to, +- "no-to-cover" => sub {$cover_to = 0}, ++ "signed-off-by-cc!" => \$signed_off_by_cc, ++ "cc-cover!" => \$cover_cc, ++ "to-cover!" => \$cover_to, + "confirm=s" => \$confirm, + "dry-run" => \$dry_run, + "envelope-sender=s" => \$envelope_sender, + "thread!" => \$thread, +- "no-thread" => sub {$thread = 0}, + "validate!" => \$validate, +- "no-validate" => sub {$validate = 0}, + "transfer-encoding=s" => \$target_xfer_encoding, + "format-patch!" => \$format_patch, +- "no-format-patch" => sub {$format_patch = 0}, + "8bit-encoding=s" => \$auto_8bit_encoding, + "compose-encoding=s" => \$compose_encoding, + "force" => \$force, + "xmailer!" => \$use_xmailer, +- "no-xmailer" => sub {$use_xmailer = 0}, + "batch-size=i" => \$batch_size, + "relogin-delay=i" => \$relogin_delay, + "git-completion-helper" => \$git_completion_helper, +-- +2.42.0 + diff --git a/git.spec b/git.spec index 0c0317e..11e4de5 100644 --- a/git.spec +++ b/git.spec @@ -77,8 +77,8 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.42.0 -Release: 2%{?dist} +Version: 2.42.1 +Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -127,6 +127,9 @@ 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 +# https://bugzilla.redhat.com/show_bug.cgi?id=2247532#c8 +Patch4: 0001-send-email-avoid-duplicate-specification-warnings.patch + %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: /usr/bin/pod2man @@ -1041,6 +1044,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Nov 14 2023 Ondřej Pohořelský - 2.42.1-1 +- update to 2.42.1 + * Wed Nov 1 2023 Joe Orton - 2.42.0-2 - remove explicit BR for apr-util-bdb (#2247532) diff --git a/sources b/sources index bbad81c..696da6f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.42.0.tar.xz) = afe5bca3c084d4ddd66f20afa820ba10f61007f66846108929e0d4ee7b7eaa896fcf00917dead16881d840f674dec6dd0e353a05e62a31016694af3d7d22a51d -SHA512 (git-2.42.0.tar.sign) = 847914db4f035095643cf38af87e53be82b0d10c0fdcb862f5015df01662c15d6d77410e4f4aaa5ad510d9d82c830a0218465d10905f3ec048929b1c02be6d5d +SHA512 (git-2.42.1.tar.xz) = 5946699108d4181e14fc3c61e4a4ebadcf8a876248c3f570ca22e6d95d8fea4eeb424d6e0c897d180df5959b8b2e3b0dd4e005d4c38bed2d35a2ed8036e6dc95 +SHA512 (git-2.42.1.tar.sign) = b4997c809d5b2010d1d5a9383a0546dd07ab3e87ac49a896a53dce0f5467a72db6149c07d36e2b2fdaf1e603937c1fdbff43393dac39ce37693e65e88071162c From f2b3ab26cc456c3905b9b19725937f0faa281d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Tue, 21 Nov 2023 14:23:40 +0100 Subject: [PATCH 802/842] update to 2.43.0 --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 11e4de5..0f1db2d 100644 --- a/git.spec +++ b/git.spec @@ -77,7 +77,7 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.42.1 +Version: 2.43.0 Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT @@ -1044,6 +1044,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Nov 21 2023 Ondřej Pohořelský - 2.43.0-1 +- update to 2.43.0 + * Tue Nov 14 2023 Ondřej Pohořelský - 2.42.1-1 - update to 2.42.1 diff --git a/sources b/sources index 696da6f..8c3805e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.42.1.tar.xz) = 5946699108d4181e14fc3c61e4a4ebadcf8a876248c3f570ca22e6d95d8fea4eeb424d6e0c897d180df5959b8b2e3b0dd4e005d4c38bed2d35a2ed8036e6dc95 -SHA512 (git-2.42.1.tar.sign) = b4997c809d5b2010d1d5a9383a0546dd07ab3e87ac49a896a53dce0f5467a72db6149c07d36e2b2fdaf1e603937c1fdbff43393dac39ce37693e65e88071162c +SHA512 (git-2.43.0.tar.xz) = d0c1694ae23ff7d523e617b98d7c9a9753a2ee58f92c21b67a192d1c57398a62ff9c1a34558ae31af8dc8d95122c219f39f654e99a3b4e7cfc3dd07be9e13203 +SHA512 (git-2.43.0.tar.sign) = 4ff055db9b7100c40427a570f8fb6ec4b5ea943d197597ca8061924afbc6eb46d28aaf46c31679addb8adaf4f672e7efb96e088b789d172b5270420a7e5fde67 From a8ab7b524dc420913420c2d4fbe7afbdcd2a7925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Wed, 20 Dec 2023 18:21:47 +0100 Subject: [PATCH 803/842] Disable t6300.35 t6300.107 t6300.108 These tests break with zlib-ng, disable them until upstream merges patch solving this issue. --- git.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 0f1db2d..0c907b8 100644 --- a/git.spec +++ b/git.spec @@ -823,7 +823,13 @@ find %{buildroot}%{_pkgdocdir} -name "*.html" -print0 | xargs -r0 linkchecker # t5559-http-fetch-smart-http2 runs t5551-http-fetch-smart with # HTTP_PROTO=HTTP/2. Unfortunately, it fails quite regularly. # https://lore.kernel.org/git/Y4fUntdlc1mqwad5@pobox.com/ -GIT_SKIP_TESTS="t5559" +# +# t6300.35 t6300.107 t6300.108 are skipped due to them failing +# with zlib-ng +# https://bugzilla.redhat.com/show_bug.cgi?id=2253368 +# These tests will be enabled again in next git release, where +# fix should be in place. +GIT_SKIP_TESTS="t5559 t6300.35 t6300.107 t6300.108" %if 0%{?rhel} && 0%{?rhel} < 8 # Skip tests which require mod_http2 on el7 From 9323031c03a8a93098509590bbb093e354edc957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Tue, 9 Jan 2024 11:47:09 +0100 Subject: [PATCH 804/842] apache.conf set DavLockDBType to sdbm With the recent change that drops apr-util-bdb build require, in favor of httpd, t5540 started failing on tests using git-httpd-push. This patch sets DavLockDBType to sdbm, fixing these failures. --- git-test-apache-davlockdbtype-config.patch | 14 ++++++++++++++ git.spec | 4 ++++ 2 files changed, 18 insertions(+) create mode 100644 git-test-apache-davlockdbtype-config.patch diff --git a/git-test-apache-davlockdbtype-config.patch b/git-test-apache-davlockdbtype-config.patch new file mode 100644 index 0000000..882006a --- /dev/null +++ b/git-test-apache-davlockdbtype-config.patch @@ -0,0 +1,14 @@ +diff -ur b/t/lib-httpd/apache.conf a/t/lib-httpd/apache.conf +--- b/t/lib-httpd/apache.conf 2024-01-09 11:06:46.660868023 +0100 ++++ a/t/lib-httpd/apache.conf 2024-01-09 11:09:09.572713625 +0100 +@@ -272,7 +272,9 @@ + + LoadModule dav_module modules/mod_dav.so + LoadModule dav_fs_module modules/mod_dav_fs.so +- ++ ++ DavLockDBType sdbm ++ + DAVLockDB DAVLock + + Dav on diff --git a/git.spec b/git.spec index 0c907b8..5a1b814 100644 --- a/git.spec +++ b/git.spec @@ -130,6 +130,10 @@ Patch3: 0003-t-lib-git-svn-try-harder-to-find-a-port.patch # https://bugzilla.redhat.com/show_bug.cgi?id=2247532#c8 Patch4: 0001-send-email-avoid-duplicate-specification-warnings.patch +# Configurates Apache test server to use `DavLockDBType sdbm` +# Prevents t5540 failures on i686, s390x and ppc64le +Patch5: git-test-apache-davlockdbtype-config.patch + %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: /usr/bin/pod2man From cab00c80b7fef4f53bcca93c6a537def82eb91f2 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 1 Jan 2024 14:20:39 -0500 Subject: [PATCH 805/842] Fix perl-podlators dependency With /app-prefixed builds of perl now existing for flatpaks, file dependencies must not be used for perl components. --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 5a1b814..05cea0e 100644 --- a/git.spec +++ b/git.spec @@ -136,7 +136,7 @@ Patch5: git-test-apache-davlockdbtype-config.patch %if %{with docs} # pod2man is needed to build Git.3pm -BuildRequires: /usr/bin/pod2man +BuildRequires: perl-podlators %if %{with asciidoctor} BuildRequires: docbook5-style-xsl BuildRequires: rubygem-asciidoctor From 75aab985567c39cbe11df4689a9c93f227e8f7c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 22:22:27 +0000 Subject: [PATCH 806/842] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 05cea0e..a74481b 100644 --- a/git.spec +++ b/git.spec @@ -78,7 +78,7 @@ Name: git Version: 2.43.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -1054,6 +1054,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.43.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Nov 21 2023 Ondřej Pohořelský - 2.43.0-1 - update to 2.43.0 From 2a4367e6d7a12d591bc8339a04af88c983d1e06e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 14:51:35 +0000 Subject: [PATCH 807/842] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index a74481b..a46794f 100644 --- a/git.spec +++ b/git.spec @@ -78,7 +78,7 @@ Name: git Version: 2.43.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -1054,6 +1054,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 2.43.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.43.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 11fa10276785738d6fd793d76d2e190986d17dbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Mon, 12 Feb 2024 11:17:05 +0100 Subject: [PATCH 808/842] update to 2.43.1 resolves: #2263575 --- ...oid-duplicate-specification-warnings.patch | 86 ------------------- git.spec | 19 ++-- sources | 4 +- 3 files changed, 9 insertions(+), 100 deletions(-) delete mode 100644 0001-send-email-avoid-duplicate-specification-warnings.patch diff --git a/0001-send-email-avoid-duplicate-specification-warnings.patch b/0001-send-email-avoid-duplicate-specification-warnings.patch deleted file mode 100644 index 3dee265..0000000 --- a/0001-send-email-avoid-duplicate-specification-warnings.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 0fdc014acc342dace179ba698e58fcb138fb86de Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Tue, 14 Nov 2023 11:38:19 -0500 -Subject: [PATCH] send-email: avoid duplicate specification warnings - -With perl-Getopt-Long >= 2.55, a warning is issued for options which are -specified more than once. In addition to causing users to see warnings, -this results in test failures which compare the output. An example, -from t9001-send-email.37: - - | +++ diff -u expect actual - | --- expect 2023-11-14 10:38:23.854346488 +0000 - | +++ actual 2023-11-14 10:38:23.848346466 +0000 - | @@ -1,2 +1,7 @@ - | +Duplicate specification "no-chain-reply-to" for option "no-chain-reply-to" - | +Duplicate specification "to-cover|to-cover!" for option "to-cover" - | +Duplicate specification "cc-cover|cc-cover!" for option "cc-cover" - | +Duplicate specification "no-thread" for option "no-thread" - | +Duplicate specification "no-to-cover" for option "no-to-cover" - | fatal: longline.patch:35 is longer than 998 characters - | warning: no patches were sent - | error: last command exited with $?=1 - | not ok 37 - reject long lines - -Remove the duplicate option specs. - -Signed-off-by: Todd Zullinger ---- - git-send-email.perl | 16 +++------------- - 1 file changed, 3 insertions(+), 13 deletions(-) - -diff --git a/git-send-email.perl b/git-send-email.perl -index affbb88509..3c678c8998 100755 ---- a/git-send-email.perl -+++ b/git-send-email.perl -@@ -503,7 +503,6 @@ sub config_regexp { - "bcc=s" => \@getopt_bcc, - "no-bcc" => \$no_bcc, - "chain-reply-to!" => \$chain_reply_to, -- "no-chain-reply-to" => sub {$chain_reply_to = 0}, - "sendmail-cmd=s" => \$sendmail_cmd, - "smtp-server=s" => \$smtp_server, - "smtp-server-option=s" => \@smtp_server_options, -@@ -518,36 +517,27 @@ sub config_regexp { - "smtp-auth=s" => \$smtp_auth, - "no-smtp-auth" => sub {$smtp_auth = 'none'}, - "annotate!" => \$annotate, -- "no-annotate" => sub {$annotate = 0}, - "compose" => \$compose, - "quiet" => \$quiet, - "cc-cmd=s" => \$cc_cmd, - "header-cmd=s" => \$header_cmd, - "no-header-cmd" => \$no_header_cmd, - "suppress-from!" => \$suppress_from, -- "no-suppress-from" => sub {$suppress_from = 0}, - "suppress-cc=s" => \@suppress_cc, -- "signed-off-cc|signed-off-by-cc!" => \$signed_off_by_cc, -- "no-signed-off-cc|no-signed-off-by-cc" => sub {$signed_off_by_cc = 0}, -- "cc-cover|cc-cover!" => \$cover_cc, -- "no-cc-cover" => sub {$cover_cc = 0}, -- "to-cover|to-cover!" => \$cover_to, -- "no-to-cover" => sub {$cover_to = 0}, -+ "signed-off-by-cc!" => \$signed_off_by_cc, -+ "cc-cover!" => \$cover_cc, -+ "to-cover!" => \$cover_to, - "confirm=s" => \$confirm, - "dry-run" => \$dry_run, - "envelope-sender=s" => \$envelope_sender, - "thread!" => \$thread, -- "no-thread" => sub {$thread = 0}, - "validate!" => \$validate, -- "no-validate" => sub {$validate = 0}, - "transfer-encoding=s" => \$target_xfer_encoding, - "format-patch!" => \$format_patch, -- "no-format-patch" => sub {$format_patch = 0}, - "8bit-encoding=s" => \$auto_8bit_encoding, - "compose-encoding=s" => \$compose_encoding, - "force" => \$force, - "xmailer!" => \$use_xmailer, -- "no-xmailer" => sub {$use_xmailer = 0}, - "batch-size=i" => \$batch_size, - "relogin-delay=i" => \$relogin_delay, - "git-completion-helper" => \$git_completion_helper, --- -2.42.0 - diff --git a/git.spec b/git.spec index a46794f..dde6f6c 100644 --- a/git.spec +++ b/git.spec @@ -77,8 +77,8 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.43.0 -Release: 3%{?dist} +Version: 2.43.1 +Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -127,9 +127,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 -# https://bugzilla.redhat.com/show_bug.cgi?id=2247532#c8 -Patch4: 0001-send-email-avoid-duplicate-specification-warnings.patch - # Configurates Apache test server to use `DavLockDBType sdbm` # Prevents t5540 failures on i686, s390x and ppc64le Patch5: git-test-apache-davlockdbtype-config.patch @@ -827,13 +824,7 @@ find %{buildroot}%{_pkgdocdir} -name "*.html" -print0 | xargs -r0 linkchecker # t5559-http-fetch-smart-http2 runs t5551-http-fetch-smart with # HTTP_PROTO=HTTP/2. Unfortunately, it fails quite regularly. # https://lore.kernel.org/git/Y4fUntdlc1mqwad5@pobox.com/ -# -# t6300.35 t6300.107 t6300.108 are skipped due to them failing -# with zlib-ng -# https://bugzilla.redhat.com/show_bug.cgi?id=2253368 -# These tests will be enabled again in next git release, where -# fix should be in place. -GIT_SKIP_TESTS="t5559 t6300.35 t6300.107 t6300.108" +GIT_SKIP_TESTS="t5559" %if 0%{?rhel} && 0%{?rhel} < 8 # Skip tests which require mod_http2 on el7 @@ -1054,6 +1045,10 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Feb 12 2024 Ondřej Pohořelský - 2.43.1-1 +- update to 2.43.1 +- resolves: #2263575 + * Wed Jan 24 2024 Fedora Release Engineering - 2.43.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 8c3805e..0a91dab 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.43.0.tar.xz) = d0c1694ae23ff7d523e617b98d7c9a9753a2ee58f92c21b67a192d1c57398a62ff9c1a34558ae31af8dc8d95122c219f39f654e99a3b4e7cfc3dd07be9e13203 -SHA512 (git-2.43.0.tar.sign) = 4ff055db9b7100c40427a570f8fb6ec4b5ea943d197597ca8061924afbc6eb46d28aaf46c31679addb8adaf4f672e7efb96e088b789d172b5270420a7e5fde67 +SHA512 (git-2.43.1.tar.xz) = c8cb27645f09b831a6206bafa91c955d735b4257a98b1adaaaa5692a0a3aaa0417878095f88eca59d4fe0ffa058865508b5099db097e7b4b06253a16f57c3b3e +SHA512 (git-2.43.1.tar.sign) = 0f84b136111bc6f6b99ad325fd9def9554ed1ec032b765c32c7299e91702cf44251b31a2e5453ab1379b8c342f640736597459bfaddaf8c0064004ee32535820 From 9c8b3cf927a661dc73e5bb35de63298a081e098c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Thu, 15 Feb 2024 09:02:27 +0100 Subject: [PATCH 809/842] update to 2.43.2 Resolves: #2264318 --- git.spec | 6 +++++- sources | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index dde6f6c..df05f4a 100644 --- a/git.spec +++ b/git.spec @@ -77,7 +77,7 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.43.1 +Version: 2.43.2 Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT @@ -1045,6 +1045,10 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Feb 15 2024 Ondřej Pohořelský - 2.43.2-1 +- update to 2.43.2 +- Resolves: #2264318 + * Mon Feb 12 2024 Ondřej Pohořelský - 2.43.1-1 - update to 2.43.1 - resolves: #2263575 diff --git a/sources b/sources index 0a91dab..e229798 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.43.1.tar.xz) = c8cb27645f09b831a6206bafa91c955d735b4257a98b1adaaaa5692a0a3aaa0417878095f88eca59d4fe0ffa058865508b5099db097e7b4b06253a16f57c3b3e -SHA512 (git-2.43.1.tar.sign) = 0f84b136111bc6f6b99ad325fd9def9554ed1ec032b765c32c7299e91702cf44251b31a2e5453ab1379b8c342f640736597459bfaddaf8c0064004ee32535820 +SHA512 (git-2.43.2.tar.xz) = 0d95b8ac65bd76acb60c3b4d80242aeda8b2ab3dda7c8586ce46cc1ddedc000494b45fd269295033b82f38662cde08d366c63aa3ff39030500952342c9d3b280 +SHA512 (git-2.43.2.tar.sign) = 3cd649b30f859645bd355a01a06f4bda363b7189be4b2ce492f2b258b618a10fdf40ef3d9cfa852594f594c67fec1f29db91cb29c20f5f97057a835cefba5253 From 59c96e058b9d18cdc293a035d369d5ab3847337b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Mon, 26 Feb 2024 09:50:12 +0100 Subject: [PATCH 810/842] update to 2.44.0 --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index df05f4a..6543f5c 100644 --- a/git.spec +++ b/git.spec @@ -77,7 +77,7 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.43.2 +Version: 2.44.0 Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT @@ -1045,6 +1045,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Feb 26 2024 Ondřej Pohořelský - 2.44.0-1 +- update to 2.44.0 + * Thu Feb 15 2024 Ondřej Pohořelský - 2.43.2-1 - update to 2.43.2 - Resolves: #2264318 diff --git a/sources b/sources index e229798..9aeba57 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.43.2.tar.xz) = 0d95b8ac65bd76acb60c3b4d80242aeda8b2ab3dda7c8586ce46cc1ddedc000494b45fd269295033b82f38662cde08d366c63aa3ff39030500952342c9d3b280 -SHA512 (git-2.43.2.tar.sign) = 3cd649b30f859645bd355a01a06f4bda363b7189be4b2ce492f2b258b618a10fdf40ef3d9cfa852594f594c67fec1f29db91cb29c20f5f97057a835cefba5253 +SHA512 (git-2.44.0.tar.sign) = 2b7284d1aaf29ead52e671a1c3574176f8a1682e96753b1cb02e94b7fd6ed69390862143ff59ab6badfc4e22c799c98a92f1ac565d304c1d141c7c56700177d1 +SHA512 (git-2.44.0.tar.xz) = 9e4b9c8a8e28cd50c0db75a93eae8a3423aa7e51c4312af1e1cdaf408e93f306c23aa747f0a97f27c11ab0e2f5e6283e52c8b61c9fe6be5b9b18673a43ce1780 From db55f698a08efca823f8ee8e88fb218c54f2eb52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Tue, 30 Apr 2024 17:15:29 +0200 Subject: [PATCH 811/842] update to 2.45.0 --- git.spec | 12 ++++-------- sources | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/git.spec b/git.spec index 6543f5c..675a15c 100644 --- a/git.spec +++ b/git.spec @@ -77,7 +77,7 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.44.0 +Version: 2.45.0 Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT @@ -639,13 +639,6 @@ rm -rf contrib/fast-import/import-zips.py %endif # endif with python2 -# Use python3 to avoid an unnecessary python2 dependency, if possible. -%if %{with python3} -sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \ - contrib/hg-to-git/hg-to-git.py -%endif -# endif with python3 - %install %make_install %{?with_docs:install-doc} @@ -1045,6 +1038,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Apr 30 2024 Ondřej Pohořelský - 2.45.0-1 +- update to 2.45.0 + * Mon Feb 26 2024 Ondřej Pohořelský - 2.44.0-1 - update to 2.44.0 diff --git a/sources b/sources index 9aeba57..0967862 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.44.0.tar.sign) = 2b7284d1aaf29ead52e671a1c3574176f8a1682e96753b1cb02e94b7fd6ed69390862143ff59ab6badfc4e22c799c98a92f1ac565d304c1d141c7c56700177d1 -SHA512 (git-2.44.0.tar.xz) = 9e4b9c8a8e28cd50c0db75a93eae8a3423aa7e51c4312af1e1cdaf408e93f306c23aa747f0a97f27c11ab0e2f5e6283e52c8b61c9fe6be5b9b18673a43ce1780 +SHA512 (git-2.45.0.tar.xz) = 36d438bf9a57dee8fe0536c90cb25d53c552e9f80e7575447d1d2af30cadab08522356f4ecd0f69b7877d5a7f84ab3b9766d8386beae57fe8d411d05d70db214 +SHA512 (git-2.45.0.tar.sign) = 8d4fdcb88355bf7511c8822e367e692514298deb99a2734b71b2754a551c76ab3aa788d5f24475c3177dafca6ce05325535c7d354c3aa82d3322bb718ccbaec4 From 18e0835469dba60ab7fc91cb77917f93a1b37e0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Wed, 15 May 2024 09:29:45 +0200 Subject: [PATCH 812/842] update to 2.45.1 --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 675a15c..130471c 100644 --- a/git.spec +++ b/git.spec @@ -77,7 +77,7 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.45.0 +Version: 2.45.1 Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT @@ -1038,6 +1038,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed May 15 2024 Ondřej Pohořelský - 2.45.1-1 +- update to 2.45.1 + * Tue Apr 30 2024 Ondřej Pohořelský - 2.45.0-1 - update to 2.45.0 diff --git a/sources b/sources index 0967862..14c4fec 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.45.0.tar.xz) = 36d438bf9a57dee8fe0536c90cb25d53c552e9f80e7575447d1d2af30cadab08522356f4ecd0f69b7877d5a7f84ab3b9766d8386beae57fe8d411d05d70db214 -SHA512 (git-2.45.0.tar.sign) = 8d4fdcb88355bf7511c8822e367e692514298deb99a2734b71b2754a551c76ab3aa788d5f24475c3177dafca6ce05325535c7d354c3aa82d3322bb718ccbaec4 +SHA512 (git-2.45.1.tar.xz) = 28461855e03f3dd5af73a1c6d26cc3e2b7b71f5eb90852f1daf582d24503b4dd5c4e4dac359e9eba1c2ba542aeb0940e0482506f19d02a354654b181c56c5317 +SHA512 (git-2.45.1.tar.sign) = cec39b09cdd3c2a2b6e0c115773492771cfb50b8054479fbc8d6b7dd798b82160d0d0cf5ba58c6c21c23ceb459cae75ec7081a99c6681d76505a21f851ee123d From 05522a0e2aa48c525fc9bdabc3bbd0bf279dc711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Mon, 3 Jun 2024 12:50:14 +0200 Subject: [PATCH 813/842] update to 2.45.2 --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 130471c..4c68148 100644 --- a/git.spec +++ b/git.spec @@ -77,7 +77,7 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.45.1 +Version: 2.45.2 Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT @@ -1038,6 +1038,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Jun 03 2024 Ondřej Pohořelský - 2.45.2-1 +- update to 2.45.2 + * Wed May 15 2024 Ondřej Pohořelský - 2.45.1-1 - update to 2.45.1 diff --git a/sources b/sources index 14c4fec..59bae85 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.45.1.tar.xz) = 28461855e03f3dd5af73a1c6d26cc3e2b7b71f5eb90852f1daf582d24503b4dd5c4e4dac359e9eba1c2ba542aeb0940e0482506f19d02a354654b181c56c5317 -SHA512 (git-2.45.1.tar.sign) = cec39b09cdd3c2a2b6e0c115773492771cfb50b8054479fbc8d6b7dd798b82160d0d0cf5ba58c6c21c23ceb459cae75ec7081a99c6681d76505a21f851ee123d +SHA512 (git-2.45.2.tar.xz) = dce30d0d563f3f76ef49c8dc88105e0cf0941c8cd70303418d9d737f840ffba36bcc575c380c75080edf64af74487e1a680db146ec5f527a32104e887d4ceb73 +SHA512 (git-2.45.2.tar.sign) = 331ba231f1d042ad41b30d81225fc31c47bc38dfb2995156353a97cd66f0a0c4d86d228e85dfca0926761b19d2e37e5f273b3bbddbca3e1c1ae3c999401fe7bd From 9f89b9e0690f91aedf40fea29b518d1d7f071660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Mon, 3 Jun 2024 15:40:55 +0200 Subject: [PATCH 814/842] add glibc-utils BuildRequires --- git.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 4c68148..fe93858 100644 --- a/git.spec +++ b/git.spec @@ -78,7 +78,7 @@ Name: git Version: 2.45.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -163,6 +163,7 @@ BuildRequires: findutils BuildRequires: gawk BuildRequires: gcc BuildRequires: gettext +BuildRequires: glibc-utils BuildRequires: gnupg2 BuildRequires: libcurl-devel BuildRequires: make @@ -1038,6 +1039,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Jun 03 2024 Ondřej Pohořelský - 2.45.2-2 +- add glibc-utils BuildRequires + * Mon Jun 03 2024 Ondřej Pohořelský - 2.45.2-1 - update to 2.45.2 From 2041c470244ddedba91683bf6129b329d89750de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Mon, 1 Jul 2024 16:27:09 +0200 Subject: [PATCH 815/842] build documentation with asciidoc on EL >= 10 --- git.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index fe93858..089b31e 100644 --- a/git.spec +++ b/git.spec @@ -21,8 +21,9 @@ %bcond_without perl_modcompat %endif -# Settings for Fedora and EL >= 9 -%if 0%{?fedora} || 0%{?rhel} >= 9 +# Settings for Fedora and EL == 9 +# In EL >= 10 docbook5-style-xsl, needed by asciidoctor, is unwanted package +%if 0%{?fedora} || 0%{?rhel} == 9 %bcond_without asciidoctor %else %bcond_with asciidoctor From e49fa1c239e06722402884a6360214601b1a1830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Mon, 1 Jul 2024 16:30:22 +0200 Subject: [PATCH 816/842] disable p4 subpackage on EL >= 10 --- git.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 089b31e..afd0f45 100644 --- a/git.spec +++ b/git.spec @@ -59,11 +59,11 @@ %bcond_without libsecret # Allow p4 subpackage to be toggled via --with/--without -# Disable by default if we lack python2 or python3 support -%if %{with python2} || %{with python3} -%bcond_without p4 -%else +# Disable p4 package by default on EL >= 10 +%if 0%{?rhel} >= 10 %bcond_with p4 +%else +%bcond_without p4 %endif # Hardening flags for EL-7 From 624305e5bea78b1f46f346740bb79fab453227a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 02:23:37 +0000 Subject: [PATCH 817/842] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index afd0f45..143492a 100644 --- a/git.spec +++ b/git.spec @@ -79,7 +79,7 @@ Name: git Version: 2.45.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -1040,6 +1040,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 2.45.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jun 03 2024 Ondřej Pohořelský - 2.45.2-2 - add glibc-utils BuildRequires From 699e77dbcbef16243c738803a83db2aa0a75f84c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Fri, 19 Jul 2024 09:29:31 +0200 Subject: [PATCH 818/842] build without perl_modcompat in EL >= 10 --- git.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 143492a..b461992 100644 --- a/git.spec +++ b/git.spec @@ -14,8 +14,8 @@ %bcond_with linkcheck %endif -# Settings for Fedora >= 38 -%if 0%{?fedora} >= 38 +# Settings for Fedora >= 38 and EL >= 10 +%if 0%{?fedora} >= 38 || 0%{?rhel} >= 10 %bcond_with perl_modcompat %else %bcond_without perl_modcompat From 0a0995368db3115d9ac362a226af2cc352e8de07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Mon, 5 Aug 2024 12:52:46 +0200 Subject: [PATCH 819/842] update to 2.46.0 --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index b461992..4b74e3d 100644 --- a/git.spec +++ b/git.spec @@ -78,8 +78,8 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.45.2 -Release: 3%{?dist} +Version: 2.46.0 +Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -1040,6 +1040,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Aug 05 2024 Ondřej Pohořelský - 2.46.0-1 +- update to 2.46.0 + * Thu Jul 18 2024 Fedora Release Engineering - 2.45.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 59bae85..3f497c7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.45.2.tar.xz) = dce30d0d563f3f76ef49c8dc88105e0cf0941c8cd70303418d9d737f840ffba36bcc575c380c75080edf64af74487e1a680db146ec5f527a32104e887d4ceb73 -SHA512 (git-2.45.2.tar.sign) = 331ba231f1d042ad41b30d81225fc31c47bc38dfb2995156353a97cd66f0a0c4d86d228e85dfca0926761b19d2e37e5f273b3bbddbca3e1c1ae3c999401fe7bd +SHA512 (git-2.46.0.tar.xz) = 3afae7a094da070c627f68ceb54c2345e3a49e04e455197527b732eb220e8c3249f5d09655a59bf4280dd0c0a3e305abc1380693e0a7fb0b8138b741c4708184 +SHA512 (git-2.46.0.tar.sign) = 912d88ec3a7e58b1b7755b6d9fd26fca39f47d98e0bcba59140cdb05f873dadbdaeb54b5f748f95f95a2cc6db9a892864b8b6331a4fe009d3b6142bafd23ab22 From fe2066bbb4522200127da9c88505cc9414634f12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Wed, 4 Sep 2024 10:42:06 +0200 Subject: [PATCH 820/842] mark git@.service as config(noreplace) Each update git@.service has been overwritten, removing users custom configurations. Marking it as config(noreplace) should prevent this behaviour. --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 4b74e3d..d683222 100644 --- a/git.spec +++ b/git.spec @@ -964,7 +964,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %files daemon %{_pkgdocdir}/git-daemon*.txt %{_unitdir}/git.socket -%{_unitdir}/git@.service +%config(noreplace) %{_unitdir}/git@.service %{gitexecdir}/git-daemon %{_localstatedir}/lib/git %{?with_docs:%{_mandir}/man1/git-daemon*.1*} From 8cb6752747878844176c7fc8663ca534a2bb716e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Mon, 16 Sep 2024 11:12:46 +0200 Subject: [PATCH 821/842] update to 2.46.1 --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index d683222..4b1bb37 100644 --- a/git.spec +++ b/git.spec @@ -78,7 +78,7 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.46.0 +Version: 2.46.1 Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT @@ -1040,6 +1040,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Sep 16 2024 Ondřej Pohořelský - 2.46.1-1 +- update to 2.46.1 + * Mon Aug 05 2024 Ondřej Pohořelský - 2.46.0-1 - update to 2.46.0 diff --git a/sources b/sources index 3f497c7..5ca6946 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.46.0.tar.xz) = 3afae7a094da070c627f68ceb54c2345e3a49e04e455197527b732eb220e8c3249f5d09655a59bf4280dd0c0a3e305abc1380693e0a7fb0b8138b741c4708184 -SHA512 (git-2.46.0.tar.sign) = 912d88ec3a7e58b1b7755b6d9fd26fca39f47d98e0bcba59140cdb05f873dadbdaeb54b5f748f95f95a2cc6db9a892864b8b6331a4fe009d3b6142bafd23ab22 +SHA512 (git-2.46.1.tar.xz) = ce1bb12cb8a320e4ef261d4715dc2144207f31cfe13b2b62cebfc9e61880db79876a634e29cf42992d4f472ce0af709f48f14c7ba800f157876f19982720fc6d +SHA512 (git-2.46.1.tar.sign) = 5d995dec6b9bed8442ebf04c2c84f6cda22105992835349537e8f7d2c683f5cd07f6b49f452ccdcd8adce9879cdb3663540d0b0e41050d3e94405feac04f988c From b7b63fdc8b0b15fef10f2b4100b1175f3e782536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Tue, 24 Sep 2024 14:31:26 +0200 Subject: [PATCH 822/842] update to 2.46.2 --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 4b1bb37..2fc3dbf 100644 --- a/git.spec +++ b/git.spec @@ -78,7 +78,7 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.46.1 +Version: 2.46.2 Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT @@ -1040,6 +1040,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Sep 24 2024 Ondřej Pohořelský - 2.46.2-1 +- update to 2.46.2 + * Mon Sep 16 2024 Ondřej Pohořelský - 2.46.1-1 - update to 2.46.1 diff --git a/sources b/sources index 5ca6946..8cb35b7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.46.1.tar.xz) = ce1bb12cb8a320e4ef261d4715dc2144207f31cfe13b2b62cebfc9e61880db79876a634e29cf42992d4f472ce0af709f48f14c7ba800f157876f19982720fc6d -SHA512 (git-2.46.1.tar.sign) = 5d995dec6b9bed8442ebf04c2c84f6cda22105992835349537e8f7d2c683f5cd07f6b49f452ccdcd8adce9879cdb3663540d0b0e41050d3e94405feac04f988c +SHA512 (git-2.46.2.tar.xz) = d8d1cec9a4ddc7b1892b7f5b3c808d235bcd4bfb1714ce0ce0e721242acc94f9ae7c2ae3181311feb5b458b04e89cd32acd3e9c90adbc4e86e05e7d5589d8a00 +SHA512 (git-2.46.2.tar.sign) = 2a20c490d1388b68b0c6def89a282ce198aff5991b0942e762f45bd51bca2b81353f648546e789a15ea141f9ea411e6ce025e84e9dc80e5fea8abc3a5af2b168 From 2354ed404127937eb64df75d2e178d59d81f6b71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Tue, 24 Sep 2024 14:34:39 +0200 Subject: [PATCH 823/842] repair bogus date in the changelog --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 2fc3dbf..54a7178 100644 --- a/git.spec +++ b/git.spec @@ -1040,7 +1040,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog -* Mon Sep 24 2024 Ondřej Pohořelský - 2.46.2-1 +* Tue Sep 24 2024 Ondřej Pohořelský - 2.46.2-1 - update to 2.46.2 * Mon Sep 16 2024 Ondřej Pohořelský - 2.46.1-1 From d4d986abeb8d45c7a783a5c356b87aaaad8775ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Tue, 8 Oct 2024 15:19:07 +0200 Subject: [PATCH 824/842] update to 2.47.0 --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 54a7178..f5bd722 100644 --- a/git.spec +++ b/git.spec @@ -78,7 +78,7 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.46.2 +Version: 2.47.0 Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT @@ -1040,6 +1040,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Oct 08 2024 Ondřej Pohořelský - 2.47.0-1 +- update to 2.47.0 + * Tue Sep 24 2024 Ondřej Pohořelský - 2.46.2-1 - update to 2.46.2 diff --git a/sources b/sources index 8cb35b7..13958fb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.46.2.tar.xz) = d8d1cec9a4ddc7b1892b7f5b3c808d235bcd4bfb1714ce0ce0e721242acc94f9ae7c2ae3181311feb5b458b04e89cd32acd3e9c90adbc4e86e05e7d5589d8a00 -SHA512 (git-2.46.2.tar.sign) = 2a20c490d1388b68b0c6def89a282ce198aff5991b0942e762f45bd51bca2b81353f648546e789a15ea141f9ea411e6ce025e84e9dc80e5fea8abc3a5af2b168 +SHA512 (git-2.47.0.tar.xz) = 58683aa59dba25ffec9fe2c185267c77b34d573e9738c133a15d25071e37095e99486c231c35b8f71aabe3c1e305238b56d2c10039318bfc08f137919bad66ec +SHA512 (git-2.47.0.tar.sign) = 7ccfe729598d3efd5cf1507c5132782f4e17d030745b4684284e691156cfe150d8911fa05f26d31382f505c6a4fbc1cc261e289e239ec9cc812ddfe20d026511 From d4648b15beafd12dd8b7dbf1628df678dbfd5b63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Mon, 25 Nov 2024 10:53:34 +0100 Subject: [PATCH 825/842] update to 2.47.1 --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index f5bd722..0ab9995 100644 --- a/git.spec +++ b/git.spec @@ -78,7 +78,7 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.47.0 +Version: 2.47.1 Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT @@ -1040,6 +1040,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Nov 25 2024 Ondřej Pohořelský - 2.47.1-1 +- update to 2.47.1 + * Tue Oct 08 2024 Ondřej Pohořelský - 2.47.0-1 - update to 2.47.0 diff --git a/sources b/sources index 13958fb..0d04741 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.47.0.tar.xz) = 58683aa59dba25ffec9fe2c185267c77b34d573e9738c133a15d25071e37095e99486c231c35b8f71aabe3c1e305238b56d2c10039318bfc08f137919bad66ec -SHA512 (git-2.47.0.tar.sign) = 7ccfe729598d3efd5cf1507c5132782f4e17d030745b4684284e691156cfe150d8911fa05f26d31382f505c6a4fbc1cc261e289e239ec9cc812ddfe20d026511 +SHA512 (git-2.47.1.tar.xz) = 6abe551c464b307bc3f6f474257e0be3e1a9eba1406af6463216b796c55a35356009c2f7bd9b4fa2d1798da5f885a3843f6ad8750ab69595f748f9ea8ed76fea +SHA512 (git-2.47.1.tar.sign) = 89557b00303ce7ea063e4bbe8a81827c44ffaf997ae5a5bd1db6f671b10fd1050069bf74a10d797ec6f65453b9839e34fdc69f029bc8a6cfb8e9918fad8eda1a From 0b1ce8c0dca90be273be2be92c6a85de046efd4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Mon, 13 Jan 2025 13:25:40 +0100 Subject: [PATCH 826/842] update to 2.48.0 --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 0ab9995..7fd9b94 100644 --- a/git.spec +++ b/git.spec @@ -78,7 +78,7 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.47.1 +Version: 2.48.0 Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT @@ -1040,6 +1040,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Jan 13 2025 Ondřej Pohořelský - 2.48.0-1 +- update to 2.48.0 + * Mon Nov 25 2024 Ondřej Pohořelský - 2.47.1-1 - update to 2.47.1 diff --git a/sources b/sources index 0d04741..ea10ecb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.47.1.tar.xz) = 6abe551c464b307bc3f6f474257e0be3e1a9eba1406af6463216b796c55a35356009c2f7bd9b4fa2d1798da5f885a3843f6ad8750ab69595f748f9ea8ed76fea -SHA512 (git-2.47.1.tar.sign) = 89557b00303ce7ea063e4bbe8a81827c44ffaf997ae5a5bd1db6f671b10fd1050069bf74a10d797ec6f65453b9839e34fdc69f029bc8a6cfb8e9918fad8eda1a +SHA512 (git-2.48.0.tar.xz) = 0b8b6633d65f20830577a073a78f13cedf4f43c8634d5d62918cddca9ca8b75519e6674307782e0eacb9e8e920a04014aa2a0f5cd2e75be06728e9160f794c9e +SHA512 (git-2.48.0.tar.sign) = 1840a7b7a53997b78b932aecfca031e0a6f7779957b0bceba772738bdbf0ac75bc9a9bc8808beb63b446262a33e404819a9859d68aa45b23b498351b27a8514d From 078a91e01a4b273c7b7b63f93285f18b672fba3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Wed, 15 Jan 2025 09:29:00 +0100 Subject: [PATCH 827/842] update to 2.48.1 --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 7fd9b94..5e6c4d6 100644 --- a/git.spec +++ b/git.spec @@ -78,7 +78,7 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.48.0 +Version: 2.48.1 Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT @@ -1040,6 +1040,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Jan 15 2025 Ondřej Pohořelský - 2.48.1-1 +- update to 2.48.1 + * Mon Jan 13 2025 Ondřej Pohořelský - 2.48.0-1 - update to 2.48.0 diff --git a/sources b/sources index ea10ecb..d6bf8a9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.48.0.tar.xz) = 0b8b6633d65f20830577a073a78f13cedf4f43c8634d5d62918cddca9ca8b75519e6674307782e0eacb9e8e920a04014aa2a0f5cd2e75be06728e9160f794c9e -SHA512 (git-2.48.0.tar.sign) = 1840a7b7a53997b78b932aecfca031e0a6f7779957b0bceba772738bdbf0ac75bc9a9bc8808beb63b446262a33e404819a9859d68aa45b23b498351b27a8514d +SHA512 (git-2.48.1.tar.xz) = 75c89ab4ca83adc46989a4b05a9b482b40a7ba69d15aa1c1f27d0cee37c2908e154a75d59b0a0a540647352b9c55020f1a5ad309f0eff78e9fd8e631ef9e4606 +SHA512 (git-2.48.1.tar.sign) = 6d2308a71970940288137df76122ac402d1e5fdd2250fce5e6d4681d68b630bcfc109e56e4539598c6b5113024c78a25193d3b8d38c39ee547a37c1d8b2f4d15 From ecbadc14c1efef1a71c7bc0f49c8c2089dbcd28f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 22:01:51 +0000 Subject: [PATCH 828/842] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 5e6c4d6..01250b4 100644 --- a/git.spec +++ b/git.spec @@ -79,7 +79,7 @@ Name: git Version: 2.48.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -1040,6 +1040,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.48.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jan 15 2025 Ondřej Pohořelský - 2.48.1-1 - update to 2.48.1 From 716550b90ac02764311b615f80b9af6cbb821f43 Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Wed, 5 Feb 2025 17:10:11 +0200 Subject: [PATCH 829/842] Keep gitk on tcl/tk 8.x until its ready for 9 --- git.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 01250b4..b3c5c65 100644 --- a/git.spec +++ b/git.spec @@ -79,7 +79,7 @@ Name: git Version: 2.48.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -429,7 +429,9 @@ Summary: Git repository browser BuildArch: noarch Requires: git = %{version}-%{release} Requires: git-gui = %{version}-%{release} -Requires: tk >= 8.4 +# Keep gitk on tcl/tk 8.x until its ready for 9 (also see below in config.mk) +# https://github.com/j6t/gitk/issues/5 +Requires: tk8 >= 8.4 %description -n gitk %{summary}. @@ -587,6 +589,10 @@ gitwebdir = %{_localstatedir}/www/git DEFAULT_TEST_TARGET = prove GIT_PROVE_OPTS = --verbose --normalize %{?_smp_mflags} --formatter=TAP::Formatter::File GIT_TEST_OPTS = -x --verbose-log + +# Keep gitk on tcl/tk 8.x until its ready for 9 (see more above in gitk requires) +TCLTK_PATH = wish8 +TCL_PATH = tclsh8 EOF # Filter bogus perl requires @@ -1040,6 +1046,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Feb 6 2025 Yanko Kaneti - 2.48.1-3 +- Keep gitk on tcl/tk 8.x until its ready for 9 + * Thu Jan 16 2025 Fedora Release Engineering - 2.48.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 9a2fecfe2e676dc896cb02242d9b29b5643ce460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Mon, 17 Mar 2025 15:37:51 +0100 Subject: [PATCH 830/842] update to 2.49.0 --- git.spec | 45 +++++++++++++++++++++++++++++---------------- sources | 4 ++-- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/git.spec b/git.spec index b3c5c65..b19d845 100644 --- a/git.spec +++ b/git.spec @@ -78,8 +78,8 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.48.1 -Release: 3%{?dist} +Version: 2.49.0 +Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -538,7 +538,7 @@ install -p -m 755 %{SOURCE99} print-failed-test-output # Remove git-archimport sed -i '/^SCRIPT_PERL += git-archimport\.perl$/d' Makefile sed -i '/^git-archimport/d' command-list.txt -rm git-archimport.perl Documentation/git-archimport.txt +rm git-archimport.perl Documentation/git-archimport.adoc %if %{without cvs} # Remove git-cvs* from command list @@ -615,7 +615,7 @@ sed -i 's@"++GITWEB_HOME_LINK_STR++"@$ENV{"SERVER_NAME"} ? "git://" . $ENV{"SERV # Move contrib/{contacts,subtree} docs to Documentation so they build with the # proper asciidoc/docbook/xmlto options -mv contrib/{contacts,subtree}/git-*.txt Documentation/ +mv contrib/{contacts,subtree}/git-*.adoc Documentation/ %build # Improve build reproducibility @@ -782,7 +782,7 @@ grep -E "$not_core_re" bin-man-doc-files > bin-man-doc-git-files # contrib not_core_doc_re="(git-(cvs|gui|citool|daemon|instaweb|subtree))|p4|svn|email|gitk|gitweb" mkdir -p %{buildroot}%{_pkgdocdir}/ -cp -pr CODE_OF_CONDUCT.md README.md Documentation/*.txt Documentation/RelNotes contrib %{buildroot}%{_pkgdocdir}/ +cp -pr CODE_OF_CONDUCT.md README.md Documentation/*.adoc Documentation/RelNotes contrib %{buildroot}%{_pkgdocdir}/ # Remove contrib/ files/dirs which have nothing useful for documentation rm -rf %{buildroot}%{_pkgdocdir}/contrib/{contacts,credential}/ cp -p gitweb/INSTALL %{buildroot}%{_pkgdocdir}/INSTALL.gitweb @@ -874,6 +874,16 @@ GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5300.1[02348] t5300.2[03459] t5300.30 t5300.4[5 %endif # endif rhel == 8 && arch == s390x +%if "%{_arch}" == "s390x" +# Skip tests which fail on s390x +# +# The following tests are failing on s390x. +# https://lore.kernel.org/git/Z8dIZmscTdi8dZAY@teonanacatl.net/ +# +# t5620.4 'do partial clone 2, backfill min batch size' +GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5620.4" +%endif +# endif "%{_arch}" == "s390x" export GIT_SKIP_TESTS # Set LANG so various UTF-8 tests are run @@ -959,7 +969,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %if %{with cvs} %files cvs -%{_pkgdocdir}/*git-cvs*.txt +%{_pkgdocdir}/*git-cvs*.adoc %{_bindir}/git-cvsserver %{gitexecdir}/*cvs* %{?with_docs:%{_mandir}/man1/*cvs*.1*} @@ -968,7 +978,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" # endif with cvs %files daemon -%{_pkgdocdir}/git-daemon*.txt +%{_pkgdocdir}/git-daemon*.adoc %{_unitdir}/git.socket %config(noreplace) %{_unitdir}/git@.service %{gitexecdir}/git-daemon @@ -977,13 +987,13 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-daemon*.html} %files email -%{_pkgdocdir}/*email*.txt +%{_pkgdocdir}/*email*.adoc %{gitexecdir}/*email* %{?with_docs:%{_mandir}/man1/*email*.1*} %{?with_docs:%{_pkgdocdir}/*email*.html} %files -n gitk -%{_pkgdocdir}/*gitk*.txt +%{_pkgdocdir}/*gitk*.adoc %{_bindir}/*gitk* %{_datadir}/gitk %{bash_completions_dir}/gitk @@ -992,7 +1002,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %files -n gitweb %{_pkgdocdir}/*.gitweb -%{_pkgdocdir}/gitweb*.txt +%{_pkgdocdir}/gitweb*.adoc %{?with_docs:%{_mandir}/man1/gitweb.1*} %{?with_docs:%{_mandir}/man5/gitweb.conf.5*} %{?with_docs:%{_pkgdocdir}/gitweb*.html} @@ -1005,8 +1015,8 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{gitexecdir}/git-citool %{_datadir}/applications/*git-gui.desktop %{_datadir}/git-gui/ -%{_pkgdocdir}/git-gui.txt -%{_pkgdocdir}/git-citool.txt +%{_pkgdocdir}/git-gui.adoc +%{_pkgdocdir}/git-citool.adoc %{?with_docs:%{_mandir}/man1/git-gui.1*} %{?with_docs:%{_pkgdocdir}/git-gui.html} %{?with_docs:%{_mandir}/man1/git-citool.1*} @@ -1014,7 +1024,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %files instaweb %{gitexecdir}/git-instaweb -%{_pkgdocdir}/git-instaweb.txt +%{_pkgdocdir}/git-instaweb.adoc %{?with_docs:%{_mandir}/man1/git-instaweb.1*} %{?with_docs:%{_pkgdocdir}/git-instaweb.html} @@ -1022,7 +1032,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %files p4 %{gitexecdir}/*p4* %{gitexecdir}/mergetools/p4merge -%{_pkgdocdir}/*p4*.txt +%{_pkgdocdir}/*p4*.adoc %{?with_docs:%{_mandir}/man1/*p4*.1*} %{?with_docs:%{_pkgdocdir}/*p4*.html} %endif @@ -1035,17 +1045,20 @@ rmdir --ignore-fail-on-non-empty "$testdir" %files subtree %{gitexecdir}/git-subtree -%{_pkgdocdir}/git-subtree.txt +%{_pkgdocdir}/git-subtree.adoc %{?with_docs:%{_mandir}/man1/git-subtree.1*} %{?with_docs:%{_pkgdocdir}/git-subtree.html} %files svn %{gitexecdir}/git-svn -%{_pkgdocdir}/git-svn.txt +%{_pkgdocdir}/git-svn.adoc %{?with_docs:%{_mandir}/man1/git-svn.1*} %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Mar 17 2025 Ondřej Pohořelský - 2.49.0-1 +- update to 2.49.0 + * Thu Feb 6 2025 Yanko Kaneti - 2.48.1-3 - Keep gitk on tcl/tk 8.x until its ready for 9 diff --git a/sources b/sources index d6bf8a9..25bd2d3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.48.1.tar.xz) = 75c89ab4ca83adc46989a4b05a9b482b40a7ba69d15aa1c1f27d0cee37c2908e154a75d59b0a0a540647352b9c55020f1a5ad309f0eff78e9fd8e631ef9e4606 -SHA512 (git-2.48.1.tar.sign) = 6d2308a71970940288137df76122ac402d1e5fdd2250fce5e6d4681d68b630bcfc109e56e4539598c6b5113024c78a25193d3b8d38c39ee547a37c1d8b2f4d15 +SHA512 (git-2.49.0.tar.xz) = 81a16415890305fc6cfd14ade8bee76779feba01f51c5446f40c14211654342c68ef0911859fa6e8e9ff0a718847bb44ee4156d03a19c9165df19ba91e09e1f0 +SHA512 (git-2.49.0.tar.sign) = e956f83ee0973295ec608aa6ab1df11992d8fc10f1702a0cdbf849f7659d94666fe714f60a7b4aeeed064bc49e1345791e3d8b0a867c075544eb48f01b84fd27 From a0b3d1a02bfce4c9462e90e3c093b81dbbdd9e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Mon, 24 Mar 2025 11:47:14 +0100 Subject: [PATCH 831/842] Adds the option to sanitize sideband channel messages CVE-2024-52005 wasn't fixed by upstream. This patch adds the option to harden Git against it. The default behaviour of Git remains unchanged. --- ...9-sanitize-sideband-channel-messages.patch | 471 ++++++++++++++++++ git.spec | 12 +- 2 files changed, 482 insertions(+), 1 deletion(-) create mode 100644 git-2.49-sanitize-sideband-channel-messages.patch diff --git a/git-2.49-sanitize-sideband-channel-messages.patch b/git-2.49-sanitize-sideband-channel-messages.patch new file mode 100644 index 0000000..f3be95a --- /dev/null +++ b/git-2.49-sanitize-sideband-channel-messages.patch @@ -0,0 +1,471 @@ +From 328ff864183cdd0a4b779b5b88a3271b39a1b1a2 Mon Sep 17 00:00:00 2001 +From: Johannes Schindelin +Date: Wed, 6 Nov 2024 20:34:50 +0100 +Subject: [PATCH 1/4] sideband: mask control characters + +The output of `git clone` is a vital component for understanding what +has happened when things go wrong. However, these logs are partially +under the control of the remote server (via the "sideband", which +typically contains what the remote `git pack-objects` process sends to +`stderr`), and is currently not sanitized by Git. + +This makes Git susceptible to ANSI escape sequence injection (see +CWE-150, https://cwe.mitre.org/data/definitions/150.html), which allows +attackers to corrupt terminal state, to hide information, and even to +insert characters into the input buffer (i.e. as if the user had typed +those characters). + +To plug this vulnerability, disallow any control character in the +sideband, replacing them instead with the common `^` +(e.g. `^[` for `\x1b`, `^A` for `\x01`). + +There is likely a need for more fine-grained controls instead of using a +"heavy hammer" like this, which will be introduced subsequently. + +Signed-off-by: Johannes Schindelin +--- + sideband.c | 17 +++++++++++++++-- + t/t5409-colorize-remote-messages.sh | 12 ++++++++++++ + 2 files changed, 27 insertions(+), 2 deletions(-) + +diff --git a/sideband.c b/sideband.c +index 251e9615ed..81b1ff0805 100644 +--- a/sideband.c ++++ b/sideband.c +@@ -66,6 +66,19 @@ void list_config_color_sideband_slots(struct string_list *list, const char *pref + list_config_item(list, prefix, keywords[i].keyword); + } + ++static void strbuf_add_sanitized(struct strbuf *dest, const char *src, int n) ++{ ++ strbuf_grow(dest, n); ++ for (; n && *src; src++, n--) { ++ if (!iscntrl(*src) || *src == '\t' || *src == '\n') ++ strbuf_addch(dest, *src); ++ else { ++ strbuf_addch(dest, '^'); ++ strbuf_addch(dest, 0x40 + *src); ++ } ++ } ++} ++ + /* + * Optionally highlight one keyword in remote output if it appears at the start + * of the line. This should be called for a single line only, which is +@@ -81,7 +94,7 @@ static void maybe_colorize_sideband(struct strbuf *dest, const char *src, int n) + int i; + + if (!want_color_stderr(use_sideband_colors())) { +- strbuf_add(dest, src, n); ++ strbuf_add_sanitized(dest, src, n); + return; + } + +@@ -114,7 +127,7 @@ static void maybe_colorize_sideband(struct strbuf *dest, const char *src, int n) + } + } + +- strbuf_add(dest, src, n); ++ strbuf_add_sanitized(dest, src, n); + } + + +diff --git a/t/t5409-colorize-remote-messages.sh b/t/t5409-colorize-remote-messages.sh +index fa5de4500a..d0745c391b 100755 +--- a/t/t5409-colorize-remote-messages.sh ++++ b/t/t5409-colorize-remote-messages.sh +@@ -98,4 +98,16 @@ test_expect_success 'fallback to color.ui' ' + grep "error: error" decoded + ' + ++test_expect_success 'disallow (color) control sequences in sideband' ' ++ write_script .git/color-me-surprised <<-\EOF && ++ printf "error: Have you \\033[31mread\\033[m this?\\n" >&2 ++ exec "$@" ++ EOF ++ test_config_global uploadPack.packObjectshook ./color-me-surprised && ++ test_commit need-at-least-one-commit && ++ git clone --no-local . throw-away 2>stderr && ++ test_decode_color decoded && ++ test_grep ! RED decoded ++' ++ + test_done +-- +2.49.0 + + +From ab2eb6c0043c643935ea0fbdaed68e15bc831b11 Mon Sep 17 00:00:00 2001 +From: Johannes Schindelin +Date: Wed, 6 Nov 2024 21:07:51 +0100 +Subject: [PATCH 2/4] sideband: introduce an "escape hatch" to allow control + characters + +The preceding commit fixed the vulnerability whereas sideband messages +(that are under the control of the remote server) could contain ANSI +escape sequences that would be sent to the terminal verbatim. + +However, this fix may not be desirable under all circumstances, e.g. +when remote servers deliberately add coloring to their messages to +increase their urgency. + +To help with those use cases, give users a way to opt-out of the +protections: `sideband.allowControlCharacters`. + +Signed-off-by: Johannes Schindelin +--- + Documentation/config.adoc | 2 ++ + Documentation/config/sideband.adoc | 5 +++++ + sideband.c | 10 ++++++++++ + t/t5409-colorize-remote-messages.sh | 8 +++++++- + 4 files changed, 24 insertions(+), 1 deletion(-) + create mode 100644 Documentation/config/sideband.adoc + +diff --git a/Documentation/config.adoc b/Documentation/config.adoc +index cc769251be..a8b04c4e51 100644 +--- a/Documentation/config.adoc ++++ b/Documentation/config.adoc +@@ -522,6 +522,8 @@ include::config/sequencer.adoc[] + + include::config/showbranch.adoc[] + ++include::config/sideband.adoc[] ++ + include::config/sparse.adoc[] + + include::config/splitindex.adoc[] +diff --git a/Documentation/config/sideband.adoc b/Documentation/config/sideband.adoc +new file mode 100644 +index 0000000000..3fb5045cd7 +--- /dev/null ++++ b/Documentation/config/sideband.adoc +@@ -0,0 +1,5 @@ ++sideband.allowControlCharacters:: ++ By default, control characters that are delivered via the sideband ++ are masked, to prevent potentially unwanted ANSI escape sequences ++ from being sent to the terminal. Use this config setting to override ++ this behavior. +diff --git a/sideband.c b/sideband.c +index 81b1ff0805..d1c326fa19 100644 +--- a/sideband.c ++++ b/sideband.c +@@ -26,6 +26,8 @@ static struct keyword_entry keywords[] = { + { "error", GIT_COLOR_BOLD_RED }, + }; + ++static int allow_control_characters; ++ + /* Returns a color setting (GIT_COLOR_NEVER, etc). */ + static int use_sideband_colors(void) + { +@@ -39,6 +41,9 @@ static int use_sideband_colors(void) + if (use_sideband_colors_cached >= 0) + return use_sideband_colors_cached; + ++ git_config_get_bool("sideband.allowcontrolcharacters", ++ &allow_control_characters); ++ + if (!git_config_get_string_tmp(key, &value)) + use_sideband_colors_cached = git_config_colorbool(key, value); + else if (!git_config_get_string_tmp("color.ui", &value)) +@@ -68,6 +73,11 @@ void list_config_color_sideband_slots(struct string_list *list, const char *pref + + static void strbuf_add_sanitized(struct strbuf *dest, const char *src, int n) + { ++ if (allow_control_characters) { ++ strbuf_add(dest, src, n); ++ return; ++ } ++ + strbuf_grow(dest, n); + for (; n && *src; src++, n--) { + if (!iscntrl(*src) || *src == '\t' || *src == '\n') +diff --git a/t/t5409-colorize-remote-messages.sh b/t/t5409-colorize-remote-messages.sh +index d0745c391b..fb31e85254 100755 +--- a/t/t5409-colorize-remote-messages.sh ++++ b/t/t5409-colorize-remote-messages.sh +@@ -105,9 +105,15 @@ test_expect_success 'disallow (color) control sequences in sideband' ' + EOF + test_config_global uploadPack.packObjectshook ./color-me-surprised && + test_commit need-at-least-one-commit && ++ + git clone --no-local . throw-away 2>stderr && + test_decode_color decoded && +- test_grep ! RED decoded ++ test_grep ! RED decoded && ++ ++ rm -rf throw-away && ++ git -c sideband.allowControlCharacters clone --no-local . throw-away 2>stderr && ++ test_decode_color decoded && ++ test_grep RED decoded + ' + + test_done +-- +2.49.0 + + +From a369672c2e6974590ad0561854318a4f255e6893 Mon Sep 17 00:00:00 2001 +From: Johannes Schindelin +Date: Mon, 18 Nov 2024 21:42:57 +0100 +Subject: [PATCH 3/4] sideband: do allow ANSI color sequences by default + +The preceding two commits introduced special handling of the sideband +channel to neutralize ANSI escape sequences before sending the payload +to the terminal, and `sideband.allowControlCharacters` to override that +behavior. + +However, some `pre-receive` hooks that are actively used in practice +want to color their messages and therefore rely on the fact that Git +passes them through to the terminal. + +In contrast to other ANSI escape sequences, it is highly unlikely that +coloring sequences can be essential tools in attack vectors that mislead +Git users e.g. by hiding crucial information. + +Therefore we can have both: Continue to allow ANSI coloring sequences to +be passed to the terminal, and neutralize all other ANSI escape +sequences. + +Signed-off-by: Johannes Schindelin +--- + Documentation/config/sideband.adoc | 17 ++++++-- + sideband.c | 61 ++++++++++++++++++++++++++--- + t/t5409-colorize-remote-messages.sh | 16 +++++++- + 3 files changed, 84 insertions(+), 10 deletions(-) + +diff --git a/Documentation/config/sideband.adoc b/Documentation/config/sideband.adoc +index 3fb5045cd7..f347fd6b33 100644 +--- a/Documentation/config/sideband.adoc ++++ b/Documentation/config/sideband.adoc +@@ -1,5 +1,16 @@ + sideband.allowControlCharacters:: + By default, control characters that are delivered via the sideband +- are masked, to prevent potentially unwanted ANSI escape sequences +- from being sent to the terminal. Use this config setting to override +- this behavior. ++ are masked, except ANSI color sequences. This prevents potentially ++ unwanted ANSI escape sequences from being sent to the terminal. Use ++ this config setting to override this behavior: +++ ++-- ++ color:: ++ Allow ANSI color sequences, line feeds and horizontal tabs, ++ but mask all other control characters. This is the default. ++ false:: ++ Mask all control characters other than line feeds and ++ horizontal tabs. ++ true:: ++ Allow all control characters to be sent to the terminal. ++-- +diff --git a/sideband.c b/sideband.c +index d1c326fa19..9084ca234d 100644 +--- a/sideband.c ++++ b/sideband.c +@@ -26,7 +26,11 @@ static struct keyword_entry keywords[] = { + { "error", GIT_COLOR_BOLD_RED }, + }; + +-static int allow_control_characters; ++static enum { ++ ALLOW_NO_CONTROL_CHARACTERS = 0, ++ ALLOW_ALL_CONTROL_CHARACTERS = 1, ++ ALLOW_ANSI_COLOR_SEQUENCES = 2 ++} allow_control_characters = ALLOW_ANSI_COLOR_SEQUENCES; + + /* Returns a color setting (GIT_COLOR_NEVER, etc). */ + static int use_sideband_colors(void) +@@ -41,8 +45,24 @@ static int use_sideband_colors(void) + if (use_sideband_colors_cached >= 0) + return use_sideband_colors_cached; + +- git_config_get_bool("sideband.allowcontrolcharacters", +- &allow_control_characters); ++ switch (git_config_get_maybe_bool("sideband.allowcontrolcharacters", &i)) { ++ case 0: /* Boolean value */ ++ allow_control_characters = i ? ALLOW_ALL_CONTROL_CHARACTERS : ++ ALLOW_NO_CONTROL_CHARACTERS; ++ break; ++ case -1: /* non-Boolean value */ ++ if (git_config_get_string_tmp("sideband.allowcontrolcharacters", ++ &value)) ++ ; /* huh? `get_maybe_bool()` returned -1 */ ++ else if (!strcmp(value, "color")) ++ allow_control_characters = ALLOW_ANSI_COLOR_SEQUENCES; ++ else ++ warning(_("unrecognized value for `sideband." ++ "allowControlCharacters`: '%s'"), value); ++ break; ++ default: ++ break; /* not configured */ ++ } + + if (!git_config_get_string_tmp(key, &value)) + use_sideband_colors_cached = git_config_colorbool(key, value); +@@ -71,9 +91,37 @@ void list_config_color_sideband_slots(struct string_list *list, const char *pref + list_config_item(list, prefix, keywords[i].keyword); + } + ++static int handle_ansi_color_sequence(struct strbuf *dest, const char *src, int n) ++{ ++ int i; ++ ++ /* ++ * Valid ANSI color sequences are of the form ++ * ++ * ESC [ [ [; ]*] m ++ */ ++ ++ if (allow_control_characters != ALLOW_ANSI_COLOR_SEQUENCES || ++ n < 3 || src[0] != '\x1b' || src[1] != '[') ++ return 0; ++ ++ for (i = 2; i < n; i++) { ++ if (src[i] == 'm') { ++ strbuf_add(dest, src, i + 1); ++ return i; ++ } ++ if (!isdigit(src[i]) && src[i] != ';') ++ break; ++ } ++ ++ return 0; ++} ++ + static void strbuf_add_sanitized(struct strbuf *dest, const char *src, int n) + { +- if (allow_control_characters) { ++ int i; ++ ++ if (allow_control_characters == ALLOW_ALL_CONTROL_CHARACTERS) { + strbuf_add(dest, src, n); + return; + } +@@ -82,7 +130,10 @@ static void strbuf_add_sanitized(struct strbuf *dest, const char *src, int n) + for (; n && *src; src++, n--) { + if (!iscntrl(*src) || *src == '\t' || *src == '\n') + strbuf_addch(dest, *src); +- else { ++ else if ((i = handle_ansi_color_sequence(dest, src, n))) { ++ src += i; ++ n -= i; ++ } else { + strbuf_addch(dest, '^'); + strbuf_addch(dest, 0x40 + *src); + } +diff --git a/t/t5409-colorize-remote-messages.sh b/t/t5409-colorize-remote-messages.sh +index fb31e85254..a755c49a74 100755 +--- a/t/t5409-colorize-remote-messages.sh ++++ b/t/t5409-colorize-remote-messages.sh +@@ -100,7 +100,7 @@ test_expect_success 'fallback to color.ui' ' + + test_expect_success 'disallow (color) control sequences in sideband' ' + write_script .git/color-me-surprised <<-\EOF && +- printf "error: Have you \\033[31mread\\033[m this?\\n" >&2 ++ printf "error: Have you \\033[31mread\\033[m this?\\a\\n" >&2 + exec "$@" + EOF + test_config_global uploadPack.packObjectshook ./color-me-surprised && +@@ -108,12 +108,24 @@ test_expect_success 'disallow (color) control sequences in sideband' ' + + git clone --no-local . throw-away 2>stderr && + test_decode_color decoded && ++ test_grep RED decoded && ++ test_grep "\\^G" stderr && ++ tr -dc "\\007" actual && ++ test_must_be_empty actual && ++ ++ rm -rf throw-away && ++ git -c sideband.allowControlCharacters=false \ ++ clone --no-local . throw-away 2>stderr && ++ test_decode_color decoded && + test_grep ! RED decoded && ++ test_grep "\\^G" stderr && + + rm -rf throw-away && + git -c sideband.allowControlCharacters clone --no-local . throw-away 2>stderr && + test_decode_color decoded && +- test_grep RED decoded ++ test_grep RED decoded && ++ tr -dc "\\007" actual && ++ test_file_not_empty actual + ' + + test_done +-- +2.49.0 + + +From b15d2255ed98eb6f75608c2f99f4ea3284ad250e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= +Date: Mon, 24 Mar 2025 10:51:39 +0100 +Subject: [PATCH 4/4] sideband: default to allowControlCharacters=true +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We don't want to change the default Git behaviour, just add the option +to filter control characters. + +Signed-off-by: Ondřej Pohořelský +--- + Documentation/config/sideband.adoc | 8 ++++---- + sideband.c | 2 +- + t/t5409-colorize-remote-messages.sh | 3 ++- + 3 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/Documentation/config/sideband.adoc b/Documentation/config/sideband.adoc +index f347fd6b33..a809e2de89 100644 +--- a/Documentation/config/sideband.adoc ++++ b/Documentation/config/sideband.adoc +@@ -1,16 +1,16 @@ + sideband.allowControlCharacters:: + By default, control characters that are delivered via the sideband +- are masked, except ANSI color sequences. This prevents potentially +- unwanted ANSI escape sequences from being sent to the terminal. Use +- this config setting to override this behavior: ++ are NOT masked. Use this config setting to prevent potentially ++ unwanted ANSI escape sequences from being sent to the terminal: + + + -- + color:: + Allow ANSI color sequences, line feeds and horizontal tabs, +- but mask all other control characters. This is the default. ++ but mask all other control characters. + false:: + Mask all control characters other than line feeds and + horizontal tabs. + true:: + Allow all control characters to be sent to the terminal. ++ This is the default. + -- +diff --git a/sideband.c b/sideband.c +index 9084ca234d..456cd3d8bc 100644 +--- a/sideband.c ++++ b/sideband.c +@@ -30,7 +30,7 @@ static enum { + ALLOW_NO_CONTROL_CHARACTERS = 0, + ALLOW_ALL_CONTROL_CHARACTERS = 1, + ALLOW_ANSI_COLOR_SEQUENCES = 2 +-} allow_control_characters = ALLOW_ANSI_COLOR_SEQUENCES; ++} allow_control_characters = ALLOW_ALL_CONTROL_CHARACTERS; + + /* Returns a color setting (GIT_COLOR_NEVER, etc). */ + static int use_sideband_colors(void) +diff --git a/t/t5409-colorize-remote-messages.sh b/t/t5409-colorize-remote-messages.sh +index a755c49a74..2d40d8c640 100755 +--- a/t/t5409-colorize-remote-messages.sh ++++ b/t/t5409-colorize-remote-messages.sh +@@ -106,7 +106,8 @@ test_expect_success 'disallow (color) control sequences in sideband' ' + test_config_global uploadPack.packObjectshook ./color-me-surprised && + test_commit need-at-least-one-commit && + +- git clone --no-local . throw-away 2>stderr && ++ git -c sideband.allowControlCharacters=color \ ++ clone --no-local . throw-away 2>stderr && + test_decode_color decoded && + test_grep RED decoded && + test_grep "\\^G" stderr && +-- +2.49.0 + diff --git a/git.spec b/git.spec index b19d845..b3b2184 100644 --- a/git.spec +++ b/git.spec @@ -79,7 +79,7 @@ Name: git Version: 2.49.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -132,6 +132,13 @@ Patch3: 0003-t-lib-git-svn-try-harder-to-find-a-port.patch # Prevents t5540 failures on i686, s390x and ppc64le Patch5: git-test-apache-davlockdbtype-config.patch +# Adds the option to sanitize sideband channel messages +# CVE-2024-52005 wasn't fixed by upstream. This patch adds the option to harden Git against it. +# The default behaviour of Git remains unchanged. +# +# https://github.com/gitgitgadget/git/pull/1853 +Patch6: git-2.49-sanitize-sideband-channel-messages.patch + %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: perl-podlators @@ -1056,6 +1063,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Mar 24 2025 Ondřej Pohořelský - 2.49.0-2 +- add the option to sanitize sideband channel messages + * Mon Mar 17 2025 Ondřej Pohořelský - 2.49.0-1 - update to 2.49.0 From 001bf29ac7e222626c490dc9ffa4c5195e36f4d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Mon, 23 Jun 2025 14:16:09 +0200 Subject: [PATCH 832/842] update to 2.50.0 --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index b3b2184..203dced 100644 --- a/git.spec +++ b/git.spec @@ -78,8 +78,8 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.49.0 -Release: 2%{?dist} +Version: 2.50.0 +Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -1063,6 +1063,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Jun 23 2025 Ondřej Pohořelský - 2.50.0-1 +- update to 2.50.0 + * Mon Mar 24 2025 Ondřej Pohořelský - 2.49.0-2 - add the option to sanitize sideband channel messages diff --git a/sources b/sources index 25bd2d3..fbc63c3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.49.0.tar.xz) = 81a16415890305fc6cfd14ade8bee76779feba01f51c5446f40c14211654342c68ef0911859fa6e8e9ff0a718847bb44ee4156d03a19c9165df19ba91e09e1f0 -SHA512 (git-2.49.0.tar.sign) = e956f83ee0973295ec608aa6ab1df11992d8fc10f1702a0cdbf849f7659d94666fe714f60a7b4aeeed064bc49e1345791e3d8b0a867c075544eb48f01b84fd27 +SHA512 (git-2.50.0.tar.xz) = a8fdf5b0ab156822324b76aa7200071eb7244f7714807c39f05bc3361bc261272a6fdd1d0bc3a097dbbf27e92c02eda612aac17cb2a45ddfa222d74937cac67f +SHA512 (git-2.50.0.tar.sign) = 1cc17cc904587ff3c3c85a728ced51a04a92b194a7e5e69e0fd2f59bff24c643a3c4e5631b0cd870d4ad4229b1e9edc4c5cf671cde72bb37ef1cc04ebfac421c From 54ed4ea4ba7db573e5cccb672c50aed38b2fe49c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Tue, 8 Jul 2025 22:41:07 +0200 Subject: [PATCH 833/842] update to 2.50.1 --- git.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 203dced..b23d32b 100644 --- a/git.spec +++ b/git.spec @@ -78,7 +78,7 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.50.0 +Version: 2.50.1 Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT @@ -1063,6 +1063,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Jul 08 2025 Ondřej Pohořelský - 2.50.1-1 +- update to 2.50.1 + * Mon Jun 23 2025 Ondřej Pohořelský - 2.50.0-1 - update to 2.50.0 diff --git a/sources b/sources index fbc63c3..8e5e30a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.50.0.tar.xz) = a8fdf5b0ab156822324b76aa7200071eb7244f7714807c39f05bc3361bc261272a6fdd1d0bc3a097dbbf27e92c02eda612aac17cb2a45ddfa222d74937cac67f -SHA512 (git-2.50.0.tar.sign) = 1cc17cc904587ff3c3c85a728ced51a04a92b194a7e5e69e0fd2f59bff24c643a3c4e5631b0cd870d4ad4229b1e9edc4c5cf671cde72bb37ef1cc04ebfac421c +SHA512 (git-2.50.1.tar.xz) = 09f37290c0d4d074b97363f4a4be1813426e93ac3fa993c4d671bb1462bcc9335713c17d1442196a35205a603eeb052662382935d27498875a251f4fe86f6b36 +SHA512 (git-2.50.1.tar.sign) = f03a588b4108a2f0eae949d8870a3f16da18dfdf23de547aeaa25cdbccf668cfe89d49bbfb3869571b261738482f32002d83b2760415d4c04a0285273b18e828 From fc75418e16da4919c30846f896122b7e08c85c92 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 22:22:42 +0000 Subject: [PATCH 834/842] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index b23d32b..d19d51f 100644 --- a/git.spec +++ b/git.spec @@ -79,7 +79,7 @@ Name: git Version: 2.50.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -1063,6 +1063,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.50.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jul 08 2025 Ondřej Pohořelský - 2.50.1-1 - update to 2.50.1 From 90cb7985fdcd5d276f9d7f17efd93932116e578e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Wed, 20 Aug 2025 11:46:09 +0200 Subject: [PATCH 835/842] update to 2.51.0 --- ...9-sanitize-sideband-channel-messages.patch | 471 ------------------ ...1-sanitize-sideband-channel-messages.patch | 274 ++++++++++ git.spec | 27 +- sources | 4 +- 4 files changed, 282 insertions(+), 494 deletions(-) delete mode 100644 git-2.49-sanitize-sideband-channel-messages.patch create mode 100644 git-2.51-sanitize-sideband-channel-messages.patch diff --git a/git-2.49-sanitize-sideband-channel-messages.patch b/git-2.49-sanitize-sideband-channel-messages.patch deleted file mode 100644 index f3be95a..0000000 --- a/git-2.49-sanitize-sideband-channel-messages.patch +++ /dev/null @@ -1,471 +0,0 @@ -From 328ff864183cdd0a4b779b5b88a3271b39a1b1a2 Mon Sep 17 00:00:00 2001 -From: Johannes Schindelin -Date: Wed, 6 Nov 2024 20:34:50 +0100 -Subject: [PATCH 1/4] sideband: mask control characters - -The output of `git clone` is a vital component for understanding what -has happened when things go wrong. However, these logs are partially -under the control of the remote server (via the "sideband", which -typically contains what the remote `git pack-objects` process sends to -`stderr`), and is currently not sanitized by Git. - -This makes Git susceptible to ANSI escape sequence injection (see -CWE-150, https://cwe.mitre.org/data/definitions/150.html), which allows -attackers to corrupt terminal state, to hide information, and even to -insert characters into the input buffer (i.e. as if the user had typed -those characters). - -To plug this vulnerability, disallow any control character in the -sideband, replacing them instead with the common `^` -(e.g. `^[` for `\x1b`, `^A` for `\x01`). - -There is likely a need for more fine-grained controls instead of using a -"heavy hammer" like this, which will be introduced subsequently. - -Signed-off-by: Johannes Schindelin ---- - sideband.c | 17 +++++++++++++++-- - t/t5409-colorize-remote-messages.sh | 12 ++++++++++++ - 2 files changed, 27 insertions(+), 2 deletions(-) - -diff --git a/sideband.c b/sideband.c -index 251e9615ed..81b1ff0805 100644 ---- a/sideband.c -+++ b/sideband.c -@@ -66,6 +66,19 @@ void list_config_color_sideband_slots(struct string_list *list, const char *pref - list_config_item(list, prefix, keywords[i].keyword); - } - -+static void strbuf_add_sanitized(struct strbuf *dest, const char *src, int n) -+{ -+ strbuf_grow(dest, n); -+ for (; n && *src; src++, n--) { -+ if (!iscntrl(*src) || *src == '\t' || *src == '\n') -+ strbuf_addch(dest, *src); -+ else { -+ strbuf_addch(dest, '^'); -+ strbuf_addch(dest, 0x40 + *src); -+ } -+ } -+} -+ - /* - * Optionally highlight one keyword in remote output if it appears at the start - * of the line. This should be called for a single line only, which is -@@ -81,7 +94,7 @@ static void maybe_colorize_sideband(struct strbuf *dest, const char *src, int n) - int i; - - if (!want_color_stderr(use_sideband_colors())) { -- strbuf_add(dest, src, n); -+ strbuf_add_sanitized(dest, src, n); - return; - } - -@@ -114,7 +127,7 @@ static void maybe_colorize_sideband(struct strbuf *dest, const char *src, int n) - } - } - -- strbuf_add(dest, src, n); -+ strbuf_add_sanitized(dest, src, n); - } - - -diff --git a/t/t5409-colorize-remote-messages.sh b/t/t5409-colorize-remote-messages.sh -index fa5de4500a..d0745c391b 100755 ---- a/t/t5409-colorize-remote-messages.sh -+++ b/t/t5409-colorize-remote-messages.sh -@@ -98,4 +98,16 @@ test_expect_success 'fallback to color.ui' ' - grep "error: error" decoded - ' - -+test_expect_success 'disallow (color) control sequences in sideband' ' -+ write_script .git/color-me-surprised <<-\EOF && -+ printf "error: Have you \\033[31mread\\033[m this?\\n" >&2 -+ exec "$@" -+ EOF -+ test_config_global uploadPack.packObjectshook ./color-me-surprised && -+ test_commit need-at-least-one-commit && -+ git clone --no-local . throw-away 2>stderr && -+ test_decode_color decoded && -+ test_grep ! RED decoded -+' -+ - test_done --- -2.49.0 - - -From ab2eb6c0043c643935ea0fbdaed68e15bc831b11 Mon Sep 17 00:00:00 2001 -From: Johannes Schindelin -Date: Wed, 6 Nov 2024 21:07:51 +0100 -Subject: [PATCH 2/4] sideband: introduce an "escape hatch" to allow control - characters - -The preceding commit fixed the vulnerability whereas sideband messages -(that are under the control of the remote server) could contain ANSI -escape sequences that would be sent to the terminal verbatim. - -However, this fix may not be desirable under all circumstances, e.g. -when remote servers deliberately add coloring to their messages to -increase their urgency. - -To help with those use cases, give users a way to opt-out of the -protections: `sideband.allowControlCharacters`. - -Signed-off-by: Johannes Schindelin ---- - Documentation/config.adoc | 2 ++ - Documentation/config/sideband.adoc | 5 +++++ - sideband.c | 10 ++++++++++ - t/t5409-colorize-remote-messages.sh | 8 +++++++- - 4 files changed, 24 insertions(+), 1 deletion(-) - create mode 100644 Documentation/config/sideband.adoc - -diff --git a/Documentation/config.adoc b/Documentation/config.adoc -index cc769251be..a8b04c4e51 100644 ---- a/Documentation/config.adoc -+++ b/Documentation/config.adoc -@@ -522,6 +522,8 @@ include::config/sequencer.adoc[] - - include::config/showbranch.adoc[] - -+include::config/sideband.adoc[] -+ - include::config/sparse.adoc[] - - include::config/splitindex.adoc[] -diff --git a/Documentation/config/sideband.adoc b/Documentation/config/sideband.adoc -new file mode 100644 -index 0000000000..3fb5045cd7 ---- /dev/null -+++ b/Documentation/config/sideband.adoc -@@ -0,0 +1,5 @@ -+sideband.allowControlCharacters:: -+ By default, control characters that are delivered via the sideband -+ are masked, to prevent potentially unwanted ANSI escape sequences -+ from being sent to the terminal. Use this config setting to override -+ this behavior. -diff --git a/sideband.c b/sideband.c -index 81b1ff0805..d1c326fa19 100644 ---- a/sideband.c -+++ b/sideband.c -@@ -26,6 +26,8 @@ static struct keyword_entry keywords[] = { - { "error", GIT_COLOR_BOLD_RED }, - }; - -+static int allow_control_characters; -+ - /* Returns a color setting (GIT_COLOR_NEVER, etc). */ - static int use_sideband_colors(void) - { -@@ -39,6 +41,9 @@ static int use_sideband_colors(void) - if (use_sideband_colors_cached >= 0) - return use_sideband_colors_cached; - -+ git_config_get_bool("sideband.allowcontrolcharacters", -+ &allow_control_characters); -+ - if (!git_config_get_string_tmp(key, &value)) - use_sideband_colors_cached = git_config_colorbool(key, value); - else if (!git_config_get_string_tmp("color.ui", &value)) -@@ -68,6 +73,11 @@ void list_config_color_sideband_slots(struct string_list *list, const char *pref - - static void strbuf_add_sanitized(struct strbuf *dest, const char *src, int n) - { -+ if (allow_control_characters) { -+ strbuf_add(dest, src, n); -+ return; -+ } -+ - strbuf_grow(dest, n); - for (; n && *src; src++, n--) { - if (!iscntrl(*src) || *src == '\t' || *src == '\n') -diff --git a/t/t5409-colorize-remote-messages.sh b/t/t5409-colorize-remote-messages.sh -index d0745c391b..fb31e85254 100755 ---- a/t/t5409-colorize-remote-messages.sh -+++ b/t/t5409-colorize-remote-messages.sh -@@ -105,9 +105,15 @@ test_expect_success 'disallow (color) control sequences in sideband' ' - EOF - test_config_global uploadPack.packObjectshook ./color-me-surprised && - test_commit need-at-least-one-commit && -+ - git clone --no-local . throw-away 2>stderr && - test_decode_color decoded && -- test_grep ! RED decoded -+ test_grep ! RED decoded && -+ -+ rm -rf throw-away && -+ git -c sideband.allowControlCharacters clone --no-local . throw-away 2>stderr && -+ test_decode_color decoded && -+ test_grep RED decoded - ' - - test_done --- -2.49.0 - - -From a369672c2e6974590ad0561854318a4f255e6893 Mon Sep 17 00:00:00 2001 -From: Johannes Schindelin -Date: Mon, 18 Nov 2024 21:42:57 +0100 -Subject: [PATCH 3/4] sideband: do allow ANSI color sequences by default - -The preceding two commits introduced special handling of the sideband -channel to neutralize ANSI escape sequences before sending the payload -to the terminal, and `sideband.allowControlCharacters` to override that -behavior. - -However, some `pre-receive` hooks that are actively used in practice -want to color their messages and therefore rely on the fact that Git -passes them through to the terminal. - -In contrast to other ANSI escape sequences, it is highly unlikely that -coloring sequences can be essential tools in attack vectors that mislead -Git users e.g. by hiding crucial information. - -Therefore we can have both: Continue to allow ANSI coloring sequences to -be passed to the terminal, and neutralize all other ANSI escape -sequences. - -Signed-off-by: Johannes Schindelin ---- - Documentation/config/sideband.adoc | 17 ++++++-- - sideband.c | 61 ++++++++++++++++++++++++++--- - t/t5409-colorize-remote-messages.sh | 16 +++++++- - 3 files changed, 84 insertions(+), 10 deletions(-) - -diff --git a/Documentation/config/sideband.adoc b/Documentation/config/sideband.adoc -index 3fb5045cd7..f347fd6b33 100644 ---- a/Documentation/config/sideband.adoc -+++ b/Documentation/config/sideband.adoc -@@ -1,5 +1,16 @@ - sideband.allowControlCharacters:: - By default, control characters that are delivered via the sideband -- are masked, to prevent potentially unwanted ANSI escape sequences -- from being sent to the terminal. Use this config setting to override -- this behavior. -+ are masked, except ANSI color sequences. This prevents potentially -+ unwanted ANSI escape sequences from being sent to the terminal. Use -+ this config setting to override this behavior: -++ -+-- -+ color:: -+ Allow ANSI color sequences, line feeds and horizontal tabs, -+ but mask all other control characters. This is the default. -+ false:: -+ Mask all control characters other than line feeds and -+ horizontal tabs. -+ true:: -+ Allow all control characters to be sent to the terminal. -+-- -diff --git a/sideband.c b/sideband.c -index d1c326fa19..9084ca234d 100644 ---- a/sideband.c -+++ b/sideband.c -@@ -26,7 +26,11 @@ static struct keyword_entry keywords[] = { - { "error", GIT_COLOR_BOLD_RED }, - }; - --static int allow_control_characters; -+static enum { -+ ALLOW_NO_CONTROL_CHARACTERS = 0, -+ ALLOW_ALL_CONTROL_CHARACTERS = 1, -+ ALLOW_ANSI_COLOR_SEQUENCES = 2 -+} allow_control_characters = ALLOW_ANSI_COLOR_SEQUENCES; - - /* Returns a color setting (GIT_COLOR_NEVER, etc). */ - static int use_sideband_colors(void) -@@ -41,8 +45,24 @@ static int use_sideband_colors(void) - if (use_sideband_colors_cached >= 0) - return use_sideband_colors_cached; - -- git_config_get_bool("sideband.allowcontrolcharacters", -- &allow_control_characters); -+ switch (git_config_get_maybe_bool("sideband.allowcontrolcharacters", &i)) { -+ case 0: /* Boolean value */ -+ allow_control_characters = i ? ALLOW_ALL_CONTROL_CHARACTERS : -+ ALLOW_NO_CONTROL_CHARACTERS; -+ break; -+ case -1: /* non-Boolean value */ -+ if (git_config_get_string_tmp("sideband.allowcontrolcharacters", -+ &value)) -+ ; /* huh? `get_maybe_bool()` returned -1 */ -+ else if (!strcmp(value, "color")) -+ allow_control_characters = ALLOW_ANSI_COLOR_SEQUENCES; -+ else -+ warning(_("unrecognized value for `sideband." -+ "allowControlCharacters`: '%s'"), value); -+ break; -+ default: -+ break; /* not configured */ -+ } - - if (!git_config_get_string_tmp(key, &value)) - use_sideband_colors_cached = git_config_colorbool(key, value); -@@ -71,9 +91,37 @@ void list_config_color_sideband_slots(struct string_list *list, const char *pref - list_config_item(list, prefix, keywords[i].keyword); - } - -+static int handle_ansi_color_sequence(struct strbuf *dest, const char *src, int n) -+{ -+ int i; -+ -+ /* -+ * Valid ANSI color sequences are of the form -+ * -+ * ESC [ [ [; ]*] m -+ */ -+ -+ if (allow_control_characters != ALLOW_ANSI_COLOR_SEQUENCES || -+ n < 3 || src[0] != '\x1b' || src[1] != '[') -+ return 0; -+ -+ for (i = 2; i < n; i++) { -+ if (src[i] == 'm') { -+ strbuf_add(dest, src, i + 1); -+ return i; -+ } -+ if (!isdigit(src[i]) && src[i] != ';') -+ break; -+ } -+ -+ return 0; -+} -+ - static void strbuf_add_sanitized(struct strbuf *dest, const char *src, int n) - { -- if (allow_control_characters) { -+ int i; -+ -+ if (allow_control_characters == ALLOW_ALL_CONTROL_CHARACTERS) { - strbuf_add(dest, src, n); - return; - } -@@ -82,7 +130,10 @@ static void strbuf_add_sanitized(struct strbuf *dest, const char *src, int n) - for (; n && *src; src++, n--) { - if (!iscntrl(*src) || *src == '\t' || *src == '\n') - strbuf_addch(dest, *src); -- else { -+ else if ((i = handle_ansi_color_sequence(dest, src, n))) { -+ src += i; -+ n -= i; -+ } else { - strbuf_addch(dest, '^'); - strbuf_addch(dest, 0x40 + *src); - } -diff --git a/t/t5409-colorize-remote-messages.sh b/t/t5409-colorize-remote-messages.sh -index fb31e85254..a755c49a74 100755 ---- a/t/t5409-colorize-remote-messages.sh -+++ b/t/t5409-colorize-remote-messages.sh -@@ -100,7 +100,7 @@ test_expect_success 'fallback to color.ui' ' - - test_expect_success 'disallow (color) control sequences in sideband' ' - write_script .git/color-me-surprised <<-\EOF && -- printf "error: Have you \\033[31mread\\033[m this?\\n" >&2 -+ printf "error: Have you \\033[31mread\\033[m this?\\a\\n" >&2 - exec "$@" - EOF - test_config_global uploadPack.packObjectshook ./color-me-surprised && -@@ -108,12 +108,24 @@ test_expect_success 'disallow (color) control sequences in sideband' ' - - git clone --no-local . throw-away 2>stderr && - test_decode_color decoded && -+ test_grep RED decoded && -+ test_grep "\\^G" stderr && -+ tr -dc "\\007" actual && -+ test_must_be_empty actual && -+ -+ rm -rf throw-away && -+ git -c sideband.allowControlCharacters=false \ -+ clone --no-local . throw-away 2>stderr && -+ test_decode_color decoded && - test_grep ! RED decoded && -+ test_grep "\\^G" stderr && - - rm -rf throw-away && - git -c sideband.allowControlCharacters clone --no-local . throw-away 2>stderr && - test_decode_color decoded && -- test_grep RED decoded -+ test_grep RED decoded && -+ tr -dc "\\007" actual && -+ test_file_not_empty actual - ' - - test_done --- -2.49.0 - - -From b15d2255ed98eb6f75608c2f99f4ea3284ad250e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= -Date: Mon, 24 Mar 2025 10:51:39 +0100 -Subject: [PATCH 4/4] sideband: default to allowControlCharacters=true -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We don't want to change the default Git behaviour, just add the option -to filter control characters. - -Signed-off-by: Ondřej Pohořelský ---- - Documentation/config/sideband.adoc | 8 ++++---- - sideband.c | 2 +- - t/t5409-colorize-remote-messages.sh | 3 ++- - 3 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/Documentation/config/sideband.adoc b/Documentation/config/sideband.adoc -index f347fd6b33..a809e2de89 100644 ---- a/Documentation/config/sideband.adoc -+++ b/Documentation/config/sideband.adoc -@@ -1,16 +1,16 @@ - sideband.allowControlCharacters:: - By default, control characters that are delivered via the sideband -- are masked, except ANSI color sequences. This prevents potentially -- unwanted ANSI escape sequences from being sent to the terminal. Use -- this config setting to override this behavior: -+ are NOT masked. Use this config setting to prevent potentially -+ unwanted ANSI escape sequences from being sent to the terminal: - + - -- - color:: - Allow ANSI color sequences, line feeds and horizontal tabs, -- but mask all other control characters. This is the default. -+ but mask all other control characters. - false:: - Mask all control characters other than line feeds and - horizontal tabs. - true:: - Allow all control characters to be sent to the terminal. -+ This is the default. - -- -diff --git a/sideband.c b/sideband.c -index 9084ca234d..456cd3d8bc 100644 ---- a/sideband.c -+++ b/sideband.c -@@ -30,7 +30,7 @@ static enum { - ALLOW_NO_CONTROL_CHARACTERS = 0, - ALLOW_ALL_CONTROL_CHARACTERS = 1, - ALLOW_ANSI_COLOR_SEQUENCES = 2 --} allow_control_characters = ALLOW_ANSI_COLOR_SEQUENCES; -+} allow_control_characters = ALLOW_ALL_CONTROL_CHARACTERS; - - /* Returns a color setting (GIT_COLOR_NEVER, etc). */ - static int use_sideband_colors(void) -diff --git a/t/t5409-colorize-remote-messages.sh b/t/t5409-colorize-remote-messages.sh -index a755c49a74..2d40d8c640 100755 ---- a/t/t5409-colorize-remote-messages.sh -+++ b/t/t5409-colorize-remote-messages.sh -@@ -106,7 +106,8 @@ test_expect_success 'disallow (color) control sequences in sideband' ' - test_config_global uploadPack.packObjectshook ./color-me-surprised && - test_commit need-at-least-one-commit && - -- git clone --no-local . throw-away 2>stderr && -+ git -c sideband.allowControlCharacters=color \ -+ clone --no-local . throw-away 2>stderr && - test_decode_color decoded && - test_grep RED decoded && - test_grep "\\^G" stderr && --- -2.49.0 - diff --git a/git-2.51-sanitize-sideband-channel-messages.patch b/git-2.51-sanitize-sideband-channel-messages.patch new file mode 100644 index 0000000..6a31b6b --- /dev/null +++ b/git-2.51-sanitize-sideband-channel-messages.patch @@ -0,0 +1,274 @@ +From 247950ec070cef60c45a877d24a4770991d1eefc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= +Date: Wed, 20 Aug 2025 09:35:47 +0200 +Subject: [PATCH] sideband: mask control characters +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The output of `git clone` is a vital component for understanding what +has happened when things go wrong. However, these logs are partially +under the control of the remote server (via the "sideband", which +typically contains what the remote `git pack-objects` process sends to +`stderr`), and is currently not sanitized by Git. + +This makes Git susceptible to ANSI escape sequence injection (see +CWE-150, https://cwe.mitre.org/data/definitions/150.html), which allows +attackers to corrupt terminal state, to hide information, and even to +insert characters into the input buffer (i.e. as if the user had typed +those characters). + +To plug this vulnerability, disallow any control character in the +sideband, replacing them instead with the common `^` +(e.g. `^[` for `\x1b`, `^A` for `\x01`). + +There is likely a need for more fine-grained controls instead of using a +"heavy hammer" like this, which will be introduced subsequently. + +Signed-off-by: Johannes Schindelin + +sideband: introduce an "escape hatch" to allow control characters + +The preceding commit fixed the vulnerability whereas sideband messages +(that are under the control of the remote server) could contain ANSI +escape sequences that would be sent to the terminal verbatim. + +However, this fix may not be desirable under all circumstances, e.g. +when remote servers deliberately add coloring to their messages to +increase their urgency. + +To help with those use cases, give users a way to opt-out of the +protections: `sideband.allowControlCharacters`. + +Signed-off-by: Johannes Schindelin + +sideband: do allow ANSI color sequences by default + +The preceding two commits introduced special handling of the sideband +channel to neutralize ANSI escape sequences before sending the payload +to the terminal, and `sideband.allowControlCharacters` to override that +behavior. + +However, some `pre-receive` hooks that are actively used in practice +want to color their messages and therefore rely on the fact that Git +passes them through to the terminal. + +In contrast to other ANSI escape sequences, it is highly unlikely that +coloring sequences can be essential tools in attack vectors that mislead +Git users e.g. by hiding crucial information. + +Therefore we can have both: Continue to allow ANSI coloring sequences to +be passed to the terminal, and neutralize all other ANSI escape +sequences. + +Signed-off-by: Johannes Schindelin + +sideband: default to allowControlCharacters=true + +We don't want to change the default Git behaviour, just add the option +to filter control characters. + +Signed-off-by: Ondřej Pohořelský +--- + Documentation/config.adoc | 2 + + Documentation/config/sideband.adoc | 16 ++++++ + sideband.c | 78 ++++++++++++++++++++++++++++- + t/t5409-colorize-remote-messages.sh | 31 ++++++++++++ + 4 files changed, 125 insertions(+), 2 deletions(-) + create mode 100644 Documentation/config/sideband.adoc + +diff --git a/Documentation/config.adoc b/Documentation/config.adoc +index cc769251be..a8b04c4e51 100644 +--- a/Documentation/config.adoc ++++ b/Documentation/config.adoc +@@ -522,6 +522,8 @@ include::config/sequencer.adoc[] + + include::config/showbranch.adoc[] + ++include::config/sideband.adoc[] ++ + include::config/sparse.adoc[] + + include::config/splitindex.adoc[] +diff --git a/Documentation/config/sideband.adoc b/Documentation/config/sideband.adoc +new file mode 100644 +index 0000000000..a809e2de89 +--- /dev/null ++++ b/Documentation/config/sideband.adoc +@@ -0,0 +1,16 @@ ++sideband.allowControlCharacters:: ++ By default, control characters that are delivered via the sideband ++ are NOT masked. Use this config setting to prevent potentially ++ unwanted ANSI escape sequences from being sent to the terminal: +++ ++-- ++ color:: ++ Allow ANSI color sequences, line feeds and horizontal tabs, ++ but mask all other control characters. ++ false:: ++ Mask all control characters other than line feeds and ++ horizontal tabs. ++ true:: ++ Allow all control characters to be sent to the terminal. ++ This is the default. ++-- +diff --git a/sideband.c b/sideband.c +index 8f15b98a65..461eea0a51 100644 +--- a/sideband.c ++++ b/sideband.c +@@ -26,6 +26,12 @@ static struct keyword_entry keywords[] = { + { "error", GIT_COLOR_BOLD_RED }, + }; + ++static enum { ++ ALLOW_NO_CONTROL_CHARACTERS = 0, ++ ALLOW_ALL_CONTROL_CHARACTERS = 1, ++ ALLOW_ANSI_COLOR_SEQUENCES = 2 ++} allow_control_characters = ALLOW_ALL_CONTROL_CHARACTERS; ++ + /* Returns a color setting (GIT_COLOR_NEVER, etc). */ + static int use_sideband_colors(void) + { +@@ -39,6 +45,25 @@ static int use_sideband_colors(void) + if (use_sideband_colors_cached >= 0) + return use_sideband_colors_cached; + ++ switch (repo_config_get_maybe_bool(the_repository, "sideband.allowcontrolcharacters", &i)) { ++ case 0: /* Boolean value */ ++ allow_control_characters = i ? ALLOW_ALL_CONTROL_CHARACTERS : ++ ALLOW_NO_CONTROL_CHARACTERS; ++ break; ++ case -1: /* non-Boolean value */ ++ if (repo_config_get_string_tmp(the_repository, "sideband.allowcontrolcharacters", ++ &value)) ++ ; /* huh? `get_maybe_bool()` returned -1 */ ++ else if (!strcmp(value, "color")) ++ allow_control_characters = ALLOW_ANSI_COLOR_SEQUENCES; ++ else ++ warning(_("unrecognized value for `sideband." ++ "allowControlCharacters`: '%s'"), value); ++ break; ++ default: ++ break; /* not configured */ ++ } ++ + if (!repo_config_get_string_tmp(the_repository, key, &value)) + use_sideband_colors_cached = git_config_colorbool(key, value); + else if (!repo_config_get_string_tmp(the_repository, "color.ui", &value)) +@@ -66,6 +91,55 @@ void list_config_color_sideband_slots(struct string_list *list, const char *pref + list_config_item(list, prefix, keywords[i].keyword); + } + ++static int handle_ansi_color_sequence(struct strbuf *dest, const char *src, int n) ++{ ++ int i; ++ ++ /* ++ * Valid ANSI color sequences are of the form ++ * ++ * ESC [ [ [; ]*] m ++ */ ++ ++ if (allow_control_characters != ALLOW_ANSI_COLOR_SEQUENCES || ++ n < 3 || src[0] != '\x1b' || src[1] != '[') ++ return 0; ++ ++ for (i = 2; i < n; i++) { ++ if (src[i] == 'm') { ++ strbuf_add(dest, src, i + 1); ++ return i; ++ } ++ if (!isdigit(src[i]) && src[i] != ';') ++ break; ++ } ++ ++ return 0; ++} ++ ++static void strbuf_add_sanitized(struct strbuf *dest, const char *src, int n) ++{ ++ int i; ++ ++ if (allow_control_characters == ALLOW_ALL_CONTROL_CHARACTERS) { ++ strbuf_add(dest, src, n); ++ return; ++ } ++ ++ strbuf_grow(dest, n); ++ for (; n && *src; src++, n--) { ++ if (!iscntrl(*src) || *src == '\t' || *src == '\n') ++ strbuf_addch(dest, *src); ++ else if ((i = handle_ansi_color_sequence(dest, src, n))) { ++ src += i; ++ n -= i; ++ } else { ++ strbuf_addch(dest, '^'); ++ strbuf_addch(dest, 0x40 + *src); ++ } ++ } ++} ++ + /* + * Optionally highlight one keyword in remote output if it appears at the start + * of the line. This should be called for a single line only, which is +@@ -81,7 +155,7 @@ static void maybe_colorize_sideband(struct strbuf *dest, const char *src, int n) + int i; + + if (!want_color_stderr(use_sideband_colors())) { +- strbuf_add(dest, src, n); ++ strbuf_add_sanitized(dest, src, n); + return; + } + +@@ -114,7 +188,7 @@ static void maybe_colorize_sideband(struct strbuf *dest, const char *src, int n) + } + } + +- strbuf_add(dest, src, n); ++ strbuf_add_sanitized(dest, src, n); + } + + +diff --git a/t/t5409-colorize-remote-messages.sh b/t/t5409-colorize-remote-messages.sh +index fa5de4500a..2d40d8c640 100755 +--- a/t/t5409-colorize-remote-messages.sh ++++ b/t/t5409-colorize-remote-messages.sh +@@ -98,4 +98,35 @@ test_expect_success 'fallback to color.ui' ' + grep "error: error" decoded + ' + ++test_expect_success 'disallow (color) control sequences in sideband' ' ++ write_script .git/color-me-surprised <<-\EOF && ++ printf "error: Have you \\033[31mread\\033[m this?\\a\\n" >&2 ++ exec "$@" ++ EOF ++ test_config_global uploadPack.packObjectshook ./color-me-surprised && ++ test_commit need-at-least-one-commit && ++ ++ git -c sideband.allowControlCharacters=color \ ++ clone --no-local . throw-away 2>stderr && ++ test_decode_color decoded && ++ test_grep RED decoded && ++ test_grep "\\^G" stderr && ++ tr -dc "\\007" actual && ++ test_must_be_empty actual && ++ ++ rm -rf throw-away && ++ git -c sideband.allowControlCharacters=false \ ++ clone --no-local . throw-away 2>stderr && ++ test_decode_color decoded && ++ test_grep ! RED decoded && ++ test_grep "\\^G" stderr && ++ ++ rm -rf throw-away && ++ git -c sideband.allowControlCharacters clone --no-local . throw-away 2>stderr && ++ test_decode_color decoded && ++ test_grep RED decoded && ++ tr -dc "\\007" actual && ++ test_file_not_empty actual ++' ++ + test_done +-- +2.50.1 + diff --git a/git.spec b/git.spec index d19d51f..ec36e59 100644 --- a/git.spec +++ b/git.spec @@ -78,8 +78,8 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.50.1 -Release: 2%{?dist} +Version: 2.51.0 +Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -137,7 +137,7 @@ Patch5: git-test-apache-davlockdbtype-config.patch # The default behaviour of Git remains unchanged. # # https://github.com/gitgitgadget/git/pull/1853 -Patch6: git-2.49-sanitize-sideband-channel-messages.patch +Patch6: git-2.51-sanitize-sideband-channel-messages.patch %if %{with docs} # pod2man is needed to build Git.3pm @@ -740,13 +740,6 @@ mkdir -p %{buildroot}%{_datadir}/git-core/contrib/completion install -pm 644 contrib/completion/git-completion.tcsh \ %{buildroot}%{_datadir}/git-core/contrib/completion/ -# Move contrib/hooks out of %%docdir -mkdir -p %{buildroot}%{_datadir}/git-core/contrib -mv contrib/hooks %{buildroot}%{_datadir}/git-core/contrib -pushd contrib > /dev/null -ln -s ../../../git-core/contrib/hooks -popd > /dev/null - # Install git-prompt.sh mkdir -p %{buildroot}%{_datadir}/git-core/contrib/completion install -pm 644 contrib/completion/git-prompt.sh \ @@ -936,11 +929,6 @@ rmdir --ignore-fail-on-non-empty "$testdir" %files -f bin-man-doc-git-files %{_datadir}/git-core/contrib/diff-highlight -%{_datadir}/git-core/contrib/hooks/update-paranoid -%{_datadir}/git-core/contrib/hooks/setgitperms.perl -%{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample -%{_datadir}/git-core/templates/hooks/pre-rebase.sample -%{_datadir}/git-core/templates/hooks/prepare-commit-msg.sample %files all # No files for you! @@ -952,11 +940,6 @@ rmdir --ignore-fail-on-non-empty "$testdir" %license COPYING # exclude is best way here because of troubles with symlinks inside git-core/ %exclude %{_datadir}/git-core/contrib/diff-highlight -%exclude %{_datadir}/git-core/contrib/hooks/update-paranoid -%exclude %{_datadir}/git-core/contrib/hooks/setgitperms.perl -%exclude %{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample -%exclude %{_datadir}/git-core/templates/hooks/pre-rebase.sample -%exclude %{_datadir}/git-core/templates/hooks/prepare-commit-msg.sample %{bash_completions_dir}/git %{_datadir}/git-core/ @@ -966,7 +949,6 @@ rmdir --ignore-fail-on-non-empty "$testdir" %exclude %{_pkgdocdir}/contrib/*/*.py[co] %endif # endif rhel <= 7 -%{_pkgdocdir}/contrib/hooks %if %{with libsecret} %files credential-libsecret @@ -1063,6 +1045,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Aug 20 2025 Ondřej Pohořelský - 2.51.0-1 +- update to 2.51.0 + * Wed Jul 23 2025 Fedora Release Engineering - 2.50.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 8e5e30a..9d8afae 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.50.1.tar.xz) = 09f37290c0d4d074b97363f4a4be1813426e93ac3fa993c4d671bb1462bcc9335713c17d1442196a35205a603eeb052662382935d27498875a251f4fe86f6b36 -SHA512 (git-2.50.1.tar.sign) = f03a588b4108a2f0eae949d8870a3f16da18dfdf23de547aeaa25cdbccf668cfe89d49bbfb3869571b261738482f32002d83b2760415d4c04a0285273b18e828 +SHA512 (git-2.51.0.tar.xz) = 2b8c59589266c0c9e58a9f4fda4a970a8a492e2e0ecbafc414fcfacac4a04251f0115b3676f4599a415b53906f1dea312b18a42e9bde455286abd62ec327beaf +SHA512 (git-2.51.0.tar.sign) = 1fb0d30fb68227ec8a13364b07c3d4468269a2912a746d75704146690115cd9e13c41be4e6e97f65fc5fce40f433456a5e2529f28fe04d6280557970189ac135 From 4cf7527c991233a0316fdbe4cfd60bbc84e0b859 Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Thu, 21 Aug 2025 16:46:57 +0300 Subject: [PATCH 836/842] Gitk can now work with tcl/tk 9 --- git.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/git.spec b/git.spec index ec36e59..1e420f8 100644 --- a/git.spec +++ b/git.spec @@ -436,9 +436,7 @@ Summary: Git repository browser BuildArch: noarch Requires: git = %{version}-%{release} Requires: git-gui = %{version}-%{release} -# Keep gitk on tcl/tk 8.x until its ready for 9 (also see below in config.mk) -# https://github.com/j6t/gitk/issues/5 -Requires: tk8 >= 8.4 +Requires: tk %description -n gitk %{summary}. @@ -596,10 +594,6 @@ gitwebdir = %{_localstatedir}/www/git DEFAULT_TEST_TARGET = prove GIT_PROVE_OPTS = --verbose --normalize %{?_smp_mflags} --formatter=TAP::Formatter::File GIT_TEST_OPTS = -x --verbose-log - -# Keep gitk on tcl/tk 8.x until its ready for 9 (see more above in gitk requires) -TCLTK_PATH = wish8 -TCL_PATH = tclsh8 EOF # Filter bogus perl requires From 8e9df669b84ad39bdefbb31dabfac3b4fa09ab4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Thu, 21 Aug 2025 18:33:27 +0200 Subject: [PATCH 837/842] exclude sample hook files from automatic dependency detection --- git.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 1e420f8..7111a62 100644 --- a/git.spec +++ b/git.spec @@ -79,7 +79,7 @@ Name: git Version: 2.51.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -605,6 +605,9 @@ EOF %endif # endif ! defined perl_bootstrap +# Exclude sample hook files from automatic dependency detection +%global __requires_exclude_from ^%{_datadir}/git-core/templates/hooks/.*sample$ + # Remove Git::LoadCPAN to ensure we use only system perl modules. This also # allows the dependencies to be automatically processed by rpm. rm -rf perl/Git/LoadCPAN{.pm,/} @@ -1039,6 +1042,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Aug 21 2025 Ondřej Pohořelský - 2.51.0-2 +- exclude sample hook files from automatic dependency detection + * Wed Aug 20 2025 Ondřej Pohořelský - 2.51.0-1 - update to 2.51.0 From ba249bb3a1b6ce3fa8636a5ea71ae0a1d41ac58c Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 12 Oct 2025 18:21:23 -0400 Subject: [PATCH 838/842] Revbump for tcl/tk 9 Currently, the rawhide and f43 branches both have -2, but the tcl/tk 9 change is only on rawhide. --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 7111a62..e337059 100644 --- a/git.spec +++ b/git.spec @@ -79,7 +79,7 @@ Name: git Version: 2.51.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -1042,6 +1042,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Sun Oct 12 2025 Yaakov Selkowitz - 2.51.0-3 +- Revbump for tcl/tk 9 + * Thu Aug 21 2025 Ondřej Pohořelský - 2.51.0-2 - exclude sample hook files from automatic dependency detection From 8f542b0496a06ad6fed89e53c4d2e2a33ffe97c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Thu, 23 Oct 2025 09:34:39 +0200 Subject: [PATCH 839/842] update to 2.51.1 --- git.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index e337059..37c2a53 100644 --- a/git.spec +++ b/git.spec @@ -78,8 +78,8 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.51.0 -Release: 3%{?dist} +Version: 2.51.1 +Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -1042,6 +1042,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Oct 23 2025 Ondřej Pohořelský - 2.51.1-1 +- update to 2.51.1 + * Sun Oct 12 2025 Yaakov Selkowitz - 2.51.0-3 - Revbump for tcl/tk 9 diff --git a/sources b/sources index 9d8afae..2fe883b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.51.0.tar.xz) = 2b8c59589266c0c9e58a9f4fda4a970a8a492e2e0ecbafc414fcfacac4a04251f0115b3676f4599a415b53906f1dea312b18a42e9bde455286abd62ec327beaf -SHA512 (git-2.51.0.tar.sign) = 1fb0d30fb68227ec8a13364b07c3d4468269a2912a746d75704146690115cd9e13c41be4e6e97f65fc5fce40f433456a5e2529f28fe04d6280557970189ac135 +SHA512 (git-2.51.1.tar.xz) = bc22d26bbfad4a549d2fb6bed11eb019c2dee607c86bf8faaa986774e526e5b367d80c9a79ab50358624634d840e8e0d27e0b46411d1aabbf76728b7a7f138dd +SHA512 (git-2.51.1.tar.sign) = b22a9ab0db57e00203181ee0138350b0dd7239b68f5ed5c1f2acfcf5f56993f0937150d3d74c27e2fdf6e6daa8eccc682353c957f9dbdd0d2dcbd870b5022aca From 6c89b0ef9df4c8238b1062f52fb4bbd0e06f5cf0 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 17 Nov 2025 11:55:29 -0500 Subject: [PATCH 840/842] Build with highlight on all arches on EL8+ While highlight was only built/shipped on some arches in RHEL 7 Optional, as of RHEL 8 it is built on all arches (albeit not shipped as of 10). --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 37c2a53..f634419 100644 --- a/git.spec +++ b/git.spec @@ -232,7 +232,7 @@ BuildRequires: glibc-langpack-is BuildRequires: gnupg2-smime %endif # endif fedora or el >= 9 -%if 0%{?fedora} || ( 0%{?rhel} >= 7 && ( "%{_arch}" == "ppc64le" || "%{_arch}" == "x86_64" ) ) +%if 0%{?fedora} || 0%{?rhel} >= 8 || ( 0%{?rhel} == 7 && ( "%{_arch}" == "ppc64le" || "%{_arch}" == "x86_64" ) ) BuildRequires: highlight %endif # endif fedora or el7+ (ppc64le/x86_64) From c488c27117d176c90e836715aed9947b2e3e6799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Thu, 20 Nov 2025 13:40:48 +0100 Subject: [PATCH 841/842] update to 2.52.0 --- ...2-sanitize-sideband-channel-messages.patch | 21 ++++++++++--------- git.spec | 14 ++++++++----- sources | 4 ++-- 3 files changed, 22 insertions(+), 17 deletions(-) rename git-2.51-sanitize-sideband-channel-messages.patch => git-2.52-sanitize-sideband-channel-messages.patch (94%) diff --git a/git-2.51-sanitize-sideband-channel-messages.patch b/git-2.52-sanitize-sideband-channel-messages.patch similarity index 94% rename from git-2.51-sanitize-sideband-channel-messages.patch rename to git-2.52-sanitize-sideband-channel-messages.patch index 6a31b6b..786cb39 100644 --- a/git-2.51-sanitize-sideband-channel-messages.patch +++ b/git-2.52-sanitize-sideband-channel-messages.patch @@ -1,6 +1,6 @@ -From 247950ec070cef60c45a877d24a4770991d1eefc Mon Sep 17 00:00:00 2001 +From 65e88e659008e2cbf79cf44975406ff0d569a3a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= -Date: Wed, 20 Aug 2025 09:35:47 +0200 +Date: Thu, 20 Nov 2025 12:24:59 +0100 Subject: [PATCH] sideband: mask control characters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -78,10 +78,10 @@ Signed-off-by: Ondřej Pohořelský create mode 100644 Documentation/config/sideband.adoc diff --git a/Documentation/config.adoc b/Documentation/config.adoc -index cc769251be..a8b04c4e51 100644 +index 62eebe7c54..dcea3c0c15 100644 --- a/Documentation/config.adoc +++ b/Documentation/config.adoc -@@ -522,6 +522,8 @@ include::config/sequencer.adoc[] +@@ -523,6 +523,8 @@ include::config/sequencer.adoc[] include::config/showbranch.adoc[] @@ -92,7 +92,7 @@ index cc769251be..a8b04c4e51 100644 include::config/splitindex.adoc[] diff --git a/Documentation/config/sideband.adoc b/Documentation/config/sideband.adoc new file mode 100644 -index 0000000000..a809e2de89 +index 0000000000..c9ba24a02c --- /dev/null +++ b/Documentation/config/sideband.adoc @@ -0,0 +1,16 @@ @@ -112,8 +112,9 @@ index 0000000000..a809e2de89 + Allow all control characters to be sent to the terminal. + This is the default. +-- +\ No newline at end of file diff --git a/sideband.c b/sideband.c -index 8f15b98a65..461eea0a51 100644 +index ea7c25211e..88d1b44a7a 100644 --- a/sideband.c +++ b/sideband.c @@ -26,6 +26,12 @@ static struct keyword_entry keywords[] = { @@ -127,10 +128,10 @@ index 8f15b98a65..461eea0a51 100644 +} allow_control_characters = ALLOW_ALL_CONTROL_CHARACTERS; + /* Returns a color setting (GIT_COLOR_NEVER, etc). */ - static int use_sideband_colors(void) + static enum git_colorbool use_sideband_colors(void) { -@@ -39,6 +45,25 @@ static int use_sideband_colors(void) - if (use_sideband_colors_cached >= 0) +@@ -39,6 +45,25 @@ static enum git_colorbool use_sideband_colors(void) + if (use_sideband_colors_cached != GIT_COLOR_UNKNOWN) return use_sideband_colors_cached; + switch (repo_config_get_maybe_bool(the_repository, "sideband.allowcontrolcharacters", &i)) { @@ -270,5 +271,5 @@ index fa5de4500a..2d40d8c640 100755 + test_done -- -2.50.1 +2.51.1 diff --git a/git.spec b/git.spec index f634419..df511dc 100644 --- a/git.spec +++ b/git.spec @@ -78,7 +78,7 @@ %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.51.1 +Version: 2.52.0 Release: 1%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT @@ -137,7 +137,7 @@ Patch5: git-test-apache-davlockdbtype-config.patch # The default behaviour of Git remains unchanged. # # https://github.com/gitgitgadget/git/pull/1853 -Patch6: git-2.51-sanitize-sideband-channel-messages.patch +Patch6: git-2.52-sanitize-sideband-channel-messages.patch %if %{with docs} # pod2man is needed to build Git.3pm @@ -875,10 +875,11 @@ GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5300.1[02348] t5300.2[03459] t5300.30 t5300.4[5 # Skip tests which fail on s390x # # The following tests are failing on s390x. -# https://lore.kernel.org/git/Z8dIZmscTdi8dZAY@teonanacatl.net/ +# https://lore.kernel.org/git/4dc4c8cd-c0cc-4784-8fcf-defa3a051087@mit.edu/ # -# t5620.4 'do partial clone 2, backfill min batch size' -GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5620.4" +# t8020.16 'cross merge boundaries in blaming' +# t8020.19 'last-modified merge undoes changes' +GIT_SKIP_TESTS="$GIT_SKIP_TESTS t8020.16 t8020.19" %endif # endif "%{_arch}" == "s390x" export GIT_SKIP_TESTS @@ -1042,6 +1043,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Nov 20 2025 Ondřej Pohořelský - 2.52.0-1 +- update to 2.52.0 + * Thu Oct 23 2025 Ondřej Pohořelský - 2.51.1-1 - update to 2.51.1 diff --git a/sources b/sources index 2fe883b..4a04f56 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.51.1.tar.xz) = bc22d26bbfad4a549d2fb6bed11eb019c2dee607c86bf8faaa986774e526e5b367d80c9a79ab50358624634d840e8e0d27e0b46411d1aabbf76728b7a7f138dd -SHA512 (git-2.51.1.tar.sign) = b22a9ab0db57e00203181ee0138350b0dd7239b68f5ed5c1f2acfcf5f56993f0937150d3d74c27e2fdf6e6daa8eccc682353c957f9dbdd0d2dcbd870b5022aca +SHA512 (git-2.52.0.tar.xz) = 965e5ebb72d1f080d64e34bdb75f0bb1689c9dd41dcf63b020d986bad49808ac09bfb1115962bc0c5b95bac8622367ac4cd09aa89266f73d2137fe94c90dd3ed +SHA512 (git-2.52.0.tar.sign) = a5a68ce131a5763650c477ec01a4de958dd6a946bdea0f613e26bdab41d2df6b3ca63f9028bbe603bf0c834bd415c86e6c616b1ff08cc48aa7c3c61a37b24b74 From da35363f19a689204ff3af77b85869ae857346b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Fri, 12 Dec 2025 13:32:24 +0100 Subject: [PATCH 842/842] remove unused buildrequires --- git.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/git.spec b/git.spec index df511dc..49c55d0 100644 --- a/git.spec +++ b/git.spec @@ -149,7 +149,6 @@ BuildRequires: rubygem-asciidoctor BuildRequires: asciidoc >= 8.4.1 %endif # endif with asciidoctor -BuildRequires: perl(File::Compare) BuildRequires: xmlto %if %{with linkcheck} BuildRequires: linkchecker @@ -179,7 +178,6 @@ BuildRequires: openssl-devel BuildRequires: pcre2-devel BuildRequires: perl(Error) BuildRequires: perl(lib) -BuildRequires: perl(Test) %if %{use_perl_generators} BuildRequires: perl-generators %endif