Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 73943 | Differences between
and this patch

Collapse All | Expand All

(-)samba-3.0.9.ebuild (-14 / +16 lines)
Lines 22-27 Link Here
22
S=${WORKDIR}/${PN}${_CVS}
22
S=${WORKDIR}/${PN}${_CVS}
23
#---------------------------------------------------------------------------
23
#---------------------------------------------------------------------------
24
SRC_URI="mirror://samba/${PN}${_CVS}.tar.gz
24
SRC_URI="mirror://samba/${PN}${_CVS}.tar.gz
25
	http://www.gentoo.org/~satya/packages/samba/samba-3.0.9-CAN-2004-1154.patch.bz2
25
	oav? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2
26
	oav? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2
26
	ldap? http://samba.idealx.org/dist/smbldap-tools-${SMBLDAP_TOOLS_VER}-3.tgz"
27
	ldap? http://samba.idealx.org/dist/smbldap-tools-${SMBLDAP_TOOLS_VER}-3.tgz"
27
#---------------------------------------------------------------------------
28
#---------------------------------------------------------------------------
Lines 74-79 Link Here
74
	find . -name CVS | xargs rm -rf
75
	find . -name CVS | xargs rm -rf
75
	# Add patch(es) --------------------------------------------------------
76
	# Add patch(es) --------------------------------------------------------
76
	epatch ${FILESDIR}/samba-3.0.x-python-setup.patch || die
77
	epatch ${FILESDIR}/samba-3.0.x-python-setup.patch || die
78
	epatch ${DISTDIR}/samba-3.0.9-CAN-2004-1154.patch.bz2 || die
77
	#bug #44743 ------------------------------------------------------------
79
	#bug #44743 ------------------------------------------------------------
78
	if [ ${ARCH} = "amd64" -o ${ARCH} = "ppc" -o ${ARCH} = "ppc64" ]; then
80
	if [ ${ARCH} = "amd64" -o ${ARCH} = "ppc" -o ${ARCH} = "ppc64" ]; then
79
		cd ${S} && epatch ${FILESDIR}/samba-3.0.x-smbumount-uid32.patch
81
		cd ${S} && epatch ${FILESDIR}/samba-3.0.x-smbumount-uid32.patch
Lines 194-214 Link Here
194
		|| myconf="${myconf} --without-ads"
196
		|| myconf="${myconf} --without-ads"
195
	#-----------------------------------------------------------------------
197
	#-----------------------------------------------------------------------
196
	append-ldflags -L/usr/$(get_libdir) # lib64 location
198
	append-ldflags -L/usr/$(get_libdir) # lib64 location
197
	append-ldflags -Wl,-z,now # lib preload
198
	# SUID configure -------------------------------------------------------
199
	my_configure "${myconf}"
200
	# SUID compile ---------------------------------------------------------
201
	for file in smbmnt smbumount; do
202
		einfo "LD: BIND_NOW: bin/${file}"
203
		rm -f bin/${file}
204
		emake bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
205
	done
206
	for file in mount.cifs; do
207
		einfo "LD: BIND_NOW: bin/${file}"
208
		gcc ${CFLAGS} ${LDFLAGS} client/${file}.c -o bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
209
	done
210
	# CONFIGURE ------------------------------------------------------------
199
	# CONFIGURE ------------------------------------------------------------
211
	LDFLAGS=${LDFLAGS/-Wl,-z,now/} #lib preload change must affect suid only!
212
	my_configure "${myconf}"
200
	my_configure "${myconf}"
213
	# Compile main SAMBA pieces --------------------------------------------
201
	# Compile main SAMBA pieces --------------------------------------------
214
	einfo "make everything" && emake everything || die "SAMBA make everything error"
202
	einfo "make everything" && emake everything || die "SAMBA make everything error"
Lines 225-230 Link Here
225
		assert "bad ${PN}-vscan-${VSCAN_VER} ./configure"
213
		assert "bad ${PN}-vscan-${VSCAN_VER} ./configure"
226
		emake # ${VSCAN_MODS}
214
		emake # ${VSCAN_MODS}
227
	fi
215
	fi
216
	# SUID configure -------------------------------------------------------
217
	append-ldflags -Wl,-z,now # lib preload
218
	my_configure "${myconf}"
219
	# SUID compile ---------------------------------------------------------
220
	for file in smbmnt smbumount; do
221
		einfo "LD: BIND_NOW: bin/${file}"
222
		rm -f bin/${file}
223
		emake bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
224
	done
225
	for file in mount.cifs; do
226
		einfo "LD: BIND_NOW: bin/${file}"
227
		gcc ${CFLAGS} ${LDFLAGS} client/${file}.c -o bin/${file} || die "LD: BIND_NOW: bin/${file} compile error"
228
	done
229
	LDFLAGS=${LDFLAGS/-Wl,-z,now/} #lib preload change must affect suid only!
228
}
230
}
229
#===========================================================================
231
#===========================================================================
230
src_install() {
232
src_install() {

Return to bug 73943