* [gentoo-commits] repo/gentoo:master commit in: dev-ruby/redis/files/
@ 2017-08-11 5:40 Hans de Graaff
0 siblings, 0 replies; 4+ messages in thread
From: Hans de Graaff @ 2017-08-11 5:40 UTC (permalink / raw
To: gentoo-commits
commit: a2ba31950c992b2cd09e55f5d65c853ef495fd2d
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 05:37:53 2017 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 05:37:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2ba3195
dev-ruby/redis: remove unused files
Package-Manager: Portage-2.3.6, Repoman-2.3.2
.../files/redis-3.0.6-local-redis-server.patch | 69 ----------------------
1 file changed, 69 deletions(-)
diff --git a/dev-ruby/redis/files/redis-3.0.6-local-redis-server.patch b/dev-ruby/redis/files/redis-3.0.6-local-redis-server.patch
deleted file mode 100644
index 243cb6cbe6d..00000000000
--- a/dev-ruby/redis/files/redis-3.0.6-local-redis-server.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- a/Rakefile 1970-01-01 01:00:00.000000000 +0100
-+++ b/Rakefile 2014-01-04 00:19:25.206135726 +0000
-@@ -2,15 +2,12 @@
- require 'rubygems/package_task'
- require 'rake/testtask'
-
--ENV["REDIS_BRANCH"] ||= "unstable"
--
- $:.unshift File.join(File.dirname(__FILE__), 'lib')
- require 'redis/version'
-
- REDIS_DIR = File.expand_path(File.join("..", "test"), __FILE__)
- REDIS_CNF = File.join(REDIS_DIR, "test.conf")
- REDIS_PID = File.join(REDIS_DIR, "db", "redis.pid")
--BINARY = "tmp/redis-#{ENV["REDIS_BRANCH"]}/src/redis-server"
-
- task :default => :run
-
-@@ -18,9 +15,7 @@
- task :run => [:start, :test, :stop]
-
- desc "Start the Redis server"
--task :start => BINARY do
-- sh "#{BINARY} --version"
--
-+task :start do
- redis_running = \
- begin
- File.exists?(REDIS_PID) && Process.kill(0, File.read(REDIS_PID).to_i)
-@@ -30,8 +25,14 @@
- end
-
- unless redis_running
-- unless system("#{BINARY} #{REDIS_CNF}")
-- abort "could not start redis-server"
-+ 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
- end
- end
-@@ -44,21 +45,9 @@
- end
- end
-
--file BINARY do
-- branch = ENV.fetch("REDIS_BRANCH")
--
-- sh <<-SH
-- mkdir -p tmp;
-- cd tmp;
-- 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
--
- Rake::TestTask.new do |t|
- t.options = "-v"
-+ t.libs << "test"
- t.test_files = FileList["test/*_test.rb"]
- end
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ruby/redis/files/
@ 2020-09-16 6:20 Hans de Graaff
0 siblings, 0 replies; 4+ messages in thread
From: Hans de Graaff @ 2020-09-16 6:20 UTC (permalink / raw
To: gentoo-commits
commit: 44fb1eb978c92d1855bcd1086fcea5b733be1486
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Sep 15 18:10:30 2020 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 06:20:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44fb1eb9
dev-ruby/redis: remove unused patch
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
.../files/redis-3.2.1-local-redis-server.patch | 68 ----------------------
1 file changed, 68 deletions(-)
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 3c6b351db48..00000000000
--- 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'
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ruby/redis/files/
@ 2021-03-20 16:11 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2021-03-20 16:11 UTC (permalink / raw
To: gentoo-commits
commit: f56b1b79a0f9435c244a5d44d0ec7f797d5a28f5
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Mar 16 18:06:45 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Mar 20 16:11:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f56b1b79
dev-ruby/redis: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/19961
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/redis-4.0.1-local-redis-server.patch | 40 ----------------------
1 file changed, 40 deletions(-)
diff --git a/dev-ruby/redis/files/redis-4.0.1-local-redis-server.patch b/dev-ruby/redis/files/redis-4.0.1-local-redis-server.patch
deleted file mode 100644
index 3bd1b03f494..00000000000
--- a/dev-ruby/redis/files/redis-4.0.1-local-redis-server.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/makefile.~1~ 2017-09-28 18:11:35.000000000 +0200
-+++ b/makefile 2018-04-10 20:45:58.307407705 +0200
-@@ -3,7 +3,7 @@
--TMP := tmp
-+TMP := ${T}
- BUILD_DIR := ${TMP}/redis-${REDIS_BRANCH}
- TARBALL := ${TMP}/redis-${REDIS_BRANCH}.tar.gz
--BINARY := ${BUILD_DIR}/src/redis-server
-+BINARY := /usr/sbin/redis-server
--PID_PATH := ${BUILD_DIR}/redis.pid
-+PID_PATH := ${TMP}/redis.pid
--SOCKET_PATH := ${BUILD_DIR}/redis.sock
-+SOCKET_PATH := ${TMP}/redis.sock
- PORT := 6381
-@@ -11,7 +11,7 @@
- test: ${TEST_FILES}
- make start
- env SOCKET_PATH=${SOCKET_PATH} \
-- ruby -v $$(echo $? | tr ' ' '\n' | awk '{ print "-r./" $$0 }') -e ''
-+ ${RUBY} -v $$(echo $? | tr ' ' '\n' | awk '{ print "-r./" $$0 }') -e ''
- make stop
-
- ${TMP}:
-@@ -20,11 +20,11 @@
- ${TARBALL}: ${TMP}
- wget https://github.com/antirez/redis/archive/${REDIS_BRANCH}.tar.gz -O $@
-
--${BINARY}: ${TARBALL} ${TMP}
-- rm -rf ${BUILD_DIR}
-- mkdir -p ${BUILD_DIR}
-- tar xf ${TARBALL} -C ${TMP}
-- cd ${BUILD_DIR} && make
-+# ${BINARY}: ${TARBALL} ${TMP}
-+# rm -rf ${BUILD_DIR}
-+# mkdir -p ${BUILD_DIR}
-+# tar xf ${TARBALL} -C ${TMP}
-+# cd ${BUILD_DIR} && make
-
- stop:
- (test -f ${PID_PATH} && (kill $$(cat ${PID_PATH}) || true) && rm -f ${PID_PATH}) || true
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ruby/redis/files/
@ 2023-09-09 5:43 Hans de Graaff
0 siblings, 0 replies; 4+ messages in thread
From: Hans de Graaff @ 2023-09-09 5:43 UTC (permalink / raw
To: gentoo-commits
commit: 1c75dc2403e6e84e58f83a2d033e3f6b28797084
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Sep 5 09:19:55 2023 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sat Sep 9 05:43:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c75dc24
dev-ruby/redis: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
.../files/redis-4.7.1-local-redis-server.patch | 42 ----------------------
1 file changed, 42 deletions(-)
diff --git a/dev-ruby/redis/files/redis-4.7.1-local-redis-server.patch b/dev-ruby/redis/files/redis-4.7.1-local-redis-server.patch
deleted file mode 100644
index e220d62e35db..000000000000
--- a/dev-ruby/redis/files/redis-4.7.1-local-redis-server.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/makefile b/makefile
-index c803066..d50ee93 100644
---- a/makefile
-+++ b/makefile
-@@ -1,16 +1,15 @@
- REDIS_BRANCH ?= 6.2
--TMP := tmp
- BUILD_DIR := ${TMP}/cache/redis-${REDIS_BRANCH}
- TARBALL := ${TMP}/redis-${REDIS_BRANCH}.tar.gz
--BINARY := ${BUILD_DIR}/src/redis-server
--REDIS_CLIENT := ${BUILD_DIR}/src/redis-cli
-+BINARY := /usr/sbin/redis-server
-+REDIS_CLIENT := /usr/bin/redis-cli
- REDIS_TRIB := ${BUILD_DIR}/src/redis-trib.rb
--PID_PATH := ${BUILD_DIR}/redis.pid
--SOCKET_PATH := ${BUILD_DIR}/redis.sock
-+PID_PATH := ${TMP}/redis.pid
-+SOCKET_PATH := ${TMP}/redis.sock
- PORT := 6381
- SLAVE_PORT := 6382
--SLAVE_PID_PATH := ${BUILD_DIR}/redis_slave.pid
--SLAVE_SOCKET_PATH := ${BUILD_DIR}/redis_slave.sock
-+SLAVE_PID_PATH := ${TMP}/redis_slave.pid
-+SLAVE_SOCKET_PATH := ${TMP}/redis_slave.sock
- HA_GROUP_NAME := master1
- SENTINEL_PORTS := 6400 6401 6402
- SENTINEL_PID_PATHS := $(addprefix ${TMP}/redis,$(addsuffix .pid,${SENTINEL_PORTS}))
-@@ -32,11 +31,11 @@ stop_all: stop_sentinel stop_slave stop stop_cluster
- ${TMP}:
- @mkdir -p $@
-
--${BINARY}: ${TMP}
-- @bin/build ${REDIS_BRANCH} $<
-+#${BINARY}: ${TMP}
-+# @bin/build ${REDIS_BRANCH} $<
-
- test:
-- @env SOCKET_PATH=${SOCKET_PATH} bundle exec rake test
-+ @env SOCKET_PATH=${SOCKET_PATH} ${RUBY} -S rake test
-
- stop:
- @$(call kill-redis,${PID_PATH})
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-09-09 5:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-20 16:11 [gentoo-commits] repo/gentoo:master commit in: dev-ruby/redis/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2023-09-09 5:43 Hans de Graaff
2020-09-16 6:20 Hans de Graaff
2017-08-11 5:40 Hans de Graaff
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox