summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2006-03-18 10:23:39 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2006-03-18 10:23:39 +0000
commitd8520d1506331da5bc8424a214a71e7b151557b8 (patch)
tree3bd5438469b2df54e2ed7a02797721fa81107c1a /app-admin/webmin/files
parentVersion bump. (diff)
downloadgentoo-2-d8520d1506331da5bc8424a214a71e7b151557b8.tar.gz
gentoo-2-d8520d1506331da5bc8424a214a71e7b151557b8.tar.bz2
gentoo-2-d8520d1506331da5bc8424a214a71e7b151557b8.zip
Version bump.
(Portage version: 2.1_pre6-r3)
Diffstat (limited to 'app-admin/webmin/files')
-rw-r--r--app-admin/webmin/files/digest-webmin-1.2609
-rw-r--r--app-admin/webmin/files/virtual-server-2.610-checkip.patch16
2 files changed, 25 insertions, 0 deletions
diff --git a/app-admin/webmin/files/digest-webmin-1.260 b/app-admin/webmin/files/digest-webmin-1.260
new file mode 100644
index 000000000000..905538536ed8
--- /dev/null
+++ b/app-admin/webmin/files/digest-webmin-1.260
@@ -0,0 +1,9 @@
+MD5 df46d1f7b075cf32fa8ca4bdf121354a virtual-server-2.610.wbm.gz 281828
+RMD160 03ceb41b68ca454138fd41fbce135c5f20f2473d virtual-server-2.610.wbm.gz 281828
+SHA256 7ed07d52fe6697217835aa97f63422aafc4ff166693482e93aa9a6adb55ce489 virtual-server-2.610.wbm.gz 281828
+MD5 72c68b700eb5f7d16cfa50fd2b22d382 webmin-1.260-minimal.tar.gz 1258472
+RMD160 8e7598c9a24478e6513a968ff62c7b18562a04e2 webmin-1.260-minimal.tar.gz 1258472
+SHA256 8b61208ea9b16f063a1d0daf05727475cc2a9e705fd0f3fa0a4a4e1364ed4949 webmin-1.260-minimal.tar.gz 1258472
+MD5 c45fe387902405cb36a1a5c6a240ad0d webmin-1.260.tar.gz 9014687
+RMD160 5b4719f59933dc24957b7c26e177e57e688393cb webmin-1.260.tar.gz 9014687
+SHA256 876e37bc6e1792451e982704749580ff2363c5aef0b9e5a04fcf93d2a367df84 webmin-1.260.tar.gz 9014687
diff --git a/app-admin/webmin/files/virtual-server-2.610-checkip.patch b/app-admin/webmin/files/virtual-server-2.610-checkip.patch
new file mode 100644
index 000000000000..70cc065a20ca
--- /dev/null
+++ b/app-admin/webmin/files/virtual-server-2.610-checkip.patch
@@ -0,0 +1,16 @@
+diff -Naurp webmin-1.260.orig/virtual-server/virtual-server-lib.pl webmin-1.260/virtual-server/virtual-server-lib.pl
+--- webmin-1.260.orig/virtual-server/virtual-server-lib.pl 2005-12-18 14:42:40.000000000 -0800
++++ webmin-1.260/virtual-server/virtual-server-lib.pl 2006-03-18 02:15:48.000000000 -0800
+@@ -2080,7 +2080,12 @@ if (!$config{'iface_manual'}) {
+ $vmax = $b->{'virtual'}
+ if ($b->{'name'} eq $iface->{'name'} &&
+ $b->{'virtual'} > $vmax);
++
++ if($b->{'address'} eq $_[0]->{'ip'}) {
++ print "IP address is already active.<p>\n";
++ return;
+ }
++ }
+ local $virt = { 'address' => $_[0]->{'ip'},
+ 'netmask' => $net::virtual_netmask || $iface->{'netmask'},
+ 'broadcast' =>