[arch-commits] Commit in memcached/repos (18 files)
Dan McGee
dan at archlinux.org
Fri Apr 24 14:50:17 UTC 2015
Date: Friday, April 24, 2015 @ 16:50:17
Author: dan
Revision: 237993
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
memcached/repos/extra-i686/0001-fix-major-off-by-one-issue.patch
(from rev 237992, memcached/trunk/0001-fix-major-off-by-one-issue.patch)
memcached/repos/extra-i686/PKGBUILD
(from rev 237992, memcached/trunk/PKGBUILD)
memcached/repos/extra-i686/memcached.conf
(from rev 237992, memcached/trunk/memcached.conf)
memcached/repos/extra-i686/memcached.install
(from rev 237992, memcached/trunk/memcached.install)
memcached/repos/extra-i686/memcached.service
(from rev 237992, memcached/trunk/memcached.service)
memcached/repos/extra-x86_64/0001-fix-major-off-by-one-issue.patch
(from rev 237992, memcached/trunk/0001-fix-major-off-by-one-issue.patch)
memcached/repos/extra-x86_64/PKGBUILD
(from rev 237992, memcached/trunk/PKGBUILD)
memcached/repos/extra-x86_64/memcached.conf
(from rev 237992, memcached/trunk/memcached.conf)
memcached/repos/extra-x86_64/memcached.install
(from rev 237992, memcached/trunk/memcached.install)
memcached/repos/extra-x86_64/memcached.service
(from rev 237992, memcached/trunk/memcached.service)
Deleted:
memcached/repos/extra-i686/PKGBUILD
memcached/repos/extra-i686/memcached.conf
memcached/repos/extra-i686/memcached.install
memcached/repos/extra-i686/memcached.service
memcached/repos/extra-x86_64/PKGBUILD
memcached/repos/extra-x86_64/memcached.conf
memcached/repos/extra-x86_64/memcached.install
memcached/repos/extra-x86_64/memcached.service
----------------------------------------------------+
/PKGBUILD | 78 +++++++++++++++++++
/memcached.conf | 8 +
/memcached.install | 42 ++++++++++
/memcached.service | 24 +++++
extra-i686/0001-fix-major-off-by-one-issue.patch | 27 ++++++
extra-i686/PKGBUILD | 36 --------
extra-i686/memcached.conf | 4
extra-i686/memcached.install | 21 -----
extra-i686/memcached.service | 12 --
extra-x86_64/0001-fix-major-off-by-one-issue.patch | 27 ++++++
extra-x86_64/PKGBUILD | 36 --------
extra-x86_64/memcached.conf | 4
extra-x86_64/memcached.install | 21 -----
extra-x86_64/memcached.service | 12 --
14 files changed, 206 insertions(+), 146 deletions(-)
Copied: memcached/repos/extra-i686/0001-fix-major-off-by-one-issue.patch (from rev 237992, memcached/trunk/0001-fix-major-off-by-one-issue.patch)
===================================================================
--- extra-i686/0001-fix-major-off-by-one-issue.patch (rev 0)
+++ extra-i686/0001-fix-major-off-by-one-issue.patch 2015-04-24 14:50:17 UTC (rev 237993)
@@ -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
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-04-24 14:50:02 UTC (rev 237992)
+++ extra-i686/PKGBUILD 2015-04-24 14:50:17 UTC (rev 237993)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee <dan at archlinux.org>
-# Contributor: Michael Irwin <6d6469 at gmail.com>
-
-pkgname=memcached
-pkgver=1.4.22
-pkgrel=1
-pkgdesc="A distributed memory object caching system"
-arch=(i686 x86_64)
-url="http://memcached.org/"
-license=('GPL')
-depends=('libevent')
-optdepends=('perl: for memcached-tool usage')
-install=memcached.install
-source=(http://www.memcached.org/files/$pkgname-$pkgver.tar.gz
- memcached.service)
-sha256sums=('cfcc470c57079914aca6e565b2daeed1d13356ad492909d9aafd6eefac538c2a'
- 'e768a48192aefa2e2f443c86b3c085043005ffc313da40f3074c060a18c8359d')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr
- make
-}
-
-check() {
- cd "$srcdir/$pkgname-$pkgver"
- make test
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
- install -D -m 755 scripts/memcached-tool "$pkgdir"/usr/bin/memcached-tool
- install -D -m 644 ../memcached.service "$pkgdir"/usr/lib/systemd/system/memcached.service
-}
Copied: memcached/repos/extra-i686/PKGBUILD (from rev 237992, memcached/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-04-24 14:50:17 UTC (rev 237993)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Dan McGee <dan at archlinux.org>
+# Contributor: Michael Irwin <6d6469 at gmail.com>
+
+pkgname=memcached
+pkgver=1.4.23
+pkgrel=1
+pkgdesc="A distributed memory object caching system"
+arch=(i686 x86_64)
+url="http://memcached.org/"
+license=('GPL')
+depends=('libevent')
+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=('2c70e691fced8db874a98bfb954015e0520151bde5a7db9a926447320ce7a777'
+ '6ac80a1e529c98c0c62b237cc82774346d95b975a29d35895ebf8f8e50fccbc4'
+ 'e768a48192aefa2e2f443c86b3c085043005ffc313da40f3074c060a18c8359d')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ patch -Np1 < ../0001-fix-major-off-by-one-issue.patch
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make test
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+ install -D -m 755 scripts/memcached-tool "$pkgdir"/usr/bin/memcached-tool
+ install -D -m 644 ../memcached.service "$pkgdir"/usr/lib/systemd/system/memcached.service
+}
Deleted: extra-i686/memcached.conf
===================================================================
--- extra-i686/memcached.conf 2015-04-24 14:50:02 UTC (rev 237992)
+++ extra-i686/memcached.conf 2015-04-24 14:50:17 UTC (rev 237993)
@@ -1,4 +0,0 @@
-# user to run memcached as; also used for pid file ownership
-MEMCACHED_USER="memcached"
-# see 'memcached -h' for available options
-MEMCACHED_ARGS="-l 127.0.0.1 -t 1"
Copied: memcached/repos/extra-i686/memcached.conf (from rev 237992, memcached/trunk/memcached.conf)
===================================================================
--- extra-i686/memcached.conf (rev 0)
+++ extra-i686/memcached.conf 2015-04-24 14:50:17 UTC (rev 237993)
@@ -0,0 +1,4 @@
+# user to run memcached as; also used for pid file ownership
+MEMCACHED_USER="memcached"
+# see 'memcached -h' for available options
+MEMCACHED_ARGS="-l 127.0.0.1 -t 1"
Deleted: extra-i686/memcached.install
===================================================================
--- extra-i686/memcached.install 2015-04-24 14:50:02 UTC (rev 237992)
+++ extra-i686/memcached.install 2015-04-24 14:50:17 UTC (rev 237993)
@@ -1,21 +0,0 @@
-post_install() {
- if ! getent group memcached >/dev/null; then
- groupadd --system memcached
- fi
- if ! getent passwd memcached >/dev/null; then
- useradd --system -c 'memcached user' -g memcached -d / -s /bin/bash memcached
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- if getent passwd memcached >/dev/null; then
- userdel memcached
- fi
- if getent group memcached >/dev/null; then
- groupdel memcached
- fi
-}
Copied: memcached/repos/extra-i686/memcached.install (from rev 237992, memcached/trunk/memcached.install)
===================================================================
--- extra-i686/memcached.install (rev 0)
+++ extra-i686/memcached.install 2015-04-24 14:50:17 UTC (rev 237993)
@@ -0,0 +1,21 @@
+post_install() {
+ if ! getent group memcached >/dev/null; then
+ groupadd --system memcached
+ fi
+ if ! getent passwd memcached >/dev/null; then
+ useradd --system -c 'memcached user' -g memcached -d / -s /bin/bash memcached
+ fi
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ if getent passwd memcached >/dev/null; then
+ userdel memcached
+ fi
+ if getent group memcached >/dev/null; then
+ groupdel memcached
+ fi
+}
Deleted: extra-i686/memcached.service
===================================================================
--- extra-i686/memcached.service 2015-04-24 14:50:02 UTC (rev 237992)
+++ extra-i686/memcached.service 2015-04-24 14:50:17 UTC (rev 237993)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Memcached Daemon
-After=network.target
-
-[Service]
-User=memcached
-# Remove '-l 127.0.0.1' to listen on all addresses
-ExecStart=/usr/bin/memcached -l 127.0.0.1
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
Copied: memcached/repos/extra-i686/memcached.service (from rev 237992, memcached/trunk/memcached.service)
===================================================================
--- extra-i686/memcached.service (rev 0)
+++ extra-i686/memcached.service 2015-04-24 14:50:17 UTC (rev 237993)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Memcached Daemon
+After=network.target
+
+[Service]
+User=memcached
+# Remove '-l 127.0.0.1' to listen on all addresses
+ExecStart=/usr/bin/memcached -l 127.0.0.1
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
Copied: memcached/repos/extra-x86_64/0001-fix-major-off-by-one-issue.patch (from rev 237992, memcached/trunk/0001-fix-major-off-by-one-issue.patch)
===================================================================
--- extra-x86_64/0001-fix-major-off-by-one-issue.patch (rev 0)
+++ extra-x86_64/0001-fix-major-off-by-one-issue.patch 2015-04-24 14:50:17 UTC (rev 237993)
@@ -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
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-04-24 14:50:02 UTC (rev 237992)
+++ extra-x86_64/PKGBUILD 2015-04-24 14:50:17 UTC (rev 237993)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee <dan at archlinux.org>
-# Contributor: Michael Irwin <6d6469 at gmail.com>
-
-pkgname=memcached
-pkgver=1.4.22
-pkgrel=1
-pkgdesc="A distributed memory object caching system"
-arch=(i686 x86_64)
-url="http://memcached.org/"
-license=('GPL')
-depends=('libevent')
-optdepends=('perl: for memcached-tool usage')
-install=memcached.install
-source=(http://www.memcached.org/files/$pkgname-$pkgver.tar.gz
- memcached.service)
-sha256sums=('cfcc470c57079914aca6e565b2daeed1d13356ad492909d9aafd6eefac538c2a'
- 'e768a48192aefa2e2f443c86b3c085043005ffc313da40f3074c060a18c8359d')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr
- make
-}
-
-check() {
- cd "$srcdir/$pkgname-$pkgver"
- make test
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
- install -D -m 755 scripts/memcached-tool "$pkgdir"/usr/bin/memcached-tool
- install -D -m 644 ../memcached.service "$pkgdir"/usr/lib/systemd/system/memcached.service
-}
Copied: memcached/repos/extra-x86_64/PKGBUILD (from rev 237992, memcached/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-04-24 14:50:17 UTC (rev 237993)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Dan McGee <dan at archlinux.org>
+# Contributor: Michael Irwin <6d6469 at gmail.com>
+
+pkgname=memcached
+pkgver=1.4.23
+pkgrel=1
+pkgdesc="A distributed memory object caching system"
+arch=(i686 x86_64)
+url="http://memcached.org/"
+license=('GPL')
+depends=('libevent')
+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=('2c70e691fced8db874a98bfb954015e0520151bde5a7db9a926447320ce7a777'
+ '6ac80a1e529c98c0c62b237cc82774346d95b975a29d35895ebf8f8e50fccbc4'
+ 'e768a48192aefa2e2f443c86b3c085043005ffc313da40f3074c060a18c8359d')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ patch -Np1 < ../0001-fix-major-off-by-one-issue.patch
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make test
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+ install -D -m 755 scripts/memcached-tool "$pkgdir"/usr/bin/memcached-tool
+ install -D -m 644 ../memcached.service "$pkgdir"/usr/lib/systemd/system/memcached.service
+}
Deleted: extra-x86_64/memcached.conf
===================================================================
--- extra-x86_64/memcached.conf 2015-04-24 14:50:02 UTC (rev 237992)
+++ extra-x86_64/memcached.conf 2015-04-24 14:50:17 UTC (rev 237993)
@@ -1,4 +0,0 @@
-# user to run memcached as; also used for pid file ownership
-MEMCACHED_USER="memcached"
-# see 'memcached -h' for available options
-MEMCACHED_ARGS="-l 127.0.0.1 -t 1"
Copied: memcached/repos/extra-x86_64/memcached.conf (from rev 237992, memcached/trunk/memcached.conf)
===================================================================
--- extra-x86_64/memcached.conf (rev 0)
+++ extra-x86_64/memcached.conf 2015-04-24 14:50:17 UTC (rev 237993)
@@ -0,0 +1,4 @@
+# user to run memcached as; also used for pid file ownership
+MEMCACHED_USER="memcached"
+# see 'memcached -h' for available options
+MEMCACHED_ARGS="-l 127.0.0.1 -t 1"
Deleted: extra-x86_64/memcached.install
===================================================================
--- extra-x86_64/memcached.install 2015-04-24 14:50:02 UTC (rev 237992)
+++ extra-x86_64/memcached.install 2015-04-24 14:50:17 UTC (rev 237993)
@@ -1,21 +0,0 @@
-post_install() {
- if ! getent group memcached >/dev/null; then
- groupadd --system memcached
- fi
- if ! getent passwd memcached >/dev/null; then
- useradd --system -c 'memcached user' -g memcached -d / -s /bin/bash memcached
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- if getent passwd memcached >/dev/null; then
- userdel memcached
- fi
- if getent group memcached >/dev/null; then
- groupdel memcached
- fi
-}
Copied: memcached/repos/extra-x86_64/memcached.install (from rev 237992, memcached/trunk/memcached.install)
===================================================================
--- extra-x86_64/memcached.install (rev 0)
+++ extra-x86_64/memcached.install 2015-04-24 14:50:17 UTC (rev 237993)
@@ -0,0 +1,21 @@
+post_install() {
+ if ! getent group memcached >/dev/null; then
+ groupadd --system memcached
+ fi
+ if ! getent passwd memcached >/dev/null; then
+ useradd --system -c 'memcached user' -g memcached -d / -s /bin/bash memcached
+ fi
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ if getent passwd memcached >/dev/null; then
+ userdel memcached
+ fi
+ if getent group memcached >/dev/null; then
+ groupdel memcached
+ fi
+}
Deleted: extra-x86_64/memcached.service
===================================================================
--- extra-x86_64/memcached.service 2015-04-24 14:50:02 UTC (rev 237992)
+++ extra-x86_64/memcached.service 2015-04-24 14:50:17 UTC (rev 237993)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Memcached Daemon
-After=network.target
-
-[Service]
-User=memcached
-# Remove '-l 127.0.0.1' to listen on all addresses
-ExecStart=/usr/bin/memcached -l 127.0.0.1
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
Copied: memcached/repos/extra-x86_64/memcached.service (from rev 237992, memcached/trunk/memcached.service)
===================================================================
--- extra-x86_64/memcached.service (rev 0)
+++ extra-x86_64/memcached.service 2015-04-24 14:50:17 UTC (rev 237993)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Memcached Daemon
+After=network.target
+
+[Service]
+User=memcached
+# Remove '-l 127.0.0.1' to listen on all addresses
+ExecStart=/usr/bin/memcached -l 127.0.0.1
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list