package: owl
version: 2.1.11-2
severity: important
tags: patch
With the next upload of the krb5 package, owl will FTBFS unless this
bug is fixed, so expect this to be upgraded to severity serious within
a week.
The krb5 package is dropping development support for libkrb4 and
libdes425 (and will be dropping runtime libraries in the near future).
Owl links against libdes425 for zcrypt and links against libkrb4 for
no particularly good reason.
Here are patches I just pushed to barnowl to fix these iyssues.
Note that patch 0007 includes some packaging changes you probably
don't want; the important thing is to build-depend on libssl-dev.
The affect of these patches will still be to use libdes425, but if
rebuilt after libdes425.so goes awy, you'd end up using libcrypto.
>From 4ad9c2d0e61dcdee8091d21d20effa74a053191b Mon Sep 17 00:00:00 2001
From: Sam Hartman <hartm...@mit.edu>
Date: Tue, 24 Feb 2009 23:15:58 -0500
Subject: [PATCH] Remove unneeded dependency on krb5 and krb4
Barnowl links against libkrb4, libk5crypto and libkrb5 and uses
symbols from none of the above. Remove these link-time dependencies.
This might break static builds but Kerberos no longer provides static
libraries.
The dependency on libkrb4 is problematic for Debian as libkrb4.so is being
removed.
---
configure.ac | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index c83b5b9..d7269d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,13 +59,9 @@ AC_CHECK_LIB(ncursesw, initscr,, AC_MSG_ERROR(No libncursesw
found.))
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 AC_CHECK_LIB(des425, req_act_vno)
AC_CHECK_LIB(des425, des_cbc_encrypt)
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 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]),)
--
1.5.6.3
>From 27ace3d98c59bd40c35cf439a2398665772aab3d Mon Sep 17 00:00:00 2001
From: Sam Hartman <hartm...@mit.edu>
Date: Tue, 24 Feb 2009 23:41:54 -0500
Subject: [PATCH] Support zcrypt using OpenSSL DES
Support a hackish mechanism for detecting OpenSSL DES if des425 is not
present. If you include des.h then they include macros to be
consistent with the des425 API. However these macros rename
des_ecb_encrypto te DES_ecb_encrypt. Searching for both the macros
and the functions was annoying in autoconf, so instead we search for
those internal function names.
Also, search for /usr/include/openssl if no krb4 includes are found.
---
configure.ac | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index d7269d1..a8975e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,6 +41,10 @@ elif test -d /usr/local/include/kerberosIV; then
CFLAGS=${CFLAGS}\ -I/usr/local/include/kerberosIV
CPPFLAGS=${CPPFLAGS}\ -I/usr/local/include/kerberosIV
AC_MSG_RESULT(yes)
+elif 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
@@ -60,7 +64,7 @@ AC_CHECK_LIB(com_err, com_err)
AC_CHECK_LIB(nsl, gethostbyname)
AC_CHECK_LIB(socket, socket)
dnl AC_CHECK_LIB(des425, req_act_vno)
-AC_CHECK_LIB(des425, des_cbc_encrypt)
+AC_CHECK_LIB(des425, des_cbc_encrypt,,AC_CHECK_LIB(crypto,DES_cbc_encrypt))
AC_CHECK_LIB(resolv, res_search)
dnl AC_CHECK_LIB(zephyr, ZGetSender,, AC_MSG_ERROR(No zephyr library found.))
AC_CHECK_LIB(zephyr, ZGetSender)
@@ -72,6 +76,7 @@ AC_ARG_ENABLE([athstatic],
AS_HELP_STRING([--enable-athstatic],
[ATHSTATIC=])
AC_CHECK_FUNCS(use_default_colors resizeterm des_string_to_key des_key_sched
des_ecb_encrypt)
+AC_CHECK_FUNCS( DES_string_to_key
DES_ecb_encrypt DES_key_sched)
AC_MSG_CHECKING(for des_ecb_encrypt prototype)
AC_TRY_COMPILE([#include <des.h>
--
1.5.6.3
>From a164690d846dad855c9d959dfc9c689c0704be40 Mon Sep 17 00:00:00 2001
From: Sam Hartman <hartm...@debian.org>
Date: Tue, 24 Feb 2009 23:56:43 -0500
Subject: [PATCH] Version 1.0.5-2
Document changes
Update standards version
Depend on libssl-dev for libcrypto when libdes425 goes away.
---
debian/changelog | 9 +++++++++
debian/control | 4 ++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fe2da5d..1ba2049 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+barnowl (1.0.5-2) unstable; urgency=low
+
+ * Use new mechanism for running -fstack-protector that works back to etch;
pulled from upstream
+ * 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
+ * Standards version 3.8.0 (no changes needed)
+
+ -- Sam Hartman <hartm...@debian.org> Tue, 24 Feb 2009 23:56:33 -0500
+
barnowl (1.0.5-1) unstable; urgency=high
* New upstream release
diff --git a/debian/control b/debian/control
index 5784d87..882113d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,10 @@ Source: barnowl
Section: net
Priority: optional
Maintainer: Sam Hartman <hartm...@debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), autoconf,
libglib2.0-dev, libzephyr-dev, libncurses5-dev, libncursesw5-dev, libkrb5-dev,
libperl-dev, pkg-config, zip
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), autoconf,
libglib2.0-dev, libzephyr-dev, libncurses5-dev, libncursesw5-dev, libkrb5-dev,
libperl-dev, pkg-config, zip, libssl-dev
vcs-git: git://git.debian.org/git/collab-maint/barnowl.git
vcs-browser: http://git.debian.org/?p=collab-maint/barnowl.git
-Standards-Version: 3.7.2
+Standards-Version: 3.8.0
Package: barnowl
Architecture: any
--
1.5.6.3
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
