[Debian-ha-commits] [pacemaker] 05/07: Interim changes

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 3c6355cb5c9ceb2ddb160dfb463f6b5876400372
Author: Richard B Winters <rik at mmogp.com>
Date:   Fri Apr 24 18:46:29 2015 -0400

    Interim changes
    
     - Temporarily drop raexecupstart.patch
    
    Change-Id: I48daa6b1128c7d4593c420c219ef9a2139d1586f
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 debian/changelog                                |  48 +++++-
 debian/control                                  |   4 +-
 debian/patches/default_file_for_pacemaker.patch |  12 +-
 debian/patches/init-scripts-compat.patch        |  12 +-
 debian/patches/raexecupstart.patch              |  12 +-
 debian/patches/series                           |   1 -
 debian/rules                                    | 194 +++++++-----------------
 7 files changed, 120 insertions(+), 163 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d952908..8ca085f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 pacemaker (1.1.12-1) UNRELEASED; urgency=medium
 
   * New upstream release
+
+  [ Richard B Winters ]
   * debian/control: Multiple edits;
     - Formatted fields for folding where applicable
     - Updated Build-depends required version of debhelper to >=9
@@ -18,8 +20,8 @@ pacemaker (1.1.12-1) UNRELEASED; urgency=medium
       -- libvotequorum-dev
     - Changed libheartbeat2-dev to a piped alternative to 
       corosync
-    - Changed heartbeat to a piped alternative to corosync in 
-      pacemaker binary
+    - Removed hardening-wrapper in preparation of updating the
+      hardening implementation
     - Updated descriptions for several packages
     - Removed duplicate/conflicting Conflicts/Replaces entries in 
       libcib
@@ -30,6 +32,48 @@ pacemaker (1.1.12-1) UNRELEASED; urgency=medium
   * debian/copyright: Multiple edits;
     - Formatted according to DEP-5 version
     - Added debian-ha-maintainers and each uploader to debian/*
+  * debian/lib<*>-dev.install: Removed *.la file references
+  * debian/rules: Multiple edits;
+    - Streamlined based on dh7 syntax
+    - Added flags to ensure that we link against all needed libs;
+      (cf. Policy 10.2)
+    - Override ./configure to ensure use of corosync as the cluster
+      stack 
+    - Dropped clearing of dependency_libs field in *.la files in
+      favor of removing all .la files instead
+
+  [ Pallai Roland ]
+  * debian/control: Multiple edits;
+    - Updated dependency version - and changed Conflicts/Replaces
+      versions - for libcib4, where previously it was libcib3
+    - Added later versions to Conflicts/Replaces where warranted
+      for libstonith1d
+    - Changed heartbeat to a piped alternative to corosync in 
+      pacemaker binary
+  * debian/libcib<version>.install: Multple edits;
+    - libcib3.install renamed to libcib4.install
+    - ABI minor/patch version incremented
+  * debian/libcib<version>-dev.install: renamed libcib3-dev.install to
+    libcib4-dev.install
+  * debian/libcrmcluster4.install
+    - ABI minor/patch version incremented
+  * debian/libcrmcommon3.install
+    - ABI minor/patch version incremented
+  * debian/lrmd1.install
+    - ABI minor/patch version incremented
+  * debian/libpe-rules2.install
+    - ABI minor/patch version incremented
+  * debian/libpe-status4.install
+    - ABI minor/patch version incremented
+  * debian/libpengine4.install
+    - ABI minor/patch version incremented
+  * debian/libstonithd2.install
+    - ABI minor/patch version incremented
+  * debian/libtransitioner.install
+    - ABI minor/patch version incremented
+  * debian/pacemaker.install
+    - Streamlined *.rng
+    - Added reference to upgrade-1.3.xsl
 
  -- Richard B Winters <rik at mmogp.com>  Fri, 24 Apr 2015 17:52:11 -0400
 
diff --git a/debian/control b/debian/control
index 53102d6..6a809b4 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Build-Depends: debhelper (>= 7.0.50),
  libesmtp-dev,
  libdbus-1-dev,
  libglib2.0-dev,
- libgnutls-dev,
+ libgnutls28-dev | libgnutls-dev,
  liblrm2-dev,
  libltdl3-dev,
  libncurses5-dev,
@@ -47,7 +47,7 @@ Build-Depends: debhelper (>= 7.0.50),
  libvotequorum-dev (>= 2.3.4),
  libxml2-dev,
  libxml2-utils,
- libxslt-dev,
+ libxslt1-dev | libxslt-dev,
  net-tools,
  openssh-client,
  perl,
diff --git a/debian/patches/default_file_for_pacemaker.patch b/debian/patches/default_file_for_pacemaker.patch
index 81d6f56..887206e 100644
--- a/debian/patches/default_file_for_pacemaker.patch
+++ b/debian/patches/default_file_for_pacemaker.patch
@@ -1,7 +1,7 @@
-Index: pacemaker-1.1.11/mcp/pacemaker.sysconfig
+Index: pacemaker-1.1.12/mcp/pacemaker.sysconfig
 ===================================================================
---- pacemaker-1.1.11.orig/mcp/pacemaker.sysconfig	2014-02-13 17:06:19.000000000 +0000
-+++ pacemaker-1.1.11/mcp/pacemaker.sysconfig	2014-02-21 14:37:53.000000000 +0000
+--- 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 @@
  
  # Turn on special handling for CMAN clusters in the init script
@@ -18,12 +18,6 @@ Index: pacemaker-1.1.11/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
- # By default Pacemaker will inherit the logfile specified in corosync.conf
--# PCMK_debugfile=/var/log/pacemaker.log
-+# export PCMK_debugfile=/var/log/pacemaker.log
- 
  # Specify an alternate syslog target for NOTICE (and higher) messages
  # Use 'none' to disable - not recommended
  # The default value is 'daemon'
diff --git a/debian/patches/init-scripts-compat.patch b/debian/patches/init-scripts-compat.patch
index 73bce1a..8fc3834 100644
--- a/debian/patches/init-scripts-compat.patch
+++ b/debian/patches/init-scripts-compat.patch
@@ -1,6 +1,6 @@
-diff -ruN pacemaker-Pacemaker-1.1.11.bak/lrmd/pacemaker_remote.in pacemaker-Pacemaker-1.1.11/lrmd/pacemaker_remote.in
---- pacemaker-Pacemaker-1.1.11.bak/lrmd/pacemaker_remote.in	2014-02-13 17:06:19.000000000 +0000
-+++ pacemaker-Pacemaker-1.1.11/lrmd/pacemaker_remote.in	2014-02-21 14:43:16.376196331 +0000
+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
@@ -10,9 +10,9 @@ diff -ruN pacemaker-Pacemaker-1.1.11.bak/lrmd/pacemaker_remote.in pacemaker-Pace
  desc="Pacemaker Remote Agent"
  prog="pacemaker_remoted"
  cman=0
-diff -ruN pacemaker-Pacemaker-1.1.11.bak/mcp/pacemaker.in pacemaker-Pacemaker-1.1.11/mcp/pacemaker.in
---- pacemaker-Pacemaker-1.1.11.bak/mcp/pacemaker.in	2014-02-13 17:06:19.000000000 +0000
-+++ pacemaker-Pacemaker-1.1.11/mcp/pacemaker.in	2014-02-21 14:42:59.897264897 +0000
+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
diff --git a/debian/patches/raexecupstart.patch b/debian/patches/raexecupstart.patch
index b22eb54..63e9243 100644
--- a/debian/patches/raexecupstart.patch
+++ b/debian/patches/raexecupstart.patch
@@ -1,7 +1,7 @@
-Index: pacemaker-1.1.5/xml/crm-1.0.dtd
+Index: pacemaker-1.1.12/xml/crm.dtd
 ===================================================================
---- pacemaker-1.1.5.orig/xml/crm-1.0.dtd	2011-02-23 11:37:45.054047000 -0500
-+++ pacemaker-1.1.5/xml/crm-1.0.dtd	2011-02-23 11:38:39.887424200 -0500
+--- 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 @@
  <!ATTLIST primitive
            id                CDATA        #REQUIRED
@@ -20,10 +20,10 @@ Index: pacemaker-1.1.5/xml/crm-1.0.dtd
            type              CDATA        #REQUIRED
            provider          CDATA        #IMPLIED>
  <!--
-Index: pacemaker-1.1.5/xml/crm-transitional.dtd
+Index: pacemaker-1.1.12/xml/crm-transitional.dtd
 ===================================================================
---- pacemaker-1.1.5.orig/xml/crm-transitional.dtd	2011-02-23 11:37:45.368515000 -0500
-+++ pacemaker-1.1.5/xml/crm-transitional.dtd	2011-02-23 11:38:39.897424209 -0500
+--- 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 @@
  <!ATTLIST primitive
            id                CDATA        #REQUIRED
diff --git a/debian/patches/series b/debian/patches/series
index b5bbb48..0ae377f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 raexecupstart.patch
-default_file_for_pacemaker.patch
 init-scripts-compat.patch
diff --git a/debian/rules b/debian/rules
index 123c282..df424eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,109 +1,68 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# Copyright 1997 to 1999 by Joey Hess.
-# License: GNU General Public License (GPL)
-
-# Thanks to Paolo Molaro <lupus at debian.org> and heartbeat_0.4.6-2.diff
-
-# Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
-
-# enable hardening
-export DEB_BUILD_HARDENING=1
-
-#
-# Path to SSH and SCP
-# Usually this is guessed if ssh is installed.
-# However, there is a long standing bug with installing ssh
-# on arm in debian and this is preventing heartbeat from
-# moving into sarge. By adding this we can remove the build
-# dependency on ssh and get an updated heartbeat into sarge... 
-# I hope. Horms 26th July 2004
-#
-# If this is removed then the build depandancy on ssh should be
-# restored
-#
-
-cfg:=--prefix=/usr --sysconfdir=/etc --localstatedir=/var 	  \
-  --libexecdir=/usr/lib --mandir=/usr/share/man \
-  --enable-snmp-subagent --with-mibsdir=/usr/share/snmp/mibs 	  \
-  --disable-fatal-warnings --enable-glib-malloc --with-esmtp 	  \
-  --with-snmp --with-ais --with-heartbeat --libdir=/usr/lib
-
-RELEASE := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }')
-UPSTREAM := $(shell echo "$(RELEASE)" | sed 's/:\?\([0-9\.]\+\)-[0-9].*/\1/')
-ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-patch:
-	override_version=$(RELEASE) sh debian/apply
-
-unpatch:
-	override_version=$(RELEASE) sh debian/apply $(UPSTREAM)
-
-build-arch: build
-build-indep: build
-build: build-stamp
-build-stamp:
-	dh_testdir
-	[ -f configure ] || sh autogen.sh
-	if [ -e configure -a ! -x configure ]; then chmod u+x configure; fi
-	if [ -e py-compile -a ! -x py-compile ]; then chmod u+x py-compile; fi
-	# run configure script
-	./configure $(cfg)
-	# set rng compatibility symlinks
-	$(shell cd xml && for a in *-1.0.rng; do ln -s "$$a" `echo "$$a" | sed 's/-1.0//g'`; done)
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	
-	[ ! -f Makefile ] || $(MAKE) clean
-	rm -f tools/ccdv
-	rm -f libltdl.tar autoconf automake autoheader
-	rm -f build-stamp
-	rm -f debian/*.files debian/*.dirs
-	
-	rm -rf debian/*-build-*
-	rm -rf debian/tmp-*
-	
-	## Zero autoconf foo
-	rm -f config.status libltdl/config.log libltdl/config.status 
-	
-	dh_clean
-
-install: build install-stamp
-install-stamp:
-	dh_testdir
-	dh_testroot
-	dh_installdirs
-	$(MAKE) install DESTDIR=`pwd`/debian/tmp docdir=/usr/share/doc/pacemaker
-	for file in `find debian/tmp -name '*.la'`; do \
-		sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
-	done
-
-binary-indep: build install
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#DH_VERBOSE = 1
+
+# see FEATURE AREAS in dpkg-buildflags(1)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+# Ensure that we link against all needed libraries (cf. Policy 10.2)
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs
+
+# main packaging script based on dh7 syntax
+%:
+	dh $@ --with autoreconf,python2,systemd --fail-missing --link-doc=pacemaker
+
+override_dh_autoreconf:
+	dh_autoreconf ./autogen.sh
+
+override_dh_auto_configure:
+	./configure --prefix=/usr \
+	    --libexecdir=/usr/lib/ \
+	    --localstatedir=/var \
+	    --sysconfdir=/etc \
+	    --libdir=/usr/lib \ 
+	    --docdir=/usr/share/doc/pacemaker \
+	    --enable-snmp-subagent --with mibsdir=/usr/share/snmp/mibs \
+	    --enable-upstart \
+	    --with-snmp \
+	    --with-esmtp \
+	    --with-corosync \
+	    --with-cs-quorum
+
+DOC = debian/tmp/usr/share/doc/pacemaker
+
+override_dh_auto_build:
+	dh_auto_build
+	$(MAKE) doxygen
+	rm doc/api/html/*.md5
+
+override_dh_auto_install:
+	dh_auto_install
+# remove .la files
+	rm -v debian/tmp/usr/lib/lib*.la
+# install default file
+	mkdir -p $(CURDIR)/debian/pacemaker/etc/default
+	cp -ax $(CURDIR)/mcp/pacemaker.sysconfig $(CURDIR)/debian/pacemaker/etc/default/pacemaker
+# remove redundant COPYING files
+	rm -v $(DOC)/COPYING $(DOC)/COPYING.LIB
 
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
+override_dh_installinit:
+	dh_installinit -p pacemaker --name pacemaker -- defaults 20 32
 
-	rm -rf `pwd`/debian/tmp/usr/lib/service_crm.so
-	rm -rf `pwd`/debian/tmp/usr/lib/service_crm.la
-	rm -rf `pwd`/debian/tmp/usr/lib/service_crm.a
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog
 
-	dh_install --sourcedir=debian/tmp --list-missing
+override_dh_strip:
+	dh_strip --dbg-package=pacemaker-dbg
 	
-	# install default file
-	mkdir -p $(CURDIR)/debian/pacemaker/etc/default
-	cp -ax $(CURDIR)/mcp/pacemaker.sysconfig $(CURDIR)/debian/pacemaker/etc/default/pacemaker
-
-	# make non-scripts non-executable
+override_dh_compress:
+# make non-scripts non-executable
 	-chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/crm-transitional.dtd
 	-chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/resources-1.0.rng
 	-chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/nvset-1.0.rng
 	-chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/upgrade06.xsl
+	-chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/upgrade-1.3.xsl
 	-chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/constraints-1.0.rng
 	-chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/shelltest/testcases/xmlonly.sh
 	-chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/shelltest/testcases/confbasic-xml.filter
@@ -112,43 +71,4 @@ binary-arch: build install
 	-chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/score.rng
 	-chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/crm.dtd
 	-chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/rule-1.0.rng
-
-	# delete redundant COPYING files
-	rm -rf debian/pacemaker/usr/share/doc/pacemaker/COPYING.LGPL
-	rm -rf debian/pacemaker/usr/share/doc/pacemaker/COPYING.LIB
-	rm -rf debian/pacemaker/usr/share/doc/pacemaker/COPYING
-	
-	# create special directory
-	mkdir -p `pwd`/debian/pacemaker/var/lib/pengine
-	mkdir -p `pwd`/debian/pacemaker/var/lib/heartbeat/pengine
-	mkdir -p `pwd`/debian/pacemaker/var/lib/pacemaker/{blackbox,cib,cores,pengine}
-	
-	dh_installdebconf -a
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_installinit -a -n -u 'defaults 20 32'
-	dh_installman -a
-	dh_lintian
-	dh_installchangelogs
-	dh_link -a
-	dh_strip -a --dbg-package=pacemaker-dbg
-	
-	dh_compress -a
-	dh_fixperms -a
-
-	chmod -x $(CURDIR)/debian/pacemaker/usr/share/pacemaker/*.rng
-	chmod 0644 $(CURDIR)/debian/pacemaker/usr/lib/lcrso/pacemaker.lcrso
-
-	dh_makeshlibs -a -V
-	dh_perl -a
-	dh_python2 -ppacemaker -ppacemaker-dev
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary binary-indep binary-arch install \
-	patch unpatch
+	dh_compress

-- 
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