Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #156 from zeitgeist87/master

Browse source 
Fix bug in git-daemon
This commit is contained in:
sbyx 2014-09-08 11:48:53 +02:00
commit 3a2458b9f0
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/git/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=git PKG_NAME:=git
PKG_VERSION:=2.1.0 PKG_VERSION:=2.1.0
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/software/scm/git/ PKG_SOURCE_URL:=@KERNEL/software/scm/git/

19
net/git/patches/100-convert_builtin.patch
View file

@ -127,6 +127,25 @@
{ {
int listen_port = 0; int listen_port = 0;
struct string_list listen_addr = STRING_LIST_INIT_NODUP; struct string_list listen_addr = STRING_LIST_INIT_NODUP;
@@ -1315,12 +1315,13 @@
store_pid(pid_file);
/* prepare argv for serving-processes */
- cld_argv = xmalloc(sizeof (char *) * (argc + 2));
- cld_argv[0] = argv[0]; /* git-daemon */
- cld_argv[1] = "--serve";
+ cld_argv = xmalloc(sizeof (char *) * (argc + 3));
+ cld_argv[0] = "git";
+ cld_argv[1] = argv[0]; /* daemon */
+ cld_argv[2] = "--serve";
for (i = 1; i < argc; ++i)
- cld_argv[i+1] = argv[i];
- cld_argv[argc+1] = NULL;
+ cld_argv[i+2] = argv[i];
+ cld_argv[argc+2] = NULL;
return serve(&listen_addr, listen_port, cred);
}
--- a/fast-import.c --- a/fast-import.c
+++ b/fast-import.c +++ b/fast-import.c
@@ -3343,7 +3343,7 @@ static void parse_argv(void) @@ -3343,7 +3343,7 @@ static void parse_argv(void)