[Debian-ha-commits] [cluster-glue] 56/73: Removed all RC patches, no longer necessary

[Richard Winters]

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

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

commit b3cc9017926755aaf64cbd16db8adcf62bf89cdc
Author: Richard B Winters <rik at mmogp.com>
Date:   Thu Apr 16 14:26:48 2015 -0400

    Removed all RC patches, no longer necessary
    
    Change-Id: I8d63575a092c3abddb3f34837d3221d9b8f5e784
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 debian/patches/libtoolize_check.patch  | 56 ----------------------------------
 debian/patches/logd_lsb_functions.diff | 12 --------
 debian/patches/raexecupstart.patch     | 41 -------------------------
 3 files changed, 109 deletions(-)

diff --git a/debian/patches/libtoolize_check.patch b/debian/patches/libtoolize_check.patch
deleted file mode 100644
index b2eb71b..0000000
--- a/debian/patches/libtoolize_check.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Description: check for libtoolize rather than libtool
-Author: Johannes Schauer <j.schauer at email.de>
-Forwarded: no
-
---- cluster-glue-1.0.12~rc1+hg2777.orig/autogen.sh
-+++ cluster-glue-1.0.12~rc1+hg2777/autogen.sh
-@@ -91,16 +91,11 @@ do
-   fi
- done
- 
--for command in libtool14 libtool15 libtool glibtool 
--do
--  URL=$gnu/$pkg/
--  if
--    testProgram $command
--  then
--    libtool=$command
--    libtoolize=`echo  "$libtool" | sed -e 's/libtool/libtoolize/'`
--  fi
--done
-+if
-+  testProgram libtoolize
-+then
-+  libtoolize=libtoolize
-+fi
- 
- if [ -z $autoconf ]; then 
-     echo You must have autoconf installed to compile the cluster-glue package.
-@@ -114,7 +109,7 @@ elif [ -z $automake ]; then
-     echo or get the source tarball at: $gnu/automake/
-     exit 1
- 
--elif [ -z $libtool ]; then 
-+elif [ -z $libtoolize ]; then 
-     echo You must have libtool installed to compile the cluster-glue package.
-     echo Download the appropriate package for your system,
-     echo or get the source tarball at: $gnu/libtool/
-@@ -125,7 +120,7 @@ oneline() {
-   read x; echo "$x"
- }
- 
--LT_version=`$libtool --version | oneline | sed -e 's%^[^0-9]*%%' -e s'% .*%%'`
-+LT_version=`$libtoolize --version | oneline | sed -e 's%^[^0-9]*%%' -e s'% .*%%'`
- LT_majvers=`echo "$LT_version" | sed -e 's%\..*%%'`
- LT_minvers=`echo "$LT_version" | sed -e 's%^[^.]*\.%%' `
- LT_minnum=`echo  "$LT_minvers" | sed -e 's%[^0-9].*%%'`
-@@ -138,8 +133,7 @@ then
- fi
- 
- # Create local copies so that the incremental updates will work.
--rm -f ./autoconf ./automake ./autoheader ./libtool
--ln -s `which $libtool` ./libtool
-+rm -f ./autoconf ./automake ./autoheader
- ln -s `which $autoconf` ./autoconf
- ln -s `which $automake` ./automake
- ln -s `which $autoheader` ./autoheader
diff --git a/debian/patches/logd_lsb_functions.diff b/debian/patches/logd_lsb_functions.diff
deleted file mode 100644
index f94ba9a..0000000
--- a/debian/patches/logd_lsb_functions.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN Reusable-Cluster-Components-glue--b5f160509785.bak/logd/logd.in Reusable-Cluster-Components-glue--b5f160509785/logd/logd.in
---- Reusable-Cluster-Components-glue--b5f160509785.bak/logd/logd.in	2013-10-31 12:09:50.000000000 +0000
-+++ Reusable-Cluster-Components-glue--b5f160509785/logd/logd.in	2014-02-21 11:57:33.320264663 +0000
-@@ -32,6 +32,8 @@
- # Default-Stop: 0 1 6
- ### END INIT INFO
- 
-+. /lib/lsb/init-functions
-+
- LOGD_CFG=@sysconfdir@/logd.cf
- LOGD_OPT=""
- [ -f "$LOGD_CFG" ] && LOGD_OPT="-c $LOGD_CFG"
diff --git a/debian/patches/raexecupstart.patch b/debian/patches/raexecupstart.patch
deleted file mode 100644
index f72c9de..0000000
--- a/debian/patches/raexecupstart.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ruN Reusable-Cluster-Components-glue--5ea7e344a633.old/lrm/lrmd/lrmd.c Reusable-Cluster-Components-glue--5ea7e344a633/lrm/lrmd/lrmd.c
---- Reusable-Cluster-Components-glue--5ea7e344a633.old/lrm/lrmd/lrmd.c	2011-10-19 15:18:06.000000000 +0000
-+++ Reusable-Cluster-Components-glue--5ea7e344a633/lrm/lrmd/lrmd.c	2011-10-20 09:26:43.385459974 +0000
-@@ -1533,6 +1533,28 @@
- 	lrmd_client_t* client = (lrmd_client_t*) user_data;
- 
- 	CHECK_ALLOCATED(client, "client", );
-+
-+	/* If we've been called as a result of g_src and/or
-+	 * g_src_cbk being unreffed, don't try to unref it
-+	 * again, as that'll deadlock. OTOH, we might have
-+	 * introduced a leak here. */
-+#if 0
-+	if (client->g_src != NULL) {
-+		G_main_del_IPC_Channel(client->g_src);
-+	}
-+
-+	if (client->g_src_cbk != NULL) {
-+		G_main_del_IPC_Channel(client->g_src_cbk);
-+	}
-+#endif
-+	lrmd_client_destroy(client);
-+
-+}
-+
-+static void
-+remove_client (lrmd_client_t *client)
-+{
-+	CHECK_ALLOCATED(client, "client", );
- 	if (client->g_src != NULL) {
- 		G_main_del_IPC_Channel(client->g_src);
- 	}
-@@ -1617,7 +1639,7 @@
- 	exist = lookup_client(client->pid);
- 	if (NULL != exist) {
- 		g_hash_table_remove(clients, (gpointer)&client->pid);
--		on_remove_client(exist);
-+		remove_client(exist);
- 		lrmd_log(LOG_NOTICE,
- 			"on_msg_register: the client [pid:%d] already exists in "
- 			"internal client list, let remove it at first."

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