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

6 files changed, 23 insertions, 17 deletions

diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
index f9a5d6e684..17069239f0 100644
--- a/main/busybox-initscripts/APKBUILD
+++ b/main/busybox-initscripts/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox-initscripts
 pkgver=2.0
-pkgrel=7
+pkgrel=8
 pkgdesc="Init scripts for busybox daemons"
 url="http://git.alpinelinux.org/cgit/aports/tree/core/busybox-initscripts"
 license="GPL-2"
@@ -55,7 +55,7 @@ b5b23dd06cea120bd8d850b54bca0b59  syslog.initd
 22adbf155ffc4595206ded6daad07812  rdate.confd
 77fb31a75511247bf4e3430565a276bc  syslog.confd
 0bb55dde32f5e119111fa4938daaef3d  watchdog.confd
-835d931c46e5fcc753e4694aa3591853  mdev.conf
+f68689d52f34a4165699e11dc44901b1  mdev.conf
 ad1556961294e4aa2abca6be52138b7c  dvbdev
 5c8725b4cbdeda23b00f08124a0d20bf  ide_links
 1acfd58dfd1cf324c90ca3a3be519510  usbdev
diff --git a/main/busybox-initscripts/mdev.conf b/main/busybox-initscripts/mdev.conf
index 13affc2bf2..d38db7bb53 100644
--- a/main/busybox-initscripts/mdev.conf
+++ b/main/busybox-initscripts/mdev.conf
@@ -97,4 +97,4 @@ cciss!(.*)	root:disk 0660 =cciss/%1
 ida!(.*)	root:disk 0660 =ida/%1
 rd!(.*)		root:disk 0660 =rd/%1
 
-sr[0-9]		root:cdrom 0660 >cdrom
+sr[0-9]		root:cdrom 0660 @ln -sf $MDEV cdrom 
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index a6fab9a3d4..5e15696680 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openrc
 pkgver=0.5.0
-pkgrel=11
+pkgrel=12
 pkgdesc="OpenRC manages the services, startup and shutdown of a host"
 url="http://roy.marples.name/openrc"
 license='BSD-2'
@@ -13,6 +13,7 @@ source="http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2
 	command-line-size-fix.patch
 	openrc-0.4.3-mkmntdirs.patch
 	openrc-hwclock.patch
+	localmount.patch
 	hostname.initd
 	hwdrivers.initd
 	keymaps.initd
@@ -51,6 +52,7 @@ md5sums="9ec7f8425e12abbbd0f7a962aae3fa3c  openrc-0.5.0.tar.bz2
 396b1cbd399403ba0448402afc6f9220  command-line-size-fix.patch
 8c2c1c2ee0509b63966b7187a2079f4b  openrc-0.4.3-mkmntdirs.patch
 f462c976b04cfbb35b2335be15eee7f6  openrc-hwclock.patch
+fa1809cd59cc0559a163bc6adc7398f6  localmount.patch
 c32e15b0858eef708497e7ee6355a055  hostname.initd
 b1e64885f301166df30be3e3cf5338ff  hwdrivers.initd
 33ca3e558c42cdd17adccbc7807298f7  keymaps.initd
diff --git a/main/openrc/localmount.patch b/main/openrc/localmount.patch
new file mode 100644
index 0000000000..c80d640a21
--- /dev/null
+++ b/main/openrc/localmount.patch
@@ -0,0 +1,12 @@
+diff -ru openrc-0.5.0.orig/init.d/localmount.in openrc-0.5.0/init.d/localmount.in
+--- openrc-0.5.0.orig/init.d/localmount.in	2009-10-09 09:08:43.000000000 +0000
++++ openrc-0.5.0/init.d/localmount.in	2009-10-09 09:09:08.000000000 +0000
+@@ -31,7 +31,7 @@
+ {
+ 	# We never unmount / or /dev or $RC_SVCDIR
+ 	local x= no_umounts_r="/|/dev|/dev/.*|${RC_SVCDIR}"
+-	no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib|/libexec"
++	no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib|/libexec|/.modloop"
+ 	# RC_NO_UMOUNTS is an env var that can be set by plugins
+ 	OIFS=$IFS SIFS=${IFS-y}
+ 	IFS=$IFS:
diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index 905297b654..a43bd2eb3d 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -3,12 +3,12 @@
 pkgname=php
 pkgver=5.2.10
 _suhosinver=${pkgver}-0.9.7
-pkgrel=3
+pkgrel=4
 pkgdesc="The PHP language runtime engine"
 url="http://www.php.net/"
 license="PHP-3"
 depends=
-install="$pkgname.post-upgrade"
+install=
 makedepends="pcre-dev libxml2-dev libiconv-dev openssl-dev zlib-dev bzip2-dev
 	curl-dev libpng-dev jpeg-dev freetype-dev libmcrypt-dev mysql-dev
 	sqlite-dev libtool libltdl postgresql-dev db-dev unixodbc-dev icu-dev
@@ -159,6 +159,9 @@ build() {
 		--with-pic \
 		$phpextensions
 
+	# see #183
+	sed -i -e '/^BUILD_CGI/s/$(LDFLAGS)/-lpthread $(LDFLAGS)/' Makefile
+
         make || return 1
         make -j1 INSTALL_ROOT="$pkgdir" install || return 1
 	# fix the extension_dir
diff --git a/main/php/php.post-upgrade b/main/php/php.post-upgrade
deleted file mode 100644
index 98c959958c..0000000000
--- a/main/php/php.post-upgrade
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-new=$1
-old=$2
-
-if [ "$(apk version -t $old 5.3)" = "<" ]; then
-	echo "*"
-	echo "* Please see migration notes here: http://php.net/migration53"
-	echo "*"
-fi
-