commit: f9289de293c88909af80c69f2ff6f602bc0b127f Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Fri Feb 10 15:56:52 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Fri Feb 10 22:33:24 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9289de2
sys-cluster/pacemaker: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/3900 .../pacemaker/files/1.0.12-BUILD_VERSION.patch | 43 ---------------------- sys-cluster/pacemaker/files/1.1.7-glibc2.16.patch | 13 ------- .../files/1.1.8-backwards_compatibility.patch | 36 ------------------ .../files/pacemaker-1.0.10-asneeded.patch | 22 ----------- .../files/pacemaker-1.0.10-installpaths.patch | 9 ----- 5 files changed, 123 deletions(-) diff --git a/sys-cluster/pacemaker/files/1.0.12-BUILD_VERSION.patch b/sys-cluster/pacemaker/files/1.0.12-BUILD_VERSION.patch deleted file mode 100644 index 8e52664482..0000000000 --- a/sys-cluster/pacemaker/files/1.0.12-BUILD_VERSION.patch +++ /dev/null @@ -1,43 +0,0 @@ -# HG changeset patch -# Parent d90c3d4786da4cfa7944c9009a0071e3ea6f8581 - -diff -r d90c3d4786da configure.ac ---- a/configure.ac Wed Jun 13 11:43:31 2012 +0900 -+++ b/configure.ac Wed Jun 13 11:44:38 2012 +0900 -@@ -464,20 +464,26 @@ - AC_DEFINE_UNQUOTED(STONITH_PLUGIN_DIR,"$STONITH_PLUGIN_DIR", Location for Stonith plugins) - AC_SUBST(STONITH_PLUGIN_DIR) - --AC_PATH_PROGS(HG, hg false) -+AC_PATH_PROGS(GIT, git false) - AC_MSG_CHECKING(build version) --BUILD_VERSION=unknown --if test -f $srcdir/.hg_archival.txt; then -- BUILD_VERSION=`cat $srcdir/.hg_archival.txt | awk '/node:/ { print $2 }'` --elif test -x $HG -a -d .hg; then -- BUILD_VERSION=`$HG id -itb` -- if test $? != 0; then -- BUILD_VERSION=unknown -- fi -+ -+BUILD_VERSION=$Format:%H$ -+if test $BUILD_VERSION != ":%H$"; then -+ AC_MSG_RESULT(archive hash: $BUILD_VERSION) -+ -+elif test -x $GIT -a -d .git; then -+ BUILD_VERSION=`$GIT log --pretty="format:%h" -n 1` -+ AC_MSG_RESULT(git hash: $BUILD_VERSION) -+ -+else -+ # The current directory name make a reasonable default -+ # Most generated archives will include the hash or tag -+ BASE=`basename $PWD` -+ BUILD_VERSION=`echo $BASE | sed s:.*[[Pp]]acemaker-::` -+ AC_MSG_RESULT(directory based hash: $BUILD_VERSION) - fi - - AC_DEFINE_UNQUOTED(BUILD_VERSION, "$BUILD_VERSION", Build version) --AC_MSG_RESULT($BUILD_VERSION) - AC_SUBST(BUILD_VERSION) - - dnl =============================================== diff --git a/sys-cluster/pacemaker/files/1.1.7-glibc2.16.patch b/sys-cluster/pacemaker/files/1.1.7-glibc2.16.patch deleted file mode 100644 index 73ffd0614c..0000000000 --- a/sys-cluster/pacemaker/files/1.1.7-glibc2.16.patch +++ /dev/null @@ -1,13 +0,0 @@ -Fix building with glibc-2.16 - -https://bugs.gentoo.org/show_bug.cgi?id=432012 ---- a/mcp/pacemaker.h -+++ b/mcp/pacemaker.h -@@ -21,6 +21,7 @@ - #include <sys/param.h> - #include <sys/types.h> - #include <sys/wait.h> -+#include <sys/resource.h> - - #include <stdint.h> - diff --git a/sys-cluster/pacemaker/files/1.1.8-backwards_compatibility.patch b/sys-cluster/pacemaker/files/1.1.8-backwards_compatibility.patch deleted file mode 100644 index d4a5780c01..0000000000 --- a/sys-cluster/pacemaker/files/1.1.8-backwards_compatibility.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/lib/cluster/legacy.c 2012-11-08 11:55:09.297354491 +0100 -+++ b/lib/cluster/legacy.c 2012-11-08 11:54:57.507587115 +0100 -@@ -1362,17 +1362,27 @@ - /* If we can still talk to our peer process on that node, - * then its also part of the corosync membership - */ -- crm_trace("%s: processes=%.16x", node->uname, node->processes); -+ crm_trace("%s: processes=%.8x", node->uname, node->processes); - return TRUE; - -- } else if(is_classic_ais_cluster() && (node->processes & crm_proc_plugin) == 0) { -- crm_trace("%s: processes=%.16x", node->uname, node->processes); -- return FALSE; -+ } else if(is_classic_ais_cluster()) { -+ if(node->processes < crm_proc_none) { -+ crm_debug("%s: unknown process list, assuming active for now", node->uname); -+ return TRUE; -+ -+ } else if(is_set(node->processes, crm_proc_none)) { -+ crm_debug("%s: all processes are inactive", node->uname); -+ return FALSE; -+ -+ } else if(is_not_set(node->processes, crm_proc_plugin)) { -+ crm_trace("%s: processes=%.8x", node->uname, node->processes); -+ return FALSE; -+ } - } - - proc = text2proc(crm_system_name); -- if(proc != crm_proc_none && (node->processes & proc) == 0) { -- crm_trace("%s: proc %.16x not in %.16x", node->uname, proc, node->processes); -+ if(proc > crm_proc_none && (node->processes & proc) == 0) { -+ crm_trace("%s: proc %.8x not in %.8x", node->uname, proc, node->processes); - return FALSE; - } - diff --git a/sys-cluster/pacemaker/files/pacemaker-1.0.10-asneeded.patch b/sys-cluster/pacemaker/files/pacemaker-1.0.10-asneeded.patch deleted file mode 100644 index ac26550493..0000000000 --- a/sys-cluster/pacemaker/files/pacemaker-1.0.10-asneeded.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- Makefile.am -+++ Makefile.am -@@ -23,7 +23,7 @@ - MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure DRF/config-h.in \ - DRF/stamp-h.in libtool.m4 ltdl.m4 libltdl.tar - --SUBDIRS = debian $(LIBLTDL_DIR) replace include lib pengine cib crmd fencing tools shell xml cts extra doc -+SUBDIRS = $(LIBLTDL_DIR) replace include lib pengine cib crmd fencing tools shell xml cts extra doc - - doc_DATA = AUTHORS COPYING COPYING.LIB - ---- lib/pengine/Makefile.am -+++ lib/pengine/Makefile.am -@@ -34,7 +34,7 @@ - - libpe_status_la_LDFLAGS = -version-info 2:0:0 - libpe_status_la_SOURCES = $(rule_files) $(status_files) --libpe_status_la_LIBADD = -llrm -+libpe_status_la_LIBADD = -llrm @CURSESLIBS@ - - clean-generic: - rm -f *.log *.debug *~ diff --git a/sys-cluster/pacemaker/files/pacemaker-1.0.10-installpaths.patch b/sys-cluster/pacemaker/files/pacemaker-1.0.10-installpaths.patch deleted file mode 100644 index 5187b7967e..0000000000 --- a/sys-cluster/pacemaker/files/pacemaker-1.0.10-installpaths.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- extra/Makefile.am -+++ extra/Makefile.am -@@ -20,5 +20,5 @@ - - SUBDIRS = resources - --mibdir = $(datadir)/snmp/mibs -+mibdir = $(datadir)/$(PACKAGE)/snmp/mibs - mib_DATA = PCMK-MIB.txt
