rpms/openais/devel cpg-hash-collision.patch, NONE, 1.1 makefile-install-clm.patch, NONE, 1.1 openais.spec, 1.10, 1.11

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Aug 10 21:27:06 UTC 2006 

Author: sdake

Update of /cvs/dist/rpms/openais/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28306/devel

Modified Files:
	openais.spec 
Added Files:
	cpg-hash-collision.patch makefile-install-clm.patch 
Log Message:
auto-import openais-0.80-1.2 on branch devel from openais-0.80-1.2.src.rpm

cpg-hash-collision.patch:
 cpg.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE cpg-hash-collision.patch ---
>From openais-bounces at lists.osdl.org Thu Aug 10 09:40:01 2006
Return-Path: <openais-bounces at lists.osdl.org>
Received: from localhost.localdomain ([unix socket]) by
	pobox.corp.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with
	LMTPA; Thu, 10 Aug 2006 09:40:01 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254]) by localhost.localdomain (8.13.1/8.12.8) with ESMTP id
	k7ADe1G9028844; Thu, 10 Aug 2006 09:40:01 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32]) by
	int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k7ADe0TG021303; Thu, 10 Aug 2006 09:40:00 -0400
Received: from smtp.osdl.org (smtp.osdl.org [65.172.181.4]) by
	mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k7ADdloZ004053; Thu, 10 Aug
	2006 09:39:53 -0400
Received: from fire-2.osdl.org (localhost [127.0.0.1]) by smtp.osdl.org
	(8.12.8/8.12.8) with ESMTP id k7ADSpnX013631; Thu, 10 Aug 2006 06:28:56
	-0700
Received: from mx1.redhat.com (mx1.redhat.com [66.187.233.31]) by
	smtp.osdl.org (8.12.8/8.12.8) with ESMTP id k7ADSlnV013627 for
	<openais at lists.osdl.org>; Thu, 10 Aug 2006 06:28:48 -0700
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254]) by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k7ADSkMt010120 for <openais at lists.osdl.org>; Thu, 10 Aug 2006 09:28:46 -0400
Received: from pobox.surrey.redhat.com (pobox.surrey.redhat.com
	[172.16.10.17]) by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with
	ESMTP id k7ADSjIC015325 for <openais at lists.osdl.org>; Thu, 10 Aug 2006
	09:28:46 -0400
Received: from [192.168.1.2] (vpn-68-1.surrey.redhat.com [10.32.68.1]) by
	pobox.surrey.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k7ADSjZC024256 for <openais at lists.osdl.org>; Thu, 10 Aug 2006 14:28:45 +0100
Message-ID: <44DB348C.4040206 at redhat.com>
Date: Thu, 10 Aug 2006 14:28:44 +0100
From: Patrick Caulfield <pcaulfie at redhat.com>
Organization: Red Hat
User-Agent: Thunderbird 1.5 (X11/20051201)
MIME-Version: 1.0
To: openais at lists.osdl.org
X-Enigmail-Version: 0.94.0.0
Received-SPF: pass (localhost is always allowed.)
X-Spam-Status: No, hits=-10.637 required=5
	tests=AWL,OSDL_HEADER_LISTID_KNOWN,OSDL_HEADER_SPF_PASS,OSDL_HEADER_SUBJECT_BRACKETED,PATCH_SUBJECT_OSDL,PATCH_UNIFIED_DIFF_OSDL
X-Spam-Checker-Version: SpamAssassin 2.63-osdl_revision__1.94__
X-MIMEDefang-Filter: osdl$Revision: 1.142 $
Subject: [Openais] [PATCH] CPG: Fix lookup bug when hashes collide
X-BeenThere: openais at lists.osdl.org
X-Mailman-Version: 2.1.8
Precedence: list
List-Id: Open SA Forum AIS Services mailing list <openais.lists.osdl.org>
List-Unsubscribe: <https://lists.osdl.org/mailman/listinfo/openais>,
	<mailto:openais-request at lists.osdl.org?subject=unsubscribe>
List-Archive: <http://lists.osdl.org/pipermail/openais>
List-Post: <mailto:openais at lists.osdl.org>
List-Help: <mailto:openais-request at lists.osdl.org?subject=help>
List-Subscribe: <https://lists.osdl.org/mailman/listinfo/openais>,
	<mailto:openais-request at lists.osdl.org?subject=subscribe>
Content-Type: text/plain; charset="iso-8859-1"
Sender: openais-bounces at lists.osdl.org
Errors-To: openais-bounces at lists.osdl.org
X-RedHat-Spam-Score: 0 
X-Evolution-Source: imap://sdake@pobox.corp.redhat.com/
Content-Transfer-Encoding: 8bit

This patch fixes a bug in cpg where get_group() will return the wrong group
info structure if there is a hash collision.

This is a bad bug that needs fixing in whitetank as well as trunk IMHO.

-- 

patrick


Index: exec/cpg.c
===================================================================
--- exec/cpg.c	(revision 1198)
+++ exec/cpg.c	(working copy)
@@ -464,12 +464,15 @@
 {
 	struct list_head *iter;
 	struct group_info *gi = NULL;
+	struct group_info *itergi;
 	uint32_t hash = jhash(name->value, name->length, 0) % GROUP_HASH_SIZE;

 	for (iter = group_lists[hash].next; iter != &group_lists[hash]; iter = iter->next) {
-		gi = list_entry(iter, struct group_info, list);
-		if (memcmp(gi->group_name.value, name->value, name->length) == 0)
+		itergi = list_entry(iter, struct group_info, list);
+		if (memcmp(itergi->group_name.value, name->value, name->length) == 0) {
+			gi = itergi;
 			break;
+		}
 	}

 	if (!gi) {
_______________________________________________
Openais mailing list
Openais at lists.osdl.org
https://lists.osdl.org/mailman/listinfo/openais

makefile-install-clm.patch:
 Makefile |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE makefile-install-clm.patch ---
diff -uNr openais-0.80/Makefile openais-0.80-new/Makefile
--- openais-0.80/Makefile	2006-07-21 13:30:29.000000000 -0700
+++ openais-0.80-new/Makefile	2006-08-10 14:01:27.000000000 -0700
@@ -108,6 +108,7 @@
 
 	cp -a lib/libais.so $(DESTDIR)$(LIBDIR)
 	cp -a lib/libSaAmf.so $(DESTDIR)$(LIBDIR)
+	cp -a lib/libSaClm.so $(DESTDIR)$(LIBDIR)
 	cp -a lib/libSaCkpt.so $(DESTDIR)$(LIBDIR)
 	cp -a lib/libSaEvt.so $(DESTDIR)$(LIBDIR)
 	cp -a lib/libSaLck.so $(DESTDIR)$(LIBDIR)
@@ -119,6 +120,7 @@
 
 	cp -a lib/libais.so.2 $(DESTDIR)$(LIBDIR)
 	cp -a lib/libSaAmf.so.2 $(DESTDIR)$(LIBDIR)
+	cp -a lib/libSaClm.so.2 $(DESTDIR)$(LIBDIR)
 	cp -a lib/libSaCkpt.so.2 $(DESTDIR)$(LIBDIR)
 	cp -a lib/libSaEvt.so.2 $(DESTDIR)$(LIBDIR)
 	cp -a lib/libSaLck.so.2 $(DESTDIR)$(LIBDIR)


Index: openais.spec
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/openais.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openais.spec	8 Aug 2006 16:19:31 -0000	1.10
+++ openais.spec	10 Aug 2006 21:27:04 -0000	1.11
@@ -1,7 +1,7 @@
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
 Version: 0.80
-Release: 1.1
+Release: 1.2
 License: BSD
 Group: System Environment/Base
 URL: http://developer.osdl.org/dev/openais/
@@ -23,6 +23,8 @@
 Patch14: revision-1191.patch
 Patch15: revision-1192.patch
 Patch16: revision-1193.patch
+Patch17: cpg-hash-collision.patch
+Patch18: makefile-install-clm.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: i386 ppc x86_64 ppc64 ia64 s390 s390x
 Requires(pre): /usr/sbin/useradd
@@ -63,6 +65,8 @@
 %patch14 -p0
 %patch15 -p0
 %patch16 -p0
+%patch17 -p0
+%patch18 -p1
 
 %build
 # -O3 required for performance reasons
@@ -114,6 +118,7 @@
 %dir /etc/ais
 %config(noreplace) /etc/ais/openais.conf
 %config(noreplace) /etc/ais/amf.conf
+%config /etc/ld.so.conf.d/openais-*.conf
 %{_initrddir}/openais
 %dir %{_libexecdir}/lcrso
 %{_libexecdir}/lcrso/aisparser.lcrso
@@ -128,16 +133,6 @@
 %{_libexecdir}/lcrso/service_lck.lcrso
 %{_libexecdir}/lcrso/service_msg.lcrso
 %{_libexecdir}/lcrso/vsf_ykd.lcrso
-%{_mandir}/man8/openais_overview.8*
-%{_mandir}/man8/cpg_overview.8*
-%{_mandir}/man8/evs_overview.8*
-
-%files devel
-%defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/CHANGELOG
-%doc %{_docdir}/%{name}-%{version}/README.devmap
-%config /etc/ld.so.conf.d/openais-*.conf
 %dir %{_libdir}/openais
 %{_libdir}/openais/libais.so*
 %{_libdir}/openais/libcpg.so*
@@ -150,6 +145,16 @@
 %{_libdir}/openais/libSaLck.so*
 %{_libdir}/openais/libSaMsg.so*
 %{_libdir}/openais/libtotem_pg.so*
+%{_mandir}/man8/openais_overview.8*
+%{_mandir}/man8/cpg_overview.8*
+%{_mandir}/man8/evs_overview.8*
+%{_mandir}/man5/openais.conf.5*
+
+%files devel
+%defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/CHANGELOG
+%doc %{_docdir}/%{name}-%{version}/README.devmap
 %dir %{_includedir}/openais/
 %{_includedir}/openais/cpg.h
 %{_includedir}/openais/cfg.h
@@ -176,7 +181,6 @@
 %{_includedir}/openais/service/print.h
 %{_includedir}/openais/service/swab.h
 %{_includedir}/openais/service/service.h
-%{_mandir}/man5/openais.conf.5*
 %{_mandir}/man3/cpg_dispatch.3*
 %{_mandir}/man3/cpg_fd_get.3*
 %{_mandir}/man3/cpg_finalize.3*
@@ -196,7 +200,12 @@
 %{_mandir}/man3/evs_membership_get.3*
 
 %changelog
-* Tue Aug 8 2006 Steven Dake <sdake at redhat.com>  - 0.80-1.1
+* Thu Aug 10 2006 Steven Dake <sdake at redhat.com> - 0.80-1.2
+- Move libraries to openais package.
+- Add cpg hash collision patch.
+- Add makefile install clm patch.
+
+* Tue Aug 8 2006 Steven Dake <sdake at redhat.com> - 0.80-1.1
 - New process of tracking any revisions in the upstream stable branch.
 
 * Sun Jul 23 2006 Steven Dake <sdake at redhat.com> - 0.80-1.0

More information about the fedora-cvs-commits mailing list