Merge branch 'master' of git://git.alpinelinux.org/aports

5 files changed, 108 insertions, 11 deletions

diff --git a/main/alpine-conf/0001-lbu-fix-the-way-we-check-if-a-dir-is-mounted-or-not.patch b/main/alpine-conf/0001-lbu-fix-the-way-we-check-if-a-dir-is-mounted-or-not.patch
new file mode 100644
index 00000000..858c3b81
--- /dev/null
+++ b/main/alpine-conf/0001-lbu-fix-the-way-we-check-if-a-dir-is-mounted-or-not.patch
@@ -0,0 +1,27 @@
+From dedf250425d3cb082cae9f0005d94fbc01e1e953 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Mon, 11 Jan 2010 20:56:02 +0000
+Subject: [PATCH] lbu: fix the way we check if a dir is mounted or not
+
+this works around an issue when lbu wrongly assumes /media/usb is
+mounted when /media/usbdisk is.
+---
+ lbu.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lbu.in b/lbu.in
+index 7709567..da8ba86 100644
+--- a/lbu.in
++++ b/lbu.in
+@@ -65,7 +65,7 @@ exit_clean() {
+ }
+ 
+ mount_once() {
+-	if ! grep $1 /proc/mounts >/dev/null; then
++	if awk "\$2 == \"$1\" {exit 1}" /proc/mounts; then
+ 		mount $1 && UMOUNT_LIST="$1 $UMOUNT_LIST"
+ 	fi
+ }
+-- 
+1.6.6
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 9182c81b..902dd78d 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,16 +1,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
 pkgver=2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
 depends="openrc"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
+	0001-lbu-fix-the-way-we-check-if-a-dir-is-mounted-or-not.patch
 	"
 license="GPL-2"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
+	patch -p1 -i "$srcdir"/0001-lbu-fix-the-way-we-check-if-a-dir-is-mounted-or-not.patch || return 1
 
 	make || return 1
 	make install PREFIX= DESTDIR="$pkgdir"
@@ -18,4 +20,5 @@ build() {
 		ln -s lbu "$pkgdir"/sbin/lbu_$i
 	done
 }
-md5sums="0aa966ef854de61b375d7e08bdb105b4  alpine-conf-2.0.tar.bz2"
+md5sums="0aa966ef854de61b375d7e08bdb105b4  alpine-conf-2.0.tar.bz2
+3b520ebbf30e4e5c2ff76f14a1e2d8f2  0001-lbu-fix-the-way-we-check-if-a-dir-is-mounted-or-not.patch"
diff --git a/main/lighttpd/APKBUILD b/main/lighttpd/APKBUILD
index aa178e2b..49e73ce9 100644
--- a/main/lighttpd/APKBUILD
+++ b/main/lighttpd/APKBUILD
@@ -1,14 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lighttpd
 pkgver=1.4.25
-pkgrel=0
+_streamver=2.2.0
+pkgrel=2
 pkgdesc="a secure, fast, compliant and very flexible web-server"
 url="http://www.lighttpd.net/"
 license="custom"
 install="$pkgname.pre-install $pkgname.post-install"
 depends=
-makedepends="flex pcre-dev openssl-dev zlib-dev bzip2-dev lua-dev pkgconfig"
+makedepends="flex pcre-dev openssl-dev zlib-dev bzip2-dev lua-dev pkgconfig
+	automake autoconf"
 source="http://download.lighttpd.net/lighttpd/releases-1.4.x/$pkgname-$pkgver.tar.bz2
+	http://h264.code-shop.com/download/lighttpd-1.4.18_mod_h264_streaming-$_streamver.tar.gz
 	$pkgname.initd
 	$pkgname.confd
 	$pkgname.logrotate
@@ -19,7 +22,25 @@ source="http://download.lighttpd.net/lighttpd/releases-1.4.x/$pkgname-$pkgver.ta
 	mod_cgi.conf
 	mod_fastcgi.conf
 	"
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-h264_streaming"
+
+prepare() {
+	cd "$srcdir"/$pkgname-$pkgver
+
+	# copy over the mod-h264-streaming mod
+	# http://h264.code-shop.com/trac/wiki/Mod-H264-Streaming-Lighttpd-Version2#DownloadLighttpd1.4.191.4.20andother1.4.x
+	cp "$srcdir"/lighttpd-1.4.18/src/moov.* src/
+	cp "$srcdir"/lighttpd-1.4.18/src/mod_h264_streaming.c src/
+
+	cat >> src/Makefile.am <<__EOF__
+
+lib_LTLIBRARIES += mod_h264_streaming.la
+mod_h264_streaming_la_SOURCES = mod_h264_streaming.c moov.c
+mod_h264_streaming_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+mod_h264_streaming_la_LIBADD = \$(common_libadd)
+__EOF__
+	aclocal -I m4 && autoconf && automake
+}
 
 build() { 
 	local i
@@ -70,7 +91,18 @@ package() {
 		install -m644 "$srcdir"/$i "$pkgdir"/etc/lighttpd/$i
 	done
 }
+
+h264_streaming() {
+	pkgdesc="H264 Streaming Module for lighttpd"
+	url="http://h264.code-shop.com/trac"
+	license="CCPL-nc-sa-3.0"
+	mkdir -p "$subpkgdir"/usr/lib/lighttpd
+	mv "$pkgdir"/usr/lib/lighttpd/mod_h264_streaming.so \
+		"$subpkgdir"/usr/lib/lighttpd/
+}
+
 md5sums="2027c49fb46530e45338c5e2da13c02f  lighttpd-1.4.25.tar.bz2
+ac37885c881a058194405232e7737a7a  lighttpd-1.4.18_mod_h264_streaming-2.2.0.tar.gz
 36c4ddbc266017dc193fcb0cdd1d84e1  lighttpd.initd
 0dede109282bfe685bdec6b35f0e4b6b  lighttpd.confd
 ad091c9157134890499f26d170352c9f  lighttpd.logrotate
diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index e1a23d39..00f5544f 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=php
 pkgver=5.3.1
-_suhosinver=${pkgver}RC1-0.9.8
-pkgrel=1
+_suhosinver=${pkgver}-0.9.8
+pkgrel=2
 pkgdesc="The PHP language runtime engine"
 url="http://www.php.net/"
 license="PHP-3"
@@ -65,6 +65,8 @@ source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2
         http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz
 	"
 
+_extdir="/usr/lib/php/20090626"
+
 build() {
         cd "$srcdir/$pkgname-$pkgver"
 
@@ -166,14 +168,14 @@ package() {
         cd "$srcdir/$pkgname-$pkgver"
         make -j1 INSTALL_ROOT="$pkgdir" install || return 1
         install -D -m644 php.ini-production "$pkgdir"/etc/php/php.ini
+	sed -i -e "s:^; extension_dir = \"./\":extension_dir = \"$_extdir\":" "$pkgdir"/etc/php/php.ini
 }
 
 _mv_mod() {
 	pkgdesc="$1 php extension"
 	depends="php"
-	local d=usr/lib/php/20090626
-	mkdir -p "$subpkgdir/$d"
-	mv "$pkgdir/$d/${1}.so" "$subpkgdir/$d/" || return 1
+	mkdir -p "$subpkgdir/$_extdir"
+	mv "$pkgdir/$_extdir/${1}.so" "$subpkgdir/$_extdir/" || return 1
 	install -d "$subpkgdir"/etc/php/conf.d
 	echo "extension=${1}.so" > "$subpkgdir"/etc/php/conf.d/${1}.ini
 	return 0
@@ -234,4 +236,4 @@ dev() {
 }
 
 md5sums="63e97ad450f0f7259e785100b634c797  php-5.3.1.tar.bz2
-c3ff0cb5fa728420d56f8ed139446647  suhosin-patch-5.3.1RC1-0.9.8.patch.gz"
+bf75fe3a9bda8c7a041d86197d6da09a  suhosin-patch-5.3.1-0.9.8.patch.gz"
diff --git a/main/procps/APKBUILD b/main/procps/APKBUILD
new file mode 100644
index 00000000..83204ad1
--- /dev/null
+++ b/main/procps/APKBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=procps
+pkgver=3.2.8
+pkgrel=0
+pkgdesc="Utilities for monitoring your system and processes on your system"
+url="http://procps.sourceforge.net/"
+license="GPL LGPL"
+depends=
+# needs fancy install
+makedepends="ncurses-dev coreutils"
+subpackages="$pkgname-dev $pkgname-doc libproc"
+source="http://$pkgname.sourceforge.net/$pkgname-$pkgver.tar.gz"
+
+build() {
+	cd "$srcdir"/$pkgname-$pkgver
+	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
+	make DESTDIR="$pkgdir" ldconfig=true install || return 1
+	install -d "$pkgdir"/usr/include/proc || return 1
+	install -m644 proc/*.h "$pkgdir"/usr/include/proc/ || return 1
+}
+
+libproc() {
+	pkgdesc="Library for monitoring system and processes"
+	install -d "$subpkgdir"/lib
+	mv "$pkgdir"/lib/libproc* "$subpkgdir"/lib/
+	ln -s libproc-$pkgver.so "$subpkgdir"/lib/libproc.so
+}
+
+md5sums="9532714b6846013ca9898984ba4cd7e0  procps-3.2.8.tar.gz"