Apache herd package refresh

77 files changed, 848 insertions, 109 deletions

diff --git a/net-www/mod_auth_kerb/ChangeLog b/net-www/mod_auth_kerb/ChangeLog
index 786ce5a0d9e4..81da44300c96 100644
--- a/net-www/mod_auth_kerb/ChangeLog
+++ b/net-www/mod_auth_kerb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mod_auth_kerb
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_kerb/ChangeLog,v 1.5 2004/06/25 00:59:36 agriffis Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_kerb/ChangeLog,v 1.6 2005/01/09 00:38:29 hollow Exp $
+
+*mod_auth_kerb-4.11-r1 (09 Jan 2005)
+
+  09 Jan 2005; Benedikt Boehm <hollow@gentoo.org> metadata.xml,
+  +files/4.11-r1/11_mod_auth_kerb.conf, +mod_auth_kerb-4.11-r1.ebuild:
+  Apache herd package refresh
 
   20 Jun 2004; Chuck Short <zul@gentoo.org> mod_auth_kerb-4.11.ebuild:
   Ebuild cleanups.
diff --git a/net-www/mod_auth_kerb/Manifest b/net-www/mod_auth_kerb/Manifest
index 151771e6d745..cbe20c33326a 100644
--- a/net-www/mod_auth_kerb/Manifest
+++ b/net-www/mod_auth_kerb/Manifest
@@ -1,6 +1,9 @@
-MD5 b410f7e3cc8a0e040b764797e16a21c1 ChangeLog 522
-MD5 d2da0e45d7e39184d1cb7abbe3879086 metadata.xml 159
-MD5 a2041c43efa1eec88dc325f40760ab07 mod_auth_kerb-4.11.ebuild 1081
+MD5 b5b9e88e860a68d57928248ef99056c4 ChangeLog 726
+MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
+MD5 a73629f724fa71b3ab96a32f70deccfe mod_auth_kerb-4.11.ebuild 1081
+MD5 59e80341fef75a7dc798258fabe86654 mod_auth_kerb-4.11-r1.ebuild 863
 MD5 c9bbfd002811a674505b3844837a63ee files/11_mod_auth_kerb.conf 180
-MD5 05d525e36b7e86f564e3a15608eca8e4 files/mod_auth_kerb_register.patch 782
 MD5 7e465f540fb90976cd1c7959ae94e6ab files/digest-mod_auth_kerb-4.11 69
+MD5 05d525e36b7e86f564e3a15608eca8e4 files/mod_auth_kerb_register.patch 782
+MD5 7e465f540fb90976cd1c7959ae94e6ab files/digest-mod_auth_kerb-4.11-r1 69
+MD5 b1d5221d1f57a0c7e01e320bdbec8150 files/4.11-r1/11_mod_auth_kerb.conf 175
diff --git a/net-www/mod_auth_kerb/files/4.11-r1/11_mod_auth_kerb.conf b/net-www/mod_auth_kerb/files/4.11-r1/11_mod_auth_kerb.conf
new file mode 100644
index 000000000000..b4ddd63c53c8
--- /dev/null
+++ b/net-www/mod_auth_kerb/files/4.11-r1/11_mod_auth_kerb.conf
@@ -0,0 +1,7 @@
+<IfDefine AUTH_KERB>
+  <IfModule !mod_auth_kerb.c>
+    LoadModule kerb_auth_module    modules/mod_auth_kerb.so
+  </IfModule>
+</IfDefine>
+
+#Place configuration directives here
diff --git a/net-www/mod_auth_kerb/files/digest-mod_auth_kerb-4.11-r1 b/net-www/mod_auth_kerb/files/digest-mod_auth_kerb-4.11-r1
new file mode 100644
index 000000000000..4464766cbc16
--- /dev/null
+++ b/net-www/mod_auth_kerb/files/digest-mod_auth_kerb-4.11-r1
@@ -0,0 +1 @@
+MD5 2f2c8a52117bfa6248a2c688efb52621 mod_auth_kerb-4.11.tar.gz 14053
diff --git a/net-www/mod_auth_kerb/metadata.xml b/net-www/mod_auth_kerb/metadata.xml
index c054a8cd9b61..10510cb8be95 100644
--- a/net-www/mod_auth_kerb/metadata.xml
+++ b/net-www/mod_auth_kerb/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>apache</herd>
+<maintainer>
+  <email>apache-devs@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/net-www/mod_auth_kerb/mod_auth_kerb-4.11-r1.ebuild b/net-www/mod_auth_kerb/mod_auth_kerb-4.11-r1.ebuild
new file mode 100644
index 000000000000..056940068dc3
--- /dev/null
+++ b/net-www/mod_auth_kerb/mod_auth_kerb-4.11-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_kerb/mod_auth_kerb-4.11-r1.ebuild,v 1.1 2005/01/09 00:38:29 hollow Exp $
+
+inherit eutils apache-module
+
+DESCRIPTION="An Apache2 authentication DSO using Kerberos"
+HOMEPAGE="http://modauthkerb.sourceforge.net/"
+
+S=${WORKDIR}/src
+SRC_URI="mirror://sourceforge/modauthkerb/${P}.tar.gz"
+DEPEND="app-crypt/mit-krb5 =net-www/apache-2*"
+RDEPEND=""
+LICENSE="Apache-1.1"
+KEYWORDS="~x86"
+IUSE=""
+SLOT="0"
+APXS2_S=${S}/modules/kerberos
+APXS2_ARGS="-DAPXS2 -DKRB5 -DKRB5_SAVE_CREDENTIALS -DKRB_DEF_REALM=\\\"EOS.NCSU.EDU\\\" -ldl -lkrb5 -lcom_err -lk5crypto -c ${PN}.c"
+APACHE2_MOD_CONF="${PVR}/11_mod_auth_kerb"
+
+src_unpack() {
+	unpack ${A} || die; cd ${S} || die;
+	epatch ${FILESDIR}/mod_auth_kerb_register.patch
+}
diff --git a/net-www/mod_auth_kerb/mod_auth_kerb-4.11.ebuild b/net-www/mod_auth_kerb/mod_auth_kerb-4.11.ebuild
index be23244960e8..9ed1cb170fbe 100644
--- a/net-www/mod_auth_kerb/mod_auth_kerb-4.11.ebuild
+++ b/net-www/mod_auth_kerb/mod_auth_kerb-4.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_kerb/mod_auth_kerb-4.11.ebuild,v 1.7 2004/06/25 00:59:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_kerb/mod_auth_kerb-4.11.ebuild,v 1.8 2005/01/09 00:38:29 hollow Exp $
 
 inherit eutils
 
diff --git a/net-www/mod_injection/ChangeLog b/net-www/mod_injection/ChangeLog
index 1876015a2058..34f76b6c6af2 100644
--- a/net-www/mod_injection/ChangeLog
+++ b/net-www/mod_injection/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mod_injection
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_injection/ChangeLog,v 1.9 2004/09/03 23:24:08 pvdabeel Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_injection/ChangeLog,v 1.10 2005/01/09 00:35:41 hollow Exp $
+
+*mod_injection-0.3.1-r1 (09 Jan 2005)
+
+  09 Jan 2005; Benedikt Boehm <hollow@gentoo.org> metadata.xml,
+  +files/0.3.1-r1/23_mod_injection.conf, +mod_injection-0.3.1-r1.ebuild:
+  Apache herd package refresh
 
   04 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   mod_injection-0.3.1.ebuild:
diff --git a/net-www/mod_injection/Manifest b/net-www/mod_injection/Manifest
index 0633ae20e84c..8bc16f670c27 100644
--- a/net-www/mod_injection/Manifest
+++ b/net-www/mod_injection/Manifest
@@ -1,8 +1,11 @@
-MD5 7ae4613bf394f263473ff94f652e59aa ChangeLog 1019
-MD5 d2da0e45d7e39184d1cb7abbe3879086 metadata.xml 159
-MD5 0cbfe48eb1dbd14b07d3e46391832aac mod_injection-0.3.0.ebuild 985
-MD5 78ea68da356be7fbf046ac0450bb47c0 mod_injection-0.3.1.ebuild 989
+MD5 39b6f303b9c7c40ed26a86b374eda42b ChangeLog 1226
+MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
+MD5 4feb4f52ba02b841d74931972015996b mod_injection-0.3.0.ebuild 985
+MD5 4fb8d8e18190a5e2ee5f426befc6de45 mod_injection-0.3.1.ebuild 989
+MD5 8fadf55965e4287d28355f63a39c54b4 mod_injection-0.3.1-r1.ebuild 720
 MD5 a3f0476015e2855d6cf3e66904b232ee files/23_mod_injection.conf 425
 MD5 410d8669ac36d7b41a388e09552a56f8 files/digest-mod_injection-0.3.0 70
 MD5 c98c6ef4db7edb9062e38dc6c16248e1 files/digest-mod_injection-0.3.1 70
 MD5 189338a2b70fef859aa31149b9143123 files/mod_injection-0.3.0-register.patch 919
+MD5 c98c6ef4db7edb9062e38dc6c16248e1 files/digest-mod_injection-0.3.1-r1 70
+MD5 1e8adbbf6d23b79dcf01b09ada7e0bb6 files/0.3.1-r1/23_mod_injection.conf 419
diff --git a/net-www/mod_injection/files/0.3.1-r1/23_mod_injection.conf b/net-www/mod_injection/files/0.3.1-r1/23_mod_injection.conf
new file mode 100644
index 000000000000..be2b318bc3c4
--- /dev/null
+++ b/net-www/mod_injection/files/0.3.1-r1/23_mod_injection.conf
@@ -0,0 +1,20 @@
+<IfDefine INJECTION>
+  <IfModule !mod_injection.c>
+    LoadModule injection_module    modules/mod_injection.so
+  </IfModule>
+</IfDefine>
+
+<IfModule mod_injection.c>
+
+    AddOutputFilter INJECTION .html
+
+<Location _REPLACE_ME_>
+
+    SetOutputFilter INJECTION
+    InjectString "<h1>Injected text from the config file...</h1>"
+#    InjectTag InjectTagTitle
+#    InjectAfter "<!-- replace_me -->"
+
+</Location>
+
+</IfModule>
diff --git a/net-www/mod_injection/files/digest-mod_injection-0.3.1-r1 b/net-www/mod_injection/files/digest-mod_injection-0.3.1-r1
new file mode 100644
index 000000000000..4115043d73d4
--- /dev/null
+++ b/net-www/mod_injection/files/digest-mod_injection-0.3.1-r1
@@ -0,0 +1 @@
+MD5 0ba75046af2d6f230e3c37fe90275b94 mod_injection-0.3.1.tar.gz 12350
diff --git a/net-www/mod_injection/metadata.xml b/net-www/mod_injection/metadata.xml
index c054a8cd9b61..10510cb8be95 100644
--- a/net-www/mod_injection/metadata.xml
+++ b/net-www/mod_injection/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>apache</herd>
+<maintainer>
+  <email>apache-devs@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/net-www/mod_injection/mod_injection-0.3.0.ebuild b/net-www/mod_injection/mod_injection-0.3.0.ebuild
index 9ffe977f2314..aa98d4d76a93 100644
--- a/net-www/mod_injection/mod_injection-0.3.0.ebuild
+++ b/net-www/mod_injection/mod_injection-0.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_injection/mod_injection-0.3.0.ebuild,v 1.5 2004/06/25 01:01:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_injection/mod_injection-0.3.0.ebuild,v 1.6 2005/01/09 00:35:41 hollow Exp $
 
 inherit eutils
 
diff --git a/net-www/mod_injection/mod_injection-0.3.1-r1.ebuild b/net-www/mod_injection/mod_injection-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..92348ed43162
--- /dev/null
+++ b/net-www/mod_injection/mod_injection-0.3.1-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_injection/mod_injection-0.3.1-r1.ebuild,v 1.1 2005/01/09 00:35:41 hollow Exp $
+
+inherit eutils apache-module
+
+DESCRIPTION="An Apache2 filtering module"
+HOMEPAGE="http://pmade.org/pjones/software/mod_injection/"
+SRC_URI="http://pmade.org/pjones/software/${PN}/download/${P}.tar.gz"
+
+LICENSE="Apache-1.1"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+SLOT="0"
+
+APXS2_S="${S}"
+APXS2_ARGS="-c src/${PN}.c"
+APACHE2_MOD_FILE="src/.libs/${PN}.so"
+APACHE2_MOD_CONF="${PVR}/23_mod_injection"
+APACHE2_MOD_DEFINE="INJECTION"
+
+DOCFILES="README INSTALL docs/CREDITS docs/manual.txt"
+
+need_apache2
diff --git a/net-www/mod_injection/mod_injection-0.3.1.ebuild b/net-www/mod_injection/mod_injection-0.3.1.ebuild
index af97be5ca16f..a08f59df4452 100644
--- a/net-www/mod_injection/mod_injection-0.3.1.ebuild
+++ b/net-www/mod_injection/mod_injection-0.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_injection/mod_injection-0.3.1.ebuild,v 1.5 2004/09/03 23:24:08 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_injection/mod_injection-0.3.1.ebuild,v 1.6 2005/01/09 00:35:41 hollow Exp $
 
 inherit eutils
 
diff --git a/net-www/mod_ldap_userdir/ChangeLog b/net-www/mod_ldap_userdir/ChangeLog
index 2c05b23aafae..4789cb6db650 100644
--- a/net-www/mod_ldap_userdir/ChangeLog
+++ b/net-www/mod_ldap_userdir/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/mod_ldap_userdir
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ldap_userdir/ChangeLog,v 1.5 2004/09/03 23:24:08 pvdabeel Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ldap_userdir/ChangeLog,v 1.6 2005/01/09 00:32:44 hollow Exp $
+
+*mod_ldap_userdir-1.1.4-r1 (09 Jan 2005)
+
+  09 Jan 2005; Benedikt Boehm <hollow@gentoo.org> metadata.xml,
+  +files/1.1.4-r1/47_mod_ldap_userdir.conf,
+  +mod_ldap_userdir-1.1.4-r1.ebuild:
+  Apache herd package refresh
 
   04 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   mod_ldap_userdir-1.1.4.ebuild:
diff --git a/net-www/mod_ldap_userdir/Manifest b/net-www/mod_ldap_userdir/Manifest
index 56dac95bbf1a..451279343db4 100644
--- a/net-www/mod_ldap_userdir/Manifest
+++ b/net-www/mod_ldap_userdir/Manifest
@@ -1,7 +1,10 @@
-MD5 51f208173a76708327f92e5b2b63e63f ChangeLog 859
-MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
-MD5 b0017166a3089a2bc18b34e6dc2bd350 mod_ldap_userdir-1.1.1.ebuild 1762
-MD5 c5b4e2ae74e03f377fd4c11acdd18c9d mod_ldap_userdir-1.1.4.ebuild 1766
+MD5 7ab98d3dfb9e8d0a9c322bb74aac5061 ChangeLog 1077
+MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
+MD5 034d87472187fe59ec5b349aa8478cf0 mod_ldap_userdir-1.1.1.ebuild 1762
+MD5 dae94540ba8320e67f156534dad71049 mod_ldap_userdir-1.1.4.ebuild 1766
+MD5 d266ecc0bd548228fef67d097fe69ceb mod_ldap_userdir-1.1.4-r1.ebuild 1101
 MD5 650877f5bf9738cca23bbbeeb5bf87d9 files/47_mod_ldap_userdir.conf 375
 MD5 7c29da41475b54ecba7e1ca97c9d9bea files/digest-mod_ldap_userdir-1.1.1 73
 MD5 9d191153d39cdfc62b5be04e66ec88c4 files/digest-mod_ldap_userdir-1.1.4 73
+MD5 9d191153d39cdfc62b5be04e66ec88c4 files/digest-mod_ldap_userdir-1.1.4-r1 73
+MD5 d74d45e0b376cedc4cddc7ada0efe685 files/1.1.4-r1/47_mod_ldap_userdir.conf 370
diff --git a/net-www/mod_ldap_userdir/files/1.1.4-r1/47_mod_ldap_userdir.conf b/net-www/mod_ldap_userdir/files/1.1.4-r1/47_mod_ldap_userdir.conf
new file mode 100644
index 000000000000..73ec9713c026
--- /dev/null
+++ b/net-www/mod_ldap_userdir/files/1.1.4-r1/47_mod_ldap_userdir.conf
@@ -0,0 +1,13 @@
+<IfDefine LDAPuserdir>
+  <IfModule !mod_ldap_userdir.c>
+    LoadModule ldap_userdir_module	modules/mod_ldap_userdir.so
+  </IfModule>
+</IfDefine>
+
+<IfModule mod_ldap_userdir.c>
+
+       LDAPUserDir             public_html
+       LDAPUserDirDNInfo       cn=root,dc=yourcompany,dc=com yourpassword
+       LDAPUserDirBaseDN       ou=People,dc=yourcompany,dc=com
+
+</IfModule>
diff --git a/net-www/mod_ldap_userdir/files/digest-mod_ldap_userdir-1.1.4-r1 b/net-www/mod_ldap_userdir/files/digest-mod_ldap_userdir-1.1.4-r1
new file mode 100644
index 000000000000..85f7f98ae433
--- /dev/null
+++ b/net-www/mod_ldap_userdir/files/digest-mod_ldap_userdir-1.1.4-r1
@@ -0,0 +1 @@
+MD5 05c825259f20028ca2b50f6365c9dbd0 mod_ldap_userdir-1.1.4.tar.gz 36883
diff --git a/net-www/mod_ldap_userdir/metadata.xml b/net-www/mod_ldap_userdir/metadata.xml
index bcaabdbbd0d3..10510cb8be95 100644
--- a/net-www/mod_ldap_userdir/metadata.xml
+++ b/net-www/mod_ldap_userdir/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>apache</herd>
-<longdescription>
-The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating systems including UNIX and Windows NT. The goal of this project is to provide a secure, efficient and extensible server that provides HTTP services in sync with the current HTTP standards.
-</longdescription>
+<maintainer>
+  <email>apache-devs@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.1.ebuild b/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.1.ebuild
index bbe860d7a675..8bad1c106f45 100644
--- a/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.1.ebuild
+++ b/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.1.ebuild,v 1.3 2004/06/25 01:02:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.1.ebuild,v 1.4 2005/01/09 00:32:44 hollow Exp $
 IUSE="apache2"
 
 DESCRIPTION="Apache module that enables ~/public_html from an LDAP directory."
diff --git a/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.4-r1.ebuild b/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..aa8a4cabd4d5
--- /dev/null
+++ b/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.4-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.4-r1.ebuild,v 1.1 2005/01/09 00:32:44 hollow Exp $
+
+inherit apache-module
+
+IUSE="ssl"
+DESCRIPTION="Apache module that enables ~/public_html from an LDAP directory."
+HOMEPAGE="http://horde.net/~jwm/software/mod_ldap_userdir/"
+KEYWORDS="~x86 ~ppc"
+
+S=${WORKDIR}/${P}
+SRC_URI="http://horde.net/~jwm/software/mod_ldap_userdir/${P}.tar.gz"
+
+DEPEND="ssl? (dev-libs/openssl)
+		net-nds/openldap"
+LICENSE="GPL-1"
+SLOT="0"
+
+APXS1_S="${S}"
+APXS2_S="${S}"
+
+APACHE1_MOD_FILE="${S}/mod_ldap_userdir.so"
+APACHE2_MOD_FILE="${S}/mod_ldap_userdir.so"
+
+DOCFILES="DIRECTIVES README user-ldif posixAccount-objectclass"
+APACHE1_MOD_CONF="${PVR}/47_mod_ldap_userdir"
+APACHE2_MOD_CONF="${PVR}/47_mod_ldap_userdir"
+
+need_apache
+
+src_compile() {
+	local myargs="-lldap -llber -c ${PN}.c"
+	useq ssl && myargs="${myargs} -D TLS=1"
+
+	if useq apache2; then
+		APXS2_ARGS="${myargs}"
+	else
+		APXS1_ARGS="${myargs}"
+	fi
+
+	apache_dual_src_compile
+}
diff --git a/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.4.ebuild b/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.4.ebuild
index 5b8baf7b68c7..7fc52d738c27 100644
--- a/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.4.ebuild
+++ b/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.4.ebuild,v 1.4 2004/09/03 23:24:08 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.4.ebuild,v 1.5 2005/01/09 00:32:44 hollow Exp $
 IUSE="apache2"
 
 DESCRIPTION="Apache module that enables ~/public_html from an LDAP directory."
diff --git a/net-www/mod_limitipconn/ChangeLog b/net-www/mod_limitipconn/ChangeLog
index 7daa079027ce..ca8500262f6e 100644
--- a/net-www/mod_limitipconn/ChangeLog
+++ b/net-www/mod_limitipconn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mod_limitipconn
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_limitipconn/ChangeLog,v 1.6 2004/09/03 23:24:08 pvdabeel Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_limitipconn/ChangeLog,v 1.7 2005/01/09 00:29:55 hollow Exp $
+
+*mod_limitipconn-0.22-r1 (09 Jan 2005)
+
+  09 Jan 2005; Benedikt Boehm <hollow@gentoo.org> metadata.xml,
+  +files/27_mod_limitipconn.conf, +mod_limitipconn-0.22-r1.ebuild:
+  Apache herd package refresh
 
   04 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   mod_limitipconn-0.22.ebuild:
diff --git a/net-www/mod_limitipconn/Manifest b/net-www/mod_limitipconn/Manifest
index 2cdf8bbe7b65..dd2c53c59bf1 100644
--- a/net-www/mod_limitipconn/Manifest
+++ b/net-www/mod_limitipconn/Manifest
@@ -1,4 +1,7 @@
-MD5 d4865d04a8dcc9669c5d4679e6da31a1 ChangeLog 843
-MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
-MD5 88720f353f851c0d85db41596cccc957 mod_limitipconn-0.22.ebuild 707
+MD5 e9d9ffb02ecb15e9a2510b81e79e5649 ChangeLog 1045
+MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
+MD5 99caf7a2b713d2d702e4c78f00a8c4fd mod_limitipconn-0.22.ebuild 707
+MD5 27be2976002d2029712918950e318247 mod_limitipconn-0.22-r1.ebuild 735
 MD5 d74c2fe772d1158400818e16f9a55a5f files/digest-mod_limitipconn-0.22 70
+MD5 9dad8cd241c920daa6b6d8740cf2ed01 files/27_mod_limitipconn.conf 624
+MD5 d74c2fe772d1158400818e16f9a55a5f files/digest-mod_limitipconn-0.22-r1 70
diff --git a/net-www/mod_limitipconn/files/27_mod_limitipconn.conf b/net-www/mod_limitipconn/files/27_mod_limitipconn.conf
new file mode 100644
index 000000000000..a4ae72b69f9d
--- /dev/null
+++ b/net-www/mod_limitipconn/files/27_mod_limitipconn.conf
@@ -0,0 +1,21 @@
+<IfDefine LIMITIP>
+  <IfModule !mod_watch.c>
+    LoadModule limitipconn_module    modules/mod_limitipconn.so
+  </IfModule>
+</IfDefine>
+<IfModule mod_limitipconn.c>
+    <Location /somewhere>
+	MaxConnPerIP 3
+	# exempting images from the connection limit is often a good
+	# idea if your web page has lots of inline images, since these
+	# pages often generate a flurry of concurrent image requests
+	NoIPLimit image/*
+    </Location>
+
+    <Location /mp3>
+	MaxConnPerIP 1
+	# In this case, all MIME types other than audio/mpeg and video*
+	# are exempt from the limit check
+	OnlyIPLimit audio/mpeg video
+    </Location>
+</IfModule>
diff --git a/net-www/mod_limitipconn/files/digest-mod_limitipconn-0.22-r1 b/net-www/mod_limitipconn/files/digest-mod_limitipconn-0.22-r1
new file mode 100644
index 000000000000..94d28ffea961
--- /dev/null
+++ b/net-www/mod_limitipconn/files/digest-mod_limitipconn-0.22-r1
@@ -0,0 +1 @@
+MD5 0f4beb9eb4e7b815ca472ccfe11451b3 mod_limitipconn-0.22.tar.gz 6333
diff --git a/net-www/mod_limitipconn/metadata.xml b/net-www/mod_limitipconn/metadata.xml
index bcaabdbbd0d3..10510cb8be95 100644
--- a/net-www/mod_limitipconn/metadata.xml
+++ b/net-www/mod_limitipconn/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>apache</herd>
-<longdescription>
-The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating systems including UNIX and Windows NT. The goal of this project is to provide a secure, efficient and extensible server that provides HTTP services in sync with the current HTTP standards.
-</longdescription>
+<maintainer>
+  <email>apache-devs@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/net-www/mod_limitipconn/mod_limitipconn-0.22-r1.ebuild b/net-www/mod_limitipconn/mod_limitipconn-0.22-r1.ebuild
new file mode 100644
index 000000000000..11dcc2fafbe7
--- /dev/null
+++ b/net-www/mod_limitipconn/mod_limitipconn-0.22-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_limitipconn/mod_limitipconn-0.22-r1.ebuild,v 1.1 2005/01/09 00:29:55 hollow Exp $
+
+inherit eutils apache-module
+
+DESCRIPTION="Allows administrators to limit the number of simultaneous downloads permitted"
+SRC_URI="http://dominia.org/djao/limit/${P}.tar.gz"
+HOMEPAGE="http://dominia.org/djao/limitipconn.html"
+
+KEYWORDS="~x86 ~ppc"
+SLOT="0"
+LICENSE="as-is"
+IUSE=""
+APXS2_S="${S}"
+APXS2_ARGS="-c mod_limitipconn.c"
+DOCFILES="ChangeLog INSTALL README"
+APACHE2_MOD_CONF="27_mod_limitipconn"
+
+need_apache2
+
+src_compile() {
+	apache2_src_compile
+}
+
+src_install() {
+	apache2_src_install
+}
+
diff --git a/net-www/mod_limitipconn/mod_limitipconn-0.22.ebuild b/net-www/mod_limitipconn/mod_limitipconn-0.22.ebuild
index 22046a9b1471..2a5a16bd9bcc 100644
--- a/net-www/mod_limitipconn/mod_limitipconn-0.22.ebuild
+++ b/net-www/mod_limitipconn/mod_limitipconn-0.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_limitipconn/mod_limitipconn-0.22.ebuild,v 1.6 2004/09/03 23:24:08 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_limitipconn/mod_limitipconn-0.22.ebuild,v 1.7 2005/01/09 00:29:55 hollow Exp $
 
 DESCRIPTION="Allows administrators to limit the number of simultaneous downloads permitted"
 SRC_URI="http://dominia.org/djao/limit/${P}.tar.gz"
diff --git a/net-www/mod_pcgi2/ChangeLog b/net-www/mod_pcgi2/ChangeLog
index 9bffecac23ab..4c85732ad3df 100644
--- a/net-www/mod_pcgi2/ChangeLog
+++ b/net-www/mod_pcgi2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mod_pcgi2
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_pcgi2/ChangeLog,v 1.10 2004/08/30 23:26:06 dholm Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_pcgi2/ChangeLog,v 1.11 2005/01/09 00:27:22 hollow Exp $
+
+*mod_pcgi2-2.0.2 (09 Jan 2005)
+
+  09 Jan 2005; Benedikt Boehm <hollow@gentoo.org> metadata.xml,
+  +files/2.0.2/20_mod_pcgi.conf, +mod_pcgi2-2.0.2.ebuild:
+  Apache herd package refresh
 
   31 Aug 2004; David Holm <dholm@gentoo.org> mod_pcgi2-2.0.1.ebuild:
   Added to ~ppc.
diff --git a/net-www/mod_pcgi2/Manifest b/net-www/mod_pcgi2/Manifest
index e97cea101285..67f96406004d 100644
--- a/net-www/mod_pcgi2/Manifest
+++ b/net-www/mod_pcgi2/Manifest
@@ -1,6 +1,9 @@
-MD5 f459fe8d972a1a8d98ea350349564673 ChangeLog 1321
-MD5 d2da0e45d7e39184d1cb7abbe3879086 metadata.xml 159
-MD5 c312db93082c97a8d95d121925d93703 mod_pcgi2-2.0.1.ebuild 2961
+MD5 bc53f42583a93470751f71a093ddf108 ChangeLog 1506
+MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
+MD5 dcdb26efb0de4dde4db5f17a000299b9 mod_pcgi2-2.0.1.ebuild 2961
+MD5 323ddbf247c2dac0a414af6bb36a3f88 mod_pcgi2-2.0.2.ebuild 920
 MD5 247a6f4e65181d477578aaf0d9f381fa files/20_mod_pcgi.conf 271
 MD5 40eeec73ead705f5c91d71cd1a79681a files/digest-mod_pcgi2-2.0.1 70
 MD5 1a8eca96144ae6ea1ca0fb9b099c66e8 files/mod_pcgi2-2.0.1-macrofix.patch 1328
+MD5 49f0dc2658376250f0258f45d9a1886c files/digest-mod_pcgi2-2.0.2 70
+MD5 312d8d52a5dd487a59c2625ba417da98 files/2.0.2/20_mod_pcgi.conf 266
diff --git a/net-www/mod_pcgi2/files/2.0.2/20_mod_pcgi.conf b/net-www/mod_pcgi2/files/2.0.2/20_mod_pcgi.conf
new file mode 100644
index 000000000000..33efac42ed6b
--- /dev/null
+++ b/net-www/mod_pcgi2/files/2.0.2/20_mod_pcgi.conf
@@ -0,0 +1,11 @@
+<IfDefine PCGI>
+	<IfModule !mod_pcgi2.c>
+	LoadModule mod_pcgi2	modules/mod_pcgi2.so
+	</IfModule>
+
+	<IfModule mod_pcgi2.c>
+    # please see /usr/share/doc/mod_pcgi-*/README
+    # for details on the required apache directives
+	</IfModule>
+</IfDefine>
+# vim:ft=apache:
diff --git a/net-www/mod_pcgi2/files/digest-mod_pcgi2-2.0.2 b/net-www/mod_pcgi2/files/digest-mod_pcgi2-2.0.2
new file mode 100644
index 000000000000..0b538cd82bb9
--- /dev/null
+++ b/net-www/mod_pcgi2/files/digest-mod_pcgi2-2.0.2
@@ -0,0 +1 @@
+MD5 343242bf25141f228b3d2dd0e5526732 mod_pcgi2-2.0.2-src.tar.gz 32214
diff --git a/net-www/mod_pcgi2/metadata.xml b/net-www/mod_pcgi2/metadata.xml
index c054a8cd9b61..10510cb8be95 100644
--- a/net-www/mod_pcgi2/metadata.xml
+++ b/net-www/mod_pcgi2/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>apache</herd>
+<maintainer>
+  <email>apache-devs@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/net-www/mod_pcgi2/mod_pcgi2-2.0.1.ebuild b/net-www/mod_pcgi2/mod_pcgi2-2.0.1.ebuild
index 9659d5ef6993..6a54413e22dd 100644
--- a/net-www/mod_pcgi2/mod_pcgi2-2.0.1.ebuild
+++ b/net-www/mod_pcgi2/mod_pcgi2-2.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_pcgi2/mod_pcgi2-2.0.1.ebuild,v 1.11 2004/08/30 23:26:06 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_pcgi2/mod_pcgi2-2.0.1.ebuild,v 1.12 2005/01/09 00:27:22 hollow Exp $
 
 inherit eutils
 
diff --git a/net-www/mod_pcgi2/mod_pcgi2-2.0.2.ebuild b/net-www/mod_pcgi2/mod_pcgi2-2.0.2.ebuild
new file mode 100644
index 000000000000..abe2375eab11
--- /dev/null
+++ b/net-www/mod_pcgi2/mod_pcgi2-2.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_pcgi2/mod_pcgi2-2.0.2.ebuild,v 1.1 2005/01/09 00:27:22 hollow Exp $
+
+inherit eutils apache-module
+
+DESCRIPTION="An Apache module to talk to Zope Corporation's PCGI"
+HOMEPAGE="http://www.zope.org/Members/phd/${PN}/"
+SRC_URI="http://zope.org/Members/phd/${PN}/${PN}/${P}-src.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+DEPEND="www-apps/pcgi"
+S=${WORKDIR}/${PN/mod_}
+APXS_S="${S}"
+APXS_ARGS="-Wc,-DMOD_PCGI2 -Wc,-DUNIX -I./ -o mod_pcgi2.so -c mod_pcgi2.c parseinfo.c pcgi-wrapper.c"
+APACHE1_MOD_FILE="${S}/mod_pcgi2.so"
+
+APXS2_S="${S}"
+APXS2_ARGS="-n pcgi2 -DUNIX -DAPACHE2 -DMOD_PCGI2 -c mod_pcgi2.c pcgi-wrapper.c parseinfo.c "
+
+DOCFILES="NEWS README TODO ChangeLog"
+APACHE1_MOD_CONF="${PVR}/20_mod_pcgi"
+APACHE2_MOD_CONF="${PVR}/20_mod_pcgi"
+
+need_apache
diff --git a/net-www/mod_roaming/ChangeLog b/net-www/mod_roaming/ChangeLog
index 7a7dbe572600..cd7b1c929edc 100644
--- a/net-www/mod_roaming/ChangeLog
+++ b/net-www/mod_roaming/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mod_roaming
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_roaming/ChangeLog,v 1.5 2004/06/25 01:03:45 agriffis Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_roaming/ChangeLog,v 1.6 2005/01/09 00:24:14 hollow Exp $
+
+*mod_roaming-2.0.0-r1 (09 Jan 2005)
+
+  09 Jan 2005; Benedikt Boehm <hollow@gentoo.org> metadata.xml,
+  +files/2.0.0-r1/18_mod_roaming.conf, +mod_roaming-2.0.0-r1.ebuild:
+  Apache herd package refresh
 
   04 Apr 2004; Chuck Short <zul@gentoo.org> metadata.xml,
   mod_roaming-2.0.0.ebuild:
diff --git a/net-www/mod_roaming/Manifest b/net-www/mod_roaming/Manifest
index 451058c99de1..ca410a5a017f 100644
--- a/net-www/mod_roaming/Manifest
+++ b/net-www/mod_roaming/Manifest
@@ -1,6 +1,9 @@
-MD5 4f3f27503b1d4deecbdc0922ad0ab7d9 mod_roaming-2.0.0.ebuild 980
-MD5 ff741a6e895320dc8cba00c19dee88c7 ChangeLog 551
-MD5 d2da0e45d7e39184d1cb7abbe3879086 metadata.xml 159
+MD5 1868cc0a150db825c4f3891ee77ce94c ChangeLog 752
+MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
+MD5 0ad12314f1cb2115aa6d3c0bc05d587b mod_roaming-2.0.0.ebuild 980
+MD5 5763642a3690792d4ffdc606985ff0f7 mod_roaming-2.0.0-r1.ebuild 896
 MD5 6ccb5bfdbe8bfba614da810c60d0acee files/18_mod_roaming.conf 414
-MD5 0c01fe5f077bd4d205041537b5ac85e1 files/mod_roaming-register.patch 761
 MD5 af5066c084bd8572017f9e005e03298e files/digest-mod_roaming-2.0.0 67
+MD5 0c01fe5f077bd4d205041537b5ac85e1 files/mod_roaming-register.patch 761
+MD5 af5066c084bd8572017f9e005e03298e files/digest-mod_roaming-2.0.0-r1 67
+MD5 aae9e6645deaf7474d6198fb6cb9a5a8 files/2.0.0-r1/18_mod_roaming.conf 409
diff --git a/net-www/mod_roaming/files/2.0.0-r1/18_mod_roaming.conf b/net-www/mod_roaming/files/2.0.0-r1/18_mod_roaming.conf
new file mode 100644
index 000000000000..ffdb7e63d2a4
--- /dev/null
+++ b/net-www/mod_roaming/files/2.0.0-r1/18_mod_roaming.conf
@@ -0,0 +1,26 @@
+<IfDefine ROAMING>
+  <IfModule !mod_roaming.c>
+    LoadModule roaming_module    modules/mod_roaming.so
+  </IfModule>
+</IfDefine>
+
+<IfModule roaming_module.c>
+
+RoamingAlias /roaming /var/lib/mod_roaming
+
+<Location /roaming>
+
+	AuthUserFile /var/lib/mod_roaming/roaming-htpasswd
+	AuthType Basic
+	AuthName "Roaming Access"
+
+	<Limit GET PUT MOVE DELETE>
+
+		require valid-user
+
+	</Limit>
+
+</Location>
+
+</IfModule>
+
diff --git a/net-www/mod_roaming/files/digest-mod_roaming-2.0.0-r1 b/net-www/mod_roaming/files/digest-mod_roaming-2.0.0-r1
new file mode 100644
index 000000000000..571c47ecad4c
--- /dev/null
+++ b/net-www/mod_roaming/files/digest-mod_roaming-2.0.0-r1
@@ -0,0 +1 @@
+MD5 ad2d720d7ffd08c4e7f2e6979795237e mod_roaming-2.0.0.tar.gz 9227
diff --git a/net-www/mod_roaming/metadata.xml b/net-www/mod_roaming/metadata.xml
index c054a8cd9b61..10510cb8be95 100644
--- a/net-www/mod_roaming/metadata.xml
+++ b/net-www/mod_roaming/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>apache</herd>
+<maintainer>
+  <email>apache-devs@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/net-www/mod_roaming/mod_roaming-2.0.0-r1.ebuild b/net-www/mod_roaming/mod_roaming-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..8ecece3ea656
--- /dev/null
+++ b/net-www/mod_roaming/mod_roaming-2.0.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_roaming/mod_roaming-2.0.0-r1.ebuild,v 1.1 2005/01/09 00:24:14 hollow Exp $
+
+inherit eutils apache-module
+
+DESCRIPTION="Apache2 DSO enabling Netscape Communicator roaming profiles"
+HOMEPAGE="http://www.klomp.org/mod_roaming/"
+
+S=${WORKDIR}/${P}
+SRC_URI="http://www.klomp.org/${PN}/${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="~x86"
+IUSE=""
+SLOT="0"
+APACHE2_MOD_CONF="${PVR}/18_mod_roaming"
+DOCFILES="CHANGES INSTALL LICENSE README"
+APXS2_S="${S}"
+APXS2_ARGS="-c ${PN}.c"
+
+need_apache2
+
+# Don't know why we need this patch. Mark Dierolf <smark@3e0.com>
+#src_unpack() {
+#	unpack ${A} || die; cd ${S} || die
+#	epatch ${FILESDIR}/mod_roaming-register.patch
+#}
+
+pkg_postinst() {
+	#empty
+	install -d -m 0755 -o apache -g apache ${ROOT}/var/lib/mod_roaming
+}
diff --git a/net-www/mod_roaming/mod_roaming-2.0.0.ebuild b/net-www/mod_roaming/mod_roaming-2.0.0.ebuild
index 50773c3c1242..d2c55fc87a95 100644
--- a/net-www/mod_roaming/mod_roaming-2.0.0.ebuild
+++ b/net-www/mod_roaming/mod_roaming-2.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_roaming/mod_roaming-2.0.0.ebuild,v 1.5 2004/06/25 01:03:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_roaming/mod_roaming-2.0.0.ebuild,v 1.6 2005/01/09 00:24:14 hollow Exp $
 
 inherit eutils
 
diff --git a/net-www/mod_scgi/ChangeLog b/net-www/mod_scgi/ChangeLog
index 97ed99f4960b..18c28e73c8f8 100644
--- a/net-www/mod_scgi/ChangeLog
+++ b/net-www/mod_scgi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mod_scgi
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/ChangeLog,v 1.11 2004/08/30 23:31:35 dholm Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/ChangeLog,v 1.12 2005/01/09 00:20:51 hollow Exp $
+
+*mod_scgi-1.2 (09 Jan 2005)
+
+  09 Jan 2005; Benedikt Boehm <hollow@gentoo.org> metadata.xml,
+  +files/1.2/20_mod_scgi.conf, +mod_scgi-1.2.ebuild:
+  Apache herd package refresh
 
   31 Aug 2004; David Holm <dholm@gentoo.org> mod_scgi-1.2_alpha2.ebuild:
   Added to ~ppc.
diff --git a/net-www/mod_scgi/Manifest b/net-www/mod_scgi/Manifest
index b4696507c145..998fbf4ccc7e 100644
--- a/net-www/mod_scgi/Manifest
+++ b/net-www/mod_scgi/Manifest
@@ -1,11 +1,14 @@
-MD5 0ce76ce46abd5867ed4b1ef7ae1ef5ae ChangeLog 1733
-MD5 0c1ffc3eff281366ee07df94a66166e6 metadata.xml 160
-MD5 149e0c4c6e5748f5598fe9d2408265d0 mod_scgi-1.2_alpha1-r1.ebuild 2764
-MD5 99fe43f988af3c184358bc12d9dfa4fb mod_scgi-1.2_alpha1-r2.ebuild 3006
-MD5 2338ffcb6d546740c10352a18110b09f mod_scgi-1.2_alpha1.ebuild 1125
-MD5 1a0a26bb52517cb9f7908743e08f66f4 mod_scgi-1.2_alpha2.ebuild 3005
+MD5 44f93237ced461b957e2c42794cccbd7 ChangeLog 1910
+MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
+MD5 99cadae04ec6ef3591a9d4b31605a90f mod_scgi-1.2_alpha1-r1.ebuild 2764
+MD5 77999ece4286fd83acf11854041e930b mod_scgi-1.2_alpha1-r2.ebuild 3006
+MD5 8a0dd30a3545621be526be5fb263ed7e mod_scgi-1.2_alpha1.ebuild 1125
+MD5 9f7e66f665d7ff1c52f256cfd24f96df mod_scgi-1.2_alpha2.ebuild 3005
+MD5 70794b8a23299ab52cd8618ddb2c13b6 mod_scgi-1.2.ebuild 1056
 MD5 98c270edf79608cb914cbc7d6ffea7b0 files/20_mod_scgi.conf 1243
 MD5 fe6e3027503038b59f1e9b4ee2cb3baa files/digest-mod_scgi-1.2_alpha1 61
 MD5 fe6e3027503038b59f1e9b4ee2cb3baa files/digest-mod_scgi-1.2_alpha1-r1 61
 MD5 fe6e3027503038b59f1e9b4ee2cb3baa files/digest-mod_scgi-1.2_alpha1-r2 61
 MD5 7ec590d1ee6da7b63a722808c6758ee7 files/digest-mod_scgi-1.2_alpha2 61
+MD5 7092d8881e1387d40515b82e1c4e9afb files/digest-mod_scgi-1.2 59
+MD5 c9efe9ec123cff4add21c35d7bbcdeb9 files/1.2/20_mod_scgi.conf 1245
diff --git a/net-www/mod_scgi/files/1.2/20_mod_scgi.conf b/net-www/mod_scgi/files/1.2/20_mod_scgi.conf
new file mode 100644
index 000000000000..59958aac8fd0
--- /dev/null
+++ b/net-www/mod_scgi/files/1.2/20_mod_scgi.conf
@@ -0,0 +1,58 @@
+<IfDefine SCGI>
+	<IfModule !mod_scgi.c>
+	    LoadModule scgi_module     modules/mod_scgi.so
+	</IfModule>
+
+	<IfModule mod_scgi.c>
+	# Apache2 example
+	#<Location "/dynamic">
+	#	SetHandler scgi-handler
+	#	SCGIServer localhost:4000
+	#	SCGIHandler On
+	#	Options -Multiviews
+	#</Location>
+	#<LocationMatch "^/(dynamic|login)($|/)">
+	#	SetHandler scgi-handler
+	#	SCGIServer localhost:4000
+	#	SCGIHandler On
+	#	Options -Multiviews
+	#</Location>
+	#<Location "/foo">
+	#	SCGIServer localhost:4000
+	#	SCGIHandler On
+	#	Options -Multiviews
+	#</Location>
+	#<Location "/bar">
+	#	SCGIServer localhost:4001
+	#	SCGIHandler On
+	#	SCGIServerTimeout 10
+	#	Options -Multiviews
+	#</Location>
+	#<Location "/bar/images">
+	#	SCGIHander Off
+	#</Location>
+
+	# Apache1 example
+	#<Location "/dynamic">
+	#	 SCGIServer 127.0.0.1 4000
+	#	 SCGIHandler On
+	#	 Options -Multiviews
+	#</Location>
+	#<LocationMatch "^/(dynamic|login)($|/)">
+	#	 SCGIServer 127.0.0.1 4000
+	#	 SCGIHandler On
+	#	 Options -Multiviews
+	#</Location>
+	#<Location "/foo">
+	#	 SCGIServer 127.0.0.1 4000
+	#	 SCGIHandler On
+	#	 Options -Multiviews
+	#</Location>
+	#<Location "/bar">
+	#	 SCGIServer 127.0.0.1 4001
+	#	 SCGIHandler On
+	#	 Options -Multiviews
+	#</Location>
+	</IfModule>
+</IfDefine>
+# vim:ft=apache:
diff --git a/net-www/mod_scgi/files/digest-mod_scgi-1.2 b/net-www/mod_scgi/files/digest-mod_scgi-1.2
new file mode 100644
index 000000000000..c5387f0f3aa8
--- /dev/null
+++ b/net-www/mod_scgi/files/digest-mod_scgi-1.2
@@ -0,0 +1 @@
+MD5 577f6db7ab95e602378293756d368112 scgi-1.2.tar.gz 19098
diff --git a/net-www/mod_scgi/metadata.xml b/net-www/mod_scgi/metadata.xml
index 631fc921d87a..10510cb8be95 100644
--- a/net-www/mod_scgi/metadata.xml
+++ b/net-www/mod_scgi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-www</herd>
+<herd>apache</herd>
+<maintainer>
+  <email>apache-devs@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/net-www/mod_scgi/mod_scgi-1.2.ebuild b/net-www/mod_scgi/mod_scgi-1.2.ebuild
new file mode 100644
index 000000000000..2f31fa896373
--- /dev/null
+++ b/net-www/mod_scgi/mod_scgi-1.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/mod_scgi-1.2.ebuild,v 1.1 2005/01/09 00:20:51 hollow Exp $
+
+inherit eutils apache-module
+
+DESCRIPTION="Apache module for a Replacement for the CGI protocol that is similar to FastCGI"
+URI_BASE="http://www.mems-exchange.org/software"
+HOMEPAGE="${URI_BASE}/scgi/"
+SRC_URI="${URI_BASE}/files/scgi/${P/mod_}.tar.gz"
+
+LICENSE="CNRI"
+KEYWORDS="~x86 ~ppc"
+DEPEND="www-apps/scgi"
+SLOT="0"
+
+S=${WORKDIR}/${P/mod_}
+
+APXS1_S="${S}/apache1"
+APXS1_ARGS="-c mod_scgi.c"
+APACHE1_MOD_FILE="${S}/apache1/${PN}.so"
+APACHE1_MOD_CONF="${PVR}/20_mod_scgi"
+APACHE1_MOD_DEFINE="SCGI"
+
+APXS2_S="${S}/apache2"
+APXS2_ARGS="-c mod_scgi.c"
+APACHE2_MOD_FILE="${S}/apache2/.libs/${PN}.so"
+APACHE2_MOD_CONF="${PVR}/20_mod_scgi"
+APACHE2_MOD_DEFINE="SCGI"
+
+need_apache
+
+DOCFILES="PKG-INFO LICENSE.txt CHANGES"
+if useq apache2; then
+	DOCFILES="${DOCFILES} apache2/README"
+else
+	DOCFILES="${DOCFILES} apache1/README"
+fi
diff --git a/net-www/mod_scgi/mod_scgi-1.2_alpha1-r1.ebuild b/net-www/mod_scgi/mod_scgi-1.2_alpha1-r1.ebuild
index 2becfb7f466c..411b77adc93d 100644
--- a/net-www/mod_scgi/mod_scgi-1.2_alpha1-r1.ebuild
+++ b/net-www/mod_scgi/mod_scgi-1.2_alpha1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/mod_scgi-1.2_alpha1-r1.ebuild,v 1.4 2004/08/16 17:36:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/mod_scgi-1.2_alpha1-r1.ebuild,v 1.5 2005/01/09 00:20:51 hollow Exp $
 
 detectapache() {
 	local domsg=
diff --git a/net-www/mod_scgi/mod_scgi-1.2_alpha1-r2.ebuild b/net-www/mod_scgi/mod_scgi-1.2_alpha1-r2.ebuild
index b0061e1eef63..52894deef4dd 100644
--- a/net-www/mod_scgi/mod_scgi-1.2_alpha1-r2.ebuild
+++ b/net-www/mod_scgi/mod_scgi-1.2_alpha1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/mod_scgi-1.2_alpha1-r2.ebuild,v 1.5 2004/08/16 17:36:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/mod_scgi-1.2_alpha1-r2.ebuild,v 1.6 2005/01/09 00:20:51 hollow Exp $
 
 detectapache() {
 	local domsg=
diff --git a/net-www/mod_scgi/mod_scgi-1.2_alpha1.ebuild b/net-www/mod_scgi/mod_scgi-1.2_alpha1.ebuild
index 826fcf43554f..12960fad13b3 100644
--- a/net-www/mod_scgi/mod_scgi-1.2_alpha1.ebuild
+++ b/net-www/mod_scgi/mod_scgi-1.2_alpha1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/mod_scgi-1.2_alpha1.ebuild,v 1.6 2004/08/16 17:36:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/mod_scgi-1.2_alpha1.ebuild,v 1.7 2005/01/09 00:20:51 hollow Exp $
 
 apachedir='1'
 apache=''
diff --git a/net-www/mod_scgi/mod_scgi-1.2_alpha2.ebuild b/net-www/mod_scgi/mod_scgi-1.2_alpha2.ebuild
index a72fb15cecac..a23e06a860ad 100644
--- a/net-www/mod_scgi/mod_scgi-1.2_alpha2.ebuild
+++ b/net-www/mod_scgi/mod_scgi-1.2_alpha2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/mod_scgi-1.2_alpha2.ebuild,v 1.5 2004/08/30 23:31:35 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/mod_scgi-1.2_alpha2.ebuild,v 1.6 2005/01/09 00:20:51 hollow Exp $
 
 detectapache() {
 	local domsg=
diff --git a/net-www/mod_security/ChangeLog b/net-www/mod_security/ChangeLog
index 16374930e446..e19a82855b00 100644
--- a/net-www/mod_security/ChangeLog
+++ b/net-www/mod_security/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mod_security
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_security/ChangeLog,v 1.6 2004/10/19 03:10:11 weeve Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_security/ChangeLog,v 1.7 2005/01/09 00:17:26 hollow Exp $
+
+*mod_security-1.8.6 (09 Jan 2005)
+
+  09 Jan 2005; Benedikt Boehm <hollow@gentoo.org> metadata.xml,
+  +files/1.8.6/99_mod_security.conf, +mod_security-1.8.6.ebuild:
+  Apache herd package refresh
 
   18 Oct 2004; Jason Wever <weeve@gentoo.org> mod_security-1.7.6.ebuild:
   Added ~sparc keyword wrt bug #66615.
diff --git a/net-www/mod_security/Manifest b/net-www/mod_security/Manifest
index 3a2c13289b1e..0c243f351c0f 100644
--- a/net-www/mod_security/Manifest
+++ b/net-www/mod_security/Manifest
@@ -1,6 +1,9 @@
-MD5 487f62726d2993c47abc4e8da0b30069 ChangeLog 907
-MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
-MD5 443586118ca1af5e7c70e0d4a96db1c6 mod_security-1.7.6.ebuild 1320
+MD5 8e0a82240a311d0edae1c3d5572671d7 ChangeLog 1102
+MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
+MD5 ff5b5f08fd4a754cd2a5de4264692dcb mod_security-1.7.6.ebuild 1320
+MD5 a86ebb07ef7e06c4ac4c7f15a5ceac37 mod_security-1.8.6.ebuild 951
 MD5 4ff2b278a8aaff992f04347e4fda401b files/99_mod_security.conf 3671
 MD5 93b283b1aef242964a12edd89989d103 files/digest-mod_security-1.7.6 70
 MD5 854e24ef0e50b53915629f226e76b43c files/mod_security.conf 3399
+MD5 acba071671480e82391bcf1022f3838a files/digest-mod_security-1.8.6 70
+MD5 99189490f6840a16c1e14874719592cf files/1.8.6/99_mod_security.conf 3666
diff --git a/net-www/mod_security/files/1.8.6/99_mod_security.conf b/net-www/mod_security/files/1.8.6/99_mod_security.conf
new file mode 100644
index 000000000000..1269365021b4
--- /dev/null
+++ b/net-www/mod_security/files/1.8.6/99_mod_security.conf
@@ -0,0 +1,123 @@
+<IfDefine SECURITY>
+  <IfModule !mod_security.c>
+    LoadModule security_module    modules/mod_security.so
+  </IfModule>
+</IfDefine>
+
+# Examples below are taken from the online documentation
+# Refer to:
+# http://www.modsecurity.org/documentation/quick-examples.html
+
+<IfModule mod_security.c>
+
+    # Turn the filtering engine On or Off
+    SecFilterEngine On
+
+    # Make sure that URL encoding is valid
+    SecFilterCheckURLEncoding On
+
+    # Only allow bytes from this range
+    SecFilterForceByteRange 32 126
+
+    # The audit engine works independently and
+    # can be turned On of Off on the per-server or
+    # on the per-directory basis. "On" will log everything,
+    # "DynamicOrRelevant" will log dynamic requests or violations,
+    # and "RelevantOnly" will only log policy violations
+    SecAuditEngine RelevantOnly
+
+    # The name of the audit log file
+    SecAuditLog logs/audit_log
+
+    SecFilterDebugLog logs/modsec_debug_log
+    SecFilterDebugLevel 0
+
+    # Should mod_security inspect POST payloads
+    SecFilterScanPOST On
+
+    # Action to take by default
+    SecFilterDefaultAction "deny,log,status:500"
+
+    # Redirect user on filter match
+    SecFilter xxx redirect:http://www.webkreator.com
+
+    # Execute the external script on filter match
+    SecFilter yyy log,exec:/home/users/ivanr/apache/bin/report-attack.pl
+
+    # Simple filter
+    SecFilter 111
+    
+    # Only check the QUERY_STRING variable
+    SecFilterSelective QUERY_STRING 222
+
+    # Only check the body of the POST request
+    SecFilterSelective POST_PAYLOAD 333
+
+    # Only check arguments (will work for GET and POST)
+    SecFilterSelective ARGS 444
+
+    # Test filter
+    SecFilter "/cgi-bin/modsec-test.pl/keyword"
+
+    # Another test filter, will be denied with 404 but not logged
+    # action supplied as a parameter overrides the default action
+    SecFilter 999 "deny,nolog,status:500"
+
+    # Prevent OS specific keywords
+    SecFilter /etc/passwd
+
+    # Prevent path traversal (..) attacks
+    SecFilter "\.\./"
+
+    # Weaker XSS protection but allows common HTML tags
+    SecFilter "<[[:space:]]*script"
+
+    # Prevent XSS atacks (HTML/Javascript injection)
+    SecFilter "<(.|\n)+>"
+
+    # Very crude filters to prevent SQL injection attacks
+    SecFilter "delete[[:space:]]+from"
+    SecFilter "insert[[:space:]]+into"
+    SecFilter "select.+from"
+
+    # Require HTTP_USER_AGENT and HTTP_HOST headers
+    SecFilterSelective "HTTP_USER_AGENT|HTTP_HOST" "^$"
+
+    # Forbid file upload
+    SecFilterSelective "HTTP_CONTENT_TYPE" multipart/form-data
+
+    # Only watch argument p1
+    SecFilterSelective "ARG_p1" 555
+
+    # Watch all arguments except p1
+    SecFilterSelective "ARGS|!ARG_p2" 666
+
+    # Only allow our own test utility to send requests (or Mozilla)
+    SecFilterSelective HTTP_USER_AGENT "!(mod_security|mozilla)"
+
+    # Do not allow variables with this name
+    SecFilterSelective ARGS_NAMES 777
+
+    # Do now allow this variable value (names are ok)
+    SecFilterSelective ARGS_VALUES 888
+
+    # Test for a POST variable parsing bug, see test #41
+    SecFilterSelective ARG_p2 AAA
+
+    # Stop spamming through FormMail
+    # note the exclamation mark at the beginning
+    # of the filter - only requests that match this regex will
+    # be allowed
+    <Location /cgi-bin/FormMail>
+        SecFilterSelective "ARG_recipient" "!@webkreator.com$"
+    </Location>
+
+    # when allowing upload, only allow images
+    # note that this is not foolproof, a determined attacker
+    # could get around this 
+    <Location /fileupload.php>
+        SecFilterInheritance Off
+        SecFilterSelective POST_PAYLOAD "!image/(jpeg|bmp|gif)"
+    </Location>
+
+</IfModule>
diff --git a/net-www/mod_security/files/digest-mod_security-1.8.6 b/net-www/mod_security/files/digest-mod_security-1.8.6
new file mode 100644
index 000000000000..74043f2eee27
--- /dev/null
+++ b/net-www/mod_security/files/digest-mod_security-1.8.6
@@ -0,0 +1 @@
+MD5 f6bf4724dd0db3d37586b64bc0ee160d mod_security-1.8.6.tar.gz 355105
diff --git a/net-www/mod_security/metadata.xml b/net-www/mod_security/metadata.xml
index bcaabdbbd0d3..10510cb8be95 100644
--- a/net-www/mod_security/metadata.xml
+++ b/net-www/mod_security/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>apache</herd>
-<longdescription>
-The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating systems including UNIX and Windows NT. The goal of this project is to provide a secure, efficient and extensible server that provides HTTP services in sync with the current HTTP standards.
-</longdescription>
+<maintainer>
+  <email>apache-devs@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/net-www/mod_security/mod_security-1.7.6.ebuild b/net-www/mod_security/mod_security-1.7.6.ebuild
index 635fe62f35e0..76d3259fee41 100644
--- a/net-www/mod_security/mod_security-1.7.6.ebuild
+++ b/net-www/mod_security/mod_security-1.7.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_security/mod_security-1.7.6.ebuild,v 1.6 2004/10/19 03:10:11 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_security/mod_security-1.7.6.ebuild,v 1.7 2005/01/09 00:17:26 hollow Exp $
 
 DESCRIPTION="Intrusion Detection System for apache"
 HOMEPAGE="http://www.modsecurity.org"
diff --git a/net-www/mod_security/mod_security-1.8.6.ebuild b/net-www/mod_security/mod_security-1.8.6.ebuild
new file mode 100644
index 000000000000..5f24d9802166
--- /dev/null
+++ b/net-www/mod_security/mod_security-1.8.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_security/mod_security-1.8.6.ebuild,v 1.1 2005/01/09 00:17:26 hollow Exp $
+
+inherit eutils apache-module
+
+DESCRIPTION="Intrusion Detection System for apache"
+HOMEPAGE="http://www.modsecurity.org"
+SRC_URI="http://www.modsecurity.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="doc"
+
+APXS1_ARGS="-S LIBEXECDIR=${S} -c ${S}/apache1/mod_security.c"
+APACHE1_MOD_FILE="apache1/${PN}.so"
+APACHE1_MOD_CONF="${PVR}/99_mod_security"
+APACHE1_MOD_DEFINE="SECURITY"
+
+APXS2_ARGS="-S LIBEXECDIR=${S} -c ${S}/apache2/mod_security.c"
+APACHE2_MOD_FILE="apache2/.libs/${PN}.so"
+APACHE2_MOD_CONF="${PVR}/99_mod_security"
+APACHE2_MOD_DEFINE="SECURITY"
+
+DOCFILES="CHANGES httpd.conf.* INSTALL LICENSE README"
+useq doc && DOCFILES="${DOCFILES} modsecurity-manual.pdf"
+
+need_apache
diff --git a/net-www/mod_transform/ChangeLog b/net-www/mod_transform/ChangeLog
index faaa489441a6..ea3398f09f32 100644
--- a/net-www/mod_transform/ChangeLog
+++ b/net-www/mod_transform/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mod_transform
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_transform/ChangeLog,v 1.3 2004/09/03 23:24:08 pvdabeel Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_transform/ChangeLog,v 1.4 2005/01/09 00:07:59 hollow Exp $
+
+*mod_transform-0.6.0 (09 Jan 2005)
+
+  09 Jan 2005; Benedikt Boehm <hollow@gentoo.org> metadata.xml,
+  +files/10_mod_transform.conf, +mod_transform-0.6.0.ebuild:
+  Apache herd package refresh
 
   04 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   mod_transform-0.4.0.ebuild:
diff --git a/net-www/mod_transform/Manifest b/net-www/mod_transform/Manifest
index 4d36ad89364b..60a7b50e0f9f 100644
--- a/net-www/mod_transform/Manifest
+++ b/net-www/mod_transform/Manifest
@@ -1,5 +1,18 @@
-MD5 a55bc3eb5c38262583de6925a8798295 ChangeLog 654
-MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
-MD5 4ac29020a30536c6d0a83835144c1db8 mod_transform-0.4.0.ebuild 909
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bd398ff8ff4803fe83248f3dff40db4b ChangeLog 844
+MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
+MD5 91424bf0348ce57649b84e4e31cc44b3 mod_transform-0.4.0.ebuild 907
+MD5 ba49cf547fb758ceda0d9620be5b7352 mod_transform-0.6.0.ebuild 882
 MD5 b3e31c1680f2a0e219fed438a86ef676 files/digest-mod_transform-0.4.0 71
 MD5 4add2247f328f42a90844bf430bfbb06 files/mod_transform.conf 92
+MD5 db935b300b66a380d0f0b21f43d4a8d5 files/10_mod_transform.conf 113
+MD5 9e604557601ae40625764b4af75b86a4 files/digest-mod_transform-0.6.0 71
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB4HXWmPFBzbX68WERAihTAJ4wlZSEogLqG1OwNGY4MiF38/NKFQCdFl/7
+GeoaB275VMIhhRKVY8zssfY=
+=6mNn
+-----END PGP SIGNATURE-----
diff --git a/net-www/mod_transform/files/10_mod_transform.conf b/net-www/mod_transform/files/10_mod_transform.conf
new file mode 100644
index 000000000000..395e9fe5bb98
--- /dev/null
+++ b/net-www/mod_transform/files/10_mod_transform.conf
@@ -0,0 +1,4 @@
+<IfDefine TRANSFORM>
+	LoadModule transform_module modules/mod_transform.so
+	AddOutputFilter XSLT xml
+</IfDefine>
diff --git a/net-www/mod_transform/files/digest-mod_transform-0.6.0 b/net-www/mod_transform/files/digest-mod_transform-0.6.0
new file mode 100644
index 000000000000..966d1db1c735
--- /dev/null
+++ b/net-www/mod_transform/files/digest-mod_transform-0.6.0
@@ -0,0 +1 @@
+MD5 8b27adea2536f105470b4bedc418ab3b mod_transform-0.6.0.tar.gz 301889
diff --git a/net-www/mod_transform/metadata.xml b/net-www/mod_transform/metadata.xml
index bcaabdbbd0d3..10510cb8be95 100644
--- a/net-www/mod_transform/metadata.xml
+++ b/net-www/mod_transform/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>apache</herd>
-<longdescription>
-The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating systems including UNIX and Windows NT. The goal of this project is to provide a secure, efficient and extensible server that provides HTTP services in sync with the current HTTP standards.
-</longdescription>
+<maintainer>
+  <email>apache-devs@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/net-www/mod_transform/mod_transform-0.4.0.ebuild b/net-www/mod_transform/mod_transform-0.4.0.ebuild
index 33690b480db0..e3da9108148b 100644
--- a/net-www/mod_transform/mod_transform-0.4.0.ebuild
+++ b/net-www/mod_transform/mod_transform-0.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_transform/mod_transform-0.4.0.ebuild,v 1.3 2004/09/03 23:24:08 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_transform/mod_transform-0.4.0.ebuild,v 1.4 2005/01/09 00:08:00 hollow Exp $
 
 DESCRIPTION="filter module that allows Apache 2.0 to do dynamic XSL Transformations"
 HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_transform/"
diff --git a/net-www/mod_transform/mod_transform-0.6.0.ebuild b/net-www/mod_transform/mod_transform-0.6.0.ebuild
new file mode 100644
index 000000000000..a44ae3a5a6f8
--- /dev/null
+++ b/net-www/mod_transform/mod_transform-0.6.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_transform/mod_transform-0.6.0.ebuild,v 1.1 2005/01/09 00:08:00 hollow Exp $
+
+inherit eutils apache-module
+
+DESCRIPTION="Filter module that allows Apache 2.0 to do dynamic XSL Transformations"
+HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_transform/"
+SRC_URI="http://www.outoforder.cc/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+DEPEND=">=dev-libs/libxslt-1.0.22
+	>=dev-libs/libxml2-2.6.6"
+
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="TRANSFORM"
+
+DOCFILES="TODO"
+
+need_apache2
+
+src_compile() {
+	econf --with-apxs=${APXS2} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	mv src/.libs/{libmod_transform.so,mod_transform.so} || die
+	apache2_src_install
+}
diff --git a/net-www/mod_vdbh/ChangeLog b/net-www/mod_vdbh/ChangeLog
index 66b5e26a4db3..32528a31ed7c 100644
--- a/net-www/mod_vdbh/ChangeLog
+++ b/net-www/mod_vdbh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mod_vdbh
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_vdbh/ChangeLog,v 1.9 2004/09/03 23:24:08 pvdabeel Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_vdbh/ChangeLog,v 1.10 2005/01/09 00:13:00 hollow Exp $
+
+*mod_vdbh-1.0.3-r1 (09 Jan 2005)
+
+  09 Jan 2005; Benedikt Boehm <hollow@gentoo.org> metadata.xml,
+  +files/1.0.3-r1/21_mod_vdbh.conf, +mod_vdbh-1.0.3-r1.ebuild:
+  Apache herd package refresh
 
   04 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   mod_vdbh-1.0.3.ebuild:
diff --git a/net-www/mod_vdbh/Manifest b/net-www/mod_vdbh/Manifest
index de5deeec65a7..5cfb0dadb380 100644
--- a/net-www/mod_vdbh/Manifest
+++ b/net-www/mod_vdbh/Manifest
@@ -1,9 +1,12 @@
-MD5 a3563fc32cd1c0d257ee4e723b54e78c ChangeLog 1128
-MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
-MD5 9551f901de71c886cb28d584773716af mod_vdbh-1.0.2-r1.ebuild 863
-MD5 2d6975baa9b91b68e14bca27022c26d2 mod_vdbh-1.0.2.ebuild 859
-MD5 df3019851fccc6fb0970ab68dd4523f1 mod_vdbh-1.0.3.ebuild 879
+MD5 59106b140e0f4054088b8b5434d752d8 ChangeLog 1320
+MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
+MD5 9f836a90624909befcb789f5021128f6 mod_vdbh-1.0.2-r1.ebuild 863
+MD5 629ef3e1fc406c631c8da22dc6883684 mod_vdbh-1.0.2.ebuild 859
+MD5 ace498e990e83f9394455720729bf3d5 mod_vdbh-1.0.3.ebuild 879
+MD5 9a4094601abb0e3ec9a4d5e5e6147af6 mod_vdbh-1.0.3-r1.ebuild 767
 MD5 5dde0d1eb90420a1ba31516e99151139 files/21_mod_vdbh.conf 576
 MD5 3e4e2e532cd0eaf5fc84c4d9d9917f77 files/digest-mod_vdbh-1.0.2 65
 MD5 3e4e2e532cd0eaf5fc84c4d9d9917f77 files/digest-mod_vdbh-1.0.2-r1 65
 MD5 697732d8b1d327f07a0d56a17f021ae5 files/digest-mod_vdbh-1.0.3 64
+MD5 697732d8b1d327f07a0d56a17f021ae5 files/digest-mod_vdbh-1.0.3-r1 64
+MD5 fdfebeb3c991150f5d17e7e05637a0f8 files/1.0.3-r1/21_mod_vdbh.conf 566
diff --git a/net-www/mod_vdbh/files/1.0.3-r1/21_mod_vdbh.conf b/net-www/mod_vdbh/files/1.0.3-r1/21_mod_vdbh.conf
new file mode 100644
index 000000000000..6ccb88181fc4
--- /dev/null
+++ b/net-www/mod_vdbh/files/1.0.3-r1/21_mod_vdbh.conf
@@ -0,0 +1,22 @@
+<IfDefine VDBH>
+  <IfModule !mod_vdbh.c>
+    LoadModule vdbh_module    modules/mod_vdbh.so
+  </IfModule>
+</IfDefine>
+
+<IfModule mod_vdbh.c>
+
+  #NameVirtualHost 206.9.161.29
+  #<VirtualHost 206.9.161.29>
+  #    vdbh On
+  #    vdbh_CLIENT_COMPRESS On
+  #    vdbh_MySQL_Database virtual_hosts
+  #    vdbh_MySQL_Table virtual_hosts
+  #    vdbh_MySQL_Host_Field server
+  #    vdbh_MySQL_Path_Field path
+  #    vdbh_MySQL_Environment_Field environment_variable
+  #    vdbh_Default_Host julia.fractal.net
+  #    vdbh_Declines .htpasswd *.txt
+  #</VirtualHost>
+
+</IfModule>
diff --git a/net-www/mod_vdbh/files/digest-mod_vdbh-1.0.3-r1 b/net-www/mod_vdbh/files/digest-mod_vdbh-1.0.3-r1
new file mode 100644
index 000000000000..3ff8ac6ea20c
--- /dev/null
+++ b/net-www/mod_vdbh/files/digest-mod_vdbh-1.0.3-r1
@@ -0,0 +1 @@
+MD5 3bd571f4d35f6b7b9f11b6eacab3947c mod_vdbh-1.0.3.tar.gz 8053
diff --git a/net-www/mod_vdbh/metadata.xml b/net-www/mod_vdbh/metadata.xml
index bcaabdbbd0d3..10510cb8be95 100644
--- a/net-www/mod_vdbh/metadata.xml
+++ b/net-www/mod_vdbh/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>apache</herd>
-<longdescription>
-The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating systems including UNIX and Windows NT. The goal of this project is to provide a secure, efficient and extensible server that provides HTTP services in sync with the current HTTP standards.
-</longdescription>
+<maintainer>
+  <email>apache-devs@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/net-www/mod_vdbh/mod_vdbh-1.0.2-r1.ebuild b/net-www/mod_vdbh/mod_vdbh-1.0.2-r1.ebuild
index ff8aae79772d..7d71eb2aab9a 100644
--- a/net-www/mod_vdbh/mod_vdbh-1.0.2-r1.ebuild
+++ b/net-www/mod_vdbh/mod_vdbh-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_vdbh/mod_vdbh-1.0.2-r1.ebuild,v 1.4 2004/07/14 06:15:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_vdbh/mod_vdbh-1.0.2-r1.ebuild,v 1.5 2005/01/09 00:13:00 hollow Exp $
 
 DESCRIPTION="An Apache2 DSO for mass virtual hosting using a MySQL database"
 HOMEPAGE="http://www.synthemesc.com/mod_vdbh/"
diff --git a/net-www/mod_vdbh/mod_vdbh-1.0.2.ebuild b/net-www/mod_vdbh/mod_vdbh-1.0.2.ebuild
index 7609e3a2e945..d9afb430ecd7 100644
--- a/net-www/mod_vdbh/mod_vdbh-1.0.2.ebuild
+++ b/net-www/mod_vdbh/mod_vdbh-1.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_vdbh/mod_vdbh-1.0.2.ebuild,v 1.5 2004/07/14 06:15:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_vdbh/mod_vdbh-1.0.2.ebuild,v 1.6 2005/01/09 00:13:00 hollow Exp $
 
 DESCRIPTION="An Apache2 DSO for mass virtual hosting using a MySQL database"
 HOMEPAGE="http://www.synthemesc.com/mod_vdbh/"
diff --git a/net-www/mod_vdbh/mod_vdbh-1.0.3-r1.ebuild b/net-www/mod_vdbh/mod_vdbh-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..f1c28d096653
--- /dev/null
+++ b/net-www/mod_vdbh/mod_vdbh-1.0.3-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_vdbh/mod_vdbh-1.0.3-r1.ebuild,v 1.1 2005/01/09 00:13:00 hollow Exp $
+
+inherit eutils apache-module
+
+DESCRIPTION="An Apache2 DSO for mass virtual hosting using a MySQL database"
+HOMEPAGE="http://www.synthemesc.com/mod_vdbh/"
+SRC_URI="http://www.synthemesc.com/downloads/${PN}/${P}.tar.gz"
+
+S="${WORKDIR}/${PN}"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+DEPEND=">=dev-db/mysql-3.23*
+	>=sys-libs/zlib-1.1.4"
+
+APXS2_ARGS="-DHAVE_STDDEF_H -I/usr/include/mysql -Wl,-lmysqlclient -c ${PN}.c"
+APACHE2_MOD_CONF="${PVR}/21_mod_vdbh"
+APACHE2_MOD_DEFINE="VDBH"
+
+DOCFILES="AUTHORS README TODO"
+
+need_apache2
diff --git a/net-www/mod_vdbh/mod_vdbh-1.0.3.ebuild b/net-www/mod_vdbh/mod_vdbh-1.0.3.ebuild
index 89c8fa9471a8..eebc202f7b54 100644
--- a/net-www/mod_vdbh/mod_vdbh-1.0.3.ebuild
+++ b/net-www/mod_vdbh/mod_vdbh-1.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_vdbh/mod_vdbh-1.0.3.ebuild,v 1.3 2004/09/03 23:24:08 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_vdbh/mod_vdbh-1.0.3.ebuild,v 1.4 2005/01/09 00:13:00 hollow Exp $
 
 DESCRIPTION="An Apache2 DSO for mass virtual hosting using a MySQL database"
 HOMEPAGE="http://www.synthemesc.com/mod_vdbh/"