From c399d539f0e3802194114d2566e8334951ffb146 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 23 Jul 2010 18:07:58 +0000
Subject: testing/bluez: upgrade to 4.69

---
 testing/bluez/APKBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'testing')

diff --git a/testing/bluez/APKBUILD b/testing/bluez/APKBUILD
index b8a18a350e..2bf90aea96 100644
--- a/testing/bluez/APKBUILD
+++ b/testing/bluez/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bluez
-pkgver=4.64
-pkgrel=1
+pkgver=4.69
+pkgrel=0
 pkgdesc="Tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
 license="GPL2"
@@ -72,6 +72,6 @@ netlink() {
 		"$subpkgdir"/usr/lib/bluetooth/plugins
 }
 
-md5sums="d6e60bad937fe72b0bc77e327ee470b0  bluez-4.64.tar.bz2
+md5sums="350568aa11a95eac6e56e9289ff1f91d  bluez-4.69.tar.bz2
 66408fb89b05e7ce7e61c4c3c356d2c6  bluetooth.initd
 a159d897a057f4675548327329c4cc22  bluetooth.confd"
-- 
cgit v1.2.3


From d3edd157d08526e8f63d01e4b4c0acdf6d1a8c10 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 23 Jul 2010 18:29:59 +0000
Subject: testing/bluez: fix support for usb and gstreamer

---
 testing/bluez/APKBUILD | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'testing')

diff --git a/testing/bluez/APKBUILD b/testing/bluez/APKBUILD
index 2bf90aea96..1ae394e84f 100644
--- a/testing/bluez/APKBUILD
+++ b/testing/bluez/APKBUILD
@@ -1,14 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bluez
 pkgver=4.69
-pkgrel=0
+pkgrel=1
 pkgdesc="Tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
 license="GPL2"
 depends=
-makedepends="dbus-dev gstreamer-dev alsa-lib-dev libusb-dev libnl-dev"
+makedepends="dbus-dev gst-plugins-base-dev alsa-lib-dev libusb-compat-dev
+	libnl-dev"
 subpackages="$pkgname-dev $pkgname-doc libbluetooth $pkgname-alsa $pkgname-cups
-	$pkgname-netlink"
+	$pkgname-netlink $pkgname-gstreamer"
 source="http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.bz2
 	bluetooth.initd
 	bluetooth.confd
@@ -72,6 +73,12 @@ netlink() {
 		"$subpkgdir"/usr/lib/bluetooth/plugins
 }
 
+gstreamer() {
+	pkgdesc="Bluez plugin for gstreamer"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/gstreamer* \
+		"$subpkgdir"/usr/lib/
+}
 md5sums="350568aa11a95eac6e56e9289ff1f91d  bluez-4.69.tar.bz2
 66408fb89b05e7ce7e61c4c3c356d2c6  bluetooth.initd
 a159d897a057f4675548327329c4cc22  bluetooth.confd"
-- 
cgit v1.2.3


From dd195cdcf5e67c9c21257512ded0a03b5bff0d5e Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 23 Jul 2010 18:44:57 +0000
Subject: testing/libusb-compat: fix dependency for -dev

---
 testing/libusb-compat/APKBUILD | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'testing')

diff --git a/testing/libusb-compat/APKBUILD b/testing/libusb-compat/APKBUILD
index d36933b66b..daffca273e 100644
--- a/testing/libusb-compat/APKBUILD
+++ b/testing/libusb-compat/APKBUILD
@@ -1,12 +1,13 @@
 # Maintainer: Leonardo Arena <rnalrd@gmail.com>
 pkgname=libusb-compat
 pkgver=0.1.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Compatibility library for use by user level applications to access USB devices regardless of OS"
 url="http://www.libusb.org/"
 license="LGPL v2.1"
 depends=
 makedepends="libusb-dev"
+depends_dev="libusb-dev"
 install=
 subpackages="$pkgname-dev"
 source="http://downloads.sourceforge.net/project/libusb/libusb-compat-0.1/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"
-- 
cgit v1.2.3


From ea3f9462b32674efcb34d577e5a620580d977766 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 23 Jul 2010 19:27:51 +0000
Subject: testing/bluez: include bluez-simple-agent

---
 testing/bluez/APKBUILD | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'testing')

diff --git a/testing/bluez/APKBUILD b/testing/bluez/APKBUILD
index 1ae394e84f..a011239283 100644
--- a/testing/bluez/APKBUILD
+++ b/testing/bluez/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bluez
 pkgver=4.69
-pkgrel=1
+pkgrel=2
 pkgdesc="Tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
 license="GPL2"
@@ -45,6 +45,7 @@ package() {
 	make install DESTDIR="$pkgdir"
 	install -Dm755 "$srcdir"/bluetooth.initd "$pkgdir"/etc/init.d/bluetooth
 	install -Dm644 "$srcdir"/bluetooth.confd "$pkgdir"/etc/conf.d/bluetooth
+	install -Dm755 "$srcdir"/test/simple-agent "$pkgdir"/usr/bin/bluez-simple-agent
 }
 
 libbluetooth() {
-- 
cgit v1.2.3


From 0ece70338db480ca97a5edbdc0351d09ec956269 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 23 Jul 2010 19:34:04 +0000
Subject: testing/bluez: build fix

---
 testing/bluez/APKBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'testing')

diff --git a/testing/bluez/APKBUILD b/testing/bluez/APKBUILD
index a011239283..6ccd959312 100644
--- a/testing/bluez/APKBUILD
+++ b/testing/bluez/APKBUILD
@@ -45,7 +45,7 @@ package() {
 	make install DESTDIR="$pkgdir"
 	install -Dm755 "$srcdir"/bluetooth.initd "$pkgdir"/etc/init.d/bluetooth
 	install -Dm644 "$srcdir"/bluetooth.confd "$pkgdir"/etc/conf.d/bluetooth
-	install -Dm755 "$srcdir"/test/simple-agent "$pkgdir"/usr/bin/bluez-simple-agent
+	install -Dm755 test/simple-agent "$pkgdir"/usr/bin/bluez-simple-agent
 }
 
 libbluetooth() {
-- 
cgit v1.2.3


From 7ae1072fba012df7f5cea36c55d923c0a2f5b817 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Sat, 24 Jul 2010 07:56:16 +0000
Subject: testing/py-gobject: new aport

Python bindings for the GObject library
http://www.pygtk.org/
---
 testing/py-gobject/APKBUILD | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 testing/py-gobject/APKBUILD

(limited to 'testing')

diff --git a/testing/py-gobject/APKBUILD b/testing/py-gobject/APKBUILD
new file mode 100644
index 0000000000..fe758d3c9a
--- /dev/null
+++ b/testing/py-gobject/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: 
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=py-gobject
+pkgver=2.20.0
+pkgrel=0
+pkgdesc="Python bindings for the GObject library"
+url="http://www.pygtk.org/"
+license="GPL"
+depends=
+makedepends="python-dev glib-dev"
+install=
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.20/pygobject-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/pygobject-$pkgver
+prepare() {
+	cd "$_builddir"
+	# apply patches here
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+md5sums="10e1fb79be3d698476a28b1e1b0c5640  pygobject-2.20.0.tar.bz2"
-- 
cgit v1.2.3


From 696cbfd0ad23379ae90f40ba336efd0cef18a834 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Sat, 24 Jul 2010 08:09:49 +0000
Subject: testing/py-dbus: new aport

Python bindings for DBUS
http://www.freedesktop.org/wiki/Software/DBusBindings
---
 testing/py-dbus/APKBUILD | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 testing/py-dbus/APKBUILD

(limited to 'testing')

diff --git a/testing/py-dbus/APKBUILD b/testing/py-dbus/APKBUILD
new file mode 100644
index 0000000000..64e1d54181
--- /dev/null
+++ b/testing/py-dbus/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=py-dbus
+pkgver=0.83.1
+pkgrel=0
+pkgdesc="Python bindings for DBUS"
+url="http://www.freedesktop.org/wiki/Software/DBusBindings"
+license="GPL LGPL"
+depends="python>=2.6.5"
+makedepends="pkgconfig dbus-glib-dev python-dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://dbus.freedesktop.org/releases/dbus-python/dbus-python-$pkgver.tar.gz"
+
+_builddir="$srcdir"/dbus-python-$pkgver
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr || return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+}
+
+md5sums="5fdf3970aa0c00020289de7ba8f3be18  dbus-python-0.83.1.tar.gz"
-- 
cgit v1.2.3


From 28d08f8ac2796f1be43712d277540a1aeac932e6 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 26 Jul 2010 14:30:48 +0000
Subject: testing/sems: bump pkgrel so we get the init.d script included

---
 testing/sems/APKBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'testing')

diff --git a/testing/sems/APKBUILD b/testing/sems/APKBUILD
index 9d16fc8336..c587cae82d 100644
--- a/testing/sems/APKBUILD
+++ b/testing/sems/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Francesco Colista <francesco.colista@gmail.com>
 pkgname=sems
 pkgver=1.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="High performance, extensible media server for SIP (RFC3261) based VoIP  services"
 url="http://iptel.org/sems/"
 license="GPL-2"
-- 
cgit v1.2.3


From 6a74f0064cfb6554de47f73b56c9c58e2914fe9f Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 27 Jul 2010 07:24:41 +0000
Subject: testing/cmph: new aport

minimal perfect hash C library - utility application
http://cmph.sourceforge.net/
---
 testing/cmph/APKBUILD | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 testing/cmph/APKBUILD

(limited to 'testing')

diff --git a/testing/cmph/APKBUILD b/testing/cmph/APKBUILD
new file mode 100644
index 0000000000..a52b0bcf13
--- /dev/null
+++ b/testing/cmph/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: 
+# Maintainer: 
+pkgname=cmph
+pkgver=0.9
+pkgrel=0
+pkgdesc="minimal perfect hash C library - utility application"
+url="http://cmph.sourceforge.net/"
+license="LGPL MPL-1.1"
+depends=
+makedepends=
+install=
+subpackages="$pkgname-dev $pkgname-doc libcmph:lib"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+lib() {
+	pkgdesc="minimal perfect hash C library - utility application"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libcmph*.so.* "$subpkgdir"/usr/lib/
+}
+
+md5sums="14c17e3058174e9333936caa8e18ed28  cmph-0.9.tar.gz"
-- 
cgit v1.2.3


From 76ec47a71a94d95451e36a71c847c29175044eae Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 27 Jul 2010 09:38:56 +0000
Subject: testing/iw: new aport

nl80211 based CLI configuration utility for wireless devices
http://wireless.kernel.org/en/users/Documentation/iw
---
 testing/iw/APKBUILD             | 33 +++++++++++++++++++++++++++++++++
 testing/iw/iw-bb-install.patch  | 15 +++++++++++++++
 testing/iw/iw-git-version.patch | 11 +++++++++++
 3 files changed, 59 insertions(+)
 create mode 100644 testing/iw/APKBUILD
 create mode 100644 testing/iw/iw-bb-install.patch
 create mode 100644 testing/iw/iw-git-version.patch

(limited to 'testing')

diff --git a/testing/iw/APKBUILD b/testing/iw/APKBUILD
new file mode 100644
index 0000000000..3cce23eff1
--- /dev/null
+++ b/testing/iw/APKBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=iw
+pkgver=0.9.18
+pkgrel=0
+pkgdesc="nl80211 based CLI configuration utility for wireless devices"
+url="http://wireless.kernel.org/en/users/Documentation/iw"
+license="GPL"
+depends=""
+makedepends="libnl-dev"
+source="http://wireless.kernel.org/download/iw/iw-$pkgver.tar.bz2
+	iw-bb-install.patch
+	iw-git-version.patch"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	cd "$_builddir"
+	patch -p1 -i "$srcdir"/iw-bb-install.patch || return 1
+	patch -p1 -i "$srcdir"/iw-git-version.patch || return 1
+}
+
+build () {
+	cd "$_builddir"
+	make V=1 || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+}
+
+md5sums="9734080d8a5c4b768c5e0da665a48950  iw-0.9.18.tar.bz2
+7f8cfc205fdcfd49d04c8923c76f439a  iw-bb-install.patch
+779d0e73df6e484c071149c9fb720551  iw-git-version.patch"
diff --git a/testing/iw/iw-bb-install.patch b/testing/iw/iw-bb-install.patch
new file mode 100644
index 0000000000..b736dbf7c2
--- /dev/null
+++ b/testing/iw/iw-bb-install.patch
@@ -0,0 +1,15 @@
+--- ./Makefile.orig
++++ ./Makefile
+@@ -86,10 +86,10 @@
+ install: iw iw.8.gz
+ 	@$(NQ) ' INST iw'
+ 	$(Q)$(MKDIR) $(DESTDIR)$(SBINDIR)
+-	$(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(SBINDIR) iw
++	$(Q)$(INSTALL) -m 755 iw $(DESTDIR)$(SBINDIR)/
+ 	@$(NQ) ' INST iw.8'
+ 	$(Q)$(MKDIR) $(DESTDIR)$(MANDIR)/man8/
+-	$(Q)$(INSTALL) -m 644 -t $(DESTDIR)$(MANDIR)/man8/ iw.8.gz
++	$(Q)$(INSTALL) -m 644 iw.8.gz $(DESTDIR)$(MANDIR)/man8/
+ 
+ clean:
+ 	$(Q)rm -f iw *.o *~ *.gz version.c *-stamp
diff --git a/testing/iw/iw-git-version.patch b/testing/iw/iw-git-version.patch
new file mode 100644
index 0000000000..0286eb4889
--- /dev/null
+++ b/testing/iw/iw-git-version.patch
@@ -0,0 +1,11 @@
+--- ./version.sh.orig
++++ ./version.sh
+@@ -5,7 +5,7 @@
+ 
+ echo '#include "iw.h"' > "$OUT"
+ 
+-if head=`git rev-parse --verify HEAD 2>/dev/null`; then
++if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then
+ 	git update-index --refresh --unmerged > /dev/null
+ 	descr=$(git describe)
+ 
-- 
cgit v1.2.3


From 390e45e6bad74946c1aaf87fa7ad180b434b05b9 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 28 Jul 2010 13:40:43 +0000
Subject: testing/smokeping: new aport

Smokeping network latency monitoring
http://oss.oetiker.ch/smokeping/

ref #348
---
 testing/smokeping/APKBUILD              | 107 ++++++++++++++++++++++++++++++++
 testing/smokeping/smokeping.initd       |  77 +++++++++++++++++++++++
 testing/smokeping/smokeping.pre-install |   5 ++
 3 files changed, 189 insertions(+)
 create mode 100644 testing/smokeping/APKBUILD
 create mode 100644 testing/smokeping/smokeping.initd
 create mode 100644 testing/smokeping/smokeping.pre-install

(limited to 'testing')

diff --git a/testing/smokeping/APKBUILD b/testing/smokeping/APKBUILD
new file mode 100644
index 0000000000..9ea5710534
--- /dev/null
+++ b/testing/smokeping/APKBUILD
@@ -0,0 +1,107 @@
+# Contributor: Jeff Bilyk <jbilyk at gmail>
+pkgname=smokeping
+pkgver=2.4.2
+pkgrel=0
+pkgdesc="Smokeping network latency monitoring"
+pkgusers="smokeping"
+pkggroups="smokeping"
+install="$pkgname.pre-install"
+url="http://oss.oetiker.ch/smokeping/"
+source="http://oss.oetiker.ch/smokeping/pub/smokeping-$pkgver.tar.gz
+	smokeping.initd"
+depends="perl fping rrdtool perl-rrd
+	perl-uri-escape
+	perl-digest-hmac
+	perl-cgi-session
+	perl-libwww
+	perl-snmp-session
+	perl-net-dns
+	"
+license="GPL"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+_vendorlib=/usr/share/perl5/vendor_perl
+
+prepare() {
+	cd "$_builddir"
+	# provided by perl-digest-hmac
+	rm -rf lib/Digest
+	# provided by perl-cgi-session
+	rm -rf lib/CGI 
+	# provided by perl-snmp-session
+	rm -r lib/BER.pm lib/SNMP_Session.pm lib/SNMP_util.pm
+	rm -r qooxdoo/qooxdoolink
+}
+
+build() {
+	return 0
+}
+
+package() {
+	cd "$_builddir"
+
+	# create dirs
+	mkdir -p "$pkgdir"/etc/smokeping \
+		"$pkgdir"/usr/bin \
+		"$pkgdir"/usr/share/webapps/smokeping \
+		"$pkgdir"/$_vendorlib
+
+	# install libs
+	cp -ra "$_builddir"/lib/* "$pkgdir"/$_vendorlib
+
+	# install cgi scripts
+	sed -e 's:^use lib:#use lib:g' \
+		-e 's:/home/oetiker.*/config.dist:/etc/smokeping/config:' \
+		-i htdocs/*.cgi.dist
+	
+	for i in smokeping.cgi tr.cgi; do
+		install -m755 htdocs/$i.dist \
+			"$pkgdir"/usr/share/webapps/smokeping/$i \
+			|| return 1
+		rm htdocs/$i.dist
+	done
+
+	# install ajax scripts
+	mv "$_builddir/htdocs"/* "$pkgdir"/usr/share/webapps/smokeping
+
+	# install smokeping executables
+	for i in smokeping tSmoke; do
+		sed -e 's:^use lib:#use lib:g' \
+			-e 's:etc/config.dist:/etc/smokeping/config:' \
+			-i bin/$i.dist
+		install -m755 bin/$i.dist "$pkgdir"/usr/bin/$i
+	done
+
+	# config
+	sed -e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
+		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
+		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
+		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /var/run/smokeping:}' \
+		-e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
+		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
+		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
+		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
+		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
+		-i etc/config.dist || return 1
+	
+	sed -e '/^<script/{s:cropper/:/cropper/:}' \
+		-i etc/basepage.html.dist \
+		|| return 1
+
+	for i in etc/*; do
+		local f=${i##*/}
+		install -m644 "$i" "$pkgdir"/etc/smokeping/${f%.dist}
+	done
+
+	chmod 700 "$pkgdir"/etc/smokeping/smokeping_secrets
+
+	# initscript
+	install -Dm755 "$srcdir"/smokeping.initd "$pkgdir"/etc/init.d/smokeping\
+		|| return 1
+
+	install -d -o smokeping -g smokeping -m755 "$pkgdir"/var/lib/smokeping.simg
+
+}
+
+md5sums="eb8e7679fcad35e59d7c51f2328250a2  smokeping-2.4.2.tar.gz
+550979e008f49299bf404aceeb81fe61  smokeping.initd"
diff --git a/testing/smokeping/smokeping.initd b/testing/smokeping/smokeping.initd
new file mode 100644
index 0000000000..068f33ff25
--- /dev/null
+++ b/testing/smokeping/smokeping.initd
@@ -0,0 +1,77 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+opts="${opts} dump reload restore"
+
+depend() {
+	need net
+	use dns
+}
+
+checkconfig() {
+	if [ ! -f "/etc/smokeping/config" ] ; then
+		eerror "You need /etc/smokeping/config to run smokeping!"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	if [ ! -d /var/run/smokeping/ ]; then
+		mkdir /var/run/smokeping/
+	fi
+	chown smokeping:smokeping /var/run/smokeping/
+
+	ebegin "Starting smokeping"
+	LC_ALL=C \
+	start-stop-daemon --start --name smokeping \
+		--pidfile /var/run/smokeping/smokeping.pid \
+		--exec /usr/bin/smokeping \
+		--chuid smokeping:smokeping
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping smokeping"
+	start-stop-daemon --stop \
+		--pidfile /var/run/smokeping/smokeping.pid
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading smokeping"
+	/usr/bin/smokeping --reload 1>/dev/null 2>&1
+	eend $?
+}
+
+dump() {
+	ebegin "Dumping smokeping rrd files to XML for backup or upgrade use"
+	if service_started "${myservice}" ; then
+		eerror "You need to stop smokeping before dumping files!"
+		return 1
+	fi
+	for f in `find /var/lib/smokeping -name '*.rrd' -print` ; do
+		f_xml=`dirname $f`/`basename $f .rrd`.xml
+		rrdtool dump "$f" > "${f_xml}"
+		chown root:0 "${f_xml}"
+	done
+	eend $?
+}
+
+restore() {
+	ebegin "Restoring smokeping rrd files from XML dump files"
+	if service_started "${myservice}" ; then
+		eerror "You need to stop smokeping before restoring files!"
+		return 1
+	fi
+	for f in `find /var/lib/smokeping -name '*.xml' -print` ; do
+		f_rrd=`dirname $f`/`basename $f .xml`.rrd
+		mv -f "${f_rrd}" "${f_rrd}.bak"
+		chown root:0 "${f_rrd}.bak"
+		rrdtool restore "$f" "${f_rrd}"
+		chown smokeping:smokeping "${f_rrd}"
+	done
+	eend $?
+}
diff --git a/testing/smokeping/smokeping.pre-install b/testing/smokeping/smokeping.pre-install
new file mode 100644
index 0000000000..236550f7c1
--- /dev/null
+++ b/testing/smokeping/smokeping.pre-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+addgroup smokeping 2>/dev/null
+adduser -h /var/lib/smokeping -S -D -G smokeping smokeping 2>/dev/null
+exit 0
-- 
cgit v1.2.3


From 24710348a568f07bb1aab710f87732f54954658c Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 28 Jul 2010 13:44:32 +0000
Subject: testing/perl-snmp-session: new aport

A SNMP Perl Module
http://code.google.com/p/snmp-session/
---
 testing/perl-snmp-session/APKBUILD | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 testing/perl-snmp-session/APKBUILD

(limited to 'testing')

diff --git a/testing/perl-snmp-session/APKBUILD b/testing/perl-snmp-session/APKBUILD
new file mode 100644
index 0000000000..dc8572ff17
--- /dev/null
+++ b/testing/perl-snmp-session/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=perl-snmp-session
+_name=SNMP_Session
+pkgver=1.13
+pkgrel=0
+pkgdesc="A SNMP Perl Module"
+url="http://code.google.com/p/snmp-session/"
+license="PerlArtistic"
+depends="perl"
+makedepends="perl-dev"
+source="http://snmp-session.googlecode.com/files/$_name-$pkgver.tar.gz"
+
+build () {
+	cd "$srcdir"/$_name-$pkgver
+	perl Makefile.PL INSTALLDIRS=vendor || return 1
+	make MAN1EXT=1p MAN3EXT=3pm || return 1
+}
+
+package() {
+	cd "$srcdir"/$_name-$pkgver
+	make install MAN1EXT=1p MAN3EXT=3pm DESTDIR="$pkgdir" || return 1
+	find "$pkgdir" -name perllocal.pod -delete
+	find "$pkgdir" -name .packlist -delete
+}
+md5sums="055e1065babf55f1f8606329c6bdb947  SNMP_Session-1.13.tar.gz"
-- 
cgit v1.2.3


From 8e928b24d0e04c0394297376538b42dd71abaf93 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 28 Jul 2010 13:45:16 +0000
Subject: testing/perl-cgi-session: new aport

perl module for persistent session data in CGI applications
http://search.cpan.org/~markstos/CGI-Session-4.42/
---
 testing/perl-cgi-session/APKBUILD | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 testing/perl-cgi-session/APKBUILD

(limited to 'testing')

diff --git a/testing/perl-cgi-session/APKBUILD b/testing/perl-cgi-session/APKBUILD
new file mode 100644
index 0000000000..9fbe2d92d0
--- /dev/null
+++ b/testing/perl-cgi-session/APKBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=perl-cgi-session
+_name=CGI-Session
+pkgver=4.42
+pkgrel=0
+pkgdesc="perl module for persistent session data in CGI applications"
+url="http://search.cpan.org/~markstos/CGI-Session-4.42/"
+license="PerlArtistic"
+depends="perl"
+makedepends="perl-dev"
+subpackages="$pkgname-doc"
+source="http://search.cpan.org/CPAN/authors/id/M/MA/MARKSTOS/CGI-Session-$pkgver.tar.gz"
+
+build () {
+	cd "$srcdir"/$_name-$pkgver
+	perl Makefile.PL INSTALLDIRS=vendor || return 1
+	make MAN1EXT=1p MAN3EXT=3pm || return 1
+}
+
+package() {
+	cd "$srcdir"/$_name-$pkgver
+	make install MAN1EXT=1p MAN3EXT=3pm DESTDIR="$pkgdir" || return 1
+	find "$pkgdir" -name perllocal.pod -delete
+	find "$pkgdir" -name .packlist -delete
+}
+md5sums="6544261a6aae66410188520b27e10699  CGI-Session-4.42.tar.gz"
-- 
cgit v1.2.3


From 0d395774c7585c486753c46d0462fa81aad8ba13 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 29 Jul 2010 07:30:00 +0000
Subject: testing/mdocml: upgrade to 1.10.5

---
 testing/mdocml/APKBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'testing')

diff --git a/testing/mdocml/APKBUILD b/testing/mdocml/APKBUILD
index 03ede31f40..539ef29e6e 100644
--- a/testing/mdocml/APKBUILD
+++ b/testing/mdocml/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: 
 # Maintainer: 
 pkgname=mdocml
-pkgver=1.10.4
+pkgver=1.10.5
 pkgrel=0
 pkgdesc="Roff implementation"
 url="http://mdocml.bsd.lv/"
@@ -30,4 +30,4 @@ package() {
 		EXAMPLEDIR=/usr/share/doc/mdocml/examples install
 }
 
-md5sums="f23e40cd64f4312b0c4e2d72e7999298  mdocml-1.10.4.tar.gz"
+md5sums="c563967a5d44ab7c423ea0b3ebb09ae5  mdocml-1.10.5.tar.gz"
-- 
cgit v1.2.3


From b967bcc2298dadd6d7a81132505a283c46c9ec44 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 29 Jul 2010 12:26:46 +0000
Subject: main/live-media: moved from testing

---
 testing/live-media/APKBUILD | 44 --------------------------------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 testing/live-media/APKBUILD

(limited to 'testing')

diff --git a/testing/live-media/APKBUILD b/testing/live-media/APKBUILD
deleted file mode 100644
index 0bd0e16714..0000000000
--- a/testing/live-media/APKBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=live-media
-pkgver=2010.01.22
-pkgrel=1
-pkgdesc="A set of C++ libraries for multimedia streaming"
-url="http://live555.com/liveMedia"
-license="LGPL"
-depends=
-makedepends=
-subpackages="$pkgname-dev"
-source="ftp://ftp.archlinux.org/other/$pkgname/live.$pkgver.tar.gz"
-
-_builddir="$srcdir"/live
-
-prepare() { 
-	cd "$_builddir"
-	sed -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DSOCKLEN_T/g' \
-		-e 's/\(LIBRARY_LINK =\).*/\1 $(LD) -o/g' \
-		-e 's/\(LIBRARY_LINK_OPTS =\).*/\1 $(LINK_OPTS) -r -Bstatic/g' \
-		-i config.linux
-}
-
-build() {
-	cd "$_builddir"
-	./genMakefiles linux
-	make C_COMPILER="${CC:-gcc}" CPLUSPLUS_COMPILER="${CXX:-g++}" \
-		|| return 1
-}
-
-package() {
-	local dir
-	cd "$_builddir"
-	for dir in BasicUsageEnvironment UsageEnvironment groupsock liveMedia; do
-		mkdir -p "$pkgdir"/usr/lib/live/${dir}
-		cp -r ${dir}/*.a ${dir}/include "$pkgdir"/usr/lib/live/${dir}
-	done
-
-	mkdir -p "$pkgdir"/usr/bin
-	for testprog in `find testProgs -type f -perm 755`; do
-		install ${testprog} "$pkgdir"/usr/bin
-	done
-}
-
-md5sums="2964edc82256170ffc874c7d3b0e5b06  live.2010.01.22.tar.gz"
-- 
cgit v1.2.3


From 648eefa83c7189822581aca994a967b7747a790d Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 29 Jul 2010 12:29:52 +0000
Subject: main/cmph: moved from testing

---
 testing/cmph/APKBUILD | 40 ----------------------------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 testing/cmph/APKBUILD

(limited to 'testing')

diff --git a/testing/cmph/APKBUILD b/testing/cmph/APKBUILD
deleted file mode 100644
index a52b0bcf13..0000000000
--- a/testing/cmph/APKBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Contributor: 
-# Maintainer: 
-pkgname=cmph
-pkgver=0.9
-pkgrel=0
-pkgdesc="minimal perfect hash C library - utility application"
-url="http://cmph.sourceforge.net/"
-license="LGPL MPL-1.1"
-depends=
-makedepends=
-install=
-subpackages="$pkgname-dev $pkgname-doc libcmph:lib"
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	cd "$_builddir"
-}
-
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-lib() {
-	pkgdesc="minimal perfect hash C library - utility application"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libcmph*.so.* "$subpkgdir"/usr/lib/
-}
-
-md5sums="14c17e3058174e9333936caa8e18ed28  cmph-0.9.tar.gz"
-- 
cgit v1.2.3


From 8ae89e3b191960d851108ca82d0d4948947c9e24 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 29 Jul 2010 15:12:02 +0000
Subject: main/lua-xml: new aport

a minimal set of functions for the processing of XML data in Lua
http://www.viremo.de/LuaXML
---
 testing/lua-xml/APKBUILD | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 testing/lua-xml/APKBUILD

(limited to 'testing')

diff --git a/testing/lua-xml/APKBUILD b/testing/lua-xml/APKBUILD
new file mode 100644
index 0000000000..619a4d2565
--- /dev/null
+++ b/testing/lua-xml/APKBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=lua-xml
+_name=LuaXML
+pkgver=090910
+pkgrel=0
+pkgdesc="a minimal set of functions for the processing of XML data in Lua"
+url="http://www.viremo.de/LuaXML"
+license="MIT"
+depends=
+makedepends="lua-dev"
+install=
+subpackages=
+source="http://www.viremo.de/LuaXML/LuaXML_$pkgver.zip"
+
+_builddir="$srcdir"
+
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	install -m755 -D LuaXML_lib.so "$pkgdir"/usr/lib/lua/5.1/LuaXML_lib.so\
+		|| return 1
+	install -m755 -D LuaXml.lua "$pkgdir"/usr/share/lua/5.1/LuaXml.lua \
+		|| return 1
+}
+
+md5sums="de690d73a34bdc7d3b4f0307a40afd87  LuaXML_090910.zip"
-- 
cgit v1.2.3


From 23db8ff6367bc28c224de0b8667381a2ee572877 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 30 Jul 2010 13:55:02 +0000
Subject: testing/vlc: moved from unstable

builds atleast
---
 testing/vlc/APKBUILD                   | 121 +++++++++++++++++++++++++++++++++
 testing/vlc/uclibc-inhibit-spawn.patch |  35 ++++++++++
 testing/vlc/uclibc-libcompat.patch     |  81 ++++++++++++++++++++++
 testing/vlc/uclibc3.patch              |  49 +++++++++++++
 4 files changed, 286 insertions(+)
 create mode 100644 testing/vlc/APKBUILD
 create mode 100644 testing/vlc/uclibc-inhibit-spawn.patch
 create mode 100644 testing/vlc/uclibc-libcompat.patch
 create mode 100644 testing/vlc/uclibc3.patch

(limited to 'testing')

diff --git a/testing/vlc/APKBUILD b/testing/vlc/APKBUILD
new file mode 100644
index 0000000000..bc12c857ee
--- /dev/null
+++ b/testing/vlc/APKBUILD
@@ -0,0 +1,121 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=vlc
+pkgver=1.1.1
+pkgrel=0
+pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
+url="http://www.videolan.org/vlc/"
+license="GPL-2"
+subpackages="$pkgname-dev $pkgname-doc"
+#depends="libnotify a52dec fluidsynth zvbi libdvbpsi lirc-utils libdca hal 
+#	libproxy sdl_image libdvdnav>=4.1.3 lua libxv libv4l libcddb smbclient
+#	libmatroska taglib sysfsutils libmpcdec ffmpeg>=0.5 libshout libmad
+#	qt fribidi libmpeg2 libmodplug avahi ttf-dejavu"
+depends="ttf-dejavu"
+makedepends="
+	a52dec-dev
+	alsa-lib-dev
+	automake
+	autoconf
+	libtool
+	dbus-dev
+	faad2-dev
+	ffmpeg-dev
+	flac-dev
+	fribidi-dev
+	gtk+-dev
+	libgcrypt-dev
+	libice-dev
+	libiconv-dev
+	libmad-dev
+	libmpeg2-dev
+	libnotify-dev
+	libogg-dev
+	libsm-dev
+	libtheora-dev
+	libx11-dev
+	libxext-dev
+	libxv-dev
+	lua-dev
+	ncurses-dev
+	mesa-dev
+	pkgconfig
+	sdl-dev
+	sysfsutils-dev
+	x264-dev
+	"
+source="http://download.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2
+	uclibc3.patch
+	uclibc-libcompat.patch
+	uclibc-inhibit-spawn.patch
+	"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch)
+			msg "Applying $i"
+			patch -p1 -i "$srcdir"/$i || return 1
+			;;
+		esac;
+	done
+	./bootstrap
+}
+
+build ()
+{
+	cd "$_builddir"
+	sed -i -e 's:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf:' modules/misc/freetype.c
+
+	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
+
+	./configure --prefix=/usr \
+		--disable-mmx \
+		--disable-nls \
+		--disable-optimizations \
+		--disable-qt4 --disable-skins2 \
+		--disable-rpath \
+		--enable-dbus \
+		--enable-dbus-control \
+		--enable-faad \
+		--enable-flac \
+		--enable-httpd \
+		--enable-ncurses \
+		--enable-realrtsp \
+		--enable-sdl \
+		--enable-sout \
+		--enable-theora \
+		--enable-vlm \
+		--enable-xvideo \
+		|| return 1
+
+#		--enable-dvdread \
+#		--enable-dvdnav \
+#		--enable-qt4 \
+#		--enable-skins2 \
+#		--enable-dvb \
+#		--enable-v4l \
+#		--enable-snapshot \
+#		--enable-hal \
+#		--enable-lirc \
+#		--enable-shout \
+#		--enable-pvr \
+
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir"/ install || return 1
+#	for res in 16 32 48 128; do
+#		install -D -m644 share/vlc${res}x${res}.png \
+#			"$pkgdir"/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png || return 1
+#	done
+	rm -rf "$pkgdir"/usr/lib/mozilla
+}
+
+md5sums="7e177faa61450ce752b0fd89ecc81fed  vlc-1.1.1.tar.bz2
+4f74dcde9ce51c15d80c3876b85c05f2  uclibc3.patch
+d718e22a7de9f38579f276f720b2f36a  uclibc-libcompat.patch
+361d6ae9d7b846833ed31e8454074158  uclibc-inhibit-spawn.patch"
diff --git a/testing/vlc/uclibc-inhibit-spawn.patch b/testing/vlc/uclibc-inhibit-spawn.patch
new file mode 100644
index 0000000000..9a6be5bd6a
--- /dev/null
+++ b/testing/vlc/uclibc-inhibit-spawn.patch
@@ -0,0 +1,35 @@
+diff --git a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c
+index 01decac..134c5c9 100644
+--- a/modules/misc/inhibit/xdg.c
++++ b/modules/misc/inhibit/xdg.c
+@@ -25,7 +25,12 @@
+ #include <vlc_common.h>
+ #include <vlc_plugin.h>
+ #include <vlc_inhibit.h>
+-#include <spawn.h>
++#if !defined(_POSIX_SPAWN)
++# define _POSIX_SPAWN -1
++#else
++# include <spawn.h>
++#endif
++
+ #include <sys/wait.h>
+ 
+ static int Open (vlc_object_t *);
+@@ -125,8 +130,15 @@ static void *Thread (void *data)
+         };
+         pid_t pid;
+         int canc = vlc_savecancel ();
+-
++#if (_POSIX_SPAWN >= 0)
+         if (!posix_spawnp (&pid, "xdg-screensaver", NULL, NULL, argv, environ))
++#else
++	pid = fork();
++	if (pid == 0) {
++		execvp("xdg-screensaver", argv);
++		exit(1);
++	} else if (pid > 0)
++#endif
+         {
+             int status;
+ 
diff --git a/testing/vlc/uclibc-libcompat.patch b/testing/vlc/uclibc-libcompat.patch
new file mode 100644
index 0000000000..e4008002f4
--- /dev/null
+++ b/testing/vlc/uclibc-libcompat.patch
@@ -0,0 +1,81 @@
+commit c605c09bbc29d88619264c55c371c9dcbc839eda
+Author: Natanael Copa <ncopa@alpinelinux.org>
+Date:   Thu Jul 29 19:20:17 2010 +0000
+
+    build: libcompat fix in case there are no functions to replace
+    
+    If the libc provides all the funcs in libcompat the libcompat.a will
+    never be created due to LIBOBJS is empty (normally it contains whatever
+    AC_REPLACE_FUNCS detects). This happens on uclibc.
+    
+    Since Makefile.am have a hardcoded LDADD to ../compat/libcompat.la things
+    goes bad when there is no libcompat.a at all. We solve this by checking
+    if LIBOBJS is set by AC_REPLACE_FUNCS and add libcompat via LTLIBCOMPAT.
+    
+    For alternative fixes see http://www.gnu.org/software/hello/manual/automake/LIBOBJS.html
+
+diff --git a/bin/Makefile.am b/bin/Makefile.am
+index 92e6879..a941d99 100644
+--- a/bin/Makefile.am
++++ b/bin/Makefile.am
+@@ -60,5 +60,5 @@ vlc_win32_rc.$(OBJEXT): vlc_win32_rc.rc
+ vlc_cache_gen_SOURCES = cachegen.c
+ vlc_cache_gen_LDADD = \
+ 	$(GNUGETOPT_LIBS) \
+-	../compat/libcompat.la \
++	$(LTLIBCOMPAT) \
+ 	../src/libvlc.la ../src/libvlccore.la
+diff --git a/configure.ac b/configure.ac
+index 52e4830..b385100 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -547,6 +547,14 @@ need_libc=false
+ dnl Check for usual libc functions
+ AC_CHECK_FUNCS([ctime_r daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r gettimeofday isatty lstat memalign openat posix_fadvise posix_madvise posix_memalign setenv setlocale stricmp strnicmp tdestroy uselocale])
+ AC_REPLACE_FUNCS([asprintf atof atoll getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab vasprintf])
++
++dnl Check that we actually need libcompat
++LTLIBCOMPAT=""
++if test "x${LIBOBJS}" != "x"; then
++	LTLIBCOMPAT="\$(top_builddir)/compat/libcompat.la"
++fi
++AC_SUBST(LTLIBCOMPAT)
++
+ AC_CHECK_FUNCS(fdatasync,,
+   [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
+ ])
+diff --git a/modules/common.am b/modules/common.am
+index 5e4d65f..9e2c739 100644
+--- a/modules/common.am
++++ b/modules/common.am
+@@ -24,7 +24,7 @@ AM_LDFLAGS = -rpath '$(libvlcdir)' \
+ 	-no-undefined \
+ 	 `$(VLC_CONFIG) --ldflags plugin $@`
+ AM_LIBADD = `$(VLC_CONFIG) -libs plugin $@` \
+-	$(LTLIBVLCCORE) $(top_builddir)/compat/libcompat.la
++	$(LTLIBVLCCORE) $(LTLIBCOMPAT)
+ 
+ include $(srcdir)/Modules.am
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index f46a154..6aad884 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -201,7 +201,7 @@ libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
+ 	-export-symbols $(srcdir)/libvlccore.sym \
+ 	-version-info 5:0:0
+ libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlccore` $(AM_LIBADD) \
+-	$(LTLIBINTL) ../compat/libcompat.la
++	$(LTLIBINTL) $(LTLIBCOMPAT)
+ libvlccore_la_DEPENDENCIES = libvlccore.sym
+ if HAVE_WIN32
+ libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
+@@ -214,7 +214,7 @@ libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
+ libvlc_la_SOURCES = $(SOURCES_libvlc_control)
+ nodist_libvlc_la_SOURCES = revision.c
+ libvlc_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` \
+-	libvlccore.la ../compat/libcompat.la
++	libvlccore.la $(LTLIBCOMPAT)
+ libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
+ libvlc_la_LDFLAGS = $(AM_LDFLAGS) `$(VLC_CONFIG) --ldflags libvlc` \
+ 	-version-info 6:0:1 \
diff --git a/testing/vlc/uclibc3.patch b/testing/vlc/uclibc3.patch
new file mode 100644
index 0000000000..04154f35bf
--- /dev/null
+++ b/testing/vlc/uclibc3.patch
@@ -0,0 +1,49 @@
+diff --git a/src/control/vlm.c b/src/control/vlm.c
+index 05417e5..46fa957 100644
+--- a/src/control/vlm.c
++++ b/src/control/vlm.c
+@@ -25,6 +25,10 @@
+ # include <config.h>
+ #endif
+ 
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
+ #include <vlc/libvlc.h>
+ #include <vlc/libvlc_vlm.h>
+ #include <vlc_es.h>
+diff --git a/src/misc/linux_specific.c b/src/misc/linux_specific.c
+index 1644ce6..1440e1c 100644
+--- a/src/misc/linux_specific.c
++++ b/src/misc/linux_specific.c
+@@ -83,14 +83,14 @@ static struct
+     unsigned refs;
+ } once = { VLC_STATIC_MUTEX, 0 };
+ 
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+ # include <gnu/libc-version.h>
+ # include <stdlib.h>
+ #endif
+ 
+ void system_Init (libvlc_int_t *libvlc, int *argc, const char *argv[])
+ {
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+     const char *glcv = gnu_get_libc_version ();
+ 
+     /* gettext in glibc 2.5-2.7 is not thread-safe. LibVLC keeps crashing,
+diff --git a/src/misc/mtime.c b/src/misc/mtime.c
+index 1cc787d..985aa3a 100644
+--- a/src/misc/mtime.c
++++ b/src/misc/mtime.c
+@@ -78,7 +78,7 @@ int nanosleep(struct timespec *, struct timespec *);
+ #  define _POSIX_CLOCK_SELECTION (-1)
+ #endif
+ 
+-# if (_POSIX_CLOCK_SELECTION < 0)
++# if (_POSIX_CLOCK_SELECTION < 0) || defined(__UCLIBC__)
+ /*
+  * We cannot use the monotonic clock if clock selection is not available,
+  * as it would screw vlc_cond_timedwait() completely. Instead, we have to
-- 
cgit v1.2.3


From 22a4623a1654ca9805402645783291f75661a696 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 30 Jul 2010 15:08:32 +0000
Subject: testing/smokeping: misc fixes ref #348

---
 testing/smokeping/APKBUILD | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'testing')

diff --git a/testing/smokeping/APKBUILD b/testing/smokeping/APKBUILD
index 9ea5710534..409da87ded 100644
--- a/testing/smokeping/APKBUILD
+++ b/testing/smokeping/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Jeff Bilyk <jbilyk at gmail>
 pkgname=smokeping
 pkgver=2.4.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Smokeping network latency monitoring"
 pkgusers="smokeping"
 pkggroups="smokeping"
@@ -50,15 +50,14 @@ package() {
 	cp -ra "$_builddir"/lib/* "$pkgdir"/$_vendorlib
 
 	# install cgi scripts
-	sed -e 's:^use lib:#use lib:g' \
-		-e 's:/home/oetiker.*/config.dist:/etc/smokeping/config:' \
-		-i htdocs/*.cgi.dist
-	
 	for i in smokeping.cgi tr.cgi; do
-		install -m755 htdocs/$i.dist \
+		sed -i -e 's:^use lib:#use lib:' \
+			-e 's:/home/oetiker.*/config.dist:/etc/smokeping/config:' \
+			-e '1s:.*:#!/usr/bin/perl:' \
+			htdocs/$i.dist || return 1
+		mv htdocs/$i.dist \
 			"$pkgdir"/usr/share/webapps/smokeping/$i \
 			|| return 1
-		rm htdocs/$i.dist
 	done
 
 	# install ajax scripts
@@ -82,6 +81,7 @@ package() {
 		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
 		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
 		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
+		-e '/^sendmail/{s:usr/lib:usr/sbin:}' \
 		-i etc/config.dist || return 1
 	
 	sed -e '/^<script/{s:cropper/:/cropper/:}' \
@@ -94,12 +94,15 @@ package() {
 	done
 
 	chmod 700 "$pkgdir"/etc/smokeping/smokeping_secrets
-
+	
 	# initscript
 	install -Dm755 "$srcdir"/smokeping.initd "$pkgdir"/etc/init.d/smokeping\
 		|| return 1
 
-	install -d -o smokeping -g smokeping -m755 "$pkgdir"/var/lib/smokeping.simg
+	install -d -o smokeping -g smokeping -m755 \
+		"$pkgdir"/var/lib/smokeping \
+		"$pkgdir"/var/lib/smokeping/.simg \
+		"$pkgdir"/var/run/smokeping
 
 }
 
-- 
cgit v1.2.3


From e648609fba5e171ac66a1cbdc0f9d269c0f8fcc5 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 30 Jul 2010 15:12:35 +0000
Subject: main/lua-xml: moved from testing

---
 testing/lua-xml/APKBUILD | 34 ----------------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 testing/lua-xml/APKBUILD

(limited to 'testing')

diff --git a/testing/lua-xml/APKBUILD b/testing/lua-xml/APKBUILD
deleted file mode 100644
index 619a4d2565..0000000000
--- a/testing/lua-xml/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=lua-xml
-_name=LuaXML
-pkgver=090910
-pkgrel=0
-pkgdesc="a minimal set of functions for the processing of XML data in Lua"
-url="http://www.viremo.de/LuaXML"
-license="MIT"
-depends=
-makedepends="lua-dev"
-install=
-subpackages=
-source="http://www.viremo.de/LuaXML/LuaXML_$pkgver.zip"
-
-_builddir="$srcdir"
-
-prepare() {
-	cd "$_builddir"
-}
-
-build() {
-	cd "$_builddir"
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	install -m755 -D LuaXML_lib.so "$pkgdir"/usr/lib/lua/5.1/LuaXML_lib.so\
-		|| return 1
-	install -m755 -D LuaXml.lua "$pkgdir"/usr/share/lua/5.1/LuaXml.lua \
-		|| return 1
-}
-
-md5sums="de690d73a34bdc7d3b4f0307a40afd87  LuaXML_090910.zip"
-- 
cgit v1.2.3


From 54fb9a296894632b4597dd7724d0a64e81d71cb2 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 30 Jul 2010 15:20:38 +0000
Subject: testing/vlc: upgrade to 1.1.2

---
 testing/vlc/APKBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'testing')

diff --git a/testing/vlc/APKBUILD b/testing/vlc/APKBUILD
index bc12c857ee..8b0f6ceecd 100644
--- a/testing/vlc/APKBUILD
+++ b/testing/vlc/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=vlc
-pkgver=1.1.1
+pkgver=1.1.2
 pkgrel=0
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 url="http://www.videolan.org/vlc/"
@@ -115,7 +115,7 @@ package() {
 	rm -rf "$pkgdir"/usr/lib/mozilla
 }
 
-md5sums="7e177faa61450ce752b0fd89ecc81fed  vlc-1.1.1.tar.bz2
+md5sums="dec11ed850e044c518aee6fef7e7f893  vlc-1.1.2.tar.bz2
 4f74dcde9ce51c15d80c3876b85c05f2  uclibc3.patch
 d718e22a7de9f38579f276f720b2f36a  uclibc-libcompat.patch
 361d6ae9d7b846833ed31e8454074158  uclibc-inhibit-spawn.patch"
-- 
cgit v1.2.3


From 81bb6f7ad5f16cf1d7361b81edcf5f04e8b89868 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 2 Aug 2010 06:16:46 +0000
Subject: main/smokeping: moved from testing

fixes #348
---
 testing/smokeping/APKBUILD              | 110 --------------------------------
 testing/smokeping/smokeping.initd       |  77 ----------------------
 testing/smokeping/smokeping.pre-install |   5 --
 3 files changed, 192 deletions(-)
 delete mode 100644 testing/smokeping/APKBUILD
 delete mode 100644 testing/smokeping/smokeping.initd
 delete mode 100644 testing/smokeping/smokeping.pre-install

(limited to 'testing')

diff --git a/testing/smokeping/APKBUILD b/testing/smokeping/APKBUILD
deleted file mode 100644
index 409da87ded..0000000000
--- a/testing/smokeping/APKBUILD
+++ /dev/null
@@ -1,110 +0,0 @@
-# Contributor: Jeff Bilyk <jbilyk at gmail>
-pkgname=smokeping
-pkgver=2.4.2
-pkgrel=1
-pkgdesc="Smokeping network latency monitoring"
-pkgusers="smokeping"
-pkggroups="smokeping"
-install="$pkgname.pre-install"
-url="http://oss.oetiker.ch/smokeping/"
-source="http://oss.oetiker.ch/smokeping/pub/smokeping-$pkgver.tar.gz
-	smokeping.initd"
-depends="perl fping rrdtool perl-rrd
-	perl-uri-escape
-	perl-digest-hmac
-	perl-cgi-session
-	perl-libwww
-	perl-snmp-session
-	perl-net-dns
-	"
-license="GPL"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-_vendorlib=/usr/share/perl5/vendor_perl
-
-prepare() {
-	cd "$_builddir"
-	# provided by perl-digest-hmac
-	rm -rf lib/Digest
-	# provided by perl-cgi-session
-	rm -rf lib/CGI 
-	# provided by perl-snmp-session
-	rm -r lib/BER.pm lib/SNMP_Session.pm lib/SNMP_util.pm
-	rm -r qooxdoo/qooxdoolink
-}
-
-build() {
-	return 0
-}
-
-package() {
-	cd "$_builddir"
-
-	# create dirs
-	mkdir -p "$pkgdir"/etc/smokeping \
-		"$pkgdir"/usr/bin \
-		"$pkgdir"/usr/share/webapps/smokeping \
-		"$pkgdir"/$_vendorlib
-
-	# install libs
-	cp -ra "$_builddir"/lib/* "$pkgdir"/$_vendorlib
-
-	# install cgi scripts
-	for i in smokeping.cgi tr.cgi; do
-		sed -i -e 's:^use lib:#use lib:' \
-			-e 's:/home/oetiker.*/config.dist:/etc/smokeping/config:' \
-			-e '1s:.*:#!/usr/bin/perl:' \
-			htdocs/$i.dist || return 1
-		mv htdocs/$i.dist \
-			"$pkgdir"/usr/share/webapps/smokeping/$i \
-			|| return 1
-	done
-
-	# install ajax scripts
-	mv "$_builddir/htdocs"/* "$pkgdir"/usr/share/webapps/smokeping
-
-	# install smokeping executables
-	for i in smokeping tSmoke; do
-		sed -e 's:^use lib:#use lib:g' \
-			-e 's:etc/config.dist:/etc/smokeping/config:' \
-			-i bin/$i.dist
-		install -m755 bin/$i.dist "$pkgdir"/usr/bin/$i
-	done
-
-	# config
-	sed -e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
-		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
-		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
-		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /var/run/smokeping:}' \
-		-e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
-		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
-		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
-		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
-		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
-		-e '/^sendmail/{s:usr/lib:usr/sbin:}' \
-		-i etc/config.dist || return 1
-	
-	sed -e '/^<script/{s:cropper/:/cropper/:}' \
-		-i etc/basepage.html.dist \
-		|| return 1
-
-	for i in etc/*; do
-		local f=${i##*/}
-		install -m644 "$i" "$pkgdir"/etc/smokeping/${f%.dist}
-	done
-
-	chmod 700 "$pkgdir"/etc/smokeping/smokeping_secrets
-	
-	# initscript
-	install -Dm755 "$srcdir"/smokeping.initd "$pkgdir"/etc/init.d/smokeping\
-		|| return 1
-
-	install -d -o smokeping -g smokeping -m755 \
-		"$pkgdir"/var/lib/smokeping \
-		"$pkgdir"/var/lib/smokeping/.simg \
-		"$pkgdir"/var/run/smokeping
-
-}
-
-md5sums="eb8e7679fcad35e59d7c51f2328250a2  smokeping-2.4.2.tar.gz
-550979e008f49299bf404aceeb81fe61  smokeping.initd"
diff --git a/testing/smokeping/smokeping.initd b/testing/smokeping/smokeping.initd
deleted file mode 100644
index 068f33ff25..0000000000
--- a/testing/smokeping/smokeping.initd
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-opts="${opts} dump reload restore"
-
-depend() {
-	need net
-	use dns
-}
-
-checkconfig() {
-	if [ ! -f "/etc/smokeping/config" ] ; then
-		eerror "You need /etc/smokeping/config to run smokeping!"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	if [ ! -d /var/run/smokeping/ ]; then
-		mkdir /var/run/smokeping/
-	fi
-	chown smokeping:smokeping /var/run/smokeping/
-
-	ebegin "Starting smokeping"
-	LC_ALL=C \
-	start-stop-daemon --start --name smokeping \
-		--pidfile /var/run/smokeping/smokeping.pid \
-		--exec /usr/bin/smokeping \
-		--chuid smokeping:smokeping
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping smokeping"
-	start-stop-daemon --stop \
-		--pidfile /var/run/smokeping/smokeping.pid
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading smokeping"
-	/usr/bin/smokeping --reload 1>/dev/null 2>&1
-	eend $?
-}
-
-dump() {
-	ebegin "Dumping smokeping rrd files to XML for backup or upgrade use"
-	if service_started "${myservice}" ; then
-		eerror "You need to stop smokeping before dumping files!"
-		return 1
-	fi
-	for f in `find /var/lib/smokeping -name '*.rrd' -print` ; do
-		f_xml=`dirname $f`/`basename $f .rrd`.xml
-		rrdtool dump "$f" > "${f_xml}"
-		chown root:0 "${f_xml}"
-	done
-	eend $?
-}
-
-restore() {
-	ebegin "Restoring smokeping rrd files from XML dump files"
-	if service_started "${myservice}" ; then
-		eerror "You need to stop smokeping before restoring files!"
-		return 1
-	fi
-	for f in `find /var/lib/smokeping -name '*.xml' -print` ; do
-		f_rrd=`dirname $f`/`basename $f .xml`.rrd
-		mv -f "${f_rrd}" "${f_rrd}.bak"
-		chown root:0 "${f_rrd}.bak"
-		rrdtool restore "$f" "${f_rrd}"
-		chown smokeping:smokeping "${f_rrd}"
-	done
-	eend $?
-}
diff --git a/testing/smokeping/smokeping.pre-install b/testing/smokeping/smokeping.pre-install
deleted file mode 100644
index 236550f7c1..0000000000
--- a/testing/smokeping/smokeping.pre-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-addgroup smokeping 2>/dev/null
-adduser -h /var/lib/smokeping -S -D -G smokeping smokeping 2>/dev/null
-exit 0
-- 
cgit v1.2.3


From 7da3c1db4d8b49065607cc7175bd77e48e9d4b5c Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 2 Aug 2010 13:01:16 +0000
Subject: main/gtksourceview: moved from testing

---
 testing/gtksourceview/APKBUILD | 26 --------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 testing/gtksourceview/APKBUILD

(limited to 'testing')

diff --git a/testing/gtksourceview/APKBUILD b/testing/gtksourceview/APKBUILD
deleted file mode 100644
index 8e080b2077..0000000000
--- a/testing/gtksourceview/APKBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=gtksourceview
-pkgver=2.10.2
-pkgrel=0
-pkgdesc="A text widget adding syntax highlighting and more to GNOME"
-url="http://live.gnome.org/GtkSourceView"
-license="GPL"
-depends=
-makedepends="gtk+-dev intltool libxml2-dev gobject-introspection"
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://ftp.gnome.org/pub/gnome/sources/gtksourceview/${pkgver%.*}/gtksourceview-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/gtksourceview-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/gtksourceview-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="56c849c0adea56228287abbabc7b70b9  gtksourceview-2.10.2.tar.bz2"
-- 
cgit v1.2.3


From 50ccfb291320049d541fc5074a1213a66920383c Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 2 Aug 2010 14:24:03 +0000
Subject: main/iw: moved from testing

---
 testing/iw/APKBUILD             | 33 ---------------------------------
 testing/iw/iw-bb-install.patch  | 15 ---------------
 testing/iw/iw-git-version.patch | 11 -----------
 3 files changed, 59 deletions(-)
 delete mode 100644 testing/iw/APKBUILD
 delete mode 100644 testing/iw/iw-bb-install.patch
 delete mode 100644 testing/iw/iw-git-version.patch

(limited to 'testing')

diff --git a/testing/iw/APKBUILD b/testing/iw/APKBUILD
deleted file mode 100644
index 3cce23eff1..0000000000
--- a/testing/iw/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=iw
-pkgver=0.9.18
-pkgrel=0
-pkgdesc="nl80211 based CLI configuration utility for wireless devices"
-url="http://wireless.kernel.org/en/users/Documentation/iw"
-license="GPL"
-depends=""
-makedepends="libnl-dev"
-source="http://wireless.kernel.org/download/iw/iw-$pkgver.tar.bz2
-	iw-bb-install.patch
-	iw-git-version.patch"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	cd "$_builddir"
-	patch -p1 -i "$srcdir"/iw-bb-install.patch || return 1
-	patch -p1 -i "$srcdir"/iw-git-version.patch || return 1
-}
-
-build () {
-	cd "$_builddir"
-	make V=1 || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="9734080d8a5c4b768c5e0da665a48950  iw-0.9.18.tar.bz2
-7f8cfc205fdcfd49d04c8923c76f439a  iw-bb-install.patch
-779d0e73df6e484c071149c9fb720551  iw-git-version.patch"
diff --git a/testing/iw/iw-bb-install.patch b/testing/iw/iw-bb-install.patch
deleted file mode 100644
index b736dbf7c2..0000000000
--- a/testing/iw/iw-bb-install.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./Makefile.orig
-+++ ./Makefile
-@@ -86,10 +86,10 @@
- install: iw iw.8.gz
- 	@$(NQ) ' INST iw'
- 	$(Q)$(MKDIR) $(DESTDIR)$(SBINDIR)
--	$(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(SBINDIR) iw
-+	$(Q)$(INSTALL) -m 755 iw $(DESTDIR)$(SBINDIR)/
- 	@$(NQ) ' INST iw.8'
- 	$(Q)$(MKDIR) $(DESTDIR)$(MANDIR)/man8/
--	$(Q)$(INSTALL) -m 644 -t $(DESTDIR)$(MANDIR)/man8/ iw.8.gz
-+	$(Q)$(INSTALL) -m 644 iw.8.gz $(DESTDIR)$(MANDIR)/man8/
- 
- clean:
- 	$(Q)rm -f iw *.o *~ *.gz version.c *-stamp
diff --git a/testing/iw/iw-git-version.patch b/testing/iw/iw-git-version.patch
deleted file mode 100644
index 0286eb4889..0000000000
--- a/testing/iw/iw-git-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./version.sh.orig
-+++ ./version.sh
-@@ -5,7 +5,7 @@
- 
- echo '#include "iw.h"' > "$OUT"
- 
--if head=`git rev-parse --verify HEAD 2>/dev/null`; then
-+if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then
- 	git update-index --refresh --unmerged > /dev/null
- 	descr=$(git describe)
- 
-- 
cgit v1.2.3


From 0031a7082630ffda720adab5b911bfc663e0d526 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 2 Aug 2010 14:36:31 +0000
Subject: testing/py-cairo: new aport

Python bindings for the cairo graphics library
http://cairographics.org/pycairo/
---
 testing/py-cairo/APKBUILD | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 testing/py-cairo/APKBUILD

(limited to 'testing')

diff --git a/testing/py-cairo/APKBUILD b/testing/py-cairo/APKBUILD
new file mode 100644
index 0000000000..b6f621d8a8
--- /dev/null
+++ b/testing/py-cairo/APKBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=py-cairo
+pkgver=1.8.10
+pkgrel=0
+pkgdesc="Python bindings for the cairo graphics library"
+url="http://cairographics.org/pycairo/"
+license="GPL"
+depends=
+makedepends="python-dev cairo-dev"
+install=
+subpackages="$pkgname-dev"
+source="http://cairographics.org/releases/py2cairo-$pkgver.tar.gz"
+
+
+_builddir="$srcdir"/pycairo-$pkgver
+
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+md5sums="87421a6a70304120555ba7ba238f3dc3  py2cairo-1.8.10.tar.gz"
-- 
cgit v1.2.3


From dda16dc0689d374e0075f46efafa545c5d03d8fb Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 2 Aug 2010 14:37:16 +0000
Subject: testing/py-gtk: new aport

Python bindings for the GTK widget set
http://www.pygtk.org/
---
 testing/py-gtk/APKBUILD | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 testing/py-gtk/APKBUILD

(limited to 'testing')

diff --git a/testing/py-gtk/APKBUILD b/testing/py-gtk/APKBUILD
new file mode 100644
index 0000000000..d7b65c14c6
--- /dev/null
+++ b/testing/py-gtk/APKBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=py-gtk
+pkgver=2.17.0
+pkgrel=0
+pkgdesc="Python bindings for the GTK widget set"
+url="http://www.pygtk.org/"
+license="LGPL"
+depends=
+makedepends="libglade-dev py-cairo-dev py-gobject-dev python-dev"
+source="http://ftp.gnome.org/pub/gnome/sources/pygtk/2.17/pygtk-$pkgver.tar.bz2"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-demo"
+
+_builddir="$srcdir"/pygtk-$pkgver
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr || return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	install -m644 gtk/gtk-extrafuncs.defs ""$pkgdir"/usr/share/pygtk/2.0/defs/" || return 1
+}
+
+demo() {
+	pkgdesc="Demonstration of pygtk"
+	depends="py-gtk"
+	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/lib/pygtk/2.0
+	mv "$pkgdir"/usr/bin/pygtk-demo "$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/lib/pygtk/2.0/*demo* \
+		"$subpkgdir"/usr/lib/pygtk/2.0/
+}
+md5sums="43d704343d7ca04a6e4ddd4fa73a3c55  pygtk-2.17.0.tar.bz2"
-- 
cgit v1.2.3


From b646a49212741fc1cfe51569e9339218299e1286 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 2 Aug 2010 14:48:28 +0000
Subject: main/tcpflow: added package func

---
 testing/tcpflow/APKBUILD | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'testing')

diff --git a/testing/tcpflow/APKBUILD b/testing/tcpflow/APKBUILD
index 244730363d..ce32707213 100644
--- a/testing/tcpflow/APKBUILD
+++ b/testing/tcpflow/APKBUILD
@@ -1,12 +1,12 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Michael Mason <ms13sp@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=tcpflow
 pkgver=0.21
-pkgrel=0
+pkgrel=1
 pkgdesc="A Tool for monitoring, capturing and storing TCP connections flows"
 url="http://www.circlemud.org/~jelson/software/tcpflow/"
 license="GPL"
-depends="libpcap"
+depends=
 makedepends="libpcap-dev"
 install=
 subpackages="$pkgname-doc"
@@ -20,6 +20,10 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install
 
 }
-- 
cgit v1.2.3


From 0f6ccc88180fb164c71477148e23de00d4a09535 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 2 Aug 2010 14:55:47 +0000
Subject: main/tcpflow: moved from testing

---
 testing/tcpflow/APKBUILD | 31 -------------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 testing/tcpflow/APKBUILD

(limited to 'testing')

diff --git a/testing/tcpflow/APKBUILD b/testing/tcpflow/APKBUILD
deleted file mode 100644
index ce32707213..0000000000
--- a/testing/tcpflow/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=tcpflow
-pkgver=0.21
-pkgrel=1
-pkgdesc="A Tool for monitoring, capturing and storing TCP connections flows"
-url="http://www.circlemud.org/~jelson/software/tcpflow/"
-license="GPL"
-depends=
-makedepends="libpcap-dev"
-install=
-subpackages="$pkgname-doc"
-source="http://www.circlemud.org/pub/jelson/tcpflow/$pkgname-$pkgver.tar.gz"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
-
-}
-
-md5sums="45a5aef6f043312315b7f342afc4a9c5  tcpflow-0.21.tar.gz"
-- 
cgit v1.2.3


From 067aef21abcefcef888a7c72ccf4d1ee4e787a78 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 3 Aug 2010 12:55:09 +0000
Subject: testing/apache: new aport

A high performance Unix-based HTTP server
http://httpd.apache.org/
---
 testing/apache/APKBUILD          | 153 ++++++++++++++++++++++++++++++++++++++
 testing/apache/alpine.layout     |  22 ++++++
 testing/apache/apache2.confd     |  82 +++++++++++++++++++++
 testing/apache/apache2.initd     | 154 +++++++++++++++++++++++++++++++++++++++
 testing/apache/apache2.logrotate |   7 ++
 5 files changed, 418 insertions(+)
 create mode 100644 testing/apache/APKBUILD
 create mode 100644 testing/apache/alpine.layout
 create mode 100644 testing/apache/apache2.confd
 create mode 100755 testing/apache/apache2.initd
 create mode 100644 testing/apache/apache2.logrotate

(limited to 'testing')

diff --git a/testing/apache/APKBUILD b/testing/apache/APKBUILD
new file mode 100644
index 0000000000..512e860099
--- /dev/null
+++ b/testing/apache/APKBUILD
@@ -0,0 +1,153 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=apache
+pkgver=2.2.16
+pkgrel=0
+pkgdesc="A high performance Unix-based HTTP server"
+url="http://httpd.apache.org/"
+license="APACHE"
+depends=""
+pkgusers="apache"
+pkggroups="apache"
+makedepends="openssl-dev zlib-dev apr-util-dev apr-dev pcre-dev"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-utils"
+source="http://archive.apache.org/dist/httpd/httpd-$pkgver.tar.bz2
+	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/02-rename-prefork-to-itk.patch
+	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/03-add-mpm-to-build-system.patch
+	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/04-correct-output-makefile-location.patch
+	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/05-add-copyright.patch
+	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/06-hook-just-after-merging-perdir-config.patch
+	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/07-base-functionality.patch
+	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/08-max-clients-per-vhost.patch
+	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/09-capabilities.patch
+	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/10-nice.patch
+	apache2.confd
+	apache2.logrotate
+	apache2.initd
+	alpine.layout"
+
+prepare() {
+	cd "$srcdir"/httpd-$pkgver
+	sed -e 's#User daemon#User apache#' \
+		-e 's#Group daemon#Group apache#' \
+		-i docs/conf/httpd.conf.in || return 1
+	cat "$srcdir/alpine.layout" >> config.layout
+
+	cd "$srcdir"
+
+	# create symlinks to soruces for prefork and worker
+	ln -s httpd-$pkgver prefork
+	ln -s httpd-$pkgver worker
+
+	# make a patched clone of itk sources
+	cp -ra httpd-$pkgver itk
+	cd itk 
+	mkdir -p server/mpm/experimental/itk
+	cp -r server/mpm/prefork/* \
+		server/mpm/experimental/itk/ || return 1
+	mv server/mpm/experimental/itk/prefork.c \
+		server/mpm/experimental/itk/itk.c || return 1
+	patch -Np1 -i "$srcdir/02-rename-prefork-to-itk.patch" || return 1
+	patch -Np1 -i "$srcdir/03-add-mpm-to-build-system.patch" || return 1
+	patch -Np1 -i "$srcdir/04-correct-output-makefile-location.patch" || return 1
+	patch -Np1 -i "$srcdir/05-add-copyright.patch" || return 1
+	patch -Np1 -i "$srcdir/06-hook-just-after-merging-perdir-config.patch" || return 1
+	patch -Np1 -i "$srcdir/07-base-functionality.patch" || return 1
+	patch -Np1 -i "$srcdir/08-max-clients-per-vhost.patch" || return 1
+	patch -Np1 -i "$srcdir/09-capabilities.patch" || return 1
+	patch -Np1 -i "$srcdir/10-nice.patch" || return 1
+	autoconf || return 1
+}
+
+build () { 
+	local mpm
+	for mpm in prefork worker itk; do
+		mkdir "$srcdir"/build-${mpm}
+		cd "$srcdir"/build-${mpm}
+
+		"$srcdir"/$mpm/configure --prefix=/usr \
+			--enable-layout=Alpine \
+			--enable-modules=all \
+			--enable-mods-shared=all \
+			--enable-so \
+			--enable-suexec \
+			--with-suexec-caller=http \
+			--with-suexec-docroot=/var/www/localhost/htdocs \
+			--with-suexec-logfile=/var/log/httpd/suexec.log \
+			--with-suexec-bin=/usr/sbin/suexec \
+			--with-suexec-uidmin=99 \
+			--with-suexec-gidmin=99 \
+			--enable-ldap \
+			--enable-authnz-ldap \
+			--enable-cache \
+			--enable-disk-cache \
+			--enable-mem-cache \
+			--enable-file-cache \
+			--enable-ssl \
+			--with-ssl \
+			--enable-deflate \
+			--enable-cgid \
+			--enable-proxy \
+			--enable-proxy-connect \
+			--enable-proxy-http \
+			--enable-proxy-ftp \
+			--enable-dbd \
+			--with-apr=/usr/bin/apr-1-config \
+			--with-apr-util=/usr/bin/apu-1-config \
+			--with-pcre=/usr \
+			--with-mpm=${mpm} \
+			|| return 1
+		make || return 1
+	done
+}
+
+package() {
+	cd "$srcdir"/build-prefork
+	make -j1 DESTDIR="$pkgdir" install || return 1
+	for mpm in worker itk; do
+		install -m755 "$srcdir"/build-$mpm/httpd \
+			"$pkgdir/usr/sbin/httpd.${mpm}" || return 1
+	done
+
+	install -D -m755 "$srcdir/apache2.initd" \
+		"$pkgdir/etc/init.d/apache2" || return 1
+	install -D -m644 "$srcdir/apache2.logrotate" \
+		"$pkgdir/etc/logrotate.d/apache2" || return 1
+	install -D -m644 "$srcdir/apache2.confd" \
+		"$pkgdir/etc/conf.d/apache2" || return 1
+
+	install -d "$pkgdir"/var/www
+	ln -fs /var/log/httpd "$pkgdir/var/www/logs"
+	ln -fs /var/run/httpd "$pkgdir/var/www/run"
+	ln -fs /usr/lib/httpd/modules "$pkgdir/var/www/modules"
+	sed -e 's#/usr/lib/httpd/modules/#modules/#' \
+		-e 's|#\(Include conf/extra/httpd-multilang-errordoc.conf\)|\1|'\
+		-e 's|#\(Include conf/extra/httpd-autoindex.conf\)|\1|' \
+		-e 's|#\(Include conf/extra/httpd-languages.conf\)|\1|' \
+		-e 's|#\(Include conf/extra/httpd-userdir.conf\)|\1|' \
+		-e 's|#\(Include conf/extra/httpd-default.conf\)|\1|' \
+		-e 's|/srv/http|/var/www/localhost|g' \
+		-i "$pkgdir/etc/apache2/httpd.conf" || return 1
+}
+
+utils() {
+	pkgdesc="Apache utility programs for webservers"
+	install -d "$subpkgdir"/usr/bin "$subpkgdir"/usr/sbin
+	cd "$pkgdir"/usr/sbin
+	mv ab dbmmanage htdbm htdigest htpasswd logresolve "$subpkgdir"/usr/bin
+	mv checkgid htcacheclean rotatelogs "$subpkgdir"/usr/sbin
+}
+
+md5sums="c8ff2a07c884300bc7766a2e7f662d33  httpd-2.2.16.tar.bz2
+db42cfcc18ae1c32aaaff2347e35b79d  02-rename-prefork-to-itk.patch
+131408ad4dc7b18547b4e062e7e495ab  03-add-mpm-to-build-system.patch
+ee488f391054d528547c3a372faa2aa7  04-correct-output-makefile-location.patch
+b202944761b2f0516196488b12504236  05-add-copyright.patch
+78fa15f8ca3a284b7d71f942e24e47fb  06-hook-just-after-merging-perdir-config.patch
+d33e39350e987721d50e6fb8e164ab6b  07-base-functionality.patch
+9f7a8935f9cabc7b46d0052906634cef  08-max-clients-per-vhost.patch
+1b28e3363e1b0d05b738a21e7ddd264f  09-capabilities.patch
+d9667fcd2ffecc63e446edd4d6666731  10-nice.patch
+f3e4f5eed88d97d1bbadd0597562bc28  apache2.confd
+d91a9a7196b10ef0bc4ab5b98ea9ccd9  apache2.logrotate
+0261136ff734c3ae8dcf878a46ed5830  apache2.initd
+af943bf52cec8088974084639661ba34  alpine.layout"
diff --git a/testing/apache/alpine.layout b/testing/apache/alpine.layout
new file mode 100644
index 0000000000..7146971d2a
--- /dev/null
+++ b/testing/apache/alpine.layout
@@ -0,0 +1,22 @@
+<Layout Alpine>
+	prefix:          /usr
+	exec_prefix:     ${prefix}
+	bindir:          ${prefix}/bin
+	sbindir:         ${prefix}/sbin
+	libdir:          ${prefix}/lib
+	libexecdir:      ${prefix}/lib+
+	mandir:          ${prefix}/share/man
+	sysconfdir:      /etc+
+	datadir:         ${usr}/share+
+	installbuilddir: ${datadir}/build
+	errordir:        ${datadir}/error
+	iconsdir:        ${datadir}/icons
+	htdocsdir:       /var/www/localhost/htdocs
+	manualdir:       /usr/share/doc/apache2/manual
+	cgidir:          /var/www/cgi-bin
+	includedir:      /usr/include+
+	localstatedir:   /var
+	runtimedir:      ${localstatedir}/run+
+	logfiledir:      ${localstatedir}/log+
+	proxycachedir:   ${localstatedir}/cache+
+</Layout>
diff --git a/testing/apache/apache2.confd b/testing/apache/apache2.confd
new file mode 100644
index 0000000000..0297b57906
--- /dev/null
+++ b/testing/apache/apache2.confd
@@ -0,0 +1,82 @@
+# /etc/conf.d/apache2: config file for /etc/init.d/apache2
+
+#
+# The default processing model (MPM) is the process-based
+# 'prefork' model. A thread-based model, 'worker', is also
+# available, but does not work with some modules (such as PHP).
+#
+#HTTPD=/usr/sbin/httpd.worker
+
+HTTPD="/usr/sbin/httpd"
+
+# When you install a module it is easy to activate or deactivate the modules
+# and other features of apache using the HTTPD_OPTS line. Every module should
+# install a configuration in /etc/apache2/modules.d. In that file will have an
+# <IfDefine NNN> directive where NNN is the option to enable that module.
+#
+# Here are the options available in the default configuration:
+#
+#  AUTH_DIGEST  Enables mod_auth_digest
+#  AUTHNZ_LDAP  Enables authentication through mod_ldap
+#  CACHE        Enables mod_cache
+#  DAV          Enables mod_dav
+#  ERRORDOCS    Enables default error documents for many languages.
+#  INFO         Enables mod_info, a useful module for debugging
+#  LANGUAGE     Enables content-negotiation based on language and charset.
+#  LDAP         Enables mod_ldap
+#  MANUAL       Enables /manual/ to be the apache manual (needs apache-doc)
+#  MEM_CACHE    Enables default configuration mod_mem_cache
+#  PROXY        Enables mod_proxy
+#  SSL          Enables SSL
+#  SUEXEC       Enables running CGI scripts (in USERDIR) through suexec.
+#  USERDIR      Enables /~username mapping to /home/username/public_html
+#
+#
+# The following two options provide the default virtual host for the HTTP and
+# HTTPS protocol. YOU NEED TO ENABLE AT LEAST ONE OF THEM, otherwise apache
+# will not listen for incomming connections on the approriate port.
+#
+#  DEFAULT_VHOST      Enables name-based virtual hosts, with the default
+#                     virtual host being in /var/www/localhost/htdocs
+#  SSL_DEFAULT_VHOST  Enables default vhost for SSL (you should enable this
+#                     when you enable SSL)
+#
+HTTPD_OPTS="-D DEFAULT_VHOST -D LANGUAGE -D INFO"
+
+# Extended options for advanced uses of Apache ONLY
+# You don't need to edit these unless you are doing crazy Apache stuff
+# As not having them set correctly, or feeding in an incorrect configuration
+# via them will result in Apache failing to start
+# YOU HAVE BEEN WARNED.
+
+# PID file
+#PIDFILE=/var/run/apache2/httpd.pid
+
+# timeout for startup/shutdown checks
+#TIMEOUT=10
+
+# ServerRoot setting
+#SERVERROOT=/var/www
+
+# Configuration file location
+# - If this does NOT start with a '/', then it is treated relative to
+# $SERVERROOT by Apache
+#CONFIGFILE=/etc/apache2/httpd.conf
+
+# Location to log startup errors to
+# They are normally dumped to your terminal.
+#STARTUPERRORLOG="/var/log/apache2/startuperror.log"
+
+# A command that outputs a formatted text version of the HTML at the URL
+# of the command line. Designed for lynx, however other programs may work.
+#LYNX="lynx -dump"
+
+# The URL to your server's mod_status status page.
+# Required for status and fullstatus
+#STATUSURL="http://localhost/server-status"
+
+# Method to use when reloading the server
+# Valid options are 'restart' and 'graceful'
+# See http://httpd.apache.org/docs/2.2/stopping.html for information on
+# what they do and how they differ.
+#RELOAD_TYPE="graceful"
diff --git a/testing/apache/apache2.initd b/testing/apache/apache2.initd
new file mode 100755
index 0000000000..03a6d03032
--- /dev/null
+++ b/testing/apache/apache2.initd
@@ -0,0 +1,154 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+opts="configdump configtest fullstatus graceful gracefulstop modules reload virtualhosts"
+
+depend() {
+	need net
+	use mysql dns logger netmount postgresql
+	after sshd
+}
+
+configtest() {
+	ebegin "Checking ${SVCNAME} configuration"
+	checkconfig
+	eend $?
+}
+
+checkconfd() {
+	PIDFILE="${PIDFILE:-/var/run/apache2/httpd.pid}"
+	TIMEOUT=${TIMEOUT:-10}
+
+	SERVERROOT="${SERVERROOT:-/var/www}"
+	if [ ! -d ${SERVERROOT} ]; then
+		eerror "SERVERROOT does not exist: ${SERVERROOT}"
+		return 1
+	fi
+
+	CONFIGFILE="${CONFIGFILE:-/etc/apache2/httpd.conf}"
+	[ "${CONFIGFILE#/}" = "${CONFIGFILE}" ] && CONFIGFILE="${SERVERROOT}/${CONFIGFILE}"
+	if [ ! -r "${CONFIGFILE}" ]; then
+		eerror "Unable to read configuration file: ${CONFIGFILE}"
+		return 1
+	fi
+
+	HTTPD_OPTS="${HTTPD_OPTS} -d ${SERVERROOT}"
+	HTTPD_OPTS="${HTTPD_OPTS} -f ${CONFIGFILE}"
+	[ -n "${STARTUPERRORLOG}" ] && HTTPD_OPTS="${HTTPD_OPTS} -E ${STARTUPERRORLOG}"
+	return 0
+
+}
+
+checkconfig() {
+	checkconfd || return 1
+
+	${HTTPD} ${HTTPD_OPTS} -t 1>/dev/null 2>&1
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		eerror "${SVCNAME} has detected an error in your setup:"
+		${HTTPD} ${HTTPD_OPTS} -t
+	fi
+
+	return $ret
+}
+
+start() {
+	checkconfig || return 1
+
+	[ -f /var/log/apache2/ssl_scache ] && rm /var/log/apache2/ssl_scache
+
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start \
+		--pidfile ${PIDFILE} \
+		--exec ${HTTPD} \
+		-- ${HTTPD_OPTS} -k start
+	eend $?
+}
+
+stop() {
+	checkconfd || return 1
+
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile ${PIDFILE} --exec ${HTTPD} \
+		--retry ${TIMEOUT}
+	eend $?
+}
+
+reload() {
+	RELOAD_TYPE="${RELOAD_TYPE:-graceful}"
+
+	checkconfig || return 1
+	service_started "${SVCNAME}" || return
+
+	if [ "${RELOAD_TYPE}" = "restart" ]; then
+		ebegin "Restarting ${SVCNAME}"
+		${HTTPD} ${HTTPD_OPTS} -k restart
+		eend $?
+	elif [ "${RELOAD_TYPE}" = "graceful" ]; then
+		ebegin "Gracefully restarting ${SVCNAME}"
+		${HTTPD} ${HTTPD_OPTS} -k graceful
+		eend $?
+	else
+		eerror "${RELOAD_TYPE} is not a valid RELOAD_TYPE. Please edit /etc/conf.d/${SVCNAME}"
+	fi
+}
+
+graceful() {
+	checkconfig || return 1
+	service_started "${SVCNAME}" || return
+	ebegin "Gracefully restarting ${SVCNAME}"
+	${HTTPD} ${HTTPD_OPTS} -k graceful
+	eend $?
+}
+
+gracefulstop() {
+	checkconfig || return 1
+	ebegin "Gracefully stopping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile ${PIDFILE} --exec ${HTTPD} \
+		--retry SIGWINCH/${TIMEOUT}
+	eend $?
+}
+
+modules() {
+	checkconfig || return 1
+
+	${HTTPD} ${HTTPD_OPTS} -M 2>&1
+}
+
+fullstatus() {
+	LYNX="${LYNX:-lynx -dump}"
+	STATUSURL="${STATUSURL:-http://localhost/server-status}"
+
+	if ! service_started "${SVCNAME}"; then
+		eerror "${SVCNAME} not started"
+	elif ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then
+		eerror "lynx not found! you need to emerge www-client/lynx"
+	else
+		${LYNX} ${STATUSURL}
+	fi
+}
+
+virtualhosts() {
+	checkconfd || return 1
+	${HTTPD} ${HTTPD_OPTS} -S
+}
+
+configdump() {
+	LYNX="${LYNX:-lynx -dump}"
+	INFOURL="${INFOURL:-http://localhost/server-info}"
+
+	checkconfd || return 1
+
+	if ! service_started "${SVCNAME}"; then
+		eerror "${SVCNAME} not started"
+	elif ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then
+		eerror "lynx not found! you need to emerge www-client/lynx"
+	else
+		echo "${HTTPD} started with '${HTTPD_OPTS}'"
+		for i in config server list; do
+			${LYNX} "${INFOURL}/?${i}" | sed '/Apache Server Information/d;/^[[:space:]]\+[_]\+$/Q'
+		done
+	fi
+}
+
diff --git a/testing/apache/apache2.logrotate b/testing/apache/apache2.logrotate
new file mode 100644
index 0000000000..1264341468
--- /dev/null
+++ b/testing/apache/apache2.logrotate
@@ -0,0 +1,7 @@
+/var/log/apache2/*log {
+   postrotate
+      if /etc/init.d/apache2 status; then
+ 	/etc/init.d/apache2 reload --quiet || true
+      fi
+   endscript
+}
-- 
cgit v1.2.3


From 6d34b2ee19f12a36c7797cfc693df5d5f0fdc578 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 3 Aug 2010 13:12:59 +0000
Subject: testing/apache: build fix

needs autotools
---
 testing/apache/APKBUILD | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'testing')

diff --git a/testing/apache/APKBUILD b/testing/apache/APKBUILD
index 512e860099..947494c156 100644
--- a/testing/apache/APKBUILD
+++ b/testing/apache/APKBUILD
@@ -8,7 +8,8 @@ license="APACHE"
 depends=""
 pkgusers="apache"
 pkggroups="apache"
-makedepends="openssl-dev zlib-dev apr-util-dev apr-dev pcre-dev"
+makedepends="openssl-dev zlib-dev apr-util-dev apr-dev pcre-dev
+	autoconf automake"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-utils"
 source="http://archive.apache.org/dist/httpd/httpd-$pkgver.tar.bz2
 	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/02-rename-prefork-to-itk.patch
-- 
cgit v1.2.3


From bc5d0beacc17d14bc85b8631fa469adeb8d1606d Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 4 Aug 2010 07:58:35 +0000
Subject: testing/apache2: renamed from apache

Upstream seems to use "apache2"
---
 testing/apache/APKBUILD           | 154 --------------------------------------
 testing/apache/alpine.layout      |  22 ------
 testing/apache/apache2.confd      |  82 --------------------
 testing/apache/apache2.initd      | 154 --------------------------------------
 testing/apache/apache2.logrotate  |   7 --
 testing/apache2/APKBUILD          | 154 ++++++++++++++++++++++++++++++++++++++
 testing/apache2/alpine.layout     |  22 ++++++
 testing/apache2/apache2.confd     |  82 ++++++++++++++++++++
 testing/apache2/apache2.initd     | 154 ++++++++++++++++++++++++++++++++++++++
 testing/apache2/apache2.logrotate |   7 ++
 10 files changed, 419 insertions(+), 419 deletions(-)
 delete mode 100644 testing/apache/APKBUILD
 delete mode 100644 testing/apache/alpine.layout
 delete mode 100644 testing/apache/apache2.confd
 delete mode 100755 testing/apache/apache2.initd
 delete mode 100644 testing/apache/apache2.logrotate
 create mode 100644 testing/apache2/APKBUILD
 create mode 100644 testing/apache2/alpine.layout
 create mode 100644 testing/apache2/apache2.confd
 create mode 100755 testing/apache2/apache2.initd
 create mode 100644 testing/apache2/apache2.logrotate

(limited to 'testing')

diff --git a/testing/apache/APKBUILD b/testing/apache/APKBUILD
deleted file mode 100644
index 947494c156..0000000000
--- a/testing/apache/APKBUILD
+++ /dev/null
@@ -1,154 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=apache
-pkgver=2.2.16
-pkgrel=0
-pkgdesc="A high performance Unix-based HTTP server"
-url="http://httpd.apache.org/"
-license="APACHE"
-depends=""
-pkgusers="apache"
-pkggroups="apache"
-makedepends="openssl-dev zlib-dev apr-util-dev apr-dev pcre-dev
-	autoconf automake"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-utils"
-source="http://archive.apache.org/dist/httpd/httpd-$pkgver.tar.bz2
-	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/02-rename-prefork-to-itk.patch
-	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/03-add-mpm-to-build-system.patch
-	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/04-correct-output-makefile-location.patch
-	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/05-add-copyright.patch
-	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/06-hook-just-after-merging-perdir-config.patch
-	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/07-base-functionality.patch
-	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/08-max-clients-per-vhost.patch
-	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/09-capabilities.patch
-	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/10-nice.patch
-	apache2.confd
-	apache2.logrotate
-	apache2.initd
-	alpine.layout"
-
-prepare() {
-	cd "$srcdir"/httpd-$pkgver
-	sed -e 's#User daemon#User apache#' \
-		-e 's#Group daemon#Group apache#' \
-		-i docs/conf/httpd.conf.in || return 1
-	cat "$srcdir/alpine.layout" >> config.layout
-
-	cd "$srcdir"
-
-	# create symlinks to soruces for prefork and worker
-	ln -s httpd-$pkgver prefork
-	ln -s httpd-$pkgver worker
-
-	# make a patched clone of itk sources
-	cp -ra httpd-$pkgver itk
-	cd itk 
-	mkdir -p server/mpm/experimental/itk
-	cp -r server/mpm/prefork/* \
-		server/mpm/experimental/itk/ || return 1
-	mv server/mpm/experimental/itk/prefork.c \
-		server/mpm/experimental/itk/itk.c || return 1
-	patch -Np1 -i "$srcdir/02-rename-prefork-to-itk.patch" || return 1
-	patch -Np1 -i "$srcdir/03-add-mpm-to-build-system.patch" || return 1
-	patch -Np1 -i "$srcdir/04-correct-output-makefile-location.patch" || return 1
-	patch -Np1 -i "$srcdir/05-add-copyright.patch" || return 1
-	patch -Np1 -i "$srcdir/06-hook-just-after-merging-perdir-config.patch" || return 1
-	patch -Np1 -i "$srcdir/07-base-functionality.patch" || return 1
-	patch -Np1 -i "$srcdir/08-max-clients-per-vhost.patch" || return 1
-	patch -Np1 -i "$srcdir/09-capabilities.patch" || return 1
-	patch -Np1 -i "$srcdir/10-nice.patch" || return 1
-	autoconf || return 1
-}
-
-build () { 
-	local mpm
-	for mpm in prefork worker itk; do
-		mkdir "$srcdir"/build-${mpm}
-		cd "$srcdir"/build-${mpm}
-
-		"$srcdir"/$mpm/configure --prefix=/usr \
-			--enable-layout=Alpine \
-			--enable-modules=all \
-			--enable-mods-shared=all \
-			--enable-so \
-			--enable-suexec \
-			--with-suexec-caller=http \
-			--with-suexec-docroot=/var/www/localhost/htdocs \
-			--with-suexec-logfile=/var/log/httpd/suexec.log \
-			--with-suexec-bin=/usr/sbin/suexec \
-			--with-suexec-uidmin=99 \
-			--with-suexec-gidmin=99 \
-			--enable-ldap \
-			--enable-authnz-ldap \
-			--enable-cache \
-			--enable-disk-cache \
-			--enable-mem-cache \
-			--enable-file-cache \
-			--enable-ssl \
-			--with-ssl \
-			--enable-deflate \
-			--enable-cgid \
-			--enable-proxy \
-			--enable-proxy-connect \
-			--enable-proxy-http \
-			--enable-proxy-ftp \
-			--enable-dbd \
-			--with-apr=/usr/bin/apr-1-config \
-			--with-apr-util=/usr/bin/apu-1-config \
-			--with-pcre=/usr \
-			--with-mpm=${mpm} \
-			|| return 1
-		make || return 1
-	done
-}
-
-package() {
-	cd "$srcdir"/build-prefork
-	make -j1 DESTDIR="$pkgdir" install || return 1
-	for mpm in worker itk; do
-		install -m755 "$srcdir"/build-$mpm/httpd \
-			"$pkgdir/usr/sbin/httpd.${mpm}" || return 1
-	done
-
-	install -D -m755 "$srcdir/apache2.initd" \
-		"$pkgdir/etc/init.d/apache2" || return 1
-	install -D -m644 "$srcdir/apache2.logrotate" \
-		"$pkgdir/etc/logrotate.d/apache2" || return 1
-	install -D -m644 "$srcdir/apache2.confd" \
-		"$pkgdir/etc/conf.d/apache2" || return 1
-
-	install -d "$pkgdir"/var/www
-	ln -fs /var/log/httpd "$pkgdir/var/www/logs"
-	ln -fs /var/run/httpd "$pkgdir/var/www/run"
-	ln -fs /usr/lib/httpd/modules "$pkgdir/var/www/modules"
-	sed -e 's#/usr/lib/httpd/modules/#modules/#' \
-		-e 's|#\(Include conf/extra/httpd-multilang-errordoc.conf\)|\1|'\
-		-e 's|#\(Include conf/extra/httpd-autoindex.conf\)|\1|' \
-		-e 's|#\(Include conf/extra/httpd-languages.conf\)|\1|' \
-		-e 's|#\(Include conf/extra/httpd-userdir.conf\)|\1|' \
-		-e 's|#\(Include conf/extra/httpd-default.conf\)|\1|' \
-		-e 's|/srv/http|/var/www/localhost|g' \
-		-i "$pkgdir/etc/apache2/httpd.conf" || return 1
-}
-
-utils() {
-	pkgdesc="Apache utility programs for webservers"
-	install -d "$subpkgdir"/usr/bin "$subpkgdir"/usr/sbin
-	cd "$pkgdir"/usr/sbin
-	mv ab dbmmanage htdbm htdigest htpasswd logresolve "$subpkgdir"/usr/bin
-	mv checkgid htcacheclean rotatelogs "$subpkgdir"/usr/sbin
-}
-
-md5sums="c8ff2a07c884300bc7766a2e7f662d33  httpd-2.2.16.tar.bz2
-db42cfcc18ae1c32aaaff2347e35b79d  02-rename-prefork-to-itk.patch
-131408ad4dc7b18547b4e062e7e495ab  03-add-mpm-to-build-system.patch
-ee488f391054d528547c3a372faa2aa7  04-correct-output-makefile-location.patch
-b202944761b2f0516196488b12504236  05-add-copyright.patch
-78fa15f8ca3a284b7d71f942e24e47fb  06-hook-just-after-merging-perdir-config.patch
-d33e39350e987721d50e6fb8e164ab6b  07-base-functionality.patch
-9f7a8935f9cabc7b46d0052906634cef  08-max-clients-per-vhost.patch
-1b28e3363e1b0d05b738a21e7ddd264f  09-capabilities.patch
-d9667fcd2ffecc63e446edd4d6666731  10-nice.patch
-f3e4f5eed88d97d1bbadd0597562bc28  apache2.confd
-d91a9a7196b10ef0bc4ab5b98ea9ccd9  apache2.logrotate
-0261136ff734c3ae8dcf878a46ed5830  apache2.initd
-af943bf52cec8088974084639661ba34  alpine.layout"
diff --git a/testing/apache/alpine.layout b/testing/apache/alpine.layout
deleted file mode 100644
index 7146971d2a..0000000000
--- a/testing/apache/alpine.layout
+++ /dev/null
@@ -1,22 +0,0 @@
-<Layout Alpine>
-	prefix:          /usr
-	exec_prefix:     ${prefix}
-	bindir:          ${prefix}/bin
-	sbindir:         ${prefix}/sbin
-	libdir:          ${prefix}/lib
-	libexecdir:      ${prefix}/lib+
-	mandir:          ${prefix}/share/man
-	sysconfdir:      /etc+
-	datadir:         ${usr}/share+
-	installbuilddir: ${datadir}/build
-	errordir:        ${datadir}/error
-	iconsdir:        ${datadir}/icons
-	htdocsdir:       /var/www/localhost/htdocs
-	manualdir:       /usr/share/doc/apache2/manual
-	cgidir:          /var/www/cgi-bin
-	includedir:      /usr/include+
-	localstatedir:   /var
-	runtimedir:      ${localstatedir}/run+
-	logfiledir:      ${localstatedir}/log+
-	proxycachedir:   ${localstatedir}/cache+
-</Layout>
diff --git a/testing/apache/apache2.confd b/testing/apache/apache2.confd
deleted file mode 100644
index 0297b57906..0000000000
--- a/testing/apache/apache2.confd
+++ /dev/null
@@ -1,82 +0,0 @@
-# /etc/conf.d/apache2: config file for /etc/init.d/apache2
-
-#
-# The default processing model (MPM) is the process-based
-# 'prefork' model. A thread-based model, 'worker', is also
-# available, but does not work with some modules (such as PHP).
-#
-#HTTPD=/usr/sbin/httpd.worker
-
-HTTPD="/usr/sbin/httpd"
-
-# When you install a module it is easy to activate or deactivate the modules
-# and other features of apache using the HTTPD_OPTS line. Every module should
-# install a configuration in /etc/apache2/modules.d. In that file will have an
-# <IfDefine NNN> directive where NNN is the option to enable that module.
-#
-# Here are the options available in the default configuration:
-#
-#  AUTH_DIGEST  Enables mod_auth_digest
-#  AUTHNZ_LDAP  Enables authentication through mod_ldap
-#  CACHE        Enables mod_cache
-#  DAV          Enables mod_dav
-#  ERRORDOCS    Enables default error documents for many languages.
-#  INFO         Enables mod_info, a useful module for debugging
-#  LANGUAGE     Enables content-negotiation based on language and charset.
-#  LDAP         Enables mod_ldap
-#  MANUAL       Enables /manual/ to be the apache manual (needs apache-doc)
-#  MEM_CACHE    Enables default configuration mod_mem_cache
-#  PROXY        Enables mod_proxy
-#  SSL          Enables SSL
-#  SUEXEC       Enables running CGI scripts (in USERDIR) through suexec.
-#  USERDIR      Enables /~username mapping to /home/username/public_html
-#
-#
-# The following two options provide the default virtual host for the HTTP and
-# HTTPS protocol. YOU NEED TO ENABLE AT LEAST ONE OF THEM, otherwise apache
-# will not listen for incomming connections on the approriate port.
-#
-#  DEFAULT_VHOST      Enables name-based virtual hosts, with the default
-#                     virtual host being in /var/www/localhost/htdocs
-#  SSL_DEFAULT_VHOST  Enables default vhost for SSL (you should enable this
-#                     when you enable SSL)
-#
-HTTPD_OPTS="-D DEFAULT_VHOST -D LANGUAGE -D INFO"
-
-# Extended options for advanced uses of Apache ONLY
-# You don't need to edit these unless you are doing crazy Apache stuff
-# As not having them set correctly, or feeding in an incorrect configuration
-# via them will result in Apache failing to start
-# YOU HAVE BEEN WARNED.
-
-# PID file
-#PIDFILE=/var/run/apache2/httpd.pid
-
-# timeout for startup/shutdown checks
-#TIMEOUT=10
-
-# ServerRoot setting
-#SERVERROOT=/var/www
-
-# Configuration file location
-# - If this does NOT start with a '/', then it is treated relative to
-# $SERVERROOT by Apache
-#CONFIGFILE=/etc/apache2/httpd.conf
-
-# Location to log startup errors to
-# They are normally dumped to your terminal.
-#STARTUPERRORLOG="/var/log/apache2/startuperror.log"
-
-# A command that outputs a formatted text version of the HTML at the URL
-# of the command line. Designed for lynx, however other programs may work.
-#LYNX="lynx -dump"
-
-# The URL to your server's mod_status status page.
-# Required for status and fullstatus
-#STATUSURL="http://localhost/server-status"
-
-# Method to use when reloading the server
-# Valid options are 'restart' and 'graceful'
-# See http://httpd.apache.org/docs/2.2/stopping.html for information on
-# what they do and how they differ.
-#RELOAD_TYPE="graceful"
diff --git a/testing/apache/apache2.initd b/testing/apache/apache2.initd
deleted file mode 100755
index 03a6d03032..0000000000
--- a/testing/apache/apache2.initd
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-opts="configdump configtest fullstatus graceful gracefulstop modules reload virtualhosts"
-
-depend() {
-	need net
-	use mysql dns logger netmount postgresql
-	after sshd
-}
-
-configtest() {
-	ebegin "Checking ${SVCNAME} configuration"
-	checkconfig
-	eend $?
-}
-
-checkconfd() {
-	PIDFILE="${PIDFILE:-/var/run/apache2/httpd.pid}"
-	TIMEOUT=${TIMEOUT:-10}
-
-	SERVERROOT="${SERVERROOT:-/var/www}"
-	if [ ! -d ${SERVERROOT} ]; then
-		eerror "SERVERROOT does not exist: ${SERVERROOT}"
-		return 1
-	fi
-
-	CONFIGFILE="${CONFIGFILE:-/etc/apache2/httpd.conf}"
-	[ "${CONFIGFILE#/}" = "${CONFIGFILE}" ] && CONFIGFILE="${SERVERROOT}/${CONFIGFILE}"
-	if [ ! -r "${CONFIGFILE}" ]; then
-		eerror "Unable to read configuration file: ${CONFIGFILE}"
-		return 1
-	fi
-
-	HTTPD_OPTS="${HTTPD_OPTS} -d ${SERVERROOT}"
-	HTTPD_OPTS="${HTTPD_OPTS} -f ${CONFIGFILE}"
-	[ -n "${STARTUPERRORLOG}" ] && HTTPD_OPTS="${HTTPD_OPTS} -E ${STARTUPERRORLOG}"
-	return 0
-
-}
-
-checkconfig() {
-	checkconfd || return 1
-
-	${HTTPD} ${HTTPD_OPTS} -t 1>/dev/null 2>&1
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eerror "${SVCNAME} has detected an error in your setup:"
-		${HTTPD} ${HTTPD_OPTS} -t
-	fi
-
-	return $ret
-}
-
-start() {
-	checkconfig || return 1
-
-	[ -f /var/log/apache2/ssl_scache ] && rm /var/log/apache2/ssl_scache
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start \
-		--pidfile ${PIDFILE} \
-		--exec ${HTTPD} \
-		-- ${HTTPD_OPTS} -k start
-	eend $?
-}
-
-stop() {
-	checkconfd || return 1
-
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile ${PIDFILE} --exec ${HTTPD} \
-		--retry ${TIMEOUT}
-	eend $?
-}
-
-reload() {
-	RELOAD_TYPE="${RELOAD_TYPE:-graceful}"
-
-	checkconfig || return 1
-	service_started "${SVCNAME}" || return
-
-	if [ "${RELOAD_TYPE}" = "restart" ]; then
-		ebegin "Restarting ${SVCNAME}"
-		${HTTPD} ${HTTPD_OPTS} -k restart
-		eend $?
-	elif [ "${RELOAD_TYPE}" = "graceful" ]; then
-		ebegin "Gracefully restarting ${SVCNAME}"
-		${HTTPD} ${HTTPD_OPTS} -k graceful
-		eend $?
-	else
-		eerror "${RELOAD_TYPE} is not a valid RELOAD_TYPE. Please edit /etc/conf.d/${SVCNAME}"
-	fi
-}
-
-graceful() {
-	checkconfig || return 1
-	service_started "${SVCNAME}" || return
-	ebegin "Gracefully restarting ${SVCNAME}"
-	${HTTPD} ${HTTPD_OPTS} -k graceful
-	eend $?
-}
-
-gracefulstop() {
-	checkconfig || return 1
-	ebegin "Gracefully stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile ${PIDFILE} --exec ${HTTPD} \
-		--retry SIGWINCH/${TIMEOUT}
-	eend $?
-}
-
-modules() {
-	checkconfig || return 1
-
-	${HTTPD} ${HTTPD_OPTS} -M 2>&1
-}
-
-fullstatus() {
-	LYNX="${LYNX:-lynx -dump}"
-	STATUSURL="${STATUSURL:-http://localhost/server-status}"
-
-	if ! service_started "${SVCNAME}"; then
-		eerror "${SVCNAME} not started"
-	elif ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then
-		eerror "lynx not found! you need to emerge www-client/lynx"
-	else
-		${LYNX} ${STATUSURL}
-	fi
-}
-
-virtualhosts() {
-	checkconfd || return 1
-	${HTTPD} ${HTTPD_OPTS} -S
-}
-
-configdump() {
-	LYNX="${LYNX:-lynx -dump}"
-	INFOURL="${INFOURL:-http://localhost/server-info}"
-
-	checkconfd || return 1
-
-	if ! service_started "${SVCNAME}"; then
-		eerror "${SVCNAME} not started"
-	elif ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then
-		eerror "lynx not found! you need to emerge www-client/lynx"
-	else
-		echo "${HTTPD} started with '${HTTPD_OPTS}'"
-		for i in config server list; do
-			${LYNX} "${INFOURL}/?${i}" | sed '/Apache Server Information/d;/^[[:space:]]\+[_]\+$/Q'
-		done
-	fi
-}
-
diff --git a/testing/apache/apache2.logrotate b/testing/apache/apache2.logrotate
deleted file mode 100644
index 1264341468..0000000000
--- a/testing/apache/apache2.logrotate
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/apache2/*log {
-   postrotate
-      if /etc/init.d/apache2 status; then
- 	/etc/init.d/apache2 reload --quiet || true
-      fi
-   endscript
-}
diff --git a/testing/apache2/APKBUILD b/testing/apache2/APKBUILD
new file mode 100644
index 0000000000..40cf16b035
--- /dev/null
+++ b/testing/apache2/APKBUILD
@@ -0,0 +1,154 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=apache2
+pkgver=2.2.16
+pkgrel=0
+pkgdesc="A high performance Unix-based HTTP server"
+url="http://httpd.apache.org/"
+license="APACHE"
+depends=""
+pkgusers="apache"
+pkggroups="apache"
+makedepends="openssl-dev zlib-dev apr-util-dev apr-dev pcre-dev
+	autoconf automake"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-utils"
+source="http://archive.apache.org/dist/httpd/httpd-$pkgver.tar.bz2
+	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/02-rename-prefork-to-itk.patch
+	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/03-add-mpm-to-build-system.patch
+	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/04-correct-output-makefile-location.patch
+	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/05-add-copyright.patch
+	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/06-hook-just-after-merging-perdir-config.patch
+	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/07-base-functionality.patch
+	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/08-max-clients-per-vhost.patch
+	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/09-capabilities.patch
+	http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/10-nice.patch
+	apache2.confd
+	apache2.logrotate
+	apache2.initd
+	alpine.layout"
+
+prepare() {
+	cd "$srcdir"/httpd-$pkgver
+	sed -e 's#User daemon#User apache#' \
+		-e 's#Group daemon#Group apache#' \
+		-i docs/conf/httpd.conf.in || return 1
+	cat "$srcdir/alpine.layout" >> config.layout
+
+	cd "$srcdir"
+
+	# create symlinks to soruces for prefork and worker
+	ln -s httpd-$pkgver prefork
+	ln -s httpd-$pkgver worker
+
+	# make a patched clone of itk sources
+	cp -ra httpd-$pkgver itk
+	cd itk 
+	mkdir -p server/mpm/experimental/itk
+	cp -r server/mpm/prefork/* \
+		server/mpm/experimental/itk/ || return 1
+	mv server/mpm/experimental/itk/prefork.c \
+		server/mpm/experimental/itk/itk.c || return 1
+	patch -Np1 -i "$srcdir/02-rename-prefork-to-itk.patch" || return 1
+	patch -Np1 -i "$srcdir/03-add-mpm-to-build-system.patch" || return 1
+	patch -Np1 -i "$srcdir/04-correct-output-makefile-location.patch" || return 1
+	patch -Np1 -i "$srcdir/05-add-copyright.patch" || return 1
+	patch -Np1 -i "$srcdir/06-hook-just-after-merging-perdir-config.patch" || return 1
+	patch -Np1 -i "$srcdir/07-base-functionality.patch" || return 1
+	patch -Np1 -i "$srcdir/08-max-clients-per-vhost.patch" || return 1
+	patch -Np1 -i "$srcdir/09-capabilities.patch" || return 1
+	patch -Np1 -i "$srcdir/10-nice.patch" || return 1
+	autoconf || return 1
+}
+
+build () { 
+	local mpm
+	for mpm in prefork worker itk; do
+		mkdir "$srcdir"/build-${mpm}
+		cd "$srcdir"/build-${mpm}
+
+		"$srcdir"/$mpm/configure --prefix=/usr \
+			--enable-layout=Alpine \
+			--enable-modules=all \
+			--enable-mods-shared=all \
+			--enable-so \
+			--enable-suexec \
+			--with-suexec-caller=http \
+			--with-suexec-docroot=/var/www/localhost/htdocs \
+			--with-suexec-logfile=/var/log/httpd/suexec.log \
+			--with-suexec-bin=/usr/sbin/suexec \
+			--with-suexec-uidmin=99 \
+			--with-suexec-gidmin=99 \
+			--enable-ldap \
+			--enable-authnz-ldap \
+			--enable-cache \
+			--enable-disk-cache \
+			--enable-mem-cache \
+			--enable-file-cache \
+			--enable-ssl \
+			--with-ssl \
+			--enable-deflate \
+			--enable-cgid \
+			--enable-proxy \
+			--enable-proxy-connect \
+			--enable-proxy-http \
+			--enable-proxy-ftp \
+			--enable-dbd \
+			--with-apr=/usr/bin/apr-1-config \
+			--with-apr-util=/usr/bin/apu-1-config \
+			--with-pcre=/usr \
+			--with-mpm=${mpm} \
+			|| return 1
+		make || return 1
+	done
+}
+
+package() {
+	cd "$srcdir"/build-prefork
+	make -j1 DESTDIR="$pkgdir" install || return 1
+	for mpm in worker itk; do
+		install -m755 "$srcdir"/build-$mpm/httpd \
+			"$pkgdir/usr/sbin/httpd.${mpm}" || return 1
+	done
+
+	install -D -m755 "$srcdir/apache2.initd" \
+		"$pkgdir/etc/init.d/apache2" || return 1
+	install -D -m644 "$srcdir/apache2.logrotate" \
+		"$pkgdir/etc/logrotate.d/apache2" || return 1
+	install -D -m644 "$srcdir/apache2.confd" \
+		"$pkgdir/etc/conf.d/apache2" || return 1
+
+	install -d "$pkgdir"/var/www
+	ln -fs /var/log/httpd "$pkgdir/var/www/logs"
+	ln -fs /var/run/httpd "$pkgdir/var/www/run"
+	ln -fs /usr/lib/httpd/modules "$pkgdir/var/www/modules"
+	sed -e 's#/usr/lib/httpd/modules/#modules/#' \
+		-e 's|#\(Include conf/extra/httpd-multilang-errordoc.conf\)|\1|'\
+		-e 's|#\(Include conf/extra/httpd-autoindex.conf\)|\1|' \
+		-e 's|#\(Include conf/extra/httpd-languages.conf\)|\1|' \
+		-e 's|#\(Include conf/extra/httpd-userdir.conf\)|\1|' \
+		-e 's|#\(Include conf/extra/httpd-default.conf\)|\1|' \
+		-e 's|/srv/http|/var/www/localhost|g' \
+		-i "$pkgdir/etc/apache2/httpd.conf" || return 1
+}
+
+utils() {
+	pkgdesc="Apache utility programs for webservers"
+	install -d "$subpkgdir"/usr/bin "$subpkgdir"/usr/sbin
+	cd "$pkgdir"/usr/sbin
+	mv ab dbmmanage htdbm htdigest htpasswd logresolve "$subpkgdir"/usr/bin
+	mv checkgid htcacheclean rotatelogs "$subpkgdir"/usr/sbin
+}
+
+md5sums="c8ff2a07c884300bc7766a2e7f662d33  httpd-2.2.16.tar.bz2
+db42cfcc18ae1c32aaaff2347e35b79d  02-rename-prefork-to-itk.patch
+131408ad4dc7b18547b4e062e7e495ab  03-add-mpm-to-build-system.patch
+ee488f391054d528547c3a372faa2aa7  04-correct-output-makefile-location.patch
+b202944761b2f0516196488b12504236  05-add-copyright.patch
+78fa15f8ca3a284b7d71f942e24e47fb  06-hook-just-after-merging-perdir-config.patch
+d33e39350e987721d50e6fb8e164ab6b  07-base-functionality.patch
+9f7a8935f9cabc7b46d0052906634cef  08-max-clients-per-vhost.patch
+1b28e3363e1b0d05b738a21e7ddd264f  09-capabilities.patch
+d9667fcd2ffecc63e446edd4d6666731  10-nice.patch
+f3e4f5eed88d97d1bbadd0597562bc28  apache2.confd
+d91a9a7196b10ef0bc4ab5b98ea9ccd9  apache2.logrotate
+0261136ff734c3ae8dcf878a46ed5830  apache2.initd
+af943bf52cec8088974084639661ba34  alpine.layout"
diff --git a/testing/apache2/alpine.layout b/testing/apache2/alpine.layout
new file mode 100644
index 0000000000..7146971d2a
--- /dev/null
+++ b/testing/apache2/alpine.layout
@@ -0,0 +1,22 @@
+<Layout Alpine>
+	prefix:          /usr
+	exec_prefix:     ${prefix}
+	bindir:          ${prefix}/bin
+	sbindir:         ${prefix}/sbin
+	libdir:          ${prefix}/lib
+	libexecdir:      ${prefix}/lib+
+	mandir:          ${prefix}/share/man
+	sysconfdir:      /etc+
+	datadir:         ${usr}/share+
+	installbuilddir: ${datadir}/build
+	errordir:        ${datadir}/error
+	iconsdir:        ${datadir}/icons
+	htdocsdir:       /var/www/localhost/htdocs
+	manualdir:       /usr/share/doc/apache2/manual
+	cgidir:          /var/www/cgi-bin
+	includedir:      /usr/include+
+	localstatedir:   /var
+	runtimedir:      ${localstatedir}/run+
+	logfiledir:      ${localstatedir}/log+
+	proxycachedir:   ${localstatedir}/cache+
+</Layout>
diff --git a/testing/apache2/apache2.confd b/testing/apache2/apache2.confd
new file mode 100644
index 0000000000..0297b57906
--- /dev/null
+++ b/testing/apache2/apache2.confd
@@ -0,0 +1,82 @@
+# /etc/conf.d/apache2: config file for /etc/init.d/apache2
+
+#
+# The default processing model (MPM) is the process-based
+# 'prefork' model. A thread-based model, 'worker', is also
+# available, but does not work with some modules (such as PHP).
+#
+#HTTPD=/usr/sbin/httpd.worker
+
+HTTPD="/usr/sbin/httpd"
+
+# When you install a module it is easy to activate or deactivate the modules
+# and other features of apache using the HTTPD_OPTS line. Every module should
+# install a configuration in /etc/apache2/modules.d. In that file will have an
+# <IfDefine NNN> directive where NNN is the option to enable that module.
+#
+# Here are the options available in the default configuration:
+#
+#  AUTH_DIGEST  Enables mod_auth_digest
+#  AUTHNZ_LDAP  Enables authentication through mod_ldap
+#  CACHE        Enables mod_cache
+#  DAV          Enables mod_dav
+#  ERRORDOCS    Enables default error documents for many languages.
+#  INFO         Enables mod_info, a useful module for debugging
+#  LANGUAGE     Enables content-negotiation based on language and charset.
+#  LDAP         Enables mod_ldap
+#  MANUAL       Enables /manual/ to be the apache manual (needs apache-doc)
+#  MEM_CACHE    Enables default configuration mod_mem_cache
+#  PROXY        Enables mod_proxy
+#  SSL          Enables SSL
+#  SUEXEC       Enables running CGI scripts (in USERDIR) through suexec.
+#  USERDIR      Enables /~username mapping to /home/username/public_html
+#
+#
+# The following two options provide the default virtual host for the HTTP and
+# HTTPS protocol. YOU NEED TO ENABLE AT LEAST ONE OF THEM, otherwise apache
+# will not listen for incomming connections on the approriate port.
+#
+#  DEFAULT_VHOST      Enables name-based virtual hosts, with the default
+#                     virtual host being in /var/www/localhost/htdocs
+#  SSL_DEFAULT_VHOST  Enables default vhost for SSL (you should enable this
+#                     when you enable SSL)
+#
+HTTPD_OPTS="-D DEFAULT_VHOST -D LANGUAGE -D INFO"
+
+# Extended options for advanced uses of Apache ONLY
+# You don't need to edit these unless you are doing crazy Apache stuff
+# As not having them set correctly, or feeding in an incorrect configuration
+# via them will result in Apache failing to start
+# YOU HAVE BEEN WARNED.
+
+# PID file
+#PIDFILE=/var/run/apache2/httpd.pid
+
+# timeout for startup/shutdown checks
+#TIMEOUT=10
+
+# ServerRoot setting
+#SERVERROOT=/var/www
+
+# Configuration file location
+# - If this does NOT start with a '/', then it is treated relative to
+# $SERVERROOT by Apache
+#CONFIGFILE=/etc/apache2/httpd.conf
+
+# Location to log startup errors to
+# They are normally dumped to your terminal.
+#STARTUPERRORLOG="/var/log/apache2/startuperror.log"
+
+# A command that outputs a formatted text version of the HTML at the URL
+# of the command line. Designed for lynx, however other programs may work.
+#LYNX="lynx -dump"
+
+# The URL to your server's mod_status status page.
+# Required for status and fullstatus
+#STATUSURL="http://localhost/server-status"
+
+# Method to use when reloading the server
+# Valid options are 'restart' and 'graceful'
+# See http://httpd.apache.org/docs/2.2/stopping.html for information on
+# what they do and how they differ.
+#RELOAD_TYPE="graceful"
diff --git a/testing/apache2/apache2.initd b/testing/apache2/apache2.initd
new file mode 100755
index 0000000000..03a6d03032
--- /dev/null
+++ b/testing/apache2/apache2.initd
@@ -0,0 +1,154 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+opts="configdump configtest fullstatus graceful gracefulstop modules reload virtualhosts"
+
+depend() {
+	need net
+	use mysql dns logger netmount postgresql
+	after sshd
+}
+
+configtest() {
+	ebegin "Checking ${SVCNAME} configuration"
+	checkconfig
+	eend $?
+}
+
+checkconfd() {
+	PIDFILE="${PIDFILE:-/var/run/apache2/httpd.pid}"
+	TIMEOUT=${TIMEOUT:-10}
+
+	SERVERROOT="${SERVERROOT:-/var/www}"
+	if [ ! -d ${SERVERROOT} ]; then
+		eerror "SERVERROOT does not exist: ${SERVERROOT}"
+		return 1
+	fi
+
+	CONFIGFILE="${CONFIGFILE:-/etc/apache2/httpd.conf}"
+	[ "${CONFIGFILE#/}" = "${CONFIGFILE}" ] && CONFIGFILE="${SERVERROOT}/${CONFIGFILE}"
+	if [ ! -r "${CONFIGFILE}" ]; then
+		eerror "Unable to read configuration file: ${CONFIGFILE}"
+		return 1
+	fi
+
+	HTTPD_OPTS="${HTTPD_OPTS} -d ${SERVERROOT}"
+	HTTPD_OPTS="${HTTPD_OPTS} -f ${CONFIGFILE}"
+	[ -n "${STARTUPERRORLOG}" ] && HTTPD_OPTS="${HTTPD_OPTS} -E ${STARTUPERRORLOG}"
+	return 0
+
+}
+
+checkconfig() {
+	checkconfd || return 1
+
+	${HTTPD} ${HTTPD_OPTS} -t 1>/dev/null 2>&1
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		eerror "${SVCNAME} has detected an error in your setup:"
+		${HTTPD} ${HTTPD_OPTS} -t
+	fi
+
+	return $ret
+}
+
+start() {
+	checkconfig || return 1
+
+	[ -f /var/log/apache2/ssl_scache ] && rm /var/log/apache2/ssl_scache
+
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start \
+		--pidfile ${PIDFILE} \
+		--exec ${HTTPD} \
+		-- ${HTTPD_OPTS} -k start
+	eend $?
+}
+
+stop() {
+	checkconfd || return 1
+
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile ${PIDFILE} --exec ${HTTPD} \
+		--retry ${TIMEOUT}
+	eend $?
+}
+
+reload() {
+	RELOAD_TYPE="${RELOAD_TYPE:-graceful}"
+
+	checkconfig || return 1
+	service_started "${SVCNAME}" || return
+
+	if [ "${RELOAD_TYPE}" = "restart" ]; then
+		ebegin "Restarting ${SVCNAME}"
+		${HTTPD} ${HTTPD_OPTS} -k restart
+		eend $?
+	elif [ "${RELOAD_TYPE}" = "graceful" ]; then
+		ebegin "Gracefully restarting ${SVCNAME}"
+		${HTTPD} ${HTTPD_OPTS} -k graceful
+		eend $?
+	else
+		eerror "${RELOAD_TYPE} is not a valid RELOAD_TYPE. Please edit /etc/conf.d/${SVCNAME}"
+	fi
+}
+
+graceful() {
+	checkconfig || return 1
+	service_started "${SVCNAME}" || return
+	ebegin "Gracefully restarting ${SVCNAME}"
+	${HTTPD} ${HTTPD_OPTS} -k graceful
+	eend $?
+}
+
+gracefulstop() {
+	checkconfig || return 1
+	ebegin "Gracefully stopping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile ${PIDFILE} --exec ${HTTPD} \
+		--retry SIGWINCH/${TIMEOUT}
+	eend $?
+}
+
+modules() {
+	checkconfig || return 1
+
+	${HTTPD} ${HTTPD_OPTS} -M 2>&1
+}
+
+fullstatus() {
+	LYNX="${LYNX:-lynx -dump}"
+	STATUSURL="${STATUSURL:-http://localhost/server-status}"
+
+	if ! service_started "${SVCNAME}"; then
+		eerror "${SVCNAME} not started"
+	elif ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then
+		eerror "lynx not found! you need to emerge www-client/lynx"
+	else
+		${LYNX} ${STATUSURL}
+	fi
+}
+
+virtualhosts() {
+	checkconfd || return 1
+	${HTTPD} ${HTTPD_OPTS} -S
+}
+
+configdump() {
+	LYNX="${LYNX:-lynx -dump}"
+	INFOURL="${INFOURL:-http://localhost/server-info}"
+
+	checkconfd || return 1
+
+	if ! service_started "${SVCNAME}"; then
+		eerror "${SVCNAME} not started"
+	elif ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then
+		eerror "lynx not found! you need to emerge www-client/lynx"
+	else
+		echo "${HTTPD} started with '${HTTPD_OPTS}'"
+		for i in config server list; do
+			${LYNX} "${INFOURL}/?${i}" | sed '/Apache Server Information/d;/^[[:space:]]\+[_]\+$/Q'
+		done
+	fi
+}
+
diff --git a/testing/apache2/apache2.logrotate b/testing/apache2/apache2.logrotate
new file mode 100644
index 0000000000..1264341468
--- /dev/null
+++ b/testing/apache2/apache2.logrotate
@@ -0,0 +1,7 @@
+/var/log/apache2/*log {
+   postrotate
+      if /etc/init.d/apache2 status; then
+ 	/etc/init.d/apache2 reload --quiet || true
+      fi
+   endscript
+}
-- 
cgit v1.2.3


From d319d97c8808f746072ba95bb10b7e0b97976ecd Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 4 Aug 2010 15:32:59 +0000
Subject: testing/apache2: add default config

ship a default config based on fedora's

build optimization, dont build modules for the mpms.

remove the gentoo specific parts from /etc/conf.d/apache2
---
 testing/apache2/APKBUILD          |  114 +++--
 testing/apache2/apache2.confd     |   34 +-
 testing/apache2/apache2.logrotate |   13 +-
 testing/apache2/httpd.conf        | 1009 +++++++++++++++++++++++++++++++++++++
 4 files changed, 1080 insertions(+), 90 deletions(-)
 create mode 100644 testing/apache2/httpd.conf

(limited to 'testing')

diff --git a/testing/apache2/APKBUILD b/testing/apache2/APKBUILD
index 40cf16b035..a072fbab43 100644
--- a/testing/apache2/APKBUILD
+++ b/testing/apache2/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apache2
 pkgver=2.2.16
-pkgrel=0
+pkgrel=1
 pkgdesc="A high performance Unix-based HTTP server"
 url="http://httpd.apache.org/"
 license="APACHE"
@@ -24,16 +24,12 @@ source="http://archive.apache.org/dist/httpd/httpd-$pkgver.tar.bz2
 	apache2.confd
 	apache2.logrotate
 	apache2.initd
+	httpd.conf
 	alpine.layout"
 
 prepare() {
-	cd "$srcdir"/httpd-$pkgver
-	sed -e 's#User daemon#User apache#' \
-		-e 's#Group daemon#Group apache#' \
-		-i docs/conf/httpd.conf.in || return 1
-	cat "$srcdir/alpine.layout" >> config.layout
-
 	cd "$srcdir"
+	cat "$srcdir/alpine.layout" >> httpd-$pkgver/config.layout
 
 	# create symlinks to soruces for prefork and worker
 	ln -s httpd-$pkgver prefork
@@ -59,45 +55,55 @@ prepare() {
 	autoconf || return 1
 }
 
+_buildmpm() {
+	local mpm=$1
+	shift
+	mkdir "$srcdir"/build-${mpm}
+	cd "$srcdir"/build-${mpm}
+	"$srcdir"/$mpm/configure --prefix=/usr \
+		--enable-layout=Alpine \
+		--enable-so \
+		--enable-suexec \
+		--with-suexec-caller=http \
+		--with-suexec-docroot=/var/www/localhost/htdocs \
+		--with-suexec-logfile=/var/log/httpd/suexec.log \
+		--with-suexec-bin=/usr/sbin/suexec \
+		--with-suexec-uidmin=99 \
+		--with-suexec-gidmin=99 \
+		--with-apr=/usr/bin/apr-1-config \
+		--with-apr-util=/usr/bin/apu-1-config \
+		--with-pcre=/usr \
+		--with-mpm=${mpm} \
+		|| return 1
+	make || return 1
+}
+
 build () { 
 	local mpm
-	for mpm in prefork worker itk; do
-		mkdir "$srcdir"/build-${mpm}
-		cd "$srcdir"/build-${mpm}
 
-		"$srcdir"/$mpm/configure --prefix=/usr \
-			--enable-layout=Alpine \
-			--enable-modules=all \
-			--enable-mods-shared=all \
-			--enable-so \
-			--enable-suexec \
-			--with-suexec-caller=http \
-			--with-suexec-docroot=/var/www/localhost/htdocs \
-			--with-suexec-logfile=/var/log/httpd/suexec.log \
-			--with-suexec-bin=/usr/sbin/suexec \
-			--with-suexec-uidmin=99 \
-			--with-suexec-gidmin=99 \
-			--enable-ldap \
-			--enable-authnz-ldap \
-			--enable-cache \
-			--enable-disk-cache \
-			--enable-mem-cache \
-			--enable-file-cache \
-			--enable-ssl \
-			--with-ssl \
-			--enable-deflate \
-			--enable-cgid \
-			--enable-proxy \
-			--enable-proxy-connect \
-			--enable-proxy-http \
-			--enable-proxy-ftp \
-			--enable-dbd \
-			--with-apr=/usr/bin/apr-1-config \
-			--with-apr-util=/usr/bin/apu-1-config \
-			--with-pcre=/usr \
-			--with-mpm=${mpm} \
-			|| return 1
-		make || return 1
+	# build prefork with everything
+	_buildmpm prefork \
+		--enable-mods-shared=all \
+		--enable-ssl --with-ssl --enable-distcache \
+		--enable-proxy \
+	        --enable-cache \
+	        --enable-disk-cache \
+		--enable-mem-cache \
+		--enable-file-cache \
+	        --enable-ldap --enable-authnz-ldap \
+	        --enable-cgid \
+	        --enable-authn-anon --enable-authn-alias \
+	        --disable-imagemap \
+		--enable-proxy-connect \
+		--enable-proxy-http \
+		--enable-proxy-ftp \
+		--enable-deflate \
+		--enable-dbd \
+		|| return 1
+
+	#build the alternative mpms, but without modules
+	for mpm in worker itk; do
+		_buildmpm $mpm --enable-modules=none
 	done
 }
 
@@ -108,7 +114,14 @@ package() {
 		install -m755 "$srcdir"/build-$mpm/httpd \
 			"$pkgdir/usr/sbin/httpd.${mpm}" || return 1
 	done
+	
+	# config
+	rm -r "$pkgdir"/etc/apache2/httpd.conf \
+		"$pkgdir"/etc/apache2/extra 
+	install -D -m644 "$srcdir"/httpd.conf "$pkgdir"/etc/apache2/httpd.conf
+	install -d "$pkgdir"/etc/apache2/conf.d
 
+	# init scripts and logrotate
 	install -D -m755 "$srcdir/apache2.initd" \
 		"$pkgdir/etc/init.d/apache2" || return 1
 	install -D -m644 "$srcdir/apache2.logrotate" \
@@ -119,15 +132,7 @@ package() {
 	install -d "$pkgdir"/var/www
 	ln -fs /var/log/httpd "$pkgdir/var/www/logs"
 	ln -fs /var/run/httpd "$pkgdir/var/www/run"
-	ln -fs /usr/lib/httpd/modules "$pkgdir/var/www/modules"
-	sed -e 's#/usr/lib/httpd/modules/#modules/#' \
-		-e 's|#\(Include conf/extra/httpd-multilang-errordoc.conf\)|\1|'\
-		-e 's|#\(Include conf/extra/httpd-autoindex.conf\)|\1|' \
-		-e 's|#\(Include conf/extra/httpd-languages.conf\)|\1|' \
-		-e 's|#\(Include conf/extra/httpd-userdir.conf\)|\1|' \
-		-e 's|#\(Include conf/extra/httpd-default.conf\)|\1|' \
-		-e 's|/srv/http|/var/www/localhost|g' \
-		-i "$pkgdir/etc/apache2/httpd.conf" || return 1
+	ln -fs /usr/lib/apache2 "$pkgdir/var/www/modules"
 }
 
 utils() {
@@ -148,7 +153,8 @@ d33e39350e987721d50e6fb8e164ab6b  07-base-functionality.patch
 9f7a8935f9cabc7b46d0052906634cef  08-max-clients-per-vhost.patch
 1b28e3363e1b0d05b738a21e7ddd264f  09-capabilities.patch
 d9667fcd2ffecc63e446edd4d6666731  10-nice.patch
-f3e4f5eed88d97d1bbadd0597562bc28  apache2.confd
-d91a9a7196b10ef0bc4ab5b98ea9ccd9  apache2.logrotate
+e322b5211e49511cac6e40c86af1b1da  apache2.confd
+75fe4138b98fcffd01b8c8c077b944f3  apache2.logrotate
 0261136ff734c3ae8dcf878a46ed5830  apache2.initd
+ea8669bd3b913c4d30f16b5a11c82564  httpd.conf
 af943bf52cec8088974084639661ba34  alpine.layout"
diff --git a/testing/apache2/apache2.confd b/testing/apache2/apache2.confd
index 0297b57906..faf02fa979 100644
--- a/testing/apache2/apache2.confd
+++ b/testing/apache2/apache2.confd
@@ -9,39 +9,11 @@
 
 HTTPD="/usr/sbin/httpd"
 
-# When you install a module it is easy to activate or deactivate the modules
-# and other features of apache using the HTTPD_OPTS line. Every module should
-# install a configuration in /etc/apache2/modules.d. In that file will have an
-# <IfDefine NNN> directive where NNN is the option to enable that module.
 #
-# Here are the options available in the default configuration:
+# To pass additional options (for instance, -D definitions) to the
+# httpd binary at startup, set HTTPD_OPTS here.
 #
-#  AUTH_DIGEST  Enables mod_auth_digest
-#  AUTHNZ_LDAP  Enables authentication through mod_ldap
-#  CACHE        Enables mod_cache
-#  DAV          Enables mod_dav
-#  ERRORDOCS    Enables default error documents for many languages.
-#  INFO         Enables mod_info, a useful module for debugging
-#  LANGUAGE     Enables content-negotiation based on language and charset.
-#  LDAP         Enables mod_ldap
-#  MANUAL       Enables /manual/ to be the apache manual (needs apache-doc)
-#  MEM_CACHE    Enables default configuration mod_mem_cache
-#  PROXY        Enables mod_proxy
-#  SSL          Enables SSL
-#  SUEXEC       Enables running CGI scripts (in USERDIR) through suexec.
-#  USERDIR      Enables /~username mapping to /home/username/public_html
-#
-#
-# The following two options provide the default virtual host for the HTTP and
-# HTTPS protocol. YOU NEED TO ENABLE AT LEAST ONE OF THEM, otherwise apache
-# will not listen for incomming connections on the approriate port.
-#
-#  DEFAULT_VHOST      Enables name-based virtual hosts, with the default
-#                     virtual host being in /var/www/localhost/htdocs
-#  SSL_DEFAULT_VHOST  Enables default vhost for SSL (you should enable this
-#                     when you enable SSL)
-#
-HTTPD_OPTS="-D DEFAULT_VHOST -D LANGUAGE -D INFO"
+HTTPD_OPTS=
 
 # Extended options for advanced uses of Apache ONLY
 # You don't need to edit these unless you are doing crazy Apache stuff
diff --git a/testing/apache2/apache2.logrotate b/testing/apache2/apache2.logrotate
index 1264341468..fe19a4381f 100644
--- a/testing/apache2/apache2.logrotate
+++ b/testing/apache2/apache2.logrotate
@@ -1,7 +1,10 @@
 /var/log/apache2/*log {
-   postrotate
-      if /etc/init.d/apache2 status; then
- 	/etc/init.d/apache2 reload --quiet || true
-      fi
-   endscript
+    missingok
+    notifempty
+    sharedscripts
+    delaycompress
+    postrotate
+        /sbin/rc-service --quiet apache2 reload > /dev/null 2>/dev/null || true
+    endscript
 }
+
diff --git a/testing/apache2/httpd.conf b/testing/apache2/httpd.conf
new file mode 100644
index 0000000000..5e0adee65e
--- /dev/null
+++ b/testing/apache2/httpd.conf
@@ -0,0 +1,1009 @@
+#
+# This is the main Apache server configuration file.  It contains the
+# configuration directives that give the server its instructions.
+# See <URL:http://httpd.apache.org/docs/2.2/> for detailed information.
+# In particular, see
+# <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
+# for a discussion of each configuration directive.
+#
+#
+# Do NOT simply read the instructions in here without understanding
+# what they do.  They're here only as hints or reminders.  If you are unsure
+# consult the online docs. You have been warned.  
+#
+# The configuration directives are grouped into three basic sections:
+#  1. Directives that control the operation of the Apache server process as a
+#     whole (the 'global environment').
+#  2. Directives that define the parameters of the 'main' or 'default' server,
+#     which responds to requests that aren't handled by a virtual host.
+#     These directives also provide default values for the settings
+#     of all virtual hosts.
+#  3. Settings for virtual hosts, which allow Web requests to be sent to
+#     different IP addresses or hostnames and have them handled by the
+#     same Apache server process.
+#
+# Configuration and logfile names: If the filenames you specify for many
+# of the server's control files begin with "/" (or "drive:/" for Win32), the
+# server will use that explicit path.  If the filenames do *not* begin
+# with "/", the value of ServerRoot is prepended -- so "logs/foo.log"
+# with ServerRoot set to "/etc/httpd" will be interpreted by the
+# server as "/etc/httpd/logs/foo.log".
+#
+
+### Section 1: Global Environment
+#
+# The directives in this section affect the overall operation of Apache,
+# such as the number of concurrent requests it can handle or where it
+# can find its configuration files.
+#
+
+#
+# Don't give away too much information about all the subcomponents
+# we are running.  Comment out this line if you don't mind remote sites
+# finding out what major optional modules you are running
+ServerTokens OS
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# NOTE!  If you intend to place this on an NFS (or otherwise network)
+# mounted filesystem then please read the LockFile documentation
+# (available at <URL:http://httpd.apache.org/docs/2.2/mod/mpm_common.html#lockfile>);
+# you will save yourself a lot of trouble.
+#
+# Do NOT add a slash at the end of the directory path.
+#
+ServerRoot "/var/www"
+
+#
+# PidFile: The file in which the server should record its process
+# identification number when it starts.  Note the PIDFILE variable in
+# /etc/conf.d/apache2 must be set appropriately if this location is
+# changed.
+#
+PidFile run/httpd.pid
+
+#
+# Timeout: The number of seconds before receives and sends time out.
+#
+Timeout 60
+
+#
+# KeepAlive: Whether or not to allow persistent connections (more than
+# one request per connection). Set to "Off" to deactivate.
+#
+KeepAlive Off
+
+#
+# MaxKeepAliveRequests: The maximum number of requests to allow
+# during a persistent connection. Set to 0 to allow an unlimited amount.
+# We recommend you leave this number high, for maximum performance.
+#
+MaxKeepAliveRequests 100
+
+#
+# KeepAliveTimeout: Number of seconds to wait for the next request from the
+# same client on the same connection.
+#
+KeepAliveTimeout 5
+
+##
+## Server-Pool Size Regulation (MPM specific)
+## 
+
+# prefork MPM
+# StartServers: number of server processes to start
+# MinSpareServers: minimum number of server processes which are kept spare
+# MaxSpareServers: maximum number of server processes which are kept spare
+# ServerLimit: maximum value for MaxClients for the lifetime of the server
+# MaxClients: maximum number of server processes allowed to start
+# MaxRequestsPerChild: maximum number of requests a server process serves
+<IfModule prefork.c>
+StartServers       8
+MinSpareServers    5
+MaxSpareServers   20
+ServerLimit      256
+MaxClients       256
+MaxRequestsPerChild  4000
+</IfModule>
+
+# worker MPM
+# StartServers: initial number of server processes to start
+# MaxClients: maximum number of simultaneous client connections
+# MinSpareThreads: minimum number of worker threads which are kept spare
+# MaxSpareThreads: maximum number of worker threads which are kept spare
+# ThreadsPerChild: constant number of worker threads in each server process
+# MaxRequestsPerChild: maximum number of requests a server process serves
+<IfModule worker.c>
+StartServers         4
+MaxClients         300
+MinSpareThreads     25
+MaxSpareThreads     75 
+ThreadsPerChild     25
+MaxRequestsPerChild  0
+</IfModule>
+
+#
+# Listen: Allows you to bind Apache to specific IP addresses and/or
+# ports, in addition to the default. See also the <VirtualHost>
+# directive.
+#
+# Change this to Listen on specific IP addresses as shown below to 
+# prevent Apache from glomming onto all bound IP addresses (0.0.0.0)
+#
+#Listen 12.34.56.78:80
+Listen 80
+
+#
+# Dynamic Shared Object (DSO) Support
+#
+# To be able to use the functionality of a module which was built as a DSO you
+# have to place corresponding `LoadModule' lines at this location so the
+# directives contained in it are actually available _before_ they are used.
+# Statically compiled modules (those listed by `httpd -l') do not need
+# to be loaded here.
+#
+# Example:
+# LoadModule foo_module modules/mod_foo.so
+#
+LoadModule auth_basic_module modules/mod_auth_basic.so
+LoadModule auth_digest_module modules/mod_auth_digest.so
+LoadModule authn_file_module modules/mod_authn_file.so
+LoadModule authn_alias_module modules/mod_authn_alias.so
+LoadModule authn_anon_module modules/mod_authn_anon.so
+LoadModule authn_dbm_module modules/mod_authn_dbm.so
+LoadModule authn_default_module modules/mod_authn_default.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule authz_user_module modules/mod_authz_user.so
+LoadModule authz_owner_module modules/mod_authz_owner.so
+LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
+LoadModule authz_dbm_module modules/mod_authz_dbm.so
+LoadModule authz_default_module modules/mod_authz_default.so
+LoadModule ldap_module modules/mod_ldap.so
+LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
+LoadModule include_module modules/mod_include.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule logio_module modules/mod_logio.so
+LoadModule env_module modules/mod_env.so
+LoadModule ext_filter_module modules/mod_ext_filter.so
+LoadModule mime_magic_module modules/mod_mime_magic.so
+LoadModule expires_module modules/mod_expires.so
+LoadModule deflate_module modules/mod_deflate.so
+LoadModule headers_module modules/mod_headers.so
+LoadModule usertrack_module modules/mod_usertrack.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule dav_module modules/mod_dav.so
+LoadModule status_module modules/mod_status.so
+LoadModule autoindex_module modules/mod_autoindex.so
+LoadModule info_module modules/mod_info.so
+LoadModule dav_fs_module modules/mod_dav_fs.so
+LoadModule vhost_alias_module modules/mod_vhost_alias.so
+LoadModule negotiation_module modules/mod_negotiation.so
+LoadModule dir_module modules/mod_dir.so
+LoadModule actions_module modules/mod_actions.so
+LoadModule speling_module modules/mod_speling.so
+LoadModule userdir_module modules/mod_userdir.so
+LoadModule alias_module modules/mod_alias.so
+LoadModule substitute_module modules/mod_substitute.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule proxy_module modules/mod_proxy.so
+LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
+LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
+LoadModule proxy_http_module modules/mod_proxy_http.so
+LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
+LoadModule proxy_connect_module modules/mod_proxy_connect.so
+LoadModule cache_module modules/mod_cache.so
+LoadModule suexec_module modules/mod_suexec.so
+LoadModule disk_cache_module modules/mod_disk_cache.so
+LoadModule cgi_module modules/mod_cgi.so
+LoadModule version_module modules/mod_version.so
+
+#
+# The following modules are not loaded by default:
+#
+#LoadModule asis_module modules/mod_asis.so
+#LoadModule authn_dbd_module modules/mod_authn_dbd.so
+#LoadModule cern_meta_module modules/mod_cern_meta.so
+#LoadModule cgid_module modules/mod_cgid.so
+#LoadModule dbd_module modules/mod_dbd.so
+#LoadModule dumpio_module modules/mod_dumpio.so
+#LoadModule filter_module modules/mod_filter.so
+#LoadModule ident_module modules/mod_ident.so
+#LoadModule log_forensic_module modules/mod_log_forensic.so
+#LoadModule unique_id_module modules/mod_unique_id.so
+#
+
+#
+# Load config files from the config directory "/etc/httpd/conf.d".
+#
+Include conf.d/*.conf
+
+#
+# ExtendedStatus controls whether Apache will generate "full" status
+# information (ExtendedStatus On) or just basic information (ExtendedStatus
+# Off) when the "server-status" handler is called. The default is Off.
+#
+#ExtendedStatus On
+
+#
+# If you wish httpd to run as a different user or group, you must run
+# httpd as root initially and it will switch.  
+#
+# User/Group: The name (or #number) of the user/group to run httpd as.
+#  . On SCO (ODT 3) use "User nouser" and "Group nogroup".
+#  . On HPUX you may not be able to use shared memory as nobody, and the
+#    suggested workaround is to create a user www and use that user.
+#  NOTE that some kernels refuse to setgid(Group) or semctl(IPC_SET)
+#  when the value of (unsigned)Group is above 60000; 
+#  don't use Group #-1 on these systems!
+#
+User apache
+Group apache
+
+### Section 2: 'Main' server configuration
+#
+# The directives in this section set up the values used by the 'main'
+# server, which responds to any requests that aren't handled by a
+# <VirtualHost> definition.  These values also provide defaults for
+# any <VirtualHost> containers you may define later in the file.
+#
+# All of these directives may appear inside <VirtualHost> containers,
+# in which case these default settings will be overridden for the
+# virtual host being defined.
+#
+
+#
+# ServerAdmin: Your address, where problems with the server should be
+# e-mailed.  This address appears on some server-generated pages, such
+# as error documents.  e.g. admin@your-domain.com
+#
+ServerAdmin root@localhost
+
+#
+# ServerName gives the name and port that the server uses to identify itself.
+# This can often be determined automatically, but we recommend you specify
+# it explicitly to prevent problems during startup.
+#
+# If this is not set to valid DNS name for your host, server-generated
+# redirections will not work.  See also the UseCanonicalName directive.
+#
+# If your host doesn't have a registered DNS name, enter its IP address here.
+# You will have to access it by its address anyway, and this will make 
+# redirections work in a sensible way.
+#
+#ServerName www.example.com:80
+
+#
+# UseCanonicalName: Determines how Apache constructs self-referencing 
+# URLs and the SERVER_NAME and SERVER_PORT variables.
+# When set "Off", Apache will use the Hostname and Port supplied
+# by the client.  When set "On", Apache will use the value of the
+# ServerName directive.
+#
+UseCanonicalName Off
+
+#
+# DocumentRoot: The directory out of which you will serve your
+# documents. By default, all requests are taken from this directory, but
+# symbolic links and aliases may be used to point to other locations.
+#
+DocumentRoot "/var/www/localhost/htdocs"
+
+#
+# Each directory to which Apache has access can be configured with respect
+# to which services and features are allowed and/or disabled in that
+# directory (and its subdirectories). 
+#
+# First, we configure the "default" to be a very restrictive set of 
+# features.  
+#
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+</Directory>
+
+#
+# Note that from this point forward you must specifically allow
+# particular features to be enabled - so if something's not working as
+# you might expect, make sure that you have specifically enabled it
+# below.
+#
+
+#
+# This should be changed to whatever you set DocumentRoot to.
+#
+<Directory "/var/www/localhost/htdocs">
+
+#
+# Possible values for the Options directive are "None", "All",
+# or any combination of:
+#   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
+#
+# Note that "MultiViews" must be named *explicitly* --- "Options All"
+# doesn't give it to you.
+#
+# The Options directive is both complicated and important.  Please see
+# http://httpd.apache.org/docs/2.2/mod/core.html#options
+# for more information.
+#
+    Options Indexes FollowSymLinks
+
+#
+# AllowOverride controls what directives may be placed in .htaccess files.
+# It can be "All", "None", or any combination of the keywords:
+#   Options FileInfo AuthConfig Limit
+#
+    AllowOverride None
+
+#
+# Controls who can get stuff from this server.
+#
+    Order allow,deny
+    Allow from all
+
+</Directory>
+
+#
+# UserDir: The name of the directory that is appended onto a user's home
+# directory if a ~user request is received.
+#
+# The path to the end user account 'public_html' directory must be
+# accessible to the webserver userid.  This usually means that ~userid
+# must have permissions of 711, ~userid/public_html must have permissions
+# of 755, and documents contained therein must be world-readable.
+# Otherwise, the client will only receive a "403 Forbidden" message.
+#
+# See also: http://httpd.apache.org/docs/misc/FAQ.html#forbidden
+#
+<IfModule mod_userdir.c>
+    #
+    # UserDir is disabled by default since it can confirm the presence
+    # of a username on the system (depending on home directory
+    # permissions).
+    #
+    UserDir disabled
+
+    #
+    # To enable requests to /~user/ to serve the user's public_html
+    # directory, remove the "UserDir disabled" line above, and uncomment
+    # the following line instead:
+    # 
+    #UserDir public_html
+
+</IfModule>
+
+#
+# Control access to UserDir directories.  The following is an example
+# for a site where these directories are restricted to read-only.
+#
+#<Directory /home/*/public_html>
+#    AllowOverride FileInfo AuthConfig Limit
+#    Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
+#    <Limit GET POST OPTIONS>
+#        Order allow,deny
+#        Allow from all
+#    </Limit>
+#    <LimitExcept GET POST OPTIONS>
+#        Order deny,allow
+#        Deny from all
+#    </LimitExcept>
+#</Directory>
+
+#
+# DirectoryIndex: sets the file that Apache will serve if a directory
+# is requested.
+#
+# The index.html.var file (a type-map) is used to deliver content-
+# negotiated documents.  The MultiViews Option can be used for the 
+# same purpose, but it is much slower.
+#
+DirectoryIndex index.html index.html.var
+
+#
+# AccessFileName: The name of the file to look for in each directory
+# for additional configuration directives.  See also the AllowOverride
+# directive.
+#
+AccessFileName .htaccess
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being 
+# viewed by Web clients. 
+#
+<Files ~ "^\.ht">
+    Order allow,deny
+    Deny from all
+    Satisfy All
+</Files>
+
+#
+# TypesConfig describes where the mime.types file (or equivalent) is
+# to be found.
+#
+TypesConfig /etc/apache2/mime.types
+
+#
+# DefaultType is the default MIME type the server will use for a document
+# if it cannot otherwise determine one, such as from filename extensions.
+# If your server contains mostly text or HTML documents, "text/plain" is
+# a good value.  If most of your content is binary, such as applications
+# or images, you may want to use "application/octet-stream" instead to
+# keep browsers from trying to display binary files as though they are
+# text.
+#
+DefaultType text/plain
+
+#
+# The mod_mime_magic module allows the server to use various hints from the
+# contents of the file itself to determine its type.  The MIMEMagicFile
+# directive tells the module where the hint definitions are located.
+#
+<IfModule mod_mime_magic.c>
+#   MIMEMagicFile /usr/share/magic.mime
+    MIMEMagicFile conf/magic
+</IfModule>
+
+#
+# HostnameLookups: Log the names of clients or just their IP addresses
+# e.g., www.apache.org (on) or 204.62.129.132 (off).
+# The default is off because it'd be overall better for the net if people
+# had to knowingly turn this feature on, since enabling it means that
+# each client request will result in AT LEAST one lookup request to the
+# nameserver.
+#
+HostnameLookups Off
+
+#
+# EnableMMAP: Control whether memory-mapping is used to deliver
+# files (assuming that the underlying OS supports it).
+# The default is on; turn this off if you serve from NFS-mounted 
+# filesystems.  On some systems, turning it off (regardless of
+# filesystem) can improve performance; for details, please see
+# http://httpd.apache.org/docs/2.2/mod/core.html#enablemmap
+#
+#EnableMMAP off
+
+#
+# EnableSendfile: Control whether the sendfile kernel support is 
+# used to deliver files (assuming that the OS supports it). 
+# The default is on; turn this off if you serve from NFS-mounted 
+# filesystems.  Please see
+# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
+#
+#EnableSendfile off
+
+#
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog directive within a <VirtualHost>
+# container, error messages relating to that virtual host will be
+# logged here.  If you *do* define an error logfile for a <VirtualHost>
+# container, that host's errors will be logged there and not here.
+#
+ErrorLog logs/error.log
+
+#
+# LogLevel: Control the number of messages logged to the error.log.
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+#
+LogLevel warn
+
+#
+# The following directives define some format nicknames for use with
+# a CustomLog directive (see below).
+#
+LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %b" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
+
+# "combinedio" includes actual counts of actual bytes received (%I) and sent (%O); this
+# requires the mod_logio module to be loaded.
+#LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
+
+#
+# The location and format of the access logfile (Common Logfile Format).
+# If you do not define any access logfiles within a <VirtualHost>
+# container, they will be logged here.  Contrariwise, if you *do*
+# define per-<VirtualHost> access logfiles, transactions will be
+# logged therein and *not* in this file.
+#
+#CustomLog logs/access.log common
+
+#
+# If you would like to have separate agent and referer logfiles, uncomment
+# the following directives.
+#
+#CustomLog logs/referer.log referer
+#CustomLog logs/agent.log agent
+
+#
+# For a single logfile with access, agent, and referer information
+# (Combined Logfile Format), use the following directive:
+#
+CustomLog logs/access.log combined
+
+#
+# Optionally add a line containing the server version and virtual host
+# name to server-generated pages (internal error documents, FTP directory
+# listings, mod_status and mod_info output etc., but not CGI generated
+# documents or custom error documents).
+# Set to "EMail" to also include a mailto: link to the ServerAdmin.
+# Set to one of:  On | Off | EMail
+#
+ServerSignature On
+
+#
+# Aliases: Add here as many aliases as you need (with no limit). The format is 
+# Alias fakename realname
+#
+# Note that if you include a trailing / on fakename then the server will
+# require it to be present in the URL.  So "/icons" isn't aliased in this
+# example, only "/icons/".  If the fakename is slash-terminated, then the 
+# realname must also be slash terminated, and if the fakename omits the 
+# trailing slash, the realname must also omit it.
+#
+# We include the /icons/ alias for FancyIndexed directory listings.  If you
+# do not use FancyIndexing, you may comment this out.
+#
+Alias /icons/ "/usr/share/apache2/icons/"
+
+<Directory "/usr/share/apache2/icons">
+    Options Indexes MultiViews FollowSymLinks
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+</Directory>
+
+#
+# WebDAV module configuration section.
+# 
+<IfModule mod_dav_fs.c>
+    # Location of the WebDAV lock database.
+    DAVLockDB /var/lib/dav/lockdb
+</IfModule>
+
+#
+# ScriptAlias: This controls which directories contain server scripts.
+# ScriptAliases are essentially the same as Aliases, except that
+# documents in the realname directory are treated as applications and
+# run by the server when requested rather than as documents sent to the client.
+# The same rules about trailing "/" apply to ScriptAlias directives as to
+# Alias.
+#
+ScriptAlias /cgi-bin/ "/var/www/cgi-bin/"
+
+#
+# "/var/www/cgi-bin" should be changed to whatever your ScriptAliased
+# CGI directory exists, if you have that configured.
+#
+<Directory "/var/www/cgi-bin">
+    AllowOverride None
+    Options None
+    Order allow,deny
+    Allow from all
+</Directory>
+
+#
+# Redirect allows you to tell clients about documents which used to exist in
+# your server's namespace, but do not anymore. This allows you to tell the
+# clients where to look for the relocated document.
+# Example:
+# Redirect permanent /foo http://www.example.com/bar
+
+#
+# Directives controlling the display of server-generated directory listings.
+#
+
+#
+# IndexOptions: Controls the appearance of server-generated directory
+# listings.
+#
+IndexOptions FancyIndexing VersionSort NameWidth=* HTMLTable Charset=UTF-8
+
+#
+# AddIcon* directives tell the server which icon to show for different
+# files or filename extensions.  These are only displayed for
+# FancyIndexed directories.
+#
+AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip
+
+AddIconByType (TXT,/icons/text.gif) text/*
+AddIconByType (IMG,/icons/image2.gif) image/*
+AddIconByType (SND,/icons/sound2.gif) audio/*
+AddIconByType (VID,/icons/movie.gif) video/*
+
+AddIcon /icons/binary.gif .bin .exe
+AddIcon /icons/binhex.gif .hqx
+AddIcon /icons/tar.gif .tar
+AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv
+AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip
+AddIcon /icons/a.gif .ps .ai .eps
+AddIcon /icons/layout.gif .html .shtml .htm .pdf
+AddIcon /icons/text.gif .txt
+AddIcon /icons/c.gif .c
+AddIcon /icons/p.gif .pl .py
+AddIcon /icons/f.gif .for
+AddIcon /icons/dvi.gif .dvi
+AddIcon /icons/uuencoded.gif .uu
+AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
+AddIcon /icons/tex.gif .tex
+AddIcon /icons/bomb.gif core
+
+AddIcon /icons/back.gif ..
+AddIcon /icons/hand.right.gif README
+AddIcon /icons/folder.gif ^^DIRECTORY^^
+AddIcon /icons/blank.gif ^^BLANKICON^^
+
+#
+# DefaultIcon is which icon to show for files which do not have an icon
+# explicitly set.
+#
+DefaultIcon /icons/unknown.gif
+
+#
+# AddDescription allows you to place a short description after a file in
+# server-generated indexes.  These are only displayed for FancyIndexed
+# directories.
+# Format: AddDescription "description" filename
+#
+#AddDescription "GZIP compressed document" .gz
+#AddDescription "tar archive" .tar
+#AddDescription "GZIP compressed tar archive" .tgz
+
+#
+# ReadmeName is the name of the README file the server will look for by
+# default, and append to directory listings.
+#
+# HeaderName is the name of a file which should be prepended to
+# directory indexes. 
+ReadmeName README.html
+HeaderName HEADER.html
+
+#
+# IndexIgnore is a set of filenames which directory indexing should ignore
+# and not include in the listing.  Shell-style wildcarding is permitted.
+#
+IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
+
+#
+# DefaultLanguage and AddLanguage allows you to specify the language of 
+# a document. You can then use content negotiation to give a browser a 
+# file in a language the user can understand.
+#
+# Specify a default language. This means that all data
+# going out without a specific language tag (see below) will 
+# be marked with this one. You probably do NOT want to set
+# this unless you are sure it is correct for all cases.
+#
+# * It is generally better to not mark a page as 
+# * being a certain language than marking it with the wrong
+# * language!
+#
+# DefaultLanguage nl
+#
+# Note 1: The suffix does not have to be the same as the language
+# keyword --- those with documents in Polish (whose net-standard
+# language code is pl) may wish to use "AddLanguage pl .po" to
+# avoid the ambiguity with the common suffix for perl scripts.
+#
+# Note 2: The example entries below illustrate that in some cases 
+# the two character 'Language' abbreviation is not identical to 
+# the two character 'Country' code for its country,
+# E.g. 'Danmark/dk' versus 'Danish/da'.
+#
+# Note 3: In the case of 'ltz' we violate the RFC by using a three char
+# specifier. There is 'work in progress' to fix this and get
+# the reference data for rfc1766 cleaned up.
+#
+# Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl)
+# English (en) - Esperanto (eo) - Estonian (et) - French (fr) - German (de)
+# Greek-Modern (el) - Hebrew (he) - Italian (it) - Japanese (ja)
+# Korean (ko) - Luxembourgeois* (ltz) - Norwegian Nynorsk (nn)
+# Norwegian (no) - Polish (pl) - Portugese (pt)
+# Brazilian Portuguese (pt-BR) - Russian (ru) - Swedish (sv)
+# Simplified Chinese (zh-CN) - Spanish (es) - Traditional Chinese (zh-TW)
+#
+AddLanguage ca .ca
+AddLanguage cs .cz .cs
+AddLanguage da .dk
+AddLanguage de .de
+AddLanguage el .el
+AddLanguage en .en
+AddLanguage eo .eo
+AddLanguage es .es
+AddLanguage et .et
+AddLanguage fr .fr
+AddLanguage he .he
+AddLanguage hr .hr
+AddLanguage it .it
+AddLanguage ja .ja
+AddLanguage ko .ko
+AddLanguage ltz .ltz
+AddLanguage nl .nl
+AddLanguage nn .nn
+AddLanguage no .no
+AddLanguage pl .po
+AddLanguage pt .pt
+AddLanguage pt-BR .pt-br
+AddLanguage ru .ru
+AddLanguage sv .sv
+AddLanguage zh-CN .zh-cn
+AddLanguage zh-TW .zh-tw
+
+#
+# LanguagePriority allows you to give precedence to some languages
+# in case of a tie during content negotiation.
+#
+# Just list the languages in decreasing order of preference. We have
+# more or less alphabetized them here. You probably want to change this.
+#
+LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
+
+#
+# ForceLanguagePriority allows you to serve a result page rather than
+# MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback)
+# [in case no accepted languages matched the available variants]
+#
+ForceLanguagePriority Prefer Fallback
+
+#
+# Specify a default charset for all content served; this enables
+# interpretation of all content as UTF-8 by default.  To use the 
+# default browser choice (ISO-8859-1), or to allow the META tags
+# in HTML content to override this choice, comment out this
+# directive:
+#
+AddDefaultCharset UTF-8
+
+#
+# AddType allows you to add to or override the MIME configuration
+# file mime.types for specific file types.
+#
+#AddType application/x-tar .tgz
+
+#
+# AddEncoding allows you to have certain browsers uncompress
+# information on the fly. Note: Not all browsers support this.
+# Despite the name similarity, the following Add* directives have nothing
+# to do with the FancyIndexing customization directives above.
+#
+#AddEncoding x-compress .Z
+#AddEncoding x-gzip .gz .tgz
+
+# If the AddEncoding directives above are commented-out, then you
+# probably should define those extensions to indicate media types:
+#
+AddType application/x-compress .Z
+AddType application/x-gzip .gz .tgz
+
+#
+#   MIME-types for downloading Certificates and CRLs
+#
+AddType application/x-x509-ca-cert .crt
+AddType application/x-pkcs7-crl    .crl
+
+#
+# AddHandler allows you to map certain file extensions to "handlers":
+# actions unrelated to filetype. These can be either built into the server
+# or added with the Action directive (see below)
+#
+# To use CGI scripts outside of ScriptAliased directories:
+# (You will also need to add "ExecCGI" to the "Options" directive.)
+#
+#AddHandler cgi-script .cgi
+
+#
+# For files that include their own HTTP headers:
+#
+#AddHandler send-as-is asis
+
+#
+# For type maps (negotiated resources):
+# (This is enabled by default to allow the Apache "It Worked" page
+#  to be distributed in multiple languages.)
+#
+AddHandler type-map var
+
+#
+# Filters allow you to process content before it is sent to the client.
+#
+# To parse .shtml files for server-side includes (SSI):
+# (You will also need to add "Includes" to the "Options" directive.)
+#
+AddType text/html .shtml
+AddOutputFilter INCLUDES .shtml
+
+#
+# Action lets you define media types that will execute a script whenever
+# a matching file is called. This eliminates the need for repeated URL
+# pathnames for oft-used CGI file processors.
+# Format: Action media/type /cgi-script/location
+# Format: Action handler-name /cgi-script/location
+#
+
+#
+# Customizable error responses come in three flavors:
+# 1) plain text 2) local redirects 3) external redirects
+#
+# Some examples:
+#ErrorDocument 500 "The server made a boo boo."
+#ErrorDocument 404 /missing.html
+#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
+#ErrorDocument 402 http://www.example.com/subscription_info.html
+#
+
+#
+# Putting this all together, we can internationalize error responses.
+#
+# We use Alias to redirect any /error/HTTP_<error>.html.var response to
+# our collection of by-error message multi-language collections.  We use 
+# includes to substitute the appropriate text.
+#
+# You can modify the messages' appearance without changing any of the
+# default HTTP_<error>.html.var files by adding the line:
+#
+#   Alias /error/include/ "/your/include/path/"
+#
+# which allows you to create your own set of files by starting with the
+# /var/www/error/include/ files and
+# copying them to /your/include/path/, even on a per-VirtualHost basis.
+#
+
+Alias /error/ "/usr/share/apache2/error/"
+
+<IfModule mod_negotiation.c>
+<IfModule mod_include.c>
+    <Directory "/usr/share/apache2/error">
+        AllowOverride None
+        Options IncludesNoExec
+        AddOutputFilter Includes html
+        AddHandler type-map var
+        Order allow,deny
+        Allow from all
+        LanguagePriority en es de fr
+        ForceLanguagePriority Prefer Fallback
+    </Directory>
+
+#    ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
+#    ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
+#    ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
+#    ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
+#    ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
+#    ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
+#    ErrorDocument 410 /error/HTTP_GONE.html.var
+#    ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
+#    ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var
+#    ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
+#    ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var
+#    ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
+#    ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var
+#    ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
+#    ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var
+#    ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
+#    ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
+
+</IfModule>
+</IfModule>
+
+#
+# The following directives modify normal HTTP response behavior to
+# handle known problems with browser implementations.
+#
+BrowserMatch "Mozilla/2" nokeepalive
+BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
+BrowserMatch "RealPlayer 4\.0" force-response-1.0
+BrowserMatch "Java/1\.0" force-response-1.0
+BrowserMatch "JDK/1\.0" force-response-1.0
+
+#
+# The following directive disables redirects on non-GET requests for
+# a directory that does not include the trailing slash.  This fixes a 
+# problem with Microsoft WebFolders which does not appropriately handle 
+# redirects for folders with DAV methods.
+# Same deal with Apple's DAV filesystem and Gnome VFS support for DAV.
+#
+BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
+BrowserMatch "MS FrontPage" redirect-carefully
+BrowserMatch "^WebDrive" redirect-carefully
+BrowserMatch "^WebDAVFS/1.[0123]" redirect-carefully
+BrowserMatch "^gnome-vfs/1.0" redirect-carefully
+BrowserMatch "^XML Spy" redirect-carefully
+BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
+
+#
+# Allow server status reports generated by mod_status,
+# with the URL of http://servername/server-status
+# Change the ".example.com" to match your domain to enable.
+#
+#<Location /server-status>
+#    SetHandler server-status
+#    Order deny,allow
+#    Deny from all
+#    Allow from .example.com
+#</Location>
+
+#
+# Allow remote server configuration reports, with the URL of
+#  http://servername/server-info (requires that mod_info.c be loaded).
+# Change the ".example.com" to match your domain to enable.
+#
+#<Location /server-info>
+#    SetHandler server-info
+#    Order deny,allow
+#    Deny from all
+#    Allow from .example.com
+#</Location>
+
+#
+# Proxy Server directives. Uncomment the following lines to
+# enable the proxy server:
+#
+#<IfModule mod_proxy.c>
+#ProxyRequests On
+#
+#<Proxy *>
+#    Order deny,allow
+#    Deny from all
+#    Allow from .example.com
+#</Proxy>
+
+#
+# Enable/disable the handling of HTTP/1.1 "Via:" headers.
+# ("Full" adds the server version; "Block" removes all outgoing Via: headers)
+# Set to one of: Off | On | Full | Block
+#
+#ProxyVia On
+
+#
+# To enable a cache of proxied content, uncomment the following lines.
+# See http://httpd.apache.org/docs/2.2/mod/mod_cache.html for more details.
+#
+#<IfModule mod_disk_cache.c>
+#   CacheEnable disk /
+#   CacheRoot "/var/cache/mod_proxy"
+#</IfModule>
+#
+
+#</IfModule>
+# End of proxy directives.
+
+### Section 3: Virtual Hosts
+#
+# VirtualHost: If you want to maintain multiple domains/hostnames on your
+# machine you can setup VirtualHost containers for them. Most configurations
+# use only name-based virtual hosts so the server doesn't need to worry about
+# IP addresses. This is indicated by the asterisks in the directives below.
+#
+# Please see the documentation at 
+# <URL:http://httpd.apache.org/docs/2.2/vhosts/>
+# for further details before you try to setup virtual hosts.
+#
+# You may use the command line option '-S' to verify your virtual host
+# configuration.
+
+#
+# Use name-based virtual hosting.
+#
+#NameVirtualHost *:80
+#
+# NOTE: NameVirtualHost cannot be used without a port specifier 
+# (e.g. :80) if mod_ssl is being used, due to the nature of the
+# SSL protocol.
+#
+
+#
+# VirtualHost example:
+# Almost any Apache directive may go into a VirtualHost container.
+# The first VirtualHost section is used for requests without a known
+# server name.
+#
+#<VirtualHost *:80>
+#    ServerAdmin webmaster@dummy-host.example.com
+#    DocumentRoot /var/www/dummy-host.example.com/htdocs
+#    ServerName dummy-host.example.com
+#    ErrorLog logs/dummy-host.example.com-error.log
+#    CustomLog logs/dummy-host.example.com-access.log common
+#</VirtualHost>
-- 
cgit v1.2.3