[arch-commits] Commit in redis/repos (28 files)

Sergej Pupykin spupykin at archlinux.org
Tue Dec 23 22:24:12 UTC 2014


    Date: Tuesday, December 23, 2014 @ 23:24:12
  Author: spupykin
Revision: 124472

archrelease: copy trunk to community-i686, community-x86_64

Added:
  redis/repos/community-i686/PKGBUILD
    (from rev 124471, redis/trunk/PKGBUILD)
  redis/repos/community-i686/redis-2.8.11-use-system-jemalloc.patch
    (from rev 124471, redis/trunk/redis-2.8.11-use-system-jemalloc.patch)
  redis/repos/community-i686/redis.conf-sane-defaults.patch
    (from rev 124471, redis/trunk/redis.conf-sane-defaults.patch)
  redis/repos/community-i686/redis.install
    (from rev 124471, redis/trunk/redis.install)
  redis/repos/community-i686/redis.logrotate
    (from rev 124471, redis/trunk/redis.logrotate)
  redis/repos/community-i686/redis.service
    (from rev 124471, redis/trunk/redis.service)
  redis/repos/community-i686/redis.tmpfiles.d
    (from rev 124471, redis/trunk/redis.tmpfiles.d)
  redis/repos/community-x86_64/PKGBUILD
    (from rev 124471, redis/trunk/PKGBUILD)
  redis/repos/community-x86_64/redis-2.8.11-use-system-jemalloc.patch
    (from rev 124471, redis/trunk/redis-2.8.11-use-system-jemalloc.patch)
  redis/repos/community-x86_64/redis.conf-sane-defaults.patch
    (from rev 124471, redis/trunk/redis.conf-sane-defaults.patch)
  redis/repos/community-x86_64/redis.install
    (from rev 124471, redis/trunk/redis.install)
  redis/repos/community-x86_64/redis.logrotate
    (from rev 124471, redis/trunk/redis.logrotate)
  redis/repos/community-x86_64/redis.service
    (from rev 124471, redis/trunk/redis.service)
  redis/repos/community-x86_64/redis.tmpfiles.d
    (from rev 124471, redis/trunk/redis.tmpfiles.d)
Deleted:
  redis/repos/community-i686/PKGBUILD
  redis/repos/community-i686/redis-2.8.11-use-system-jemalloc.patch
  redis/repos/community-i686/redis.conf-sane-defaults.patch
  redis/repos/community-i686/redis.install
  redis/repos/community-i686/redis.logrotate
  redis/repos/community-i686/redis.service
  redis/repos/community-i686/redis.tmpfiles.d
  redis/repos/community-x86_64/PKGBUILD
  redis/repos/community-x86_64/redis-2.8.11-use-system-jemalloc.patch
  redis/repos/community-x86_64/redis.conf-sane-defaults.patch
  redis/repos/community-x86_64/redis.install
  redis/repos/community-x86_64/redis.logrotate
  redis/repos/community-x86_64/redis.service
  redis/repos/community-x86_64/redis.tmpfiles.d

---------------------------------------------------------+
 /PKGBUILD                                               |  102 ++++++++++++++
 /redis-2.8.11-use-system-jemalloc.patch                 |   30 ++++
 /redis.conf-sane-defaults.patch                         |   62 ++++++++
 /redis.install                                          |   16 ++
 /redis.logrotate                                        |   10 +
 /redis.service                                          |   22 +++
 /redis.tmpfiles.d                                       |    2 
 community-i686/PKGBUILD                                 |   51 -------
 community-i686/redis-2.8.11-use-system-jemalloc.patch   |   15 --
 community-i686/redis.conf-sane-defaults.patch           |   31 ----
 community-i686/redis.install                            |    8 -
 community-i686/redis.logrotate                          |    5 
 community-i686/redis.service                            |   11 -
 community-i686/redis.tmpfiles.d                         |    1 
 community-x86_64/PKGBUILD                               |   51 -------
 community-x86_64/redis-2.8.11-use-system-jemalloc.patch |   15 --
 community-x86_64/redis.conf-sane-defaults.patch         |   31 ----
 community-x86_64/redis.install                          |    8 -
 community-x86_64/redis.logrotate                        |    5 
 community-x86_64/redis.service                          |   11 -
 community-x86_64/redis.tmpfiles.d                       |    1 
 21 files changed, 244 insertions(+), 244 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-12-23 22:23:47 UTC (rev 124471)
+++ community-i686/PKGBUILD	2014-12-23 22:24:12 UTC (rev 124472)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer:  Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Jan-Erik Rediger <badboy at archlinux dot us>
-# Contributor: nofxx <x@<nick>.com>
-
-pkgname=redis
-pkgver=2.8.18
-pkgrel=1
-pkgdesc='Advanced key-value store'
-arch=('i686' 'x86_64')
-url='http://redis.io/'
-license=('BSD')
-depends=('jemalloc' 'grep' 'shadow')
-backup=('etc/redis.conf'
-        'etc/logrotate.d/redis')
-install=redis.install
-source=(http://download.redis.io/releases/redis-$pkgver.tar.gz
-        redis.service
-        redis.logrotate redis.tmpfiles.d
-        redis.conf-sane-defaults.patch
-        redis-2.8.11-use-system-jemalloc.patch)
-md5sums=('1ba2df52c6761edb010b8976c84aebd6'
-         'aec12c881dc2693754f85539ae8e0bc7'
-         '9e2d75b7a9dc421122d673fe520ef17f'
-         'dd9ab8022b4d963b2e5899170dfff490'
-         'b1beae6954b780da261b4056fd7f918a'
-         '2ae176578f538e37a67a463258302bc6')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../redis.conf-sane-defaults.patch
-  patch -p1 -i ../redis-2.8.11-use-system-jemalloc.patch
-}
-
-build() {
-  make -C $pkgname-$pkgver
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make PREFIX="$pkgdir"/usr install
-
-  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/redis/LICENSE
-  install -Dm644 redis.conf "$pkgdir"/etc/redis.conf
-  install -Dm644 ../redis.service "$pkgdir"/usr/lib/systemd/system/redis.service
-
-  # files kept for compatibility with installations made before 2.8.13-2
-  install -Dm644 ../redis.logrotate "$pkgdir"/etc/logrotate.d/redis
-  install -Dm644 ../redis.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/redis.conf
-}

Copied: redis/repos/community-i686/PKGBUILD (from rev 124471, redis/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-12-23 22:24:12 UTC (rev 124472)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer:  Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Jan-Erik Rediger <badboy at archlinux dot us>
+# Contributor: nofxx <x@<nick>.com>
+
+pkgname=redis
+pkgver=2.8.19
+pkgrel=1
+pkgdesc='Advanced key-value store'
+arch=('i686' 'x86_64')
+url='http://redis.io/'
+license=('BSD')
+depends=('jemalloc' 'grep' 'shadow')
+backup=('etc/redis.conf'
+        'etc/logrotate.d/redis')
+install=redis.install
+source=(http://download.redis.io/releases/redis-$pkgver.tar.gz
+        redis.service
+        redis.logrotate redis.tmpfiles.d
+        redis.conf-sane-defaults.patch
+        redis-2.8.11-use-system-jemalloc.patch)
+md5sums=('3794107224043465603f48941f5c86a7'
+         'aec12c881dc2693754f85539ae8e0bc7'
+         '9e2d75b7a9dc421122d673fe520ef17f'
+         'dd9ab8022b4d963b2e5899170dfff490'
+         'b1beae6954b780da261b4056fd7f918a'
+         '2ae176578f538e37a67a463258302bc6')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../redis.conf-sane-defaults.patch
+  patch -p1 -i ../redis-2.8.11-use-system-jemalloc.patch
+}
+
+build() {
+  make -C $pkgname-$pkgver
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make PREFIX="$pkgdir"/usr install
+
+  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/redis/LICENSE
+  install -Dm644 redis.conf "$pkgdir"/etc/redis.conf
+  install -Dm644 ../redis.service "$pkgdir"/usr/lib/systemd/system/redis.service
+
+  # files kept for compatibility with installations made before 2.8.13-2
+  install -Dm644 ../redis.logrotate "$pkgdir"/etc/logrotate.d/redis
+  install -Dm644 ../redis.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/redis.conf
+}

Deleted: community-i686/redis-2.8.11-use-system-jemalloc.patch
===================================================================
--- community-i686/redis-2.8.11-use-system-jemalloc.patch	2014-12-23 22:23:47 UTC (rev 124471)
+++ community-i686/redis-2.8.11-use-system-jemalloc.patch	2014-12-23 22:24:12 UTC (rev 124472)
@@ -1,15 +0,0 @@
-Index: redis-2.8.11/src/Makefile
-===================================================================
---- redis-2.8.11.orig/src/Makefile
-+++ redis-2.8.11/src/Makefile
-@@ -84,8 +84,8 @@ endif
- 
- ifeq ($(MALLOC),jemalloc)
- 	DEPENDENCY_TARGETS+= jemalloc
--	FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
--	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl
-+	FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include/jemalloc
-+	FINAL_LIBS+= -ljemalloc -ldl
- endif
- 
- REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)

Copied: redis/repos/community-i686/redis-2.8.11-use-system-jemalloc.patch (from rev 124471, redis/trunk/redis-2.8.11-use-system-jemalloc.patch)
===================================================================
--- community-i686/redis-2.8.11-use-system-jemalloc.patch	                        (rev 0)
+++ community-i686/redis-2.8.11-use-system-jemalloc.patch	2014-12-23 22:24:12 UTC (rev 124472)
@@ -0,0 +1,15 @@
+Index: redis-2.8.11/src/Makefile
+===================================================================
+--- redis-2.8.11.orig/src/Makefile
++++ redis-2.8.11/src/Makefile
+@@ -84,8 +84,8 @@ endif
+ 
+ ifeq ($(MALLOC),jemalloc)
+ 	DEPENDENCY_TARGETS+= jemalloc
+-	FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
+-	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl
++	FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include/jemalloc
++	FINAL_LIBS+= -ljemalloc -ldl
+ endif
+ 
+ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)

Deleted: community-i686/redis.conf-sane-defaults.patch
===================================================================
--- community-i686/redis.conf-sane-defaults.patch	2014-12-23 22:23:47 UTC (rev 124471)
+++ community-i686/redis.conf-sane-defaults.patch	2014-12-23 22:24:12 UTC (rev 124472)
@@ -1,31 +0,0 @@
-diff --git a/redis.conf b/redis.conf
-index 6efb6ac..344e021 100644
---- a/redis.conf
-+++ b/redis.conf
-@@ -61,7 +61,7 @@ tcp-backlog 511
- # Examples:
- #
- # bind 192.168.1.100 10.0.0.1
--# bind 127.0.0.1
-+bind 127.0.0.1
- 
- # Specify the path for the Unix socket that will be used to listen for
- # incoming connections. There is no default, so Redis will not listen
-@@ -87,7 +87,7 @@ timeout 0
- # On other kernels the period depends on the kernel configuration.
- #
- # A reasonable value for this option is 60 seconds.
--tcp-keepalive 0
-+tcp-keepalive 60
- 
- # Specify the server verbosity level.
- # This can be one of:
-@@ -184,7 +184,7 @@ dbfilename dump.rdb
- # The Append Only File will also be created inside this directory.
- # 
- # Note that you must specify a directory here, not a file name.
--dir ./
-+dir /var/lib/redis/
- 
- ################################# REPLICATION #################################
- 

Copied: redis/repos/community-i686/redis.conf-sane-defaults.patch (from rev 124471, redis/trunk/redis.conf-sane-defaults.patch)
===================================================================
--- community-i686/redis.conf-sane-defaults.patch	                        (rev 0)
+++ community-i686/redis.conf-sane-defaults.patch	2014-12-23 22:24:12 UTC (rev 124472)
@@ -0,0 +1,31 @@
+diff --git a/redis.conf b/redis.conf
+index 6efb6ac..344e021 100644
+--- a/redis.conf
++++ b/redis.conf
+@@ -61,7 +61,7 @@ tcp-backlog 511
+ # Examples:
+ #
+ # bind 192.168.1.100 10.0.0.1
+-# bind 127.0.0.1
++bind 127.0.0.1
+ 
+ # Specify the path for the Unix socket that will be used to listen for
+ # incoming connections. There is no default, so Redis will not listen
+@@ -87,7 +87,7 @@ timeout 0
+ # On other kernels the period depends on the kernel configuration.
+ #
+ # A reasonable value for this option is 60 seconds.
+-tcp-keepalive 0
++tcp-keepalive 60
+ 
+ # Specify the server verbosity level.
+ # This can be one of:
+@@ -184,7 +184,7 @@ dbfilename dump.rdb
+ # The Append Only File will also be created inside this directory.
+ # 
+ # Note that you must specify a directory here, not a file name.
+-dir ./
++dir /var/lib/redis/
+ 
+ ################################# REPLICATION #################################
+ 

Deleted: community-i686/redis.install
===================================================================
--- community-i686/redis.install	2014-12-23 22:23:47 UTC (rev 124471)
+++ community-i686/redis.install	2014-12-23 22:24:12 UTC (rev 124472)
@@ -1,8 +0,0 @@
-post_install() {
-  getent group redis >/dev/null || groupadd --system redis
-  getent passwd redis >/dev/null || useradd --system -g redis \
-    -d /var/lib/redis -s /bin/false redis
-
-  install -dm700 var/lib/redis
-  chown redis:redis var/lib/redis
-}

Copied: redis/repos/community-i686/redis.install (from rev 124471, redis/trunk/redis.install)
===================================================================
--- community-i686/redis.install	                        (rev 0)
+++ community-i686/redis.install	2014-12-23 22:24:12 UTC (rev 124472)
@@ -0,0 +1,8 @@
+post_install() {
+  getent group redis >/dev/null || groupadd --system redis
+  getent passwd redis >/dev/null || useradd --system -g redis \
+    -d /var/lib/redis -s /bin/false redis
+
+  install -dm700 var/lib/redis
+  chown redis:redis var/lib/redis
+}

Deleted: community-i686/redis.logrotate
===================================================================
--- community-i686/redis.logrotate	2014-12-23 22:23:47 UTC (rev 124471)
+++ community-i686/redis.logrotate	2014-12-23 22:24:12 UTC (rev 124472)
@@ -1,5 +0,0 @@
-/var/log/redis.log {
-   notifempty
-   copytruncate
-   missingok
-}

Copied: redis/repos/community-i686/redis.logrotate (from rev 124471, redis/trunk/redis.logrotate)
===================================================================
--- community-i686/redis.logrotate	                        (rev 0)
+++ community-i686/redis.logrotate	2014-12-23 22:24:12 UTC (rev 124472)
@@ -0,0 +1,5 @@
+/var/log/redis.log {
+   notifempty
+   copytruncate
+   missingok
+}

Deleted: community-i686/redis.service
===================================================================
--- community-i686/redis.service	2014-12-23 22:23:47 UTC (rev 124471)
+++ community-i686/redis.service	2014-12-23 22:24:12 UTC (rev 124472)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Advanced key-value store
-After=network.target
-
-[Service]
-User=redis
-ExecStart=/usr/bin/redis-server /etc/redis.conf
-ExecStop=/usr/bin/redis-cli shutdown
-
-[Install]
-WantedBy=multi-user.target

Copied: redis/repos/community-i686/redis.service (from rev 124471, redis/trunk/redis.service)
===================================================================
--- community-i686/redis.service	                        (rev 0)
+++ community-i686/redis.service	2014-12-23 22:24:12 UTC (rev 124472)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Advanced key-value store
+After=network.target
+
+[Service]
+User=redis
+ExecStart=/usr/bin/redis-server /etc/redis.conf
+ExecStop=/usr/bin/redis-cli shutdown
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-i686/redis.tmpfiles.d
===================================================================
--- community-i686/redis.tmpfiles.d	2014-12-23 22:23:47 UTC (rev 124471)
+++ community-i686/redis.tmpfiles.d	2014-12-23 22:24:12 UTC (rev 124472)
@@ -1 +0,0 @@
-d /run/redis 0755 redis redis -

Copied: redis/repos/community-i686/redis.tmpfiles.d (from rev 124471, redis/trunk/redis.tmpfiles.d)
===================================================================
--- community-i686/redis.tmpfiles.d	                        (rev 0)
+++ community-i686/redis.tmpfiles.d	2014-12-23 22:24:12 UTC (rev 124472)
@@ -0,0 +1 @@
+d /run/redis 0755 redis redis -

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-12-23 22:23:47 UTC (rev 124471)
+++ community-x86_64/PKGBUILD	2014-12-23 22:24:12 UTC (rev 124472)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer:  Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Jan-Erik Rediger <badboy at archlinux dot us>
-# Contributor: nofxx <x@<nick>.com>
-
-pkgname=redis
-pkgver=2.8.18
-pkgrel=1
-pkgdesc='Advanced key-value store'
-arch=('i686' 'x86_64')
-url='http://redis.io/'
-license=('BSD')
-depends=('jemalloc' 'grep' 'shadow')
-backup=('etc/redis.conf'
-        'etc/logrotate.d/redis')
-install=redis.install
-source=(http://download.redis.io/releases/redis-$pkgver.tar.gz
-        redis.service
-        redis.logrotate redis.tmpfiles.d
-        redis.conf-sane-defaults.patch
-        redis-2.8.11-use-system-jemalloc.patch)
-md5sums=('1ba2df52c6761edb010b8976c84aebd6'
-         'aec12c881dc2693754f85539ae8e0bc7'
-         '9e2d75b7a9dc421122d673fe520ef17f'
-         'dd9ab8022b4d963b2e5899170dfff490'
-         'b1beae6954b780da261b4056fd7f918a'
-         '2ae176578f538e37a67a463258302bc6')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../redis.conf-sane-defaults.patch
-  patch -p1 -i ../redis-2.8.11-use-system-jemalloc.patch
-}
-
-build() {
-  make -C $pkgname-$pkgver
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make PREFIX="$pkgdir"/usr install
-
-  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/redis/LICENSE
-  install -Dm644 redis.conf "$pkgdir"/etc/redis.conf
-  install -Dm644 ../redis.service "$pkgdir"/usr/lib/systemd/system/redis.service
-
-  # files kept for compatibility with installations made before 2.8.13-2
-  install -Dm644 ../redis.logrotate "$pkgdir"/etc/logrotate.d/redis
-  install -Dm644 ../redis.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/redis.conf
-}

Copied: redis/repos/community-x86_64/PKGBUILD (from rev 124471, redis/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-12-23 22:24:12 UTC (rev 124472)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer:  Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Jan-Erik Rediger <badboy at archlinux dot us>
+# Contributor: nofxx <x@<nick>.com>
+
+pkgname=redis
+pkgver=2.8.19
+pkgrel=1
+pkgdesc='Advanced key-value store'
+arch=('i686' 'x86_64')
+url='http://redis.io/'
+license=('BSD')
+depends=('jemalloc' 'grep' 'shadow')
+backup=('etc/redis.conf'
+        'etc/logrotate.d/redis')
+install=redis.install
+source=(http://download.redis.io/releases/redis-$pkgver.tar.gz
+        redis.service
+        redis.logrotate redis.tmpfiles.d
+        redis.conf-sane-defaults.patch
+        redis-2.8.11-use-system-jemalloc.patch)
+md5sums=('3794107224043465603f48941f5c86a7'
+         'aec12c881dc2693754f85539ae8e0bc7'
+         '9e2d75b7a9dc421122d673fe520ef17f'
+         'dd9ab8022b4d963b2e5899170dfff490'
+         'b1beae6954b780da261b4056fd7f918a'
+         '2ae176578f538e37a67a463258302bc6')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../redis.conf-sane-defaults.patch
+  patch -p1 -i ../redis-2.8.11-use-system-jemalloc.patch
+}
+
+build() {
+  make -C $pkgname-$pkgver
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make PREFIX="$pkgdir"/usr install
+
+  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/redis/LICENSE
+  install -Dm644 redis.conf "$pkgdir"/etc/redis.conf
+  install -Dm644 ../redis.service "$pkgdir"/usr/lib/systemd/system/redis.service
+
+  # files kept for compatibility with installations made before 2.8.13-2
+  install -Dm644 ../redis.logrotate "$pkgdir"/etc/logrotate.d/redis
+  install -Dm644 ../redis.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/redis.conf
+}

Deleted: community-x86_64/redis-2.8.11-use-system-jemalloc.patch
===================================================================
--- community-x86_64/redis-2.8.11-use-system-jemalloc.patch	2014-12-23 22:23:47 UTC (rev 124471)
+++ community-x86_64/redis-2.8.11-use-system-jemalloc.patch	2014-12-23 22:24:12 UTC (rev 124472)
@@ -1,15 +0,0 @@
-Index: redis-2.8.11/src/Makefile
-===================================================================
---- redis-2.8.11.orig/src/Makefile
-+++ redis-2.8.11/src/Makefile
-@@ -84,8 +84,8 @@ endif
- 
- ifeq ($(MALLOC),jemalloc)
- 	DEPENDENCY_TARGETS+= jemalloc
--	FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
--	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl
-+	FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include/jemalloc
-+	FINAL_LIBS+= -ljemalloc -ldl
- endif
- 
- REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)

Copied: redis/repos/community-x86_64/redis-2.8.11-use-system-jemalloc.patch (from rev 124471, redis/trunk/redis-2.8.11-use-system-jemalloc.patch)
===================================================================
--- community-x86_64/redis-2.8.11-use-system-jemalloc.patch	                        (rev 0)
+++ community-x86_64/redis-2.8.11-use-system-jemalloc.patch	2014-12-23 22:24:12 UTC (rev 124472)
@@ -0,0 +1,15 @@
+Index: redis-2.8.11/src/Makefile
+===================================================================
+--- redis-2.8.11.orig/src/Makefile
++++ redis-2.8.11/src/Makefile
+@@ -84,8 +84,8 @@ endif
+ 
+ ifeq ($(MALLOC),jemalloc)
+ 	DEPENDENCY_TARGETS+= jemalloc
+-	FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
+-	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl
++	FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include/jemalloc
++	FINAL_LIBS+= -ljemalloc -ldl
+ endif
+ 
+ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)

Deleted: community-x86_64/redis.conf-sane-defaults.patch
===================================================================
--- community-x86_64/redis.conf-sane-defaults.patch	2014-12-23 22:23:47 UTC (rev 124471)
+++ community-x86_64/redis.conf-sane-defaults.patch	2014-12-23 22:24:12 UTC (rev 124472)
@@ -1,31 +0,0 @@
-diff --git a/redis.conf b/redis.conf
-index 6efb6ac..344e021 100644
---- a/redis.conf
-+++ b/redis.conf
-@@ -61,7 +61,7 @@ tcp-backlog 511
- # Examples:
- #
- # bind 192.168.1.100 10.0.0.1
--# bind 127.0.0.1
-+bind 127.0.0.1
- 
- # Specify the path for the Unix socket that will be used to listen for
- # incoming connections. There is no default, so Redis will not listen
-@@ -87,7 +87,7 @@ timeout 0
- # On other kernels the period depends on the kernel configuration.
- #
- # A reasonable value for this option is 60 seconds.
--tcp-keepalive 0
-+tcp-keepalive 60
- 
- # Specify the server verbosity level.
- # This can be one of:
-@@ -184,7 +184,7 @@ dbfilename dump.rdb
- # The Append Only File will also be created inside this directory.
- # 
- # Note that you must specify a directory here, not a file name.
--dir ./
-+dir /var/lib/redis/
- 
- ################################# REPLICATION #################################
- 

Copied: redis/repos/community-x86_64/redis.conf-sane-defaults.patch (from rev 124471, redis/trunk/redis.conf-sane-defaults.patch)
===================================================================
--- community-x86_64/redis.conf-sane-defaults.patch	                        (rev 0)
+++ community-x86_64/redis.conf-sane-defaults.patch	2014-12-23 22:24:12 UTC (rev 124472)
@@ -0,0 +1,31 @@
+diff --git a/redis.conf b/redis.conf
+index 6efb6ac..344e021 100644
+--- a/redis.conf
++++ b/redis.conf
+@@ -61,7 +61,7 @@ tcp-backlog 511
+ # Examples:
+ #
+ # bind 192.168.1.100 10.0.0.1
+-# bind 127.0.0.1
++bind 127.0.0.1
+ 
+ # Specify the path for the Unix socket that will be used to listen for
+ # incoming connections. There is no default, so Redis will not listen
+@@ -87,7 +87,7 @@ timeout 0
+ # On other kernels the period depends on the kernel configuration.
+ #
+ # A reasonable value for this option is 60 seconds.
+-tcp-keepalive 0
++tcp-keepalive 60
+ 
+ # Specify the server verbosity level.
+ # This can be one of:
+@@ -184,7 +184,7 @@ dbfilename dump.rdb
+ # The Append Only File will also be created inside this directory.
+ # 
+ # Note that you must specify a directory here, not a file name.
+-dir ./
++dir /var/lib/redis/
+ 
+ ################################# REPLICATION #################################
+ 

Deleted: community-x86_64/redis.install
===================================================================
--- community-x86_64/redis.install	2014-12-23 22:23:47 UTC (rev 124471)
+++ community-x86_64/redis.install	2014-12-23 22:24:12 UTC (rev 124472)
@@ -1,8 +0,0 @@
-post_install() {
-  getent group redis >/dev/null || groupadd --system redis
-  getent passwd redis >/dev/null || useradd --system -g redis \
-    -d /var/lib/redis -s /bin/false redis
-
-  install -dm700 var/lib/redis
-  chown redis:redis var/lib/redis
-}

Copied: redis/repos/community-x86_64/redis.install (from rev 124471, redis/trunk/redis.install)
===================================================================
--- community-x86_64/redis.install	                        (rev 0)
+++ community-x86_64/redis.install	2014-12-23 22:24:12 UTC (rev 124472)
@@ -0,0 +1,8 @@
+post_install() {
+  getent group redis >/dev/null || groupadd --system redis
+  getent passwd redis >/dev/null || useradd --system -g redis \
+    -d /var/lib/redis -s /bin/false redis
+
+  install -dm700 var/lib/redis
+  chown redis:redis var/lib/redis
+}

Deleted: community-x86_64/redis.logrotate
===================================================================
--- community-x86_64/redis.logrotate	2014-12-23 22:23:47 UTC (rev 124471)
+++ community-x86_64/redis.logrotate	2014-12-23 22:24:12 UTC (rev 124472)
@@ -1,5 +0,0 @@
-/var/log/redis.log {
-   notifempty
-   copytruncate
-   missingok
-}

Copied: redis/repos/community-x86_64/redis.logrotate (from rev 124471, redis/trunk/redis.logrotate)
===================================================================
--- community-x86_64/redis.logrotate	                        (rev 0)
+++ community-x86_64/redis.logrotate	2014-12-23 22:24:12 UTC (rev 124472)
@@ -0,0 +1,5 @@
+/var/log/redis.log {
+   notifempty
+   copytruncate
+   missingok
+}

Deleted: community-x86_64/redis.service
===================================================================
--- community-x86_64/redis.service	2014-12-23 22:23:47 UTC (rev 124471)
+++ community-x86_64/redis.service	2014-12-23 22:24:12 UTC (rev 124472)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Advanced key-value store
-After=network.target
-
-[Service]
-User=redis
-ExecStart=/usr/bin/redis-server /etc/redis.conf
-ExecStop=/usr/bin/redis-cli shutdown
-
-[Install]
-WantedBy=multi-user.target

Copied: redis/repos/community-x86_64/redis.service (from rev 124471, redis/trunk/redis.service)
===================================================================
--- community-x86_64/redis.service	                        (rev 0)
+++ community-x86_64/redis.service	2014-12-23 22:24:12 UTC (rev 124472)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Advanced key-value store
+After=network.target
+
+[Service]
+User=redis
+ExecStart=/usr/bin/redis-server /etc/redis.conf
+ExecStop=/usr/bin/redis-cli shutdown
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-x86_64/redis.tmpfiles.d
===================================================================
--- community-x86_64/redis.tmpfiles.d	2014-12-23 22:23:47 UTC (rev 124471)
+++ community-x86_64/redis.tmpfiles.d	2014-12-23 22:24:12 UTC (rev 124472)
@@ -1 +0,0 @@
-d /run/redis 0755 redis redis -

Copied: redis/repos/community-x86_64/redis.tmpfiles.d (from rev 124471, redis/trunk/redis.tmpfiles.d)
===================================================================
--- community-x86_64/redis.tmpfiles.d	                        (rev 0)
+++ community-x86_64/redis.tmpfiles.d	2014-12-23 22:24:12 UTC (rev 124472)
@@ -0,0 +1 @@
+d /run/redis 0755 redis redis -



More information about the arch-commits mailing list