Обновление утилит, миграция /etc/calculate/calculate.env->/var/lib/calculate

atratsevskiy
parent 6529185963
commit 385e0a1261

@ -216,6 +216,7 @@ RDEPEND="
dev-python/pexpect[python_targets_python2_7]
!<sys-apps/calculate-lib-2.1.12
!sys-apps/calculate-lib:3
!sys-apps/calculate-i18n:3
!sys-apps/calculate-client:3

@ -1,2 +1,2 @@
# Calculate path=/etc name=calculate
# Calculate path=/var/lib name=calculate

@ -1,42 +0,0 @@
# Calculate format=raw name=calculate.env comment=# pkg(sys-apps/calculate-utils)<3.4.0_beta1
[install]
#?os_root_type==hdd&&cl_autopartition_set==off#
os_install_dev_from = #-os_root_dev-#
#os_root_type#
#?cl_autopartition_set==on&&cl_install_dev_from!=#
os_install_dev_from = #-cl_install_dev_from-#
#cl_autopartition_set#
#?os_root_type==hdd#
os_install_ntp = #-os_install_ntp-#
#os_root_type#
os_install_net_settings = #-os_install_net_conf-#
#?cl_autologin!=&&os_install_linux_shortname!=CMC&&os_install_root_type!=livecd#
cl_autologin = #-cl_autologin-#
#cl_autologin#
#?cl_autologin==&&os_install_linux_shortname==CMC&&os_install_root_type!=livecd#
cl_autologin =
#cl_autologin#
[main]
# Set auto-update configuration files.
cl_autoupdate_set = off
#?os_install_root_type!=livecd#
# keep value of root dev uuid (8 char) for kernel symlink
cl_kernel_uid = #-cl_install_kernel_uid-#
#os_install_root_type#
#?os_install_linux_build!=#
# current linux build
os_linux_build = #-os_install_linux_build-#
#os_install_linux_build#
cl_home_crypt_set = #-cl_install_home_crypt_set-#
[update]
# auto-check updates
cl_update_autocheck_set = #-cl_install_autocheck_set-#
# interval for update auto-check
cl_update_autocheck_interval = #-cl_install_autocheck_interval-#
# clean packages and distfiles
cl_update_cleanpkg_set = #-cl_install_cleanpkg_set-#
# update other overlays
cl_update_other_set = #-cl_install_other_set-#

@ -1 +1 @@
# Calculate path=/var/lib/calculate name=ini.env link=/etc/calculate/ini.env mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_alpha38
# Calculate path=/var/lib/calculate name=ini.env link=/etc/calculate/ini.env mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_alpha38&&load(/etc/calculate/ini.env)!=

@ -0,0 +1 @@
# Calculate path=/var/lib/calculate name=calculate.env link=/etc/calculate/calculate.env mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_alpha39&&load(/etc/calculate/calculate.env)!=

@ -0,0 +1 @@
# Calculate path=/etc/calculate name=calculate.env append=remove mergepkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_alpha39

@ -1,4 +1,4 @@
# Calculate path=/etc/calculate format=samba os_audio==alsa
# Calculate path=/var/lib/calculate format=samba os_audio==alsa
[install]
os_audio = alsa

@ -1,4 +1,4 @@
# Calculate path=/etc/calculate format=samba os_audio==pulseaudio
# Calculate path=/var/lib/calculate format=samba os_audio==pulseaudio
[install]
os_audio = pulseaudio

@ -1,4 +1,4 @@
# Calculate format=samba path=/etc/calculate name=calculate.env merge(sys-apps/calculate-utils)!=&&module(client)==&&ini(merge-calculate.client)!=
# Calculate format=samba path=/var/lib/calculate name=calculate.env merge(sys-apps/calculate-utils)!=&&module(client)==&&ini(merge-calculate.client)!=
[!client]

@ -1,4 +1,4 @@
# Calculate path=/etc/calculate comment=# format=samba
# Calculate path=/var/lib/calculate comment=# format=samba
[main]
cl_autoupdate_set = on
cl_template_locate = #-cl_builder_template_location-#

@ -1,4 +1,4 @@
# Calculate comment=# format=samba path=/etc/calculate
# Calculate comment=# format=samba path=/var/lib/calculate
[main]
os_linux_build = #-os_builder_linux_build-#
os_linux_files = #-os_builder_linux_files-#

@ -1,4 +1,4 @@
# Calculate format=samba merge=x11-base/xorg-server,x11-misc/lightdm cl_setup==session||cl_setup== path=/etc/calculate name=calculate.env
# Calculate format=samba merge=x11-base/xorg-server,x11-misc/lightdm cl_setup==session||cl_setup== path=/var/lib/calculate name=calculate.env
[main]
cl_home_crypt_set = #-cl_install_home_crypt_set-#

@ -1,4 +1,4 @@
# Calculate format=samba ini(overlay-calculate.revision)<66 name=calculate.env path=/etc/calculate
# Calculate format=samba ini(overlay-calculate.revision)<66 name=calculate.env path=/var/lib/calculate
#-ini(overlay-calculate.revision,88)-#

@ -0,0 +1 @@
# Calculate chmod=0644 link=/var/lib/calculate/calculate.env mirror

@ -0,0 +1 @@
# Calculate chmod=0644 link=/var/lib/calculate/ini.env mirror

@ -1 +1,2 @@
DIST calculate-lib-2.1.11.tar.bz2 61687 SHA256 62976c08d4fb4810389ace6f5a99abb5a962f6c8d9053ff943d0669480fb5599 SHA512 e3bc2168a55367cf19ad3a27921b53e5e845643238bf171209ab29752c91b5d4d338a2120774764ac1c79abd93f2deff8680f8faa1407940984ea9fd6a199e67 WHIRLPOOL 0ced92ea493dd8db02b0ae1514ebbb51ee76dc6f441b4a38c984c39da2121fb81dd1f2e840c4c5b71a117a12817a2a269d85676288202aa9801f69727e3338dc
DIST calculate-lib-2.1.12.tar.bz2 62375 SHA256 43d74a948e0881fc65cb268e58499d3b4a8c7e5507a0d50ceeebdd3c25aed801 SHA512 a7c53d8333f8ee11b0536fbe8f7284e3b19a226b67034e84831fbb47b9d4df5f1da9631c0f15ad8ccadfca4aa6d6d5c7ed35dde6ab0e6a77618a15d1f04fbe40 WHIRLPOOL aff11ed2c9785640cbeae7213e7f90ce55721e3bc828aff872c1b6ca652c9ae706d81dbd6f071b2cbfa0b3a3376cf0fe7d20c9ad3db7f2607b277bced07a76da

@ -0,0 +1,24 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 eutils
SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/calculate2/${PN}/${P}.tar.bz2
http://mirror.yandex.ru/calculate/source/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}"

@ -0,0 +1,183 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python{2_6,2_7})
inherit distutils-r1 eutils
SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/calculate2/${PN}/${P}.tar.bz2
http://mirror.yandex.ru/calculate/source/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Configuration utility for Linux services"
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.12
>=net-nds/openldap-2.3[-minimal]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
!calculate_nosamba? (
|| (
<net-fs/samba-4[acl,client,cups,ldap,netapi,pam,server,smbclient]
>=net-fs/samba-4[acl,client,cups,ldap,pam]
)
)
!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,ldap]
>=net-im/ejabberd-16.04-r1[ldap] )
>=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}"
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"
}

@ -22,8 +22,10 @@ DIST calculate-ldap-3.5.0_alpha8.tar.bz2 11926 SHA256 49dd74c0a0d4cdc6d3afb424a5
DIST calculate-lib-3.4.7.2.tar.bz2 166379 SHA256 0c8f83f04d41cbdca8e6a0291d7c36a13724b1c6207d0dd83e1c9394932b4438 SHA512 6e7798dbe335016e750e1a3bc19e1539f92d31ccf950dbe67d863841de0ba06a9af5f02f99549093e05ea80d576c578db1ecae4c417490735cbbd5ceb77111c8 WHIRLPOOL 1037719f470c8f864e554d84b7694d2b47d2f4b9a46823cda2b2bf5f59889d52a7417b6500716ebdb0604c11d2888c56db8965ba6b707ebc98e88eb91e47efb4
DIST calculate-lib-3.4.7.3.tar.bz2 166195 SHA256 5ba86a793f95a4a7a6a8746688ac70f6d7edc13da7d4971d3be0f2055b98271c SHA512 d8dd78b60f3c35bb3affd77b191975b1cab6f09b9060ea1126fc3e02bf660adee0843a591c850992acee42dee3629fd269a960263de05e89078f77c7bbfaab78 WHIRLPOOL 3459bced747dea82d92c2ed5ca60505ea27684613e0b2e7fe828515d633b3ec6b20a9440502b8df6fc654007186a67d6911c6e0ad01b898cc779fe7f8dcca8d3
DIST calculate-lib-3.5.0_alpha23.tar.bz2 176666 SHA256 e527469e42d084dae70acdc811693ff050c16f966e08da91c1e5a07900d3bfc6 SHA512 7f9c8093fd53abcc30706a87f158b47d156f3d705227589844296d2c814a059c4c460f989e8ec8d6b2e5936b460585c8c9985efbeb77ed2d27a15bdcddf14b37 WHIRLPOOL 850ca9a745d771b2df2aca619389945950f74cd3d6c46e85c3e62b21c2e8e6332874c86906e5b698cab8bf8853cf37497f9e1e78489b8a59477e6361e076195f
DIST calculate-lib-3.5.0_alpha24.tar.bz2 176504 SHA256 643a347797bdfe2e211c82a2b3780bab3c1295c1780662c9d990f93d8729c4b3 SHA512 22d9e443f5851284a66da3d75f4a9d1787d39e1f05fc857cf0ce4b63c2259d649c2d51f9d41cf9c0e65c7529b8a42418c7a41bb6370d32dd624d4fa46a5a1d64 WHIRLPOOL e600ac7584a45016be89073f261240aed57208edb8362d7f21deaf82f1dd50904033e07f27931a8fefe06cab6be11f4261c79b8fb21b3333815479f40ff8dbe3
DIST calculate-server-3.5.0_alpha2.tar.bz2 6668 SHA256 08d8d163342d605ce59990d4c1afaef804179ef782d010d9a324ce1fcbd661bd SHA512 c46454386a9ab1946ec01f0956435215f62d878b9d6ef49f4c6647aa94c5fceee6b225177585bd63690132d5a4798aefe8985bf70501a734b4357c5b35b26cc2 WHIRLPOOL 4ce730734337d6866141905e318fd24916c8aa3261ce8c50490b21ead71001272228ed21942d002e88a20f247d031d9b7e46529e8d64ac7d6a8bb1bb24e4021e
DIST calculate-unix-3.5.0_alpha4.tar.bz2 21764 SHA256 1834dc83decc5280a71900ea6eb092aef9305efb0ef6ca49beb39970bf4509dd SHA512 d0ddd1252581a8ac3173533b72b0ce37a909a66b4f1df0e8e4749af30ef180eeb6e773ed30d57006e4148d14caec88df303529a2ceaece782b9de890a585284b WHIRLPOOL 182a7edea1e33566c7fc2c52ae35bb76e2297dee66f52b506adb85db85f6abf15b8aa6513f74d4161c875bd53b50da20d7f23add5f6c23b71ae5da10f42f8579
DIST calculate-update-3.4.7.4.tar.bz2 33564 SHA256 bfae076d06cd0f3be1bed85e04669cca98ea199ffbf47f71335ddef206ce617d SHA512 34fc287431461f00322875a9f3bd5f467e2946d051ff1f6340a669e93ecb27f3bbeb4e0f6073ec5067b9392f4fe8d6581c4ad2ed3462ade4917f5a2879bf82b4 WHIRLPOOL e2b6f5f64bb9470fd99bc9f7ed090a47090cb0e4682628ff0e96115416e74bb1690ad4693cffb1a1bb472e9a87ccbc09816c0ce49d448cb5ce3a28fdb9a47704
DIST calculate-update-3.4.7.5.tar.bz2 33610 SHA256 615ac4a101caaa88cb14026f871a585a46fd65bcfe279337ac07f75567c6c841 SHA512 0b1bbc0726e06706bdbf00f49fd48204a166294b17d0a3f7f65812825733364eca2cca15e736636802141a6dc7ef8648dddf848baa0d1897f064130514eba3db WHIRLPOOL b1aa709756fb6060736777731cbd093f2d9981cdef9e8c9c112c7888b37517724873672b5d53eaa7de36daa6943a170fd7639a6155e9c05929936388425bb4da
DIST calculate-update-3.5.0_alpha4.tar.bz2 33673 SHA256 63ebd29e0d1f27a1efc3ba981fc15a1d4860817360c25406d7079fb711cdc99e SHA512 b80f9c0e2fa0ee05e0a14f9760b512a78ee12b1f76eebfb6fccf0b32c91c1405ddcedfba78c912fc726013d9513abab3b84bc5a4c262abfd34d1ba06ef7132a3 WHIRLPOOL d2b0e90f356298e0cb25833e929d80f37222bd7014928f4d068a1f03708e73831537de92b1a2bba7bf20922ba10e529b746f62651c27f901a3c41ac529864e30
DIST calculate-update-3.5.0_alpha5.tar.bz2 33715 SHA256 ba8004ec2423803a544d015067ecde0ae5dd50563864c47a13d33d814f29e0f2 SHA512 9dfebd7369fde1d0c13f691429892299fcab6775b8f3d62dee9b225849c29137c3bcdbcbce12426614a0eaac25852f44acc8f3ed1766a062db009a0dce1942d2 WHIRLPOOL 51bf6b0493179f1d96d70f3644bb0a998ac3615f6902eda4d2d7690011d3c27e5719531cfa0bb5dcc4436207baf87c52c1f0ffad7de43fb8ac1b5249f3a81707

@ -0,0 +1,34 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
UTILS_PV="3.5.0_alpha2"
declare -A CALCULATE_MODULES=(
["lib"]="3.5.0_alpha24"
["install"]="3.5.0_alpha8"
["core"]="3.5.0_alpha15"
["i18n"]="3.5.0_alpha3"
["client"]="3.5.0_alpha5"
["desktop"]="3.5.0_alpha5"
["console"]="3.5.0_alpha7"
["console-gui"]="3.5.0_alpha23"
["update"]="3.5.0_alpha5"
["builder"]="3.5.0_alpha3"
["ldap"]="3.5.0_alpha8"
["unix"]="3.5.0_alpha4"
)
inherit calculate-utils-r1
DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS=""
Loading…
Cancel
Save