From 611b41e7a696f96955e1c1a88c435b9a10311108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20du=20Bo=C3=BFs?= <thomas@duboys.info>
Date: Tue, 21 Feb 2023 19:33:56 +0100
Subject: [PATCH 1/3] Merge configs for the same hosts instead of using the
 last one

---
 ddclient.in | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ddclient.in b/ddclient.in
index 530458f..38f68e5 100755
--- a/ddclient.in
+++ b/ddclient.in
@@ -1639,9 +1639,14 @@ sub _read_config {
 
             ## allow {host} to be a comma separated list of hosts
             foreach my $h (split_by_comma($host)) {
-                ## save a copy of the current globals
-                $config{$h} = { %locals };
-                $config{$h}{'host'} = $h;
+                if ($config{$h}) {
+                    ## host already defined, merging configs
+                    $config{$h} = { %{merge($config{$h}, \%locals)} };
+                } else {
+                    ## save a copy of the current globals
+                    $config{$h} = { %locals };
+                    $config{$h}{'host'} = $h;
+                }
             }
         }
         %passwords = ();

From 36de4e0b88969f9fcf8b6bf9c9d3864705a75822 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20du=20Bo=C3=BFs?= <thomas@duboys.info>
Date: Tue, 21 Feb 2023 19:45:41 +0100
Subject: [PATCH 2/3] updating changelog

---
 ChangeLog.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog.md b/ChangeLog.md
index f3919f2..2496130 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -25,6 +25,8 @@ repository history](https://github.com/ddclient/ddclient/commits/master).
 
   * DynDNS2 now uses the newer ipv4/ipv6 syntax's
   * The OVH provider now ignores extra data returned
+  * Allow to define usev4 and usev6 options per hostname
+  * Merge multiple configs for the same hostname instead of use the last
 
 ## 2022-10-20 v3.10.0
 

From b225d37528ce00f0785f94c72268756c439ec264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20du=20Bo=C3=BFs?= <thomas@duboys.info>
Date: Tue, 21 Feb 2023 21:10:28 +0100
Subject: [PATCH 3/3] Remove README.ssl from makefile as it's deleted on master

---
 Makefile.am | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index a9543ee..99ab507 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,6 @@ EXTRA_DIST = \
 	ChangeLog.md \
 	README.cisco \
 	README.md \
-	README.ssl \
 	autogen \
 	sample-ddclient-wrapper.sh \
 	sample-etc_cron.d_ddclient \