Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt

5 files changed, 55 insertions, 21 deletions

diff --git a/src/plugins/Bugzilla.xml b/src/plugins/Bugzilla.xml
new file mode 100644
index 00000000..bc8e8ecb
--- /dev/null
+++ b/src/plugins/Bugzilla.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<event>
+    <name>Bugzilla</name>
+    <action>Report this problem to the Red Hat bug tracker</action>
+    <description>Reports selected problems to the Red Hat bug tracker</description>
+    <options>
+        <option type="text" name="Bugzilla_BugzillaURL">
+           <label>Bugzilla URL</label>
+           <allow-empty>no</allow-empty>
+           <description>Address of the bugzilla server</description>
+           <property>Address of the bugzilla server</property>
+           <notused1>blahblahblah</notused1>
+       </option>
+       <option type="text" name="Bugzilla_Login">
+           <label>User name</label>
+           <allow-empty>no</allow-empty>
+           <description>Username to use to log into your bugzilla account</description>
+       </option>
+       <option type="password" name="Bugzilla_Password">
+           <label>Password</label>
+           <allow-empty>no</allow-empty>
+           <description>Password for your bugzilla account</description>
+       </option>
+       <option type="bool" name="Bugzilla_SSLVerify">
+           <label>SSL Verify</label>
+           <description>Check the ssl key validity</description>
+       </option>
+    </options>
+</event>
+
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 59e0f1a4..3c4b37cf 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -38,6 +38,11 @@ dist_pluginsconf_DATA = \
     RHTSupport.conf \
     Upload.conf
 
+eventsdir = $(EVENTS_DIR)
+
+dist_events_DATA = \
+    Bugzilla.xml
+
 eventsconfdir = $(EVENTS_CONF_DIR)
 
 dist_eventsconf_DATA = \
@@ -77,7 +82,7 @@ abrt_dump_oops_CPPFLAGS = \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
     $(GLIB_CFLAGS) \
     -D_GNU_SOURCE \
-    -Wall -Werror
+    -Wall -Wwrite-strings -Werror
 abrt_dump_oops_LDADD = \
     ../lib/libreport.la
 
@@ -96,7 +101,7 @@ abrt_action_analyze_c_CPPFLAGS = \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
     $(GLIB_CFLAGS) \
     -D_GNU_SOURCE \
-    -Wall -Werror
+    -Wall -Wwrite-strings -Werror
 abrt_action_analyze_c_LDADD = \
     ../lib/libreport.la
 
@@ -115,7 +120,7 @@ abrt_action_analyze_python_CPPFLAGS = \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
     $(GLIB_CFLAGS) \
     -D_GNU_SOURCE \
-    -Wall -Werror
+    -Wall -Wwrite-strings -Werror
 abrt_action_analyze_python_LDADD = \
     ../lib/libreport.la
 
@@ -134,7 +139,7 @@ abrt_action_analyze_oops_CPPFLAGS = \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
     $(GLIB_CFLAGS) \
     -D_GNU_SOURCE \
-    -Wall -Werror
+    -Wall -Wwrite-strings -Werror
 abrt_action_analyze_oops_LDADD = \
     ../lib/libreport.la
 
@@ -153,7 +158,7 @@ abrt_action_generate_backtrace_CPPFLAGS = \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
     $(GLIB_CFLAGS) \
     -D_GNU_SOURCE \
-    -Wall -Werror
+    -Wall -Wwrite-strings -Werror
 abrt_action_generate_backtrace_LDADD = \
     ../lib/libreport.la \
     ../btparser/libbtparser.la
@@ -173,7 +178,7 @@ abrt_action_bugzilla_CPPFLAGS = \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
     $(GLIB_CFLAGS) \
     -D_GNU_SOURCE \
-    -Wall -Werror
+    -Wall -Wwrite-strings -Werror
 abrt_action_bugzilla_LDADD = \
     $(GLIB_LIBS) \
     ../lib/libabrt_web.la \
@@ -196,7 +201,7 @@ abrt_action_rhtsupport_CPPFLAGS = \
     $(GLIB_CFLAGS) \
     $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) \
     -D_GNU_SOURCE \
-    -Wall -Werror
+    -Wall -Wwrite-strings -Werror
 abrt_action_rhtsupport_LDFLAGS = -ltar
 abrt_action_rhtsupport_LDADD = \
     $(GLIB_LIBS) \
@@ -220,7 +225,7 @@ abrt_action_upload_CPPFLAGS = \
     $(GLIB_CFLAGS) \
     $(CURL_CFLAGS) \
     -D_GNU_SOURCE \
-    -Wall -Werror
+    -Wall -Wwrite-strings -Werror
 abrt_action_upload_LDFLAGS = -ltar
 abrt_action_upload_LDADD = \
     $(GLIB_LIBS) \
@@ -242,7 +247,7 @@ abrt_action_kerneloops_CPPFLAGS = \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
     $(GLIB_CFLAGS) \
     -D_GNU_SOURCE \
-    -Wall -Werror
+    -Wall -Wwrite-strings -Werror
 abrt_action_kerneloops_LDADD = \
     ../lib/libabrt_web.la \
     ../lib/libreport.la
@@ -262,7 +267,7 @@ abrt_action_mailx_CPPFLAGS = \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
     $(GLIB_CFLAGS) \
     -D_GNU_SOURCE \
-    -Wall -Werror
+    -Wall -Wwrite-strings -Werror
 abrt_action_mailx_LDADD = \
     ../lib/libreport.la
 
@@ -281,7 +286,7 @@ abrt_action_print_CPPFLAGS = \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
     $(GLIB_CFLAGS) \
     -D_GNU_SOURCE \
-    -Wall -Werror
+    -Wall -Wwrite-strings -Werror
 abrt_action_print_LDADD = \
     ../lib/libreport.la
 
@@ -291,7 +296,7 @@ abrt_action_install_debuginfo_CPPFLAGS = \
     -I$(srcdir)/../include/report -I$(srcdir)/../include \
     -I$(srcdir)/../lib \
     -D_GNU_SOURCE \
-    -Wall
+    -Wall -Wwrite-strings
 abrt_action_install_debuginfo_LDADD =
 
 abrt_retrace_client_SOURCES = \
@@ -303,7 +308,7 @@ abrt_retrace_client_SOURCES = \
      $(NSS_CFLAGS) \
      $(GLIB_CFLAGS) \
      -D_GNU_SOURCE \
-     -Wall -Werror
+     -Wall -Wwrite-strings -Werror
  abrt_retrace_client_LDADD = \
      ../lib/libreport.la \
      ../btparser/libbtparser.la \
diff --git a/src/plugins/abrt-action-analyze-c.c b/src/plugins/abrt-action-analyze-c.c
index 5def9aa1..635a3316 100644
--- a/src/plugins/abrt-action-analyze-c.c
+++ b/src/plugins/abrt-action-analyze-c.c
@@ -63,7 +63,7 @@ static char *run_unstrip_n(const char *dump_dir_name, unsigned timeout_sec)
     args[1] = xasprintf("--core=%s/"FILENAME_COREDUMP, dump_dir_name);
     args[2] = (char*)"-n";
     args[3] = NULL;
-    pid_t child = fork_execv_on_steroids(flags, args, pipeout, /*unsetenv_vec:*/ NULL, /*dir:*/ NULL, uid);
+    pid_t child = fork_execv_on_steroids(flags, args, pipeout, /*env_vec:*/ NULL, /*dir:*/ NULL, uid);
     free(args[1]);
 
     /* Bugs in unstrip or corrupted coredumps can cause it to enter infinite loop.
diff --git a/src/plugins/abrt-action-generate-backtrace.c b/src/plugins/abrt-action-generate-backtrace.c
index a8c18e36..7defc9c4 100644
--- a/src/plugins/abrt-action-generate-backtrace.c
+++ b/src/plugins/abrt-action-generate-backtrace.c
@@ -76,6 +76,11 @@ static char* exec_vp(char **args, uid_t uid, int redirect_stderr, int *status)
         "LC_MONETARY",
         "LC_NUMERIC",
         "LC_TIME",
+        /* Workaround for
+         * http://sourceware.org/bugzilla/show_bug.cgi?id=9622
+         * (gdb emitting ESC sequences even with -batch)
+         */
+        "TERM",
         NULL
     };
 
@@ -137,12 +142,6 @@ static char *get_backtrace(struct dump_dir *dd)
     char *executable = dd_load_text(dd, FILENAME_EXECUTABLE);
     dd_close(dd);
 
-    // Workaround for
-    // http://sourceware.org/bugzilla/show_bug.cgi?id=9622
-    unsetenv("TERM");
-    // This is not necessary
-    //putenv((char*)"TERM=dumb");
-
     char *args[21];
     args[0] = (char*)"gdb";
     args[1] = (char*)"-batch";
diff --git a/src/plugins/abrt-action-mailx.c b/src/plugins/abrt-action-mailx.c
index 3debf449..06f81780 100644
--- a/src/plugins/abrt-action-mailx.c
+++ b/src/plugins/abrt-action-mailx.c
@@ -32,7 +32,7 @@ static void exec_and_feed_input(uid_t uid, const char* text, char **args)
                 EXECFLG_INPUT | EXECFLG_QUIET | EXECFLG_SETGUID,
                 args,
                 pipein,
-                /*unsetenv_vec:*/ NULL,
+                /*env_vec:*/ NULL,
                 /*dir:*/ NULL,
                 uid);