From 3657fffc26c2d2ef44abf840dd7b5f1ee9f99058 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Fri, 16 Sep 2005 18:13:23 +0000 Subject: [PATCH 01/48] 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 c7fa4a750453a585936bbd33ac68362ded7ef60f Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 19 Sep 2005 22:32:09 +0000 Subject: [PATCH 02/48] 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 916e43bdc86fb345abb3ed6bcc15d3fce12c771b Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 22 Sep 2005 19:47:52 +0000 Subject: [PATCH 03/48] 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 069c5c16f55b01611b81c0136a46d0b0ee7a0e01 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 4 Oct 2005 00:12:14 +0000 Subject: [PATCH 04/48] 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 833a267616bf892982bfbeec1777c23a14517ae3 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 4 Oct 2005 20:14:42 +0000 Subject: [PATCH 05/48] 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 385ae7ce47837d0d0fd342c8dfc6ce1d5f977f03 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 11 Oct 2005 01:11:10 +0000 Subject: [PATCH 06/48] 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 4bffebbfcf274b02595160382c24cfeec86d7c59 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Sun, 16 Oct 2005 17:11:15 +0000 Subject: [PATCH 07/48] 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 17949f894d458416011e1cdf633b4d9a7d7ab40c Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Wed, 19 Oct 2005 10:32:36 +0000 Subject: [PATCH 08/48] 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 fae9296aeec8124331d9eafc3005aefaddfc9bc2 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 31 Oct 2005 05:41:27 +0000 Subject: [PATCH 09/48] 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 10/48] 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 b49a322adebcbef9213dea1af985fb679d114ee9 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 10 Jan 2006 23:46:18 +0000 Subject: [PATCH 11/48] 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 9e3183d61409144cf81a324bcfc6620e92ce5374 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Wed, 11 Jan 2006 06:05:47 +0000 Subject: [PATCH 12/48] 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 2b5f3831d25f078f13a6fb033925614a418e20ae Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 16 Jan 2006 05:09:22 +0000 Subject: [PATCH 13/48] 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 85391c40029d927af8f12b26266ca32c9e085630 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 24 Jan 2006 22:47:36 +0000 Subject: [PATCH 14/48] 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 5e46bab10855d4b93bc1b18e63d7caad26cb6617 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Wed, 1 Feb 2006 16:42:29 +0000 Subject: [PATCH 15/48] 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 0bed77d1d7918466af9143780d87d59cac514da9 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 13 Feb 2006 18:30:49 +0000 Subject: [PATCH 16/48] 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 cabf6e8618cdc112f2dc7f24c2afb7738a3b0e5c Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 16 Feb 2006 19:44:06 +0000 Subject: [PATCH 17/48] 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 96b4c796d93ada31a2d029eb82d798c12659825c Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Wed, 22 Feb 2006 00:41:38 +0000 Subject: [PATCH 18/48] 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 d3d50ba09b23e3f94a86db463e3f7af49d167ec4 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 23 Feb 2006 02:31:33 +0000 Subject: [PATCH 19/48] 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 76412beb1bc560e937785f64f69c0eeca6a60397 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 2 Mar 2006 06:50:14 +0000 Subject: [PATCH 20/48] 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 b3d43c2ab041413e7c8918f1ec855f1d572392ea Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Wed, 5 Apr 2006 23:28:25 +0000 Subject: [PATCH 21/48] 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 50ab47ebee82ed1369a896f724c55451c7f9865b Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 10 Apr 2006 16:52:46 +0000 Subject: [PATCH 22/48] 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 23/48] 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 b16bf443c2042bf417a0a4d6242af97c3e17d913 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 20 Apr 2006 00:41:34 +0000 Subject: [PATCH 24/48] 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 d52d123f55973ad98c51bd74f5356822fbfcbe49 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Sat, 29 Apr 2006 01:28:51 +0000 Subject: [PATCH 25/48] 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 d0c0bc6abc2ed42e8d606eaa9881abebd6c6b356 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 4 May 2006 19:48:01 +0000 Subject: [PATCH 26/48] 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 d3f3de17e7499a18e9110b8975dc5da5b15a5736 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 16 May 2006 08:13:29 +0000 Subject: [PATCH 27/48] 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 18aafd4f738c07d63bdd0d850ce95254a72fc324 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 13 Jun 2006 23:26:15 +0000 Subject: [PATCH 28/48] 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 f1e3764cf16968b758d649059a332accae9243cd Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Fri, 7 Jul 2006 06:54:56 +0000 Subject: [PATCH 29/48] 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 4282f061b90e784bf321df9988bdfeabb3db3a2d Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 11 Sep 2006 22:53:46 +0000 Subject: [PATCH 30/48] 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 45bceb8e3a06f1a73e3e8d036b54954819e0efa5 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Fri, 22 Sep 2006 18:14:25 +0000 Subject: [PATCH 31/48] 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 e9a29724028f774930a56b46097b097df608f601 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 5 Oct 2006 05:00:10 +0000 Subject: [PATCH 32/48] 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 c2dafda69fe03270229c3b486800b7ddb43e6440 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Wed, 18 Oct 2006 04:14:35 +0000 Subject: [PATCH 33/48] 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 9c66fe54a1170e81362327c03930ddaa76f84433 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Sun, 10 Dec 2006 22:35:27 +0000 Subject: [PATCH 34/48] 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 35/48] 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 54174e5cf05ee5008e689484a4d8ee1cfdb014f6 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Fri, 8 Jun 2007 19:49:42 +0000 Subject: [PATCH 36/48] 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 d24dae5d65925de5212f5292289c7d32d9df7947 Mon Sep 17 00:00:00 2001 From: jbowes Date: Fri, 22 Jun 2007 17:07:24 +0000 Subject: [PATCH 37/48] 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 38/48] 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 87530d166bcc02333f48d5c58c06f697cdb9083b Mon Sep 17 00:00:00 2001 From: jbowes Date: Mon, 23 Jul 2007 20:29:53 +0000 Subject: [PATCH 39/48] 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 40/48] 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 496180660a7c8480c7faecfbcc3943d393c25961 Mon Sep 17 00:00:00 2001 From: jbowes Date: Fri, 21 Dec 2007 14:49:10 +0000 Subject: [PATCH 41/48] 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 42/48] 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 9fb22aac21243ff9a052199d4e89db97bc00aad3 Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Mon, 7 Jul 2008 20:37:42 +0000 Subject: [PATCH 43/48] 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 b6cb93f5bb04b56b3349489b7bc051e5462fa9af Mon Sep 17 00:00:00 2001 From: jbowes Date: Sat, 20 Dec 2008 18:15:48 +0000 Subject: [PATCH 44/48] 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 e9afada94e68c01923223b8640d165a1711e63de Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 14 Jan 2009 18:58:39 +0000 Subject: [PATCH 45/48] 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 0a4b1682d1d222111c739906a30aaaafeae0073e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 19 Jun 2009 13:35:08 +0000 Subject: [PATCH 46/48] 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 394cf6a48b6c8fd0ae87d158079c779afb81099f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:56:49 +0000 Subject: [PATCH 47/48] 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 5001719f8696f5e1dadf8cb4cd9b8777725da776 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 15:41:18 +0000 Subject: [PATCH 48/48] 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