? files/samba.pam-include Index: samba-3.0.14a-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.14a-r2.ebuild,v retrieving revision 1.13 diff -u -B -r1.13 samba-3.0.14a-r2.ebuild --- samba-3.0.14a-r2.ebuild 9 Aug 2005 00:13:02 -0000 1.13 +++ samba-3.0.14a-r2.ebuild 9 Aug 2005 12:32:14 -0000 @@ -54,7 +54,7 @@ export EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/general if use oav ; then - cp -a ${WORKDIR}/${PFVSCAN} ${S2}/examples/VFS + cp -pPR ${WORKDIR}/${PFVSCAN} ${S2}/examples/VFS epatch ${PATCHDIR}/vscan fi } @@ -74,7 +74,7 @@ fi use mysql && mymods="mysql,${mymods}" use postgres && mymods="pgsql,${mymods}" - [ -n "${mymods}" ] && myconf="--with-expsam=${mymods}" + [[ -n "${mymods}" ]] && myconf="--with-expsam=${mymods}" mylangs="en" use linguas_ja && mylangs="${mylangs},ja" @@ -95,12 +95,13 @@ --with-logfilebase=/var/log/samba \ --with-privatedir=${PRIVATE_DST} \ --enable-static --enable-shared \ - --with-smbmount --with-automount \ + --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) \ @@ -142,7 +143,7 @@ # Extra rpctorture progs exeinto /usr/bin for i in ${extra_bins}; do - [ -x ${S}/bin/${i} ] && doexe ${S}/bin/${i} + [[ -x ${S}/bin/${i} ]] && doexe ${S}/bin/${i} einfo "Extra binaries: ${i}" done @@ -167,13 +168,15 @@ doexe ${S}/nsswitch/pam_winbind.so fi - # mount backend - dodir /sbin - dosym ../usr/bin/smbmount /sbin/mount.smbfs - dosym ../usr/bin/mount.cifs /sbin/mount.cifs + 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 + # 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 @@ -203,7 +206,7 @@ newins ${FILESDIR}/smb.conf.example-samba3.gz smb.conf.example.gz doins ${FILESDIR}/lmhosts - newpamd ${FILESDIR}/samba.pam samba + newpamd ${FILESDIR}/samba.pam-include samba use winbind && doins ${FILESDIR}/system-auth-winbind insinto /etc/xinetd.d newins ${FILESDIR}/swat.xinetd swat @@ -229,7 +232,7 @@ dodoc ${FILESDIR}/nsswitch.conf-wins use winbind && dodoc ${FILESDIR}/nsswitch.conf-winbind - cp -a ${S2}/examples/* ${D}/usr/share/doc/${PF}/examples + 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` @@ -256,7 +259,7 @@ && -r ${ROOT}/${PRIVATE_SRC}/secrets.tdb ]]; then ebegin "Copying ${ROOT}/${PRIVATE_SRC}/* to ${ROOT}/${PRIVATE_DST}/" mkdir -p ${IMAGE}/${PRIVATE_DST} - cp -af ${ROOT}/${PRIVATE_SRC}/* ${IMAGE}/${PRIVATE_DST}/ + cp -pPRf ${ROOT}/${PRIVATE_SRC}/* ${IMAGE}/${PRIVATE_DST}/ eend $? fi