This is an automated email from the git hooks/post-receive script. olek-guest pushed a commit to branch master in repository cyphesis-cpp.
commit 47e67b2bc12e98162e17e9ce122995ff9c971644 Author: Olek Wojnar <[email protected]> Date: Mon Aug 29 23:08:26 2016 -0400 Refresh patches --- debian/changelog | 9 + debian/patches/add-missing-man-pages.patch | 46 +- debian/patches/disable-comm-peer-test.patch | 8 +- .../patches/do-not-register-with-metaserver.patch | 4 +- .../patches/explicit-integer-instantiation.patch | 2 +- .../fix-broken-PythonArithmeticScripttest.patch | 6 +- .../fix-broken-install-data-hook-target.patch | 15 - debian/patches/man_pages_to_section_6.patch | 1433 -------------------- debian/patches/remove-generated-file.patch | 20 + debian/patches/series | 3 +- 10 files changed, 63 insertions(+), 1483 deletions(-) diff --git a/debian/changelog b/debian/changelog index a0fe9b1..818ff88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +cyphesis-cpp (0.6.2-1) unstable; urgency=medium + + * New upstream release + * Refresh patches + -- Remove two superseded patches + -- Add remove-generated-file.patch + + -- Olek Wojnar <[email protected]> Mon, 29 Aug 2016 23:08:14 -0400 + cyphesis-cpp (0.6.0-6) unstable; urgency=medium * Fix link failure on ppc64el with O3 optimization (LP: #1608298) diff --git a/debian/patches/add-missing-man-pages.patch b/debian/patches/add-missing-man-pages.patch index 17bb146..dbfcc5e 100644 --- a/debian/patches/add-missing-man-pages.patch +++ b/debian/patches/add-missing-man-pages.patch @@ -1,49 +1,49 @@ Description: Backport missing man pages Will not be needed after Cyphesis 0.6.2 Origin: https://github.com/worldforge/cyphesis/commit/bc7136eabf93c1b78fc48df7d465df4c7e1dd239 -Last-Update: 2014-10-20 +Last-Update: 2016-08-29 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,5 +1,6 @@ - man_MANS = cyclient.6 cycmd.6 cyphesis.6 cyphesis-tools.6 \ -- cyaddrules.6 cyconvertrules.6 cydumprules.6 cyloadrules.6 cypasswd.6 -+ cyaddrules.6 cyconvertrules.6 cydumprules.6 cyloadrules.6 cypasswd.6 \ -+ cydb.6 cypython.6 + man_MANS = cyclient.1 cycmd.1 cyphesis.1 cyphesis-tools.1 \ +- cyaddrules.1 cyconvertrules.1 cydumprules.1 cyloadrules.1 cypasswd.1 ++ cyaddrules.1 cyconvertrules.1 cydumprules.1 cyloadrules.1 cypasswd.1 \ ++ cydb.1 cypython.1 .sgml.1: docbook2man $(top_srcdir)/man/manpages.sgml @@ -8,11 +9,13 @@ - echo ".so man6/cyphesis-tools.6" > cydumprules.6 - echo ".so man6/cyphesis-tools.6" > cyloadrules.6 - echo ".so man6/cyphesis-tools.6" > cypasswd.6 -+ echo ".so man6/cyphesis-tools.6" > cydb.6 -+ echo ".so man6/cyphesis-tools.6" > cypython.6 + echo ".so man1/cyphesis-tools.1" > cydumprules.1 + echo ".so man1/cyphesis-tools.1" > cyloadrules.1 + echo ".so man1/cyphesis-tools.1" > cypasswd.1 ++ echo ".so man1/cyphesis-tools.1" > cydb.1 ++ echo ".so man1/cyphesis-tools.1" > cypython.1 EXTRA_DIST = cyclient.sgml cycmd.sgml cyphesis.sgml cyphesis-tools.sgml \ - manpages.sgml cyclient.6 cycmd.6 cyphesis.6 cyphesis-tools.6 \ - cyaddrules.6 cyconvertrules.6 cydumprules.6 cyloadrules.6 \ -- cypasswd.6 -+ cypasswd.6 cydb.6 cypython.6 + manpages.sgml cyclient.1 cycmd.1 cyphesis.1 cyphesis-tools.1 \ + cyaddrules.1 cyconvertrules.1 cydumprules.1 cyloadrules.1 \ +- cypasswd.1 ++ cypasswd.1 cydb.1 cypython.1 maintainer-clean-local: -rm -f $(man_MANS) --- /dev/null -+++ b/man/cydb.6 ++++ b/man/cydb.1 @@ -0,0 +1 @@ -+.so man6/cyphesis-tools.6 ---- a/man/cyphesis-tools.6 -+++ b/man/cyphesis-tools.6 ++.so man1/cyphesis-tools.1 +--- a/man/cyphesis-tools.1 ++++ b/man/cyphesis-tools.1 @@ -1,31 +1,28 @@ -.\" This manpage has been automatically generated by docbook2man -.\" from a DocBook document. This tool can be found at: -.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> -.\" Please send any bug reports, improvements, comments, patches, -.\" etc. to Steve Cheng <[email protected]>. --.TH "CYPHESIS-TOOLS" "6" "18 November 2010" "" "cyphesis" +-.TH "CYPHESIS-TOOLS" "1" "18 November 2010" "" "cyphesis" - +.\" auto-generated by docbook2man-spec $Revision: 1.2 $ -+.TH "CYPHESIS-TOOLS" "6" "17 April 2014" "" "cyphesis" ++.TH "CYPHESIS-TOOLS" "1" "17 April 2014" "" "cyphesis" .SH NAME -cyconfig, cyconvertrules, cydumprules, cyloadrules, cypasswd \- cyphesis tools +cyconfig, cyconvertrules, cydumprules, cyloadrules, cypasswd, cypython, cydb \- cyphesis tools @@ -163,7 +163,7 @@ Last-Update: 2014-10-20 +Copyright 2013 Erik Ogenvik. .SH "SEE ALSO" .PP - \fBcyphesis\fR(6), + \fBcyphesis\fR(1), --- a/man/cyphesis-tools.sgml +++ b/man/cyphesis-tools.sgml @@ -6,7 +6,7 @@ @@ -239,6 +239,6 @@ Last-Update: 2014-10-20 <refsect1><title>Options</title> <para> --- /dev/null -+++ b/man/cypython.6 ++++ b/man/cypython.1 @@ -0,0 +1 @@ -+.so man6/cyphesis-tools.6 ++.so man6/cyphesis-tools.1 diff --git a/debian/patches/disable-comm-peer-test.patch b/debian/patches/disable-comm-peer-test.patch index 216ea31..f2843c3 100644 --- a/debian/patches/disable-comm-peer-test.patch +++ b/debian/patches/disable-comm-peer-test.patch @@ -2,13 +2,13 @@ Description: Disable CommPeertest Due to buildd network limitations Forwarded: not-needed Author: Olek Wojnar <[email protected]> -Last-Update: 2014-11-30 +Last-Update: 2016-08-29 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -79,7 +79,7 @@ - Linktest +@@ -92,7 +92,7 @@ + SystemAccounttest TCPListenFactorytest CorePropertyManagertest - SERVER_COMM_TESTS = CommSockettest CommStreamClienttest CommClienttest \ + SERVER_COMM_TESTS = CommStreamClienttest CommClienttest \ - CommHttpClienttest CommStreamListenertest CommPeertest \ + CommHttpClienttest CommStreamListenertest \ CommMDNSPublishertest CommClientKittest \ diff --git a/debian/patches/do-not-register-with-metaserver.patch b/debian/patches/do-not-register-with-metaserver.patch index a151927..4fb3f6f 100644 --- a/debian/patches/do-not-register-with-metaserver.patch +++ b/debian/patches/do-not-register-with-metaserver.patch @@ -3,7 +3,7 @@ Description: Do not register with metaserver are ready to run a public server will easily be able to reenable this setting. Forwarded: not-needed Author: Olek Wojnar <[email protected]> -Last-Update: 2016-07-04 +Last-Update: 2016-08-29 --- a/data/cyphesis.vconf +++ b/data/cyphesis.vconf @@ -14,5 +14,5 @@ Last-Update: 2016-07-04 -usemetaserver="true" +usemetaserver="false" metaserver="metaserver.worldforge.org" + msheartbeat=240 # Run in daemon mode - daemon="false" diff --git a/debian/patches/explicit-integer-instantiation.patch b/debian/patches/explicit-integer-instantiation.patch index cac62ce..91425a8 100644 --- a/debian/patches/explicit-integer-instantiation.patch +++ b/debian/patches/explicit-integer-instantiation.patch @@ -5,7 +5,7 @@ Last-Update: 2016-08-29 --- a/common/globals.cpp +++ b/common/globals.cpp -@@ -166,6 +166,7 @@ int readConfigItem<std::string>(const std::string & section, const std::string & +@@ -170,6 +170,7 @@ } template int readConfigItem<bool>(const std::string & section, const std::string & key, bool & storage); diff --git a/debian/patches/fix-broken-PythonArithmeticScripttest.patch b/debian/patches/fix-broken-PythonArithmeticScripttest.patch index a63f961..52f02b5 100644 --- a/debian/patches/fix-broken-PythonArithmeticScripttest.patch +++ b/debian/patches/fix-broken-PythonArithmeticScripttest.patch @@ -1,11 +1,11 @@ Description: Backport fix for broken PythonArithmeticScripttest Will not be needed after Cyphesis 0.6.2 Origin: https://github.com/worldforge/cyphesis/commit/1a846529350b599652cd295ba7f3ea400e5267ba -Last-Update: 2014-10-20 +Last-Update: 2016-08-29 --- a/tests/PythonArithmeticScripttest.cpp +++ b/tests/PythonArithmeticScripttest.cpp -@@ -47,6 +47,7 @@ +@@ -46,6 +46,7 @@ { Py_Initialize(); @@ -13,7 +13,7 @@ Last-Update: 2014-10-20 PyObject * testmod = Py_InitModule("testmod", no_methods); assert(testmod != 0); -@@ -80,6 +81,7 @@ +@@ -79,6 +80,7 @@ pas.set("foo", 1.0f); pas.set("mim", 1.0f); diff --git a/debian/patches/fix-broken-install-data-hook-target.patch b/debian/patches/fix-broken-install-data-hook-target.patch deleted file mode 100644 index 928a4ff..0000000 --- a/debian/patches/fix-broken-install-data-hook-target.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Backport fix for build failure - Will not be needed after Cyphesis 0.6.0 -Origin: https://github.com/worldforge/cyphesis/commit/cdbc2dbdeb0f06d08fbdd146081a3ed975397bbc -Last-Update: 2014-10-23 - ---- a/Makefile.am -+++ b/Makefile.am -@@ -11,6 +11,7 @@ - socket_DATA = - - install-data-hook: -+ mkdir -p $(DESTDIR)$(socketdir) - chmod 1777 $(DESTDIR)$(socketdir) - @echo - @echo "Cyphesis is not yet ready to run." diff --git a/debian/patches/man_pages_to_section_6.patch b/debian/patches/man_pages_to_section_6.patch deleted file mode 100644 index e55ca71..0000000 --- a/debian/patches/man_pages_to_section_6.patch +++ /dev/null @@ -1,1433 +0,0 @@ -Description: Move man pages from Section 1 to Section 6 -Author: Olek Wojnar <[email protected]> -Forwarded: http://mail.worldforge.org/pipermail/general/2014-October/008386.html -Last-Update: 2014-10-20 - ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -1,18 +1,18 @@ --man_MANS = cyclient.1 cycmd.1 cyphesis.1 cyphesis-tools.1 \ -- cyaddrules.1 cyconvertrules.1 cydumprules.1 cyloadrules.1 cypasswd.1 -+man_MANS = cyclient.6 cycmd.6 cyphesis.6 cyphesis-tools.6 \ -+ cyaddrules.6 cyconvertrules.6 cydumprules.6 cyloadrules.6 cypasswd.6 - - .sgml.1: - docbook2man $(top_srcdir)/man/manpages.sgml -- echo ".so man1/cyphesis-tools.1" > cyaddrules.1 -- echo ".so man1/cyphesis-tools.1" > cyconvertrules.1 -- echo ".so man1/cyphesis-tools.1" > cydumprules.1 -- echo ".so man1/cyphesis-tools.1" > cyloadrules.1 -- echo ".so man1/cyphesis-tools.1" > cypasswd.1 -+ echo ".so man6/cyphesis-tools.6" > cyaddrules.6 -+ echo ".so man6/cyphesis-tools.6" > cyconvertrules.6 -+ echo ".so man6/cyphesis-tools.6" > cydumprules.6 -+ echo ".so man6/cyphesis-tools.6" > cyloadrules.6 -+ echo ".so man6/cyphesis-tools.6" > cypasswd.6 - - EXTRA_DIST = cyclient.sgml cycmd.sgml cyphesis.sgml cyphesis-tools.sgml \ -- manpages.sgml cyclient.1 cycmd.1 cyphesis.1 cyphesis-tools.1 \ -- cyaddrules.1 cyconvertrules.1 cydumprules.1 cyloadrules.1 \ -- cypasswd.1 -+ manpages.sgml cyclient.6 cycmd.6 cyphesis.6 cyphesis-tools.6 \ -+ cyaddrules.6 cyconvertrules.6 cydumprules.6 cyloadrules.6 \ -+ cypasswd.6 - - maintainer-clean-local: - -rm -f $(man_MANS) ---- a/man/cyaddrules.1 -+++ /dev/null -@@ -1 +0,0 @@ --.so man1/cyphesis-tools.1 ---- a/man/cyclient.1 -+++ /dev/null -@@ -1,69 +0,0 @@ --.\" This manpage has been automatically generated by docbook2man --.\" from a DocBook document. This tool can be found at: --.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> --.\" Please send any bug reports, improvements, comments, patches, --.\" etc. to Steve Cheng <[email protected]>. --.TH "CYCLIENT" "1" "18 November 2010" "" "cyphesis" -- --.SH NAME --cyclient \- cyphesis world building client --.SH SYNOPSIS -- --\fB/usr/bin/cyclient\fR [ \fB--section:option=value\fR\fI ...\fR ] [ \fBpackage.function\fR ] -- --.SH "DESCRIPTION" --.PP --The \fBcyclient\fR program connects to a cyphesis server and --populates the world with data. --.SH "OPTIONS" --.PP --Configuration options are divided up into named sections, which need to --be specified when modifying or overriding the options. In a config file --the name of a section is specified in square brackets at the beginning --of the section. On the command line the section is given at the --beginning of the option specification, as shown in the synopsis above. --.SS "CLIENT OPTIONS" --.PP --The following options are present in the client section of the config file, --and overriden by specifying the client section name on the command line. --.TP --\fBpackage="define_world" \fR --Python package which contains the client function. -- --This setting provides the name of the Python package which contains the --function that should run by the client. --.TP --\fBfunction="default" \fR --Python client function. -- --This setting provides the Python function which should be run by the client. --.SS "SERVER OPTIONS" --.PP --The following options are present in the cyphesis section of the config --file, and overriden by specifying the cyphesis section name on the --command line. These options apply to the server, but are also required --by the client to ensure that the client can connect. --.TP --\fBtcpport=6767 \fR --Network port for server TCP connections. -- --Specifies the port number to use when connecting to the server. --.TP --\fBunixport="cyphesis.sock" \fR --Local liston socket for Unix domain connections. -- --Specifies the filename to use to listen for local trusted client connections. --.SH "AUTHOR" --.PP --Written by Alistair Riddoch. --.SH "REPORTING BUGS" --.PP --Report bugs to <[email protected]>\&. --.SH "COPYRIGHT" --.PP --Copyright 2004 Alistair Riddoch. --.SH "SEE ALSO" --.PP --\fBcyphesis\fR(1), --\fBcyphesis-tools\fR(1), --\fBcycmd\fR(1) ---- a/man/cyclient.sgml -+++ b/man/cyclient.sgml -@@ -3,7 +3,7 @@ - - <refmeta> - <refentrytitle>cyclient</refentrytitle> -- <manvolnum>1</manvolnum> -+ <manvolnum>6</manvolnum> - </refmeta> - - <refnamediv> -@@ -132,9 +132,9 @@ - </refsect1> - <refsect1><title>See Also</title> - <para> --<citerefentry><refentrytitle>cyphesis</refentrytitle><manvolnum>1</manvolnum></citerefentry>, --<citerefentry><refentrytitle>cyphesis-tools</refentrytitle><manvolnum>1</manvolnum></citerefentry>, --<citerefentry><refentrytitle>cycmd</refentrytitle><manvolnum>1</manvolnum></citerefentry> -+<citerefentry><refentrytitle>cyphesis</refentrytitle><manvolnum>6</manvolnum></citerefentry>, -+<citerefentry><refentrytitle>cyphesis-tools</refentrytitle><manvolnum>6</manvolnum></citerefentry>, -+<citerefentry><refentrytitle>cycmd</refentrytitle><manvolnum>6</manvolnum></citerefentry> - </para> - </refsect1> - </refentry> ---- a/man/cycmd.1 -+++ /dev/null -@@ -1,274 +0,0 @@ --.\" This manpage has been automatically generated by docbook2man --.\" from a DocBook document. This tool can be found at: --.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> --.\" Please send any bug reports, improvements, comments, patches, --.\" etc. to Steve Cheng <[email protected]>. --.TH "CYCMD" "1" "18 November 2010" "" "cyphesis" -- --.SH NAME --cycmd \- cycmd game server process --.SH SYNOPSIS -- --\fBcycmd\fR [ \fB--section:option=value\fR\fI ...\fR ] [ \fBcommand [ server ]\fR ] -- --.SH "DESCRIPTION" --.PP --The \fBcycmd\fR program provides a commandline interface to a --cyphesis server. --.SH "OPTIONS" --.PP --Configuration options are divided up into named sections, which need to --be specified when modifying or overriding the options. In a config file --the name of a section is specified in square brackets at the beginning --of the section. On the command line the section is given at the --beginning of the option specification, as shown in the synopsis above. --.SS "CLIENT OPTIONS" --.PP --The following options used by \fBcycmd\fR are present in the --client section of the config file, and overriden by specifying the client --section name on the command line. --.TP --\fBserverhost=hostname \fR --Hostname of the server to connect to. -- --This setting provides the hostname of the system where cyphesis is running --that \fBcycmd\fR should try and connect to. --.SS "SERVER OPTIONS" --.PP --The following options are present in the cyphesis section of the config --file, and overriden by specifying the cyphesis section name on the --command line. These options apply to the server, but are also required --by the client to ensure that the client can connect. --.TP --\fBtcpport=6767 \fR --Network port for server TCP connections. -- --Specifies the port number to use when connecting to the server. --.TP --\fBunixport="cyphesis.sock" \fR --Local liston socket for Unix domain connections. -- --Specifies the filename to use to listen for local trusted client connections. --.SH "COMMANDS" --.TP --\fB add_agent [ type ] \fR --Create an in-game agent. -- --Create an avatar or agent in the game to be used to manipulate the world. --By default an avatar of type "creator" is created, and this is required for --most operations. Avatars of other types can be created, but have limited --ability to edit the world. --.TP --\fB cancel \fR --Cancel the current admin task. -- --Various commands begin a background admin task in the client. This command --stops any currently running task. --.TP --\fB connect hostname \fR --Connect the server to a peer. -- --Try and establish a connection to a peer server. --.TP --\fB creator_create type \fR --Use agent to create an entity. -- --Use the in-game agent owned by this client to create an in-game entity of any --type. --.TP --\fB delete id \fR --Delete an entity from the server. -- --Delete the in-game entity with the given ID from the world. --.TP --\fB dump [ filename ] \fR --Write the contents of the world to an Atlas dump file. -- --An Atlas representation of every entity on the server is written to a file --using the XML codec. --.TP --\fB get id \fR --Examine any object on the server. -- --Get an object description from the server, and display its contents. --.TP --\fB find_by_name name \fR --Find an entity with the given name. -- --Search the world for an entity with the given name, and return the first one --found. --.TP --\fB find_by_type type \fR --Find an entity with the given type. -- --Search the world for an entity with the given type, and return the first one --found. --.TP --\fB flush type \fR --Flush entities from the server -- --Search the world for entities with the given type, and delete them all. -- --This process does not work perfectly reliably, so may have to be run multiple --times to fully clear the server. --.TP --\fB help \fR --Display online help. -- --Lists all the commands available, with a short description of what each one --does. --.TP --\fB install type_id parent_id \fR --Install a new type in the server. -- --.TP --\fB look \fR --Return a view of the current server lobby. -- --Look at the current server lobby, where all users currently logged in --are represented. The view is returned and displayed. --.TP --\fB logout [ account ] \fR --Log user out of server. --.TP --\fB monitor \fR --Enable server monitoring. -- --Direct the server to report all in-game operations to the client. A digest --of each operation is displayed, including the type, which entity the operation --is from and which entity the operation is to. --.TP --\fB query entity_id \fR --Synonym for "get" (deprecated). --.TP --\fB reload type \fR --Reload the script for a type. -- --Reload the Python script for a given type from the file on disk. --.TP --\fB restore [ filename ] \fR --Restore the contents of an Atlas dump file into the world. -- --Read entities from an Atlas XML codec dump file, and restore them into the --server. The most reliable use case for this is with an empty server to restore --a snapshot of the world taken at an earlier time. -- --It is possible to restore a dump file into server which already contains a --world, but the following caveats apply: -- --If there are collisions between the ID space being used in the existing world, --and the ID space used in the dump file, the tool will do its best to do the --right thing, but the results are to some extent undefined. If an entity with --the same ID and type exists in both spaces, only one will exist after the --restore and it will have some of the properties of both copies of that entity. --.TP --\fB stat \fR --Examine the current server status. -- --Get a description of the current server status, and display its contents. --.TP --\fB unmonitor \fR --Disable server monitoring. -- --Direct the server to stop reporting all in-game operations to the client. --.SH "EXAMPLES" --.PP --The first example shows getting the current server status and checking --the lobby to see if any users are logged in. -- --.nf --cyphesis> stat --Info( -- builddate: 11:32:45, Sep 27 2004 -- clients: 1 -- name: calcitration.ecs.soton.ac.uk -- objtype: obj -- parents: [ server ] -- ruleset: mason -- server: cyphesis -- uptime: 1728.2 -- version: 0.3.2 --) --cyphesis> look --Sight( -- id: lobby -- name: lobby -- objtype: obj -- parents: [ room ] -- people: [ 1 ] -- rooms: [ ] --) --cyphesis> -- --.fi --.PP --The first entity returned shows various information about the server, --including when it was built, the number of connected client, the --current ruleset, and the server uptime. The second entity representing --the lobby shows that only one user is current logged in, and no chat --rooms have been created. --.PP --The second example shows how to install a new type. -- --.nf --cyphesis> get thing --Info( -- children: [ feature character plant food stackable structure arm arrow axe barrel block_house board boat boundary bow campfire cleaver coin fire gallows house lumber pelvis ribcage shin skull stall sword thigh tower twobyfour wall weather ] -- contains: [ ] -- id: thing -- loc: -- name: -- objtype: class -- parents: [ game_entity ] -- pos: [ 0 0 0 ] -- stamp_contains: 0 -- velocity: [ 0 0 0 ] --) --cyphesis> install box thing --cyphesis> -- --.fi --.PP --The third example shows server monitoring being enable, followed by information --of a series of in-game operations. The flow of messages in while monitoring the --server can be large. In order to supress the flow, the --\fBunmonitor\fR command must be used. -- --.nf --cyphesis> monitor --cyphesis> --tick(from="900006",to="900006") --tick(from="900007",to="900007") --cyphesis> --tick(from="900008",to="900008") --cyphesis> --tick(from="899982",to="899982") --cyphesis> --tick(from="899356",to="899356") --cyphesis> --tick(from="899357",to="899357") --cyphesis> --tick(from="899358",to="899358") --cyphesis> --tick(from="899359",to="899359") --cyphesis> --tick(from="899360",to="899360") --cyphesis> --tick(from="899361",to="899361") --cyphesis> -- --.fi --.SH "AUTHOR" --.PP --Written by Alistair Riddoch. --.SH "REPORTING BUGS" --.PP --Report bugs to <[email protected]>\&. --.SH "COPYRIGHT" --.PP --Copyright 2004 Alistair Riddoch. --.SH "SEE ALSO" --.PP --\fBcyphesis\fR(1), --\fBcyclient\fR(1), --\fBcyphesis-tools\fR(1) ---- a/man/cycmd.sgml -+++ b/man/cycmd.sgml -@@ -2,7 +2,7 @@ - - <refmeta> - <refentrytitle>cycmd</refentrytitle> -- <manvolnum>1</manvolnum> -+ <manvolnum>6</manvolnum> - </refmeta> - - <refnamediv> -@@ -544,9 +544,9 @@ - </refsect1> - <refsect1><title>See Also</title> - <para> --<citerefentry><refentrytitle>cyphesis</refentrytitle><manvolnum>1</manvolnum></citerefentry>, --<citerefentry><refentrytitle>cyclient</refentrytitle><manvolnum>1</manvolnum></citerefentry>, --<citerefentry><refentrytitle>cyphesis-tools</refentrytitle><manvolnum>1</manvolnum></citerefentry> -+<citerefentry><refentrytitle>cyphesis</refentrytitle><manvolnum>6</manvolnum></citerefentry>, -+<citerefentry><refentrytitle>cyclient</refentrytitle><manvolnum>6</manvolnum></citerefentry>, -+<citerefentry><refentrytitle>cyphesis-tools</refentrytitle><manvolnum>6</manvolnum></citerefentry> - </para> - </refsect1> - </refentry> ---- a/man/cyconvertrules.1 -+++ /dev/null -@@ -1 +0,0 @@ --.so man1/cyphesis-tools.1 ---- a/man/cydumprules.1 -+++ /dev/null -@@ -1 +0,0 @@ --.so man1/cyphesis-tools.1 ---- a/man/cyloadrules.1 -+++ /dev/null -@@ -1 +0,0 @@ --.so man1/cyphesis-tools.1 ---- a/man/cypasswd.1 -+++ /dev/null -@@ -1 +0,0 @@ --.so man1/cyphesis-tools.1 ---- a/man/cyphesis-tools.1 -+++ /dev/null -@@ -1,106 +0,0 @@ --.\" This manpage has been automatically generated by docbook2man --.\" from a DocBook document. This tool can be found at: --.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> --.\" Please send any bug reports, improvements, comments, patches, --.\" etc. to Steve Cheng <[email protected]>. --.TH "CYPHESIS-TOOLS" "1" "18 November 2010" "" "cyphesis" -- --.SH NAME --cyconfig, cyconvertrules, cydumprules, cyloadrules, cypasswd \- cyphesis tools --.SH SYNOPSIS -- --\fB/usr/bin/cyaddrules\fR [ \fB--section:option=value\fR\fI ...\fR ] [ \fBrulesetname atlas-xml-file\fR ] -- -- --\fB/usr/bin/cyconfig\fR [ \fB--section:option=value\fR\fI ...\fR ] -- -- --\fB/usr/bin/cyconvertrules\fR \fBrule_file\fR -- -- --\fB/usr/bin/cydumprules\fR -- -- --\fB/usr/bin/cyloadrules\fR [ \fB--section:option=value\fR\fI ...\fR ] [ \fBrulesetname atlas-xml-file\fR ] -- -- --\fB/usr/bin/cypasswd\fR [ { \fB-a\fR | \fB-s\fR | \fB-d\fR } \fBaccount\fR ] -- --.SH "DESCRIPTION" --.PP --The cyphesis tools manage the data and configuration files used by cyphesis. --.PP --The \fBcyaddrules\fR tool uploads Atlas XML rules files into the --a running server. If rules already exist in the server, then the default --attributes are updated, and if the rule has a script associated with it, --then the script is reloaded from file. \fBcyaddrules\fR can --either upload the file given on the command line, or if none is specified it --will upload the rule file for the ruleset specified in the server config, --and any rule files it depends on. \fBcyaddrules\fR is typically --used to add additional rules during rule development without having to --restart the server. Rules can be loaded directly into a running server --using \fBcyaddrules\fR\&. --.PP --The \fBcyconfig\fR program provides an easy scriptable way to --make permanent changes to the server config from the command line. --It works by writing new config options to \fI\&.cyphesis.vconf\fR --in the users home directory, which is read by the server at startup, --and overrides the contents of the main config file. For a description of --the various options that the server takes, please see --\fBcyphesis\fR(1)\&. --.PP --The \fBcyconvertrules\fR program converts Atlas XML rules files --from an older historic format into the format used by cyphesis since --version 0.3.1. --.PP --The \fBcydumprules\fR program dumps rules from the database table --used by the server into a set of Atlas XML rules files. Note that this does --not produce a set of files containing the same rules as those that were loaded --in using \fBcyloadrules\fR because some of the rules in the --rulesets that were not top level may have been overloaded, and do not exist --in the database table. Typically this command will be used to get an updated --copy of the top level ruleset from the server database, and the rest of the --files will be ignored. --.PP --The \fBcyloadrules\fR tool loads Atlas XML rules files into the --database table used by the server. The rules table is read by the --server at startup, so a server restart is typically required after loading --rules. \fBcyloadrules\fR can either load the file given on --the command line, or if none is specified it will load the rule file for --the ruleset specified in the server config, and any rule files it depends on. --Rules can be loaded directly into a running server using --\fBcyaddrules\fR\&. --.PP --The \fBcypasswd\fR tool is used to administrate the accounts table --in the server database. --.SH "OPTIONS" --.PP --The \fBcypasswd\fR can either add a new account, set the password --of an existing account, or remove an account from the database. When no --arguments are given, it prompts for a new admin password for cyphesis. --When run with the \fB-a\fR option, the command prompts for a --password to be entered and an account with the username given by \fBaccount\fR, --and with the password supplied at the prompt is created. When run with the --\fB-s\fR option, the command prompts for a password, and the --existing account with username given by \fBaccount\fR has its password changed to --the new one entered. When run with the \fB-d\fR option, the --account with username given by \fBaccount\fR is removed from the database. --.PP --Whenever the \fBcypasswd\fR prompts for a password, a second --prompt is displayed asking for confirmation of the password. If the two --password entered do not match, the operation is aborted, and no changes are --made to the database. --.SH "AUTHOR" --.PP --Written by Alistair Riddoch. --.SH "REPORTING BUGS" --.PP --Report bugs to <[email protected]>\&. --.SH "COPYRIGHT" --.PP --Copyright 2004 Alistair Riddoch. --.SH "SEE ALSO" --.PP --\fBcyphesis\fR(1), --\fBcyclient\fR(1), --\fBcycmd\fR(1) ---- a/man/cyphesis-tools.sgml -+++ b/man/cyphesis-tools.sgml -@@ -2,7 +2,7 @@ - - <refmeta> - <refentrytitle>cyphesis-tools</refentrytitle> -- <manvolnum>1</manvolnum> -+ <manvolnum>6</manvolnum> - </refmeta> - - <refnamediv> -@@ -68,7 +68,7 @@ - in the users home directory, which is read by the server at startup, - and overrides the contents of the main config file. For a description of - the various options that the server takes, please see --<citerefentry><refentrytitle>cyphesis</refentrytitle><manvolnum>1</manvolnum> -+<citerefentry><refentrytitle>cyphesis</refentrytitle><manvolnum>6</manvolnum> - </citerefentry>. - </para> - <para> -@@ -139,9 +139,9 @@ - </refsect1> - <refsect1><title>See Also</title> - <para> --<citerefentry><refentrytitle>cyphesis</refentrytitle><manvolnum>1</manvolnum></citerefentry>, --<citerefentry><refentrytitle>cyclient</refentrytitle><manvolnum>1</manvolnum></citerefentry>, --<citerefentry><refentrytitle>cycmd</refentrytitle><manvolnum>1</manvolnum></citerefentry> -+<citerefentry><refentrytitle>cyphesis</refentrytitle><manvolnum>6</manvolnum></citerefentry>, -+<citerefentry><refentrytitle>cyclient</refentrytitle><manvolnum>6</manvolnum></citerefentry>, -+<citerefentry><refentrytitle>cycmd</refentrytitle><manvolnum>6</manvolnum></citerefentry> - </para> - </refsect1> - </refentry> ---- a/man/cyphesis.1 -+++ /dev/null -@@ -1,165 +0,0 @@ --.\" auto-generated by docbook2man-spec from docbook-utils package --.TH "CYPHESIS" "1" "10 December 2010" "" "cyphesis" --.SH NAME --cyphesis \- cyphesis game server process --.SH SYNOPSIS --.sp --\fB/usr/bin/cyphesis\fR [ \fB--section:option=value\fR\fI...\fR ] --.SH "DESCRIPTION" --.PP --The \fBcyphesis\fR program implements the core world server for --WorldForge. --.SH "OPTIONS" --.PP --Configuration options are divided up into named sections, which need to --be specified when modifying or overriding the options. In a config file --the name of a section is specified in square brackets at the beginning --of the section. On the command line the section is given at the --beginning of the option specification, as shown in the synopsis above. --.SS "SERVER OPTIONS" --.PP --The following options are present in the cyphesis section of the config --file, and overriden by specifying the cyphesis section name on the --command line. --.TP --\fBdirectory="/path/to/server/data"\fR --Directory where server data and scripts can be found. -- --Name of the top level ruleset this server should use. -- --Normally this directory is set at compile time, but in some rare cases it --may be necessary to tell cyphesis to use a different directory. --.TP --\fBconfdir="/path/to/server/config"\fR --Directory where server config can be found. -- --Normally this directory is set at compile time, but in some rare cases it --may be necessary to tell cyphesis to use a different directory. --.TP --\fBvardir="/path/to/server/var"\fR --Directory where temporary files can be stored. -- --Normally this directory is set at compile time, but in some rare cases it --may be necessary to tell cyphesis to use a different directory. --.TP --\fBruleset="mason"\fR --Ruleset name. -- --Name of the top level ruleset this server should use. -- --Rulesets are hierarchical, so it is very probable that the top level ruleset --will depend on another ruleset. In order to specify the that ruleset --depends on another ruleset, a section is required in the config file with --the name of the ruleset, which contains an additional ruleset option. --On startup the server will look for dependent rulesets until it reaches --a ruleset which has no dependencies, at which point it is assumed the base --ruleset has been found. -- --For example, the mason ruleset depends on the basic ruleset, but the --basic ruleset has no dependencies. The required configuration entries for --this arrangement look like this: --.sp --.nf --[cyphesis] --ruleset="mason" --[mason] --ruleset="basic" -- --.sp --.fi --.TP --\fBservername=hostname\fR --Server name. -- --Name that identifies this server. If this option is ommited from the config --file, and not provided any other way, then the system hostname will be used. --.TP --\fBtcpport=6767\fR --Network listen port for TCP connections. -- --Specifies the port number to use to listen for incoming client connections. --.TP --\fBunixport="cyphesis.sock"\fR --Local liston socket for Unix domain connections. -- --Specifies the filename to use to listen for local trusted client connections. --.TP --\fBrestricted=false\fR --Flag to control restricted mode. -- --If this option is true the server is run in restricted mode. This --means that clients will not be able to create new accounts, leaving --account creation entirelu in the hands of the administrator. --.TP --\fBusemetaserver=true\fR --Flag to control use of metaserver. -- --If this flag is true the server registers its presence with a metaserver. --.TP --\fBmetaserver="metaserver.worldforge.org"\fR --Hostname to use as metaserver. -- --The hostname is used as the address of the metaserver where the presence of --this server is registered if the usemetaserver option is enabled. --.TP --\fBdaemon=false\fR --Flag to control daemon mode. -- --If this flag is true the server automatically drop into the background --after startup. For convenience the parent process will not complete --until the server has completed its setup, including reading all config --information, loading all data from the database, setting up internal --data structures and setting up communications. The exit status of the --parent process indicates whether these steps were completed successfully. --.TP --\fBuseaiclient=false\fR --Flag to control use of AI client. -- --If this flag is true the server does not attempt to do any AI simulation --internally, and instead relies on a specialist AI client. This feature --is not yet implemented. --.TP --\fBdbserver\fR --Remote hostname for the PostgreSQL RDBMS. -- --If this setting is present the server will use a remote instance of the --PostgreSQL RDBMS for its database requirements at the hostname provided. --Do not use this setting unless you need a remote database for some --reason. Specify "localhost" will cause the database module to use --remote connection even though the connection is to the local machine. --.TP --\fBdbname="cyphesis"\fR --Name of database to use. -- --This setting provides the database name the server is to use for its data. --If this setting is omitted, the name cyphesis is used. --.TP --\fBdbuser\fR --Database account name for access. -- --This setting provides the username to be used to authenticate with the --database. If it is not included, the username of the user running the --server is used. --.TP --\fBdbpasswd\fR --Database account password for access. -- --This setting provides the password to be used to authenticate with the --database. PostgreSQL does not usually require a password when connecting --to a PostgreSQL RDBMS on the same system as the server, when the database --username to be used is the same as the user running the server. If --this is the case then the setting must be omitted from the config file. --.SH "AUTHOR" --.PP --Written by Alistair Riddoch. --.SH "REPORTING BUGS" --.PP --Report bugs to <[email protected]>\&. --.SH "COPYRIGHT" --.PP --Copyright 2004 Alistair Riddoch. --.SH "SEE ALSO" --.PP --\fBcyclient\fR(1), --\fBcyphesis-tools\fR(1), --\fBcycmd\fR(1) ---- a/man/cyphesis.sgml -+++ b/man/cyphesis.sgml -@@ -2,7 +2,7 @@ - - <refmeta> - <refentrytitle>cyphesis</refentrytitle> -- <manvolnum>1</manvolnum> -+ <manvolnum>6</manvolnum> - </refmeta> - - <refnamediv> -@@ -362,9 +362,9 @@ - </refsect1> - <refsect1><title>See Also</title> - <para> --<citerefentry><refentrytitle>cyclient</refentrytitle><manvolnum>1</manvolnum></citerefentry>, --<citerefentry><refentrytitle>cyphesis-tools</refentrytitle><manvolnum>1</manvolnum></citerefentry>, --<citerefentry><refentrytitle>cycmd</refentrytitle><manvolnum>1</manvolnum></citerefentry> -+<citerefentry><refentrytitle>cyclient</refentrytitle><manvolnum>6</manvolnum></citerefentry>, -+<citerefentry><refentrytitle>cyphesis-tools</refentrytitle><manvolnum>6</manvolnum></citerefentry>, -+<citerefentry><refentrytitle>cycmd</refentrytitle><manvolnum>6</manvolnum></citerefentry> - </para> - </refsect1> - </refentry> ---- /dev/null -+++ b/man/cyaddrules.6 -@@ -0,0 +1 @@ -+.so man6/cyphesis-tools.6 ---- /dev/null -+++ b/man/cyclient.6 -@@ -0,0 +1,69 @@ -+.\" This manpage has been automatically generated by docbook2man -+.\" from a DocBook document. This tool can be found at: -+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> -+.\" Please send any bug reports, improvements, comments, patches, -+.\" etc. to Steve Cheng <[email protected]>. -+.TH "CYCLIENT" "6" "18 November 2010" "" "cyphesis" -+ -+.SH NAME -+cyclient \- cyphesis world building client -+.SH SYNOPSIS -+ -+\fB/usr/bin/cyclient\fR [ \fB--section:option=value\fR\fI ...\fR ] [ \fBpackage.function\fR ] -+ -+.SH "DESCRIPTION" -+.PP -+The \fBcyclient\fR program connects to a cyphesis server and -+populates the world with data. -+.SH "OPTIONS" -+.PP -+Configuration options are divided up into named sections, which need to -+be specified when modifying or overriding the options. In a config file -+the name of a section is specified in square brackets at the beginning -+of the section. On the command line the section is given at the -+beginning of the option specification, as shown in the synopsis above. -+.SS "CLIENT OPTIONS" -+.PP -+The following options are present in the client section of the config file, -+and overriden by specifying the client section name on the command line. -+.TP -+\fBpackage="define_world" \fR -+Python package which contains the client function. -+ -+This setting provides the name of the Python package which contains the -+function that should run by the client. -+.TP -+\fBfunction="default" \fR -+Python client function. -+ -+This setting provides the Python function which should be run by the client. -+.SS "SERVER OPTIONS" -+.PP -+The following options are present in the cyphesis section of the config -+file, and overriden by specifying the cyphesis section name on the -+command line. These options apply to the server, but are also required -+by the client to ensure that the client can connect. -+.TP -+\fBtcpport=6767 \fR -+Network port for server TCP connections. -+ -+Specifies the port number to use when connecting to the server. -+.TP -+\fBunixport="cyphesis.sock" \fR -+Local liston socket for Unix domain connections. -+ -+Specifies the filename to use to listen for local trusted client connections. -+.SH "AUTHOR" -+.PP -+Written by Alistair Riddoch. -+.SH "REPORTING BUGS" -+.PP -+Report bugs to <[email protected]>\&. -+.SH "COPYRIGHT" -+.PP -+Copyright 2004 Alistair Riddoch. -+.SH "SEE ALSO" -+.PP -+\fBcyphesis\fR(6), -+\fBcyphesis-tools\fR(6), -+\fBcycmd\fR(6) ---- /dev/null -+++ b/man/cycmd.6 -@@ -0,0 +1,274 @@ -+.\" This manpage has been automatically generated by docbook2man -+.\" from a DocBook document. This tool can be found at: -+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> -+.\" Please send any bug reports, improvements, comments, patches, -+.\" etc. to Steve Cheng <[email protected]>. -+.TH "CYCMD" "6" "18 November 2010" "" "cyphesis" -+ -+.SH NAME -+cycmd \- cycmd game server process -+.SH SYNOPSIS -+ -+\fBcycmd\fR [ \fB--section:option=value\fR\fI ...\fR ] [ \fBcommand [ server ]\fR ] -+ -+.SH "DESCRIPTION" -+.PP -+The \fBcycmd\fR program provides a commandline interface to a -+cyphesis server. -+.SH "OPTIONS" -+.PP -+Configuration options are divided up into named sections, which need to -+be specified when modifying or overriding the options. In a config file -+the name of a section is specified in square brackets at the beginning -+of the section. On the command line the section is given at the -+beginning of the option specification, as shown in the synopsis above. -+.SS "CLIENT OPTIONS" -+.PP -+The following options used by \fBcycmd\fR are present in the -+client section of the config file, and overriden by specifying the client -+section name on the command line. -+.TP -+\fBserverhost=hostname \fR -+Hostname of the server to connect to. -+ -+This setting provides the hostname of the system where cyphesis is running -+that \fBcycmd\fR should try and connect to. -+.SS "SERVER OPTIONS" -+.PP -+The following options are present in the cyphesis section of the config -+file, and overriden by specifying the cyphesis section name on the -+command line. These options apply to the server, but are also required -+by the client to ensure that the client can connect. -+.TP -+\fBtcpport=6767 \fR -+Network port for server TCP connections. -+ -+Specifies the port number to use when connecting to the server. -+.TP -+\fBunixport="cyphesis.sock" \fR -+Local liston socket for Unix domain connections. -+ -+Specifies the filename to use to listen for local trusted client connections. -+.SH "COMMANDS" -+.TP -+\fB add_agent [ type ] \fR -+Create an in-game agent. -+ -+Create an avatar or agent in the game to be used to manipulate the world. -+By default an avatar of type "creator" is created, and this is required for -+most operations. Avatars of other types can be created, but have limited -+ability to edit the world. -+.TP -+\fB cancel \fR -+Cancel the current admin task. -+ -+Various commands begin a background admin task in the client. This command -+stops any currently running task. -+.TP -+\fB connect hostname \fR -+Connect the server to a peer. -+ -+Try and establish a connection to a peer server. -+.TP -+\fB creator_create type \fR -+Use agent to create an entity. -+ -+Use the in-game agent owned by this client to create an in-game entity of any -+type. -+.TP -+\fB delete id \fR -+Delete an entity from the server. -+ -+Delete the in-game entity with the given ID from the world. -+.TP -+\fB dump [ filename ] \fR -+Write the contents of the world to an Atlas dump file. -+ -+An Atlas representation of every entity on the server is written to a file -+using the XML codec. -+.TP -+\fB get id \fR -+Examine any object on the server. -+ -+Get an object description from the server, and display its contents. -+.TP -+\fB find_by_name name \fR -+Find an entity with the given name. -+ -+Search the world for an entity with the given name, and return the first one -+found. -+.TP -+\fB find_by_type type \fR -+Find an entity with the given type. -+ -+Search the world for an entity with the given type, and return the first one -+found. -+.TP -+\fB flush type \fR -+Flush entities from the server -+ -+Search the world for entities with the given type, and delete them all. -+ -+This process does not work perfectly reliably, so may have to be run multiple -+times to fully clear the server. -+.TP -+\fB help \fR -+Display online help. -+ -+Lists all the commands available, with a short description of what each one -+does. -+.TP -+\fB install type_id parent_id \fR -+Install a new type in the server. -+ -+.TP -+\fB look \fR -+Return a view of the current server lobby. -+ -+Look at the current server lobby, where all users currently logged in -+are represented. The view is returned and displayed. -+.TP -+\fB logout [ account ] \fR -+Log user out of server. -+.TP -+\fB monitor \fR -+Enable server monitoring. -+ -+Direct the server to report all in-game operations to the client. A digest -+of each operation is displayed, including the type, which entity the operation -+is from and which entity the operation is to. -+.TP -+\fB query entity_id \fR -+Synonym for "get" (deprecated). -+.TP -+\fB reload type \fR -+Reload the script for a type. -+ -+Reload the Python script for a given type from the file on disk. -+.TP -+\fB restore [ filename ] \fR -+Restore the contents of an Atlas dump file into the world. -+ -+Read entities from an Atlas XML codec dump file, and restore them into the -+server. The most reliable use case for this is with an empty server to restore -+a snapshot of the world taken at an earlier time. -+ -+It is possible to restore a dump file into server which already contains a -+world, but the following caveats apply: -+ -+If there are collisions between the ID space being used in the existing world, -+and the ID space used in the dump file, the tool will do its best to do the -+right thing, but the results are to some extent undefined. If an entity with -+the same ID and type exists in both spaces, only one will exist after the -+restore and it will have some of the properties of both copies of that entity. -+.TP -+\fB stat \fR -+Examine the current server status. -+ -+Get a description of the current server status, and display its contents. -+.TP -+\fB unmonitor \fR -+Disable server monitoring. -+ -+Direct the server to stop reporting all in-game operations to the client. -+.SH "EXAMPLES" -+.PP -+The first example shows getting the current server status and checking -+the lobby to see if any users are logged in. -+ -+.nf -+cyphesis> stat -+Info( -+ builddate: 11:32:45, Sep 27 2004 -+ clients: 1 -+ name: calcitration.ecs.soton.ac.uk -+ objtype: obj -+ parents: [ server ] -+ ruleset: mason -+ server: cyphesis -+ uptime: 1728.2 -+ version: 0.3.2 -+) -+cyphesis> look -+Sight( -+ id: lobby -+ name: lobby -+ objtype: obj -+ parents: [ room ] -+ people: [ 1 ] -+ rooms: [ ] -+) -+cyphesis> -+ -+.fi -+.PP -+The first entity returned shows various information about the server, -+including when it was built, the number of connected client, the -+current ruleset, and the server uptime. The second entity representing -+the lobby shows that only one user is current logged in, and no chat -+rooms have been created. -+.PP -+The second example shows how to install a new type. -+ -+.nf -+cyphesis> get thing -+Info( -+ children: [ feature character plant food stackable structure arm arrow axe barrel block_house board boat boundary bow campfire cleaver coin fire gallows house lumber pelvis ribcage shin skull stall sword thigh tower twobyfour wall weather ] -+ contains: [ ] -+ id: thing -+ loc: -+ name: -+ objtype: class -+ parents: [ game_entity ] -+ pos: [ 0 0 0 ] -+ stamp_contains: 0 -+ velocity: [ 0 0 0 ] -+) -+cyphesis> install box thing -+cyphesis> -+ -+.fi -+.PP -+The third example shows server monitoring being enable, followed by information -+of a series of in-game operations. The flow of messages in while monitoring the -+server can be large. In order to supress the flow, the -+\fBunmonitor\fR command must be used. -+ -+.nf -+cyphesis> monitor -+cyphesis> -+tick(from="900006",to="900006") -+tick(from="900007",to="900007") -+cyphesis> -+tick(from="900008",to="900008") -+cyphesis> -+tick(from="899982",to="899982") -+cyphesis> -+tick(from="899356",to="899356") -+cyphesis> -+tick(from="899357",to="899357") -+cyphesis> -+tick(from="899358",to="899358") -+cyphesis> -+tick(from="899359",to="899359") -+cyphesis> -+tick(from="899360",to="899360") -+cyphesis> -+tick(from="899361",to="899361") -+cyphesis> -+ -+.fi -+.SH "AUTHOR" -+.PP -+Written by Alistair Riddoch. -+.SH "REPORTING BUGS" -+.PP -+Report bugs to <[email protected]>\&. -+.SH "COPYRIGHT" -+.PP -+Copyright 2004 Alistair Riddoch. -+.SH "SEE ALSO" -+.PP -+\fBcyphesis\fR(6), -+\fBcyclient\fR(6), -+\fBcyphesis-tools\fR(6) ---- /dev/null -+++ b/man/cyconvertrules.6 -@@ -0,0 +1 @@ -+.so man6/cyphesis-tools.6 ---- /dev/null -+++ b/man/cydumprules.6 -@@ -0,0 +1 @@ -+.so man6/cyphesis-tools.6 ---- /dev/null -+++ b/man/cyloadrules.6 -@@ -0,0 +1 @@ -+.so man6/cyphesis-tools.6 ---- /dev/null -+++ b/man/cypasswd.6 -@@ -0,0 +1 @@ -+.so man6/cyphesis-tools.6 ---- /dev/null -+++ b/man/cyphesis-tools.6 -@@ -0,0 +1,106 @@ -+.\" This manpage has been automatically generated by docbook2man -+.\" from a DocBook document. This tool can be found at: -+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> -+.\" Please send any bug reports, improvements, comments, patches, -+.\" etc. to Steve Cheng <[email protected]>. -+.TH "CYPHESIS-TOOLS" "6" "18 November 2010" "" "cyphesis" -+ -+.SH NAME -+cyconfig, cyconvertrules, cydumprules, cyloadrules, cypasswd \- cyphesis tools -+.SH SYNOPSIS -+ -+\fB/usr/bin/cyaddrules\fR [ \fB--section:option=value\fR\fI ...\fR ] [ \fBrulesetname atlas-xml-file\fR ] -+ -+ -+\fB/usr/bin/cyconfig\fR [ \fB--section:option=value\fR\fI ...\fR ] -+ -+ -+\fB/usr/bin/cyconvertrules\fR \fBrule_file\fR -+ -+ -+\fB/usr/bin/cydumprules\fR -+ -+ -+\fB/usr/bin/cyloadrules\fR [ \fB--section:option=value\fR\fI ...\fR ] [ \fBrulesetname atlas-xml-file\fR ] -+ -+ -+\fB/usr/bin/cypasswd\fR [ { \fB-a\fR | \fB-s\fR | \fB-d\fR } \fBaccount\fR ] -+ -+.SH "DESCRIPTION" -+.PP -+The cyphesis tools manage the data and configuration files used by cyphesis. -+.PP -+The \fBcyaddrules\fR tool uploads Atlas XML rules files into the -+a running server. If rules already exist in the server, then the default -+attributes are updated, and if the rule has a script associated with it, -+then the script is reloaded from file. \fBcyaddrules\fR can -+either upload the file given on the command line, or if none is specified it -+will upload the rule file for the ruleset specified in the server config, -+and any rule files it depends on. \fBcyaddrules\fR is typically -+used to add additional rules during rule development without having to -+restart the server. Rules can be loaded directly into a running server -+using \fBcyaddrules\fR\&. -+.PP -+The \fBcyconfig\fR program provides an easy scriptable way to -+make permanent changes to the server config from the command line. -+It works by writing new config options to \fI\&.cyphesis.vconf\fR -+in the users home directory, which is read by the server at startup, -+and overrides the contents of the main config file. For a description of -+the various options that the server takes, please see -+\fBcyphesis\fR(6)\&. -+.PP -+The \fBcyconvertrules\fR program converts Atlas XML rules files -+from an older historic format into the format used by cyphesis since -+version 0.3.1. -+.PP -+The \fBcydumprules\fR program dumps rules from the database table -+used by the server into a set of Atlas XML rules files. Note that this does -+not produce a set of files containing the same rules as those that were loaded -+in using \fBcyloadrules\fR because some of the rules in the -+rulesets that were not top level may have been overloaded, and do not exist -+in the database table. Typically this command will be used to get an updated -+copy of the top level ruleset from the server database, and the rest of the -+files will be ignored. -+.PP -+The \fBcyloadrules\fR tool loads Atlas XML rules files into the -+database table used by the server. The rules table is read by the -+server at startup, so a server restart is typically required after loading -+rules. \fBcyloadrules\fR can either load the file given on -+the command line, or if none is specified it will load the rule file for -+the ruleset specified in the server config, and any rule files it depends on. -+Rules can be loaded directly into a running server using -+\fBcyaddrules\fR\&. -+.PP -+The \fBcypasswd\fR tool is used to administrate the accounts table -+in the server database. -+.SH "OPTIONS" -+.PP -+The \fBcypasswd\fR can either add a new account, set the password -+of an existing account, or remove an account from the database. When no -+arguments are given, it prompts for a new admin password for cyphesis. -+When run with the \fB-a\fR option, the command prompts for a -+password to be entered and an account with the username given by \fBaccount\fR, -+and with the password supplied at the prompt is created. When run with the -+\fB-s\fR option, the command prompts for a password, and the -+existing account with username given by \fBaccount\fR has its password changed to -+the new one entered. When run with the \fB-d\fR option, the -+account with username given by \fBaccount\fR is removed from the database. -+.PP -+Whenever the \fBcypasswd\fR prompts for a password, a second -+prompt is displayed asking for confirmation of the password. If the two -+password entered do not match, the operation is aborted, and no changes are -+made to the database. -+.SH "AUTHOR" -+.PP -+Written by Alistair Riddoch. -+.SH "REPORTING BUGS" -+.PP -+Report bugs to <[email protected]>\&. -+.SH "COPYRIGHT" -+.PP -+Copyright 2004 Alistair Riddoch. -+.SH "SEE ALSO" -+.PP -+\fBcyphesis\fR(6), -+\fBcyclient\fR(6), -+\fBcycmd\fR(6) ---- /dev/null -+++ b/man/cyphesis.6 -@@ -0,0 +1,165 @@ -+.\" auto-generated by docbook2man-spec from docbook-utils package -+.TH "CYPHESIS" "6" "10 December 2010" "" "cyphesis" -+.SH NAME -+cyphesis \- cyphesis game server process -+.SH SYNOPSIS -+.sp -+\fB/usr/bin/cyphesis\fR [ \fB--section:option=value\fR\fI...\fR ] -+.SH "DESCRIPTION" -+.PP -+The \fBcyphesis\fR program implements the core world server for -+WorldForge. -+.SH "OPTIONS" -+.PP -+Configuration options are divided up into named sections, which need to -+be specified when modifying or overriding the options. In a config file -+the name of a section is specified in square brackets at the beginning -+of the section. On the command line the section is given at the -+beginning of the option specification, as shown in the synopsis above. -+.SS "SERVER OPTIONS" -+.PP -+The following options are present in the cyphesis section of the config -+file, and overriden by specifying the cyphesis section name on the -+command line. -+.TP -+\fBdirectory="/path/to/server/data"\fR -+Directory where server data and scripts can be found. -+ -+Name of the top level ruleset this server should use. -+ -+Normally this directory is set at compile time, but in some rare cases it -+may be necessary to tell cyphesis to use a different directory. -+.TP -+\fBconfdir="/path/to/server/config"\fR -+Directory where server config can be found. -+ -+Normally this directory is set at compile time, but in some rare cases it -+may be necessary to tell cyphesis to use a different directory. -+.TP -+\fBvardir="/path/to/server/var"\fR -+Directory where temporary files can be stored. -+ -+Normally this directory is set at compile time, but in some rare cases it -+may be necessary to tell cyphesis to use a different directory. -+.TP -+\fBruleset="mason"\fR -+Ruleset name. -+ -+Name of the top level ruleset this server should use. -+ -+Rulesets are hierarchical, so it is very probable that the top level ruleset -+will depend on another ruleset. In order to specify the that ruleset -+depends on another ruleset, a section is required in the config file with -+the name of the ruleset, which contains an additional ruleset option. -+On startup the server will look for dependent rulesets until it reaches -+a ruleset which has no dependencies, at which point it is assumed the base -+ruleset has been found. -+ -+For example, the mason ruleset depends on the basic ruleset, but the -+basic ruleset has no dependencies. The required configuration entries for -+this arrangement look like this: -+.sp -+.nf -+[cyphesis] -+ruleset="mason" -+[mason] -+ruleset="basic" -+ -+.sp -+.fi -+.TP -+\fBservername=hostname\fR -+Server name. -+ -+Name that identifies this server. If this option is ommited from the config -+file, and not provided any other way, then the system hostname will be used. -+.TP -+\fBtcpport=6767\fR -+Network listen port for TCP connections. -+ -+Specifies the port number to use to listen for incoming client connections. -+.TP -+\fBunixport="cyphesis.sock"\fR -+Local liston socket for Unix domain connections. -+ -+Specifies the filename to use to listen for local trusted client connections. -+.TP -+\fBrestricted=false\fR -+Flag to control restricted mode. -+ -+If this option is true the server is run in restricted mode. This -+means that clients will not be able to create new accounts, leaving -+account creation entirelu in the hands of the administrator. -+.TP -+\fBusemetaserver=true\fR -+Flag to control use of metaserver. -+ -+If this flag is true the server registers its presence with a metaserver. -+.TP -+\fBmetaserver="metaserver.worldforge.org"\fR -+Hostname to use as metaserver. -+ -+The hostname is used as the address of the metaserver where the presence of -+this server is registered if the usemetaserver option is enabled. -+.TP -+\fBdaemon=false\fR -+Flag to control daemon mode. -+ -+If this flag is true the server automatically drop into the background -+after startup. For convenience the parent process will not complete -+until the server has completed its setup, including reading all config -+information, loading all data from the database, setting up internal -+data structures and setting up communications. The exit status of the -+parent process indicates whether these steps were completed successfully. -+.TP -+\fBuseaiclient=false\fR -+Flag to control use of AI client. -+ -+If this flag is true the server does not attempt to do any AI simulation -+internally, and instead relies on a specialist AI client. This feature -+is not yet implemented. -+.TP -+\fBdbserver\fR -+Remote hostname for the PostgreSQL RDBMS. -+ -+If this setting is present the server will use a remote instance of the -+PostgreSQL RDBMS for its database requirements at the hostname provided. -+Do not use this setting unless you need a remote database for some -+reason. Specify "localhost" will cause the database module to use -+remote connection even though the connection is to the local machine. -+.TP -+\fBdbname="cyphesis"\fR -+Name of database to use. -+ -+This setting provides the database name the server is to use for its data. -+If this setting is omitted, the name cyphesis is used. -+.TP -+\fBdbuser\fR -+Database account name for access. -+ -+This setting provides the username to be used to authenticate with the -+database. If it is not included, the username of the user running the -+server is used. -+.TP -+\fBdbpasswd\fR -+Database account password for access. -+ -+This setting provides the password to be used to authenticate with the -+database. PostgreSQL does not usually require a password when connecting -+to a PostgreSQL RDBMS on the same system as the server, when the database -+username to be used is the same as the user running the server. If -+this is the case then the setting must be omitted from the config file. -+.SH "AUTHOR" -+.PP -+Written by Alistair Riddoch. -+.SH "REPORTING BUGS" -+.PP -+Report bugs to <[email protected]>\&. -+.SH "COPYRIGHT" -+.PP -+Copyright 2004 Alistair Riddoch. -+.SH "SEE ALSO" -+.PP -+\fBcyclient\fR(6), -+\fBcyphesis-tools\fR(6), -+\fBcycmd\fR(6) diff --git a/debian/patches/remove-generated-file.patch b/debian/patches/remove-generated-file.patch new file mode 100644 index 0000000..aa0d173 --- /dev/null +++ b/debian/patches/remove-generated-file.patch @@ -0,0 +1,20 @@ +Description: Remove generated file + Accidentally included in upstream source +Forwarded: not-needed +Author: Olek Wojnar <[email protected]> +Last-Update: 2016-09-4 + +--- a/server/buildid.cpp ++++ /dev/null +@@ -1,11 +0,0 @@ +-// This file was generated by gen_buildid.py +-// Do not edit +- +-#include "common/const.h" +- +-namespace consts { +- +- const char * buildTime = __TIME__; +- const char * buildDate = __DATE__; +- const int buildId = 2524; +-} diff --git a/debian/patches/series b/debian/patches/series index d392122..1ec5ea5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,6 @@ +remove-generated-file.patch disable-comm-peer-test.patch fix-broken-PythonArithmeticScripttest.patch -man_pages_to_section_6.patch add-missing-man-pages.patch -fix-broken-install-data-hook-target.patch do-not-register-with-metaserver.patch explicit-integer-instantiation.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/cyphesis-cpp.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
