psyc-mirrors
/
psyced
mirror of git://git.psyced.org/git/psyced
1
0
Fork 0
Code Issues 2 Releases Wiki Activity

Compare commits

base: psyc-mirrors:d04fd7e10507addca3201caa27270314560e603c
Branches Tags
psyc-mirrors:master
psyc-mirrors:psyced-20160525
..
compare: psyc-mirrors:9441f0758a4d8a76dac791afa4ebe44ad6c34e69
Branches Tags
psyc-mirrors:master
psyc-mirrors:psyced-20160525

No commits in common. "d04fd7e10507addca3201caa27270314560e603c" and "9441f0758a4d8a76dac791afa4ebe44ad6c34e69" have entirely different histories.
d04fd7e105 ... 9441f0758a

6 changed files with 8 additions and 7 deletions
Show Stats Expand all files Collapse all files

2
config/README.1st
View File

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

2
install.sh
View File

@ -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. in the youbroketheinternet-overlay instead of this installation script.
Stop it now and do this... 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: or this instead:

2
world/drivers/ldmud/library/library.c
View File

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

2
world/net/include/net.h
View File

@ -280,7 +280,7 @@
// still using rawp anywhere? // still using rawp anywhere?
//#define rawp(TEXT) { P1(("rawp? "+TEXT)) emit(TEXT); } //#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) # if defined(TWITTER_KEY) && defined(TWITTER_SECRET)
# define TWITTER # define TWITTER
# endif # endif

5
world/net/user.c
View File

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

2
world/net/usercmd.i
View File

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