Changeset 37138


Ignore:
Timestamp:
2013-07-03T01:13:28+02:00 (5 years ago)
Author:
tripolar
Message:

[packages]: update git to v1.8.3.2

Location:
packages/net/git
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • packages/net/git/Makefile

    r32733 r37138  
    99 
    1010PKG_NAME:=git 
    11 PKG_VERSION:=1.7.11.2 
     11PKG_VERSION:=1.8.3.2 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1515PKG_SOURCE_URL:=http://git-core.googlecode.com/files/ 
    16 PKG_MD5SUM:=91e01a22032f5d0ca2941ae7fd49d587 
     16PKG_MD5SUM:=83b792fd06066c77e1d4911ebba2d701 
    1717 
    1818PKG_INSTALL:=1 
  • packages/net/git/patches/100-convert_builtin.patch

    r32733 r37138  
    1 --- /dev/null 
    2 +++ b/builtin/daemon.c 
    3 @@ -0,0 +1 @@ 
    4 +#include "../daemon.c" 
    5 --- /dev/null 
    6 +++ b/builtin/fast-import.c 
    7 @@ -0,0 +1 @@ 
    8 +#include "../fast-import.c" 
    9 --- /dev/null 
    10 +++ b/builtin/http-backend.c 
    11 @@ -0,0 +1 @@ 
    12 +#include "../http-backend.c" 
    13 --- /dev/null 
    14 +++ b/builtin/imap-send.c 
    15 @@ -0,0 +1 @@ 
    16 +#include "../imap-send.c" 
    17 --- /dev/null 
    18 +++ b/builtin/shell.c 
    19 @@ -0,0 +1 @@ 
    20 +#include "../shell.c" 
    21 --- /dev/null 
    22 +++ b/builtin/upload-pack.c 
    23 @@ -0,0 +1 @@ 
    24 +#include "../upload-pack.c" 
    25 --- a/builtin.h 
    26 +++ b/builtin.h 
    27 @@ -153,5 +153,11 @@ extern int cmd_verify_pack(int argc, con 
    28  extern int cmd_show_ref(int argc, const char **argv, const char *prefix); 
    29  extern int cmd_pack_refs(int argc, const char **argv, const char *prefix); 
    30  extern int cmd_replace(int argc, const char **argv, const char *prefix); 
    31 +extern int cmd_daemon(int argc, char **argv, const char *prefix); 
    32 +extern int cmd_fast_import(int argc, const char **argv, const char *prefix); 
    33 +extern int cmd_http_backend(int argc, char **argv, const char *prefix); 
    34 +extern int cmd_imap_send(int argc, char **argv, const char *prefix); 
    35 +extern int cmd_shell(int argc, char **argv, const char *prefix); 
    36 +extern int cmd_upload_pack(int argc, char **argv, const char *prefix); 
    37   
    38  #endif 
    39 --- a/daemon.c 
    40 +++ b/daemon.c 
    41 @@ -1091,7 +1091,7 @@ static int serve(struct string_list *lis 
    42         return service_loop(&socklist); 
    43  } 
    44   
    45 -int main(int argc, char **argv) 
    46 +int cmd_daemon(int argc, char **argv, const char *prefix) 
    47  { 
    48         int listen_port = 0; 
    49         struct string_list listen_addr = STRING_LIST_INIT_NODUP; 
    50 --- a/fast-import.c 
    51 +++ b/fast-import.c 
    52 @@ -3347,7 +3347,7 @@ static void parse_argv(void) 
    53                 read_marks(); 
    54  } 
    55   
    56 -int main(int argc, const char **argv) 
    57 +int cmd_fast_import(int argc, const char **argv, const char *prefix) 
    58  { 
    59         unsigned int i; 
    60   
    61 --- a/http-backend.c 
    62 +++ b/http-backend.c 
    63 @@ -533,7 +533,7 @@ static struct service_cmd { 
    64         {"POST", "/git-receive-pack$", service_rpc} 
    65  }; 
    66   
    67 -int main(int argc, char **argv) 
    68 +int cmd_http_backend(int argc, char **argv, const char *prefix) 
    69  { 
    70         char *method = getenv("REQUEST_METHOD"); 
    71         char *dir; 
    72 --- a/imap-send.c 
    73 +++ b/imap-send.c 
    74 @@ -1502,7 +1502,7 @@ static int git_imap_config(const char *k 
    75         return 0; 
    76  } 
    77   
    78 -int main(int argc, char **argv) 
    79 +int cmd_imap_send(int argc, char **argv, const char *prefix) 
    80  { 
    81         struct msg_data all_msgs, msg; 
    82         struct store *ctx = NULL; 
    83 --- a/shell.c 
    84 +++ b/shell.c 
    85 @@ -129,7 +129,7 @@ static struct commands { 
    86         { NULL }, 
    87  }; 
    88   
    89 -int main(int argc, char **argv) 
    90 +int cmd_shell(int argc, char **argv, const char *prefix) 
    91  { 
    92         char *prog; 
    93         const char **user_argv; 
    94 --- a/upload-pack.c 
    95 +++ b/upload-pack.c 
    96 @@ -785,7 +785,7 @@ static void upload_pack(void) 
    97         } 
    98  } 
    99   
    100 -int main(int argc, char **argv) 
    101 +int cmd_upload_pack(int argc, char **argv, const char *prefix) 
    102  { 
    103         char *dir; 
    104         int i; 
    105 --- a/git.c 
    106 +++ b/git.c 
    107 @@ -269,11 +269,11 @@ const char git_version_string[] = GIT_VE 
    108   
    109  struct cmd_struct { 
    110         const char *cmd; 
    111 -       int (*fn)(int, const char **, const char *); 
    112 +       int (*fn)(int, char **, const char *); 
    113         int option; 
    114  }; 
    115   
    116 -static int run_builtin(struct cmd_struct *p, int argc, const char **argv) 
    117 +static int run_builtin(struct cmd_struct *p, int argc, char **argv) 
    118  { 
    119         int status, help; 
    120         struct stat st; 
    121 @@ -326,7 +326,7 @@ static int run_builtin(struct cmd_struct 
    122         return 0; 
    123  } 
    124   
    125 -static void handle_internal_command(int argc, const char **argv) 
    126 +static void handle_internal_command(int argc, char **argv) 
    127  { 
    128         const char *cmd = argv[0]; 
    129         static struct cmd_struct commands[] = { 
    130 @@ -353,12 +353,14 @@ static void handle_internal_command(int 
    131                 { "commit-tree", cmd_commit_tree, RUN_SETUP }, 
    132                 { "config", cmd_config, RUN_SETUP_GENTLY }, 
    133                 { "count-objects", cmd_count_objects, RUN_SETUP }, 
    134 +               { "daemon", cmd_daemon }, 
    135                 { "describe", cmd_describe, RUN_SETUP }, 
    136                 { "diff", cmd_diff }, 
    137                 { "diff-files", cmd_diff_files, RUN_SETUP | NEED_WORK_TREE }, 
    138                 { "diff-index", cmd_diff_index, RUN_SETUP }, 
    139                 { "diff-tree", cmd_diff_tree, RUN_SETUP }, 
    140                 { "fast-export", cmd_fast_export, RUN_SETUP }, 
    141 +               { "fast-import", cmd_fast_import }, 
    142                 { "fetch", cmd_fetch, RUN_SETUP }, 
    143                 { "fetch-pack", cmd_fetch_pack, RUN_SETUP }, 
    144                 { "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP }, 
    145 @@ -371,6 +373,8 @@ static void handle_internal_command(int 
    146                 { "grep", cmd_grep, RUN_SETUP_GENTLY }, 
    147                 { "hash-object", cmd_hash_object }, 
    148                 { "help", cmd_help }, 
    149 +               { "http-backend", cmd_http_backend }, 
    150 +               { "imap-send", cmd_imap_send }, 
    151                 { "index-pack", cmd_index_pack, RUN_SETUP_GENTLY }, 
    152                 { "init", cmd_init_db }, 
    153                 { "init-db", cmd_init_db }, 
    154 @@ -419,6 +423,7 @@ static void handle_internal_command(int 
    155                 { "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE }, 
    156                 { "rm", cmd_rm, RUN_SETUP }, 
    157                 { "send-pack", cmd_send_pack, RUN_SETUP }, 
    158 +               { "shell", cmd_shell }, 
    159                 { "shortlog", cmd_shortlog, RUN_SETUP_GENTLY | USE_PAGER }, 
    160                 { "show", cmd_show, RUN_SETUP }, 
    161                 { "show-branch", cmd_show_branch, RUN_SETUP }, 
    162 @@ -436,6 +441,7 @@ static void handle_internal_command(int 
    163                 { "update-server-info", cmd_update_server_info, RUN_SETUP }, 
    164                 { "upload-archive", cmd_upload_archive }, 
    165                 { "upload-archive--writer", cmd_upload_archive_writer }, 
    166 +               { "upload-pack", cmd_upload_pack }, 
    167                 { "var", cmd_var, RUN_SETUP_GENTLY }, 
    168                 { "verify-pack", cmd_verify_pack }, 
    169                 { "verify-tag", cmd_verify_tag, RUN_SETUP }, 
     1diff --git a/Makefile b/Makefile 
     2index 0f931a2..d6c718f 100644 
    1703--- a/Makefile 
    1714+++ b/Makefile 
    172 @@ -467,15 +467,7 @@ EXTRA_PROGRAMS = 
     5@@ -529,16 +529,7 @@ EXTRA_PROGRAMS = 
    1736 # ... and all the rest that could be moved out of bindir to gitexecdir 
    1747 PROGRAMS += $(EXTRA_PROGRAMS) 
     
    18316-PROGRAM_OBJS += show-index.o 
    18417-PROGRAM_OBJS += upload-pack.o 
     18-PROGRAM_OBJS += remote-testsvn.o 
    18519+PROGRAM_OBJS = 
    18620  
    18721 # Binary suffix, set to .exe for Windows builds 
    18822 X = 
    189 @@ -903,6 +895,12 @@ BUILTIN_OBJS += builtin/var.o 
     23@@ -977,6 +968,12 @@ BUILTIN_OBJS += builtin/var.o 
    19024 BUILTIN_OBJS += builtin/verify-pack.o 
    19125 BUILTIN_OBJS += builtin/verify-tag.o 
     
    20034 GITLIBS = $(LIB_FILE) $(XDIFF_LIB) 
    20135 EXTLIBS = 
    202 @@ -1502,7 +1500,7 @@ endif 
     36@@ -1135,7 +1132,7 @@ endif 
    20337 EXTLIBS += -lz 
    20438  
     
    20943                BASIC_CFLAGS += -I$(OPENSSLDIR)/include 
    21044                OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib) 
    211 @@ -2287,10 +2285,6 @@ endif 
     45@@ -2009,10 +2006,6 @@ endif 
    21246 git-%$X: %.o GIT-LDFLAGS $(GITLIBS) 
    21347        $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) 
     
    22054        $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ 
    22155                $(LIBS) $(CURL_LIBCURL) 
    222 @@ -2587,24 +2581,22 @@ endif 
     56@@ -2323,24 +2316,22 @@ endif 
    22357        bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \ 
    22458        execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \ 
     
    24781                cp "$$execdir/git$X" "$$execdir/$$p" || exit; \ 
    24882        done && \ 
     83diff --git a/builtin.h b/builtin.h 
     84index faef559..f2e9d26 100644 
     85--- a/builtin.h 
     86+++ b/builtin.h 
     87@@ -146,5 +146,11 @@ extern int cmd_verify_pack(int argc, const char **argv, const char *prefix); 
     88 extern int cmd_show_ref(int argc, const char **argv, const char *prefix); 
     89 extern int cmd_pack_refs(int argc, const char **argv, const char *prefix); 
     90 extern int cmd_replace(int argc, const char **argv, const char *prefix); 
     91+extern int cmd_daemon(int argc, char **argv, const char *prefix); 
     92+extern int cmd_fast_import(int argc, const char **argv, const char *prefix); 
     93+extern int cmd_http_backend(int argc, char **argv, const char *prefix); 
     94+extern int cmd_imap_send(int argc, char **argv, const char *prefix); 
     95+extern int cmd_shell(int argc, char **argv, const char *prefix); 
     96+extern int cmd_upload_pack(int argc, char **argv, const char *prefix); 
     97  
     98 #endif 
     99diff --git a/builtin/daemon.c b/builtin/daemon.c 
     100new file mode 100644 
     101index 0000000..b1d8113 
     102--- /dev/null 
     103+++ b/builtin/daemon.c 
     104@@ -0,0 +1 @@ 
     105+#include "../daemon.c" 
     106diff --git a/builtin/fast-import.c b/builtin/fast-import.c 
     107new file mode 100644 
     108index 0000000..12e1c10 
     109--- /dev/null 
     110+++ b/builtin/fast-import.c 
     111@@ -0,0 +1 @@ 
     112+#include "../fast-import.c" 
     113diff --git a/builtin/http-backend.c b/builtin/http-backend.c 
     114new file mode 100644 
     115index 0000000..f8780e8 
     116--- /dev/null 
     117+++ b/builtin/http-backend.c 
     118@@ -0,0 +1 @@ 
     119+#include "../http-backend.c" 
     120diff --git a/builtin/imap-send.c b/builtin/imap-send.c 
     121new file mode 100644 
     122index 0000000..246e2c7 
     123--- /dev/null 
     124+++ b/builtin/imap-send.c 
     125@@ -0,0 +1 @@ 
     126+#include "../imap-send.c" 
     127diff --git a/builtin/shell.c b/builtin/shell.c 
     128new file mode 100644 
     129index 0000000..deed6bf 
     130--- /dev/null 
     131+++ b/builtin/shell.c 
     132@@ -0,0 +1 @@ 
     133+#include "../shell.c" 
     134diff --git a/builtin/upload-pack.c b/builtin/upload-pack.c 
     135new file mode 100644 
     136index 0000000..14d020a 
     137--- /dev/null 
     138+++ b/builtin/upload-pack.c 
     139@@ -0,0 +1 @@ 
     140+#include "../upload-pack.c" 
     141diff --git a/daemon.c b/daemon.c 
     142index 6aeddcb..71500cf 100644 
     143--- a/daemon.c 
     144+++ b/daemon.c 
     145@@ -1160,7 +1160,7 @@ static int serve(struct string_list *listen_addr, int listen_port, 
     146        return service_loop(&socklist); 
     147 } 
     148  
     149-int main(int argc, char **argv) 
     150+int cmd_daemon(int argc, char **argv, const char *prefix) 
     151 { 
     152        int listen_port = 0; 
     153        struct string_list listen_addr = STRING_LIST_INIT_NODUP; 
     154diff --git a/fast-import.c b/fast-import.c 
     155index 5f539d7..bd4a54f 100644 
     156--- a/fast-import.c 
     157+++ b/fast-import.c 
     158@@ -3347,7 +3347,7 @@ static void parse_argv(void) 
     159                read_marks(); 
     160 } 
     161  
     162-int main(int argc, const char **argv) 
     163+int cmd_fast_import(int argc, const char **argv, const char *prefix) 
     164 { 
     165        unsigned int i; 
     166  
     167diff --git a/git.c b/git.c 
     168index 88eef5a..93751ff 100644 
     169--- a/git.c 
     170+++ b/git.c 
     171@@ -252,11 +252,11 @@ static int handle_alias(int *argcp, const char ***argv) 
     172  
     173 struct cmd_struct { 
     174        const char *cmd; 
     175-       int (*fn)(int, const char **, const char *); 
     176+       int (*fn)(int, char **, const char *); 
     177        int option; 
     178 }; 
     179  
     180-static int run_builtin(struct cmd_struct *p, int argc, const char **argv) 
     181+static int run_builtin(struct cmd_struct *p, int argc, char **argv) 
     182 { 
     183        int status, help; 
     184        struct stat st; 
     185@@ -309,7 +309,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv) 
     186        return 0; 
     187 } 
     188  
     189-static void handle_internal_command(int argc, const char **argv) 
     190+static void handle_internal_command(int argc, char **argv) 
     191 { 
     192        const char *cmd = argv[0]; 
     193        static struct cmd_struct commands[] = { 
     194@@ -337,6 +337,7 @@ static void handle_internal_command(int argc, const char **argv) 
     195                { "commit-tree", cmd_commit_tree, RUN_SETUP }, 
     196                { "config", cmd_config, RUN_SETUP_GENTLY }, 
     197                { "count-objects", cmd_count_objects, RUN_SETUP }, 
     198+               { "daemon", cmd_daemon }, 
     199                { "credential", cmd_credential, RUN_SETUP_GENTLY }, 
     200                { "describe", cmd_describe, RUN_SETUP }, 
     201                { "diff", cmd_diff }, 
     202@@ -344,6 +345,7 @@ static void handle_internal_command(int argc, const char **argv) 
     203                { "diff-index", cmd_diff_index, RUN_SETUP }, 
     204                { "diff-tree", cmd_diff_tree, RUN_SETUP }, 
     205                { "fast-export", cmd_fast_export, RUN_SETUP }, 
     206+               { "fast-import", cmd_fast_import }, 
     207                { "fetch", cmd_fetch, RUN_SETUP }, 
     208                { "fetch-pack", cmd_fetch_pack, RUN_SETUP }, 
     209                { "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP }, 
     210@@ -356,6 +358,8 @@ static void handle_internal_command(int argc, const char **argv) 
     211                { "grep", cmd_grep, RUN_SETUP_GENTLY }, 
     212                { "hash-object", cmd_hash_object }, 
     213                { "help", cmd_help }, 
     214+               { "http-backend", cmd_http_backend }, 
     215+               { "imap-send", cmd_imap_send }, 
     216                { "index-pack", cmd_index_pack, RUN_SETUP_GENTLY }, 
     217                { "init", cmd_init_db }, 
     218                { "init-db", cmd_init_db }, 
     219@@ -404,6 +408,7 @@ static void handle_internal_command(int argc, const char **argv) 
     220                { "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE }, 
     221                { "rm", cmd_rm, RUN_SETUP }, 
     222                { "send-pack", cmd_send_pack, RUN_SETUP }, 
     223+               { "shell", cmd_shell }, 
     224                { "shortlog", cmd_shortlog, RUN_SETUP_GENTLY | USE_PAGER }, 
     225                { "show", cmd_show, RUN_SETUP }, 
     226                { "show-branch", cmd_show_branch, RUN_SETUP }, 
     227@@ -421,6 +426,7 @@ static void handle_internal_command(int argc, const char **argv) 
     228                { "update-server-info", cmd_update_server_info, RUN_SETUP }, 
     229                { "upload-archive", cmd_upload_archive }, 
     230                { "upload-archive--writer", cmd_upload_archive_writer }, 
     231+               { "upload-pack", cmd_upload_pack }, 
     232                { "var", cmd_var, RUN_SETUP_GENTLY }, 
     233                { "verify-pack", cmd_verify_pack }, 
     234                { "verify-tag", cmd_verify_tag, RUN_SETUP }, 
     235diff --git a/http-backend.c b/http-backend.c 
     236index 6b85ffa..38582c9 100644 
     237--- a/http-backend.c 
     238+++ b/http-backend.c 
     239@@ -563,7 +563,7 @@ static struct service_cmd { 
     240        {"POST", "/git-receive-pack$", service_rpc} 
     241 }; 
     242  
     243-int main(int argc, char **argv) 
     244+int cmd_http_backend(int argc, char **argv, const char *prefix) 
     245 { 
     246        char *method = getenv("REQUEST_METHOD"); 
     247        char *dir; 
     248diff --git a/imap-send.c b/imap-send.c 
     249index d9bcfb4..cdcd724 100644 
     250--- a/imap-send.c 
     251+++ b/imap-send.c 
     252@@ -1366,7 +1366,7 @@ static int git_imap_config(const char *key, const char *val, void *cb) 
     253        return 0; 
     254 } 
     255  
     256-int main(int argc, char **argv) 
     257+int cmd_imap_send(int argc, char **argv, const char *prefix) 
     258 { 
     259        struct strbuf all_msgs = STRBUF_INIT; 
     260        struct strbuf msg = STRBUF_INIT; 
     261diff --git a/shell.c b/shell.c 
     262index 1429870..18e34aa 100644 
     263--- a/shell.c 
     264+++ b/shell.c 
     265@@ -142,7 +142,7 @@ static struct commands { 
     266        { NULL }, 
     267 }; 
     268  
     269-int main(int argc, char **argv) 
     270+int cmd_shell(int argc, char **argv, const char *prefix) 
     271 { 
     272        char *prog; 
     273        const char **user_argv; 
     274diff --git a/upload-pack.c b/upload-pack.c 
     275index 127e59a..7bd12b0 100644 
     276--- a/upload-pack.c 
     277+++ b/upload-pack.c 
     278@@ -788,7 +788,7 @@ static int upload_pack_config(const char *var, const char *value, void *unused) 
     279        return parse_hide_refs_config(var, value, "uploadpack"); 
     280 } 
     281  
     282-int main(int argc, char **argv) 
     283+int cmd_upload_pack(int argc, char **argv, const char *prefix) 
     284 { 
     285        char *dir; 
     286        int i; 
Note: See TracChangeset for help on using the changeset viewer.