diff options
author | adrianp <adrianp@pkgsrc.org> | 2005-12-03 16:13:34 +0000 |
---|---|---|
committer | adrianp <adrianp@pkgsrc.org> | 2005-12-03 16:13:34 +0000 |
commit | bb70e1320417c03614589b7b64ad7b48581cd235 (patch) | |
tree | 76e0131cf5f2c8e58939721769e81a79fd9f3fe4 /sysutils | |
parent | 535d171d379d650d6ecada2322da58ba09189b59 (diff) | |
download | pkgsrc-bb70e1320417c03614589b7b64ad7b48581cd235.tar.gz |
Update to webmin-1.170nb2 to address:
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2005-3912
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/webmin/Makefile | 10 | ||||
-rw-r--r-- | sysutils/webmin/distinfo | 3 | ||||
-rw-r--r-- | sysutils/webmin/patches/patch-ab | 112 |
3 files changed, 119 insertions, 6 deletions
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile index d9a9681cddf..b67babd289c 100644 --- a/sysutils/webmin/Makefile +++ b/sysutils/webmin/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:23 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/03 16:13:34 adrianp Exp $ DISTNAME= webmin-1.170-minimal PKGNAME= ${DISTNAME:S/-minimal$//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=webadmin/} @@ -23,9 +23,9 @@ WEBMIN_DIR= ${PREFIX}/${WEBMIN_SUBDIR} WEBMIN_SUBDIR= share/webmin WEBMIN_ETCDIR?= ${PKG_SYSCONFDIR}/webmin WEBMIN_LOGDIR?= ${VARBASE}/log/webmin -FILES_SUBST+= WEBMIN_DIR=${WEBMIN_DIR} -FILES_SUBST+= WEBMIN_ETCDIR=${WEBMIN_ETCDIR} -FILES_SUBST+= WEBMIN_LOGDIR=${WEBMIN_LOGDIR} +FILES_SUBST+= WEBMIN_DIR=${WEBMIN_DIR:Q} +FILES_SUBST+= WEBMIN_ETCDIR=${WEBMIN_ETCDIR:Q} +FILES_SUBST+= WEBMIN_LOGDIR=${WEBMIN_LOGDIR:Q} MESSAGE_SUBST+= WEBMIN_DIR=${WEBMIN_DIR} USE_PKGINSTALL= yes diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo index cc9a0f6a4a1..912bff72435 100644 --- a/sysutils/webmin/distinfo +++ b/sysutils/webmin/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.4 2005/02/24 13:40:59 agc Exp $ +$NetBSD: distinfo,v 1.5 2005/12/03 16:13:34 adrianp Exp $ SHA1 (webmin-1.170-minimal.tar.gz) = a32ef7e89d669020cb47e13bc40e321e3c4b6aa5 RMD160 (webmin-1.170-minimal.tar.gz) = 0ed3b9c54dc5fd97b7ce5ea0e74378491d649695 Size (webmin-1.170-minimal.tar.gz) = 1011002 bytes SHA1 (patch-aa) = e732d88ab149ba4e577e6b0aa28884d6bc3b8102 +SHA1 (patch-ab) = 24e3b8132b3a9a32e12a5e2b4ba89a23d3ef99a1 diff --git a/sysutils/webmin/patches/patch-ab b/sysutils/webmin/patches/patch-ab new file mode 100644 index 00000000000..70b499c88cb --- /dev/null +++ b/sysutils/webmin/patches/patch-ab @@ -0,0 +1,112 @@ +$NetBSD: patch-ab,v 1.1 2005/12/03 16:13:34 adrianp Exp $ + +--- miniserv.pl.orig 2005-12-03 14:36:50.000000000 +0000 ++++ miniserv.pl +@@ -216,11 +216,11 @@ if ($use_syslog) { + } + else { + local $msg = ucfirst($config{'pam'})." starting"; +- eval { syslog("info", $msg); }; ++ eval { syslog("info", "%s", $msg); }; + if ($@) { + eval { + setlogsock("inet"); +- syslog("info", $msg); ++ syslog("info", "%s", $msg); + }; + if ($@) { + # All attempts to use syslog have failed.. +@@ -543,7 +543,7 @@ while(1) { + &run_logout_script($s, $sdb[0]); + delete($sessiondb{$s}); + if ($use_syslog) { +- syslog("info", "Timeout of $sdb[0]"); ++ syslog("info", "%s", "Timeout of $sdb[0]"); + } + } + } +@@ -709,7 +709,7 @@ while(1) { + local $logtext = "Security alert: Host $2 ". + "blocked after $config{'blockhost_failures'} ". + "failed logins for user $1"; +- syslog("crit", $logtext); ++ syslog("crit", "%s", $logtext); + } + } + else { +@@ -1043,12 +1043,12 @@ if (%users) { + if ($certs{$u} eq $peername) { + $authuser = $u; + $validated = 2; +- #syslog("info", "SSL login as $authuser from $acpthost") if ($use_syslog); ++ #syslog("info", "%s", "SSL login as $authuser from $acpthost") if ($use_syslog); + last; + } + } + if ($use_syslog && !$validated) { +- syslog("crit", ++ syslog("crit", "%s", + "Unknown SSL certificate $peername"); + } + } +@@ -1081,7 +1081,7 @@ if (%users) { + $validated = 0; + } + if ($use_syslog && !$validated) { +- syslog("crit", ++ syslog("crit", "%s", + ($nonexist ? "Non-existent" : + $expired ? "Expired" : "Invalid"). + " login as $authuser from $acpthost"); +@@ -1118,7 +1118,7 @@ if (%users) { + $authuser = $baseauthuser = undef; + if ($louser) { + if ($use_syslog) { +- syslog("info", "Logout by $louser from $acpthost"); ++ syslog("info", "%s", "Logout by $louser from $acpthost"); + } + &run_logout_script($louser, $sid, + $acptip, $localip); +@@ -1208,7 +1208,7 @@ if (%users) { + &write_keep_alive(0); + &write_data("\r\n"); + &log_request($acpthost, $authuser, $reqline, 302, 0); +- syslog("info", "Successful login as $authuser from $acpthost") if ($use_syslog); ++ syslog("info", "%s", "Successful login as $authuser from $acpthost") if ($use_syslog); + return 0; + } + elsif ($ok && $expired && +@@ -1224,7 +1224,7 @@ if (%users) { + $page = $config{'password_form'}; + $logged_code = 401; + $miniserv_internal = 2; +- syslog("crit", ++ syslog("crit", "%s", + "Expired login as $in{'user'} ". + "from $acpthost") if ($use_syslog); + } +@@ -1236,7 +1236,7 @@ if (%users) { + $already_session_id = undef; + $method = "GET"; + $authuser = $baseauthuser = undef; +- syslog("crit", ++ syslog("crit", "%s", + ($nonexist ? "Non-existent" : + $expired ? "Expired" : "Invalid"). + " login as $in{'user'} from $acpthost") +@@ -1289,13 +1289,13 @@ if (%users) { + # Local user exists in webmin users file + $validated = 1; + $authuser = $localauth_user; +- # syslog("info", "Local login as $authuser from $acpthost") if ($use_syslog); ++ # syslog("info", "%s", "Local login as $authuser from $acpthost") if ($use_syslog); + } + elsif ($config{'unixauth'}) { + # Local user must exist + $validated = 2; + $authuser = $localauth_user; +- # syslog("info", "Local login as $authuser from $acpthost") if ($use_syslog); ++ # syslog("info", "%s", "Local login as $authuser from $acpthost") if ($use_syslog); + } + else { + $localauth_user = undef; |