diff options
Diffstat (limited to 'net-misc/tokyotyrant/files')
| -rw-r--r-- | net-misc/tokyotyrant/files/fix_makefiles-1.4.41.patch | 85 | ||||
| -rw-r--r-- | net-misc/tokyotyrant/files/fix_testsuite.patch | 104 | ||||
| -rw-r--r-- | net-misc/tokyotyrant/files/tokyotyrant.confd | 15 | ||||
| -rw-r--r-- | net-misc/tokyotyrant/files/tokyotyrant.initd | 38 |
4 files changed, 0 insertions, 242 deletions
diff --git a/net-misc/tokyotyrant/files/fix_makefiles-1.4.41.patch b/net-misc/tokyotyrant/files/fix_makefiles-1.4.41.patch deleted file mode 100644 index 40d26cc5f93a..000000000000 --- a/net-misc/tokyotyrant/files/fix_makefiles-1.4.41.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index b388455..52d3bc3 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -58,8 +58,8 @@ CFLAGS = @MYCFLAGS@ - LDFLAGS = @MYLDFLAGS@ - CMDLDFLAGS = @MYCMDLDFLAGS@ - LIBS = @LIBS@ --LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:. --RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@ -+LDENV = -+RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR) - POSTCMD = @MYPOSTCMD@ - - -@@ -120,10 +120,6 @@ install : - cp -Rf $(LIBRARYFILES) $(DESTDIR)$(LIBDIR) - mkdir -p $(DESTDIR)$(BINDIR) - cp -Rf $(COMMANDFILES) $(DESTDIR)$(BINDIR) -- mkdir -p $(DESTDIR)$(SBINDIR) -- cp -Rf $(INITFILES) $(DESTDIR)$(SBINDIR) -- mkdir -p $(DESTDIR)$(DATADIR) -- cp -Rf $(SCREXTFILES) $(DOCUMENTFILES) $(DESTDIR)$(DATADIR) - mkdir -p $(DESTDIR)$(MAN1DIR) - cd man && cp -Rf $(MAN1FILES) $(DESTDIR)$(MAN1DIR) - mkdir -p $(DESTDIR)$(MAN3DIR) -@@ -132,7 +128,6 @@ install : - cd man && cp -Rf $(MAN8FILES) $(DESTDIR)$(MAN8DIR) - mkdir -p $(DESTDIR)$(PCDIR) - cp -Rf $(PCFILES) $(DESTDIR)$(PCDIR) -- [ "$$UID" == 0 ] && ldconfig || true - @printf '\n' - @printf '#================================================================\n' - @printf '# Thanks for using Tokyo Tyrant.\n' -diff --git a/configure.in b/configure.in -index fbe0c71..809a839 100644 ---- a/configure.in -+++ b/configure.in -@@ -28,33 +28,15 @@ MYDOCUMENTFILES="COPYING ChangeLog THANKS doc tokyotyrant.idl" - MYPCFILES="tokyotyrant.pc" - - # Building flags --MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2" -+MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char" - MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include" - MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__" --MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib" -+MYLDFLAGS="-L. -L\$(LIBDIR)" - MYCMDLDFLAGS="" - MYRUNPATH="\$(LIBDIR)" - MYLDLIBPATHENV="LD_LIBRARY_PATH" - MYPOSTCMD="true" - --# Building paths --PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" --PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb" --CPATH="$HOME/include:/usr/local/include:$CPATH" --LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH" --LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" --PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" --export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH --if type pkg-config > /dev/null 2>&1 --then -- PATH="$PATH:`pkg-config --variable=bindir tokyocabinet`" -- CPATH="$CPATH:`pkg-config --variable=includedir tokyocabinet`" -- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir tokyocabinet`" -- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir tokyocabinet`" --fi -- -- -- - #================================================================ - # Options - #================================================================ -diff --git a/tokyotyrant.pc.in b/tokyotyrant.pc.in -index efb3749..efec1f6 100644 ---- a/tokyotyrant.pc.in -+++ b/tokyotyrant.pc.in -@@ -10,5 +10,5 @@ datadir=@datadir@ - Name: Tokyo Tyrant - Description: network interface of Tokyo Cabinet - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -ltokyotyrant @LIBS@ -+Libs: -L${libdir} -ltokyotyrant - Cflags: -I${includedir} diff --git a/net-misc/tokyotyrant/files/fix_testsuite.patch b/net-misc/tokyotyrant/files/fix_testsuite.patch deleted file mode 100644 index 7ee9dc801cb6..000000000000 --- a/net-misc/tokyotyrant/files/fix_testsuite.patch +++ /dev/null @@ -1,104 +0,0 @@ ---- a/Makefile.in 2009-10-14 10:33:16.000000000 +0200 -+++ b/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' diff --git a/net-misc/tokyotyrant/files/tokyotyrant.confd b/net-misc/tokyotyrant/files/tokyotyrant.confd deleted file mode 100644 index b6417134f47c..000000000000 --- a/net-misc/tokyotyrant/files/tokyotyrant.confd +++ /dev/null @@ -1,15 +0,0 @@ -# Tokyo tyrant config - -# Listening options -TT_HOST=127.0.0.1 -TT_PORT=1978 - -# Database file - please refer to man ttserver for alternatives -TT_DB="/var/lib/tokyotyrant/casket.tch#bnum=1000000#opts=ld" - -# ttserver accepts a wide range of options, put them here -TT_OPTS="" - -# don't change these -TT_PID=/var/run/tokyotyrant/db.pid -TT_LOG=/var/log/tokyotyrant/db.log
\ No newline at end of file diff --git a/net-misc/tokyotyrant/files/tokyotyrant.initd b/net-misc/tokyotyrant/files/tokyotyrant.initd deleted file mode 100644 index f754d4901bfc..000000000000 --- a/net-misc/tokyotyrant/files/tokyotyrant.initd +++ /dev/null @@ -1,38 +0,0 @@ -#!/sbin/openrc-run - -extra_commands="configtest reload" - -depend() { - need net -} - -start() { - configtest || return 1 - ebegin "Starting tokyo tyrant" - start-stop-daemon --start --exec /usr/bin/ttserver -- \ - -pid ${TT_PID} -dmn -host ${TT_HOST} -log ${TT_LOG} \ - -port ${TT_PORT} ${TT_OPTS} ${TT_DB} - eend $? "Failed to start tokyo tyrant" -} - -stop() { - configtest || return 1 - ebegin "Stopping tokyo tyrant" - start-stop-daemon --stop --pidfile ${TT_PID} - eend $? "Failed to stop tokyo tyrant" - rm -f ${TT_PID} -} - -reload() { - configtest || return 1 - ebegin "Gracefully restarting tokyo tyrant" - kill -HUP `cat ${TT_PID}` &>/dev/null - eend $? "Failed to reload tokyo tyrant" -} - -configtest() { - if [ -z "${TT_DB}" ] || [ -z "${TT_PORT}" ] ; then - eerror "Please check your configuration" - eend $? - fi -} |