8 files changed, 214 insertions, 186 deletions

diff --git a/net/xbone/Makefile b/net/xbone/Makefile
index 396b1827bb21..9e7878de3bd0 100644
--- a/net/xbone/Makefile
+++ b/net/xbone/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	XBone
-PORTVERSION=	1.3.1
+PORTVERSION=	2.0
 CATEGORIES=     net
 MASTER_SITES=   http://www.isi.edu/xbone/software/x-bone/
 
@@ -24,18 +24,10 @@ NO_BUILD=	yes
 
 PERL_LIB=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}
 
-.if !defined(USA_RESIDENT) || ${USA_RESIDENT}!=YES && ${USA_RESIDENT}!=NO
+.if !defined(OPTION) || ${OPTION}!=RD && ${OPTION}!=OMGUI
 pre-fetch:
 	@${ECHO} ""
-	@${ECHO} "ERROR! You must set variable USA_RESIDENT to YES, if you are"
-	@${ECHO} "USA resident or to NO, if you aren't USA resident to build"
-	@${ECHO} "this package. This option is required by other softwares"
-	@${ECHO} "X-Bone depends on."
-	@${FALSE}
-.elif !defined(XBONE_OPTION) || ${XBONE_OPTION}!=RD && ${XBONE_OPTION}!=OMGUI
-pre-fetch:
-	@${ECHO} ""
-	@${ECHO} "! You must set variable XBONE_OPTION=OMGUI or XBONE_OPTION=RD."
+	@${ECHO} "! You must set variable OPTION=OMGUI or OPTION=RD."
 	@${ECHO} "  OMGUI: Install & configure the system for:"
 	@${ECHO} "         (1) X-Bone Overlay Manager"
 	@${ECHO} "         (2) X-Bone GUI files (html & CGI scripts)"
@@ -47,27 +39,25 @@ pre-fetch:
 	@${ECHO} "      or a router."
 	@${ECHO} "  **  YOU NEED MULTIPLE RD-HOSTS TO CONSTRUCT OVERLAYS."
 	@${FALSE}
-.elif defined(XBONE_OPTION)
-.if ${XBONE_OPTION}==RD
+.elif defined(OPTION)
+.if ${OPTION}==RD
 BUILD_DEPENDS=  ${PERL_LIB}/Net/Netmask.pm:${PORTSDIR}/net/p5-Net-Netmask \
 		${PERL_LIB}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay
 INSTALL_TARGET=	rd
 PLIST=		${PKGDIR}/pkg-plist.rd
-PKGDEINSTALL=	${PKGDIR}/pkg-deinstall.rd
 .else
 BUILD_DEPENDS=  ${PREFIX}/sbin/httpsd:${PORTSDIR}/www/apache13-ssl\
 		${PERL_LIB}/CGI/Carp.pm:${PORTSDIR}/www/p5-CGI \
 		${PERL_LIB}/Mail/Sendmail.pm:${PORTSDIR}/mail/p5-Mail-Sendmail \
 		${PERL_LIB}/Net/Netmask.pm:${PORTSDIR}/net/p5-Net-Netmask\
 		${PERL_LIB}/File/CounterFile.pm:${PORTSDIR}/misc/p5-File-CounterFile \
-		${PERL_LIB}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay
+		${PERL_LIB}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \
+		$[PERL_LIB]/Parse/RecDescent.pm:$[PORTSDIR]/devel/p5-Parse-RecDescent
 INSTALL_TARGET= omgui
 MAKE_ARGS=	PERL5=${PERL5} SYS=${SYS}
 .endif
 .endif
 
-RUN_DEPENDS=	${PREFIX}/bin/ip-tun:${PORTSDIR}/net/ip-tun
-
 MAN1=		xb-pick.1
 MAN5=		XB_Defs.pm.5 Xbone_daemon.conf.5 Xbone_daemon.state.5
 MAN8=		X-Bone.8 xb-daemon.8 xb-overlay-manager.8 xb-config.8
diff --git a/net/xbone/distinfo b/net/xbone/distinfo
index 42a277f6f93b..adc6feb8e4b0 100644
--- a/net/xbone/distinfo
+++ b/net/xbone/distinfo
@@ -1 +1 @@
-MD5 (XBone-1.3.1.tar.gz) = c07084c1f164e49c325575e3398da319
+MD5 (XBone-2.0.tar.gz) = c4f882eb2f2932f8a74c525abc2f4028
diff --git a/net/xbone/files/patch-XB_Defs.pm b/net/xbone/files/patch-XB_Defs.pm
new file mode 100644
index 000000000000..a266b78de88f
--- /dev/null
+++ b/net/xbone/files/patch-XB_Defs.pm
@@ -0,0 +1,11 @@
+--- xbone/lib/XB_Defs.pm.orig	Thu Dec 19 16:50:25 2002
++++ xbone/lib/XB_Defs.pm	Thu Dec 19 16:51:40 2002
+@@ -153,7 +153,7 @@
+ ############################################################
+ 
+ $XB_Defs::XBONE_VERSION_DATE =	    # Date this version was created.
+-  "30/10/2001";                     # "<day_num>/<month_num>/<year_num>"
++  "1/1/2003";                       # "<day_num>/<month_num>/<year_num>"
+ # `date "+%d/%m/%Y"`;               # <- for development
+ 
+ $XB_Defs::XBONE_OBSOLETE_LIMIT =    # Seconds after the version date
diff --git a/net/xbone/pkg-comment b/net/xbone/pkg-comment
index 78813376519e..bd071fdd486a 100644
--- a/net/xbone/pkg-comment
+++ b/net/xbone/pkg-comment
@@ -1 +1 @@
-A system for dynamic internet overlay deployment and management
+A system for dynamic internet overlay deployment and management 
diff --git a/net/xbone/pkg-deinstall b/net/xbone/pkg-deinstall
index 6fe609cfddff..6148c6469db5 100644
--- a/net/xbone/pkg-deinstall
+++ b/net/xbone/pkg-deinstall
@@ -7,21 +7,11 @@ if [ $2 != "POST-DEINSTALL" ]; then
   exit 0
 fi
 echo "==> Post-deinstallation cleanup:"
-if [ -d /etc/xbone ]; then
-  /usr/bin/dialog --yesno "/etc/xbone found. Do you want to DELETE it?\
-                           Warning: <YES> would DELETE ALL XBONE CONFIG/STATE\
-			   files and ALL CERTIFICATES." 8 50 && 
-  rm -rf /etc/xbone || echo "    - /etc/xbone is not deleted."
-fi
-/usr/bin/dialog --yesno "Do you want to DELETE all remaining XBone files\
-  under /usr/local/xbone, /usr/local/www & /usr/local/etc/apache?" 8 50 &&
-for f in /usr/local/xbone /usr/local/www /usr/local/etc/apache; do
-  if [ -d $f ]; then
-    rm -rf $f
-  fi
-  if [ -d "$f-OLD" ]; then
-    mv -f $f-OLD $f
+echo "    Check the following directories to clean X-Bone related files:"
+dirs="/etc/xbone /etc/named/xbone /usr/local/etc/xbone /usr/local/xbone /usr/local/www/xbone"
+for p in $dirs; do
+  if [ -d $p ]; then
+    echo "      $p"
   fi
-done ||
-echo "Check /usr/local/[xbone|www|etc/apache] for possible remaining files."
+done
 
diff --git a/net/xbone/pkg-deinstall.rd b/net/xbone/pkg-deinstall.rd
deleted file mode 100644
index 592b77802368..000000000000
--- a/net/xbone/pkg-deinstall.rd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-if [ -z $2 ]; then
-  exit 0
-fi
-if [ $2 != "POST-DEINSTALL" ]; then
-  echo "!!! This script is for post-deinstallation only."; \
-  exit 0
-fi
-echo "==> Post-deinstallation cleanup:"
-if [ -d /etc/xbone ]; then
-  /usr/bin/dialog --yesno "/etc/xbone found. Do you want to DELETE it?\
-                           Warning: <YES> would DELETE ALL XBONE CONFIG/STATE\
-			   files and ALL CERTIFICATES." 8 50 && 
-  rm -rf /etc/xbone || echo "    - /etc/xbone is not deleted."
-fi
-if [ -d /usr/local/xbone ]; then
-  /usr/bin/dialog --yesno "Do you want to DELETE all remaining XBone files\
-                           under /usr/local/xbone?" 8 50 &&
-  rm -rf /usr/local/xbone || echo "    - /usr/local/xbone not deleted."
-fi
-
diff --git a/net/xbone/pkg-plist b/net/xbone/pkg-plist
index eff2e5d137f9..0ecf9ed89c07 100644
--- a/net/xbone/pkg-plist
+++ b/net/xbone/pkg-plist
@@ -1,27 +1,44 @@
+etc/xbone/apache-conf/.cvsignore
+etc/xbone/apache-conf/access.conf
+etc/xbone/apache-conf/httpsd.conf
+etc/xbone/apache-conf/magic
+etc/xbone/apache-conf/mime.types
+etc/xbone/apache-conf/srm.conf
+etc/xbone/cert/CAcert.der
+etc/xbone/cert/CAcert.pem
+etc/xbone/named-conf/named.conf
+etc/xbone/named-conf/resolv.conf
+etc/xbone/named-conf/xbone/xbone-forward.zone
+etc/xbone/named-conf/xbone/xbone-reverse.zone
+xbone/apps/abone-script
 xbone/doc/README.security
+xbone/doc/api-language.doc
 xbone/doc/arch
 xbone/doc/daemon_data_structures
 xbone/doc/disclaimer
 xbone/doc/gui
+xbone/doc/mrouted.conf.example
 xbone/doc/om_data_structures
 xbone/doc/plan
 xbone/doc/protocol
 xbone/doc/rd.data-structures
-xbone/install/apache_conf_sample/.cvsignore
-xbone/install/apache_conf_sample/access.conf
-xbone/install/apache_conf_sample/httpsd.conf
-xbone/install/apache_conf_sample/httpsd.conf.ORIG
-xbone/install/apache_conf_sample/magic
-xbone/install/apache_conf_sample/mime.types
-xbone/install/apache_conf_sample/srm.conf
-xbone/install/named_conf_sample/xbone/xbone-reverse.private
-xbone/install/named_conf_sample/xbone/xbone-reverse.private.ORIG
-xbone/install/named_conf_sample/xbone/xbone.private
-xbone/install/named_conf_sample/xbone/xbone.private.ORIG
-xbone/install/named_conf_sample/named.conf
-xbone/install/named_conf_sample/named.conf.ORIG
-xbone/install/named_conf_sample/resolv.conf
-xbone/install/named_conf_sample/resolv.conf.ORIG
+xbone/install/apache-conf/.cvsignore
+xbone/install/apache-conf/access.conf
+xbone/install/apache-conf/httpsd.conf
+xbone/install/apache-conf/httpsd.conf.ORIG
+xbone/install/apache-conf/magic
+xbone/install/apache-conf/mime.types
+xbone/install/apache-conf/srm.conf
+xbone/install/named-conf/xbone/xbone-forward.zone
+xbone/install/named-conf/xbone/xbone-forward.zone.ORIG
+xbone/install/named-conf/xbone/xbone-reverse.zone
+xbone/install/named-conf/xbone/xbone-reverse.zone.ORIG
+xbone/install/named-conf/named.conf
+xbone/install/named-conf/named.conf.ORIG
+xbone/install/named-conf/resolv.conf
+xbone/install/named-conf/resolv.conf.ORIG
+xbone/install/patches/linux/ipip.c.patch71
+xbone/install/patches/linux/ipip.c.patch72
 xbone/install/CHANGES
 xbone/install/COPYRIGHT
 xbone/install/FAQ
@@ -32,20 +49,26 @@ xbone/install/README
 xbone/install/REQUIREMENTS
 xbone/install/SECURITY
 xbone/install/setkey.tar.gz
-xbone/install/xb-DNS-config.pl
 xbone/install/xb-Host-check.pl
-xbone/install/xb-Port-check.pl
 xbone/install/xb-Source-patch.pl
 xbone/lib/cert/CAcert.der
 xbone/lib/cert/CAcert.pem
+xbone/lib/XB_API.pm
+xbone/lib/XB_API_GUI.pm
+xbone/lib/XB_API_OM.pm
+xbone/lib/XB_API_parser.pm
+xbone/lib/XB_AppScript.pm
 xbone/lib/XB_Common.pm
 xbone/lib/XB_Defs.pm
 xbone/lib/XB_Defs.pm.ORIG
+xbone/lib/XB_Defs.pm.orig
 xbone/lib/XB_IPsec.pm
 xbone/lib/XB_Log.pm
 xbone/lib/XB_Overlay_List.pm
+xbone/lib/XB_SMIME.pm
 xbone/lib/XB_SSL.pm
 xbone/lib/XB_Utils.pm
+xbone/lib/XB_XOL.pm
 xbone/man/man1/xb-pick.1
 xbone/man/man5/XB_Defs.pm.5
 xbone/man/man5/Xbone_daemon.conf.5
@@ -66,26 +89,19 @@ xbone/rd/apps/xb-config.pl.ORIG
 xbone/rd/apps/xb-overlay-list.pl
 xbone/rd/apps/xb-pick
 xbone/rd/XB_App_Start.pm
+xbone/rd/XB_AppCmds.pm
 xbone/rd/XB_Commands.pm
 xbone/rd/XB_DNS.pm
+xbone/rd/XB_Dummynet.pm
 xbone/rd/XB_Node_DB.pm
 xbone/rd/XB_Route.pm
 xbone/rd/XB_Tunnel.pm
 xbone/rd/xb-daemon.pl
-xbone/rd/xb-daemon.pl.ORIG
-xbone/www/cgi-bin/index.pl
-xbone/www/cgi-bin/index.pl.ORIG
-xbone/www/cgi-bin/xb-get-ca-cert.pl
-xbone/www/cgi-bin/xb-get-ca-cert.pl.ORIG
-xbone/www/cgi-bin/xb-req-user-cert.pl
-xbone/www/cgi-bin/xb-req-user-cert.pl.ORIG
 xbone/www/htdocs/index.html
 xbone/www/htdocs/robots.txt
 xbone/www/htdocs/xbone.css
 xbone/www/s-cgi-bin/XB_Interface.pm
 xbone/www/s-cgi-bin/XB_Interface.pm.ORIG
-xbone/www/s-cgi-bin/index.pl
-xbone/www/s-cgi-bin/index.pl.ORIG
 xbone/www/s-cgi-bin/xb-admin.pl
 xbone/www/s-cgi-bin/xb-admin.pl.ORIG
 xbone/www/s-cgi-bin/xb-cookies.pl
@@ -94,6 +110,10 @@ xbone/www/s-cgi-bin/xb-create.pl
 xbone/www/s-cgi-bin/xb-create.pl.ORIG
 xbone/www/s-cgi-bin/xb-destroy.pl
 xbone/www/s-cgi-bin/xb-destroy.pl.ORIG
+xbone/www/s-cgi-bin/xb-discover.pl
+xbone/www/s-cgi-bin/xb-discover.pl.ORIG
+xbone/www/s-cgi-bin/xb-index.pl
+xbone/www/s-cgi-bin/xb-index.pl.ORIG
 xbone/www/s-cgi-bin/xb-req-host-cert.pl
 xbone/www/s-cgi-bin/xb-req-host-cert.pl.ORIG
 xbone/www/s-cgi-bin/xb-status.pl
@@ -114,84 +134,88 @@ xbone/www/s-htdocs/images/tree.gif
 xbone/www/s-htdocs/index.html
 xbone/www/s-htdocs/robots.txt
 xbone/www/s-htdocs/xbone.css
-www/cgi-bin/index.pl
-www/cgi-bin/index.pl.ORIG
-www/cgi-bin/xb-get-ca-cert.pl
-www/cgi-bin/xb-get-ca-cert.pl.ORIG
-www/cgi-bin/xb-req-user-cert.pl
-www/cgi-bin/xb-req-user-cert.pl.ORIG
-www/htdocs/index.html
-www/htdocs/robots.txt
-www/htdocs/xbone.css
-www/lib/cert/CAcert.der
-www/lib/cert/CAcert.pem
-www/lib/XB_Common.pm
-www/lib/XB_Defs.pm
-www/lib/XB_Defs.pm.ORIG
-www/lib/XB_IPsec.pm
-www/lib/XB_Log.pm
-www/lib/XB_Overlay_List.pm
-www/lib/XB_SSL.pm
-www/lib/XB_Utils.pm
-www/s-cgi-bin/XB_Interface.pm
-www/s-cgi-bin/XB_Interface.pm.ORIG
-www/s-cgi-bin/index.pl
-www/s-cgi-bin/index.pl.ORIG
-www/s-cgi-bin/xb-admin.pl
-www/s-cgi-bin/xb-admin.pl.ORIG
-www/s-cgi-bin/xb-cookies.pl
-www/s-cgi-bin/xb-cookies.pl.ORIG
-www/s-cgi-bin/xb-create.pl
-www/s-cgi-bin/xb-create.pl.ORIG
-www/s-cgi-bin/xb-destroy.pl
-www/s-cgi-bin/xb-destroy.pl.ORIG
-www/s-cgi-bin/xb-req-host-cert.pl
-www/s-cgi-bin/xb-req-host-cert.pl.ORIG
-www/s-cgi-bin/xb-status.pl
-www/s-cgi-bin/xb-status.pl.ORIG
-www/s-htdocs/images/h1.gif
-www/s-htdocs/images/h2.gif
-www/s-htdocs/images/h3.gif
-www/s-htdocs/images/h4.gif
-www/s-htdocs/images/h5.gif
-www/s-htdocs/images/h6.gif
-www/s-htdocs/images/h7.gif
-www/s-htdocs/images/h8.gif
-www/s-htdocs/images/linear.gif
-www/s-htdocs/images/ring.gif
-www/s-htdocs/images/stag.gif
-www/s-htdocs/images/star.gif
-www/s-htdocs/images/tree.gif
-www/s-htdocs/index.html
-www/s-htdocs/robots.txt
-www/s-htdocs/xbone.css
-etc/apache/.cvsignore
-etc/apache/access.conf
-etc/apache/httpd.conf
-etc/apache/httpsd.conf
-etc/apache/httpsd.conf.ORIG
-etc/apache/magic
-etc/apache/mime.types
-etc/apache/srm.conf
+xbone/www/xb-cgi-bin/xb-get-ca-cert.pl
+xbone/www/xb-cgi-bin/xb-get-ca-cert.pl.ORIG
+xbone/www/xb-cgi-bin/xb-index.pl
+xbone/www/xb-cgi-bin/xb-index.pl.ORIG
+xbone/www/xb-cgi-bin/xb-req-user-cert.pl
+xbone/www/xb-cgi-bin/xb-req-user-cert.pl.ORIG
+www/xbone/index.html
+www/xbone/robots.txt
+www/xbone/xbone.css
+www/xbone/htdocs/index.html
+www/xbone/htdocs/robots.txt
+www/xbone/htdocs/xbone.css
+www/xbone/lib/cert/CAcert.der
+www/xbone/lib/cert/CAcert.pem
+www/xbone/lib/XB_API.pm
+www/xbone/lib/XB_API_GUI.pm
+www/xbone/lib/XB_API_OM.pm
+www/xbone/lib/XB_API_parser.pm
+www/xbone/lib/XB_AppScript.pm
+www/xbone/lib/XB_Common.pm
+www/xbone/lib/XB_Defs.pm
+www/xbone/lib/XB_Defs.pm.orig
+www/xbone/lib/XB_IPsec.pm
+www/xbone/lib/XB_Log.pm
+www/xbone/lib/XB_Overlay_List.pm
+www/xbone/lib/XB_SMIME.pm
+www/xbone/lib/XB_SSL.pm
+www/xbone/lib/XB_Utils.pm
+www/xbone/lib/XB_XOL.pm
+www/xbone/s-cgi-bin/XB_Interface.pm
+www/xbone/s-cgi-bin/xb-admin.pl
+www/xbone/s-cgi-bin/xb-cookies.pl
+www/xbone/s-cgi-bin/xb-create.pl
+www/xbone/s-cgi-bin/xb-destroy.pl
+www/xbone/s-cgi-bin/xb-discover.pl
+www/xbone/s-cgi-bin/xb-index.pl
+www/xbone/s-cgi-bin/xb-req-host-cert.pl
+www/xbone/s-cgi-bin/xb-status.pl
+www/xbone/s-htdocs/images/h1.gif
+www/xbone/s-htdocs/images/h2.gif
+www/xbone/s-htdocs/images/h3.gif
+www/xbone/s-htdocs/images/h4.gif
+www/xbone/s-htdocs/images/h5.gif
+www/xbone/s-htdocs/images/h6.gif
+www/xbone/s-htdocs/images/h7.gif
+www/xbone/s-htdocs/images/h8.gif
+www/xbone/s-htdocs/images/linear.gif
+www/xbone/s-htdocs/images/ring.gif
+www/xbone/s-htdocs/images/stag.gif
+www/xbone/s-htdocs/images/star.gif
+www/xbone/s-htdocs/images/tree.gif
+www/xbone/s-htdocs/index.html
+www/xbone/s-htdocs/robots.txt
+www/xbone/s-htdocs/xbone.css
+www/xbone/xb-cgi-bin/xb-get-ca-cert.pl
+www/xbone/xb-cgi-bin/xb-index.pl
+www/xbone/xb-cgi-bin/xb-req-user-cert.pl
+etc/apache/httpsd.conf.xbone
 bin/xb-config
 bin/xb-daemon
 bin/xb-overlay-manager
 bin/xb-pick
-@dirrm etc/apache
-@dirrm www/cgi-bin
-@dirrm www/htdocs
-@dirrm www/lib/cert
-@dirrm www/lib
-@dirrm www/s-cgi-bin
-@dirrm www/s-htdocs/images
-@dirrm www/s-htdocs
-@dirrm www
-@unexec mv -f www-OLD www 2>/dev/null || true
-@unexec mv -f etc/apache-OLD etc/apache 2>/dev/null || true
+@dirrm www/xbone/htdocs
+@dirrm www/xbone/lib/cert
+@dirrm www/xbone/lib
+@dirrm www/xbone/s-cgi-bin
+@dirrm www/xbone/s-htdocs/images
+@dirrm www/xbone/s-htdocs
+@dirrm www/xbone/xb-cgi-bin
+@dirrm www/xbone
+@dirrm etc/xbone/apache-conf
+@dirrm etc/xbone/cert
+@dirrm etc/xbone/named-conf/xbone
+@dirrm etc/xbone/named-conf
+@dirrm etc/xbone
+@dirrm xbone/apps
 @dirrm xbone/doc
-@dirrm xbone/install/apache_conf_sample
-@dirrm xbone/install/named_conf_sample/xbone
-@dirrm xbone/install/named_conf_sample
+@dirrm xbone/install/apache-conf
+@dirrm xbone/install/named-conf/xbone
+@dirrm xbone/install/named-conf
+@dirrm xbone/install/patches/linux
+@dirrm xbone/install/patches
 @dirrm xbone/install
 @dirrm xbone/man/man1
 @dirrm xbone/man/man5
@@ -202,10 +226,10 @@ bin/xb-pick
 @dirrm xbone/om
 @dirrm xbone/rd/apps
 @dirrm xbone/rd
-@dirrm xbone/www/cgi-bin
 @dirrm xbone/www/htdocs
 @dirrm xbone/www/s-cgi-bin
 @dirrm xbone/www/s-htdocs/images
 @dirrm xbone/www/s-htdocs
+@dirrm xbone/www/xb-cgi-bin
 @dirrm xbone/www
 @dirrm xbone
diff --git a/net/xbone/pkg-plist.rd b/net/xbone/pkg-plist.rd
index 22bb72c5468a..62bafc3e7b8f 100644
--- a/net/xbone/pkg-plist.rd
+++ b/net/xbone/pkg-plist.rd
@@ -1,27 +1,44 @@
+etc/xbone/apache-conf/.cvsignore
+etc/xbone/apache-conf/access.conf
+etc/xbone/apache-conf/httpsd.conf
+etc/xbone/apache-conf/magic
+etc/xbone/apache-conf/mime.types
+etc/xbone/apache-conf/srm.conf
+etc/xbone/cert/CAcert.der
+etc/xbone/cert/CAcert.pem
+etc/xbone/named-conf/named.conf
+etc/xbone/named-conf/resolv.conf
+etc/xbone/named-conf/xbone/xbone-forward.zone
+etc/xbone/named-conf/xbone/xbone-reverse.zone
+xbone/apps/abone-script
+xbone/doc/api-language.doc
 xbone/doc/README.security
 xbone/doc/arch
 xbone/doc/daemon_data_structures
 xbone/doc/disclaimer
 xbone/doc/gui
+xbone/doc/mrouted.conf.example
 xbone/doc/om_data_structures
 xbone/doc/plan
 xbone/doc/protocol
 xbone/doc/rd.data-structures
-xbone/install/apache_conf_sample/.cvsignore
-xbone/install/apache_conf_sample/access.conf
-xbone/install/apache_conf_sample/httpsd.conf
-xbone/install/apache_conf_sample/httpsd.conf.ORIG
-xbone/install/apache_conf_sample/magic
-xbone/install/apache_conf_sample/mime.types
-xbone/install/apache_conf_sample/srm.conf
-xbone/install/named_conf_sample/xbone/xbone-reverse.private
-xbone/install/named_conf_sample/xbone/xbone-reverse.private.ORIG
-xbone/install/named_conf_sample/xbone/xbone.private
-xbone/install/named_conf_sample/xbone/xbone.private.ORIG
-xbone/install/named_conf_sample/named.conf
-xbone/install/named_conf_sample/named.conf.ORIG
-xbone/install/named_conf_sample/resolv.conf
-xbone/install/named_conf_sample/resolv.conf.ORIG
+xbone/install/apache-conf/.cvsignore
+xbone/install/apache-conf/access.conf
+xbone/install/apache-conf/httpsd.conf
+xbone/install/apache-conf/httpsd.conf.ORIG
+xbone/install/apache-conf/magic
+xbone/install/apache-conf/mime.types
+xbone/install/apache-conf/srm.conf
+xbone/install/named-conf/xbone/xbone-forward.zone
+xbone/install/named-conf/xbone/xbone-forward.zone.ORIG
+xbone/install/named-conf/xbone/xbone-reverse.zone
+xbone/install/named-conf/xbone/xbone-reverse.zone.ORIG
+xbone/install/named-conf/named.conf
+xbone/install/named-conf/named.conf.ORIG
+xbone/install/named-conf/resolv.conf
+xbone/install/named-conf/resolv.conf.ORIG
+xbone/install/patches/linux/ipip.c.patch71
+xbone/install/patches/linux/ipip.c.patch72
 xbone/install/CHANGES
 xbone/install/COPYRIGHT
 xbone/install/FAQ
@@ -32,20 +49,26 @@ xbone/install/README
 xbone/install/REQUIREMENTS
 xbone/install/SECURITY
 xbone/install/setkey.tar.gz
-xbone/install/xb-DNS-config.pl
 xbone/install/xb-Host-check.pl
-xbone/install/xb-Port-check.pl
 xbone/install/xb-Source-patch.pl
 xbone/lib/cert/CAcert.der
 xbone/lib/cert/CAcert.pem
+xbone/lib/XB_API.pm
+xbone/lib/XB_API_GUI.pm
+xbone/lib/XB_API_OM.pm
+xbone/lib/XB_API_parser.pm
+xbone/lib/XB_AppScript.pm
 xbone/lib/XB_Common.pm
 xbone/lib/XB_Defs.pm
 xbone/lib/XB_Defs.pm.ORIG
+xbone/lib/XB_Defs.pm.orig
 xbone/lib/XB_IPsec.pm
 xbone/lib/XB_Log.pm
 xbone/lib/XB_Overlay_List.pm
+xbone/lib/XB_SMIME.pm
 xbone/lib/XB_SSL.pm
 xbone/lib/XB_Utils.pm
+xbone/lib/XB_XOL.pm
 xbone/man/man1/xb-pick.1
 xbone/man/man5/XB_Defs.pm.5
 xbone/man/man5/Xbone_daemon.conf.5
@@ -66,26 +89,19 @@ xbone/rd/apps/xb-config.pl.ORIG
 xbone/rd/apps/xb-overlay-list.pl
 xbone/rd/apps/xb-pick
 xbone/rd/XB_App_Start.pm
+xbone/rd/XB_AppCmds.pm
 xbone/rd/XB_Commands.pm
 xbone/rd/XB_DNS.pm
+xbone/rd/XB_Dummynet.pm
 xbone/rd/XB_Node_DB.pm
 xbone/rd/XB_Route.pm
 xbone/rd/XB_Tunnel.pm
 xbone/rd/xb-daemon.pl
-xbone/rd/xb-daemon.pl.ORIG
-xbone/www/cgi-bin/index.pl
-xbone/www/cgi-bin/index.pl.ORIG
-xbone/www/cgi-bin/xb-get-ca-cert.pl
-xbone/www/cgi-bin/xb-get-ca-cert.pl.ORIG
-xbone/www/cgi-bin/xb-req-user-cert.pl
-xbone/www/cgi-bin/xb-req-user-cert.pl.ORIG
 xbone/www/htdocs/index.html
 xbone/www/htdocs/robots.txt
 xbone/www/htdocs/xbone.css
 xbone/www/s-cgi-bin/XB_Interface.pm
 xbone/www/s-cgi-bin/XB_Interface.pm.ORIG
-xbone/www/s-cgi-bin/index.pl
-xbone/www/s-cgi-bin/index.pl.ORIG
 xbone/www/s-cgi-bin/xb-admin.pl
 xbone/www/s-cgi-bin/xb-admin.pl.ORIG
 xbone/www/s-cgi-bin/xb-cookies.pl
@@ -94,6 +110,10 @@ xbone/www/s-cgi-bin/xb-create.pl
 xbone/www/s-cgi-bin/xb-create.pl.ORIG
 xbone/www/s-cgi-bin/xb-destroy.pl
 xbone/www/s-cgi-bin/xb-destroy.pl.ORIG
+xbone/www/s-cgi-bin/xb-discover.pl
+xbone/www/s-cgi-bin/xb-discover.pl.ORIG
+xbone/www/s-cgi-bin/xb-index.pl
+xbone/www/s-cgi-bin/xb-index.pl.ORIG
 xbone/www/s-cgi-bin/xb-req-host-cert.pl
 xbone/www/s-cgi-bin/xb-req-host-cert.pl.ORIG
 xbone/www/s-cgi-bin/xb-status.pl
@@ -114,14 +134,28 @@ xbone/www/s-htdocs/images/tree.gif
 xbone/www/s-htdocs/index.html
 xbone/www/s-htdocs/robots.txt
 xbone/www/s-htdocs/xbone.css
+xbone/www/xb-cgi-bin/xb-get-ca-cert.pl
+xbone/www/xb-cgi-bin/xb-get-ca-cert.pl.ORIG
+xbone/www/xb-cgi-bin/xb-index.pl
+xbone/www/xb-cgi-bin/xb-index.pl.ORIG
+xbone/www/xb-cgi-bin/xb-req-user-cert.pl
+xbone/www/xb-cgi-bin/xb-req-user-cert.pl.ORIG
 bin/xb-config
 bin/xb-daemon
 bin/xb-overlay-manager
 bin/xb-pick
+@dirrm etc/xbone/apache-conf
+@dirrm etc/xbone/cert
+@dirrm etc/xbone/named-conf/xbone
+@dirrm etc/xbone/named-conf
+@dirrm etc/xbone
+@dirrm xbone/apps
 @dirrm xbone/doc
-@dirrm xbone/install/apache_conf_sample
-@dirrm xbone/install/named_conf_sample/xbone
-@dirrm xbone/install/named_conf_sample
+@dirrm xbone/install/apache-conf
+@dirrm xbone/install/named-conf/xbone
+@dirrm xbone/install/named-conf
+@dirrm xbone/install/patches/linux
+@dirrm xbone/install/patches
 @dirrm xbone/install
 @dirrm xbone/man/man1
 @dirrm xbone/man/man5
@@ -132,10 +166,10 @@ bin/xb-pick
 @dirrm xbone/om
 @dirrm xbone/rd/apps
 @dirrm xbone/rd
-@dirrm xbone/www/cgi-bin
 @dirrm xbone/www/htdocs
 @dirrm xbone/www/s-cgi-bin
 @dirrm xbone/www/s-htdocs/images
 @dirrm xbone/www/s-htdocs
+@dirrm xbone/www/xb-cgi-bin
 @dirrm xbone/www
 @dirrm xbone