Permalink
Browse files

git:

 * bump version to [https://raw.github.com/git/git/master/Documentation/RelNotes/1.9.0.txt 1.9.0]


git-svn-id: file:///var/svn/freetz/trunk@11749 149334a1-2f27-0410-a3b9-fc62619ac1e6
  • Loading branch information...
1 parent a0ba795 commit 5b017fc91fdb6dc04cdcb1f130b03c898c29deb3 er13 committed Feb 16, 2014
View
@@ -66,7 +66,7 @@ Latest changes:
* e2fsprogs 1.42.8
* ffmpeg 1.2.4
* gdb 7.6.2
- * git 1.8.5.4
+ * git 1.9.0
* gmp 5.1.3
* HAProxy 1.5-dev21
* haserl 0.9.32
View
@@ -1,5 +1,5 @@
config FREETZ_PACKAGE_GIT
- bool "git 1.8.5.4"
+ bool "git 1.9.0"
select FREETZ_BUSYBOX_START_STOP_DAEMON
select FREETZ_LIB_libpthread
select FREETZ_LIB_libcurl
View
@@ -1,6 +1,6 @@
-$(call PKG_INIT_BIN, 1.8.5.4)
+$(call PKG_INIT_BIN, 1.9.0)
$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.gz
-$(PKG)_SOURCE_SHA1:=cbf14318ee9652232489982bb2da15d2e5ebb580
+$(PKG)_SOURCE_SHA1:=e60667fc16e5a5f1cde46616b0458cc802707743
$(PKG)_SITE:=http://git-core.googlecode.com/files
# files to be moved from /usr/lib/git-core to /usr/bin
@@ -1,14 +1,14 @@
--- Makefile
+++ Makefile
-@@ -1731,6 +1731,7 @@
+@@ -1728,6 +1728,7 @@
$(BUILT_INS): git$X
$(QUIET_BUILT_IN)$(RM) $@ && \
+ test -z "$(NO_INSTALL_HARDLINKS)" && \
ln $< $@ 2>/dev/null || \
ln -s $< $@ 2>/dev/null || \
cp $< $@
-@@ -2056,6 +2057,7 @@
+@@ -2063,6 +2064,7 @@
$(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
$(QUIET_LNCP)$(RM) $@ && \
@@ -18,7 +18,7 @@
for ac_prog in gar ar
--- Makefile
+++ Makefile
-@@ -1079,16 +1079,6 @@
+@@ -1075,16 +1075,6 @@
PTHREAD_LIBS =
endif
@@ -35,7 +35,7 @@
ifdef NO_LIBGEN_H
COMPAT_CFLAGS += -DNO_LIBGEN_H
COMPAT_OBJS += compat/basename.o
-@@ -1098,7 +1088,7 @@
+@@ -1094,7 +1084,7 @@
BASIC_CFLAGS += -DUSE_LIBPCRE
ifdef LIBPCREDIR
BASIC_CFLAGS += -I$(LIBPCREDIR)/include
@@ -44,7 +44,7 @@
endif
EXTLIBS += -lpcre
endif
-@@ -1112,7 +1102,7 @@
+@@ -1108,7 +1098,7 @@
ifdef CURLDIR
# Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
BASIC_CFLAGS += -I$(CURLDIR)/include
@@ -53,7 +53,7 @@
else
CURL_LIBCURL = -lcurl
endif
-@@ -1140,7 +1130,7 @@
+@@ -1136,7 +1126,7 @@
ifndef NO_EXPAT
ifdef EXPATDIR
BASIC_CFLAGS += -I$(EXPATDIR)/include
@@ -62,7 +62,7 @@
else
EXPAT_LIBEXPAT = -lexpat
endif
-@@ -1152,7 +1142,7 @@
+@@ -1148,7 +1138,7 @@
ifdef ZLIB_PATH
BASIC_CFLAGS += -I$(ZLIB_PATH)/include
@@ -71,7 +71,7 @@
endif
EXTLIBS += -lz
-@@ -1160,7 +1150,7 @@
+@@ -1156,7 +1146,7 @@
OPENSSL_LIBSSL = -lssl
ifdef OPENSSLDIR
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
@@ -80,7 +80,7 @@
else
OPENSSL_LINK =
endif
-@@ -1187,7 +1177,7 @@
+@@ -1183,7 +1173,7 @@
ifdef NEEDS_LIBICONV
ifdef ICONVDIR
BASIC_CFLAGS += -I$(ICONVDIR)/include
@@ -1,6 +1,6 @@
--- Makefile
+++ Makefile
-@@ -1841,7 +1841,7 @@
+@@ -1848,7 +1848,7 @@
autoconf -o configure configure.ac+ && \
$(RM) configure.ac+

0 comments on commit 5b017fc

Please sign in to comment.