Pullup ticket #4207 - requested by taca

net/samba: security update Revisions pulled up: - net/samba/Makefile 1.235,1.237 - net/samba/Makefile.mirrors 1.10 - net/samba/PLIST 1.54 - net/samba/distinfo 1.91-1.92 - net/samba/patches/patch-ac 1.15 - net/samba/patches/patch-ad 1.19 - net/samba/patches/patch-ae 1.11 - net/samba/patches/patch-af 1.12 - net/samba/patches/patch-ah 1.7 - net/samba/patches/patch-ai 1.7 - net/samba/patches/patch-aj 1.7 - net/samba/patches/patch-ak 1.6 - net/samba/patches/patch-an 1.4 - net/samba/patches/patch-ao 1.4 - net/samba/patches/patch-aq 1.4 - net/samba/patches/patch-as 1.4 - net/samba/patches/patch-av 1.5 - net/samba/patches/patch-aw 1.4 - net/samba/patches/patch-ba 1.11 - net/samba/patches/patch-bb 1.5 - net/samba/patches/patch-bf 1.6 --- Module Name: pkgsrc Committed By: adam Date: Wed Jul 3 20:00:48 UTC 2013 Modified Files: pkgsrc/net/samba: Makefile PLIST distinfo pkgsrc/net/samba/patches: patch-bf Log Message: Changes 3.6.16: * BUG 9881: Link dbwrap_tool and dbwrap_torture against libtevent. * BUG 9722: Properly handle Oplock breaks in compound requests. * BUG 9822: Fix crash bug during Win8 sync. * BUG 9927: errno gets overwritten in call to check_parent_exists(). * BUG 8997: Change libreplace GPL source to LGPL. * BUG 9900: is_printer_published GUID retrieval. * BUG 9941: Fix a bug of drvupgrade of smbcontrol. * BUG 9868: Don't know how to make LIBNDR_PREG_OBJ. * BUG 9688: Remove "experimental" label on "max protocol=SMB2" parameter. * BUG 9881: Check for system libtevent. --- Module Name: pkgsrc Committed By: wiz Date: Thu Jul 4 19:31:10 UTC 2013 Modified Files: pkgsrc/net/samba: Makefile.mirrors Log Message: Fix URL. --- Module Name: pkgsrc Committed By: taca Date: Mon Aug 12 02:45:55 UTC 2013 Modified Files: pkgsrc/net/samba: Makefile distinfo pkgsrc/net/samba/patches: patch-ac patch-ad patch-ae patch-af patch-ah patch-ai patch-aj patch-ak patch-an patch-ao patch-aq patch-as patch-av patch-aw patch-ba patch-bb Log Message: Update samba to 3.6.17, security release. ============================== Release Notes for Samba 3.6.17 August 05, 2013 ============================== This is a security release in order to address CVE-2013-4124 (Missing integer wrap protection in EA list reading can cause server to loop with DOS). o CVE-2013-4124: All current released versions of Samba are vulnerable to a denial of service on an authenticated or guest connection. A malformed packet can cause the smbd server to loop the CPU performing memory allocations and preventing any further service. A connection to a file share, or a local account is needed to exploit this problem, either authenticated or unauthenticated if guest connections are allowed. This flaw is not exploitable beyond causing the code to loop allocating memory, which may cause the machine to exceed memory limits. Changes since 3.6.16: --------------------- o Jeremy Allison <jra@samba.org> * BUG 10010: CVE-2013-4124: Missing integer wrap protection in EA list reading can cause server to loop with DOS.
author: tron <tron> 2013-08-12 12:20:18 +0000
committer: tron <tron> 2013-08-12 12:20:18 +0000
commit: 38c15b64b33d8734ebcc2c0b99fbe927045d1d89 (patch)
tree: 442f4997e2849fae41b98d48b347534d6eedc392
parent: 59413624bb83f94ddc05f858b13170b74170a07f (diff)
download: pkgsrc-38c15b64b33d8734ebcc2c0b99fbe927045d1d89.tar.gz
21 files changed, 93 insertions, 89 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 2e102bc3206..9e5c53049a1 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.234 2013/06/12 12:35:35 wiz Exp $
+# $NetBSD: Makefile,v 1.234.2.1 2013/08/12 12:20:18 tron Exp $
 
 DISTNAME=	samba-${VERSION}
-PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${SAMBA_MIRRORS:=stable/}
 
@@ -10,7 +9,7 @@ HOMEPAGE=	http://www.samba.org/
 COMMENT=	SMB/CIFS protocol server suite
 LICENSE=	gnu-gpl-v3
 
-VERSION=	3.6.15
+VERSION=	3.6.17
 CONFLICTS+=	ja-samba-[0-9]* pam-smbpass-[0-9]* winbind-[0-9]*
 
 FILESDIR=		${PKGDIR}/../../net/samba/files
diff --git a/net/samba/Makefile.mirrors b/net/samba/Makefile.mirrors
index 7c900e5bbc5..7c6b5ea972f 100644
--- a/net/samba/Makefile.mirrors
+++ b/net/samba/Makefile.mirrors
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mirrors,v 1.9 2012/01/29 22:05:38 taca Exp $
+# $NetBSD: Makefile.mirrors,v 1.9.12.1 2013/08/12 12:20:18 tron Exp $
 #
 # This Makefile fragment contains the mirror sites for fetching Samba.
 
@@ -25,4 +25,4 @@ SAMBA_MIRRORS=	\
 	ftp://ftp.oss.eznetsols.org/samba/ \
 	ftp://us5.samba.org/pub/samba-ftp/ \
 	ftp://download.samba.org/pub/samba/ \
-	http://download.samba.org/samba/ftp/
+	http://www.samba.org/samba/ftp/
diff --git a/net/samba/PLIST b/net/samba/PLIST
index 660f21e372a..ed6db2e0f37 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.53 2013/04/30 20:08:10 adam Exp $
+@comment $NetBSD: PLIST,v 1.53.2.1 2013/08/12 12:20:18 tron Exp $
 bin/eventlogadm
 bin/findsmb
 bin/net
@@ -26,6 +26,8 @@ include/netapi.h
 include/smb_share_modes.h
 include/talloc.h
 ${PLIST.winbind}include/wbclient.h
+include/tevent.h
+include/tevent_internal.h
 lib/libnetapi.${LIBEXT}
 lib/libnetapi.${LIBEXT}.0
 lib/libsmbclient.${LIBEXT}
@@ -39,6 +41,9 @@ ${PLIST.winbind}lib/libwbclient.${LIBEXT}
 ${PLIST.winbind}lib/libwbclient.${LIBEXT}.0
 ${PLIST.winbind}${NSS_WINBIND}
 ${PLIST.winbind}${NSS_WINS}
+lib/libtevent.${LIBEXT}
+lib/libtevent.${LIBEXT}.0
+lib/libtevent.${LIBEXT}.0.9.11
 lib/samba/auth/script.${LIBEXT}
 lib/samba/charset/CP437.${LIBEXT}
 lib/samba/charset/CP850.${LIBEXT}
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 52e1d4cf966..f983f9afe0b 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,32 +1,32 @@
-$NetBSD: distinfo,v 1.90 2013/05/09 07:36:14 adam Exp $
+$NetBSD: distinfo,v 1.90.2.1 2013/08/12 12:20:18 tron Exp $
 
-SHA1 (samba-3.6.15.tar.gz) = 59d528427eaf401cf387205f1fb9806dae282e55
-RMD160 (samba-3.6.15.tar.gz) = aa8235076d5ed1142847f464c8f5cfcd5cf94d7e
-Size (samba-3.6.15.tar.gz) = 34111211 bytes
+SHA1 (samba-3.6.17.tar.gz) = e0e9921e87328667e7379c72130c5c800737846f
+RMD160 (samba-3.6.17.tar.gz) = 0280da9cd7fa97e3e0d8121a0d7cdc1228d6d9d3
+Size (samba-3.6.17.tar.gz) = 34110538 bytes
 SHA1 (patch-aa) = 6c8497adce78e8b1dea2a0402d4a980b67b57b8e
 SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567
-SHA1 (patch-ac) = 5b1c0fdb781cb75f81af71ed2695144d4a35e032
-SHA1 (patch-ad) = 447aaf4ea4cc98f0ccd5a3a22e1ffec0e69a3971
-SHA1 (patch-ae) = 6698c698dc64c0f3df159157d182eae6aaa70958
-SHA1 (patch-af) = c76fa31b80d2a0686fe2c42ab6e860d794b4f111
+SHA1 (patch-ac) = 25edbd616199b7dcb41f87aa1374d0bdf19cafec
+SHA1 (patch-ad) = 750b0c08d9975a257bec09088cb38414a1299070
+SHA1 (patch-ae) = de70580b293f4b964bc39b95c6a27511faaf088a
+SHA1 (patch-af) = 433379f00214ef066043c6c6763cab41a39f3e18
 SHA1 (patch-ag) = d84aeab73f22e372f0d275276f4a1160b240199c
-SHA1 (patch-ah) = a75ab50dbdb2de48915e55e43d06e713275b23e2
-SHA1 (patch-ai) = 0a12dcfabcab7986968493d5f06701d06c3d5386
-SHA1 (patch-aj) = c83d02c15bcb359809c4558885a706cd5c1a686b
-SHA1 (patch-ak) = cb51a96310eb7dde14351e4f12b68ce8d52c92c3
+SHA1 (patch-ah) = d4dc5c01fae6b72fb8902b32c0c5b668a918ce49
+SHA1 (patch-ai) = 2161f55d4f1ffe13fa24387349bb9ac71dae5521
+SHA1 (patch-aj) = bb9ad5a44922eb067d1d84cd9ea444b671297e5c
+SHA1 (patch-ak) = 0c4e6c9f80e3ae5ecc71054ffacf39eba5c2d439
 SHA1 (patch-am) = c4054a6923c2a599f3c9e56a06dbde2b8fc59335
-SHA1 (patch-an) = a9b31b791d979a1062006bbe55375aaab69210a1
-SHA1 (patch-ao) = bc31d3003bdaad141652daff2e0b6b3cafcee8c1
-SHA1 (patch-aq) = c3d1a3045364bebaa6c90967837907bd1de0964b
+SHA1 (patch-an) = d486b7a05ebaaeb494f8c66d11ad2012053713f8
+SHA1 (patch-ao) = 688f4180eb728363a1e616320464a6410f1ffced
+SHA1 (patch-aq) = 1eef65b3a798b3f80cc71f5d1f43b54c11782c0f
 SHA1 (patch-ar) = 5213b0a3d95d106939c2e268a8538c5e2901079a
-SHA1 (patch-as) = a9fcb1813d55d598bf1226cf004de85701c93e61
+SHA1 (patch-as) = 98db2b3242bd4f6b41284d418acdcebb7f42d36f
 SHA1 (patch-at) = dcfbe79496065559380e5713a758816e538e728b
 SHA1 (patch-au) = f94b27a5792acfa3742b4c07b23b3395b73eba84
-SHA1 (patch-av) = fccde3e48f2b3de3b1adfaa488a67c57696d1a83
-SHA1 (patch-aw) = 36cb31313cdbd1e4670f33924371df5ed3390420
-SHA1 (patch-ba) = 87799a62831b45e6cde8c36fbafbc08596411f98
-SHA1 (patch-bb) = 6283ffa8781d0c069f81e80704a018028e6b2b50
+SHA1 (patch-av) = ee4652f6278eea9b2208dacfba9b075bd60dd54b
+SHA1 (patch-aw) = 772678763cfc9df298eb6d0a65c24a8372852309
+SHA1 (patch-ba) = 64d88570f2e15db4f8769c7865e0793eb8909c2b
+SHA1 (patch-bb) = bfc730bc2f82aff61bdf1000ab33333368a162bd
 SHA1 (patch-bc) = 857e2400c8852f3c878f8d82857e80f214be2aea
 SHA1 (patch-bd) = b78324305bbf67fa4a7dd627e0af1618d2bf7b47
 SHA1 (patch-be) = 2b298e596f2f57a595b83619ba68f6ad95febaaa
-SHA1 (patch-bf) = 9511567bfe9b579ae0a1c85483e7fe3ad4866973
+SHA1 (patch-bf) = 19932332d11ce447293b061cd47506fef3d01853
diff --git a/net/samba/patches/patch-ac b/net/samba/patches/patch-ac
index dc93bd78dfc..1f05dc38f51 100644
--- a/net/samba/patches/patch-ac
+++ b/net/samba/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.14 2011/12/16 11:05:24 asau Exp $
+$NetBSD: patch-ac,v 1.14.14.1 2013/08/12 12:20:19 tron Exp $
 
---- libads/kerberos.c.orig	2010-12-05 21:57:18.000000000 +0000
+--- libads/kerberos.c.orig	2013-07-29 18:55:18.000000000 +0000
 +++ libads/kerberos.c
-@@ -460,7 +460,7 @@ char* kerberos_secrets_fetch_des_salt( v
+@@ -411,7 +411,7 @@ char* kerberos_secrets_fetch_des_salt( v
  
  	if ( (key = des_salt_key()) == NULL ) {
  		DEBUG(0,("kerberos_secrets_fetch_des_salt: failed to generate key!\n"));
diff --git a/net/samba/patches/patch-ad b/net/samba/patches/patch-ad
index a06df65d0a3..8ae4dbe8f34 100644
--- a/net/samba/patches/patch-ad
+++ b/net/samba/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.18 2011/12/16 11:05:24 asau Exp $
+$NetBSD: patch-ad,v 1.18.14.1 2013/08/12 12:20:19 tron Exp $
 
---- VERSION.orig	2010-01-14 10:12:10.000000000 +0000
+--- VERSION.orig	2013-07-29 18:55:18.000000000 +0000
 +++ VERSION
-@@ -84,7 +84,7 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=
+@@ -84,7 +84,7 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=no
  #       SAMBA_VERSION_VENDOR_FUNCTION                  #
  #                                                      #
  ########################################################
diff --git a/net/samba/patches/patch-ae b/net/samba/patches/patch-ae
index aee34b70b07..a70f54dec75 100644
--- a/net/samba/patches/patch-ae
+++ b/net/samba/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.10 2011/12/16 11:05:24 asau Exp $
+$NetBSD: patch-ae,v 1.10.14.1 2013/08/12 12:20:19 tron Exp $
 
---- auth/pampass.c.orig	2010-01-14 10:12:10.000000000 +0000
+--- auth/pampass.c.orig	2013-07-29 18:55:18.000000000 +0000
 +++ auth/pampass.c
-@@ -46,6 +46,10 @@
+@@ -48,6 +48,10 @@
  #include <pam/pam_appl.h>
  #endif
  
diff --git a/net/samba/patches/patch-af b/net/samba/patches/patch-af
index 850c00d97a3..884ff246a3f 100644
--- a/net/samba/patches/patch-af
+++ b/net/samba/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.11 2012/12/14 07:39:35 adam Exp $
+$NetBSD: patch-af,v 1.11.6.1 2013/08/12 12:20:19 tron Exp $
 
---- configure.orig	2012-12-06 10:40:30.000000000 +0000
+--- configure.orig	2013-07-29 18:57:14.000000000 +0000
 +++ configure
-@@ -19487,6 +19487,7 @@ $as_echo "#define DARWINOS 1" >>confdefs
+@@ -19513,6 +19513,7 @@ $as_echo "#define DARWINOS 1" >>confdefs
  
  			BLDSHARED="true"
  			LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress"
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.11 2012/12/14 07:39:35 adam Exp $
  			CFLAGS="$CFLAGS -fno-common"
  			SHLD="\${CC}"
  			SHLIBEXT="dylib"
-@@ -19536,7 +19537,7 @@ fi
+@@ -19562,7 +19563,7 @@ fi
  
  if test "x$enable_as_needed" != xno; then
      saved_before_as_needed_ldflags="$LDFLAGS"
@@ -19,7 +19,7 @@ $NetBSD: patch-af,v 1.11 2012/12/14 07:39:35 adam Exp $
  	saved_ldflags="$LDFLAGS"
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $flags works" >&5
  $as_echo_n "checking if $flags works... " >&6; }
-@@ -26337,9 +26338,9 @@ LIBS="-lcrypto $KRB5_LIBS  $LIBS"
+@@ -26638,9 +26639,9 @@ LIBS="-lcrypto $KRB5_LIBS  $LIBS"
  
  
  
@@ -32,7 +32,7 @@ $NetBSD: patch-af,v 1.11 2012/12/14 07:39:35 adam Exp $
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -26351,31 +26352,31 @@ else
+@@ -26652,31 +26653,31 @@ else
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -72,7 +72,7 @@ $NetBSD: patch-af,v 1.11 2012/12/14 07:39:35 adam Exp $
  _ACEOF
  
  fi
-@@ -35742,31 +35743,39 @@ case "$host_os" in
+@@ -36043,31 +36044,39 @@ case "$host_os" in
  		NSSSONAMEVERSIONSUFFIX=".2"
  		WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_linux.o"
  		;;
diff --git a/net/samba/patches/patch-ah b/net/samba/patches/patch-ah
index f2793bf32a2..6895b1f63f8 100644
--- a/net/samba/patches/patch-ah
+++ b/net/samba/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.6 2011/12/16 22:32:06 asau Exp $
+$NetBSD: patch-ah,v 1.6.14.1 2013/08/12 12:20:19 tron Exp $
 
---- libsmb/cliconnect.c.orig	2011-08-09 15:17:47.000000000 +0400
-+++ libsmb/cliconnect.c	2011-08-23 16:04:27.000000000 +0400
-@@ -3523,7 +3523,7 @@
+--- libsmb/cliconnect.c.orig	2013-07-29 18:55:18.000000000 +0000
++++ libsmb/cliconnect.c
+@@ -3538,7 +3538,7 @@ struct cli_state *get_ipc_connect_master
          if (!NT_STATUS_IS_OK(status)) {
                  DEBUG(99, ("No master browsers responded: %s\n",
  			   nt_errstr(status)));
diff --git a/net/samba/patches/patch-ai b/net/samba/patches/patch-ai
index 875216cb6e6..aab67a93424 100644
--- a/net/samba/patches/patch-ai
+++ b/net/samba/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.6 2011/12/16 11:05:24 asau Exp $
+$NetBSD: patch-ai,v 1.6.14.1 2013/08/12 12:20:19 tron Exp $
 
---- include/local.h.orig	2010-10-07 16:41:16.000000000 +0000
+--- include/local.h.orig	2013-07-29 18:55:18.000000000 +0000
 +++ include/local.h
-@@ -189,10 +189,10 @@
+@@ -175,10 +175,10 @@
   * Default passwd chat script.
   */
  
diff --git a/net/samba/patches/patch-aj b/net/samba/patches/patch-aj
index 1319f9014c8..0c123b19c1a 100644
--- a/net/samba/patches/patch-aj
+++ b/net/samba/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.6 2011/12/16 22:32:06 asau Exp $
+$NetBSD: patch-aj,v 1.6.14.1 2013/08/12 12:20:19 tron Exp $
 
---- smbd/dir.c.orig	2011-08-09 15:17:47.000000000 +0400
-+++ smbd/dir.c	2011-08-23 16:05:42.000000000 +0400
-@@ -200,7 +200,7 @@
+--- smbd/dir.c.orig	2013-07-29 18:55:18.000000000 +0000
++++ smbd/dir.c
+@@ -202,7 +202,7 @@ static struct dptr_struct *dptr_get(stru
  					      dptr->wcard, dptr->attr))) {
  					DEBUG(4,("dptr_get: Failed to open %s (%s)\n",dptr->path,
  						strerror(errno)));
diff --git a/net/samba/patches/patch-ak b/net/samba/patches/patch-ak
index e02fc1073da..8aa03660288 100644
--- a/net/samba/patches/patch-ak
+++ b/net/samba/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.5 2011/12/16 11:05:24 asau Exp $
+$NetBSD: patch-ak,v 1.5.14.1 2013/08/12 12:20:19 tron Exp $
 
---- intl/lang_tdb.c.orig	2010-01-14 10:12:10.000000000 +0000
+--- intl/lang_tdb.c.orig	2013-07-29 18:55:18.000000000 +0000
 +++ intl/lang_tdb.c
-@@ -139,7 +139,7 @@ bool lang_tdb_init(const char *lang)
+@@ -142,7 +142,7 @@ bool lang_tdb_init(const char *lang)
  		goto done;
  	}
  	
diff --git a/net/samba/patches/patch-an b/net/samba/patches/patch-an
index e75d76a0f7a..edae797dc06 100644
--- a/net/samba/patches/patch-an
+++ b/net/samba/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.3 2011/12/16 11:05:24 asau Exp $
+$NetBSD: patch-an,v 1.3.14.1 2013/08/12 12:20:19 tron Exp $
 
---- smbd/ntquotas.c.orig	2010-12-05 21:00:36.000000000 +0000
+--- smbd/ntquotas.c.orig	2013-07-29 18:55:18.000000000 +0000
 +++ smbd/ntquotas.c
-@@ -234,7 +234,7 @@ void *init_quota_handle(TALLOC_CTX *mem_
+@@ -239,7 +239,7 @@ void *init_quota_handle(TALLOC_CTX *mem_
  	SMB_NTQUOTA_HANDLE *qt_handle;
  
  	if (!mem_ctx)
diff --git a/net/samba/patches/patch-ao b/net/samba/patches/patch-ao
index a756d263dc4..2f6dfc16135 100644
--- a/net/samba/patches/patch-ao
+++ b/net/samba/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.3 2011/12/16 11:05:24 asau Exp $
+$NetBSD: patch-ao,v 1.3.14.1 2013/08/12 12:20:19 tron Exp $
 
---- libsmb/samlogon_cache.c.orig	2010-12-05 21:01:38.000000000 +0000
+--- libsmb/samlogon_cache.c.orig	2013-07-29 18:55:18.000000000 +0000
 +++ libsmb/samlogon_cache.c
-@@ -217,7 +217,7 @@ struct netr_SamInfo3 *netsamlogon_cache_
+@@ -212,7 +212,7 @@ struct netr_SamInfo3 *netsamlogon_cache_
  	if (!netsamlogon_cache_init()) {
  		DEBUG(0,("netsamlogon_cache_get: cannot open %s for write!\n",
  			NETSAMLOGON_TDB));
diff --git a/net/samba/patches/patch-aq b/net/samba/patches/patch-aq
index 743103e44d7..48c60437f74 100644
--- a/net/samba/patches/patch-aq
+++ b/net/samba/patches/patch-aq
@@ -1,10 +1,10 @@
-$NetBSD: patch-aq,v 1.3 2011/12/16 11:05:24 asau Exp $
+$NetBSD: patch-aq,v 1.3.14.1 2013/08/12 12:20:19 tron Exp $
 
 Add support for passwd expand gecos
 
---- param/loadparm.c.orig	2011-06-14 11:17:28.000000000 +0000
+--- param/loadparm.c.orig	2013-07-29 18:55:18.000000000 +0000
 +++ param/loadparm.c
-@@ -310,6 +310,7 @@ struct global {
+@@ -325,6 +325,7 @@ struct global {
  	bool bUnixPasswdSync;
  	bool bPasswdChatDebug;
  	int iPasswdChatTimeout;
@@ -12,7 +12,7 @@ Add support for passwd expand gecos
  	bool bTimestampLogs;
  	bool bNTSmbSupport;
  	bool bNTPipeSupport;
-@@ -1297,6 +1298,15 @@ static struct parm_struct parm_table[] =
+@@ -1310,6 +1311,15 @@ static struct parm_struct parm_table[] =
  		.flags		= FLAG_ADVANCED,
  	},
  	{
@@ -28,7 +28,7 @@ Add support for passwd expand gecos
  		.label		= "check password script",
  		.type		= P_STRING,
  		.p_class	= P_GLOBAL,
-@@ -5074,6 +5084,7 @@ static void init_globals(bool first_time
+@@ -5327,6 +5337,7 @@ static void init_globals(bool reinit_glo
  	Globals.bPamPasswordChange = False;
  	Globals.bPasswdChatDebug = False;
  	Globals.iPasswdChatTimeout = 2; /* 2 second default. */
@@ -36,7 +36,7 @@ Add support for passwd expand gecos
  	Globals.bNTPipeSupport = True;	/* Do NT pipes by default. */
  	Globals.bNTStatusSupport = True; /* Use NT status by default. */
  	Globals.bStatCache = True;	/* use stat cache by default */
-@@ -5528,6 +5539,7 @@ FN_GLOBAL_BOOL(lp_pam_password_change, &
+@@ -5809,6 +5820,7 @@ FN_GLOBAL_BOOL(lp_pam_password_change, &
  FN_GLOBAL_BOOL(lp_unix_password_sync, &Globals.bUnixPasswdSync)
  FN_GLOBAL_BOOL(lp_passwd_chat_debug, &Globals.bPasswdChatDebug)
  FN_GLOBAL_INTEGER(lp_passwd_chat_timeout, &Globals.iPasswdChatTimeout)
diff --git a/net/samba/patches/patch-as b/net/samba/patches/patch-as
index d1faf1beb2a..5007a947de4 100644
--- a/net/samba/patches/patch-as
+++ b/net/samba/patches/patch-as
@@ -1,6 +1,6 @@
-$NetBSD: patch-as,v 1.3 2011/12/16 11:05:24 asau Exp $
+$NetBSD: patch-as,v 1.3.14.1 2013/08/12 12:20:19 tron Exp $
 
---- script/installmodules.sh.orig	2010-01-14 10:12:10.000000000 +0000
+--- script/installmodules.sh.orig	2013-07-29 18:55:18.000000000 +0000
 +++ script/installmodules.sh
 @@ -11,7 +11,7 @@ shift
  
diff --git a/net/samba/patches/patch-av b/net/samba/patches/patch-av
index 6d6e6764c42..4781fdbf8e8 100644
--- a/net/samba/patches/patch-av
+++ b/net/samba/patches/patch-av
@@ -1,8 +1,8 @@
-$NetBSD: patch-av,v 1.4 2011/12/16 11:05:24 asau Exp $
+$NetBSD: patch-av,v 1.4.14.1 2013/08/12 12:20:19 tron Exp $
 
---- smbd/server.c.orig	2010-10-07 16:41:16.000000000 +0000
+--- smbd/server.c.orig	2013-07-29 18:55:18.000000000 +0000
 +++ smbd/server.c
-@@ -1210,6 +1210,9 @@ extern void build_options(bool screen);
+@@ -1154,6 +1154,9 @@ extern void build_options(bool screen);
  	if (!directory_exist(lp_lockdir()))
  		mkdir(lp_lockdir(), 0755);
  
diff --git a/net/samba/patches/patch-aw b/net/samba/patches/patch-aw
index 2f193f451e4..2849aff2b5f 100644
--- a/net/samba/patches/patch-aw
+++ b/net/samba/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.3 2011/12/16 11:05:24 asau Exp $
+$NetBSD: patch-aw,v 1.3.14.1 2013/08/12 12:20:19 tron Exp $
 
---- winbindd/winbindd_cache.c.orig	2010-12-05 21:02:29.000000000 +0000
+--- winbindd/winbindd_cache.c.orig	2013-07-29 18:55:18.000000000 +0000
 +++ winbindd/winbindd_cache.c
-@@ -4438,7 +4438,7 @@ struct winbindd_tdc_domain * wcache_tdc_
+@@ -4623,7 +4623,7 @@ struct winbindd_tdc_domain * wcache_tdc_
  	DEBUG(10,("wcache_tdc_fetch_domain: Searching for domain %s\n", name));
  
  	if ( !init_wcache() ) {
diff --git a/net/samba/patches/patch-ba b/net/samba/patches/patch-ba
index fa240deacc8..05ad6c3a575 100644
--- a/net/samba/patches/patch-ba
+++ b/net/samba/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.10 2011/12/16 11:05:24 asau Exp $
+$NetBSD: patch-ba,v 1.10.14.1 2013/08/12 12:20:19 tron Exp $
 
---- configure.in.orig	2011-08-03 18:24:05.000000000 +0000
+--- configure.in.orig	2013-07-29 18:55:18.000000000 +0000
 +++ configure.in
-@@ -6239,6 +6239,11 @@ AC_CHECK_MEMBER(struct passwd.pw_age,
+@@ -6541,6 +6541,11 @@ AC_CHECK_MEMBER(struct passwd.pw_age,
  		AC_DEFINE(HAVE_PASSWD_PW_AGE, 1, [Defined if struct passwd has pw_age field]),,
  		[#include <pwd.h>])
  
diff --git a/net/samba/patches/patch-bb b/net/samba/patches/patch-bb
index 515a62e6eed..7c64357d550 100644
--- a/net/samba/patches/patch-bb
+++ b/net/samba/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.4 2011/12/16 11:05:24 asau Exp $
+$NetBSD: patch-bb,v 1.4.14.1 2013/08/12 12:20:19 tron Exp $
 
---- include/config.h.in.orig	2011-08-03 18:25:13.000000000 +0000
+--- include/config.h.in.orig	2013-07-29 18:57:13.000000000 +0000
 +++ include/config.h.in
-@@ -1688,6 +1688,9 @@
+@@ -1598,6 +1598,9 @@
  /* Defined if struct passwd has pw_age field */
  #undef HAVE_PASSWD_PW_AGE
  
diff --git a/net/samba/patches/patch-bf b/net/samba/patches/patch-bf
index b005d5ef93b..cae390377f2 100644
--- a/net/samba/patches/patch-bf
+++ b/net/samba/patches/patch-bf
@@ -1,13 +1,13 @@
-$NetBSD: patch-bf,v 1.5 2011/12/16 11:05:24 asau Exp $
+$NetBSD: patch-bf,v 1.5.14.1 2013/08/12 12:20:19 tron Exp $
 
---- Makefile.in.orig	2011-08-03 18:24:05.000000000 +0000
+--- Makefile.in.orig	2013-06-19 07:35:24.000000000 +0000
 +++ Makefile.in
-@@ -2552,7 +2552,7 @@ bin/winbind_krb5_locator.@SHLIBEXT@: $(B
- bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) $(LIBTALLOC) $(LIBWBCLIENT)
+@@ -2864,7 +2864,7 @@ bin/winbind_krb5_locator.@SHLIBEXT@: $(B
+ bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) $(LIBTALLOC) $(LIBTEVENT) $(LIBWBCLIENT)
  	@echo "Linking shared library $@"
  	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) -lpam @INIPARSERLIBS@ \
--		$(LIBREPLACE_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) @SONAMEFLAG@`basename $@`
-+		$(LIBS) $(LIBREPLACE_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) @SONAMEFLAG@`basename $@`
+-		$(LIBREPLACE_LIBS) $(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBWBCLIENT_LIBS) @SONAMEFLAG@`basename $@`
++		$(LIBS) $(LIBREPLACE_LIBS) $(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBWBCLIENT_LIBS) @SONAMEFLAG@`basename $@`
  
  ##########
  # Plugins:
author	tron <tron>	2013-08-12 12:20:18 +0000
committer	tron <tron>	2013-08-12 12:20:18 +0000
commit	38c15b64b33d8734ebcc2c0b99fbe927045d1d89 (patch)
tree	442f4997e2849fae41b98d48b347534d6eedc392
parent	59413624bb83f94ddc05f858b13170b74170a07f (diff)
download	pkgsrc-38c15b64b33d8734ebcc2c0b99fbe927045d1d89.tar.gz