Changes of Revision 7
[-] | Added | cgit.changes |
x 1
2 +------------------------------------------------------------------- 3 +Thu Sep 30 08:21:27 CEST 2010 - tiwai@suse.de 4 + 5 +- updated to git 1.7.3: 6 + major version update; new options and behavior for git-rebase, 7 + git-clean, git-checkout, git-gui. 8 + See release note: 9 + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.3.txt 10 +- updated to git 1.7.3.1: 11 + fix git-stash breakages 12 +- Set NO_CROSS_DIRECTORY_HARDLINKS=1 to satisfy BS 13 + 14 +------------------------------------------------------------------- 15 +Fri Aug 20 17:41:32 CEST 2010 - anschneider@exsuse.de 16 + 17 +- fixed more segfaults in cgit. 18 + 19 +------------------------------------------------------------------- 20 +Fri Aug 20 16:29:03 CEST 2010 - anschneider@exsuse.de 21 + 22 +- fix cgit segfault when using git > 1.7 23 +- update to version 0.8.3.3 24 +- get debuginfo working, don't strip binaries. 25 + 26 +------------------------------------------------------------------- 27 +Fri Aug 20 10:02:44 CEST 2010 - tiwai@suse.de 28 + 29 +- updated to git 1.7.2.2 30 + 31 +------------------------------------------------------------------- 32 +Thu Jul 29 13:52:36 CEST 2010 - tiwai@suse.de 33 + 34 +- fix missing link with libpthread 35 + 36 +------------------------------------------------------------------- 37 +Thu Jul 29 13:43:28 CEST 2010 - tiwai@suse.de 38 + 39 +- updated to git 1.7.2.1: minor fixes for git-instaweb, git-web, 40 + git-config. See release note: 41 + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.2.1.txt 42 + 43 +------------------------------------------------------------------- 44 +Thu Jul 22 12:19:02 CEST 2010 - tiwai@suse.de 45 + 46 +- updated to git 1.7.2: mostly bug fixes and small enhancements; 47 + see the release note: 48 + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.2.txt 49 +- gitweb stuff is moved to /usr/share/gitweb 50 + 51 +------------------------------------------------------------------- 52 +Sun Apr 25 18:29:34 UTC 2010 - poletti.marco@gmail.com 53 + 54 +- Build against version 1.7.0.3 of git instead of 1.6.4.3. 55 + 56 +------------------------------------------------------------------- 57 +Fri Feb 5 16:37:58 UTC 2010 - poletti.marco@gmail.com 58 + 59 +- Initial release, version 0.8.3.1 60 |
||
[-] | Changed | git.changes ^ |
201 1
2 ------------------------------------------------------------------- 3 +Thu Sep 30 08:21:27 CEST 2010 - tiwai@suse.de 4 + 5 +- updated to git 1.7.3: 6 + major version update; new options and behavior for git-rebase, 7 + git-clean, git-checkout, git-gui. 8 + See release note: 9 + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.3.txt 10 +- updated to git 1.7.3.1: 11 + fix git-stash breakages 12 +- Set NO_CROSS_DIRECTORY_HARDLINKS=1 to satisfy BS 13 + 14 +------------------------------------------------------------------- 15 +Fri Aug 20 09:54:04 CEST 2010 - tiwai@suse.de 16 + 17 +- updated to git 1.7.2.2: 18 + This is primarily for fixing a hanging bug in the smart http 19 + transport, but also comes with a lot of documentation udpates. 20 + See release note: 21 + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.2.2.txt 22 + 23 +------------------------------------------------------------------- 24 +Thu Jul 29 13:43:28 CEST 2010 - tiwai@suse.de 25 + 26 +- updated to git 1.7.2.1: minor fixes for git-instaweb, git-web, 27 + git-config. See release note: 28 + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.2.1.txt 29 + 30 +------------------------------------------------------------------- 31 +Thu Jul 22 12:19:02 CEST 2010 - tiwai@suse.de 32 + 33 +- updated to git 1.7.2: mostly bug fixes and small enhancements; 34 + see the release note: 35 + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.2.txt 36 +- gitweb stuff is moved to /usr/share/gitweb 37 + 38 +------------------------------------------------------------------- 39 +Tue Jun 1 02:56:35 CEST 2010 - pbaudis@suse.cz 40 + 41 +- Fix the git.xinetd to be disabled by default and the --base-path setting 42 + [bnc#495060, bnc#461726] 43 +- Fix missing dependencies of git send-email [bnc#561690] 44 +- Fix spurious perl-Error provides [bnc#578273] 45 +- Drop global $COMP_WORDBREAKS change from bash-completion [bnc#446506] 46 + 47 +------------------------------------------------------------------- 48 +Tue May 18 20:14:19 UTC 2010 - chris@computersalat.de 49 + 50 +- install missing gitweb.js 51 + 52 +------------------------------------------------------------------- 53 +Mon Apr 26 08:26:42 CEST 2010 - tiwai@suse.de 54 + 55 +- updated to git 1.7.1: 56 + including fixes in previous 1.7.0.x releases, a few new behavior 57 + changes; see the release note: 58 + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.1.txt 59 + 60 +------------------------------------------------------------------- 61 +Thu Apr 8 23:21:51 CEST 2010 - dmueller@suse.de 62 + 63 +- require the correct perl-base version 64 + 65 +------------------------------------------------------------------- 66 +Thu Apr 1 13:35:17 CEST 2010 - tiwai@suse.de 67 + 68 +- updated to git 1.7.0.4: minor fixes 69 + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.4.txt 70 + 71 +------------------------------------------------------------------- 72 +Mon Mar 22 17:30:46 CET 2010 - tiwai@suse.de 73 + 74 +- updated to git 1.7.0.3: just minor fixes 75 + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.3.txt 76 + 77 +------------------------------------------------------------------- 78 +Mon Mar 8 08:40:02 CET 2010 - tiwai@suse.de 79 + 80 +- updated to git 1.7.0.2: 81 + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.2.txt 82 + 83 +------------------------------------------------------------------- 84 +Mon Mar 1 12:47:24 CET 2010 - tiwai@suse.de 85 + 86 +- updated to git 1.7.0.1; just a minor update 87 + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.1.txt 88 + 89 +------------------------------------------------------------------- 90 +Thu Feb 25 17:42:15 CET 2010 - tiwai@suse.de 91 + 92 +- don't use %py_requires macro, otherwise it add an implicit 93 + dependency to git.rpm 94 + 95 +------------------------------------------------------------------- 96 +Sat Feb 20 19:16:04 UTC 2010 - jengelh@medozas.de 97 + 98 +- use %_smp_mflags, use %_libexecdir for gitexecdir 99 + 100 +------------------------------------------------------------------- 101 +Wed Feb 17 10:00:42 CET 2010 - tiwai@suse.de 102 + 103 +- fix installation of python stuff 104 + 105 +------------------------------------------------------------------- 106 +Mon Feb 15 09:31:29 CET 2010 - tiwai@suse.de 107 + 108 +- updated to version 1.7.0: Major update 109 + See details in 110 + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.txt 111 + 112 + Notes on behaviour change: 113 + * "git push" into a branch that is currently checked out (i.e. pointed at by 114 + HEAD in a repository that is not bare) is refused by default. 115 + * "git send-email" does not make deep threads by default when sending a 116 + patch series with more than two messages. All messages will be sent 117 + as a reply to the first message, i.e. cover letter. 118 + * "git status" is not "git commit --dry-run" anymore. This change does 119 + not affect you if you run the command without argument. 120 + * "git diff" traditionally treated various "ignore whitespace" options 121 + only as a way to filter the patch output. "git diff --exit-code -b" 122 + exited with non-zero status even if all changes were about changing the 123 + amount of whitespace and nothing else; and "git diff -b" showed the 124 + "diff --git" header line for such a change without patch text. 125 + * External diff and textconv helpers are now executed using the shell. 126 + This makes them consistent with other programs executed by git, and 127 + allows you to pass command-line parameters to the helpers. Any helper 128 + paths containing spaces or other metacharacters now need to be 129 + shell-quoted. The affected helpers are GIT_EXTERNAL_DIFF in the 130 + environment, and diff.*.command and diff.*.textconv in the config 131 + file. 132 + * The --max-pack-size argument to 'git repack', 'git pack-objects', and 133 + 'git fast-import' was assuming the provided size to be expressed in MiB, 134 + unlike the corresponding config variable and other similar options accepting 135 + a size value. It is now expecting a size expressed in bytes, with a possible 136 + unit suffix of 'k', 'm', or 'g'. 137 + 138 +- added git-remote-helpers sub-package for python helpers 139 + 140 +------------------------------------------------------------------- 141 +Thu Jan 21 08:24:01 CET 2010 - tiwai@suse.de 142 + 143 +- updated to version 1.6.6: 144 + * "git fsck" defaults to "git fsck --full" and will take longer 145 + * check "Preparing yourselves for compatibility issues in 1.7.0" 146 + section below for the future update 147 + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.6.txt 148 +- updated to version 1.6.6.1; minor bug fixes 149 + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.6.1.txt 150 + 151 +------------------------------------------------------------------- 152 +Fri Dec 18 17:30:02 CET 2009 - tiwai@suse.de 153 + 154 +- updated to version 1.6.5.7; minor bug fixes 155 + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.6.txt 156 + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.7.txt 157 + 158 +------------------------------------------------------------------- 159 +Tue Dec 8 15:08:16 CET 2009 - tiwai@suse.de 160 + 161 +- updated to version 1.6.5.5; only bug fixes; see release notes 162 + below; 163 + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.4.txt 164 + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.5.txt 165 + 166 +------------------------------------------------------------------- 167 +Tue Nov 17 12:24:57 CET 2009 - tiwai@suse.de 168 + 169 +- updated to version 1.6.5.3; see release notes: 170 + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.txt 171 + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.1.txt 172 + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.2.txt 173 + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.3.txt 174 + 175 +------------------------------------------------------------------- 176 +Fri Oct 23 10:40:40 UTC 2009 - opensuse@sukimashita.com 177 + 178 +- fix build of git-http-push enabling webdav push (bnc#504569) 179 + 180 +------------------------------------------------------------------- 181 +Fri Oct 2 13:02:40 UTC 2009 - lnussel@suse.de 182 + 183 +- fix apparmor profile for gitweb 184 + 185 +------------------------------------------------------------------- 186 +Tue Sep 29 16:38:39 CEST 2009 - tiwai@suse.de 187 + 188 +- remove git-arch from Recommends of git package; it's totally 189 + optional now 190 +- remove tla from Requires of git-arch to avoid dependency errors 191 + 192 +------------------------------------------------------------------- 193 +Mon Aug 31 14:32:04 CEST 2009 - tiwai@suse.de 194 + 195 +- updated to version 1.6.4.2: 196 + * rounding fix for --date=relative output between 1 and 5 years 197 + * regression fix of "git add -p" to handleexec bits changes 198 + * fix "git apply" to honor GNU diff's convention to mark the 199 + creation/deletion event with UNIX epoch timestamp 200 + * fix "git checkout" to removed files correctly with symlinks 201 |
||
[-] | Added | cgit.spec ^ |
89 1
2 +# 3 +# spec file for package cgit (Version 0.8.3.3) 4 +# 5 +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. 6 +# 7 +# All modifications and additions to the file contributed by third parties 8 +# remain the property of their copyright owners, unless otherwise agreed 9 +# upon. The license for this file, and modifications and additions to the 10 +# file, is the same license as for the pristine package itself (unless the 11 +# license for the pristine package is not an Open Source License, in which 12 +# case the license is the MIT License). An "Open Source License" is a 13 +# license that conforms to the Open Source Definition (Version 1.9) 14 +# published by the Open Source Initiative. 15 + 16 +# Please submit bugfixes or comments via http://bugs.opensuse.org/ 17 +# 18 + 19 +# norootforbuild 20 + 21 +%define git_version 1.7.3.1 22 + 23 +Name: cgit 24 +Url: http://hjemli.net/git/cgit/ 25 +License: GPLv2 26 +Group: Development/Libraries/C and C++ 27 +AutoReqProv: on 28 +Version: 0.8.3.3 29 +Release: 2 30 +Summary: A web frontend for git repositories 31 +Source0: %{name}-%{version}.tar.bz2 32 +Source1: git-%{git_version}.tar.bz2 33 +Source2: cgitrc 34 +Patch0: cgit-link-fixes.diff 35 +Patch1: cgit_fix_stringlist.patch 36 +# Requirements for cgit 37 +BuildRequires: git >= 1.7.1 38 +BuildRequires: gnu-crypto libopenssl-devel libzip-devel 39 +# Requirements for cgitrc man page generation 40 +BuildRequires: asciidoc libxslt 41 +BuildRoot: %{_tmppath}/%{name}-%{version}-build 42 + 43 +%description 44 +This is an attempt to create a fast web interface for the git scm, using a 45 +builtin cache to decrease server io-pressure. 46 + 47 +Authors: 48 +-------- 49 + Lars Hjemli (hjemli@gmail.com) 50 + 51 +%prep 52 +%setup -q 53 +%setup -q -T -D -a 1 54 +rm -rf git 55 +mv git-%{git_version} git 56 +%patch0 -p1 57 +%patch1 -p1 58 + 59 +%build 60 +make 61 +make man-doc 62 + 63 +%install 64 +make install CGIT_SCRIPT_PATH="%{buildroot}"/srv/www/htdocs/cgit 65 + 66 +mkdir -p "%{buildroot}"/srv/www/cgi-bin/cgit/ 67 +mv "%{buildroot}"/srv/www/{htdocs,cgi-bin}/cgit/cgit.cgi 68 + 69 +mkdir -p "%{buildroot}%{_mandir}"/man5/ 70 +cp cgitrc.5 "%{buildroot}%{_mandir}"/man5/cgitrc.5 71 + 72 +mkdir -p "%{buildroot}"/etc 73 +cp %{SOURCE2} "%{buildroot}"/etc/cgitrc 74 + 75 +%clean 76 +make clean 77 + 78 +%files 79 +%defattr(-,root,root) 80 +%dir /srv/www/htdocs/cgit 81 +%dir /srv/www/cgi-bin/cgit 82 +/srv/www/cgi-bin/cgit/cgit.cgi 83 +/srv/www/htdocs/cgit/cgit.css 84 +/srv/www/htdocs/cgit/cgit.png 85 +%doc %{_mandir}/man5/cgitrc.5.gz 86 +%config(noreplace) /etc/cgitrc 87 + 88 +%changelog 89 |
||
[-] | Changed | git.spec ^ |
201 1
2 # 3 # spec file for package git (Version 1.7.3.1) 4 # 5 -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. 6 +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. 7 # 8 # All modifications and additions to the file contributed by third parties 9 # remain the property of their copyright owners, unless otherwise agreed 10
11 # Please submit bugfixes or comments via http://bugs.opensuse.org/ 12 # 13 14 -# norootforbuild 15 16 +%define gitexecdir %_libexecdir/git 17 18 Name: git 19 -BuildRequires: asciidoc curl-devel sgml-skel xmlto 20 -%if 0%{?sles_version} > 0 21 -BuildRequires: openssl-devel 22 +%if 0%{?suse_version} < 1030 23 +%define dist_has_fdupes 0 24 %else 25 -BuildRequires: libopenssl-devel 26 +%define dist_has_fdupes 1 27 %endif 28 +BuildRequires: asciidoc 29 +BuildRequires: curl libcurl-devel libexpat-devel 30 +%if %{dist_has_fdupes} 31 +BuildRequires: fdupes 32 +%endif 33 +%if 0%{?suse_version} < 1030 34 +BuildRequires: openssl-devel 35 +%else 36 +BuildRequires: libopenssl-devel 37 +%endif 38 +BuildRequires: sgml-skel 39 +BuildRequires: xmlto 40 +BuildRequires: python 41 +BuildRequires: perl-Error 42 Version: 1.7.3.1 43 -Release: 8 44 +Release: 1 45 Summary: Fast, scalable, distributed revision control system 46 -License: GPL v2 or later 47 +License: GPLv2+ 48 Group: Development/Tools/Version Control 49 -Url: http://git.or.cz 50 +Url: http://git-scm.com 51 Source0: http://kernel.org/pub/software/scm/git/%name-%{version}.tar.bz2 52 Source1: apache2-gitweb.conf 53 Source2: sysconfig.git-daemon 54 Source3: git-daemon.init 55 Source4: git.xinetd 56 +Source5: usr.share.git-web.gitweb.cgi 57 +Patch1: git-nohardlink.diff 58 +Patch2: git-python-install-fix.diff 59 +Patch3: completion-wordbreaks.diff 60 BuildRoot: %{_tmppath}/%{name}-%{version}-build 61 -Requires: git-core = %{version} git-svn = %{version} git-cvs = %{version} 62 -Requires: git-arch = %{version} git-email = %{version} gitk = %{version} 63 +Requires: git-core = %{version} 64 +Recommends: git-svn git-cvs git-email gitk git-gui git-web 65 +Suggests: git-daemon 66 67 %description 68 Git is a fast, scalable, distributed revision control system with an 69
70 Linus Torvalds <torvalds@osdl.org> 71 72 %package core 73 -License: GPL v2 or later 74 +License: GPLv2+ 75 Summary: Core git tools 76 Group: Development/Tools/Version Control 77 -Requires: rsync, less, openssh 78 -Requires: perl-base 79 +Requires: rsync, less, openssh, perl-Error 80 +Requires: perl-base = %{perl_version} 81 82 %description core 83 Git is a fast, scalable, distributed revision control system with an 84
85 Junio C Hamano <junkio@cox.net> 86 87 %package svn 88 -License: GPL v2 or later 89 +License: GPLv2+ 90 Summary: Git tools for importing Subversion repositories 91 Group: Development/Tools/Version Control 92 Requires: git-core = %{version}, subversion 93
94 Junio C Hamano <junkio@cox.net> 95 96 %package cvs 97 -License: GPL v2 or later 98 +License: GPLv2+ 99 Summary: Git tools for importing CVS repositories 100 Group: Development/Tools/Version Control 101 Requires: git-core = %{version}, cvs, cvsps, perl-DBD-SQLite 102
103 Junio C Hamano <junkio@cox.net> 104 105 %package arch 106 -License: GPL v2 or later 107 -Summary: git-arch - Git tools for importing Arch repositories 108 +License: GPLv2+ 109 +Summary: Git tools for importing Arch repositories 110 Group: Development/Tools/Version Control 111 -Requires: git-core = %{version}, tla 112 +Requires: git-core = %{version} 113 +# Requires: tla 114 115 %description arch 116 Tools for importing GNU Arch repositories to the GIT version control 117
118 Junio C Hamano <junkio@cox.net> 119 120 %package email 121 -License: GPL v2 or later 122 +License: GPLv2+ 123 Summary: Git tools for sending email 124 Group: Development/Tools/Version Control 125 Requires: git-core = %{version} 126 +# For sending mails over secure SMTP: 127 +Recommends: perl-Net-SMTP-SSL, perl-Authen-SASL 128 129 %description email 130 Email interface for the GIT version control system. 131
132 Junio C Hamano <junkio@cox.net> 133 134 %package daemon 135 -License: GPL v2 or later 136 -Summary: Fast, scalable, distributed revision control system 137 +License: GPLv2+ 138 +Summary: Simple Server for Git Repositories 139 Group: Development/Tools/Version Control 140 Requires: git-core = %{version} 141 -Provides: git-core:/usr/bin/git-daemon 142 PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq 143 144 %description daemon 145 -Git is a fast, scalable, distributed revision control system with an 146 -unusually rich command set that provides both high-level operations and 147 -full access to internals. 148 - 149 -This package itself only provides the README of git but with the 150 -packages it requires, it brings you a complete Git environment 151 -including GTK and email interfaces and tools for importing source code 152 -repositories from other revision control systems such as subversion, 153 -CVS, and GNU arch. 154 +A really simple TCP git daemon. In the default configuration it allows 155 +read only access to repositories in /srv/git/ that contain the 156 +'git-daemon-export-ok' file. 157 158 159 160
161 Linus Torvalds <torvalds@osdl.org> 162 163 %package -n gitk 164 -License: GPL v2 or later 165 +License: GPLv2+ 166 Summary: Git revision tree visualiser 167 Group: Development/Tools/Version Control 168 Requires: git-core = %{version}, tk >= 8.4 169 +Supplements: packageand(git-core:tk) 170 171 %description -n gitk 172 Grapical tool for visualization of revision trees of projects 173
174 Linus Torvalds <torvalds@osdl.org> 175 Junio C Hamano <junkio@cox.net> 176 177 +%package gui 178 +License: GPLv2+ 179 +Summary: Grapical tool for common git operations 180 +Group: Development/Tools/Version Control 181 +Requires: git-core = %{version}, tk >= 8.4 182 +Supplements: packageand(git-core:tk) 183 + 184 +%description gui 185 +A Tcl/Tk based graphical user interface to Git. git-gui focuses on 186 +allowing users to make changes to their repository by making new 187 +commits, amending existing ones, creating branches, performing local 188 +merges, and fetching/pushing to remote repositories. 189 + 190 +Unlike gitk, git-gui focuses on commit generation and single file 191 +annotation, and does not show project history. It does however supply 192 +menu actions to start a gitk session from within git-gui. 193 + 194 + 195 + 196 +Authors: 197 +-------- 198 + Linus Torvalds <torvalds@osdl.org> 199 + 200 +%package web 201 |
||
[+] | Added | cgit-link-fixes.diff ^ |
@@ -0,0 +1,15 @@ +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/Makefile ++++ b/Makefile +@@ -68,7 +68,7 @@ + $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< + + +-EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto ++EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto -lpthread + OBJECTS = + OBJECTS += cache.o + OBJECTS += cgit.o | ||
[+] | Added | cgit_fix_stringlist.patch ^ |
@@ -0,0 +1,66 @@ +Index: cgit-0.8.3.3/cgit.c +=================================================================== +--- cgit-0.8.3.3.orig/cgit.c ++++ cgit-0.8.3.3/cgit.c +@@ -21,7 +21,7 @@ void add_mimetype(const char *name, cons + { + struct string_list_item *item; + +- item = string_list_insert(xstrdup(name), &ctx.cfg.mimetypes); ++ item = string_list_insert(&ctx.cfg.mimetypes, xstrdup(name)); + item->util = xstrdup(value); + } + +Index: cgit-0.8.3.3/ui-stats.c +=================================================================== +--- cgit-0.8.3.3.orig/ui-stats.c ++++ cgit-0.8.3.3/ui-stats.c +@@ -175,7 +175,7 @@ static void add_commit(struct string_lis + + info = cgit_parse_commit(commit); + tmp = xstrdup(info->author); +- author = string_list_insert(tmp, authors); ++ author = string_list_insert(authors, tmp); + if (!author->util) + author->util = xcalloc(1, sizeof(struct authorstat)); + else +@@ -186,7 +186,7 @@ static void add_commit(struct string_lis + date = gmtime(&t); + period->trunc(date); + tmp = xstrdup(period->pretty(date)); +- item = string_list_insert(tmp, items); ++ item = string_list_insert(items, tmp); + if (item->util) + free(tmp); + item->util++; +@@ -279,7 +279,7 @@ void print_combined_authorrow(struct str + author = &authors->items[i]; + authorstat = author->util; + items = &authorstat->list; +- date = string_list_lookup(tmp, items); ++ date = string_list_lookup(items, tmp); + if (date) + subtotal += (size_t)date->util; + } +@@ -331,7 +331,7 @@ void print_authors(struct string_list *a + for (j = 0; j < period->count; j++) { + tmp = period->pretty(tm); + period->inc(tm); +- date = string_list_lookup(tmp, items); ++ date = string_list_lookup(items, tmp); + if (!date) + html("<td>0</td>"); + else { +Index: cgit-0.8.3.3/ui-plain.c +=================================================================== +--- cgit-0.8.3.3.orig/ui-plain.c ++++ cgit-0.8.3.3/ui-plain.c +@@ -35,7 +35,7 @@ static void print_object(const unsigned + ctx.page.mimetype = NULL; + ext = strrchr(path, '.'); + if (ext && *(++ext)) { +- mime = string_list_lookup(ext, &ctx.cfg.mimetypes); ++ mime = string_list_lookup(&ctx.cfg.mimetypes, ext); + if (mime) + ctx.page.mimetype = (char *)mime->util; + } | ||
[+] | Added | completion-wordbreaks.diff ^ |
@@ -0,0 +1,23 @@ +--- + contrib/completion/git-completion.bash | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +--- a/contrib/completion/git-completion.bash ++++ b/contrib/completion/git-completion.bash +@@ -72,10 +72,12 @@ + # git@vger.kernel.org + # + +-case "$COMP_WORDBREAKS" in +-*:*) : great ;; +-*) COMP_WORDBREAKS="$COMP_WORDBREAKS:" +-esac ++# SUSE-specific: We trust the system is consistent and do not let individual ++# scripts play ping-pong with the global $COMP_WORDBREAKS value. ++#case "$COMP_WORDBREAKS" in ++#*:*) : great ;; ++#*) COMP_WORDBREAKS="$COMP_WORDBREAKS:" ++#esac + + # __gitdir accepts 0 or 1 arguments (i.e., location) + # returns location of .git repo | ||
[+] | Added | git-nohardlink.diff ^ |
@@ -0,0 +1,16 @@ +don't use hardlinks as our .spec calls fdupes which converts the +hardlinks to symlinks again in an unpredicatable way +--- + Makefile | 1 - + 1 file changed, 1 deletion(-) + +--- a/Makefile ++++ b/Makefile +@@ -2133,7 +2133,6 @@ + done && \ + for p in $(BUILT_INS); do \ + $(RM) "$$execdir/$$p" && \ +- ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \ + ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \ + cp "$$execdir/git$X" "$$execdir/$$p" || exit; \ + done && \ | ||
[+] | Added | git-python-install-fix.diff ^ |
@@ -0,0 +1,27 @@ +--- + Makefile | 2 +- + git_remote_helpers/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/git_remote_helpers/Makefile ++++ b/git_remote_helpers/Makefile +@@ -29,7 +29,7 @@ + $(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build + + install: $(pysetupfile) +- $(PYTHON_PATH) $(pysetupfile) install --prefix $(DESTDIR_SQ)$(prefix) ++ $(PYTHON_PATH) $(pysetupfile) install --prefix $(prefix) --root $(DESTDIR_SQ) + + instlibdir: $(pysetupfile) + @echo "$(DESTDIR_SQ)$(prefix)/$(PYLIBDIR)" +--- a/Makefile ++++ b/Makefile +@@ -1718,7 +1718,7 @@ + $(patsubst %.py,%,$(SCRIPT_PYTHON)): % : %.py + $(QUIET_GEN)$(RM) $@ $@+ && \ + INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C git_remote_helpers -s \ +- --no-print-directory prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' \ ++ --no-print-directory prefix='$(prefix_SQ)' DESTDIR=\ + instlibdir` && \ + sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \ + -e 's|\(os\.getenv("GITPYTHONLIB"\)[^)]*)|\1,"@@INSTLIBDIR@@")|' \ | ||
[+] | Changed | apache2-gitweb.conf ^ |
@@ -1,6 +1,6 @@ -Alias /git/ "/usr/share/git-web/" +Alias /git/ "/usr/share/gitweb/" -<Directory "/usr/share/git-web"> +<Directory "/usr/share/gitweb"> Options ExecCGI AllowOverride None AddHandler cgi-script .cgi | ||
Added | cgit-0.8.3.3.tar.bz2 ^ | |
[+] | Added | cgitrc ^ |
@@ -0,0 +1,63 @@ +# Enable caching of up to 1000 output entriess +cache-size=1000 + +# Specify some default clone prefixes +clone-prefix=ssh://domain.com/var/git + +# Specify the css url +css=/git/cgit.css + +# Specify the logo url +logo=/git/cgit.png + +# Show extra links for each repository on the index page +enable-index-links=1 + +# Show number of affected files per commit on the log pages +enable-log-filecount=1 + +# Show number of added/removed lines per commit on the log pages +enable-log-linecount=1 + +# Set the title and heading of the repository index page +root-title=git repositories + +# Allow download of tar.gz, tar.bz2 and zip-files +snapshots=tar.gz tar.bz2 zip + + +## +## List of common mimetypes +## + +mimetype.git=image/git +mimetype.html=text/html +mimetype.jpg=image/jpeg +mimetype.jpeg=image/jpeg +mimetype.pdf=application/pdf +mimetype.png=image/png +mimetype.svg=image/svg+xml + + +## +## List of repositories. +## PS: Any repositories listed when section is unset will not be +## displayed under a section heading +## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos') +## and included like this: +## include=/etc/cgitrepos +## + +# Add your repositories here. +# +# Examples: +# +# repo.url=main +# repo.path=/var/git/main.git +# repo.desc=Main repository +# repo.owner=your.email@domain.com +# +# repo.url=secondary +# repo.path=/var/git/ut.git +# repo.desc=Secondary repository +# repo.owner=another.email@domain.com | ||
[+] | Changed | git-daemon.init ^ |
@@ -32,10 +32,20 @@ # Description: server for git repositories ### END INIT INFO -git_daemon=/usr/bin/git-daemon -test -x $git_daemon || { echo "$git_daemon not installed"; - if [ "$1" = "stop" ]; then exit 0; - else exit 5; fi; } +if test -x /usr/lib64/git/git-daemon; then + git_daemon=/usr/lib64/git/git-daemon +elif test -x /usr/lib/git/git-daemon; then + git_daemon=/usr/lib/git/git-daemon +else + echo "git-daemon not installed" + if [ "$1" = "stop" ]; then + exit 0 + else + exit 5 + fi +fi + +pidfile=/var/run/git-daemon.pid # Check for existence of needed config file and read it git_daemon_config=/etc/sysconfig/git-daemon @@ -56,13 +66,13 @@ case "$1" in start) echo -n "Starting git-daemon " - /sbin/start_daemon "$git_daemon" \ + /sbin/startproc -p $pidfile $git_daemon \ --syslog \ --detach \ --reuseaddr \ --user=git-daemon \ --group=nogroup \ - --pid-file=/var/run/git-daemon.pid \ + --pid-file=$pidfile \ --base-path="$GIT_DAEMON_BASE_PATH" \ $GIT_DAEMON_ARGS @@ -70,7 +80,7 @@ ;; stop) echo -n "Shutting down git-daemon " - /sbin/killproc -TERM $git_daemon + /sbin/killproc -p $pidfile $git_daemon -TERM rc_status -v ;; try-restart|condrestart) @@ -106,11 +116,11 @@ ;; status) echo -n "Checking for service git-daemon " - /sbin/checkproc $git_daemon + /sbin/checkproc -p $pidfile $git_daemon rc_status -v ;; probe) - test $git_daemon_config -nt /var/run/git-daemon.pid && echo reload + test $git_daemon_config -nt $pidfile && echo reload ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" | ||
[+] | Changed | git.xinetd ^ |
@@ -2,13 +2,14 @@ # description: The git server offers access to git repositories service git { + disable = yes socket_type = stream protocol = tcp wait = no user = git-daemon group = nogroup - server = /usr/bin/git-daemon - server_args = --syslog --detach --reuseaddr --user=git-daemon --group=nogroup --pid-file=/var/run/git-daemon.pid --base-path="/srv/git" + server = /usr/bin/git + server_args = daemon --syslog --inetd --base-path=/srv/git type = UNLISTED port = 9418 log_on_failure += USERID | ||
[+] | Added | usr.share.git-web.gitweb.cgi ^ |
@@ -0,0 +1,23 @@ +# Last Modified: Fri Dec 19 11:03:49 2008 +#include <tunables/global> + +/usr/share/gitweb/gitweb.cgi { + #include <abstractions/base> + #include <abstractions/bash> + #include <abstractions/nameservice> + #include <abstractions/perl> + + /bin/bash rix, + /dev/tty rw, + /etc/gitweb.conf r, + /etc/mime.types r, + /proc/meminfo r, + /proc/sys/kernel/ngroups_max r, + /srv/git/ r, + /srv/git/** r, + /usr/bin/perl ix, + /usr/lib/git/git rix, + /usr/bin/git-receive-pack rix, + /usr/share/gitweb/* r, + /usr/share/gitweb/static/* r, +} |