pool/git
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 49174 from devel:tools:scm

Browse Source 
Copy from devel:tools:scm/git based on submit request 49174 from user coolo

OBS-URL: https://build.opensuse.org/request/show/49174
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=45
This commit is contained in:
OBS User autobuild 2010-09-27 14:02:12 +00:00 committed by Git OBS Bridge
parent 3dfd548265
commit bb54ee6dfc
15 changed files with 344 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apache2-gitweb.conf
View File

@ -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 Options ExecCGI
AllowOverride None AllowOverride None
AddHandler cgi-script .cgi AddHandler cgi-script .cgi

3
cgit-0.8.3.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:64c834eba1b16088206e4f7d95db83c8824ef3ee74f6a16fe03c80f72cb86709
size 54759

15
cgit-link-fixes.diff Normal file
View File

@ -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

46
cgit.changes Normal file
View File

@ -0,0 +1,46 @@
-------------------------------------------------------------------
Fri Aug 20 17:41:32 CEST 2010 - anschneider@exsuse.de
- fixed more segfaults in cgit.
-------------------------------------------------------------------
Fri Aug 20 16:29:03 CEST 2010 - anschneider@exsuse.de
- fix cgit segfault when using git > 1.7
- update to version 0.8.3.3
- get debuginfo working, don't strip binaries.
-------------------------------------------------------------------
Fri Aug 20 10:02:44 CEST 2010 - tiwai@suse.de
- updated to git 1.7.2.2
-------------------------------------------------------------------
Thu Jul 29 13:52:36 CEST 2010 - tiwai@suse.de
- fix missing link with libpthread
-------------------------------------------------------------------
Thu Jul 29 13:43:28 CEST 2010 - tiwai@suse.de
- updated to git 1.7.2.1: minor fixes for git-instaweb, git-web,
git-config. See release note:
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.2.1.txt
-------------------------------------------------------------------
Thu Jul 22 12:19:02 CEST 2010 - tiwai@suse.de
- updated to git 1.7.2: mostly bug fixes and small enhancements;
see the release note:
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.2.txt
- gitweb stuff is moved to /usr/share/gitweb
-------------------------------------------------------------------
Sun Apr 25 18:29:34 UTC 2010 - poletti.marco@gmail.com
- Build against version 1.7.0.3 of git instead of 1.6.4.3.
-------------------------------------------------------------------
Fri Feb 5 16:37:58 UTC 2010 - poletti.marco@gmail.com
- Initial release, version 0.8.3.1

87
cgit.spec Normal file
View File

@ -0,0 +1,87 @@
#
# spec file for package cgit (Version 0.8.3.3)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
%define git_version 1.7.2.2
Name: cgit
Url: http://hjemli.net/git/cgit/
License: GPLv2
Group: Development/Libraries/C and C++
AutoReqProv: on
Version: 0.8.3.3
Release: 1
Summary: A web frontend for git repositories
Source0: %{name}-%{version}.tar.bz2
Source1: git-%{git_version}.tar.bz2
Source2: cgitrc
Patch0: cgit-link-fixes.diff
Patch1: cgit_fix_stringlist.patch
# Requirements for cgit
BuildRequires: git >= 1.7.1
BuildRequires: gnu-crypto libopenssl-devel libzip-devel
# Requirements for cgitrc man page generation
BuildRequires: asciidoc libxslt
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
This is an attempt to create a fast web interface for the git scm, using a
builtin cache to decrease server io-pressure.
Authors:
--------
Lars Hjemli (hjemli@gmail.com)
%prep
%setup -q
%setup -q -T -D -a 1
rm -rf git
mv git-%{git_version} git
%patch0 -p1
%patch1 -p1
%build
make
make man-doc
%install
make install CGIT_SCRIPT_PATH="%{buildroot}"/srv/www/htdocs/cgit
mkdir -p "%{buildroot}"/srv/www/cgi-bin/cgit/
mv "%{buildroot}"/srv/www/{htdocs,cgi-bin}/cgit/cgit.cgi
mkdir -p "%{buildroot}%{_mandir}"/man5/
cp cgitrc.5 "%{buildroot}%{_mandir}"/man5/cgitrc.5
mkdir -p "%{buildroot}"/etc
cp %{SOURCE2} "%{buildroot}"/etc/cgitrc
%clean
make clean
%files
%defattr(-,root,root)
%dir /srv/www/htdocs/cgit
%dir /srv/www/cgi-bin/cgit
/srv/www/cgi-bin/cgit/cgit.cgi
/srv/www/htdocs/cgit/cgit.css
/srv/www/htdocs/cgit/cgit.png
%doc %{_mandir}/man5/cgitrc.5.gz
%config(noreplace) /etc/cgitrc
%changelog

66
cgit_fix_stringlist.patch Normal file
View File

@ -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;
}

63
cgitrc Normal file
View File

@ -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

10
completion-wordbreaks.diff
View File

@ -1,6 +1,10 @@
--- a/contrib/completion/git-completion.bash~ 2010-06-01 03:09:24.371191000 +0200 ---
+++ b/contrib/completion/git-completion.bash 2010-06-01 03:09:25.180182000 +0200 contrib/completion/git-completion.bash | 10 ++++++----
@@ -54,10 +54,12 @@ 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 # git@vger.kernel.org
# #

3
git-1.7.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bcf008ec9639480a3ebfdc4708743b6c0978a8bd3103a2dda587ea9473b9dde2
size 2475655

3
git-1.7.2.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9ea4936f04f56426e8b643d22caeb9e1d1e5a5b28111fcd3839b6735b3610a66
size 2564964

6
git-nohardlink.diff
View File

@ -6,11 +6,11 @@ hardlinks to symlinks again in an unpredicatable way
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -1667,7 +1667,6 @@ @@ -2081,7 +2081,6 @@
cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \ cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \
{ for p in $(BUILT_INS); do \ for p in $(BUILT_INS); do \
$(RM) "$$execdir/$$p" && \ $(RM) "$$execdir/$$p" && \
- ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \ - ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \ ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
cp "$$execdir/git$X" "$$execdir/$$p" || exit; \ cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
done; } && \ done && \

16
git-python-install-fix.diff
View File

@ -1,10 +1,11 @@
--- ---
Makefile | 2 +-
git_remote_helpers/Makefile | 2 +- git_remote_helpers/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 2 files changed, 2 insertions(+), 2 deletions(-)
--- a/git_remote_helpers/Makefile --- a/git_remote_helpers/Makefile
+++ b/git_remote_helpers/Makefile +++ b/git_remote_helpers/Makefile
@@ -25,7 +25,7 @@ @@ -29,7 +29,7 @@
$(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build $(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build
install: $(pysetupfile) install: $(pysetupfile)
@ -13,3 +14,14 @@
instlibdir: $(pysetupfile) instlibdir: $(pysetupfile)
@echo "$(DESTDIR_SQ)$(prefix)/$(PYLIBDIR)" @echo "$(DESTDIR_SQ)$(prefix)/$(PYLIBDIR)"
--- a/Makefile
+++ b/Makefile
@@ -1700,7 +1700,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@@")|' \

29
git.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Fri Aug 20 09:54:04 CEST 2010 - tiwai@suse.de
- updated to git 1.7.2.2:
This is primarily for fixing a hanging bug in the smart http
transport, but also comes with a lot of documentation udpates.
See release note:
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.2.2.txt
-------------------------------------------------------------------
Thu Jul 29 13:43:28 CEST 2010 - tiwai@suse.de
- updated to git 1.7.2.1: minor fixes for git-instaweb, git-web,
git-config. See release note:
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.2.1.txt
-------------------------------------------------------------------
Thu Jul 22 12:19:02 CEST 2010 - tiwai@suse.de
- updated to git 1.7.2: mostly bug fixes and small enhancements;
see the release note:
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.2.txt
- gitweb stuff is moved to /usr/share/gitweb
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 1 02:56:35 CEST 2010 - pbaudis@suse.cz Tue Jun 1 02:56:35 CEST 2010 - pbaudis@suse.cz
@ -7,6 +31,11 @@ Tue Jun 1 02:56:35 CEST 2010 - pbaudis@suse.cz
- Fix spurious perl-Error provides [bnc#578273] - Fix spurious perl-Error provides [bnc#578273]
- Drop global $COMP_WORDBREAKS change from bash-completion [bnc#446506] - Drop global $COMP_WORDBREAKS change from bash-completion [bnc#446506]
-------------------------------------------------------------------
Tue May 18 20:14:19 UTC 2010 - chris@computersalat.de
- install missing gitweb.js
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 26 08:26:42 CEST 2010 - tiwai@suse.de Mon Apr 26 08:26:42 CEST 2010 - tiwai@suse.de

10
git.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package git (Version 1.7.1) # spec file for package git (Version 1.7.2.2)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -38,7 +38,7 @@ BuildRequires: sgml-skel
BuildRequires: xmlto BuildRequires: xmlto
BuildRequires: python BuildRequires: python
BuildRequires: perl-Error BuildRequires: perl-Error
Version: 1.7.1 Version: 1.7.2.2
Release: 1 Release: 1
Summary: Fast, scalable, distributed revision control system Summary: Fast, scalable, distributed revision control system
License: GPLv2+ License: GPLv2+
@ -288,11 +288,7 @@ cp gitweb/INSTALL INSTALL.gitweb
cp gitweb/README README.gitweb cp gitweb/README README.gitweb
install -d ${RPM_BUILD_ROOT}/usr/share/git-web install -d ${RPM_BUILD_ROOT}/usr/share/git-web
install -d ${RPM_BUILD_ROOT}/etc/apache2/conf.d install -d ${RPM_BUILD_ROOT}/etc/apache2/conf.d
install -m 755 gitweb/gitweb.cgi $RPM_BUILD_ROOT/usr/share/git-web/gitweb.cgi
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/apache2/conf.d/gitweb.conf install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/apache2/conf.d/gitweb.conf
for i in git-favicon.png git-logo.png gitweb.css; do
install -m 644 gitweb/$i $RPM_BUILD_ROOT/usr/share/git-web
done
### git-daemon ### git-daemon
install -d -m 755 $RPM_BUILD_ROOT/etc/init.d install -d -m 755 $RPM_BUILD_ROOT/etc/init.d
install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/init.d/git-daemon install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/init.d/git-daemon
@ -419,7 +415,7 @@ fi
%dir /etc/apache2 %dir /etc/apache2
%dir /etc/apache2/conf.d %dir /etc/apache2/conf.d
%config(noreplace) /etc/apache2/conf.d/gitweb.conf %config(noreplace) /etc/apache2/conf.d/gitweb.conf
/usr/share/git-web /usr/share/gitweb
/etc/apparmor.d /etc/apparmor.d
%files remote-helpers %files remote-helpers

5
usr.share.git-web.gitweb.cgi
View File

@ -1,7 +1,7 @@
# Last Modified: Fri Dec 19 11:03:49 2008 # Last Modified: Fri Dec 19 11:03:49 2008
#include <tunables/global> #include <tunables/global>
/usr/share/git-web/gitweb.cgi { /usr/share/gitweb/gitweb.cgi {
#include <abstractions/base> #include <abstractions/base>
#include <abstractions/bash> #include <abstractions/bash>
#include <abstractions/nameservice> #include <abstractions/nameservice>
@ -18,5 +18,6 @@
/usr/bin/perl ix, /usr/bin/perl ix,
/usr/lib/git/git rix, /usr/lib/git/git rix,
/usr/bin/git-receive-pack rix, /usr/bin/git-receive-pack rix,
/usr/share/git-web/* r, /usr/share/gitweb/* r,
/usr/share/gitweb/static/* r,
} }