summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2009-01-14 10:18:28 +0000
committerBenedikt Boehm <hollow@gentoo.org>2009-01-14 10:18:28 +0000
commit7be7125da84fa818e530d292a03f22c4200448bf (patch)
tree1f05386a0137c8c70b056c08a707b5a750c0043b /www-apache
parentx86 stable wrt #254621 (diff)
downloadhistorical-7be7125da84fa818e530d292a03f22c4200448bf.tar.gz
historical-7be7125da84fa818e530d292a03f22c4200448bf.tar.bz2
historical-7be7125da84fa818e530d292a03f22c4200448bf.zip
chroot support is built into apache 2.2.10, fixes #254450
Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.22-vs2.3.0.34-gentoo x86_64
Diffstat (limited to 'www-apache')
-rw-r--r--www-apache/mod_chroot/ChangeLog8
-rw-r--r--www-apache/mod_chroot/Manifest16
-rw-r--r--www-apache/mod_chroot/mod_chroot-0.4.ebuild25
-rw-r--r--www-apache/mod_chroot/mod_chroot-0.5.ebuild6
4 files changed, 11 insertions, 44 deletions
diff --git a/www-apache/mod_chroot/ChangeLog b/www-apache/mod_chroot/ChangeLog
index 5a886ac894f9..dc71a4538dfc 100644
--- a/www-apache/mod_chroot/ChangeLog
+++ b/www-apache/mod_chroot/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-apache/mod_chroot
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_chroot/ChangeLog,v 1.15 2008/03/07 22:28:05 angelos Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_chroot/ChangeLog,v 1.16 2009/01/14 10:18:28 hollow Exp $
+
+ 14 Jan 2009; Benedikt Böhm <hollow@gentoo.org> -mod_chroot-0.4.ebuild,
+ mod_chroot-0.5.ebuild:
+ chroot support is built into apache 2.2.10, fixes #254450
07 Mar 2008; Christoph Mende <angelos@gentoo.org> mod_chroot-0.5.ebuild:
Stable on amd64, bug #208554
diff --git a/www-apache/mod_chroot/Manifest b/www-apache/mod_chroot/Manifest
index 1ec35d8c141c..feedf10f7b77 100644
--- a/www-apache/mod_chroot/Manifest
+++ b/www-apache/mod_chroot/Manifest
@@ -1,17 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX 15_mod_chroot.conf 156 RMD160 8b5102e67c6221b0ec4663940a1cda2ff16b3814 SHA1 3ef91faf7961fc48eedf8587bcafb504d94d75be SHA256 dd726bb5fe77719b172ab31acb3a4fd2cdb091aca0d72f013cc7b03ae180b864
-DIST mod_chroot-0.4.tar.gz 14661 RMD160 e98787f0b4bd83b78f92da8eb1dc70450aa90373 SHA1 f3b4107a06e16b819bade60ac5ea37e5bfb73b70 SHA256 ceb71daad5a0093096cc8d223473f14307dbdde95f86019cf59fb078731b88b3
DIST mod_chroot-0.5.tar.gz 15055 RMD160 baba1cac0f05953dac5ab7f483bbc49417eaf8ff SHA1 42935c37fb163ff519651ddd0b0fd6982a978015 SHA256 d29c34b52d8eb94a725dc8e7124df0e5a86282cd0c405c792fda70ec9f0f7cac
-EBUILD mod_chroot-0.4.ebuild 701 RMD160 73c2976e99c43d5d03cc435d42732b24b431b743 SHA1 2027c8de91767590d554aee7bbec3e02221932dc SHA256 01100c409ea742ee313fc9507bb58c3c1e7badaded1baf3531788d43b05ddf92
-EBUILD mod_chroot-0.5.ebuild 708 RMD160 53ace38a68e4aa6a8ef33f0cfb90d5397cbfea34 SHA1 6110f53e8ef453a788a8a9b2a6553c4e23927514 SHA256 c1114d30a9a4c445419842d2480829ffef94f04ec04637ab951f2800f8b61953
-MISC ChangeLog 2016 RMD160 e957a4c677da2508e923b27340279565bb46853a SHA1 d3a7c962e26b65c8b226d9d193cc7d20f0317f71 SHA256 4ce10ccb524c97de10079282ef40941de6ffe67ec3cb2299a71281e21dd449cc
+EBUILD mod_chroot-0.5.ebuild 735 RMD160 03b6bb935e2c7603642c33c96d90df0bf487d24f SHA1 0f203d93d0d8d7d08f43d9ff9c34b3857f3ab77e SHA256 9f5ff82afa5f9d3f509cc76a47b097b29a1b96c6c4a91a97474e741d32065f83
+MISC ChangeLog 2175 RMD160 cd3cfbba0b07016a68f13b3911ca52256ddf1531 SHA1 88742bb053a0fa9d46533578a6ff0d53e057f793 SHA256 f71c60b0d3327975db1e14c560c6a816e099daaf27dc024f20e18da3c202b68a
MISC metadata.xml 160 RMD160 a0f6e133e170b7477018d8584c20e8723f6914fa SHA1 a3b9b520ec43ee1f9b1c7b5c5b8745bf84454c03 SHA256 3c312146c4cb5b912d6f56292242ce3a85c629ca98ee7ef0a84ca575708b44fe
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH0cF6KhnDs22gwa8RAjO2AJ9VkgNYSqxUbMy/m5IgNApK6T8I8gCg9L2e
-SkEenAj3y7bdYMj2pgYXOF4=
-=8va4
------END PGP SIGNATURE-----
diff --git a/www-apache/mod_chroot/mod_chroot-0.4.ebuild b/www-apache/mod_chroot/mod_chroot-0.4.ebuild
deleted file mode 100644
index b38aa094cda6..000000000000
--- a/www-apache/mod_chroot/mod_chroot-0.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_chroot/mod_chroot-0.4.ebuild,v 1.5 2007/09/21 20:57:33 hollow Exp $
-
-inherit apache-module
-
-KEYWORDS="ppc x86"
-
-DESCRIPTION="mod_chroot allows you to run Apache in a chroot jail with no additional files."
-HOMEPAGE="http://core.segfault.pl/~hobbit/mod_chroot/"
-SRC_URI="http://core.segfault.pl/~hobbit/mod_chroot/dist/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-APXS2_S="${S}/src/apache20"
-APACHE2_MOD_CONF="15_${PN}"
-APACHE2_MOD_DEFINE="CHROOT"
-
-DOCFILES="CAVEATS ChangeLog INSTALL README README.Apache20"
-
-need_apache
diff --git a/www-apache/mod_chroot/mod_chroot-0.5.ebuild b/www-apache/mod_chroot/mod_chroot-0.5.ebuild
index bfa737c9429f..737491220b33 100644
--- a/www-apache/mod_chroot/mod_chroot-0.5.ebuild
+++ b/www-apache/mod_chroot/mod_chroot-0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_chroot/mod_chroot-0.5.ebuild,v 1.7 2008/03/07 22:28:05 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_chroot/mod_chroot-0.5.ebuild,v 1.8 2009/01/14 10:18:28 hollow Exp $
inherit apache-module
@@ -14,7 +14,7 @@ SLOT="0"
IUSE=""
DEPEND=""
-RDEPEND=""
+RDEPEND="!>=www-servers/apache-2.2.10"
APXS2_S="${S}/src/apache20"
APACHE2_MOD_CONF="15_${PN}"