- security bump for tftp vuln. CVE-2006-1061 - bug #125766

(Portage version: 2.1_pre5-r4)

7 files changed, 18 insertions, 7 deletions

diff --git a/net-misc/curl/files/curl-7.15-libtftp.patch b/net-misc/curl/files/curl-7.15-libtftp.patch
new file mode 100644
index 000000000000..c92c66417f2e
--- /dev/null
+++ b/net-misc/curl/files/curl-7.15-libtftp.patch
@@ -0,0 +1,12 @@
+diff -Nrup curl-7.15.1/lib/tftp.c curl-7.15.1/lib/tftp.c
+--- curl-7.15.1/lib/tftp.c	2005-12-05 15:10:37.000000000 -0500
++++ curl-7.15.1/lib/tftp.c	2006-03-18 20:16:02.000000000 -0500
+@@ -271,7 +271,7 @@ static void tftp_send_first(tftp_state_d
+       /* If we are downloading, send an RRQ */
+       state->spacket.event = htons(TFTP_EVENT_RRQ);
+     }
+-    sprintf((char *)state->spacket.u.request.data, "%s%c%s%c",
++    snprintf((char *)state->spacket.u.request.data, 512, "%s%c%s%c",
+             filename, '\0',  mode, '\0');
+     sbytes = 4 + (int)strlen(filename) + (int)strlen(mode);
+     sbytes = sendto(state->sockfd, (void *)&state->spacket,
diff --git a/net-misc/curl/files/digest-curl-7.13.1 b/net-misc/curl/files/digest-curl-7.13.1
deleted file mode 100644
index 1ac48c652545..000000000000
--- a/net-misc/curl/files/digest-curl-7.13.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d673f68dbab2553acdbfb5435bd1cd48 curl-7.13.1.tar.bz2 1860688
diff --git a/net-misc/curl/files/digest-curl-7.13.2 b/net-misc/curl/files/digest-curl-7.13.2
deleted file mode 100644
index 833fa116dd4b..000000000000
--- a/net-misc/curl/files/digest-curl-7.13.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 542fbdafd2fb051477fa544770b566de curl-7.11.2.tar.bz2 1141204
-MD5 5916bb359223800afa234a1cf5145b78 curl-7.13.2.tar.bz2 1891406
diff --git a/net-misc/curl/files/digest-curl-7.15.0 b/net-misc/curl/files/digest-curl-7.15.0
deleted file mode 100644
index 711cdc3ee81c..000000000000
--- a/net-misc/curl/files/digest-curl-7.15.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e3b130320d3704af375c097606f49c01 curl-7.15.0.tar.bz2 1426714
diff --git a/net-misc/curl/files/digest-curl-7.15.1-r1 b/net-misc/curl/files/digest-curl-7.15.1-r1
new file mode 100644
index 000000000000..b801ba19eb94
--- /dev/null
+++ b/net-misc/curl/files/digest-curl-7.15.1-r1
@@ -0,0 +1,3 @@
+MD5 d330d48580bfade58c82d4f295f171f0 curl-7.15.1.tar.bz2 1437950
+RMD160 c733937754b579d45de8c26cf4dfa6c5cec82fae curl-7.15.1.tar.bz2 1437950
+SHA256 8b1ea75a91ef7d1e00086865eba9a4cf8baefcb212ce451a61348e00b8756324 curl-7.15.1.tar.bz2 1437950
diff --git a/net-misc/curl/files/digest-curl-7.15.2 b/net-misc/curl/files/digest-curl-7.15.2
deleted file mode 100644
index ad92fd333c73..000000000000
--- a/net-misc/curl/files/digest-curl-7.15.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6c08e7891fe0db49af65fd10abfd69b1 curl-7.15.2.tar.bz2 1460095
-RMD160 4a9dfadc9cc7ee61c0a025a5e3bd8d83db5628bc curl-7.15.2.tar.bz2 1460095
-SHA256 5e856952b1e5ba802206e038b85da1791001c321a1a022a563639fa116222b2b curl-7.15.2.tar.bz2 1460095
diff --git a/net-misc/curl/files/digest-curl-7.15.3 b/net-misc/curl/files/digest-curl-7.15.3
new file mode 100644
index 000000000000..027befc70ff9
--- /dev/null
+++ b/net-misc/curl/files/digest-curl-7.15.3
@@ -0,0 +1,3 @@
+MD5 d71b2ee8febfde2c7dc30a43638ec0d9 curl-7.15.3.tar.bz2 1467043
+RMD160 35172fe66d5e6cc1df05e6160ffdf086448730f3 curl-7.15.3.tar.bz2 1467043
+SHA256 77771db616dee02f21b94c409ed423a72fa7f2b2d65c27395137b0f920388440 curl-7.15.3.tar.bz2 1467043