[SCM] Image Reduction and Analysis Facility branch, debian, updated. 4c0bda83a1643cfb55d45be291afdd92249147fc

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 4c0bda83a1643cfb55d45be291afdd92249147fc
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Jun 1 16:36:21 2013 +0200

    Fix undefined symbols when using shared xmlrpc

diff --git a/debian/patches/series b/debian/patches/series
index 9523d4c..f210b1e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ unop_int.patch
 voclient.patch
 vodata.patch
 xc.patch
+shared-xmlrpc.patch
diff --git a/debian/patches/shared-xmlrpc.patch b/debian/patches/shared-xmlrpc.patch
new file mode 100644
index 0000000..fb8a5c7
--- /dev/null
+++ b/debian/patches/shared-xmlrpc.patch
@@ -0,0 +1,65 @@
+--- a/vendor/voclient/libsamp/Makefile
++++ b/vendor/voclient/libsamp/Makefile
+@@ -35,7 +35,7 @@
+         CARCH   = -arch i386 -arch ppc -m32 -mmacosx-version-min=10.4
+     endif
+ else
+-    CLIBS       = -lm -lc -lpthread -lcurl
++    CLIBS       = -lm -lc -lpthread -lcurl -lxmlrpc -lxmlrpc_server_abyss
+     CARCH       = -D$(PLATFORM)
+ endif
+ 
+--- a/vendor/voclient/libsamp/libxrpc/xrClient.c
++++ b/vendor/voclient/libsamp/libxrpc/xrClient.c
+@@ -857,8 +857,6 @@
+ xr_freeParam (int cnum)
+ {
+     ClientP client   = &clientArray[cnum];
+-    int    refcount  = 0;
+-    extern int xmlrpc_refcount();
+ 
+     assert (cnum < MAX_CLIENTS);		/* validate the client number */
+ 
+@@ -873,14 +871,13 @@
+ 	    xmlrpc_DECREF (v);
+ 	}
+ 	*/
+-        refcount = xmlrpc_refcount (client->param) - 1;
+ 	xmlrpc_DECREF (client->param);
+ #ifdef CLEAN_ENV
+ 	xmlrpc_env_clean(&client->env);
+ #endif
+     }
+ 
+-    if (refcount == 0)
++    if (xmlrpc_value_type(client->result) == XMLRPC_TYPE_DEAD)
+ 	client->param = (xmlrpc_value *) NULL;
+ }
+ 
+@@ -892,8 +889,6 @@
+ xr_freeResult (int cnum)
+ {
+     ClientP client   = &clientArray[cnum];
+-    int    refcount  = 0;
+-    extern int xmlrpc_refcount();
+ 
+     assert (cnum < MAX_CLIENTS);		/* validate the client number */
+ 
+@@ -908,15 +903,14 @@
+ 	    xmlrpc_DECREF (v);
+ 	}
+ 	*/
+-        refcount = xmlrpc_refcount (client->result) - 1;
+-	if (refcount)
++	if (xmlrpc_value_type(client->result) != XMLRPC_TYPE_DEAD)
+ 	    xmlrpc_DECREF (client->result);
+ #ifdef CLEAN_ENV
+ 	xmlrpc_env_clean(&client->env);
+ #endif
+     }
+ 
+-    if (refcount == 0)
++    if (xmlrpc_value_type(client->result) == XMLRPC_TYPE_DEAD)
+ 	client->result = (xmlrpc_value *) NULL;
+ }
+ 
diff --git a/debian/patches/xc.patch b/debian/patches/xc.patch
index 6acbeb3..1a750f6 100644
--- a/debian/patches/xc.patch
+++ b/debian/patches/xc.patch
@@ -12,21 +12,26 @@
  
  #ifdef LINUX
  char *fortlib[] = { "-lf2c",			/*  0  (host progs) */
-@@ -1213,7 +1217,12 @@
+@@ -1213,6 +1217,18 @@
  		arglist[nargs++] = mkfname (IRAFLIB6);
  	    }
  	}
--
 +#ifdef HOST_CURL
 +	arglist[nargs++] = "-lcurl";
 +#endif
 +#ifdef HOST_EXPAT
 +	arglist[nargs++] = "-lexpat";
 +#endif
++	arglist[nargs++] = "-lxmlrpc";
++	arglist[nargs++] = "-lxmlrpc_util";
++	arglist[nargs++] = "-lxmlrpc_client";
++	arglist[nargs++] = "-lxmlrpc_server";
++	arglist[nargs++] = "-lxmlrpc_abyss";
++	arglist[nargs++] = "-lxmlrpc_server_abyss";
+ 
  	/* Host libraries, searched after iraf libraries. */
  	for (i=0;  i < nhlibs;  i++)
- 	    arglist[nargs++] = hlibs[i];
-@@ -1360,6 +1369,7 @@
+@@ -1360,6 +1376,7 @@
  		    link_static = 1;
  	        } else if (strcmp (lflag, F_SHARED) == 0) {
  		    link_static = 0;
@@ -34,7 +39,7 @@
  #if defined(LINUX) || defined(BSD) || defined(X86) || defined(MACOSX)
  	        } else if ((strcmp (lflag, "-lf2c") == 0) || 
  	    	    (strcmp (lflag, "-lcompat") == 0)) {
-@@ -1369,8 +1379,10 @@
+@@ -1369,8 +1386,10 @@
  		        arglist[nargs++] = mkfname (lflag);
  		        *p_nargs = nargs;
  		        return (1);

-- 
Image Reduction and Analysis Facility