parent
b69d506fa8
commit
5e42317b96
@ -0,0 +1,39 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The program of setting and storing the user account in the domain"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND="~sys-apps/calculate-desktop-3.1.7
|
||||
!<sys-apps/calculate-client-3.1.0
|
||||
>=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/keyutils
|
||||
sys-auth/pam_keystore
|
||||
sys-auth/pam_client
|
||||
dev-lang/swig"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-client-3.1.7-r3.patch"
|
||||
}
|
||||
@ -0,0 +1,97 @@
|
||||
diff --git client/client.py client/client.py
|
||||
index 14a8c8e..4ab0aec 100644
|
||||
--- client/client.py
|
||||
+++ client/client.py
|
||||
@@ -1058,8 +1058,12 @@ class Client(commandServer, encrypt, Desktop):
|
||||
yield remotePw
|
||||
if remotePw:
|
||||
self.printERROR(_("Wrong password"))
|
||||
- yield self.askPassword(\
|
||||
- _("Domain password for the desktop"),False)
|
||||
+ # не запрашвать пароль при загрузке системы
|
||||
+ if not path.exists('/prc/self/fd/0') or \
|
||||
+ os.readlink('/proc/self/fd/0') != '/dev/console':
|
||||
+ yield self.askPassword(\
|
||||
+ _("Domain password for the desktop"),False)
|
||||
+ self.printERROR(_("Wrong password"))
|
||||
|
||||
pathRemote = "/var/calculate/remote"
|
||||
for pwdRemote in passwdQueue():
|
||||
@@ -1067,7 +1071,6 @@ class Client(commandServer, encrypt, Desktop):
|
||||
if sambaPasswordCheck("client",pwdRemote,domain,"remote"):
|
||||
self.clVars.Set('cl_remote_pw',pwdRemote)
|
||||
return True
|
||||
- self.printERROR(_("Wrong password"))
|
||||
return False
|
||||
|
||||
def writeClientVars(self,domain,currentVersion,pwdRemote):
|
||||
diff --git client/utils/cl_client_sync.py client/utils/cl_client_sync.py
|
||||
index 5b276ef..eccb315 100644
|
||||
--- client/utils/cl_client_sync.py
|
||||
+++ client/utils/cl_client_sync.py
|
||||
@@ -44,6 +44,7 @@ class ClClientSyncLoginAction(Action):
|
||||
'method':'Client.mountRemoteRes(cl_remote_pw,cl_client_remote_path,'
|
||||
'cl_remote_host)',
|
||||
'condition':lambda Get: (Get('cl_remote_host') and
|
||||
+ Get('os_remote_auth') and
|
||||
not isMount(Get('cl_client_remote_path'))),
|
||||
},
|
||||
# check on domain user
|
||||
@@ -85,10 +86,13 @@ class ClClientSyncLoginAction(Action):
|
||||
},
|
||||
# проверка на попытку открыть вторую сессию для этого пользователя
|
||||
{'name':'two_session',
|
||||
- 'error':__("Second X session for user %s cannot be opened."),
|
||||
- 'condition':lambda Get:Get('ur_login') in \
|
||||
- Get('desktop.cl_desktop_online_user') and \
|
||||
- Get('cl_client_sync') == 'on'
|
||||
+ 'error':__("Second X session for user {ur_login} cannot be opened."),
|
||||
+ 'condition':lambda dv: (dv.Get('ur_login') in
|
||||
+ dv.Get('desktop.cl_desktop_online_user') and
|
||||
+ int(dv.Select('desktop.cl_desktop_online_count',
|
||||
+ where='desktop.cl_desktop_online_user',
|
||||
+ eq=dv.Get('ur_login'),limit=1) > 1) and
|
||||
+ dv.Get('cl_client_sync') == 'on')
|
||||
},
|
||||
{'name':'domain_user:domain_sync',
|
||||
'method':'Client.setSyncStatus(ur_home_path,ur_uid,ur_gid,"process")',
|
||||
@@ -101,12 +105,6 @@ class ClClientSyncLoginAction(Action):
|
||||
'ur_uid,ur_gid,"unix","remote_profile")',
|
||||
'condition':lambda Get:Get('cl_replication_host')
|
||||
},
|
||||
- # проверить расхождение времени между серверами
|
||||
- #{'name':'repl_profile:check_clock_scew',
|
||||
- # 'method':'Client.checkClockScew('
|
||||
- # 'failed_warning':__("Profile synchronization will be applied "
|
||||
- # "without archiving")
|
||||
- #},
|
||||
# отправить команду архивирования профиля на удаленном домене
|
||||
# если он новее локального профиля
|
||||
{'name':'repl_profile:pack_remote',
|
||||
@@ -211,7 +209,7 @@ class ClClientSyncLoginAction(Action):
|
||||
'method':'Client.setSyncStatus(ur_home_path,ur_uid,ur_gid,"error")',
|
||||
'depend':Tasks.failed_all('sync_remote','sync_local','fallback_sync') |
|
||||
(Tasks.hasnot('domain_sync') & Tasks.failed()) |
|
||||
- Tasks.failed_one_of('mount_resources')
|
||||
+ Tasks.failed_one_of('mount_resources','two_session')
|
||||
},
|
||||
# распаковать ссылки
|
||||
{'name':'domain_sync:unpack_links',
|
||||
@@ -274,7 +272,7 @@ class ClClientSyncLogoutAction(Action):
|
||||
'else_error':__("User home directory {ur_home_path} not found"),
|
||||
},
|
||||
# проверить наличие подключенных ресурсов
|
||||
- {'name':'check_mount',
|
||||
+ {'name':'domain_user:check_mount',
|
||||
'condition':lambda Get:any(x and isMount(x)
|
||||
for x in Get('cl_client_user_mount_path')),
|
||||
'else_error':__("User remote resources not found")
|
||||
@@ -340,7 +338,7 @@ class ClClientSyncLogoutAction(Action):
|
||||
'"error")',
|
||||
'depend': Tasks.hasnot('success_sync')
|
||||
},
|
||||
- {'name':'check_mount!:umount_allres',
|
||||
+ {'name':'umount_allres',
|
||||
'method':'Desktop.umountUserRes(ur_home_path)',
|
||||
}
|
||||
]
|
||||
@ -0,0 +1,26 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=4
|
||||
|
||||
DESCRIPTION="Calculate Utilities meta package"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
SRC_URI=""
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="cl_consolegui cl_client cl_desktop cl_console"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-3.1.7-r5
|
||||
=sys-apps/calculate-i18n-3.1.7
|
||||
=sys-apps/calculate-lib-3.1.7-r1
|
||||
=sys-apps/calculate-core-3.1.7-r6
|
||||
=sys-apps/calculate-update-3.1.7
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.7-r3 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.7-r1 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.7-r1 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.1.7 )
|
||||
"
|
||||
Loading…
Reference in new issue