Skip to content

Commit

Permalink
Bump Windows PortableGit to 1.9.5
Browse files Browse the repository at this point in the history 
Bump git to 1.8.5.6 for Mac binaries

add checksums for git
  • Loading branch information
@tkelman
tkelman committed Dec 19, 2014
1 parent c81ec26 commit 2841dec
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -492,4 +492,4 @@ endif
7z e -y mingw-libexpat.cpio && \
7z x -y mingw-zlib.rpm -so > mingw-zlib.cpio && \
7z e -y mingw-zlib.cpio && \
$(JLDOWNLOAD) PortableGit.7z https://github.com/msysgit/msysgit/releases/download/Git-1.9.4-preview20140611/PortableGit-1.9.4-preview20140611.7z
$(JLDOWNLOAD) PortableGit.7z https://github.com/msysgit/msysgit/releases/download/Git-1.9.5-preview20141217/PortableGit-1.9.5-preview20141217.7z
4 changes: 2 additions & 2 deletions deps/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1706,11 +1706,11 @@ GIT_SOURCE = git-$(GIT_VER)/src/git
GIT_TARGET = $(build_prefix)/git

git-$(GIT_VER).tar.gz:
$(JLDOWNLOAD) $@ http://git-core.googlecode.com/files/$@
$(JLDOWNLOAD) $@ https://github.com/git/git/archive/v$(GIT_VER).tar.gz
git-$(GIT_VER)/configure: git-$(GIT_VER).tar.gz
$(JLCHECKSUM) $<
$(TAR) zxf $<
touch -c $@
$(MAKE) -C git-$(GIT_VER) configure
git-$(GIT_VER)/config.status: git-$(GIT_VER)/configure
cd git-$(GIT_VER) && \
./configure $(CONFIGURE_COMMON) --bindir="$(build_libexecdir)"
Expand Down
2 changes: 1 addition & 1 deletion deps/Versions.make
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ OSXUNWIND_VER = 0.0.1
GMP_VER=6.0.0
MPFR_VER=3.1.2
PATCHELF_VER = 0.8
GIT_VER = 1.8.2.3
GIT_VER = 1.8.5.6
VIRTUALENV_VER = 1.11.6
LIBGIT2_VER = 0.21.3
1 change: 1 addition & 0 deletions deps/checksums/git-1.8.5.6.tar.gz/md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bbaa27d812be3ece87fcd830c6fdd6ab
1 change: 1 addition & 0 deletions deps/checksums/git-1.8.5.6.tar.gz/sha512
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d07d218f33ede72841c84fe95aeed2dc7f8bd928ce0c513b695926e504c27854ac981dca211aa52bda9cde243770567fc9e2f2f97ab5213b947b9dee5d70d858

4 comments on commit 2841dec

@tkelman
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a security update, see https://github.com/blog/1938-vulnerability-announced-update-your-git-clients, so @JuliaBackports assuming this doesn't break nightlies in any way

@staticfloat do the osx nightly builders have autoconf installed? tarballs of git from github don't include the configure script, it needs to be generated.

@staticfloat
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If they don't we can ask for brew to install it beforehand, like we do with gcc and cmake.

@tkelman
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

found a different solution that should work. note to whoever backports this, squash this commit with a3d95db

@tkelman
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

backported in abb6931

Please sign in to comment.