Attachment #65525 for bug #101675




	export EPATCH_SUFFIX="patch"
	epatch ${PATCHDIR}/general
	if use oav ; then
		cp -pPR ${WORKDIR}/${PFVSCAN} ${S2}/examples/VFS
		epatch ${PATCHDIR}/vscan
	fi
}

	fi
	use mysql && mymods="mysql,${mymods}"
	use postgres && mymods="pgsql,${mymods}"
	[[ -n "${mymods}" ]] && myconf="--with-expsam=${mymods}"

	mylangs="en"
	use linguas_ja && mylangs="${mylangs},ja"

		--with-logfilebase=/var/log/samba \
		--with-privatedir=${PRIVATE_DST} \
		--enable-static --enable-shared \
		--with-automount \
		--with-libsmbclient \
		--without-spinlocks \
		--with-syslog \
		--with-idmap \
		--without-ldapsam \
		$(use_with kernel_linux smbmount) \
		$(use_with acl acl-support) \
		$(use_enable cups) \
		$(use_with kerberos krb5) \

	# Extra rpctorture progs
	exeinto /usr/bin
	for i in ${extra_bins}; do
		[[ -x ${S}/bin/${i} ]] && doexe ${S}/bin/${i}
		einfo "Extra binaries: ${i}"
	done


		doexe ${S}/nsswitch/pam_winbind.so
	fi

	if use kernel_linux; then
		# mount backend
		dodir /sbin
		dosym ../usr/bin/smbmount /sbin/mount.smbfs
		dosym ../usr/bin/mount.cifs /sbin/mount.cifs
	fi

	# bug #46389: samba doesn't create symlink anymore
	# beaviour seems to be changed in 3.0.6, see bug #61046
	dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so.0
	dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so


	newins ${FILESDIR}/smb.conf.example-samba3.gz smb.conf.example.gz
	doins ${FILESDIR}/lmhosts

	newpamd ${FILESDIR}/samba.pam-include samba
	use winbind && doins ${FILESDIR}/system-auth-winbind
	insinto /etc/xinetd.d
	newins ${FILESDIR}/swat.xinetd swat

	dodoc ${FILESDIR}/nsswitch.conf-wins
	use winbind && dodoc ${FILESDIR}/nsswitch.conf-winbind

	cp -pPR ${S2}/examples/* ${D}/usr/share/doc/${PF}/examples

	chmod -R 755 `find ${D}/usr/share/doc/${PF}/examples -type d`
	chmod -R 644 `find ${D}/usr/share/doc/${PF}/examples ! -type d`

		&& -r ${ROOT}/${PRIVATE_SRC}/secrets.tdb ]]; then
		ebegin "Copying ${ROOT}/${PRIVATE_SRC}/* to ${ROOT}/${PRIVATE_DST}/"
			mkdir -p ${IMAGE}/${PRIVATE_DST}
			cp -pPRf ${ROOT}/${PRIVATE_SRC}/* ${IMAGE}/${PRIVATE_DST}/
		eend $?
	fi


Return to bug 101675

Lines 54-60 Link Here

(-)samba-3.0.14a-r2.ebuild (-12 / +15 lines)
54	export EPATCH_SUFFIX="patch"	54	export EPATCH_SUFFIX="patch"
55	epatch ${PATCHDIR}/general	55	epatch ${PATCHDIR}/general
56	if use oav ; then	56	if use oav ; then
57	cp -a ${WORKDIR}/${PFVSCAN} ${S2}/examples/VFS	57	cp -pPR ${WORKDIR}/${PFVSCAN} ${S2}/examples/VFS
58	epatch ${PATCHDIR}/vscan	58	epatch ${PATCHDIR}/vscan
59	fi	59	fi
60	}	60	}
Lines 74-80 Link Here
74	fi	74	fi
75	use mysql && mymods="mysql,${mymods}"	75	use mysql && mymods="mysql,${mymods}"
76	use postgres && mymods="pgsql,${mymods}"	76	use postgres && mymods="pgsql,${mymods}"
77	[ -n "${mymods}" ] && myconf="--with-expsam=${mymods}"	77	[[ -n "${mymods}" ]] && myconf="--with-expsam=${mymods}"
78		78
79	mylangs="en"	79	mylangs="en"
80	use linguas_ja && mylangs="${mylangs},ja"	80	use linguas_ja && mylangs="${mylangs},ja"
Lines 95-106 Link Here
95	--with-logfilebase=/var/log/samba \	95	--with-logfilebase=/var/log/samba \
96	--with-privatedir=${PRIVATE_DST} \	96	--with-privatedir=${PRIVATE_DST} \
97	--enable-static --enable-shared \	97	--enable-static --enable-shared \
98	--with-smbmount --with-automount \	98	--with-automount \
99	--with-libsmbclient \	99	--with-libsmbclient \
100	--without-spinlocks \	100	--without-spinlocks \
101	--with-syslog \	101	--with-syslog \
102	--with-idmap \	102	--with-idmap \
103	--without-ldapsam \	103	--without-ldapsam \
		104	$(use_with kernel_linux smbmount) \
104	$(use_with acl acl-support) \	105	$(use_with acl acl-support) \
105	$(use_enable cups) \	106	$(use_enable cups) \
106	$(use_with kerberos krb5) \	107	$(use_with kerberos krb5) \
Lines 142-148 Link Here
142	# Extra rpctorture progs	143	# Extra rpctorture progs
143	exeinto /usr/bin	144	exeinto /usr/bin
144	for i in ${extra_bins}; do	145	for i in ${extra_bins}; do
145	[ -x ${S}/bin/${i} ] && doexe ${S}/bin/${i}	146	[[ -x ${S}/bin/${i} ]] && doexe ${S}/bin/${i}
146	einfo "Extra binaries: ${i}"	147	einfo "Extra binaries: ${i}"
147	done	148	done
148		149
Lines 167-179 Link Here
167	doexe ${S}/nsswitch/pam_winbind.so	168	doexe ${S}/nsswitch/pam_winbind.so
168	fi	169	fi
169		170
170	# mount backend	171	if use kernel_linux; then
171	dodir /sbin	172	# mount backend
172	dosym ../usr/bin/smbmount /sbin/mount.smbfs	173	dodir /sbin
173	dosym ../usr/bin/mount.cifs /sbin/mount.cifs	174	dosym ../usr/bin/smbmount /sbin/mount.smbfs
		175	dosym ../usr/bin/mount.cifs /sbin/mount.cifs
		176	fi
174		177
175	# bug #46389: samba doesn't create symlink anymore	178	# bug #46389: samba doesn't create symlink anymore
176	# beaviour seems to be changed in 3.0.6, see bug #61046	179	# beaviour seems to be changed in 3.0.6, see bug #61046
177	dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so.0	180	dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so.0
178	dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so	181	dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so
179		182
Lines 203-209 Link Here
203	newins ${FILESDIR}/smb.conf.example-samba3.gz smb.conf.example.gz	206	newins ${FILESDIR}/smb.conf.example-samba3.gz smb.conf.example.gz
204	doins ${FILESDIR}/lmhosts	207	doins ${FILESDIR}/lmhosts
205		208
206	newpamd ${FILESDIR}/samba.pam samba	209	newpamd ${FILESDIR}/samba.pam-include samba
207	use winbind && doins ${FILESDIR}/system-auth-winbind	210	use winbind && doins ${FILESDIR}/system-auth-winbind
208	insinto /etc/xinetd.d	211	insinto /etc/xinetd.d
209	newins ${FILESDIR}/swat.xinetd swat	212	newins ${FILESDIR}/swat.xinetd swat
Lines 229-235 Link Here
229	dodoc ${FILESDIR}/nsswitch.conf-wins	232	dodoc ${FILESDIR}/nsswitch.conf-wins
230	use winbind && dodoc ${FILESDIR}/nsswitch.conf-winbind	233	use winbind && dodoc ${FILESDIR}/nsswitch.conf-winbind
231		234
232	cp -a ${S2}/examples/* ${D}/usr/share/doc/${PF}/examples	235	cp -pPR ${S2}/examples/* ${D}/usr/share/doc/${PF}/examples
233		236
234	chmod -R 755 `find ${D}/usr/share/doc/${PF}/examples -type d`	237	chmod -R 755 `find ${D}/usr/share/doc/${PF}/examples -type d`
235	chmod -R 644 `find ${D}/usr/share/doc/${PF}/examples ! -type d`	238	chmod -R 644 `find ${D}/usr/share/doc/${PF}/examples ! -type d`
Lines 256-262 Link Here
256	&& -r ${ROOT}/${PRIVATE_SRC}/secrets.tdb ]]; then	259	&& -r ${ROOT}/${PRIVATE_SRC}/secrets.tdb ]]; then
257	ebegin "Copying ${ROOT}/${PRIVATE_SRC}/* to ${ROOT}/${PRIVATE_DST}/"	260	ebegin "Copying ${ROOT}/${PRIVATE_SRC}/* to ${ROOT}/${PRIVATE_DST}/"
258	mkdir -p ${IMAGE}/${PRIVATE_DST}	261	mkdir -p ${IMAGE}/${PRIVATE_DST}
259	cp -af ${ROOT}/${PRIVATE_SRC}/* ${IMAGE}/${PRIVATE_DST}/	262	cp -pPRf ${ROOT}/${PRIVATE_SRC}/* ${IMAGE}/${PRIVATE_DST}/
260	eend $?	263	eend $?
261	fi	264	fi
262		265