mhonarc-commits
[Top] [All Lists]

CVS: mharc/bin apply-config,1.8,1.9 compress-files,1.6,1.7 compress-mboxes,...

2002-09-13 00:26:06
Update of /cvsroot/mhonarc/mharc/bin
In directory subversions:/tmp/cvs-serv1897

Modified Files:
	apply-config compress-files compress-mboxes extract-mesg-date 
	filter-spool gc-search-indexes mbox-month-pack mh-month-pack 
	mhonarc-check mk-procmailrc mk-search-index read-mail 
	web-archive 
Log Message:
* Scripts check if running under CGI environment, and if so, terminate
  execution.
* Some minor POD tweeks.


Index: apply-config
===================================================================
RCS file: /cvsroot/mhonarc/mharc/bin/apply-config,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** apply-config	23 Jul 2002 04:10:46 -0000	1.8
--- apply-config	13 Sep 2002 07:25:55 -0000	1.9
***************
*** 26,38 ****
  package MHArc::apply_config;
  
! my $Dir;
! BEGIN {
!   $Dir = `dirname $0`; chomp $Dir;
! }
  use lib "$Dir/../lib";  # Add relative lib to search path
! 
  use MHArc::Config;
  my $config = MHArc::Config->load("$Dir/../lib/config.sh");
! 
  
  use Getopt::Long;
--- 26,41 ----
  package MHArc::apply_config;
  
! ##--------------------------------------------------------------------------##
! # <x-boot-strap>
! BEGIN { die qq/CGI use FORBIDDEN!\n/ if (defined($ENV{'GATEWAY_INTERFACE'})); }
! my $Dir; BEGIN { $Dir = `dirname $0`; chomp $Dir; }
  use lib "$Dir/../lib";  # Add relative lib to search path
! # </x-boot-strap>
! ##--------------------------------------------------------------------------##
! # <x-config>
  use MHArc::Config;
  my $config = MHArc::Config->load("$Dir/../lib/config.sh");
! # </x-config>
! ##--------------------------------------------------------------------------##
  
  use Getopt::Long;
***************
*** 228,234 ****
  Earl Hood, earl(_at_)earlhood(_dot_)com
  
! This program is part of the MHArc archiving system and comes with
  ABSOLUTELY NO WARRANTY and may be copied only under the terms of
! the GNU General Public License, which may be found in the MHArc
  distribution.
  
--- 231,237 ----
  Earl Hood, earl(_at_)earlhood(_dot_)com
  
! This program is part of the mharc archiving system and comes with
  ABSOLUTELY NO WARRANTY and may be copied only under the terms of
! the GNU General Public License, which may be found in the mhArc
  distribution.
  

Index: compress-files
===================================================================
RCS file: /cvsroot/mhonarc/mharc/bin/compress-files,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** compress-files	26 Aug 2002 05:33:23 -0000	1.6
--- compress-files	13 Sep 2002 07:25:55 -0000	1.7
***************
*** 1,4 ****
  #!/usr/local/bin/perl
! ##---------------------------------------------------------------------------##
  ##  File:
  ##	$Id$
--- 1,4 ----
  #!/usr/local/bin/perl
! ##--------------------------------------------------------------------------##
  ##  File:
  ##	$Id$
***************
*** 6,10 ****
  ##	Gzip files matching a specified pattern and older then specified
  ##	time period.
! ##---------------------------------------------------------------------------##
  ##  Copyright (C) 2001-2002	Earl Hood <earl(_at_)earlhood(_dot_)com>
  ##
--- 6,10 ----
  ##	Gzip files matching a specified pattern and older then specified
  ##	time period.
! ##--------------------------------------------------------------------------##
  ##  Copyright (C) 2001-2002	Earl Hood <earl(_at_)earlhood(_dot_)com>
  ##
***************
*** 23,35 ****
  ##  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  ##  02111-1307, USA
! ##---------------------------------------------------------------------------##
  
  package MHArc::compress_files;
  
! my $Dir;
! BEGIN {
!   $Dir = `dirname $0`; chomp $Dir;
! }
  use lib "$Dir/../lib";  # Add relative lib to search path
  
  use Getopt::Long;
--- 23,38 ----
  ##  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  ##  02111-1307, USA
! ##--------------------------------------------------------------------------##
  
  package MHArc::compress_files;
  
! ##--------------------------------------------------------------------------##
! # <boot-strap>
! BEGIN { die qq/CGI use FORBIDDEN!\n/ if (defined($ENV{'GATEWAY_INTERFACE'})); }
! my $Dir; BEGIN { $Dir = `dirname $0`; chomp $Dir; }
  use lib "$Dir/../lib";  # Add relative lib to search path
+ # </boot-strap>
+ ##--------------------------------------------------------------------------##
+ 
  
  use Getopt::Long;
***************
*** 113,117 ****
  =head1 DESCRIPTION
  
! This program is part of MHArc, the auto-archiving system that works in
  conjuction with Procmail, Namazu, and a collection of shell and
  Perl programs.  This program is used to compress files that have not
--- 116,120 ----
  =head1 DESCRIPTION
  
! This program is part of mharc, the auto-archiving system that works in
  conjuction with Procmail, Namazu, and a collection of shell and
  Perl programs.  This program is used to compress files that have not
***************
*** 161,165 ****
  =head1 SEE ALSO
  
! L<compress-mboxes>
  
  =head1 VERSION
--- 164,168 ----
  =head1 SEE ALSO
  
! L<compress-mboxes|compress-mboxes>
  
  =head1 VERSION
***************
*** 171,177 ****
  Earl Hood, earl(_at_)earlhood(_dot_)com
  
! This program is part of the MHArc archiving system and comes with
  ABSOLUTELY NO WARRANTY and may be copied only under the terms of
! the GNU General Public License, which may be found in the MHArc
  distribution.
  
--- 174,180 ----
  Earl Hood, earl(_at_)earlhood(_dot_)com
  
! This program is part of the mharc archiving system and comes with
  ABSOLUTELY NO WARRANTY and may be copied only under the terms of
! the GNU General Public License, which may be found in the mharc
  distribution.
  

Index: compress-mboxes
===================================================================
RCS file: /cvsroot/mhonarc/mharc/bin/compress-mboxes,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** compress-mboxes	26 Aug 2002 05:33:23 -0000	1.6
--- compress-mboxes	13 Sep 2002 07:25:55 -0000	1.7
***************
*** 1,9 ****
  #!/usr/local/bin/perl
! ##---------------------------------------------------------------------------##
  ##  File:
  ##	$Id$
  ##  Description:
  ##	Script to compress older mailbox inorder to save disk space.
! ##---------------------------------------------------------------------------##
  ##  Copyright (C) 2001-2002	Earl Hood <earl(_at_)earlhood(_dot_)com>
  ##
--- 1,9 ----
  #!/usr/local/bin/perl
! ##--------------------------------------------------------------------------##
  ##  File:
  ##	$Id$
  ##  Description:
  ##	Script to compress older mailbox inorder to save disk space.
! ##--------------------------------------------------------------------------##
  ##  Copyright (C) 2001-2002	Earl Hood <earl(_at_)earlhood(_dot_)com>
  ##
***************
*** 22,37 ****
  ##  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  ##  02111-1307, USA
! ##---------------------------------------------------------------------------##
  
  package MHArc::compress_mboxes;
  
! my $Dir;
! BEGIN {
!   $Dir = `dirname $0`; chomp $Dir;
! }
  use lib "$Dir/../lib";  # Add relative lib to search path
! 
  use MHArc::Config;
  my $config = MHArc::Config->load("$Dir/../lib/config.sh");
  
  use Getopt::Long;
--- 22,42 ----
  ##  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  ##  02111-1307, USA
! ##--------------------------------------------------------------------------##
  
  package MHArc::compress_mboxes;
  
! ##--------------------------------------------------------------------------##
! # <x-boot-strap>
! BEGIN { die qq/CGI use FORBIDDEN!\n/ if (defined($ENV{'GATEWAY_INTERFACE'})); }
! my $Dir; BEGIN { $Dir = `dirname $0`; chomp $Dir; }
  use lib "$Dir/../lib";  # Add relative lib to search path
! # </x-boot-strap>
! ##--------------------------------------------------------------------------##
! # <x-config>
  use MHArc::Config;
  my $config = MHArc::Config->load("$Dir/../lib/config.sh");
+ # </x-config>
+ ##--------------------------------------------------------------------------##
+ 
  
  use Getopt::Long;
***************
*** 96,100 ****
  =head1 DESCRIPTION
  
! This program is part of MHArc, the auto-archiving system that works in
  conjuction with Procmail, Namazu, and a collection of shell and
  Perl programs.  This program has the responsibility of gzipping
--- 101,105 ----
  =head1 DESCRIPTION
  
! This program is part of mharc, the auto-archiving system that works in
  conjuction with Procmail, Namazu, and a collection of shell and
  Perl programs.  This program has the responsibility of gzipping
***************
*** 141,145 ****
  =item C<I<mharc-root>/lib/config.sh>
  
! Main configuration file for MHArc.
  
  =back
--- 146,150 ----
  =item C<I<mharc-root>/lib/config.sh>
  
! Main configuration file for mharc.
  
  =back
***************
*** 151,155 ****
  =item *
  
! This program basically invokes L<compress-files> with the proper
  arguments to do the actual work.
  
--- 156,160 ----
  =item *
  
! This program basically invokes L<compress-files|compress-files> with the proper
  arguments to do the actual work.
  
***************
*** 158,162 ****
  =head1 SEE ALSO
  
! L<compress-files>
  
  =head1 VERSION
--- 163,167 ----
  =head1 SEE ALSO
  
! L<compress-files|compress-files>
  
  =head1 VERSION
***************
*** 168,174 ****
  Earl Hood, earl(_at_)earlhood(_dot_)com
  
! This program is part of the MHArc archiving system and comes with
  ABSOLUTELY NO WARRANTY and may be copied only under the terms of
! the GNU General Public License, which may be found in the MHArc
  distribution.
  
--- 173,179 ----
  Earl Hood, earl(_at_)earlhood(_dot_)com
  
! This program is part of the mharc archiving system and comes with
  ABSOLUTELY NO WARRANTY and may be copied only under the terms of
! the GNU General Public License, which may be found in the mharc
  distribution.
  

Index: extract-mesg-date
===================================================================
RCS file: /cvsroot/mhonarc/mharc/bin/extract-mesg-date,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** extract-mesg-date	3 Sep 2002 16:30:47 -0000	1.2
--- extract-mesg-date	13 Sep 2002 07:25:55 -0000	1.3
***************
*** 26,38 ****
  package MHArc::extract_mesg_date;
  
! # <boot-strap>
! my $Dir;
! BEGIN {
!   $Dir = `dirname $0`; chomp $Dir;
! }
  use lib "$Dir/../lib";  # Add relative lib to search path
  use MHArc::Config;
  my $config = MHArc::Config->load("$Dir/../lib/config.sh");
! # </boot-strap>
  
  use Getopt::Long;
--- 26,42 ----
  package MHArc::extract_mesg_date;
  
! ##--------------------------------------------------------------------------##
! # <x-boot-strap>
! BEGIN { die qq/CGI use FORBIDDEN!\n/ if (defined($ENV{'GATEWAY_INTERFACE'})); }
! my $Dir; BEGIN { $Dir = `dirname $0`; chomp $Dir; }
  use lib "$Dir/../lib";  # Add relative lib to search path
+ # </x-boot-strap>
+ ##--------------------------------------------------------------------------##
+ # <x-config>
  use MHArc::Config;
  my $config = MHArc::Config->load("$Dir/../lib/config.sh");
! # </x-config>
! ##--------------------------------------------------------------------------##
! 
  
  use Getopt::Long;
***************
*** 110,114 ****
  The format of the date is controled by the C<-fmt> option.
  
! This program is provided as part of MHArc to provide the ability to
  to determine the dates of messages during filtering.
  Example shell command usage:
--- 114,118 ----
  The format of the date is controled by the C<-fmt> option.
  
! This program is provided as part of mharc to provide the ability to
  to determine the dates of messages during filtering.
  Example shell command usage:
***************
*** 168,174 ****
  Earl Hood, earl(_at_)earlhood(_dot_)com
  
! This program is part of the MHArc archiving system and comes with
  ABSOLUTELY NO WARRANTY and may be copied only under the terms of
! the GNU General Public License, which may be found in the MHArc
  distribution.
  
--- 172,178 ----
  Earl Hood, earl(_at_)earlhood(_dot_)com
  
! This program is part of the mharc archiving system and comes with
  ABSOLUTELY NO WARRANTY and may be copied only under the terms of
! the GNU General Public License, which may be found in the mharc
  distribution.
  

Index: filter-spool
===================================================================
RCS file: /cvsroot/mhonarc/mharc/bin/filter-spool,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** filter-spool	3 Sep 2002 16:30:47 -0000	1.8
--- filter-spool	13 Sep 2002 07:25:55 -0000	1.9
***************
*** 1,9 ****
  #!/usr/local/bin/perl
! ##---------------------------------------------------------------------------##
  ##  File:
  ##	$Id$
  ##  Description:
  ##	Script to grab mail spool and filter mail to raw mbox archives.
! ##---------------------------------------------------------------------------##
  ##  Copyright (C) 2002	Earl Hood <earl(_at_)earlhood(_dot_)com>
  ##
--- 1,9 ----
  #!/usr/local/bin/perl
! ##--------------------------------------------------------------------------##
  ##  File:
  ##	$Id$
  ##  Description:
  ##	Script to grab mail spool and filter mail to raw mbox archives.
! ##--------------------------------------------------------------------------##
  ##  Copyright (C) 2002	Earl Hood <earl(_at_)earlhood(_dot_)com>
  ##
***************
*** 22,40 ****
  ##  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  ##  02111-1307, USA
! ##---------------------------------------------------------------------------##
  
  package MHArc::filter_spool;
  
! ##---------------------------------------------------------------------------##
! # <boot-strap>
! my $Dir;
! BEGIN {
!   $Dir = `dirname $0`; chomp $Dir;
! }
  use lib "$Dir/../lib";  # Add relative lib to search path
  use MHArc::Config;
  my $config = MHArc::Config->load("$Dir/../lib/config.sh");
! # </boot-strap>
! ##---------------------------------------------------------------------------##
  
  use Getopt::Long;
--- 22,42 ----
  ##  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  ##  02111-1307, USA
! ##--------------------------------------------------------------------------##
  
  package MHArc::filter_spool;
  
! ##--------------------------------------------------------------------------##
! # <x-boot-strap>
! BEGIN { die qq/CGI use FORBIDDEN!\n/ if (defined($ENV{'GATEWAY_INTERFACE'})); }
! my $Dir; BEGIN { $Dir = `dirname $0`; chomp $Dir; }
  use lib "$Dir/../lib";  # Add relative lib to search path
+ # </x-boot-strap>
+ ##--------------------------------------------------------------------------##
+ # <x-config>
  use MHArc::Config;
  my $config = MHArc::Config->load("$Dir/../lib/config.sh");
! # </x-config>
! ##--------------------------------------------------------------------------##
! 
  
  use Getopt::Long;
***************
*** 179,186 ****
  =head1 DESCRIPTION
  
! This program is part of MHArc, a web-based mail archiving system.
  This program has the responsibility of filtering incoming mail into
! the raw message archives.  This script is called by the C<read-mail>
! script before C<web-archive> is invoked.
  
  =head1 OPTIONS
--- 181,188 ----
  =head1 DESCRIPTION
  
! This program is part of mharc, a web-based mail archiving system.
  This program has the responsibility of filtering incoming mail into
! the raw message archives.  This script is called by the L<read-mail|read-mail>
! script before L<web-archive|web-archive> is invoked.
  
  =head1 OPTIONS
***************
*** 211,215 ****
  B<Note:> This program does not do any processing of the HTML archives.
  This option is used to insure that the HTML archive root directory
! exists for subsequent processing by other MHArc scripts.
  
  =item C<-is-spool>
--- 213,217 ----
  B<Note:> This program does not do any processing of the HTML archives.
  This option is used to insure that the HTML archive root directory
! exists for subsequent processing by other mharc scripts.
  
  =item C<-is-spool>
***************
*** 279,283 ****
  =item C<I<mharc-root>/lib/config.sh>
  
! Main configuration file for MHArc.
  
  =back
--- 281,285 ----
  =item C<I<mharc-root>/lib/config.sh>
  
! Main configuration file for mharc.
  
  =back
***************
*** 291,297 ****
  Earl Hood, earl(_at_)earlhood(_dot_)com
  
! This program is part of the MHArc archiving system and comes with
  ABSOLUTELY NO WARRANTY and may be copied only under the terms of
! the GNU General Public License, which may be found in the MHArc
  distribution.
  
--- 293,299 ----
  Earl Hood, earl(_at_)earlhood(_dot_)com
  
! This program is part of the mharc archiving system and comes with
  ABSOLUTELY NO WARRANTY and may be copied only under the terms of
! the GNU General Public License, which may be found in the mharc
  distribution.
  

Index: gc-search-indexes
===================================================================
RCS file: /cvsroot/mhonarc/mharc/bin/gc-search-indexes,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** gc-search-indexes	9 Jul 2002 01:30:49 -0000	1.4
--- gc-search-indexes	13 Sep 2002 07:25:55 -0000	1.5
***************
*** 1,9 ****
  #!/usr/local/bin/perl
! ##---------------------------------------------------------------------------##
  ##  File:
  ##	$Id$
  ##  Description:
  ##	Script to do garbage collection on Namazu search indexes.
! ##---------------------------------------------------------------------------##
  ##  Copyright (C) 2001-2002	Earl Hood <earl(_at_)earlhood(_dot_)com>
  ##
--- 1,9 ----
  #!/usr/local/bin/perl
! ##--------------------------------------------------------------------------##
  ##  File:
  ##	$Id$
  ##  Description:
  ##	Script to do garbage collection on Namazu search indexes.
! ##--------------------------------------------------------------------------##
  ##  Copyright (C) 2001-2002	Earl Hood <earl(_at_)earlhood(_dot_)com>
  ##
***************
*** 22,37 ****
  ##  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  ##  02111-1307, USA
! ##---------------------------------------------------------------------------##
  
  package MHArc::compress_mboxes;
  
! my $Dir;
! BEGIN {
!   $Dir = `dirname $0`; chomp $Dir;
! }
  use lib "$Dir/../lib";  # Add relative lib to search path
! 
  use MHArc::Config;
  my $config = MHArc::Config->load("$Dir/../lib/config.sh");
  
  use Getopt::Long;
--- 22,42 ----
  ##  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  ##  02111-1307, USA
! ##--------------------------------------------------------------------------##
  
  package MHArc::compress_mboxes;
  
! ##--------------------------------------------------------------------------##
! # <x-boot-strap>
! BEGIN { die qq/CGI use FORBIDDEN!\n/ if (defined($ENV{'GATEWAY_INTERFACE'})); }
! my $Dir; BEGIN { $Dir = `dirname $0`; chomp $Dir; }
  use lib "$Dir/../lib";  # Add relative lib to search path
! # </x-boot-strap>
! ##--------------------------------------------------------------------------##
! # <x-config>
  use MHArc::Config;
  my $config = MHArc::Config->load("$Dir/../lib/config.sh");
+ # </x-config>
+ ##--------------------------------------------------------------------------##
+ 
  
  use Getopt::Long;
***************
*** 117,121 ****
  =head1 DESCRIPTION
  
! This program is part of MHArc, the auto-archiving system that works in
  conjuction with Procmail, Namazu, and a collection of shell and
  Perl programs.  This program has the responsibility of performing
--- 122,126 ----
  =head1 DESCRIPTION
  
! This program is part of mharc, the auto-archiving system that works in
  conjuction with Procmail, Namazu, and a collection of shell and
  Perl programs.  This program has the responsibility of performing
***************
*** 157,161 ****
  =item C<I<mharc-root>/lib/config.sh>
  
! Main configuration file for MHArc.
  
  =back
--- 162,166 ----
  =item C<I<mharc-root>/lib/config.sh>
  
! Main configuration file for mharc.
  
  =back
***************
*** 168,172 ****
  
  This program should be invoked occasionally, like once a week.  The
! template crontab provided with MHArc provides a useful crontab entry
  for invoking this program.
  
--- 173,177 ----
  
  This program should be invoked occasionally, like once a week.  The
! template crontab provided with mharc provides a useful crontab entry
  for invoking this program.
  
***************
*** 181,187 ****
  Earl Hood, earl(_at_)earlhood(_dot_)com
  
! This program is part of the MHArc archiving system and comes with
  ABSOLUTELY NO WARRANTY and may be copied only under the terms of
! the GNU General Public License, which may be found in the MHArc
  distribution.
  
--- 186,192 ----
  Earl Hood, earl(_at_)earlhood(_dot_)com
  
! This program is part of the mharc archiving system and comes with
  ABSOLUTELY NO WARRANTY and may be copied only under the terms of
! the GNU General Public License, which may be found in the mharc
  distribution.
  

Index: mbox-month-pack
===================================================================
RCS file: /cvsroot/mhonarc/mharc/bin/mbox-month-pack,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** mbox-month-pack	17 Jul 2002 21:59:36 -0000	1.2
--- mbox-month-pack	13 Sep 2002 07:25:55 -0000	1.3
***************
*** 26,36 ****
  package MHArc::mbox_month_pack;
  
! my $Dir;
! BEGIN {
!   $Dir = `dirname $0`; chomp $Dir;
! }
  use lib "$Dir/../lib";  # Add relative lib to search path
  use MHArc::Config;
  my $config = MHArc::Config->load("$Dir/../lib/config.sh");
  
  use Getopt::Long;
--- 26,42 ----
  package MHArc::mbox_month_pack;
  
! ##--------------------------------------------------------------------------##
! # <x-boot-strap>
! BEGIN { die qq/CGI use FORBIDDEN!\n/ if (defined($ENV{'GATEWAY_INTERFACE'})); }
! my $Dir; BEGIN { $Dir = `dirname $0`; chomp $Dir; }
  use lib "$Dir/../lib";  # Add relative lib to search path
+ # </x-boot-strap>
+ ##--------------------------------------------------------------------------##
+ # <x-config>
  use MHArc::Config;
  my $config = MHArc::Config->load("$Dir/../lib/config.sh");
+ # </x-config>
+ ##--------------------------------------------------------------------------##
+ 
  
  use Getopt::Long;
***************
*** 235,240 ****
  messages will be appended to it.
  
! This program is provided as part of MHArc to provide the ability to
! import existing mailbox messages into MHArc archives.
  
  =head1 OPTIONS
--- 241,246 ----
  messages will be appended to it.
  
! This program is provided as part of mharc to provide the ability to
! import existing mailbox messages into mharc archives.
  
  =head1 OPTIONS
***************
*** 306,312 ****
  Earl Hood, earl(_at_)earlhood(_dot_)com
  
! This program is part of the MHArc archiving system and comes with
  ABSOLUTELY NO WARRANTY and may be copied only under the terms of
! the GNU General Public License, which may be found in the MHArc
  distribution.
  
--- 312,318 ----
  Earl Hood, earl(_at_)earlhood(_dot_)com
  
! This program is part of the mharc archiving system and comes with
  ABSOLUTELY NO WARRANTY and may be copied only under the terms of
! the GNU General Public License, which may be found in the mharc
  distribution.
  

Index: mh-month-pack
===================================================================
RCS file: /cvsroot/mhonarc/mharc/bin/mh-month-pack,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** mh-month-pack	9 Jul 2002 01:25:21 -0000	1.2
--- mh-month-pack	13 Sep 2002 07:25:55 -0000	1.3
***************
*** 26,29 ****
--- 26,31 ----
  package MHArc::mh_month_pack;
  
+ BEGIN { die qq/CGI use FORBIDDEN!\n/ if (defined($ENV{'GATEWAY_INTERFACE'})); }
+ 
  use Pod::Usage;
  use Getopt::Long;
***************
*** 194,201 ****
  multiple times and to skip messages that have been packed before.
  
! This program is provided as part of MHArc to provide the ability to
! import MH/nmh messages into MHArc archives.  This program could be
  used for sites that have an existing MH/nmh filtering system inplace
! and want to usage MHArc to generate web-based archives.  This program
  can be used instead of C<filter-spool> to move incoming messages into
  the raw message archive before calling C<web-archive>.
--- 196,203 ----
  multiple times and to skip messages that have been packed before.
  
! This program is provided as part of mharc to provide the ability to
! import MH/nmh messages into mharc archives.  This program could be
  used for sites that have an existing MH/nmh filtering system inplace
! and want to usage mharc to generate web-based archives.  This program
  can be used instead of C<filter-spool> to move incoming messages into
  the raw message archive before calling C<web-archive>.
***************
*** 271,277 ****
  Earl Hood, earl(_at_)earlhood(_dot_)com
  
! This program is part of the MHArc archiving system and comes with
  ABSOLUTELY NO WARRANTY and may be copied only under the terms of
! the GNU General Public License, which may be found in the MHArc
  distribution.
  
--- 273,279 ----
  Earl Hood, earl(_at_)earlhood(_dot_)com
  
! This program is part of the mharc archiving system and comes with
  ABSOLUTELY NO WARRANTY and may be copied only under the terms of
! the GNU General Public License, which may be found in the mharc
  distribution.
  

Index: mhonarc-check
===================================================================
RCS file: /cvsroot/mhonarc/mharc/bin/mhonarc-check,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** mhonarc-check	17 Jul 2002 21:59:36 -0000	1.3
--- mhonarc-check	13 Sep 2002 07:25:55 -0000	1.4
***************
*** 26,36 ****
  package MHArc::mhonarc_check;
  
! my $Dir;
! BEGIN {
!   $Dir = `dirname $0`; chomp $Dir;
! }
  use lib "$Dir/../lib";  # Add relative lib to search path
  use MHArc::Config;
  my $config = MHArc::Config->load("$Dir/../lib/config.sh");
  
  eval {
--- 26,42 ----
  package MHArc::mhonarc_check;
  
! ##--------------------------------------------------------------------------##
! # <x-boot-strap>
! BEGIN { die qq/CGI use FORBIDDEN!\n/ if (defined($ENV{'GATEWAY_INTERFACE'})); }
! my $Dir; BEGIN { $Dir = `dirname $0`; chomp $Dir; }
  use lib "$Dir/../lib";  # Add relative lib to search path
+ # </x-boot-strap>
+ ##--------------------------------------------------------------------------##
+ # <x-config>
  use MHArc::Config;
  my $config = MHArc::Config->load("$Dir/../lib/config.sh");
+ # </x-config>
+ ##--------------------------------------------------------------------------##
+ 
  
  eval {
***************
*** 53,55 ****
--- 59,94 ----
    exit 0;
  }
+ 
+ ##--------------------------------------------------------------------------##
+ __END__
+ 
+ =head1 NAME
+ 
+ mhonarc-check - Checks that mharc scripts will be able to load MHonArc
+ 
+ =head1 SYNOPSIS
+ 
+   mhonarc-check
+ 
+ =head1 DESCRIPTION
+ 
+ This program does a simple check to see that an installation of mharc
+ can load the MHonArc libraries.  If the check failed, the program
+ returns a non-zero exit status and prints out what can be done to
+ fix the problem.
+ 
+ =head1 VERSION
+ 
+ C<$Id$>
+ 
+ =head1 AUTHOR
+ 
+ Earl Hood, earl(_at_)earlhood(_dot_)com
+ 
+ This program is part of the mharc archiving system and comes with
+ ABSOLUTELY NO WARRANTY and may be copied only under the terms of
+ the GNU General Public License, which may be found in the mhArc
+ distribution.
+ 
+ =cut
  

Index: mk-procmailrc
===================================================================
RCS file: /cvsroot/mhonarc/mharc/bin/mk-procmailrc,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** mk-procmailrc	1 Aug 2002 01:18:46 -0000	1.16
--- mk-procmailrc	13 Sep 2002 07:25:55 -0000	1.17
***************
*** 1,4 ****
  #!/usr/local/bin/perl -w
! ##---------------------------------------------------------------------------##
  ##  File:
  ##	$Id$
--- 1,4 ----
  #!/usr/local/bin/perl -w
! ##--------------------------------------------------------------------------##
  ##  File:
  ##	$Id$
***************
*** 6,10 ****
  ##	Program to create a procmail recipe file from lists.txt.
  ##	Run script with '-man' option to view manpage for this program.
! ##---------------------------------------------------------------------------##
  ##  Copyright (C) 2001-2002	Earl Hood <earl(_at_)earlhood(_dot_)com>
  ##
--- 6,10 ----
  ##	Program to create a procmail recipe file from lists.txt.
  ##	Run script with '-man' option to view manpage for this program.
! ##--------------------------------------------------------------------------##
  ##  Copyright (C) 2001-2002	Earl Hood <earl(_at_)earlhood(_dot_)com>
  ##
***************
*** 23,38 ****
  ##  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  ##  02111-1307, USA
! ##---------------------------------------------------------------------------##
  
  package MHArc::mk_procmailrc;
  
! my $Dir;
! BEGIN {
!   $Dir = `dirname $0`; chomp $Dir;
! }
  use lib "$Dir/../lib";  # Add relative lib to search path
! 
  use MHArc::Config;
  my $config = MHArc::Config->load("$Dir/../lib/config.sh");
  
  use Getopt::Long;
--- 23,43 ----
  ##  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  ##  02111-1307, USA
! ##--------------------------------------------------------------------------##
  
  package MHArc::mk_procmailrc;
  
! ##--------------------------------------------------------------------------##
! # <x-boot-strap>
! BEGIN { die qq/CGI use FORBIDDEN!\n/ if (defined($ENV{'GATEWAY_INTERFACE'})); }
! my $Dir; BEGIN { $Dir = `dirname $0`; chomp $Dir; }
  use lib "$Dir/../lib";  # Add relative lib to search path
! # </x-boot-strap>
! ##--------------------------------------------------------------------------##
! # <x-config>
  use MHArc::Config;
  my $config = MHArc::Config->load("$Dir/../lib/config.sh");
+ # </x-config>
+ ##--------------------------------------------------------------------------##
+ 
  
  use Getopt::Long;
***************
*** 304,307 ****
--- 309,313 ----
  } # End: MAIN
  
+ ##--------------------------------------------------------------------------##
  __END__
  
***************
*** 317,327 ****
  =head1 DESCRIPTION
  
! This program is part of MHArc, a web-based mail archiving system.  This
  program has the responsibility of generating the main procmailrc
! used by the C<filter-spool> program.  The procmailrc is generated
  from C<I<mharc-root>/lib/lists.def>.
  
  This program is typically invoked from calling C<make> from
! the MHArc root directory with configuration options specified
  in C<I<mharc-root>/lib/config.sh>.
  
--- 323,333 ----
  =head1 DESCRIPTION
  
! This program is part of mharc, a web-based mail archiving system.  This
  program has the responsibility of generating the main procmailrc
! used by the L<filter-spool|filter-spool> program.  The procmailrc is generated
  from C<I<mharc-root>/lib/lists.def>.
  
  This program is typically invoked from calling C<make> from
! the mharc root directory with configuration options specified
  in C<I<mharc-root>/lib/config.sh>.
  
***************
*** 329,333 ****
  
  The list definition file, C<I<mharc-root>/lib/lists.def>, is
! read to generate the procmailrc used by B<filter-spool> to
  filter messages into raw mail archives.  The format of the file
  is intended to be simple and more convenient than writing the
--- 335,339 ----
  
  The list definition file, C<I<mharc-root>/lib/lists.def>, is
! read to generate the procmailrc used by L<filter-spool|filter-spool> to
  filter messages into raw mail archives.  The format of the file
  is intended to be simple and more convenient than writing the
***************
*** 367,376 ****
  =item Address
  
! Mail address of the list.  This option can be specified multiple times.
! Multiple listings can be use to capture the multiple addresses that denote
! the list.  This is useful if the list ever moves to a new address.
! 
! Multiple listings can also represent multiple lists that will be
! archived together.
  
  =item From-Address
--- 373,380 ----
  =item Address
  
! Mail address of the list.
! This option can be specified multiple times.
! Multiple addresses can be use to capture the multiple addresses that represent
! a single list or to represent multiple lists to be archived together.
  
  =item From-Address
***************
*** 383,390 ****
  where subscribers receive list messages but cannot post to the list.
  
! This option can be specified multiple times.  Multiple listings can be
! use to capture the multiple addresses that denote the list.  This is
! useful if the list ever moves to a new address.  Multiple listings
! can also represent multiple lists that will be archived together.
  
  =item CVS-Commits
--- 387,393 ----
  where subscribers receive list messages but cannot post to the list.
  
! This option can be specified multiple times.
! Multiple addresses can be use to capture the multiple addresses that represent
! a single list or to represent multiple lists to be archived together.
  
  =item CVS-Commits
***************
*** 421,425 ****
  
  Another example use of this option is if you use the special C<Name>
! "C<.catch>" (or the C<-catch-archive> setting described in L<OPTIONS>).
  Using "C<.catch>" is handy for Final definitions to pre-catch messages
  that should not be placed in any list archive.
--- 424,428 ----
  
  Another example use of this option is if you use the special C<Name>
! "C<.catch>" (or the C<-catch-archive> setting described in L<"OPTIONS">).
  Using "C<.catch>" is handy for Final definitions to pre-catch messages
  that should not be placed in any list archive.
***************
*** 438,442 ****
  HTTP server process so someone cannot backdoor into the raw archives.
  This is generally done by removing world read permission.  Make sure
! the permission do allow for the MHArc archiving system to read and
  write to the directory.
  
--- 441,445 ----
  HTTP server process so someone cannot backdoor into the raw archives.
  This is generally done by removing world read permission.  Make sure
! the permission do allow for the mharc archiving system to read and
  write to the directory.
  
***************
*** 593,597 ****
  =item C<I<mharc-root>/lib/config.sh>
  
! Main configuration file for MHArc.
  
  =back
--- 596,600 ----
  =item C<I<mharc-root>/lib/config.sh>
  
! Main configuration file for mharc.
  
  =back
***************
*** 605,611 ****
  Earl Hood, earl(_at_)earlhood(_dot_)com
  
! This program is part of the MHArc archiving system and comes with
  ABSOLUTELY NO WARRANTY and may be copied only under the terms of
! the GNU General Public License, which may be found in the MHArc
  distribution.
  
--- 608,614 ----
  Earl Hood, earl(_at_)earlhood(_dot_)com
  
! This program is part of the mharc archiving system and comes with
  ABSOLUTELY NO WARRANTY and may be copied only under the terms of
! the GNU General Public License, which may be found in the mharc
  distribution.
  

Index: mk-search-index
===================================================================
RCS file: /cvsroot/mhonarc/mharc/bin/mk-search-index,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** mk-search-index	5 Mar 2002 18:36:52 -0000	1.3
--- mk-search-index	13 Sep 2002 07:25:55 -0000	1.4
***************
*** 1,4 ****
  #!/bin/sh
! ##---------------------------------------------------------------------------##
  ##  File:
  ##	$Id$
--- 1,4 ----
  #!/bin/sh
! ##--------------------------------------------------------------------------##
  ##  File:
  ##	$Id$
***************
*** 9,13 ****
  ##	NOTE: This script is probably no longer needed since
  ##	      web-archive calls the search indexing tool directly.
! ##---------------------------------------------------------------------------##
  ##  Copyright (C) 2001-2002	Earl Hood <earl(_at_)earlhood(_dot_)com>
  ##
--- 9,13 ----
  ##	NOTE: This script is probably no longer needed since
  ##	      web-archive calls the search indexing tool directly.
! ##--------------------------------------------------------------------------##
  ##  Copyright (C) 2001-2002	Earl Hood <earl(_at_)earlhood(_dot_)com>
  ##
***************
*** 26,30 ****
  ##  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  ##  02111-1307, USA
! ##---------------------------------------------------------------------------##
  
  if [ $# -ne 1 ]; then
--- 26,35 ----
  ##  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  ##  02111-1307, USA
! ##--------------------------------------------------------------------------##
! 
! if [ ! -z "$GATEWAY_INTERFACE" ]; then
!   echo "CGI use FORBIDDEN!"
!   exit 1
! fi
  
  if [ $# -ne 1 ]; then

Index: read-mail
===================================================================
RCS file: /cvsroot/mhonarc/mharc/bin/read-mail,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** read-mail	23 Jul 2002 04:00:21 -0000	1.8
--- read-mail	13 Sep 2002 07:25:55 -0000	1.9
***************
*** 1,9 ****
  #!/usr/local/bin/perl
! ##---------------------------------------------------------------------------##
  ##  File:
  ##	$Id$
  ##  Description:
  ##	Read mail spool and archive messages.
! ##---------------------------------------------------------------------------##
  ##  Copyright (C) 2001	Earl Hood <earl(_at_)earlhood(_dot_)com>
  ##
--- 1,9 ----
  #!/usr/local/bin/perl
! ##--------------------------------------------------------------------------##
  ##  File:
  ##	$Id$
  ##  Description:
  ##	Read mail spool and archive messages.
! ##--------------------------------------------------------------------------##
  ##  Copyright (C) 2001	Earl Hood <earl(_at_)earlhood(_dot_)com>
  ##
***************
*** 22,40 ****
  ##  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  ##  02111-1307, USA
! ##---------------------------------------------------------------------------##
  
  package MHArc::read_mail;
  
! ##---------------------------------------------------------------------------##
! # <boot-strap>
! my $Dir;
! BEGIN {
!   $Dir = `dirname $0`; chomp $Dir;
! }
  use lib "$Dir/../lib";  # Add relative lib to search path
  use MHArc::Config;
  my $config = MHArc::Config->load("$Dir/../lib/config.sh");
! # </boot-strap>
! ##---------------------------------------------------------------------------##
  
  use Getopt::Long;
--- 22,42 ----
  ##  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  ##  02111-1307, USA
! ##--------------------------------------------------------------------------##
  
  package MHArc::read_mail;
  
! ##--------------------------------------------------------------------------##
! # <x-boot-strap>
! BEGIN { die qq/CGI use FORBIDDEN!\n/ if (defined($ENV{'GATEWAY_INTERFACE'})); }
! my $Dir; BEGIN { $Dir = `dirname $0`; chomp $Dir; }
  use lib "$Dir/../lib";  # Add relative lib to search path
+ # </x-boot-strap>
+ ##--------------------------------------------------------------------------##
+ # <x-config>
  use MHArc::Config;
  my $config = MHArc::Config->load("$Dir/../lib/config.sh");
! # </x-config>
! ##--------------------------------------------------------------------------##
! 
  
  use Getopt::Long;
***************
*** 98,109 ****
  =head1 DESCRIPTION
  
! This program is part of MHArc, a web-based mail archiving system.
  This is the main program for archiving mail.  It is generally
  called via cron.
  
  This program does very little itself, but it invokes other
! MHArc scripts to do all the work.
  
! If the file C<.noarchive> exists in MHArc root directory, then
  this program will do nothing and exit.  This is to allow one
  to disable archiving while doing administrative tasks.
--- 100,111 ----
  =head1 DESCRIPTION
  
! This program is part of mharc, a web-based mail archiving system.
  This is the main program for archiving mail.  It is generally
  called via cron.
  
  This program does very little itself, but it invokes other
! mharc scripts to do all the work.
  
! If the file C<.noarchive> exists in mharc root directory, then
  this program will do nothing and exit.  This is to allow one
  to disable archiving while doing administrative tasks.
***************
*** 144,148 ****
  =item C<I<mharc-root>/lib/config.sh>
  
! Main configuration file for MHArc.
  
  =back
--- 146,150 ----
  =item C<I<mharc-root>/lib/config.sh>
  
! Main configuration file for mharc.
  
  =back
***************
*** 156,162 ****
  Earl Hood, earl(_at_)earlhood(_dot_)com
  
! This program is part of the MHArc archiving system and comes with
  ABSOLUTELY NO WARRANTY and may be copied only under the terms of
! the GNU General Public License, which may be found in the MHArc
  distribution.
  
--- 158,164 ----
  Earl Hood, earl(_at_)earlhood(_dot_)com
  
! This program is part of the mharc archiving system and comes with
  ABSOLUTELY NO WARRANTY and may be copied only under the terms of
! the GNU General Public License, which may be found in the mharc
  distribution.
  

Index: web-archive
===================================================================
RCS file: /cvsroot/mhonarc/mharc/bin/web-archive,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** web-archive	9 Sep 2002 03:13:34 -0000	1.33
--- web-archive	13 Sep 2002 07:25:55 -0000	1.34
***************
*** 27,38 ****
  package MHArc::web_archive;
  
! my $Dir;
! BEGIN {
!   $Dir = `dirname $0`; chomp $Dir;
! }
  use lib "$Dir/../lib";  # Add relative lib to search path
! 
  use MHArc::Config;
  my $config = MHArc::Config->load("$Dir/../lib/config.sh");
  
  
--- 27,42 ----
  package MHArc::web_archive;
  
! ##--------------------------------------------------------------------------##
! # <x-boot-strap>
! BEGIN { die qq/CGI use FORBIDDEN!\n/ if (defined($ENV{'GATEWAY_INTERFACE'})); }
! my $Dir; BEGIN { $Dir = `dirname $0`; chomp $Dir; }
  use lib "$Dir/../lib";  # Add relative lib to search path
! # </x-boot-strap>
! ##--------------------------------------------------------------------------##
! # <x-config>
  use MHArc::Config;
  my $config = MHArc::Config->load("$Dir/../lib/config.sh");
+ # </x-config>
+ ##--------------------------------------------------------------------------##
  
  
***************
*** 814,822 ****
  conjuction with Procmail, Namazu, and a collection of shell and
  Perl programs.  This program has the responsibility of processing
! the mailbox archives created by the B<filter-spool> script to
  update and/or create MHonArc archives.
  
! This program is automatically called by the B<read-mail> script for
! processing incoming mail within the mail spool if B<filter-spool>
  returns with an okay status.  However, this program can be manually
  invoked to rebuild archives, edit existing archives, or other
--- 818,826 ----
  conjuction with Procmail, Namazu, and a collection of shell and
  Perl programs.  This program has the responsibility of processing
! the mailbox archives created by the L<filter-spool|filter-spool> script to
  update and/or create MHonArc archives.
  
! This program is automatically called by the L<read-mail|read-mail> script for
! processing incoming mail within the mail spool if L<filter-spool|filter-spool>
  returns with an okay status.  However, this program can be manually
  invoked to rebuild archives, edit existing archives, or other
***************
*** 1035,1041 ****
  Earl Hood, mhonarc(_at_)mhonarc(_dot_)org 
  
! This program is part of the MHArc archiving system and comes with
  ABSOLUTELY NO WARRANTY and may be copied only under the terms of
! the GNU General Public License, which may be found in the MHArc
  distribution.
  
--- 1039,1045 ----
  Earl Hood, mhonarc(_at_)mhonarc(_dot_)org 
  
! This program is part of the mharc archiving system and comes with
  ABSOLUTELY NO WARRANTY and may be copied only under the terms of
! the GNU General Public License, which may be found in the mharc
  distribution.
  

---------------------------------------------------------------------
To sign-off this list, send email to majordomo(_at_)mhonarc(_dot_)org with the
message text UNSUBSCRIBE MHONARC-DEV