--- samba-3.0.9.ebuild	2004-12-10 14:39:42.000000000 +0100
+++ samba-3.0.9.ebuild	2004-12-16 12:05:42.000000000 +0100
@@ -22,6 +22,7 @@ 
 S=${WORKDIR}/${PN}${_CVS}
 #---------------------------------------------------------------------------
 SRC_URI="mirror://samba/${PN}${_CVS}.tar.gz
+	http://www.gentoo.org/~satya/packages/samba/samba-3.0.9-CAN-2004-1154.patch.bz2
 	oav? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2
 	ldap? http://samba.idealx.org/dist/smbldap-tools-${SMBLDAP_TOOLS_VER}-3.tgz"
 #---------------------------------------------------------------------------
@@ -74,6 +75,8 @@ 
 	find . -name CVS | xargs rm -rf
 	# Add patch(es) --------------------------------------------------------
 	epatch ${FILESDIR}/samba-3.0.x-python-setup.patch || die
+	epatch ${FILESDIR}/samba-3.0.9-*.patch || die
+	epatch ${DISTDIR}/samba-3.0.9-CAN-2004-1154.patch.bz2 || die
 	#bug #44743 ------------------------------------------------------------
 	if [ ${ARCH} = "amd64" -o ${ARCH} = "ppc" -o ${ARCH} = "ppc64" ]; then
 		cd ${S} && epatch ${FILESDIR}/samba-3.0.x-smbumount-uid32.patch
@@ -194,21 +197,7 @@ 
 		|| myconf="${myconf} --without-ads"
 	#-----------------------------------------------------------------------
 	append-ldflags -L/usr/$(get_libdir) # lib64 location
-	append-ldflags -Wl,-z,now # lib preload
-	# SUID configure -------------------------------------------------------
-	my_configure "${myconf}"
-	# SUID compile ---------------------------------------------------------
-	for file in smbmnt smbumount; do
-		einfo "LD: BIND_NOW: bin/${file}"
-		rm -f bin/${file}
-		emake bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
-	done
-	for file in mount.cifs; do
-		einfo "LD: BIND_NOW: bin/${file}"
-		gcc ${CFLAGS} ${LDFLAGS} client/${file}.c -o bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
-	done
 	# CONFIGURE ------------------------------------------------------------
-	LDFLAGS=${LDFLAGS/-Wl,-z,now/} #lib preload change must affect suid only!
 	my_configure "${myconf}"
 	# Compile main SAMBA pieces --------------------------------------------
 	einfo "make everything" && emake everything || die "SAMBA make everything error"
@@ -225,6 +214,20 @@ 
 		assert "bad ${PN}-vscan-${VSCAN_VER} ./configure"
 		emake # ${VSCAN_MODS}
 	fi
+	# SUID configure -------------------------------------------------------
+	append-ldflags -Wl,-z,now # lib preload
+	my_configure "${myconf}"
+	# SUID compile ---------------------------------------------------------
+	for file in smbmnt smbumount; do
+		einfo "LD: BIND_NOW: bin/${file}"
+		rm -f bin/${file}
+		emake bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
+	done
+	for file in mount.cifs; do
+		einfo "LD: BIND_NOW: bin/${file}"
+		gcc ${CFLAGS} ${LDFLAGS} client/${file}.c -o bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
+	done
+	LDFLAGS=${LDFLAGS/-Wl,-z,now/} #lib preload change must affect suid only!
 }
 #===========================================================================
 src_install() {