From aa965724a5d5c464df6f6b33ee4f10d40b43afb5 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 20 Oct 2007 06:39:10 +0000 Subject: [PATCH 01/12] Initialize branch F-8 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..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From ec58f1a2cb7f21fca0afa75e8241fda8b50f65d6 Mon Sep 17 00:00:00 2001 From: jwboyer Date: Tue, 27 Nov 2007 16:29:35 +0000 Subject: [PATCH 02/12] Update to latest upstream release. Fix a few bugs --- .cvsignore | 2 +- git.spec | 19 ++++++++++++++----- sources | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1725bcd..c6a071e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.3.4.tar.gz +git-1.5.3.6.tar.gz diff --git a/git.spec b/git.spec index 140adb1..772477a 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.3.4 +Version: 1.5.3.6 Release: 1%{?dist} Summary: Git core and tools License: GPLv2 @@ -25,7 +25,7 @@ This is a dummy package which brings in all subpackages. %package core Summary: Core git tools Group: Development/Tools -Requires: zlib >= 1.2, rsync, curl, less, openssh-clients, expat +Requires: zlib >= 1.2, rsync, curl, less, openssh-clients, expat, perl(Error) %description core Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations @@ -52,7 +52,7 @@ Simple web interface to track changes in git repositories %package svn Summary: Git tools for importing Subversion repositories Group: Development/Tools -Requires: git-core = %{version}-%{release}, subversion +Requires: git-core = %{version}-%{release}, subversion, perl(Term::ReadKey) %description svn Git tools for importing Subversion repositories. @@ -73,7 +73,7 @@ Git tools for importing Arch repositories. %package email Summary: Git tools for sending email Group: Development/Tools -Requires: git-core = %{version}-%{release} +Requires: git-core = %{version}-%{release}, perl-Git = %{version}-%{release} %description email Git tools for sending email. @@ -94,7 +94,7 @@ Git revision tree visualiser. %package -n perl-Git Summary: Perl interface to Git Group: Development/Libraries -Requires: git-core = %{version}-%{release} +Requires: git-core = %{version}-%{release}, perl(Error) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) @@ -233,6 +233,15 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Tue Nov 27 2007 Josh Boyer 1.5.3.6-1 +- git-1.5.3.6 +- git-core requires perl(Error) (bug 367861) +- git-svn requires perl(Term:ReadKey) (bug 261361) +- git-email requires perl-Git (bug 333061) + +* Wed Oct 24 2007 Lubomir Kundrak 1.5.3.4-2 +- git-Perl requires Error package + * Tue Oct 09 2007 James Bowes 1.5.3.4-1 - git-1.5.3.4 diff --git a/sources b/sources index 3012073..31bf148 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -863235e36f5e4922c7f7a8459e0f8910 git-1.5.3.4.tar.gz +37126a4eb247b491b29e768fd25bfee8 git-1.5.3.6.tar.gz From bbd02156e71a71079819f4c904f3f9aec7471778 Mon Sep 17 00:00:00 2001 From: jbowes Date: Fri, 21 Dec 2007 15:46:40 +0000 Subject: [PATCH 03/12] Have git metapackage require explicit versions; update to 1.5.3.7 --- git.spec | 18 ++++++++++++++++-- sources | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 772477a..449f843 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.3.6 +Version: 1.5.3.7 Release: 1%{?dist} Summary: Git core and tools License: GPLv2 @@ -13,7 +13,17 @@ Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, perl-Git, emacs-git + +Requires: git-core = %{version}-%{release} +Requires: git-svn = %{version}-%{release} +Requires: git-cvs = %{version}-%{release} +Requires: git-arch = %{version}-%{release} +Requires: git-email = %{version}-%{release} +Requires: gitk = %{version}-%{release} +Requires: git-gui = %{version}-%{release} +Requires: perl-Git = %{version}-%{release} +Requires: emacs-git = %{version}-%{release} + %description Git is a fast, scalable, distributed revision control system with an @@ -233,6 +243,10 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Fri Dec 21 2007 James Bowes 1.5.3.7-1 +- git-1.5.3.7 +- Have git metapackage require explicit versions (bug 247214) + * Tue Nov 27 2007 Josh Boyer 1.5.3.6-1 - git-1.5.3.6 - git-core requires perl(Error) (bug 367861) diff --git a/sources b/sources index 31bf148..2a0b639 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -37126a4eb247b491b29e768fd25bfee8 git-1.5.3.6.tar.gz +1dc83cf9e529abceb4d65ff018da60a2 git-1.5.3.7.tar.gz From 5a8418dc77120ebf9f4fd0b9d42089f452b53c49 Mon Sep 17 00:00:00 2001 From: jbowes Date: Tue, 8 Jan 2008 13:04:58 +0000 Subject: [PATCH 04/12] git 1.5.3.8 --- git.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 449f843..e13dc5e 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.3.7 +Version: 1.5.3.8 Release: 1%{?dist} Summary: Git core and tools License: GPLv2 @@ -243,6 +243,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Tue Jan 08 2008 James Bowes 1.5.3.8-1 +- git-1.5.3.8 + * Fri Dec 21 2007 James Bowes 1.5.3.7-1 - git-1.5.3.7 - Have git metapackage require explicit versions (bug 247214) diff --git a/sources b/sources index 2a0b639..88cf747 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1dc83cf9e529abceb4d65ff018da60a2 git-1.5.3.7.tar.gz +95a79b889cfdb6e33388058f9a188e66 git-1.5.3.8.tar.gz From 2b3541050015c07d34aba21ae7c02ba2a138c9fa Mon Sep 17 00:00:00 2001 From: jbowes Date: Mon, 4 Feb 2008 19:30:37 +0000 Subject: [PATCH 05/12] git 1.5.4 --- git.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index e13dc5e..6dae857 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.3.8 +Version: 1.5.4 Release: 1%{?dist} Summary: Git core and tools License: GPLv2 @@ -11,7 +11,7 @@ Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch -BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs %{!?_without_docs:, xmlto, asciidoc > 6.0.3} +BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: git-core = %{version}-%{release} @@ -243,6 +243,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Mon Feb 04 2008 James Bowes 1.5.4-1 +- git-1.5.4 + * Tue Jan 08 2008 James Bowes 1.5.3.8-1 - git-1.5.3.8 diff --git a/sources b/sources index 88cf747..11a9cc9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -95a79b889cfdb6e33388058f9a188e66 git-1.5.3.8.tar.gz +22725d00bf2006bc9464873b7ae85e28 git-1.5.4.tar.gz From 10b2d13e6165349eaaeffc6634dae8f95de7f16b Mon Sep 17 00:00:00 2001 From: jbowes Date: Mon, 4 Feb 2008 19:54:20 +0000 Subject: [PATCH 06/12] own gitk datadir --- git.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 6dae857..158c2ff 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -213,6 +213,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc Documentation/*gitk*.txt %{_bindir}/*gitk* +%{_datadir}/gitk %{!?_without_docs: %{_mandir}/man1/*gitk*.1*} %{!?_without_docs: %doc Documentation/*gitk*.html } @@ -243,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Mon Feb 04 2008 James Bowes 1.5.4-2 +- Own datadir/gitk + * Mon Feb 04 2008 James Bowes 1.5.4-1 - git-1.5.4 From 480827a3861763e0e89dfe31de997449f5d22a55 Mon Sep 17 00:00:00 2001 From: jbowes Date: Sun, 10 Feb 2008 14:57:57 +0000 Subject: [PATCH 07/12] git 1.5.4.1 --- git.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 158c2ff..38265bf 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.4 -Release: 2%{?dist} +Version: 1.5.4.1 +Release: 1%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -244,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Sun Feb 10 2008 James Bowes 1.5.4.1-1 +- git-1.5.4.1 + * Mon Feb 04 2008 James Bowes 1.5.4-2 - Own datadir/gitk diff --git a/sources b/sources index 11a9cc9..3b6a520 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -22725d00bf2006bc9464873b7ae85e28 git-1.5.4.tar.gz +b9f43605fad1543597ed85dc7c7af86e git-1.5.4.1.tar.gz From 422a86877483f240347d9b86cd04f4ab6d0e7f6e Mon Sep 17 00:00:00 2001 From: jbowes Date: Sun, 24 Feb 2008 13:17:59 +0000 Subject: [PATCH 08/12] git 1.5.4.3 for f8 --- git.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 38265bf..537282f 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.4.1 +Version: 1.5.4.3 Release: 1%{?dist} Summary: Git core and tools License: GPLv2 @@ -244,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Sun Feb 24 2008 James Bowes 1.5.4.3-1 +- git-1.5.4.3 + * Sun Feb 10 2008 James Bowes 1.5.4.1-1 - git-1.5.4.1 diff --git a/sources b/sources index 3b6a520..45cae7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b9f43605fad1543597ed85dc7c7af86e git-1.5.4.1.tar.gz +6311a711eb780b1fbae29e0fd28836bd git-1.5.4.3.tar.gz From fec6b88434e57bf67acb2d9a3caa2a4adcf5bbce Mon Sep 17 00:00:00 2001 From: Bernie Innocenti Date: Tue, 26 Feb 2008 20:47:37 +0000 Subject: [PATCH 09/12] - Do not silently overwrite /etc/httpd/conf.d/git.conf --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 537282f..da5c9a2 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -239,11 +239,14 @@ rm -rf $RPM_BUILD_ROOT %files -n gitweb %defattr(-,root,root) /var/www/git/ -%{_sysconfdir}/httpd/conf.d/git.conf +%config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf %{!?_without_docs: %doc Documentation/*.html Documentation/howto} %{!?_without_docs: %doc Documentation/technical} %changelog +* Sun Feb 26 2008 Bernardo Innocenti 1.5.4.3-2 +- Do not silently overwrite /etc/httpd/conf.d/git.conf + * Sun Feb 24 2008 James Bowes 1.5.4.3-1 - git-1.5.4.3 From c8c024504b6fe86698de5a8efd2a5605426a2e86 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 20 Dec 2008 17:41:16 +0000 Subject: [PATCH 10/12] - Fix local privilege escalation bug in gitweb (http://article.gmane.org/gmane.comp.version-control.git/103624) --- .cvsignore | 2 +- 0001-hotfix-1.5.456.X.txt | 70 +++++++++++++++++++++++++++++++++++++++ git.spec | 8 ++++- 3 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 0001-hotfix-1.5.456.X.txt diff --git a/.cvsignore b/.cvsignore index c6a071e..924d482 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.3.6.tar.gz +git-1.5.4.3.tar.gz diff --git a/0001-hotfix-1.5.456.X.txt b/0001-hotfix-1.5.456.X.txt new file mode 100644 index 0000000..074fdc5 --- /dev/null +++ b/0001-hotfix-1.5.456.X.txt @@ -0,0 +1,70 @@ +>From dfff4b7aa42de7e7d58caeebe2c6128449f09b76 Mon Sep 17 00:00:00 2001 +From: Junio C Hamano +Date: Tue, 16 Dec 2008 19:42:02 -0800 +Subject: [PATCH] gitweb: do not run "git diff" that is Porcelain + +Jakub says that legacy-style URI to view two blob differences are never +generated since 1.4.3. This codepath runs "git diff" Porcelain from the +gitweb, which is a no-no. It can trigger diff.external command that is +specified in the configuration file of the repository being viewed. + +This patch applies to v1.5.4 and later. + +Signed-off-by: Junio C Hamano +--- + gitweb/gitweb.perl | 38 ++------------------------------------ + 1 files changed, 2 insertions(+), 36 deletions(-) + +diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl +index b582332..86a6ced 100755 +--- a/gitweb/gitweb.perl ++++ b/gitweb/gitweb.perl +@@ -4809,43 +4809,9 @@ sub git_blobdiff { + or die_error(undef, "Open git-diff-tree failed"); + } + +- # old/legacy style URI +- if (!%diffinfo && # if new style URI failed +- defined $hash && defined $hash_parent) { +- # fake git-diff-tree raw output +- $diffinfo{'from_mode'} = $diffinfo{'to_mode'} = "blob"; +- $diffinfo{'from_id'} = $hash_parent; +- $diffinfo{'to_id'} = $hash; +- if (defined $file_name) { +- if (defined $file_parent) { +- $diffinfo{'status'} = '2'; +- $diffinfo{'from_file'} = $file_parent; +- $diffinfo{'to_file'} = $file_name; +- } else { # assume not renamed +- $diffinfo{'status'} = '1'; +- $diffinfo{'from_file'} = $file_name; +- $diffinfo{'to_file'} = $file_name; +- } +- } else { # no filename given +- $diffinfo{'status'} = '2'; +- $diffinfo{'from_file'} = $hash_parent; +- $diffinfo{'to_file'} = $hash; +- } +- +- # non-textual hash id's can be cached +- if ($hash =~ m/^[0-9a-fA-F]{40}$/ && +- $hash_parent =~ m/^[0-9a-fA-F]{40}$/) { +- $expires = '+1d'; +- } +- +- # open patch output +- open $fd, "-|", git_cmd(), "diff", @diff_opts, +- '-p', ($format eq 'html' ? "--full-index" : ()), +- $hash_parent, $hash, "--" +- or die_error(undef, "Open git-diff failed"); +- } else { ++ # old/legacy style URI -- not generated anymore since 1.4.3. ++ if (!%diffinfo) { + die_error('404 Not Found', "Missing one of the blob diff parameters") +- unless %diffinfo; + } + + # header +-- +1.6.1.rc3.19.g66a9 + diff --git a/git.spec b/git.spec index da5c9a2..77f10f3 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -11,6 +11,7 @@ Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch +Patch1: 0001-hotfix-1.5.456.X.txt BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -122,6 +123,7 @@ Requires: git-core = %{version}-%{release}, emacs-common %prep %setup -q %patch0 -p1 +%patch1 -p1 %build make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ @@ -244,6 +246,10 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Sat Dec 20 2008 Todd Zullinger 1.5.4.3-3 +- Fix local privilege escalation bug in gitweb + (http://article.gmane.org/gmane.comp.version-control.git/103624) + * Sun Feb 26 2008 Bernardo Innocenti 1.5.4.3-2 - Do not silently overwrite /etc/httpd/conf.d/git.conf From bc4fa00720a3dba1237a1c3f85d878effa13f25a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:56:49 +0000 Subject: [PATCH 11/12] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6c8a637..fbfe8aa 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := git SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 724e691ef3adb265ba0e71178571168cfd29d12b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 15:41:09 +0000 Subject: [PATCH 12/12] 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 fbfe8aa..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: git -# $Id$ -NAME := git -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8