Changeset 517

Timestamp:

08/16/06 02:56:44 (2 years ago)

Author:

pennmush

Message:

PennMUSH 1.8.1p3 Archival

Files:

• 1.8.1/CHANGES.180 (modified) (2 diffs)
• 1.8.1/CHANGES.181 (modified) (1 diff)
• 1.8.1/Configure (modified) (17 diffs)
• 1.8.1/Patchlevel (modified) (1 diff)
• 1.8.1/config_h.SH (modified) (5 diffs)
• 1.8.1/confmagic.h (modified) (1 diff)
• 1.8.1/game/txt/hlp/pennv180.hlp (modified) (2 diffs)
• 1.8.1/game/txt/hlp/pennv181.hlp (modified) (2 diffs)
• 1.8.1/game/txt/hlp/pennvOLD.hlp (modified) (1 diff)
• 1.8.1/hdrs/version.h (modified) (1 diff)

1.8.1/CHANGES.180

@@ -13 +13 @@
-==========================================================================
-
-August 29
+September 15
-
-Fixes:
@@ -20 +20 @@
-  * SHS encryption now works on 64-bit architectures that define
-    uint32_t. Report by Licenser@M*U*S*H.
+  * MySQL detection by Configure was accidentally removed
+    in 1.8.0p7/1.8.1p2. It's back. Report by Walker@M*U*S*H.
+    Same applies to SO_KEEPIDLE and some other Configure units.
-
-

1.8.1/CHANGES.181

@@ -13 +13 @@
-
-==========================================================================
+
+Version 1.8.1 patchlevel 3                      September 15, 2005
+
+Fixes
+  * Bugfixes from 1.8.0p8 applied.
+
-
-Version 1.8.1 patchlevel 2                      September 5, 2005

1.8.1/Configure

@@ -19 +19 @@
-#
-
-Configure 1.21.1.4.1.1.1.1.1.1.1.7.1.14 Mon, 28 Jun 2004 09:33:37 -05
+Head.U 1.3 Mon, 10 Nov 2003 14:51:32 -06
-#
-Mon Jun 28 09:20:55 CDT 2004
+Thu Sep 15 18:16:35 CDT 2005
-
-cat >/tmp/c1$$ <<EOF
@@ -264 +264 @@
-cdecl=''
-cf_email=''
+cf_name=''
-cf_by=''
-cf_time=''
@@ -380 +381 @@
-i_niin=''
-i_sysin=''
+i_nitcp=''
-i_setjmp=''
-i_stddef=''
@@ -417 +419 @@
-installdir=''
-libc=''
+d_mysql=''
+libmysqlclient=''
-glibpth=''
-libpth=''
@@ -454 +458 @@
-so=''
-d_keepalive=''
+d_keepidle=''
-sharpbang=''
-shsharp=''
@@ -4618 +4623 @@
-eval $inlibc
-
+: see if this is a netinet/tcp.h system
+set netinet/tcp.h i_nitcp
+eval $inhdr
+
-: see if setsockopt with SO_KEEPALIVE works as advertised
-echo " "
-case "$d_oldsock" in
-"$undef")
-    if $contains SO_KEEPALIVE `./findhdr sys/socket.h` \
-        /dev/null >/dev/null 2>&1
-    then
-        echo "OK, let's see if SO_KEEPALIVE works as advertised..." >&4
-        $cat > socket.c <<EOP
@@ -4630 +4636 @@
-#include <sys/socket.h>
-#include <netinet/in.h>
+#$i_nitcp I_NETINET_TCP
+#ifdef I_NETINET_TCP
+#include <netinet/tcp.h>
+#endif
-#include <netdb.h>
-
@@ -4635 +4645 @@
-{
-    int s = socket(AF_INET, SOCK_STREAM, 0);
+    int val = 1;
-    if (s == -1)
-        exit(1);
-0, 0
+&val, sizeof(val)
-        exit(2);
+#ifdef I_NETINET_TCP
+#ifdef TCP_KEEPIDLE
+    val = 1;
+    if (-1 == setsockopt(s, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)))
+        exit(3);
+#else
+        exit(3);
+#endif
+#endif
-    exit(0);
-}
@@ -4647 +4667 @@
-            case $? in
-            0) echo "Yes, it does!"
-
+
+
+
-            1) $cat <<EOM
-(Something went wrong -- Assuming SO_KEEPALIVE is broken)
-EOM
-
+
+
+
-            2) echo "No, it doesn't.  Don't trust your manuals!!"
-
+
+
+
+
+
+
+
-            esac
-        else
@@ -4660 +4690 @@
-EOM
-            val="$undef"
+            val2="$undef"
-        fi
-
-
-
-
+
-*) cat <<EOM
-As you have an old socket interface, you can't have heard of SO_KEEPALIVE.
-EOM
-
+
+
-esac
-set d_keepalive
+eval $setvar
+val="$val2"
+set d_keepidle
-eval $setvar
-$rm -f socket socket.c
@@ -4759 +4791 @@
-set memset d_memset
-eval $inlibc
+
+: see if we should include -lmysqlclient
+echo " "
+
+d_mysql="$undef"
+
+if $test "x$no_mysql" = "x"; then
+
+  libmysqlclient="-lmysqlclient"
+
+  $cat > test_mysql.c <<EOM
+#include <stdio.h>
+#include <stdlib.h>
+#include <mysql/mysql.h>
+#include <mysql/errmsg.h>
+
+int main(int argc, char **argv) {
+   printf("Your mysql is version %s\n",mysql_get_client_info());
+   exit(0);
+}
+EOM
+
+  if $cc $ccflags $ldflags -o test_mysql test_mysql.c $libs $libmysqlclient >/dev/null 2>&1 ;
+  then
+      echo 'You have mysql...' >&4
+      version=`./test_mysql`
+      if $test $? -eq 0; then
+    echo "$version" >&4
+        d_mysql="$define"
+      else
+        echo "...but my test program didn't run correctly." >&4
+        libmysqlclient=''
+      fi
+  else
+      echo "You don't seem to have mysql." >&4
+      libmysqlclient=''
+  fi
+  $rm -f test_mysql* core
+
+else
+
+  echo "Skipping mysql tests." >&4
+  libmysqlclient=''
+
+fi
-
-: check for a new-style definitions
@@ -6606 +6683 @@
-    elif ./xenix; then
-        dflt=y
+    elif $test "x$osname" = "xlinux"; then
+        dflt=y
-    else
-        dflt=n
@@ -6862 +6941 @@
-cf_by='$cf_by'
-cf_email='$cf_email'
+cf_name='$cf_name'
-cf_time='$cf_time'
-chgrp='$chgrp'
@@ -6915 +6995 @@
-d_itimer='$d_itimer'
-d_keepalive='$d_keepalive'
+d_keepidle='$d_keepidle'
-d_keepsig='$d_keepsig'
-d_lrand48='$d_lrand48'
@@ -6923 +7004 @@
-d_memset='$d_memset'
-d_mymalloc='$d_mymalloc'
+d_mysql='$d_mysql'
-d_newstyle='$d_newstyle'
-d_oldsock='$d_oldsock'
@@ -7008 +7090 @@
-i_netdb='$i_netdb'
-i_niin='$i_niin'
+i_nitcp='$i_nitcp'
-i_setjmp='$i_setjmp'
-i_sgtty='$i_sgtty'
@@ -7049 +7132 @@
-less='$less'
-libc='$libc'
+libmysqlclient='$libmysqlclient'
-libpth='$libpth'
-libs='$libs'

1.8.1/Patchlevel

@@ -1 +1 @@
-Do not edit this file. It is maintained by the official PennMUSH patches.
-2
+3

1.8.1/config_h.SH

@@ -26 +26 @@
- * For a more permanent change edit config.sh and rerun config_h.SH.
- *
-config_h.SH 1.17.1.2.1.1.1.11 Mon, 24 May 2004 14:14:15 -0500 dunemush
+Config_h.U,v 3.0.1.5 1997/02/28 14:57:43 ram Exp
- */
-
@@ -398 +398 @@
- */
-#define Size_t $sizetype     /* length paramater for string functions */
-
-/* CAN_KEEPALIVE:
- *  This symbol if defined indicates to the C program that the SO_KEEPALIVE
- *  option of setsockopt() will work as advertised in the manual.
- */
-#$d_keepalive CAN_KEEPALIVE     /**/
-
-/* VOIDFLAGS:
@@ -807 +801 @@
-#$i_netdb I_NETDB       /**/
-
+/* I_NETINET_TCP:
+ *  This symbol, if defined, indicates to the C program that it should
+ *  include <netinet/tcp.h>.
+ */
+#$i_nitcp I_NETINET_TCP /**/
+
-/* I_SETJMP:
- *  This symbol, if defined, indicates to the C program that it can
@@ -845 +845 @@
-#$i_stdarg I_STDARG     /**/
-
+/* HAS_MYSQL:
+ *     Defined if mysql client libraries are available.
+ */
+#$d_mysql HAS_MYSQL /**/
+
-/* HAS_OPENSSL:
- *     Defined if openssl 0.9.6+ is available.
@@ -850 +855 @@
-#$d_openssl HAS_OPENSSL /**/
-
+/* CAN_KEEPALIVE:
+ *  This symbol if defined indicates to the C program that the SO_KEEPALIVE
+ *  option of setsockopt() will work as advertised in the manual.
+ */
+/* CAN_KEEPIDLE:
+ *  This symbol if defined indicates to the C program that the TCP_KEEPIDLE
+ *  option of setsockopt() will work as advertised in the manual.
+ */
+#$d_keepalive CAN_KEEPALIVE     /**/
+
+#$d_keepidle CAN_KEEPIDLE       /**/
+
-#endif
-!GROK!THIS!

1.8.1/confmagic.h

@@ -7 +7 @@
- * without the -M option.
- *
-confmagic.h 1.9 Fri, 15 Feb 2002 16:56:28 -0600 dunemush
+Magic_h.U,v 3.0.1.2 1993/11/10 17:32:58 ram Exp
- */
-

1.8.1/game/txt/hlp/pennv180.hlp

@@ -1 +1 @@
-& 1.8.0p8
-August 29
+September 15
-
-Fixes:
@@ -7 +7 @@
-  * SHS encryption now works on 64-bit architectures that define
-    uint32_t. Report by Licenser@M*U*S*H.
+  * MySQL detection by Configure was accidentally removed
+    in 1.8.0p7/1.8.1p2. It's back. Report by Walker@M*U*S*H.
+    Same applies to SO_KEEPIDLE and some other Configure units.
-
-

1.8.1/game/txt/hlp/pennv181.hlp

@@ -1 @@
-2
+3
-& changes
-This is a list of changes in this patchlevel which are probably of
@@ -12 +12 @@
-be read in 'help patchlevels'.
-
+Version 1.8.1 patchlevel 3                      September 15, 2005
+
+Fixes
+  * Bugfixes from 1.8.0p8 applied.
+
+
+& 1.8.1p2
-Version 1.8.1 patchlevel 2                      September 5, 2005
-

1.8.1/game/txt/hlp/pennvOLD.hlp

@@ -4418 +4418 @@
-type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3'
-
-
+, 3
-1.8.0: 0, 1, 2, 3, 4, 5, 6, 7, 8
-1.7.7: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,

1.8.1/hdrs/version.h

@@ -1 +1 @@
-#define VERSION "1.8.1"
-2
-0
-2
+3
+1
+3