diff options
| author | taca <taca@pkgsrc.org> | 2011-06-20 15:09:51 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2011-06-20 15:09:51 +0000 |
| commit | 27b0268c486df474961b196e9f925599df15b8e9 (patch) | |
| tree | 7b10d7a99916a5753b8451408a82ab64189a3e8c /www/php-apc | |
| parent | 4ac0700d064d75541958a92eb27442b0ca59d95b (diff) | |
| download | pkgsrc-27b0268c486df474961b196e9f925599df15b8e9.tar.gz | |
Apply two fix from repository.
- Fix pollution of the slots table with unoccupied slots (r311376)
- Fix fcntl lock error from repository (r311339). It was reported
by PR pkg/45082 from Peter Avalos.
Bump PKGREVISION.
Diffstat (limited to 'www/php-apc')
| -rw-r--r-- | www/php-apc/Makefile | 7 | ||||
| -rw-r--r-- | www/php-apc/distinfo | 4 | ||||
| -rw-r--r-- | www/php-apc/patches/patch-apc__cache.c | 18 | ||||
| -rw-r--r-- | www/php-apc/patches/patch-apc__lock.h | 15 |
4 files changed, 41 insertions, 3 deletions
diff --git a/www/php-apc/Makefile b/www/php-apc/Makefile index 7015650726e..b181630eaaf 100644 --- a/www/php-apc/Makefile +++ b/www/php-apc/Makefile @@ -1,11 +1,14 @@ -# $NetBSD: Makefile,v 1.13 2011/05/16 13:10:56 taca Exp $ +# $NetBSD: Makefile,v 1.14 2011/06/20 15:09:51 taca Exp $ MODNAME= apc PECL_VERSION= 3.1.9 +PKGREVISION= 1 CATEGORIES+= sysutils + +MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Alternative PHP Cache +LICENSE= php-license -MAINTAINER= pkgsrc-users@NetBSD.org CONFLICTS= php-apc-[0-9]* diff --git a/www/php-apc/distinfo b/www/php-apc/distinfo index cb5e3bf0d37..f1699dd2d78 100644 --- a/www/php-apc/distinfo +++ b/www/php-apc/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.9 2011/05/16 13:10:56 taca Exp $ +$NetBSD: distinfo,v 1.10 2011/06/20 15:09:51 taca Exp $ SHA1 (php-apc/apc-3.1.9.tgz) = 417b95e63496de7f785b4917166098c6ac996008 RMD160 (php-apc/apc-3.1.9.tgz) = 67288c957a0234a82912f06e51c6f60f4ed4c66c Size (php-apc/apc-3.1.9.tgz) = 155540 bytes +SHA1 (patch-apc__cache.c) = e2f99914ee85ceb0192a1fb18c2382b3f7bd11f7 +SHA1 (patch-apc__lock.h) = 46a28dc40254b32251b559ada3a1133600db2f55 diff --git a/www/php-apc/patches/patch-apc__cache.c b/www/php-apc/patches/patch-apc__cache.c new file mode 100644 index 00000000000..7b7073f4cb8 --- /dev/null +++ b/www/php-apc/patches/patch-apc__cache.c @@ -0,0 +1,18 @@ +$NetBSD: patch-apc__cache.c,v 1.1 2011/06/20 15:09:52 taca Exp $ + +- Fix pollution of the slots table with unoccupied slots from + repository r311376. + +--- apc_cache.c.orig 2011-05-14 22:14:56.000000000 +0000 ++++ apc_cache.c +@@ -1290,7 +1290,9 @@ zval* apc_cache_info(apc_cache_t* cache, + add_next_index_zval(list, link); + j++; + } +- add_next_index_long(slots, j); ++ if(j != 0) { ++ add_next_index_long(slots, j); ++ } + } + + /* For each slot pending deletion */ diff --git a/www/php-apc/patches/patch-apc__lock.h b/www/php-apc/patches/patch-apc__lock.h new file mode 100644 index 00000000000..d8dd9711a19 --- /dev/null +++ b/www/php-apc/patches/patch-apc__lock.h @@ -0,0 +1,15 @@ +$NetBSD: patch-apc__lock.h,v 1.1 2011/06/20 15:09:52 taca Exp $ + +- Fix fcntl lock error from repository r311339. + +--- apc_lock.h.orig 2011-05-14 22:14:56.000000000 +0000 ++++ apc_lock.h +@@ -154,7 +154,7 @@ + # define apc_lck_nb_lock(a) apc_fcntl_nonblocking_lock(a TSRMLS_CC) + # define apc_lck_rdlock(a) apc_fcntl_rdlock(a TSRMLS_CC) + # define apc_lck_unlock(a) apc_fcntl_unlock(a TSRMLS_CC) +-# define apc_lck_rdunlock(a) apc_fcntl_unlock(&a TSRMLS_CC) ++# define apc_lck_rdunlock(a) apc_fcntl_unlock(a TSRMLS_CC) + #endif + + #endif |