summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorasau <asau@pkgsrc.org>2012-04-11 10:03:37 +0000
committerasau <asau@pkgsrc.org>2012-04-11 10:03:37 +0000
commitcda00e923d6cc8e5c25202b3af042343851a5bad (patch)
tree682d300094bbbf2b9ad91b5fdb07dc5ecf9fb98b
parent9b611314484acb564ab96f8d6a93c08e4dd4333f (diff)
downloadpkgsrc-cda00e923d6cc8e5c25202b3af042343851a5bad.tar.gz
Apply official patch to address CVE-2012-1182 ("root" credential remote code execution).
-rw-r--r--net/samba30/Makefile4
-rw-r--r--net/samba30/Makefile.patches8
-rw-r--r--net/samba30/distinfo5
-rw-r--r--net/samba33/Makefile7
-rw-r--r--net/samba33/distinfo5
5 files changed, 19 insertions, 10 deletions
diff --git a/net/samba30/Makefile b/net/samba30/Makefile
index 986a010a239..81588af8d58 100644
--- a/net/samba30/Makefile
+++ b/net/samba30/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2012/03/13 13:23:18 taca Exp $
+# $NetBSD: Makefile,v 1.5 2012/04/11 10:03:37 asau Exp $
.include "../../net/samba/Makefile.mirrors"
DISTNAME= samba-${VERSION}
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= net
MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/}
diff --git a/net/samba30/Makefile.patches b/net/samba30/Makefile.patches
index df33dd67702..27395a49ea1 100644
--- a/net/samba30/Makefile.patches
+++ b/net/samba30/Makefile.patches
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.patches,v 1.1.1.1 2011/12/15 22:23:23 asau Exp $
+# $NetBSD: Makefile.patches,v 1.2 2012/04/11 10:03:37 asau Exp $
#
# This Makefile fragment describes the recommended patches for the
# currently packaged version of Samba. All recommended patches for
@@ -11,6 +11,6 @@
#
#PATCH_SITES= http://www.samba.org/samba/patches/patches-${VERSION}/
#PATCHFILES=
-#PATCH_DIST_STRIP= -p2
-#PATCH_SITES= http://www.samba.org/samba/ftp/patches/security/
-#PATCHFILES=
+PATCH_DIST_STRIP= -p2
+PATCH_SITES= http://www.samba.org/samba/ftp/patches/security/
+PATCHFILES= samba-3.0.37-CVE-2012-1182.patch
diff --git a/net/samba30/distinfo b/net/samba30/distinfo
index eeae4a68c42..1a0c1be51b7 100644
--- a/net/samba30/distinfo
+++ b/net/samba30/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.2 2012/03/13 13:23:18 taca Exp $
+$NetBSD: distinfo,v 1.3 2012/04/11 10:03:37 asau Exp $
+SHA1 (samba-3.0.37-CVE-2012-1182.patch) = 0d90e57897fa6c2fefdd88dd8a6daa0c87302110
+RMD160 (samba-3.0.37-CVE-2012-1182.patch) = 417e58c300df8b6771bd93674fee1b96c9f3a933
+Size (samba-3.0.37-CVE-2012-1182.patch) = 3223 bytes
SHA1 (samba-3.0.37.tar.gz) = 5ec6bc6558b3c799f747eb49fbba019d5edf0cbd
RMD160 (samba-3.0.37.tar.gz) = 06b76ae22729e10c83d6af42d03b03ad69e49103
Size (samba-3.0.37.tar.gz) = 23416703 bytes
diff --git a/net/samba33/Makefile b/net/samba33/Makefile
index 81b71b2c850..53d32ad7e72 100644
--- a/net/samba33/Makefile
+++ b/net/samba33/Makefile
@@ -1,11 +1,14 @@
-# $NetBSD: Makefile,v 1.20 2012/03/13 13:22:24 taca Exp $
+# $NetBSD: Makefile,v 1.21 2012/04/11 10:10:58 asau Exp $
.include "../../net/samba/Makefile.mirrors"
DISTNAME= samba-${VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= net
MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/}
+PATCH_SITES= http://www.samba.org/samba/ftp/patches/security/
+PATCHFILES= samba-3.3.16-CVE-2012-1182.patch
+PATCH_DIST_STRIP= -p2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.samba.org/
diff --git a/net/samba33/distinfo b/net/samba33/distinfo
index 9605497a1b7..b1f40771f28 100644
--- a/net/samba33/distinfo
+++ b/net/samba33/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.9 2012/03/13 13:22:24 taca Exp $
+$NetBSD: distinfo,v 1.10 2012/04/11 10:10:58 asau Exp $
+SHA1 (samba-3.3.16-CVE-2012-1182.patch) = d3491c3f4a8a133b03b4d939b52047e22ee67706
+RMD160 (samba-3.3.16-CVE-2012-1182.patch) = db8425087d88c11a3490505e0603f1d0fb8d5d7f
+Size (samba-3.3.16-CVE-2012-1182.patch) = 1367588 bytes
SHA1 (samba-3.3.16.tar.gz) = bfb06f2cd88ba6c2fb9d25cabf3b22bf1a402f08
RMD160 (samba-3.3.16.tar.gz) = 30e181de0e5399503cad3e09f3dd172a0fc6a011
Size (samba-3.3.16.tar.gz) = 25566685 bytes