Splitting web-related functions into libABRT_web_utils.so

Was:

    linux-vdso.so.1 =>  (0x00007fff4e4a0000)
    libABRTUtils.so.0 => /usr/lib64/libABRTUtils.so.0 (0x00007f64316c0000)
    libABRTdUtils.so.0 => /usr/lib64/libABRTdUtils.so.0 (0x00007f64314b6000)
    libpolkit-gobject-1.so.0 => /usr/lib64/libpolkit-gobject-1.so.0 (0x0000003c2c600000)
    libgio-2.0.so.0 => /lib64/libgio-2.0.so.0 (0x0000003c20a00000)
    libgobject-2.0.so.0 => /lib64/libgobject-2.0.so.0 (0x0000003c1f600000)
    libgmodule-2.0.so.0 => /lib64/libgmodule-2.0.so.0 (0x0000003c20600000)
    libgthread-2.0.so.0 => /lib64/libgthread-2.0.so.0 (0x0000003c1fa00000)
    libglib-2.0.so.0 => /lib64/libglib-2.0.so.0 (0x0000003c1f200000)
    libxml2.so.2 => /usr/lib64/libxml2.so.2 (0x0000003c28200000)
    libdl.so.2 => /lib64/libdl.so.2 (0x00007f64312b2000)
    libdbus-1.so.3 => /lib64/libdbus-1.so.3 (0x0000003c1fe00000)
    libpthread.so.0 => /lib64/libpthread.so.0 (0x00007f6431096000)
    librt.so.1 => /lib64/librt.so.1 (0x00007f6430e8e000)
    libxmlrpc.so.3 => /usr/lib64/libxmlrpc.so.3 (0x0000003c22e00000)
    libxmlrpc_util.so.3 => /usr/lib64/libxmlrpc_util.so.3 (0x0000003c23600000)
    libxmlrpc_client.so.3 => /usr/lib64/libxmlrpc_client.so.3 (0x0000003c23a00000)
    libstdc++.so.6 => /usr/lib64/libstdc++.so.6 (0x0000003c2c200000)
    libm.so.6 => /lib64/libm.so.6 (0x00007f6430c0a000)
    libgcc_s.so.1 => /lib64/libgcc_s.so.1 (0x0000003c28e00000)
    libc.so.6 => /lib64/libc.so.6 (0x00007f643088b000)
    libeggdbus-1.so.0 => /usr/lib64/libeggdbus-1.so.0 (0x0000003c30200000)
    libresolv.so.2 => /lib64/libresolv.so.2 (0x00007f6430671000)
    libz.so.1 => /lib64/libz.so.1 (0x0000003c1e600000)
    libselinux.so.1 => /lib64/libselinux.so.1 (0x00007f6430452000)
    /lib64/ld-linux-x86-64.so.2 (0x00007f64318d0000)
    libcurl.so.4 => /usr/lib64/libcurl.so.4 (0x00007f64301f6000)
    libdbus-glib-1.so.2 => /usr/lib64/libdbus-glib-1.so.2 (0x00007f642ffd3000)
    libidn.so.11 => /lib64/libidn.so.11 (0x0000003c21200000)
    liblber-2.4.so.2 => /usr/lib64/liblber-2.4.so.2 (0x00007f642fdc5000)
    libldap-2.4.so.2 => /usr/lib64/libldap-2.4.so.2 (0x00007f642fb80000)
    libgssapi_krb5.so.2 => /lib64/libgssapi_krb5.so.2 (0x00007f642f951000)
    libkrb5.so.3 => /lib64/libkrb5.so.3 (0x00007f642f694000)
    libk5crypto.so.3 => /lib64/libk5crypto.so.3 (0x00007f642f468000)
    libcom_err.so.2 => /lib64/libcom_err.so.2 (0x0000003c29200000)
    libssl3.so => /usr/lib64/libssl3.so (0x00007f642f234000)
    libsmime3.so => /usr/lib64/libsmime3.so (0x00007f642f009000)
    libnss3.so => /usr/lib64/libnss3.so (0x00007f642eccf000)
    libnssutil3.so => /usr/lib64/libnssutil3.so (0x00007f642eab0000)
    libplds4.so => /lib64/libplds4.so (0x00007f642e8ad000)
    libplc4.so => /lib64/libplc4.so (0x00007f642e6a9000)
    libnspr4.so => /lib64/libnspr4.so (0x00007f642e46c000)
    libssh2.so.1 => /usr/lib64/libssh2.so.1 (0x0000003c21600000)
    libsasl2.so.2 => /usr/lib64/libsasl2.so.2 (0x0000003c34e00000)
    libssl.so.10 => /usr/lib64/libssl.so.10 (0x0000003c2d600000)
    libcrypto.so.10 => /lib64/libcrypto.so.10 (0x0000003c29a00000)
    libkrb5support.so.0 => /lib64/libkrb5support.so.0 (0x00007f642e263000)
    libkeyutils.so.1 => /lib64/libkeyutils.so.1 (0x0000003c2aa00000)
    libcrypt.so.1 => /lib64/libcrypt.so.1 (0x00007f642e02c000)
    libfreebl3.so => /lib64/libfreebl3.so (0x00007f642ddcf000)

Now:

    linux-vdso.so.1 =>  (0x00007fff187ff000)
    libABRTUtils.so.0 => /usr/lib64/libABRTUtils.so.0 (0x00007fb12b24e000)
    libdbus-1.so.3 => /lib64/libdbus-1.so.3 (0x0000003c1fe00000)
    libpthread.so.0 => /lib64/libpthread.so.0 (0x00007fb12b032000)
    libABRTdUtils.so.0 => /usr/lib64/libABRTdUtils.so.0 (0x00007fb12ae2b000)
    libpolkit-gobject-1.so.0 => /usr/lib64/libpolkit-gobject-1.so.0 (0x0000003c2c600000)
    libgio-2.0.so.0 => /lib64/libgio-2.0.so.0 (0x0000003c20a00000)
    libgobject-2.0.so.0 => /lib64/libgobject-2.0.so.0 (0x0000003c1f600000)
    libgmodule-2.0.so.0 => /lib64/libgmodule-2.0.so.0 (0x0000003c20600000)
    libgthread-2.0.so.0 => /lib64/libgthread-2.0.so.0 (0x0000003c1fa00000)
    librt.so.1 => /lib64/librt.so.1 (0x00007fb12ac23000)
    libglib-2.0.so.0 => /lib64/libglib-2.0.so.0 (0x0000003c1f200000)
    libdl.so.2 => /lib64/libdl.so.2 (0x00007fb12aa1f000)
    libstdc++.so.6 => /usr/lib64/libstdc++.so.6 (0x0000003c2c200000)
    libm.so.6 => /lib64/libm.so.6 (0x00007fb12a79b000)
    libgcc_s.so.1 => /lib64/libgcc_s.so.1 (0x0000003c28e00000)
    libc.so.6 => /lib64/libc.so.6 (0x00007fb12a41c000)
    /lib64/ld-linux-x86-64.so.2 (0x00007fb12b45e000)
    libeggdbus-1.so.0 => /usr/lib64/libeggdbus-1.so.0 (0x0000003c30200000)
    libresolv.so.2 => /lib64/libresolv.so.2 (0x00007fb12a202000)
    libz.so.1 => /lib64/libz.so.1 (0x0000003c1e600000)
    libselinux.so.1 => /lib64/libselinux.so.1 (0x00007fb129fe3000)
    libdbus-glib-1.so.2 => /usr/lib64/libdbus-glib-1.so.2 (0x00007fb129dc0000)

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

4 files changed, 37 insertions, 27 deletions

diff --git a/inc/Makefile.am b/inc/Makefile.am
index a6b52beb..993fa62a 100644
--- a/inc/Makefile.am
+++ b/inc/Makefile.am
@@ -2,7 +2,6 @@ HEADER_FILES = \
     abrt_exception.h \
     abrtlib.h \
     abrt_types.h \
-    abrt_xmlrpc.h \
     action.h \
     analyzer.h \
     comm_layer_inner.h \
diff --git a/lib/utils/Makefile.am b/lib/utils/Makefile.am
index 8ceebbe6..e4735cde 100644
--- a/lib/utils/Makefile.am
+++ b/lib/utils/Makefile.am
@@ -1,6 +1,10 @@
 # ABRTUtils has small set of deps. This reduces deps of smaller abrt binaries
 # ABRTdUtils has much more. It is used by daemon and plugins only
-lib_LTLIBRARIES = libABRTUtils.la libABRTdUtils.la
+# ABRT_web_utils is used only by some abrt-action-foo programs, not by daemon
+lib_LTLIBRARIES = \
+    libABRTUtils.la \
+    libABRTdUtils.la \
+    libABRT_web_utils.la
 HEADER_DIR = $(srcdir)/../../inc
 AM_CPPFLAGS = -I$(HEADER_DIR)
 
@@ -56,12 +60,8 @@ libABRTdUtils_la_SOURCES = \
     parse_release.cpp \
     make_descr.cpp \
     $(HEADER_DIR)/comm_layer_inner.h CommLayerInner.cpp \
-    $(HEADER_DIR)/abrt_xmlrpc.h abrt_xmlrpc.cpp \
-    abrt_rh_support.h abrt_rh_support.c \
-    abrt_curl.h abrt_curl.c \
     $(HEADER_DIR)/plugin.h Plugin.cpp \
     Polkit.h Polkit.cpp
-
 libABRTdUtils_la_CPPFLAGS = \
     -Wall -Werror \
     -I$(srcdir)/../../inc \
@@ -70,18 +70,36 @@ libABRTdUtils_la_CPPFLAGS = \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
-    $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) \
     $(POLKIT_CFLAGS) \
-    $(LIBXML_CFLAGS) \
     -D_GNU_SOURCE
 libABRTdUtils_la_LDFLAGS = \
     -version-info 0:1:0
 libABRTdUtils_la_LIBADD = \
-    $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) \
     $(POLKIT_LIBS) \
-    $(LIBXML_LIBS) \
     -ldl
 
+libABRT_web_utils_la_SOURCES = \
+    abrt_curl.h abrt_curl.c \
+    abrt_xmlrpc.h abrt_xmlrpc.cpp
+libABRT_web_utils_la_CPPFLAGS = \
+    -Wall -Werror \
+    -I$(srcdir)/../../inc \
+    -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
+    -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
+    -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
+    -DCONF_DIR=\"$(CONF_DIR)\" \
+    -DVAR_RUN=\"$(VAR_RUN)\" \
+    $(CURL_CFLAGS) \
+    $(LIBXML_CFLAGS) \
+    $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) \
+    -D_GNU_SOURCE
+libABRT_web_utils_la_LDFLAGS = \
+    -version-info 0:1:0
+libABRT_web_utils_la_LIBADD = \
+    $(CURL_LIBS) \
+    $(LIBXML_LIBS) \
+    $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS)
+
 $(DESTDIR)/$(DEBUG_DUMPS_DIR):
 	$(mkdir_p) '$@'
 # no need to chmod it here
diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp
index d7ff5781..9e6965fb 100644
--- a/src/daemon/Daemon.cpp
+++ b/src/daemon/Daemon.cpp
@@ -26,8 +26,6 @@
 #include <string>
 #include <sys/inotify.h>
 #include <sys/ioctl.h> /* ioctl(FIONREAD) */
-#include <xmlrpc-c/base.h>
-#include <xmlrpc-c/client.h>
 #include <glib.h>
 #include "abrtlib.h"
 #include "abrt_exception.h"
@@ -970,14 +968,6 @@ int main(int argc, char** argv)
         if (LoadSettings() != 0)
             throw 1;
 
-        VERB1 log("Initializing XML-RPC library");
-        xmlrpc_env env;
-        xmlrpc_env_init(&env);
-        xmlrpc_client_setup_global_const(&env);
-        if (env.fault_occurred)
-            error_msg_and_die("XML-RPC Fault: %s(%d)", env.fault_string, env.fault_code);
-        xmlrpc_env_clean(&env);
-
         VERB1 log("Creating glib main loop");
         pMainloop = g_main_loop_new(NULL, FALSE);
 
@@ -1085,7 +1075,6 @@ int main(int argc, char** argv)
     /* Error or INT/TERM. Clean up, in reverse order.
      * Take care to not undo things we did not do.
      */
-    xmlrpc_client_teardown_global_const();
     dumpsocket_shutdown();
     if (pidfile_created)
         unlink(VAR_RUN_PIDFILE);
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 0129ffc6..daac8462 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -36,16 +36,14 @@ abrtd_CPPFLAGS = \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
     $(GLIB_CFLAGS) \
     $(DBUS_CFLAGS) \
-    $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) \
     $(ENABLE_SOCKET_OR_DBUS) \
     -D_GNU_SOURCE \
     -Wall
 abrtd_LDADD = \
-    ../../lib/utils/libABRTUtils.la \
-    ../../lib/utils/libABRTdUtils.la \
     $(DL_LIBS) \
     $(DBUS_LIBS) \
-    $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS)
+    ../../lib/utils/libABRTUtils.la \
+    ../../lib/utils/libABRTdUtils.la
 
 abrt_server_SOURCES = \
     abrt-server.c
@@ -178,10 +176,13 @@ abrt_action_bugzilla_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_bugzilla_LDADD = \
+    $(GLIB_LIBS) \
+    ../../lib/utils/libABRT_web_utils.la \
     ../../lib/utils/libABRTdUtils.la \
     ../../lib/utils/libABRTUtils.la
 
 abrt_action_rhtsupport_SOURCES = \
+    abrt_rh_support.h abrt_rh_support.c \
     abrt-action-rhtsupport.cpp
 abrt_action_rhtsupport_CPPFLAGS = \
     -I$(srcdir)/../../inc \
@@ -195,10 +196,14 @@ abrt_action_rhtsupport_CPPFLAGS = \
     -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
     $(GLIB_CFLAGS) \
+    $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_rhtsupport_LDFLAGS = -ltar
 abrt_action_rhtsupport_LDADD = \
+    $(GLIB_LIBS) \
+    $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) \
+    ../../lib/utils/libABRT_web_utils.la \
     ../../lib/utils/libABRTdUtils.la \
     ../../lib/utils/libABRTUtils.la
 
@@ -216,11 +221,10 @@ abrt_action_kerneloops_CPPFLAGS = \
     -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
     $(GLIB_CFLAGS) \
-    $(CURL_CFLAGS) \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_kerneloops_LDADD = \
-    $(CURL_LIBS) \
+    ../../lib/utils/libABRT_web_utils.la \
     ../../lib/utils/libABRTdUtils.la \
     ../../lib/utils/libABRTUtils.la