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

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Sat Aug 29 13:03:35 UTC 2015


    Date: Saturday, August 29, 2015 @ 15:03:35
  Author: bpiotrowski
Revision: 138921

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

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

-----------------------------------------------------------------+
 community-staging-i686/PKGBUILD                                 |   51 ++++++++++
 community-staging-i686/redis-2.8.11-use-system-jemalloc.patch   |   15 ++
 community-staging-i686/redis.conf-sane-defaults.patch           |   31 ++++++
 community-staging-i686/redis.install                            |    8 +
 community-staging-i686/redis.logrotate                          |    5 
 community-staging-i686/redis.service                            |   22 ++++
 community-staging-x86_64/PKGBUILD                               |   51 ++++++++++
 community-staging-x86_64/redis-2.8.11-use-system-jemalloc.patch |   15 ++
 community-staging-x86_64/redis.conf-sane-defaults.patch         |   31 ++++++
 community-staging-x86_64/redis.install                          |    8 +
 community-staging-x86_64/redis.logrotate                        |    5 
 community-staging-x86_64/redis.service                          |   22 ++++
 12 files changed, 264 insertions(+)

Copied: redis/repos/community-staging-i686/PKGBUILD (from rev 138920, redis/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2015-08-29 13:03:35 UTC (rev 138921)
@@ -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=3.0.3
+pkgrel=2
+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.conf-sane-defaults.patch
+        redis-2.8.11-use-system-jemalloc.patch)
+md5sums=('76725490d6168cfb4b0ce014b89d4b54'
+         'afa0f4a9000c26c3323e83fe34883e23'
+         '9e2d75b7a9dc421122d673fe520ef17f'
+         '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
+
+  ln -sf redis-server $pkgdir/usr/bin/redis-sentinel
+}

Copied: redis/repos/community-staging-i686/redis-2.8.11-use-system-jemalloc.patch (from rev 138920, redis/trunk/redis-2.8.11-use-system-jemalloc.patch)
===================================================================
--- community-staging-i686/redis-2.8.11-use-system-jemalloc.patch	                        (rev 0)
+++ community-staging-i686/redis-2.8.11-use-system-jemalloc.patch	2015-08-29 13:03:35 UTC (rev 138921)
@@ -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)

Copied: redis/repos/community-staging-i686/redis.conf-sane-defaults.patch (from rev 138920, redis/trunk/redis.conf-sane-defaults.patch)
===================================================================
--- community-staging-i686/redis.conf-sane-defaults.patch	                        (rev 0)
+++ community-staging-i686/redis.conf-sane-defaults.patch	2015-08-29 13:03:35 UTC (rev 138921)
@@ -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 #################################
+ 

Copied: redis/repos/community-staging-i686/redis.install (from rev 138920, redis/trunk/redis.install)
===================================================================
--- community-staging-i686/redis.install	                        (rev 0)
+++ community-staging-i686/redis.install	2015-08-29 13:03:35 UTC (rev 138921)
@@ -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
+}

Copied: redis/repos/community-staging-i686/redis.logrotate (from rev 138920, redis/trunk/redis.logrotate)
===================================================================
--- community-staging-i686/redis.logrotate	                        (rev 0)
+++ community-staging-i686/redis.logrotate	2015-08-29 13:03:35 UTC (rev 138921)
@@ -0,0 +1,5 @@
+/var/log/redis.log {
+   notifempty
+   copytruncate
+   missingok
+}

Copied: redis/repos/community-staging-i686/redis.service (from rev 138920, redis/trunk/redis.service)
===================================================================
--- community-staging-i686/redis.service	                        (rev 0)
+++ community-staging-i686/redis.service	2015-08-29 13:03:35 UTC (rev 138921)
@@ -0,0 +1,22 @@
+[Unit]
+Description=Advanced key-value store
+After=network.target
+
+[Service]
+Type=simple
+User=redis
+Group=redis
+ExecStart=/usr/bin/redis-server /etc/redis.conf
+ExecStop=/usr/bin/redis-cli shutdown
+CapabilityBoundingSet=
+PrivateTmp=true
+PrivateDevices=true
+ProtectSystem=full
+ProtectHome=true
+NoNewPrivileges=true
+RuntimeDirectory=redis
+RuntimeDirectoryMode=755
+LimitNOFILE=10032
+
+[Install]
+WantedBy=multi-user.target

Copied: redis/repos/community-staging-x86_64/PKGBUILD (from rev 138920, redis/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2015-08-29 13:03:35 UTC (rev 138921)
@@ -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=3.0.3
+pkgrel=2
+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.conf-sane-defaults.patch
+        redis-2.8.11-use-system-jemalloc.patch)
+md5sums=('76725490d6168cfb4b0ce014b89d4b54'
+         'afa0f4a9000c26c3323e83fe34883e23'
+         '9e2d75b7a9dc421122d673fe520ef17f'
+         '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
+
+  ln -sf redis-server $pkgdir/usr/bin/redis-sentinel
+}

Copied: redis/repos/community-staging-x86_64/redis-2.8.11-use-system-jemalloc.patch (from rev 138920, redis/trunk/redis-2.8.11-use-system-jemalloc.patch)
===================================================================
--- community-staging-x86_64/redis-2.8.11-use-system-jemalloc.patch	                        (rev 0)
+++ community-staging-x86_64/redis-2.8.11-use-system-jemalloc.patch	2015-08-29 13:03:35 UTC (rev 138921)
@@ -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)

Copied: redis/repos/community-staging-x86_64/redis.conf-sane-defaults.patch (from rev 138920, redis/trunk/redis.conf-sane-defaults.patch)
===================================================================
--- community-staging-x86_64/redis.conf-sane-defaults.patch	                        (rev 0)
+++ community-staging-x86_64/redis.conf-sane-defaults.patch	2015-08-29 13:03:35 UTC (rev 138921)
@@ -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 #################################
+ 

Copied: redis/repos/community-staging-x86_64/redis.install (from rev 138920, redis/trunk/redis.install)
===================================================================
--- community-staging-x86_64/redis.install	                        (rev 0)
+++ community-staging-x86_64/redis.install	2015-08-29 13:03:35 UTC (rev 138921)
@@ -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
+}

Copied: redis/repos/community-staging-x86_64/redis.logrotate (from rev 138920, redis/trunk/redis.logrotate)
===================================================================
--- community-staging-x86_64/redis.logrotate	                        (rev 0)
+++ community-staging-x86_64/redis.logrotate	2015-08-29 13:03:35 UTC (rev 138921)
@@ -0,0 +1,5 @@
+/var/log/redis.log {
+   notifempty
+   copytruncate
+   missingok
+}

Copied: redis/repos/community-staging-x86_64/redis.service (from rev 138920, redis/trunk/redis.service)
===================================================================
--- community-staging-x86_64/redis.service	                        (rev 0)
+++ community-staging-x86_64/redis.service	2015-08-29 13:03:35 UTC (rev 138921)
@@ -0,0 +1,22 @@
+[Unit]
+Description=Advanced key-value store
+After=network.target
+
+[Service]
+Type=simple
+User=redis
+Group=redis
+ExecStart=/usr/bin/redis-server /etc/redis.conf
+ExecStop=/usr/bin/redis-cli shutdown
+CapabilityBoundingSet=
+PrivateTmp=true
+PrivateDevices=true
+ProtectSystem=full
+ProtectHome=true
+NoNewPrivileges=true
+RuntimeDirectory=redis
+RuntimeDirectoryMode=755
+LimitNOFILE=10032
+
+[Install]
+WantedBy=multi-user.target



More information about the arch-commits mailing list