forked from calculate/calculate-overlay
parent
04a6048669
commit
6f0743b676
@ -0,0 +1,42 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The library for Calculate 2"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE=""
|
||||
DEPEND="!<sys-apps/calculate-client-2.1.12
|
||||
!<sys-apps/calculate-server-2.1.11
|
||||
>=dev-lang/python-2.5.2
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
>=dev-python/pyxml-0.8"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# fix get ip and mac without ifconfig
|
||||
epatch "${FILESDIR}/calculate-lib-2.1.11-fix_getip.patch"
|
||||
|
||||
# fix import xpath
|
||||
epatch "${FILESDIR}/calculate-lib-2.1.11-fix_xpath.patch"
|
||||
|
||||
# fix iniparser
|
||||
epatch "${FILESDIR}/calculate-lib-2.1.11-fix_iniparser.patch"
|
||||
|
||||
# fix dovecot restart
|
||||
epatch "${FILESDIR}/calculate-lib-2.1.11-dovecot_restart.patch"
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
diff --git pym/cl_utils.py pym/cl_utils.py
|
||||
index ac25984..5672b4e 100644
|
||||
--- pym/cl_utils.py
|
||||
+++ pym/cl_utils.py
|
||||
@@ -296,7 +296,8 @@ def runOsCommand(cmd, inStr=None, ret_first=None, env_dict=None):
|
||||
retcode = pipe.wait()
|
||||
res = fout.readlines()
|
||||
fout.close()
|
||||
- res += ferr.readlines()
|
||||
+ if not ("dovecot start" in cmd or "dovecot restart" in cmd):
|
||||
+ res += ferr.readlines()
|
||||
ferr.close()
|
||||
if res:
|
||||
if len(res) == 1 or ret_first:
|
||||
@ -0,0 +1,219 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The program for configuring services Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
IUSE="calculate_nomail
|
||||
calculate_nodhcp
|
||||
calculate_noftp
|
||||
calculate_nojabber
|
||||
calculate_nonamed
|
||||
calculate_nosamba
|
||||
calculate_noproxy"
|
||||
|
||||
DEPEND="=sys-apps/calculate-lib-2.1.11-r4
|
||||
>=net-nds/openldap-2.3[-minimal]
|
||||
>=sys-auth/pam_ldap-180[ssl]
|
||||
>=sys-auth/nss_ldap-239
|
||||
!calculate_nosamba? (
|
||||
>=net-fs/samba-3.4.6[acl,client,cups,ldap,netapi,pam,server,smbclient]
|
||||
<net-fs/samba-4.0.0
|
||||
)
|
||||
!calculate_nomail? (
|
||||
|| ( <net-mail/dovecot-1.2.0[pop3d,ldap,pam,ssl]
|
||||
>=net-mail/dovecot-1.2.0[ldap,pam,ssl]
|
||||
)
|
||||
>=mail-filter/procmail-3.22
|
||||
dev-python/pymilter
|
||||
>=mail-mta/postfix-2.2[ldap,pam,ssl,sasl,dovecot-sasl]
|
||||
)
|
||||
!calculate_noftp? (
|
||||
|| ( <net-ftp/proftpd-1.3.3[-acl,ldap,ncurses,nls,pam,ssl,tcpd]
|
||||
>=net-ftp/proftpd-1.3.3[-acl,ident,ldap,ncurses,nls,pam,ssl,tcpd]
|
||||
)
|
||||
)
|
||||
!calculate_nojabber? (
|
||||
>=net-im/ejabberd-2.1.8[mod_pubsub]
|
||||
>=media-gfx/imagemagick-6.6
|
||||
)
|
||||
!calculate_nonamed? ( >=net-dns/bind-9.6.1_p1[sdb-ldap] )
|
||||
!calculate_noproxy? ( >=net-proxy/squid-3.0.14[ldap,pam,ssl] )
|
||||
!calculate_nodhcp? ( >=net-misc/dhcp-3.1.2_p1 )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# ftp .Trash-uid
|
||||
epatch "${FILESDIR}/calculate-server-2.1.16-ftp_trash.patch"
|
||||
|
||||
# fix check ip
|
||||
epatch "${FILESDIR}/calculate-server-2.1.16-fix_ip_check.patch"
|
||||
|
||||
# fix get ip
|
||||
epatch "${FILESDIR}/calculate-server-2.1.16-fix_get_ip.patch"
|
||||
|
||||
# add win7 profile dir
|
||||
epatch "${FILESDIR}/calculate-server-2.1.16-win7_profile.patch"
|
||||
|
||||
# fix work with calculate.env
|
||||
epatch "${FILESDIR}/calculate-server-2.1.16-fix_inienv.patch"
|
||||
|
||||
# fix jabber tls
|
||||
epatch "${FILESDIR}/calculate-server-2.1.16-jabber_tls.patch"
|
||||
|
||||
# fix empty ip
|
||||
epatch "${FILESDIR}/calculate-server-2.1.16-fix_empty_ip.patch"
|
||||
|
||||
# add smtp auth
|
||||
epatch "${FILESDIR}/calculate-server-2.1.16-smtp_auth.patch"
|
||||
|
||||
# add samba options for remote work distfiles
|
||||
epatch "${FILESDIR}/calculate-server-2.1.16-distfiles.patch"
|
||||
|
||||
# support squid 3.2
|
||||
epatch "${FILESDIR}/calculate-server-2.1.16-fix_proxy.patch"
|
||||
|
||||
# fix sasl config
|
||||
epatch "${FILESDIR}/calculate-server-2.1.16-fix_sasl_config.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,17 @@
|
||||
diff --git profile/mail/etc/postfix/main.cf profile/mail/etc/postfix/main.cf
|
||||
index 308769a..de16ede 100644
|
||||
--- profile/mail/etc/postfix/main.cf
|
||||
+++ profile/mail/etc/postfix/main.cf
|
||||
@@ -205,7 +205,12 @@ smtp_tls_session_cache_database = btree:${queue_directory}/smtp_scache
|
||||
|
||||
#включаем авторизацию через dovecot
|
||||
smtpd_sasl_auth_enable = yes
|
||||
+#pkg(mail-mta/postfix)<2.10.1#
|
||||
smtpd_sasl2_auth_enable = yes
|
||||
+#pkg#
|
||||
+#pkg(mail-mta/postfix)>=2.10.1#
|
||||
+!smtpd_sasl2_auth_enable = del
|
||||
+#pkg#
|
||||
smtpd_sasl_type = dovecot
|
||||
smtpd_sasl_path = private/auth
|
||||
smtpd_sasl_security_options = noanonymous
|
||||
@ -0,0 +1,30 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=3
|
||||
|
||||
DESCRIPTION="Calculate Utilities meta package"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
SRC_URI=""
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="
|
||||
cl_assemble
|
||||
cl_builder
|
||||
cl_server
|
||||
"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
!sys-apps/calculate-templates
|
||||
!<sys-apps/calculate-install-3.0.0_alpha1
|
||||
=sys-apps/calculate-lib-2.2.31-r2
|
||||
=sys-apps/calculate-i18n-2.2.31
|
||||
|
||||
cl_assemble? ( =sys-apps/calculate-assemble-2.2.31-r6 )
|
||||
cl_builder? ( =sys-apps/calculate-builder-2.2.31-r11 )
|
||||
|
||||
cl_server? ( =sys-apps/calculate-server-2.1.16-r10 )
|
||||
"
|
||||
Loading…
Reference in new issue