From 9e1bac56b1799015e2c484eb19b7f12ee36a3800 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 15 May 2013 10:46:52 +0200
Subject: [PATCH] samba: update to 3.6.15.

---
 srcpkgs/samba/template | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 327978d7529..9e8a91554d8 100644
--- a/srcpkgs/samba/template
+++ b/srcpkgs/samba/template
@@ -1,7 +1,7 @@
 # Template file for 'samba'
 pkgname=samba
-version=3.6.12
-revision=2
+version=3.6.15
+revision=1
 build_wrksrc=source3
 build_style=gnu-configure
 configure_args="--with-fhs --with-pam --with-pam_smbpass --with-ldap
@@ -17,11 +17,25 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://www.samba.org"
 distfiles="http://us1.samba.org/samba/ftp/stable/$pkgname-$version.tar.gz"
-checksum=6ff797c1772613bd5172d2c8b900fd56bf096d7252faee8b47c4925a4fdc9f8b
+checksum=42b9acb13f8760a1767829ebaa4c371e462aad5287caf92887e64930cf27da60
 
-makedepends="pkg-config perl readline-devel python-devel libcap-devel
- popt-devel e2fsprogs-devel mit-krb5-devel>=1.10.1 libldap-devel pam-devel
- acl-devel avahi-libs-devel tdb-devel talloc-devel cups-devel"
+hostmakedepends="pkg-config perl python-devel"
+makedepends="readline-devel libcap-devel popt-devel e2fsprogs-devel
+ mit-krb5-devel>=1.10.1 libldap-devel pam-devel acl-devel avahi-libs-devel
+ tdb-devel talloc-devel cups-devel"
+
+if [ "$CROSS_BUILD" ]; then
+	# XXX needs cups-config
+	hostmakedepends+=" cups-devel"
+	configure_args+=" samba_cv_CC_NEGATIVE_ENUM_VALUES=yes
+			libreplace_cv_HAVE_GETADDRINFO=yes
+			libreplace_cv_HAVE_GETIFADDRS=yes
+			ac_cv_file__proc_sys_kernel_core_pattern=yes
+			ac_cv_func_ext_krb5_free_keytab_entry_contents=yes
+			samba_cv_HAVE_WRFILE_KEYTAB=yes
+			smb_krb5_cv_enctype_to_string_takes_size_t_arg=yes
+			smb_krb5_cv_enctype_to_string_takes_krb5_context_arg=yes"
+fi
 
 post_install() {
 	cd ${wrksrc}
@@ -83,7 +97,7 @@ libsmbclient_package() {
 
 samba-devel_package() {
 	depends="libsmbclient>=${version}"
-	short_desc="${short_desc} - development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 	}
@@ -97,7 +111,6 @@ samba_package() {
 		smbd.service off
 		winbindd.service off"
 	pkg_install() {
-		vmove etc
-		vmove usr
+		vmove all
 	}
 }