Changeset 40879


Ignore:
Timestamp:
2014-05-29T13:52:54+02:00 (4 years ago)
Author:
tripolar
Message:

[packages] git: update to 2.0.0

Signed-off-by: Peter Wagner <tripolar@…>

Location:
packages/net/git
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • packages/net/git/Makefile

    r40750 r40879  
    99 
    1010PKG_NAME:=git 
    11 PKG_VERSION:=1.9.3 
     11PKG_VERSION:=2.0.0 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz 
    1515PKG_SOURCE_URL:=@KERNEL/software/scm/git/ 
    16 PKG_MD5SUM:=560200d1db05a2dd2b8a2b3718655463 
     16PKG_MD5SUM:=0646202ae979e4339f3e47f2375b5773 
    1717 
    1818PKG_INSTALL:=1 
  • packages/net/git/patches/100-convert_builtin.patch

    r40450 r40879  
    11--- a/Makefile 
    22+++ b/Makefile 
    3 @@ -536,16 +536,7 @@ EXTRA_PROGRAMS = 
     3@@ -532,16 +532,7 @@ EXTRA_PROGRAMS = 
    44 # ... and all the rest that could be moved out of bindir to gitexecdir 
    55 PROGRAMS += $(EXTRA_PROGRAMS) 
     
    1919 # Binary suffix, set to .exe for Windows builds 
    2020 X = 
    21 @@ -993,6 +984,12 @@ BUILTIN_OBJS += builtin/var.o 
     21@@ -1002,6 +993,12 @@ BUILTIN_OBJS += builtin/var.o 
    2222 BUILTIN_OBJS += builtin/verify-pack.o 
    2323 BUILTIN_OBJS += builtin/verify-tag.o 
     
    3232 GITLIBS = $(LIB_FILE) $(XDIFF_LIB) 
    3333 EXTLIBS = 
    34 @@ -1156,7 +1153,7 @@ endif 
     34@@ -1165,7 +1162,7 @@ endif 
    3535 EXTLIBS += -lz 
    3636  
     
    4141                BASIC_CFLAGS += -I$(OPENSSLDIR)/include 
    4242                OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib) 
    43 @@ -2054,10 +2051,6 @@ endif 
     43@@ -2049,10 +2046,6 @@ endif 
    4444 git-%$X: %.o GIT-LDFLAGS $(GITLIBS) 
    4545        $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) 
     
    5252        $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ 
    5353                $(LIBS) $(CURL_LIBCURL) 
    54 @@ -2366,24 +2359,22 @@ endif 
     54@@ -2364,24 +2357,22 @@ endif 
    5555        bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \ 
    5656        execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \ 
     
    119119--- a/daemon.c 
    120120+++ b/daemon.c 
    121 @@ -1148,7 +1148,7 @@ static int serve(struct string_list *lis 
     121@@ -1125,7 +1125,7 @@ static int serve(struct string_list *lis 
    122122        return service_loop(&socklist); 
    123123 } 
     
    130130--- a/fast-import.c 
    131131+++ b/fast-import.c 
    132 @@ -3365,7 +3365,7 @@ static void parse_argv(void) 
     132@@ -3356,7 +3356,7 @@ static void parse_argv(void) 
    133133                read_marks(); 
    134134 } 
     
    223223--- a/upload-pack.c 
    224224+++ b/upload-pack.c 
    225 @@ -781,7 +781,7 @@ static int upload_pack_config(const char 
     225@@ -790,7 +790,7 @@ static int upload_pack_config(const char 
    226226        return parse_hide_refs_config(var, value, "uploadpack"); 
    227227 } 
Note: See TracChangeset for help on using the changeset viewer.