[arch-commits] Commit in memcached/trunk (2 files)

[Dan McGee]

    Date: Friday, April 24, 2015 @ 16:50:02
  Author: dan
Revision: 237992

upgpkg: memcached 1.4.23-1

Added:
  memcached/trunk/0001-fix-major-off-by-one-issue.patch
Modified:
  memcached/trunk/PKGBUILD

---------------------------------------+
 0001-fix-major-off-by-one-issue.patch |   27 +++++++++++++++++++++++++++
 PKGBUILD                              |    7 +++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

Added: 0001-fix-major-off-by-one-issue.patch
===================================================================
--- 0001-fix-major-off-by-one-issue.patch	                        (rev 0)
+++ 0001-fix-major-off-by-one-issue.patch	2015-04-24 14:50:02 UTC (rev 237992)
@@ -0,0 +1,27 @@
+From 369845f086fd1e31481aca656cb9131a883a86a9 Mon Sep 17 00:00:00 2001
+From: dormando <dormando at rydia.net>
+Date: Fri, 24 Apr 2015 00:03:49 -0700
+Subject: [PATCH] fix major off by one issue
+
+none of my machines could repro a crash, but it's definitely wrong :/ Very
+sad.
+---
+ memcached.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/memcached.h b/memcached.h
+index 689a6f5..99cf0b5 100644
+--- a/memcached.h
++++ b/memcached.h
+@@ -77,7 +77,7 @@
+ 
+ /* Slab sizing definitions. */
+ #define POWER_SMALLEST 1
+-#define POWER_LARGEST  255
++#define POWER_LARGEST  256 /* actual cap is 255 */
+ #define CHUNK_ALIGN_BYTES 8
+ /* slab class max is a 6-bit number, -1. */
+ #define MAX_NUMBER_OF_SLAB_CLASSES (63 + 1)
+-- 
+2.3.6
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-24 08:40:16 UTC (rev 237991)
+++ PKGBUILD	2015-04-24 14:50:02 UTC (rev 237992)
@@ -3,7 +3,7 @@
 # Contributor: Michael Irwin <6d6469 at gmail.com>
 
 pkgname=memcached
-pkgver=1.4.22
+pkgver=1.4.23
 pkgrel=1
 pkgdesc="A distributed memory object caching system"
 arch=(i686 x86_64)
@@ -13,12 +13,15 @@
 optdepends=('perl: for memcached-tool usage')
 install=memcached.install
 source=(http://www.memcached.org/files/$pkgname-$pkgver.tar.gz
+        0001-fix-major-off-by-one-issue.patch
         memcached.service)
-sha256sums=('cfcc470c57079914aca6e565b2daeed1d13356ad492909d9aafd6eefac538c2a'
+sha256sums=('2c70e691fced8db874a98bfb954015e0520151bde5a7db9a926447320ce7a777'
+            '6ac80a1e529c98c0c62b237cc82774346d95b975a29d35895ebf8f8e50fccbc4'
             'e768a48192aefa2e2f443c86b3c085043005ffc313da40f3074c060a18c8359d')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 < ../0001-fix-major-off-by-one-issue.patch
   ./configure --prefix=/usr
   make
 }