[Debian-ha-commits] [resource-agents] 03/11: debian/patches: refresh 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 resource-agents.

commit d48be03c08d6308a3343f2eb99569545c0381338
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Sun Nov 26 00:55:05 2017 +0100

    debian/patches: refresh for new version
---
 debian/patches/ipv6-linux-only    |  2 +-
 debian/patches/pgsql-9.6          | 38 --------------------------------------
 debian/patches/reproducible.patch |  2 +-
 debian/patches/series             |  1 -
 4 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/debian/patches/ipv6-linux-only b/debian/patches/ipv6-linux-only
index d8c6a80..472c27c 100644
--- a/debian/patches/ipv6-linux-only
+++ b/debian/patches/ipv6-linux-only
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -731,8 +731,8 @@ AM_CONDITIONAL(USE_LIBNET, test "x$libne
+@@ -739,8 +739,8 @@
  dnl ************************************************************************
  dnl * Check for netinet/icmp6.h to enable the IPv6addr resource agent
  AC_CHECK_HEADERS(netinet/icmp6.h,[],[],[#include <sys/types.h>])
diff --git a/debian/patches/pgsql-9.6 b/debian/patches/pgsql-9.6
deleted file mode 100644
index 9cbf0a0..0000000
--- a/debian/patches/pgsql-9.6
+++ /dev/null
@@ -1,38 +0,0 @@
-commit 6e91193f0e4d3f72d22564e1fe393e7391691f9d
-Author: Andreas Ntaflos <andreas.ntaflos at rise-world.com>
-Date:   Mon Dec 12 14:43:59 2016 +0100
-
-    Double-quote value of synchronous_standby_names in rep_mode.conf
-    
-    PostgreSQL 9.6 introduced a new syntax for specifying
-    synchronous_standby_names. The old syntax, used by the pgsql RA, is
-    still valid but PostgreSQL now treats the standby-names in
-    synchronous_standby_names as SQL identifiers. This means such values
-    need to be double-quoted since they can easily contain dashes or other
-    characters that are not valid in a bare SQL identifier.
-    
-    See the docs for synchronous_standby_names in
-    https://www.postgresql.org/docs/9.6/static/runtime-config-replication.html
-    for confirmation and
-    https://www.postgresql.org/message-id/21183.1481253534%40sss.pgh.pa.us
-    for a short discussion.
-
-commit 6ad25cf64e00cebe5d90ec96430d94a38b240d31
-Author: Gianluca De Cicco <gnlcdccc at gmail.com>
-Date:   Thu Mar 23 15:12:24 2017 +0100
-
-    fix regex in set async mode
-
-Index: resource-agents/heartbeat/pgsql
-===================================================================
---- resource-agents.orig/heartbeat/pgsql
-+++ resource-agents/heartbeat/pgsql
-@@ -1474,7 +1474,7 @@ set_async_mode_all() {
- }
- 
- set_async_mode() {
--    cat $REP_MODE_CONF |  grep -q -e "[,' ]$1[,' ]"
-+    cat $REP_MODE_CONF |  grep -q -E "(\"$1\")|([,' ]$1[,' ])"
-     if [ $? -eq 0 ]; then
-         ocf_log info "Setup $1 into async mode."
-         runasowner -q err "echo \"synchronous_standby_names = ''\" > \"$REP_MODE_CONF\""
diff --git a/debian/patches/reproducible.patch b/debian/patches/reproducible.patch
index c7b0c96..6e27d21 100644
--- a/debian/patches/reproducible.patch
+++ b/debian/patches/reproducible.patch
@@ -8,7 +8,7 @@ Last-Update: 2017-08-22
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/configure.ac
 +++ b/configure.ac
-@@ -758,7 +758,7 @@
+@@ -766,7 +766,7 @@
          CFLAGS="$CFLAGS -g"
  	enable_fatal_warnings=no
  else
diff --git a/debian/patches/series b/debian/patches/series
index a8091a8..9fbafae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@ mysql-path.patch
 no-dirty-version
 ipv6-linux-only
 ocft-configs.patch
-pgsql-9.6
 xen-toolstack.patch
 gitignore.patch
 reproducible.patch

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