config/README.1st

@@ -16,5 +16,5 @@ copy files out of here to where you need them.
 === UPDATE! ===
 
 Gentoo configuration has moved into the youbroketheinternet-overlay
-available from git://psyciumunsqarzsehz5xlgsi2mg4dkvntwf5bwj5kwbcbazwiuhna2ad.onion/youbroketheinternet-overlay
+available from git://cheettyiapsyciew.onion/youbroketheinternet-overlay
 

install.sh

@@ -51,7 +51,7 @@ If you are running gentoo/portage you should try out our beautiful ebuilds
 in the youbroketheinternet-overlay instead of this installation script.
 Stop it now and do this...
 
-torify git clone git://git.psyciumunsqarzsehz5xlgsi2mg4dkvntwf5bwj5kwbcbazwiuhna2ad.onion/youbroketheinternet-overlay
+torify git clone git://git.cheettyiapsyciew.onion/youbroketheinternet-overlay
 
 or this instead:
 

world/drivers/ldmud/library/library.c

@@ -21,9 +21,7 @@ inherit NET_PATH "library/tls";
 # ifdef SANDBOX
 inherit NET_PATH "library/sandbox";
 # endif
-# if __EFUN_DEFINED__(hmac)
 inherit NET_PATH "library/hmac";
-# endif
 inherit NET_PATH "library/dns";
 inherit NET_PATH "library/htbasics";
 inherit NET_PATH "library/json";

world/net/include/net.h

@@ -280,7 +280,7 @@
 // still using rawp anywhere?
 //#define	rawp(TEXT) { P1(("rawp? "+TEXT)) emit(TEXT); }
 
-#if __EFUN_DEFINED__(hmac) && defined(_flag_enable_module_microblogging)
+#ifdef _flag_enable_module_microblogging
 # if defined(TWITTER_KEY) && defined(TWITTER_SECRET)
 #  define TWITTER
 # endif

world/net/user.c

@@ -924,8 +924,9 @@ case "_status_place_members":
 //			  "_list_members_nicks" : t ]) );
 		// irc-thang: w(mc + "_end", 0, vars);
 //		return 1;
-#if __EFUN_DEFINED__(hmac) && defined(TELEPHONY_SECRET)
+#ifdef TELEPHONY_SECRET
 # include <sys/tls.h>
+
 case "_notice_answer_call_click":
 case "_notice_answer_call":
 		t = vars["_time_expire"];
@@ -942,7 +943,9 @@ case "_notice_answer_call":
 		t3 = NET_PATH "http/call"->make_session(MYNICK, to_int(t), t3);
 		w("_notice_answer_call_link", 0, ([
                     "_page_call": (
+#ifdef __TLS__
                         (tls_available() && HTTPS_URL) ||
+#endif
                         HTTP_URL) + NET_PATH +"http/call?thats=me&sid=" +t3,
 # ifdef TELEPHONY_SERVER
                     "_uniform_call": TELEPHONY_SERVER + t2,

world/net/usercmd.i

@@ -639,7 +639,7 @@ cmd(a, args, dest, command) {
   "The PSYC authentication token \"[_nonce]\" is now valid. Use it wisely.",
 		  ([ "_nonce" : v("nonce") ]));
 		break;
-#if __EFUN_DEFINED__(hmac) && defined(TELEPHONY_SECRET)
+#ifdef TELEPHONY_SECRET
 # include <sys/tls.h>
 # ifndef TELEPHONY_EXPIRY
 #  define TELEPHONY_EXPIRY (60*60)