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>
This commit is contained in:
		
							
								
								
									
										4
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								Makefile
									
									
									
									
									
								
							| @@ -5,7 +5,7 @@ CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) | ||||
| CGIT_CONFIG = /etc/cgitrc | ||||
| 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 | ||||
| INSTALL = install | ||||
|  | ||||
| @@ -68,7 +68,7 @@ endif | ||||
| 	$(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 | ||||
|   | ||||
							
								
								
									
										2
									
								
								cgit.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								cgit.c
									
									
									
									
									
								
							| @@ -21,7 +21,7 @@ void add_mimetype(const char *name, const char *value) | ||||
| { | ||||
| 	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); | ||||
| } | ||||
|  | ||||
|   | ||||
							
								
								
									
										2
									
								
								git
									
									
									
									
									
								
							
							
								
								
								
								
								
							
						
						
									
										2
									
								
								git
									
									
									
									
									
								
							 Submodule git updated: 7fb6bcff2d...87b50542a0
									
								
							| @@ -35,7 +35,7 @@ static void print_object(const unsigned char *sha1, const char *path) | ||||
| 	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; | ||||
| 	} | ||||
|   | ||||
| @@ -175,7 +175,7 @@ static void add_commit(struct string_list *authors, struct commit *commit, | ||||
|  | ||||
| 	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_list *authors, struct commit *commit, | ||||
| 	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 string_list *authors, int from, int to, | ||||
| 			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 *authors, int top, | ||||
| 		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 { | ||||
|   | ||||
		Посилання в новій задачі
	
	Block a user
	 Lars Hjemli
					Lars Hjemli