aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@ubuntu.com>2019-12-05 16:35:02 -0500
committerLibravatarUnit 193 <unit193@ubuntu.com>2019-12-05 16:35:02 -0500
commit748708cf83bc93ffbdb72a2b9c613bb564793ad2 (patch)
tree530c0b431562f9c16d955e0e61194ee96b437cd6
parenta1b3c346fdd75ceb389881fade3b063c6375255b (diff)
downloadlistadmin-748708cf83bc93ffbdb72a2b9c613bb564793ad2.tar.bz2
listadmin-748708cf83bc93ffbdb72a2b9c613bb564793ad2.tar.xz
listadmin-748708cf83bc93ffbdb72a2b9c613bb564793ad2.tar.zst
Import Upstream version 2.27upstream/2.27
-rw-r--r--Makefile11
-rwxr-xr-xlistadmin.pl29
2 files changed, 21 insertions, 19 deletions
diff --git a/Makefile b/Makefile
index 0cab446..4c24933 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
SHELL = /bin/sh
INSTALL = install -c
-VERSION = 2.26
+VERSION = 2.27
PREFIX = /usr/local
BINDIR = $(PREFIX)/bin
@@ -37,7 +37,8 @@ distclean:
# for my use only
WWW_DOCS = /hom/kjetilho/www_docs/hacks
publish: dist
- cp listadmin.txt $(WWW_DOCS)/listadmin.txt
- cp $(TARFILE) $(WWW_DOCS)/
- cp listadmin.pl $(WWW_DOCS)/listadmin
- perl -pi -e 's/listadmin-\d+\.\d+/listadmin-'$(VERSION)'/g' $(WWW_DOCS)/index.html
+ cp -p listadmin.txt $(WWW_DOCS)/listadmin.txt
+ cp -p $(TARFILE) $(WWW_DOCS)/
+ cp -p listadmin.pl $(WWW_DOCS)/listadmin
+ cp -p listadmin.man $(WWW_DOCS)/listadmin.man
+ perl -pi -e 's/listadmin(.)\d+\.\d+/listadmin$${1}'$(VERSION)'/g' $(WWW_DOCS)/index.html
diff --git a/listadmin.pl b/listadmin.pl
index e638d0e..d9c32d9 100755
--- a/listadmin.pl
+++ b/listadmin.pl
@@ -1,6 +1,6 @@
#! /usr/bin/perl -w
#
-# listadmin version 2.26
+# listadmin version 2.27
# Written 2003 - 2005 by
# Kjetil Torgrim Homme <kjetilho+listadmin@ifi.uio.no>
# Released into public domain.
@@ -606,7 +606,7 @@ sub parse_approval {
$body = $parse->get_text("/textarea");
} else {
$headers =~ s/\n\n//s;
- $body = $';
+ $body = $'; # ' # stupid perl-mode
$headers = $`;
}
$headers =~ s/^\s+//;
@@ -709,6 +709,7 @@ sub read_config {
++$lineno;
chomp;
s/\r$//;
+ s/\s+$//; # trailing whitespace is "always" unintended
next if /^\s*#/;
s/^\s+// if $line; # remove leading whitespace after continuation
if (/\\$/) {
@@ -719,15 +720,15 @@ sub read_config {
$line =~ s/^\s+//;
next if /^$/;
if ($line =~ /^username\s+/i) {
- $user = unquote ($'); # $POSTFIX
+ $user = unquote ($'); # ' stupid perl-mode
if ($user !~ /^[a-z0-9._+-]+\@[a-z0-9.-]+$/) {
print STDERR "$file:$lineno: Illegal username: '$user'\n";
exit 1;
}
} elsif ($line =~ /^password\s+/i) {
- $pw = unquote ($');
+ $pw = unquote ($'); # ' stupid perl-mode
} elsif ($line =~ /^spamlevel\s+/i) {
- $spam = unquote ($');
+ $spam = unquote ($'); # ' stupid perl-mode
if ($spam =~ /^(\d+)\s*$/) {
$spam = $1;
} else {
@@ -736,7 +737,7 @@ sub read_config {
exit 1;
}
} elsif ($line =~ /^confirm\s+/i) {
- $confirm = unquote ($');
+ $confirm = unquote ($'); # ' stupid perl-mode
if ($confirm eq "yes") {
$confirm = 1;
} elsif ($confirm eq "no") {
@@ -747,7 +748,7 @@ sub read_config {
exit 1;
}
} elsif ($line =~ /^action\s+/i) {
- $action = unquote ($'); # $POSTFIX
+ $action = unquote ($'); # ' stupid perl-mode
unless (exists $act{$action}) {
print STDERR "$file:$lineno: Illegal value: '$action'\n";
print STDERR "choose one of ",
@@ -756,10 +757,10 @@ sub read_config {
}
$action = $act{$action};
} elsif ($line =~ /^adminurl\s+/i) {
- $url = unquote ($'); # $POSTFIX
- $url = undef if $url eq "NONE"; # use UiO specific code
+ $url = unquote ($'); # ' stupid perl-mode
+ $url = undef if $url eq "NONE";
} elsif ($line =~ /^default\s+/i) {
- $default = unquote ($'); # $POSTFIX
+ $default = unquote ($'); # ' stupid perl-mode
unless (exists $act{$default}) {
print STDERR "$file:$lineno: Illegal value: '$default'\n";
print STDERR "choose one of ",
@@ -768,7 +769,7 @@ sub read_config {
}
$default = $act{$default};
} elsif ($line =~ /^log\s+/i) {
- $logfile = unquote ($'); # $POSTFIX
+ $logfile = unquote ($'); # ' stupid perl-mode
$logfile =~ s,^\$HOME/,$ENV{'HOME'}/,;
$logfile =~ s,^~/,$ENV{'HOME'}/,;
$logfile =~ s,^~(\w+)/,(getpwnam($1))[7]."/",e;
@@ -778,7 +779,7 @@ sub read_config {
}
$logfile = undef if $logfile eq "none";
} elsif ($line =~ /^subscription_action\s+/) {
- $subact = unquote ($');
+ $subact = unquote ($'); # ' stupid perl-mode
unless (exists $sact{$subact}) {
print STDERR "$file:$lineno: Illegal value: '$subact'\n";
print STDERR "choose one of ",
@@ -787,7 +788,7 @@ sub read_config {
}
$subact = $sact{$subact};
} elsif ($line =~ /^subscription_default\s+/) {
- $subdef = unquote ($');
+ $subdef = unquote ($'); # ' stupid perl-mode
unless (exists $sact{$subdef}) {
print STDERR "$file:$lineno: Illegal value: '$subdef'\n";
print STDERR "choose one of ",
@@ -797,7 +798,7 @@ sub read_config {
$subdef = $sact{$subdef};
} elsif ($line =~ /^($pattern_keywords)\s+/o) {
my $key = $1;
- my $val = $'; # $POSTFIX
+ my $val = $'; # ' stupid perl-mode
$val =~ s/\s+$//;
if ($val =~ /^"(.*)"$/) {
$val = $1;