do not hardcode uid for sysv semaphores, to fix compilation on platforms

without spinlock semaphore support; fixes PR pkg/34201

4 files changed, 60 insertions, 2 deletions

diff --git a/www/php-eaccelerator/Makefile b/www/php-eaccelerator/Makefile
index 034294a13e8..8be747d6408 100644
--- a/www/php-eaccelerator/Makefile
+++ b/www/php-eaccelerator/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2010/03/16 13:58:07 taca Exp $
+# $NetBSD: Makefile,v 1.12 2010/10/02 19:11:35 jdolecek Exp $
 
 MODNAME=	eaccelerator
 PECL_VERSION=	0.9.6
+PKGREVISION=	1
 CATEGORIES+=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=eaccelerator/} \
 		http://bart.eaccelerator.net/source/${PECL_VERSION}/
diff --git a/www/php-eaccelerator/distinfo b/www/php-eaccelerator/distinfo
index df4f055ece3..759e9878464 100644
--- a/www/php-eaccelerator/distinfo
+++ b/www/php-eaccelerator/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.6 2010/03/16 13:58:07 taca Exp $
+$NetBSD: distinfo,v 1.7 2010/10/02 19:11:35 jdolecek Exp $
 
 SHA1 (php-eaccelerator/eaccelerator-0.9.6.tar.bz2) = 65594917d0efa754d35760d2cde8701ffaa2914a
 RMD160 (php-eaccelerator/eaccelerator-0.9.6.tar.bz2) = 86320cbafa31f4b6db308c55035bbf057325a708
 Size (php-eaccelerator/eaccelerator-0.9.6.tar.bz2) = 105833 bytes
+SHA1 (patch-aa) = e5b5a02444fc9370840781beea9f7bd0400ed090
+SHA1 (patch-ab) = d70524b10a7d99ff61288485cf4030838cdac735
diff --git a/www/php-eaccelerator/patches/patch-aa b/www/php-eaccelerator/patches/patch-aa
new file mode 100644
index 00000000000..88f23273c49
--- /dev/null
+++ b/www/php-eaccelerator/patches/patch-aa
@@ -0,0 +1,42 @@
+$NetBSD: patch-aa,v 1.1 2010/10/02 19:11:35 jdolecek Exp $
+
+--- config.m4.orig	2010-02-28 20:06:38.000000000 +0100
++++ config.m4
+@@ -92,13 +92,6 @@ AC_ARG_WITH(eaccelerator-debug,
+   eaccelerator_debug=no
+ ])
+ 
+-AC_ARG_WITH(eaccelerator-userid,
+-[  --with-eaccelerator-userid               eAccelerator runs under this userid, only needed when using sysvipc semaphores.],[
+-  ea_userid=$withval
+-],[
+-  ea_userid=0
+-])
+-
+ AC_ARG_WITH(eaccelerator-doc-comment-inclusion,
+ [  --with-eaccelerator-doc-comment-inclusion  If you want eAccelerator to retain doc-comments in  internal php structures.],[
+     enable_doc_comment_inclusion=$withval
+@@ -113,8 +106,6 @@ if test "$PHP_EACCELERATOR" != "no"; the
+ 
+   AC_DEFINE(WITH_EACCELERATOR_INFO, 1, [Define to be able to get information about eAccelerator])
+ 
+-  AC_DEFINE_UNQUOTED(EA_USERID, $ea_userid, [The userid eAccelerator will be running under.]) 
+-
+   if test "$enable_doc_comment_inclusion" = "yes"; then
+     AC_DEFINE(INCLUDE_DOC_COMMENTS, 1, [If you want eAccelerator to retain doc-comments in internal php structures (meta-programming)])
+   fi
+@@ -322,12 +313,8 @@ if test "$PHP_EACCELERATOR" != "no"; the
+     AC_DEFINE(MM_SEM_SPINLOCK, 1, [Define if you like to use spinlock based semaphores])
+     msg="spinlock"
+   elif test "$mm_sem_ipc" = "yes"; then
+-    if test $ea_userid = 0; then
+-        AC_MSG_ERROR("You need to pass the user id eaccelerator will be running under when using sysvipc semaphores")
+-    else
+-        AC_DEFINE(MM_SEM_IPC, 1, [Define if you like to use sysvipc based semaphores])
+-        msg="sysvipc"
+-    fi
++    AC_DEFINE(MM_SEM_IPC, 1, [Define if you like to use sysvipc based semaphores])
++    msg="sysvipc"
+   elif test "$mm_sem_fcntl" = "yes"; then
+     AC_DEFINE(MM_SEM_FCNTL, 1, [Define if you like to use fcntl based semaphores])
+     msg="fcntl"
diff --git a/www/php-eaccelerator/patches/patch-ab b/www/php-eaccelerator/patches/patch-ab
new file mode 100644
index 00000000000..0576601b1f5
--- /dev/null
+++ b/www/php-eaccelerator/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2010/10/02 19:11:35 jdolecek Exp $
+
+--- mm.c.orig	2010-02-28 20:08:30.000000000 +0100
++++ mm.c
+@@ -338,7 +338,7 @@ static int mm_init_lock(const char* key,
+     rc = semctl(lock->semid, 0, IPC_STAT, arg);
+   } while (rc < 0 && errno == EINTR);
+ 
+-  buf.sem_perm.uid = EA_USERID;
++  buf.sem_perm.uid = getuid();
+ 
+   do {
+     rc = semctl(lock->semid, 0, IPC_SET, arg);