Fixing patch for #299901, thanks to Johan Bergstroem

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

1 files changed, 104 insertions, 104 deletions

diff --git a/net-misc/tokyotyrant/files/fix_testsuite.patch b/net-misc/tokyotyrant/files/fix_testsuite.patch
index 5587f6c08768..d48825381777 100644
--- a/net-misc/tokyotyrant/files/fix_testsuite.patch
+++ b/net-misc/tokyotyrant/files/fix_testsuite.patch
@@ -1,104 +1,104 @@
---- Makefile.in	2009-10-14 10:33:16.000000000 +0200

-+++ Makefile.in.new	2009-10-14 10:27:39.000000000 +0200

-@@ -166,48 +166,49 @@

- 

- 

- check :

-+	$(RUNENV) $(RUNCMD) ./ttserver -dmn -host 127.0.0.1 -port 19781 -pid /tmp/tttest.pid /tmp/tttest.tch

- 	$(RUNENV) $(RUNCMD) ./tcrmgr version

--	$(RUNENV) $(RUNCMD) ./tcrtest write -cnum 5 -tout 5 -rnd 127.0.0.1 50000

--	$(RUNENV) $(RUNCMD) ./tcrtest write -cnum 5 -tout 5 -nr -rnd 127.0.0.1 50000

--	$(RUNENV) $(RUNCMD) ./tcrtest write -cnum 5 -tout 5 127.0.0.1 50000

--	$(RUNENV) $(RUNCMD) ./tcrtest read -cnum 5 -tout 5 127.0.0.1

--	$(RUNENV) $(RUNCMD) ./tcrtest read -cnum 5 -tout 5 -mul 5 127.0.0.1

--	$(RUNENV) $(RUNCMD) ./tcrtest remove -cnum 5 -tout 5 127.0.0.1

--	$(RUNENV) $(RUNCMD) ./tcrtest rcat -cnum 5 -tout 5 127.0.0.1 50000

--	$(RUNENV) $(RUNCMD) ./tcrtest rcat -cnum 5 -tout 5 -shl 50 127.0.0.1 50000

--	$(RUNENV) $(RUNCMD) ./tcrmgr vanish 127.0.0.1

--	$(RUNENV) $(RUNCMD) ./tcrtest rcat -cnum 5 -tout 5 -dad 127.0.0.1 50000

--	$(RUNENV) $(RUNCMD) ./tcrtest rcat -cnum 5 -tout 5 -ext putcat -xlr 127.0.0.1 50000

--	$(RUNENV) $(RUNCMD) ./tcrtest misc -cnum 5 -tout 5 127.0.0.1 5000

--	$(RUNENV) $(RUNCMD) ./tcrtest wicked -cnum 5 -tout 5 127.0.0.1 5000

--	$(RUNENV) $(RUNCMD) ./tcrmgr inform 127.0.0.1

--	$(RUNENV) $(RUNCMD) ./tcrmgr vanish 127.0.0.1

--	$(RUNENV) $(RUNCMD) ./tcrmttest write -tnum 5 127.0.0.1 5000

--	$(RUNENV) $(RUNCMD) ./tcrmttest read -tnum 5 127.0.0.1

--	$(RUNENV) $(RUNCMD) ./tcrmttest remove -tnum 5 127.0.0.1

--	$(RUNENV) $(RUNCMD) ./tcrmttest write -tnum 5 -ext putcat -rnd 127.0.0.1 5000

--	$(RUNENV) $(RUNCMD) ./tcrmttest typical -tnum 5 127.0.0.1 5000

--	$(RUNENV) $(RUNCMD) ./tcrmgr vanish 127.0.0.1

--	$(RUNENV) $(RUNCMD) ./tcrmgr put 127.0.0.1 one first

--	$(RUNENV) $(RUNCMD) ./tcrmgr put 127.0.0.1 two second

--	$(RUNENV) $(RUNCMD) ./tcrmgr put -dk 127.0.0.1 three third

--	$(RUNENV) $(RUNCMD) ./tcrmgr put -dc 127.0.0.1 three third

--	$(RUNENV) $(RUNCMD) ./tcrmgr put -dc 127.0.0.1 three third

--	$(RUNENV) $(RUNCMD) ./tcrmgr put -dc 127.0.0.1 three third

--	$(RUNENV) $(RUNCMD) ./tcrmgr put 127.0.0.1 four fourth

--	$(RUNENV) $(RUNCMD) ./tcrmgr put -dk 127.0.0.1 five fifth

--	$(RUNENV) $(RUNCMD) ./tcrmgr out 127.0.0.1 one

--	$(RUNENV) $(RUNCMD) ./tcrmgr out 127.0.0.1 two

--	$(RUNENV) $(RUNCMD) ./tcrmgr get 127.0.0.1 three > check.out

--	$(RUNENV) $(RUNCMD) ./tcrmgr get 127.0.0.1 four > check.out

--	$(RUNENV) $(RUNCMD) ./tcrmgr get 127.0.0.1 five > check.out

--	$(RUNENV) $(RUNCMD) ./tcrmgr mget 127.0.0.1 one two three four five > check.out

--	$(RUNENV) $(RUNCMD) ./tcrmgr misc 127.0.0.1 putlist six sixth seven seventh

--	$(RUNENV) $(RUNCMD) ./tcrmgr misc 127.0.0.1 outlist six

--	$(RUNENV) $(RUNCMD) ./tcrmgr misc 127.0.0.1 getlist three four five six > check.out

--	$(RUNENV) $(RUNCMD) ./tcrmgr list -pv 127.0.0.1 > check.out

--	$(RUNENV) $(RUNCMD) ./tcrmgr list -pv -fm f 127.0.0.1 > check.out

--	$(RUNENV) $(RUNCMD) ./tcrmgr http -ih http://127.0.0.1:1978/five > check.out

-+	$(RUNENV) $(RUNCMD) ./tcrtest write -port 19781 -cnum 5 -tout 5 -rnd 127.0.0.1 50000

-+	$(RUNENV) $(RUNCMD) ./tcrtest write -port 19781 -cnum 5 -tout 5 -nr -rnd 127.0.0.1 50000

-+	$(RUNENV) $(RUNCMD) ./tcrtest write -port 19781 -cnum 5 -tout 5 127.0.0.1 50000

-+	$(RUNENV) $(RUNCMD) ./tcrtest read -port 19781 -cnum 5 -tout 5 127.0.0.1

-+	$(RUNENV) $(RUNCMD) ./tcrtest read -port 19781 -cnum 5 -tout 5 -mul 5 127.0.0.1

-+	$(RUNENV) $(RUNCMD) ./tcrtest remove -port 19781 -cnum 5 -tout 5 127.0.0.1

-+	$(RUNENV) $(RUNCMD) ./tcrtest rcat -port 19781 -cnum 5 -tout 5 127.0.0.1 50000

-+	$(RUNENV) $(RUNCMD) ./tcrtest rcat -port 19781 -cnum 5 -tout 5 -shl 50 127.0.0.1 50000

-+	$(RUNENV) $(RUNCMD) ./tcrmgr vanish -port 19781 127.0.0.1

-+	$(RUNENV) $(RUNCMD) ./tcrtest rcat -port 19781 -cnum 5 -tout 5 -dad 127.0.0.1 50000

-+	$(RUNENV) $(RUNCMD) ./tcrtest rcat -port 19781 -cnum 5 -tout 5 -ext putcat -xlr 127.0.0.1 50000

-+	$(RUNENV) $(RUNCMD) ./tcrtest misc -port 19781 -cnum 5 -tout 5 127.0.0.1 5000

-+	$(RUNENV) $(RUNCMD) ./tcrtest wicked -port 19781 -cnum 5 -tout 5 127.0.0.1 5000

-+	$(RUNENV) $(RUNCMD) ./tcrmgr inform -port 19781 127.0.0.1

-+	$(RUNENV) $(RUNCMD) ./tcrmgr vanish -port 19781 127.0.0.1

-+	$(RUNENV) $(RUNCMD) ./tcrmttest write -port 19781 -tnum 5 127.0.0.1 5000

-+	$(RUNENV) $(RUNCMD) ./tcrmttest read -port 19781 -tnum 5 127.0.0.1

-+	$(RUNENV) $(RUNCMD) ./tcrmttest remove -port 19781 -tnum 5 127.0.0.1

-+	$(RUNENV) $(RUNCMD) ./tcrmttest write -port 19781 -tnum 5 -ext putcat -rnd 127.0.0.1 5000

-+	$(RUNENV) $(RUNCMD) ./tcrmttest typical -port 19781 -tnum 5 127.0.0.1 5000

-+	$(RUNENV) $(RUNCMD) ./tcrmgr vanish -port 19781 127.0.0.1

-+	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 127.0.0.1 one first

-+	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 127.0.0.1 two second

-+	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dk 127.0.0.1 three third

-+	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dc 127.0.0.1 three third

-+	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dc 127.0.0.1 three third

-+	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dc 127.0.0.1 three third

-+	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 127.0.0.1 four fourth

-+	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dk 127.0.0.1 five fifth

-+	$(RUNENV) $(RUNCMD) ./tcrmgr out -port 19781 127.0.0.1 one

-+	$(RUNENV) $(RUNCMD) ./tcrmgr out -port 19781 127.0.0.1 two

-+	$(RUNENV) $(RUNCMD) ./tcrmgr get -port 19781 127.0.0.1 three > check.out

-+	$(RUNENV) $(RUNCMD) ./tcrmgr get -port 19781 127.0.0.1 four > check.out

-+	$(RUNENV) $(RUNCMD) ./tcrmgr get -port 19781 127.0.0.1 five > check.out

-+	$(RUNENV) $(RUNCMD) ./tcrmgr mget -port 19781 127.0.0.1 one two three four five > check.out

-+	$(RUNENV) $(RUNCMD) ./tcrmgr misc -port 19781 127.0.0.1 putlist six sixth seven seventh

-+	$(RUNENV) $(RUNCMD) ./tcrmgr misc -port 19781 127.0.0.1 outlist six

-+	$(RUNENV) $(RUNCMD) ./tcrmgr misc -port 19781 127.0.0.1 getlist three four five six > check.out

-+	$(RUNENV) $(RUNCMD) ./tcrmgr list -port 19781 -pv 127.0.0.1 > check.out

-+	$(RUNENV) $(RUNCMD) ./tcrmgr list -port 19781 -pv -fm f 127.0.0.1 > check.out

-+	$(RUNENV) $(RUNCMD) ./tcrmgr http -ih http://127.0.0.1:19781/five > check.out

- 	rm -rf ulog ; mkdir -p ulog

- 	$(RUNENV) $(RUNCMD) ./ttultest write -lim 10000 ulog 5000

- 	$(RUNENV) $(RUNCMD) ./ttultest write -lim 10000 -as ulog 5000

-@@ -215,6 +216,10 @@

- 	rm -rf ulog ; mkdir -p ulog

- 	$(RUNENV) $(RUNCMD) ./ttultest thread -lim 10000 ulog 5 5000

- 	$(RUNENV) $(RUNCMD) ./ttultest thread -lim 10000 -as ulog 5 5000

-+

-+	kill `cat /tmp/tttest.pid`

-+	rm /tmp/tttest.tch

-+

- 	@printf '\n'

- 	@printf '#================================================================\n'

- 	@printf '# Checking completed.\n'
\ No newline at end of file
+--- Makefile.in	2009-10-14 10:33:16.000000000 +0200
++++ Makefile.in.new	2009-10-14 10:27:39.000000000 +0200
+@@ -166,48 +166,49 @@
+ 
+ 
+ check :
++	$(RUNENV) $(RUNCMD) ./ttserver -dmn -host 127.0.0.1 -port 19781 -pid /tmp/tttest.pid /tmp/tttest.tch
+ 	$(RUNENV) $(RUNCMD) ./tcrmgr version
+-	$(RUNENV) $(RUNCMD) ./tcrtest write -cnum 5 -tout 5 -rnd 127.0.0.1 50000
+-	$(RUNENV) $(RUNCMD) ./tcrtest write -cnum 5 -tout 5 -nr -rnd 127.0.0.1 50000
+-	$(RUNENV) $(RUNCMD) ./tcrtest write -cnum 5 -tout 5 127.0.0.1 50000
+-	$(RUNENV) $(RUNCMD) ./tcrtest read -cnum 5 -tout 5 127.0.0.1
+-	$(RUNENV) $(RUNCMD) ./tcrtest read -cnum 5 -tout 5 -mul 5 127.0.0.1
+-	$(RUNENV) $(RUNCMD) ./tcrtest remove -cnum 5 -tout 5 127.0.0.1
+-	$(RUNENV) $(RUNCMD) ./tcrtest rcat -cnum 5 -tout 5 127.0.0.1 50000
+-	$(RUNENV) $(RUNCMD) ./tcrtest rcat -cnum 5 -tout 5 -shl 50 127.0.0.1 50000
+-	$(RUNENV) $(RUNCMD) ./tcrmgr vanish 127.0.0.1
+-	$(RUNENV) $(RUNCMD) ./tcrtest rcat -cnum 5 -tout 5 -dad 127.0.0.1 50000
+-	$(RUNENV) $(RUNCMD) ./tcrtest rcat -cnum 5 -tout 5 -ext putcat -xlr 127.0.0.1 50000
+-	$(RUNENV) $(RUNCMD) ./tcrtest misc -cnum 5 -tout 5 127.0.0.1 5000
+-	$(RUNENV) $(RUNCMD) ./tcrtest wicked -cnum 5 -tout 5 127.0.0.1 5000
+-	$(RUNENV) $(RUNCMD) ./tcrmgr inform 127.0.0.1
+-	$(RUNENV) $(RUNCMD) ./tcrmgr vanish 127.0.0.1
+-	$(RUNENV) $(RUNCMD) ./tcrmttest write -tnum 5 127.0.0.1 5000
+-	$(RUNENV) $(RUNCMD) ./tcrmttest read -tnum 5 127.0.0.1
+-	$(RUNENV) $(RUNCMD) ./tcrmttest remove -tnum 5 127.0.0.1
+-	$(RUNENV) $(RUNCMD) ./tcrmttest write -tnum 5 -ext putcat -rnd 127.0.0.1 5000
+-	$(RUNENV) $(RUNCMD) ./tcrmttest typical -tnum 5 127.0.0.1 5000
+-	$(RUNENV) $(RUNCMD) ./tcrmgr vanish 127.0.0.1
+-	$(RUNENV) $(RUNCMD) ./tcrmgr put 127.0.0.1 one first
+-	$(RUNENV) $(RUNCMD) ./tcrmgr put 127.0.0.1 two second
+-	$(RUNENV) $(RUNCMD) ./tcrmgr put -dk 127.0.0.1 three third
+-	$(RUNENV) $(RUNCMD) ./tcrmgr put -dc 127.0.0.1 three third
+-	$(RUNENV) $(RUNCMD) ./tcrmgr put -dc 127.0.0.1 three third
+-	$(RUNENV) $(RUNCMD) ./tcrmgr put -dc 127.0.0.1 three third
+-	$(RUNENV) $(RUNCMD) ./tcrmgr put 127.0.0.1 four fourth
+-	$(RUNENV) $(RUNCMD) ./tcrmgr put -dk 127.0.0.1 five fifth
+-	$(RUNENV) $(RUNCMD) ./tcrmgr out 127.0.0.1 one
+-	$(RUNENV) $(RUNCMD) ./tcrmgr out 127.0.0.1 two
+-	$(RUNENV) $(RUNCMD) ./tcrmgr get 127.0.0.1 three > check.out
+-	$(RUNENV) $(RUNCMD) ./tcrmgr get 127.0.0.1 four > check.out
+-	$(RUNENV) $(RUNCMD) ./tcrmgr get 127.0.0.1 five > check.out
+-	$(RUNENV) $(RUNCMD) ./tcrmgr mget 127.0.0.1 one two three four five > check.out
+-	$(RUNENV) $(RUNCMD) ./tcrmgr misc 127.0.0.1 putlist six sixth seven seventh
+-	$(RUNENV) $(RUNCMD) ./tcrmgr misc 127.0.0.1 outlist six
+-	$(RUNENV) $(RUNCMD) ./tcrmgr misc 127.0.0.1 getlist three four five six > check.out
+-	$(RUNENV) $(RUNCMD) ./tcrmgr list -pv 127.0.0.1 > check.out
+-	$(RUNENV) $(RUNCMD) ./tcrmgr list -pv -fm f 127.0.0.1 > check.out
+-	$(RUNENV) $(RUNCMD) ./tcrmgr http -ih http://127.0.0.1:1978/five > check.out
++	$(RUNENV) $(RUNCMD) ./tcrtest write -port 19781 -cnum 5 -tout 5 -rnd 127.0.0.1 50000
++	$(RUNENV) $(RUNCMD) ./tcrtest write -port 19781 -cnum 5 -tout 5 -nr -rnd 127.0.0.1 50000
++	$(RUNENV) $(RUNCMD) ./tcrtest write -port 19781 -cnum 5 -tout 5 127.0.0.1 50000
++	$(RUNENV) $(RUNCMD) ./tcrtest read -port 19781 -cnum 5 -tout 5 127.0.0.1
++	$(RUNENV) $(RUNCMD) ./tcrtest read -port 19781 -cnum 5 -tout 5 -mul 5 127.0.0.1
++	$(RUNENV) $(RUNCMD) ./tcrtest remove -port 19781 -cnum 5 -tout 5 127.0.0.1
++	$(RUNENV) $(RUNCMD) ./tcrtest rcat -port 19781 -cnum 5 -tout 5 127.0.0.1 50000
++	$(RUNENV) $(RUNCMD) ./tcrtest rcat -port 19781 -cnum 5 -tout 5 -shl 50 127.0.0.1 50000
++	$(RUNENV) $(RUNCMD) ./tcrmgr vanish -port 19781 127.0.0.1
++	$(RUNENV) $(RUNCMD) ./tcrtest rcat -port 19781 -cnum 5 -tout 5 -dad 127.0.0.1 50000
++	$(RUNENV) $(RUNCMD) ./tcrtest rcat -port 19781 -cnum 5 -tout 5 -ext putcat -xlr 127.0.0.1 50000
++	$(RUNENV) $(RUNCMD) ./tcrtest misc -port 19781 -cnum 5 -tout 5 127.0.0.1 5000
++	$(RUNENV) $(RUNCMD) ./tcrtest wicked -port 19781 -cnum 5 -tout 5 127.0.0.1 5000
++	$(RUNENV) $(RUNCMD) ./tcrmgr inform -port 19781 127.0.0.1
++	$(RUNENV) $(RUNCMD) ./tcrmgr vanish -port 19781 127.0.0.1
++	$(RUNENV) $(RUNCMD) ./tcrmttest write -port 19781 -tnum 5 127.0.0.1 5000
++	$(RUNENV) $(RUNCMD) ./tcrmttest read -port 19781 -tnum 5 127.0.0.1
++	$(RUNENV) $(RUNCMD) ./tcrmttest remove -port 19781 -tnum 5 127.0.0.1
++	$(RUNENV) $(RUNCMD) ./tcrmttest write -port 19781 -tnum 5 -ext putcat -rnd 127.0.0.1 5000
++	$(RUNENV) $(RUNCMD) ./tcrmttest typical -port 19781 -tnum 5 127.0.0.1 5000
++	$(RUNENV) $(RUNCMD) ./tcrmgr vanish -port 19781 127.0.0.1
++	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 127.0.0.1 one first
++	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 127.0.0.1 two second
++	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dk 127.0.0.1 three third
++	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dc 127.0.0.1 three third
++	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dc 127.0.0.1 three third
++	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dc 127.0.0.1 three third
++	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 127.0.0.1 four fourth
++	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dk 127.0.0.1 five fifth
++	$(RUNENV) $(RUNCMD) ./tcrmgr out -port 19781 127.0.0.1 one
++	$(RUNENV) $(RUNCMD) ./tcrmgr out -port 19781 127.0.0.1 two
++	$(RUNENV) $(RUNCMD) ./tcrmgr get -port 19781 127.0.0.1 three > check.out
++	$(RUNENV) $(RUNCMD) ./tcrmgr get -port 19781 127.0.0.1 four > check.out
++	$(RUNENV) $(RUNCMD) ./tcrmgr get -port 19781 127.0.0.1 five > check.out
++	$(RUNENV) $(RUNCMD) ./tcrmgr mget -port 19781 127.0.0.1 one two three four five > check.out
++	$(RUNENV) $(RUNCMD) ./tcrmgr misc -port 19781 127.0.0.1 putlist six sixth seven seventh
++	$(RUNENV) $(RUNCMD) ./tcrmgr misc -port 19781 127.0.0.1 outlist six
++	$(RUNENV) $(RUNCMD) ./tcrmgr misc -port 19781 127.0.0.1 getlist three four five six > check.out
++	$(RUNENV) $(RUNCMD) ./tcrmgr list -port 19781 -pv 127.0.0.1 > check.out
++	$(RUNENV) $(RUNCMD) ./tcrmgr list -port 19781 -pv -fm f 127.0.0.1 > check.out
++	$(RUNENV) $(RUNCMD) ./tcrmgr http -ih http://127.0.0.1:19781/five > check.out
+ 	rm -rf ulog ; mkdir -p ulog
+ 	$(RUNENV) $(RUNCMD) ./ttultest write -lim 10000 ulog 5000
+ 	$(RUNENV) $(RUNCMD) ./ttultest write -lim 10000 -as ulog 5000
+@@ -215,6 +216,10 @@
+ 	rm -rf ulog ; mkdir -p ulog
+ 	$(RUNENV) $(RUNCMD) ./ttultest thread -lim 10000 ulog 5 5000
+ 	$(RUNENV) $(RUNCMD) ./ttultest thread -lim 10000 -as ulog 5 5000
++
++	kill `cat /tmp/tttest.pid`
++	rm /tmp/tttest.tch
++
+ 	@printf '\n'
+ 	@printf '#================================================================\n'
+ 	@printf '# Checking completed.\n'