my @files = <$tmpdir/*>;
my $version = $files[0];
-$version =~ s/^.*\/openssl-(\d+\.\d+\.\d+[a-z]*)\..*$/$1/;
+
+if ($version =~ /beta/)
+ {
+ $version =~ s/^.*\/openssl-(\d+\.\d+\.\d+[a-z]*-beta\d+)\..*$/$1/;
+ }
+else
+ {
+ $version =~ s/^.*\/openssl-(\d+\.\d+\.\d+[a-z]*)\..*$/$1/;
+ }
+
my $announce = "$tmpdir/openssl-$version.txt.asc";
my @distfiles = (
exit 1 if $bad;
print "Directory sanity check OK\n";
+
+my $annversion = $version;
+
+$annversion =~ s/-beta(\d+$)/ beta $1/;
-print "Starting release for OpenSSL $version\n";
+print "Starting release for OpenSSL $annversion\n";
if ($do_copy)
{
print "Test mode: no files copied\n";
}
-$mail =~ s/SUBJECT/"OpenSSL version $version released"/;
+$mail =~ s/SUBJECT/"OpenSSL version $annversion released"/;
$mail =~ s/RECIP/openssl-dev openssl-users openssl-announce/;
$mail =~ s/BODY/$announce/;