diff --git a/sys-apps/calculate-server/ChangeLog b/sys-apps/calculate-server/ChangeLog index b8e4bd054..d2449218e 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-r2 (03 Jun 2011) + + 03 Jun 2011; Mike Hiretsky (mhiretskiy) + +calculate-server-2.1.14-r2.ebuild, + +files/calculate-server-2.1.14-rename_param.patch: + Update for rename param. + *calculate-server-2.1.14-r1 (31 May 2011) 31 May 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-server/Manifest b/sys-apps/calculate-server/Manifest index b0677daa3..08d3793c0 100644 --- a/sys-apps/calculate-server/Manifest +++ b/sys-apps/calculate-server/Manifest @@ -2,6 +2,7 @@ AUX calculate-server-2.1.13-fifo_fix.patch 1122 RMD160 e015ecfd39ff9dd62fbee98ae 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-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 DIST calculate-server-2.1.14.tar.bz2 167957 RMD160 a2d349f1cd6a6107f7e32b79b5189e5a0530b440 SHA1 3f23fb09fb7b67f14d48c8ffb3edc03e5eef95a9 SHA256 3c5b4de78df05c545884995d50fd5b8b53c6d9742d91e699d8fd1d9020168e05 EBUILD calculate-server-2.1.13-r1.ebuild 5100 RMD160 1a8e0de5d7a283a4bdddc644e4cb72d8c9a2f5a8 SHA1 4b4002c079fe429e94fc9fe750847a588b1ece94 SHA256 cdce4a2c954bfcdc6deb32c2af1a5a56083aedf7a382f7645ac1fd83043a82d6 @@ -9,7 +10,8 @@ EBUILD calculate-server-2.1.13-r2.ebuild 5184 RMD160 c25bba74a1d999c47066a04092f EBUILD calculate-server-2.1.13-r3.ebuild 5261 RMD160 0cba75d6a711127b6a213e6181e346539aa60d84 SHA1 2056fa023ba26f855bc58431d639381c291a1a94 SHA256 7909ee9e15be1005374e1dda50bfd4ef475c9dcca97cb0ea1f4bc565ca2a528c EBUILD calculate-server-2.1.13.ebuild 4947 RMD160 f84f1384fcd7705a718b5c88b6066e262987ac3b SHA1 596a88a3e393f689a0d76ddb3dc723d03b3eb816 SHA256 feee22c11dd0617ea25164445bd1f074d06a3e30a2b57704d325f71ae6e4bb66 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.ebuild 4966 RMD160 0a71a8217e53bec9c87669713e3007a5097e9b19 SHA1 6c284957f2841655facc4301cc7a9945d5f95876 SHA256 a7d071a4a1b10e1a03ebec2509be004ddcad0831976a05e88aa2ebbbee4fa986 EBUILD calculate-server-9999.ebuild 1032 RMD160 1b7daa72a3ed2e85c4d12a9e7acbcd12dfb9254b SHA1 05b16c21743b21cc5dfdde4a917f426b1bfcc46d SHA256 5df5730fe598902d17b3b1d6f591e1a0c16e90c0be7986dfa62390aa6c991b58 -MISC ChangeLog 6502 RMD160 adf493c28ec2499a69bce1d1cfcb0480e1234373 SHA1 6f9fbbff9f0c32c5ed4e58cdc9682735399201f3 SHA256 07e6dfe13dce38023cc4232776b51d1361773e37a9dad0d775285ec52c7020db +MISC ChangeLog 6724 RMD160 6d27e2b005d6fe4c9a2be9fbde9523528117de3f SHA1 bccbb4cab2a28d756dae0dd38903a87e1c6ba037 SHA256 99a5f346f115e821b9d9700a163c4c9843d2342ecd499320e9388c239bf16210 MISC metadata.xml 286 RMD160 e243725ec1a1302cab0d0efee76a4a926e855916 SHA1 6071aa604ea5a1ba8e1772e8f37a24f26b893d8d SHA256 aab7ddde310df96da76277d5ae340a4b0926bec3b354bfb2fea3288081036d74 diff --git a/sys-apps/calculate-server/calculate-server-2.1.14-r2.ebuild b/sys-apps/calculate-server/calculate-server-2.1.14-r2.ebuild new file mode 100644 index 000000000..a42752a27 --- /dev/null +++ b/sys-apps/calculate-server/calculate-server-2.1.14-r2.ebuild @@ -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-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-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" +} diff --git a/sys-apps/calculate-server/files/calculate-server-2.1.14-rename_param.patch b/sys-apps/calculate-server/files/calculate-server-2.1.14-rename_param.patch new file mode 100644 index 000000000..286125030 --- /dev/null +++ b/sys-apps/calculate-server/files/calculate-server-2.1.14-rename_param.patch @@ -0,0 +1,46 @@ +commit b450c3dad3c7aa06d213342acca5fd15d0facca5 +Author: Mike Hiretsky +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", diff --git a/sys-apps/calculate-utilities/ChangeLog b/sys-apps/calculate-utilities/ChangeLog index a8af2836e..da3e51d2b 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.15-r7 (03 Jun 2011) + + 03 Jun 2011; Mike Hiretsky (mhiretskiy) + +calculate-utilities-2.2.15-r7.ebuild: + Update for server. + *calculate-utilities-2.2.15-r6 (31 May 2011) 31 May 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 36149d372..d93aeef51 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -17,6 +17,7 @@ EBUILD calculate-utilities-2.2.15-r3.ebuild 835 RMD160 fdaed0dfa80627e09cd92df77 EBUILD calculate-utilities-2.2.15-r4.ebuild 838 RMD160 0ac5b0baa9591e32d3bc1fb83259a1af6f145ef3 SHA1 cb20981186bc64ac2164699e4e28cd63c121ff71 SHA256 3b6c1f777bac3ca53fea9a2441873ca79cd6241d135f9f9c5285a5f678ae2161 EBUILD calculate-utilities-2.2.15-r5.ebuild 835 RMD160 42276695e9bf95587ec5eace649fa843e9362328 SHA1 bae5173d4ff7ab20a7f77a559efc9da9b5670b48 SHA256 2ee5b5a91cb90139cef361a3db7cac87c846009bf7db3a6ac0b99fd444c7bc9f EBUILD calculate-utilities-2.2.15-r6.ebuild 838 RMD160 f0c7a4b6c12275c0449e425b6106321d22e08889 SHA1 5bc93df591f212e427427f59f60ca10afadd1274 SHA256 a9aeb9d16c68b093a14d572173cf0eba4bbf69aac2343bb88fe66ac43a090037 +EBUILD calculate-utilities-2.2.15-r7.ebuild 838 RMD160 e7bd561b748a694cdf0eb38ba147275f87d9825e SHA1 f233c7cdc657c94547c1ac49ff183ef6dd318960 SHA256 b7d23b34efc574ea82da2fb0873c7dada7c5b22fff0eac9faf2b6374b10fc1c6 EBUILD calculate-utilities-2.2.15.ebuild 829 RMD160 08af4128804390a3611da9de6a0877f86f837c03 SHA1 d4c713a63a074a193a2a8a614ed80c5e343af871 SHA256 5e60616c449b464b7163a25c32f1dd5a565d5c878b823a23b2848fda49d0afca EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66 -MISC ChangeLog 9597 RMD160 f5ddec872bd92f5921115cbd64a5f93d01520de4 SHA1 c6ad8a1052039a2e55d80861679cba75a754f8dc SHA256 686393b8410c64f502e1e68846785e127ac2ba1c8b9b0ffbcd439b79002fe96e +MISC ChangeLog 9766 RMD160 821532d4715028b8e85f9fe93b0b734db0b8d9d9 SHA1 61c313ae11773a7268aca4992b0537712e863e04 SHA256 4ee79c5fb5156c309b8feb85a14116fd76c5e3111a5a433862cb87a9381c95be diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.15-r7.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.15-r7.ebuild new file mode 100644 index 000000000..2cfdc5bee --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.15-r7.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.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 ) +" +