diff options
Diffstat (limited to 'dev-ruby/redis')
-rw-r--r-- | dev-ruby/redis/Manifest | 1 | ||||
-rw-r--r-- | dev-ruby/redis/files/redis-3.2.1-local-redis-server.patch | 68 |
2 files changed, 0 insertions, 69 deletions
diff --git a/dev-ruby/redis/Manifest b/dev-ruby/redis/Manifest index c10d9882e6f6..572a4f5fb26e 100644 --- a/dev-ruby/redis/Manifest +++ b/dev-ruby/redis/Manifest @@ -1,4 +1,3 @@ -AUX redis-3.2.1-local-redis-server.patch 1710 BLAKE2B 8ade0ba31d4d4466e6f874e2303bfb661d4773346f8bc2ac2144ecb8466da4173289d57d9c71f9e90daf4b560724aaf4a854f623c9f09f098f45498c16f08c6e SHA512 e10f59dfb7249874b0e882b888904901fa780ad1687b5000dc73851fe53e5bd2319c4418847ecca4e22efac404a4a283e108755a03f0615d76e0f23583602576 AUX redis-4.0.1-local-redis-server.patch 1273 BLAKE2B 108c8baef8beea68327c3b9bce8e56d133ff6357068407db08e93b70305726cd061585ec62ae28f8450ccb29b950eb20495c890234c738890aa0228591e97d79 SHA512 0eef2e7535ce06c4f0a86fe3118d12b95ea36f968fdc015fd68faa410041911eb62ace26155fb628751a3e3d264a1fad41890095cbadeb230630c64009b273a0 AUX redis-4.1.4-local-redis-server.patch 1454 BLAKE2B cfbb707109cac75fb38a614c41b3cd0cb9b9f70bc9e62a2fcdcf9208e7b1b0c3709101d788d1158b0cc3c4e47f9817a82e88ea2165b85304474f47cd1d1cdac6 SHA512 903d186c9a834208f89b06c4ea2ae2d8e8559e0d8d5d0e71a0c7ab8ffd212463e34b1da551b5ad1267a3283eb4c735fb85a94b696d403399368d3d97a2b50abb DIST redis-rb-4.0.1.tar.gz 87859 BLAKE2B c53f9a4ae96195eeab9f8fd0eae1ec8bcfeee7b717faf5b85c127ff90a88fbf9a0cfcef9d4c002ef7ee07f12a8e813bfd3e4d284a616d8637029d51a6c067f34 SHA512 c377512e0103a1aadb4aef3e64983fd4b20a26d67320ff0c500b7617c8b3bd5b4ba2240488a7d55be1301bb0b926398835f5c242ae97afe9141b3499da358eb9 diff --git a/dev-ruby/redis/files/redis-3.2.1-local-redis-server.patch b/dev-ruby/redis/files/redis-3.2.1-local-redis-server.patch deleted file mode 100644 index 3c6b351db485..000000000000 --- a/dev-ruby/redis/files/redis-3.2.1-local-redis-server.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- a/Rakefile 2015-08-11 22:16:04.474139810 +0100 -+++ b/Rakefile 2015-08-11 22:19:01.024398679 +0100 -@@ -1,14 +1,11 @@ - require "rake/testtask" - --ENV["REDIS_BRANCH"] ||= "unstable" -- - REDIS_DIR = File.expand_path(File.join("..", "test"), __FILE__) - REDIS_CNF = File.join(REDIS_DIR, "test.conf") - REDIS_CNF_TEMPLATE = File.join(REDIS_DIR, "test.conf.erb") - REDIS_PID = File.join(REDIS_DIR, "db", "redis.pid") - REDIS_LOG = File.join(REDIS_DIR, "db", "redis.log") - REDIS_SOCKET = File.join(REDIS_DIR, "db", "redis.sock") --BINARY = "tmp/redis-#{ENV["REDIS_BRANCH"]}/src/redis-server" - - task :default => :run - -@@ -16,9 +13,7 @@ - task :run => [:start, :test, :stop] - - desc "Start the Redis server" --task :start => [BINARY, REDIS_CNF] do -- sh "#{BINARY} --version" -- -+task :start => [REDIS_CNF] do - redis_running = \ - begin - File.exists?(REDIS_PID) && Process.kill(0, File.read(REDIS_PID).to_i) -@@ -27,10 +22,14 @@ - false - end - -- unless redis_running -- unless system("#{BINARY} #{REDIS_CNF}") -- abort "could not start redis-server" -- end -+ unless system("which redis-server") -+ STDERR.puts "redis-server not in PATH" -+ exit 1 -+ end -+ -+ unless system("redis-server #{REDIS_CNF}") -+ STDERR.puts "could not start redis-server" -+ exit 1 - end - - at_exit do -@@ -52,20 +51,6 @@ - FileUtils.rm_f(REDIS_CNF) - end - --file BINARY do -- branch = ENV.fetch("REDIS_BRANCH") -- -- sh <<-SH -- mkdir -p tmp; -- cd tmp; -- rm -rf redis-#{branch}; -- wget https://github.com/antirez/redis/archive/#{branch}.tar.gz -O #{branch}.tar.gz; -- tar xf #{branch}.tar.gz; -- cd redis-#{branch}; -- make -- SH --end -- - file REDIS_CNF => [REDIS_CNF_TEMPLATE, __FILE__] do |t| - require 'erb' - |