From 11f12b4dd7cde3d0d5b00c08cfce712a00931e3b Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Sun, 19 Oct 2008 16:46:12 +0200
Subject: [PATCH] Repaired 'make dist' tarball output.
---
Makefile.am | 6 +-
src/lib-sieve/plugins/body/Makefile.am | 2 -
src/lib-sieve/plugins/body/body.sieve | 13 --
.../comparator-i-ascii-numeric/Makefile.am | 2 -
.../cmp-i-ascii-numeric.sieve | 9 --
src/lib-sieve/plugins/copy/Makefile.am | 2 -
src/lib-sieve/plugins/copy/copy.sieve | 5 -
src/lib-sieve/plugins/imapflags/Makefile.am | 2 -
.../plugins/imapflags/imapflags-2.sieve | 18 ---
.../plugins/imapflags/imapflags-errors.sieve | 20 ---
.../imapflags/imapflags-implicit.sieve | 29 ----
.../imapflags/imapflags-variables.sieve | 29 ----
.../plugins/imapflags/imapflags.sieve | 28 ----
src/lib-sieve/plugins/regex/Makefile.am | 2 -
src/lib-sieve/plugins/relational/Makefile.am | 2 -
.../plugins/relational/relational.sieve | 57 --------
src/lib-sieve/plugins/subaddress/Makefile.am | 2 -
.../plugins/subaddress/subaddress.sieve | 14 --
src/lib-sieve/plugins/vacation/Makefile.am | 1 -
.../plugins/vacation/vacation-errors.sieve | 4 -
src/lib-sieve/plugins/vacation/vacation.sieve | 24 ----
src/lib-sieve/plugins/variables/Makefile.am | 2 -
.../plugins/variables/variables-errors.sieve | 12 --
.../plugins/variables/variables-match.sieve | 136 ------------------
.../plugins/variables/variables-nspace.sieve | 5 -
.../plugins/variables/variables-regex.sieve | 18 ---
.../plugins/variables/variables.sieve | 38 -----
src/testsuite/Makefile.am | 2 +-
28 files changed, 4 insertions(+), 480 deletions(-)
delete mode 100644 src/lib-sieve/plugins/body/body.sieve
delete mode 100644 src/lib-sieve/plugins/comparator-i-ascii-numeric/cmp-i-ascii-numeric.sieve
delete mode 100644 src/lib-sieve/plugins/copy/copy.sieve
delete mode 100644 src/lib-sieve/plugins/imapflags/imapflags-2.sieve
delete mode 100644 src/lib-sieve/plugins/imapflags/imapflags-errors.sieve
delete mode 100644 src/lib-sieve/plugins/imapflags/imapflags-implicit.sieve
delete mode 100644 src/lib-sieve/plugins/imapflags/imapflags-variables.sieve
delete mode 100644 src/lib-sieve/plugins/imapflags/imapflags.sieve
delete mode 100644 src/lib-sieve/plugins/relational/relational.sieve
delete mode 100644 src/lib-sieve/plugins/subaddress/subaddress.sieve
delete mode 100644 src/lib-sieve/plugins/vacation/vacation-errors.sieve
delete mode 100644 src/lib-sieve/plugins/vacation/vacation.sieve
delete mode 100644 src/lib-sieve/plugins/variables/variables-errors.sieve
delete mode 100644 src/lib-sieve/plugins/variables/variables-match.sieve
delete mode 100644 src/lib-sieve/plugins/variables/variables-nspace.sieve
delete mode 100644 src/lib-sieve/plugins/variables/variables-regex.sieve
delete mode 100644 src/lib-sieve/plugins/variables/variables.sieve
diff --git a/Makefile.am b/Makefile.am
index 6ad1ebd62..7261c7867 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,10 +2,10 @@ SUBDIRS = src
EXTRA_DIST = \
tests \
- sieve/* \
+ examples/* \
doc/* \
- COPYING.LGPL \
- ChangeLog
+ COPYING.LGPL \
+ ChangeLog
if MAINTAINER_MODE
ChangeLog: .hg/dirstate
diff --git a/src/lib-sieve/plugins/body/Makefile.am b/src/lib-sieve/plugins/body/Makefile.am
index 9f8d8d804..b1bbfcf52 100644
--- a/src/lib-sieve/plugins/body/Makefile.am
+++ b/src/lib-sieve/plugins/body/Makefile.am
@@ -17,5 +17,3 @@ libsieve_ext_body_la_SOURCES = \
noinst_HEADERS = \
ext-body-common.h
-
-EXTRA_DIST = *.txt *.sieve
diff --git a/src/lib-sieve/plugins/body/body.sieve b/src/lib-sieve/plugins/body/body.sieve
deleted file mode 100644
index 64e35a17b..000000000
--- a/src/lib-sieve/plugins/body/body.sieve
+++ /dev/null
@@ -1,13 +0,0 @@
-require ["body", "fileinto"];
-
-if body :content "text/plain" :comparator "i;ascii-casemap" :contains "WERKT" {
- fileinto "WERKT";
-}
-
-if body :content "text/plain" :comparator "i;ascii-casemap" :contains "HET" {
- fileinto "HET";
-}
-
-if body :content "text/plain" :comparator "i;octet" :contains "NIET" {
- fileinto "NIET";
-}
diff --git a/src/lib-sieve/plugins/comparator-i-ascii-numeric/Makefile.am b/src/lib-sieve/plugins/comparator-i-ascii-numeric/Makefile.am
index 89c2e4ed9..7a55625e6 100644
--- a/src/lib-sieve/plugins/comparator-i-ascii-numeric/Makefile.am
+++ b/src/lib-sieve/plugins/comparator-i-ascii-numeric/Makefile.am
@@ -9,5 +9,3 @@ AM_CPPFLAGS = \
libsieve_ext_comparator_i_ascii_numeric_la_SOURCES = \
ext-cmp-i-ascii-numeric.c
-
-EXTRA_DIST = *.txt *.sieve
diff --git a/src/lib-sieve/plugins/comparator-i-ascii-numeric/cmp-i-ascii-numeric.sieve b/src/lib-sieve/plugins/comparator-i-ascii-numeric/cmp-i-ascii-numeric.sieve
deleted file mode 100644
index 17d9f1f90..000000000
--- a/src/lib-sieve/plugins/comparator-i-ascii-numeric/cmp-i-ascii-numeric.sieve
+++ /dev/null
@@ -1,9 +0,0 @@
-require "fileinto";
-require "comparator-i;ascii-numeric";
-
-if header :is :comparator "i;ascii-numeric" "X-Spam-Score" "3T" {
- discard;
- stop;
-}
-
-keep;
diff --git a/src/lib-sieve/plugins/copy/Makefile.am b/src/lib-sieve/plugins/copy/Makefile.am
index 1d71d3ac5..a4a6bfa24 100644
--- a/src/lib-sieve/plugins/copy/Makefile.am
+++ b/src/lib-sieve/plugins/copy/Makefile.am
@@ -9,5 +9,3 @@ AM_CPPFLAGS = \
libsieve_ext_copy_la_SOURCES = \
ext-copy.c
-
-EXTRA_DIST = *.sieve *.txt
diff --git a/src/lib-sieve/plugins/copy/copy.sieve b/src/lib-sieve/plugins/copy/copy.sieve
deleted file mode 100644
index 972ec1504..000000000
--- a/src/lib-sieve/plugins/copy/copy.sieve
+++ /dev/null
@@ -1,5 +0,0 @@
-require ["copy", "fileinto"];
-
-fileinto :copy "frop";
-redirect :copy "sirius@rename-it.nl";
-
diff --git a/src/lib-sieve/plugins/imapflags/Makefile.am b/src/lib-sieve/plugins/imapflags/Makefile.am
index 6dac7abe3..eee48e7a2 100644
--- a/src/lib-sieve/plugins/imapflags/Makefile.am
+++ b/src/lib-sieve/plugins/imapflags/Makefile.am
@@ -28,5 +28,3 @@ libsieve_ext_imapflags_la_SOURCES = \
noinst_HEADERS = \
ext-imapflags-common.h
-
-EXTRA_DIST = *.txt *.sieve
diff --git a/src/lib-sieve/plugins/imapflags/imapflags-2.sieve b/src/lib-sieve/plugins/imapflags/imapflags-2.sieve
deleted file mode 100644
index 863054ca1..000000000
--- a/src/lib-sieve/plugins/imapflags/imapflags-2.sieve
+++ /dev/null
@@ -1,18 +0,0 @@
-require "imap4flags";
-require "fileinto";
-
-setflag "FRop FRML Hutsefluts Friep Slorf";
-addflag ["derf", "slorf", "werty", "drolf"];
-addflag ["frop", "frml", "frep"];
-
-removeflag ["frop", "slorf"];
-removeflag "hutsefluts frep";
-addflag "fiiierp";
-
-if hasflag :is "Werty" {
- fileinto "FROP";
-}
-
-if hasflag :is "eek" {
- fileinto "EEK";
-}
diff --git a/src/lib-sieve/plugins/imapflags/imapflags-errors.sieve b/src/lib-sieve/plugins/imapflags/imapflags-errors.sieve
deleted file mode 100644
index 02400c919..000000000
--- a/src/lib-sieve/plugins/imapflags/imapflags-errors.sieve
+++ /dev/null
@@ -1,20 +0,0 @@
-require "imap4flags";
-require "fileinto";
-
-setflag;
-addflag 2;
-setflag "flagvar" 2;
-addflag 2 "$MDNRequired";
-removeflag ["flagvar"] "$MDNRequired";
-
-hasflag;
-
-if hasflag 3 {
- removeflag "$MDNRequired";
-}
-
-if hasflag "flagvar" ["$MDNRequired", "\\Seen"] {
- removeflag "$MDNRequired";
-}
-
-removeflag "\\frop";
diff --git a/src/lib-sieve/plugins/imapflags/imapflags-implicit.sieve b/src/lib-sieve/plugins/imapflags/imapflags-implicit.sieve
deleted file mode 100644
index 8754fad5c..000000000
--- a/src/lib-sieve/plugins/imapflags/imapflags-implicit.sieve
+++ /dev/null
@@ -1,29 +0,0 @@
-require "imap4flags";
-require "fileinto";
-require "relational";
-require "comparator-i;ascii-numeric";
-require "copy";
-
-setflag "\\Seen";
-addflag "$DSNRequired";
-removeflag "$DSNRequired";
-
-if header :contains "from" "boss@frobnitzm.example.edu" {
- setflag "\\Flagged";
- fileinto :copy "From Boss";
-}
-
-if header :contains "Disposition-Notification-To" "mel@example.com" {
- addflag "$MDNRequired";
-}
-
-if header :contains "from" "imap@cac.washington.example.edu" {
- removeflag "$MDNRequired \\Flagged \\Seen \\Deleted";
- fileinto :copy "imap-list";
-}
-
-if hasflag :count "ge" :comparator "i;ascii-numeric" "2" {
- fileinto :copy "imap-twoflags";
-}
-
-fileinto :copy :flags "MDNRequired \\Draft" "imap-draft";
diff --git a/src/lib-sieve/plugins/imapflags/imapflags-variables.sieve b/src/lib-sieve/plugins/imapflags/imapflags-variables.sieve
deleted file mode 100644
index 36bf7d4f6..000000000
--- a/src/lib-sieve/plugins/imapflags/imapflags-variables.sieve
+++ /dev/null
@@ -1,29 +0,0 @@
-require "imap4flags";
-require "fileinto";
-require "relational";
-require "comparator-i;ascii-numeric";
-require "variables";
-
-setflag "frop" "\\Seen";
-addflag "frop" "$DSNRequired";
-removeflag "frop" "$DSNRequired";
-
-if header :contains "from" "boss@frobnitzm.example.edu" {
- setflag "frop" "\\Flagged";
- fileinto "From Boss";
-}
-
-if header :contains "Disposition-Notification-To" "mel@example.com" {
- addflag "frml" "$MDNRequired";
-}
-
-if header :contains "from" "imap@cac.washington.example.edu" {
- removeflag "frop" "$MDNRequired \\Flagged \\Seen \\Deleted";
- fileinto "imap-list";
-}
-
-if hasflag :count "ge" :comparator "i;ascii-numeric" "frop" "2" {
- fileinto "imap-twoflags";
-}
-
-fileinto :flags "\\Seen MDNRequired \\Draft" "INBOX";
diff --git a/src/lib-sieve/plugins/imapflags/imapflags.sieve b/src/lib-sieve/plugins/imapflags/imapflags.sieve
deleted file mode 100644
index 2503134b6..000000000
--- a/src/lib-sieve/plugins/imapflags/imapflags.sieve
+++ /dev/null
@@ -1,28 +0,0 @@
-require "imap4flags";
-require "fileinto";
-require "relational";
-require "comparator-i;ascii-numeric";
-
-setflag "\\Seen";
-addflag "$DSNRequired";
-removeflag "$DSNRequired";
-
-if header :contains "from" "boss@frobnitzm.example.edu" {
- setflag "\\Flagged";
- fileinto "From Boss";
-}
-
-if header :contains "Disposition-Notification-To" "mel@example.com" {
- addflag "$MDNRequired";
-}
-
-if header :contains "from" "imap@cac.washington.example.edu" {
- removeflag "$MDNRequired \\Flagged \\Seen \\Deleted";
- fileinto "imap-list";
-}
-
-if hasflag :count "ge" :comparator "i;ascii-numeric" "2" {
- fileinto "imap-twoflags";
-}
-
-fileinto :flags "MDNRequired \\Draft 3[\"]\\4" "INBOX";
diff --git a/src/lib-sieve/plugins/regex/Makefile.am b/src/lib-sieve/plugins/regex/Makefile.am
index f59cc5063..c7d8320c9 100644
--- a/src/lib-sieve/plugins/regex/Makefile.am
+++ b/src/lib-sieve/plugins/regex/Makefile.am
@@ -14,5 +14,3 @@ libsieve_ext_regex_la_SOURCES = \
noinst_HEADERS = \
ext-regex-common.h
-
-EXTRA_DIST = *.txt *.sieve
diff --git a/src/lib-sieve/plugins/relational/Makefile.am b/src/lib-sieve/plugins/relational/Makefile.am
index 2b5fbd8a2..21a8e9094 100644
--- a/src/lib-sieve/plugins/relational/Makefile.am
+++ b/src/lib-sieve/plugins/relational/Makefile.am
@@ -15,5 +15,3 @@ libsieve_ext_relational_la_SOURCES = \
noinst_HEADERS = \
ext-relational-common.h
-
-EXTRA_DIST = *.txt *.sieve
diff --git a/src/lib-sieve/plugins/relational/relational.sieve b/src/lib-sieve/plugins/relational/relational.sieve
deleted file mode 100644
index a125a7c25..000000000
--- a/src/lib-sieve/plugins/relational/relational.sieve
+++ /dev/null
@@ -1,57 +0,0 @@
-require ["relational", "comparator-i;ascii-numeric", "fileinto"];
-
-if header :value "eq" :comparator "i;ascii-numeric" "x-spam-score" "2" {
- fileinto "INBOX.fail";
-} else {
- fileinto "INBOX.succeed";
-}
-
-if header :value "lt" :comparator "i;ascii-numeric" "x-spam-score" "2" {
- fileinto "INBOX.fail";
-} else {
- fileinto "INBOX.succeed";
-}
-
-if header :value "lt" :comparator "i;ascii-numeric" "x-spam-score" "2" {
- fileinto "INBOX.fail";
-} else {
- fileinto "INBOX.succeed";
-}
-
-if header :value "le" :comparator "i;ascii-numeric" "x-spam-score" "300" {
- fileinto "INBOX.succeed";
-} else {
- fileinto "INBOX.fail";
-}
-
-if header :value "le" :comparator "i;ascii-numeric" "x-spam-score" "302" {
- fileinto "INBOX.succeed";
-} else {
- fileinto "INBOX.fail";
-}
-
-if header :value "le" :comparator "i;ascii-numeric" "x-spam-score" "00302" {
- fileinto "INBOX.succeed";
-} else {
- fileinto "INBOX.fail";
-}
-
-if header :count "ne" :comparator "i;ascii-numeric" "to" "2" {
- fileinto "INBOX.fail";
-} else {
- fileinto "INBOX.succeed";
-}
-
-if header :count "ge" :comparator "i;ascii-numeric" "to" "2" {
- fileinto "INBOX.succeed";
-} else {
- fileinto "INBOX.fail";
-}
-
-if header :count "ge" :comparator "i;ascii-numeric" "to" "002" {
- fileinto "INBOX.succeed";
-} else {
- fileinto "INBOX.fail";
-}
-
-keep;
diff --git a/src/lib-sieve/plugins/subaddress/Makefile.am b/src/lib-sieve/plugins/subaddress/Makefile.am
index 119effbca..26122999a 100644
--- a/src/lib-sieve/plugins/subaddress/Makefile.am
+++ b/src/lib-sieve/plugins/subaddress/Makefile.am
@@ -9,5 +9,3 @@ AM_CPPFLAGS = \
libsieve_ext_subaddress_la_SOURCES = \
ext-subaddress.c
-
-EXTRA_DIST = *.txt *.sieve
diff --git a/src/lib-sieve/plugins/subaddress/subaddress.sieve b/src/lib-sieve/plugins/subaddress/subaddress.sieve
deleted file mode 100644
index 7c2ab9329..000000000
--- a/src/lib-sieve/plugins/subaddress/subaddress.sieve
+++ /dev/null
@@ -1,14 +0,0 @@
-require "subaddress";
-require "fileinto";
-
-if address :comparator "i;ascii-casemap" :user "from" "STEPHAN" {
- discard;
-
- if address :detail :comparator "i;octet" "from" "sieve" {
- keep;
- stop;
- }
- stop;
-}
-
-keep;
diff --git a/src/lib-sieve/plugins/vacation/Makefile.am b/src/lib-sieve/plugins/vacation/Makefile.am
index 78b38c881..1e59ef1ea 100644
--- a/src/lib-sieve/plugins/vacation/Makefile.am
+++ b/src/lib-sieve/plugins/vacation/Makefile.am
@@ -17,4 +17,3 @@ libsieve_ext_vacation_la_SOURCES = \
noinst_HEADERS = \
ext-vacation-common.h
-EXTRA_DIST = *.txt *.sieve
diff --git a/src/lib-sieve/plugins/vacation/vacation-errors.sieve b/src/lib-sieve/plugins/vacation/vacation-errors.sieve
deleted file mode 100644
index 24c6cc741..000000000
--- a/src/lib-sieve/plugins/vacation/vacation-errors.sieve
+++ /dev/null
@@ -1,4 +0,0 @@
-require "vacation";
-vacation :subject "At the beach" :days 16 :days 34 "I am at the beach relaxing. Mmmm, surf...";
-
-
diff --git a/src/lib-sieve/plugins/vacation/vacation.sieve b/src/lib-sieve/plugins/vacation/vacation.sieve
deleted file mode 100644
index c68c48c7e..000000000
--- a/src/lib-sieve/plugins/vacation/vacation.sieve
+++ /dev/null
@@ -1,24 +0,0 @@
-require "vacation";
-vacation :subject "At the beach" :days 16 :mime :days 12 text:
-Content-Type: multipart/alternative; boundary=foo
-
---foo
-
-I'm at the beach relaxing. Mmmm, surf...
-
---foo
-Content-Type: text/html; charset=us-ascii
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"
- "http://www.w3.org/TR/REC-html40/strict.dtd">
-<HTML><HEAD><TITLE>How to relax</TITLE>
-<BASE HREF="http://home.example.com/pictures/"></HEAD>
-<BODY><P>I'm at the <A HREF="beach.gif">beach</A> relaxing.
-Mmmm, <A HREF="ocean.gif">surf</A>...
-</BODY></HTML>
-
---foo--
-.
-;
-
-
diff --git a/src/lib-sieve/plugins/variables/Makefile.am b/src/lib-sieve/plugins/variables/Makefile.am
index 6763e00a6..85e3df869 100644
--- a/src/lib-sieve/plugins/variables/Makefile.am
+++ b/src/lib-sieve/plugins/variables/Makefile.am
@@ -33,5 +33,3 @@ noinst_HEADERS = \
ext-variables-modifiers.h \
ext-variables-dump.h \
sieve-ext-variables.h
-
-EXTRA_DIST = *.sieve
diff --git a/src/lib-sieve/plugins/variables/variables-errors.sieve b/src/lib-sieve/plugins/variables/variables-errors.sieve
deleted file mode 100644
index 02590cef3..000000000
--- a/src/lib-sieve/plugins/variables/variables-errors.sieve
+++ /dev/null
@@ -1,12 +0,0 @@
-require "variables";
-require "fileinto";
-
-set :upper :lower "frop" "FrOp";
-set :lowerfirst :upperfirst "friep" "Friep";
-
-fileinto "${frop}";
-fileinto "${friep}";
-
-set "0" "Frop";
-set "frop." "Friep";
-set "frop.friep" "Frml";
diff --git a/src/lib-sieve/plugins/variables/variables-match.sieve b/src/lib-sieve/plugins/variables/variables-match.sieve
deleted file mode 100644
index f742911f2..000000000
--- a/src/lib-sieve/plugins/variables/variables-match.sieve
+++ /dev/null
@@ -1,136 +0,0 @@
-require "variables";
-require "fileinto";
-
-set "match1" "Test of general stupidity";
-
-# Test 1
-if string :matches "${match1}" "Test of *" {
- fileinto "TEST 1: ${1}";
-} else {
- fileinto "FAILED 1: ${match1}";
- stop;
-}
-
-# Test 2
-if string :matches "${match1}" "of *" {
- fileinto "FAILED 2: ${match1}";
- stop;
-} else {
- fileinto "TEST 2: OK";
-}
-
-set "match2" "toptoptop";
-
-# Test 3
-if string :matches "${match2}" "*top" {
- fileinto "TEST 3: ${1}";
-} else {
- fileinto "FAILED 3: ${match2}";
- stop;
-}
-
-set "match3" "ik ben een tukker met grote oren en een lelijke broek.";
-
-# Test 4
-if string :matches "${match3}" "ik ben * met * en *." {
- fileinto "TEST 4: Hij is een ${1} met ${2} en ${3}!";
-} else {
- fileinto "FAILED 4: ${match3}";
- stop;
-}
-
-# Test 5
-
-set "match4" "beter van niet?";
-
-if string :matches "${match4}" "*\\?" {
- fileinto "TEST 5: ${1}";
-} else {
- fileinto "FAILED 5: ${match4}";
- stop;
-}
-
-# Test 6
-
-
-set "match5" "The quick brown fox jumps over the lazy dog.";
-
-if string :matches "${match5}" "T?? ????? ????? ?o? ?u??? o?er ?he ???? ?o?." {
- fileinto "TEST 6: ${22}${8}${6}${25}${2}${13}${26}${1}${5}${15}${7}${21}${16}${12}${10}${17}${3}${9}${18}${20}${4}${19}${11}${14}${24}${23}";
-} else {
- fileinto "FAILED 6: ${match5}";
- #stop;
-}
-if true {
-
-# Test 7
-if string :matches "${match5}" "T?? ????? ?w??? ?o? ?u??? o?er ?he ???? ?o?." {
- fileinto "FAILED 7: ${match5}";
- stop;
-} else {
- fileinto "TEST 7: OK";
-}
-}
-
-# Test 8
-
-set "match6" "zero:one:zero|three;one;zero/five";
-
-if string :matches "${match6}" "*one?zero?five" {
- fileinto "TEST 8: o${2}z${3}f (${1})";
-} else {
- fileinto "FAILED 8: ${match6}";
- stop;
-}
-
-# Test 9
-
-set "match7" "frop";
-
-if string :matches "${match7}" "??op" {
- fileinto "TEST 9: ${1}-${2}-op";
-} else {
- fileinto "FAILED 9: ${match7}";
- #stop;
-}
-
-# Test 10
-
-if string :matches "${match7}" "fr??" {
- fileinto "TEST 10: fr-${1}-${2}";
-} else {
- fileinto "FAILED 10: ${match7}";
- #stop;
-}
-
-# Test 11
-
-set "match8" "klopfropstroptop";
-
-if string :matches "${match8}" "*fr??*top" {
- fileinto "TEST 11: ${1}: fr-${2}-${3}: ${4}";
-} else {
- fileinto "FAILED 11: ${match8}";
- #stop;
-}
-
-if string :matches "${match8}" "?*fr??*top" {
- fileinto "TEST 12: ${1}-${2}: fr-${3}-${4}: ${5}";
-} else {
- fileinto "FAILED 12: ${match8}";
- #stop;
-}
-
-if string :matches "${match8}" "*?op" {
- fileinto "TEST 13: ${1} ${2} op";
-} else {
- fileinto "FAILED 13: ${match8}";
- #stop;
-}
-
-if string :matches "${match8}" "*?op*" {
- fileinto "TEST 14: (*?op*): ${1}:${2}:${3}:${4}:${5}:${6}:${7}:";
-} else {
- fileinto "FAILED 14: ${match8}";
- #stop;
-}
diff --git a/src/lib-sieve/plugins/variables/variables-nspace.sieve b/src/lib-sieve/plugins/variables/variables-nspace.sieve
deleted file mode 100644
index 32502cb5a..000000000
--- a/src/lib-sieve/plugins/variables/variables-nspace.sieve
+++ /dev/null
@@ -1,5 +0,0 @@
-require "variables";
-require "fileinto";
-
-fileinto "This is ${dovecot.program_name} version ${dovecot.program_version}.";
-
diff --git a/src/lib-sieve/plugins/variables/variables-regex.sieve b/src/lib-sieve/plugins/variables/variables-regex.sieve
deleted file mode 100644
index 263be5ea7..000000000
--- a/src/lib-sieve/plugins/variables/variables-regex.sieve
+++ /dev/null
@@ -1,18 +0,0 @@
-require "variables";
-require "regex";
-require "fileinto";
-
-set "match1" "Hutseflutsfropfrml";
-
-if string :regex "${match1}" "Hutse(.+)fropfrml" {
- fileinto "${0}:${1}:${2}";
-}
-
-if string :regex "${match1}" "(.+)f((.+)f(.+))f(.+)" {
- fileinto "${0}:${1}:${2}:${3}:${4}:${5}";
-}
-
-if string :regex "${match1}" "(.+)((g(.+)friep)|(f(.+)frop))(.+)" {
- fileinto "${0}:${1}:${2}:${3}:${4}:${5}:${6}:${7}";
-}
-
diff --git a/src/lib-sieve/plugins/variables/variables.sieve b/src/lib-sieve/plugins/variables/variables.sieve
deleted file mode 100644
index b5239690f..000000000
--- a/src/lib-sieve/plugins/variables/variables.sieve
+++ /dev/null
@@ -1,38 +0,0 @@
-require "variables";
-require "fileinto";
-
-set :lower :upperfirst "foo" "FOOSOME";
-set :upperfirst :lower "bar" "BARABLE";
-set :upper :lowerfirst "HutsE" "hutsefluts";
-set :lowerfirst :upper "pIEp" "piepsnot";
-
-#fileinto "${foo}.${bar}";
-
-#set "huts" "${foo} likes the ${bar}";
-#set "fluts" "${foo}";
-set "friep" "it is ${foo} but not ${bar}!";
-set "frop" "van je ${hutse} en ${piep}!";
-
-set :length "len_frop" "${frop}";
-set :quotewildcard "quote_friep" "frop*friep\\frml?";
-
-fileinto "${friep}";
-fileinto "${frop}";
-fileinto "LEN-${len_frop}";
-fileinto "${quote_friep}";
-
-set "header" "subject";
-set :lower "hvalue" "moNey";
-set :lower "speed" "very fast";
-
-if header :contains "${header}" ["${hvalue}"] {
- fileinto "Oeh, het werkt.";
-}
-
-if header :contains "${header}" ["${hvalue} ${speed}"] {
- fileinto "Oeh, dit werkt ook.";
-}
-
-if string :comparator "i;ascii-casemap" "${foo}" "foosome" {
- fileinto "CASE";
-}
diff --git a/src/testsuite/Makefile.am b/src/testsuite/Makefile.am
index d8e7f508c..890c80ea0 100644
--- a/src/testsuite/Makefile.am
+++ b/src/testsuite/Makefile.am
@@ -62,7 +62,7 @@ testsuite_SOURCES = \
noinst_HEADERS = \
testsuite-common.h \
testsuite-objects.h \
- testsuite-result.c \
+ testsuite-result.h \
namespaces.h \
mail-raw.h
--
GitLab