Jelajahi Sumber

* Update logo
* Update LICENSE
* Update cmd_about
* Update CREDITS


svn: 3889

Bryan Drewery 17 tahun lalu
induk
melakukan
4e7989d29e
5 mengubah file dengan 99 tambahan dan 20 penghapusan
  1. 80 7
      LICENSE
  2. 3 3
      README
  3. 8 3
      doc/CREDITS
  4. 3 2
      src/cmds.c
  5. 5 5
      src/misc.c

+ 80 - 7
LICENSE

@@ -1,19 +1,35 @@
- This package includes a mix of licenses:
+****************************************************************
+****************************************************************
+ANY REDISTRIBUTION OF THIS SOURCE OR DERIVATIVES OF THIS SOURCE 
+MUST INCLUDE THIS FILE, DOC/CREDITS, CMD_ABOUT, AND FILE HEADERS
+WITH LICENSING/COPYRIGHTS.
+CMD_ABOUT MUST INCLUDE: CREDITS TO BRYAN/EGGDEV/GHOST AND THE 
+OFFICIAL WRAITH URL (http://wraith.botpack.net)
+-Bryan Drewery
+****************************************************************
+****************************************************************
+
+
+This package includes a mix of licenses:
   * Public domain
   * BSD
   * GPL v2
   * BSD-style
 
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
+ * This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+ * This product includes unlicensed code (mostly GPL) by Erik Johansen (einride) from the ghost botpack (http://ghost.botpack.net)
 
- * This product includes unlicensed code by Erik Johansen (einride) from the ghost botpack (http://ghost.botpack.net)
+ snprintf.c:
+ * This code is based on code written by Patrick Powell (papowell@astart.com)
+ * It may be used for any purpose as long as this notice remains intact
+ * on all source code distributions
 
 /*
  * Copyright (C) 1997 Robey Pointer
- * Copyright (C) 1999 - 2008 Eggheads Development Team
- * Copyright (C) 2002 - 2008 Bryan Drewery
+ * Copyright (C) 1999 - 2008 Eggheads Development Team (http://www.eggheads.org)
+ * Copyright (C) 2002 - 2008 Bryan Drewery (http://wraith.botpack.net)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -29,4 +45,61 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
+(FULL GPL CAN BE FOUND IN DOC/GPL)
+
+src/crypto files (AES, MD5, SHA1):
+/* ====================================================================
+ * Copyright (c) 1998-2008 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
 

+ 3 - 3
README

@@ -1,7 +1,7 @@
-                       .__  __  .__
+                        __  __   __
 __  _  ______________  |__|/  |_|  |__
-\ \/ \/ /\_  __ \__  \ |  \   __\  |  \
- \     /  |  | \// __ \|  ||  | |   Y  \
+\ \/ \/ /\_  __ \__  \ |  \    _\  |  \
+ \     /  |  | \// __ \|  ||  | |   \  \
   \/\_/   |__|  (____  /__||__| |___|  /
                      \/              \/
 

+ 8 - 3
doc/CREDITS

@@ -1,5 +1,6 @@
-Wraith botpack by bryan, with credits and thanks to the following:
+Wraith botpack by Bryan (http://wraith.botpack.net)
 (written from a base of Eggdrop 1.6.12)
+Credits and thanks to the following:
 
 * Eggdev for eggdrop obviously.
 * ryguy for beta testing, providing code, finding bugs, and providing input.
@@ -12,8 +13,12 @@ Wraith botpack by bryan, with credits and thanks to the following:
 * Excelsior for celdrop which inspired many features.
 * syt for giving me inspiration to code a more secure bot.
 * Blackjac for helping with the bx auth script with his Sentinel script.
-* Mystikal for various bugs
-* Many others
+* Mystikal for various bugs.
+* Many others.
+
+Credit for suggestions/bugs can be found at: http://wraith.botpack.net/report/9
+Bugs can be reported at: http://wraith.botpack.net/newticket
+Bugs can be looked up by #, ie, '#24' in url: http://wraith.botpack.net/ticket/24/
 
 The botpack ghost inspired the early versions of wraith and a few cmds.
 * einride

+ 3 - 2
src/cmds.c

@@ -406,9 +406,10 @@ static void cmd_about(int idx, char *par)
   dprintf(idx, STR(" * $bExcelsior$b for celdrop which inspired many features.\n"));
   dprintf(idx, STR(" * $bsyt$b for giving me inspiration to code a more secure bot.\n"));
   dprintf(idx, STR(" * $bBlackjac$b for helping with the bx auth script with his Sentinel script.\n"));
-  dprintf(idx, STR(" * $bMystikal$b for various bugs\n"));
+  dprintf(idx, STR(" * $bMystikal$b for various bugs.\n"));
+  dprintf(idx, STR(" * $bMany$b others.\n"));
   dprintf(idx, " \n");
-  dprintf(idx, STR("Credit for suggestions/bugs can be found at: https://wraith.botpack.net/trac/report/9\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, " \n");

+ 5 - 5
src/misc.c

@@ -350,17 +350,17 @@ void daysdur(time_t mynow, time_t then, char *out)
 /* show l33t banner */
 static const char *wbanner(void) {
 /*
-                       .__  __  .__
+                        __  __   __
 __  _  ______________  |__|/  |_|  |__
-\ \/ \/ /\_  __ \__  \ |  \   __\  |  \
- \     /  |  | \// __ \|  ||  | |   Y  \
+\ \/ \/ /\_  __ \__  \ |  \    _\  |  \
+ \     /  |  | \// __ \|  ||  | |   \  \
   \/\_/   |__|  (____  /__||__| |___|  /
                      \/              \/
 */
-  return STR("                       .__  __  .__\n__  _  ______________  |__|/  |_|  |__\n\\ \\/ \\/ /\\_  __ \\__  \\ |  \\   __\\  |  \\\n \\     /  |  | \\// __ \\|  ||  | |   Y  \\\n  \\/\\_/   |__|  (____  /__||__| |___|  /\n                     \\/              \\/\n");
+  return STR("                        __  __   __\n__  _  ______________  |__|/  |_|  |__\n\\ \\/ \\/ /\\_  __ \\__  \\ |  \\    _\\  |  \\\n \\     /  |  | \\// __ \\|  ||  | |   \\  \\\n  \\/\\_/   |__|  (____  /__||__| |___|  /\n                     \\/              \\/\n");
 #ifdef no
   switch (randint(9)) {
-   case 0: return STR("                       .__  __  .__\n__  _  ______________  |__|/  |_|  |__\n\\ \\/ \\/ /\\_  __ \\__  \\ |  \\   __\\  |  \\\n \\     /  |  | \\// __ \\|  ||  | |   Y  \\\n  \\/\\_/   |__|  (____  /__||__| |___|  /\n                     \\/              \\/\n");
+   case 0: return STR("                        __  __   __\n__  _  ______________  |__|/  |_|  |__\n\\ \\/ \\/ /\\_  __ \\__  \\ |  \\    _\\  |  \\\n \\     /  |  | \\// __ \\|  ||  | |   \\  \\\n  \\/\\_/   |__|  (____  /__||__| |___|  /\n                     \\/              \\/\n");
    case 1: return STR("                    _ _   _     \n__      ___ __ __ _(_) |_| |__  \n\\ \\ /\\ / / '__/ _` | | __| '_ \\ \n \\ V  V /| | | (_| | | |_| | | |\n  \\_/\\_/ |_|  \\__,_|_|\\__|_| |_|\n");
    //case 2: return STR("@@@  @@@  @@@  @@@@@@@    @@@@@@   @@@  @@@@@@@  @@@  @@@\n@@@  @@@  @@@  @@@@@@@@  @@@@@@@@  @@@  @@@@@@@  @@@  @@@\n@@!  @@!  @@!  @@!  @@@  @@!  @@@  @@!    @@!    @@!  @@@\n!@!  !@!  !@!  !@!  @!@  !@!  @!@  !@!    !@!    !@!  @!@\n@!!  !!@  @!@  @!@!!@!   @!@!@!@!  !!@    @!!    @!@!@!@!\n!@!  !!!  !@!  !!@!@!    !!!@!!!!  !!!    !!!    !!!@!!!!\n!!:  !!:  !!:  !!: :!!   !!:  !!!  !!:    !!:    !!:  !!!\n:!:  :!:  :!:  :!:  !:!  :!:  !:!  :!:    :!:    :!:  !:!\n :::: :: :::   ::   :::  ::   :::   ::     ::    ::   :::\n  :: :  : :     :   : :   :   : :  :       :      :   : :\n");
    case 3: return STR("                                     o8o      .   oooo\n                                     `''    .o8   `888\noooo oooo    ooo oooo d8b  .oooo.   oooo  .o888oo  888 .oo.\n `88. `88.  .8'  `888''8P `P  )88b  `888    888    888P'Y88b\n  `88..]88..8'    888      .oP'888   888    888    888   888\n   `888'`888'     888     d8(  888   888    888 .  888   888\n    `8'  `8'     d888b    `Y888''8o o888o   '888' o888o o888o\n");