From d41a634896116d0aca1f5e1168c5ed8b0bc3fdb1 Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Mon, 17 Dec 2012 00:52:58 +0000
Subject: [PATCH] Update to Samba 3.6.10. Also add a patch from naddy@ to make
 use of posix_openpt().

From MAINTAINER

ok sthen@
---
 net/samba/Makefile                            |  4 ++--
 net/samba/distinfo                            |  4 ++--
 net/samba/patches/patch-source3_configure_in  | 19 ++++++++++++++-----
 ...urce3_rpc_server_samr_srv_samr_chgpasswd_c | 16 ++++++++++++++++
 4 files changed, 34 insertions(+), 9 deletions(-)
 create mode 100644 net/samba/patches/patch-source3_rpc_server_samr_srv_samr_chgpasswd_c

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 5c6031ec891..b5ce0b8ba62 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.172 2012/11/04 00:22:50 brad Exp $
+# $OpenBSD: Makefile,v 1.173 2012/12/17 00:52:58 brad Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT-main=		SMB and CIFS client and server for UNIX
 COMMENT-docs=		additional documentation and examples for Samba
 
-DISTNAME=		samba-3.6.9
+DISTNAME=		samba-3.6.10
 PKGNAME-main=		${DISTNAME}
 FULLPKGNAME-docs=	${DISTNAME:S/-/-docs-/}
 FULLPKGPATH-docs=	net/samba,-docs
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 9c746504ed2..6cf747c27ee 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,2 +1,2 @@
-SHA256 (samba-3.6.9.tar.gz) = lxS1DBu9sNNSG9v0A7sRK1QFBAaFywtP8/mjcNHoQCA=
-SIZE (samba-3.6.9.tar.gz) = 34077002
+SHA256 (samba-3.6.10.tar.gz) = SvU4QHc7V2i2IOivtm4IG4T4Y5saCpL7QOVeyFVvrnQ=
+SIZE (samba-3.6.10.tar.gz) = 34076720
diff --git a/net/samba/patches/patch-source3_configure_in b/net/samba/patches/patch-source3_configure_in
index 5131a3e778c..6157264e035 100644
--- a/net/samba/patches/patch-source3_configure_in
+++ b/net/samba/patches/patch-source3_configure_in
@@ -1,7 +1,16 @@
-$OpenBSD: patch-source3_configure_in,v 1.6 2012/11/04 00:22:50 brad Exp $
---- source3/configure.in.orig	Mon Oct 29 05:05:46 2012
-+++ source3/configure.in	Tue Oct 30 02:50:04 2012
-@@ -1675,8 +1675,7 @@ DSO_EXPORTS=""
+$OpenBSD: patch-source3_configure_in,v 1.7 2012/12/17 00:52:58 brad Exp $
+--- source3/configure.in.orig	Thu Dec  6 20:28:00 2012
++++ source3/configure.in	Sun Dec 16 20:12:54 2012
+@@ -1112,7 +1112,7 @@ AC_CHECK_FUNCS(sigprocmask sigblock sigaction sigset i
+ AC_CHECK_FUNCS(initgroups select rdchk getgrnam getgrent pathconf)
+ AC_CHECK_FUNCS(getgrset)
+ AC_CHECK_FUNCS(setpriv setgidx setuidx setgroups sysconf stat64 fstat64)
+-AC_CHECK_FUNCS(lstat64 fopen64 atexit grantpt lseek64 ftruncate64 posix_fallocate posix_fallocate64)
++AC_CHECK_FUNCS(lstat64 fopen64 atexit grantpt posix_openpt lseek64 ftruncate64 posix_fallocate posix_fallocate64)
+ AC_CHECK_FUNCS(fallocate fallocate64)
+ AC_CHECK_FUNCS(fseeko fseek64 fseeko64 ftell64 ftello64 setluid getpwanam)
+ AC_CHECK_FUNCS(opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64)
+@@ -1671,8 +1671,7 @@ DSO_EXPORTS=""
  			;;
  		*openbsd*)  BLDSHARED="true"
  			LDSHFLAGS="-shared"
@@ -11,7 +20,7 @@ $OpenBSD: patch-source3_configure_in,v 1.6 2012/11/04 00:22:50 brad Exp $
  			PICFLAG="-fPIC"
  			AC_DEFINE(STAT_ST_BLOCKSIZE,512,[The size of a block])
  			AC_DEFINE(BROKEN_GETGRNAM,1,[Does getgrnam work correctly])
-@@ -6789,13 +6788,43 @@ fi
+@@ -6806,13 +6805,43 @@ fi
  
  CFLAGS=$CFLAGS_SAVE
  
diff --git a/net/samba/patches/patch-source3_rpc_server_samr_srv_samr_chgpasswd_c b/net/samba/patches/patch-source3_rpc_server_samr_srv_samr_chgpasswd_c
new file mode 100644
index 00000000000..a1d594ea148
--- /dev/null
+++ b/net/samba/patches/patch-source3_rpc_server_samr_srv_samr_chgpasswd_c
@@ -0,0 +1,16 @@
+$OpenBSD: patch-source3_rpc_server_samr_srv_samr_chgpasswd_c,v 1.1 2012/12/17 00:52:58 brad Exp $
+--- source3/rpc_server/samr/srv_samr_chgpasswd.c.orig	Sat Dec  8 23:53:28 2012
++++ source3/rpc_server/samr/srv_samr_chgpasswd.c	Sat Dec  8 23:54:49 2012
+@@ -73,8 +73,12 @@ static int findpty(char **slave)
+ 	*slave = NULL;
+ 
+ #if defined(HAVE_GRANTPT)
++#if defined(HAVE_POSIX_OPENPT)
++	if ((master = posix_openpt(O_RDWR|O_NOCTTY)) >= 0) {
++#else
+ 	/* Try to open /dev/ptmx. If that fails, fall through to old method. */
+ 	if ((master = sys_open("/dev/ptmx", O_RDWR, 0)) >= 0) {
++#endif
+ 		grantpt(master);
+ 		unlockpt(master);
+ 		line = (char *)ptsname(master);