From: short <> Date: Sat, 18 Oct 2003 12:49:30 +0000 (+0000) Subject: rename X-Git-Tag: bp_lace~47 X-Git-Url: http://git.jankratochvil.net/?p=PerlMail.git;a=commitdiff_plain;h=ba95562b1683631fd058e10bb8205dfecd3e3fe8 rename --- diff --git a/MANIFEST b/MANIFEST index b05a958..fabd32e 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,5 +1,6 @@ MANIFEST Makefile.PL My-Audit.pm -lacemail-accept -lacemail-submit +perlmail-accept +perlmail-submit +perlmail-sendmail diff --git a/Makefile.PL b/Makefile.PL index c67d531..2cff937 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -11,8 +11,8 @@ use ExtUtils::MakeMaker; WriteMakefile( - "NAME"=>"LaceMail", - "AUTHOR"=>"Jan Kratochvil ", + "NAME"=>"PerlMail", + "AUTHOR"=>"Jan Kratochvil ", "VERSION_FROM"=>"Makefile.PL", "depend"=>{"Makefile"=>'$(VERSION_FROM)'}, "PREREQ_PM"=>{ @@ -42,5 +42,5 @@ WriteMakefile( "User::Utmp"=>0, "WWW::SMS::TMobileCZ"=>0, }, - "EXE_FILES"=>["lacemail-accept","lacemail-submit","lacemail-sendmail","contacts-n9k2mutt"], + "EXE_FILES"=>["perlmail-accept","perlmail-submit","perlmail-sendmail","contacts-n9k2mutt"], ); diff --git a/contacts-n9k2mutt b/contacts-n9k2mutt index 493d0d3..b2b0117 100755 --- a/contacts-n9k2mutt +++ b/contacts-n9k2mutt @@ -34,7 +34,7 @@ while (<>) { "iscompany"=>($record{"Name"} && $record{"Company"} && $record{"Name"} eq $record{"Company"}), })); } @record); - } PrecislovaniLace::Contacts->import($_)); + } Contacts->import($_)); my @nicked=map({ my $data=$_; my($name,$mail,$attr,$iscompany)=map(($data->{$_}),qw(name mail attr iscompany)); diff --git a/perlmail-accept b/perlmail-accept index eeb104b..08f6a2b 100755 --- a/perlmail-accept +++ b/perlmail-accept @@ -10,7 +10,7 @@ use warnings; INIT { require Sys::Syslog; - Sys::Syslog::openlog("lacemail","pid","mail"); + Sys::Syslog::openlog("perlmail","pid","mail"); my @syslogging_stack; sub syslogging_on_save { @@ -100,7 +100,7 @@ sub stdin exit 0; } -# FIXME: separate 'lacemail'-transfer together with lacemail-submit away +# FIXME: separate 'perlmail'-transfer together with perlmail-submit away sub inetd { die "Excessive arguments" if @ARGV; @@ -458,7 +458,7 @@ my($message)=@_; local $Audit=Mail::Audit->new( "emergency"=>"$Mail/emergency", "data"=>[map("$_\n",split("\n",$message))], - "log"=>"$HOME/.lacemail.log", + "log"=>"$HOME/.perlmail.log", "loglevel"=>99, ); local @AuditStored=(); @@ -481,7 +481,7 @@ sub razor2 open CHILD,'|' .'('.'(razor-check 2>&1;echo >&3 $?)' .'|sed "s/^/razor-check: /"' - .'|logger -t "lacemail['.$$.']" -p mail.crit' + .'|logger -t "perlmail['.$$.']" -p mail.crit' .') 3>&1' .'|exit `cat`' or return 0; @@ -624,7 +624,7 @@ sub muttrc_aliases } # FIXME: Unify -# BEGIN lacemail-sendmail +# BEGIN perlmail-sendmail # return: Mail::Address instance or undef() sub parseone { @@ -635,7 +635,7 @@ my($line)=@_; warn "Got ".scalar(@r)." addresses while wanting just one; when parsing: $line" if 1!=@r; return $r[0]; } -# END lacemail-sendmail +# END perlmail-sendmail # FIXME: host may get multiple recipients and thus not showing "for <...>" # FIXME: muttrc_get("from") is too strict @@ -729,7 +729,7 @@ my($header,$map)=@_; $text=~s/\b\Q$from\E\b/$to/gsi; } return if $text eq $orig; - $Audit->put_header("X-LaceMail-header_remap-$header",$orig); + $Audit->put_header("X-PerlMail-header_remap-$header",$orig); $Audit->replace_header($header,$text); } diff --git a/perlmail-sendmail b/perlmail-sendmail index c06a051..64cf703 100755 --- a/perlmail-sendmail +++ b/perlmail-sendmail @@ -73,8 +73,8 @@ my @h_from=( ); -# FIXME: modularized unification with 'lacemail-accept' -# BEGIN lacemail-accept +# FIXME: modularized unification with 'perlmail-accept' +# BEGIN perlmail-accept our %muttrc_pending=(); sub muttrc { @@ -143,7 +143,7 @@ my(@headers)=@_; } return wantarray() ? %r : $r{$r[0]}; } -# END lacemail-accept +# END perlmail-accept sub sendmail_show { return "\"$sendmail_orig\" ".join(",",map("\"$_\"",@ARGV)); } @@ -171,7 +171,7 @@ my $opt_q; my $opt_t; our $opt_f; #my $opt_F; # declared before &FromAddress already -my $opt_lacemail_dry_run; +my $opt_perlmail_dry_run; my @ARGV_save=@ARGV; # for non-bm mode die if !Getopt::Long::GetOptions( "b=s" ,\$opt_b, @@ -180,7 +180,7 @@ die if !Getopt::Long::GetOptions( "t" ,\$opt_t, "f=s" ,\$opt_f, "F=s" ,\$opt_F, - "lacemail-dry-run+",\$opt_lacemail_dry_run, + "perlmail-dry-run+",\$opt_perlmail_dry_run, ); if (0 # RedHat sendmail-8.12.5-7/sendmail/main.c/\QDo a quick prescan of the argument list.\E @@ -289,7 +289,7 @@ for my $rcpt (@rcpts) { local $SIG{"PIPE"}=sub { die "Got SIGPIPE from ".sendmail_show(); }; local *SENDMAIL; - if ($opt_lacemail_dry_run) { + if ($opt_perlmail_dry_run) { print sendmail_show()."\n"; *SENDMAIL=\*STDOUT; } @@ -309,7 +309,7 @@ for my $rcpt (@rcpts) { } } - next if $opt_lacemail_dry_run; # don't close our STDOUT as it is aliased to *SENDMAIL + next if $opt_perlmail_dry_run; # don't close our STDOUT as it is aliased to *SENDMAIL close SENDMAIL or warn "close(".sendmail_show()."): $?=".join(",", (!WIFEXITED($?) ? () : ("EXITSTATUS(".WEXITSTATUS($?).")")), (!WIFSIGNALED($?) ? () : ("TERMSIG(" .WTERMSIG($?) .")")), diff --git a/perlmail-submit b/perlmail-submit index 9de0b90..8a452ad 100755 --- a/perlmail-submit +++ b/perlmail-submit @@ -16,11 +16,11 @@ use POSIX qw(mktime); use Fcntl qw(:flock); -my $Lock_pathname="/tmp/LaceMail.lock"; +my $Lock_pathname="/tmp/PerlMail.lock"; #my $PeerAddr="dejhome.dyn.jankratochvil.net.:852"; my $PeerAddr="127.0.0.1:2852"; my $Socket_timeout=7600; # 15sec is NOT enough! -my $DB_table="LaceMail_folder"; +my $DB_table="PerlMail_folder"; my $DBI_database="short"; my $DBI_user="short"; my $DBI_pwd=$ENV{"HOME"}."/priv/mysql.".$DBI_user.".pwd"; @@ -203,6 +203,6 @@ die if !GetOptions( "submit" ,\&submit, "pending",\&pending, "clean:s",\&clean, - "V|version",sub { print "lacemail-submit: $VERSION\n"; exit 0; }, + "V|version",sub { print "perlmail-submit: $VERSION\n"; exit 0; }, ); exit 0;