calculate/calculate-overlay
5
2
Fork 4
Code Issues 16 Pull requests 3 Releases Wiki Activity

Update server

Browse source
This commit is contained in:
Хирецкий Михаил 2012-08-31 15:32:37 +04:00
parent 04ebafc52e
commit b1385dd52c
5 changed files with 259 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys-apps/calculate-server/Manifest
View file

@ -1,10 +1,12 @@
AUX calculate-server-2.1.15-fix_getip.patch 1703 SHA256 aabc9c9b935b1804ea3f375d0868d0954ca1c7925b64930f3f8d460d1815c13d SHA512 cab990701c7d9c32c973ae6a4f2132bbc1af822e2b7e7c3f392797b440860af4f8b69ce0bdf68bf16bd067f76f4a4b1f49620576bc5f4fa0a6f9e56e4381a30c WHIRLPOOL f7cafbb83ef0550f7d3edf1a95cd2e7a70963b9cdbf69fb6165f8e94bee1707fb926807142595ec94de3a219362c9b1d29d7829a28ba25d605fd506e69d4198e
AUX calculate-server-2.1.15-fix_postfix.patch 628 SHA256 6365b3d1bc3eac156e45b8545811ed4122504fa3ea25368cee5703584d085966 SHA512 a8f78f182598e0246b5acf208e17d6d82c889495f843de32117445557f7b0a145ff12d205911735bd57fdafa9e5529d5a249c30724db9c214b08f2570e13691a WHIRLPOOL ac579b3b9ece6ccb7176453022bf6a2368dae70c1594177ada93ebeeda55f3966d477093c13e5ffecb530e48e8737d537a6d277d13b456ce4dc5eaf41c326c32
AUX calculate-server-2.1.15-fix_proftpd.patch 920 SHA256 42b8969e61bd4456812db8f164076b00d35f5f21daecf0d9dc89486738ce2a80 SHA512 d404adffadbd2fbc1063bd156ca1e573d6394323e7b3bc8792918e77d5934a1f25a49a13016e6a8d2ab6f6a0cfa0e8d9dfd88450d64c9f0f0c55c533c968a4c6 WHIRLPOOL f44eb4598095b760079d9452b1a65e83830c02961240338c211b5299894a693aa368ad20c092567bbed4b77c72496a04f26261252ebb20868181620dd35e9e4d
AUX calculate-server-2.1.16-ftp_trash.patch 1314 SHA256 3f686648e5a069dbea154461de9183e9ab423d7b8245ab580d3b58094772797a SHA512 8e7072af8f288086967b94b830f1e97d24d8e3b70cf37336468bda4406e50228f70ea4f65071032f3fe8a412ce415f7af0bdefd4b9b854873633fc9ef5cc2b03 WHIRLPOOL 6080878d25666c4ea56c5794305071134d9eb0ace766d2de36a206d68904924af1963eec9f3cca8795e3805f26c934262dc310cf321383c057bd6c6c404696d3
DIST calculate-server-2.1.15.tar.bz2 168350 SHA256 3bc8f28dc3c583d1ec51d9653fc92d047c0f2064f3745a34195ba133cfc66d8c SHA512 6d8ce41bb218d43dc0c6c3f7b68988f9c2d40a707cdc9a3749f526e2cf3fca92f33f44c65a1dfcda9dbed638847a44d6c28aa7aaa395301035729286799497bf WHIRLPOOL fdcbb18dd43e093dffbe3bf6c902a543c99f02bbcdc69419daa4daa49d5449ac64e4f933b3b87fa0e706e35bf0dc1ddfe02516eee54e8112cc29dbf7c7913b15
DIST calculate-server-2.1.16.tar.bz2 168460 SHA256 38c7b76057c0778c4b45c893d9f7c8647b779aed14a094bc64275140abd8008c SHA512 cd9fa9e449f92499b22b738fa2e50846a16fbaae9e96660ad7068668c901203060dfd02a5e71ed9167bad90107106fe0dc9e203a0c4bc54518e4541cd8d4799e WHIRLPOOL 3fcc65d5c39ebda099ba6b734778d0e72cb393fd4327d1ee46105cf4fb020f4d0f5934b5d807158357181fd86fcdd171557213aa6dc455692b0d42cae8275aeb
EBUILD calculate-server-2.1.15-r6.ebuild 5605 SHA256 d6dac49936efb03a91a56ba33757a11086a2671a9012e1dd23bd15498536aa24 SHA512 b832ce5e26abfdf3067ae61b59ab175905c9e8cd7fed7b3b234b3d6eed506c0bd4eaf569b3f84234379bd101c126906f2880cb7c896f9239ac66aee2e83eff1c WHIRLPOOL cbc6fedc0c3e4b986fcad6a633a44b63fd62da4f41d3f0df8294a1b189ec597cbae5d50d2e9322e98b045cb951861868a666ca49a5547b6da534094b50ed5668
EBUILD calculate-server-2.1.15-r7.ebuild 5684 SHA256 1eedbac2a5bd43e4defbd8155a58a05db000118a670db202ba734b484215bef5 SHA512 029be2f1e2eef4a95e2ec5a73b37dbc9011ccba116c954434f77914b6598566404a128b293c034fb2bbb4d63355ae95c94823575563acb173a04a3edffc67fbd WHIRLPOOL 22700602bc8e5920eb3bb98705d4e5356d66ab930020f7fa48c104288ae3c10815d746dcb3f2d01167383049dc4689ff21bcb3062ae5af7a17cc6a94c8a8095d
EBUILD calculate-server-2.1.16-r1.ebuild 5510 SHA256 cfd62bea16fa265118b83eecd166b5bcb8c9c14cb3cb101f5129df38103781d0 SHA512 5900676cd8f882e724cae1c5c168ba461cb68a53fe30102e254e26afb344913190544c0a97b440a015657f8bdb7ecae7fc469e33c5c2ca162dd9f8e06bf9d8ed WHIRLPOOL d613e63323af7e863bac4a7dbf687929f6f33f1e11b031900bb9e10e7eba98491111222a8fcec3d266527144b1ae6416261ebb86240063160332a79f4ee66753
EBUILD calculate-server-2.1.16.ebuild 5385 SHA256 e8725df59a5a7fe7ec2e855a6e3c7fff2e72b1182ec06173afb462dec035ba7f SHA512 f41e66d7300fb014acd763aeae9551979236aeece5552bcab764fd066c35ddc0b3076617f9c94e58c4383f1376c7ad52246cecb135615436196f03bde60c696b WHIRLPOOL d216abfbcb42554ace72180b914cb3f21d21449d0b3761e4b819ddacf12aeecfbe1eee7a99da277f12eb66515db2d538946cdf1f90e542c33764d93c1c7d5ba3
EBUILD calculate-server-2.1.9999.ebuild 1122 SHA256 e2c8e01cbf08f07e29007346f6b69b2452715ec381aeec954e88d44a282ae1ae SHA512 7c8eefbfc1825606664d80b015b6796c18ec694c400900532078cbe50bf7922dc5aa4c9301af58b1c3b0a6d9ff00da71fd2671dadbef970394ca85212acbcc25 WHIRLPOOL 0f83a53ce05e3240f4f8faa117ab7f4b7273cfe3baaf803a39a50ed426c96629759c6d9392c04a5fee67c9c49457d1e95ae179e74733b5efedb32c1d9b834353
MISC ChangeLog 8940 SHA256 d17edb3f2a5ed7acf057ddb04e31045bae2e8b46e26704d1ebbb08df079d23bd SHA512 e79568d5acf396c56cbf5726812c327d7849d1b5d566dffc1a8b588a79fb9dcd994e1fdb5a152fc96ee53ca468eadeeefe7236baaad7262005b8deb7a2b89a6f WHIRLPOOL b0bbaadc2a2d20c2d6290feb7d50015385e283c97bd5c657cb434e55bdbfd5adefcb0a580dbd450a232677eb280a1ef14aa9b67c1d7b6c41e55caeb50bfeb631

189
sys-apps/calculate-server/calculate-server-2.1.16-r1.ebuild Normal file
View file

@ -0,0 +1,189 @@
# 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-r2
>=net-nds/openldap-2.3[-minimal]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
!calculate_nosamba? (
>=net-fs/samba-3.4.6[acl,client,cups,ldap,netapi,pam,server,smbclient]
<net-fs/samba-4.0.0
)
!calculate_nomail? (
|| ( <net-mail/dovecot-1.2.0[pop3d,ldap,pam,ssl]
>=net-mail/dovecot-1.2.0[ldap,pam,ssl]
)
>=mail-filter/procmail-3.22
dev-python/pymilter
>=mail-mta/postfix-2.2[ldap,pam,ssl]
)
!calculate_noftp? (
|| ( <net-ftp/proftpd-1.3.3[-acl,ldap,ncurses,nls,pam,ssl,tcpd]
>=net-ftp/proftpd-1.3.3[-acl,ident,ldap,ncurses,nls,pam,ssl,tcpd]
)
)
!calculate_nojabber? (
>=net-im/ejabberd-2.1.8[mod_pubsub]
>=media-gfx/imagemagick-6.6
)
!calculate_nonamed? ( >=net-dns/bind-9.6.1_p1[sdb-ldap] )
!calculate_noproxy? ( >=net-proxy/squid-3.0.14[ldap,pam,ssl] )
!calculate_nodhcp? ( >=net-misc/dhcp-3.1.2_p1 )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# ftp .Trash-uid
epatch "${FILESDIR}/calculate-server-2.1.16-ftp_trash.patch"
}
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"
}

33
sys-apps/calculate-server/files/calculate-server-2.1.16-ftp_trash.patch Normal file
View file

@ -0,0 +1,33 @@
commit 0069b26d762ca6f488d9a7dd31316f6072d586d6
Author: Хирецкий Михаил <mh@calculate.ru>
Date: Fri Aug 31 15:30:04 2012 +0400
Add .Trash for FTP service
diff --git a/pym/cl_ldap.py b/pym/cl_ldap.py
index 65fa9e8..9800c80 100644
--- a/pym/cl_ldap.py
+++ b/pym/cl_ldap.py
@@ -12246,14 +12246,21 @@ class servRepl(shareLdap):
userTrashDir =\
os.path.join(self.clVars.Get("sr_samba_share_path"),
".Trash-%d"%uid)
+ userTrashDirFtp =\
+ os.path.join(self.clVars.Get("sr_ftp_path"),
+ ".Trash-%d"%uid)
userDirs = [("home",userHomeDir),
("netlogon",userNetlogonDir),
("win_prof",winProfDir),
('lin_prof',linProfDir),
- ('trash',userTrashDir)]
+ ('trash',userTrashDir),
+ ('ftp',userTrashDirFtp)]
flagError = False
for name, userDir in userDirs:
+ if name == "ftp":
+ if self.clVars.Get("sr_ftp_set") != "on":
+ continue
if not os.path.exists(userDir):
if not self.createUserDir(uid, gid, userDir):
flagError = True

1
sys-apps/calculate-utilities/Manifest
View file

@ -14,6 +14,7 @@ EBUILD calculate-utilities-2.2.29-r22.ebuild 803 SHA256 d6c99af701873b1f4f9c3106
EBUILD calculate-utilities-2.2.29-r23.ebuild 803 SHA256 dbf5814667fb6239f24934ea9e655e53cff766294148345d2eda8d4389dd5fb2 SHA512 819bae2f4db24fef9926661b8ed2295b565bec06234f1ce0fb8426a7a2845a570d19a404fe1dfbb8cba96265411f739c59b3a0852d64bc12c2e233c30c088a3f WHIRLPOOL beebda33ca817acf405c80d81e584cba1d21788fb2ecf4fd93a15d3791cbdbebf2e938a1deb32e2f67b0844bad105f25a214bd0019879b6741b1dae3eeca13fd
EBUILD calculate-utilities-2.2.29-r24.ebuild 803 SHA256 6abe2d6f80cfb8fc9bc7b69487648b3e037e6280f1788b4c870485207ef0f56e SHA512 56c7fc2950a73c5d95a2a07730084d99c7862847c6cb54284262e170e7a228f2b3f63240eaec061740e6ff5685629efc4d489ebd6e3966899b3da1aedf5f3a8c WHIRLPOOL 6cc47eef7a1a09e0856bc88a73d4a7619367ff2f6558e8a6f137050883fbd724b6f044a6db35343a2205b93224b5c4f76cedb3f4019ecd658a702f0d30d3dcf3
EBUILD calculate-utilities-2.2.29-r25.ebuild 803 SHA256 5403ffc2c2a147682290ca543374e6361913abdd6ada7fb7bd501fe5732bc0f5 SHA512 fe03efbbdd070996addda9f1dd3aa62cb3af452d3774bcb9845896e07fd27ee4b5edca8a91b09c761046a1b0c59b38e524d5d7a10ea1de0377466564023fbf8e WHIRLPOOL 5d9c328ed740796069b9b3d48f56c1fbd0bc6e5ec2d5552438e7a07143bfa9d19fa06e3010ed0e561010693c29751982773fb1ccc2232f95fab68f65d2c52865
EBUILD calculate-utilities-2.2.30-r1.ebuild 788 SHA256 c0f7e2ba8bb4a796795faae849be8280ae0745ba9f806a883c248fb303da8488 SHA512 65edb5da7b21a320b8fe9994e214c6cbbe7f63df35dfaf7adfeb9ee022ec5ffa5bf1879fe3a75ce26a42b1b82c4c0d92b7202a35fa888b9de4bfab62588f8daf WHIRLPOOL 15431f9a4f31103d85057d997eafca0d299258e890c2d1ccadcad61bc63ad5ca01b11159e67a481f271bb4b759e7435dd8e294f7789da07d7062b8fe0041890f
EBUILD calculate-utilities-2.2.30.ebuild 785 SHA256 3d9a39094f884a5fca946e0121ce558aac616a1857339f2571e07a67bf83b578 SHA512 58b7ddd50570d0514fa948e6b91f9f4bd6f2c317868837331c564612cc41207f41b338f0ce017fadc2853d5fce4783b7d2966c8fcecc11bd29bb1f1625356a8b WHIRLPOOL 04f7b6bca3cf282db977f52b06983958aac9428228a47b64d75da1e3f4a6319e482eb80ca4724af1dd830ceed7cbb9263e4c5ebaa4fed3644e91af446831f6b2
EBUILD calculate-utilities-2.2.9999.ebuild 842 SHA256 56d97b7d2ce11d23b25d9036b4e2ee196b547ce1d11b0cc349a8205515b66bf1 SHA512 fc7802b92ade52210fa7381b55c48638da6d9adee6d2f03f18d6bdd0050756089b3ca8de944f4e865517554523b40737abe9f22587ecae74079eec563f80868b WHIRLPOOL f1382f0629a8dae37aaecf40cb8cbc3682bde3b43e92c9c6a84cda75897dc5d5de043233fb7a3f929749520b05fe3af94187c7a3ccdae4e252e83699d871f225
EBUILD calculate-utilities-3.0.0-r1.ebuild 598 SHA256 c5ccfe1a28e2643314c97023570a0afae156438a372d138ac12bedbaf96c25ed SHA512 d4c5f005a8970f66bbfb1755d0cbcdb400b312be72aa5ba9400969b2103b351ff8f918c487caf0e4fb36498c86dcbc42e182ecfb96f1ade967cb0677065b8ba8 WHIRLPOOL e1f0eefa6ea7d0e8b74b9663a304d42d0485e3353df483c47e92ab9b85989f783cb2e784af3444989065ae31e56d5a0cdfcdac823d2919e6eaa6ffc30678a93a

34
sys-apps/calculate-utilities/calculate-utilities-2.2.30-r1.ebuild Normal file
View file

@ -0,0 +1,34 @@
# 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_client
cl_desktop
cl_server
"
RDEPEND="${RDEPEND}
!sys-apps/calculate-templates
!<sys-apps/calculate-install-3.0.0_alpha1
=sys-apps/calculate-lib-2.2.30
=sys-apps/calculate-i18n-2.2.30
cl_assemble? ( =sys-apps/calculate-assemble-2.2.30 )
cl_builder? ( =sys-apps/calculate-builder-2.2.30 )
cl_client? ( =sys-apps/calculate-client-2.2.30 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.30 )
cl_server? ( =sys-apps/calculate-server-2.1.16-r1 )
"