diff options
| -rw-r--r-- | main/redis/APKBUILD | 2 | ||||
| -rw-r--r-- | main/redis/makefile-dont-duplicate-binary.patch | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/main/redis/APKBUILD b/main/redis/APKBUILD index 082e85a96e..5f9f755d33 100644 --- a/main/redis/APKBUILD +++ b/main/redis/APKBUILD @@ -14,6 +14,7 @@ checkdepends="tcl procps" install="$pkgname.pre-install" subpackages="$pkgname-openrc" source="http://download.redis.io/releases/$pkgname-$pkgver.tar.gz + makefile-dont-duplicate-binary.patch redis.conf.patch sentinel.conf.patch $pkgname.initd @@ -71,6 +72,7 @@ package() { } sha512sums="a6cf63cb361f0a87da3955ba628190dc04cad342f7a664d18e44416ee67dd86ed6e3a46b9701e994f1417e56b819b3c6fc595f363c10bb4b83d5033919d29598 redis-4.0.9.tar.gz +5fd8a478771642b9c0dc285f1d95896f7680b94c7edab0ce60ad19ba0c2979028c7d9b0afb846dbf3e1be146ec5ded52ebb059a5b25b0a8e52bf8e57f18c0cf4 makefile-dont-duplicate-binary.patch c8a35e3c30be99fef8678acb2502f424bcca478dcc1ef1750f8c8c8e9e9c462f97586159f32ebba84b6a4eb398a9d568e3200241fb0de1f96293c9fdaafb06c9 redis.conf.patch d9bbb3fcc69022633d7fea3227c41d8777422ce9778623efb6aa539468fc51d2d1de09d364e21c7c8b45c61e7bbc7aaaf22745257d60ea937f77a8673facf286 sentinel.conf.patch a56fdf8ac3f649ae1fa74005158be7d758a670ea02224519bc0000e7ce78e0c0f65a6166ced028f558461d03eba377fa37437d5e610b5ec3ed005d9e62eae25b redis.initd diff --git a/main/redis/makefile-dont-duplicate-binary.patch b/main/redis/makefile-dont-duplicate-binary.patch new file mode 100644 index 0000000000..881e0a582c --- /dev/null +++ b/main/redis/makefile-dont-duplicate-binary.patch @@ -0,0 +1,15 @@ +redis-check-rdb and redis-check-aof binaries are identical to redis-server. + +See https://github.com/antirez/redis/pull/3494 + +--- a/src/Makefile ++++ b/src/Makefile +@@ -287,6 +287,6 @@ + $(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(INSTALL_BIN) + $(REDIS_INSTALL) $(REDIS_BENCHMARK_NAME) $(INSTALL_BIN) + $(REDIS_INSTALL) $(REDIS_CLI_NAME) $(INSTALL_BIN) +- $(REDIS_INSTALL) $(REDIS_CHECK_RDB_NAME) $(INSTALL_BIN) +- $(REDIS_INSTALL) $(REDIS_CHECK_AOF_NAME) $(INSTALL_BIN) + @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_SENTINEL_NAME) ++ @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_RDB_NAME) ++ @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_AOF_NAME) |