# HG changeset patch
# User Nick <nick@somerandomnick.ano>
# Date 1325015051 0
# Node ID 2fa4790fa684cbdf0262b82529608f383f5b025d
# Parent  1a037f07507059b50cb87cab683fe105539fb714# Parent  1dcc647991ca4d47c8facfe294639c72744131a0
Merge commit '78145ff44783ee3c6deb80d3ea47e939deef0c7e'

diff -r 1a037f075070 -r 2fa4790fa684 contrib/peer2anonet/README.html
--- a/contrib/peer2anonet/README.html	Wed Dec 21 18:43:03 2011 +0000
+++ b/contrib/peer2anonet/README.html	Tue Dec 27 19:44:11 2011 +0000
@@ -93,6 +93,10 @@
 
             <b>CONFIGURATION FILES:</b>
 
+                If /etc/peer2anonet/bird.conf exists, then peer2anonet
+                will not create a new bird. Instead it will use this
+                bird.conf and append new protocols to it. 
+
                 /etc/peer2anonet/peers/$PEER/* contains:
                 
                     asn  local_port  peering_ip  pubkey  remote_ip  remote_port  run  seckey
diff -r 1a037f075070 -r 2fa4790fa684 contrib/peer2anonet/peer2anonet
--- a/contrib/peer2anonet/peer2anonet	Wed Dec 21 18:43:03 2011 +0000
+++ b/contrib/peer2anonet/peer2anonet	Tue Dec 27 19:44:11 2011 +0000
@@ -142,7 +142,10 @@
 bird -c bird.conf -d' > /services/bird/run
     chmod +x /services/bird/run
 
-    echo "function n_AnoNet_mine (prefix arg) {
+    if [ -e /etc/peer2anonet/bird.conf ]; then
+        cp /etc/peer2anonet/bird.conf /services/bird/bird.conf
+    else
+        echo "function n_AnoNet_mine (prefix arg) {
  if arg ~ [ $P2A_NET/24+ ] then return true;
 return false; };
 
@@ -190,6 +193,7 @@
  interface \"eth0\";
  import filter only_AnoNet;
 }" > /services/bird/bird.conf
+    fi
 
     for PEER in `ls /etc/peer2anonet/peers`; do
         mkdir -p /services/"$PEER"
@@ -409,14 +413,14 @@
     )
 
     echo -e '\nCONFIGURE DNS:\n'
-    NICK=`cat conf/git_name`
-    TINYDNS_ROOT_IP=`cat conf/tinydns__rootsrvrip`
-    TINYDNS_ROOT_DOMAIN=`cat conf/tinydns__rootsrvrname`
-    TINYDNS_ANO_IP=`cat conf/tinydns__tldsrvrip`
-    TINYDNS_ANO_DOMAIN=`cat conf/tinydns__tldsrvrname`
-    TINYDNS_IP=`cat conf/tinydns__srvrip`
-    TINYDNS_DOMAIN=`cat conf/tinydns__srvrname`
-    GIT_IP=`cat conf/gitd_ip`
+    NICK=`cat conf/git_name` || exit 1
+    TINYDNS_ROOT_IP=`cat conf/tinydns__rootsrvrip` || exit 1
+    TINYDNS_ROOT_DOMAIN=`cat conf/tinydns__rootsrvrname` || exit 1
+    TINYDNS_ANO_IP=`cat conf/tinydns__tldsrvrip` || exit 1
+    TINYDNS_ANO_DOMAIN=`cat conf/tinydns__tldsrvrname` || exit 1
+    TINYDNS_IP=`cat conf/tinydns__srvrip` || exit 1
+    TINYDNS_DOMAIN=`cat conf/tinydns__srvrname` || exit 1
+    GIT_IP=`cat conf/gitd_ip` || exit 1
     GIT_DOMAIN="git.$NICK.ano"
 
     ip addr add $TINYDNS_ROOT_IP/32 dev lo > /dev/null 2>&1
diff -r 1a037f075070 -r 2fa4790fa684 contrib/splicex/configure
--- a/contrib/splicex/configure	Wed Dec 21 18:43:03 2011 +0000
+++ b/contrib/splicex/configure	Tue Dec 27 19:44:11 2011 +0000
@@ -74,6 +74,7 @@
  fi
 fi
 echo
+mkdir -p build || exit 1
 if [ -z "$2" ]; then
  sed -e s^PYTHON^"$PYPATH"^g src/splicex.py >build/splicex || exit 1
  sed -e s^PYTHON^"$PYPATH"^g src/splicex-deshadow.py >build/splicex-deshadow || exit 1
diff -r 1a037f075070 -r 2fa4790fa684 contrib/splicex/src/make.in
--- a/contrib/splicex/src/make.in	Wed Dec 21 18:43:03 2011 +0000
+++ b/contrib/splicex/src/make.in	Tue Dec 27 19:44:11 2011 +0000
@@ -61,7 +61,7 @@
 	rm  -f /usr/bin/splicex-deshadow
 
 clean:
-	rm Makefile DEBIAN/splicex DEBIAN/*.deb build/* -rf
+	rm Makefile DEBIAN/splicex DEBIAN/*.deb build -rf
 
 preinstall:
 	rm -rf /etc/splicex
diff -r 1a037f075070 -r 2fa4790fa684 contrib/splicex/src/pymake.in
--- a/contrib/splicex/src/pymake.in	Wed Dec 21 18:43:03 2011 +0000
+++ b/contrib/splicex/src/pymake.in	Tue Dec 27 19:44:11 2011 +0000
@@ -48,7 +48,7 @@
 	rm  -f /usr/bin/splicex-deshadow
 
 clean:
-	rm Makefile DEBIAN/splicex DEBIAN/*.deb build/* -rf
+	rm Makefile DEBIAN/splicex DEBIAN/*.deb build -rf
 
 preinstall:
 	rm -rf /etc/splicex