From e9bcf119da6b66b322d587ef7021300c088a3051 Mon Sep 17 00:00:00 2001
From: Konrad Rosenbaum <konrad@silmor.de>
Date: Sun, 21 Jul 2013 22:28:43 +0200
Subject: [PATCH] include more aurora deps, hide passwords from log

---
 Makefile               |   30 +++++++++++++++++++-----------
 magicsmoke.aurora      |    4 ++++
 pack                   |    2 +-
 taurus                 |    2 +-
 wob/transact/user.wolf |    8 ++++----
 5 files changed, 29 insertions(+), 17 deletions(-)
 create mode 100644 magicsmoke.aurora

diff --git a/Makefile b/Makefile
index 1f641c6..2720c0b 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 
 #change this if the correct Qt is not in your PATH
 QMAKE = qmake
-#QMAKE = /usr/local/Trolltech/Qt-4.8.0/bin/qmake
+#QMAKE = /usr/local/Qt-5.1.0/bin/qmake
 
 #set this if you want additional arguments to qmake
 # normally only a spec is usefule for this, see below
@@ -63,7 +63,7 @@ none:
 	@echo "  server - build the server (in Unix mode)"
 	@echo "  all - build everything (in Unix mode)"
 	@echo "  debug - build client in debug mode"
-	@echo "  macosx - build the client and server on MacOS/X"
+#	@echo "  macosx - build the client and server on MacOS/X"
 	@echo "Documentation, Translation:"
 	@echo "  sdoc - generate source docu, needs doxygen"
 	@echo "  lupdate - update translation source files"
@@ -105,6 +105,9 @@ client: wob taurus tzone wbase
 taurus:
 	cd taurus && $(QMAKE) $(QMCFG) $(QMAKEFLAGS) && $(MAKE)
 	cp -a taurus/lib/* bin/
+	-cp -a taurus/aurora/gpg/bin/gpg bin/
+	-cp -a taurus/aurora/gpg/bin/gpg.exe bin/
+	cp -a taurus/aurora/gpg/lib/* bin/
 
 tzone:
 	cd tzone && $(QMAKE) $(QMCFG) $(QMAKEFLAGS) && $(MAKE)
@@ -152,13 +155,16 @@ install-doc: sdoc
 clean:
 	-rm -rf src/.ctmp src/Makefile* src/msmoke
 	-rm -rf src/wob www/inc/wob doc/wob wob/core*
-	$(MAKE) -C pack clean
-	$(MAKE) -C taurus clean
+	-$(MAKE) -C pack clean
+	-$(MAKE) -C taurus clean
+	-$(MAKE) -C mainapp clean
 	-rm -rf tzone/zoneinfo* tzone/libQtTzData* tzone/Makefile* tzone/.ctmp
 	-rm -rf doc/source-php doc/source-cpp
+	-rm -rf taurus/lib/*
 	-rm -rf `find . -name '*~'`
 	-rm -rf `find . -name '*.bak'`
 	-rm -rf `find . -name 'core*'`
+	-rm -rf `find . -name '.ctmp'`
 	-rm -rf bin
 
 distclean: clean
@@ -168,14 +174,16 @@ debug: client server
 
 ##installation packages
 
-macosx: MAKE=xcodebuild
-macosx: client server lrelease
-	cd src ; cp *.qm msmoke.app/Contents/MacOS
-	cd src ; for i in *.qm ; do cp -f $(QTTRANS)/qt$${i#smoke} msmoke.app/Contents/MacOS || true ; done
-	cd src ; rm -f msmoke.dmg ; macdeployqt msmoke.app -dmg
-	@echo "....."
-	@echo "You find the package in src/msmoke.dmg"
+#MacOS is currently not supported
+#macosx: MAKE=xcodebuild
+#macosx: client server lrelease
+#	cd src ; cp *.qm msmoke.app/Contents/MacOS
+#	cd src ; for i in *.qm ; do cp -f $(QTTRANS)/qt$${i#smoke} msmoke.app/Contents/MacOS || true ; done
+#	cd src ; rm -f msmoke.dmg ; macdeployqt msmoke.app -dmg
+#	@echo "....."
+#	@echo "You find the package in src/msmoke.dmg"
 
+#TODO: fix this for MS 2.x
 nsis: script client
 	echo !define QTDIR / >qtpath.nsh
 	$(QMAKE) -query QT_INSTALL_PREFIX >>qtpath.nsh
diff --git a/magicsmoke.aurora b/magicsmoke.aurora
new file mode 100644
index 0000000..919640f
--- /dev/null
+++ b/magicsmoke.aurora
@@ -0,0 +1,4 @@
+<AuroraInfo>
+        <CurrentVersion buildDate="2013-01-21" installDate="2013-01-22" version="1.99beta"/>
+        <Settings baseurl="http://localhost/~konrad" indexfile="magicsmoke.xml" pollinterval="30"/>
+</AuroraInfo>
diff --git a/pack b/pack
index 4ccb7a2..3b929b9 160000
--- a/pack
+++ b/pack
@@ -1 +1 @@
-Subproject commit 4ccb7a2b5d235d5dadf502a82990fb77a467db78
+Subproject commit 3b929b9cf42e562a7e5e2ea2208086c81bfc52cc
diff --git a/taurus b/taurus
index 7e63283..a7c9d4c 160000
--- a/taurus
+++ b/taurus
@@ -1 +1 @@
-Subproject commit 7e6328381dbf9b738dafb7647e21cfe0c146c131
+Subproject commit a7c9d4c44216478ae7542d99feda16381ceb994c
diff --git a/wob/transact/user.wolf b/wob/transact/user.wolf
index 5af96db..e24df09 100644
--- a/wob/transact/user.wolf
+++ b/wob/transact/user.wolf
@@ -18,7 +18,7 @@
 		</Output>
 	</Transaction>
 	
-	<Transaction name="Login" mode="open">
+	<Transaction name="Login" mode="open" nolog="request">
 		<Doc>Attempt to log into the server. Both the user and the host the user is using are verified. The login will fail if the authentication of either of them fails or the user does not have the righ to login from this host.</Doc>
 		<Input>
 			<Var name="username" type="string">name of the user</Var>
@@ -58,7 +58,7 @@
 		</Output>
 	</Transaction>
 	
-	<Transaction name="ChangeMyPassword">
+	<Transaction name="ChangeMyPassword" nolog="request">
 		<Doc>Changes the password of the user of the current session. This may fail if the old password does not match or the new password is too weak.</Doc>
 		<Input>
 			<Var name="oldpassword" type="string">this must match the old password of the user to authenticate the change</Var>
@@ -87,7 +87,7 @@
 		</Output>
 	</Transaction>
 	
-	<Transaction name="CreateUser">
+	<Transaction name="CreateUser" nolog="request">
 		<Doc>Attempts to create a new user. This may fail if the user already exists.</Doc>
 		<Input>
 			<Var name="username" type="astring"/>
@@ -100,7 +100,7 @@
 		</Output>
 	</Transaction>
 	
-	<Transaction name="ChangePassword">
+	<Transaction name="ChangePassword" nolog="request">
 		<Doc>Admins: change/reset the password of a specific user. To be used when a user forgot his/her password.</Doc>
 		<Input>
 			<Var name="username" type="astring"/>
-- 
1.7.2.5