diff options
author | Steve Dibb <beandog@gentoo.org> | 2008-04-15 01:18:08 +0000 |
---|---|---|
committer | Steve Dibb <beandog@gentoo.org> | 2008-04-15 01:18:08 +0000 |
commit | c39d55b39e7793b2339b772112584a4178f11649 (patch) | |
tree | 0665d920a97694f3d54c49fae3e131d7533932ee /app-admin/webmin/files | |
parent | Drop stable keywords (diff) | |
download | gentoo-2-c39d55b39e7793b2339b772112584a4178f11649.tar.gz gentoo-2-c39d55b39e7793b2339b772112584a4178f11649.tar.bz2 gentoo-2-c39d55b39e7793b2339b772112584a4178f11649.zip |
Drop stable keywords, bug 217582, remove old
(Portage version: 2.1.5_rc3)
Diffstat (limited to 'app-admin/webmin/files')
8 files changed, 0 insertions, 194 deletions
diff --git a/app-admin/webmin/files/1.390-iptables-gentoo.patch b/app-admin/webmin/files/1.390-iptables-gentoo.patch deleted file mode 100644 index 59590afa8ed9..000000000000 --- a/app-admin/webmin/files/1.390-iptables-gentoo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- firewall/gentoo-linux-lib.pl.orig 2007-12-23 13:27:20.000000000 +0100 -+++ firewall/gentoo-linux-lib.pl 2007-12-23 13:27:28.000000000 +0100 -@@ -19,7 +19,7 @@ - # Applies the current iptables configuration from the save file - sub apply_iptables - { --local $out = &backquote_logged("cd / ; /etc/init.d/iptables restart 2>&1"); -+local $out = &backquote_logged("cd / ; /etc/init.d/iptables reload 2>&1"); - return $? ? "<pre>$out</pre>" : undef; - } - diff --git a/app-admin/webmin/files/virtual-server-2.31-namevirtual.patch b/app-admin/webmin/files/virtual-server-2.31-namevirtual.patch deleted file mode 100644 index 0669a84c9486..000000000000 --- a/app-admin/webmin/files/virtual-server-2.31-namevirtual.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -Naur virtual-server.orig/feature-ssl.pl virtual-server/feature-ssl.pl ---- virtual-server.orig/feature-ssl.pl 2004-09-11 00:34:25.000000000 -0700 -+++ virtual-server/feature-ssl.pl 2004-11-17 22:48:20.000000000 -0800 -@@ -10,6 +10,24 @@ - local $web_sslport = $tmpl->{'web_sslport'} || 443; - &require_apache(); - local $conf = &apache::get_config(); -+ -+# add NameVirtualHost if needed -+if ($_[0]->{'name'}) { -+ local $found; -+ local @nv = &apache::find_directive("NameVirtualHost", $conf); -+ foreach $nv (@nv) { -+ $found++ if ($nv eq $_[0]->{'ip'} || -+ $nv =~ /^(\S+):(\S+)/ && $1 eq $_[0]->{'ip'} && $2 eq "443" || -+ $nv eq '*'); -+ } -+ if(!$foundssl) { -+ &apache::save_directive("NameVirtualHost", -+ [ @nv, $_[0]->{'ip'}.":443" ], -+ $conf, $conf); -+ &flush_file_lines(); -+ } -+ } -+ - if ($apache::config{'virt_file'}) { - $f = -d $apache::config{'virt_file'} ? - "$apache::config{'virt_file'}/www.$_[0]->{'dom'}.conf" : -diff -Naur virtual-server.orig/feature-web.pl virtual-server/feature-web.pl ---- virtual-server.orig/feature-web.pl 2004-10-07 17:07:06.000000000 -0700 -+++ virtual-server/feature-web.pl 2004-11-17 22:52:13.024826263 -0800 -@@ -40,7 +40,7 @@ - local @nv = &apache::find_directive("NameVirtualHost", $conf); - foreach $nv (@nv) { - $found++ if ( #$nv eq $_[0]->{'ip'} || -- $nv =~ /^(\S+):(\S+)/ && $1 eq $_[0]->{'ip'} || -+ $nv =~ /^(\S+):(\S+)/ && $1 eq $_[0]->{'ip'} && $2 eq $web_port || - $nv eq '*'); - $found_no_port++ if $nv eq $_[0]->{'ip'}; - $nvstar++ if ($nv eq "*"); -@@ -248,7 +248,7 @@ - &$first_print($text{'save_apache'}); - local $lref = &read_file_lines($virt->{'file'}); - $lref->[$virt->{'line'}] = -- $_[0]->{'name'} ? "<VirtualHost *>" : -+ $_[0]->{'name'} && !$config{'all_namevirtual'} ? "<VirtualHost *>" : - "<VirtualHost $_[0]->{'ip'}:$_[1]->{'web_port'}>"; - &flush_file_lines(); - $rv++; -diff -Naur virtual-server.orig/help/iface.html virtual-server/help/iface.html ---- virtual-server.orig/help/iface.html 2004-02-09 23:13:33.000000000 -0800 -+++ virtual-server/help/iface.html 2004-11-17 22:53:18.404198519 -0800 -@@ -1,5 +1,9 @@ - <header>Network Interface</header> - -+If you chose 'Create all webs as NameVirtualHost?' in the module configuration, this option will let you select the IP address to use for this site. <p> -+ -+If you did not choose 'Create all webs as NameVirtualHost?' in the module configuration, you will have two options here: <p> -+ - If you want to set up an IP-based virtual host (required for SSL websites or virtual FTP hosting), this option must be set to <b>Virtual interface with IP</b> and an un-used address entered. Virtualmin will activate this IP on your system when the server is created, and associate it with the server. <p> - - If the <b>Shared</b> option is selected, the system's primary network interface address will be used for this server's website and DNS domain instead. <p> diff --git a/app-admin/webmin/files/virtual-server-2.31-pgsql.patch b/app-admin/webmin/files/virtual-server-2.31-pgsql.patch deleted file mode 100644 index 97109242db58..000000000000 --- a/app-admin/webmin/files/virtual-server-2.31-pgsql.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur virtual-server.orig/domain_setup.cgi virtual-server/domain_setup.cgi ---- virtual-server.orig/domain_setup.cgi 2004-10-10 16:25:43.000000000 -0700 -+++ virtual-server/domain_setup.cgi 2004-11-17 22:41:50.285398317 -0800 -@@ -70,6 +70,11 @@ - $user =~ /^[^\t :]+$/ || &error($text{'setup_euser2'}); - defined(getpwnam($user)) && &error($text{'setup_euser'}); - } -+ -+ if ($config{'postgres'} && $in{'postgres'}) { -+ $user =~ /^[A-Za-z]/ || &error("Username must begin with a letter if you are using postgres."); -+ } -+ - if ($in{'mgroup_def'}) { - $group = $user; - } diff --git a/app-admin/webmin/files/virtual-server-2.60-nocgibin.patch b/app-admin/webmin/files/virtual-server-2.60-nocgibin.patch deleted file mode 100644 index 3379dffbf0fb..000000000000 --- a/app-admin/webmin/files/virtual-server-2.60-nocgibin.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naurp webmin-1.210.orig/virtual-server/feature-dir.pl webmin-1.210/virtual-server/feature-dir.pl ---- webmin-1.210.orig/virtual-server/feature-dir.pl 2005-04-12 17:27:34.000000000 -0700 -+++ webmin-1.210/virtual-server/feature-dir.pl 2005-06-24 10:00:03.000000000 -0700 -@@ -38,8 +38,8 @@ if ($tmpl->{'skel'} ne "none") { - # Setup web directories - local $d; - local $perms = $tmpl->{'web_html_perms'}; -+# [ 'cgi-bin', '755' ], - foreach $d ( [ &public_html_dir($_[0], 1), $perms ], -- [ 'cgi-bin', '755' ], - [ 'logs', '755' ], - [ $config{'homes_dir'}, '755' ] ) { - &system_logged("mkdir -p $qh/$d->[0] 2>/dev/null"); -diff -Naurp webmin-1.210.orig/virtual-server/import.cgi webmin-1.210/virtual-server/import.cgi ---- webmin-1.210.orig/virtual-server/import.cgi 2005-02-21 21:01:02.000000000 -0800 -+++ webmin-1.210/virtual-server/import.cgi 2005-06-24 10:00:24.000000000 -0700 -@@ -164,8 +164,8 @@ if ($in{'confirm'}) { - - # Setup web directories - print $text{'import_dirs'},"<br>\n"; -+# [ 'cgi-bin', '755' ], - foreach $d ( [ $config{'html_dir'} || 'public_html', '755' ], -- [ 'cgi-bin', '755' ], - [ 'logs', '755' ], - [ $config{'homes_dir'}, '755' ] ) { - if (!-d "$uinfo{'home'}/$d->[0]") { diff --git a/app-admin/webmin/files/virtual-server-2.610-checkip.patch b/app-admin/webmin/files/virtual-server-2.610-checkip.patch deleted file mode 100644 index 70cc065a20ca..000000000000 --- a/app-admin/webmin/files/virtual-server-2.610-checkip.patch +++ /dev/null @@ -1,16 +0,0 @@ -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' => diff --git a/app-admin/webmin/files/webmin-1.170-postfix.patch b/app-admin/webmin/files/webmin-1.170-postfix.patch deleted file mode 100644 index 002cb7d84ef9..000000000000 --- a/app-admin/webmin/files/webmin-1.170-postfix.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur webmin-1.170.orig/postfix/postfix-lib.pl webmin-1.170/postfix/postfix-lib.pl ---- webmin-1.170.orig/postfix/postfix-lib.pl 2004-11-12 20:00:28.000000000 -0800 -+++ webmin-1.170/postfix/postfix-lib.pl 2004-11-17 22:10:48.298393107 -0800 -@@ -604,12 +604,12 @@ - { - &get_maps($_[0], $_[2]); # force cache init - my @maps_files = $_[2] ? @{$_[2]} : &get_maps_files(&get_real_value($_[0])); --local $lref = &read_file_lines($maps_files[0]); -+local $lref = &read_file_lines($maps_files[$#maps_files]); - push(@$lref, "$_[1]->{'name'}\t$_[1]->{'value'}"); - &flush_file_lines(); - --$_[1]->{'map_file'} = $maps_files[0]; --$_[1]->{'file'} = $maps_files[0]; -+$_[1]->{'map_file'} = $maps_files[$#maps_files]; -+$_[1]->{'file'} = $maps_files[$#maps_files]; - $_[1]->{'line'} = @$lref - 1; - $_[1]->{'number'} = scalar(@{$maps_cache{$_[0]}}); - push(@{$maps_cache{$_[0]}}, $_[1]); diff --git a/app-admin/webmin/files/webmin-1.230-ldap-useradmin.patch b/app-admin/webmin/files/webmin-1.230-ldap-useradmin.patch deleted file mode 100644 index bc7562db4720..000000000000 --- a/app-admin/webmin/files/webmin-1.230-ldap-useradmin.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naurp webmin-1.230.orig/ldap-useradmin/save_user.cgi webmin-1.230/ldap-useradmin/save_user.cgi ---- webmin-1.230.orig/ldap-useradmin/save_user.cgi 2005-09-19 05:32:05.000000000 -0700 -+++ webmin-1.230/ldap-useradmin/save_user.cgi 2005-09-21 16:54:26.000000000 -0700 -@@ -301,7 +301,7 @@ else { - $shadow = &shadow_fields(); - - # Add to the ldap database -- @classes = ( "posixAccount", "shadowAccount" ); -+ @classes = ( "posixAccount", "shadowAccount", "person" ); - - push(@classes, split(/\s+/, $config{'other_class'})); - push(@classes, $samba_class) if ($in{'samba'}); -@@ -718,8 +718,8 @@ if ($config{'given'}) { - if ($lastname && &in_schema($schema, "sn")); - } - else { -- #push(@props, "sn", $in{'real'}) -- # if (&in_schema($schema, "sn")); -+ push(@props, "sn", $in{'real'}) -+ if (&in_schema($schema, "sn")); - } - if (&in_schema($schema, "gecos")) { - push(@props, "gecos", $in{'real'}); diff --git a/app-admin/webmin/files/webmin-1.300-postfix.patch b/app-admin/webmin/files/webmin-1.300-postfix.patch deleted file mode 100644 index 15384d689012..000000000000 --- a/app-admin/webmin/files/webmin-1.300-postfix.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naurp webmin-1.300.orig/postfix/postfix-lib.pl webmin-1.300/postfix/postfix-lib.pl ---- webmin-1.300.orig/postfix/postfix-lib.pl 2006-09-14 15:21:43.000000000 -0700 -+++ webmin-1.300/postfix/postfix-lib.pl 2006-10-16 11:55:45.000000000 -0700 -@@ -682,15 +682,15 @@ sub create_mapping - { - &get_maps($_[0], $_[2]); # force cache init - my @maps_files = $_[2] ? @{$_[2]} : &get_maps_files(&get_real_value($_[0])); --local $lref = &read_file_lines($maps_files[0]); -+local $lref = &read_file_lines($maps_files[$#maps_files]); - $_[1]->{'line'} = scalar(@$lref); - push(@$lref, &make_table_comment($_[1]->{'cmt'})); - push(@$lref, "$_[1]->{'name'}\t$_[1]->{'value'}"); - $_[1]->{'eline'} = scalar(@$lref)-1; - &flush_file_lines(); - --$_[1]->{'map_file'} = $maps_files[0]; --$_[1]->{'file'} = $maps_files[0]; -+$_[1]->{'map_file'} = $maps_files[$#maps_files]; -+$_[1]->{'file'} = $maps_files[$#maps_files]; - $_[1]->{'number'} = scalar(@{$maps_cache{$_[0]}}); - push(@{$maps_cache{$_[0]}}, $_[1]); - } |