From af7d72b16c7652e9ddc3c441017de5c9bb9205f2 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Mon, 30 Jan 2017 14:50:23 -0500
Subject: gnu: tcpdump: Update to 4.9.0 [security fixes].

Fixes CVE-2016-{7922,7923,7924,7925,7926,7927,7928,7929,7930,7931,7932,7933
7934,7935,7936,7937,7938,7939,7940,7973,7974,7975,7983,7984,7985,7986,7992,7993,
8574,8575} and CVE-2017-{5202,5203,5204,5205,5341,5342,5482,5483,5484,5485,
5486}.

* gnu/packages/admin.scm (tcpdump): Update to 4.9.0.
[source]: Add alternate URL and set the file-name.
---
 gnu/packages/admin.scm | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 12aa9e70a7..96aececbbf 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -633,14 +633,24 @@ network statistics collection, security monitoring, network debugging, etc.")
 (define-public tcpdump
   (package
     (name "tcpdump")
-    (version "4.7.4")
+    (version "4.9.0")
     (source (origin
               (method url-fetch)
-              (uri (string-append "http://www.tcpdump.org/release/tcpdump-"
-                                  version ".tar.gz"))
+              ;; We use this Debian URL while the upstream URL is still
+              ;; officially private. This is the result of a botched
+              ;; coordinated release of tcpdump 4.9.0. I verified with
+              ;; the tcpdump maintainers that the upstream URL provides
+              ;; the same data as this Debian URL.
+              (uri
+                (list
+                  (string-append "http://http.debian.net/debian/pool/main/t/"
+                                  name "/" name "_" version ".orig.tar.gz")
+                  (string-append "http://www.tcpdump.org/release/tcpdump-"
+                                 version ".tar.gz")))
+              (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1byr8w6grk08fsq0444jmcz9ar89lq9nf4mjq2cny0w9k8k21rbb"))))
+                "0pjsxsy8l71i813sa934cwf1ryp9xbr7nxwsvnzavjdirchq3sga"))))
     (build-system gnu-build-system)
     (inputs `(("libpcap" ,libpcap)
               ("openssl" ,openssl)))
-- 
cgit v1.2.3

ea3ec2f8f4ee5'>gnu</a>/<a href='/guix/log/gnu/packages?id=2c1cc27f8fffa3fbce8cf75cd45ea3ec2f8f4ee5'>packages</a>/<a href='/guix/log/gnu/packages/wicd.scm?id=2c1cc27f8fffa3fbce8cf75cd45ea3ec2f8f4ee5'>wicd.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/wicd.scm?id=2c1cc27f8fffa3fbce8cf75cd45ea3ec2f8f4ee5&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2017-09-20 20:58:04 -0400'>2017-09-20</span></td><td><a href='/guix/commit/gnu/packages/wicd.scm?id=dc1d3cdef70f0e3c047c229c2a0e561d1f47bde8'>gnu: Use 'modify-phases' syntax.</a><span class='msg-avail'>...</span></td><td>Kei Kebreau</td></tr>
>Danny Milosavljevic</td></tr>
<tr><td><span title='2019-01-10 19:17:49 +0100'>2019-01-10</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=8b0c1744154f0e9a008c4e4586bfdb0876749139'>services: docker: Use more minimal service requrements.</a><span class='msg-avail'>...</span></td><td>Danny Milosavljevic</td></tr>
<tr><td><span title='2019-01-10 19:17:48 +0100'>2019-01-10</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=d3a0e74d6a303cd46b0761b5a84c8e8b290e3797'>services: docker: Clarify service-extension shepherd-root-service-type.</a><span class='msg-avail'>...</span></td><td>Danny Milosavljevic</td></tr>
<tr><td><span title='2019-01-10 05:15:42 +0100'>2019-01-10</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=f946a370edbf65baab41e8373e25157da5029a88'>services: docker: Depend on elogind.</a><span class='msg-avail'>...</span></td><td>Danny Milosavljevic</td></tr>
<tr><td><span title='2019-01-10 03:54:28 +0100'>2019-01-10</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=f0bfd0fc217a9af44b122f4e3cdf389a74594096'>services: docker: Specify log file for containerd.</a><span class='msg-avail'>...</span></td><td>Danny Milosavljevic</td></tr>
<tr><td><span title='2019-01-10 03:00:55 +0100'>2019-01-10</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=8af4c335e32fbed7556a4cd7f26f93bc66afaace'>services: Add docker.</a><span class='msg-avail'>...</span></td><td>Danny Milosavljevic</td></tr>