--- open-iscsi-2.0.871.3.ebuild	2010-10-10 23:13:58.000000000 +0200
+++ open-iscsi-2.0.872.ebuild	2010-10-10 23:13:58.000000000 +0200
@@ -7,7 +7,8 @@
 
 DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720"
 HOMEPAGE="http://www.open-iscsi.org/"
-SRC_URI="mirror://kernel/linux/kernel/people/mnc/open-iscsi/releases/${P}.tar.gz"
+MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
+SRC_URI="mirror://kernel/linux/kernel/people/mnc/open-iscsi/releases/${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
@@ -16,6 +17,8 @@
 RDEPEND="${DEPEND}
 		sys-apps/util-linux"
 
+S="${WORKDIR}/${MY_PV}"
+
 pkg_setup() {
 	linux-info_pkg_setup
 
@@ -38,8 +41,7 @@
 
 src_prepare() {
 	export EPATCH_OPTS="-d${S}"
-	epatch "${FILESDIR}"/CVE-2009-1297.patch
-	epatch "${FILESDIR}"/${PN}-2.0.871-makefile-cleanup.patch
+	epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup.patch
 	epatch "${FILESDIR}"/${P}-glibc212.patch
 }