|
[-]
[+]
|
Added |
cgit.changes
|
|
|
|
[-]
[+]
|
Changed |
git.changes
^
|
|
|
|
[-]
[+]
|
Added |
cgit.spec
^
|
|
|
|
[-]
[+]
|
Changed |
git.spec
^
|
|
|
|
[-]
[+]
|
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,
+}
|
