- Update to 1.6.3.3 - remove now unnecessary patch for DoS issue.

4 files changed, 11 insertions, 68 deletions

diff --git a/devel/git/Makefile b/devel/git/Makefile
index 779e6432b298..3569c2e6b5fe 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	git
-PORTVERSION=	1.6.3.2
-PORTREVISION=	1
+PORTVERSION=	1.6.3.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_KERNEL_ORG}
 MASTER_SITE_SUBDIR=	software/scm/${PORTNAME}
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 30c5d3bc0e1a..9bc24c315fdd 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,9 +1,9 @@
-MD5 (git-1.6.3.2.tar.bz2) = 149948ff33fb7d8cf9eef925e6c08157
-SHA256 (git-1.6.3.2.tar.bz2) = 82f02697f108062c05d8edab4a57eb24c18205024ef6c3e7dc03bf2bcb148882
-SIZE (git-1.6.3.2.tar.bz2) = 2059586
-MD5 (git-manpages-1.6.3.2.tar.bz2) = 2fb5ba5cabe0057470d577d2d4ff4816
-SHA256 (git-manpages-1.6.3.2.tar.bz2) = bc8b815ef7624c2eb013327687b9016e8e127d4d56d2c8fe86c81f25751842d0
-SIZE (git-manpages-1.6.3.2.tar.bz2) = 243535
-MD5 (git-1.6.3.2.tar.bz2.sign) = 9800e14a0863b17511431eb02c3e3268
-SHA256 (git-1.6.3.2.tar.bz2.sign) = bfe3fbe32cacc64eee2a6444341a244a7bb656198b41dac355ffe83f485f0162
-SIZE (git-1.6.3.2.tar.bz2.sign) = 248
+MD5 (git-1.6.3.3.tar.bz2) = 91ae46ac01dadab1962beb064abd5b60
+SHA256 (git-1.6.3.3.tar.bz2) = f94bc0d1fc861a12c7fb821b27a4e6a80901e84432cdb7894cb7a437d4c939ad
+SIZE (git-1.6.3.3.tar.bz2) = 2061691
+MD5 (git-manpages-1.6.3.3.tar.bz2) = 36be16310d1e24f23c966c8e17a499d7
+SHA256 (git-manpages-1.6.3.3.tar.bz2) = a05a18f448a327137e1d6b04175caaabcc9c88f8327290b8f82b69119db39330
+SIZE (git-manpages-1.6.3.3.tar.bz2) = 243822
+MD5 (git-1.6.3.3.tar.bz2.sign) = 5679dd5fa62c6abd878d53fc7e3913ad
+SHA256 (git-1.6.3.3.tar.bz2.sign) = 872d40ec4a9dc04a78f4ee010387fcb582faf5fa572be023cc96466c918f5e77
+SIZE (git-1.6.3.3.tar.bz2.sign) = 248
diff --git a/devel/git/files/patch-dos b/devel/git/files/patch-dos
deleted file mode 100644
index be68c253c86a..000000000000
--- a/devel/git/files/patch-dos
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git connect.c.orig connect.c
-index f6b8ba6..958c831 100644
---- connect.c.orig
-+++ connect.c
-@@ -579,7 +579,10 @@ struct child_process *git_connect(int fd[2], const char *url_orig,
- 			git_tcp_connect(fd, host, flags);
- 		/*
- 		 * Separate original protocol components prog and path
--		 * from extended components with a NUL byte.
-+		 * from extended host header with a NUL byte.
-+		 *
-+		 * Note: Do not add any other headers here!  Doing so
-+		 * will cause older git-daemon servers to crash.
- 		 */
- 		packet_write(fd[1],
- 			     "%s %s%chost=%s%c",
-diff --git daemon.c.orig daemon.c
-index daa4c8e..b2babcc 100644
---- daemon.c.orig
-+++ daemon.c
-@@ -406,15 +406,15 @@ static char *xstrdup_tolower(const char *str)
- }
- 
- /*
-- * Separate the "extra args" information as supplied by the client connection.
-+ * Read the host as supplied by the client connection.
-  */
--static void parse_extra_args(char *extra_args, int buflen)
-+static void parse_host_arg(char *extra_args, int buflen)
- {
- 	char *val;
- 	int vallen;
- 	char *end = extra_args + buflen;
- 
--	while (extra_args < end && *extra_args) {
-+	if (extra_args < end && *extra_args) {
- 		saw_extended_args = 1;
- 		if (strncasecmp("host=", extra_args, 5) == 0) {
- 			val = extra_args + 5;
-@@ -436,6 +436,8 @@ static void parse_extra_args(char *extra_args, int buflen)
- 			/* On to the next one */
- 			extra_args = val + vallen;
- 		}
-+		if (extra_args < end && *extra_args)
-+			die("Invalid request");
- 	}
- 
- 	/*
-@@ -545,7 +547,7 @@ static int execute(struct sockaddr *addr)
- 	hostname = canon_hostname = ip_address = tcp_port = NULL;
- 
- 	if (len != pktlen)
--		parse_extra_args(line + len + 1, pktlen - len - 1);
-+		parse_host_arg(line + len + 1, pktlen - len - 1);
- 
- 	for (i = 0; i < ARRAY_SIZE(daemon_service); i++) {
- 		struct daemon_service *s = &(daemon_service[i]);
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 6b454c94bd51..5f4e95a7bd25 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -698,6 +698,7 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.3.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.3.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.3.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.3.3.txt
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/INSTALL
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/README
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/git-favicon.png