rpms/jwhois/devel jwhois-4.0-ipv6match.patch, NONE, 1.1 jwhois.spec, 1.39, 1.40

[Vitezslav Crhonek (vcrhonek)]

Author: vcrhonek

Update of /cvs/extras/rpms/jwhois/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21937

Modified Files:
	jwhois.spec 
Added Files:
	jwhois-4.0-ipv6match.patch 
Log Message:
fix buildroot, fix cidr-ipv6 matching

jwhois-4.0-ipv6match.patch:

--- NEW FILE jwhois-4.0-ipv6match.patch ---
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 at 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/extras/rpms/jwhois/devel/jwhois.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- jwhois.spec	28 Nov 2007 14:15:46 -0000	1.39
+++ jwhois.spec	6 Dec 2007 12:05:33 -0000	1.40
@@ -1,13 +1,14 @@
 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
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf automake libidn-devel
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -18,6 +19,7 @@
 %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,12 @@
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Thu Dec  6 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.0-6
+- Fix buildroot
+- Fix matching of cidr-ipv6 network addressed (patch by Lubomir
+  Kundrak <lkundrak at redhat.com>)
+  Resolves: #280941
+
 * Wed Nov 28 2007 Vitezslav Crhonek <vcrhonek at 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