From ff1157bc5c62d8f23a6afdc6494a0bc221554e81 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 1 Nov 2013 22:22:01 -0400 Subject: [PATCH] debian/diff: add missing #include to connect.c A misresolved merge conflict dropped #include "tcp.h" from connect.c between 1.8.4.2-1 and 1.8.5~rc0-1, which results in these build warnings: CC connect.o connect.c: In function 'git_connect': connect.c:379:3: warning: implicit declaration of function 'git_use_proxy' [-Wimplicit-function-declaration] connect.c:380:4: warning: implicit declaration of function 'git_proxy_connect' [-Wimplicit-function-declaration] connect.c:380:9: warning: assignment makes pointer from integer without a cast [enabled by default] connect.c:382:4: warning: implicit declaration of function 'git_tcp_connect' [-Wimplicit-function-declaration] Obviously this was a silly accident, but it will cause runtime crashes on some architectures (https://wiki.debian.org/ImplicitPointerConversions), as well as rejection on at least the Ubuntu amd64 buildds via a build log filter. Fixes: http://bugs.debian.org/728508 Signed-off-by: Jonathan Nieder --- debian/changelog | 8 ++++++++ ...port-expose-git_tcp_connect-and-friends-in-new-t.diff | 16 ++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index a5a026d8c3..cb88927936 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +git (1:1.8.5~rc0-1.1) experimental; urgency=low + + [ Anders Kaseorg ] + * debian/diff/0003-transport-expose-git_tcp_connect-...diff: + include tcp.h before using tcp functions (closes: #728508). + + -- Jonathan Nieder Mon, 04 Nov 2013 13:42:35 -0500 + git (1:1.8.5~rc0-1) experimental; urgency=low * new upstream release candidate. diff --git a/debian/diff/0003-transport-expose-git_tcp_connect-and-friends-in-new-t.diff b/debian/diff/0003-transport-expose-git_tcp_connect-and-friends-in-new-t.diff index ae19bed917..f17db0dbd5 100644 --- a/debian/diff/0003-transport-expose-git_tcp_connect-and-friends-in-new-t.diff +++ b/debian/diff/0003-transport-expose-git_tcp_connect-and-friends-in-new-t.diff @@ -13,10 +13,10 @@ library easier to understand before adding to it. Signed-off-by: Jonathan Nieder --- Makefile | 2 + - connect.c | 276 ------------------------------------------------------------- + connect.c | 277 +------------------------------------------------------------ tcp.c | 280 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tcp.h | 8 ++ - 4 files changed, 290 insertions(+), 276 deletions(-) + 4 files changed, 291 insertions(+), 276 deletions(-) create mode 100644 tcp.c create mode 100644 tcp.h @@ -41,10 +41,18 @@ index af847f8..a78f758 100644 LIB_OBJS += transport.o LIB_OBJS += transport-helper.o diff --git a/connect.c b/connect.c -index 06e88b0..aa7b3e6 100644 +index 06e88b0..da37b2c 100644 --- a/connect.c +++ b/connect.c -@@ -251,282 +251,6 @@ static enum protocol get_protocol(const char *name) +@@ -6,6 +6,7 @@ + #include "run-command.h" + #include "remote.h" + #include "connect.h" ++#include "tcp.h" + #include "url.h" + #include "string-list.h" + +@@ -251,282 +252,6 @@ static enum protocol get_protocol(const char *name) die("I don't handle protocol '%s'", name); } -- 2.11.4.GIT