Attachment 277131 Details for Bug 280941 – Proposed fix

[patch] Proposed fix

jwhois-280941.patch (text/plain), 2.13 KB, created by Lubomir Kundrak on 2007-12-04 16:21:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lubomir Kundrak

Created: 2007-12-04 16:21:08 UTC

Size: 2.13 KB

patch

obsolete

>Index: jwhois-4.0-ipv6match.patch
>===================================================================
>RCS file: jwhois-4.0-ipv6match.patch
>diff -N jwhois-4.0-ipv6match.patch
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jwhois-4.0-ipv6match.patch	4 Dec 2007 16:19:00 -0000
>@@ -0,0 +1,15 @@
>+When IPv6 address mask did not end on an octed boundary, the the opposite
>+part of last byte of host address was taken into account when a match was
>+attempted. -- Lubomir Kundrak <lkundrak@redhat.com>
>+
>+--- jwhois-4.0/src/lookup.c.ipv6-match	2007-12-04 17:09:57.000000000 +0100
>++++ jwhois-4.0/src/lookup.c	2007-12-04 17:10:20.000000000 +0100
>+@@ -149,7 +149,7 @@ static int ipv6_address_is_in_network(co
>+     }
>+   /* i == bits / 8 */
>+   if (bits % 8 != 0
>+-      && (addr->s6_addr[i] & (0xFFu << (bits % 8))) != net->s6_addr[i])
>++      && (addr->s6_addr[i] & (0xFFu << 8-(bits % 8))) != net->s6_addr[i])
>+     return 0;
>+   return 1;
>+ }
>Index: jwhois.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/jwhois/devel/jwhois.spec,v
>retrieving revision 1.39
>diff -u -p -r1.39 jwhois.spec
>--- jwhois.spec	28 Nov 2007 14:15:46 -0000	1.39
>+++ jwhois.spec	4 Dec 2007 16:19:00 -0000
>@@ -1,9 +1,10 @@
> Name: jwhois
> Version: 4.0
>-Release: 5%{?dist}
>+Release: 6%{?dist}
> URL: http://www.gnu.org/software/jwhois/
> Source0: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz
> Patch0: jwhois-4.0-connect.patch
>+Patch1: jwhois-4.0-ipv6match.patch
> License: GPLv3
> Group: Applications/Internet
> Summary: Internet whois/nicname client
>@@ -18,6 +19,7 @@ A whois client that accepts both traditi
> %prep
> %setup -q
> %patch0 -p1 -b .connect
>+%patch1 -p1 -b .ipv6match
> 
> iconv -f iso-8859-1 -t utf-8 < doc/sv/jwhois.1 > doc/sv/jwhois.1_
> mv doc/sv/jwhois.1_ doc/sv/jwhois.1
>@@ -57,6 +59,9 @@ fi
> rm -fr $RPM_BUILD_ROOT
> 
> %changelog
>+* Tue Dec 03 2007 Lubomir Kundrak <lkundrak@redhat.com> - 4.0-6
>+- Fix matching of cidr-ipv6 network addressed (#280941)
>+
> * Wed Nov 28 2007 Vitezslav Crhonek <vcrhonek@redhat.com> - 4.0-5
> - Merge review: add _smp_mflag, remove RPM_BUILD_ROOT test in istall
>   and clean, remove Obsoletes:, fix use of %% in changelog

Actions: View | Diff

Attachments on bug 280941: 277131