Changeset 4779b8c

Timestamp:

Mar 13, 2009, 9:45:00 PM (15 years ago)

Author:

Sam Hartman <hartmans@mit.edu>

Branches:

debian

Children:

484b14d

Parents:

b0c6735 (diff), 4708281 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'debian' of ssh://dev.suchdamage.org/~/debian/barnowl into debian

Files:

• configure.ac (modified) (3 diffs)
• debian/changelog (modified) (1 diff)
• debian/control (modified) (1 diff)

configure.ac

@@ -42 +42 @@
         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)
@@ -60 +64 @@
 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(des425, des_cbc_encrypt,,AC_CHECK_LIB(crypto,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)
@@ -77 +77 @@
 
 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)

debian/changelog

@@ +1 @@
+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 <hartmans@debian.org>  Tue, 24 Feb 2009 23:56:33 -0500
+
 barnowl (1.0.5-1) unstable; urgency=high
 

debian/control

@@ -3 +3 @@
 Priority: optional
 Maintainer: Sam Hartman <hartmans@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