X-Git-Url: https://code.th-h.de/?p=usenet%2Fyapfaq.git;a=blobdiff_plain;f=yapfaq.pl;h=50928277f62f6c05974e72e89055c2e5a843d147;hp=a6dc98619623d26efa39cba79c75e923f9e8b0a7;hb=refs%2Ftags%2Fv0.7;hpb=5ddba442dab41b5b28d060320a9e2363a768a9a5;ds=sidebyside diff --git a/yapfaq.pl b/yapfaq.pl index a6dc986..5092827 100644 --- a/yapfaq.pl +++ b/yapfaq.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -W # -# yapfaq Version 0.6 by Thomas Hochstein +# yapfaq Version 0.7 by Thomas Hochstein # (Original author: Marc Brockschmidt) # # This script posts any project described in its config-file. Most people @@ -12,29 +12,31 @@ # It can be redistributed and/or modified under the same terms under # which Perl itself is published. -my $Version = "0.6"; - -my $NNTPServer = "localhost"; -my $NNTPUser = ""; -my $NNTPPass = ""; -my $Sender = ""; -my $ConfigFile = "yapfaq.cfg"; -my $UsePGP = 0; - -################################## PGP-Config ################################# - -my $pgp = '/usr/bin/pgp'; # path to pgp -my $PGPVersion = '2'; # Use 2 for 2.X, 5 for PGP > 2.X and GPG for GPG - -my $PGPSigner = ''; # sign as who? -my $PGPPass = ''; # pgp2 only -my $PathtoPGPPass = ''; # pgp2, pgp5 and gpg - - -my $pgpbegin ='-----BEGIN PGP SIGNATURE-----';# Begin of PGP-Signature -my $pgpend ='-----END PGP SIGNATURE-----'; # End of PGP-Signature -my $pgptmpf ='pgptmp'; # temporary file for PGP. -my $pgpheader ='X-PGP-Sig'; +my $Version = "0.7"; + +my $RCFile = '.yapfaqrc'; +my @ValidConfVars = ('NNTPServer','NNTPUser','NNTPPass','Sender','ConfigFile', + 'UsePGP','pgp','PGPVersion','PGPSigner','PGPPass', + 'PathtoPGPPass','pgpbegin','pgpend','pgptmpf','pgpheader'); + +################################### Defaults ################################## +my %Config = (NNTPServer => "localhost", + NNTPUser => "", + NNTPPass => "", + Sender => "", + ConfigFile => "yapfaq.cfg", + UsePGP => 0, + + ################################## PGP-Config ################################# + pgp => '/usr/bin/pgp', # path to pgp + PGPVersion => '2', # Use 2 for 2.X, 5 for PGP > 2.X and GPG for GPG + PGPSigner => '', # sign as who? + PGPPass => '', # pgp2 only + PathtoPGPPass => '', # pgp2, pgp5 and gpg + pgpbegin => '-----BEGIN PGP SIGNATURE-----', # Begin of PGP-Signature + pgpend => '-----END PGP SIGNATURE-----', # End of PGP-Signature + pgptmpf => 'pgptmp', # temporary file for PGP. + pgpheader => 'X-PGP-Sig'); my @PGPSignHeaders = ('From', 'Newsgroups', 'Subject', 'Control', 'Supersedes', 'Followup-To', 'Date', 'Sender', 'Approved', @@ -52,22 +54,45 @@ my @PGPorderheaders = ('from', 'newsgroups', 'subject', 'control', use strict; use Net::NNTP; +use Net::Domain qw(hostfqdn); use Date::Calc qw(Add_Delta_YM Add_Delta_Days Delta_Days Today); use Fcntl ':flock'; # import LOCK_* constants use Getopt::Std; my ($TDY, $TDM, $TDD) = Today(); #TD: Today's date +# read commandline options my %Options; -getopts('hvpdt:f:', \%Options); +getopts('Vhvpdt:f:c:s:', \%Options); +# -V: print version / copyright information +if ($Options{'V'}) { + print "$0 v $Version\nCopyright (c) 2003 Marc Brockschmidt \nCopyright (c) 2010 Thomas Hochstein \n"; + print "This program is free software; you may redistribute it and/or modify it under the same terms as Perl itself.\n"; + exit(0); +} +# -h: feed myself to perldoc if ($Options{'h'}) { - print "$0 v $Version\nUsage: $0 [-hvpd] [-t ] [-f ]\n"; + exec ('perldoc', $0); exit(0); }; +# -f: set $Faq my ($Faq) = $Options{'f'} if ($Options{'f'}); +# read runtime configuration (configuration variables) +$RCFile = $Options{'c'} if ($Options{'c'}); +if (-f $RCFile) { + readrc (\$RCFile,\%Config); +} else { + warn "$0: W: .rc file $RCFile does not exist!\n"; +} + +# read configuration (configured FAQs) my @Config; -readconfig (\$ConfigFile, \@Config, \$Faq); +readconfig (\$Config{'ConfigFile'}, \@Config, \$Faq); +# for each FAQ: +# - parse configuration +# - read status data +# - if FAQ is due: call postfaq() foreach (@Config) { my ($LPD,$LPM,$LPY) = (01, 01, 0001); #LP: Last posting-date my ($NPY,$NPM,$NPD); #NP: Next posting-date @@ -78,8 +103,10 @@ foreach (@Config) { my ($MIDF,$ReplyTo,$ExtHea)=($$_{'mid-format'},$$_{'reply-to'},$$_{'extraheader'}); my ($Supersede) =($$_{'supersede'}); + # -f: loop if not FAQ to post next if (defined($Faq) && $ActName ne $Faq); + # read status data if (open (FH, "<$File.cfg")) { while(){ if (/##;; Lastpost:\s*(\d{1,2})\.(\d{1,2})\.(\d{2}(\d{2})?)/){ @@ -97,11 +124,12 @@ foreach (@Config) { ($NPY,$NPM,$NPD) = calcdelta ($LPY,$LPM,$LPD,$PFreq); + # if FAQ is due: get it out if (Delta_Days($NPY,$NPM,$NPD,$TDY,$TDM,$TDD) >= 0 or ($Options{'p'})) { if($Options{'d'}) { print "$ActName: Would be posted now (but running in simulation mode [$0 -d]).\n" if $Options{'v'}; } else { - postfaq(\$ActName,\$File,\$From,\$Subject,\$NG,\$Fup2,\$MIDF,\$ExtHea,\$Sender,\$TDY,\$TDM,\$TDD,\$ReplyTo,\$SupersedeMID,\$Expire); + postfaq(\$ActName,\$File,\$From,\$Subject,\$NG,\$Fup2,\$MIDF,\$ExtHea,\$Config{'Sender'},\$TDY,\$TDM,\$TDD,\$ReplyTo,\$SupersedeMID,\$Expire); } } elsif($Options{'v'}) { print "$ActName: Nothing to do.\n"; @@ -110,6 +138,26 @@ foreach (@Config) { exit; +#################################### readrc #################################### +# Takes a filename and the reference to an array which contains the valid options + +sub readrc{ + my ($File, $Config) = @_; + + print "Reading $$File.\n" if($Options{'v'}); + + open FH, "<$$File" or die "$0: Can't open $$File: $!"; + while () { + if (/^\s*(\S+)\s*=\s*'?(.*?)'?\s*(#.*$|$)/) { + if (grep(/$1/,@ValidConfVars)) { + $$Config{$1} = $2 if $2 ne ''; + } else { + warn "$0: W: $1 is not a valid configuration variable (reading from $$File)\n"; + } + } + } +} + ################################## readconfig ################################## # Takes a filename, a reference to an array, which will hold hashes with # the data from $File, and - optionally - the name of the (single) FAQ to post @@ -118,9 +166,7 @@ sub readconfig{ my ($File, $Config, $Faq) = @_; my ($LastEntry, $Error, $i) = ('','',0); - if($Options{'v'}) { - print "Reading configuration.\n"; - } + print "Reading configuration.\n" if($Options{'v'}); open FH, "<$$File" or die "$0: E: Can't open $$File: $!"; while () { @@ -139,24 +185,37 @@ sub readconfig{ #Check saved values: for $i (0..$i){ next if (defined($$Faq) && defined($$Config[$i]{'name'}) && $$Config[$i]{'name'} ne $$Faq ); - unless($$Config[$i]{'from'} =~ /\S+\@(\S+\.)?\S{2,}\.\S{2,}/) { - $Error .= "E: The From-header for your project \"$$Config[$i]{'name'}\" seems to be incorrect.\n" + unless(defined($$Config[$i]{'name'}) && $$Config[$i]{'name'} =~ /^\S+$/) { + $Error .= "E: The name of your project \"$$Config[$i]{'name'}\" is not defined or contains whitespaces.\n" + } + unless(defined($$Config[$i]{'file'}) && -f $$Config[$i]{'file'}) { + $Error .= "E: The file to post for your project \"$$Config[$i]{'name'}\" is not defined or does not exist.\n" + } + unless(defined($$Config[$i]{'from'}) && $$Config[$i]{'from'} =~ /\S+\@(\S+\.)?\S{2,}\.\S{2,}/) { + $Error .= "E: The From header for your project \"$$Config[$i]{'name'}\" seems to be incorrect.\n" } - unless($$Config[$i]{'ngs'} =~ /^\S+$/) { - $Error .= "E: The Newsgroups-header for your project \"$$Config[$i]{'name'}\" contains whitespaces.\n" + unless(defined($$Config[$i]{'ngs'}) && $$Config[$i]{'ngs'} =~ /^\S+$/) { + $Error .= "E: The Newsgroups header for your project \"$$Config[$i]{'name'}\" is not defined or contains whitespaces.\n" + } + unless(defined($$Config[$i]{'subject'})) { + $Error .= "E: The Subject header for your project \"$$Config[$i]{'name'}\" is not defined.\n" } unless(!$$Config[$i]{'fup2'} || $$Config[$i]{'fup2'} =~ /^\S+$/) { - $Error .= "E: The Followup-To-header for your project \"$$Config[$i]{'name'}\" contains whitespaces.\n" + $Error .= "E: The Followup-To header for your project \"$$Config[$i]{'name'}\" contains whitespaces.\n" } - unless($$Config[$i]{'posting-frequency'} =~ /^\s*\d+\s*[dwmy]\s*$/) { + unless(defined($$Config[$i]{'posting-frequency'}) && $$Config[$i]{'posting-frequency'} =~ /^\s*\d+\s*[dwmy]\s*$/) { $Error .= "E: The Posting-frequency for your project \"$$Config[$i]{'name'}\" is invalid.\n" } unless(!$$Config[$i]{'expires'} || $$Config[$i]{'expires'} =~ /^\s*\d+\s*[dwmy]\s*$/) { - $$Config[$i]{'expires'} = '3m'; # set default: 3 month - warn "$0: W: The Expires for your project \"$$Config[$i]{'name'}\" is invalid - set to 3 month.\n"; + warn "$0: W: The Expires for your project \"$$Config[$i]{'name'}\" is invalid - set to 3 month.\n"; + $$Config[$i]{'expires'} = '3m'; # set default (3 month) if expires is unset or invalid + } + unless(!$$Config[$i]{'mid-format'} || $$Config[$i]{'mid-format'} =~ /^<\S+\@\S{2,}\.\S{2,}>$/) { + warn "$0: W: The Message-ID format for your project \"$$Config[$i]{'name'}\" seems to be invalid - set to default.\n"; + $$Config[$i]{'mid-format'} = '<%n-%d.%m.%y@'.hostfqdn.'>'; # set default if mid-format is invalid } - $Error .= "-" x 25 . "\n" if $Error; } + $Error .= "-" x 25 . 'program terminated' . "-" x 25 . "\n" if $Error; die $Error if $Error; } @@ -175,6 +234,21 @@ sub calcdelta { } return ($NYear, $NMonth, $NDay); } + +################################ updatestatus ############################### +# Takes a MID and a status file name +# and writes status information to disk + +sub updatestatus { + my ($ActName, $File, $date, $MID) = @_; + + print "$$ActName: Save status information.\n" if($Options{'v'}); + + open (FH, ">$$File.cfg") or die "$0: E: Can't open $$File.cfg: $!"; + print FH "##;; Lastpost: $date\n"; + print FH "##;; LastMID: $MID\n"; + close FH; +} ################################## postfaq ################################## # Takes a filename and many other vars. @@ -185,21 +259,19 @@ sub postfaq { my ($ActName,$File,$From,$Subject,$NG,$Fup2,$MIDF,$ExtraHeaders,$Sender,$TDY,$TDM,$TDD,$ReplyTo,$Supersedes,$Expire) = @_; my (@Header,@Body,$MID,$InRealBody,$LastModified); - if($Options{'v'}) { - print "$$ActName: Preparing to post.\n"; - } + print "$$ActName: Preparing to post.\n" if($Options{'v'}); #Prepare MID: $$TDM = ($$TDM < 10 && $$TDM !~ /^0/) ? "0" . $$TDM : $$TDM; $$TDD = ($$TDD < 10 && $$TDD !~ /^0/) ? "0" . $$TDD : $$TDD; $MID = $$MIDF; + $MID = '<%n-%d.%m.%y@'.hostfqdn.'>' if !defined($MID); # set to default if unset $MID =~ s/\%n/$$ActName/g; $MID =~ s/\%d/$$TDD/g; $MID =~ s/\%m/$$TDM/g; $MID =~ s/\%y/$$TDY/g; - #Now get the body: open (FH, "<$$File"); while (){ @@ -223,7 +295,9 @@ sub postfaq { my $wday = ("Sun","Mon","Tue","Wed","Thu","Fri","Sat")[$time[6]]; my $year = (1900 + $time[5]); my $tz = $time[8] ? " +0200" : " +0100"; - + + $$Expire = '3m' if !$$Expire; # set default if unset: 3 month + my ($expY,$expM,$expD) = calcdelta ($year,$month,$day,$$Expire); my $expmonthN = ("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec")[$expM-1]; @@ -259,24 +333,18 @@ sub postfaq { push @Header, "$_\n" for (split /\n/, $$ExtraHeaders); } - my @Article = ($UsePGP)?@{signpgp(\@Header, \@Body)}:(@Header, "\n", @Body); + # sign article if $UsePGP is true + my @Article = ($Config{'UsePGP'})?@{signpgp(\@Header, \@Body)}:(@Header, "\n", @Body); - if($Options{'v'}) { - print "$$ActName: Posting article ...\n"; - } - post(\@Article); - - # Test mode? - return if($Options{'t'}); - - if($Options{'v'}) { - print "$$ActName: Save status information.\n"; + # post article + print "$$ActName: Posting article ...\n" if($Options{'v'}); + my $failure = post(\@Article); + + if ($failure) { + print "$$ActName: Posting failed, ERROR.dat may have more information.\n" if($Options{'v'} && (!defined($Options{'t'}) || $Options{'t'} !~ /console/i)); + } else { + updatestatus($ActName, $File, "$day.$month.$year", $MID) if !defined($Options{'t'}); } - - open (FH, ">$$File.cfg") or die "$0: E: Can't open $$File.cfg: $!"; - print FH "##;; Lastpost: $day.$month.$year\n"; - print FH "##;; LastMID: $MID\n"; - close FH; } ################################## post ################################## @@ -286,35 +354,49 @@ sub postfaq { sub post { my ($ArticleR) = @_; + my ($failure) = -1; - # Test mode? + # test mode - print article to console if(defined($Options{'t'}) and $Options{'t'} =~ /console/i) { - print "\n-----BEGIN--------------------------------------------------\n"; - print @$ArticleR; - print "\n------END---------------------------------------------------\n"; - return; - } - - my $NewsConnection = Net::NNTP->new($NNTPServer, Reader => 1) - or die "$0: E: Can't connect to news server '$NNTPServer'!\n"; - - $NewsConnection->authinfo ($NNTPUser, $NNTPPass); - $NewsConnection->post(); - $NewsConnection->datasend (@$ArticleR); - $NewsConnection->dataend(); - - if (!$NewsConnection->ok()) { - open FH, ">>ERROR.dat"; - print FH "\nPosting failed! Saving to ERROR.dat. Response from news server:\n"; - print FH $NewsConnection->code(); - print FH $NewsConnection->message(); - print FH "\n"; - print FH @$ArticleR; - print FH "-" x 80, "\n"; - close FH; + print "-----BEGIN--------------------------------------------------\n"; + print @$ArticleR; + print "------END---------------------------------------------------\n"; + # pipe article to script + } elsif(defined($Options{'s'})) { + open (POST, "| $Options{'s'}") or die "$0: E: Cannot fork $Options{'s'}: $!\n"; + print POST @$ArticleR; + close POST; + if ($? == 0) { + $failure = 0; + } else { + warn "$0: W: $Options{'s'} exited with status ", ($? >> 8), "\n"; + $failure = $?; + } + # post article + } else { + my $NewsConnection = Net::NNTP->new($Config{'NNTPServer'}, Reader => 1) or die "$0: E: Can't connect to news server '$Config{'NNTPServer'}'!\n"; + $NewsConnection->authinfo ($Config{'NNTPUser'}, $Config{'NNTPPass'}) if (defined($Config{'NNTPUser'})); + $NewsConnection->post(); + $NewsConnection->datasend (@$ArticleR); + $NewsConnection->dataend(); + + if ($NewsConnection->ok()) { + $failure = 0; + # Posting failed? Save to ERROR.dat + } else { + warn "$0: W: Posting failed!\n"; + open FH, ">>ERROR.dat"; + print FH "\nPosting failed! Saving to ERROR.dat. Response from news server:\n"; + print FH $NewsConnection->code(); + print FH $NewsConnection->message(); + print FH "\n"; + print FH @$ArticleR; + print FH "-" x 80, "\n"; + close FH; + } + $NewsConnection->quit(); } - - $NewsConnection->quit(); + return $failure; } #-------- sub getpgpcommand @@ -327,26 +409,26 @@ sub getpgpcommand { my $PGPCommand; if ($PGPVersion eq '2') { - if ($PathtoPGPPass && !$PGPPass) { - open (PGPPW, $PathtoPGPPass) or die "$0: E: Can't open $PathtoPGPPass: $!"; - $PGPPass = ; + if ($Config{'PathtoPGPPass'} && !$Config{'PGPPass'}) { + open (PGPPW, $Config{'PathtoPGPPass'}) or die "$0: E: Can't open $Config{'PathtoPGPPass'}: $!"; + Config{'$PGPPass'} = ; close PGPPW; } - if ($PGPPass) { - $PGPCommand = "PGPPASS=\"".$PGPPass."\" ".$pgp." -u \"".$PGPSigner."\" +verbose=0 language='en' -saft <".$pgptmpf.".txt >".$pgptmpf.".txt.asc"; + if (Config{'$PGPPass'}) { + $PGPCommand = "PGPPASS=\"".$Config{'PGPPass'}."\" ".$Config{'pgp'}." -u \"".$Config{'PGPSigner'}."\" +verbose=0 language='en' -saft <".$Config{'pgptmpf'}.".txt >".$Config{'pgptmpf'}.".txt.asc"; } else { die "$0: E: PGP-Passphrase is unknown!\n"; } } elsif ($PGPVersion eq '5') { - if ($PathtoPGPPass) { - $PGPCommand = "PGPPASSFD=2 ".$pgp."s -u \"".$PGPSigner."\" -t --armor -o ".$pgptmpf.".txt.asc -z -f < ".$pgptmpf.".txt 2<".$PathtoPGPPass; + if ($Config{'PathtoPGPPass'}) { + $PGPCommand = "PGPPASSFD=2 ".$Config{'pgp'}."s -u \"".$Config{'PGPSigner'}."\" -t --armor -o ".$Config{'pgptmpf'}.".txt.asc -z -f < ".$Config{'pgptmpf'}.".txt 2<".$Config{'PathtoPGPPass'}; } else { die "$0: E: PGP-Passphrase is unknown!\n"; } } elsif ($PGPVersion =~ m/GPG/io) { - if ($PathtoPGPPass) { - $PGPCommand = $pgp." --digest-algo MD5 -a -u \"".$PGPSigner."\" -o ".$pgptmpf.".txt.asc --no-tty --batch --passphrase-fd 2 2<".$PathtoPGPPass." --clearsign ".$pgptmpf.".txt"; + if (Config{'$PathtoPGPPass'}) { + $PGPCommand = $Config{'pgp'}." --digest-algo MD5 -a -u \"".$Config{'PGPSigner'}."\" -o ".$Config{'pgptmpf'}.".txt.asc --no-tty --batch --passphrase-fd 2 2<".$Config{'PathtoPGPPass'}." --clearsign ".$Config{'pgptmpf'}.".txt"; } else { die "$0: E: Passphrase is unknown!\n"; } @@ -389,8 +471,8 @@ sub signpgp { $pgpbody = join ("", @$BodyR); # Delete and create the temporary pgp-Files - unlink "$pgptmpf.txt"; - unlink "$pgptmpf.txt.asc"; + unlink "$Config{'pgptmpf'}.txt"; + unlink "$Config{'pgptmpf'}.txt.asc"; $signheaders = join(",", @signheaders); $pgphead = "X-Signed-Headers: $signheaders\n"; @@ -400,37 +482,37 @@ sub signpgp { } } - open(FH, ">" . $pgptmpf . ".txt") or die "$0: E: can't open $pgptmpf: $!\n"; + open(FH, ">" . $Config{'pgptmpf'} . ".txt") or die "$0: E: can't open $Config{'pgptmpf'}: $!\n"; print FH $pgphead, "\n", $pgpbody; - print FH "\n" if ($PGPVersion =~ m/GPG/io); # workaround a pgp/gpg incompatibility - should IMHO be fixed in pgpverify + print FH "\n" if ($Config{'PGPVersion'} =~ m/GPG/io); # workaround a pgp/gpg incompatibility - should IMHO be fixed in pgpverify close(FH) or warn "$0: W: Couldn't close TMP: $!\n"; # Start PGP, then read the signature; - my $PGPCommand = getpgpcommand($PGPVersion); + my $PGPCommand = getpgpcommand($Config{'PGPVersion'}); `$PGPCommand`; - open (FH, "<" . $pgptmpf . ".txt.asc") or die "$0: E: can't open ".$pgptmpf.".txt.asc: $!\n"; - $/ = "$pgpbegin\n"; + open (FH, "<" . $Config{'pgptmpf'} . ".txt.asc") or die "$0: E: can't open ".$Config{'pgptmpf'}.".txt.asc: $!\n"; + $/ = "$Config{'pgpbegin'}\n"; $_ = ; - unless (m/\Q$pgpbegin\E$/o) { -# unlink $pgptmpf . ".txt"; -# unlink $pgptmpf . ".txt.asc"; - die "$0: E: $pgpbegin not found in ".$pgptmpf.".txt.asc\n" + unless (m/\Q$Config{'pgpbegin'}\E$/o) { +# unlink $Config{'pgptmpf'} . ".txt"; +# unlink $Config{'pgptmpf'} . ".txt.asc"; + die "$0: E: $Config{'pgpbegin'} not found in ".$Config{'pgptmpf'}.".txt.asc\n" } - unlink($pgptmpf . ".txt") or warn "$0: W: Couldn't unlink $pgptmpf.txt: $!\n"; + unlink($Config{'pgptmpf'} . ".txt") or warn "$0: W: Couldn't unlink $Config{'pgptmpf'}.txt: $!\n"; $/ = "\n"; $_ = ; unless (m/^Version: (\S+)(?:\s(\S+))?/o) { - unlink $pgptmpf . ".txt"; - unlink $pgptmpf . ".txt.asc"; + unlink $Config{'pgptmpf'} . ".txt"; + unlink $Config{'pgptmpf'} . ".txt.asc"; die "$0: E: didn't find PGP Version line where expected.\n"; } if (defined($2)) { - $$HeaderR{$pgpheader} = $1."-".$2." ".$signheaders; + $$HeaderR{$Config{'pgpheader'}} = $1."-".$2." ".$signheaders; } else { - $$HeaderR{$pgpheader} = $1." ".$signheaders; + $$HeaderR{$Config{'pgpheader'}} = $1." ".$signheaders; } do { # skip other pgp headers like @@ -439,23 +521,23 @@ sub signpgp { while () { chomp; - last if /^\Q$pgpend\E$/; - $$HeaderR{$pgpheader} .= "\n\t$_"; + last if /^\Q$Config{'pgpend'}\E$/; + $$HeaderR{$Config{'pgpheader'}} .= "\n\t$_"; } - $$HeaderR{$pgpheader} .= "\n" unless ($$HeaderR{$pgpheader} =~ /\n$/s); + $$HeaderR{$Config{'pgpheader'}} .= "\n" unless ($$HeaderR{$Config{'pgpheader'}} =~ /\n$/s); $_ = ; unless (eof(FH)) { - unlink $pgptmpf . ".txt"; - unlink $pgptmpf . ".txt.asc"; - die "$0: E: unexpected data following $pgpend\n"; + unlink $Config{'pgptmpf'} . ".txt"; + unlink $Config{'pgptmpf'} . ".txt.asc"; + die "$0: E: unexpected data following $Config{'pgpend'}\n"; } close(FH); - unlink "$pgptmpf.txt.asc"; + unlink "$Config{'pgptmpf'}.txt.asc"; - my $tmppgpheader = $pgpheader . ": " . $$HeaderR{$pgpheader}; - delete $$HeaderR{$pgpheader}; + my $tmppgpheader = $Config{'pgpheader'} . ": " . $$HeaderR{$Config{'pgpheader'}}; + delete $$HeaderR{$Config{'pgpheader'}}; @pgphead = (); foreach $header (@PGPorderheaders) { @@ -472,7 +554,7 @@ sub signpgp { } } - push @pgphead, ("X-PGP-Key: " . $PGPSigner . "\n"), $tmppgpheader; + push @pgphead, ("X-PGP-Key: " . $Config{'PGPSigner'} . "\n"), $tmppgpheader; undef $tmppgpheader; @pgpbody = split /$/m, $pgpbody; @@ -490,7 +572,7 @@ yapfaq - Post Usenet FAQs I<(yet another postfaq)> =head1 SYNOPSIS -B [B<-hvpd>] [B<-t> I | CONSOLE] [B<-f> I] +B [B<-hvpd>] [B<-t> I | CONSOLE] [B<-f> I] [B<-s> I] [B<-c> I<.rc file>] =head1 REQUIREMENTS @@ -526,7 +608,8 @@ headers as defined in its config file (by default F). F consists of one or more blocks, separated by C<=====> on a single line, each containing the configuration for one FAQ as a set -of definitions in the form of I. +of definitions in the form of I. Everything after a "#" +sign is ignored so you may comment your configuration file. =over 4 @@ -554,7 +637,7 @@ or Ionths> or Iears>. This value must be set. -=item B = I