Update to 1.7.2.3

This commit is contained in:
Tom G. Christensen
2010-09-12 08:43:55 +00:00
committed by Tom G. Christensen
parent 59affc3a1d
commit 876d436547
5 changed files with 56 additions and 69 deletions

View File

@@ -1,24 +0,0 @@
--- git-1.5.5.1/git-compat-util.h.socklen_t 2008-05-11 20:17:59.225343000 +0200
+++ git-1.5.5.1/git-compat-util.h 2008-05-11 20:20:01.765932000 +0200
@@ -453,4 +453,8 @@
# define FORCE_DIR_SET_GID 0
#endif
+#ifdef NO_SOCKLEN_T
+typedef int socklen_t;
+#endif
+
#endif
--- git-1.5.5.1.hack/Makefile.socklen_t 2008-05-11 20:26:52.657848000 +0200
+++ git-1.5.5.1.hack/Makefile 2008-05-11 20:28:06.418161000 +0200
@@ -852,6 +852,10 @@
LIB_OBJS += compat/inet_pton.o
endif
+ifdef NO_SOCKLEN_T
+ BASIC_CFLAGS += -DNO_SOCKLEN_T
+endif
+
ifdef NO_ICONV
BASIC_CFLAGS += -DNO_ICONV
endif

View File

@@ -1,24 +0,0 @@
--- git-1.7.0.5/Makefile.symlinks 2010-04-21 18:51:30.653110000 +0200
+++ git-1.7.0.5/Makefile 2010-04-21 18:53:13.173717000 +0200
@@ -1633,7 +1633,6 @@
$(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
$(QUIET_LNCP)$(RM) $@ && \
- ln $< $@ 2>/dev/null || \
ln -s $< $@ 2>/dev/null || \
cp $< $@
@@ -1837,13 +1836,11 @@
cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \
{ for p in $(BUILT_INS); do \
$(RM) "$$execdir/$$p" && \
- ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
done; } && \
{ for p in $(REMOTE_CURL_ALIASES); do \
$(RM) "$$execdir/$$p" && \
- ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
done; } && \

View File

@@ -0,0 +1,46 @@
--- git-1.7.2.3/Makefile.symlinks 2010-09-03 23:05:21.000000000 +0200
+++ git-1.7.2.3/Makefile 2010-09-07 12:15:43.500000000 +0200
@@ -1594,7 +1594,6 @@
$(BUILT_INS): git$X
$(QUIET_BUILT_IN)$(RM) $@ && \
- ln git$X $@ 2>/dev/null || \
ln -s git$X $@ 2>/dev/null || \
cp git$X $@
@@ -1895,7 +1894,6 @@
$(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
$(QUIET_LNCP)$(RM) $@ && \
- ln $< $@ 2>/dev/null || \
ln -s $< $@ 2>/dev/null || \
cp $< $@
@@ -2079,26 +2077,23 @@
for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
$(RM) "$$execdir/$$p" && \
test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
- ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
+ ln -s "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
cp "$$bindir/$$p" "$$execdir/$$p" || exit; \
done; \
} && \
for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \
$(RM) "$$bindir/$$p" && \
- ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \
ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \
cp "$$bindir/git$X" "$$bindir/$$p" || exit; \
done && \
for p in $(BUILT_INS); do \
$(RM) "$$execdir/$$p" && \
- ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
done && \
remote_curl_aliases="$(REMOTE_CURL_ALIASES)" && \
for p in $$remote_curl_aliases; do \
$(RM) "$$execdir/$$p" && \
- ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
done && \