parent
766438c3af
commit
e25c5ee9f8
@ -0,0 +1,32 @@
|
||||
# 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 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}"
|
||||
|
||||
# change palce of i18n files to /usr/share/calculate-2.0
|
||||
epatch "${FILESDIR}/lib_i18n_path.patch"
|
||||
# fix fifo processing
|
||||
epatch "${FILESDIR}/calculate-lib-2.1.8-fix_fifo.patch"
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
commit 267519aa6b09b24cb45e965bbbdb8448eb8dde6b
|
||||
Author: Mike Hiretsky <mh@calculate.ru>
|
||||
Date: Tue May 17 09:57:50 2011 +0400
|
||||
|
||||
Add fifo to scan files.
|
||||
|
||||
diff --git a/pym/cl_profile.py b/pym/cl_profile.py
|
||||
index cad373a..618ef27 100644
|
||||
--- a/pym/cl_profile.py
|
||||
+++ b/pym/cl_profile.py
|
||||
@@ -1940,6 +1940,7 @@ class _file(_error):
|
||||
self.files = []
|
||||
self.links = []
|
||||
self.sockets = []
|
||||
+ self.fifo = []
|
||||
def getFilesDir(dirP, dirname,names):
|
||||
for nameFile in names:
|
||||
absNameFile = dirname + "/" + nameFile
|
||||
@@ -1953,6 +1954,8 @@ class _file(_error):
|
||||
dirP.dirs.append(absNameFile)
|
||||
elif stat.S_ISSOCK(os.stat(absNameFile)[stat.ST_MODE]):
|
||||
dirP.sockets.append(absNameFile)
|
||||
+ elif stat.S_ISFIFO(os.stat(absNameFile)[stat.ST_MODE]):
|
||||
+ dirP.fifo.append(absNameFile)
|
||||
for profileDir in profilesDirs:
|
||||
if profileDir:
|
||||
dirP = dirProf()
|
||||
@ -1,7 +1,9 @@
|
||||
AUX calculate-server-2.1.13-fifo_fix.patch 1122 RMD160 e015ecfd39ff9dd62fbee98ae9465dfa9cd87fff SHA1 e74caba4e28ba4aeebd556d9866eca7226950762 SHA256 a065091c6dfbfeef8e9d8c0c229a015c571ff1d7d96781397a0176b2cb6bd262
|
||||
AUX calculate-server-2.1.13-rename_cl_update.patch 4885 RMD160 0eb4083d8a6e381fbc88044d9f6b8eba8b837bf5 SHA1 10ad7a4967f58049a71b1e2e7fa2e1289a5c8072 SHA256 87d7435e5a987f18644022bef20f7c4deafd1fd162a3a3656999aff74eebaa59
|
||||
DIST calculate-server-2.1.13.tar.bz2 157717 RMD160 42d15a964a8c94774003d89ddc6bd834d20b1d5d SHA1 08e47e64aa8173b76a73693346d465ed62ac2ea1 SHA256 c748759f792c21dd28f2659bfeccf2a707c08f36a5d49766ceb6b922a98e930e
|
||||
EBUILD calculate-server-2.1.13-r1.ebuild 5100 RMD160 1a8e0de5d7a283a4bdddc644e4cb72d8c9a2f5a8 SHA1 4b4002c079fe429e94fc9fe750847a588b1ece94 SHA256 cdce4a2c954bfcdc6deb32c2af1a5a56083aedf7a382f7645ac1fd83043a82d6
|
||||
EBUILD calculate-server-2.1.13-r2.ebuild 5184 RMD160 c25bba74a1d999c47066a04092f96b7a993aeba4 SHA1 6cebce6f3342b7a9b4d173a22f25e91acb9aecd9 SHA256 764e2f219aaa1db76c0c64376287529e3a69b3d87041df5aa3add663c01de4ce
|
||||
EBUILD calculate-server-2.1.13.ebuild 4947 RMD160 f84f1384fcd7705a718b5c88b6066e262987ac3b SHA1 596a88a3e393f689a0d76ddb3dc723d03b3eb816 SHA256 feee22c11dd0617ea25164445bd1f074d06a3e30a2b57704d325f71ae6e4bb66
|
||||
EBUILD calculate-server-9999.ebuild 982 RMD160 0f4120756b5a9b533783c3ba95380507b6f9cd1b SHA1 f77edc90b28cfe8b2d12fd8830fe1641e5119bd7 SHA256 0486a61066cee349510bef0f68e8ffa37ce5ea5a2be0859fbec7eacadcb91913
|
||||
MISC ChangeLog 5639 RMD160 2512466b77cf44ae2363a2983a258b78161fd70d SHA1 959c9ef159f0de50c27d133331017512c1aeb72e SHA256 c64f7d5e3e17647056f8eabfd471bc16695060fab03dc69f329545e506d92bb6
|
||||
MISC ChangeLog 5871 RMD160 0d9d2ef1f4cfa99516805ff2f4ac482316225fb2 SHA1 5e7530c5481ae7117f175f0d3ccac7fa40ebb83d SHA256 8571b7f703ee2548b39f8d38195c47183c3344bc843f857905402f4f3bdf2ae6
|
||||
MISC metadata.xml 286 RMD160 e243725ec1a1302cab0d0efee76a4a926e855916 SHA1 6071aa604ea5a1ba8e1772e8f37a24f26b893d8d SHA256 aab7ddde310df96da76277d5ae340a4b0926bec3b354bfb2fea3288081036d74
|
||||
|
||||
@ -0,0 +1,172 @@
|
||||
# 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.8-r2
|
||||
>=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"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# change cl-update to cl-update-server
|
||||
epatch "${FILESDIR}/calculate-server-2.1.13-rename_cl_update.patch"
|
||||
# fix fifo processing
|
||||
epatch "${FILESDIR}/calculate-server-2.1.13-fifo_fix.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,30 @@
|
||||
commit a75af744f9cd2e45404fad74ac560fabe1f1cc79
|
||||
Author: Mike Hiretsky <mh@calculate.ru>
|
||||
Date: Tue May 17 10:05:20 2011 +0400
|
||||
|
||||
Add processing fifo files.
|
||||
|
||||
diff --git a/pym/cl_ldap.py b/pym/cl_ldap.py
|
||||
index 6806945..c66326b 100644
|
||||
--- a/pym/cl_ldap.py
|
||||
+++ b/pym/cl_ldap.py
|
||||
@@ -1176,6 +1176,9 @@ in a sambaDomainName',
|
||||
for socketRm in scanObjs[0].sockets:
|
||||
# Удаляем сокеты
|
||||
os.remove(socketRm)
|
||||
+ for fifoRm in scanObjs[0].fifo:
|
||||
+ # Удаляем fifo
|
||||
+ os.remove(fifoRm)
|
||||
for linkRm in scanObjs[0].links:
|
||||
# Удаляем ссылки
|
||||
os.unlink(linkRm[1])
|
||||
@@ -1421,6 +1424,9 @@ if you want to continue to run the program again"))
|
||||
# Удаляем сокеты
|
||||
for rmSocket in scanObjs[0].sockets:
|
||||
os.remove(rmSocket)
|
||||
+ # Удаляем fifo
|
||||
+ for rmFifo in scanObjs[0].fifo:
|
||||
+ os.remove(rmFifo)
|
||||
mode,uid,gid = fileObj.getModeFile(srcDir)
|
||||
os.chmod(destDir, mode)
|
||||
os.chown(destDir, uid,gid)
|
||||
@ -0,0 +1,35 @@
|
||||
# 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.14-r4
|
||||
=sys-apps/calculate-templates-2.2.14-r3
|
||||
=sys-apps/calculate-lib-2.2.14-r2
|
||||
|
||||
cl_assemble? ( =sys-apps/calculate-assemble-2.2.14-r1 )
|
||||
cl_builder? ( =sys-apps/calculate-builder-2.2.14-r3 )
|
||||
cl_client? ( =sys-apps/calculate-client-2.2.14 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-2.2.14 )
|
||||
cl_installgui? ( =app-misc/calculate-install-gui-2.2.14 )
|
||||
|
||||
cl_server? ( =sys-apps/calculate-server-2.1.13-r2 )
|
||||
"
|
||||
Loading…
Reference in new issue