Merge commit 'origin'

CHANGESTODO

@@ -12,6 +12,9 @@ ________________________________________________________________________
 
 - pointless to keep gentoo files in this git, if they can't be updated
   separately
+
++ teach net/smtp to trust localhost etc.
++ teach net/smtp to ask recipient object if spam rules are to be applied
 ________________________________________________________________________
 == currently being inspected ===========================================
 ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
@@ -1377,6 +1380,11 @@ ________________________________________________________________________
 ! When the /topic command makes funny errors, then your room has a custom
   cmd() and doesn't pass vars over. It should use ON_COMMAND instead!
 
+________________________________________________________________________
+* PSYC FUTURES		    see also http://about.psyc.eu/Category:Vapor
+¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
++ http://about.psyc.eu/Hashtags
++ http://about.psyc.eu/Follower
 ________________________________________________________________________
 * TOYS IN THE ATTIC
 ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
@@ -3886,3 +3894,4 @@ spyc/* psyc/*
 +	should a _date type run on unixtime minus PSYC_EPOCH?
 install.sh
 +	don't leave _host_IP uncommented
++	mkdir data/* log/*

world/default/en/jabber.textdb

@@ -1,6 +1,12 @@
 <PSYC:TEXTDB> ## vim:syntax=mail
 ## Check utf-8: Praise Atatürk!
 
+_notice_add_alias_temporary
+|## shouldn't be sent to jabber clients
+
+_failure_unavailable_alias
+|## shouldn't be sent to jabber clients
+
 _MISC_character_command
 |## since several clients started catching / commands..
 |+

world/net/include/place.gen

@@ -146,7 +146,7 @@ inherit NET_PATH "place/mailcast";
 #           ifdef PUBLIC
 inherit NET_PATH "place/public";
 #           else
-	     // special case in the archetype options logic, see also the .pl
+	     // special case in the archetype options logic, see also psyconf
 #	     ifndef PLACE_HISTORY
 #	      ifdef PLACE_HISTORY_EXPORT
 #	       define PLACE_HISTORY

world/net/person.c

@@ -2515,6 +2515,10 @@ reboot(reason, restart, pass) {
 	//unless (clonep(ME)) return;
 	if (blueprint(ME) == ME) return;
 	P2(("%O shutting down\n", ME))
+
+	// temporary, please remove after 2009-04
+	if (!v("locations")) vSet("locations", ([]));
+
 #if !defined(SLAVE) && !defined(_flag_disable_info_session)
 	if (ONLINE) {
 	    // same in net/psyc/circuit.c