calculate
/
calculate-overlay
5
2
Fork 4
Code Issues 10 Pull Requests 1 Releases Wiki Activity

Fix server

Browse Source
atratsevskiy
Хирецкий Михаил 12 years ago
parent 88eabd11f9
commit cf07f74682
5 changed files with 317 additions and 0 deletions
Show Stats Download Patch File Download Diff File

39
sys-apps/calculate-lib/calculate-lib-2.1.11-r3.ebuild
Unescape View File

@ -0,0 +1,39 @@
# Copyright 1999-2011 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/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
DEPEND="!<sys-apps/calculate-client-2.1.12
!<sys-apps/calculate-server-2.1.11
>=dev-lang/python-2.5.2
>=dev-python/python-ldap-2.0[ssl]
>=dev-python/pyxml-0.8"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix get ip and mac without ifconfig
epatch "${FILESDIR}/calculate-lib-2.1.11-fix_getip.patch"
# fix import xpath
epatch "${FILESDIR}/calculate-lib-2.1.11-fix_xpath.patch"
# fix iniparser
epatch "${FILESDIR}/calculate-lib-2.1.11-fix_iniparser.patch"
}

27
sys-apps/calculate-lib/files/calculate-lib-2.1.11-fix_iniparser.patch
Unescape View File

@ -0,0 +1,27 @@
diff --git pym/cl_base.py pym/cl_base.pypym/cl_base.py
index 15a8d34..860e33a 100644
--- pym/cl_base.py
+++ pym/cl_base.pypym/cl_base.py
@@ -379,6 +379,7 @@ class iniParser(cl_profile._error):
return False
self.checkIni = "samba"
# В файле есть данные
+ textIni = re.sub(r"^#.*$",textIni,'',re.M)
if not self.isEmptyFile(textIni):
try:
objIni = cl_profile.plasma(textIni)
diff --git pym/cl_utils.py pym/cl_base.pypym/cl_utils.py
index 8f25ffd..ac25984 100644
--- pym/cl_utils.py
+++ pym/cl_base.pypym/cl_utils.py
@@ -526,9 +526,7 @@ def getInterfaces():
Get available interfaces (discard which hasn't device)
"""
try:
- return filter(lambda x:os.path.exists(
- os.path.join(SYSFS_NET_PATH,x,"device")),
- os.listdir(SYSFS_NET_PATH))
+ return filter(lambda x: x!= "lo",os.listdir(SYSFS_NET_PATH))
except:
return []

201
sys-apps/calculate-server/calculate-server-2.1.16-r5.ebuild
Unescape View File

@ -0,0 +1,201 @@
# 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/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program for configuring services Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="calculate_nomail
calculate_nodhcp
calculate_noftp
calculate_nojabber
calculate_nonamed
calculate_nosamba
calculate_noproxy"
DEPEND="=sys-apps/calculate-lib-2.1.11-r3
>=net-nds/openldap-2.3[-minimal]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
!calculate_nosamba? (
>=net-fs/samba-3.4.6[acl,client,cups,ldap,netapi,pam,server,smbclient]
<net-fs/samba-4.0.0
)
!calculate_nomail? (
|| ( <net-mail/dovecot-1.2.0[pop3d,ldap,pam,ssl]
>=net-mail/dovecot-1.2.0[ldap,pam,ssl]
)
>=mail-filter/procmail-3.22
dev-python/pymilter
>=mail-mta/postfix-2.2[ldap,pam,ssl]
)
!calculate_noftp? (
|| ( <net-ftp/proftpd-1.3.3[-acl,ldap,ncurses,nls,pam,ssl,tcpd]
>=net-ftp/proftpd-1.3.3[-acl,ident,ldap,ncurses,nls,pam,ssl,tcpd]
)
)
!calculate_nojabber? (
>=net-im/ejabberd-2.1.8[mod_pubsub]
>=media-gfx/imagemagick-6.6
)
!calculate_nonamed? ( >=net-dns/bind-9.6.1_p1[sdb-ldap] )
!calculate_noproxy? ( >=net-proxy/squid-3.0.14[ldap,pam,ssl] )
!calculate_nodhcp? ( >=net-misc/dhcp-3.1.2_p1 )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# ftp .Trash-uid
epatch "${FILESDIR}/calculate-server-2.1.16-ftp_trash.patch"
# fix check ip
epatch "${FILESDIR}/calculate-server-2.1.16-fix_ip_check.patch"
# fix get ip
epatch "${FILESDIR}/calculate-server-2.1.16-fix_get_ip.patch"
# add win7 profile dir
epatch "${FILESDIR}/calculate-server-2.1.16-win7_profile.patch"
# fix work with calculate.env
epatch "${FILESDIR}/calculate-server-2.1.16-fix_inienv.patch"
}
pkg_postinst() {
if [ -d /var/calculate/server-data/mail/imap ] || \
[ -d /var/calculate/server-data/samba/win/profiles ] || \
[ -d /var/calculate/server-data/samba/unix/profiles ] || \
[ -d /var/calculate/server-data/samba/win/netlogon ];
then
ewarn "Data found in directories of previous version calculate-server"
fi
if [ -d /var/calculate/server-data/mail/imap ];
then
if ! [ -d /var/calculate/server-data/mail~ ];
then
if mv /var/calculate/server-data/mail/imap \
/var/calculate/server-data/mail~ && \
rmdir /var/calculate/server-data/mail && \
mv /var/calculate/server-data/mail~ \
/var/calculate/server-data/mail;
then
ewarn
ewarn "Data from /var/calculate/server-data/mail/imap"
ewarn "was moved to /var/calculate/server-data/mail"
MAILUPDATE="TRUE"
fi
fi
if ! [ "${MAILUPDATE}" == "TRUE" ];
then
eerror "Cannot move /var/calculate/server-data/mail/imap"
eerror "Please manualy move /var/calculate/server-data/mail/imap"
eerror "to /var/calculate/server-data/mail"
fi
fi
if [ -d /var/calculate/server-data/samba/win/profiles ];
then
SAMBAUPDATE=""
if ! [ -d /var/calculate/server-data/samba/profiles/win ];
then
if mkdir -p /var/calculate/server-data/samba/profiles && \
mv /var/calculate/server-data/samba/win/profiles \
/var/calculate/server-data/samba/profiles/win;
then
ewarn
ewarn "Data from /var/calculate/server-data/samba/win/profiles"
ewarn "was moved to /var/calculate/server-data/samba/profiles/win"
SAMBAUPDATE="TRUE"
fi
fi
if ! [ "${SAMBAUPDATE}" == "TRUE" ];
then
eerror "Cannot move /var/calculate/server-data/samba/win/profiles"
eerror "Please manualy move "
eerror "/var/calculate/server-data/samba/win/profiles"
eerror "to /var/calculate/server-data/samba/profiles/win"
fi
fi
if [ -d /var/calculate/server-data/samba/unix/profiles ]; \
then
SAMBAUPDATE=""
if ! [ -d /var/calculate/server-data/samba/profiles/unix ];
then
if mkdir -p /var/calculate/server-data/samba/profiles && \
mv -f /var/calculate/server-data/samba/unix/profiles \
/var/calculate/server-data/samba/profiles/unix;
then
rmdir /var/calculate/server-data/samba/unix
ewarn
ewarn "Data from /var/calculate/server-data/samba/unix/profiles"
ewarn "was moved to /var/calculate/server-data/samba/profiles/unix"
SAMBAUPDATE="TRUE"
fi
fi
if ! [ "${SAMBAUPDATE}" == "TRUE" ];
then
eerror "Cannot move /var/calculate/server-data/samba/unix/profiles"
eerror "Please manualy move "
eerror "/var/calculate/server-data/samba/unix/profiles"
eerror "to /var/calculate/server-data/samba/profiles/unix"
fi
fi
if [ -d /var/calculate/server-data/samba/win/netlogon ];
then
SAMBAUPDATE=""
if ! [ -d /var/calculate/server-data/samba/netlogon ];
then
if mv -f /var/calculate/server-data/samba/win/netlogon \
/var/calculate/server-data/samba/netlogon;
then
rmdir /var/calculate/server-data/samba/win
ewarn
ewarn "Data form /var/calculate/server-data/samba/win/netlogon"
ewarn "was moved to /var/calculate/server-data/samba/netlogon"
SAMBAUPDATE="TRUE"
fi
fi
if ! [ "${SAMBAUPDATE}" == "TRUE" ];
then
eerror "Cannot move /var/calculate/server-data/samba/win/netlogon"
eerror "Please manualy move "
eerror "/var/calculate/server-data/samba/win/netlogon"
eerror "/var/calculate/server-data/samba/netlogon"
fi
fi
if [ "${MAILUPDATE}" == "TRUE" ];
then
ewarn
ewarn "Please update mail service by the command:"
ewarn "\tcl-update mail"
fi
if [ "${SAMBAUPDATE}" == "TRUE" ];
then
ewarn
ewarn "Please update samba service by the command:"
ewarn "\tcl-update samba"
fi
ewarn
ewarn "WARNING!!! If you have the samba service, then update it by the command:"
ewarn "\tcl-update samba"
}

20
sys-apps/calculate-server/files/calculate-server-2.1.16-fix_inienv.patch
Unescape View File

@ -0,0 +1,20 @@
diff --git pym/cl_ldap.py pym/cl_ldap.py
index 697273e..dc5324e 100644
--- pym/cl_ldap.py
+++ pym/cl_ldap.py
@@ -8910,10 +8910,13 @@ for running replication")%bFile)
return False
# Получим пути к ini файлам
iniFiles = self.clVars.Get("cl_env_path")
- # Удаляем все ini файлы
+ # Удаляем секции настроек из всех ini
for iniFile in iniFiles:
if os.path.exists(iniFile):
- os.remove(iniFile)
+ if "remote" in iniFile:
+ cl_base.iniParser(iniFile).delArea("client")
+ else:
+ cl_base.iniParser(iniFile).delArea("server")
# Получим путь к ldap файлу
ldapParser = iniLdapParser()
ldapFile = ldapParser.nameIniFile

30
sys-apps/calculate-utilities/calculate-utilities-2.2.30-r9.ebuild
Unescape View File

@ -0,0 +1,30 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_server
"
RDEPEND="${RDEPEND}
!sys-apps/calculate-templates
!<sys-apps/calculate-install-3.0.0_alpha1
=sys-apps/calculate-lib-2.2.30
=sys-apps/calculate-i18n-2.2.30-r1
cl_assemble? ( =sys-apps/calculate-assemble-2.2.30 )
cl_builder? ( =sys-apps/calculate-builder-2.2.30-r3 )
cl_server? ( =sys-apps/calculate-server-2.1.16-r5 )
"
Write Preview
Loading…
Cancel
Save