Ok by me.

Ian McWilliam


On 22/03/2013 9:24 PM, Brad Smith wrote:
Here is an update to Samba 3.6.13.

OK?


Index: Makefile
===================================================================
RCS file: /home/cvs/ports/net/samba/Makefile,v
retrieving revision 1.178
diff -u -p -r1.178 Makefile
--- Makefile    11 Mar 2013 11:35:56 -0000      1.178
+++ Makefile    22 Mar 2013 09:46:53 -0000
@@ -5,7 +5,7 @@ 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.12
+DISTNAME=              samba-3.6.13
  PKGNAME-main=         ${DISTNAME}
  FULLPKGNAME-docs=     ${DISTNAME:S/-/-docs-/}
  FULLPKGPATH-docs=     net/samba,-docs
@@ -24,8 +24,8 @@ MAINTAINER=           Ian McWilliam <kaosagnt@tpg
  # GPLv3+
  PERMIT_PACKAGE_CDROM=         Yes
-WANTLIB += asn1 c crypto cups execinfo gssapi iniparser krb5 m ncurses
-WANTLIB += popt pthread readline ssl talloc tdb z
+WANTLIB += c cups execinfo iniparser ncurses popt pthread readline talloc
+WANTLIB += tdb z
MASTER_SITES= http://download.samba.org/samba/ftp/ \
                http://us2.samba.org/samba/ftp/ \
@@ -57,7 +57,7 @@ USE_GMAKE=            Yes
  USE_GROFF=            Yes
  #SEPARATE_BUILD=              Yes
  CONFIGURE_STYLE=      gnu
-AUTOCONF_VERSION=      2.68
+AUTOCONF_VERSION=      2.69
CONFIGURE_ARGS= --disable-fam \
                        --without-pam \
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/net/samba/distinfo,v
retrieving revision 1.38
diff -u -p -r1.38 distinfo
--- distinfo    30 Jan 2013 23:22:05 -0000      1.38
+++ distinfo    22 Mar 2013 08:51:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (samba-3.6.12.tar.gz) = b/eXwXcmE71RctLIuQD9Vr8JbXJS+u6LR8SSWk/cn4s=
-SIZE (samba-3.6.12.tar.gz) = 34073788
+SHA256 (samba-3.6.13.tar.gz) = mS+K1WcXv1UbAK0dMRcFiKCH+1wtTZzTj9EVRPK4pZY=
+SIZE (samba-3.6.13.tar.gz) = 34101849
Index: patches/patch-source3_configure_in
===================================================================
RCS file: /home/cvs/ports/net/samba/patches/patch-source3_configure_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-source3_configure_in
--- patches/patch-source3_configure_in  17 Dec 2012 00:52:58 -0000      1.7
+++ patches/patch-source3_configure_in  22 Mar 2013 08:53:19 -0000
@@ -1,16 +1,7 @@
  $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=""
+--- source3/configure.in.orig  Mon Mar 18 04:59:37 2013
++++ source3/configure.in       Fri Mar 22 04:52:13 2013
+@@ -1675,8 +1675,7 @@ DSO_EXPORTS=""
                        ;;
                *openbsd*)  BLDSHARED="true"
                        LDSHFLAGS="-shared"
@@ -20,7 +11,7 @@ $OpenBSD: patch-source3_configure_in,v 1
                        PICFLAG="-fPIC"
                        AC_DEFINE(STAT_ST_BLOCKSIZE,512,[The size of a block])
                        AC_DEFINE(BROKEN_GETGRNAM,1,[Does getgrnam work 
correctly])
-@@ -6806,13 +6805,43 @@ fi
+@@ -6810,13 +6809,43 @@ fi
CFLAGS=$CFLAGS_SAVE Index: patches/patch-source3_rpc_server_samr_srv_samr_chgpasswd_c
===================================================================
RCS file: patches/patch-source3_rpc_server_samr_srv_samr_chgpasswd_c
diff -N patches/patch-source3_rpc_server_samr_srv_samr_chgpasswd_c
--- patches/patch-source3_rpc_server_samr_srv_samr_chgpasswd_c  17 Dec 2012 
00:52:58 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$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);
Index: pkg/PLIST-main
===================================================================
RCS file: /home/cvs/ports/net/samba/pkg/PLIST-main,v
retrieving revision 1.22
diff -u -p -r1.22 PLIST-main
--- pkg/PLIST-main      4 Aug 2012 14:45:34 -0000       1.22
+++ pkg/PLIST-main      22 Mar 2013 09:39:49 -0000
@@ -100,6 +100,7 @@ lib/samba/vfs/xattr_tdb.so
  @bin libexec/smbd
  @bin libexec/swat
  @bin libexec/winbindd
+@man man/man1/dbwrap_tool.1
  @man man/man1/findsmb.1
  @man man/man1/log2pcap.1
  @man man/man1/nmblookup.1


Reply via email to