From c28fa72a4c7614195517b5922ef5ef556a11dd00 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Fri, 5 Mar 2010 16:39:03 +0100
Subject: samba: Upgrade stable releases from 3.2.8 to latest 3.2.x release

This is addressing: CVE-2009-1886, CVE-2009-1888, CVE-2009-2813
CVE-2009-2948 and CVE-2009-2906.
---
 conf/checksums.ini                |  4 ----
 recipes/samba/samba-ads_3.2.15.bb | 13 +++++++++++++
 recipes/samba/samba-ads_3.2.8.bb  | 11 -----------
 recipes/samba/samba.inc           |  2 +-
 recipes/samba/samba_3.2.15.bb     | 27 +++++++++++++++++++++++++++
 recipes/samba/samba_3.2.8.bb      | 25 -------------------------
 6 files changed, 41 insertions(+), 41 deletions(-)
 create mode 100644 recipes/samba/samba-ads_3.2.15.bb
 delete mode 100644 recipes/samba/samba-ads_3.2.8.bb
 create mode 100644 recipes/samba/samba_3.2.15.bb
 delete mode 100644 recipes/samba/samba_3.2.8.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 88f7ec77d3..b7fe8a3cad 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -24494,10 +24494,6 @@ sha256=22647c6bdd0f1b311bd0e3a893fb184f07d0f5e1c4b3bccd20a024fe18fd7567
 md5=528677f261f3ed4a58f9483ca25ba6b2
 sha256=4f2bb8c5785c50ad05d3adc0027c0881211b8a5c51e840651b53b7e455c004a3
 
-[http://samba.org/samba/ftp/stable/samba-3.2.8.tar.gz]
-md5=06efd6e6cc4aac628a1a0b082e4be0f2
-sha256=7e7fb53d6ff05993dcb8b871e3c3016bd4d161d72ded8f8760a4439e9d76aa3b
-
 [http://samba.org/samba/ftp/stable/samba-3.3.0.tar.gz]
 md5=adb048dc3988055533e1ea5d91d81f99
 sha256=b00ca360e9b414744eff33ca4567f3eb1a28d32914e20f00b6672fbc141c9beb
diff --git a/recipes/samba/samba-ads_3.2.15.bb b/recipes/samba/samba-ads_3.2.15.bb
new file mode 100644
index 0000000000..dc64754665
--- /dev/null
+++ b/recipes/samba/samba-ads_3.2.15.bb
@@ -0,0 +1,13 @@
+require samba.inc
+require samba-ads.inc
+LICENSE = "GPLv3"
+
+PR = "r2"
+SRC_URI += "file://config-lfs.patch;patch=1 \
+            file://quota.patch;patch=1;pnum=0 \
+            file://configure-3.2.8.patch;patch=1 \
+            file://config-h.patch;patch=1 \
+            file://mtab.patch;patch=1 \
+	        "
+SRC_URI[src.md5sum] = "5a3bcc4927c9643b9f42970d0815b18f"
+SRC_URI[src.sha256sum] = "84281fd1faeffee8558e49dff865dd382abbf78bc1be00f8cb5aa70aeea67d46"
diff --git a/recipes/samba/samba-ads_3.2.8.bb b/recipes/samba/samba-ads_3.2.8.bb
deleted file mode 100644
index e643292dd4..0000000000
--- a/recipes/samba/samba-ads_3.2.8.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require samba.inc
-require samba-ads.inc
-LICENSE = "GPLv3"
-
-PR = "r2"
-SRC_URI += "file://config-lfs.patch;patch=1 \
-            file://quota.patch;patch=1;pnum=0 \
-            file://configure-3.2.8.patch;patch=1 \
-            file://config-h.patch;patch=1 \
-            file://mtab.patch;patch=1 \
-	        "
diff --git a/recipes/samba/samba.inc b/recipes/samba/samba.inc
index ec21ed70b0..d8df8f176c 100644
--- a/recipes/samba/samba.inc
+++ b/recipes/samba/samba.inc
@@ -2,7 +2,7 @@ SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS = "readline virtual/libiconv"
 
-SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
+SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz;name=src \
            file://volatiles.03_samba \
            file://smb.conf \
            file://init \
diff --git a/recipes/samba/samba_3.2.15.bb b/recipes/samba/samba_3.2.15.bb
new file mode 100644
index 0000000000..6a14f96078
--- /dev/null
+++ b/recipes/samba/samba_3.2.15.bb
@@ -0,0 +1,27 @@
+require samba.inc
+require samba-basic.inc
+LICENSE = "GPLv3"
+
+SRC_URI += "file://configure-3.2.8.patch;patch=1 \
+            file://config-h.patch;patch=1 \
+            file://mtab.patch;patch=1 \
+	        "
+SRC_URI[src.md5sum] = "5a3bcc4927c9643b9f42970d0815b18f"
+SRC_URI[src.sha256sum] = "84281fd1faeffee8558e49dff865dd382abbf78bc1be00f8cb5aa70aeea67d46"
+
+PR = "r1"
+
+EXTRA_OECONF += "\
+	SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
+	samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \
+	linux_getgrouplist_ok=no \
+	samba_cv_HAVE_BROKEN_GETGROUPS=no \
+	samba_cv_HAVE_FTRUNCATE_EXTEND=yes \
+	samba_cv_have_setresuid=yes \
+	samba_cv_have_setresgid=yes \
+	samba_cv_HAVE_WRFILE_KEYTAB=yes \
+	"
+
+do_configure() {
+	oe_runconf
+}
diff --git a/recipes/samba/samba_3.2.8.bb b/recipes/samba/samba_3.2.8.bb
deleted file mode 100644
index 16dcd3160a..0000000000
--- a/recipes/samba/samba_3.2.8.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require samba.inc
-require samba-basic.inc
-LICENSE = "GPLv3"
-
-SRC_URI += "file://configure-3.2.8.patch;patch=1 \
-            file://config-h.patch;patch=1 \
-            file://mtab.patch;patch=1 \
-	        "
-
-PR = "r1"
-
-EXTRA_OECONF += "\
-	SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
-	samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \
-	linux_getgrouplist_ok=no \
-	samba_cv_HAVE_BROKEN_GETGROUPS=no \
-	samba_cv_HAVE_FTRUNCATE_EXTEND=yes \
-	samba_cv_have_setresuid=yes \
-	samba_cv_have_setresgid=yes \
-	samba_cv_HAVE_WRFILE_KEYTAB=yes \
-	"
-
-do_configure() {
-	oe_runconf
-}
-- 
cgit v1.2.3