diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-04-18 15:09:02 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-04-18 15:09:02 +0000 |
| commit | 3b6820bec54e5d2781e1849357dee5179d234827 (patch) | |
| tree | 5c66a963566a56c830590b8cd9176755594c9611 /app-admin/webmin | |
| parent | remove circular moves (diff) | |
| download | gentoo-2-3b6820bec54e5d2781e1849357dee5179d234827.tar.gz gentoo-2-3b6820bec54e5d2781e1849357dee5179d234827.tar.bz2 gentoo-2-3b6820bec54e5d2781e1849357dee5179d234827.zip | |
Edited apache2 patch. Closes bug #89518.
(Portage version: 2.0.51.19)
Diffstat (limited to 'app-admin/webmin')
| -rw-r--r-- | app-admin/webmin/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/webmin/Manifest | 2 | ||||
| -rw-r--r-- | app-admin/webmin/files/webmin-1.140-apache2.patch | 7 |
3 files changed, 10 insertions, 5 deletions
diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog index 979bb458745b..c2bf379056f6 100644 --- a/app-admin/webmin/ChangeLog +++ b/app-admin/webmin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/webmin # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.83 2005/04/16 07:39:21 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.84 2005/04/18 15:09:02 eradicator Exp $ + + 18 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org> + files/webmin-1.140-apache2.patch: + Edited apache2 patch. Closes bug #89518. 16 Apr 2005; Markus Rothe <corsair@gentoo.org> webmin-1.200.ebuild: Stable on ppc64; bug #89141 diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest index 916190a9234a..e4eae52dab19 100644 --- a/app-admin/webmin/Manifest +++ b/app-admin/webmin/Manifest @@ -13,7 +13,7 @@ MD5 cc16dcb159f84c912365504002444a08 files/virtual-server-2.31-namevirtual.patch MD5 cad6a5577a4c4b3773702ab1bd8d6461 files/virtual-server-2.31-nocgibin.patch 1073 MD5 4f5dc10c2c1d19218cecfc2a678a0ce4 files/virtual-server-2.31-pgsql.patch 579 MD5 bb2acab90ada721c723d91a5a97c193c files/webmin-1.130-webalizer.patch 615 -MD5 a01d77a867d5469c7211685bfd04f6f6 files/webmin-1.140-apache2.patch 1227 +MD5 395e49092aa7b9e808d3e9d723508884 files/webmin-1.140-apache2.patch 1250 MD5 0ebd73f1cd5948ec1c3532a2f59f2c53 files/webmin-1.170-postfix.patch 868 MD5 512204473654b6eb41308d3319ba6144 files/webmin-1.170-setup-nocheck.patch 943 MD5 e7e3780c0bf03968b380535064c54213 files/webmin-gentoo-init 859 diff --git a/app-admin/webmin/files/webmin-1.140-apache2.patch b/app-admin/webmin/files/webmin-1.140-apache2.patch index 4b4e3abd03f2..bd45dfbc2160 100644 --- a/app-admin/webmin/files/webmin-1.140-apache2.patch +++ b/app-admin/webmin/files/webmin-1.140-apache2.patch @@ -7,15 +7,16 @@ diff -Naur webmin-1.140.orig/apache/config-gentoo-linux webmin-1.140/apache/conf -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/apache stop ++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/conf/apache2.conf -+mime_types=/etc/apache2/conf/mime.types ++httpd_conf=/etc/apache2/httpd.conf ++mime_types=/etc/apache2/mime.types show_order=0 max_servers=100 test_config=1 |