Merge branch 'master' into next

* master:
  * Update docs
  * Fix startup error on OpenBSD 4.7 due to failed ptrace()

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -1,3 +1,11 @@
+* Fix problems with changing IP
+* Add an extra 2 second delay before releasing nick to aide in syncing and time to type /nick
+* When a nick is released, start regaining as soon as it is witnessed to have been taken again
+* Fix cmd_relay so it does not use IPv6 if not supported.
+* Fix bot linking so it does not use IPv6 if not supported.
+* Fix auth IRC lookups getting the wrong cached idx
+* Bot will now jump from the server it's on if it is removed from the server list. (fixes a changing network bug)
+
 * Fix crash related to slowpart
 * Properly honor exemptions when kicking matched RBL clients
 * Fixed parsing errors in .chanset
@@ -6,13 +14,7 @@
 * Update rbl list, 'set -yes rbl-servers -' to get new list.
 * Update server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
 * Fix default compile so it doesn't use a ton of processes.
-* Fix problems with changing IP
-* Add an extra 2 second delay before releasing nick to aide in syncing and time to type /nick
-* When a nick is released, start regaining as soon as it is witnessed to have been taken again
-* Fix cmd_relay so it does not use IPv6 if not supported.
-* Fix bot linking so it does not use IPv6 if not supported.
-* Fix auth IRC lookups getting the wrong cached idx
-* Bot will now jump from the server it's on if it is removed from the server list. (fixes a changing network bug)
+* Fix bot getting killed on OpenBSD 4.7 on startup
 
 1.3 - http://wraith.botpack.net/milestone/1.3
 * Binary / shell / startup changes

src/shell.c

@@ -312,7 +312,7 @@ void check_trace(int start)
       case 0:		//child
         i = ptrace(PT_ATTACH, parent, 0, 0);
         /* EPERM is given on fbsd when security.bsd.unprivileged_proc_debug=0 */
-        if (i == -1 && errno != EPERM) {
+        if (i == -1 && errno != EPERM && errno != EINVAL) {
           if (start) {
             kill(parent, SIGKILL);
             exit(1);