lede-packages-rs

commit 3a2458b9f043b8ad6d0cf8dfcfe4002a92543937
parent 978dc488e9a1d2556d20917c3f5cf4c2a25da7b0
Author: sbyx <steven@midlink.org>
Date:   Mon,  8 Sep 2014 11:48:53 +0200

Merge pull request #156 from zeitgeist87/master

Fix bug in git-daemon
Diffstat:
M
net/git/Makefile
 | 
2
+-
M
net/git/patches/100-convert_builtin.patch
 | 
19
+++++++++++++++++++

2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/net/git/Makefile b/net/git/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=git
 PKG_VERSION:=2.1.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/software/scm/git/
diff --git a/net/git/patches/100-convert_builtin.patch b/net/git/patches/100-convert_builtin.patch
@@ -127,6 +127,25 @@
  {
  	int listen_port = 0;
  	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
 +++ b/fast-import.c
 @@ -3343,7 +3343,7 @@ static void parse_argv(void)