SOURCES: magma-fix.patch - updated for cluster 1.02.00

[qboosh]

Author: qboosh                       Date: Sat May 20 07:51:08 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for cluster 1.02.00

---- Files affected:
SOURCES:
   magma-fix.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/magma-fix.patch
diff -u SOURCES/magma-fix.patch:1.2 SOURCES/magma-fix.patch:1.3
--- SOURCES/magma-fix.patch:1.2	Sun Nov  6 00:29:07 2005
+++ SOURCES/magma-fix.patch	Sat May 20 09:51:02 2006
@@ -1,32 +1,11 @@
---- magma-1.0-pre21/lib/global.c.orig	2005-03-30 00:11:58.000000000 +0200
-+++ magma-1.0-pre21/lib/global.c	2005-04-14 21:10:47.096656352 +0200
+--- cluster-1.02.00/magma/lib/global.c.orig	2005-01-17 19:40:05.000000000 +0100
++++ cluster-1.02.00/magma/lib/global.c	2006-05-20 09:50:02.684073000 +0200
 @@ -112,7 +112,7 @@
  int
  clu_disconnect(int fd)
  {
 -	int e, rv;
-+	int e = 0, rv = 0;
++	int e, rv = 0;
  
  	if (fd >= 0)
  		clist_delete(fd);
-diff -urNBb magma/lib/Makefile magma/lib/Makefile
---- magma/lib/Makefile	2005-09-01 17:32:27.000000000 +0200
-+++ magma/lib/Makefile	2005-11-06 00:28:01.776214750 +0100
-@@ -96,14 +96,14 @@
- 
- libmagma.so.$(RELEASE_MAJOR).$(RELEASE_MINOR): global.o plugin.o \
- 			localinfo.o ip_lookup.o memberlist.o clist.o
--	${CC} -shared -o libmagma.so.$(RELEASE_MAJOR) -o $@ $^ -lpthread -ldl
-+	${CC} -shared -Wl,-soname,libmagma.so.$(RELEASE_MAJOR) -o libmagma.so.$(RELEASE_MAJOR) -o $@ $^ -lpthread -ldl
- 
- libmagma_nt.so.$(RELEASE_MAJOR).$(RELEASE_MINOR): plugin.o localinfo.o \
- 			ip_lookup.o memberlist.o
--	${CC} -shared -o libmagma_nt.so.$(RELEASE_MAJOR) -o $@ $^ -ldl
-+	${CC} -shared -Wl,-soname,libmagma_nt.so.$(RELEASE_MAJOR) -o libmagma_nt.so.$(RELEASE_MAJOR) -o $@ $^ -ldl
- 
- libmagmamsg.so.$(RELEASE_MAJOR).$(RELEASE_MINOR): message.o fdops.o libmagma.so.$(RELEASE_MAJOR).$(RELEASE_MINOR)
--	${CC} -shared -o libmagmamsg.so.$(RELEASE_MAJOR) -o $@ $^ -Wl,-Bdynamic -L. -lmagma -lpthread -ldl
-+	${CC} -shared -Wl,-soname,libmagmamsg.so.$(RELEASE_MAJOR) -o libmagmamsg.so.$(RELEASE_MAJOR) -o $@ $^ -Wl,-Bdynamic -L. -lmagma -lpthread -ldl
- 
- libmagma.a: global.o plugin.o localinfo.o ip_lookup.o \
- 		        memberlist.o clist.o
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/magma-fix.patch?r1=1.2&r2=1.3&f=u