pool/tcpdump
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 304087 from home:AndreasStieger:branches:network:utilities

Browse Source 
tcpdump 4.7.4

OBS-URL: https://build.opensuse.org/request/show/304087
OBS-URL: https://build.opensuse.org/package/show/network:utilities/tcpdump?expand=0&rev=29
This commit is contained in:
Vítězslav Čížek 2015-04-27 19:33:27 +00:00 committed by Git OBS Bridge
parent 5213689914
commit 8e8a8911d0
7 changed files with 13 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
CVE-2015-3138.patch
View File

@ -1,41 +0,0 @@
From 3ed82f4ed0095768529afc22b923c8f7171fff70 Mon Sep 17 00:00:00 2001
From: Denis Ovsienko <denis@ovsienko.info>
Date: Wed, 25 Mar 2015 22:35:12 +0000
Subject: [PATCH] whiteboard: fixup a few reversed tests (GH #446)
This is a follow-up to commit 3a3ec26.
---
print-wb.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/print-wb.c b/print-wb.c
index 3e3b064..4fa5e38 100644
--- a/print-wb.c
+++ b/print-wb.c
@@ -201,7 +201,7 @@ wb_id(netdissect_options *ndo,
len -= sizeof(*io) * nid;
io = (struct id_off *)(id + 1);
cp = (char *)(io + nid);
- if (!ND_TTEST2(cp, len)) {
+ if (ND_TTEST2(cp, len)) {
ND_PRINT((ndo, "\""));
fn_print(ndo, (u_char *)cp, (u_char *)cp + len);
ND_PRINT((ndo, "\""));
@@ -266,7 +266,7 @@ wb_prep(netdissect_options *ndo,
}
n = EXTRACT_32BITS(&prep->pp_n);
ps = (const struct pgstate *)(prep + 1);
- while (--n >= 0 && !ND_TTEST(*ps)) {
+ while (--n >= 0 && ND_TTEST(*ps)) {
const struct id_off *io, *ie;
char c = '<';
@@ -275,7 +275,7 @@ wb_prep(netdissect_options *ndo,
ipaddr_string(ndo, &ps->page.p_sid),
EXTRACT_32BITS(&ps->page.p_uid)));
io = (struct id_off *)(ps + 1);
- for (ie = io + ps->nid; io < ie && !ND_TTEST(*io); ++io) {
+ for (ie = io + ps->nid; io < ie && ND_TTEST(*io); ++io) {
ND_PRINT((ndo, "%c%s:%u", c, ipaddr_string(ndo, &io->id),
EXTRACT_32BITS(&io->off)));
c = ',';

3
tcpdump-4.7.3.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1f87fb652ce996d41e7a06c601bc6ea29b13fee922945b23770c29490f1d8ace
size 1152383

BIN
tcpdump-4.7.3.tar.gz.sig
View File

Binary file not shown.

3
tcpdump-4.7.4.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6be520269a89036f99c0b2126713a60965953eab921002b07608ccfc0c47d9af
size 1153657

BIN
tcpdump-4.7.4.tar.gz.sig Normal file
View File

Binary file not shown.

9
tcpdump.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sun Apr 26 18:51:40 UTC 2015 - astieger@suse.com
- tcpdump 4.7.4:
* PPKI to Router Protocol: Fix Segmentation Faults and other problems
* RPKI to Router Protocol: print strings with fn_printn()
* wb: fix some bounds checks
(previously patched in, removed CVE-2015-3138.patch)
-------------------------------------------------------------------
Fri Apr 17 20:00:24 UTC 2015 - astieger@suse.com

4
tcpdump.spec
View File

@ -20,7 +20,7 @@
# for pcap_set_tstamp_precision()
%define min_libpcap_version 1.7.2
Name: tcpdump
Version: 4.7.3
Version: 4.7.4
Release: 0
Summary: A Packet Sniffer
License: BSD-3-Clause
@ -30,7 +30,6 @@ Source: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
Source1: tcpdump-qeth
Source2: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz.sig
Source3: http://www.tcpdump.org/tcpdump-workers.asc#/%{name}.keyring
Patch0: CVE-2015-3138.patch
BuildRequires: libpcap-devel >= %{min_libpcap_version}
BuildRequires: libsmi-devel
BuildRequires: openssl-devel
@ -43,7 +42,6 @@ ethernet. It can be used to debug specific network problems.
%prep
%setup -q
%patch0 -p1
%build
export CFLAGS="%{optflags} -Wall -DGUESS_TSO -fstack-protector -fno-strict-aliasing"