Updated FSF address

@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 		       Version 2, June 1991
 
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
  of this license document, but changing it is not allowed.
 
 
@@ -305,7 +305,8 @@ the "copyright" line and a pointer to where the full notice is found.
 
 
     You should have received a copy of the GNU General Public License
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     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
 
 
 
 
 Also add information on how to contact you by electronic and paper mail.
 Also add information on how to contact you by electronic and paper mail.

@@ -3,7 +3,7 @@
                        Version 2.1, February 1999
                        Version 2.1, February 1999
 
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
  of this license document, but changing it is not allowed.
 
 
@@ -493,7 +493,8 @@ does.>
 
 
     You should have received a copy of the GNU Lesser General Public
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
     License along with this library; 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
 
 
 Also add information on how to contact you by electronic and paper
 Also add information on how to contact you by electronic and paper
 mail.
 mail.

@@ -14,8 +14,8 @@
 ##
 ##
 ##   You should have received a copy of the GNU General Public License
 ##   You should have received a copy of the GNU General Public License
 ##   along with this program; if not, write to the Free Software
 ##   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 = gnits 1.8.5 dist-bzip2 std-options
 AUTOMAKE_OPTIONS = gnits 1.8.5 dist-bzip2 std-options
 ACLOCAL_AMFLAGS = -I m4
 ACLOCAL_AMFLAGS = -I m4

-GNU mailutils NEWS -- history of user-visible changes.  2005-03-25
+GNU mailutils NEWS -- history of user-visible changes.  2005-05-17
 Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 See the end of file for copying conditions.
 See the end of file for copying conditions.
 
 
 Please send mailutils bug reports to <bug-mailutils@gnu.org>.
 Please send mailutils bug reports to <bug-mailutils@gnu.org>.
 
 
-Version 0.6.1:
+Version 0.6.90:
 
 
 * libsieve: New action 'vacation'
 * libsieve: New action 'vacation'
 
 
@@ -71,6 +71,7 @@ with right to left script orientation (Arabic, Hebrew).
 ** Fixed displaying mail headers in different languages (mail,frm,from)
 ** Fixed displaying mail headers in different languages (mail,frm,from)
 ** SQL authentication: prevent sql injection attacks
 ** SQL authentication: prevent sql injection attacks
 ** Fixed bug in the default syslog diagnostic printer
 ** Fixed bug in the default syslog diagnostic printer
+** Fixed potential vulnerabilities: IDEF0954, IDEF0955, IDEF0956, IDEF0957
 
 
 
 
 Version 0.6:
 Version 0.6:

@@ -14,8 +14,8 @@
 ##
 ##
 ##   You should have received a copy of the GNU General Public License
 ##   You should have received a copy of the GNU General Public License
 ##   along with GNU Mailutils; if not, write to the Free Software
 ##   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}/include -I${top_srcdir}/mailbox/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu @INTLINCS@
 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu @INTLINCS@
 AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" \
 AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" \
@@ -35,4 +35,4 @@ virtual.c
 
 
 libmuauth_la_LIBADD = @SQLLIB@ @LTLIBINTL@
 libmuauth_la_LIBADD = @SQLLIB@ @LTLIBINTL@
 libmuauth_la_LDFLAGS = -version-info 0:0:0
 libmuauth_la_LDFLAGS = -version-info 0:0:0
-libmuauth_la_DEPENDENCIES = @SQLLIB_DEPENDENCY@ 
\ No newline at end of file
+libmuauth_la_DEPENDENCIES = @SQLLIB_DEPENDENCY@ 

@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
    Lesser General Public License for more details.
 
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 
 #if HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 # include <config.h>
 # include <config.h>

@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
    Lesser General Public License for more details.
 
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 
 #ifdef HAVE_CONFIG_H
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 # include <config.h>

@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
    Lesser General Public License for more details.
 
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 
 #include <mailutils/types.h>
 #include <mailutils/types.h>
 
 

@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
    Lesser General Public License for more details.
 
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 
 #ifdef HAVE_CONFIG_H
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 # include <config.h>

@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
    Lesser General Public License for more details.
 
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 
 #ifdef HAVE_CONFIG_H
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 # include <config.h>

@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
    Lesser General Public License for more details.
 
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 
 #include <sys/types.h>
 #include <sys/types.h>
 #include <stdlib.h>
 #include <stdlib.h>

@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
    Lesser General Public License for more details.
 
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 
 #if HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 # include <config.h>
 # include <config.h>

@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
    Lesser General Public License for more details.
 
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 
 #ifdef HAVE_CONFIG_H
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 # include <config.h>

@@ -14,8 +14,8 @@
 ##
 ##
 ##   You should have received a copy of the GNU General Public License
 ##   You should have received a copy of the GNU General Public License
 ##   along with GNU Mailutils; if not, write to the Free Software
 ##   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$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu -I$(top_srcdir)/include @INTLINCS@
 INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu -I$(top_srcdir)/include @INTLINCS@
 
 

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "comsat.h"
 #include "comsat.h"
 #define obstack_chunk_alloc malloc
 #define obstack_chunk_alloc malloc

@@ -13,9 +13,9 @@
    GNU General Public License for more details.
    GNU General Public License for more details.
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA. */
+   along with GNU Inetutils; see the file COPYING.  If not, write
+   to the Free Software Foundation, Inc., 51 Franklin Street,
+   Fifth Floor, Boston, MA 02110-1301 USA. */
 
 
 #include "comsat.h"
 #include "comsat.h"
 
 

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "comsat.h"
 #include "comsat.h"
 
 

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 # include <config.h>

@@ -14,7 +14,8 @@
 ##
 ##
 ##   You should have received a copy of the GNU General Public License
 ##   You should have received a copy of the GNU General Public License
 ##   along with this program; if not, write to the Free Software
 ##   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}/mailbox \
 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox \
  -I${top_srcdir}/mailbox/include -I${top_builddir}/include/mailutils/gnu \
  -I${top_srcdir}/mailbox/include -I${top_builddir}/include/mailutils/gnu \

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 # include <config.h>

@@ -12,11 +12,11 @@ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
 dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
 dnl GNU General Public License for more details.
 dnl
 dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with GNU Mailutils; if not, write to the Free Software
-dnl Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+dnl You should have received a copy of the GNU General Public License along
+dnl with GNU Mailutils; if not, write to the Free Software Foundation,
+dnl Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
-AC_INIT([GNU Mailutils], [0.6.1], [bug-mailutils@gnu.org], [mailutils])
+AC_INIT([GNU Mailutils], [0.6.90], [bug-mailutils@gnu.org], [mailutils])
 AC_CONFIG_SRCDIR([mailbox/mailbox.c])
 AC_CONFIG_SRCDIR([mailbox/mailbox.c])
 AC_CONFIG_AUX_DIR([scripts])
 AC_CONFIG_AUX_DIR([scripts])
 AC_CANONICAL_TARGET([])
 AC_CANONICAL_TARGET([])

@@ -14,7 +14,7 @@
 ##
 ##
 ##   You should have received a copy of the GNU General Public License
 ##   You should have received a copy of the GNU General Public License
 ##   along with this program; if not, write to the Free Software
 ##   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
 
 
 SUBDIRS=texinfo rfc man
 SUBDIRS=texinfo rfc man

@@ -14,7 +14,8 @@
 ##
 ##
 ##   You should have received a copy of the GNU General Public License
 ##   You should have received a copy of the GNU General Public License
 ##   along with this program; if not, write to the Free Software
 ##   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
 
 
 man_MANS = pop3d.1 imap4d.1 popauth.1 mail.1
 man_MANS = pop3d.1 imap4d.1 popauth.1 mail.1
 EXTRA_DIST = $(man_MANS)
 EXTRA_DIST = $(man_MANS)

@@ -14,8 +14,8 @@
 ##
 ##
 ##   You should have received a copy of the GNU General Public License
 ##   You should have received a copy of the GNU General Public License
 ##   along with GNU Mailutils; if not, write to the Free Software
 ##   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
 
 
 EXTRA_DIST = \
 EXTRA_DIST = \
  rfc821.txt \
  rfc821.txt \

@@ -3,7 +3,7 @@
 
 
 
 
  Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
  Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
  of this license document, but changing it is not allowed.
 
 

@@ -14,7 +14,8 @@
 ##
 ##
 ##   You should have received a copy of the GNU General Public License
 ##   You should have received a copy of the GNU General Public License
 ##   along with this program; if not, write to the Free Software
 ##   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
 
 
 info_TEXINFOS = mailutils.texi muint.texi
 info_TEXINFOS = mailutils.texi muint.texi
 
 

@@ -5,7 +5,7 @@
 
 
 @display
 @display
 Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc.
 Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 
 Everyone is permitted to copy and distribute verbatim copies
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
 of this license document, but changing it is not allowed.

@@ -42,8 +42,8 @@
 
 
 @copying
 @copying
 Published by the Free Software Foundation,
 Published by the Free Software Foundation,
-59 Temple Place - Suite 330
-Boston, MA 02111-1307, USA
+51 Franklin Street, Fifth Floor
+Boston, MA 02110-1301, USA
 
 
 Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004
 Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.
 Free Software Foundation, Inc.

@@ -17,8 +17,8 @@
 
 
 @copying
 @copying
 Published by the Free Software Foundation,
 Published by the Free Software Foundation,
-59 Temple Place - Suite 330
-Boston, MA 02111-1307, USA
+51 Franklin Street, Fifth Floor
+Boston, MA 02110-1301, USA
 
 
 Copyright @copyright{} 2003, 2004 Free Software Foundation, Inc.
 Copyright @copyright{} 2003, 2004 Free Software Foundation, Inc.
 
 

@@ -14,8 +14,8 @@
 ##
 ##
 ##   You should have received a copy of the GNU General Public License
 ##   You should have received a copy of the GNU General Public License
 ##   along with this program; if not, write to the Free Software
 ##   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$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @INTLINCS@
 INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @INTLINCS@
 
 

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 # include <config.h>

@@ -14,7 +14,8 @@
 ##
 ##
 ##   You should have received a copy of the GNU General Public License
 ##   You should have received a copy of the GNU General Public License
 ##   along with this program; if not, write to the Free Software
 ##   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
 
 
 SUBDIRS = config cpp scheme
 SUBDIRS = config cpp scheme
 
 

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 <stdio.h>
 #include <stdio.h>
 #include <string.h>
 #include <string.h>

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 <unistd.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdio.h>

@@ -14,7 +14,8 @@
 ##
 ##
 ##   You should have received a copy of the GNU General Public License
 ##   You should have received a copy of the GNU General Public License
 ##   along with this program; if not, write to the Free Software
 ##   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
 
 
 EXTRA_DIST = comsat.conf dot.biffrc gnu-imap4d.pam gnu-pop3d.pam\
 EXTRA_DIST = comsat.conf dot.biffrc gnu-imap4d.pam gnu-pop3d.pam\
  mailutils.rc
  mailutils.rc

@@ -14,5 +14,6 @@
 ##
 ##
 ##   You should have received a copy of the GNU General Public License
 ##   You should have received a copy of the GNU General Public License
 ##   along with this program; if not, write to the Free Software
 ##   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
 
 

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 <stdio.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdlib.h>

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 */
 
 
 /* This is an example program to illustrate the use of stream functions.
 /* This is an example program to illustrate the use of stream functions.
    It connects to a remote HTTP server and prints the contents of its
    It connects to a remote HTTP server and prints the contents of its

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 <stdio.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdlib.h>

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 <unistd.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdio.h>

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 <stdio.h>
 #include <stdio.h>
 #include <mailutils/mailcap.h>
 #include <mailutils/mailcap.h>

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 # include <config.h>

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 <sys/types.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/stat.h>

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 */
 
 
 /* This is a "fake" mta designed for testing purposes. It imitates
 /* This is a "fake" mta designed for testing purposes. It imitates
    sendmail sending and daemon modes. It does not actually send anything,
    sendmail sending and daemon modes. It does not actually send anything,

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 <mailutils/mutil.h>
 #include <mailutils/mutil.h>
 #include <mailutils/argp.h>
 #include <mailutils/argp.h>

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 # include <config.h>

@@ -16,7 +16,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #  include <config.h>

@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU Lesser General Public License for more details.
    GNU Lesser General Public License for more details.
 
 
-   You should have received a copy of the GNU Lesser 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  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with GNU Mailutils; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 
 /*  This is an example on how to write extension tests for GNU sieve.
 /*  This is an example on how to write extension tests for GNU sieve.
     It provides test "numaddr".
     It provides test "numaddr".

@@ -16,7 +16,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #  include <config.h>

@@ -14,7 +14,8 @@
 ##
 ##
 ##   You should have received a copy of the GNU General Public License
 ##   You should have received a copy of the GNU General Public License
 ##   along with this program; if not, write to the Free Software
 ##   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
 
 
 EXTRA_DIST = reply.scm
 EXTRA_DIST = reply.scm
 
 

@@ -11,9 +11,9 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;;; GNU General Public License for more details.
 ;;;; GNU General Public License for more details.
 ;;;; 
 ;;;; 
-;;;; 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
+;;;; 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
 ;;; This is a simple Guile program that generates automatic reply to 
 ;;; This is a simple Guile program that generates automatic reply to 
 ;;; incoming mail messages.
 ;;; incoming mail messages.
@@ -77,4 +77,4 @@ Kind regards\n")
   (reply msg))	
   (reply msg))	
     
     
     
     
-	
\ No newline at end of file
+	

@@ -14,7 +14,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 <stdio.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdlib.h>

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 <stdio.h>
 #include <stdio.h>
 #include <string.h>
 #include <string.h>

@@ -14,7 +14,8 @@
 ##
 ##
 ##   You should have received a copy of the GNU General Public License
 ##   You should have received a copy of the GNU General Public License
 ##   along with this program; if not, write to the Free Software
 ##   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\
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib\
  -I${top_builddir}/include/mailutils/gnu @INTLINCS@
  -I${top_builddir}/include/mailutils/gnu @INTLINCS@

@@ -14,7 +14,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 <frm.h>
 #include <frm.h>
 
 

@@ -14,7 +14,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 <frm.h>
 #include <frm.h>
 
 

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 # include <config.h>

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 <frm.h>
 #include <frm.h>
 
 

@@ -14,8 +14,8 @@
 ##
 ##
 ##   You should have received a copy of the GNU General Public License
 ##   You should have received a copy of the GNU General Public License
 ##   along with this program; if not, write to the Free Software
 ##   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
 AUTOMAKE_OPTIONS = dejagnu
 DEJATOOL = frm
 DEJATOOL = frm

@@ -13,8 +13,9 @@
 # GNU General Public License for more details.
 # GNU General Public License for more details.
 #  
 #  
 # You should have received a copy of the GNU General Public License
 # 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
 source $top_srcdir/testsuite/lib/mailutils.exp
 
 

@@ -14,8 +14,8 @@
 ##
 ##
 ##   You should have received a copy of the GNU General Public License
 ##   You should have received a copy of the GNU General Public License
 ##   along with this program; if not, write to the Free Software
 ##   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. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/lib \
 INCLUDES = -I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/lib \
  -I$(top_srcdir)/mailbox -I$(top_srcdir)/include \
  -I$(top_srcdir)/mailbox -I$(top_srcdir)/include \

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "guimb.h"
 #include "guimb.h"
 
 

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 */
 
 
 #if defined(HAVE_CONFIG_H)
 #if defined(HAVE_CONFIG_H)
 # include <config.h>
 # include <config.h>

@@ -14,7 +14,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "guimb.h"
 #include "guimb.h"
 
 

@@ -14,8 +14,8 @@
 ##
 ##
 ##   You should have received a copy of the GNU General Public License
 ##   You should have received a copy of the GNU General Public License
 ##   along with this program; if not, write to the Free Software
 ##   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
 
 
 bin_SCRIPTS = sieve.scm
 bin_SCRIPTS = sieve.scm
 
 

@@ -11,9 +11,9 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;;; GNU General Public License for more details.
 ;;;; GNU General Public License for more details.
 ;;;; 
 ;;;; 
-;;;; 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
+;;;; 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
 ;;;; This module provides GNU extension test "mimeheader".
 ;;;; This module provides GNU extension test "mimeheader".
 
 

@@ -11,9 +11,9 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;;; GNU General Public License for more details.
 ;;;; GNU General Public License for more details.
 ;;;; 
 ;;;; 
-;;;; 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
+;;;; 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
 ;;;; This module provides GNU extension test "numaddr".
 ;;;; This module provides GNU extension test "numaddr".
 
 

@@ -11,9 +11,9 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;;; GNU General Public License for more details.
 ;;;; GNU General Public License for more details.
 ;;;; 
 ;;;; 
-;;;; 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
+;;;; 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
 ;;;; This module provides sieve's "redirect" action.
 ;;;; This module provides sieve's "redirect" action.
 
 

@@ -11,9 +11,9 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;;; GNU General Public License for more details.
 ;;;; GNU General Public License for more details.
 ;;;; 
 ;;;; 
-;;;; 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
+;;;; 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
 ;;;; This module provides sieve's "reject" action.
 ;;;; This module provides sieve's "reject" action.
 
 

@@ -11,9 +11,9 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;;; GNU General Public License for more details.
 ;;;; GNU General Public License for more details.
 ;;;; 
 ;;;; 
-;;;; 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
+;;;; 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
 ;;;; This module provides core functionality for the sieve scripts.
 ;;;; This module provides core functionality for the sieve scripts.
 
 

@@ -14,9 +14,9 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;;; GNU General Public License for more details.
 ;;;; GNU General Public License for more details.
 ;;;; 
 ;;;; 
-;;;; 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
+;;;; 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;;;;
 ;;;;
 
 
 ;;;; This is a Sieve to Scheme translator.
 ;;;; This is a Sieve to Scheme translator.

@@ -11,9 +11,9 @@
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;;; GNU General Public License for more details.
 ;;;; GNU General Public License for more details.
 ;;;; 
 ;;;; 
-;;;; 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
+;;;; 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
 ;;;; This module provides "vacation" extension
 ;;;; This module provides "vacation" extension
 
 

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "guimb.h"
 #include "guimb.h"
 
 

@@ -14,8 +14,8 @@
 ##
 ##
 ##   You should have received a copy of the GNU General Public License
 ##   You should have received a copy of the GNU General Public License
 ##   along with GNU Mailutils; if not, write to the Free Software
 ##   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 \
 INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include \
  -I$(top_srcdir)/mailbox \
  -I$(top_srcdir)/mailbox \

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "imap4d.h"
 
 

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "imap4d.h"
 #include <gsasl.h>
 #include <gsasl.h>

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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). 
   GSSAPI authentication for imap (rfc 1731). 

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "imap4d.h"
 
 

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "imap4d.h"
 
 

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "imap4d.h"
 
 

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "imap4d.h"
 
 

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "imap4d.h"
 
 

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "imap4d.h"
 
 

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "imap4d.h"
 
 

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "imap4d.h"
 #include <unistd.h>
 #include <unistd.h>

@@ -13,12 +13,13 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "imap4d.h"
 
 
 /*
 /*
- *
+ *  
  */
  */
 
 
 int
 int

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "imap4d.h"
 
 

@@ -13,12 +13,13 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "imap4d.h"
 
 
 /*
 /*
- *
+ *  
  */
  */
 
 
 int
 int

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "imap4d.h"
 #include <ctype.h>
 #include <ctype.h>

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "imap4d.h"
 
 

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "imap4d.h"
 #ifdef WITH_GSASL
 #ifdef WITH_GSASL

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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
 #ifndef _IMAP4D_H
 #define _IMAP4D_H 1
 #define _IMAP4D_H 1

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "imap4d.h"
 #include <dirent.h>
 #include <dirent.h>

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "imap4d.h"
 
 

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "imap4d.h"
 
 

@@ -13,12 +13,13 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "imap4d.h"
 
 
 /*
 /*
- *
+ *  
  */
  */
 
 
 int
 int

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "imap4d.h"
 
 

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "imap4d.h"
 
 

@@ -13,7 +13,8 @@
 
 
    You should have received a copy of the GNU General Public License
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
    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 "imap4d.h"