Apache herd package refresh

15 files changed, 150 insertions, 23 deletions

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"