Pullup ticket #3665 - requested by taca net/samba: security update Revisions pulled up: - net/samba/Makefile 1.209 - net/samba/Makefile.mirrors 1.8-1.9 - net/samba/distinfo 1.79 --- Module Name: pkgsrc Committed By: taca Date: Sun Jan 29 22:01:19 UTC 2012 Modified Files: pkgsrc/net/samba: Makefile Makefile.mirrors distinfo Log Message: Update samba package to 3.6.3. Quote from release notes: Samba 3.6.3: This is a security release in order to address CVE-2012-0817 (Memory leak/Denial of service). o CVE-2012-0817: The Samba File Serving daemon (smbd) in Samba versions 3.6.0 to 3.6.2 is affected by a memory leak that can cause a server denial of service. Samba 3.6.2: Major enhancements in Samba 3.6.2 include: o Make Winbind receive user/group information (bug #8371). o Several SMB2 fixes. For complete changes, please refer http://www.samba.org/samba/history/samba-3.6.2.html and http://www.samba.org/samba/history/samba-3.6.3.html. --- Module Name: pkgsrc Committed By: taca Date: Sun Jan 29 22:05:38 UTC 2012 Modified Files: pkgsrc/net/samba: Makefile.mirrors Log Message: Revert accidently commited my trial local change.diff -r1.207 -r1.207.2.1 pkgsrc/net/samba/Makefile
(tron)
@@ -1,27 +1,27 @@ | @@ -1,27 +1,27 @@ | |||
1 | # $NetBSD: Makefile,v 1.207 2011/12/19 14:47:27 asau Exp $ | 1 | # $NetBSD: Makefile,v 1.207.2.1 2012/01/29 23:46:39 tron Exp $ | |
2 | 2 | |||
3 | .include "../../net/samba/Makefile.mirrors" | 3 | .include "../../net/samba/Makefile.mirrors" | |
4 | 4 | |||
5 | DISTNAME= samba-${VERSION} | 5 | DISTNAME= samba-${VERSION} | |
6 | CATEGORIES= net | 6 | CATEGORIES= net | |
7 | MASTER_SITES= ${SAMBA_MIRRORS:=stable/} | 7 | MASTER_SITES= ${SAMBA_MIRRORS:=stable/} | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://www.samba.org/ | 10 | HOMEPAGE= http://www.samba.org/ | |
11 | COMMENT= SMB/CIFS protocol server suite | 11 | COMMENT= SMB/CIFS protocol server suite | |
12 | LICENSE= gnu-gpl-v3 | 12 | LICENSE= gnu-gpl-v3 | |
13 | 13 | |||
14 | VERSION= 3.6.1 | 14 | VERSION= 3.6.3 | |
15 | CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]* | 15 | CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]* | |
16 | 16 | |||
17 | PKG_DESTDIR_SUPPORT= user-destdir | 17 | PKG_DESTDIR_SUPPORT= user-destdir | |
18 | 18 | |||
19 | FILESDIR= ${PKGDIR}/../../net/samba/files | 19 | FILESDIR= ${PKGDIR}/../../net/samba/files | |
20 | DESCR_SRC= ${PKGDIR}/../../net/samba/DESCR | 20 | DESCR_SRC= ${PKGDIR}/../../net/samba/DESCR | |
21 | MESSAGE_SRC= ${PKGDIR}/../../net/samba/MESSAGE | 21 | MESSAGE_SRC= ${PKGDIR}/../../net/samba/MESSAGE | |
22 | WRKSRC= ${WRKDIR}/${DISTNAME}/source3 | 22 | WRKSRC= ${WRKDIR}/${DISTNAME}/source3 | |
23 | BUILD_DEFS+= VARBASE | 23 | BUILD_DEFS+= VARBASE | |
24 | 24 | |||
25 | .include "../../mk/bsd.prefs.mk" | 25 | .include "../../mk/bsd.prefs.mk" | |
26 | 26 | |||
27 | PKG_SYSCONFSUBDIR= samba | 27 | PKG_SYSCONFSUBDIR= samba |
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | $NetBSD: distinfo,v 1.78 2011/12/16 22:32:06 asau Exp $ | 1 | $NetBSD: distinfo,v 1.78.2.1 2012/01/29 23:46:40 tron Exp $ | |
2 | 2 | |||
3 | SHA1 (samba-3.6.1.tar.gz) = fed82fd92958f3209edb3c71321d4b48abee9c4b | 3 | SHA1 (samba-3.6.3.tar.gz) = 430a1e13fe20c17e2808035c863eb5e77685c89b | |
4 | RMD160 (samba-3.6.1.tar.gz) = 6ed44e66b22cef00168831fa7ed13571fd5e45ed | 4 | RMD160 (samba-3.6.3.tar.gz) = fd04fd5897f0f34f257c504de911e1ab34ff3e25 | |
5 | Size (samba-3.6.1.tar.gz) = 28984820 bytes | 5 | Size (samba-3.6.3.tar.gz) = 28993737 bytes | |
6 | SHA1 (patch-aa) = 6c8497adce78e8b1dea2a0402d4a980b67b57b8e | 6 | SHA1 (patch-aa) = 6c8497adce78e8b1dea2a0402d4a980b67b57b8e | |
7 | SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567 | 7 | SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567 | |
8 | SHA1 (patch-ac) = 5b1c0fdb781cb75f81af71ed2695144d4a35e032 | 8 | SHA1 (patch-ac) = 5b1c0fdb781cb75f81af71ed2695144d4a35e032 | |
9 | SHA1 (patch-ad) = 447aaf4ea4cc98f0ccd5a3a22e1ffec0e69a3971 | 9 | SHA1 (patch-ad) = 447aaf4ea4cc98f0ccd5a3a22e1ffec0e69a3971 | |
10 | SHA1 (patch-ae) = 6698c698dc64c0f3df159157d182eae6aaa70958 | 10 | SHA1 (patch-ae) = 6698c698dc64c0f3df159157d182eae6aaa70958 | |
11 | SHA1 (patch-af) = 0c40e9ead1c3aba58448dd0a35669de598e543b7 | 11 | SHA1 (patch-af) = 0c40e9ead1c3aba58448dd0a35669de598e543b7 | |
12 | SHA1 (patch-ag) = d84aeab73f22e372f0d275276f4a1160b240199c | 12 | SHA1 (patch-ag) = d84aeab73f22e372f0d275276f4a1160b240199c | |
13 | SHA1 (patch-ah) = a75ab50dbdb2de48915e55e43d06e713275b23e2 | 13 | SHA1 (patch-ah) = a75ab50dbdb2de48915e55e43d06e713275b23e2 | |
14 | SHA1 (patch-ai) = 0a12dcfabcab7986968493d5f06701d06c3d5386 | 14 | SHA1 (patch-ai) = 0a12dcfabcab7986968493d5f06701d06c3d5386 | |
15 | SHA1 (patch-aj) = c83d02c15bcb359809c4558885a706cd5c1a686b | 15 | SHA1 (patch-aj) = c83d02c15bcb359809c4558885a706cd5c1a686b | |
16 | SHA1 (patch-ak) = cb51a96310eb7dde14351e4f12b68ce8d52c92c3 | 16 | SHA1 (patch-ak) = cb51a96310eb7dde14351e4f12b68ce8d52c92c3 | |
17 | SHA1 (patch-al) = 20f587b38f5f7a9afefa9863868e9b275d37c454 | 17 | SHA1 (patch-al) = 20f587b38f5f7a9afefa9863868e9b275d37c454 | |
18 | SHA1 (patch-am) = c4054a6923c2a599f3c9e56a06dbde2b8fc59335 | 18 | SHA1 (patch-am) = c4054a6923c2a599f3c9e56a06dbde2b8fc59335 |