Merge commit 'e8cb9da4f1c911c1ce9eda54e92404dc95a7b648'

6 files changed, 169 insertions, 14 deletions

diff --git a/contrib/peer2anonet/README.html b/contrib/peer2anonet/README.html
index 4fb5721..0bf6db8 100644
--- a/contrib/peer2anonet/README.html
+++ b/contrib/peer2anonet/README.html
@@ -32,6 +32,9 @@
     export http_proxy='http://127.0.0.1:8118/'
     ./contrib/peer2anonet/peer2anonet --install-*
 
+    You can use torify or usewithtor on most options
+    but setting http_proxy is more reliable.
+
     torify ./contrib/peer2anonet/peer2anonet --install-*
 
     usewithtor ./contrib/peer2anonet/peer2anonet --install-*
@@ -116,6 +119,28 @@
     enjoy to use `--update-dns' to bring your AnoNet
     domains up to speed.
 
+<b>SETUP QMAIL:</b>
+
+    <b>WARN:</b>
+
+        You should patch or firewall off qmail from
+        reaching IcannNet so someone cannot harvest
+        your IP with the mailerdaemon response.
+
+    If you did not ./configure resdb with tinydns support
+    then you need to do that before using this function.
+
+    also before using you will need to have installed
+    daemontools, djbdns, and ucspi-tcp. peer2anonet
+    can do this for you with --install-* options.
+
+    setup-qmail will download and install qmail if it
+    isn't already installed and configure your
+    mx domain as a.mx.$nick.ano with the ip of your
+    resdb git-daemon ip.
+
+    ./contrib/peer2anonet/peer2anonet --setup-qmail
+
 <b>COMPLAIN:</b>
 
     If this README doesn't tell you what you need to know
diff --git a/contrib/peer2anonet/peer2anonet b/contrib/peer2anonet/peer2anonet
index 657557a..0f0564c 100755
--- a/contrib/peer2anonet/peer2anonet
+++ b/contrib/peer2anonet/peer2anonet
@@ -25,6 +25,7 @@ USAGE(){
     echo -e '\n    ./contrib/peer2anonet/peer2anonet --install-ucspi-tcp     installs ucspi-tcp'
     echo -e '\n    ./contrib/peer2anonet/peer2anonet --install-djbdns        installs djbdns'
     echo -e '\n    ./contrib/peer2anonet/peer2anonet --install-nacl          installs nacl'
+    echo -e '\n    ./contrib/peer2anonet/peer2anonet --setup-qmail           installs and configures qmail'
     echo -e '\n    ./contrib/peer2anonet/peer2anonet --configure-dns         configures dnscache and tinydns zones'
     echo -e '\n    ./contrib/peer2anonet/peer2anonet --update-dns            updates tinydns-ano zone\n'
     exit 0
@@ -370,15 +371,140 @@ INSTALL_UCSPI_TCP(){
     make setup check
     }
 
+SETUP_QMAIL(){
+    echo -e '\nSETUP QMAIL:\n'
+
+    echo -e '\tWARN:\n'
+    echo -e '\tYou should patch or firewall off qmail from'
+    echo -e '\treaching IcannNet so someone cannot harvest'
+    echo -e '\tyour IP with the mailerdaemon response.'
+
+    [[ $(echo X`which gcc`) == X ]] && echo '   fatal error: cannot find gcc'
+    [[ $(echo X`which gcc`) == X ]] && exit 1
+    [[ $(echo X`which make`) == X ]] && echo '   fatal error: cannot find make'
+    [[ $(echo X`which make`) == X ]] && exit 1
+    [[ $(echo X`which tcpserver`) == X ]] && echo '   fatal error: needs ./contrib/peer2anonet/peer2anonet --install-ucspi-tcp'
+    [[ $(echo X`which tcpserver`) == X ]] && exit 1
+    [[ $(echo X`which svscanboot`) == X ]] && echo '   fatal error: needs ./contrib/peer2anonet/peer2anonet --install-daemontools'
+    [[ $(echo X`which svscanboot`) == X ]] && exit 1
+
+    NICK=`cat conf/git_name` || exit 1
+    MX_IP=`cat conf/gitd_ip` || exit 1
+    MX_DOMAIN="a.mx.$NICK.ano" || exit 1
+
+    if [ -e /services/tinydns ]; then
+        ( 
+            cd /services
+            echo "creating /etc/peer2anonet/tinydns.tar backup"
+            tar cf /etc/peer2anonet/tinydns.tar tinydns
+            echo "@$NICK.ano:$MX_IP:a:12801:86400">>/services/tinydns/root/data
+        )
+    else
+        echo '   fatal error: needs ./contrib/peer2anonet/peer2anonet --configure-dns'
+        exit 1
+    fi
+
+    ( 
+        cd /services/tinydns/root
+        make
+        cd /service
+        sleep 5
+        svc -t dnscache tinydns tinydns-ano tinydns-root
+    )
+
+    useradd qmaillog || exit 1
+
+    if [ -w /etc/rc.local ]; then
+        if [[ $(cat /etc/rc.local) != *"ip addr add $MX_IP/32 dev lo &"* ]]; then
+            echo "ip addr add $MX_IP/32 dev lo &" >> /etc/rc.local
+        fi
+    elif [ -w /etc/rc.d/rc.local ]; then
+        if [[ $(cat /etc/rc.d/rc.local) != *"ip addr add $MX_IP/32 dev lo &"* ]]; then
+            echo "ip addr add $MX_IP/32 dev lo &" >> /etc/rc.d/rc.local
+        fi
+    else
+        echo "   fatal error: cannot reliably assign ip's to startup"
+        exit 1
+    fi
+
+    ip addr add $MX_IP/32 dev lo > /dev/null 2>&1
+
+    if [ -e '/var/qmail/bin/qmail-qmtpd' ] || ! [ -e '/var/qmail/bin/qmail-smtpd' ]; then
+        cd /usr/local/src
+        wget http://www.srn.ano/software/qmail-1.03.tar.gz
+        tar xzf qmail-1.03.tgz
+        cd qmail-1.03
+        unset http_proxy
+        wget -O- http://www.srn.ano/patches/qmail-1.03-qmtpc.patch | patch -p1
+        mkdir /var/qmail
+        groupadd nofiles
+        useradd -g nofiles -d /var/qmail/alias alias
+        useradd -g nofiles -d /var/qmail qmaild
+        useradd -g nofiles -d /var/qmail qmaill
+        useradd -g nofiles -d /var/qmail qmailp
+        groupadd qmail
+        useradd -g qmail -d /var/qmail qmailq
+        useradd -g qmail -d /var/qmail qmailr
+        useradd -g qmail -d /var/qmail qmails
+        sed -i 's/gcc/gcc -include errno.h/g' conf-cc
+        make setup check
+        ./config-fast $MX_DOMAIN
+        echo yourdomain.ano >>/var/qmail/control/locals
+        echo yourdomain.ano >>/var/qmail/control/rcpthosts
+        (cd ~alias; touch .qmail-postmaster .qmail-mailer-daemon .qmail-root)
+        chmod 644 ~alias/.qmail*
+    fi
+
+    mkdir -p /services/qmail
+    mkdir -p /services/qmail/log
+    mkdir -p /services/qmail/log/main
+    chown qmaillog /services/qmail/log/main
+    echo -e '#!/bin/sh\nexec env - PATH="/var/qmail/bin:/usr/local/bin:/usr/bin:/bin" qmail-start ./Mailbox' >/services/qmail/run
+    chmod +x /services/qmail/run
+    echo -e '#!/bin/sh\nexec setuidgid qmaillog multilog t s10000 n4 ./main' >/services/qmail/log/run
+    chmod +x /services/qmail/log/run
+
+    ( cd / ; ln -s /services/qmail /service )
+
+    mkdir -p /services/qmail-smtpd
+    mkdir -p /services/qmail-smtpd/log
+    mkdir -p /services/qmail-smtpd/log/main
+    chown qmaillog /services/qmail-smtpd/log/main
+    echo -e echo -e '#!/bin/sh\nexec envuidgid qmaild tcpserver -U -c 100 '$MX_IP' smtp /var/qmail/bin/qmail-smtpd' >/services/qmail-smtpd/run
+    chmod +x /services/qmail-smtpd/run
+    echo -e '#!/bin/sh\nexec setuidgid qmaillog multilog t s10000 n4 ./main' >/services/qmail-smtpd/log/run
+    chmod +x /services/qmail-smtpd/log/run
+
+    ( cd / ; ln -s /services/qmail-smtpd /service )
+
+    mkdir -p /services/qmail-qmtpd
+    mkdir -p /services/qmail-qmtpd/log
+    mkdir -p /services/qmail-qmtpd/log/main
+    chown qmaillog /services/qmail-qmtpd/log/main
+    echo -e echo -e '#!/bin/sh\nexec envuidgid qmaild tcpserver -U -c 100 '$MX_IP' qmtp /var/qmail/bin/qmail-qmtpd' >/services/qmail-qmtpd/run
+    chmod +x /services/qmail-qmtpd/run
+    echo -e '#!/bin/sh\nexec setuidgid qmaillog multilog t s10000 n4 ./main' >/services/qmail-qmtpd/log/run
+    chmod +x /services/qmail-qmtpd/log/run
+
+    ( cd / ; ln -s /services/qmail-qmtpd /service )
+
+    (
+        cd /
+        [ -e /usr/sbin/sendmail ] && mv /usr/sbin/sendmail /usr/sbin/sendmail.bak
+        ln -s /var/qmail/bin/sendmail /usr/sbin/sendmail
+    )
+
+    echo 'export MAIL=~/Mailbox' >>/etc/profile
+
 INSTALL_DJBDNS(){
     echo -e '\nINSTALL DJBDNS:\n'
     [[ $(echo X`which gcc`) == X ]] && echo '   fatal error: cannot find gcc'
     [[ $(echo X`which gcc`) == X ]] && exit 1
     [[ $(echo X`which make`) == X ]] && echo '   fatal error: cannot find make'
     [[ $(echo X`which make`) == X ]] && exit 1
-    [[ $(echo X`which tcpserver`) == X ]] && echo '   fatal error: needs ./contrib/peer2anonet/peer2nonet --install-ucspi-tcp'
+    [[ $(echo X`which tcpserver`) == X ]] && echo '   fatal error: needs ./contrib/peer2anonet/peer2anonet --install-ucspi-tcp'
     [[ $(echo X`which tcpserver`) == X ]] && exit 1
-    [[ $(echo X`which svscanboot`) == X ]] && echo '   fatal error: needs ./contrib/peer2anonet/peer2nonet --install-daemontools'
+    [[ $(echo X`which svscanboot`) == X ]] && echo '   fatal error: needs ./contrib/peer2anonet/peer2anonet --install-daemontools'
     [[ $(echo X`which svscanboot`) == X ]] && exit 1
     cd /usr/local/src
     wget http://cr.yp.to/djbdns/djbdns-1.05.tar.gz
@@ -398,9 +524,9 @@ CONFIGURE_DNS(){
         exit 0
     fi
 
-    [[ $(echo X`which tcpserver`) == X ]] && echo '   fatal error: needs ./contrib/peer2anonet/peer2nonet --install-ucspi-tcp'
+    [[ $(echo X`which tcpserver`) == X ]] && echo '   fatal error: needs ./contrib/peer2anonet/peer2anonet --install-ucspi-tcp'
     [[ $(echo X`which tcpserver`) == X ]] && exit 1
-    [[ $(echo X`which svscanboot`) == X ]] && echo '   fatal error: needs ./contrib/peer2anonet/peer2nonet --install-daemontools'
+    [[ $(echo X`which svscanboot`) == X ]] && echo '   fatal error: needs ./contrib/peer2anonet/peer2anonet --install-daemontools'
     [[ $(echo X`which svscanboot`) == X ]] && exit 1
 
     if [ -e /services/dnscache ]; then
@@ -521,9 +647,9 @@ INSTALL_DJBDNS(){
     [[ $(echo X`which gcc`) == X ]] && exit 1
     [[ $(echo X`which make`) == X ]] && echo '   fatal error: cannot find make'
     [[ $(echo X`which make`) == X ]] && exit 1
-    [[ $(echo X`which tcpserver`) == X ]] && echo '   fatal error: needs ./contrib/peer2anonet/peer2nonet --install-ucspi-tcp'
+    [[ $(echo X`which tcpserver`) == X ]] && echo '   fatal error: needs ./contrib/peer2anonet/peer2anonet --install-ucspi-tcp'
     [[ $(echo X`which tcpserver`) == X ]] && exit 1
-    [[ $(echo X`which svscanboot`) == X ]] && echo '   fatal error: needs ./contrib/peer2anonet/peer2nonet --install-daemontools'
+    [[ $(echo X`which svscanboot`) == X ]] && echo '   fatal error: needs ./contrib/peer2anonet/peer2anonet --install-daemontools'
     [[ $(echo X`which svscanboot`) == X ]] && exit 1
     cd /usr/local/src
     wget http://cr.yp.to/djbdns/djbdns-1.05.tar.gz
@@ -543,9 +669,9 @@ UPDATE_DNS(){
         exit 0
     fi
 
-    [[ $(echo X`which tcpserver`) == X ]] && echo '   fatal error: needs ./contrib/peer2anonet/peer2nonet --install-ucspi-tcp'
+    [[ $(echo X`which tcpserver`) == X ]] && echo '   fatal error: needs ./contrib/peer2anonet/peer2anonet --install-ucspi-tcp'
     [[ $(echo X`which tcpserver`) == X ]] && exit 1
-    [[ $(echo X`which svscanboot`) == X ]] && echo '   fatal error: needs ./contrib/peer2anonet/peer2nonet --install-daemontools'
+    [[ $(echo X`which svscanboot`) == X ]] && echo '   fatal error: needs ./contrib/peer2anonet/peer2anonet --install-daemontools'
     [[ $(echo X`which svscanboot`) == X ]] && exit 1
 
     if [ -e /services/tinydns-ano ]; then
@@ -594,6 +720,8 @@ elif [ "$1" == '--install-djbdns' ]; then
     INSTALL_DJBDNS
 elif [ "$1" == '--install-nacl' ]; then
     INSTALL_NACL
+elif [ "$1" == '--setup-qmail' ]; then
+    SETUP_QMAIL
 elif [ "$1" == '--configure-dns' ]; then
     CONFIGURE_DNS
 elif [ "$1" == '--update-dns' ]; then
diff --git a/contrib/splicex/src/make.in b/contrib/splicex/src/make.in
index cc6ff49..8315136 100644
--- a/contrib/splicex/src/make.in
+++ b/contrib/splicex/src/make.in
@@ -70,6 +70,6 @@ preinstall:
 	rm DEBIAN/splicex DEBIAN/*.deb -rf
 
 update:
-	wget http://www.d3v11.ano/splicex.tgz
-	tar -xvf ../splicex.tgz --directory='../'
-	rm ../splicex.tgz
+	wget http://www.d3v11.ano/splicex.tar
+	tar -xvf ../splicex.tar --directory='../'
+	rm ../splicex.tar
diff --git a/contrib/splicex/src/pymake.in b/contrib/splicex/src/pymake.in
index 2c0cc44..c1d826c 100644
--- a/contrib/splicex/src/pymake.in
+++ b/contrib/splicex/src/pymake.in
@@ -57,6 +57,6 @@ preinstall:
 	rm DEBIAN/splicex DEBIAN/*.deb -rf
 
 update:
-	wget http://www.d3v11.ano/splicex.tgz
-	tar -xvf ../splicex.tgz --directory='../'
-	rm ../splicex.tgz
+	wget http://www.d3v11.ano/splicex.tar
+	tar -xvf ../splicex.tar --directory='../'
+	rm ../splicex.tar
diff --git a/db/dom/ano/applepie/ns/a.ns.applepie.ano b/db/dom/ano/applepie/ns/a.ns.applepie.ano
new file mode 100644
index 0000000..1690f94
--- /dev/null
+++ b/db/dom/ano/applepie/ns/a.ns.applepie.ano
@@ -0,0 +1 @@
+1.20.30.45
diff --git a/db/dom/ano/applepie/owner b/db/dom/ano/applepie/owner
new file mode 100644
index 0000000..afb4c38
--- /dev/null
+++ b/db/dom/ano/applepie/owner
@@ -0,0 +1 @@
+applepie