Pullup ticket #4348 - requested by taca

net/samba: security update

Revisions pulled up:
- net/samba/Makefile                                            1.242-1.247
- net/samba/distinfo                                            1.97-1.98
- net/samba/patches/patch-ab                                    1.29

---
   Module Name:	pkgsrc
   Committed By:	obache
   Date:		Tue Jan 28 12:16:39 UTC 2014

   Modified Files:
   	pkgsrc/net/samba: Makefile

   Log Message:
   Use GNU_CONFIGURE_LIBDIR for --libdir.

---
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Wed Feb 12 23:18:57 UTC 2014

   Modified Files:
   	pkgsrc/net/samba: Makefile

   Log Message:
   Recursive PKGREVISION bump for OpenSSL API version bump.

---
   Module Name:	pkgsrc
   Committed By:	obache
   Date:		Mon Mar  3 08:05:07 UTC 2014

   Modified Files:
   	pkgsrc/net/samba: Makefile

   Log Message:
   simplify with SUBST_VARS.

---
   Module Name:	pkgsrc
   Committed By:	obache
   Date:		Mon Mar  3 08:15:10 UTC 2014

   Modified Files:
   	pkgsrc/net/samba: Makefile distinfo
   	pkgsrc/net/samba/patches: patch-ab

   Log Message:
   Replace log dir in the default sample config file correctly.

   Bump PKGREVISION.

---
   Module Name:	pkgsrc
   Committed By:	jperkin
   Date:		Thu Mar 13 11:08:54 UTC 2014

   Modified Files:
   	pkgsrc/net/samba: Makefile

   Log Message:
   Set USE_GCC_RUNTIME=yes for packages which build shared libraries but do
   not use libtool to do so.  This is required to correctly depend upon a
   gcc runtime package (e.g. gcc47-libs) when using USE_PKGSRC_GCC_RUNTIME.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Mon Mar 17 14:01:57 UTC 2014

   Modified Files:
   	pkgsrc/net/samba: Makefile distinfo

   Log Message:
   Update samba to 3.6.23.

                      ==============================
                      Release Notes for Samba 3.6.23
                              March 11, 2014
                      ==============================

   This is a security release in order to address
   CVE-2013-4496 (Password lockout not enforced for SAMR password changes).

   o  CVE-2013-4496:
      Samba versions 3.4.0 and above allow the administrator to implement
      locking out Samba accounts after a number of bad password attempts.

      However, all released versions of Samba did not implement this check for
      password changes, such as are available over multiple SAMR and RAP
      interfaces, allowing password guessing attacks.

3 files changed, 19 insertions, 16 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 6fc1de0ee3b..db5c095a8b3 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.241 2013/12/09 10:44:22 taca Exp $
+# $NetBSD: Makefile,v 1.241.2.1 2014/03/18 12:42:57 tron Exp $
 
 DISTNAME=	samba-${VERSION}
 CATEGORIES=	net
@@ -9,9 +9,11 @@ HOMEPAGE=	http://www.samba.org/
 COMMENT=	SMB/CIFS protocol server suite
 LICENSE=	gnu-gpl-v3
 
-VERSION=	3.6.22
+VERSION=	3.6.23
 CONFLICTS+=	ja-samba-[0-9]* pam-smbpass-[0-9]* winbind-[0-9]*
 
+USE_GCC_RUNTIME=	yes
+
 FILESDIR=		${PKGDIR}/../../net/samba/files
 DESCR_SRC=		${PKGDIR}/../../net/samba/DESCR
 MESSAGE_SRC=		${PKGDIR}/../../net/samba/MESSAGE
@@ -48,7 +50,7 @@ REPLACE_PERL=		script/findsmb.in
 
 BROKEN_GETTEXT_DETECTION=yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--libdir=${SAMBA_LIBDIR}
+GNU_CONFIGURE_LIBDIR=	${SAMBA_LIBDIR}
 CONFIGURE_ARGS+=	--with-libiconv=${BUILDLINK_PREFIX.iconv}
 CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
 CONFIGURE_ARGS+=	--with-configdir=${SAMBA_ETCDIR}
@@ -105,12 +107,13 @@ SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing paths.
 SUBST_FILES.paths=	${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh
 SUBST_STAGE.paths=	post-patch
-SUBST_SED.paths+=	-e 's,@AWK@,${AWK},g'
-SUBST_SED.paths+=	-e 's,@CAT@,${CAT},g'
-SUBST_SED.paths+=	-e 's,@MKTEMP@,${MKTEMP},g'
-SUBST_SED.paths+=	-e 's,@RM@,${RM},g'
-SUBST_SED.paths+=	-e 's,@PWD_MKDB@,${PWD_MKDB},g'
-SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
+SUBST_VARS.paths+=	AWK CAT MKTEMP RM PWD_MKDB SH
+
+SUBST_CLASSES+=		def-cfg
+SUBST_MESSAGE.def-cfg=	Fixing default config files
+SUBST_FILES.def-cfg=	${WRKDIR}/${DISTNAME}/examples/smb.conf.default
+SUBST_STAGE.def-cfg=	post-configure
+SUBST_VARS.def-cfg=	SAMBA_LOGDIR
 
 post-extract:
 	${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR}
diff --git a/net/samba/distinfo b/net/samba/distinfo
index b306e1cd138..6ee721a6fb6 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.96 2013/12/09 10:44:22 taca Exp $
+$NetBSD: distinfo,v 1.96.2.1 2014/03/18 12:42:57 tron Exp $
 
-SHA1 (samba-3.6.22.tar.gz) = e4ce4a273cc264b01d928f1bb59f0dc38dd65f9b
-RMD160 (samba-3.6.22.tar.gz) = 66063045f4c3232764528ce7571dd336591001e4
-Size (samba-3.6.22.tar.gz) = 34122131 bytes
+SHA1 (samba-3.6.23.tar.gz) = 5ba2f8323ab17fa6c04bf87c11d20f10a4fcfe17
+RMD160 (samba-3.6.23.tar.gz) = 43dc3b5dcc2ee515bed03ad77b9726841faea946
+Size (samba-3.6.23.tar.gz) = 34122387 bytes
 SHA1 (patch-aa) = 6c8497adce78e8b1dea2a0402d4a980b67b57b8e
-SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567
+SHA1 (patch-ab) = eb680f72ab0118e57d1b322aba869ac798b27e17
 SHA1 (patch-ac) = 25edbd616199b7dcb41f87aa1374d0bdf19cafec
 SHA1 (patch-ad) = 750b0c08d9975a257bec09088cb38414a1299070
 SHA1 (patch-ae) = de70580b293f4b964bc39b95c6a27511faaf088a
diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab
index cd5d0c3988f..d21ed643d73 100644
--- a/net/samba/patches/patch-ab
+++ b/net/samba/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.28 2011/12/16 11:05:24 asau Exp $
+$NetBSD: patch-ab,v 1.28.18.1 2014/03/18 12:42:57 tron Exp $
 
 --- ../examples/smb.conf.default.orig	2010-01-14 10:12:10.000000000 +0000
 +++ ../examples/smb.conf.default
@@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.28 2011/12/16 11:05:24 asau Exp $
  # this tells Samba to use a separate log file for each machine
  # that connects
 -   log file = /usr/local/samba/var/log.%m
-+;  log file = @VARBASE@/log/log.%m
++;  log file = @SAMBA_LOGDIR@/log.%m
  
  # Put a capping on the size of the log files (in Kb).
 -   max log size = 50