From 71e9bdf303b49f78382968a65d8ad74a9be17ee1 Mon Sep 17 00:00:00 2001 From: Jonathan Callen Date: Mon, 9 Nov 2009 11:20:13 +0000 Subject: Drop unused files (Portage version: -svn/cvs/Linux i686) --- app-admin/webmin/ChangeLog | 9 ++++++- .../files/virtual-server-3.23-nocgibin.patch | 13 --------- .../webmin/files/virtual-server-3.23-pgsql.patch | 14 ---------- app-admin/webmin/files/webmin-1.140-apache2.patch | 31 ---------------------- .../webmin/files/webmin-1.270-ldap-useradmin.patch | 12 --------- 5 files changed, 8 insertions(+), 71 deletions(-) delete mode 100644 app-admin/webmin/files/virtual-server-3.23-nocgibin.patch delete mode 100644 app-admin/webmin/files/virtual-server-3.23-pgsql.patch delete mode 100644 app-admin/webmin/files/webmin-1.140-apache2.patch delete mode 100644 app-admin/webmin/files/webmin-1.270-ldap-useradmin.patch (limited to 'app-admin/webmin') diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog index 262c24ef6901..07655c7823f8 100644 --- a/app-admin/webmin/ChangeLog +++ b/app-admin/webmin/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-admin/webmin # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.185 2009/10/23 14:25:08 vostorga Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.186 2009/11/09 11:20:13 abcd Exp $ + + 09 Nov 2009; Jonathan Callen + -files/webmin-1.140-apache2.patch, + -files/webmin-1.270-ldap-useradmin.patch, + -files/virtual-server-3.23-nocgibin.patch, + -files/virtual-server-3.23-pgsql.patch: + Drop unused files 23 Oct 2009; Víctor Ostorga webmin-1.490.ebuild: Fixing sandbox violation with iptables, bug 267996 diff --git a/app-admin/webmin/files/virtual-server-3.23-nocgibin.patch b/app-admin/webmin/files/virtual-server-3.23-nocgibin.patch deleted file mode 100644 index f527efc9ae98..000000000000 --- a/app-admin/webmin/files/virtual-server-3.23-nocgibin.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naurp webmin-1.300.orig/virtual-server/feature-dir.pl webmin-1.300/virtual-server/feature-dir.pl ---- webmin-1.300.orig/virtual-server/feature-dir.pl 2006-10-01 17:21:42.000000000 -0700 -+++ webmin-1.300/virtual-server/feature-dir.pl 2006-10-16 12:01:09.000000000 -0700 -@@ -262,8 +262,8 @@ sub virtual_server_directories - { - local $tmpl = &get_template($_[0]->{'template'}); - local $perms = $tmpl->{'web_html_perms'}; -+# [ 'cgi-bin', $perms ], - return ( [ &public_html_dir($_[0], 1), $perms ], -- [ 'cgi-bin', $perms ], - [ 'logs', '750' ], - [ $config{'homes_dir'}, '755' ] ); - } diff --git a/app-admin/webmin/files/virtual-server-3.23-pgsql.patch b/app-admin/webmin/files/virtual-server-3.23-pgsql.patch deleted file mode 100644 index 3f10f5daa9af..000000000000 --- a/app-admin/webmin/files/virtual-server-3.23-pgsql.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naurp webmin-1.300.orig/virtual-server/domain_setup.cgi webmin-1.300/virtual-server/domain_setup.cgi ---- webmin-1.300.orig/virtual-server/domain_setup.cgi 2006-10-01 17:21:42.000000000 -0700 -+++ webmin-1.300/virtual-server/domain_setup.cgi 2006-10-16 12:07:09.000000000 -0700 -@@ -81,6 +81,10 @@ if (!$parentuser) { - 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."); -+ } -+ - # Parse mail group name - if ($in{'mgroup_def'}) { - $in{'dom'} =~ /^([^\.]+)/; diff --git a/app-admin/webmin/files/webmin-1.140-apache2.patch b/app-admin/webmin/files/webmin-1.140-apache2.patch deleted file mode 100644 index bd45dfbc2160..000000000000 --- a/app-admin/webmin/files/webmin-1.140-apache2.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Naur webmin-1.140.orig/apache/config-gentoo-linux webmin-1.140/apache/config-gentoo-linux ---- webmin-1.140.orig/apache/config-gentoo-linux 2004-04-05 16:24:24.000000000 -0700 -+++ webmin-1.140/apache/config-gentoo-linux 2004-05-31 00:48:39.000000000 -0700 -@@ -1,11 +1,11 @@ - show_list=0 --httpd_dir=/etc/apache --httpd_path=/usr/sbin/apache --apachectl_path=/usr/sbin/apachectl --start_cmd=/etc/init.d/apache start --stop_cmd=/etc/init.d/apache stop -+httpd_dir=/etc/apache2 -+httpd_path=/usr/sbin/apache2 -+apachectl_path=/usr/sbin/apache2ctl -+start_cmd=/etc/init.d/apache2 start -+stop_cmd=/etc/init.d/apache2 stop --httpd_conf=/etc/apache/conf/apache.conf --mime_types=/etc/apache/conf/mime.types -+httpd_conf=/etc/apache2/httpd.conf -+mime_types=/etc/apache2/mime.types - show_order=0 - max_servers=100 - test_config=1 -diff -Naur webmin-1.140.orig/webalizer/config-gentoo-linux webmin-1.140/webalizer/config-gentoo-linux ---- webmin-1.140.orig/webalizer/config-gentoo-linux 2004-04-05 16:25:23.000000000 -0700 -+++ webmin-1.140/webalizer/config-gentoo-linux 2004-05-31 00:49:06.000000000 -0700 -@@ -1,4 +1,4 @@ - webalizer=webalizer --webalizer_conf=/etc/apache/conf/webalizer.conf -+webalizer_conf=/etc/apache2/conf/webalizer.conf - auto=apache,squid - su_shell=1 diff --git a/app-admin/webmin/files/webmin-1.270-ldap-useradmin.patch b/app-admin/webmin/files/webmin-1.270-ldap-useradmin.patch deleted file mode 100644 index 5fc3f31ff868..000000000000 --- a/app-admin/webmin/files/webmin-1.270-ldap-useradmin.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naurp webmin-1.270.orig/ldap-useradmin/save_user.cgi webmin-1.270/ldap-useradmin/save_user.cgi ---- webmin-1.270.orig/ldap-useradmin/save_user.cgi 2006-04-04 16:16:16.000000000 -0700 -+++ webmin-1.270/ldap-useradmin/save_user.cgi 2006-04-12 01:11:04.000000000 -0700 -@@ -319,7 +319,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'}); -- cgit v1.2.3-65-gdbad