Added option 'noperm' for mount samba resources Disks,Home,FTP. Removed double block of declaration option 'h' for all console utils.atratsevskiy
root
15 years ago
parent
0340a284b6
commit
310ed34456
@ -0,0 +1,74 @@
|
||||
# Copyright 1999-2009 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="2"
|
||||
|
||||
inherit distutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The program of setting and storing the user account in the domain"
|
||||
HOMEPAGE="http://www.calculate-linux.org/Calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="kde xfce"
|
||||
|
||||
DEPEND=">=sys-apps/calculate-lib-2.1.3-r1
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
>=sys-auth/pam_ldap-180[ssl]
|
||||
>=sys-auth/nss_ldap-239
|
||||
>=sys-apps/keyexec-0.1.2
|
||||
>=sys-apps/hal-0.5.9
|
||||
sys-apps/keyutils
|
||||
sys-auth/pam_keystore
|
||||
xfce? ( x11-misc/slim )
|
||||
kde? ( kde-base/kdm )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
ISUPDATE=/tmp/${PN}.ebuild.update
|
||||
|
||||
# for fixing bug of ebuild calculate-client-2.0.17
|
||||
OLDISUPDATEPATH="${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17/temp/"
|
||||
OLDISUPDATE="${OLDISUPDATEPATH}/${PN}.update"
|
||||
|
||||
pkg_preinst() {
|
||||
touch ${ISUPDATE}
|
||||
rm -f /etc/init.d/client
|
||||
|
||||
# for fixing bug of ebuild calculate-client-2.0.17
|
||||
mkdir -p ${OLDISUPDATEPATH}
|
||||
touch ${OLDISUPDATE}
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
|
||||
# patch add cifs mount option noperm for mounting Home,Disks,FTP
|
||||
epatch "${FILESDIR}/calculate-client-${PVR}.patch"
|
||||
}
|
||||
|
||||
|
||||
pkg_postinst() {
|
||||
if use kde || use xfce;
|
||||
then
|
||||
cl-client --install
|
||||
ewarn "Please restart xdm for refreshing configuration files."
|
||||
fi
|
||||
rm ${ISUPDATE}
|
||||
|
||||
# for fixing bug of ebuild calculate-client-2.0.17
|
||||
rm -rf ${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17
|
||||
rmdir ${PORTAGE_TMPDIR}/portage/${CATEGORY} &>/dev/null
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
# for fixing bug of ebuild calculate-client-2.0.17 (|| -e ${OLDISUPDATE} )
|
||||
if ! [[ -e ${ISUPDATE} || -e ${OLDISUPDATE} ]];
|
||||
then
|
||||
cl-client --uninstall
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
diff --git a/pym/cl_client.py b/pym/cl_client.py
|
||||
--- pym/cl_client.py
|
||||
+++ pym/cl_client.py
|
||||
@@ -350,11 +350,6 @@ class cl_client(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
||||
'helpChapter':_("Common options"),
|
||||
'help':_("display this help and exit")
|
||||
},
|
||||
- {'shortOption':"h",
|
||||
- 'longOption':"help",
|
||||
- 'helpChapter':_("Common options"),
|
||||
- 'help':_("display this help and exit")
|
||||
- },
|
||||
{'progAccess':(0,),
|
||||
'shortOption':"r",
|
||||
'helpChapter':_("Common options"),
|
||||
@@ -1648,11 +1643,11 @@ or ld_bind_dn or ld_bind_pw")
|
||||
return foundTwoSession
|
||||
|
||||
def mountSambaRes(self,userName,userPwd,uid,gid,res,path,
|
||||
- mountUidList=['ftp','share']):
|
||||
+ mountUidList=['ftp','home','share']):
|
||||
"""Монтирует Samba ресурсы"""
|
||||
if res in mountUidList:
|
||||
# Монтируем директории c uid
|
||||
- mountStr="mount -t cifs -o user=%s,uid=%s,gid=%s"\
|
||||
+ mountStr="mount -t cifs -o user=%s,uid=%s,gid=%s,noperm"\
|
||||
%(userName,uid,gid) +\
|
||||
" //%s/%s %s" %(self.clVars.Get("cl_remote_host"),
|
||||
res, path)
|
||||
Loading…
Reference in new issue