From 9a2a799bb6839a0b3889864bd6552ae22b5621b8 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Mon, 26 Feb 2024 17:21:19 +0100
Subject: [PATCH] lib-sieve: Rename sieve-settings to sieve-settings.old

---
 src/lib-sieve/Makefile.am                                     | 4 ++--
 src/lib-sieve/plugins/duplicate/ext-duplicate-common.c        | 2 +-
 src/lib-sieve/plugins/editheader/ext-editheader-common.c      | 2 +-
 src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c            | 2 +-
 src/lib-sieve/plugins/include/ext-include-common.c            | 2 +-
 .../plugins/spamvirustest/ext-spamvirustest-common.c          | 2 +-
 src/lib-sieve/plugins/subaddress/ext-subaddress.c             | 2 +-
 src/lib-sieve/plugins/vacation/ext-vacation-common.c          | 2 +-
 src/lib-sieve/plugins/variables/ext-variables-common.c        | 2 +-
 .../vnd.dovecot/environment/ext-vnd-environment-items.c       | 2 +-
 src/lib-sieve/sieve-actions.c                                 | 2 +-
 src/lib-sieve/sieve-address-source.c                          | 2 +-
 src/lib-sieve/sieve-extensions.c                              | 2 +-
 src/lib-sieve/sieve-plugins.c                                 | 2 +-
 src/lib-sieve/sieve-script.c                                  | 2 +-
 src/lib-sieve/{sieve-settings.c => sieve-settings.old.c}      | 2 +-
 src/lib-sieve/{sieve-settings.h => sieve-settings.old.h}      | 4 ++--
 src/lib-sieve/sieve-storage-sync.c                            | 2 +-
 src/lib-sieve/sieve-storage.c                                 | 2 +-
 src/lib-sieve/sieve.c                                         | 2 +-
 src/lib-sieve/storage/file/sieve-file-storage.c               | 3 +--
 src/plugins/sieve-extprograms/sieve-extprograms-common.c      | 2 +-
 src/testsuite/cmd-test-config.c                               | 2 +-
 23 files changed, 25 insertions(+), 26 deletions(-)
 rename src/lib-sieve/{sieve-settings.c => sieve-settings.old.c} (99%)
 rename src/lib-sieve/{sieve-settings.h => sieve-settings.old.h} (96%)

diff --git a/src/lib-sieve/Makefile.am b/src/lib-sieve/Makefile.am
index 7fb2a4fa2..aba132bae 100644
--- a/src/lib-sieve/Makefile.am
+++ b/src/lib-sieve/Makefile.am
@@ -97,7 +97,7 @@ libdovecot_sieve_la_LIBADD = \
 	$(LIBDOVECOT)
 
 libdovecot_sieve_la_SOURCES = \
-	sieve-settings.c \
+	sieve-settings.old.c \
 	sieve-message.c \
 	sieve-smtp.c \
 	sieve-lexer.c \
@@ -144,7 +144,7 @@ headers = \
 	sieve-types.h \
 	sieve-common.h \
 	sieve-limits.h \
-	sieve-settings.h \
+	sieve-settings.old.h \
 	sieve-message.h \
 	sieve-smtp.h \
 	sieve-lexer.h \
diff --git a/src/lib-sieve/plugins/duplicate/ext-duplicate-common.c b/src/lib-sieve/plugins/duplicate/ext-duplicate-common.c
index 41262233b..c8fe7c3bb 100644
--- a/src/lib-sieve/plugins/duplicate/ext-duplicate-common.c
+++ b/src/lib-sieve/plugins/duplicate/ext-duplicate-common.c
@@ -9,7 +9,7 @@
 #include "array.h"
 
 #include "sieve-common.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-error.h"
 #include "sieve-extensions.h"
 #include "sieve-message.h"
diff --git a/src/lib-sieve/plugins/editheader/ext-editheader-common.c b/src/lib-sieve/plugins/editheader/ext-editheader-common.c
index 58a9cb517..66f83e059 100644
--- a/src/lib-sieve/plugins/editheader/ext-editheader-common.c
+++ b/src/lib-sieve/plugins/editheader/ext-editheader-common.c
@@ -9,7 +9,7 @@
 
 #include "sieve-common.h"
 #include "sieve-error.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-extensions.h"
 
 #include "ext-editheader-limits.h"
diff --git a/src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c b/src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c
index 09440fe45..29ff02d00 100644
--- a/src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c
+++ b/src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c
@@ -33,7 +33,7 @@
 #include "sieve-address-source.h"
 #include "sieve-message.h"
 #include "sieve-smtp.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 
 #include "sieve-ext-enotify.h"
 
diff --git a/src/lib-sieve/plugins/include/ext-include-common.c b/src/lib-sieve/plugins/include/ext-include-common.c
index 79e684f3c..911a1a72c 100644
--- a/src/lib-sieve/plugins/include/ext-include-common.c
+++ b/src/lib-sieve/plugins/include/ext-include-common.c
@@ -7,7 +7,7 @@
 #include "home-expand.h"
 
 #include "sieve-common.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-error.h"
 #include "sieve-script.h"
 #include "sieve-storage.h"
diff --git a/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.c b/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.c
index e6c43fa15..a8a47daa5 100644
--- a/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.c
+++ b/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.c
@@ -6,7 +6,7 @@
 #include "mail-storage.h"
 
 #include "sieve-common.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-error.h"
 #include "sieve-extensions.h"
 #include "sieve-message.h"
diff --git a/src/lib-sieve/plugins/subaddress/ext-subaddress.c b/src/lib-sieve/plugins/subaddress/ext-subaddress.c
index 85e6e9a94..9b86b8e25 100644
--- a/src/lib-sieve/plugins/subaddress/ext-subaddress.c
+++ b/src/lib-sieve/plugins/subaddress/ext-subaddress.c
@@ -13,7 +13,7 @@
 
 #include "sieve-common.h"
 
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-code.h"
 #include "sieve-address.h"
 #include "sieve-extensions.h"
diff --git a/src/lib-sieve/plugins/vacation/ext-vacation-common.c b/src/lib-sieve/plugins/vacation/ext-vacation-common.c
index cb648ec38..d4ac338a5 100644
--- a/src/lib-sieve/plugins/vacation/ext-vacation-common.c
+++ b/src/lib-sieve/plugins/vacation/ext-vacation-common.c
@@ -5,7 +5,7 @@
 
 #include "sieve-common.h"
 #include "sieve-error.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-extensions.h"
 
 #include "ext-vacation-common.h"
diff --git a/src/lib-sieve/plugins/variables/ext-variables-common.c b/src/lib-sieve/plugins/variables/ext-variables-common.c
index dab91448a..aca892089 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-common.c
+++ b/src/lib-sieve/plugins/variables/ext-variables-common.c
@@ -7,7 +7,7 @@
 #include "array.h"
 
 #include "sieve-common.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 
 #include "sieve-ast.h"
 #include "sieve-binary.h"
diff --git a/src/lib-sieve/plugins/vnd.dovecot/environment/ext-vnd-environment-items.c b/src/lib-sieve/plugins/vnd.dovecot/environment/ext-vnd-environment-items.c
index 43361b438..51f4a8eae 100644
--- a/src/lib-sieve/plugins/vnd.dovecot/environment/ext-vnd-environment-items.c
+++ b/src/lib-sieve/plugins/vnd.dovecot/environment/ext-vnd-environment-items.c
@@ -4,7 +4,7 @@
 #include "lib.h"
 #include "array.h"
 
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-extensions.h"
 #include "sieve-commands.h"
 #include "sieve-comparators.h"
diff --git a/src/lib-sieve/sieve-actions.c b/src/lib-sieve/sieve-actions.c
index 65a619298..2b653869b 100644
--- a/src/lib-sieve/sieve-actions.c
+++ b/src/lib-sieve/sieve-actions.c
@@ -19,7 +19,7 @@
 #include "rfc2822.h"
 
 #include "sieve-code.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-extensions.h"
 #include "sieve-binary.h"
 #include "sieve-interpreter.h"
diff --git a/src/lib-sieve/sieve-address-source.c b/src/lib-sieve/sieve-address-source.c
index fa5d142b2..4560e5636 100644
--- a/src/lib-sieve/sieve-address-source.c
+++ b/src/lib-sieve/sieve-address-source.c
@@ -5,7 +5,7 @@
 
 #include "sieve-common.h"
 #include "sieve-error.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-address.h"
 #include "sieve-message.h"
 
diff --git a/src/lib-sieve/sieve-extensions.c b/src/lib-sieve/sieve-extensions.c
index 19e175557..90c91780b 100644
--- a/src/lib-sieve/sieve-extensions.c
+++ b/src/lib-sieve/sieve-extensions.c
@@ -9,7 +9,7 @@
 
 #include "sieve-common.h"
 #include "sieve-error.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-extensions.h"
 
 /*
diff --git a/src/lib-sieve/sieve-plugins.c b/src/lib-sieve/sieve-plugins.c
index bd8c426b5..2fadf27ac 100644
--- a/src/lib-sieve/sieve-plugins.c
+++ b/src/lib-sieve/sieve-plugins.c
@@ -5,7 +5,7 @@
 #include "str.h"
 #include "module-dir.h"
 
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-extensions.h"
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/sieve-script.c b/src/lib-sieve/sieve-script.c
index 718ee67b9..f60042f62 100644
--- a/src/lib-sieve/sieve-script.c
+++ b/src/lib-sieve/sieve-script.c
@@ -13,7 +13,7 @@
 
 #include "sieve-common.h"
 #include "sieve-limits.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-error.h"
 #include "sieve-dump.h"
 #include "sieve-binary.h"
diff --git a/src/lib-sieve/sieve-settings.c b/src/lib-sieve/sieve-settings.old.c
similarity index 99%
rename from src/lib-sieve/sieve-settings.c
rename to src/lib-sieve/sieve-settings.old.c
index 82a6ce09f..7068c2691 100644
--- a/src/lib-sieve/sieve-settings.c
+++ b/src/lib-sieve/sieve-settings.old.c
@@ -8,7 +8,7 @@
 #include "sieve-error.h"
 #include "sieve-address.h"
 #include "sieve-address-source.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 
 #include <ctype.h>
 
diff --git a/src/lib-sieve/sieve-settings.h b/src/lib-sieve/sieve-settings.old.h
similarity index 96%
rename from src/lib-sieve/sieve-settings.h
rename to src/lib-sieve/sieve-settings.old.h
index f2dfca20b..371e9676a 100644
--- a/src/lib-sieve/sieve-settings.h
+++ b/src/lib-sieve/sieve-settings.old.h
@@ -1,5 +1,5 @@
-#ifndef SIEVE_SETTINGS_H
-#define SIEVE_SETTINGS_H
+#ifndef SIEVE_SETTINGS_OLD_H
+#define SIEVE_SETTINGS_OLD_H
 
 #include "sieve-common.h"
 
diff --git a/src/lib-sieve/sieve-storage-sync.c b/src/lib-sieve/sieve-storage-sync.c
index 278803026..e9369b959 100644
--- a/src/lib-sieve/sieve-storage-sync.c
+++ b/src/lib-sieve/sieve-storage-sync.c
@@ -11,7 +11,7 @@
 #include "mail-storage-private.h"
 
 #include "sieve-common.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-error-private.h"
 
 #include "sieve-script-private.h"
diff --git a/src/lib-sieve/sieve-storage.c b/src/lib-sieve/sieve-storage.c
index d239f24f7..462313ae6 100644
--- a/src/lib-sieve/sieve-storage.c
+++ b/src/lib-sieve/sieve-storage.c
@@ -10,7 +10,7 @@
 #include "ioloop.h"
 
 #include "sieve-common.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-error-private.h"
 
 #include "sieve-script-private.h"
diff --git a/src/lib-sieve/sieve.c b/src/lib-sieve/sieve.c
index ca315785a..7da596929 100644
--- a/src/lib-sieve/sieve.c
+++ b/src/lib-sieve/sieve.c
@@ -13,7 +13,7 @@
 #include "message-address.h"
 #include "mail-user.h"
 
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-extensions.h"
 #include "sieve-plugins.h"
 
diff --git a/src/lib-sieve/storage/file/sieve-file-storage.c b/src/lib-sieve/storage/file/sieve-file-storage.c
index 0702209ff..cb48f1e9a 100644
--- a/src/lib-sieve/storage/file/sieve-file-storage.c
+++ b/src/lib-sieve/storage/file/sieve-file-storage.c
@@ -12,9 +12,8 @@
 
 #include "sieve.h"
 #include "sieve-common.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-error-private.h"
-#include "sieve-settings.h"
 
 #include "sieve-file-storage.h"
 
diff --git a/src/plugins/sieve-extprograms/sieve-extprograms-common.c b/src/plugins/sieve-extprograms/sieve-extprograms-common.c
index ea954c72c..401fb2ef0 100644
--- a/src/plugins/sieve-extprograms/sieve-extprograms-common.c
+++ b/src/plugins/sieve-extprograms/sieve-extprograms-common.c
@@ -20,7 +20,7 @@
 #include "program-client.h"
 
 #include "sieve-common.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-error.h"
 #include "sieve-extensions.h"
 #include "sieve-ast.h"
diff --git a/src/testsuite/cmd-test-config.c b/src/testsuite/cmd-test-config.c
index ec5e73c54..a6eabdf31 100644
--- a/src/testsuite/cmd-test-config.c
+++ b/src/testsuite/cmd-test-config.c
@@ -2,7 +2,7 @@
  */
 
 #include "sieve-common.h"
-#include "sieve-settings.h"
+#include "sieve-settings.old.h"
 #include "sieve-extensions.h"
 #include "sieve-commands.h"
 #include "sieve-validator.h"
-- 
GitLab