rpms/openais/devel revision-1547.patch, NONE, 1.1 revision-1549.patch, NONE, 1.1 revision-1550.patch, NONE, 1.1 openais.spec, 1.24, 1.25

[Steven Dake (sdake)]

Author: sdake

Update of /cvs/pkgs/rpms/openais/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27612/devel

Modified Files:
	openais.spec 
Added Files:
	revision-1547.patch revision-1549.patch revision-1550.patch 
Log Message:
Patches to fix building on ppc64.


revision-1547.patch:

--- NEW FILE revision-1547.patch ---
Index: exec/service.c
===================================================================
--- exec/service.c	(revision 1545)
+++ exec/service.c	(revision 1547)
@@ -99,6 +99,9 @@
 
 struct openais_service_handler *ais_service[SERVICE_HANDLER_MAXIMUM_COUNT];
 
+static unsigned int object_internal_configuration_handle;
+
+
 static unsigned int default_services_requested (struct objdb_iface_ver0 *objdb)
 {
 	unsigned int object_service_handle;
@@ -138,7 +141,7 @@
 	unsigned int handle;
 	struct openais_service_handler *service;
 	unsigned int res;
-	unsigned int object_handle;
+	unsigned int object_service_handle;
 
 	/*
 	 * reference the service interface
@@ -176,30 +179,30 @@
 	/*
 	 * Store service in object database
 	 */
-	objdb->object_create (OBJECT_PARENT_HANDLE,
-		&object_handle,
+	objdb->object_create (object_internal_configuration_handle,
+		&object_service_handle,
 		"service",
 		strlen ("service"));
 
-	objdb->object_key_create (object_handle,
+	objdb->object_key_create (object_service_handle,
 		"name",
 		strlen ("name"),
 		service_name,
 		strlen (service_name) + 1);
 
-	objdb->object_key_create (object_handle,
+	objdb->object_key_create (object_service_handle,
 		"ver",
 		strlen ("ver"),
 		&service_ver,
 		sizeof (service_ver));
 
-	res = objdb->object_key_create (object_handle,
+	res = objdb->object_key_create (object_service_handle,
 		"handle",
 		strlen ("handle"),
 		&handle,
 		sizeof (handle));
 
-	objdb->object_key_create (object_handle,
+	objdb->object_key_create (object_service_handle,
 		"service_id",
 		strlen ("service_id"),
 		&service->id,
@@ -209,7 +212,7 @@
 	return (res);
 }
 
-static int openais_service_unlink_common(
+static int openais_service_unlink_common (
 	struct objdb_iface_ver0 *objdb,
 	unsigned int object_service_handle,
 	const char *service_name,
@@ -218,21 +221,22 @@
 	unsigned int res;
 	unsigned short *service_id;
 	unsigned int *found_service_handle;
+
 	res = objdb->object_key_get (object_service_handle,
-				     "handle",
-				     strlen ("handle"),
-				     (void *)&found_service_handle,
-				     NULL);
+		"handle",
+		strlen ("handle"),
+		(void *)&found_service_handle,
+		NULL);
 	
 	res = objdb->object_key_get (object_service_handle,
-				     "service_id",
-				     strlen ("service_id"),
-				     (void *)&service_id,
-				     NULL);
+		"service_id",
+		strlen ("service_id"),
+		(void *)&service_id,
+		NULL);
 	
 	log_printf(LOG_LEVEL_NOTICE, "Unloading openais component: %s v%u\n",
-		   service_name, service_version);
-	
+		service_name, service_version);
+
 	if (ais_service[*service_id]->exec_exit_fn) {
 		ais_service[*service_id]->exec_exit_fn (objdb);
 	}
@@ -251,9 +255,8 @@
 	char *found_service_name;
 	unsigned int *found_service_ver;
 
-	objdb->object_find_reset (OBJECT_PARENT_HANDLE);
 	while (objdb->object_find (
-		OBJECT_PARENT_HANDLE,
+		object_internal_configuration_handle,
 		"service",
 		strlen ("service"),
 		&object_service_handle) == 0) {
@@ -275,8 +278,11 @@
 		 */
 		if ((strcmp (service_name, found_service_name) == 0) &&
 			(service_ver == *found_service_ver)) {
-			res = openais_service_unlink_common(
-			    objdb, object_service_handle, service_name, service_ver);
+
+			res = openais_service_unlink_common (
+				objdb, object_service_handle,
+				service_name, service_ver);
+
 			objdb->object_destroy (object_service_handle);
 			return res;
 		}
@@ -293,11 +299,12 @@
 
 	log_printf(LOG_LEVEL_NOTICE, "Unloading all openais components\n");
 	
-	objdb->object_find_reset (OBJECT_PARENT_HANDLE);
-	while (objdb->object_find (OBJECT_PARENT_HANDLE,
-				   "service",
-				   strlen ("service"),
-				   &object_service_handle) == 0) {
+	objdb->object_find_reset (object_internal_configuration_handle);
+
+	while (objdb->object_find (object_internal_configuration_handle,
+		"service",
+		strlen ("service"),
+		&object_service_handle) == 0) {
 		
 		objdb->object_key_get (object_service_handle,
 			"name",
@@ -311,11 +318,11 @@
 			(void *)&service_ver,
 			NULL);
 				
-		openais_service_unlink_common(
+		openais_service_unlink_common (
 			objdb, object_service_handle, service_name, *service_ver);
 
 		objdb->object_destroy (object_service_handle);
-		objdb->object_find_reset (OBJECT_PARENT_HANDLE);
+		objdb->object_find_reset (object_internal_configuration_handle);
 	}
 
 	return (0);
@@ -333,7 +340,13 @@
 	char *found_service_ver;
 	unsigned int found_service_ver_atoi;
  
+	objdb->object_create (OBJECT_PARENT_HANDLE,
+		&object_internal_configuration_handle,
+		"internal_configuration",
+		strlen ("internal_configuration"));
+
 	objdb->object_find_reset (OBJECT_PARENT_HANDLE);
+
 	while (objdb->object_find (
 		OBJECT_PARENT_HANDLE,
 		"service",
@@ -354,15 +367,6 @@
 
 		found_service_ver_atoi = atoi (found_service_ver);
 
-		objdb->object_key_replace (
-			object_service_handle,
-			"ver",
-			strlen ("ver"),
-			found_service_ver,
-			strlen (found_service_ver),
-			&found_service_ver_atoi,
-			sizeof (found_service_ver_atoi));
-		
 		openais_service_link_and_init (
 			objdb,
 			found_service_name,
Index: exec/service.h
===================================================================
--- exec/service.h	(revision 1545)
+++ exec/service.h	(revision 1547)
@@ -90,9 +90,9 @@
  * Link and initialize a service
  */
 extern unsigned int openais_service_link_and_init (
-    struct objdb_iface_ver0 *objdb,
-    char *service_name,
-    unsigned int service_ver);
+	struct objdb_iface_ver0 *objdb,
+	char *service_name,
+	unsigned int service_ver);
 
 /*
  * Unlink and exit a service

revision-1549.patch:

--- NEW FILE revision-1549.patch ---
Index: exec/main.c
===================================================================
--- exec/main.c	(revision 1547)
+++ exec/main.c	(revision 1549)
@@ -615,13 +615,8 @@
 
 	logsys_config_facility_set ("openais", main_config.syslog_facility);
 	logsys_config_mode_set (main_config.logmode);
+	logsys_config_file_set (&error_string, main_config.logfile);
 
-	res = logsys_config_file_set (&error_string, main_config.logfile);
-	if (res == -1) {
-		log_printf (LOG_LEVEL_ERROR, error_string);
-		openais_exit_error (AIS_DONE_LOGSETUP);
-	}
-
 	aisexec_uid_determine (&main_config);
 
 	aisexec_gid_determine (&main_config);

revision-1550.patch:

--- NEW FILE revision-1550.patch ---
Index: exec/Makefile
===================================================================
--- exec/Makefile	(revision 1549)
+++ exec/Makefile	(revision 1550)
@@ -198,7 +198,7 @@
 	$(CC) $(LDFLAGS) -shared -Wl,-soname,libtotem_pg.so.2 $(TOTEM_OBJS) -o $@
 
 liblogsys.so.2.0.0: $(LIBLOGSYS_OBJS)
-	$(CC) $(LDFLAGS) -shared -Wl,-soname,liblogsys.so.2 $(LOGSYS_OBJS) -o $@
+	$(CC) -shared -Wl,-soname,liblogsys.so.2 $(LOGSYS_OBJS) -o $@ $(LDFLAGS)
 
 endif
 


Index: openais.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/openais.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- openais.spec	12 May 2008 16:14:42 -0000	1.24
+++ openais.spec	20 May 2008 16:54:17 -0000	1.25
@@ -1,12 +1,15 @@
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
 Version: 0.83
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Release: 3%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://developer.osdl.org/dev/openais/
 Source0: http://developer.osdl.org/dev/openais/downloads/openais-%{version}/openais-%{version}.tar.gz
 Patch0: openais-defaultconfig.patch
+Patch1: revision-1547.patch
+Patch2: revision-1549.patch
+Patch3: revision-1550.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: i386 ppc x86_64 ppc64 ia64 s390 s390x alpha
@@ -32,6 +35,10 @@
 %prep
 %setup -q -n openais-%{version}
 %patch0 -p0
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
+
 %build
 
 # -O3 required for performance reasons
@@ -168,6 +175,11 @@
 %{_mandir}/man3/confdb_*3*
 
 %changelog
+* Tue May 20 2008 Steven Dake <sdake at redhat.com> - 0.83-3
+- Add upstream revision 1547 - Fix loading of multiple objects.
+- Add upstream revision 1549 - Remove exit when logsys files can't be created.
+- Add upstream revision 1550 - Fix linking of other projects against logsys on ppc64.
+
 * Mon May 12 2008 Steven Dake <sdake at redhat.com> - 0.83-2
 - Fix DOA on source tarball.