Исправлено обновление system-auth без pam_client модуляatratsevskiy
parent
4f519dee02
commit
99b4f4f0ef
@ -0,0 +1,35 @@
|
||||
# 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 library for Calculate 3"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="minimal"
|
||||
DEPEND="!minimal? ( dev-python/py-smbpasswd )
|
||||
>=dev-python/pyxml-0.8
|
||||
sys-apps/iproute2
|
||||
sys-apps/pciutils
|
||||
sys-fs/lvm2
|
||||
sys-fs/mdadm
|
||||
dev-python/pyinotify
|
||||
sys-apps/file[python]"
|
||||
RDEPEND="${DEPEND}"
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-lib-3.1.5-r3.patch"
|
||||
}
|
||||
@ -0,0 +1,54 @@
|
||||
diff --git calculate/lib/cl_template.py calculate/lib/cl_template.py
|
||||
index 389c528..dbf6419 100644
|
||||
--- calculate/lib/cl_template.py
|
||||
+++ calculate/lib/cl_template.py
|
||||
@@ -4455,7 +4455,7 @@ gettext -d cl_template "$*"
|
||||
self.cltObj.applyTemplates()
|
||||
self.stop = self.stop or self.cltObj.stop
|
||||
if not self.stop and ((self.objVar.Get('cl_merge_pkg') or \
|
||||
- self.objVar.Get('cl_action') == "sync") and \
|
||||
+ self.objVar.Get('cl_action') in ("sync","domain","undomain")) and \
|
||||
self.objVar.Get('cl_merge_pkg_new')):
|
||||
self.objVar.Set('cl_root_path',
|
||||
self.objVar.Get('cl_root_path_next'),force=True)
|
||||
diff --git calculate/lib/utils/files.py calculate/lib/utils/files.py
|
||||
index cd94e92..34c3bc8 100644
|
||||
--- calculate/lib/utils/files.py
|
||||
+++ calculate/lib/utils/files.py
|
||||
@@ -732,9 +732,11 @@ class FStab(object):
|
||||
|
||||
def rebuildCache(self):
|
||||
"""Rebuild cache from fstab file"""
|
||||
+ def setlen(ar):
|
||||
+ return ar[:6]+[""]*(6-len(ar))
|
||||
self.cache = \
|
||||
- map(lambda x:map(lambda y:y.strip(),x.split()),
|
||||
- filter(lambda x:x and not x.lstrip().startswith("#"),
|
||||
+ map(lambda x:setlen(map(lambda y:y.strip(),x.split())),
|
||||
+ filter(lambda x:x.strip() and not x.lstrip().startswith("#"),
|
||||
open(self.fstab_file,'r').read().split('\n')))
|
||||
for data in self.cache:
|
||||
convertDev = lambda x: path.realpath(x) if x.startswith('/') else x
|
||||
diff --git calculate/lib/variables/__init__.py calculate/lib/variables/__init__.py
|
||||
index 415d5ef..1fac4d6 100644
|
||||
--- calculate/lib/variables/__init__.py
|
||||
+++ calculate/lib/variables/__init__.py
|
||||
@@ -25,4 +25,4 @@ class VariableClVer(ReadonlyVariable):
|
||||
"""
|
||||
Package version
|
||||
"""
|
||||
- value = "3.1.5"
|
||||
+ value = "3.1.5.1"
|
||||
diff --git calculate/lib/variables/user.py calculate/lib/variables/user.py
|
||||
index d53cdd7..b80410c 100644
|
||||
--- calculate/lib/variables/user.py
|
||||
+++ calculate/lib/variables/user.py
|
||||
@@ -53,7 +53,7 @@ class LdapHelper:
|
||||
|
||||
def getLdapUserObject(self):
|
||||
"""Get data obejct from LDAP"""
|
||||
- if not LdapHelper._ldapUserObject:
|
||||
+ if not LdapHelper._ldapUserObject and ldapUser:
|
||||
LdapHelper._ldapUserObject = ldapUser()
|
||||
return LdapHelper._ldapUserObject
|
||||
|
||||
@ -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.5-r15
|
||||
=sys-apps/calculate-i18n-3.1.5-r1
|
||||
=sys-apps/calculate-lib-3.1.5-r3
|
||||
=sys-apps/calculate-core-3.1.5-r1
|
||||
=sys-apps/calculate-update-3.1.5
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.5-r5 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.5-r4 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.5-r2 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.1.5 )
|
||||
"
|
||||
Loading…
Reference in new issue