diff --git a/sys-apps/calculate-server/ChangeLog b/sys-apps/calculate-server/ChangeLog index f44dc7b67..df7f2704b 100644 --- a/sys-apps/calculate-server/ChangeLog +++ b/sys-apps/calculate-server/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-server-2.1.14-r4 (27 Jun 2011) + + 27 Jun 2011; Mike Hiretsky (mhiretskiy) + +calculate-server-2.1.14-r4.ebuild, + +files/calculate-server-2.1.14-add_maildomain_group.patch: + Update for creating maildomain group. + *calculate-server-2.1.14-r3 (24 Jun 2011) 24 Jun 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-server/Manifest b/sys-apps/calculate-server/Manifest index 5246c4392..2320d5428 100644 --- a/sys-apps/calculate-server/Manifest +++ b/sys-apps/calculate-server/Manifest @@ -1,6 +1,7 @@ AUX calculate-server-2.1.13-fifo_fix.patch 1122 RMD160 e015ecfd39ff9dd62fbee98ae9465dfa9cd87fff SHA1 e74caba4e28ba4aeebd556d9866eca7226950762 SHA256 a065091c6dfbfeef8e9d8c0c229a015c571ff1d7d96781397a0176b2cb6bd262 AUX calculate-server-2.1.13-fix_bind.patch 543 RMD160 e50c44995eadaf6d2be753691886969f2f836775 SHA1 deffc9c0b65970dffdf6d5b971721c81c473bee0 SHA256 f6148f9f0029d58c36c2ce8a630b9c232b9f1f356b40973137facb9cf8f65700 AUX calculate-server-2.1.13-rename_cl_update.patch 4885 RMD160 0eb4083d8a6e381fbc88044d9f6b8eba8b837bf5 SHA1 10ad7a4967f58049a71b1e2e7fa2e1289a5c8072 SHA256 87d7435e5a987f18644022bef20f7c4deafd1fd162a3a3656999aff74eebaa59 +AUX calculate-server-2.1.14-add_maildomain_group.patch 2289 RMD160 447030faf2e759ee8cf46574fe5ca74089077971 SHA1 392ea8b227d8db4bbcb1b8f40d24755fd2a9e143 SHA256 ac7daed35446b5e948af0fbe03fe1928202062a444a7296f07d61105605fd22b AUX calculate-server-2.1.14-fix_dovecot.patch 502 RMD160 c7d4c76dc49a3894e7534572643e321696ae5a58 SHA1 1d62d3b5c9a5628cbb133bc615f8af06d6e844b5 SHA256 4f9ed8f74dd50244f1b6ac5f8a1b991a0f973fb2c05eac23e0509c2d31458baa AUX calculate-server-2.1.14-rename_param.patch 1980 RMD160 2d5e449e1da1f9dc7f3c2ddf11125842309675c4 SHA1 75aab35370256629d82eca9347d5d1fc07706b2d SHA256 d09e00c52625b4320a753cc519250d396f92742181af2a6f7a95b060812cf99d DIST calculate-server-2.1.13.tar.bz2 157717 RMD160 42d15a964a8c94774003d89ddc6bd834d20b1d5d SHA1 08e47e64aa8173b76a73693346d465ed62ac2ea1 SHA256 c748759f792c21dd28f2659bfeccf2a707c08f36a5d49766ceb6b922a98e930e @@ -12,7 +13,8 @@ EBUILD calculate-server-2.1.13.ebuild 4947 RMD160 f84f1384fcd7705a718b5c88b6066e EBUILD calculate-server-2.1.14-r1.ebuild 5097 RMD160 a433b84fd253706023c4f75668074b2d2849ee3d SHA1 80a4bea5f628e96eb35bce201463fc6285418386 SHA256 3153253ebde93514e7012b818ba1d2111af6fdb99e2d811551654d1a64a1176a EBUILD calculate-server-2.1.14-r2.ebuild 5178 RMD160 6e4cd5ef4ad89cd141617d368e47a70b6cbe8be6 SHA1 9b6fb392886dfc9e90036f6693ec7363aa19f5f0 SHA256 74af07dc90e016cfda0f32f7fa5b095cdb140f5b1fb25fe4118932e1f6ae3d43 EBUILD calculate-server-2.1.14-r3.ebuild 5215 RMD160 ba22727ca23e6d33b1cc7bc4a322fede487af01a SHA1 9eed54db2315e2044cfd338c12162f7e546d6e87 SHA256 6ed68dbb83f685853d5a32d760a7fb292433e6225742f8e88a505e77461b6268 +EBUILD calculate-server-2.1.14-r4.ebuild 5336 RMD160 cb965b75095b94485f0215f55a4a6006c98bd657 SHA1 c3fffb8636d4e0d57fb36f73a99c2113f5878eb1 SHA256 88afe9bd15f6412ede7fd4cb9f19af4b9774ac31630cc930473453b6b76d9c27 EBUILD calculate-server-2.1.14.ebuild 4966 RMD160 0a71a8217e53bec9c87669713e3007a5097e9b19 SHA1 6c284957f2841655facc4301cc7a9945d5f95876 SHA256 a7d071a4a1b10e1a03ebec2509be004ddcad0831976a05e88aa2ebbbee4fa986 EBUILD calculate-server-9999.ebuild 1032 RMD160 1b7daa72a3ed2e85c4d12a9e7acbcd12dfb9254b SHA1 05b16c21743b21cc5dfdde4a917f426b1bfcc46d SHA256 5df5730fe598902d17b3b1d6f591e1a0c16e90c0be7986dfa62390aa6c991b58 -MISC ChangeLog 6888 RMD160 764a64fd14ced899a8aa46a25119210641ce401e SHA1 5435b81efcf35dbb323fd68a20e97f71cfb05b57 SHA256 fae17156647529e3618a8c477124161be0a9755733c459168bbe7b679f8969d0 +MISC ChangeLog 7131 RMD160 11e5d052b33b0941b586d02006ee7e91f16595eb SHA1 230009c49a6822ffd518136074aa3ae05aaf5f98 SHA256 d45612d3f05761461fbe7600fec276c18a5cc9e9a7b1a580a90e8976fae945bd MISC metadata.xml 286 RMD160 e243725ec1a1302cab0d0efee76a4a926e855916 SHA1 6071aa604ea5a1ba8e1772e8f37a24f26b893d8d SHA256 aab7ddde310df96da76277d5ae340a4b0926bec3b354bfb2fea3288081036d74 diff --git a/sys-apps/calculate-server/calculate-server-2.1.14-r4.ebuild b/sys-apps/calculate-server/calculate-server-2.1.14-r4.ebuild new file mode 100644 index 000000000..156a58e3a --- /dev/null +++ b/sys-apps/calculate-server/calculate-server-2.1.14-r4.ebuild @@ -0,0 +1,177 @@ +# 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-mail/dovecot-1.2.0[ldap,pam,ssl] + ) + >=mail-mta/postfix-2.2[ldap,pam,ssl] + || ( =net-ftp/proftpd-1.3.3[-acl,ident,ldap,ncurses,nls,pam,radius,ssl,tcpd] + ) + >=mail-filter/procmail-3.22 + >=net-im/ejabberd-2.1.8[mod_pubsub] + >=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" + # add maildomain group to unix for mail service + epatch "${FILESDIR}calculate-server-2.1.14-add_maildomain_group.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" +} diff --git a/sys-apps/calculate-server/files/calculate-server-2.1.14-add_maildomain_group.patch b/sys-apps/calculate-server/files/calculate-server-2.1.14-add_maildomain_group.patch new file mode 100644 index 000000000..2372c6088 --- /dev/null +++ b/sys-apps/calculate-server/files/calculate-server-2.1.14-add_maildomain_group.patch @@ -0,0 +1,54 @@ +commit 14b241a66ec2e749ed0b1cae3576bcbac025d2df +Author: Mike Hiretsky +Date: Mon Jun 27 12:17:16 2011 +0400 + + Add maildomain group to unix during mail service setup. + +diff --git a/pym/cl_ldap.py b/pym/cl_ldap.py +index e1c6eae..ebab6bd 100644 +--- a/pym/cl_ldap.py ++++ b/pym/cl_ldap.py +@@ -4695,6 +4695,22 @@ if you want to continue to run the program again")) + self.clVars.Set("sr_mail_host", fullHostName, True) + return True + ++ def addDefaultMailGroup(self): ++ """Add default mail group to unix""" ++ mailGroup = self.defaultUnixGroup["name"] ++ if not self.servUnixObj.searchUnixGroupName(mailGroup): ++ # Если нужно создаем новую Unix группу ++ unixGroupFullName = self.defaultUnixGroup["comment"] ++ optGroupUnix = {"c": unixGroupFullName} ++ if not self.servUnixObj.addGroupUnixServer(mailGroup, ++ optGroupUnix, ++ False): ++ self.printERROR (_("Can not add group")+ " " +\ ++ str(mailGroup) + _(" in Unix service")) ++ return False ++ return True ++ ++ + def setupMailServer(self, options): + """Начальная настройка Mail сервиса""" + # Принудительная установка +@@ -4876,6 +4892,10 @@ if you want to continue to run the program again")) + return False + else: + self.printOK(msgStartSort) ++ ++ if not self.addDefaultMailGroup(): ++ return False ++ + textLines = self.execProg("/etc/init.d/postfix start") + if textLines == False: + self.printNotOK(_("Starting") + " " + "Postfix" + " ...") +@@ -7686,6 +7706,9 @@ outdated. If the backup is obsolete, use cl-backup.")) + for service in servicesRestart: + if service in "ldap": + continue ++ if service in "mail": ++ if not self.servMailObj.addDefaultMailGroup(): ++ return False + if not self.stopServices([service]): + flagError = True + break diff --git a/sys-apps/calculate-utilities/ChangeLog b/sys-apps/calculate-utilities/ChangeLog index e3fc11056..60874fa2e 100644 --- a/sys-apps/calculate-utilities/ChangeLog +++ b/sys-apps/calculate-utilities/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-utilities-2.2.17-r9 (27 Jun 2011) + + 27 Jun 2011; Mike Hiretsky (mhiretskiy) + +calculate-utilities-2.2.17-r9.ebuild: + Update for server. + *calculate-utilities-2.2.17-r8 (27 Jun 2011) 27 Jun 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 5fd76a94e..9e914a317 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -24,6 +24,7 @@ EBUILD calculate-utilities-2.2.17-r5.ebuild 838 RMD160 eabbdf6a93661be23c44928d5 EBUILD calculate-utilities-2.2.17-r6.ebuild 838 RMD160 26a95cd01bc633878f7c33de9a6990f07835d252 SHA1 100364fae1828ab27a54351e7cf2dd9badf62e09 SHA256 5ffd4db1ed6e2e1de201137a7d30eed7247543a0c294eda14c961345f7aad9e0 EBUILD calculate-utilities-2.2.17-r7.ebuild 841 RMD160 2df9886a9bdf03f9f64738ae9862df73decf0e74 SHA1 2904857c354c757ea38a6138b4ffc8a45c1f2a05 SHA256 97bc320598288b8204e5300a96e4e653d6de98ebd76a9e1890c7b99beb9116bb EBUILD calculate-utilities-2.2.17-r8.ebuild 841 RMD160 274fa8d79b0f5dbf687dec6eddc0551ada68000d SHA1 4ec06a7f4a7908bae9167f119c499dc65b97ec4b SHA256 61f0cff5c9448279cd7c67e9a57966b08a439ace1696421d1e9410b562e5e967 +EBUILD calculate-utilities-2.2.17-r9.ebuild 841 RMD160 bbbca3c558b7f99cf801bf2ebcff71fdf8c559c0 SHA1 1f215ef2dd184779fd81e8006180cba0fc774ea4 SHA256 520c283973458ca547e62396b80b7531d1641d75de8103a5a86d52e2587d95a1 EBUILD calculate-utilities-2.2.17.ebuild 829 RMD160 29fb0a089833990a144d2f31cad389d4feaad2a6 SHA1 a2a0a45be11ccbb49772f0bc04dc0be2c68ea361 SHA256 0f96a85ef7e239058d62387237df40e3ba19e310e963226398d91413967a60b3 EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66 -MISC ChangeLog 13425 RMD160 a35e5eede363599c89c31b44af400ee11d455ccf SHA1 3570d63c626f32ab5f5920bc7a133349eaa565ae SHA256 93c06aca1bbfae8069cb8a4dc147bd101a641f768009377b0a509063ba17e6fb +MISC ChangeLog 13594 RMD160 7b77c710e0e7cff8226a2b62cd05807068a62d63 SHA1 b1b9becc62a1166824219b5c46d0506123705a2c SHA256 55fe4f07faa048fbe9c034376a2d62c253aa52329d05384fe633bf97c38e9e42 diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.17-r9.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.17-r9.ebuild new file mode 100644 index 000000000..2b6417ae9 --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.17-r9.ebuild @@ -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.17-r2 + =sys-apps/calculate-templates-2.2.17-r5 + =sys-apps/calculate-lib-2.2.17-r3 + + cl_assemble? ( =sys-apps/calculate-assemble-2.2.17-r1 ) + cl_builder? ( =sys-apps/calculate-builder-2.2.17 ) + cl_client? ( =sys-apps/calculate-client-2.2.17 ) + cl_desktop? ( =sys-apps/calculate-desktop-2.2.17 ) + cl_installgui? ( =app-misc/calculate-install-gui-2.2.17 ) + + cl_server? ( =sys-apps/calculate-server-2.1.14-r4 ) +" +