Browse Source

git: update to 2.7.3

Signed-off-by: Peter Wagner <tripolar@gmx.at>
Peter Wagner 8 years ago
parent
commit
d986ccd6c5

+ 2
- 2
net/git/Makefile View File

8
 include $(TOPDIR)/rules.mk
8
 include $(TOPDIR)/rules.mk
9
 
9
 
10
 PKG_NAME:=git
10
 PKG_NAME:=git
11
-PKG_VERSION:=2.7.1
11
+PKG_VERSION:=2.7.3
12
 PKG_RELEASE:=1
12
 PKG_RELEASE:=1
13
 
13
 
14
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
14
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
15
 PKG_SOURCE_URL:=@KERNEL/software/scm/git/
15
 PKG_SOURCE_URL:=@KERNEL/software/scm/git/
16
-PKG_MD5SUM:=eece7b1e87983271621a0cb6aab37a25
16
+PKG_MD5SUM:=bb01710b1b24789a53c800a90c73957f
17
 
17
 
18
 PKG_INSTALL:=1
18
 PKG_INSTALL:=1
19
 PKG_BUILD_PARALLEL:=1
19
 PKG_BUILD_PARALLEL:=1

+ 19
- 30
net/git/patches/100-convert_builtin.patch View File

1
 --- a/Makefile
1
 --- a/Makefile
2
 +++ b/Makefile
2
 +++ b/Makefile
3
-@@ -557,16 +557,7 @@ EXTRA_PROGRAMS =
3
+@@ -559,16 +559,7 @@ EXTRA_PROGRAMS =
4
  # ... and all the rest that could be moved out of bindir to gitexecdir
4
  # ... and all the rest that could be moved out of bindir to gitexecdir
5
  PROGRAMS += $(EXTRA_PROGRAMS)
5
  PROGRAMS += $(EXTRA_PROGRAMS)
6
  
6
  
17
  
17
  
18
  # Binary suffix, set to .exe for Windows builds
18
  # Binary suffix, set to .exe for Windows builds
19
  X =
19
  X =
20
-@@ -923,6 +914,11 @@ BUILTIN_OBJS += builtin/verify-pack.o
20
+@@ -929,6 +920,11 @@ BUILTIN_OBJS += builtin/verify-pack.o
21
  BUILTIN_OBJS += builtin/verify-tag.o
21
  BUILTIN_OBJS += builtin/verify-tag.o
22
  BUILTIN_OBJS += builtin/worktree.o
22
  BUILTIN_OBJS += builtin/worktree.o
23
  BUILTIN_OBJS += builtin/write-tree.o
23
  BUILTIN_OBJS += builtin/write-tree.o
29
  
29
  
30
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
30
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
31
  EXTLIBS =
31
  EXTLIBS =
32
-@@ -1106,7 +1102,7 @@ endif
32
+@@ -1112,7 +1108,7 @@ endif
33
  EXTLIBS += -lz
33
  EXTLIBS += -lz
34
  
34
  
35
  ifndef NO_OPENSSL
35
  ifndef NO_OPENSSL
38
  	ifdef OPENSSLDIR
38
  	ifdef OPENSSLDIR
39
  		BASIC_CFLAGS += -I$(OPENSSLDIR)/include
39
  		BASIC_CFLAGS += -I$(OPENSSLDIR)/include
40
  		OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
40
  		OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
41
-@@ -1977,10 +1973,6 @@ endif
41
+@@ -1989,10 +1985,6 @@ endif
42
  git-%$X: %.o GIT-LDFLAGS $(GITLIBS)
42
  git-%$X: %.o GIT-LDFLAGS $(GITLIBS)
43
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
43
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
44
  
44
  
49
  git-http-fetch$X: http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS)
49
  git-http-fetch$X: http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS)
50
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
50
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
51
  		$(CURL_LIBCURL) $(LIBS)
51
  		$(CURL_LIBCURL) $(LIBS)
52
-@@ -2300,10 +2292,11 @@ endif
52
+@@ -2312,10 +2304,11 @@ endif
53
  	bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
53
  	bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
54
  	execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
54
  	execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
55
  	{ test "$$bindir/" = "$$execdir/" || \
55
  	{ test "$$bindir/" = "$$execdir/" || \
64
  	} && \
64
  	} && \
65
 --- a/builtin.h
65
 --- a/builtin.h
66
 +++ b/builtin.h
66
 +++ b/builtin.h
67
-@@ -141,5 +141,10 @@ extern int cmd_verify_pack(int argc, con
67
+@@ -142,5 +142,10 @@ extern int cmd_verify_pack(int argc, con
68
  extern int cmd_show_ref(int argc, const char **argv, const char *prefix);
68
  extern int cmd_show_ref(int argc, const char **argv, const char *prefix);
69
  extern int cmd_pack_refs(int argc, const char **argv, const char *prefix);
69
  extern int cmd_pack_refs(int argc, const char **argv, const char *prefix);
70
  extern int cmd_replace(int argc, const char **argv, const char *prefix);
70
  extern int cmd_replace(int argc, const char **argv, const char *prefix);
97
 +#include "../upload-pack.c"
97
 +#include "../upload-pack.c"
98
 --- a/daemon.c
98
 --- a/daemon.c
99
 +++ b/daemon.c
99
 +++ b/daemon.c
100
-@@ -1184,7 +1184,7 @@ static int serve(struct string_list *lis
100
+@@ -1178,7 +1178,7 @@ static int serve(struct string_list *lis
101
  	return service_loop(&socklist);
101
  	return service_loop(&socklist);
102
  }
102
  }
103
  
103
  
106
  {
106
  {
107
  	int listen_port = 0;
107
  	int listen_port = 0;
108
  	struct string_list listen_addr = STRING_LIST_INIT_NODUP;
108
  	struct string_list listen_addr = STRING_LIST_INIT_NODUP;
109
-@@ -1380,12 +1380,13 @@ int main(int argc, char **argv)
109
+@@ -1374,6 +1374,7 @@ int main(int argc, char **argv)
110
  		write_file(pid_file, "%"PRIuMAX, (uintmax_t) getpid());
110
  		write_file(pid_file, "%"PRIuMAX, (uintmax_t) getpid());
111
  
111
  
112
  	/* prepare argv for serving-processes */
112
  	/* prepare argv for serving-processes */
113
--	cld_argv = xmalloc(sizeof (char *) * (argc + 2));
114
--	cld_argv[0] = argv[0];	/* git-daemon */
115
--	cld_argv[1] = "--serve";
116
-+	cld_argv = xmalloc(sizeof (char *) * (argc + 3));
117
-+	cld_argv[0] = "git";
118
-+	cld_argv[1] = argv[0];	/* daemon */
119
-+	cld_argv[2] = "--serve";
113
++	argv_array_push(&cld_argv, "git"); /* git-daemon */
114
+ 	argv_array_push(&cld_argv, argv[0]); /* git-daemon */
115
+ 	argv_array_push(&cld_argv, "--serve");
120
  	for (i = 1; i < argc; ++i)
116
  	for (i = 1; i < argc; ++i)
121
--		cld_argv[i+1] = argv[i];
122
--	cld_argv[argc+1] = NULL;
123
-+		cld_argv[i+2] = argv[i];
124
-+	cld_argv[argc+2] = NULL;
125
- 
126
- 	return serve(&listen_addr, listen_port, cred);
127
- }
128
 --- a/fast-import.c
117
 --- a/fast-import.c
129
 +++ b/fast-import.c
118
 +++ b/fast-import.c
130
-@@ -3380,7 +3380,7 @@ static void parse_argv(void)
119
+@@ -3381,7 +3381,7 @@ static void parse_argv(void)
131
  		read_marks();
120
  		read_marks();
132
  }
121
  }
133
  
122
  
138
  
127
  
139
 --- a/git.c
128
 --- a/git.c
140
 +++ b/git.c
129
 +++ b/git.c
141
-@@ -311,11 +311,11 @@ static int handle_alias(int *argcp, cons
130
+@@ -307,11 +307,11 @@ static int handle_alias(int *argcp, cons
142
  
131
  
143
  struct cmd_struct {
132
  struct cmd_struct {
144
  	const char *cmd;
133
  	const char *cmd;
152
  {
141
  {
153
  	int status, help;
142
  	int status, help;
154
  	struct stat st;
143
  	struct stat st;
155
-@@ -396,6 +396,7 @@ static struct cmd_struct commands[] = {
144
+@@ -392,6 +392,7 @@ static struct cmd_struct commands[] = {
156
  	{ "config", cmd_config, RUN_SETUP_GENTLY },
145
  	{ "config", cmd_config, RUN_SETUP_GENTLY },
157
  	{ "count-objects", cmd_count_objects, RUN_SETUP },
146
  	{ "count-objects", cmd_count_objects, RUN_SETUP },
158
  	{ "credential", cmd_credential, RUN_SETUP_GENTLY },
147
  	{ "credential", cmd_credential, RUN_SETUP_GENTLY },
160
  	{ "describe", cmd_describe, RUN_SETUP },
149
  	{ "describe", cmd_describe, RUN_SETUP },
161
  	{ "diff", cmd_diff },
150
  	{ "diff", cmd_diff },
162
  	{ "diff-files", cmd_diff_files, RUN_SETUP | NEED_WORK_TREE },
151
  	{ "diff-files", cmd_diff_files, RUN_SETUP | NEED_WORK_TREE },
163
-@@ -414,6 +415,7 @@ static struct cmd_struct commands[] = {
152
+@@ -410,6 +411,7 @@ static struct cmd_struct commands[] = {
164
  	{ "grep", cmd_grep, RUN_SETUP_GENTLY },
153
  	{ "grep", cmd_grep, RUN_SETUP_GENTLY },
165
  	{ "hash-object", cmd_hash_object },
154
  	{ "hash-object", cmd_hash_object },
166
  	{ "help", cmd_help },
155
  	{ "help", cmd_help },
168
  	{ "index-pack", cmd_index_pack, RUN_SETUP_GENTLY },
157
  	{ "index-pack", cmd_index_pack, RUN_SETUP_GENTLY },
169
  	{ "init", cmd_init_db, NO_SETUP },
158
  	{ "init", cmd_init_db, NO_SETUP },
170
  	{ "init-db", cmd_init_db, NO_SETUP },
159
  	{ "init-db", cmd_init_db, NO_SETUP },
171
-@@ -463,6 +465,7 @@ static struct cmd_struct commands[] = {
160
+@@ -459,6 +461,7 @@ static struct cmd_struct commands[] = {
172
  	{ "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE },
161
  	{ "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE },
173
  	{ "rm", cmd_rm, RUN_SETUP },
162
  	{ "rm", cmd_rm, RUN_SETUP },
174
  	{ "send-pack", cmd_send_pack, RUN_SETUP },
163
  	{ "send-pack", cmd_send_pack, RUN_SETUP },
176
  	{ "shortlog", cmd_shortlog, RUN_SETUP_GENTLY | USE_PAGER },
165
  	{ "shortlog", cmd_shortlog, RUN_SETUP_GENTLY | USE_PAGER },
177
  	{ "show", cmd_show, RUN_SETUP },
166
  	{ "show", cmd_show, RUN_SETUP },
178
  	{ "show-branch", cmd_show_branch, RUN_SETUP },
167
  	{ "show-branch", cmd_show_branch, RUN_SETUP },
179
-@@ -479,6 +482,7 @@ static struct cmd_struct commands[] = {
168
+@@ -476,6 +479,7 @@ static struct cmd_struct commands[] = {
180
  	{ "update-server-info", cmd_update_server_info, RUN_SETUP },
169
  	{ "update-server-info", cmd_update_server_info, RUN_SETUP },
181
  	{ "upload-archive", cmd_upload_archive },
170
  	{ "upload-archive", cmd_upload_archive },
182
  	{ "upload-archive--writer", cmd_upload_archive_writer },
171
  	{ "upload-archive--writer", cmd_upload_archive_writer },
186
  	{ "verify-pack", cmd_verify_pack },
175
  	{ "verify-pack", cmd_verify_pack },
187
 --- a/imap-send.c
176
 --- a/imap-send.c
188
 +++ b/imap-send.c
177
 +++ b/imap-send.c
189
-@@ -1496,7 +1496,7 @@ static int curl_append_msgs_to_imap(stru
178
+@@ -1494,7 +1494,7 @@ static int curl_append_msgs_to_imap(stru
190
  }
179
  }
191
  #endif
180
  #endif
192
  
181
  
208
  	const char **user_argv;
197
  	const char **user_argv;
209
 --- a/upload-pack.c
198
 --- a/upload-pack.c
210
 +++ b/upload-pack.c
199
 +++ b/upload-pack.c
211
-@@ -819,7 +819,7 @@ static int upload_pack_config(const char
200
+@@ -820,7 +820,7 @@ static int upload_pack_config(const char
212
  	return parse_hide_refs_config(var, value, "uploadpack");
201
  	return parse_hide_refs_config(var, value, "uploadpack");
213
  }
202
  }
214
  
203
  

+ 3
- 3
net/git/patches/300-configure_for_crosscompiling View File

1
 --- a/configure.ac
1
 --- a/configure.ac
2
 +++ b/configure.ac
2
 +++ b/configure.ac
3
-@@ -867,7 +867,8 @@ AC_RUN_IFELSE(
3
+@@ -860,7 +860,8 @@ AC_RUN_IFELSE(
4
  		FILE *f = fopen(".", "r");
4
  		FILE *f = fopen(".", "r");
5
  		return f && fread(&c, 1, 1, f)]])],
5
  		return f && fread(&c, 1, 1, f)]])],
6
  	[ac_cv_fread_reads_directories=no],
6
  	[ac_cv_fread_reads_directories=no],
10
  ])
10
  ])
11
  if test $ac_cv_fread_reads_directories = yes; then
11
  if test $ac_cv_fread_reads_directories = yes; then
12
  	FREAD_READS_DIRECTORIES=UnfortunatelyYes
12
  	FREAD_READS_DIRECTORIES=UnfortunatelyYes
13
-@@ -901,7 +902,8 @@ AC_RUN_IFELSE(
13
+@@ -894,7 +895,8 @@ AC_RUN_IFELSE(
14
  		  if (snprintf(buf, 3, "%s", "12345") != 5
14
  		  if (snprintf(buf, 3, "%s", "12345") != 5
15
  		      || strcmp(buf, "12")) return 1]])],
15
  		      || strcmp(buf, "12")) return 1]])],
16
  	[ac_cv_snprintf_returns_bogus=no],
16
  	[ac_cv_snprintf_returns_bogus=no],
20
  ])
20
  ])
21
  if test $ac_cv_snprintf_returns_bogus = yes; then
21
  if test $ac_cv_snprintf_returns_bogus = yes; then
22
  	SNPRINTF_RETURNS_BOGUS=UnfortunatelyYes
22
  	SNPRINTF_RETURNS_BOGUS=UnfortunatelyYes
23
-@@ -924,7 +926,8 @@ yippeeyeswehaveit
23
+@@ -917,7 +919,8 @@ yippeeyeswehaveit
24
  #endif
24
  #endif
25
  ]),
25
  ]),
26
  	[ac_cv_sane_mode_bits=yes],
26
  	[ac_cv_sane_mode_bits=yes],

+ 1
- 1
net/git/patches/400-imapsend_without_curl.patch View File

1
 --- a/Makefile
1
 --- a/Makefile
2
 +++ b/Makefile
2
 +++ b/Makefile
3
-@@ -1074,7 +1074,7 @@ else
3
+@@ -1080,7 +1080,7 @@ else
4
  	endif
4
  	endif
5
  	curl_check := $(shell (echo 072200; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p)
5
  	curl_check := $(shell (echo 072200; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p)
6
  	ifeq "$(curl_check)" "072200"
6
  	ifeq "$(curl_check)" "072200"