git-svn-id: http://svn.calculate.ru/overlay@2394 c91db197-33c1-4113-bf15-f8a5c547ca64

atratsevskiy
mhiretskiy 15 years ago
parent 8e0be9098c
commit 72eea5fa9e

@ -1,31 +1,5 @@
AUX bugfix-2.0.16-r1.patch 3547 RMD160 9d3015325ceef21b9c8cc41aa6b6a3a72d5c61f2 SHA1 e81453a95bd44053da8ff2310c08ad8f2412b10b SHA256 123c3b88fffb032421f4f03b3bfa0ce154225c99548d9e258b086f04c57f5eda
AUX bugfix-2.0.17-r1.patch 19683 RMD160 f653fb50e2ca640575d9904b3a75090a37f5b63d SHA1 739bc41a372755b205b9c7dc90fd358a9f8f3eec SHA256 971948b3e8ae7b9907466a3e9e2f136b37b7bb47b89520b1a9a5e113f8b487af
AUX bugfix-2.0.18-r1.patch 1412 RMD160 57863342e757ca81e8d4661ef8dc75208da0a110 SHA1 6cb6b18df1369a47a00eb92b6560dc0ff6203830 SHA256 5099e73dca15c37cb167623e9742f5231068e28cd61ee5e9aa2c9693bf9113e4
DIST calculate-client-2.0.11.tar.bz2 30849 RMD160 6eae19cf63e10ad005e3f07775377b09581c4f77 SHA1 9451fb119d7c88b8f44d1c924658d872d66b654e SHA256 8e6eb6d5b3a6039f49ecc2cd3ff6850372250f6c605fdae484acd2115b96fa90
DIST calculate-client-2.0.12.tar.bz2 32075 RMD160 76b51ece5e4e0de5c737ce3cac7d3b5a83aa9992 SHA1 c37970a0ff6066c57deddccb30cb8f1840f543da SHA256 9ceda4327f564a365fa97c8cb07b318d6a5ef946f37200ff898db0b945808e9e
DIST calculate-client-2.0.13.tar.bz2 32332 RMD160 0ac61d79bd263795d73a7f638e39788bc74db234 SHA1 6e94740cc7a53e113bdcd5c6dd3ebf73eb135c7e SHA256 54d87e278db17dcf4748618a6c49df153cd81842b60caf234f66d459c5b8e156
DIST calculate-client-2.0.14.tar.bz2 33102 RMD160 cf50d4a6088a2707fab91268198bc3534c04d3b1 SHA1 d424e212b3957cb6d37afa4ca5b645a72be34821 SHA256 48cdfff7ff2be0b89c9446850411ee1a585b690e5af7290a561fe16c49937ca1
DIST calculate-client-2.0.15.tar.bz2 39750 RMD160 f565dfe3fb49e5b713869e7469683710e36da070 SHA1 5435ceb99b6f86d722553ca43c4e011be012c8bd SHA256 93aba6699708667a6dee419dd7a6359d9478c859d9d90aa46d51a7bcf96bb49b
DIST calculate-client-2.0.16.tar.bz2 40610 RMD160 550236ad2673024abb0cf2bb4f61e848c5bcd5f7 SHA1 5148b4fd878dc24fd69bb1ddf9cc6be78726ef81 SHA256 279f8968e451b52f7ad541c7633a147be417891ab422653f243a9ca725854f49
DIST calculate-client-2.0.17.tar.bz2 47073 RMD160 b7efd07193ccdaa1a47b0f3643e081ccf7fd7764 SHA1 3ad0cea676dfd78709d7c6fc27d269b2ca47e66d SHA256 2f8af2cb26c8ae450ee51ebec2a821fe476a7f90a2537dde107044a915364caf
DIST calculate-client-2.0.18.tar.bz2 64549 RMD160 1dc0356e63e67a0100640672563f21d29e6a98f9 SHA1 d0a42bdefbfb23edc20f18a64b8be00f551f1ff9 SHA256 87be6f98b0c82828b951bb9b9e9dd53730f5794921e099bffc23cda6283a3af0
DIST calculate-client-2.1.0.tar.bz2 64547 RMD160 7e620d31f08c13abfce9bcdc7100b60dbc92cc9c SHA1 1f477fe3696a9188eb2fd6c71f7fd5c12343eb60 SHA256 38550fa2420a761d0492714b092b80e237e33857e8ec82ee0828a12962663874
DIST calculate-client-2.1.1.tar.bz2 70930 RMD160 f93f4974479dc70b66a536beb1bb27aebc8de06e SHA1 5df8fa69319f3ee596586c19b9574b819b2c2376 SHA256 bf63883a04cbd3447d908922d8f9b34dd392e055702b628ca9e43539bf8ade02
DIST calculate-client-2.1.2.tar.bz2 71205 RMD160 5c9d3db4f9da23cb357084ce4afe754e12481692 SHA1 2618f7583b1461c61c920d1f3c53ffe65a135a19 SHA256 1b0b31fb0d9a252dbeb248ce8b45a5fb56c5e9a12dc0a3186840cff867f721cc
DIST calculate-client-2.1.3.tar.bz2 58474 RMD160 9f56e3f4f351bb20d88b84c6bff493c81a909eaa SHA1 3e406f2da3e7297e46819f38e96fb8de61fe2597 SHA256 f8e729e411c7a422977105edf82306629e2837e0c8b051925d85218b397e03cd
EBUILD calculate-client-2.0.11-r1.ebuild 916 RMD160 b5b0428132078514b2dcd9a223657cca5de935f7 SHA1 92fd9ecefe6771d2415fc547019e0bb707b517f4 SHA256 cdb0d40d32ef988b11501a9cbf747906799e8da7d2ae77dbc4fd73d366db33fd
EBUILD calculate-client-2.0.12-r1.ebuild 916 RMD160 1aca41fa174f8456f7838034206840c5e9984297 SHA1 cb73b2344d1d9ba7e583a86778bb383e5444f982 SHA256 2dbd34d3f4124bdf6c083acf921ab4e605d7569a9c6744dd779a8e80a4bf7dcf
EBUILD calculate-client-2.0.13.ebuild 903 RMD160 947df79696a73da940ef7c55a365d29bb2e75f01 SHA1 831b4cae0cfe982b1d42f6edcf0fba7986ea41b9 SHA256 807aa32d834a3f78a115787ac112f7fdd0fba63f424637a2f5eb68826d046570
EBUILD calculate-client-2.0.14.ebuild 914 RMD160 54c71f4abfd3d7860c996db5e209cb61bd85018f SHA1 1028237cbde945aa18e212fa502b9a6dbe018e19 SHA256 40fdec43676f76e6c9141df90db7d48bd5f3ff05792d4f748d8fe783bbcf5a0a
EBUILD calculate-client-2.0.15.ebuild 880 RMD160 b5511df5154339fbb6addaaa4f7a68312b9e29f0 SHA1 4fb32aedb42d4d96e3b7910e411aeb5a4409b1ab SHA256 0b35956eb65f7ac57b66d6f3189fc1c091bef36aeed0abff77750decca4cda7c
EBUILD calculate-client-2.0.16-r1.ebuild 852 RMD160 56be4a1bd764cb30b972dc0dd69e1f75c5e31fd2 SHA1 52d33b537d1db1291a5d81c986c8232c488484ab SHA256 997cea20eea7fd4e401575b178cb09e17c586869b04fba09682330ef150dc55f
EBUILD calculate-client-2.0.16.ebuild 729 RMD160 d62e7f9e926cdbfc05fbe054e8fe21934bcfd68e SHA1 a8c0b24679b2de26fe4d6bc37fa477e1379fa3f8 SHA256 344e4f4c2b3d4a1a69c820fa3f6b06e35b576e51c8f2313a6473683a169d11e5
EBUILD calculate-client-2.0.17-r1.ebuild 1835 RMD160 996b535979a9ab3aac4547253bd5a07ff324dc2f SHA1 f9547e0e7997d119daa7f2d30aa4ae2413316809 SHA256 2adb0ac73c67a9a35891e658cba6d53d34c24fb8e052d645cab579264a5fd0be
EBUILD calculate-client-2.0.17.ebuild 1183 RMD160 8e15afc624496b5c7bf47af22e098c482425f024 SHA1 80f4e6351db949196e79418c8c1a2b6e2c64f58a SHA256 d09c2d139fd5bce4a7734f381ea4184075feeae715e45829ae851dac57d9fea0
EBUILD calculate-client-2.0.18-r1.ebuild 1836 RMD160 557d7390223eb94405b17652d3ff84168f9fcfb3 SHA1 57c67d94e88c6020a9966cca43a8a3cb55175427 SHA256 631ac9926bdd7c4968d07d59e1ee113b8fa69c258c4cefa8288eb710a4996c03
EBUILD calculate-client-2.0.18.ebuild 1734 RMD160 ffc4f9676be5381ba0e75c1bdd8243c7d8ef1119 SHA1 54d49f2b748c034c4d9a3adf623f8521608d4f4c SHA256 9982b118036547640d934d1abf701deee925cca1691d7a8234e1a57dbb32e0d3
EBUILD calculate-client-2.1.0.ebuild 1733 RMD160 f75b004b4641e982e61ab73b9b4b3c889524148e SHA1 7e677a0433c43cf4efb56b0e6bf7bc8b9ee25ec8 SHA256 8c58e3c7c4900e0eeeb7d7e1050824591a06b286d8d8df8694c3f4258aa36b84
EBUILD calculate-client-2.1.1.ebuild 1733 RMD160 f036e2e7310b03250e945b436912b784c07d01c5 SHA1 d566af904da1cf07d5937d75449db3f749857f48 SHA256 1b5d14bf553ef678ae5456d541fe97c6b5ffb29271baeb4c8aea7bcff5fb6552
EBUILD calculate-client-2.1.2.ebuild 1731 RMD160 3f7e8f67724e55e5185200b2b1e67427549a4071 SHA1 6131d2bf4e1784b61acb629b9952256bd09c2a4b SHA256 aac2a6438ddc83614aff7b2529346d6f93e5cd87ab64f796a9186b6dd1eb7381
EBUILD calculate-client-2.1.3.ebuild 1725 RMD160 3e30b3d51775db2093677f2e2006535dc5c62ea8 SHA1 910910dfea567f1c3ac397924744435f1de67e50 SHA256 d3a701d7fa45db68dc25b8659383b450761968f2e290a7cd73ca920ab52f5e3c
EBUILD calculate-client-9999.ebuild 1632 RMD160 cf284b9bc34691430561f6979d2697147ba8677a SHA1 48f4d4db6bd7c31a9528929e01834835cfd097ba SHA256 bd5df17f31a4ff1687926ae2a6083c69f36daf75024761bcfb22db45983b14c8

@ -1,27 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
SRC_URI="ftp://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
http://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of setting and storing the user account in the domain"
HOMEPAGE="http://www.calculate-linux.ru/Calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="=sys-apps/calculate-lib-2.0.8-r1
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=kde-misc/kgtk-0.9.5[qt4]
>=kde-misc/gtk-kde4-0.8.0
>=sys-apps/keyexec-0.1.2
>=sys-apps/hal-0.5.9
sys-apps/keyutils
sys-auth/pam_keystore"

@ -1,27 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
SRC_URI="ftp://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
http://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of setting and storing the user account in the domain"
HOMEPAGE="http://www.calculate-linux.ru/Calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="=sys-apps/calculate-lib-2.0.9-r1
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=kde-misc/kgtk-0.9.5[qt4]
>=kde-misc/gtk-kde4-0.8.0
>=sys-apps/keyexec-0.1.2
>=sys-apps/hal-0.5.9
sys-apps/keyutils
sys-auth/pam_keystore"

@ -1,27 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
SRC_URI="ftp://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
http://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of setting and storing the user account in the domain"
HOMEPAGE="http://www.calculate-linux.ru/Calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS=""
DEPEND="=sys-apps/calculate-lib-2.0.10
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=kde-misc/kgtk-0.9.5[qt4]
>=kde-misc/gtk-kde4-0.8.0
>=sys-apps/keyexec-0.1.2
>=sys-apps/hal-0.5.9
sys-apps/keyutils
sys-auth/pam_keystore"

@ -1,27 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
SRC_URI="ftp://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
http://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of setting and storing the user account in the domain"
HOMEPAGE="http://www.calculate-linux.ru/Calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="=sys-apps/calculate-lib-2.0.11
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=kde-misc/kgtk-0.9.5[qt4]
>=kde-misc/gtk-kde4-0.8.0
>=sys-apps/keyexec-0.1.2
>=sys-apps/hal-0.5.9
sys-apps/keyutils
sys-auth/pam_keystore"

@ -1,26 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
SRC_URI="ftp://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
http://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of setting and storing the user account in the domain"
HOMEPAGE="http://www.calculate-linux.ru/Calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="=sys-apps/calculate-lib-2.0.12
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=kde-misc/kgtk-0.9.5[qt4]
>=sys-apps/keyexec-0.1.2
>=sys-apps/hal-0.5.9
sys-apps/keyutils
sys-auth/pam_keystore"

@ -1,35 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
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.ru/Calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="kde"
DEPEND="=sys-apps/calculate-lib-2.0.14
>=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
kde? (
>=kde-misc/kgtk-0.9.5[qt4] )"
src_unpack() {
unpack ${A}
cd "${S}"
# bugfix patch
epatch "${FILESDIR}/bugfix-${PVR}.patch"
}

@ -1,25 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
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.ru/Calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="=sys-apps/calculate-lib-2.0.14
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=kde-misc/kgtk-0.9.5[qt4]
>=sys-apps/keyexec-0.1.2
>=sys-apps/hal-0.5.9
sys-apps/keyutils
sys-auth/pam_keystore"

@ -1,74 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
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.ru/Calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="kde xfce"
DEPEND="=sys-apps/calculate-lib-2.0.15
>=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
kde? ( >=kde-misc/kgtk-0.9.5[qt4]
>=kde-base/kdm-4.2.0[-kdeprefix] )
xfce? ( x11-misc/slim )"
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"
src_unpack() {
unpack ${A}
cd "${S}"
# bugfix patch
epatch "${FILESDIR}/bugfix-${PVR}.patch"
}
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}
}
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
}

@ -1,52 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
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.ru/Calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="kde xfce"
DEPEND="=sys-apps/calculate-lib-2.0.15
>=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
kde? ( >=kde-misc/kgtk-0.9.5[qt4]
>=kde-base/kdm-4.2.0[-kdeprefix] )
xfce? ( x11-misc/slim )"
RDEPEND="${DEPEND}"
ISUPDATE=${T}/${PN}.update
pkg_preinst() {
touch ${ISUPDATE}
rm -f /etc/init.d/client
}
pkg_postinst() {
if use kde || use xfce;
then
cl-client --install
ewarn "Please restart xdm for refreshing configuration files."
fi
rm ${ISUPDATE}
}
pkg_prerm() {
if ! [[ -e ${ISUPDATE} ]];
then
cl-client --uninstall
fi
}

@ -1,75 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
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.ru/Calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="kde xfce"
DEPEND="=sys-apps/calculate-lib-2.0.16
>=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
kde? ( >=kde-misc/kgtk-0.9.5[qt4]
>=kde-base/kdm-4.2.0[-kdeprefix] )
xfce? ( x11-misc/slim )"
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"
src_unpack() {
unpack ${A}
cd "${S}"
# bugfix patch
epatch "${FILESDIR}/bugfix-${PVR}.patch"
}
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}
}
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
}

@ -1,66 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
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.ru/Calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="kde xfce"
DEPEND="=sys-apps/calculate-lib-2.0.16
>=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
kde? ( >=kde-misc/kgtk-0.9.5[qt4]
>=kde-base/kdm-4.2.0[-kdeprefix] )
xfce? ( x11-misc/slim )"
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}
}
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
}

@ -1,66 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
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.ru/Calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="kde xfce"
DEPEND="=sys-apps/calculate-lib-2.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/hal-0.5.9
sys-apps/keyutils
sys-auth/pam_keystore
kde? ( >=kde-misc/kgtk-0.9.5[qt4]
>=kde-base/kdm-4.2.0[-kdeprefix] )
xfce? ( x11-misc/slim )"
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}
}
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
}

@ -1,66 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
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.ru/Calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="kde xfce"
DEPEND="=sys-apps/calculate-lib-2.1.1
>=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
kde? ( >=kde-misc/kgtk-0.9.5[qt4]
>=kde-base/kdm-4.2.0[-kdeprefix] )
xfce? ( x11-misc/slim )"
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}
}
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
}

@ -1,69 +0,0 @@
diff -ruN calculate-client-2.0.16.old/pym/cl_client.py calculate-client-2.0.16/pym/cl_client.py
--- calculate-client-2.0.16.old/pym/cl_client.py 2009-04-26 15:04:05.000000000 +0400
+++ calculate-client-2.0.16/pym/cl_client.py 2009-05-06 10:19:15.570219689 +0400
@@ -60,22 +60,23 @@
if max != None:
self.max = max
self.title = title
- self.label ="LOGINKDIALOG=%d" % os.getpid()
- pipe = popen2.Popen4(self.execenv + " %s " % self.label +\
- '/usr/bin/kdialog --progressbar "%s" %d' % (\
- " "*(len(title)+20),self.max))
- if pipe.poll() != 0:
- time.sleep(0.5)
- if pipe.poll() == 0:
- self.kdialog = pipe.fromchild.readline().strip()
- while not "org.kde.kdialog" in self.kdialog:
- s = fout.fromchild.readline()
- if s == "":
- self.shutdownDialog()
- self.kdialog = s.strip()
- self.setTitle(self.title)
- else:
- self.shutdownDialog()
+ if os.system('which kdialog >/dev/null') == 0:
+ self.label ="LOGINKDIALOG=%d" % os.getpid()
+ pipe = popen2.Popen4(self.execenv + " %s " % self.label +\
+ '/usr/bin/kdialog --progressbar "%s" %d' % (\
+ " "*(len(title)+20),self.max))
+ if pipe.poll() != 0:
+ time.sleep(0.5)
+ if pipe.poll() == 0:
+ self.kdialog = pipe.fromchild.readline().strip()
+ while not "org.kde.kdialog" in self.kdialog:
+ s = fout.fromchild.readline()
+ if s == "":
+ self.shutdownDialog()
+ self.kdialog = s.strip()
+ self.setTitle(self.title)
+ else:
+ self.shutdownDialog()
def shutdownDialog(self):
'''Принудительно уничтожить процесс kdialog'''
@@ -1019,10 +1020,12 @@
--set-ldap_root=%s --set-ldap_bind=%s --set-ldap_bindpw=%s -P \
install/6intranet" %(domain,servDn,unixDN,bindDn,bindPw)
self.execProg(execStr)
- textLine = self.execProg("/etc/init.d/dbus restart")
- if not "ok" in textLine:
- self.printWARNING(_("Error restarting /etc/init.d/dbus")+ " ...")
- return False
+ if os.path.exists('/etc/init.d/dbus'):
+ textLines = self.execProg("/etc/init.d/dbus restart", False, False)
+ if not (textLines and type(textLines) == types.ListType and\
+ "ok" in textLines[-1] or textLines and "ok" in textLines):
+ self.printWARNING(_("Error restarting /etc/init.d/dbus")+ " ...")
+ return False
self.printOK(_("Computer added to domain %s")%domain + " ...")
return True
@@ -1601,7 +1604,7 @@
# Отмонтируем пользовательские ресурсы в случае ошибки
self.errorAndUnmountUserRes = True
return False
- # если репликации нет, то prevHost и remote_host одинковые
+ # если репликации нет, то prevHost и remote_host одинаковые
else:
prevHost=self.clVars.Get('cl_remote_host')
# Синхронизируем настройки пользователя

@ -1,436 +0,0 @@
diff -ruN calculate-client-2.0.17.orig/data/login calculate-client-2.0.17/data/login
--- calculate-client-2.0.17.orig/data/login 2009-06-01 10:22:53.000000000 +0400
+++ calculate-client-2.0.17/data/login 2009-06-01 10:34:09.000000000 +0400
@@ -1,5 +1,11 @@
#! /bin/sh
+
+xmes() {
+ echo "$1:
+$2" | iconv -f utf8 -t koi8-r - | xargs xmessage -buttons OK:0 -default OK
+}
+
env-update
source /etc/profile
@@ -20,8 +26,7 @@
if [ "$?" -gt "0" ];
then
echo $ERRORLOG >> $FILE_LOG
- xmessage -buttons OK:0 -default OK "cl-sync:
-$ERRORLOG"
+ xmes cl-sync "$ERRORLOG"
exit 1
fi
fi
@@ -36,11 +41,9 @@
ERRORLOG2=`/usr/bin/cl-sync --color=never --logout --nosync $USER`
if [ "$?" -gt "0" ];
then
- xmessage -buttons OK:0 -default OK "cl-sync:
-$ERRORLOG2"
+ xmes cl-sync "$ERRORLOG2"
fi
- xmessage -buttons OK:0 -default OK "cl-createhome:
-$ERRORLOG"
+ xmes cl-createhome "$ERRORLOG"
exit 1
fi
fi
diff -ruN calculate-client-2.0.17.orig/pym/cl_client.py calculate-client-2.0.17/pym/cl_client.py
--- calculate-client-2.0.17.orig/pym/cl_client.py 2009-06-01 10:22:53.000000000 +0400
+++ calculate-client-2.0.17/pym/cl_client.py 2009-06-01 10:32:33.000000000 +0400
@@ -289,15 +289,15 @@
{
'progAccess':(2,),
'helpChapter':"Function",
- 'help':_("Mounting directories and synchronize the user preferences")
+ 'help':_("Mounting resources and synchronize the user preferences")
},
# Examples
{
'progAccess':(0,),
'helpChapter':_("Examples"),
'help':pcs( " cl-client 192.168.0.1", self.column_width,
- "# " + _("Adds settings for connecting to domain \
-(ip 192.168.0.1)"),
+ "# " + _("Adds settings for connecting to domain") + \
+ " (ip 192.168.0.1)",
self.consolewidth-self.column_width )
},
# Options
@@ -314,18 +314,18 @@
{'progAccess':(0,),
'shortOption':"r",
'helpChapter':_("Common options"),
- 'help':_("Removes the settings for connecting to a domain")
+ 'help':_("remove the settings for connecting to a domain")
},
{'progAccess':(2,),
'longOption':'progress',
'helpChapter':_("Common options"),
- 'help':_("Show progress bar for kde startup (works only with options \
+ 'help':_("show progress bar for kde startup (works only with options \
--login)")
},
{'progAccess':(1,),
'longOption':'progress',
'helpChapter':_("Common options"),
- 'help':_("Show progress bar for kde startup")
+ 'help':_("show progress bar for kde startup")
},
{'progAccess':(0,1,2),
'longOption':"vars",
@@ -337,7 +337,7 @@
'longOption':"color",
'optVal':_("WHEN"),
'helpChapter':_("Common options"),
- 'help':_("control whether color is used to distinguish file types. \
+ 'help':_("control whether color is used. \
WHEN may be 'never', 'always', or 'auto'")
},
{'progAccess':(1,),
@@ -349,13 +349,13 @@
{'progAccess':(0,),
'longOption':"install",
'helpChapter':_("Common options"),
- 'help':_("Adds use of scripts this package for window manager")
+ 'help':_("add use of scripts this package for window manager")
},
{'progAccess':(0,),
'longOption':"uninstall",
'helpChapter':_("Common options"),
- 'help':_("Remove use of scripts this package for window manager and, \
-if necessary, disconnects domain")
+ 'help':_("remove use of scripts this package for window manager and, \
+if necessary, removes from domain")
},
{'progAccess':(0,),
'longOption':"mount",
@@ -459,7 +459,7 @@
if os.getuid() == 0 and os.getgid() == 0:
return True
else:
- self.printERROR("The user is not root")
+ self.printERROR(_("The user is not root"))
return False
@@ -496,7 +496,11 @@
def searchPrevHost(self, userName):
"""Находит сервер к которому был подключен пользователь"""
- resSearch = self.searchLdapDN(userName, self.replHostsDN, "uid")
+ # Короткое имя системы
+ osLinuxShort = self.clVars.Get("os_linux_shortname")
+ # Имя для поиска в служебной ветке репликации
+ userLogin = "%s@%s"%(userName,osLinuxShort)
+ resSearch = self.searchLdapDN(userLogin, self.replHostsDN, "uid")
return resSearch
def searchUnixUser(self, userName):
@@ -760,7 +764,7 @@
return True
else:
self.printERROR(_("ERROR") + ": " + execStr)
- self.printERROR(_("Not deleted from default runlevel"))
+ self.printERROR(_("Can not delete from default runlevel"))
return False
def createHome(self, userName, applyAlways=False, progress=False):
@@ -829,7 +833,7 @@
if not dirsAndFiles:
# Отмонтируем пользовательские ресурсы в случае ошибки
self.errorAndUnmountUserRes = True
- self.printERROR(_("Not apply user profile"))
+ self.printERROR(_("Can not apply user profile"))
return False
self.chownR(homeDir, uid, gid, dirsAndFiles)
if not homeExists:
@@ -844,7 +848,7 @@
foundMountHome =self.isMount("/var/calculate/client-home","none",False)
if not (self.clVars.Get("cl_remote_host") and foundMountRemote and\
foundMountHome):
- self.printERROR("The computer is not in domain")
+ self.printERROR(_("The computer is not in domain"))
return False
return (foundMountRemote,foundMountHome)
@@ -930,12 +934,12 @@
# Наложим профили
dirsAndFiles = self.applyProfilesFromSystem()
if not dirsAndFiles:
- self.printERROR(_("Not apply 'install/domain' profiles"))
+ self.printERROR(_("Can not apply 'install/domain' profiles"))
return False
if hostAuth == "local":
- self.printOK(_("Set profiles in local mode"))
+ self.printOK(_("Set profiles of local mode"))
else:
- self.printOK(_("Set profiles in network mode"))
+ self.printOK(_("Set profiles of network mode"))
currentVersion = self.clVars.Get("cl_ver")
self.clVars.Write("os_remote_client", currentVersion)
self.clVars.Write("os_remote_auth", hostAuth)
@@ -963,7 +967,7 @@
return True
pathHome = "/var/calculate/client-home"
if foundMountRemote:
- self.printWARNING(_("Samba resource [remote] is mount") + \
+ self.printWARNING(_("Samba resource [%s] is mount")%"remote" + \
" ...")
if foundMountHome:
self.printWARNING(str(pathHome) + " " +_("is mount")+
@@ -980,7 +984,8 @@
pathRemote = "/var/calculate/remote"
pwdRemote = self.clVars.Get("cl_remote_pw")
if not (domain and pwdRemote):
- self.printERROR(_("Not found vaiable: cl_remote_pw") + " ...")
+ self.printERROR(_("Not found variable")+\
+ ": cl_remote_pw ...")
return False
if not os.path.exists(pathRemote):
os.makedirs(pathRemote)
@@ -990,8 +995,8 @@
//%s/remote %s" %(escPwdRemote,domain,pathRemote)
textLine = self.execProg(mountStr)
if not (textLine == None):
- self.printWARNING(_("Can not mount Samba resource [remote]") +\
- " ...")
+ self.printWARNING(_("Can not mount Samba resource [%s]")%\
+ "remote" + " ...")
flagLocalProfile = True
# Если профили не актуальны накладываем новую версию профилей
if not self.applyRelevanceProfiles("local"):
@@ -1003,8 +1008,8 @@
self.printERROR(_("Can not unmount") + " /home")
return False
return True
- self.printSUCCESS(_("Mount Samba resource [remote]") +\
- " ...")
+ self.printSUCCESS(_("Mount Samba resource [%s]") % "remote" +\
+ " ...")
if (not foundMountHome) and (not flagLocalProfile):
if not os.path.exists(pathHome):
os.makedirs(pathHome)
@@ -1036,7 +1041,7 @@
foundMountHome = self.isMount(pathHome ,"none",False)
domain = self.clVars.Get("cl_remote_host")
if not domain:
- self.printWARNING("The computer is not in domain")
+ self.printWARNING(_("The computer is not in domain"))
return True
if foundMountRemote:
textLineUmount = self.umountSleepPath(pathRemote)
@@ -1062,7 +1067,7 @@
# Наложим профили
dirsAndFiles = self.applyProfilesFromSystem()
if not dirsAndFiles:
- self.printERROR(_("Not apply 'install/domain' profiles"))
+ self.printERROR(_("Can not apply 'install/domain' profiles"))
return False
if not self.delDaemonAutostart("client"):
return False
@@ -1100,7 +1105,7 @@
# Наложим профили
dirsAndFiles = self.applyProfilesFromSystem()
if not dirsAndFiles:
- self.printERROR(_("Not apply 'install/client' profiles"))
+ self.printERROR(_("Can not apply 'install/client' profiles"))
return False
remoteHost = clVars.Get("cl_remote_host")
if remoteHost:
@@ -1132,7 +1137,7 @@
# Наложим профили
dirsAndFiles = self.applyProfilesFromSystem()
if not dirsAndFiles:
- self.printERROR(_("Not apply 'install/client' profiles"))
+ self.printERROR(_("Can not apply 'install/client' profiles"))
return False
if printSuccess:
self.printOK(messageOk)
@@ -1187,13 +1192,14 @@
foundMountRemote =self.isMount("/var/calculate/remote" ,"cifs")
foundMountHome =self.isMount("/var/calculate/client-home","none",False)
if foundMountRemote:
- self.printWARNING(_("Samba resource [remote] mount") + \
- " ...")
+ self.printWARNING(_("Samba resource [%s] is mount")%\
+ "remote" + " ...")
else:
if pwd:
userPwd = pwd
else:
- userPwd=self.getUserPassword("Domain password for the desktop")
+ userPwd=self.getUserPassword(\
+ _("Domain password for the desktop"))
pathRemote = "/var/calculate/remote"
pwdRemote = userPwd
if not os.path.exists(pathRemote):
@@ -1204,11 +1210,11 @@
//%s/remote %s" %(escPwdRemote,domain,pathRemote)
textLine = self.execProg(mountStr)
if not (textLine == None):
- self.printERROR(_("Can not mount Samba resource [remote]") + \
- " ...")
+ self.printERROR(_("Can not mount Samba resource [%s]")%\
+ "remote" + " ...")
return False
else:
- self.printSUCCESS(_("Mount Samba resource [remote]") + \
+ self.printSUCCESS(_("Mount Samba resource [%s]")%"remote" + \
" ...")
self.clVars.Write("cl_remote_host", domain, False, "local")
self.clVars.Write("cl_remote_pw", userPwd, False, "local")
@@ -1235,7 +1241,7 @@
bindPw = self.clVars.Get("ld_bind_pw")
# запишем их
if not (servDn and unixDN and bindDn and bindPw):
- self.printERROR(_("Not found variables:"))
+ self.printERROR(_("Not found variables") + ":")
self.printERROR("ld_services_dn or ld_unix_dn \
or ld_bind_dn or ld_bind_pw")
return False
@@ -1252,7 +1258,7 @@
# Наложим профили
dirsAndFiles = self.applyProfilesFromSystem()
if not dirsAndFiles:
- self.printERROR(_("Not apply 'install/domain' profiles"))
+ self.printERROR(_("Can not apply 'install/domain' profiles"))
return False
# Рестартуем dbus
self.restartDBus()
@@ -1312,7 +1318,7 @@
self.createClVars()
# В случае компьютера вне домена
if not self.clVars.Get("cl_remote_host"):
- self.printSUCCESS(_("To be used by local profile."))
+ self.printSUCCESS(_("To be used local profile."))
return True
connectDomain = self.isDomain()
if not connectDomain:
@@ -1320,7 +1326,7 @@
self.errorAndUnmountUserRes = True
return False
elif not connectDomain[0]:
- self.printERROR(_("Can not mount Samba resource [remote]") + \
+ self.printERROR(_("Can not mount Samba resource [%s]")%"remote"+\
" ...")
# Отмонтируем пользовательские ресурсы в случае ошибки
self.errorAndUnmountUserRes = True
@@ -1404,9 +1410,9 @@
# необходима ли синхронизация с локальным сервером
needSync = False
try:
- # если актуальный профиль хранистся не на локальном сервер
+ # если актуальный профиль хранится не на локальном сервере
# то на локальный сервер закачиваем профиль
- # так как даже если он будет поврежденные на другом серевер
+ # так как даже если он будет поврежден на другом сервере
# остаётся правильная копия
if not self.isCorrectProfileOnLocalServer(userName):
needSync = True
@@ -1459,10 +1465,10 @@
if flagError:
# Отмонтируем пользовательские ресурсы в случае ошибки
self.errorAndUnmountUserRes = True
- self.printERROR(_("Can not keep a user profile in the domain"))
+ self.printERROR(_("Can not save a user profile in the domain"))
return False
- self.printSUCCESS(_("Keep a user profile in the domain"))
- self.printOK(_("Umount user resource in domain") + " ...")
+ self.printSUCCESS(_("Saved a user profile in the domain"))
+ self.printOK(_("Umounted user resource in domain") + " ...")
return True
def umountUserResNoSync(self, userName, printError=True, printSuccess=True,
@@ -1481,7 +1487,7 @@
# В случае компьютера вне домена
if not self.clVars.Get("cl_remote_host"):
if printSuccess:
- self.printSUCCESS(_("To be used by local profile."))
+ self.printSUCCESS(_("To be used local profile."))
return True
# Подсоединяемся к серверу
domain = self.clVars.Get("cl_remote_host")
@@ -1536,7 +1542,7 @@
self.printERROR(_("Can not unmount user %s resource")%userName)
return False
if printSuccess:
- self.printOK(_("Umount user %s resources") %userName + " ...")
+ self.printOK(_("Umounted user %s resources") %userName + " ...")
return True
def isSessionUser(self, userName):
@@ -1652,7 +1658,7 @@
self.createClVars()
# В случае компьютера вне домена
if not self.clVars.Get("cl_remote_host"):
- self.printSUCCESS(_("To be used by local profile."))
+ self.printSUCCESS(_("To be used local profile."))
return True
# Проверим что компьютер в домене и смонтирован [remote]
connectDomain = self.isDomain()
@@ -1661,7 +1667,7 @@
self.errorAndUnmountUserRes = True
return False
elif not connectDomain[0]:
- self.printERROR(_("Can not mount Samba resource [remote]") + \
+ self.printERROR(_("Can not mount Samba resource [%s]")%"remote"+ \
" ...")
# Отмонтируем пользовательские ресурсы в случае ошибки
self.errorAndUnmountUserRes = True
@@ -1712,7 +1718,7 @@
pathReplRun = ""
# Путь к профилю пользователя по умолчанию
defaultPath = ""
- # Ност пользователя по умолчанию
+ # Хост пользователя по умолчанию
defaultHost = self.clVars.Get("cl_remote_host")
for path, res in pathRemote:
# Создаем директории для монтирования
@@ -1930,8 +1936,8 @@
else:
self.createUserFile(logOutFile,"SUCCESS", uid, gid)
- self.printSUCCESS(_("Mount user resource in domain"))
- self.printOK(_("Get a user profile in the domain") + " ...")
+ self.printSUCCESS(_("Mounted user resource of the domain"))
+ self.printOK(_("Get a user profile from the domain") + " ...")
return True
def mountSleepRes(self,userName,userPwd,uid,gid,res,path):
@@ -2000,13 +2006,13 @@
execStr = "cp -r '%s' '%s'" %(fd, movedPath)
textLine = self.execProg(execStr)
if not (textLine == None):
- self.printERROR(_("Can not exec ") + " " + str(execStr) +\
+ self.printERROR(_("Can not exec") + " " + str(execStr) +\
" ...")
return False
execStr = "rm -rf '%s'" %fd
textLine = self.execProg(execStr)
if not (textLine == None):
- self.printERROR(_("Can not exec ") + " " + str(execStr) +\
+ self.printERROR(_("Can not exec") + " " + str(execStr) +\
" ...")
return False
os.chdir(pathProg)
@@ -2027,7 +2033,7 @@
if not os.path.exists(userDir):
self.printERROR(_("Path %s not exists") %userDir)
return False
- fd = os.open(fileName, os.O_CREAT)
+ fd = os.open(fileName, os.O_CREAT|os.O_TRUNC)
os.close(fd)
os.chmod(fileName, mode)
os.chown(fileName,uid,gid)
@@ -2230,7 +2236,7 @@
os.chown(configFileName,uid,gid)
except:
pass
- self.printERROR(_("Can not rsync") + " " + str(sync) +\
+ self.printERROR(_("Can not execute rsync") + " " + str(sync) +\
" ...")
flagError = True
else:

@ -1,33 +0,0 @@
diff -ruN calculate-client-2.0.18.orig/README calculate-client-2.0.18/README
--- calculate-client-2.0.18.orig/README 2009-03-13 13:53:40.844361000 +0300
+++ calculate-client-2.0.18/README 2009-06-05 09:14:45.476897000 +0400
@@ -7,7 +7,7 @@
Python >= 2.3
python-ldap >= 2.0.0
pyxml >= 0.8
- calculate-lib >= 2.0.12
+ calculate-lib >= 2.0.16
To install calculate-client , just execute the install script 'setup.py'.
Example:
diff -ruN calculate-client-2.0.18.orig/profile/CLD/single/.kde4/share/config/plasma-appletsrc calculate-client-2.0.18/profile/CLD/single/.kde4/share/config/plasma-appletsrc
--- calculate-client-2.0.18.orig/profile/CLD/single/.kde4/share/config/plasma-appletsrc 2009-06-01 09:31:24.688354000 +0400
+++ calculate-client-2.0.18/profile/CLD/single/.kde4/share/config/plasma-appletsrc 2009-06-05 10:21:35.715200000 +0400
@@ -75,7 +75,7 @@
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
Url=file:///home/#-ur_login-#/FTP
#cl_remote_host#
-#?cl_remote_ftp=#
+#?cl_remote_ftp==#
[Containments][#-sum(cont,cont)-#][Applets][!#-sum(app,app+1)-#]
#cl_remote_ftp#
@@ -176,7 +176,7 @@
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
Url=file:///home/#-ur_login-#/FTP
#cl_remote_host#
-#?cl_remote_ftp=#
+#?cl_remote_ftp==#
[Containments][#-sum(cont,cont)-#][Applets][!#-sum(app,app+1)-#]
#cl_remote_ftp#

@ -1,23 +1,3 @@
DIST calculate-lib-2.0.10.tar.bz2 49431 RMD160 3cbc81aceca77c23692ba20580320a59c7cd11fe SHA1 1508b7f3e85b27d6289d3da6b55dc8688fc28a28 SHA256 3eccd33001bdb7701d5bfb86916eba0cec55ff7472a245fc72a7b1823dedcbb7
DIST calculate-lib-2.0.11.tar.bz2 49438 RMD160 a9e6b742336adc7abf4a4c03106bf064be62c384 SHA1 df96d2d993c0639f2f8ef224f480e419c15a0309 SHA256 0eb6d9c05830466a081e2019157486f1a5b50916a67eea6dd793034dc7067891
DIST calculate-lib-2.0.12.tar.bz2 49686 RMD160 df34e5e5b11f6ebd34e3a5f815178eefca6444ee SHA1 0f651fd52deeb668e4e0c60cc05f9f5804c6b239 SHA256 b450b9ad8d1becc2b94ee2f6688eea6e4d5ff2b95d0139f92bd950294ca5efb0
DIST calculate-lib-2.0.13.tar.bz2 49807 RMD160 d55c1a522b93cca1c0d5436736dea855175573f3 SHA1 7323ff0ca7cf833f52800dd1601aa0dd636f00e9 SHA256 7fba0458d268834f34ab4eed90eac95f35fa615d82eb14c4a9f65639a7d78f15
DIST calculate-lib-2.0.14.tar.bz2 50027 RMD160 30feb3174358e753a6145ca064b83bcc8b46a0d1 SHA1 6de9f48ff48193d68513055da4dce1bfd80184e6 SHA256 31111c6f6d21a0c9683bf72b086d8c882564d574bed8b652d20c61d94b2d271c
DIST calculate-lib-2.0.15.tar.bz2 52329 RMD160 0300625f9243d0f0ba6ff7ae85b219c3c04ef1a0 SHA1 f5faaaa896f828cb5bff38b1f6c5dc0b529b3ad3 SHA256 dff95a1062fb5d0100bea93914180b99c1c992ac0058150387042896787cd13f
DIST calculate-lib-2.0.16.tar.bz2 53132 RMD160 67175735b351e9808ca4803036f6ab157bc15970 SHA1 0f92bad8123d443af8e748be054d4f41e457929f SHA256 c7a06a4e353e472760232eb51ff4aa76a916c0e859d07d6ac44ccda5efdc0bba
DIST calculate-lib-2.0.8.tar.bz2 48765 RMD160 f096963f39b0f204b0e901d6e1468059b4749767 SHA1 17699710253f21dc6c99386e65d757999aa272f1 SHA256 b144b46d2807763d5e4da0c9e7a1bdc6ff4ae0989942ba38dfd8b3fae29afe84
DIST calculate-lib-2.0.9.tar.bz2 49446 RMD160 dd0833561f775e55a8d0d01d9e9d752a1c51a68b SHA1 7cc1002fd7cffc104542825b7eb027f47bc713c4 SHA256 fe09066738efc7f1896822a756f2ca022f75d0d55b3670f4a7d6894cda06e807
DIST calculate-lib-2.1.0.tar.bz2 55868 RMD160 c7c679ee793742f2839f5222a8479ace5c4331b3 SHA1 6fdffe5d1e007ba3dffdb44f190a84b3eee30653 SHA256 3dea4b3bb573ed6e75856cb66a6d713c725a28cd1e732afcd5eb8e3e5fe7faf3
DIST calculate-lib-2.1.1.tar.bz2 55853 RMD160 3007384d0a63881a08cd988348920f3e22dcaa8b SHA1 cc9a2a137ba680c2b223d392ceea8b79cc9fbd6d SHA256 5bf5e38ac8908e42d343d865761da3809c1f6884d654b5ee178aa443fe1b491f
EBUILD calculate-lib-2.0.10.ebuild 705 RMD160 8c3da5f3fdbf3f59046d8837a9f7e0f8a3fde43d SHA1 d598585a9ee7ffca9be8af767d8b777b2260f09b SHA256 137f0c0590cce4a6dd4f28c8bc3b01f1f17cee4b58d456791ca70cba6d9ebb26
EBUILD calculate-lib-2.0.11.ebuild 705 RMD160 cfbb189de5bd0b1c9929b047b3dde25774101475 SHA1 ff2c72091428521cb22079c6f376e4fc7fed2ba1 SHA256 e54159741d027dd8de30dd7eafbb30ae4f871c0ce1926684402210058969d588
EBUILD calculate-lib-2.0.12.ebuild 705 RMD160 d5c7310e88cca7ed8be277645b5c9fc71d70bc90 SHA1 6642ba3dd0310d1da7dcc9fdd63d60c9cadf4bed SHA256 4f4251f53408966144b4aed8f05db45ffb80a5de63c831c9b0a3906b654a0edf
EBUILD calculate-lib-2.0.13.ebuild 731 RMD160 ba3a4a7324634d4269a05062a8fe6de3f0dcbbe0 SHA1 0b05160482331b73aa129ede9f0f2c7d3394aa88 SHA256 53f01b581d6cb5867e250726fd5868a75dec7d1fb92cae50944a730e5b7b0f94
EBUILD calculate-lib-2.0.14.ebuild 586 RMD160 b90ca6695c05e9aa9beb78f811389cf4da08148e SHA1 d37e5e8a100ed86a05f88705af66d0fa2573bb8f SHA256 8266a0bf75d6da04fef0d61af831d6c5f807270484631f68341edd0144c61b67
EBUILD calculate-lib-2.0.15.ebuild 586 RMD160 2a7c5b3b8a3d177095d83ff1cfeeacae692d06f4 SHA1 ea6b2fdd85189cf1af446705d4050a6b69ac3160 SHA256 11069bf2bb0f312ff4459bee2f138501a4f2ee0fe0f936010718b72760bd9c88
EBUILD calculate-lib-2.0.16.ebuild 586 RMD160 89017ba4ce6e3762a0e1b08773fc8c9b216783d9 SHA1 9e28ad4436e1a41a0913f402e4cbbd1eeb8f6b7e SHA256 007c51f4cf244c4df1b1cc17aeeaaec42c7a564d1adbd072fbd7e78a7a6d425e
EBUILD calculate-lib-2.0.8-r1.ebuild 705 RMD160 013a86c863d6da808c55e43c99152c1fa812945d SHA1 943b85014982635a3b5697426c7607cefddac075 SHA256 f97867412984b29024368d8b4f304a43348be6d00e5c1a26a882e5c690a273d6
EBUILD calculate-lib-2.0.9-r1.ebuild 787 RMD160 5a6b258f50e87929decd85b073d76c7f000f9297 SHA1 7e1c42e877d8e1ffb0a7677b15d65c4081fb6f5a SHA256 be80b7b6da32f1222ab97bb05769acb5a024755a07675f647633faea9c2ca54f
EBUILD calculate-lib-2.1.0.ebuild 584 RMD160 1168e271573ae29d5ffbf1415829715d802f3e99 SHA1 930065f8f109d55eb376c6d7ef967236c40b6c0e SHA256 c4d60b287dee8d5a6b828e8ecb05e78989ca0364bd01f8c752beacd3050fcb5a
EBUILD calculate-lib-2.1.1.ebuild 582 RMD160 62b203ff6b4972b7aaa7d4ed53ea999483fc532c SHA1 5c78330c5189fd9372c7cd2397e89f4867449de6 SHA256 f83047fed839b20114c5300b7536f7f499f77b590d4a082a0a86f4c3e5244fd7
EBUILD calculate-lib-9999.ebuild 464 RMD160 e0ddc557b2d985343632a0586809706ff7f145e0 SHA1 fffc3d64f1604b721452e4c81da0ea1ee21b06ec SHA256 20648bf0c62a41342486184e4763c6d32f97d24598a70d58c2943c5f5eed8de0

@ -1,21 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
SRC_URI="ftp://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
http://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.ru/Calculate_2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="!<sys-apps/calculate-client-2.0.13
!<sys-apps/calculate-server-2.0.7
>=dev-python/python-ldap-2.0[ssl]
>=dev-python/pyxml-0.8"

@ -1,21 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
SRC_URI="ftp://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
http://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.ru/Calculate_2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="!<sys-apps/calculate-client-2.0.14
!<sys-apps/calculate-server-2.0.7
>=dev-python/python-ldap-2.0[ssl]
>=dev-python/pyxml-0.8"

@ -1,21 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
SRC_URI="ftp://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
http://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.ru/Calculate_2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="!<sys-apps/calculate-client-2.0.15
!<sys-apps/calculate-server-2.0.8
>=dev-python/python-ldap-2.0[ssl]
>=dev-python/pyxml-0.8"

@ -1,22 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
SRC_URI="ftp://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
http://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.ru/Calculate_2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="!<sys-apps/calculate-client-2.0.15
!<sys-apps/calculate-server-2.0.9
>=dev-lang/python-2.5.2
>=dev-python/python-ldap-2.0[ssl]
>=dev-python/pyxml-0.8"

@ -1,21 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.ru/Calculate_2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="!<sys-apps/calculate-client-2.0.16
!<sys-apps/calculate-server-2.0.9
>=dev-lang/python-2.5.2
>=dev-python/python-ldap-2.0[ssl]
>=dev-python/pyxml-0.8"

@ -1,20 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.ru/Calculate_2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="!<sys-apps/calculate-client-2.0.17
!<sys-apps/calculate-server-2.0.12
>=dev-lang/python-2.5.2
>=dev-python/python-ldap-2.0[ssl]
>=dev-python/pyxml-0.8"

@ -1,20 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.ru/Calculate_2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="!<sys-apps/calculate-client-2.0.18
!<sys-apps/calculate-server-2.0.12
>=dev-lang/python-2.5.2
>=dev-python/python-ldap-2.0[ssl]
>=dev-python/pyxml-0.8"

@ -1,21 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
SRC_URI="ftp://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
http://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.ru/Calculate_2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="!<sys-apps/calculate-client-2.0.10
!<sys-apps/calculate-server-2.0.6
>=dev-python/python-ldap-2.0[ssl]
>=dev-python/pyxml-0.8"

@ -1,22 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
SRC_URI="ftp://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
http://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/calculate2/${PN}/${P}.tar.bz2
ftp://ftp.calculate-linux.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.ru/Calculate_2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="!<sys-apps/calculate-client-2.0.12
!<sys-apps/calculate-server-2.0.6
>=dev-python/python-ldap-2.0[ssl]
>=dev-python/pyxml-0.8"

@ -1,20 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.ru/Calculate_2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="!<sys-apps/calculate-client-2.1.0
!<sys-apps/calculate-server-2.1.0
>=dev-lang/python-2.5.2
>=dev-python/python-ldap-2.0[ssl]
>=dev-python/pyxml-0.8"

@ -1,26 +1,4 @@
AUX bugfix-2.0.12-r2.patch 1816 RMD160 1a8cafa690a45724b6efca1f9bee3fa9e3e825f6 SHA1 eb4e95b0e5ebbe2f70a58b9a47b9d7039499e234 SHA256 79edef345809316faadc8de00f6456100756c426237c46f62aba08c32e6955d4
AUX bugfix-r1.patch 15315 RMD160 d1b98e91a9d74a9405ac239b7f65278795d5a4e5 SHA1 f51165d6e7a6053cb6139737525a33e40e73020b SHA256 c24009d5dce14fdd4b1ab34a3e3eebadf7818a154fb4dd08cff75684fefefc18
DIST calculate-server-2.0.10.tar.bz2 95013 RMD160 c72ff97a2a9a44ae3e8c661dba49e57c3c917b64 SHA1 2aaffdc9ce0d8405b6ddd8b8ff381518e49dea3d SHA256 2dfbf3704c20efb7e7d4854627213249002f6a51e292dfb9cc486c98b93f32e6
DIST calculate-server-2.0.11.tar.bz2 95097 RMD160 7081d2d84cb32bb4d227a520cab86d18d9f4e942 SHA1 e2540fd62d7331d53a69f9dbb0175622754ca962 SHA256 ebd6972ac791c0078061c6278c3002eceb097a666f76158657fc4e83703da96c
DIST calculate-server-2.0.12.tar.bz2 100300 RMD160 3545ba8a32bd0876efd6214248906b4085003578 SHA1 4a4d8ab85cbfcf194a714a4c8dec875c851c96b5 SHA256 51b1acd1b82e9da1bc86e4fd83862389ceef365840f9d7fe6932e714feec1795
DIST calculate-server-2.0.6.tar.bz2 67671 RMD160 0e065a7c0fc54f18c22dc88c379bfeda954402ff SHA1 d6c914daa15d9d9482f62f63c275690d1473bc98 SHA256 e86cc9f0c6756bd7043834bf74cc484d715e364d92e076d5ca39bcdbef59f4f3
DIST calculate-server-2.0.7.tar.bz2 78994 RMD160 bc30817790120f48ede32a5a65fd3fb69d7ad5c9 SHA1 6b67921a05eeb4c5625a59012c0feb4daf143f78 SHA256 750d7731052300038b259ad94f6190bbb3e75f70b25f63d918cc3a2f74ae800f
DIST calculate-server-2.0.8.tar.bz2 81329 RMD160 321e13492e60b3cf963c9c56c56d820696f380b4 SHA1 140f822a929611e8bd9cd7ac25feccb873d0b5b7 SHA256 31b3024aae6f02edb57557403604b02266276593722f977eca3ce7152a612806
DIST calculate-server-2.0.9.tar.bz2 88531 RMD160 4bb8811f2170571b243be149d9be2294339ec11b SHA1 7c0185d86dc669c5dc22a55e4efb832b6fea07e3 SHA256 bf7d3c67250a7a2c215d8d81c36c423b5a7c2e222d40ae247797086ceca0e5dd
DIST calculate-server-2.1.0.tar.bz2 106102 RMD160 4606b0a9991c5c6774118ed5346577ea1f5b1495 SHA1 f67b5c5540bd25f0e04e6cf033ece7f8be000a49 SHA256 3049023d0f05365d2a575e1df9056a6fd4ac8299ac7937e6ce5f6d0cce826915
DIST calculate-server-2.1.1.tar.bz2 106245 RMD160 47094ec7dcfe706f5b87ad218fbba9436678f41a SHA1 3a174de783281a42838caa54b29d179fe43b26b3 SHA256 5a93d5813a0f07f1afb636610e6f80f5dd54934ac2b494c5c268ec4d43e66c17
DIST calculate-server-2.1.2.tar.bz2 106650 RMD160 7707f81a3af840b3475aee8c3f41c73546bbc00a SHA1 74553eefaab44d11c165716b075de66227d23f11 SHA256 a1f3ac6e20c55635807a892ae363a22810a292b14cb18c5a2e00929f28edee41
DIST calculate-server-2.1.3.tar.bz2 106639 RMD160 8c64ce72ecfef31bb9cd27b734404d2791be1612 SHA1 3a85f7c46898558ee409945fa0395eca9d2e1678 SHA256 23ac39cca24528350809cc3b127ea954ea2549363b446ccaa4ad0b867d57873d
EBUILD calculate-server-2.0.10.ebuild 4613 RMD160 1de4323ea8e1e98f204097e6f33c904f2ef7939c SHA1 622469f012a6b223f42f51e27a26ab5811220039 SHA256 3000e3f2df7ed9ea9a338c0301502f6a3176d73f5f396b8e8d8714b33741c448
EBUILD calculate-server-2.0.11.ebuild 4612 RMD160 213637eced6fb1959436ef356949e00957860c63 SHA1 3d26b37d28179d6d233d9c4173da1eb7a16b54e8 SHA256 ef3d17d143b1b7ea16dd4f3c6805181928ec23d0ab1d7be34014f28572ceda6c
EBUILD calculate-server-2.0.12-r2.ebuild 4927 RMD160 00afe40c4a61503f94e389d6700c89fe1ad2c86a SHA1 75fa29896fed952548bf336c9dae4abe0aaa17cc SHA256 4c883f9094aaee71e5931efe4e063684714ffa07962519bfefb6253fcdc78cf2
EBUILD calculate-server-2.0.6-r1.ebuild 4766 RMD160 7a33f101dc1e6b60d38f255550815cf2f3a921bf SHA1 6b6fa8a64afd6a3a3e9ac0b2512d8998b9343375 SHA256 85cee081c9f0f251667b31d9cba8e9b9a8f7b4eebc073b76d341479e9f813572
EBUILD calculate-server-2.0.7.ebuild 4764 RMD160 243b4926e9beaf2d5cf45338eddab07df5c3a1dc SHA1 27666ef42e4b0dff1c4a1cd086d1a74f579ab5e3 SHA256 c23af116ad636ac237f4b48fe6f817803b12a536fb55e5ae7a11c0abc4d88e0d
EBUILD calculate-server-2.0.8-r1.ebuild 4864 RMD160 b32b7c9d94884208048428b0e33303e3ad89b91d SHA1 ebe258f64c2e6dc9964f6058328f4e2377d13fc7 SHA256 346c0a0b39dd0104f695d7b764de0d1d15caaf37c4eb8b81c3869a0ad062a3f1
EBUILD calculate-server-2.0.9.ebuild 4764 RMD160 3e07eacdf549e8435e6e527296f404409cd9be91 SHA1 fab65aab084048fd444d25116839ee01eda45f71 SHA256 2c6de1d3381dda97f8cc973c5bf0a04a4b83745404e41671fee7830f74f44a4d
EBUILD calculate-server-2.1.0-r1.ebuild 4821 RMD160 33b76d580979facf4e511ac6594a5df9bac4c228 SHA1 866f2f5a3ae7e2e20a5b34365e17dd700dbdd3f7 SHA256 a09e3362e3f77d23638ab4bc864d204b2de88acd10e55cfa49c5044e5f5ca26c
EBUILD calculate-server-2.1.1.ebuild 4821 RMD160 33b76d580979facf4e511ac6594a5df9bac4c228 SHA1 866f2f5a3ae7e2e20a5b34365e17dd700dbdd3f7 SHA256 a09e3362e3f77d23638ab4bc864d204b2de88acd10e55cfa49c5044e5f5ca26c
EBUILD calculate-server-2.1.2.ebuild 4821 RMD160 33b76d580979facf4e511ac6594a5df9bac4c228 SHA1 866f2f5a3ae7e2e20a5b34365e17dd700dbdd3f7 SHA256 a09e3362e3f77d23638ab4bc864d204b2de88acd10e55cfa49c5044e5f5ca26c
EBUILD calculate-server-2.1.3.ebuild 4852 RMD160 8904b55da5065c31db856f4a531c5e83ff0f1b9e SHA1 1d71cb60c1864adeaaae9736f2fdb674ff67c421 SHA256 b47668a854c3716e51e8ab29e9e026129db2cc609837e941f74bbe9e194bb946
EBUILD calculate-server-9999.ebuild 875 RMD160 2f80b904339e5e5b20d98c03776be99c4856d552 SHA1 1ad9f97aba8c815ab713d93bfc4ce2eb8e8cd887 SHA256 ae3738ddb2c18dd351bb2a0c7687aae2174673a97afbbf6493450ebcdfc0eeac
MISC ChangeLog 249 RMD160 dc9ee0a6b94f9087b7328928681afa173b793232 SHA1 0f72a9e2568f517c0728980b30ca14319da82e47 SHA256 75c0a2ce18c083706d73bc85c748a3d2626b236218aed60fc4afae5b959de8bd

@ -1,146 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
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.ru/Calculate_2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="=sys-apps/calculate-lib-2.0.14
>=net-nds/openldap-2.3[-minimal]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=net-fs/samba-3.0[acl,cups,kernel_linux,ldap,pam]
>=net-mail/dovecot-1.0[pop3d,ldap,pam,ssl]
>=net-im/calculate-ejabberd-2.0.2[ldap,pam,ssl,zlib]
>=mail-mta/postfix-2.2[ldap,pam,ssl]
>=net-ftp/proftpd-1.3.1[-acl,ldap,ncurses,nls,pam,radius,ssl,tcpd]
>=mail-filter/procmail-3.22"
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
}

@ -1,145 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
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.ru/Calculate_2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="=sys-apps/calculate-lib-2.0.14
>=net-nds/openldap-2.3[-minimal]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=net-fs/samba-3.0[acl,cups,kernel_linux,ldap,pam]
>=net-mail/dovecot-1.0[pop3d,ldap,pam,ssl]
>=net-im/calculate-ejabberd-2.0.2[ldap,pam,ssl,zlib]
>=mail-mta/postfix-2.2[ldap,pam,ssl]
>=net-ftp/proftpd-1.3.1[-acl,ldap,ncurses,nls,pam,radius,ssl,tcpd]
>=mail-filter/procmail-3.22"
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
}

@ -1,159 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
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.ru/Calculate_2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="=sys-apps/calculate-lib-2.0.14
>=net-nds/openldap-2.3[-minimal]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=net-fs/samba-3.0[acl,cups,kernel_linux,ldap,pam]
>=net-mail/dovecot-1.0[pop3d,ldap,pam,ssl]
>=net-im/calculate-ejabberd-2.0.2[ldap,pam,ssl,zlib]
>=mail-mta/postfix-2.2[ldap,pam,ssl]
>=net-ftp/proftpd-1.3.1[-acl,ldap,ncurses,nls,pam,radius,ssl,tcpd]
>=mail-filter/procmail-3.22"
src_unpack() {
unpack ${A}
cd "${S}"
# Fixed bug - when adding a user with an indication of jabber ID
epatch "${FILESDIR}/bugfix-${PVR}.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 use samba or jabber services, then need update them"
ewarn "by commands:"
ewarn "\tcl-update samba"
ewarn "\tcl-update jabber"
}

@ -1,147 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
SRC_URI="ftp://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
http://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program for configuring services Linux"
HOMEPAGE="http://www.calculate-linux.ru/Calculate_2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="=sys-apps/calculate-lib-2.0.8-r1
>=net-nds/openldap-2.3[-minimal]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=net-fs/samba-3.0[acl,cups,kernel_linux,ldap,pam]
>=net-mail/dovecot-1.0[pop3d,ldap,pam,ssl]
>=net-im/calculate-ejabberd-2.0.2[ldap,pam,ssl,zlib]
>=mail-mta/postfix-2.2[ldap,pam,ssl]
>=net-ftp/proftpd-1.3.1[-acl,ldap,ncurses,nls,pam,radius,ssl,tcpd]
>=mail-filter/procmail-3.22"
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
}

@ -1,147 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
SRC_URI="ftp://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
http://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program for configuring services Linux"
HOMEPAGE="http://www.calculate-linux.ru/Calculate_2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="=sys-apps/calculate-lib-2.0.10
>=net-nds/openldap-2.3[-minimal]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=net-fs/samba-3.0[acl,cups,kernel_linux,ldap,pam]
>=net-mail/dovecot-1.0[pop3d,ldap,pam,ssl]
>=net-im/calculate-ejabberd-2.0.2[ldap,pam,ssl,zlib]
>=mail-mta/postfix-2.2[ldap,pam,ssl]
>=net-ftp/proftpd-1.3.1[-acl,ldap,ncurses,nls,pam,radius,ssl,tcpd]
>=mail-filter/procmail-3.22"
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
}

@ -1,155 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
SRC_URI="ftp://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
http://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program for configuring services Linux"
HOMEPAGE="http://www.calculate-linux.ru/Calculate_2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="=sys-apps/calculate-lib-2.0.12
>=net-nds/openldap-2.3[-minimal]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=net-fs/samba-3.0[acl,cups,kernel_linux,ldap,pam]
>=net-mail/dovecot-1.0[pop3d,ldap,pam,ssl]
>=net-im/calculate-ejabberd-2.0.2[ldap,pam,ssl,zlib]
>=mail-mta/postfix-2.2[ldap,pam,ssl]
>=net-ftp/proftpd-1.3.1[-acl,ldap,ncurses,nls,pam,radius,ssl,tcpd]
>=mail-filter/procmail-3.22"
src_unpack() {
unpack ${A}
cd "${S}"
# delete a option
epatch "${FILESDIR}/bugfix-r1.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
}

@ -1,147 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
SRC_URI="ftp://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
http://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2
ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program for configuring services Linux"
HOMEPAGE="http://www.calculate-linux.ru/Calculate_2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="=sys-apps/calculate-lib-2.0.13
>=net-nds/openldap-2.3[-minimal]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=net-fs/samba-3.0[acl,cups,kernel_linux,ldap,pam]
>=net-mail/dovecot-1.0[pop3d,ldap,pam,ssl]
>=net-im/calculate-ejabberd-2.0.2[ldap,pam,ssl,zlib]
>=mail-mta/postfix-2.2[ldap,pam,ssl]
>=net-ftp/proftpd-1.3.1[-acl,ldap,ncurses,nls,pam,radius,ssl,tcpd]
>=mail-filter/procmail-3.22"
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
}

@ -1,151 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
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.ru/Calculate_2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="=sys-apps/calculate-lib-2.1.0
>=net-nds/openldap-2.3[-minimal]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
=net-fs/samba-3.0*[acl,cups,kernel_linux,ldap,pam]
>=net-mail/dovecot-1.0[pop3d,ldap,pam,ssl]
>=net-im/calculate-ejabberd-2.0.2[ldap,pam,ssl,zlib]
>=mail-mta/postfix-2.2[ldap,pam,ssl]
>=net-ftp/proftpd-1.3.1[-acl,ldap,ncurses,nls,pam,radius,ssl,tcpd]
>=mail-filter/procmail-3.22"
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 are updating calculate-server from version"
ewarn "less 2.0.12, you need update samba and jabber services by commands:"
ewarn "\tcl-update samba"
ewarn "\tcl-update jabber"
}

@ -1,151 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
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.ru/Calculate_2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="=sys-apps/calculate-lib-2.1.0
>=net-nds/openldap-2.3[-minimal]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
=net-fs/samba-3.0*[acl,cups,kernel_linux,ldap,pam]
>=net-mail/dovecot-1.0[pop3d,ldap,pam,ssl]
>=net-im/calculate-ejabberd-2.0.2[ldap,pam,ssl,zlib]
>=mail-mta/postfix-2.2[ldap,pam,ssl]
>=net-ftp/proftpd-1.3.1[-acl,ldap,ncurses,nls,pam,radius,ssl,tcpd]
>=mail-filter/procmail-3.22"
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 are updating calculate-server from version"
ewarn "less 2.0.12, you need update samba and jabber services by commands:"
ewarn "\tcl-update samba"
ewarn "\tcl-update jabber"
}

@ -1,151 +0,0 @@
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
inherit distutils
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.ru/Calculate_2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="=sys-apps/calculate-lib-2.1.0
>=net-nds/openldap-2.3[-minimal]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
=net-fs/samba-3.0*[acl,cups,kernel_linux,ldap,pam]
>=net-mail/dovecot-1.0[pop3d,ldap,pam,ssl]
>=net-im/calculate-ejabberd-2.0.2[ldap,pam,ssl,zlib]
>=mail-mta/postfix-2.2[ldap,pam,ssl]
>=net-ftp/proftpd-1.3.1[-acl,ldap,ncurses,nls,pam,radius,ssl,tcpd]
>=mail-filter/procmail-3.22"
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 are updating calculate-server from version"
ewarn "less 2.0.12, you need update samba and jabber services by commands:"
ewarn "\tcl-update samba"
ewarn "\tcl-update jabber"
}

@ -1,39 +0,0 @@
diff -ruN calculate-server-2.0.12.orig/ldif/jabber_user.ldif calculate-server-2.0.12/ldif/jabber_user.ldif
--- calculate-server-2.0.12.orig/ldif/jabber_user.ldif 2009-05-08 18:58:37.000000000 +0400
+++ calculate-server-2.0.12/ldif/jabber_user.ldif 2009-05-14 11:18:45.000000000 +0400
@@ -2,7 +2,7 @@
dn: uid=#-ur_name-#,ou=Users,#-ld_jabber_dn-#
objectClass: inetOrgPerson
uid: #-ur_name-#
-cn: #-ur_name-#
+cn: #-sr_jabber_user_name-#
sn: #-ur_fio-#
mail: #-sr_jabber_user_id-#
initials: Yes
diff -ruN calculate-server-2.0.12.orig/pym/cl_fill_server.py calculate-server-2.0.12/pym/cl_fill_server.py
--- calculate-server-2.0.12.orig/pym/cl_fill_server.py 2009-05-08 17:47:18.000000000 +0400
+++ calculate-server-2.0.12/pym/cl_fill_server.py 2009-05-14 11:18:45.000000000 +0400
@@ -509,3 +509,10 @@
if jabberHosts:
return ", ".join(map(lambda x: '"'+x+'"', jabberHosts.split(",")))
return ""
+
+ def get_sr_jabber_user_name(self):
+ """Имя jabber пользователя (левая часть jabber id)"""
+ userJid = self.Get("sr_jabber_user_id")
+ if userJid:
+ return userJid.partition('@')[0]
+ return ""
diff -ruN calculate-server-2.0.12.orig/pym/cl_vars_server.py calculate-server-2.0.12/pym/cl_vars_server.py
--- calculate-server-2.0.12.orig/pym/cl_vars_server.py 2009-05-08 17:47:18.000000000 +0400
+++ calculate-server-2.0.12/pym/cl_vars_server.py 2009-05-14 13:07:55.000000000 +0400
@@ -154,6 +154,9 @@
# jabber id пользователя
sr_jabber_user_id = {'mode':"w"}
+ # имя jabber пользователя (левая часть jabber id)
+ sr_jabber_user_name = {'mode':"w"}
+
# шифрование при получении - ''/ssl
sr_jabber_crypt = {'mode':"w",'value':'ssl'}

@ -1,303 +0,0 @@
diff -ruN calculate-server-2.0.8.orig/pym/cl_ldap.py calculate-server-2.0.8/pym/cl_ldap.py
--- calculate-server-2.0.8.orig/pym/cl_ldap.py 2009-03-17 14:29:08.000000000 +0300
+++ calculate-server-2.0.8/pym/cl_ldap.py 2009-03-30 17:44:42.000000000 +0400
@@ -393,8 +393,9 @@
def runLdapServer(self):
"""Запускает LDAP сервер"""
- textLine = self.execProg("/etc/init.d/slapd start")
- if "ok" in textLine:
+ textLines = self.execProg("/etc/init.d/slapd start", False, False)
+ if textLines and type(textLines) == types.ListType and\
+ "ok" in textLines[-1] or textLines and "ok" in textLines:
return True
else:
self.printNotOK(_("Starting LDAP")+ " ...")
@@ -402,8 +403,9 @@
def restartLdapServer(self):
"""Запускает LDAP сервер"""
- textLine = self.execProg("/etc/init.d/slapd restart")
- if "ok" in textLine:
+ textLines = self.execProg("/etc/init.d/slapd restart", False, False)
+ if textLines and type(textLines) == types.ListType and\
+ "ok" in textLines[-1] or textLines and "ok" in textLines:
return True
else:
self.printNotOK(_("Restarting LDAP")+ " ...")
@@ -411,8 +413,9 @@
def stopLdapServer(self):
"""Останавливает LDAP сервер"""
- textLine = self.execProg("/etc/init.d/slapd stop")
- if "ok" in textLine:
+ textLines = self.execProg("/etc/init.d/slapd stop", False, False)
+ if textLines and type(textLines) == types.ListType and\
+ "ok" in textLines[-1] or textLines and "ok" in textLines:
#self.printOK(_("LDAP stop")+ " ...")
return True
else:
@@ -498,8 +501,10 @@
flagError = False
for daemon in daemons:
if not self.getRunDaemons([daemon]):
- textLine = self.execProg("/etc/init.d/%s start" %(daemon))
- if not ("ok" in textLine):
+ textLines = self.execProg("/etc/init.d/%s start" %(daemon),
+ False, False)
+ if not (textLines and type(textLines) == types.ListType and\
+ "ok" in textLines[-1] or textLines and "ok" in textLines):
self.printERROR( _("Daemon %s was not started") %daemon)
flagError = True
break
@@ -581,23 +586,32 @@
flagLdap = True
elif service == "mail":
if self.getRunDaemons(["postfix"]):
- textLine = self.execProg("/etc/init.d/postfix stop")
- if not ("ok" in textLine):
+ textLines = self.execProg("/etc/init.d/postfix stop", False,
+ False)
+ if not (textLines and type(textLines) == types.ListType\
+ and "ok" in textLines[-1] or textLines and\
+ "ok" in textLines):
self.printERROR( "Postfix" + " " +
_("service is not stopped"))
flagError = True
break
if self.getRunDaemons(["dovecot"]):
- textLine = self.execProg("/etc/init.d/dovecot stop")
- if not ("ok" in textLine):
+ textLines = self.execProg("/etc/init.d/dovecot stop", False,
+ False)
+ if not (textLines and type(textLines) == types.ListType and\
+ "ok" in textLines[-1] or textLines and\
+ "ok" in textLines):
self.printERROR(str("Dovecot") + " " +
_("service is not stopped"))
flagError = True
break
elif service == "jabber":
if self.getRunService("jabber"):
- textLine = self.execProg("/etc/init.d/ejabberd stop")
- if not ("ok" in textLine):
+ textLines = self.execProg("/etc/init.d/ejabberd stop",False,
+ False)
+ if not (textLines and type(textLines) == types.ListType and\
+ "ok" in textLines[-1] or textLines and\
+ "ok" in textLines):
self.printERROR( "Ejabberd" + " " +
_("service is not stopped"))
flagError = True
@@ -616,24 +630,30 @@
break
elif service == "ftp":
if self.getRunDaemons(["proftpd"]):
- textLine = self.execProg("/etc/init.d/proftpd stop")
- if not ("ok" in textLine):
+ textLines = self.execProg("/etc/init.d/proftpd stop",False,
+ False)
+ if not (textLines and type(textLines) == types.ListType and\
+ "ok" in textLines[-1] or textLines and\
+ "ok" in textLines):
self.printERROR( "Proftpd" + " " +
_("service is not stopped"))
flagError = True
break
elif self.getRunService(service):
stopService = service
- textLine = self.execProg("/etc/init.d/%s stop" %(stopService))
- if not ("ok" in textLine):
+ textLines = self.execProg("/etc/init.d/%s stop" %(stopService),
+ False, False)
+ if not (textLines and type(textLines) == types.ListType and\
+ "ok" in textLines[-1] or textLines and "ok" in textLines):
self.printERROR( str(service) + " " +
_("service is not stopped"))
flagError = True
break
if flagLdap:
if self.getRunService('ldap'):
- textLine = self.execProg("/etc/init.d/slapd stop")
- if not ("ok" in textLine):
+ textLines = self.execProg("/etc/init.d/slapd stop",False,False)
+ if not (textLines and type(textLines) == types.ListType and\
+ "ok" in textLines[-1] or textLines and "ok" in textLines):
self.printERROR( "LDAP" + " " +
_("service is not stopped"))
flagError = True
@@ -3558,12 +3578,12 @@
_("input 'yes'") +", "+ _("if not 'no'")
if not self.dialogYesNo(messDialog):
return True
- if options.has_key("allow"):
+ if options.has_key("a"):
# Получаем от пользователя доверительные сети
if not self.getAllowNet():
return False
else:
- if options.has_key("allow"):
+ if options.has_key("a"):
# Получаем от пользователя доверительные сети
if not self.getAllowNet():
return False
@@ -3660,14 +3680,16 @@
if not (textLine == None):
self.printERROR(_("Can not create Postfix aliases") + " ...")
return False
- textLine = self.execProg("/etc/init.d/postfix start")
- if "ok" in textLine:
+ textLines = self.execProg("/etc/init.d/postfix start",False,False)
+ if textLines and type(textLines) == types.ListType and\
+ "ok" in textLines[-1] or textLines and "ok" in textLines:
self.printOK(_("Starting") + " " + "Postfix" + " ...")
else:
self.printNotOK(_("Starting") + " " + "Postfix" + " ...")
return False
- textLine = self.execProg("/etc/init.d/dovecot start")
- if "ok" in textLine:
+ textLines = self.execProg("/etc/init.d/dovecot start", False, False)
+ if textLines and type(textLines) == types.ListType and\
+ "ok" in textLines[-1] or textLines and "ok" in textLines:
self.printOK(_("Starting") + " " + "Dovecot" + " ...")
else:
self.printNotOK(_("Starting") + " " + "Dovecot" + " ...")
@@ -4332,8 +4354,9 @@
if not os.path.exists("/etc/jabber/ssl.pem"):
self.printERROR(_("Can not create Jabber certificate") + " ...")
return False
- textLine = self.execProg("/etc/init.d/ejabberd start")
- if "ok" in textLine:
+ textLines = self.execProg("/etc/init.d/ejabberd start", False, False)
+ if textLines and type(textLines) == types.ListType and\
+ "ok" in textLines[-1] or textLines and "ok" in textLines:
self.printOK(_("Starting") + " " + "Ejabberd" + " ...")
else:
self.printNotOK(_("Starting") + " " + "Ejabberd" + " ...")
@@ -4825,12 +4848,12 @@
_("input 'yes'") +", "+ _("if not 'no'")
if not self.dialogYesNo(messDialog):
return True
- if options.has_key("allow"):
+ if options.has_key("a"):
# Получаем от пользователя доверительные сети
if not self.getAllowNet():
return False
else:
- if options.has_key("allow"):
+ if options.has_key("a"):
# Получаем от пользователя доверительные сети
if not self.getAllowNet():
return False
@@ -4888,8 +4911,9 @@
self.printERROR(_("ERROR") + ": " +\
_("Can not add Samba admin password"))
return False
- textLine = self.execProg("/etc/init.d/slapd restart")
- if not "ok" in textLine:
+ textLines = self.execProg("/etc/init.d/slapd restart", False, False)
+ if not (textLines and type(textLines) == types.ListType and\
+ "ok" in textLines[-1] or textLines and "ok" in textLines):
self.printNotOK(_("LDAP restart") + " ...")
return False
#Cоединение с Ldap (администратор)
@@ -4915,8 +4939,9 @@
print _("LDAP Error") + ": " + self.ldapObj.getError().strip()
return False
self.printOK(_("Added ldif file") +" ...")
- textLine = self.execProg("/etc/init.d/samba start")
- if "ok" in textLine:
+ textLines = self.execProg("/etc/init.d/samba start", False, False)
+ if textLines and type(textLines) == types.ListType and\
+ "ok" in textLines[-1] or textLines and "ok" in textLines:
self.printOK(_("Starting") + " Samba ...")
else:
self.printNotOK(_("Starting") + " Samba ...")
@@ -5268,8 +5293,8 @@
opt = {}
if options.has_key("v"):
opt['v'] = ''
- if options.has_key("allow"):
- opt['allow'] = ''
+ if options.has_key("a"):
+ opt['a'] = ''
# Сервисы для которых не будет задаваться вопрос о доступных сетях
# при включенной опции allow
noInputAllowNetServices = []
@@ -5370,7 +5395,7 @@
if service == "samba":
# Получаем от пользователя доверительные сети
# для сервиса Samba
- if options.has_key("allow") and\
+ if options.has_key("a") and\
not service in noInputAllowNetServices:
self.servSambaObj.clVars = self.clVars
if not self.servSambaObj.getAllowNet():
@@ -5411,7 +5436,7 @@
if service == "mail":
# Получаем от пользователя доверительные сети
# для сервиса Mail
- if options.has_key("allow") and\
+ if options.has_key("a") and\
not service in noInputAllowNetServices:
self.servMailObj.clVars = self.clVars
if not self.servMailObj.getAllowNet():
@@ -7021,6 +7046,7 @@
(on/off)")
},
{'progAccess':(9,),
+ 'shortOption':"a",
'longOption':"allow",
'helpChapter':_("Mail service options"),
'help':_("enter the allowed ip addresses and network")
@@ -7040,11 +7066,13 @@
'help':_("encryption type - 'none', 'tls'")
},
{'progAccess':(9,),
+ 'shortOption':"a",
'longOption':"allow",
'helpChapter':_("Samba service options"),
'help':_("enter the allowed ip addresses and network")
},
{'progAccess':(10,),
+ 'shortOption':"a",
'longOption':"allow",
'helpChapter':_("Common options"),
'help':_("enter the allowed ip addresses and network\
@@ -7556,13 +7584,15 @@
if self.clVars.Get("sr_samba_set") == "on":
if self.getRunService('samba'):
textLines = self.execProg("/etc/init.d/samba restart",
- False,False)
- if not "ok" in textLines[-1]:
+ False, False)
+ if not (textLines and type(textLines) == types.ListType and\
+ "ok" in textLines[-1] or textLines and "ok" in textLines):
self.printNotOK(_("Restarting") + " Samba ...")
return False
else:
- textLine = self.execProg("/etc/init.d/samba start")
- if not "ok" in textLine:
+ textLines = self.execProg("/etc/init.d/samba start",False,False)
+ if not (textLines and type(textLines) == types.ListType and\
+ "ok" in textLines[-1] or textLines and "ok" in textLines):
self.printNotOK(_("Starting") + " Samba ...")
return False
# Подключаемся к LDAP cерверу
@@ -7595,12 +7625,13 @@
{"DN":self.clVars.Get("ld_ftp_dn"),
"PASS":self.clVars.Get("ld_ftp_pw")})
self.printOK(_("Added ldif file") +" ...")
+ textLines = []
if self.getRunService('ftp'):
textLines = self.execProg("/etc/init.d/proftpd restart",False,False)
- textLine = textLines[0]
else:
- textLine = self.execProg("/etc/init.d/proftpd start")
- if "ok" in textLine:
+ textLines = self.execProg("/etc/init.d/proftpd start",False,False)
+ if textLines and type(textLines) == types.ListType and\
+ "ok" in textLines[-1] or textLines and "ok" in textLines:
self.printOK(_("Starting") + " " + "Proftpd" + " ...")
else:
self.printNotOK(_("Starting") + " " + "Proftpd" + " ...")

@ -1,5 +1,5 @@
DIST calculate-1.1.0.tar.bz2 205141 RMD160 cff5f13cdef67ac24ed2154320e32892c3a09e16 SHA1 c6acb177fe71d5b616c3385edaa4e8cfd6063ce2 SHA256 e8ad568647e5cc9285392b4197a042496d8d7454bb93865ccd28d1edf054bec7
DIST calculate-1.2.0_rc1.tar.bz2 212550 RMD160 2c0d46bde1499069ce1b30e33867a75533ddd52a SHA1 daedf7f1918a1d9ad13d85c88cb9619ff646a997 SHA256 e8e93f659e33ea720c6f895596163a44a79db1f25c835ff478d6c965ce1885cf
EBUILD calculate-1.1.0-r1.ebuild 1855 RMD160 f8a68acbe5996a0ac35a492eb1accc556d391d1c SHA1 b15d8b199dd77e9670178221a727a8936deaab7c SHA256 f40d5f96864f34f45390e71b5e0e2142f115297dae67658d9175e09920210c80
EBUILD calculate-1.2.0_rc1.ebuild 1778 RMD160 b6b60ddf9848e774c3d9aa6f5a2ef84b41836d16 SHA1 99239a8760ef70337f7d710bcb1875bedf9748b6 SHA256 a85bbc7c48cb5ef4e4db446364a359696e238309456b0ca8b087bc8bc3ddb520
EBUILD calculate-9999.ebuild 1359 RMD160 c8c3dc5c15c18aed1bfe4868d919b2f94109785d SHA1 e28b9603dec77910239f0cdd0f2b4edbbf9f258b SHA256 176ac49563303829b115ba4daea80eff01aa4bb921639092380924ffc119a107
EBUILD calculate-1.2.0_rc1.ebuild 1815 RMD160 9ea64321372bc3eab1e58a918a6db90c5670fd1b SHA1 18e2a0a5202adf58c4cc0d71fecc68b209c4c582 SHA256 df1802b531646beeec815730ff6e758742afd25c439eec298210745a6e664dbe
EBUILD calculate-9999.ebuild 1396 RMD160 2f0a2d6d6dc794956cb05691a9746b1c5c640b5d SHA1 03a67b17288287ce86e4bf8805ddeda18d0188b3 SHA256 0f3a0aa1415d9528dda79a221673c333d7f148c5cbd866f1bfec8894fdbe5355

@ -38,7 +38,8 @@ DEPEND="app-arch/bzip2
RDEPEND="${DEPEND}"
pkg_setup() {
if [ `ls /usr/calculate/install | grep -c ""` -gt 0 ] && \
if [ -e /usr/calculate/install ] && \
[ `ls /usr/calculate/install | grep -c ""` -gt 0 ] && \
! [ -e /var/db/pkg/sys-apps/calculate-[0-9]* ];
then
eerror "Finding other copy of calculate in target directory"

@ -16,7 +16,8 @@ DEPEND=""
RDEPEND="${DEPEND}"
pkg_setup() {
if [ `ls /usr/calculate/install | grep -c ""` -gt 0 ] && \
if [ -e /usr/calculate/install ] && \
[ `ls /usr/calculate/install | grep -c ""` -gt 0 ] && \
! [ -e /var/db/pkg/sys-apps/calculate-[0-9]* ];
then
eerror "Finding other copy of calculate in target directory"

@ -1,5 +1,2 @@
DIST keyexec-0.1.1.tar.bz2 6168 RMD160 2a1ed09044f1073e66929b66d48dd734e3602d3e SHA1 779110ed5b82bc45144e8515ffb9f7a91a675e64 SHA256 d33ee1c836d8cee7ed63376c9effb90f1759d806fcaa433be4425881fadb3d9e
DIST keyexec-0.1.2.tar.bz2 6157 RMD160 d93ddd4c17dbec4c99552a52c90ab1e37f7aaa3b SHA1 d36f3067d3d0df7867c89f5bc0d73a440e80912b SHA256 670cbac2b9e2d60715d91a3d4fe937a449ec50f3dab23887b203f014efd08bb7
EBUILD keyexec-0.1.1-r1.ebuild 743 RMD160 b440d01c97a815d25b5f39fe221cef23a54d09d5 SHA1 3f4bda1732599a87766be9e3a19081a2d3193d09 SHA256 471a90a9cb5c95241cc857ffbdb99714bc742fe8063a87b8f7f705efbd8cd0b9
EBUILD keyexec-0.1.2-r2.ebuild 727 RMD160 5aaf0cd899d21c6667056ef11b905f14531b152b SHA1 b3259de0a9a40d1ff6c938cd0a02ece38db1fa0c SHA256 066a458dd223a8b78001650cbf341ecbab234ef2b90aab53c1eacdfbcabe2ba1
EBUILD keyexec-0.1.2-r3.ebuild 740 RMD160 bb14ea4e22125536f966e21ae31a6d9cc8f6cac2 SHA1 a86269de1f92fcffd4ef2f163e0f0da5273ac33a SHA256 f55acd279d1d49a78c5c3392d9415e301049281df16338bca1afe2d71b4b8510

@ -1,27 +0,0 @@
# Copyright 2007 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
inherit qt3 kde-functions
DESCRIPTION="Starts other program using the password of the user kept in the kernel"
HOMEPAGE="http://www.calculate-linux.ru/keyexec"
SRC_URI="ftp://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2
http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2
ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/${PN}/${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND=">=sys-apps/keyutils-1.1
>=sys-auth/pam_keystore-0.1"
#RDEPEND=""
need-kde 3.5
src_compile() {
make CFLAGS="-Wall ${CFLAGS}" || die
}
src_install() {
emake install DESTDIR="${D}"
}

@ -1,25 +0,0 @@
# Copyright 2007 Calculate Pack, http://www.calculate-linux.ru
# Distributed under the terms of the GNU General Public License v2
DESCRIPTION="Starts other program using the password of the user kept in the kernel"
HOMEPAGE="http://www.calculate-linux.ru/keyexec"
SRC_URI="ftp://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2
http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2
ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/${PN}/${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
DEPEND=">=sys-apps/keyutils-1.1
>=sys-auth/pam_keystore-0.1
>=kde-base/kdelibs-4.1.0"
#RDEPEND=""
src_compile() {
make CFLAGS="-Wall ${CFLAGS}" || die
}
src_install() {
emake install DESTDIR="${D}"
}
Loading…
Cancel
Save