Merge branch 'maint'

* maint:
  Update wiki links to use github

Conflicts:
	configure

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/wraith/wraith.png?branch=master)](https://travis-ci.org/wraith/wraith)
 
-* http://wraith.botpack.net
+* https://github.com/wraith/wraith/wiki
 * http://github.com/wraith/wraith
 * @wraithbotpack
 
@@ -24,7 +24,7 @@ are referenced here.
 For official release announcements send an email to:
   wraith-announce-subscribe@botpack.net
 
-Download: http://wraith.botpack.net/wiki/Download
+Download: https://github.com/wraith/wraith/wiki/Download
 Git: git://github.com/wraith/wraith.git
 
 See git for a list of Contributors: git shortlog -sen master
@@ -32,8 +32,8 @@ See git for a list of Contributors: git shortlog -sen master
 Support:
 * How To Contribute: http://github.com/wraith/wraith/blob/master/CONTRIBUTING.md
 * Getting Started: http://github.com/wraith/wraith/wiki/GettingStarted
-* FAQ: http://wraith.botpack.net/wiki/FrequentlyAskedQuestions
-* Documentation Index: http://wraith.botpack.net/wiki/Documentation
+* FAQ: https://github.com/wraith/wraith/wiki/FrequentlyAskedQuestions
+* Documentation Index: https://github.com/wraith/wraith/wiki/Documentation
 * Issues can be reported at: https://github.com/wraith/wraith/issues
 * #wraith @ EFnet
 

build/autotools/configure.ac

@@ -262,7 +262,7 @@ if [ "$GIT_REQUIRED" = "1" ]; then
     echo ""
     echo "You have downloaded a GIT version of wraith."
     echo "Either 'git clone' from a git repository or download a source tarball"
-    echo "A distribution version can be found at http://wraith.botpack.net/wiki/Download"
+    echo "A distribution version can be found at https://github.com/wraith/wraith/wiki/Download"
     echo ""
     echo ""
     exit 1

configure

@@ -7927,18 +7927,18 @@ else
 /* end build/confdefs.h.  */
 
   /* For now, do not test the preprocessor; as of 2007 there are too many
-         implementations with broken preprocessors.  Perhaps this can
-         be revisited in 2012.  In the meantime, code should not expect
-         #if to work with literals wider than 32 bits.  */
+	 implementations with broken preprocessors.  Perhaps this can
+	 be revisited in 2012.  In the meantime, code should not expect
+	 #if to work with literals wider than 32 bits.  */
       /* Test literals.  */
       long long int ll = 9223372036854775807ll;
       long long int nll = -9223372036854775807LL;
       unsigned long long int ull = 18446744073709551615ULL;
       /* Test constant expressions.   */
       typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
-                     ? 1 : -1)];
+		     ? 1 : -1)];
       typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
-                     ? 1 : -1)];
+		     ? 1 : -1)];
       int i = 63;
 int
 main ()
@@ -7947,9 +7947,9 @@ main ()
       long long int llmax = 9223372036854775807ll;
       unsigned long long int ullmax = 18446744073709551615ull;
       return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
-              | (llmax / ll) | (llmax % ll)
-              | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
-              | (ullmax / ull) | (ullmax % ull));
+	      | (llmax / ll) | (llmax % ll)
+	      | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+	      | (ullmax / ull) | (ullmax % ull));
   ;
   return 0;
 }
@@ -7981,33 +7981,33 @@ if ${ac_cv_type_long_long_int+:} false; then :
 else
   ac_cv_type_long_long_int=yes
       if test "x${ac_cv_prog_cc_c99-no}" = xno; then
-        ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
-        if test $ac_cv_type_long_long_int = yes; then
-                                        if test "$cross_compiling" = yes; then :
+	ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
+	if test $ac_cv_type_long_long_int = yes; then
+	  	  	  	  if test "$cross_compiling" = yes; then :
   :
 else
   cat build/confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end build/confdefs.h.  */
 #include <limits.h>
-                 #ifndef LLONG_MAX
-                 # define HALF \
-                          (1LL << (sizeof (long long int) * CHAR_BIT - 2))
-                 # define LLONG_MAX (HALF - 1 + HALF)
-                 #endif
+		 #ifndef LLONG_MAX
+		 # define HALF \
+			  (1LL << (sizeof (long long int) * CHAR_BIT - 2))
+		 # define LLONG_MAX (HALF - 1 + HALF)
+		 #endif
 int
 main ()
 {
 long long int n = 1;
-                 int i;
-                 for (i = 0; ; i++)
-                   {
-                     long long int m = n << i;
-                     if (m >> i != n)
-                       return 1;
-                     if (LLONG_MAX / 2 < m)
-                       break;
-                   }
-                 return 0;
+		 int i;
+		 for (i = 0; ; i++)
+		   {
+		     long long int m = n << i;
+		     if (m >> i != n)
+		       return 1;
+		     if (LLONG_MAX / 2 < m)
+		       break;
+		   }
+		 return 0;
   ;
   return 0;
 }
@@ -8021,7 +8021,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-        fi
+	fi
       fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5
@@ -9023,7 +9023,7 @@ if [ "$GIT_REQUIRED" = "1" ]; then
     echo ""
     echo "You have downloaded a GIT version of wraith."
     echo "Either 'git clone' from a git repository or download a source tarball"
-    echo "A distribution version can be found at http://wraith.botpack.net/wiki/Download"
+    echo "A distribution version can be found at https://github.com/wraith/wraith/wiki/Download"
     echo ""
     echo ""
     exit 1

doc/UPDATES.md

@@ -191,7 +191,7 @@
   * Add cmd_newhub for adding a new hub. All bots will add this to their config.
   * Hubs can now be overridden inside the botconfig (-C)
   * Optimize userfile writing by doing it asynchronously
-  * Groups support added. See: http://wraith.botpack.net/wiki/Groups
+  * Groups support added. See: https://github.com/wraith/wraith/wiki/Groups
     * Add [bot]set var 'groups' to configure what groups bots are in
     * Add chanset 'groups' to take a list of groups that should join. 'chanset #chan groups { main backup }'
     * Added group support to 'botcmd': 'botcmd [*|&|?] %group cmd'

scripts/irssi/wraith.pl

@@ -9,7 +9,7 @@ $VERSION = "1.01";
           name        => 'wraith-auth',
           description => 'private auth script for botpack wraith',
           license     => 'ALL?',
-          url         => 'http://wraith.botpack.net/wiki/AuthSystem',
+          url         => 'https://github.com/wraith/wraith/wiki/AuthSystem',
           changed     => '$Date$ ',
 );
 

src/binary.cc

@@ -354,7 +354,7 @@ readcfg(const char *cfgfile, bool read_stdin)
       t.c_lflag &= ~(ECHO | ISIG);
       tty_changed = (tcsetattr (fileno (stdin), TCSAFLUSH | TCSASOFT, &t) == 0);
     }
-    printf(STR("// Paste in your PACKCONFIG. Reference http://wraith.botpack.net/wiki/PackConfig\n"));
+    printf(STR("// Paste in your PACKCONFIG. Reference https://github.com/wraith/wraith/wiki/PackConfig\n"));
     printf(STR("// Press <enter> if it gets hung up. If that doesn't work hit ^D (CTRL+d)\n"));
     fflush(stdout);
   } else {

src/cmds.cc

@@ -427,10 +427,8 @@ static void cmd_about(int idx, char *par)
   dprintf(idx, STR(" * $bMany$b others.\n"));
   dprintf(idx, " \n");
   dprintf(idx, STR("For a list of Contributors see: git shortlog -sen master\n"));
-  dprintf(idx, STR("To Contribute see: http://wraith.botpack.net/wiki/Contributing\n"));
-  dprintf(idx, STR("Credit for suggestions/bugs can be found at: http://wraith.botpack.net/report/9\n"));
-  dprintf(idx, STR("Bugs can be reported at: http://wraith.botpack.net/newticket\n"));
-  dprintf(idx, STR("Bugs can be looked up by #, ie, '#24' in url: http://wraith.botpack.net/ticket/24\n"));
+  dprintf(idx, STR("To Contribute see: https://github.com/wraith/wraith/wiki/Contributing\n"));
+  dprintf(idx, STR("Bugs can be reported at: https://github.com/wraith/wraith/issues\n"));
   dprintf(idx, " \n");
   dprintf(idx, STR("Please support wraith by signing up for a shell at http://www.xzibition.com (coupon 'wraith' for 30%% off)\n"));
   dprintf(idx, " \n");
@@ -719,8 +717,8 @@ static void cmd_help(int idx, char *par)
   } else if (!fnd) {
     dprintf(idx, "No match for '%s'.\n", match);
   }
-  dprintf(idx, "FAQ: http://wraith.botpack.net/wiki/FrequentlyAskedQuestions\n");
-  dprintf(idx, "Documentation: http://wraith.botpack.net/wiki/Documentation\n");
+  dprintf(idx, "FAQ: https://github.com/wraith/wraith/wiki/FrequentlyAskedQuestions\n");
+  dprintf(idx, "Documentation: https://github.com/wraith/wraith/wiki/Documentation\n");
 }
 
 static void cmd_addlog(int idx, char *par)

src/config.h.in

@@ -84,7 +84,7 @@
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H
 
-/* Define to 1 if the system has the type 'long long int'. */
+/* Define to 1 if the system has the type `long long int'. */
 #undef HAVE_LONG_LONG_INT
 
 /* Define to 1 if you have the `madvise' function. */
@@ -221,7 +221,7 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to 1 if the system has the type 'unsigned long long int'. */
+/* Define to 1 if the system has the type `unsigned long long int'. */
 #undef HAVE_UNSIGNED_LONG_LONG_INT
 
 /* Define to 1 if you have the `vsnprintf' function. */