# HG changeset patch # User pragmo # Date 1284036563 0 # Node ID 85efc932b07fb1561ab93cebe3e8723cf6918461 # Parent ad89a50f816e892e8d4f6d3622b8209a0cd54525# Parent fcaccafbb5d7a0336720e76080762ace1babf899 Merge branch 'master' of git://git1.somerandomnick.ano diff -r ad89a50f816e -r 85efc932b07f db/as/111/owner --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/as/111/owner Thu Sep 09 12:49:23 2010 +0000 @@ -0,0 +1,1 @@ +wakawaka diff -r ad89a50f816e -r 85efc932b07f db/as/63999/owner --- a/db/as/63999/owner Thu Sep 09 12:42:33 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -wakawaka diff -r ad89a50f816e -r 85efc932b07f db/usr/wakawaka/email --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/usr/wakawaka/email Thu Sep 09 12:49:23 2010 +0000 @@ -0,0 +1,1 @@ +mail@wakawaka.ano diff -r ad89a50f816e -r 85efc932b07f db/usr/wakawaka/git --- a/db/usr/wakawaka/git Thu Sep 09 12:42:33 2010 +0000 +++ b/db/usr/wakawaka/git Thu Sep 09 12:49:23 2010 +0000 @@ -1,1 +1,1 @@ -git://1.0.111.1/.git/ +git://wakawaka.ano/.git/ diff -r ad89a50f816e -r 85efc932b07f db/usr/wakawaka/gpg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/usr/wakawaka/gpg Thu Sep 09 12:49:23 2010 +0000 @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.16 (GNU/Linux) + +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 +1RsWdKAsAA== +=YqLE +-----END PGP PUBLIC KEY BLOCK----- diff -r ad89a50f816e -r 85efc932b07f doc/www.anonet2.org/public_pod/Makefile --- a/doc/www.anonet2.org/public_pod/Makefile Thu Sep 09 12:42:33 2010 +0000 +++ b/doc/www.anonet2.org/public_pod/Makefile Thu Sep 09 12:49:23 2010 +0000 @@ -1,4 +1,4 @@ -all: index.html links.html faq.html darknet_comparison.html anonymity.html +all: index.html links.html faq.html darknet_comparison.html anonymity.html intro.html %.html: %.pod pod2html --noindex < $< 2>/dev/null > $@.tmp diff -r ad89a50f816e -r 85efc932b07f doc/www.anonet2.org/public_pod/index.pod --- a/doc/www.anonet2.org/public_pod/index.pod Thu Sep 09 12:42:33 2010 +0000 +++ b/doc/www.anonet2.org/public_pod/index.pod Thu Sep 09 12:49:23 2010 +0000 @@ -10,116 +10,65 @@ (Note: There's now a separate page (L), to answer all your AnoNet-related questions.) -So, you came across anoNet and thought it sounded great, so you decided -to join in order to check it out. +A quick introduction to darknets and anonymity in general and AnoNet2 in particular, is now on a separate page (L). + +=head2 How to Join -...and found the (only) client port doesn't work half the time, +There are many ways to join AnoNet. If you just want to hang out with +us and chat, it's very easy: -...and most of the advertised services no longer exist, +=over -...and most of the people have left, +=item webchat + +L -...and those who are left can hardly be classified as friendly, +=item telnet chat -...and so you left, and perhaps found another darknet instead. +L + +=item IRC chat -Well, you're not the only one who's been turned off, and a few of us -have decided to take action and fix AnoNet. Some of us are relatively -new, while others joined AnoNet1 years ago, and left out of disgust. -A number of features set version 2 apart from the original: +L + +=back + +If you're feeling adventurous enough to connect, UFO has a client port +at L. + +Once you're online, you can reconnect to IRC from inside AnoNet: =over -=item No false advertising +=item IRC -If you see something advertised here, it exists. You won't see stuff -that hasn't been up in years here. (This page is easy to update from -within AnoNet2 by anybody who has an update/correction to make, and -changes normally propagate within no more than a few days.) +L -=item No centralized network control +=item IRC -You don't have to worry about Kaos waking up one morning and blocking -your access to the whole network by deciding to filter private ASNs. -You also don't have to worry about a couple of powerful guys getting -together and "blacklisting" you from the network for some unspecified -reason with an inquisition against your peers. - -=item No centralized IRC control +L +(L, if you don't have +DNS for some reason) -You don't have to worry about risc g-lining you from the "official" IRC -network for no apparent reason, and refusing to even admit to having -g-lined you. Since the whole purpose behind AnoNet was to create a -censorship-resistant alternative to the government-censored "public" -Internet, arbitrary censorship on the "official" AnoNet1 IRC network by -anonymous government members is particularly troubling. AnoNet2 has -no "official" IRC network, and the servers most commonly used have -interesting channels bridged with a relay bot, so even if you manage to -annoy an IRC server operator to the point where he decides to g-line you -from his whole "network," that doesn't automatically prevent you from -connecting to another server and accessing one of the bridged channels. -(Obviously, if you manage to annoy the operators of all the linked servers -to the point where all of them g-line you from their respective "networks" -and nobody wants to let you relay your own server in, then you're probably -out of luck. Of course, that doesn't prevent you from running your own -IRC server, and those who want to hear you can still join it.) +=item IRC -=item No resource mess +L (L, for the same reason as before and if you want you can use SSL on port 6697) + +=item telnet -We have one mechanism for resource management, a decentralized (not just -distributed, but truly decentralized) resource database. You don't have -to deal with half a zillion incompatible (and in the case of the wiki, -down) services, run by guys who may not even be on the AnoNet tomorrow. -Managing your resources is as simple as taking a VI to the appropriate -files, doing a "git commit," and then just waiting for everybody else to -pull your changes (either directly from you, or indirectly from others -who pull from you). +L -=item No arbitrary rules +=item Jabber -If you read the advertising for AnoNet, you probably think it's whatever -you make of it. Sadly, there's a tiny handful of people who have control -over most of the network, and make new (unwritten) rules whenever the -mood strikes them. The sum of those rules is that AnoNet is whatever -I make of it. In version 2, we've undertaken to fix that, by both -technical and administrative means. AnoNet2 not only has no arbitrary -rules - it has no rules whatsoever. +irc.somerandomnick.ano (RendezVous MUC) =back -=head2 How to Join - -Disclaimer: If the following paragraph makes no sense to you, you can -join our webchat at L to have a -real human help you get up and running in a hurry. It's a lot easier -(and not half as boring) to learn the technical details interactively, -once you're online. - -Joining is pretty simple: If you know how to connect to a -client port, UFO's CP (L -or L) will already -land you in the right place. (Once you're online, you -can join "the club" at L, -or L -(L, if you don't have -DNS for some reason), or L -(L, for the same reason as before and if you -want you can use SSL on port 6697). If you don't have an IRC client handy -(or if you're too lazy to set it up to avoid leaking your real info), -you can just telnet over to L -(or L, from the outside). Alternatively, -you can point your Jabber client over to irc.somerandomnick.ano, or you -can even use Jabber s2s to talk with everybody else by just joining the -MUC room RendezVouz at irc.somerandomnick.ano.) If OpenVPN is all Greek -to you, UFO's IRC server is also reachable from the public Internet -(L). If IRC is all Greek to you, -you may want to talk to your favorite search engine about that, or just -use KwaakNet's Webchat (L). -(Note that if your only aim in joining AnoNet is to search Google +Note that if your only aim in joining AnoNet is to search Google anonymously, you can save yourself the hassle by just heading over to Scroogle (L). If you're looking to browse the rest of the public Internet anonymously, though, we now have outbound -proxies, which you're more than welcome to use.) +proxies, which you're more than welcome to use. =head2 Why to Join diff -r ad89a50f816e -r 85efc932b07f doc/www.anonet2.org/public_pod/intro.pod --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/www.anonet2.org/public_pod/intro.pod Thu Sep 09 12:49:23 2010 +0000 @@ -0,0 +1,88 @@ +=head1 AnoNet2 Introduction + +(Note: There's now a page (L) explaining +a bit about anonymity in general and its place in AnoNet in particular.) + +(Note: There's now a darknet comparison page +(L), where you can compare +and contrast the various darknet options.) + +(Note: There's now a separate page (L), +to answer all your AnoNet-related questions.) + +So, you came across anoNet and thought it sounded great, so you decided +to join in order to check it out. + +...and found the (only) client port doesn't work half the time, + +...and most of the advertised services no longer exist, + +...and most of the people have left, + +...and those who are left can hardly be classified as friendly, + +...and so you left, and perhaps found another darknet instead. + +Well, you're not the only one who's been turned off, and a few of us +have decided to take action and fix AnoNet. Some of us are relatively +new, while others joined AnoNet1 years ago, and left out of disgust. +A number of features set version 2 apart from the original: + +=over + +=item No false advertising + +If you see something advertised here, it exists. You won't see stuff +that hasn't been up in years here. (This page is easy to update from +within AnoNet2 by anybody who has an update/correction to make, and +changes normally propagate within no more than a few days.) + +=item No centralized network control + +You don't have to worry about Kaos waking up one morning and blocking +your access to the whole network by deciding to filter private ASNs. +You also don't have to worry about a couple of powerful guys getting +together and "blacklisting" you from the network for some unspecified +reason with an inquisition against your peers. + +=item No centralized IRC control + +You don't have to worry about risc g-lining you from the "official" IRC +network for no apparent reason, and refusing to even admit to having +g-lined you. Since the whole purpose behind AnoNet was to create a +censorship-resistant alternative to the government-censored "public" +Internet, arbitrary censorship on the "official" AnoNet1 IRC network by +anonymous government members is particularly troubling. AnoNet2 has +no "official" IRC network, and the servers most commonly used have +interesting channels bridged with a relay bot, so even if you manage to +annoy an IRC server operator to the point where he decides to g-line you +from his whole "network," that doesn't automatically prevent you from +connecting to another server and accessing one of the bridged channels. +(Obviously, if you manage to annoy the operators of all the linked servers +to the point where all of them g-line you from their respective "networks" +and nobody wants to let you relay your own server in, then you're probably +out of luck. Of course, that doesn't prevent you from running your own +IRC server, and those who want to hear you can still join it.) + +=item No resource mess + +We have one mechanism for resource management, a decentralized (not just +distributed, but truly decentralized) resource database. You don't have +to deal with half a zillion incompatible (and in the case of the wiki, +down) services, run by guys who may not even be on the AnoNet tomorrow. +Managing your resources is as simple as taking a VI to the appropriate +files, doing a "git commit," and then just waiting for everybody else to +pull your changes (either directly from you, or indirectly from others +who pull from you). + +=item No arbitrary rules + +If you read the advertising for AnoNet, you probably think it's whatever +you make of it. Sadly, there's a tiny handful of people who have control +over most of the network, and make new (unwritten) rules whenever the +mood strikes them. The sum of those rules is that AnoNet is whatever +I make of it. In version 2, we've undertaken to fix that, by both +technical and administrative means. AnoNet2 not only has no arbitrary +rules - it has no rules whatsoever. + +=back diff -r ad89a50f816e -r 85efc932b07f scripts/head_-c_-1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/head_-c_-1 Thu Sep 09 12:49:23 2010 +0000 @@ -0,0 +1,9 @@ +#!/bin/sh + +#This script is necessary because head from GNU textutils 2.0 (on Borg's +# machine) doesn't implement negative arguments for the -n and -c options. + +#FIXME: The emulation here fails if there's a newline at the end: +#sed '$s/.$//' + +rev | tac | dd bs=1 skip=1 status=noxfer 2>/dev/null | tac | rev