From 1e793114ad1e40023d22254b8e96937b7bf0d9bf Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 04:35:09 +0000 Subject: [PATCH 01/10] Initialize branch F-10 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..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From a1507f67f2ba2fb12ff00b552be7dc375b1c8113 Mon Sep 17 00:00:00 2001 From: jwboyer Date: Fri, 14 Nov 2008 13:54:35 +0000 Subject: [PATCH 02/10] - git-1.6.0.4 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 99abeff..38b8d8f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.0.3.tar.bz2 +git-1.6.0.4.tar.bz2 diff --git a/git.spec b/git.spec index 43cdbc7..839b452 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.0.3 +Version: 1.6.0.4 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -260,6 +260,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Fri Nov 14 2008 Josh Boyer 1.6.0.4-1 +- git-1.6.0.4 + * Wed Oct 22 2008 Josh Boyer 1.6.0.3-1 - git-1.6.0.3 - Drop curl requirement in favor of libcurl (bug 449388) diff --git a/sources b/sources index f2fb1e9..6391dc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7178b0b0eaaa07538149bb231902796 git-1.6.0.3.tar.bz2 +ed8c4fa007a44d51b646865c35461ce8 git-1.6.0.4.tar.bz2 From 85f06c6bf83b57443bb7438fb8bd9d7195670b67 Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Mon, 17 Nov 2008 19:34:35 +0000 Subject: [PATCH 03/10] switch to /var/lib/git-daemon from /srv/git rh bug #443707 --- git.spec | 7 +++++-- git.xinetd | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 839b452..eb9a2f6 100644 --- a/git.spec +++ b/git.spec @@ -171,7 +171,7 @@ find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' %else rm -rf $RPM_BUILD_ROOT%{_mandir} %endif -mkdir -p $RPM_BUILD_ROOT/srv/git +mkdir -p $RPM_BUILD_ROOT/var/lib/git-daemon mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d install -m 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git @@ -248,7 +248,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_bindir}/git-daemon %config(noreplace)%{_sysconfdir}/xinetd.d/git -/srv/git +/var/lib/git-daemon %files -n gitweb %defattr(-,root,root) @@ -260,6 +260,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Mon Nov 17 2008 Seth Vidal +- switch from /srv/git to /var/lib/git-daemon for packaging rules compliance + * Fri Nov 14 2008 Josh Boyer 1.6.0.4-1 - git-1.6.0.4 diff --git a/git.xinetd b/git.xinetd index dcfae91..e8ecfda 100644 --- a/git.xinetd +++ b/git.xinetd @@ -9,7 +9,7 @@ service git wait = no user = nobody server = /usr/bin/git-daemon - server_args = --base-path=/srv/git --export-all --user-path=public_git --syslog --inetd --verbose + server_args = --base-path=/var/lib/git-daemon --export-all --user-path=public_git --syslog --inetd --verbose log_on_failure += USERID # xinetd doesn't do this by default. bug #195265 flags = IPv6 From 6462d36f25fa5fb89dfe6485927808b81dea7f29 Mon Sep 17 00:00:00 2001 From: jwboyer Date: Thu, 11 Dec 2008 16:27:10 +0000 Subject: [PATCH 04/10] - git-1.6.0.5 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 38b8d8f..69ce87c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.0.4.tar.bz2 +git-1.6.0.5.tar.bz2 diff --git a/git.spec b/git.spec index eb9a2f6..e741afa 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.0.4 +Version: 1.6.0.5 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -260,6 +260,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Thu Dec 11 2008 Josh Boyer 1.6.0.5-1 +- git-1.6.0.5 + * Mon Nov 17 2008 Seth Vidal - switch from /srv/git to /var/lib/git-daemon for packaging rules compliance diff --git a/sources b/sources index 6391dc7..69eade4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ed8c4fa007a44d51b646865c35461ce8 git-1.6.0.4.tar.bz2 +899172ebeac65f7a09a8e204d4f87d8c git-1.6.0.5.tar.bz2 From acc6a81084339ebb9a87d7ea1b035bd86ebbf166 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 20 Dec 2008 17:39:13 +0000 Subject: [PATCH 05/10] - git-1.6.0.6 - Fixes a local privilege escalation bug in gitweb (http://article.gmane.org/gmane.comp.version-control.git/103624) - Add gitk Requires to git-gui (bug 476308) --- .cvsignore | 2 +- git.spec | 9 ++++++++- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 69ce87c..3db4196 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.0.5.tar.bz2 +git-1.6.0.6.tar.bz2 diff --git a/git.spec b/git.spec index e741afa..040d620 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.0.5 +Version: 1.6.0.6 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -98,6 +98,7 @@ Git tools for sending email. Summary: Git GUI tool Group: Development/Tools Requires: git = %{version}-%{release}, tk >= 8.4 +Requires: gitk = %{version}-%{release} %description gui Git GUI tool. @@ -260,6 +261,12 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sat Dec 20 2008 Todd Zullinger 1.6.0.6-1 +- git-1.6.0.6 +- Fixes a local privilege escalation bug in gitweb + (http://article.gmane.org/gmane.comp.version-control.git/103624) +- Add gitk Requires to git-gui (bug 476308) + * Thu Dec 11 2008 Josh Boyer 1.6.0.5-1 - git-1.6.0.5 diff --git a/sources b/sources index 69eade4..383d999 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -899172ebeac65f7a09a8e204d4f87d8c git-1.6.0.5.tar.bz2 +b5be9b34b441cb57f92086bfaf59f255 git-1.6.0.6.tar.bz2 From da369ac35553e49e6c6b828c960aa05c5cf29142 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 2 Mar 2009 16:00:05 +0000 Subject: [PATCH 06/10] - Enable parallel delta searching when packing objects (Roland McGrath) - Consolidate build/install options in %make_git (Roland McGrath) - Require perl(Authen::SASL) in git-email (bug 483062) - Exclude vc-git.el from emacs-git (bug 479531) - Update URL field --- git.spec | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/git.spec b/git.spec index 040d620..99f3cf7 100644 --- a/git.spec +++ b/git.spec @@ -1,11 +1,11 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.6.0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools -URL: http://kernel.org/pub/software/scm/git/ +URL: http://git-scm.com/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2 Source1: git-init.el Source2: git.xinetd @@ -90,7 +90,7 @@ Git tools for importing Arch repositories. Summary: Git tools for sending email Group: Development/Tools Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} -Requires: perl(Net::SMTP::SSL) +Requires: perl(Net::SMTP::SSL), perl(Authen::SASL) %description email Git tools for sending email. @@ -131,20 +131,24 @@ Requires: git = %{version}-%{release}, emacs-common %setup -q %patch0 -p1 +# Use these same options for every invocation of 'make'. +# Otherwise it will rebuild in %%install due to flags changes. +%define make_git \ +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \\\ + ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\ + DESTDIR=$RPM_BUILD_ROOT \\\ + INSTALLDIRS=vendor \\\ + THREADED_DELTA_SEARCH=YesPlease \\\ + gitexecdir=%{_bindir} \\\ + prefix=%{_prefix} + %build -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ - ETC_GITCONFIG=/etc/gitconfig \ - gitexecdir=%{_bindir} \ - prefix=%{_prefix} all %{!?_without_docs: doc} +%{make_git} all %{!?_without_docs: doc} make -C contrib/emacs %install rm -rf $RPM_BUILD_ROOT -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \ - prefix=%{_prefix} mandir=%{_mandir} \ - ETC_GITCONFIG=/etc/gitconfig \ - gitexecdir=%{_bindir} \ - INSTALLDIRS=vendor install %{!?_without_docs: install-doc} +%{make_git} install %{!?_without_docs: install-doc} make -C contrib/emacs install \ emacsdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp for elc in $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/*.elc ; do @@ -242,6 +246,7 @@ rm -rf $RPM_BUILD_ROOT %files -n emacs-git %defattr(-,root,root) +%exclude %{_datadir}/emacs/site-lisp/vc-git.el* %{_datadir}/emacs/site-lisp/*git*.el* %{_datadir}/emacs/site-lisp/site-start.d/git-init.el @@ -261,6 +266,13 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Mon Mar 02 2009 Todd Zullinger - 1.6.0.6-2 +- Enable parallel delta searching when packing objects (Roland McGrath) +- Consolidate build/install options in %%make_git (Roland McGrath) +- Require perl(Authen::SASL) in git-email (bug 483062) +- Exclude vc-git.el from emacs-git (bug 479531) +- Update URL field + * Sat Dec 20 2008 Todd Zullinger 1.6.0.6-1 - git-1.6.0.6 - Fixes a local privilege escalation bug in gitweb From c93b2c080259695b43875eed11b83e00b5aa693e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 2 Mar 2009 18:54:11 +0000 Subject: [PATCH 07/10] Change /var/lib/git-daemon to %{_var}/lib/git Include docs in the git-daemon package Drop redundant libcurl Requires --- git.spec | 18 ++++++++++++------ git.xinetd | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index 99f3cf7..f9330a7 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.6.0.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -15,7 +15,7 @@ BuildRequires: zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, ema BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl-Git = %{version}-%{release} -Requires: zlib >= 1.2, rsync, libcurl, less, openssh-clients, expat, perl(Error) +Requires: zlib >= 1.2, rsync, less, openssh-clients, expat, perl(Error) Provides: git-core = %{version}-%{release} Obsoletes: git-core <= 1.5.4.3 @@ -172,11 +172,11 @@ find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' (find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citooli|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files (find $RPM_BUILD_ROOT%{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 "archimport|svn|git-cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %else rm -rf $RPM_BUILD_ROOT%{_mandir} %endif -mkdir -p $RPM_BUILD_ROOT/var/lib/git-daemon +mkdir -p $RPM_BUILD_ROOT%{_var}/lib/git mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d install -m 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git @@ -252,9 +252,12 @@ rm -rf $RPM_BUILD_ROOT %files daemon %defattr(-,root,root) +%doc Documentation/*daemon*.txt %{_bindir}/git-daemon %config(noreplace)%{_sysconfdir}/xinetd.d/git -/var/lib/git-daemon +%{_var}/lib/git +%{!?_without_docs: %{_mandir}/man1/*daemon*.1*} +%{!?_without_docs: %doc Documentation/*daemon*.html} %files -n gitweb %defattr(-,root,root) @@ -266,11 +269,14 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog -* Mon Mar 02 2009 Todd Zullinger - 1.6.0.6-2 +* Mon Mar 02 2009 Todd Zullinger - 1.6.0.6-3 - Enable parallel delta searching when packing objects (Roland McGrath) - Consolidate build/install options in %%make_git (Roland McGrath) - Require perl(Authen::SASL) in git-email (bug 483062) - Exclude vc-git.el from emacs-git (bug 479531) +- Change /var/lib/git-daemon to %{_var}/lib/git +- Include docs in the git-daemon package +- Drop redundant libcurl Requires - Update URL field * Sat Dec 20 2008 Todd Zullinger 1.6.0.6-1 diff --git a/git.xinetd b/git.xinetd index e8ecfda..1ab3cc0 100644 --- a/git.xinetd +++ b/git.xinetd @@ -9,7 +9,7 @@ service git wait = no user = nobody server = /usr/bin/git-daemon - server_args = --base-path=/var/lib/git-daemon --export-all --user-path=public_git --syslog --inetd --verbose + server_args = --base-path=/var/lib/git --export-all --user-path=public_git --syslog --inetd --verbose log_on_failure += USERID # xinetd doesn't do this by default. bug #195265 flags = IPv6 From 5a19a13d04c8c6b1c905a76879a106045646aab6 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 19 Jun 2009 13:15:41 +0000 Subject: [PATCH 08/10] Fix git-daemon hang on invalid input (CVE-2009-2108, bug 505761) - Ignore Branches output from cvsps-2.2b1 (bug 490602) - Escape newline in git-daemon xinetd description (bug 502393) --- git-1.6.0.6-daemon-extra-args.patch | 114 ++++++++++++++++++ ...t-Ignore-cvsps-2.2b1-Branches-output.patch | 26 ++++ git.spec | 12 +- git.xinetd | 2 +- 4 files changed, 152 insertions(+), 2 deletions(-) create mode 100644 git-1.6.0.6-daemon-extra-args.patch create mode 100644 git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch diff --git a/git-1.6.0.6-daemon-extra-args.patch b/git-1.6.0.6-daemon-extra-args.patch new file mode 100644 index 0000000..f07fa27 --- /dev/null +++ b/git-1.6.0.6-daemon-extra-args.patch @@ -0,0 +1,114 @@ +From ccf9fce9da3cda9ee869c70a048971c7f231a78a 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 dd96f8e..c7a9f6d 100644 +--- a/connect.c ++++ b/connect.c +@@ -573,7 +573,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 8dcde73..325766e 100644 +--- a/daemon.c ++++ b/daemon.c +@@ -432,16 +432,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; +@@ -461,6 +460,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"); + } + } + +@@ -580,7 +581,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-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch b/git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch new file mode 100644 index 0000000..37a22dd --- /dev/null +++ b/git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch @@ -0,0 +1,26 @@ +From 09891c65a5f7409ce0bd37daced0ff31fbb1b1c9 Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Mon, 23 Mar 2009 00:03:36 -0400 +Subject: [PATCH] git-cvsimport: Ignore cvsps-2.2b1 Branches: output + +Signed-off-by: Todd Zullinger +--- + git-cvsimport.perl | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/git-cvsimport.perl b/git-cvsimport.perl +index e439202..d020f1a 100755 +--- a/git-cvsimport.perl ++++ b/git-cvsimport.perl +@@ -952,7 +952,7 @@ while () { + } elsif (/^-+$/) { # end of unknown-line processing + $state = 1; + } elsif ($state != 11) { # ignore stuff when skipping +- print STDERR "* UNKNOWN LINE * $_\n"; ++ print STDERR "* UNKNOWN LINE * $_\n" unless /^Branches: /; + } + } + commit() if $branch and $state != 11; +-- +1.6.2.2 + diff --git a/git.spec b/git.spec index f9330a7..4c85e94 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.6.0.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -11,6 +11,9 @@ Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch +Patch1: git-1.6.0.6-daemon-extra-args.patch +# https://bugzilla.redhat.com/490602 +Patch2: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -130,6 +133,8 @@ Requires: git = %{version}-%{release}, emacs-common %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -269,6 +274,11 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Fri Jun 19 2009 Todd Zullinger - 1.6.0.6-4 +- Fix git-daemon hang on invalid input (CVE-2009-2108, bug 505761) +- Ignore Branches output from cvsps-2.2b1 (bug 490602) +- Escape newline in git-daemon xinetd description (bug 502393) + * Mon Mar 02 2009 Todd Zullinger - 1.6.0.6-3 - Enable parallel delta searching when packing objects (Roland McGrath) - Consolidate build/install options in %%make_git (Roland McGrath) diff --git a/git.xinetd b/git.xinetd index 1ab3cc0..be6193f 100644 --- a/git.xinetd +++ b/git.xinetd @@ -1,5 +1,5 @@ # default: off -# description: The git dæmon allows git repositories to be exported using +# description: The git dæmon allows git repositories to be exported using \ # the git:// protocol. service git From 96e164ec781aae335f309696e28b54467d441fb8 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:56:49 +0000 Subject: [PATCH 09/10] 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 04e1ce5f42729b618e92c8d61b538bcd67db9ed2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 15:41:27 +0000 Subject: [PATCH 10/10] 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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10