[Pkg-samba-maint] [samba] 17/20: Remove local copy of krb5-types.h to prevent it from interfering.

[Jelmer Vernooij]

This is an automated email from the git hooks/post-receive script.

jelmer pushed a commit to branch samba_4.1
in repository samba.

commit 634725c64682f070045d94db3ad611bc15f81de2
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Dec 1 20:45:59 2013 +0000

    Remove local copy of krb5-types.h to prevent it from interfering.
    
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
---
 debian/patches/26_heimdal_no_local_krb5_types | 20 ++++++++++++++++++++
 debian/patches/series                         |  1 +
 2 files changed, 21 insertions(+)

diff --git a/debian/patches/26_heimdal_no_local_krb5_types b/debian/patches/26_heimdal_no_local_krb5_types
new file mode 100644
index 0000000..322af0e
--- /dev/null
+++ b/debian/patches/26_heimdal_no_local_krb5_types
@@ -0,0 +1,20 @@
+diff --git a/source4/heimdal_build/krb5-types.h b/source4/heimdal_build/krb5-types.h
+deleted file mode 100644
+index 4f55a80..0000000
+--- a/source4/heimdal_build/krb5-types.h
++++ /dev/null
+@@ -1,14 +0,0 @@
+-/* krb5-types.h -- this file was generated for i686-pc-linux-gnu by
+-                   $Id: bits.c,v 1.23 2005/01/05 15:22:02 lha Exp $ */
+-
+-#ifndef __krb5_types_h__
+-#define __krb5_types_h__
+-
+-#include "replace.h"
+-#include "system/network.h"
+-
+-typedef socklen_t krb5_socklen_t;
+-typedef int krb5_socket_t;
+-typedef ssize_t krb5_ssize_t;
+-
+-#endif /* __krb5_types_h__ */
diff --git a/debian/patches/series b/debian/patches/series
index 34e4b4f..b8fbf72 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ VERSION.patch
 waf_smbpasswd_location
 add-so-version-to-private-libraries
 do-not-install-smbclient4-and-nmbclient4
+26_heimdal_no_local_krb5_types

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git