update to 4.0.10

We now run autogen.sh before configure - else build complains about wrong
automake version.

diff --git a/Makefile b/Makefile
index 6990f8937d4b7c30c60d3bb33504f627f6bd4f75..3d097f9f98b0ad779a8b0c7658d938b3d367006c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,10 @@
-RELEASE=3.1
+RELEASE=3.2
+
+# GIT SOURCE: https://git.fedorahosted.org/git/fence-agents.git
 
 PACKAGE=fence-agents-pve
 PKGREL=1
-FAVER=4.0.5
+FAVER=4.0.10
 FADIR=fence-agents-${FAVER}
 FASRC=${FADIR}.tar.xz
 
@@ -23,10 +25,12 @@ ${DEB} deb: ${FASRC}
        lintian -X copyright-file ${DEB}
 
 ${RHCSRC} download:
-       rm -rf fence-agents.git
-       git clone git://git.fedorahosted.org/fence-agents.git fence-agents.git
-       cd fence-agents.git; ./autogen.sh; ./configure; make dist
-       mv fence-agents.git/fence-agents-*.tar.gz .
+       #rm -rf fence-agents.git
+       #git clone git://git.fedorahosted.org/fence-agents.git fence-agents.git
+       #cd fence-agents.git; ./autogen.sh; ./configure; make dist
+       #mv fence-agents.git/fence-agents-*.tar.xz .
+       rm ${FASRC}
+       wget https://fedorahosted.org/releases/f/e/fence-agents/${FASRC}
 
 .PHONY: upload
 upload: ${DEB}

diff --git a/debian/changelog b/debian/changelog
index d846df7c11defab6374a104f0702a14b265f9990..5a879811127ee8c102404a3810ca65ff2a9a512e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+fence-agents-pve (4.0.10-1) unstable; urgency=low
+  
+  * update to 4.0.10
+
+  * add fence_ovh (depend on python-suds)
+  
+  * add fence_amt
+  
+  * remove baytech, bullpap, cpint, egenera, mcdata, nss_wrapper, 
+    rackswitch, vixel, xcat. Those agents are no longer included in 
+    upstream package.
+  
+  * remove fence_scsi (breaks cluster schema generation)
+  
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 15 Jul 2014 08:41:22 +0200
+
 fence-agents-pve (4.0.5-1) unstable; urgency=low
 
   * update to 4.0.5

diff --git a/debian/control b/debian/control
index 3b59fa0fc382569192d93c64e4d21a3398493842..dbc6fbb8f4918010cccd68ffd1254f0842f01c7e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: fence-agents-pve
 Section: admin
 Priority: optional
 Maintainer: Proxmox Support Team <support@proxmox.com>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, python-suds
 Standards-Version: 3.8.4
 
 Package: fence-agents-pve
 Architecture: any
 Depends: ${perl:Depends}, ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, openipmi, sg3-utils, python-pexpect, python-pycurl,
  libnet-snmp-perl, libnet-telnet-perl, snmp, telnet, openssh-client,
- python-openssl, redhat-cluster-pve
+ python-openssl, redhat-cluster-pve, python-suds
 Description: fence agents for redhat cluster suite
  This package provides various fence agents.

diff --git a/debian/patches/fix-make-check.patch b/debian/patches/fix-make-check.patch
new file mode 100644 (file)
index 0000000..a0f2aed
--- /dev/null
+++ b/debian/patches/fix-make-check.patch
@@ -0,0 +1,22 @@
+Index: new/make/agentccheck.mk
+===================================================================
+--- new.orig/make/agentccheck.mk       2014-07-01 13:17:00.000000000 +0200
++++ new/make/agentccheck.mk    2014-07-15 08:46:37.000000000 +0200
+@@ -1,5 +1,5 @@
+ TEMPFILE:=$(shell mktemp)
+-DATADIR:=$(abs_top_builddir)/../tests/data/metadata
++DATADIR:=$(abs_top_builddir)/tests/data/metadata
+ 
+ check: $(TARGET:%=xml-check.%) $(SYMTARGET:%=xml-check.%)
+ 
+Index: new/make/agentpycheck.mk
+===================================================================
+--- new.orig/make/agentpycheck.mk      2014-07-01 13:14:58.000000000 +0200
++++ new/make/agentpycheck.mk   2014-07-15 08:46:57.000000000 +0200
+@@ -1,5 +1,5 @@
+ TEMPFILE:=$(shell mktemp)
+-DATADIR:=$(abs_top_builddir)/../tests/data/metadata
++DATADIR:=$(abs_top_builddir)/tests/data/metadata
+ 
+ check: $(TARGET:%=xml-check.%) $(SYMTARGET:%=xml-check.%) $(TARGET:%=delay-check.%)
+ 

diff --git a/debian/patches/fix-vgs-path.patch b/debian/patches/fix-vgs-path.patch
new file mode 100644 (file)
index 0000000..f274513
--- /dev/null
+++ b/debian/patches/fix-vgs-path.patch
@@ -0,0 +1,13 @@
+Index: new/tests/data/metadata/fence_scsi.xml
+===================================================================
+--- new.orig/tests/data/metadata/fence_scsi.xml        2014-07-01 12:53:45.000000000 +0200
++++ new/tests/data/metadata/fence_scsi.xml     2014-07-15 09:13:29.000000000 +0200
+@@ -56,7 +56,7 @@
+       </parameter>
+       <parameter name="vgs_path" unique="0" required="0">
+               <getopt mixed="--vgs-path=[path]" />
+-              <content type="string" default="/usr/sbin/vgs"  />
++              <content type="string" default="/sbin/vgs"  />
+               <shortdesc lang="en">Path to vgs binary</shortdesc>
+       </parameter>
+       <parameter name="power_wait" unique="0" required="0">

diff --git a/debian/patches/series b/debian/patches/series
index 64ae7f21a4544cccf805147e55d8a13185ec7ef1..285baf6f521d4ef488a863bce87f768bf78a3495 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-# nothing to do
\ No newline at end of file
+fix-make-check.patch
+fix-vgs-path.patch

diff --git a/debian/rules b/debian/rules
index 9e61fc71c307ff84f2cc063ae03dfd995aea9ea1..e9d47581bded7c6191207493e57ef1829351595a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,19 +8,16 @@ export DH_OPTIONS
 
 AGENTS=        \
 alom           \
+amt            \
 apc            \
 apc_snmp       \
-baytech                \
 bladecenter    \
 brocade                \
-bullpap                \
 cisco_mds      \
 cisco_ucs      \
-cpint          \
 drac           \
 drac5          \
 eaton_snmp     \
-egenera                \
 eps            \
 hds_cb         \
 hpblade                \
@@ -35,17 +32,12 @@ ldom                \
 lib            \
 lpar           \
 manual         \
-mcdata         \
 netio          \
-nss_wrapper    \
-rackswitch     \
+ovh            \
 rsa            \
 rsb            \
 sanbox2                \
-scsi           \
-vixel          \
 wti            \
-xcat           \
 zvm            
 
 DESTDIR=debian/fence-agents-pve/
@@ -54,6 +46,7 @@ DESTDIR=debian/fence-agents-pve/
        dh --with quilt $@  
 
 override_dh_auto_configure:
+       ./autogen.sh
        ./configure                                             \
                --prefix=/usr                                   \
                --localstatedir=/var                            \

diff --git a/fence-agents-4.0.10.tar.xz b/fence-agents-4.0.10.tar.xz
new file mode 100644 (file)
index 0000000..322d2f0
Binary files /dev/null and b/fence-agents-4.0.10.tar.xz differ

diff --git a/fence-agents-4.0.5.tar.xz b/fence-agents-4.0.5.tar.xz
deleted file mode 100644 (file)
index 5e49562..0000000
Binary files a/fence-agents-4.0.5.tar.xz and /dev/null differ