summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2010-09-27 05:58:01 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-09-27 05:58:13 (UTC)
commit82a883ede7e47616aba041a5eb36e08666ef9177 (patch) (side-by-side diff)
tree14acc2bad5ca5375aa08cb946788b6923d72df7c
parentaaa3f7854232726d5530f66b9459e036bbba15cb (diff)
downloadcgit-82a883ede7e47616aba041a5eb36e08666ef9177.zip
cgit-82a883ede7e47616aba041a5eb36e08666ef9177.tar.gz
cgit-82a883ede7e47616aba041a5eb36e08666ef9177.tar.bz2
Use GIT-1.7.3
This fixes http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-2542. Noticed-by: Silvio Cesare <silvio.cesare@gmail.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Makefile4
-rw-r--r--cgit.c2
m---------git0
-rw-r--r--ui-plain.c2
-rw-r--r--ui-stats.c8
5 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 5162020..0349639 100644
--- a/Makefile
+++ b/Makefile
@@ -7,3 +7,3 @@ CACHE_ROOT = /var/cache/cgit
SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.6.4.3
+GIT_VER = 1.7.3
GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
@@ -70,3 +70,3 @@ endif
-EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
+EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto -lpthread
OBJECTS =
diff --git a/cgit.c b/cgit.c
index 6c7e811..ad62d10 100644
--- a/cgit.c
+++ b/cgit.c
@@ -23,3 +23,3 @@ void add_mimetype(const char *name, const char *value)
- item = string_list_insert(xstrdup(name), &ctx.cfg.mimetypes);
+ item = string_list_insert(&ctx.cfg.mimetypes, xstrdup(name));
item->util = xstrdup(value);
diff --git a/git b/git
-Subproject 7fb6bcff2dece2ff9fbc5ebfe526d9b2a7e764c
+Subproject 87b50542a08ac6caa083ddc376e674424e37940
diff --git a/ui-plain.c b/ui-plain.c
index 66cb19c..5569a7c 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -37,3 +37,3 @@ static void print_object(const unsigned char *sha1, const char *path)
if (ext && *(++ext)) {
- mime = string_list_lookup(ext, &ctx.cfg.mimetypes);
+ mime = string_list_lookup(&ctx.cfg.mimetypes, ext);
if (mime)
diff --git a/ui-stats.c b/ui-stats.c
index bdaf9cc..50c2540 100644
--- a/ui-stats.c
+++ b/ui-stats.c
@@ -177,3 +177,3 @@ static void add_commit(struct string_list *authors, struct commit *commit,
tmp = xstrdup(info->author);
- author = string_list_insert(tmp, authors);
+ author = string_list_insert(authors, tmp);
if (!author->util)
@@ -188,3 +188,3 @@ static void add_commit(struct string_list *authors, struct commit *commit,
tmp = xstrdup(period->pretty(date));
- item = string_list_insert(tmp, items);
+ item = string_list_insert(items, tmp);
if (item->util)
@@ -281,3 +281,3 @@ void print_combined_authorrow(struct string_list *authors, int from, int to,
items = &authorstat->list;
- date = string_list_lookup(tmp, items);
+ date = string_list_lookup(items, tmp);
if (date)
@@ -333,3 +333,3 @@ void print_authors(struct string_list *authors, int top,
period->inc(tm);
- date = string_list_lookup(tmp, items);
+ date = string_list_lookup(items, tmp);
if (!date)