parent
7b32ac60a6
commit
d3d5132159
@ -0,0 +1,174 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The program for configuring services Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
IUSE=""
|
||||
|
||||
DEPEND="=sys-apps/calculate-lib-2.1.11
|
||||
>=net-nds/openldap-2.3[-minimal]
|
||||
>=sys-auth/pam_ldap-180[ssl]
|
||||
>=sys-auth/nss_ldap-239
|
||||
>=net-fs/samba-3.4.6[acl,client,cups,ldap,netapi,pam,server,smbclient]
|
||||
<net-fs/samba-4.0.0
|
||||
|| ( <net-mail/dovecot-1.2.0[pop3d,ldap,pam,ssl]
|
||||
>=net-mail/dovecot-1.2.0[ldap,pam,ssl]
|
||||
)
|
||||
>=mail-mta/postfix-2.2[ldap,pam,ssl]
|
||||
|| ( <net-ftp/proftpd-1.3.3[-acl,ldap,ncurses,nls,pam,radius,ssl,tcpd]
|
||||
>=net-ftp/proftpd-1.3.3[-acl,ident,ldap,ncurses,nls,pam,radius,ssl,tcpd]
|
||||
)
|
||||
>=mail-filter/procmail-3.22
|
||||
>=net-dns/bind-9.6.1_p1[sdb-ldap]
|
||||
>=net-proxy/squid-3.0.14[ldap,pam,ssl]
|
||||
>=net-misc/dhcp-3.1.2_p1
|
||||
>=media-gfx/imagemagick-6.6
|
||||
dev-python/pymilter"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# fix for dovecot2.0
|
||||
epatch "${FILESDIR}/calculate-server-2.1.14-fix_dovecot.patch"
|
||||
# rename param
|
||||
epatch "${FILESDIR}/calculate-server-2.1.14-rename_param.patch"
|
||||
}
|
||||
|
||||
|
||||
pkg_postinst() {
|
||||
if [ -d /var/calculate/server-data/mail/imap ] || \
|
||||
[ -d /var/calculate/server-data/samba/win/profiles ] || \
|
||||
[ -d /var/calculate/server-data/samba/unix/profiles ] || \
|
||||
[ -d /var/calculate/server-data/samba/win/netlogon ];
|
||||
then
|
||||
ewarn "Data found in directories of previous version calculate-server"
|
||||
fi
|
||||
|
||||
if [ -d /var/calculate/server-data/mail/imap ];
|
||||
then
|
||||
if ! [ -d /var/calculate/server-data/mail~ ];
|
||||
then
|
||||
if mv /var/calculate/server-data/mail/imap \
|
||||
/var/calculate/server-data/mail~ && \
|
||||
rmdir /var/calculate/server-data/mail && \
|
||||
mv /var/calculate/server-data/mail~ \
|
||||
/var/calculate/server-data/mail;
|
||||
then
|
||||
ewarn
|
||||
ewarn "Data from /var/calculate/server-data/mail/imap"
|
||||
ewarn "was moved to /var/calculate/server-data/mail"
|
||||
MAILUPDATE="TRUE"
|
||||
fi
|
||||
fi
|
||||
if ! [ "${MAILUPDATE}" == "TRUE" ];
|
||||
then
|
||||
eerror "Cannot move /var/calculate/server-data/mail/imap"
|
||||
eerror "Please manualy move /var/calculate/server-data/mail/imap"
|
||||
eerror "to /var/calculate/server-data/mail"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -d /var/calculate/server-data/samba/win/profiles ];
|
||||
then
|
||||
SAMBAUPDATE=""
|
||||
if ! [ -d /var/calculate/server-data/samba/profiles/win ];
|
||||
then
|
||||
if mkdir -p /var/calculate/server-data/samba/profiles && \
|
||||
mv /var/calculate/server-data/samba/win/profiles \
|
||||
/var/calculate/server-data/samba/profiles/win;
|
||||
then
|
||||
ewarn
|
||||
ewarn "Data from /var/calculate/server-data/samba/win/profiles"
|
||||
ewarn "was moved to /var/calculate/server-data/samba/profiles/win"
|
||||
SAMBAUPDATE="TRUE"
|
||||
fi
|
||||
fi
|
||||
if ! [ "${SAMBAUPDATE}" == "TRUE" ];
|
||||
then
|
||||
eerror "Cannot move /var/calculate/server-data/samba/win/profiles"
|
||||
eerror "Please manualy move "
|
||||
eerror "/var/calculate/server-data/samba/win/profiles"
|
||||
eerror "to /var/calculate/server-data/samba/profiles/win"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -d /var/calculate/server-data/samba/unix/profiles ]; \
|
||||
then
|
||||
SAMBAUPDATE=""
|
||||
if ! [ -d /var/calculate/server-data/samba/profiles/unix ];
|
||||
then
|
||||
if mkdir -p /var/calculate/server-data/samba/profiles && \
|
||||
mv -f /var/calculate/server-data/samba/unix/profiles \
|
||||
/var/calculate/server-data/samba/profiles/unix;
|
||||
then
|
||||
rmdir /var/calculate/server-data/samba/unix
|
||||
ewarn
|
||||
ewarn "Data from /var/calculate/server-data/samba/unix/profiles"
|
||||
ewarn "was moved to /var/calculate/server-data/samba/profiles/unix"
|
||||
SAMBAUPDATE="TRUE"
|
||||
fi
|
||||
fi
|
||||
if ! [ "${SAMBAUPDATE}" == "TRUE" ];
|
||||
then
|
||||
eerror "Cannot move /var/calculate/server-data/samba/unix/profiles"
|
||||
eerror "Please manualy move "
|
||||
eerror "/var/calculate/server-data/samba/unix/profiles"
|
||||
eerror "to /var/calculate/server-data/samba/profiles/unix"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -d /var/calculate/server-data/samba/win/netlogon ];
|
||||
then
|
||||
SAMBAUPDATE=""
|
||||
if ! [ -d /var/calculate/server-data/samba/netlogon ];
|
||||
then
|
||||
if mv -f /var/calculate/server-data/samba/win/netlogon \
|
||||
/var/calculate/server-data/samba/netlogon;
|
||||
then
|
||||
rmdir /var/calculate/server-data/samba/win
|
||||
ewarn
|
||||
ewarn "Data form /var/calculate/server-data/samba/win/netlogon"
|
||||
ewarn "was moved to /var/calculate/server-data/samba/netlogon"
|
||||
SAMBAUPDATE="TRUE"
|
||||
fi
|
||||
fi
|
||||
if ! [ "${SAMBAUPDATE}" == "TRUE" ];
|
||||
then
|
||||
eerror "Cannot move /var/calculate/server-data/samba/win/netlogon"
|
||||
eerror "Please manualy move "
|
||||
eerror "/var/calculate/server-data/samba/win/netlogon"
|
||||
eerror "/var/calculate/server-data/samba/netlogon"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${MAILUPDATE}" == "TRUE" ];
|
||||
then
|
||||
ewarn
|
||||
ewarn "Please update mail service by the command:"
|
||||
ewarn "\tcl-update mail"
|
||||
fi
|
||||
if [ "${SAMBAUPDATE}" == "TRUE" ];
|
||||
then
|
||||
ewarn
|
||||
ewarn "Please update samba service by the command:"
|
||||
ewarn "\tcl-update samba"
|
||||
fi
|
||||
|
||||
ewarn
|
||||
ewarn "WARNING!!! If you have the samba service, then update it by the command:"
|
||||
ewarn "\tcl-update samba"
|
||||
}
|
||||
@ -0,0 +1,46 @@
|
||||
commit b450c3dad3c7aa06d213342acca5fd15d0facca5
|
||||
Author: Mike Hiretsky <mh@calculate.ru>
|
||||
Date: Fri Jun 3 12:45:58 2011 +0400
|
||||
|
||||
Change history-domain to history-domains.
|
||||
|
||||
diff --git a/i18n/cl_server_ru.mo b/i18n/cl_server_ru.mo
|
||||
index 598fec3..77e1fc6 100644
|
||||
Binary files a/i18n/cl_server_ru.mo and b/i18n/cl_server_ru.mo differ
|
||||
diff --git a/pym/cl_ldap.py b/pym/cl_ldap.py
|
||||
index c9d6279..e1c6eae 100644
|
||||
--- a/pym/cl_ldap.py
|
||||
+++ b/pym/cl_ldap.py
|
||||
@@ -1237,16 +1237,16 @@ in a sambaDomainName',
|
||||
def getMailHistoryData(self,options):
|
||||
"""Get mail history params from env and cmdline"""
|
||||
if not "history" in options and ("history-path" in options or
|
||||
- "history-domain" in options):
|
||||
+ "history-domains" in options):
|
||||
if "history-path" in options:
|
||||
param = "history-path"
|
||||
else:
|
||||
- param = "history-domain"
|
||||
+ param = "history-domains"
|
||||
self.printERROR(_("Command line incorrect, "
|
||||
"'%s' is not using without 'history'")%param)
|
||||
return False
|
||||
- if "history-domain" in options:
|
||||
- history_domain = options["history-domain"].strip()
|
||||
+ if "history-domains" in options:
|
||||
+ history_domain = options["history-domains"].strip()
|
||||
self.clVars.Set("sr_mail_history_domain", history_domain)
|
||||
else:
|
||||
history_domain = self.clVars.Get("sr_mail_history_domain")
|
||||
@@ -10103,9 +10103,9 @@ example: --range 192.168.0.2,192.168.0.50')
|
||||
},
|
||||
{'progAccess':(6,9),
|
||||
'optVal':"DOMAIN",
|
||||
- 'longOption':"history-domain",
|
||||
+ 'longOption':"history-domains",
|
||||
'helpChapter':_("Mail service options"),
|
||||
- 'help':_("domain for own mail")
|
||||
+ 'help':_("domain or domains for own mail (comma delimited)")
|
||||
},
|
||||
{'progAccess':(6,9),
|
||||
'optVal':"PATH",
|
||||
@ -0,0 +1,36 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=3
|
||||
|
||||
DESCRIPTION="Calculate Utilities meta package"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
SRC_URI=""
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="
|
||||
cl_assemble
|
||||
cl_builder
|
||||
cl_client
|
||||
cl_desktop
|
||||
cl_installgui
|
||||
cl_server
|
||||
"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-2.2.15-r1
|
||||
=sys-apps/calculate-templates-2.2.15-r1
|
||||
=sys-apps/calculate-lib-2.2.15-r1
|
||||
|
||||
cl_assemble? ( =sys-apps/calculate-assemble-2.2.15 )
|
||||
cl_builder? ( =sys-apps/calculate-builder-2.2.15 )
|
||||
cl_client? ( =sys-apps/calculate-client-2.2.15 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-2.2.15 )
|
||||
cl_installgui? ( =app-misc/calculate-install-gui-2.2.15 )
|
||||
|
||||
cl_server? ( =sys-apps/calculate-server-2.1.14-r2 )
|
||||
"
|
||||
|
||||
Loading…
Reference in new issue