summaryrefslogtreecommitdiff
path: root/data/git
diff options
context:
space:
mode:
Diffstat (limited to 'data/git')
-rw-r--r--data/git/_metadata/version2
-rw-r--r--data/git/git-1.5.6.rc0.tar.bz2bin1724742 -> 0 bytes
-rw-r--r--data/git/git-2.2.0.tar.gzbin0 -> 5157176 bytes
-rw-r--r--data/git/make.sh3
-rw-r--r--data/git/symlink.diff55
5 files changed, 41 insertions, 19 deletions
diff --git a/data/git/_metadata/version b/data/git/_metadata/version
index 4c21d6a1a..ccbccc3dc 100644
--- a/data/git/_metadata/version
+++ b/data/git/_metadata/version
@@ -1 +1 @@
-1.5.6.rc0
+2.2.0
diff --git a/data/git/git-1.5.6.rc0.tar.bz2 b/data/git/git-1.5.6.rc0.tar.bz2
deleted file mode 100644
index 257dcc550..000000000
--- a/data/git/git-1.5.6.rc0.tar.bz2
+++ /dev/null
Binary files differ
diff --git a/data/git/git-2.2.0.tar.gz b/data/git/git-2.2.0.tar.gz
new file mode 100644
index 000000000..2eb2178ba
--- /dev/null
+++ b/data/git/git-2.2.0.tar.gz
Binary files differ
diff --git a/data/git/make.sh b/data/git/make.sh
index 31faba511..3dc1c30d8 100644
--- a/data/git/make.sh
+++ b/data/git/make.sh
@@ -1,5 +1,6 @@
pkg:setup
+export PATH=/apl/tel/path:$PATH
pkg:configure ac_cv_c_c99_format=yes ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=yes --without-tcltk
make
pkg:install
-pkg: sed -i -e 's/^=head2 .*:/=head2/' /usr/lib/perl/5.8.8/perllocal.pod
+pkg: rm -f /usr/lib/perl/5.10.1/perllocal.pod
diff --git a/data/git/symlink.diff b/data/git/symlink.diff
index 158b8aacc..4b10e71e4 100644
--- a/data/git/symlink.diff
+++ b/data/git/symlink.diff
@@ -1,21 +1,42 @@
-diff -ru git-1.5.6.rc0/Makefile git-1.5.6.rc0+iPhone/Makefile
---- git-1.5.6.rc0/Makefile 2008-05-26 00:47:42.000000000 +0000
-+++ git-1.5.6.rc0+iPhone/Makefile 2008-05-31 18:51:02.000000000 +0000
-@@ -999,7 +999,7 @@
- '-DGIT_INFO_PATH="$(infodir_SQ)"' $<
+diff -ru git-2.2.0/Makefile git-2.2.0+iPhone/Makefile
+--- git-2.2.0/Makefile 2014-11-26 22:39:03.000000000 +0000
++++ git-2.2.0+iPhone/Makefile 2014-12-03 08:21:03.000000000 +0000
+@@ -1628,7 +1628,6 @@
$(BUILT_INS): git$X
-- $(QUIET_BUILT_IN)$(RM) $@ && ln git$X $@
-+ $(QUIET_BUILT_IN)$(RM) $@ && ln -s git$X $@
+ $(QUIET_BUILT_IN)$(RM) $@ && \
+- ln $< $@ 2>/dev/null || \
+ ln -s $< $@ 2>/dev/null || \
+ cp $< $@
- common-cmds.h: ./generate-cmdlist.sh command-list.txt
+@@ -1912,7 +1911,6 @@
-@@ -1241,7 +1241,7 @@
- cp '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \
- '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X'; \
- fi
-- $(foreach p,$(BUILT_INS), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
-+ $(foreach p,$(BUILT_INS), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln -s 'git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
- ifneq (,$X)
- $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';)
- endif
+ $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
+ $(QUIET_LNCP)$(RM) $@ && \
+- ln $< $@ 2>/dev/null || \
+ ln -s $< $@ 2>/dev/null || \
+ cp $< $@
+
+@@ -2226,14 +2224,12 @@
+ for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \
+ $(RM) "$$bindir/$$p" && \
+ test -z "$(NO_INSTALL_HARDLINKS)" && \
+- 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" && \
+ test -z "$(NO_INSTALL_HARDLINKS)" && \
+- 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 && \
+@@ -2241,7 +2237,6 @@
+ for p in $$remote_curl_aliases; do \
+ $(RM) "$$execdir/$$p" && \
+ test -z "$(NO_INSTALL_HARDLINKS)" && \
+- 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 && \