From c2341570f1800bd4d9d57d0d402377f22f887531 Mon Sep 17 00:00:00 2001
From: IKEDA Soji <ikeda@conversion.co.jp>
Date: Sun, 16 Jan 2022 17:16:05 +0900
Subject: [PATCH] Upgrade: During upgrade from Sympa prior to 6.2b.1, some
 parameters in list config files may be removed.

---
 src/lib/Sympa/List.pm    | 2 ++
 src/lib/Sympa/Upgrade.pm | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/lib/Sympa/List.pm b/src/lib/Sympa/List.pm
index 7321ccefb..debf32cb7 100644
--- a/src/lib/Sympa/List.pm
+++ b/src/lib/Sympa/List.pm
@@ -5353,6 +5353,8 @@ sub _load_include_admin_user_postprocess {
                 listname => $listname,
                 filter   => $filter,
                 };
+            delete $config_hash->{'defaults'}{'include_sympa_list'}
+                if $config_hash->{'defaults'};
         }
         delete $config_hash->{'include_list'};
         delete $config_hash->{'defaults'}{'include_list'}
diff --git a/src/lib/Sympa/Upgrade.pm b/src/lib/Sympa/Upgrade.pm
index 1e3a38d5d..52d540eb3 100644
--- a/src/lib/Sympa/Upgrade.pm
+++ b/src/lib/Sympa/Upgrade.pm
@@ -1287,6 +1287,7 @@ sub upgrade {
             if ($list->{'admin'}{'archive'}{'access'}) {
                 $list->{'admin'}{'archive'}{'mail_access'} =
                     {'name' => $list->{'admin'}{'archive'}{'access'}};
+                delete $list->{'admin'}{'defaults'}{'archive'};
             }
             delete $list->{'admin'}{'archive'}{'access'};
 
@@ -1305,6 +1306,7 @@ sub upgrade {
                 $list->{'admin'}{'archive'}{'max_month'} =
                     $list->{'admin'}{'web_archive'}{'max_month'}
                     if $list->{'admin'}{'web_archive'}{'max_month'};
+                delete $list->{'admin'}{'defaults'}{'archive'};
             }
             delete $list->{'admin'}{'web_archive'};