From 342fe2a10e837ff84500dac803080ec27b4e122f Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 11 Dec 2012 14:13:39 +0100
Subject: [PATCH] samba: update to 3.6.10.

---
 srcpkgs/samba/files/samba.logrotate | 10 ---------
 srcpkgs/samba/samba-devel.template  |  5 ++---
 srcpkgs/samba/template              | 33 +++++++++++++----------------
 3 files changed, 17 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/samba/files/samba.logrotate

diff --git a/srcpkgs/samba/files/samba.logrotate b/srcpkgs/samba/files/samba.logrotate
deleted file mode 100644
index 1a278bd4ae6..00000000000
--- a/srcpkgs/samba/files/samba.logrotate
+++ /dev/null
@@ -1,10 +0,0 @@
-/var/log/samba/*.log /var/log/samba/log.* {
-   notifempty
-   missingok
-   sharedscripts
-   copytruncate
-   postrotate
-	/bin/systemctl try-restart smbd.service nmbd.service winbindd.service \
-		2>/dev/null || true
-   endscript
-}
diff --git a/srcpkgs/samba/samba-devel.template b/srcpkgs/samba/samba-devel.template
index 724f00918c4..f64ec2d9ea2 100644
--- a/srcpkgs/samba/samba-devel.template
+++ b/srcpkgs/samba/samba-devel.template
@@ -1,14 +1,13 @@
 # Template file for 'samba-devel'.
 #
-depends="libsmbclient>=3.6.5"
+noarch=yes
+depends="libsmbclient>=${version}"
 short_desc="${short_desc} - development files"
 long_desc="
  ${long_desc}
 
  This package provides development files: headers, static libraries, etc."
 
-noarch=yes
-
 do_install() {
 	vmove usr/include usr
 }
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 568684a5969..fd4b0363918 100644
--- a/srcpkgs/samba/template
+++ b/srcpkgs/samba/template
@@ -1,27 +1,23 @@
 # Template file for 'samba'
 pkgname=samba
-version=3.6.8
-revision=2
+version=3.6.10
+revision=1
 build_wrksrc=source3
 build_style=gnu-configure
 configure_args="--with-fhs --with-pam --with-pam_smbpass --with-ldap
---with-configdir=/etc/samba --with-lockdir=/var/samba
---with-cachedir=/var/samba --with-nmbdsocketdir=/run/samba/socket
---with-statedir=/var/samba --with-piddir=/run/samba --with-dnsupdate
---with-pammodulesdir=/usr/lib/security --with-automount --disable-swat
---with-syslog --enable-external-libtalloc --with-quotas --enable-cups
---enable-external-libtdb --disable-fam --with-ads --with-acl-support
---with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2"
-depends="smbclient libsmbclient>=$version"
-makedepends="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"
+ --with-configdir=/etc/samba --with-lockdir=/var/samba
+ --with-cachedir=/var/samba --with-nmbdsocketdir=/run/samba/socket
+ --with-statedir=/var/samba --with-piddir=/run/samba --with-dnsupdate
+ --with-pammodulesdir=/usr/lib/security --with-automount --disable-swat
+ --with-syslog --enable-external-libtalloc --with-quotas --enable-cups
+ --enable-external-libtdb --disable-fam --with-ads --with-acl-support
+ --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2"
 short_desc="SMB/CIFS file, print, and login server for Unix"
 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=4f5a171a8d902c6b4f822ed875c51eb8339196d9ccf0ecd7f6521c966b3514de
+checksum=4af53840773b5768b620e8afb66e081b84f8639b1a0a92fb40e55ec8556fae74
 long_desc="
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
  providing support for cross-platform file and printer sharing with Microsoft
@@ -31,6 +27,10 @@ long_desc="
 
 subpackages="smbclient libsmbclient samba-devel"
 
+makedepends="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"
+
 # Don't restart services automatically.
 systemd_services="
 nmbd.service off
@@ -40,8 +40,8 @@ winbindd.service off"
 conf_files="/etc/samba/smb.conf /etc/pam.d/samba"
 
 post_install() {
-	# conf file
 	cd ${wrksrc}
+	# conf file
 	cat examples/smb.conf.default | \
 		sed 's|log file = .*$|log file = /var/log/samba/%m.log|g' > \
 		${DESTDIR}/etc/samba/smb.conf
@@ -77,7 +77,4 @@ post_install() {
 
 	# PAM support
 	vinstall ${FILESDIR}/samba.pam 644 etc/pam.d samba
-
-	# logrotate file
-	vinstall ${FILESDIR}/samba.logrotate 644 etc/logrotate.d samba
 }