[Debian-ha-commits] [fence-agents] 03/09: Refresh patches for new version

[Valentin Vidic]

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

vvidic-guest pushed a commit to branch master
in repository fence-agents.

commit 3b4d942c6e411a295b5a9b9a536048999fee3e83
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Sat Feb 10 10:04:25 2018 +0100

    Refresh patches for new version
---
 debian/patches/disable-network-access |  6 +++---
 debian/patches/remove-fence_amt_ws    | 12 +-----------
 debian/patches/reproducible           | 14 --------------
 debian/patches/series                 |  1 -
 4 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/debian/patches/disable-network-access b/debian/patches/disable-network-access
index 32eef8e..b41e9d7 100644
--- a/debian/patches/disable-network-access
+++ b/debian/patches/disable-network-access
@@ -1,6 +1,6 @@
 --- a/fence/agents/Makefile.am
 +++ b/fence/agents/Makefile.am
-@@ -36,11 +36,11 @@
+@@ -58,11 +58,11 @@
  FENCE_TEST_ARGS			= \
  login=test\n\
  passwd=test\n\
@@ -11,6 +11,6 @@
  devices=test\n\
 -session_url=http://test\n\
 +session_url=http://127.0.0.1\n\
- email=test at test.te
+ email=test at test.te\n\
+ ping_targets=localhost
  
- manual/fence_ack_manual: manual/fence_ack_manual.in
diff --git a/debian/patches/remove-fence_amt_ws b/debian/patches/remove-fence_amt_ws
index 3220608..43e3f1b 100644
--- a/debian/patches/remove-fence_amt_ws
+++ b/debian/patches/remove-fence_amt_ws
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -142,6 +142,9 @@ if test "x$AGENTS_LIST" = xall; then
+@@ -165,6 +165,9 @@
  	AGENTS_LIST=`find $srcdir/fence/agents -mindepth 2 -maxdepth 2 -name '*.py' -printf '%P ' | sed -e 's#lib/[A-Za-z_.]* ##g' -e 's#nss_wrapper/[A-Za-z_.]* ##g' -e 's#autodetect/[A-Za-z_.]* ##g'`
  fi
  
@@ -10,13 +10,3 @@
  XENAPILIB=0
  if echo "$AGENTS_LIST" | grep -q xenapi; then
  	XENAPILIB=1
-@@ -163,7 +166,8 @@ AC_PYTHON_MODULE(suds, 1)
- AC_PYTHON_MODULE(pexpect, 1)
- AC_PYTHON_MODULE(pycurl, 1)
- AC_PYTHON_MODULE(requests, 1)
--AC_PYTHON_MODULE(pywsman, 1)
-+# openwsman is not in Debian yet
-+#AC_PYTHON_MODULE(pywsman, 1)
- 
- ## path to 3rd-party binaries
- AC_PATH_PROG([IPMITOOL_PATH], [ipmitool], [/usr/bin/ipmitool])
diff --git a/debian/patches/reproducible b/debian/patches/reproducible
deleted file mode 100644
index 1dc7427..0000000
--- a/debian/patches/reproducible
+++ /dev/null
@@ -1,14 +0,0 @@
-Use debian/changelog timestamp for BUILD_DATE in scripts
-https://reproducible.debian.net/rb-pkg/unstable/amd64/fence-agents.html
-
---- a/scripts/fenceparse
-+++ b/scripts/fenceparse
-@@ -32,7 +32,7 @@ esac
- 
- awk "{print}(\$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $realinfile
- echo ${start}RELEASE_VERSION=\"${release}\"${end}
--echo ${start}BUILD_DATE=\"\(built $(date)\)\"${end}
-+echo ${start}BUILD_DATE=\"\(built ${BUILD_DATE:-$(date)}\)\"${end}
- if awk -v p=0 "(\$1 ~ /#BEGIN_VERSION_GENERATION/){p = 1} (\$1 ~ /#END_VERSION_GENERATION/){p = 0} {if(p==1)print}" $realinfile | \
- 		grep -q REDHAT_COPYRIGHT; then
- 	echo ${start}REDHAT_COPYRIGHT=${definedata}${end}
diff --git a/debian/patches/series b/debian/patches/series
index bf3cfd5..dec0462 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-reproducible
 remove-fence_amt_ws
 disable-network-access

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