[Debian-ha-commits] [pacemaker] 06/07: Drop unapplied patches, run applied patches through gbp pq

Richard Winters devrik-guest at moszumanska.debian.org
Sat Apr 25 20:52:05 UTC 2015


This is an automated email from the git hooks/post-receive script.

devrik-guest pushed a commit to branch master
in repository pacemaker.

commit 9309da1a7f7ab6e14747c1751bebcbd132fda59e
Author: Richard B Winters <rik at mmogp.com>
Date:   Fri Apr 24 21:13:20 2015 -0400

    Drop unapplied patches, run applied patches through gbp pq
    
     - add .gitignore to debian/ for un-ignoring patch files
    
    Change-Id: Ia39880e826c2b5b5aae7df6b4aff167a40680861
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 debian/.gitignore                                  |  2 +
 ...aexecupstart.patch => 0001-raexecupstart.patch} | 32 +++++---
 debian/patches/0002-init-scripts-compat.patch      | 35 +++++++++
 ...y-enable-logging-exports-in-default-file.patch} | 81 ++++++--------------
 .../patches/cli_stop_after_assertion_failure.patch | 88 ----------------------
 debian/patches/fix_crm_mon_host_list.patch         | 31 --------
 debian/patches/fix_crm_mon_utils.patch             | 33 --------
 debian/patches/fix_dir_creation.patch              | 68 -----------------
 debian/patches/glib_no_CRIT_messages.patch         | 29 -------
 .../gracefully_handle_ECHILD_in_waitpid.patch      | 61 ---------------
 debian/patches/init-scripts-compat.patch           | 24 ------
 debian/patches/prevent_glib_assertion.patch        | 16 ----
 debian/patches/series                              |  5 +-
 13 files changed, 85 insertions(+), 420 deletions(-)

diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..c3d09af
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,2 @@
+!*.patch
+
diff --git a/debian/patches/raexecupstart.patch b/debian/patches/0001-raexecupstart.patch
similarity index 62%
rename from debian/patches/raexecupstart.patch
rename to debian/patches/0001-raexecupstart.patch
index 63e9243..fffeb5a 100644
--- a/debian/patches/raexecupstart.patch
+++ b/debian/patches/0001-raexecupstart.patch
@@ -1,8 +1,18 @@
-Index: pacemaker-1.1.12/xml/crm.dtd
+From: Debian HA Maintainers <debian-ha-maintainers at lists.alioth.debian.org>
+Date: Fri, 24 Apr 2015 20:53:23 -0400
+Subject: raexecupstart
+
 ===================================================================
---- pacemaker-1.1.5.orig/xml/crm.dtd	2011-02-23 11:37:45.054047000 -0500
-+++ pacemaker-1.1.5/xml/crm.dtd	2011-02-23 11:38:39.887424200 -0500
-@@ -215,7 +215,7 @@
+---
+ xml/crm-transitional.dtd | 4 ++--
+ xml/crm.dtd              | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/xml/crm-transitional.dtd b/xml/crm-transitional.dtd
+index a0f1a8c..4657b6d 100644
+--- a/xml/crm-transitional.dtd
++++ b/xml/crm-transitional.dtd
+@@ -221,7 +221,7 @@ NOTE: primitive resources may contain at most one "operations" object.
  <!ATTLIST primitive
            id                CDATA        #REQUIRED
            description       CDATA        #IMPLIED
@@ -11,7 +21,7 @@ Index: pacemaker-1.1.12/xml/crm.dtd
            type              CDATA        #REQUIRED
            provider          CDATA        #IMPLIED
  
-@@ -799,7 +799,7 @@
+@@ -805,7 +805,7 @@ It contains a list of all resource's added (but not necessarily still active) on
  <!ELEMENT lrm_resource (lrm_rsc_op*)>
  <!ATTLIST lrm_resource
            id            CDATA #REQUIRED
@@ -20,11 +30,11 @@ Index: pacemaker-1.1.12/xml/crm.dtd
            type              CDATA        #REQUIRED
            provider          CDATA        #IMPLIED>
  <!--
-Index: pacemaker-1.1.12/xml/crm-transitional.dtd
-===================================================================
---- pacemaker-1.1.12.orig/xml/crm-transitional.dtd	2011-02-23 11:37:45.368515000 -0500
-+++ pacemaker-1.1.12/xml/crm-transitional.dtd	2011-02-23 11:38:39.897424209 -0500
-@@ -221,7 +221,7 @@
+diff --git a/xml/crm.dtd b/xml/crm.dtd
+index 90960d3..786e67c 100644
+--- a/xml/crm.dtd
++++ b/xml/crm.dtd
+@@ -215,7 +215,7 @@ NOTE: primitive resources may contain at most one "operations" object.
  <!ATTLIST primitive
            id                CDATA        #REQUIRED
            description       CDATA        #IMPLIED
@@ -33,7 +43,7 @@ Index: pacemaker-1.1.12/xml/crm-transitional.dtd
            type              CDATA        #REQUIRED
            provider          CDATA        #IMPLIED
  
-@@ -805,7 +805,7 @@
+@@ -799,7 +799,7 @@ It contains a list of all resource's added (but not necessarily still active) on
  <!ELEMENT lrm_resource (lrm_rsc_op*)>
  <!ATTLIST lrm_resource
            id            CDATA #REQUIRED
diff --git a/debian/patches/0002-init-scripts-compat.patch b/debian/patches/0002-init-scripts-compat.patch
new file mode 100644
index 0000000..d1d5efd
--- /dev/null
+++ b/debian/patches/0002-init-scripts-compat.patch
@@ -0,0 +1,35 @@
+From: Debian HA Maintainers <debian-ha-maintainers at lists.alioth.debian.org>
+Date: Fri, 24 Apr 2015 20:53:23 -0400
+Subject: init-scripts-compat
+
+---
+ lrmd/pacemaker_remote.in | 2 ++
+ mcp/pacemaker.in         | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/lrmd/pacemaker_remote.in b/lrmd/pacemaker_remote.in
+index ba89087..67e664e 100644
+--- a/lrmd/pacemaker_remote.in
++++ b/lrmd/pacemaker_remote.in
+@@ -20,6 +20,8 @@
+ # Description:		Starts and stops the Pacemaker remote agent for non-cluster nodes
+ ### END INIT INFO
+ 
++. /lib/lsb/init-functions
++
+ desc="Pacemaker Remote Agent"
+ prog="pacemaker_remoted"
+ cman=0
+diff --git a/mcp/pacemaker.in b/mcp/pacemaker.in
+index 82a6e11..ca7fab9 100644
+--- a/mcp/pacemaker.in
++++ b/mcp/pacemaker.in
+@@ -21,6 +21,8 @@
+ # Description:		Starts and stops Pacemaker Cluster Manager.
+ ### END INIT INFO
+ 
++. /lib/lsb/init-functions
++
+ desc="Pacemaker Cluster Manager"
+ prog="pacemakerd"
+ 
diff --git a/debian/patches/default_file_for_pacemaker.patch b/debian/patches/0003-Properly-enable-logging-exports-in-default-file.patch
similarity index 54%
rename from debian/patches/default_file_for_pacemaker.patch
rename to debian/patches/0003-Properly-enable-logging-exports-in-default-file.patch
index 887206e..4e8cb74 100644
--- a/debian/patches/default_file_for_pacemaker.patch
+++ b/debian/patches/0003-Properly-enable-logging-exports-in-default-file.patch
@@ -1,8 +1,22 @@
-Index: pacemaker-1.1.12/mcp/pacemaker.sysconfig
-===================================================================
---- pacemaker-1.1.12.orig/mcp/pacemaker.sysconfig	2014-02-13 17:06:19.000000000 +0000
-+++ pacemaker-1.1.12/mcp/pacemaker.sysconfig	2014-02-21 14:37:53.000000000 +0000
-@@ -2,46 +2,46 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Fri, 24 Apr 2015 21:12:11 -0400
+Subject: Properly enable logging exports in default file
+
+ - Resolves exporting of variables by prepending 'export' to the  
+   command. 
+ - This is a redo of a previous patch; default_file_for_pacemaker
+
+Change-Id: I0db1e1cbd65b5c99bdf366a005d06cf6b6ea7401
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ mcp/pacemaker.sysconfig | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/mcp/pacemaker.sysconfig b/mcp/pacemaker.sysconfig
+index 4b1fdff..b79ae7e 100644
+--- a/mcp/pacemaker.sysconfig
++++ b/mcp/pacemaker.sysconfig
+@@ -2,14 +2,14 @@
  
  # Turn on special handling for CMAN clusters in the init script
  # Without this, fenced (and by inference, cman) cannot reliably be made to shut down
@@ -18,6 +32,9 @@ Index: pacemaker-1.1.12/mcp/pacemaker.sysconfig
 +# eg. export PCMK_debug=crmd,pengine
 +# export PCMK_debug=yes|no|crmd|pengine|cib|stonith-ng|attrd|pacemakerd
  
+ # Send INFO (and higher) messages to the named log file
+ # Additional messages may also appear here depending on any configured debug and trace settings
+@@ -19,29 +19,29 @@
  # Specify an alternate syslog target for NOTICE (and higher) messages
  # Use 'none' to disable - not recommended
  # The default value is 'daemon'
@@ -35,9 +52,8 @@ Index: pacemaker-1.1.12/mcp/pacemaker.sysconfig
 +# export PCMK_trace_functions=function1,function2,function3
  
  # Log all messages from a comma-separated list of files (no path)
--# Supports wildcards eg. PCMK_trace_files=prefix*.c
+ # Supports wildcards eg. PCMK_trace_files=prefix*.c
 -# PCMK_trace_files=file.c,other.h
-+# Supports wildcards eg. export PCMK_trace_files=prefix*.c
 +# export PCMK_trace_files=file.c,other.h
  
  # Log all messages matching comma-separated list of formats
@@ -56,7 +72,7 @@ Index: pacemaker-1.1.12/mcp/pacemaker.sysconfig
  
  # Enable blackbox logging globally or per-subsystem
  # The blackbox contains a rolling buffer of all logs (including info+debug+trace)
-@@ -51,37 +51,37 @@
+@@ -51,8 +51,8 @@
  # sending SIGUSR1 (or SIGTRAP), and disabled by sending SIGUSR2
  #
  # Multiple subsystems may me listed separated by commas
@@ -67,52 +83,3 @@ Index: pacemaker-1.1.12/mcp/pacemaker.sysconfig
  
  #==#==# Advanced use only
  
- # Enable this for compatibility with older corosync (prior to 2.0)
- # based clusters which used the nodes uname as its uuid also
--# PCMK_uname_is_uuid=no
-+# export PCMK_uname_is_uuid=no
- 
- # Specify an alternate location for RNG schemas and XSL transforms
- # Mostly only useful for developer testing
--# PCMK_schema_directory=/some/path
-+# export PCMK_schema_directory=/some/path
- 
- # Enable this for rebooting this machine at the time of process (subsystem) failure
--# PCMK_fail_fast=no
-+# export PCMK_fail_fast=no
- 
- #==#==# Pacemaker Remote
- # Use a custom directory for finding the authkey.
--# PCMK_authkey_location=/etc/pacemaker/authkey
-+# export PCMK_authkey_location=/etc/pacemaker/authkey
- #
- # Specify a custom port for Pacemaker Remote connections
--# PCMK_remote_port=3121
-+# export PCMK_remote_port=3121
- 
- #==#==# IPC
- 
- # Force use of a particular class of IPC connection
--# PCMK_ipc_type=shared-mem|socket|posix|sysv
-+# export PCMK_ipc_type=shared-mem|socket|posix|sysv
- 
- # Specify an IPC buffer size in bytes
- # Useful when connecting to really big clusters that exceed the default 20k buffer
--# PCMK_ipc_buffer=20480
-+# export PCMK_ipc_buffer=20480
- 
- #==#==# Profiling and memory leak testing
- 
-@@ -89,8 +89,8 @@
- # G_SLICE=always-malloc
- # MALLOC_PERTURB_=221 # or 0
- # MALLOC_CHECK_=3     # or 0,1,2
--# PCMK_valgrind_enabled=yes
--# PCMK_valgrind_enabled=cib,crmd
--# PCMK_callgrind_enabled=yes
--# PCMK_callgrind_enabled=cib,crmd
-+# export PCMK_valgrind_enabled=yes
-+# export PCMK_valgrind_enabled=cib,crmd
-+# export PCMK_callgrind_enabled=yes
-+# export PCMK_callgrind_enabled=cib,crmd
- # VALGRIND_OPTS="--leak-check=full --trace-children=no --num-callers=25 --log-file=/var/lib/pacemaker/valgrind-%p --suppressions=/usr/share/pacemaker/tests/valgrind-pcmk.suppressions --gen-suppressions=all"
diff --git a/debian/patches/cli_stop_after_assertion_failure.patch b/debian/patches/cli_stop_after_assertion_failure.patch
deleted file mode 100644
index 73e3b9d..0000000
--- a/debian/patches/cli_stop_after_assertion_failure.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git a/lib/common/logging.c b/lib/common/logging.c
-index 2b74d3f..ba137f5 100644
---- a/lib/common/logging.c
-+++ b/lib/common/logging.c
-@@ -46,6 +46,7 @@
- unsigned int crm_log_level = LOG_INFO;
- static gboolean crm_tracing_enabled(void);
- unsigned int crm_trace_nonlog = 0;
-+bool crm_is_daemon = 0;
- 
- #ifdef HAVE_G_LOG_SET_DEFAULT_HANDLER
- GLogFunc glib_log_default;
-@@ -626,6 +627,8 @@
-     const char *facility = daemon_option("logfacility");
-     const char *f_copy = facility;
- 
-+    crm_is_daemon = daemon;
-+
-     if (crm_trace_nonlog == 0) {
-         crm_trace_nonlog = g_quark_from_static_string("Pacemaker non-logging tracepoint");
-     }
-@@ -711,11 +714,11 @@
-         qb_log_ctl(QB_LOG_SYSLOG, QB_LOG_CONF_ENABLED, QB_FALSE);
-     }
- 
--    if (daemon) {
-+    if (crm_is_daemon) {
-         set_daemon_option("logfacility", facility);
-     }
- 
--    if (daemon && crm_tracing_enabled()
-+    if (crm_is_daemon && crm_tracing_enabled()
-         && qb_log_ctl(QB_LOG_STDERR, QB_LOG_CONF_STATE_GET, 0) != QB_LOG_STATE_ENABLED
-         && qb_log_ctl(QB_LOG_BLACKBOX, QB_LOG_CONF_STATE_GET, 0) != QB_LOG_STATE_ENABLED) {
-         /* Make sure tracing goes somewhere */
-@@ -725,20 +728,20 @@
-     crm_update_callsites();
- 
-     /* Ok, now we can start logging... */
--    if (quiet == FALSE && daemon == FALSE) {
-+    if (quiet == FALSE && crm_is_daemon == FALSE) {
-         crm_log_args(argc, argv);
-     }
- 
--    if (daemon) {
-+    if (crm_is_daemon) {
-         const char *user = getenv("USER");
- 
-         if (user != NULL && safe_str_neq(user, "root") && safe_str_neq(user, CRM_DAEMON_USER)) {
-             crm_trace("Not switching to corefile directory for %s", user);
--            daemon = FALSE;
-+            crm_is_daemon = FALSE;
-         }
-     }
- 
--    if (daemon) {
-+    if (crm_is_daemon) {
-         int user = getuid();
-         const char *base = CRM_CORE_DIR;
-         struct passwd *pwent = getpwuid(user);
-diff --git a/lib/common/utils.c b/lib/common/utils.c
-index 069b5c8..527c9e0 100644
---- a/lib/common/utils.c
-+++ b/lib/common/utils.c
-@@ -1085,6 +1085,8 @@
-     }
- }
- 
-+extern bool crm_is_daemon;
-+
- /* coverity[+kill] */
- void
- crm_abort(const char *file, const char *function, int line,
-@@ -1097,6 +1099,14 @@
-     /* Implied by the parent's error logging below */
-     /* crm_write_blackbox(0); */
- 
-+    if(crm_is_daemon == FALSE) {
-+        /* This is a command line tool - do not fork */
-+
-+        /* crm_add_logfile(NULL);   * Record it to a file? */
-+        crm_enable_stderr(TRUE); /* Make sure stderr is enabled so we can tell the caller */
-+        do_fork = FALSE;         /* Just crash if needed */
-+    }
-+
-     if (do_core == FALSE) {
-         crm_err("%s: Triggered assert at %s:%d : %s", function, file, line, assert_condition);
-         return;
diff --git a/debian/patches/fix_crm_mon_host_list.patch b/debian/patches/fix_crm_mon_host_list.patch
deleted file mode 100644
index 9a2c3e6..0000000
--- a/debian/patches/fix_crm_mon_host_list.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/tools/crm_mon.c b/tools/crm_mon.c
-index d5b34c1..4c4e962 100644
---- a/tools/crm_mon.c
-+++ b/tools/crm_mon.c
-@@ -973,7 +973,6 @@
-         if (safe_str_eq(type, "ping") || safe_str_eq(type, "pingd")) {
-             const char *name = "pingd";
-             const char *multiplier = NULL;
--            char **host_list = NULL;
-             int host_list_num = 0;
-             int expected_score = 0;
- 
-@@ -984,11 +983,15 @@
-             /* To identify the resource with the attribute name. */
-             if (safe_str_eq(name, attrname)) {
-                 int value = crm_parse_int(attrvalue, "0");
-+                const char *hosts = g_hash_table_lookup(rsc->parameters, "host_list");
- 
-                 multiplier = g_hash_table_lookup(rsc->parameters, "multiplier");
--                host_list = g_strsplit(g_hash_table_lookup(rsc->parameters, "host_list"), " ", 0);
--                host_list_num = g_strv_length(host_list);
--                g_strfreev(host_list);
-+                if(hosts) {
-+                    char **host_list = g_strsplit(hosts, " ", 0);
-+                    host_list_num = g_strv_length(host_list);
-+                    g_strfreev(host_list);
-+                }
-+
-                 /* pingd multiplier is the same as the default value. */
-                 expected_score = host_list_num * crm_parse_int(multiplier, "1");
- 
diff --git a/debian/patches/fix_crm_mon_utils.patch b/debian/patches/fix_crm_mon_utils.patch
deleted file mode 100644
index a842dbd..0000000
--- a/debian/patches/fix_crm_mon_utils.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/lib/common/utils.c b/lib/common/utils.c
-index 069b5c8..4c40604 100644
---- a/lib/common/utils.c
-+++ b/lib/common/utils.c
-@@ -1123,13 +1123,23 @@ crm_abort(const char *file, const char *function, int line,
-                     function, pid, file, line, assert_condition);
-             crm_write_blackbox(SIGTRAP, NULL);
- 
--            do {
-+            while(1) {
-                 rc = waitpid(pid, &status, 0);
--                if (rc < 0 && errno != EINTR) {
--                    crm_perror(LOG_ERR, "%s: Cannot wait on forked child %d", function, pid);
--                }
-+                if(rc == pid) {
-+                    break;
-+
-+                } else if (errno == EINTR) {
-+                    crm_trace("Trying again to wait for forked child %d", pid);
-+                    continue;
-+
-+                } else if (errno == ECHILD) {
-+                    crm_warn("Cannot wait on forked child %d yet", pid);
- 
--            } while (rc < 0 && errno == EINTR);
-+                } else {
-+                    crm_perror(LOG_ERR, "Cannot wait on forked child %d", pid);
-+                    break;
-+                }
-+            }
- 
-             return;
-     }
diff --git a/debian/patches/fix_dir_creation.patch b/debian/patches/fix_dir_creation.patch
deleted file mode 100644
index 92880ae..0000000
--- a/debian/patches/fix_dir_creation.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/mcp/pacemaker.c b/mcp/pacemaker.c
-index cfa762e..6cc64c5 100644
---- a/mcp/pacemaker.c
-+++ b/mcp/pacemaker.c
-@@ -631,6 +631,16 @@ struct qb_ipcs_service_handlers ipc_callbacks =
- };
- /* *INDENT-ON* */
- 
-+static void
-+mcp_chown(const char *path, uid_t uid, gid_t gid)
-+{
-+    int rc = chown(path, uid, gid);
-+    if(rc < 0) {
-+        crm_warn("Cannot change the ownership of %s to user %s and gid %d: %s",
-+                 path, CRM_DAEMON_USER, gid, pcmk_strerror(errno));
-+    }
-+}
-+
- int
- main(int argc, char **argv)
- {
-@@ -775,20 +785,30 @@ struct qb_ipcs_service_handlers ipc_callbacks =
-     }
- 
-     mkdir(CRM_STATE_DIR, 0750);
--    rc = chown(CRM_STATE_DIR, pcmk_uid, pcmk_gid);
--    if(rc < 0) {
--        crm_warn("Cannot change the ownership of %s to user %s and gid %d",
--                 CRM_STATE_DIR, CRM_DAEMON_USER, pcmk_gid);
--    }
-+    mcp_chown(CRM_STATE_DIR, pcmk_uid, pcmk_gid);
- 
-     /* Used by stonithd */
-     build_path(HA_STATE_DIR "/heartbeat", 0755);
-+    mcp_chown(HA_STATE_DIR, pcmk_uid, pcmk_gid);
- 
-     /* Used by RAs - Leave owned by root */
-     build_path(CRM_RSCTMP_DIR, 0755);
- 
-     /* Used to store core files in */
-     build_path(CRM_CORE_DIR, 0755);
-+    mcp_chown(CRM_CORE_DIR, pcmk_uid, pcmk_gid);
-+
-+    /* Used to store blackbox dumps in */
-+    build_path(CRM_BLACKBOX_DIR, 0755);
-+    mcp_chown(CRM_BLACKBOX_DIR, pcmk_uid, pcmk_gid);
-+
-+    /* Used to store policy engine inputs in */
-+    build_path(PE_STATE_DIR, 0755);
-+    mcp_chown(PE_STATE_DIR, pcmk_uid, pcmk_gid);
-+
-+    /* Used to store the cluster configuration */
-+    build_path(CRM_CONFIG_DIR, 0755);
-+    mcp_chown(CRM_CONFIG_DIR, pcmk_uid, pcmk_gid);
- 
-     /* Per-user core directories */
-     if (mkdir(CRM_CORE_DIR"/root", 0700) < 0 && errno != EEXIST) {
-@@ -798,9 +818,7 @@ struct qb_ipcs_service_handlers ipc_callbacks =
-     if (mkdir(CRM_CORE_DIR"/"CRM_DAEMON_USER, 0700) < 0 && errno != EEXIST) {
-         crm_perror(LOG_INFO, "Could not create %s", CRM_CORE_DIR"/"CRM_DAEMON_USER);
-     } else {
--        if(chown(CRM_CORE_DIR"/"CRM_DAEMON_USER, pcmk_uid, pcmk_gid) < 0) {
--            crm_perror(LOG_ERR, "Could not change the ownership of %s to %s", CRM_CORE_DIR"/"CRM_DAEMON_USER, CRM_DAEMON_USER);
--        }
-+        mcp_chown(CRM_CORE_DIR, pcmk_uid, pcmk_gid);
-     }
- 
-     client_list = g_hash_table_new(g_direct_hash, g_direct_equal);
diff --git a/debian/patches/glib_no_CRIT_messages.patch b/debian/patches/glib_no_CRIT_messages.patch
deleted file mode 100644
index f96b04e..0000000
--- a/debian/patches/glib_no_CRIT_messages.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/lib/common/logging.c b/lib/common/logging.c
-index b4ca277..2b74d3f 100644
---- a/lib/common/logging.c
-+++ b/lib/common/logging.c
-@@ -56,12 +56,21 @@
- {
-     int log_level = LOG_WARNING;
-     GLogLevelFlags msg_level = (flags & G_LOG_LEVEL_MASK);
-+    static struct qb_log_callsite *glib_cs = NULL;
-+
-+    if (glib_cs == NULL) {
-+        glib_cs = qb_log_callsite_get(__PRETTY_FUNCTION__, __FILE__, "glib-handler", LOG_DEBUG, __LINE__, crm_trace_nonlog);
-+    }
-+
- 
-     switch (msg_level) {
-         case G_LOG_LEVEL_CRITICAL:
--            /* log and record how we got here */
--            crm_abort(__FILE__, __PRETTY_FUNCTION__, __LINE__, message, TRUE, TRUE);
--            return;
-+            log_level = LOG_CRIT;
-+
-+            if (crm_is_callsite_active(glib_cs, LOG_DEBUG, 0) == FALSE) {
-+                /* log and record how we got here */
-+                crm_abort(__FILE__, __PRETTY_FUNCTION__, __LINE__, message, TRUE, TRUE);
-+            }
- 
-         case G_LOG_LEVEL_ERROR:
-             log_level = LOG_ERR;
diff --git a/debian/patches/gracefully_handle_ECHILD_in_waitpid.patch b/debian/patches/gracefully_handle_ECHILD_in_waitpid.patch
deleted file mode 100644
index d79c98a..0000000
--- a/debian/patches/gracefully_handle_ECHILD_in_waitpid.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/lib/common/utils.c b/lib/common/utils.c
-index 527c9e0..b45e620 100644
---- a/lib/common/utils.c
-+++ b/lib/common/utils.c
-@@ -1118,31 +1118,36 @@
-         crm_err("%s: Triggered fatal assert at %s:%d : %s", function, file, line, assert_condition);
-     }
- 
--    switch (pid) {
--        case -1:
--            crm_crit("%s: Cannot create core for non-fatal assert at %s:%d : %s",
--                     function, file, line, assert_condition);
--            return;
--
--        case 0:                /* Child */
--            abort();
--            break;
-+    if (pid == -1) {
-+        crm_crit("%s: Cannot create core for non-fatal assert at %s:%d : %s",
-+                 function, file, line, assert_condition);
-+        return;
-+
-+    } else if(pid == 0) {
-+        /* Child process */
-+        abort();
-+        return;
-+    }
- 
--        default:               /* Parent */
--            crm_err("%s: Forked child %d to record non-fatal assert at %s:%d : %s",
--                    function, pid, file, line, assert_condition);
--            crm_write_blackbox(SIGTRAP, NULL);
-+    /* Parent process */
-+    crm_err("%s: Forked child %d to record non-fatal assert at %s:%d : %s",
-+            function, pid, file, line, assert_condition);
-+    crm_write_blackbox(SIGTRAP, NULL);
- 
--            do {
--                rc = waitpid(pid, &status, 0);
--                if (rc < 0 && errno != EINTR) {
--                    crm_perror(LOG_ERR, "%s: Cannot wait on forked child %d", function, pid);
--                }
-+    do {
-+        rc = waitpid(pid, &status, 0);
-+        if(rc == pid) {
-+            return; /* Job done */
-+        }
- 
--            } while (rc < 0 && errno == EINTR);
-+    } while(errno == EINTR);
- 
--            return;
-+    if (errno == ECHILD) {
-+        /* crm_mon does this */
-+        crm_trace("Cannot wait on forked child %d - SIGCHLD is probably set to SIG_IGN", pid);
-+        return;
-     }
-+    crm_perror(LOG_ERR, "Cannot wait on forked child %d", pid);
- }
- 
- char *
diff --git a/debian/patches/init-scripts-compat.patch b/debian/patches/init-scripts-compat.patch
deleted file mode 100644
index 8fc3834..0000000
--- a/debian/patches/init-scripts-compat.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN pacemaker-Pacemaker-1.1.12.bak/lrmd/pacemaker_remote.in pacemaker-Pacemaker-1.1.11/lrmd/pacemaker_remote.in
---- pacemaker-Pacemaker-1.1.12.bak/lrmd/pacemaker_remote.in	2014-02-13 17:06:19.000000000 +0000
-+++ pacemaker-Pacemaker-1.1.12/lrmd/pacemaker_remote.in	2014-02-21 14:43:16.376196331 +0000
-@@ -20,6 +20,8 @@
- # Description:		Starts and stops the Pacemaker remote agent for non-cluster nodes
- ### END INIT INFO
-
-+. /lib/lsb/init-functions
-+
- desc="Pacemaker Remote Agent"
- prog="pacemaker_remoted"
- cman=0
-diff -ruN pacemaker-Pacemaker-1.1.12.bak/mcp/pacemaker.in pacemaker-Pacemaker-1.1.11/mcp/pacemaker.in
---- pacemaker-Pacemaker-1.1.12.bak/mcp/pacemaker.in	2014-02-13 17:06:19.000000000 +0000
-+++ pacemaker-Pacemaker-1.1.12/mcp/pacemaker.in	2014-02-21 14:42:59.897264897 +0000
-@@ -21,6 +21,8 @@
- # Description:		Starts and stops Pacemaker Cluster Manager.
- ### END INIT INFO
-
-+. /lib/lsb/init-functions
-+
- desc="Pacemaker Cluster Manager"
- prog="pacemakerd"
-
diff --git a/debian/patches/prevent_glib_assertion.patch b/debian/patches/prevent_glib_assertion.patch
deleted file mode 100644
index 481400c..0000000
--- a/debian/patches/prevent_glib_assertion.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/lib/services/systemd.c b/lib/services/systemd.c
-index 2a66da5..b18f86f 100644
---- a/lib/services/systemd.c
-+++ b/lib/services/systemd.c
-@@ -478,7 +478,10 @@ struct unit_info {
-             fclose(file_strm);
-         }
-         systemd_daemon_reload(systemd_proxy, &error);
--        g_error_free(error); error = NULL;
-+        if(error) {
-+            g_error_free(error);
-+            error = NULL;
-+        }
-         free(override_file);
-         free(override_dir);
- 
diff --git a/debian/patches/series b/debian/patches/series
index 0ae377f..c4ab39d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
-raexecupstart.patch
-init-scripts-compat.patch
+0001-raexecupstart.patch
+0002-init-scripts-compat.patch
+0003-Properly-enable-logging-exports-in-default-file.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pacemaker.git



More information about the Debian-HA-Commits mailing list