aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@ubuntu.com>2019-12-05 16:35:07 -0500
committerLibravatarUnit 193 <unit193@ubuntu.com>2019-12-05 16:35:07 -0500
commit65f027a32e2c6399364be7993ca61230c1df740e (patch)
tree172fa084a91a86960ac3e71571f2d1530b051c5e
parent7d205e0ab81fb362055f2c07ab51d29656c01c53 (diff)
downloadlistadmin-65f027a32e2c6399364be7993ca61230c1df740e.tar.bz2
listadmin-65f027a32e2c6399364be7993ca61230c1df740e.tar.xz
listadmin-65f027a32e2c6399364be7993ca61230c1df740e.tar.zst
Import Upstream version 2.29upstream/2.29
-rw-r--r--Makefile2
-rw-r--r--listadmin.man2
-rwxr-xr-xlistadmin.pl27
-rw-r--r--listadmin.txt2
4 files changed, 19 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index 3aa4a22..d207f58 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
SHELL = /bin/sh
INSTALL = install -c
-VERSION = 2.28
+VERSION = 2.29
PREFIX = /usr/local
BINDIR = $(PREFIX)/bin
diff --git a/listadmin.man b/listadmin.man
index 0add86a..1043143 100644
--- a/listadmin.man
+++ b/listadmin.man
@@ -187,7 +187,7 @@ An example configuration file:
#
# Settings affect all lists being listed after it.
- username jdoe
+ username jdoe@example.com
password Geheim
default discard
# This one works for Sourceforge:
diff --git a/listadmin.pl b/listadmin.pl
index 8703e9b..a4c7949 100755
--- a/listadmin.pl
+++ b/listadmin.pl
@@ -1,6 +1,6 @@
#! /usr/bin/perl -w
#
-# listadmin version 2.28
+# listadmin version 2.29
# Written 2003 - 2006 by
# Kjetil Torgrim Homme <kjetilho+listadmin@ifi.uio.no>
#
@@ -42,8 +42,6 @@ usage() unless getopts('f:t:');
$rc = $opt_f if $opt_f;
usage() if defined $opt_t && $opt_t !~ /\d/ && $opt_t !~ /^\d*(\.\d*)?$/;
my $time_limit = time + 60 * ($opt_t || 24*60);
-my $hostname = `/bin/uname -n`;
-chomp($hostname);
# Turn on autoflush on STDOUT
$| = 1;
@@ -85,7 +83,8 @@ Reason: @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< Spam? @<<
.
-for $list (@lists) {
+for (@lists) {
+ $list = $_;
my $user = $config->{$list}{"user"};
my $pw = $config->{$list}{"password"} || "";
@@ -103,8 +102,10 @@ for $list (@lists) {
}
$info = get_list ($list, $config->{$list}, $pw) if $pw;
} while ($info->{'autherror'} && $pw);
- if ($info->{'servererror'} || $info->{'autherror'}) {
- print "skipping...\n";
+ if ($info->{'servererror'}) {
+ next;
+ } elsif ($info->{'autherror'}) {
+ print "no password, skipping...\n" unless $pw;
next;
}
@@ -458,10 +459,14 @@ sub get_list {
}
my @mailman_mentions = grep {/Mailman/} split (/\n/, $page);
- my $last_mention = pop(@mailman_mentions);
- die "Can not find version information in '$last_mention'\n"
- unless $last_mention =~ /\bv(ersion)?\s(\d+\.\d+)/;
- $mmver = $2;
+ for my $mention (reverse @mailman_mentions) {
+ if ($mention =~ /\bv(ersion)?\s(\d+\.\d+)/) {
+ $mmver = $2;
+ last;
+ }
+ }
+ die "Can not find version information in, please mail maintainer."
+ unless $mmver;
if ($mmver ge "2.1") {
# Mailman does not look for "details" in parameters, so it
@@ -476,7 +481,7 @@ sub get_list {
$page_appr = $resp->content;
}
- my $dumpdir = $config->{$list}{"dumpdir"};
+ my $dumpdir = $config->{"dumpdir"};
if (defined $dumpdir) {
if (open (DUMP, ">$dumpdir/dump-subs-$list.html")) {
print DUMP $page;
diff --git a/listadmin.txt b/listadmin.txt
index daf165c..c8c4790 100644
--- a/listadmin.txt
+++ b/listadmin.txt
@@ -212,7 +212,7 @@ EXAMPLE
#
# Settings affect all lists being listed after it.
- username jdoe
+ username jdoe@example.com
password Geheim
default discard
# This one works for Sourceforge: