--- owl-2.2.2.orig/Makefile.in
+++ owl-2.2.2/Makefile.in
@@ -2,7 +2,7 @@
 
 srcdir = @srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
+prefix = $(DESTDIR)@prefix@
 exec_prefix = @exec_prefix@
 datadir = @datadir@
 bindir = @bindir@
--- owl-2.2.2.orig/aclocal.m4
+++ owl-2.2.2/aclocal.m4
@@ -0,0 +1,171 @@
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+		
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$PKG_CONFIG"; then
+    if test -n "$$1"; then
+        pkg_cv_[]$1="$$1"
+    else
+        PKG_CHECK_EXISTS([$3],
+                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+			 [pkg_failed=yes])
+    fi
+else
+	pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT
+])],
+		[AC_MSG_RESULT([no])
+                $4])
+elif test $pkg_failed = untried; then
+	ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+		[$4])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
+
--- owl-2.2.2.orig/aim.c
+++ owl-2.2.2/aim.c
@@ -1010,7 +1010,7 @@
     int i;
     
     owl_free(filename); /* not needed */
-    owl_function_error("getaimdata memrequest: recieved invalid request for 0x%08lx bytes at 0x%08lx (file %s)\n", len, offset, modname);
+    owl_function_error("getaimdata memrequest: received invalid request for 0x%08lx bytes at 0x%08lx (file %s)\n", len, offset, modname);
     i = 8;
     if (modname) {
       i+=strlen(modname);
@@ -1221,7 +1221,7 @@
      * Apparently if you set the charset to something WinAIM
      * doesn't recognize, it will completly ignore the message.
      * That is, it will not display anything in the conversation
-     * window for the user that recieved it.
+     * window for the user that received it.
      *
      * HOWEVER, if they do not have a conversation window open
      * for you, a new one will be created, but it will not have
--- owl-2.2.2.orig/codelist.pl
+++ owl-2.2.2/codelist.pl
@@ -2,7 +2,7 @@
 # $Id: codelist.pl,v 1.7 2003/07/02 22:15:24 kretch Exp $
 
 if ($#ARGV eq -1) {
-    @ARGV=`ls *.c`;
+    @ARGV=`ls -1 *.c |grep -v perlglue.c`;
     chop(@ARGV);
 }
 
--- owl-2.2.2.orig/commands.c
+++ owl-2.2.2/commands.c
@@ -297,8 +297,8 @@
 	      "suppress a given zephyr triplet",
 	      "zpunt <class> <instance> [recipient]\n"
 	      "zpunt <instance>",
-	      "The zpunt command will supress message to the specified\n"
-	      "zephyr triplet.  In the second usage messages as supressed\n"
+	      "The zpunt command will suppress message to the specified\n"
+	      "zephyr triplet.  In the second usage messages as suppressed\n"
 	      "for class MESSAGE and the named instance.\n\n"
 	      "SEE ALSO:  zunpunt, show zpunts\n"),
 
--- owl-2.2.2.orig/configure
+++ owl-2.2.2/configure
@@ -2635,11 +2635,13 @@
 
 { echo "$as_me:$LINENO: checking for /usr/include/kerberosIV" >&5
 echo $ECHO_N "checking for /usr/include/kerberosIV... $ECHO_C" >&6; }
-if test -d /usr/include/kerberosIV; then
-        CFLAGS=${CFLAGS}\ -I/usr/include/kerberosIV
-        CPPFLAGS=${CPPFLAGS}\ -I/usr/include/kerberosIV
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ echo "$as_me:$LINENO: result: DEPRECATED" >&5
+echo "${ECHO_T}DEPRECATED" >&6; }
+if test -d /usr/include/openssl; then
+        CFLAGS=${CFLAGS}\ -I/usr/include/openssl
+        CPPFLAGS=${CPPFLAGS}\ -I/usr/include/openssl
+        { echo "$as_me:$LINENO: result: OpenSSL DES found instead" >&5
+echo "${ECHO_T}OpenSSL DES found instead" >&6; }
 else
         { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
@@ -3116,13 +3118,13 @@
 fi
 
 
-{ echo "$as_me:$LINENO: checking for krb5_derive_key in -lk5crypto" >&5
-echo $ECHO_N "checking for krb5_derive_key in -lk5crypto... $ECHO_C" >&6; }
-if test "${ac_cv_lib_k5crypto_krb5_derive_key+set}" = set; then
+{ echo "$as_me:$LINENO: checking for DES_cbc_encrypt in -lcrypto" >&5
+echo $ECHO_N "checking for DES_cbc_encrypt in -lcrypto... $ECHO_C" >&6; }
+if test "${ac_cv_lib_crypto_DES_cbc_encrypt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lk5crypto  $LIBS"
+LIBS="-lcrypto  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3136,11 +3138,11 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char krb5_derive_key ();
+char DES_cbc_encrypt ();
 int
 main ()
 {
-return krb5_derive_key ();
+return DES_cbc_encrypt ();
   ;
   return 0;
 }
@@ -3163,97 +3165,26 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_k5crypto_krb5_derive_key=yes
+  ac_cv_lib_crypto_DES_cbc_encrypt=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_k5crypto_krb5_derive_key=no
+	ac_cv_lib_crypto_DES_cbc_encrypt=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_k5crypto_krb5_derive_key" >&5
-echo "${ECHO_T}$ac_cv_lib_k5crypto_krb5_derive_key" >&6; }
-if test $ac_cv_lib_k5crypto_krb5_derive_key = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_DES_cbc_encrypt" >&5
+echo "${ECHO_T}$ac_cv_lib_crypto_DES_cbc_encrypt" >&6; }
+if test $ac_cv_lib_crypto_DES_cbc_encrypt = yes; then
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBK5CRYPTO 1
+#define HAVE_LIBCRYPTO 1
 _ACEOF
 
-  LIBS="-lk5crypto $LIBS"
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for des_cbc_encrypt in -ldes425" >&5
-echo $ECHO_N "checking for des_cbc_encrypt in -ldes425... $ECHO_C" >&6; }
-if test "${ac_cv_lib_des425_des_cbc_encrypt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldes425  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char des_cbc_encrypt ();
-int
-main ()
-{
-return des_cbc_encrypt ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_des425_des_cbc_encrypt=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_des425_des_cbc_encrypt=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5
-echo "${ECHO_T}$ac_cv_lib_des425_des_cbc_encrypt" >&6; }
-if test $ac_cv_lib_des425_des_cbc_encrypt = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDES425 1
-_ACEOF
-
-  LIBS="-ldes425 $LIBS"
+  LIBS="-lcrypto $LIBS"
 
 fi
 
@@ -3329,13 +3260,13 @@
 fi
 
 
-{ echo "$as_me:$LINENO: checking for krb5_get_credentials in -lkrb5" >&5
-echo $ECHO_N "checking for krb5_get_credentials in -lkrb5... $ECHO_C" >&6; }
-if test "${ac_cv_lib_krb5_krb5_get_credentials+set}" = set; then
+{ echo "$as_me:$LINENO: checking for ZGetSender in -lzephyr" >&5
+echo $ECHO_N "checking for ZGetSender in -lzephyr... $ECHO_C" >&6; }
+if test "${ac_cv_lib_zephyr_ZGetSender+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lkrb5  $LIBS"
+LIBS="-lzephyr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3349,11 +3280,11 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char krb5_get_credentials ();
+char ZGetSender ();
 int
 main ()
 {
-return krb5_get_credentials ();
+return ZGetSender ();
   ;
   return 0;
 }
@@ -3376,37 +3307,36 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_krb5_krb5_get_credentials=yes
+  ac_cv_lib_zephyr_ZGetSender=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_krb5_krb5_get_credentials=no
+	ac_cv_lib_zephyr_ZGetSender=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_krb5_krb5_get_credentials" >&5
-echo "${ECHO_T}$ac_cv_lib_krb5_krb5_get_credentials" >&6; }
-if test $ac_cv_lib_krb5_krb5_get_credentials = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_zephyr_ZGetSender" >&5
+echo "${ECHO_T}$ac_cv_lib_zephyr_ZGetSender" >&6; }
+if test $ac_cv_lib_zephyr_ZGetSender = yes; then
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBKRB5 1
+#define HAVE_LIBZEPHYR 1
 _ACEOF
 
-  LIBS="-lkrb5 $LIBS"
+  LIBS="-lzephyr $LIBS"
 
 fi
 
-
-{ echo "$as_me:$LINENO: checking for krb_sendauth in -lkrb4" >&5
-echo $ECHO_N "checking for krb_sendauth in -lkrb4... $ECHO_C" >&6; }
-if test "${ac_cv_lib_krb4_krb_sendauth+set}" = set; then
+{ echo "$as_me:$LINENO: checking for ZInitLocationInfo in -lzephyr" >&5
+echo $ECHO_N "checking for ZInitLocationInfo in -lzephyr... $ECHO_C" >&6; }
+if test "${ac_cv_lib_zephyr_ZInitLocationInfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lkrb4  $LIBS"
+LIBS="-lzephyr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3420,11 +3350,11 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char krb_sendauth ();
+char ZInitLocationInfo ();
 int
 main ()
 {
-return krb_sendauth ();
+return ZInitLocationInfo ();
   ;
   return 0;
 }
@@ -3447,185 +3377,62 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_krb4_krb_sendauth=yes
+  ac_cv_lib_zephyr_ZInitLocationInfo=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_krb4_krb_sendauth=no
+	ac_cv_lib_zephyr_ZInitLocationInfo=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_krb4_krb_sendauth" >&5
-echo "${ECHO_T}$ac_cv_lib_krb4_krb_sendauth" >&6; }
-if test $ac_cv_lib_krb4_krb_sendauth = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBKRB4 1
-_ACEOF
-
-  LIBS="-lkrb4 $LIBS"
-
-else
-
-{ echo "$as_me:$LINENO: checking for krb_sendauth in -lkrb" >&5
-echo $ECHO_N "checking for krb_sendauth in -lkrb... $ECHO_C" >&6; }
-if test "${ac_cv_lib_krb_krb_sendauth+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lkrb  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_zephyr_ZInitLocationInfo" >&5
+echo "${ECHO_T}$ac_cv_lib_zephyr_ZInitLocationInfo" >&6; }
+if test $ac_cv_lib_zephyr_ZInitLocationInfo = yes; then
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char krb_sendauth ();
-int
-main ()
-{
-return krb_sendauth ();
-  ;
-  return 0;
-}
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBZEPHYR_ZINITLOCATIONINFO
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_krb_krb_sendauth=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_krb_krb_sendauth=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_krb_krb_sendauth" >&5
-echo "${ECHO_T}$ac_cv_lib_krb_krb_sendauth" >&6; }
-if test $ac_cv_lib_krb_krb_sendauth = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBKRB 1
-_ACEOF
 
-  LIBS="-lkrb $LIBS"
 
-fi
-
-fi
 
 
-{ echo "$as_me:$LINENO: checking for ZGetSender in -lzephyr" >&5
-echo $ECHO_N "checking for ZGetSender in -lzephyr... $ECHO_C" >&6; }
-if test "${ac_cv_lib_zephyr_ZGetSender+set}" = set; then
+for ac_func in DES_string_to_key  DES_ecb_encrypt DES_key_sched
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lzephyr  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ZGetSender ();
-int
-main ()
-{
-return ZGetSender ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_zephyr_ZGetSender=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_zephyr_ZGetSender=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_zephyr_ZGetSender" >&5
-echo "${ECHO_T}$ac_cv_lib_zephyr_ZGetSender" >&6; }
-if test $ac_cv_lib_zephyr_ZGetSender = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBZEPHYR 1
-_ACEOF
-
-  LIBS="-lzephyr $LIBS"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
 
-fi
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 
-{ echo "$as_me:$LINENO: checking for ZInitLocationInfo in -lzephyr" >&5
-echo $ECHO_N "checking for ZInitLocationInfo in -lzephyr... $ECHO_C" >&6; }
-if test "${ac_cv_lib_zephyr_ZInitLocationInfo+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lzephyr  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+#undef $ac_func
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
@@ -3633,11 +3440,18 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char ZInitLocationInfo ();
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
 int
 main ()
 {
-return ZInitLocationInfo ();
+return $ac_func ();
   ;
   return 0;
 }
@@ -3660,28 +3474,27 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_zephyr_ZInitLocationInfo=yes
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_zephyr_ZInitLocationInfo=no
+	eval "$as_ac_var=no"
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_zephyr_ZInitLocationInfo" >&5
-echo "${ECHO_T}$ac_cv_lib_zephyr_ZInitLocationInfo" >&6; }
-if test $ac_cv_lib_zephyr_ZInitLocationInfo = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBZEPHYR_ZINITLOCATIONINFO
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
-
+done
 
 
 
@@ -4895,7 +4708,7 @@
 and GLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&5
 echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -4905,7 +4718,7 @@
 and GLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
@@ -4937,7 +4750,7 @@
    { (exit 1); exit 1; }; }
 fi
 
-FOO=`perl -MExtUtils::Embed -e ldopts | sed 's/,-E//' | sed 's/-liconv//'`
+FOO=`perl -MExtUtils::Embed -e ldopts | sed 's/-Wl,-E//' | sed 's/-liconv//'`
 echo Adding perl LDFLAGS ${FOO}
 LDFLAGS=${LDFLAGS}\ ${FOO}
 
--- owl-2.2.2.orig/configure.in
+++ owl-2.2.2/configure.in
@@ -30,13 +30,21 @@
 
 dnl Check for kerberosIV include
 AC_MSG_CHECKING(for /usr/include/kerberosIV)
-if test -d /usr/include/kerberosIV; then
-        CFLAGS=${CFLAGS}\ -I/usr/include/kerberosIV
-        CPPFLAGS=${CPPFLAGS}\ -I/usr/include/kerberosIV
-        AC_MSG_RESULT(yes)
+dnl per debbugs#517019
+AC_MSG_RESULT(DEPRECATED)
+dnl if test -d /usr/include/kerberosIV; then
+dnl         CFLAGS=${CFLAGS}\ -I/usr/include/kerberosIV
+dnl         CPPFLAGS=${CPPFLAGS}\ -I/usr/include/kerberosIV
+dnl         AC_MSG_RESULT(yes)
+dnl el
+if test -d /usr/include/openssl; then
+        CFLAGS=${CFLAGS}\ -I/usr/include/openssl
+        CPPFLAGS=${CPPFLAGS}\ -I/usr/include/openssl
+        AC_MSG_RESULT(OpenSSL DES found instead)
 else
         AC_MSG_RESULT(no)
 fi
+dnl openssl stanza per debbugs#517019
 
 dnl check for stack-protector
 PROTECT_CFLAGS=${PROTECT_CFLAGS-"-fstack-protector"}
@@ -54,18 +62,24 @@
 AC_CHECK_LIB(com_err, com_err)
 AC_CHECK_LIB(nsl, gethostbyname)
 AC_CHECK_LIB(socket, socket)
-AC_CHECK_LIB(k5crypto, krb5_derive_key)
+dnl per debbugs#517019
+dnl AC_CHECK_LIB(k5crypto, krb5_derive_key)
 dnl AC_CHECK_LIB(des425, req_act_vno)
-AC_CHECK_LIB(des425, des_cbc_encrypt)
+dnl AC_CHECK_LIB(des425, des_cbc_encrypt)
+dnl AC_CHECK_LIB(des425, des_cbc_encrypt,,AC_CHECK_LIB(crypto,DES_cbc_encrypt))
+AC_CHECK_LIB(crypto,DES_cbc_encrypt)
 dnl AC_CHECK_LIB(des, des_quad_cksum)
 AC_CHECK_LIB(resolv, res_search)
-AC_CHECK_LIB(krb5, krb5_get_credentials)
-AC_CHECK_LIB(krb4, krb_sendauth,,
-   AC_CHECK_LIB(krb, krb_sendauth))
+dnl per debbugs#517019
+dnl AC_CHECK_LIB(krb5, krb5_get_credentials)
+dnl AC_CHECK_LIB(krb4, krb_sendauth,,
+dnl   AC_CHECK_LIB(krb, krb_sendauth))
 dnl AC_CHECK_LIB(zephyr, ZGetSender,, AC_MSG_ERROR(No zephyr library found.))
 AC_CHECK_LIB(zephyr, ZGetSender)
 AC_CHECK_LIB(zephyr, ZInitLocationInfo, AC_DEFINE([HAVE_LIBZEPHYR_ZINITLOCATIONINFO], [], [Have ZInitLocationInfo]),)
 
+dnl per debbugs#517019
+AC_CHECK_FUNCS(DES_string_to_key  DES_ecb_encrypt DES_key_sched)
 AC_CHECK_FUNCS(use_default_colors resizeterm des_string_to_key des_key_sched des_ecb_encrypt)
 
 AC_MSG_CHECKING(for des_ecb_encrypt prototype)
@@ -107,7 +121,7 @@
 fi
 
 dnl Add LDFLAGS for embeded perl
-FOO=`perl -MExtUtils::Embed -e ldopts | sed 's/,-E//' | sed 's/-liconv//'`
+FOO=`perl -MExtUtils::Embed -e ldopts | sed 's/-Wl,-E//' | sed 's/-liconv//'`
 echo Adding perl LDFLAGS ${FOO}
 LDFLAGS=${LDFLAGS}\ ${FOO}
 
--- owl-2.2.2.orig/debian/README.Debian
+++ owl-2.2.2/debian/README.Debian
@@ -0,0 +1,7 @@
+owl for Debian
+--------------
+
+owl is one of the simpler (while still being extensible) non-graphical
+zephyr clients, which may make it simpler to get started as a user.
+
+ -- Mark W. Eichin <eichin@thok.org>, Tue, 23 Apr 2002 01:58:14 -0400
--- owl-2.2.2.orig/debian/changelog
+++ owl-2.2.2/debian/changelog
@@ -0,0 +1,250 @@
+owl (2.2.2-4b1) staging; urgency=high
+
+  * No-change rebuild against perl 5.20
+
+ -- Philip Muškovac <yofel@kubuntu.org>  Fri, 22 Aug 2014 14:24:26 +0000
+
+owl (2.2.2-4) unstable; urgency=medium
+
+  * aim.c commands.c doc/code.txt libfaim/chatnav.c libfaim/im.c variable.c:
+    lintian spelling-error-in-binary (most of which were actually user-visible.)
+  * debian/control: lintian no-homepage-field.
+  * debian/shlibs.local: #148175 was fixed 12 years ago (see 1.0.1-3
+    below) so drop the no-longer-needed file.
+
+ -- Mark W. Eichin <eichin@thok.org>  Fri, 04 Jul 2014 12:58:53 -0400
+
+owl (2.2.2-3) unstable; urgency=medium
+
+  * debian/rules, debian/control, debian/compat: minimal-dh 9.
+  * variable.c: since dh 9 means actually running tests, switch the use of
+    personalbell (which hasn't been boolean since 2.1.5) as suggested 
+    by barnowl.
+  * Makefile.in: add DESTDIR to prefix (because dh doesn't know
+    configure/PREFIX logic anymore.)
+  * debian/control: fix description-synopsis-starts-with-article.
+  * debian/changelog: fix debian-changelog-line-too-long.
+  * debian/control: standards version 3.8.0 -> 3.9.5.
+  
+ -- Mark W. Eichin <eichin@thok.org>  Mon, 30 Jun 2014 20:51:39 -0400
+
+owl (2.2.2-2) unstable; urgency=medium
+
+  * Maintainer upload. Thanks to gregoa@debian.org and hartmans@debian.org
+    for their NMUs.
+  * debian/source/format: 1.0 to be explicit.
+  * dgit upload with a modern signing key in preparation for other
+    modernization work.
+  * codelist.pl: filter out perlglue.c, it now needs hairy macros that nothing
+    that includes owl_prototypes.h actually provides.
+
+ -- Mark W. Eichin <eichin@thok.org>  Sun, 29 Jun 2014 22:33:08 -0400
+
+owl (2.2.2-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: configure: error: No terminfo found for this system":
+    add build dependency on ncurses-term.
+    (Closes: #708840)
+
+ -- gregor herrmann <gregoa@debian.org>  Sat, 25 May 2013 21:29:32 +0200
+
+owl (2.2.2-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Build depend on libzephyr-dev >= 3.0; this indicates a transition from
+    krb4-based zephyr to krb5-based zephyr, Closes: #538053
+
+ -- Sam Hartman <hartmans@debian.org>  Thu, 23 Jul 2009 07:37:06 -0400
+
+owl (2.2.2-1) unstable; urgency=low
+
+  * New upstream release.  The upstream author has become active again and
+    has worked with the barnowl developers on security issues. (Closes: #515118)
+  * configure.in, debian.control: barnowl updates via Sam Hartman
+    eliminate retro libkrb4 and des425 dependencies. (Closes: #517019)
+      * Do not link against libkrb4 or libkrb5; we use none of their symbols
+      * Support openssl DES for zcrypt so that we continue to have zcrypt
+        after libdes425 goes away
+      Note: ditched the KerberosIV test entirely to force this version,
+      allowing build/test on lenny.
+  * zcrypt.c: use des.h again, so we get the openssl one above.
+  * from unreleased 2.1.11-3:
+      * debian/control: version debhelper depends (lintian
+        package-lacks-versioned-build-depends-on-debhelper.)
+      * debian/watch: New file.
+  * debian/control: add libglib2.0-dev, per configure.in
+  
+ -- Mark W. Eichin <eichin@thok.org>  Mon, 13 Apr 2009 00:53:12 -0400
+
+owl (2.1.11-2) unstable; urgency=low
+
+  * debian/control, debian/rules, debian/compat: move to debhelper V7
+    (lintian debian-rules-sets-DH_COMPAT,
+    package-uses-deprecated-debhelper-compat-version.)
+  * debian/changelog: force my original name spelling to avoid false NMU
+    detection (lintian changelog-should-mention-nmu,
+    source-nmu-has-incorrect-version-number.)
+  * debian/rules: conditionalize distclean more narrowly (lintian
+    debian-rules-ignores-make-clean-error.)
+
+ -- Mark W. Eichin <eichin@thok.org>  Wed, 01 Oct 2008 23:53:58 -0400
+
+owl (2.1.11-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #454632)
+  * zephyr.c: report error in owl_zephyr_loadsubs too.
+  
+ -- Mark Eichin <eichin@thok.org>  Sun, 28 Sep 2008 00:39:22 -0400
+
+owl (2.1.8-4) unstable; urgency=low
+
+  * debian/copyright: fix lintian complaint about
+    copyright-lists-upstream-authors-with-dh_make-boilerplate.
+  * debian/control: fix lintian complaint about
+    description-synopsis-might-not-be-phrased-properly.  Also hint at
+    libzephyr3-krb, though I don't think it needs a Suggests.  Since the
+    code includes AIM support, grudgingly mention it in the Description.
+  * functions.c: support modern graphical browsers; doesn't implement the
+    full generic configuration due to the -remote issue, but particular
+    new browsers could be added directly in perl extension code.
+    (Closes: #152405)
+  
+ -- Mark Eichin <eichin@thok.org>  Sat, 27 Sep 2008 22:39:57 -0400
+
+owl (2.1.8-3) unstable; urgency=low
+
+  * Thanks to rra and dannf for the NMUs. (Closes: #477626)
+  * perlconfig.c: use PERL_SYS_INIT3 protocol as documented in perldoc
+    perlembed. (Closes: #495061)
+
+ -- Mark Eichin <eichin@thok.org>  Fri, 26 Sep 2008 02:52:32 -0400
+
+owl (2.1.8-2.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Sleep for 100ms instead of 10us when no key has been pressed to
+    avoid busy-waiting on input.  (Closes: #433027)
+  * More correctly remove the -E flag from Perl's ldflags to fix build
+    problems with Perl 5.10.  (Closes: #476013)
+
+ -- Russ Allbery <rra@debian.org>  Sun, 25 May 2008 08:00:28 -0700
+
+owl (2.1.8-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Include a patch from Andreas Jochens to fix compilation with gcc-4.0.
+    Closes: #287891
+  * Add some prototypes to perlglue.xs to avoid the implicit conversion of
+    return pointers from owl_zephyr_get_realm() & owl_zephyr_get_sender().
+    Closes: #326106
+
+ -- dann frazier <dannf@debian.org>  Tue, 11 Oct 2005 20:47:51 -0600
+
+owl (2.1.8-2) unstable; urgency=low
+
+  * zcrypt.c: use kerberosIV/des.h, not the openafs one. Closes: #189108.
+  * configure.in: change it in the test, too.
+
+ -- Mark W. Eichin <eichin@thok.org>  Sun, 29 Aug 2004 16:25:03 -0400
+
+owl (2.1.8-1) unstable; urgency=low
+
+  * New upstream release.  Kept debian/*, dropped all old patches
+    (everything that mattered was already upstream.)
+  * debian/copyright: new upstream location and mailing lists
+  * configure.in: don't look for libdes, it breaks kerberized zephyr.
+  * zephyr.c: actually record error_message in owl_function_error calls.     
+
+ -- Mark W. Eichin <eichin@thok.org>  Sun, 29 Aug 2004 13:21:53 -0400
+
+owl (1.2.9-1.1) unstable; urgency=low
+
+  * NMU
+  * Fix compile error, patch in BTS.  Closes: #189108
+
+ -- LaMont Jones <lamont@debian.org>  Sun,  3 Aug 2003 18:54:07 -0600
+
+owl (1.2.9-1) unstable; urgency=low
+
+  * New upstream release
+  * update fixes resize problem (Closes: #182897)
+  * upstream also took changes for perl multithreading, thanks Bas
+    Zoetekouw and Lamont Jones for the NMU (Closes: #159123)
+	
+ -- Mark W. Eichin <eichin@thok.org>  Sun, 13 Apr 2003 21:04:52 -0400
+
+owl (1.1.3-1.1) unstable; urgency=low
+
+  * NMU
+  * Fix perl 5.8 build problem.  Closes: #159123
+
+ -- LaMont Jones <lamont@debian.org>  Tue,  8 Oct 2002 18:21:44 -0600
+
+owl (1.1.3-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Mark W. Eichin <eichin@thok.org>  Fri,  5 Jul 2002 14:33:23 -0400
+
+owl (1.0.1-4) unstable; urgency=low
+
+  * debian/control: build-depend on a version of libzephyr late enough to
+    have #110486 fixed.  (Closes: #148404)
+
+ -- Mark W. Eichin <eichin@thok.org>  Thu, 30 May 2002 14:19:18 -0400
+
+owl (1.0.1-3) unstable; urgency=low
+
+  * debian/shlibs.local: override libzephyr3-krb's shlibs file until
+    #148175 is fixed.  (Closes: #148107)
+
+ -- Mark W. Eichin <eichin@thok.org>  Sat, 25 May 2002 18:35:09 -0400
+
+owl (1.0.1-2) unstable; urgency=low
+
+  * update README.debian from pre-release.
+  * configure.in: ditch the explicit krb tests, so we can get the right
+    libs. Crudely done, improvements sought.
+
+ -- Mark W. Eichin <eichin@thok.org>  Sat, 25 May 2002 02:19:47 -0400
+
+owl (1.0.1-1) unstable; urgency=low
+
+  * New upstream release.  Includes the 1.0.1 fixes below.
+  * debian/watch: new file, lets us use uscan and be very lazy :-)
+
+ -- Mark W. Eichin <eichin@thok.org>  Fri, 24 May 2002 17:42:44 -0400
+
+owl (1.0-1) unstable; urgency=low
+
+  * New upstream release (first public deb.) (Closes: #147980)
+  * zephyr.c (loadloginsubs, loadsubs): use free correctly.  (pre-1.0.1 fix)
+  * util.c (owl_free): void, don't return.  (pre-1.0.1 fix)
+
+ -- Mark W. Eichin <eichin@thok.org>  Fri, 24 May 2002 01:27:28 -0400
+
+owl (0.10-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Mark W. Eichin <eichin@thok.org>  Tue,  7 May 2002 17:25:28 -0400
+
+owl (0.9-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Mark W. Eichin <eichin@thok.org>  Sun, 28 Apr 2002 22:29:02 -0400
+
+owl (0.8.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Mark W. Eichin <eichin@thok.org>  Wed, 24 Apr 2002 19:19:29 -0400
+
+owl (0.7-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Mark W. Eichin <eichin@thok.org>  Tue, 23 Apr 2002 01:58:14 -0400
+
--- owl-2.2.2.orig/debian/compat
+++ owl-2.2.2/debian/compat
@@ -0,0 +1 @@
+9
--- owl-2.2.2.orig/debian/control
+++ owl-2.2.2/debian/control
@@ -0,0 +1,17 @@
+Source: owl
+Section: net
+Priority: optional
+Homepage: http://www.ktools.org/owl/
+Maintainer: Mark W. Eichin <eichin@thok.org>
+Build-Depends: debhelper (>> 9), libzephyr-dev (>= 3.0~beta), libncurses5-dev, libkrb5-dev, libperl-dev, libssl-dev, libglib2.0-dev, ncurses-term
+Standards-Version: 3.9.5
+
+Package: owl
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, zephyr-clients
+Description: Curses-based tty Zephyr client
+ An alternative standalone (doesn't use zwgc) Zephyr (instant
+ messaging) client.  Has perl hooks and a curses UI; supports Kerberos
+ if libzephyr4-krb is present. (Also supports AIM.)
+ .
+ ktools software -- The 'k' is for Quality!
--- owl-2.2.2.orig/debian/copyright
+++ owl-2.2.2/debian/copyright
@@ -0,0 +1,55 @@
+This package was debianized by Mark W. Eichin <eichin@thok.org> on
+Tue, 23 Apr 2002 01:58:14 -0400.
+
+It was downloaded from http://www.ktools.org/dist/owl/owl-2.2.2.tar.gz
+
+Upstream Authors: bug-ktools@ktools.org
+
+Owl was primarly written by James Kretchmar at the Massachusetts
+Institute of Technology.  Erik Nygren has also made substantial
+contributions and improvemnts to the program.
+
+Copyright:
+
+from owl.c:
+
+/*  Copyright (c) 2004 James Kretchmar. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *  
+ *    * 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.
+ *  
+ *    * Redistributions in any form must be accompanied by information on
+ *      how to obtain complete source code for the Owl software and any
+ *      accompanying software that uses the Owl software. The source code
+ *      must either be included in the distribution or be available for no
+ *      more than the cost of distribution plus a nominal fee, and must be
+ *      freely redistributable under reasonable conditions. For an
+ *      executable file, complete source code means the source code for
+ *      all modules it contains. It does not include source code for
+ *      modules or files that typically accompany the major components of
+ *      the operating system on which the executable file runs.
+ *  
+ * 
+ *  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ *  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
+ *  NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 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.
+ */
+
+  ktools software -- The 'k' is for Quality!
--- owl-2.2.2.orig/debian/dirs
+++ owl-2.2.2/debian/dirs
@@ -0,0 +1 @@
+usr/bin
--- owl-2.2.2.orig/debian/rules
+++ owl-2.2.2/debian/rules
@@ -0,0 +1,7 @@
+#!/usr/bin/make -f
+# lintian hardening
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
+%:
+	dh $@
--- owl-2.2.2.orig/debian/source/format
+++ owl-2.2.2/debian/source/format
@@ -0,0 +1 @@
+1.0
--- owl-2.2.2.orig/debian/watch
+++ owl-2.2.2/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://www.ktools.org/dist/owl/owl-(.*)\.tar\.gz
--- owl-2.2.2.orig/doc/code.txt
+++ owl-2.2.2/doc/code.txt
@@ -163,7 +163,7 @@
 The four curses windows on the screen are
 
   recwin - receiving window
-  sepwin - seperator window
+  sepwin - separator window
   msgwin - message window
   typwin - typing window
 
--- owl-2.2.2.orig/libfaim/chatnav.c
+++ owl-2.2.2/libfaim/chatnav.c
@@ -379,7 +379,7 @@
 	}
 
 	if (snac2->family != 0x000d) {
-		faimdprintf(sess, 0, "faim: chatnav_parse_info: recieved response that maps to corrupt request! (fam=%04x)\n", snac2->family);
+		faimdprintf(sess, 0, "faim: chatnav_parse_info: received response that maps to corrupt request! (fam=%04x)\n", snac2->family);
 		return 0;
 	}
 
--- owl-2.2.2.orig/libfaim/im.c
+++ owl-2.2.2/libfaim/im.c
@@ -1024,7 +1024,7 @@
 	channel = aimbs_get16(bs);
 
 	if (channel != 0x01) {
-		faimdprintf(sess, 0, "icbm: ICBM recieved on unsupported channel.  Ignoring. (chan = %04x)\n", channel);
+		faimdprintf(sess, 0, "icbm: ICBM received on unsupported channel.  Ignoring. (chan = %04x)\n", channel);
 		return 0;
 	}
 
--- owl-2.2.2.orig/perlconfig.c
+++ owl-2.2.2/perlconfig.c
@@ -179,6 +179,7 @@
   int ret, fd;
   PerlInterpreter *p;
   char filename[MAXPATHLEN];
+  int embedding_argc;
   char *embedding[5];
   char *err;
   struct stat statbuff;
@@ -191,8 +192,11 @@
   embedding[0]="";
   embedding[1]=filename;
   embedding[2]=0;
+  embedding_argc = 2;
 
   /* create and initialize interpreter */
+  PERL_SYS_INIT3(&embedding_argc, &embedding, &environ);
+  /* we never perl_free so we don't PERL_TERM either */
   p=perl_alloc();
   owl_global_set_perlinterp(&g, (void*)p);
   perl_construct(p);
--- owl-2.2.2.orig/variable.c
+++ owl-2.2.2/variable.c
@@ -107,7 +107,7 @@
 	       "send pings", "" ),
 
   OWLVAR_BOOL( "sepbar_disable" /* %OwlVarStub */, 0,
-	       "disable printing information in the seperator bar", "" ),
+	       "disable printing information in the separator bar", "" ),
 
   OWLVAR_BOOL( "smartstrip" /* %OwlVarStub */, 1,
 	       "strip kerberos instance for reply", ""),
@@ -940,16 +940,16 @@
   printf("BEGIN testing owl_variable\n");
   FAIL_UNLESS("setup", 0==owl_variable_dict_setup(&vd));
 
-  FAIL_UNLESS("get bool", 0==owl_variable_get_bool(&vd,"personalbell"));
+  FAIL_UNLESS("get bool", 0==owl_variable_get_bool(&vd,"rxping"));
   FAIL_UNLESS("get bool (no such)", -1==owl_variable_get_bool(&vd,"mumble"));
-  FAIL_UNLESS("get bool as string 1", 0==owl_variable_get_tostring(&vd,"personalbell", buf, 1024));
+  FAIL_UNLESS("get bool as string 1", 0==owl_variable_get_tostring(&vd,"rxping", buf, 1024));
   FAIL_UNLESS("get bool as string 2", 0==strcmp(buf,"off"));
-  FAIL_UNLESS("set bool 1", 0==owl_variable_set_bool_on(&vd,"personalbell"));
-  FAIL_UNLESS("get bool 2", 1==owl_variable_get_bool(&vd,"personalbell"));
-  FAIL_UNLESS("set bool 3", 0==owl_variable_set_fromstring(&vd,"personalbell","off",0,0));
-  FAIL_UNLESS("get bool 4", 0==owl_variable_get_bool(&vd,"personalbell"));
-  FAIL_UNLESS("set bool 5", -1==owl_variable_set_fromstring(&vd,"personalbell","xxx",0,0));
-  FAIL_UNLESS("get bool 6", 0==owl_variable_get_bool(&vd,"personalbell"));
+  FAIL_UNLESS("set bool 1", 0==owl_variable_set_bool_on(&vd,"rxping"));
+  FAIL_UNLESS("get bool 2", 1==owl_variable_get_bool(&vd,"rxping"));
+  FAIL_UNLESS("set bool 3", 0==owl_variable_set_fromstring(&vd,"rxping","off",0,0));
+  FAIL_UNLESS("get bool 4", 0==owl_variable_get_bool(&vd,"rxping"));
+  FAIL_UNLESS("set bool 5", -1==owl_variable_set_fromstring(&vd,"rxping","xxx",0,0));
+  FAIL_UNLESS("get bool 6", 0==owl_variable_get_bool(&vd,"rxping"));
 
 
   FAIL_UNLESS("get string", 0==strcmp("~/zlog/people", owl_variable_get_string(&vd,"logpath")));
--- owl-2.2.2.orig/zephyr.c
+++ owl-2.2.2/zephyr.c
@@ -70,9 +70,11 @@
 int owl_zephyr_loadsubs_helper(ZSubscription_t subs[], int count)
 {
   int i, ret = 0;
+  errcode_t code;
   /* sub without defaults */
-  if (ZSubscribeToSansDefaults(subs,count,0) != ZERR_NONE) {
-    owl_function_error("Error subscribing to zephyr notifications.");
+  code = ZSubscribeToSansDefaults(subs,count,0);
+  if (code != ZERR_NONE) {
+    owl_function_error("Error %s subscribing to zephyr notifications.", error_message(code));
     ret=-2;
   }
 
@@ -171,9 +173,11 @@
 {
 #ifdef HAVE_LIBZEPHYR
   ZSubscription_t subs[10];
-    
-  if (ZSubscribeTo(subs,0,0) != ZERR_NONE) {
-    owl_function_error("Error subscribing to default zephyr notifications.");
+  errcode_t code;
+
+  code = ZSubscribeTo(subs,0,0);
+  if (code != ZERR_NONE) {
+    owl_function_error("Error %s subscribing to default zephyr notifications.", error_message(code));
     return(-1);
   }
   return(0);
@@ -190,6 +194,7 @@
   char subsfile[MAXPATHLEN], buffer[1024];
   int count, ret, i;
   struct stat statbuff;
+  errcode_t code;
 
   if (filename==NULL) {
     sprintf(subsfile, "%s/%s", owl_global_get_homedir(&g), ".anyone");
@@ -230,8 +235,9 @@
   }
 
   /* sub with defaults */
-  if (ZSubscribeToSansDefaults(subs,count,0) != ZERR_NONE) {
-    owl_function_error("Error subscribing to zephyr notifications.");
+  code = ZSubscribeToSansDefaults(subs,count,0);
+  if (code != ZERR_NONE) {
+    owl_function_error("Error %s subscribing to zephyr notifications.", error_message(code));
     ret=-2;
   }
 
@@ -284,14 +290,16 @@
 {
 #ifdef HAVE_LIBZEPHYR
   ZSubscription_t subs[5];
+  errcode_t code;
 
   subs[0].zsub_class=class;
   subs[0].zsub_classinst=inst;
   subs[0].zsub_recipient=recip;
 
   ZResetAuthentication();
-  if (ZUnsubscribeTo(subs,1,0) != ZERR_NONE) {
-    owl_function_error("Error unsubbing from <%s,%s,%s>", class, inst, recip);
+  code = ZUnsubscribeTo(subs,1,0);
+  if (code != ZERR_NONE) {
+    owl_function_error("Error %s unsubbing from <%s,%s,%s>", error_message(code), class, inst, recip);
     return(-2);
   }
   return(0);
@@ -464,7 +472,7 @@
   owl_free(notice.z_message);
   ZFreeNotice(&notice);
   if (ret!=ZERR_NONE) {
-    owl_function_error("Error sending zephyr");
+    owl_function_error("Error %s sending zephyr", error_message(ret));
     return(ret);
   }
   return(0);
@@ -640,7 +648,7 @@
   ZResetAuthentication();
   ret=ZLocateUser(user,&numlocs,auth?ZAUTH:ZNOAUTH);
   if (ret != ZERR_NONE) {
-    return(owl_sprintf("Error locating user %s\n", user));
+    return(owl_sprintf("Error %s locating user %s\n", error_message(ret), user));
   }
 
   if (numlocs==0) {
@@ -652,6 +660,7 @@
 
   out=strdup("");
   for (;numlocs;numlocs--) {
+    /* should check return here, and fix loop */
     ZGetLocations(&locations,&one);
     myuser=short_zuser(user);
     tmp=owl_sprintf("%s%s: %s\t%s\t%s\n",
@@ -769,6 +778,8 @@
   ret=ZSetLocation(eset);
   owl_zephyr_process_events(NULL);
   if (ret != ZERR_NONE) {
+    /* we should check this, but ZSetLocation almost *always* gives Internal Error. Sigh. */
+    /* is this the "SENT" bug? if so, it is fixed... */
     /* owl_function_makemsg("Error setting location: %s", error_message(ret)); */
   }
 #endif
@@ -853,6 +864,7 @@
   if (ret==ZERR_TOOMANYSUBS) {
     return(owl_strdup("Zephyr: too many subscriptions\n"));
   } else if (ret || (num <= 0)) {
+    /* need to attach error_message(ret) here! */
     return(owl_strdup("Zephyr: error retriving subscriptions\n"));
   }
 
@@ -863,6 +875,7 @@
     if ((ret = ZGetSubscriptions(&sub, &one)) != ZERR_NONE) {
       owl_free(out);
       ZFlushSubscriptions();
+      /* need to attach error_message(ret) here! */
       out=owl_strdup("Error while getting subscriptions\n");
       return(out);
     } else {
