Apache herd package refresh

13 files changed, 206 insertions, 12 deletions

diff --git a/net-www/mod_bandwidth/ChangeLog b/net-www/mod_bandwidth/ChangeLog
index 32d8f5ac24f7..fb37114185bb 100644
--- a/net-www/mod_bandwidth/ChangeLog
+++ b/net-www/mod_bandwidth/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-www/mod_bandwidth
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_bandwidth/ChangeLog,v 1.8 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_bandwidth/ChangeLog,v 1.9 2005/01/08 21:06:39 hollow Exp $
+
+*mod_bandwidth-2.0.5-r1 (08 Jan 2005)
+
+  08 Jan 2005; Benedikt Boehm <hollow@gentoo.org> metadata.xml,
+  +files/10_mod_bandwidth.conf, +files/11_mod_bandwidth.conf,
+  +files/mod_bandwidth-0.1-register.patch,
+  +files/mod_bandwidth-2.0.5-register.patch, +mod_bandwidth-0.1.ebuild,
+  +mod_bandwidth-2.0.5-r1.ebuild:
+  Apache herd package refresh
 
   04 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   mod_bandwidth-2.0.5.ebuild:
diff --git a/net-www/mod_bandwidth/Manifest b/net-www/mod_bandwidth/Manifest
index cc10a5ffaedf..415aa2be1e26 100644
--- a/net-www/mod_bandwidth/Manifest
+++ b/net-www/mod_bandwidth/Manifest
@@ -1,8 +1,16 @@
-MD5 2439656c04681f553a9ecac9adb96d31 ChangeLog 1382
-MD5 d2da0e45d7e39184d1cb7abbe3879086 metadata.xml 159
-MD5 cc0a323077d650bbb9ca332efe12e547 mod_bandwidth-2.0.4.ebuild 1720
-MD5 04b736dafe7019352697a500f62db173 mod_bandwidth-2.0.5.ebuild 1727
+MD5 1c13a92c6e83c9cc334d58802f4857a1 ChangeLog 1727
+MD5 52d4491250bfe0a8852170c9ce5aa3a8 metadata.xml 501
+MD5 db1d24e8bd750e6d9547ce350169510a mod_bandwidth-2.0.4.ebuild 1720
+MD5 550ae1744ab1c9e1d5d40dbacf2847dc mod_bandwidth-2.0.5.ebuild 1727
+MD5 2534d050f891044dfd2d653085fff269 mod_bandwidth-0.1.ebuild 767
+MD5 300f3c5f25f4d6082442e3c36570c1f5 mod_bandwidth-2.0.5-r1.ebuild 893
 MD5 b1f6d1637699dda2b89daf03a5991078 files/digest-mod_bandwidth-2.0.4 59
 MD5 b1f6d1637699dda2b89daf03a5991078 files/digest-mod_bandwidth-2.0.5 59
 MD5 7fdb7dc609577ce39c00d5c998411c56 files/mod_bandwidth-2.0.4-register.patch 658
 MD5 cb75940c95ae90a42fc84bd3baac4f4f files/mod_bandwidth.conf 519
+MD5 7fdb7dc609577ce39c00d5c998411c56 files/mod_bandwidth-2.0.5-register.patch 658
+MD5 b1f6d1637699dda2b89daf03a5991078 files/digest-mod_bandwidth-2.0.5-r1 59
+MD5 dac0efd1eef32dd1d908af7fc099257c files/10_mod_bandwidth.conf 789
+MD5 656e380794c40a6ad5b626a19890bcdb files/digest-mod_bandwidth-0.1 65
+MD5 9f72d332086dbced50fb49b5c6d75328 files/11_mod_bandwidth.conf 782
+MD5 ea897e09ddaffb4b385d94b6f827beb9 files/mod_bandwidth-0.1-register.patch 625
diff --git a/net-www/mod_bandwidth/files/10_mod_bandwidth.conf b/net-www/mod_bandwidth/files/10_mod_bandwidth.conf
new file mode 100644
index 000000000000..70ced3dbcaf3
--- /dev/null
+++ b/net-www/mod_bandwidth/files/10_mod_bandwidth.conf
@@ -0,0 +1,30 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_bandwidth/files/10_mod_bandwidth.conf,v 1.1 2005/01/08 21:06:39 hollow Exp $
+
+<IfDefine BANDWIDTH>
+  <IfModule !mod_bandwidth.c>
+    LoadModule bandwidth_module             modules/mod_bandwidth.so
+  </IfModule>
+</IfDefine>
+
+#
+# Syntax can be found at http://www.cohprog.com/v3/bandwidth/doc-en.html
+#
+<IfModule mod_bandwidth.c>
+  BandWidthDataDir /var/cache/mod_bandwidth
+
+  # This must be turned on for mod_bandwidth to actually do anything
+  # These directives can go inside a VirtualHost or Directory, etc...
+  # 
+  # BandWidthModule On
+
+  # Limit 196.168.0.0/24 to 80KB/sec, with a minimum of 60KB/sec
+  #
+  # BandWidth 196.168.0 80000
+  # BandWidth 196.168.0 60000
+
+  # Everyone else shares 50KB/sec
+  #
+  # Bandwidth all 50000
+</IfModule>
diff --git a/net-www/mod_bandwidth/files/11_mod_bandwidth.conf b/net-www/mod_bandwidth/files/11_mod_bandwidth.conf
new file mode 100644
index 000000000000..62a8d55cef9a
--- /dev/null
+++ b/net-www/mod_bandwidth/files/11_mod_bandwidth.conf
@@ -0,0 +1,30 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_bandwidth/files/11_mod_bandwidth.conf,v 1.1 2005/01/08 21:06:39 hollow Exp $
+
+<IfDefine BANDWIDTH>
+  <IfModule !mod_bandwidth.c>
+    LoadModule bw_module             modules/mod_bandwidth.so
+  </IfModule>
+</IfDefine>
+
+#
+# Syntax can be found at http://www.cohprog.com/v3/bandwidth/doc-en.html
+#
+<IfModule mod_bandwidth.c>
+  BandWidthDataDir /var/cache/mod_bandwidth
+
+  # This must be turned on for mod_bandwidth to actually do anything
+  # These directives can go inside a VirtualHost or Directory, etc...
+  # 
+  # BandWidthModule On
+
+  # Limit 196.168.0.0/24 to 80KB/sec, with a minimum of 60KB/sec
+  #
+  # BandWidth 196.168.0 80000
+  # BandWidth 196.168.0 60000
+
+  # Everyone else shares 50KB/sec
+  #
+  # Bandwidth all 50000
+</IfModule>
diff --git a/net-www/mod_bandwidth/files/digest-mod_bandwidth-0.1 b/net-www/mod_bandwidth/files/digest-mod_bandwidth-0.1
new file mode 100644
index 000000000000..b9e30608dd4f
--- /dev/null
+++ b/net-www/mod_bandwidth/files/digest-mod_bandwidth-0.1
@@ -0,0 +1 @@
+MD5 8a2efaee819f97e33aa352f630448b93 mod_bandwidth-0.1.tgz 11073
diff --git a/net-www/mod_bandwidth/files/digest-mod_bandwidth-2.0.5-r1 b/net-www/mod_bandwidth/files/digest-mod_bandwidth-2.0.5-r1
new file mode 100644
index 000000000000..318a048630c9
--- /dev/null
+++ b/net-www/mod_bandwidth/files/digest-mod_bandwidth-2.0.5-r1
@@ -0,0 +1 @@
+MD5 00f0905d777f79485beb428b53191ecf mod_bandwidth.c 43630
diff --git a/net-www/mod_bandwidth/files/mod_bandwidth-0.1-register.patch b/net-www/mod_bandwidth/files/mod_bandwidth-0.1-register.patch
new file mode 100644
index 000000000000..7da7391ec9d9
--- /dev/null
+++ b/net-www/mod_bandwidth/files/mod_bandwidth-0.1-register.patch
@@ -0,0 +1,19 @@
+diff -Nur mod_bandwidth-0.1/mod_bandwidth-0.1.c mod_bandwidth-0.1-register/mod_bandwidth-0.1.c
+--- mod_bandwidth-0.1/mod_bandwidth-0.1.c	2004-11-05 23:18:31.000000000 +0100
++++ mod_bandwidth-0.1-register/mod_bandwidth-0.1.c	2004-11-17 10:59:05.199819784 +0100
+@@ -340,6 +340,7 @@
+ 
+ 
+ #define VERSION             0.1
++#define VERSION_S           "0.1"
+ #define CORE_PRIVATE
+ 
+ #include <time.h>
+@@ -1010,6 +1011,7 @@
+ 
+     ap_mpm_query(AP_MPMQ_HARD_LIMIT_THREADS, &thread_limit);
+     ap_mpm_query(AP_MPMQ_HARD_LIMIT_DAEMONS, &server_limit);
++    ap_add_version_component(p, "mod_bandwidth/"VERSION_S);
+     return OK;
+ }
+ 
diff --git a/net-www/mod_bandwidth/files/mod_bandwidth-2.0.5-register.patch b/net-www/mod_bandwidth/files/mod_bandwidth-2.0.5-register.patch
new file mode 100644
index 000000000000..9e5222d6ebb9
--- /dev/null
+++ b/net-www/mod_bandwidth/files/mod_bandwidth-2.0.5-register.patch
@@ -0,0 +1,20 @@
+--- mod_bandwidth.c.orig	2003-07-13 22:29:57.000000000 -0400
++++ mod_bandwidth.c	2003-07-13 22:30:49.000000000 -0400
+@@ -1236,9 +1236,16 @@
+ { NULL }
+ };
+ 
++#define MOD_BANDWIDTH_VERSION_S "2.0.4"
++
++void bandwidth_module_init(void)
++{
++    ap_add_version_component("mod_bandwidth/" MOD_BANDWIDTH_VERSION_S);
++}
++
+ module bandwidth_module = {
+    STANDARD_MODULE_STUFF,
+-   NULL,                        /* initializer */
++   bandwidth_module_init,       /* initializer */
+    create_bw_config,            /* bw config creater */
+    NULL,                        /* bw merger --- default is to override */
+    create_bw_server_config,     /* server config */
diff --git a/net-www/mod_bandwidth/metadata.xml b/net-www/mod_bandwidth/metadata.xml
index c054a8cd9b61..46ba836d2661 100644
--- a/net-www/mod_bandwidth/metadata.xml
+++ b/net-www/mod_bandwidth/metadata.xml
@@ -1,5 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>apache</herd>
+  <herd>apache</herd>
+  <maintainer>
+    <email>hollow@gentoo.org</email>
+    <name>Benedikt Boehm</name>
+  </maintainer>
+  <longdescription>
+    Mod_bandwidth is a module for the Apache webserver that enables the setting
+    of server-wide or per connection bandwidth limits, based on the directory,
+    size of files and remote IP/domain.
+  </longdescription>
 </pkgmetadata>
diff --git a/net-www/mod_bandwidth/mod_bandwidth-0.1.ebuild b/net-www/mod_bandwidth/mod_bandwidth-0.1.ebuild
new file mode 100644
index 000000000000..79459375225a
--- /dev/null
+++ b/net-www/mod_bandwidth/mod_bandwidth-0.1.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_bandwidth/mod_bandwidth-0.1.ebuild,v 1.1 2005/01/08 21:06:39 hollow Exp $
+
+inherit eutils apache-module
+
+DESCRIPTION="Bandwidth Management Module for Apache 2.0"
+HOMEPAGE="http://www.ivn.cl/apache/"
+SRC_URI="http://www.ivn.cl/apache/mod_bandwidth-0.1.tgz"
+
+KEYWORDS="~x86"
+DEPEND=""
+LICENSE="Apache-1.1"
+SLOT="1"
+IUSE=""
+
+APXS2_ARGS="-c ${PN}.c"
+APACHE2_MOD_CONF="11_${PN}"
+APACHE2_MOD_DEFINE="BANDWIDTH"
+
+need_apache2
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+	epatch ${FILESDIR}/mod_bandwidth-0.1-register.patch || die
+	mv ${S}/{mod_bandwidth-0.1.c,mod_bandwidth.c}
+}
+
+pkg_postinst() {
+	# empty dirs
+	install -m0755 -o apache -g apache -d ${ROOT}/var/cache/mod_bandwidth/{link,master}
+	apache2_pkg_postinst
+}
diff --git a/net-www/mod_bandwidth/mod_bandwidth-2.0.4.ebuild b/net-www/mod_bandwidth/mod_bandwidth-2.0.4.ebuild
index 4b61fd2d12ed..34fe4c588b5b 100644
--- a/net-www/mod_bandwidth/mod_bandwidth-2.0.4.ebuild
+++ b/net-www/mod_bandwidth/mod_bandwidth-2.0.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_bandwidth/mod_bandwidth-2.0.4.ebuild,v 1.6 2004/06/25 01:00:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_bandwidth/mod_bandwidth-2.0.4.ebuild,v 1.7 2005/01/08 21:06:39 hollow Exp $
 
 DESCRIPTION="Bandwidth Management Module for Apache"
 HOMEPAGE="http://www.cohprog.com/v3/bandwidth/intro-en.html"
diff --git a/net-www/mod_bandwidth/mod_bandwidth-2.0.5-r1.ebuild b/net-www/mod_bandwidth/mod_bandwidth-2.0.5-r1.ebuild
new file mode 100644
index 000000000000..15850e332e3d
--- /dev/null
+++ b/net-www/mod_bandwidth/mod_bandwidth-2.0.5-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_bandwidth/mod_bandwidth-2.0.5-r1.ebuild,v 1.1 2005/01/08 21:06:39 hollow Exp $
+
+inherit eutils apache-module
+
+DESCRIPTION="Bandwidth Management Module for Apache"
+HOMEPAGE="http://www.cohprog.com/v3/bandwidth/intro-en.html"
+SRC_URI="ftp://ftp.cohprog.com/pub/apache/module/1.3.0/mod_bandwidth.c"
+
+KEYWORDS="~x86 ~sparc ~ppc"
+DEPEND=""
+LICENSE="Apache-1.1"
+SLOT="0"
+IUSE=""
+
+APACHE1_MOD_CONF="10_${PN}"
+APACHE1_MOD_DEFINE="BANDWIDTH"
+
+need_apache1
+
+src_unpack() {
+	mkdir -p ${S} && cp ${DISTDIR}/${A} ${S} || die
+	cd ${S} || die
+	epatch ${FILESDIR}/${P}-register.patch || die
+	sed -i -e "s:define MOD_BANDWIDTH_VERSION_S.*:define MOD_BANDWIDTH_VERSION_S \"${PV}\":" mod_bandwidth.c || die "version fix failed"
+}
+
+pkg_postinst() {
+	# empty dirs
+	install -m0755 -o apache -g apache -d ${ROOT}/var/cache/mod_bandwidth/{link,master}
+	apache1_pkg_postinst
+}
diff --git a/net-www/mod_bandwidth/mod_bandwidth-2.0.5.ebuild b/net-www/mod_bandwidth/mod_bandwidth-2.0.5.ebuild
index 85b29b557e8e..97a96fcd038e 100644
--- a/net-www/mod_bandwidth/mod_bandwidth-2.0.5.ebuild
+++ b/net-www/mod_bandwidth/mod_bandwidth-2.0.5.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_bandwidth/mod_bandwidth-2.0.5.ebuild,v 1.5 2004/09/03 23:24:08 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_bandwidth/mod_bandwidth-2.0.5.ebuild,v 1.6 2005/01/08 21:06:39 hollow Exp $
 
 DESCRIPTION="Bandwidth Management Module for Apache"
 HOMEPAGE="http://www.cohprog.com/v3/bandwidth/intro-en.html"