summaryrefslogtreecommitdiffabout
path: root/sieve
authorSergey Poznyakoff <gray@gnu.org.ua>2005-05-17 13:13:40 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2005-05-17 13:13:40 (GMT)
commitb93156813d1112dab689c697eb817e62bb73bbd5 (patch) (side-by-side diff)
treed634b333beeabce99e22131b65043d00ef5960b2 /sieve
parentc0b1c8f24780571248345b245a538db24d788872 (diff)
downloadmailutils-b93156813d1112dab689c697eb817e62bb73bbd5.tar.gz
mailutils-b93156813d1112dab689c697eb817e62bb73bbd5.tar.bz2
Updated FSF addressalpha_0_6_90
Diffstat (limited to 'sieve') (more/less context) (ignore whitespace changes)
-rw-r--r--sieve/Makefile.am4
-rw-r--r--sieve/sieve.c3
-rw-r--r--sieve/testsuite/Makefile.am4
-rw-r--r--sieve/testsuite/Redirect2
-rw-r--r--sieve/testsuite/Reject2
-rw-r--r--sieve/testsuite/lib/sieve.exp5
-rw-r--r--sieve/testsuite/sieve/action.exp5
-rw-r--r--sieve/testsuite/sieve/address.exp5
-rw-r--r--sieve/testsuite/sieve/allof.exp5
-rw-r--r--sieve/testsuite/sieve/anyof.exp5
-rw-r--r--sieve/testsuite/sieve/envelope.exp5
-rw-r--r--sieve/testsuite/sieve/exists.exp5
-rw-r--r--sieve/testsuite/sieve/ext.exp7
-rw-r--r--sieve/testsuite/sieve/false.exp5
-rw-r--r--sieve/testsuite/sieve/header.exp5
-rw-r--r--sieve/testsuite/sieve/i-casemap.exp5
-rw-r--r--sieve/testsuite/sieve/i-numeric.exp5
-rw-r--r--sieve/testsuite/sieve/i-octet.exp5
-rw-r--r--sieve/testsuite/sieve/mul-addr.exp5
-rw-r--r--sieve/testsuite/sieve/not.exp5
-rw-r--r--sieve/testsuite/sieve/redirect.exp5
-rw-r--r--sieve/testsuite/sieve/reject.exp5
-rw-r--r--sieve/testsuite/sieve/relational.exp5
-rw-r--r--sieve/testsuite/sieve/size.exp5
-rw-r--r--sieve/testsuite/sieve/true.exp5
25 files changed, 69 insertions, 48 deletions
diff --git a/sieve/Makefile.am b/sieve/Makefile.am
index 5703e4b..013e430 100644
--- a/sieve/Makefile.am
+++ b/sieve/Makefile.am
@@ -14,8 +14,8 @@
##
## You should have received a copy of the GNU General Public License
## along with this program; if not, write to the Free Software
-## Foundation, Inc.
-## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301 USA
INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu @INTLINCS@
SUBDIRS = testsuite
diff --git a/sieve/sieve.c b/sieve/sieve.c
index 75d3aa6..cb08f9e 100644
--- a/sieve/sieve.c
+++ b/sieve/sieve.c
@@ -13,7 +13,8 @@
You should have received a copy of the GNU General Public License
along with GNU Mailutils; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301 USA */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/sieve/testsuite/Makefile.am b/sieve/testsuite/Makefile.am
index 67a2d22..2d9b37f 100644
--- a/sieve/testsuite/Makefile.am
+++ b/sieve/testsuite/Makefile.am
@@ -14,8 +14,8 @@
##
## You should have received a copy of the GNU General Public License
## along with this program; if not, write to the Free Software
-## Foundation, Inc.
-## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301 USA
AUTOMAKE_OPTIONS = dejagnu
DEJATOOL = sieve
diff --git a/sieve/testsuite/Redirect b/sieve/testsuite/Redirect
index c2a8738..e6d5976 100644
--- a/sieve/testsuite/Redirect
+++ b/sieve/testsuite/Redirect
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
TEST redirect.sv
diff --git a/sieve/testsuite/Reject b/sieve/testsuite/Reject
index 97f6d03..eab5e44 100644
--- a/sieve/testsuite/Reject
+++ b/sieve/testsuite/Reject
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
TEST reject.sv
diff --git a/sieve/testsuite/lib/sieve.exp b/sieve/testsuite/lib/sieve.exp
index a5795a9..96df673 100644
--- a/sieve/testsuite/lib/sieve.exp
+++ b/sieve/testsuite/lib/sieve.exp
@@ -13,8 +13,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
source $top_srcdir/testsuite/lib/mailutils.exp
set sieve_source_dir "${srcdir}/scripts"
diff --git a/sieve/testsuite/sieve/action.exp b/sieve/testsuite/sieve/action.exp
index 88e67d9..4de6ee9 100644
--- a/sieve/testsuite/sieve/action.exp
+++ b/sieve/testsuite/sieve/action.exp
@@ -13,8 +13,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
sieve_test stop.sv -pattern\
"STOP on msg uid 1"\
diff --git a/sieve/testsuite/sieve/address.exp b/sieve/testsuite/sieve/address.exp
index ea4b39a..d45f4c6 100644
--- a/sieve/testsuite/sieve/address.exp
+++ b/sieve/testsuite/sieve/address.exp
@@ -13,8 +13,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
sieve_test addr_is_all.sv -pattern \
"DISCARD on msg uid 1: marking as deleted"\
diff --git a/sieve/testsuite/sieve/allof.exp b/sieve/testsuite/sieve/allof.exp
index 04523c9..4875e8e 100644
--- a/sieve/testsuite/sieve/allof.exp
+++ b/sieve/testsuite/sieve/allof.exp
@@ -13,8 +13,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
sieve_test allof00.sv -pattern \
"IMPLICIT KEEP on msg uid 1"\
diff --git a/sieve/testsuite/sieve/anyof.exp b/sieve/testsuite/sieve/anyof.exp
index 2d7ae58..2bc4e17 100644
--- a/sieve/testsuite/sieve/anyof.exp
+++ b/sieve/testsuite/sieve/anyof.exp
@@ -13,8 +13,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
sieve_test anyof00.sv -pattern \
"IMPLICIT KEEP on msg uid 1"\
diff --git a/sieve/testsuite/sieve/envelope.exp b/sieve/testsuite/sieve/envelope.exp
index 7b81288..2287740 100644
--- a/sieve/testsuite/sieve/envelope.exp
+++ b/sieve/testsuite/sieve/envelope.exp
@@ -13,8 +13,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
sieve_test envelope1.sv -pattern \
"DISCARD on msg uid 1: marking as deleted"\
diff --git a/sieve/testsuite/sieve/exists.exp b/sieve/testsuite/sieve/exists.exp
index 9ef5e61..49c4ce6 100644
--- a/sieve/testsuite/sieve/exists.exp
+++ b/sieve/testsuite/sieve/exists.exp
@@ -13,8 +13,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
sieve_test exists1.sv -pattern \
"DISCARD on msg uid 1: marking as deleted"\
diff --git a/sieve/testsuite/sieve/ext.exp b/sieve/testsuite/sieve/ext.exp
index 7d70ebe..024b5d2 100644
--- a/sieve/testsuite/sieve/ext.exp
+++ b/sieve/testsuite/sieve/ext.exp
@@ -13,8 +13,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
mu_version
if ![mu_check_capability HAVE_LIBLTDL] {
@@ -24,4 +25,4 @@ if ![mu_check_capability HAVE_LIBLTDL] {
sieve_test -L "${top_builddir}/examples" -f ${MU_SPOOL_DIR}/bigto.mbox numaddr.sv -pattern \
"DISCARD on msg uid 1: marking as deleted"
-# End of ext.exp \ No newline at end of file
+# End of ext.exp
diff --git a/sieve/testsuite/sieve/false.exp b/sieve/testsuite/sieve/false.exp
index 6006d3b..cec2da6 100644
--- a/sieve/testsuite/sieve/false.exp
+++ b/sieve/testsuite/sieve/false.exp
@@ -13,8 +13,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
sieve_test false.sv -pattern \
"IMPLICIT KEEP on msg uid 1"\
diff --git a/sieve/testsuite/sieve/header.exp b/sieve/testsuite/sieve/header.exp
index 57c5605..d832f71 100644
--- a/sieve/testsuite/sieve/header.exp
+++ b/sieve/testsuite/sieve/header.exp
@@ -13,8 +13,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
sieve_test header1.sv -pattern \
"DISCARD on msg uid 1: marking as deleted"\
diff --git a/sieve/testsuite/sieve/i-casemap.exp b/sieve/testsuite/sieve/i-casemap.exp
index 2f8aa7b..24bda22 100644
--- a/sieve/testsuite/sieve/i-casemap.exp
+++ b/sieve/testsuite/sieve/i-casemap.exp
@@ -13,8 +13,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
sieve_test i-casemap-is.sv -pattern \
"DISCARD on msg uid 1: marking as deleted"\
diff --git a/sieve/testsuite/sieve/i-numeric.exp b/sieve/testsuite/sieve/i-numeric.exp
index 13984d7..42de0b0 100644
--- a/sieve/testsuite/sieve/i-numeric.exp
+++ b/sieve/testsuite/sieve/i-numeric.exp
@@ -13,8 +13,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
sieve_test i-numeric-is.sv -pattern \
"IMPLICIT KEEP on msg uid 1"\
diff --git a/sieve/testsuite/sieve/i-octet.exp b/sieve/testsuite/sieve/i-octet.exp
index 63642d6..b7f9c58 100644
--- a/sieve/testsuite/sieve/i-octet.exp
+++ b/sieve/testsuite/sieve/i-octet.exp
@@ -13,8 +13,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
sieve_test i-octet-is.sv -pattern \
"DISCARD on msg uid 1: marking as deleted"\
diff --git a/sieve/testsuite/sieve/mul-addr.exp b/sieve/testsuite/sieve/mul-addr.exp
index d4be76a..f6a2040 100644
--- a/sieve/testsuite/sieve/mul-addr.exp
+++ b/sieve/testsuite/sieve/mul-addr.exp
@@ -13,8 +13,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
sieve_test -f $MU_SPOOL_DIR/relational.mbox mul-addr.sv -pattern \
"DISCARD on msg uid 1: marking as deleted"\
diff --git a/sieve/testsuite/sieve/not.exp b/sieve/testsuite/sieve/not.exp
index 76483dd..fa344a9 100644
--- a/sieve/testsuite/sieve/not.exp
+++ b/sieve/testsuite/sieve/not.exp
@@ -13,8 +13,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
sieve_test not.sv -pattern \
"DISCARD on msg uid 1: marking as deleted"\
diff --git a/sieve/testsuite/sieve/redirect.exp b/sieve/testsuite/sieve/redirect.exp
index 918704d..ea4c975 100644
--- a/sieve/testsuite/sieve/redirect.exp
+++ b/sieve/testsuite/sieve/redirect.exp
@@ -13,8 +13,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
set mtafile "$MU_FOLDER_DIR/mta.diag"
set env(MTA_DIAG) "$mtafile"
diff --git a/sieve/testsuite/sieve/reject.exp b/sieve/testsuite/sieve/reject.exp
index 648ff02..90a73a1 100644
--- a/sieve/testsuite/sieve/reject.exp
+++ b/sieve/testsuite/sieve/reject.exp
@@ -13,8 +13,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
set mtafile "$MU_FOLDER_DIR/mta.diag"
set env(MTA_DIAG) "$mtafile"
diff --git a/sieve/testsuite/sieve/relational.exp b/sieve/testsuite/sieve/relational.exp
index 3f873f0..1a1c49f 100644
--- a/sieve/testsuite/sieve/relational.exp
+++ b/sieve/testsuite/sieve/relational.exp
@@ -13,8 +13,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
sieve_test -f $MU_SPOOL_DIR/relational.mbox rel-address.sv -pattern \
"DISCARD on msg uid 1: marking as deleted"\
diff --git a/sieve/testsuite/sieve/size.exp b/sieve/testsuite/sieve/size.exp
index f283280..93ba0c3 100644
--- a/sieve/testsuite/sieve/size.exp
+++ b/sieve/testsuite/sieve/size.exp
@@ -13,8 +13,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
sieve_test size1.sv -pattern \
"IMPLICIT KEEP on msg uid 1"\
diff --git a/sieve/testsuite/sieve/true.exp b/sieve/testsuite/sieve/true.exp
index d38c27d..11fe59a 100644
--- a/sieve/testsuite/sieve/true.exp
+++ b/sieve/testsuite/sieve/true.exp
@@ -13,8 +13,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
sieve_test true.sv -pattern \
"DISCARD on msg uid 1: marking as deleted"\

Return to:

Send suggestions and report system problems to the System administrator.