summaryrefslogtreecommitdiff
path: root/imap4d
diff options
context:
space:
mode:
Diffstat (limited to 'imap4d')
-rw-r--r--imap4d/Makefile.am4
-rw-r--r--imap4d/append.c3
-rw-r--r--imap4d/auth_gsasl.c3
-rw-r--r--imap4d/auth_gss.c3
-rw-r--r--imap4d/authenticate.c3
-rw-r--r--imap4d/bye.c3
-rw-r--r--imap4d/capability.c3
-rw-r--r--imap4d/check.c3
-rw-r--r--imap4d/close.c3
-rw-r--r--imap4d/commands.c3
-rw-r--r--imap4d/copy.c3
-rw-r--r--imap4d/create.c3
-rw-r--r--imap4d/delete.c5
-rw-r--r--imap4d/examine.c3
-rw-r--r--imap4d/expunge.c5
-rw-r--r--imap4d/fetch.c3
-rw-r--r--imap4d/idle.c3
-rw-r--r--imap4d/imap4d.c3
-rw-r--r--imap4d/imap4d.h3
-rw-r--r--imap4d/list.c3
-rw-r--r--imap4d/login.c3
-rw-r--r--imap4d/logout.c3
-rw-r--r--imap4d/lsub.c5
-rw-r--r--imap4d/namespace.c3
-rw-r--r--imap4d/noop.c3
-rw-r--r--imap4d/rename.c3
-rw-r--r--imap4d/search.c3
-rw-r--r--imap4d/select.c3
-rw-r--r--imap4d/signal.c3
-rw-r--r--imap4d/starttls.c3
-rw-r--r--imap4d/status.c5
-rw-r--r--imap4d/store.c3
-rw-r--r--imap4d/subscribe.c3
-rw-r--r--imap4d/sync.c3
-rw-r--r--imap4d/testsuite/Makefile.am4
-rw-r--r--imap4d/testsuite/imap4d/IDEF0955.exp7
-rw-r--r--imap4d/testsuite/imap4d/IDEF0956.exp7
-rw-r--r--imap4d/testsuite/imap4d/anystate.exp5
-rw-r--r--imap4d/testsuite/imap4d/append.exp5
-rw-r--r--imap4d/testsuite/imap4d/create.exp5
-rw-r--r--imap4d/testsuite/imap4d/examine.exp5
-rw-r--r--imap4d/testsuite/imap4d/expunge.exp5
-rw-r--r--imap4d/testsuite/imap4d/fetch.exp5
-rw-r--r--imap4d/testsuite/imap4d/list.exp5
-rw-r--r--imap4d/testsuite/imap4d/search.exp5
-rw-r--r--imap4d/testsuite/imap4d/x.exp5
-rw-r--r--imap4d/testsuite/lib/imap4d.exp5
-rw-r--r--imap4d/uid.c3
-rw-r--r--imap4d/unsubscribe.c3
-rw-r--r--imap4d/util.c3
-rw-r--r--imap4d/version.c3
51 files changed, 120 insertions, 71 deletions
diff --git a/imap4d/Makefile.am b/imap4d/Makefile.am
index d748068f8..270dc6218 100644
--- a/imap4d/Makefile.am
+++ b/imap4d/Makefile.am
@@ -14,8 +14,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
INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include \
-I$(top_srcdir)/mailbox \
diff --git a/imap4d/append.c b/imap4d/append.c
index 46f7ff3f4..4afc012d9 100644
--- a/imap4d/append.c
+++ b/imap4d/append.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 */
#include "imap4d.h"
diff --git a/imap4d/auth_gsasl.c b/imap4d/auth_gsasl.c
index 45c715007..2ac9637d8 100644
--- a/imap4d/auth_gsasl.c
+++ b/imap4d/auth_gsasl.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 */
#include "imap4d.h"
#include <gsasl.h>
diff --git a/imap4d/auth_gss.c b/imap4d/auth_gss.c
index 0e637660f..d4f5b1cb5 100644
--- a/imap4d/auth_gss.c
+++ b/imap4d/auth_gss.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 */
/*
GSSAPI authentication for imap (rfc 1731).
diff --git a/imap4d/authenticate.c b/imap4d/authenticate.c
index b5de670ea..6da22804f 100644
--- a/imap4d/authenticate.c
+++ b/imap4d/authenticate.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 */
#include "imap4d.h"
diff --git a/imap4d/bye.c b/imap4d/bye.c
index bbbe2f2f4..d527a692a 100644
--- a/imap4d/bye.c
+++ b/imap4d/bye.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 */
#include "imap4d.h"
diff --git a/imap4d/capability.c b/imap4d/capability.c
index fb2be74f7..59761ed80 100644
--- a/imap4d/capability.c
+++ b/imap4d/capability.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 */
#include "imap4d.h"
diff --git a/imap4d/check.c b/imap4d/check.c
index 3ae846e48..a13e3f2a1 100644
--- a/imap4d/check.c
+++ b/imap4d/check.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 */
#include "imap4d.h"
diff --git a/imap4d/close.c b/imap4d/close.c
index e89fd6536..e3c7d7a92 100644
--- a/imap4d/close.c
+++ b/imap4d/close.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 */
#include "imap4d.h"
diff --git a/imap4d/commands.c b/imap4d/commands.c
index 8a91f4f76..ab6139e3f 100644
--- a/imap4d/commands.c
+++ b/imap4d/commands.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 */
#include "imap4d.h"
diff --git a/imap4d/copy.c b/imap4d/copy.c
index 5da514343..7ea518a49 100644
--- a/imap4d/copy.c
+++ b/imap4d/copy.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 */
#include "imap4d.h"
diff --git a/imap4d/create.c b/imap4d/create.c
index a617aa53f..f2fde3c45 100644
--- a/imap4d/create.c
+++ b/imap4d/create.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 */
#include "imap4d.h"
#include <unistd.h>
diff --git a/imap4d/delete.c b/imap4d/delete.c
index 0faedd85e..998caf1b8 100644
--- a/imap4d/delete.c
+++ b/imap4d/delete.c
@@ -13,12 +13,13 @@
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 */
#include "imap4d.h"
/*
- *
+ *
*/
int
diff --git a/imap4d/examine.c b/imap4d/examine.c
index a14157860..a392d54c0 100644
--- a/imap4d/examine.c
+++ b/imap4d/examine.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 */
#include "imap4d.h"
diff --git a/imap4d/expunge.c b/imap4d/expunge.c
index 082d3f516..6068759ba 100644
--- a/imap4d/expunge.c
+++ b/imap4d/expunge.c
@@ -13,12 +13,13 @@
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 */
#include "imap4d.h"
/*
- *
+ *
*/
int
diff --git a/imap4d/fetch.c b/imap4d/fetch.c
index 2f8d58b11..3681450dd 100644
--- a/imap4d/fetch.c
+++ b/imap4d/fetch.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 */
#include "imap4d.h"
#include <ctype.h>
diff --git a/imap4d/idle.c b/imap4d/idle.c
index 97c89692b..1ee6e7902 100644
--- a/imap4d/idle.c
+++ b/imap4d/idle.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 */
#include "imap4d.h"
diff --git a/imap4d/imap4d.c b/imap4d/imap4d.c
index f8e9ff219..a2ef25aef 100644
--- a/imap4d/imap4d.c
+++ b/imap4d/imap4d.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 */
#include "imap4d.h"
#ifdef WITH_GSASL
diff --git a/imap4d/imap4d.h b/imap4d/imap4d.h
index f58d9fc34..a4c80c95b 100644
--- a/imap4d/imap4d.h
+++ b/imap4d/imap4d.h
@@ -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 */
#ifndef _IMAP4D_H
#define _IMAP4D_H 1
diff --git a/imap4d/list.c b/imap4d/list.c
index 73fc3a3f6..b07ac64ac 100644
--- a/imap4d/list.c
+++ b/imap4d/list.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 */
#include "imap4d.h"
#include <dirent.h>
diff --git a/imap4d/login.c b/imap4d/login.c
index 956653efa..48d7ace19 100644
--- a/imap4d/login.c
+++ b/imap4d/login.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 */
#include "imap4d.h"
diff --git a/imap4d/logout.c b/imap4d/logout.c
index 99309475c..dcd95e4d6 100644
--- a/imap4d/logout.c
+++ b/imap4d/logout.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 */
#include "imap4d.h"
diff --git a/imap4d/lsub.c b/imap4d/lsub.c
index dfadb0d09..60da82a23 100644
--- a/imap4d/lsub.c
+++ b/imap4d/lsub.c
@@ -13,12 +13,13 @@
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 */
#include "imap4d.h"
/*
- *
+ *
*/
int
diff --git a/imap4d/namespace.c b/imap4d/namespace.c
index 83afc76b6..b1f8c7439 100644
--- a/imap4d/namespace.c
+++ b/imap4d/namespace.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 */
#include "imap4d.h"
diff --git a/imap4d/noop.c b/imap4d/noop.c
index ae3f88533..4347c1154 100644
--- a/imap4d/noop.c
+++ b/imap4d/noop.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 */
#include "imap4d.h"
diff --git a/imap4d/rename.c b/imap4d/rename.c
index 9368c600b..571bbe71e 100644
--- a/imap4d/rename.c
+++ b/imap4d/rename.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 */
#include "imap4d.h"
diff --git a/imap4d/search.c b/imap4d/search.c
index 1a02477a6..ec3f7c338 100644
--- a/imap4d/search.c
+++ b/imap4d/search.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 */
#include "imap4d.h"
diff --git a/imap4d/select.c b/imap4d/select.c
index bd219edeb..fd24a346b 100644
--- a/imap4d/select.c
+++ b/imap4d/select.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 */
#include "imap4d.h"
diff --git a/imap4d/signal.c b/imap4d/signal.c
index de2657550..3375fc2c5 100644
--- a/imap4d/signal.c
+++ b/imap4d/signal.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 */
#define __USE_MISC
#include "imap4d.h"
diff --git a/imap4d/starttls.c b/imap4d/starttls.c
index 8b22796fa..2016e7cd2 100644
--- a/imap4d/starttls.c
+++ b/imap4d/starttls.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 */
#include "imap4d.h"
diff --git a/imap4d/status.c b/imap4d/status.c
index 0b70a6fd4..294bd8aa1 100644
--- a/imap4d/status.c
+++ b/imap4d/status.c
@@ -13,12 +13,13 @@
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 */
#include "imap4d.h"
/*
- *
+ *
*/
typedef int (*status_funcp) __P ((mailbox_t));
diff --git a/imap4d/store.c b/imap4d/store.c
index 998c0652b..406ed5fde 100644
--- a/imap4d/store.c
+++ b/imap4d/store.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 */
#include "imap4d.h"
diff --git a/imap4d/subscribe.c b/imap4d/subscribe.c
index 825a5b1fa..57098d46b 100644
--- a/imap4d/subscribe.c
+++ b/imap4d/subscribe.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 */
#include "imap4d.h"
diff --git a/imap4d/sync.c b/imap4d/sync.c
index 185c0c195..d0179e733 100644
--- a/imap4d/sync.c
+++ b/imap4d/sync.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 */
#include "imap4d.h"
#include <mailutils/observer.h>
diff --git a/imap4d/testsuite/Makefile.am b/imap4d/testsuite/Makefile.am
index 006142d9b..6692910a1 100644
--- a/imap4d/testsuite/Makefile.am
+++ b/imap4d/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 = imap4d
diff --git a/imap4d/testsuite/imap4d/IDEF0955.exp b/imap4d/testsuite/imap4d/IDEF0955.exp
index 25f8a8314..a392ea907 100644
--- a/imap4d/testsuite/imap4d/IDEF0955.exp
+++ b/imap4d/testsuite/imap4d/IDEF0955.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.
# Mailutils versions prior to 0.6.1 allowed to use any numbers in message
# sets, even those greater than the maximum id (message number or uid),
@@ -41,4 +42,4 @@ imap4d_test "FETCH 1:4294967294 FLAGS" \
imap4d_test "UID FETCH 1:4294967294 FLAGS" \
"BAD UID FETCH Bogus number set"
-# End of IDEF0955.exp \ No newline at end of file
+# End of IDEF0955.exp
diff --git a/imap4d/testsuite/imap4d/IDEF0956.exp b/imap4d/testsuite/imap4d/IDEF0956.exp
index 144048255..d2f78d8a4 100644
--- a/imap4d/testsuite/imap4d/IDEF0956.exp
+++ b/imap4d/testsuite/imap4d/IDEF0956.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.
# Mailutils versions prior to 0.6.1 missed check for integer overflow
# in fetch_io.
@@ -37,4 +38,4 @@ imap4d_test "SELECT mbox1" \
imap4d_test "FETCH 1 BODY\[TEXT\]<0.4294967294>" \
"BAD FETCH Completed"
-# End of IDEF0956.exp \ No newline at end of file
+# End of IDEF0956.exp
diff --git a/imap4d/testsuite/imap4d/anystate.exp b/imap4d/testsuite/imap4d/anystate.exp
index 539158b03..5fc440b86 100644
--- a/imap4d/testsuite/imap4d/anystate.exp
+++ b/imap4d/testsuite/imap4d/anystate.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.
imap4d_start
diff --git a/imap4d/testsuite/imap4d/append.exp b/imap4d/testsuite/imap4d/append.exp
index 287f43e7d..5d9ec961f 100644
--- a/imap4d/testsuite/imap4d/append.exp
+++ b/imap4d/testsuite/imap4d/append.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.
# 6.3.11. APPEND Command
# Arguments: mailbox name
diff --git a/imap4d/testsuite/imap4d/create.exp b/imap4d/testsuite/imap4d/create.exp
index f838c9fab..4ea1ed935 100644
--- a/imap4d/testsuite/imap4d/create.exp
+++ b/imap4d/testsuite/imap4d/create.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 n