- release 4 (by relup.sh)

[packages/amanda.git] / amanda-heimdal.patch

diff --git a/amanda-heimdal.patch b/amanda-heimdal.patch
index 36fdb2986cb3e50fa87d9b852f0457759c0fc6c7..4448083fce10f26a470f829f7722318299b1460e 100644 (file)
--- a/amanda-heimdal.patch
+++ b/amanda-heimdal.patch
@@ -11,6 +11,15 @@
                  break
 --- amanda-2.6.0/common-src/krb5-security.c~   2008-01-18 01:31:41.000000000 +0100
 +++ amanda-2.6.0/common-src/krb5-security.c    2008-05-13 11:50:57.000000000 +0200
+@@ -45,7 +45,7 @@
+ #include "sockaddr-util.h"
+ 
+ #ifdef KRB5_HEIMDAL_INCLUDES
+-#include "com_err.h"
++#include "et/com_err.h"
+ #endif
+ 
+ #define BROKEN_MEMORY_CCACHE
 @@ -67,7 +67,7 @@
  #ifndef KRB5_HEIMDAL_INCLUDES
  #include <gssapi/gssapi_generic.h>
@@ -22,8 +31,13 @@
  
 --- amanda-2.6.0/common-src/security-util.h~   2008-01-18 01:31:41.000000000 +0100
 +++ amanda-2.6.0/common-src/security-util.h    2008-05-13 11:51:10.000000000 +0200
-@@ -51,7 +51,7 @@
+@@ -47,11 +47,11 @@
+ 
+ 
+ #ifdef KRB5_SECURITY
+-#  define KRB5_DEPRECATED 1
  #  ifndef KRB5_HEIMDAL_INCLUDES
++#    define KRB5_DEPRECATED 1
  #    include <gssapi/gssapi_generic.h>
  #  else
 -#    include <gssapi/gssapi.h>