diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2004-05-31 07:51:50 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2004-05-31 07:51:50 +0000 |
| commit | cce8b710b19ae2103d63d4f657f2e8fe412855fc (patch) | |
| tree | 510515ed0ffac0fbfc98a92e80d67ffa1063b63f /app-admin | |
| parent | Fixes bugs #46900, #47761, #48891, and hopefully #51080. (Manifest recommit) (diff) | |
| download | gentoo-2-cce8b710b19ae2103d63d4f657f2e8fe412855fc.tar.gz gentoo-2-cce8b710b19ae2103d63d4f657f2e8fe412855fc.tar.bz2 gentoo-2-cce8b710b19ae2103d63d4f657f2e8fe412855fc.zip | |
Updated apache2 patch to include path change in webalizer module.
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/webmin/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/webmin/files/webmin-1.140-apache2.patch | 14 | ||||
| -rw-r--r-- | app-admin/webmin/webmin-1.140-r1.ebuild | 4 |
3 files changed, 19 insertions, 5 deletions
diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog index 84e4c17eea55..e9a2a0ed7e40 100644 --- a/app-admin/webmin/ChangeLog +++ b/app-admin/webmin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/webmin # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.45 2004/05/22 22:58:43 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.46 2004/05/31 07:51:50 eradicator Exp $ + + 31 May 2004; Jeremy Huddleston <eradicator@gentoo.org> + webmin-1.140-r1.ebuild, files/webmin-1.140-apache2.patch: + Updated apache2 patch to include path change in webalizer module. 22 May 2004; Jason Wever <weeve@gentoo.org> webmin-1.140-r1.ebuild: Stable on sparc. diff --git a/app-admin/webmin/files/webmin-1.140-apache2.patch b/app-admin/webmin/files/webmin-1.140-apache2.patch index 2e96af826b10..4b4e3abd03f2 100644 --- a/app-admin/webmin/files/webmin-1.140-apache2.patch +++ b/app-admin/webmin/files/webmin-1.140-apache2.patch @@ -1,5 +1,6 @@ ---- apache/config-gentoo-linux.orig 2004-05-15 00:49:39.000000000 -0700 -+++ apache/config-gentoo-linux 2004-05-15 00:50:21.000000000 -0700 +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 @@ -18,3 +19,12 @@ 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/webmin-1.140-r1.ebuild b/app-admin/webmin/webmin-1.140-r1.ebuild index 4e7f9900d9c1..65391b974509 100644 --- a/app-admin/webmin/webmin-1.140-r1.ebuild +++ b/app-admin/webmin/webmin-1.140-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.140-r1.ebuild,v 1.6 2004/05/22 22:58:43 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.140-r1.ebuild,v 1.7 2004/05/31 07:51:50 eradicator Exp $ inherit eutils @@ -27,7 +27,7 @@ src_unpack() { # Bug #47020 epatch ${FILESDIR}/${PN}-1.130-webalizer.patch - # Bug #50810 + # Bug #50810, #51943 if use apache2; then epatch ${FILESDIR}/${PN}-1.140-apache2.patch fi |