jengelh/cgit
SHA256
1
0
Fork 0
forked from pool/cgit
Code Pull Requests Activity

Accepting request 87800 from devel:tools:scm

Browse Source 
NOTE: this SR is intended to move cgit from git (as of now cgit.spec is
      incldued in git package src).  cgit will be no longer linked repo.

- split from OBS git repo to an individual repo (since cgit-0.9
  doesn't build with git-1.7.7)
- merged fixes in git repo back to cgit repo
- updated to git 1.7.6.4
- updated to cgit 0.9.0.2

OBS-URL: https://build.opensuse.org/request/show/87800
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cgit?expand=0&rev=3
This commit is contained in:
Stephan Kulow 2011-10-18 11:39:58 +00:00 committed by Git OBS Bridge
parent a26d2df9ee
commit 1b9f409eb4
21 changed files with 196 additions and 1716 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apache2-gitweb.conf
View File

@ -1,10 +0,0 @@
Alias /git/ "/usr/share/gitweb/"
<Directory "/usr/share/gitweb">
Options ExecCGI
AllowOverride None
AddHandler cgi-script .cgi
DirectoryIndex gitweb.cgi
Order allow,deny
Allow from all
</Directory>

3
cgit-0.8.3.3.tar.bz2
View File

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

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

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

35
cgit-CVE-2011-2711-fix.diff Normal file
View File

@ -0,0 +1,35 @@
From bebe89d7c11a92bf206bf6e528c51ffa8ecbc0d5 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <cgit@cryptocrack.de>
Date: Fri, 22 Jul 2011 11:47:19 +0000
Subject: Fix potential XSS vulnerability in rename hint
The file name displayed in the rename hint should be escaped to avoid
XSS. Note that this vulnerability is only applicable when an attacker
has gained push access to the repository.
Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
---
ui-diff.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -97,10 +97,12 @@
htmlf("</td><td class='%s'>", class);
cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
ctx.qry.sha2, info->new_path, 0);
- if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
- htmlf(" (%s from %s)",
- info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
- info->old_path);
+ if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) {
+ htmlf(" (%s from ",
+ info->status == DIFF_STATUS_COPIED ? "copied" : "renamed");
+ html_txt(info->old_path);
+ html(")");
+ }
html("</td><td class='right'>");
if (info->binary) {
htmlf("bin</td><td class='graph'>%ld -> %ld bytes",

71
cgit-git-1.7.6_build_fix.patch Normal file
View File

@ -0,0 +1,71 @@
---
shared.c | 11 ++++++-----
ui-stats.c | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
Index: cgit-0.9.0.2/shared.c
===================================================================
--- cgit-0.9.0.2.orig/shared.c 2011-07-21 16:24:10.000000000 +0200
+++ cgit-0.9.0.2/shared.c 2011-08-04 01:20:42.695017536 +0200
@@ -303,7 +303,7 @@ void cgit_diff_tree(const unsigned char
filepair_fn fn, const char *prefix, int ignorews)
{
struct diff_options opt;
- int prefixlen;
+ struct pathspec_item pitem;
diff_setup(&opt);
opt.output_format = DIFF_FORMAT_CALLBACK;
@@ -315,10 +315,11 @@ void cgit_diff_tree(const unsigned char
opt.format_callback = cgit_diff_tree_cb;
opt.format_callback_data = fn;
if (prefix) {
- opt.nr_paths = 1;
- opt.paths = &prefix;
- prefixlen = strlen(prefix);
- opt.pathlens = &prefixlen;
+ opt.pathspec.nr = 1;
+ opt.pathspec.raw = &prefix;
+ pitem.match = prefix;
+ pitem.len = strlen(prefix);
+ opt.pathspec.items = &pitem;
}
diff_setup_done(&opt);
Index: cgit-0.9.0.2/ui-stats.c
===================================================================
--- cgit-0.9.0.2.orig/ui-stats.c 2011-07-21 16:24:10.000000000 +0200
+++ cgit-0.9.0.2/ui-stats.c 2011-08-04 01:20:42.695017536 +0200
@@ -239,7 +239,7 @@ struct string_list collect_stats(struct
init_revisions(&rev, NULL);
rev.abbrev = DEFAULT_ABBREV;
rev.commit_format = CMIT_FMT_DEFAULT;
- rev.no_merges = 1;
+ rev.max_parents = 1;
rev.verbose_header = 1;
rev.show_root_diff = 0;
setup_revisions(argc, argv, &rev, NULL);
Index: cgit-0.9.0.2/ui-tree.c
===================================================================
--- cgit-0.9.0.2.orig/ui-tree.c 2011-07-21 16:24:10.000000000 +0200
+++ cgit-0.9.0.2/ui-tree.c 2011-08-04 01:20:58.632061214 +0200
@@ -206,6 +206,8 @@ static void ls_tail()
static void ls_tree(const unsigned char *sha1, char *path)
{
+ const char *paths[] = { path, NULL };
+ struct pathspec pathspec;
struct tree *tree;
tree = parse_tree_indirect(sha1);
@@ -216,7 +218,9 @@ static void ls_tree(const unsigned char
}
ls_head();
- read_tree_recursive(tree, "", 0, 1, NULL, ls_item, NULL);
+ init_pathspec(&pathspec, paths);
+ read_tree_recursive(tree, "", 0, 1, &pathspec, ls_item, NULL);
+ free_pathspec(&pathspec);
ls_tail();
}

15
cgit-link-fixes.diff
View File

@ -1,15 +0,0 @@
---
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

14
cgit-optflags.diff Normal file
View File

@ -0,0 +1,14 @@
---
Makefile | 1 +
1 file changed, 1 insertion(+)
--- a/Makefile
+++ b/Makefile
@@ -134,6 +134,7 @@
CFLAGS += -g -Wall -Igit
+CFLAGS += $(RPM_OPT_FLAGS)
CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'

51
cgit.changes
View File

@ -1,3 +1,54 @@
-------------------------------------------------------------------
Fri Oct 14 10:13:03 CEST 2011 - tiwai@suse.de
- split from OBS git repo to an individual repo (since cgit-0.9
doesn't build with git-1.7.7)
- merged fixes in git repo back to cgit repo
- updated to git 1.7.6.4
-------------------------------------------------------------------
Wed Aug 3 21:35:48 UTC 2011 - asn@cryptomilk.org
- updated to cgit 0.9.0.2
- fixed potential XSS vulnerability in rename hint
- fixed a segfault with git 1.7.6
-------------------------------------------------------------------
Mon Jun 27 18:22:11 CEST 2011 - tiwai@suse.de
- updated to git 1.7.6: see git changelog for more details
-------------------------------------------------------------------
Mon Jun 6 16:03:34 CEST 2011 - tiwai@suse.de
- updated to git 1.7.5.4: see git changelog for more details
-------------------------------------------------------------------
Mon Jun 6 12:24:02 CEST 2011 - tiwai@suse.de
- Fix incompatibilies with git 1.7.5.x to build cgit again
-------------------------------------------------------------------
Wed Jun 1 12:41:12 UTC 2011 - mmarek@novell.com
- Do not buildrequire git, the package builds it's own git and the
buildrequires line only makes backporting harder.
-------------------------------------------------------------------
Fri May 27 11:54:43 CEST 2011 - tiwai@suse.de
- updated git 1.7.5.3:
See git changelog for more details
-------------------------------------------------------------------
Mon Mar 28 18:26:17 CEST 2011 - tiwai@suse.de
- updated to git 1.7.4.2:
documentation updates, small bug fixes;
see included Documentation/RelNotes/1.7.4.2.txt
- updated to cgit 0.9:
major updates; using git-1.7.4.x
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 17 17:51:32 CET 2010 - tiwai@suse.de Fri Dec 17 17:51:32 CET 2010 - tiwai@suse.de

38
cgit.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package cgit (Version 0.8.3.3) # spec file for package cgit
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,23 +17,23 @@
# norootforbuild # norootforbuild
%define git_version 1.7.3.4 %define git_version 1.7.6.4
Name: cgit Name: cgit
Url: http://hjemli.net/git/cgit/ Url: http://hjemli.net/git/cgit/
License: GPLv2 License: GPLv2
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
AutoReqProv: on AutoReqProv: on
Version: 0.8.3.3 Version: 0.9.0.2
Release: 4 Release: 7
Summary: A web frontend for git repositories Summary: A web frontend for git repositories
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
Source1: git-%{git_version}.tar.bz2 Source1: git-%{git_version}.tar.gz
Source2: cgitrc Source2: cgitrc
Patch0: cgit-link-fixes.diff Patch: cgit-optflags.diff
Patch1: cgit_fix_stringlist.patch Patch1: cgit-git-1.7.6_build_fix.patch
Patch2: cgit-CVE-2011-2711-fix.diff
# Requirements for cgit # Requirements for cgit
BuildRequires: git >= 1.7.1
BuildRequires: gnu-crypto libopenssl-devel libzip-devel BuildRequires: gnu-crypto libopenssl-devel libzip-devel
# Requirements for cgitrc man page generation # Requirements for cgitrc man page generation
BuildRequires: asciidoc libxslt BuildRequires: asciidoc libxslt
@ -50,38 +50,38 @@ Authors:
%prep %prep
%setup -q %setup -q
%setup -q -T -D -a 1 %setup -q -T -D -a 1
%patch -p1
%patch1 -p1
%patch2 -p1
rm -rf git rm -rf git
mv git-%{git_version} git mv git-%{git_version} git
%patch0 -p1
%patch1 -p1
%build %build
make make V=1
make man-doc
%install %install
make install CGIT_SCRIPT_PATH="%{buildroot}"/srv/www/htdocs/cgit make install DESTDIR="%{buildroot}" CGIT_SCRIPT_PATH=/srv/www/htdocs/cgit
make install-man DESTDIR="%{buildroot}"
mkdir -p "%{buildroot}"/srv/www/cgi-bin/cgit/ mkdir -p "%{buildroot}"/srv/www/cgi-bin/cgit/
mv "%{buildroot}"/srv/www/{htdocs,cgi-bin}/cgit/cgit.cgi 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 mkdir -p "%{buildroot}"/etc
cp %{SOURCE2} "%{buildroot}"/etc/cgitrc cp %{SOURCE2} "%{buildroot}"/etc/cgitrc
%clean %clean
make clean rm -rf %{buildroot}
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc README COPYING
%doc %{_mandir}/man5/cgitrc.5.gz
%dir /srv/www/htdocs/cgit %dir /srv/www/htdocs/cgit
%dir /srv/www/cgi-bin/cgit %dir /srv/www/cgi-bin/cgit
/srv/www/cgi-bin/cgit/cgit.cgi /srv/www/cgi-bin/cgit/cgit.cgi
/srv/www/htdocs/cgit/cgit.css /srv/www/htdocs/cgit/cgit.css
/srv/www/htdocs/cgit/cgit.png /srv/www/htdocs/cgit/cgit.png
%doc %{_mandir}/man5/cgitrc.5.gz /usr/lib/cgit
%config(noreplace) /etc/cgitrc %config(noreplace) /etc/cgitrc
%changelog %changelog

66
cgit_fix_stringlist.patch
View File

@ -1,66 +0,0 @@
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;
}

23
completion-wordbreaks.diff
View File

@ -1,23 +0,0 @@
---
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

3
git-1.7.3.4.tar.bz2
View File

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

3
git-1.7.6.4.tar.gz Normal file
View File

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

130
git-daemon.init
View File

@ -1,130 +0,0 @@
#!/bin/sh
#
# SUSE system startup script for git-daemon
# Copyright (C) 1995-2008 SUSE / Novell Inc.
#
# This library is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or (at
# your option) any later version.
#
# This library is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
# USA.
#
# /etc/init.d/git-daemon
# and its symbolic link
# /usr/sbin/rcgit-daemon
#
### BEGIN INIT INFO
# Provides: git-daemon
# Required-Start: $syslog $remote_fs $network
# Required-Stop: $syslog $remote_fs
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Short-Description: server for git repositories
# Description: server for git repositories
### END INIT INFO
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
test -r $git_daemon_config || { echo "$git_daemon_config not existing";
if [ "$1" = "stop" ]; then exit 0;
else exit 6; fi; }
# Read config
. $git_daemon_config
: ${GIT_DAEMON_BASE_PATH:=/srv/git}
. /etc/rc.status
# Reset status of this service
rc_reset
case "$1" in
start)
echo -n "Starting git-daemon "
/sbin/startproc -p $pidfile $git_daemon \
--syslog \
--detach \
--reuseaddr \
--user=git-daemon \
--group=nogroup \
--pid-file=$pidfile \
--base-path="$GIT_DAEMON_BASE_PATH" \
$GIT_DAEMON_ARGS
rc_status -v
;;
stop)
echo -n "Shutting down git-daemon "
/sbin/killproc -p $pidfile $git_daemon -TERM
rc_status -v
;;
try-restart|condrestart)
if test "$1" = "condrestart"; then
echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}"
fi
$0 status
if test $? = 0; then
$0 restart
else
rc_reset # Not running is not a failure.
fi
rc_status
;;
restart)
## Stop the service and regardless of whether it was
## running or not, start it again.
$0 stop
$0 start
# Remember status and be quiet
rc_status
;;
force-reload)
$0 try-restart
rc_status
;;
reload)
echo -n "Reload service git-daemon "
## does not support reload
rc_failed 3
rc_status -v
;;
status)
echo -n "Checking for service git-daemon "
/sbin/checkproc -p $pidfile $git_daemon
rc_status -v
;;
probe)
test $git_daemon_config -nt $pidfile && echo reload
;;
*)
echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}"
exit 1
;;
esac
rc_exit

16
git-nohardlink.diff
View File

@ -1,16 +0,0 @@
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 && \

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

@ -1,27 +0,0 @@
---
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@@")|' \

903
git.changes
View File

@ -1,903 +0,0 @@
-------------------------------------------------------------------
Fri Dec 17 17:51:32 CET 2010 - tiwai@suse.de
- updated to git 1.7.3.3:
In addition to the usual fixes, this release also includes
support for the new "add.ignoreErrors" name given to the
existing "add.ignore-errors" configuration variable.
- updated to git 1.7.3.4:
Among many fixes since v1.7.3.3, it contains a fix to a recently
discovered XSS vulnerability in Gitweb (CVE 2010-3906)
-------------------------------------------------------------------
Mon Dec 13 09:01:59 UTC 2010 - coolo@novell.com
- fix file list for perl module on factory
-------------------------------------------------------------------
Wed Dec 1 23:45:44 CET 2010 - dmueller@suse.de
- update to git 1.7.3.2:
This is primarily to push out many documentation fixes
accumulated since the 1.7.3.1 release.
-------------------------------------------------------------------
Thu Sep 30 08:21:27 CEST 2010 - tiwai@suse.de
- updated to git 1.7.3:
major version update; new options and behavior for git-rebase,
git-clean, git-checkout, git-gui.
See release note:
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.3.txt
- updated to git 1.7.3.1:
fix git-stash breakages
- Set NO_CROSS_DIRECTORY_HARDLINKS=1 to satisfy BS
-------------------------------------------------------------------
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
- Fix the git.xinetd to be disabled by default and the --base-path setting
[bnc#495060, bnc#461726]
- Fix missing dependencies of git send-email [bnc#561690]
- Fix spurious perl-Error provides [bnc#578273]
- 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
- updated to git 1.7.1:
including fixes in previous 1.7.0.x releases, a few new behavior
changes; see the release note:
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.1.txt
-------------------------------------------------------------------
Thu Apr 8 23:21:51 CEST 2010 - dmueller@suse.de
- require the correct perl-base version
-------------------------------------------------------------------
Thu Apr 1 13:35:17 CEST 2010 - tiwai@suse.de
- updated to git 1.7.0.4: minor fixes
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.4.txt
-------------------------------------------------------------------
Mon Mar 22 17:30:46 CET 2010 - tiwai@suse.de
- updated to git 1.7.0.3: just minor fixes
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.3.txt
-------------------------------------------------------------------
Mon Mar 8 08:40:02 CET 2010 - tiwai@suse.de
- updated to git 1.7.0.2:
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.2.txt
-------------------------------------------------------------------
Mon Mar 1 12:47:24 CET 2010 - tiwai@suse.de
- updated to git 1.7.0.1; just a minor update
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.1.txt
-------------------------------------------------------------------
Thu Feb 25 17:42:15 CET 2010 - tiwai@suse.de
- don't use %py_requires macro, otherwise it add an implicit
dependency to git.rpm
-------------------------------------------------------------------
Sat Feb 20 19:16:04 UTC 2010 - jengelh@medozas.de
- use %_smp_mflags, use %_libexecdir for gitexecdir
-------------------------------------------------------------------
Wed Feb 17 10:00:42 CET 2010 - tiwai@suse.de
- fix installation of python stuff
-------------------------------------------------------------------
Mon Feb 15 09:31:29 CET 2010 - tiwai@suse.de
- updated to version 1.7.0: Major update
See details in
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.txt
Notes on behaviour change:
* "git push" into a branch that is currently checked out (i.e. pointed at by
HEAD in a repository that is not bare) is refused by default.
* "git send-email" does not make deep threads by default when sending a
patch series with more than two messages. All messages will be sent
as a reply to the first message, i.e. cover letter.
* "git status" is not "git commit --dry-run" anymore. This change does
not affect you if you run the command without argument.
* "git diff" traditionally treated various "ignore whitespace" options
only as a way to filter the patch output. "git diff --exit-code -b"
exited with non-zero status even if all changes were about changing the
amount of whitespace and nothing else; and "git diff -b" showed the
"diff --git" header line for such a change without patch text.
* External diff and textconv helpers are now executed using the shell.
This makes them consistent with other programs executed by git, and
allows you to pass command-line parameters to the helpers. Any helper
paths containing spaces or other metacharacters now need to be
shell-quoted. The affected helpers are GIT_EXTERNAL_DIFF in the
environment, and diff.*.command and diff.*.textconv in the config
file.
* The --max-pack-size argument to 'git repack', 'git pack-objects', and
'git fast-import' was assuming the provided size to be expressed in MiB,
unlike the corresponding config variable and other similar options accepting
a size value. It is now expecting a size expressed in bytes, with a possible
unit suffix of 'k', 'm', or 'g'.
- added git-remote-helpers sub-package for python helpers
-------------------------------------------------------------------
Thu Jan 21 08:24:01 CET 2010 - tiwai@suse.de
- updated to version 1.6.6:
* "git fsck" defaults to "git fsck --full" and will take longer
* check "Preparing yourselves for compatibility issues in 1.7.0"
section below for the future update
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.6.txt
- updated to version 1.6.6.1; minor bug fixes
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.6.1.txt
-------------------------------------------------------------------
Fri Dec 18 17:30:02 CET 2009 - tiwai@suse.de
- updated to version 1.6.5.7; minor bug fixes
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.6.txt
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.7.txt
-------------------------------------------------------------------
Tue Dec 8 15:08:16 CET 2009 - tiwai@suse.de
- updated to version 1.6.5.5; only bug fixes; see release notes
below;
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.4.txt
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.5.txt
-------------------------------------------------------------------
Tue Nov 17 12:24:57 CET 2009 - tiwai@suse.de
- updated to version 1.6.5.3; see release notes:
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.txt
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.1.txt
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.2.txt
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.3.txt
-------------------------------------------------------------------
Fri Oct 23 10:40:40 UTC 2009 - opensuse@sukimashita.com
- fix build of git-http-push enabling webdav push (bnc#504569)
-------------------------------------------------------------------
Fri Oct 2 13:02:40 UTC 2009 - lnussel@suse.de
- fix apparmor profile for gitweb
-------------------------------------------------------------------
Tue Sep 29 16:38:39 CEST 2009 - tiwai@suse.de
- remove git-arch from Recommends of git package; it's totally
optional now
- remove tla from Requires of git-arch to avoid dependency errors
-------------------------------------------------------------------
Mon Aug 31 14:32:04 CEST 2009 - tiwai@suse.de
- updated to version 1.6.4.2:
* rounding fix for --date=relative output between 1 and 5 years
* regression fix of "git add -p" to handleexec bits changes
* fix "git apply" to honor GNU diff's convention to mark the
creation/deletion event with UNIX epoch timestamp
* fix "git checkout" to removed files correctly with symlinks
* make "git clean -d -f" safer for separate git repos
* fix bugs in "git fetch/push" over http transports
* fix "git format-patch --cover-letter" with non-ASCII strings
* See details in
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.4.2.txt
-------------------------------------------------------------------
Mon Aug 24 14:34:08 CEST 2009 - tiwai@suse.de
- updated to version 1.6.4:
git push into the currently checked-out branch will be refused
by default.
See details in
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.4.txt
- updated to version 1.6.4.1:
Bug fix release. See details in
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.4.1.txt
-------------------------------------------------------------------
Mon Jun 22 13:08:41 CEST 2009 - tiwai@suse.de
- updated to 1.6.3.3:
* fix "git daemon" to correctly parse the initial line
* fix "git diff --textconv" memory leak
* improved the built-in regular expressions
* fix import-tars script (in contrib) to import symbolic links
* fix http.c to use correct CURLOPT_SSLKEY
* fix low-level filelevel merge driver
* fix "git rebase -i" left stray closing parenthesis in reflog
* fix "git remote show" to show all the URLs associated with named
remotes
* fix "whitespace" attribute handling
-------------------------------------------------------------------
Fri Jun 5 10:10:25 CEST 2009 - tiwai@suse.de
- updated to 1.6.3.1:
* fix regression of "git checkout -b new-branch"
- updated to 1.6.3.2:
* fixes for gcc4.4 builds and others. See below for details
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.3.2.txt
-------------------------------------------------------------------
Fri May 8 11:37:26 CEST 2009 - tiwai@suse.de
- updated to 1.6.3:
* major version update: git push behavior change,
With the next major release, "git push" into a branch that is
currently checked out will be refused by default. You can
choose what should happen upon such a push by setting the
configuration
* Detailed changelog found at
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.3.txt
-------------------------------------------------------------------
Mon Apr 20 12:44:42 CEST 2009 - tiwai@suse.de
- updated to 1.6.2.4:
* The configuration parser had a buffer overflow while parsing
an overlong value.
* pruning reflog entries that are unreachable from the tip of
the ref during "git reflog prune" (hence "git gc") was very
inefficient.
* "git-add -p" lacked a way to say "q"uit to refuse staging any
hunks for the remaining paths. You had to say "d" and then ^C.
* "git-checkout <tree-ish> <submodule>" did not update the index
entry at the named path; it now does.
* "git-fast-export" choked when seeing a tag that does not point
at commit.
* "git init" segfaulted when given an overlong template location
via the --template= option.
* "git-ls-tree" and "git-diff-tree" used a pathspec correctly
when deciding to descend into a subdirectory but they did not
match the individual paths correctly. This caused pathspecs
"abc/d ab" to match "abc/0" ("abc/d" made them decide to
descend into the directory "abc/", and then "ab" incorrectly
matched "abc/0" when it shouldn't).
* "git-merge-recursive" was broken when a submodule entry was
involved in a criss-cross merge situation.
-------------------------------------------------------------------
Thu Apr 16 11:02:04 CEST 2009 - tiwai@suse.de
- updated to 1.6.2.2:
* A longstanding confusing description of what --pickaxe option
of git-diff does has been clarified in the documentation.
* "git-blame -S" did not quite work near the commits that were
given on the command line correctly.
* "git diff --pickaxe-regexp" did not count overlapping matches
correctly.
* "git diff" did not feed files in work-tree representation to
external diff and textconv.
* "git-fetch" in a repository that was not cloned from anywhere
said it cannot find 'origin', which was hard to understand for
new people.
* "git-format-patch --numbered-files --stdout" did not have to
die of incompatible options; it now simply ignores
--numbered-files as no files are produced anyway.
* "git-ls-files --deleted" did not work well with GIT_DIR&GIT_WORK_TREE.
* "git-read-tree A B C..." without -m option has been broken for
a long time.
* git-send-email ignored --in-reply-to when --no-thread was given.
* 'git-submodule add' did not tolerate extra slashes and ./ in
the path it accepted from the command line; it now is more lenient.
* git-svn misbehaved when the project contained a path that began
with two dashes.
* import-zips script (in contrib) did not compute the common
directory prefix correctly.
* miscompilation of negated enum constants by old gcc (2.9)
affected the codepaths to spawn subprocesses.
- updated to 1.6.2.3:
* Setting an octal mode value to core.sharedrepository
configuration to restrict access to the repository to group
members did not work as advertised.
* A fairly large and trivial memory leak while rev-list shows
list of reachable objects has been identified and plugged.
* "git-commit --interactive" did not abort when underlying
"git-add -i" signaled a failure.
* git-repack (invoked from git-gc) did not work as nicely as it
should in a repository that borrows objects from neighbours
via alternates mechanism especially when some packs are marked
with the ".keep" flag to prevent them from being repacked.
- fix the start-check in git-daemon script (bnc#494824)
-------------------------------------------------------------------
Mon Mar 16 09:50:24 CET 2009 - tiwai@suse.de
- updated to 1.6.2.1:
* .gitignore learned to handle backslash as a quoting mechanism
for comment introduction character "#".
* timestamp output in --date=relative mode used to display
timestamps that are long time ago in the default mode
* git-add -i/-p now works with non-ASCII pathnames.
* "git hash-object -w" did not read from the configuration file
from the correct .git directory.
* git-send-email learned to correctly handle multiple Cc:
addresses.
-------------------------------------------------------------------
Thu Mar 5 12:24:45 CET 2009 - tiwai@suse.de
- updated to 1.6.2:
* @{-1} is a way to refer to the last branch you were on.
* The location of .mailmap file can be configured
* Improvements on "git add -p"
* Improvements on "git am" behavior and options
* "git blame" aligns author names better
* "git clone" now makes its best effort when cloning from an
empty repository
* "git checkout -" is a shorthand for "git checkout @{-1}".
* "git cherry" defaults to whatever the current branch is
tracking (if exists) when the <upstream> argument is not given.
* "git cvsserver" fixes / improvements
* New options for "git diff"
* New options for "git filter-branch"
* "git fsck" now checks loose objects in alternate object
stores
* "git gc --prune" was resurrected to allow "git gc --no-prune"
* New option for "git mergetool"
* "git rebase -i" can transplant a history down to root
* "git reset --merge" option
* "git submodule update" learned --no-fetch option.
* "git tag" learned --contains
For more details, see
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.2.txt
-------------------------------------------------------------------
Mon Feb 9 08:27:53 CET 2009 - tiwai@suse.de
- updated to 1.6.1.3:
* "git diff --binary | git apply" pipeline did not work well
when a binary blob is changed to a symbolic link.
* some combinations of -b/-w/--ignore-space-at-eol to "git diff"
did not work as expected.
* "git grep" did not pass the -I (ignore binary) option when
calling out an external grep program.
* "git log" and friends include HEAD to the set of starting
points when --all is given. This makes a difference when you
are not on any branch.
* "git mv" to move an untracked file to overwrite a tracked
contents misbehaved.
* "git merge -s octopus" with many potential merge bases did not
work correctly.
* RPM binary package installed the html manpages in a wrong
place.
Also includes minor documentation fixes and updates.
-------------------------------------------------------------------
Thu Jan 29 13:24:33 CET 2009 - schwab@suse.de
- Formatting fix for manual pages.
-------------------------------------------------------------------
Thu Jan 29 11:53:19 CET 2009 - tiwai@suse.de
- updated to 1.6.1.2:
* The logic for rename detectin in internal diff used by commands
like "git diff" and "git blame" have been optimized to avoid
loading the same blob repeatedly.
* We did not allow writing out a blob that is larger than 2GB
for no good reason.
* "git format-patch -o $dir", when $dir is a relative directory,
used it as relative to the root of the work tree, not relative
to the current directory.
* v1.6.1 introduced an optimization for "git push" into a
repository (A) that borrows its objects from another
repository (B) to avoid sending objects that are available in
repository B, when they are not yet used by repository A.
However the code on the "git push" sender side was buggy and
did not work when repository B had new objects that are not
known by the sender. This caused pushing into a "forked"
repository served by v1.6.1 software using "git push" from
v1.6.1 sometimes did not work. The bug was purely on the
"git push" sender side, and has been corrected.
* "git status -v" did not paint its diff output in colour even
when color.ui configuration was set.
* "git ls-tree" learned --full-tree option to help Porcelain
scripts that want to always see the full path regardless of the
current working directory.
* "git grep" incorrectly searched in work tree paths even when
they are marked as assume-unchanged. It now searches in the
index entries.
* "git gc" with no grace period needlessly ejected packed but
unreachable objects in their loose form, only to delete them
right away.
-------------------------------------------------------------------
Mon Jan 26 12:21:15 CET 2009 - tiwai@suse.de
- updated to 1.6.1.1:
* "git add frotz/nitfol" when "frotz" is a submodule should have
errored out, but it didn't.
* "git apply" took file modes from the patch text and updated
the mode bits of the target tree even when the patch was not
about mode changes.
* "git bisect view" on Cygwin did not launch gitk
* "git checkout $tree" did not trigger an error.
* "git commit" tried to remove COMMIT_EDITMSG from the work tree
by mistake.
* "git describe --all" complained when a commit is described
with a tag, which was nonsense.
* "git diff --no-index --" did not trigger no-index (aka "use
git-diff as a replacement of diff on untracked files") behaviour.
* "git format-patch -1 HEAD" on a root commit failed to produce
patch text.
* "git fsck branch" did not work as advertised; instead it
behaved the same way as "git fsck".
* "git log --pretty=format:%s" did not handle a multi-line
subject the same way as built-in log listers (i.e. shortlog,
--pretty=oneline, etc.)
* "git daemon", and "git merge-file" are more careful when freopen
fails and barf, instead of going on and writing to unopened
filehandle.
* "git http-push" did not like some RFC 4918 compliant DAV server
responses.
* "git merge -s recursive" mistakenly overwritten an untracked
file in the work tree upon delete/modify conflict.
* "git merge -s recursive" didn't leave the index unmerged for
entries with rename/delete conflictd.
* "git merge -s recursive" clobbered untracked files in the work
tree.
* "git mv -k" with more than one errorneous paths misbehaved.
* "git read-tree -m -u" hence branch switching incorrectly lost
a subdirectory in rare cases.
* "git rebase -i" issued an unnecessary error message upon a user
error of marking the first commit to be "squash"ed.
* "git shortlog" did not format a commit message with multi-line
subject correctly.
-------------------------------------------------------------------
Thu Jan 8 15:55:42 CET 2009 - tiwai@suse.de
- updated to 1.6.1:
* handle properly the exit code when pager is used
* various git-gui updates including translations
* gitweb updates
* many other improvements / fixes. See release notes
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.1.txt
-------------------------------------------------------------------
Fri Dec 19 14:04:40 CET 2008 - lnussel@suse.de
- add apparmor profile for git-web
- don't use %jobs for generating docu
- change gitexecdir to /usr/lib instead of %_libdir
-------------------------------------------------------------------
Wed Dec 17 09:35:17 CET 2008 - tiwai@suse.de
- Fix VUL-0 Possible gitweb vulnerability: calling "git diff"
[bnc#459664]
-------------------------------------------------------------------
Thu Dec 11 01:57:33 CET 2008 - pbaudis@suse.cz
- Fix the git.xinetd daemon call [bnc#450508]
-------------------------------------------------------------------
Wed Nov 19 08:54:41 CET 2008 - tiwai@suse.de
- install git-shell and git-cvsserver as in the upstream
(bnc#446049)
-------------------------------------------------------------------
Tue Nov 4 08:45:59 CET 2008 - olh@suse.de
- use fdupes only if the distribution provides it
- use libopenssl-devel only if the distribution provides it
-------------------------------------------------------------------
Fri Oct 24 15:03:52 CEST 2008 - tiwai@suse.de
- fix git.xinetd not to run the old git-daemon (bnc#438715)
-------------------------------------------------------------------
Mon Oct 6 15:53:47 CEST 2008 - tiwai@suse.de
- fix git-daemon init script to start (bnc#432610)
-------------------------------------------------------------------
Fri Sep 26 17:17:12 CEST 2008 - schwab@suse.de
- Fix manual pages.
-------------------------------------------------------------------
Thu Sep 25 16:08:40 CEST 2008 - tiwai@suse.de
- updated to 1.6.0.2:
Mostly small bug fixes, see details in
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.0.2.txt
-------------------------------------------------------------------
Thu Sep 25 16:04:22 CEST 2008 - tiwai@suse.de
- fix file selections of git-core package
- use symlinks for git sub-commands instead of hardlinks to make
build system happy
-------------------------------------------------------------------
Tue Sep 9 12:18:09 CEST 2008 - tiwai@suse.de
- updated to 1.6.0:
* http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.0.txt
- updated to 1.6.0.1:
* http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.0.1.txt
- install git subcommands now to libdir/git
users have to set up properly if they want to keep the old style
(refer git --execpath)
-------------------------------------------------------------------
Tue Sep 9 11:38:39 CEST 2008 - lnussel@suse.de
- split off gui and web subpackages
-------------------------------------------------------------------
Mon Aug 18 11:42:39 CEST 2008 - schwab@suse.de
- Fix name of completions file.
-------------------------------------------------------------------
Tue Aug 12 13:59:54 CEST 2008 - tiwai@suse.de
- updated to 1.5.6.5:
* http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.6.5.txt
* http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.6.4.txt
* http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.6.3.txt
* http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.6.2.txt
* http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.6.1.txt
-------------------------------------------------------------------
Wed Aug 6 11:50:51 CEST 2008 - anosek@suse.cz
- fixed Add git xinetd.d file for ability to use yast2 (bnc#398361)
- created file git.xinetd to run git under xinetd daemon
-------------------------------------------------------------------
Wed Jun 25 00:03:23 CEST 2008 - dmueller@suse.de
- update to 1.5.6:
* http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.6.txt
-------------------------------------------------------------------
Mon Jun 16 16:43:50 CEST 2008 - lnussel@suse.de
- use separate package for git-daemon (bnc#382710)
- add user and install init script for git-daemon
-------------------------------------------------------------------
Tue May 20 15:18:40 CEST 2008 - lnussel@suse.de
- install gitweb icons, style sheet and README (bnc#359882)
- build using V=1 so use of cflags can be verified by brp scripts
- fix build using --without docs
-------------------------------------------------------------------
Mon Apr 7 16:40:38 CEST 2008 - dmueller@suse.de
- update to 1.5.4.5:
* http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.4.5.txt
-------------------------------------------------------------------
Tue Mar 18 14:42:06 CET 2008 - dmueller@suse.de
- update to 1.5.4.4:
* git svnimport was removed in favor of git svn
* git runstatus has been removed
* changes are available under
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.4.txt
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.4.1.txt
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.4.2.txt
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.4.3.txt
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.4.4.txt
-------------------------------------------------------------------
Mon Jan 28 14:21:27 CET 2008 - mmarek@suse.de
- added libopenssl-devel to BuildRequires to fix build
-------------------------------------------------------------------
Wed Jan 9 00:42:47 CET 2008 - schwab@suse.de
- Update to version 1.5.3.8.
* Some documentation used "email.com" as an example domain.
* git-svn fix to handle funky branch and project names going over
http/https correctly.
* git-svn fix to tone down a needlessly alarming warning message.
* git-clone did not correctly report errors while fetching over http.
* git-send-email added redundant Message-Id: header to the outgoing
e-mail when the patch text already had one.
* a read-beyond-end-of-buffer bug in configuration file updater was fixed.
* git-grep used to show the same hit repeatedly for unmerged paths.
* After amending the patch title in "git-am -i", the command did not
report the patch it applied with the updated title.
-------------------------------------------------------------------
Tue Jan 8 10:12:16 CET 2008 - crrodriguez@suse.de
- git-cvsserver was unusable, it produced a perl failed-compilation error
due to missing dependency on perl-DBD-Sqlite.
- update to version 1.5.3.7
* git-send-email added 8-bit contents to the payload without
marking it as 8-bit in a CTE header.
* "git-bundle create a.bndl HEAD" dereferenced the symref and
did not record the ref as 'HEAD'; this prevented a bundle
from being used as a normal source of git-clone.
* The code to reject nonsense command line of the form
"git-commit -a paths..." and "git-commit --interactive
paths..." were broken.
* Adding a signature that is not ASCII-only to an original
commit that is ASCII-only would make the result non-ASCII.
"git-format-patch -s" did not mark such a message correctly
with MIME encoding header.
* git-add sometimes did not mark the resulting index entry
stat-clean. This affected only cases when adding the
contents with the same length as the previously staged
contents, and the previous staging made the index entry
"racily clean".
* git-commit did not honor GIT_INDEX_FILE the user had in the
environment.
* When checking out a revision, git-checkout did not report where the
updated HEAD is if you happened to have a file called HEAD in the
work tree.
* "git-rev-list --objects" mishandled a tree that points at a
submodule.
* "git cvsimport" was not ready for packed refs that "git gc" can
produce and gave incorrect results.
* Many scripted Porcelains were confused when you happened to have a
file called "HEAD" in your work tree.
-------------------------------------------------------------------
Wed Nov 28 09:12:23 CET 2007 - dmueller@suse.de
- update to 1.5.3.6:
* various smaller bugfixes
- remove requires on release (#305826)
- install bash completion (#336848)
-------------------------------------------------------------------
Tue Oct 9 18:50:30 CEST 2007 - dmueller@suse.de
- update to 1.5.3.4:
* submodule support
* many new features and bugfixes
-------------------------------------------------------------------
Mon Aug 6 23:00:14 CEST 2007 - dmueller@suse.de
- update to 1.5.2.4:
* "git checkout" failed to switch back and forth between
branches, one of which has "frotz -> xyzzy" symlink and
file "xyzzy/filfre", while the other one has a file
"frotz/filfre".
* "git prune" used to segfault upon seeing a commit that is
referred to by a tree object (aka "subproject").
* "git diff --name-status --no-index" mishandled an added file.
* "git apply --reverse --whitespace=warn" still complained
about whitespaces that a forward application would have
introduced.
-------------------------------------------------------------------
Thu Jul 5 02:35:22 CEST 2007 - dmueller@suse.de
- Update to 1.5.2.3:
* fix many segfaults with the SVN gateway
* various bugfixes
-------------------------------------------------------------------
Fri May 18 00:34:20 CEST 2007 - dmueller@suse.de
- Update to 1.5.1.4:
* GIT <-> SVN gateway
* New porcelain, much improved index handling
* git-config
* Bare repositories refuse commands that need a working tree
* packed ref support
* 3-way merges can be done without rcs
* python dependency dropped
-------------------------------------------------------------------
Sat Nov 18 04:46:49 CET 2006 - pbaudis@suse.cz
- Fix build failure from previous change (trivial omission)
-------------------------------------------------------------------
Fri Nov 17 20:56:22 CET 2006 - pbaudis@suse.cz
- Fix git-arch package containing git-archive and git-upload-archive
[#222074]
-------------------------------------------------------------------
Fri Nov 17 05:24:23 CET 2006 - pbaudis@suse.cz
- Upgrade to git-1.4.3.4 - only few bugfixes, most importantly
git-apply wouldn't apply creation/deletion patches
-------------------------------------------------------------------
Tue Nov 7 01:04:24 CET 2006 - ro@suse.de
- fix permissions for manpages
-------------------------------------------------------------------
Sat Oct 28 22:15:26 CEST 2006 - meissner@suse.de
- use RPM_OPT_FLAGS also in %install make
-------------------------------------------------------------------
Thu Oct 26 14:56:47 CEST 2006 - pbaudis@suse.cz
- Upgrade to git-1.4.3.3 - bugfixes release
-------------------------------------------------------------------
Thu Oct 19 02:14:05 CEST 2006 - pbaudis@suse.cz
- Update to git-1.4.3 - UI improvements, speedups, random new
features (e.g. git-daemon name-based virtual hosting support),
basic Git.pm
- Fixes build failures due to asciidoc incompatibilities
-------------------------------------------------------------------
Tue Jul 25 08:43:27 CEST 2006 - pbaudis@suse.cz
- Update to git-1.4.1.1 - includes gitweb, many bugfixes, some
commands are converted from shell to C, aliasing support,
documentation improvements and so on.
- Junio's patch got applied upstream.
- Pre-create /srv/git for bare Git repositories hosting.
- Install gitweb to /srv/www/cgi-bin pre-configured to look
for packages at /srv/git.
-------------------------------------------------------------------
Mon May 15 01:04:34 CEST 2006 - pbaudis@suse.cz
- Update to git-core-1.3.1 - git-cvsserver pserver interface,
.git/refs/remotes branches support, blame/annotate tools,
builtin diff, faster and better rename detection and number
of other stuff.
- Add Junio's patch for saner handling of symlink refs. This is
an important bugfix since without this, it is impossible to
bisect behind kernel linux-v2.6.15-g117a93d.
- Olaf Hering's cutnpaste patch got applied upstream.
-------------------------------------------------------------------
Mon Mar 13 02:28:07 CET 2006 - ro@suse.de
- change requires from "openssh-clients" to "openssh"
(former does not exist)
-------------------------------------------------------------------
Fri Mar 10 01:54:28 CET 2006 - pbaudis@suse.cz
- Add Olaf Hering's patch for easier cut'n'pasting.
-------------------------------------------------------------------
Tue Mar 7 23:08:46 CET 2006 - pbaudis@suse.cz
- Update to git-core 1.2.4.
- This is a security fix: there was a buffer overflow when checking
out a tree with an insanely long symlink. (No Bugzilla id.)
-------------------------------------------------------------------
Wed Jan 25 21:36:11 CET 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
-------------------------------------------------------------------
Tue Jan 17 21:50:49 CET 2006 - pbaudis@suse.cz
- Fix the specfile build (no expat and asciidoc, xmlto problems)
-------------------------------------------------------------------
Mon Jan 16 23:14:38 CET 2006 - pbaudis@suse.cz
- Update to git-core 1.1.3.
- Modify the specfile so that it looks more like the stock one.
- Split bits to subpackages
-------------------------------------------------------------------
Sun Dec 4 14:28:09 CET 2005 - schwab@suse.de
- Fix embedded paths.
-------------------------------------------------------------------
Wed Oct 5 23:35:21 CEST 2005 - schwab@suse.de
- Don't build documentation in parallel.
-------------------------------------------------------------------
Mon Sep 19 11:11:41 CEST 2005 - schwab@suse.de
- Update to git-core 0.99.7.
- Install manpages.
-------------------------------------------------------------------
Fri Aug 5 11:24:34 CEST 2005 - kasievers@suse.de
- New version 0.99.3git20050905
rename git to git-core, to match the upstream package name
-------------------------------------------------------------------
Sun Jul 3 03:21:00 CEST 2005 - kasievers@suse.de
- New version 0.7git20050703
-------------------------------------------------------------------
Thu Jun 30 22:16:53 CEST 2005 - kasievers@suse.de
- New version 20050630
-------------------------------------------------------------------
Fri Jun 24 13:54:01 CEST 2005 - kasievers@suse.de
- New version 20050624
-------------------------------------------------------------------
Sun Jun 12 03:50:05 CEST 2005 - kay.sievers@suse.de
- New version 20050612
-------------------------------------------------------------------
Thu Jun 2 11:31:29 CEST 2005 - kay.sievers@suse.de
- Split git/Cogito into separate packages
- Update git to version 20050602
-------------------------------------------------------------------
Fri May 20 14:27:50 CEST 2005 - schwab@suse.de
- Use RPM_OPT_FLAGS.
- Specfile cleanup.
-------------------------------------------------------------------
Fri May 20 14:15:46 CEST 2005 - mmj@suse.de
- %_libdir -> FHS libexec
-------------------------------------------------------------------
Fri May 20 13:02:10 CEST 2005 - skh@suse.de
- initial package

444
git.spec
View File

@ -1,444 +0,0 @@
#
# spec file for package git (Version 1.7.3.4)
#
# 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/
#
%define gitexecdir %_libexecdir/git
Name: git
%if 0%{?suse_version} < 1030
%define dist_has_fdupes 0
%else
%define dist_has_fdupes 1
%endif
BuildRequires: asciidoc
BuildRequires: curl libcurl-devel libexpat-devel
%if %{dist_has_fdupes}
BuildRequires: fdupes
%endif
%if 0%{?suse_version} < 1030
BuildRequires: openssl-devel
%else
BuildRequires: libopenssl-devel
%endif
BuildRequires: sgml-skel
BuildRequires: xmlto
BuildRequires: python
BuildRequires: perl-Error
Version: 1.7.3.4
Release: 1
Summary: Fast, scalable, distributed revision control system
License: GPLv2+
Group: Development/Tools/Version Control
Url: http://git-scm.com
Source0: http://kernel.org/pub/software/scm/git/%name-%{version}.tar.bz2
Source1: apache2-gitweb.conf
Source2: sysconfig.git-daemon
Source3: git-daemon.init
Source4: git.xinetd
Source5: usr.share.git-web.gitweb.cgi
Patch1: git-nohardlink.diff
Patch2: git-python-install-fix.diff
Patch3: completion-wordbreaks.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: git-core = %{version}
Recommends: git-svn git-cvs git-email gitk git-gui git-web
Suggests: git-daemon
%description
Git is a fast, scalable, distributed revision control system with an
unusually rich command set that provides both high-level operations and
full access to internals.
This package itself only provides the README of git but with the
packages it requires, it brings you a complete Git environment
including GTK and email interfaces and tools for importing source code
repositories from other revision control systems such as subversion,
CVS, and GNU arch.
Authors:
--------
Linus Torvalds <torvalds@osdl.org>
%package core
License: GPLv2+
Summary: Core git tools
Group: Development/Tools/Version Control
Requires: rsync, less, openssh, perl-Error
Requires: perl-base = %{perl_version}
%description core
Git is a fast, scalable, distributed revision control system with an
unusually rich command set that provides both high-level operations and
full access to internals.
These are the core tools with minimal dependencies.
Authors:
--------
Linus Torvalds <torvalds@osdl.org>
Junio C Hamano <junkio@cox.net>
%package svn
License: GPLv2+
Summary: Git tools for importing Subversion repositories
Group: Development/Tools/Version Control
Requires: git-core = %{version}, subversion
Requires: subversion-perl
%description svn
Tools for importing Subversion repositories to the Git version control
system.
Authors:
--------
Linus Torvalds <torvalds@osdl.org>
Junio C Hamano <junkio@cox.net>
%package cvs
License: GPLv2+
Summary: Git tools for importing CVS repositories
Group: Development/Tools/Version Control
Requires: git-core = %{version}, cvs, cvsps, perl-DBD-SQLite
%description cvs
Tools for importing CVS repositories to the Git version control system.
Authors:
--------
Linus Torvalds <torvalds@osdl.org>
Junio C Hamano <junkio@cox.net>
%package arch
License: GPLv2+
Summary: Git tools for importing Arch repositories
Group: Development/Tools/Version Control
Requires: git-core = %{version}
# Requires: tla
%description arch
Tools for importing GNU Arch repositories to the GIT version control
system.
Authors:
--------
Linus Torvalds <torvalds@osdl.org>
Junio C Hamano <junkio@cox.net>
%package email
License: GPLv2+
Summary: Git tools for sending email
Group: Development/Tools/Version Control
Requires: git-core = %{version}
# For sending mails over secure SMTP:
Recommends: perl-Net-SMTP-SSL, perl-Authen-SASL
%description email
Email interface for the GIT version control system.
Authors:
--------
Linus Torvalds <torvalds@osdl.org>
Junio C Hamano <junkio@cox.net>
%package daemon
License: GPLv2+
Summary: Simple Server for Git Repositories
Group: Development/Tools/Version Control
Requires: git-core = %{version}
PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq
%description daemon
A really simple TCP git daemon. In the default configuration it allows
read only access to repositories in /srv/git/ that contain the
'git-daemon-export-ok' file.
Authors:
--------
Linus Torvalds <torvalds@osdl.org>
%package -n gitk
License: GPLv2+
Summary: Git revision tree visualiser
Group: Development/Tools/Version Control
Requires: git-core = %{version}, tk >= 8.4
Supplements: packageand(git-core:tk)
%description -n gitk
Grapical tool for visualization of revision trees of projects
maintained in the Git version control system. It name gitk indicates
that it's written using the Tk Widget set.
A simple Tk based graphical interface for common Git operations is
found in the package git-gui.
Authors:
--------
Linus Torvalds <torvalds@osdl.org>
Junio C Hamano <junkio@cox.net>
%package gui
License: GPLv2+
Summary: Grapical tool for common git operations
Group: Development/Tools/Version Control
Requires: git-core = %{version}, tk >= 8.4
Supplements: packageand(git-core:tk)
%description gui
A Tcl/Tk based graphical user interface to Git. git-gui focuses on
allowing users to make changes to their repository by making new
commits, amending existing ones, creating branches, performing local
merges, and fetching/pushing to remote repositories.
Unlike gitk, git-gui focuses on commit generation and single file
annotation, and does not show project history. It does however supply
menu actions to start a gitk session from within git-gui.
Authors:
--------
Linus Torvalds <torvalds@osdl.org>
%package web
License: GPLv2+
Summary: Git Web Interface
Group: Development/Tools/Version Control
Requires: git-core = %{version}
Supplements: packageand(git-core:apache2)
%description web
CGI script that allows browsing git repositories via web interface.
The apache2 configuration contained in this package installs a virtual
directory /git/ that calls the cgi script.
Authors:
--------
Linus Torvalds <torvalds@osdl.org>
%package remote-helpers
License: GPLv2+
Summary: Python package for remote helper scripts
Group: Development/Tools/Version Control
Requires: git-core = %{version}, python
%description remote-helpers
This package contains the building blocks for remote helpers written in Python.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
cat > .make <<'EOF'
#!/bin/bash
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
GITWEB_CONFIG="/etc/gitweb.conf" \
GITWEB_PROJECTROOT="/srv/git" \
WITH_OWN_SUBPROCESS_PY=YesPlease \
DESTDIR=$RPM_BUILD_ROOT \
NO_CROSS_DIRECTORY_HARDLINKS=1 \
V=1 \
prefix=%{_prefix} mandir=%{_mandir} \
gitexecdir=%{gitexecdir} \
"$@"
EOF
#
chmod 755 .make
./.make all %{?_smp_mflags}
%{!?_without_docs: ./.make doc}
%install
./.make install %{!?_without_docs: install-doc}
### git-web
cp gitweb/INSTALL INSTALL.gitweb
cp gitweb/README README.gitweb
install -d ${RPM_BUILD_ROOT}/usr/share/git-web
install -d ${RPM_BUILD_ROOT}/etc/apache2/conf.d
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/apache2/conf.d/gitweb.conf
### git-daemon
install -d -m 755 $RPM_BUILD_ROOT/etc/init.d
install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/init.d/git-daemon
install -d -m 755 $RPM_BUILD_ROOT%{_sbindir}
ln -s ../../etc/init.d/git-daemon $RPM_BUILD_ROOT%{_sbindir}/rcgit-daemon
install -d -m 755 $RPM_BUILD_ROOT/var/adm/fillup-templates
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.git-daemon
install -d -m 755 $RPM_BUILD_ROOT/srv/git
install -d -m 755 $RPM_BUILD_ROOT/etc/xinetd.d
install -m 644 %{S:4} $RPM_BUILD_ROOT/etc/xinetd.d/git
###
(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
(find $RPM_BUILD_ROOT%{gitexecdir} -mindepth 1 | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) >> bin-man-doc-files
(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
( pushd perl
perl Makefile.PL
make -f perl.mak DESTDIR=${RPM_BUILD_ROOT} install_vendor
)
rm -rf ${RPM_BUILD_ROOT}/usr/lib/perl5/site_perl
%perl_process_packlist
find $RPM_BUILD_ROOT/%_mandir -type f -print0 | xargs -0 chmod 644
install -m 644 -D contrib/completion/git-completion.bash $RPM_BUILD_ROOT/etc/bash_completion.d/git.sh
#
# apparmor profile for git-web
#
install -d -m 755 $RPM_BUILD_ROOT/etc/apparmor.d
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/apparmor.d
#
%if %{dist_has_fdupes}
# create predictable symlinks to make apparmor profile work
for i in git git-upload-archive; do
rm $RPM_BUILD_ROOT%{_bindir}/$i
ln -s %{gitexecdir}/git-add $RPM_BUILD_ROOT%{_bindir}/$i
done
if ! test -f $RPM_BUILD_ROOT%{gitexecdir}/git-add; then
echo "git-add is not a regular file, apparmor profile won't work!" >&2
exit 1
fi
# use symlinks instead of hardlinks in sub-commands
%fdupes -s $RPM_BUILD_ROOT
%endif
%clean
rm -rf $RPM_BUILD_ROOT
%pre daemon
if ! /usr/bin/getent passwd git-daemon >/dev/null; then
/usr/sbin/useradd -r -d /var/lib/empty -s /bin/false -c "git daemon" -g nogroup git-daemon || :
fi
%post daemon
%{fillup_and_insserv -n git-daemon}
%postun daemon
%{insserv_cleanup}
%preun daemon
%stop_on_removal
%files
%defattr(-,root,root)
%doc README
%files svn
%defattr(-,root,root)
%{gitexecdir}/*svn*
%doc Documentation/*svn*.txt
%{!?_without_docs: %{_mandir}/man1/*svn*.1*}
%{!?_without_docs: %doc Documentation/*svn*.html }
%files cvs
%defattr(-,root,root)
%doc Documentation/*git-cvs*.txt
%{_bindir}/git-cvs*
%{gitexecdir}/*cvs*
%{!?_without_docs: %{_mandir}/man1/*cvs*.1*}
%{!?_without_docs: %doc Documentation/*git-cvs*.html }
%files arch
%defattr(-,root,root)
%doc Documentation/git-archimport.txt
%{gitexecdir}/git-archimport
%{!?_without_docs: %{_mandir}/man1/git-archimport.1*}
%{!?_without_docs: %doc Documentation/git-archimport.html }
%files email
%defattr(-,root,root)
%doc Documentation/*email*.txt
%{gitexecdir}/*email*
%{!?_without_docs: %{_mandir}/man1/*email*.1*}
%{!?_without_docs: %doc Documentation/*email*.html }
%files daemon
%defattr(-,root,root)
%doc Documentation/*daemon*.txt
%{gitexecdir}/*daemon*
/etc/init.d/git-daemon
%{_sbindir}/rcgit-daemon
%dir /srv/git
/var/adm/fillup-templates/sysconfig.git-daemon
%{!?_without_docs: %{_mandir}/man1/*daemon*.1*}
%{!?_without_docs: %doc Documentation/*daemon*.html }
%config(noreplace) /etc/xinetd.d/git
%files -n gitk
%defattr(-,root,root)
%doc Documentation/*gitk*.txt
%{_bindir}/gitk
/usr/share/gitk
%{!?_without_docs: %{_mandir}/man1/*gitk*.1*}
%{!?_without_docs: %doc Documentation/*gitk*.html }
%files gui
%defattr(-,root,root)
%doc Documentation/*gui*.txt
%{gitexecdir}/git-gui*
/usr/share/git-gui
%{!?_without_docs: %{_mandir}/man1/*gui*.1*}
%{!?_without_docs: %doc Documentation/*gui*.html }
%files web
%defattr(-,root,root)
%doc README.gitweb INSTALL.gitweb
%dir /etc/apache2
%dir /etc/apache2/conf.d
%config(noreplace) /etc/apache2/conf.d/gitweb.conf
/usr/share/gitweb
/etc/apparmor.d
%files remote-helpers
%defattr(-,root,root)
%if %suse_version >= 1120
%python_sitelib/*
%else
%py_sitedir/*
%endif
%files core -f bin-man-doc-files
%defattr(-,root,root)
%{_bindir}/git
%{_datadir}/git-core/
%dir %{gitexecdir}
%doc README COPYING Documentation/*.txt
%{!?_without_docs: %doc Documentation/*.html }
%if 0%{?suse_version} < 1140
/var/adm/perl-modules/%{name}
%endif
%{perl_vendorlib}/Git.pm
%{perl_vendorarch}/auto/Git/
/etc/bash_completion.d/git.sh
%changelog

16
git.xinetd
View File

@ -1,16 +0,0 @@
# default: off
# 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
server_args = daemon --syslog --inetd --base-path=/srv/git
type = UNLISTED
port = 9418
log_on_failure += USERID
}

18
sysconfig.git-daemon
View File

@ -1,18 +0,0 @@
## Path: Network/git-daemon
## Description: git daemon configuration
## ServiceRestart: git-daemon
## Type: string
## Default:
#
# base path for exported directories
#
# defaults to "/srv/git" if not set
#
GIT_DAEMON_BASE_PATH=""
## Type: string
## Default:
#
# additional arguments for git-daemon. See manual page
GIT_DAEMON_ARGS=""

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

@ -1,23 +0,0 @@
# 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,
}