diff --git a/.gitignore b/.gitignore index 6067b57..d4de9c4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /omping-0.0.1.tar.gz /omping-0.0.2.tar.gz +/omping-0.0.3.tar.gz diff --git a/omping-001-getifaddrs-may-return-NULL-ifa_addr.patch b/omping-001-getifaddrs-may-return-NULL-ifa_addr.patch deleted file mode 100644 index a80a0f0..0000000 --- a/omping-001-getifaddrs-may-return-NULL-ifa_addr.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 220749b10250154f95aa05c8b948cbe7015a2daa Mon Sep 17 00:00:00 2001 -From: Jan Friesse -Date: Thu, 14 Apr 2011 13:53:08 +0200 -Subject: [PATCH] getifaddrs may return NULL ifa_addr - -Such ifa_addr is then dereferenced to find out address family. -Proper check is added now. - -Resolves: tt#31 ---- - addrfunc.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/addrfunc.c b/addrfunc.c -index d6aa3cb..77fac4c 100644 ---- a/addrfunc.c -+++ b/addrfunc.c -@@ -260,8 +260,9 @@ af_find_local_ai(const struct ai_list *ai_list, int *ip_ver, struct ifaddrs **if - TAILQ_FOREACH(aip, ai_list, entries) { - for (ai_i = aip->ai; ai_i != NULL; ai_i = ai_i->ai_next) { - for (ifa_i = ifa; ifa_i != NULL; ifa_i = ifa_i->ifa_next) { -- if (ifa_i->ifa_addr->sa_family != AF_INET && -- ifa_i->ifa_addr->sa_family != AF_INET6) { -+ if (ifa_i->ifa_addr == NULL || -+ (ifa_i->ifa_addr->sa_family != AF_INET && -+ ifa_i->ifa_addr->sa_family != AF_INET6)) { - continue ; - } - --- -1.7.3.4 - diff --git a/omping.spec b/omping.spec index a536b98..cb9b374 100644 --- a/omping.spec +++ b/omping.spec @@ -1,12 +1,11 @@ Name: omping -Version: 0.0.2 -Release: 3%{?dist} +Version: 0.0.3 +Release: 1%{?dist} Summary: Utility to test IP multicast functionality Group: Applications/Internet License: ISC URL: http://fedorahosted.org/omping/ Source0: http://fedorahosted.org/releases/o/m/omping/%{name}-%{version}.tar.gz -Patch0: omping-001-getifaddrs-may-return-NULL-ifa_addr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -15,7 +14,6 @@ primarily in local network. %prep %setup -q -%patch0 -p1 %build make %{?_smp_mflags} CFLAGS="%{optflags}" @@ -34,6 +32,9 @@ rm -rf %{buildroot} %{_mandir}/man8/* %changelog +* Mon May 02 2011 Jan Friesse - 0.0.3-1 +- Update to version 0.0.3 + * Wed Apr 14 2011 Jan Friesse - 0.0.2-3 - Resolves rhbz#696509 diff --git a/sources b/sources index 03efae2..8b65d18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -04cca9576b0b936258336997c9e4b02c omping-0.0.2.tar.gz +a21bc9636ba9945653e0df892e5c8fd1 omping-0.0.3.tar.gz