http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56223
Revision: 56223
Author: midom
Date: 2009-09-12 10:01:18 +0000 (Sat, 12 Sep 2009)
Log Message:
-----------
* Upstream 3.1.3p1-beta
* Rework SHM patch a bit, to have proper name, proper contents and no rejects
Modified Paths:
--------------
trunk/debs/php5-apc/debian/changelog
trunk/debs/php5-apc/debian/patches/00list
Added Paths:
-----------
trunk/debs/php5-apc/debian/patches/01-noshm.dpatch
Removed Paths:
-------------
trunk/debs/php5-apc/debian/patches/01-nort-3.0.13.dpatch
Modified: trunk/debs/php5-apc/debian/changelog
===================================================================
--- trunk/debs/php5-apc/debian/changelog 2009-09-12 09:34:14 UTC (rev
56222)
+++ trunk/debs/php5-apc/debian/changelog 2009-09-12 10:01:18 UTC (rev
56223)
@@ -1,3 +1,9 @@
+php5-apc (3.1.3p1-1wm1) hardy; urgency=medium
+ * Rework shm patch a bit
+ * Upstream 3.1.3p1
+
+ -- Domas Mituzas <[email protected]> Sat, 12 Sep 2009 12:55:00 +0200
+
php5-apc (3.0.19-1wm2) hardy; urgency=medium
* Disable pthread mutexes
* Don't strip symbols
Modified: trunk/debs/php5-apc/debian/patches/00list
===================================================================
--- trunk/debs/php5-apc/debian/patches/00list 2009-09-12 09:34:14 UTC (rev
56222)
+++ trunk/debs/php5-apc/debian/patches/00list 2009-09-12 10:01:18 UTC (rev
56223)
@@ -1 +1 @@
-01-nort-3.0.13
+01-noshm
Deleted: trunk/debs/php5-apc/debian/patches/01-nort-3.0.13.dpatch
===================================================================
--- trunk/debs/php5-apc/debian/patches/01-nort-3.0.13.dpatch 2009-09-12
09:34:14 UTC (rev 56222)
+++ trunk/debs/php5-apc/debian/patches/01-nort-3.0.13.dpatch 2009-09-12
10:01:18 UTC (rev 56223)
@@ -1,54 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-nort-3.0.13.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-...@dpatch@
-diff -ru APC-3.0.13/apc_mmap.c APC-3.0.13-nort/apc_mmap.c
---- APC-3.0.13/apc_mmap.c 2007-02-24 22:58:42.000000000 +0000
-+++ APC-3.0.13-nort/apc_mmap.c 2007-03-07 00:40:01.000000000 +0000
-@@ -66,6 +66,7 @@
- * On FreeBSD these are mapped onto the regular filesystem so you can
put whatever
- * path you want here.
- */
-+#ifdef WM_ENABLE_SHM
- if(strstr(file_mask,".shm")) {
- mktemp(file_mask);
- fd = shm_open(file_mask, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR);
-@@ -82,11 +83,12 @@
- shmaddr = (void *)mmap(NULL, size, PROT_READ | PROT_WRITE,
MAP_SHARED, fd, 0);
- shm_unlink(file_mask);
- close(fd);
-- }
-+ } else
-+#endif
- /*
- * Support anonymous mmap through the /dev/zero interface as well
- */
-- else if(!strcmp(file_mask,"/dev/zero")) {
-+ if(!strcmp(file_mask,"/dev/zero")) {
- fd = open("/dev/zero", O_RDWR, S_IRUSR | S_IWUSR);
- if(fd == -1) {
- apc_eprint("apc_mmap: open on /dev/zero failed:");
-diff -ru APC-3.0.13/config.m4 APC-3.0.13-nort/config.m4
---- APC-3.0.13/config.m4 2007-02-24 22:58:42.000000000 +0000
-+++ APC-3.0.13-nort/config.m4 2007-03-07 00:40:25.000000000 +0000
-@@ -195,7 +195,7 @@
- apc_main.c \
- apc_mmap.c \
- apc_sem.c \
-- apc_shm.c \
-+dnl apc_shm.c \
- apc_futex.c \
- apc_pthreadmutex.c \
- apc_spin.c \
-@@ -205,7 +205,7 @@
- apc_zend.c \
- apc_rfc1867.c "
-
-- PHP_CHECK_LIBRARY(rt, shm_open, [PHP_ADD_LIBRARY(rt,,APC_SHARED_LIBADD)])
-+dnl PHP_CHECK_LIBRARY(rt, shm_open, [PHP_ADD_LIBRARY(rt,,APC_SHARED_LIBADD)])
- PHP_NEW_EXTENSION(apc, $apc_sources, $ext_shared,, \\$(APC_CFLAGS))
- PHP_SUBST(APC_SHARED_LIBADD)
- PHP_SUBST(APC_CFLAGS)
Copied: trunk/debs/php5-apc/debian/patches/01-noshm.dpatch (from rev 56222,
trunk/debs/php5-apc/debian/patches/01-nort-3.0.13.dpatch)
===================================================================
--- trunk/debs/php5-apc/debian/patches/01-noshm.dpatch
(rev 0)
+++ trunk/debs/php5-apc/debian/patches/01-noshm.dpatch 2009-09-12 10:01:18 UTC
(rev 56223)
@@ -0,0 +1,63 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01-nort-3.0.13.dpatch by <[email protected]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+...@dpatch@
+diff -urNad APC-3.1.3p1~/apc_mmap.c APC-3.1.3p1/apc_mmap.c
+--- APC-3.1.3p1~/apc_mmap.c 1970-01-01 12:13:08.000000000 +0300
++++ APC-3.1.3p1/apc_mmap.c 2009-09-12 12:54:52.000000000 +0300
+@@ -77,33 +77,6 @@
+ goto error;
+ }
+ remap = 0; /* cannot remap */
+- } else if(strstr(file_mask,".shm")) {
+- /*
+- * If the filemask contains .shm we try to do a POSIX-compliant
shared memory
+- * backed mmap which should avoid synchs on some platforms. At least
on
+- * FreeBSD this implies MAP_NOSYNC and on Linux it is equivalent of
mmap'ing
+- * a file in a mounted shmfs. For this to work on Linux you need to
make sure
+- * you actually have shmfs mounted. Also on Linux, make sure the
file_mask you
+- * pass in has a leading / and no other /'s. eg. /apc.shm.XXXXXX
+- * On FreeBSD these are mapped onto the regular filesystem so you can
put whatever
+- * path you want here.
+- */
+- if(!mktemp(file_mask)) {
+- apc_eprint("apc_mmap: mktemp on %s failed:", file_mask);
+- goto error;
+- }
+- fd = shm_open(file_mask, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR);
+- if(fd == -1) {
+- apc_eprint("apc_mmap: shm_open on %s failed:", file_mask);
+- goto error;
+- }
+- if (ftruncate(fd, size) < 0) {
+- close(fd);
+- shm_unlink(file_mask);
+- apc_eprint("apc_mmap: ftruncate failed:");
+- goto error;
+- }
+- shm_unlink(file_mask);
+ } else {
+ /*
+ * Otherwise we do a normal filesystem mmap
+diff -urNad APC-3.1.3p1~/config.m4 APC-3.1.3p1/config.m4
+--- APC-3.1.3p1~/config.m4 1970-01-01 12:13:08.000000000 +0300
++++ APC-3.1.3p1/config.m4 2009-09-12 12:54:29.000000000 +0300
+@@ -210,7 +210,6 @@
+ apc_main.c \
+ apc_mmap.c \
+ apc_sem.c \
+- apc_shm.c \
+ apc_pthreadmutex.c \
+ apc_spin.c \
+ pgsql_s_lock.c \
+@@ -223,7 +222,6 @@
+ apc_iterator.c \
+ apc_bin.c "
+
+- PHP_CHECK_LIBRARY(rt, shm_open, [PHP_ADD_LIBRARY(rt,,APC_SHARED_LIBADD)])
+ PHP_NEW_EXTENSION(apc, $apc_sources, $ext_shared,, \\$(APC_CFLAGS))
+ PHP_SUBST(APC_SHARED_LIBADD)
+ PHP_SUBST(APC_CFLAGS)
Property changes on: trunk/debs/php5-apc/debian/patches/01-noshm.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mergeinfo
+
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
