Merge branch 'develop' of git.calculate-linux.org:calculate/calculate-overlay into develop

mhiretskiy
Alexander Tratsevskiy 3 years ago
commit 9b7797ddba

@ -59,7 +59,7 @@ cl_remote_host = ''
os_remote_auth = ''
os_remote_client = ''
cl_moved_skip_path = Laptop,Disks,Home,Moved,FTP,Desktop,Share
cl_sync_skip_path = Home,Share,FTP,Disks,Laptop,.cache,.claws-mail/*/*bak,.claws-mail/*bak,.claws-mail/imapcache,.claws-mail/tmp,.config/chromium/Default/Archived History*,.config/chromium/Default/History*,.config/chromium/Default/Service Worker/CacheStorage,.config/chromium/Default/Service Worker/ScriptCache,.config/*/*/GPUCache,.config/*/GPUCache,.config/libreoffice/4/user/uno_packages/cache,.config/libreoffice/*/user/backup,.config/qupzilla/crashlog,.config/qupzilla/profiles/default/networkcache,.config/Riot/Cache,.config/Rocket.Chat/Cache,.config/Rocket.Chat/Code Cache,.config/skypeforlinux/Cache,.ecryptfs,.googleearth/Cache,.gvfs,.local/share/akonadi/db_data,.local/share/mime/mime.cache,.local/share/Steam,.local/share/TelegramDesktop/tdata/user_data*,.local/share/Trash,.logout,.mozilla/firefox/*/Cache,.mozilla/firefox/calculate.default/urlclassifier3.sqlite,.PlayOnLinux,.Private,.Skype/Logs/skype*,.thumbnails,.Xauthority,.xsession-errors.old
cl_sync_skip_path = Home,Share,FTP,Disks,Laptop,.cache,.claws-mail/*/*bak,.claws-mail/*bak,.claws-mail/imapcache,.claws-mail/tmp,.config/chromium/Default/Archived History*,.config/chromium/Default/History*,.config/chromium/Default/Service Worker/CacheStorage,.config/chromium/Default/Service Worker/ScriptCache,.config/*/*/GPUCache,.config/*/GPUCache,.config/libreoffice/4/user/uno_packages/cache,.config/libreoffice/*/user/backup,.config/Microsoft/Microsoft Teams/Cache,.config/Microsoft/Microsoft Teams/Application Cache,.config/qupzilla/crashlog,.config/qupzilla/profiles/default/networkcache,.config/Riot/Cache,.config/Rocket.Chat/Cache,.config/Rocket.Chat/Code Cache,.config/skypeforlinux/Cache,.ecryptfs,.googleearth/Cache,.gvfs,.local/share/akonadi/db_data,.local/share/mime/mime.cache,.local/share/Steam,.local/share/TelegramDesktop/tdata/user_data*,.local/share/Trash,.logout,.mozilla/firefox/*/Cache,.mozilla/firefox/calculate.default/urlclassifier3.sqlite,.PlayOnLinux,.Private,.Skype/Logs/skype*,.thumbnails,.Xauthority,.xsession-errors.old
cl_sync_del_path = .kde4/cache-*,.kde4/share/config/phonondevicesrc,.kde4/tmp-*
cl_profile_all_set = off
cl_client_nscd_cache = 3

@ -36,7 +36,7 @@
~app-cdr/dumpet-2.1_p20140601 amd64
~app-crypt/acme-sh-2.8.8 amd64
~app-crypt/acr38u-1.7.11 amd64
~app-crypt/aescrypt-3.0.6b amd64
~app-crypt/aescrypt-3.14 amd64
~app-crypt/asedriveiiie-serial-3.5 amd64
~app-crypt/asedriveiiie-usb-3.5 amd64
~app-crypt/asekey-3.7 amd64
@ -97,7 +97,7 @@
~app-dicts/mecab-unidic-2.1.2 amd64
~app-dicts/sword-br_en-1.1 amd64
~app-dicts/sword-la_en-1.1 amd64
~app-editors/kakoune-2020.01.16 amd64
~app-editors/kakoune-2020.01.16_p20200601 amd64
~app-editors/le-1.16.5 amd64
~app-editors/ng-1.5_beta1 amd64
~app-editors/qhexedit2-0.8.6_p20190316 amd64
@ -114,7 +114,7 @@
~app-emulation/docker-swarm-1.2.9 amd64
~app-emulation/dynamips-0.2.21 amd64
~app-emulation/edumips64-1.2 amd64
~app-emulation/gxemul-0.6.0 amd64
~app-emulation/gxemul-0.6.2 amd64
~app-emulation/hyperd-0.7.0 amd64
~app-emulation/libspectrum-1.4.4 amd64
~app-emulation/qemu-init-scripts-0.3.0 amd64
@ -710,7 +710,7 @@ net-vpn/wireguard-tools amd64
~x11-misc/whaw-0.2 amd64
~x11-misc/xcalib-0.10 amd64
~x11-misc/xcape-1.2 amd64
~x11-misc/xcave-2.4.0 amd64
~x11-misc/xcave-2.5.1 amd64
~x11-misc/xdo-0.5.7 amd64
~x11-misc/xdock-0.3.0 amd64
~x11-misc/xgestures-0.4 amd64

@ -8,7 +8,7 @@
~media-fonts/exljbris-free-20100320 amd64
~media-fonts/fantasque-sans-mono-1.8.0 amd64
~media-fonts/fifth-leg-0.6 amd64
~media-fonts/fira-mono-3.205 amd64
~media-fonts/fira-mono-4.202 amd64
~media-fonts/font-schumacher-misc-1.1.2 amd64
~media-fonts/hermit-1.21 amd64
~media-fonts/heuristica-1.0.2 amd64

@ -1,9 +0,0 @@
# Calculate protected name=smb.conf format=samba pkg(kde-apps/kio-extras)!=||pkg(gnome-base/gvfs)!=
[global]
#?grep(/etc/samba/smb.conf,client\x20max\x20protocol)==#
client max protocol = NT1
#grep#
#?grep(/etc/samba/smb.conf,client\x20min\x20protocol)==#
client min protocol = NT1
#grep#

@ -0,0 +1,7 @@
# Calculate run=/bin/bash ini(overlay-calculate.revision)=>20191116.3,#-cut(0,-,#-cl_pass_file-#)-#
#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-#
sed -r -i '/(server|client) (min|max) protocol.*NT1/d' /etc/samba/smb.conf
exit 0

@ -0,0 +1,192 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
DISTUTILS_USE_SETUPTOOLS=manual
inherit distutils2 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-r7
dev-python/setuptools-python2
>=net-nds/openldap-2.3[-minimal]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
!<sys-apps/calculate-utils-3.5.0_alpha44
!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-python2
>=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
media-gfx/graphicsmagick )
)
!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}"
PATCHES=(
"${FILESDIR}"/calculate-server-2.1.20-remove_profile_pack.patch
"${FILESDIR}"/calculate-server-2.1.20-remove_min_version.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,19 @@
commit acb67f1857a42aa649b8952c29b3ab1bf5dc8935
Author: Хирецкий Михаил <mh@calculate.ru>
Date: Mon Mar 15 17:08:57 2021 +0300
Remove min protocol option
diff --git a/profile/samba/etc/samba/smb.conf b/profile/samba/etc/samba/smb.conf
index 4eeb2d4..03fe2f8 100644
--- a/profile/samba/etc/samba/smb.conf
+++ b/profile/samba/etc/samba/smb.conf
@@ -117,7 +117,7 @@ chown=root:root
hide unreadable = yes
hide dot files = yes
socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
- server min protocol = NT1
+ !server min protocol =
# Поддержка wins
# --------------------------------------------------------------------

@ -2,6 +2,7 @@ DIST calculate-builder-3.6.8.tar.bz2 42331 BLAKE2B 9d701b522d969f4f34ea6be5590b2
DIST calculate-builder-3.6.9.tar.bz2 42512 BLAKE2B ed94c820a9b736c7016add9af32784cf962eeb82b7094451a8e548e7aa12fa345c21d32eb8036ee1100aa4d9c3b647f8a33f36dbdc287a07868429af82c42bc4 SHA512 0aa342c5dbb00c4b81d2c9a85bf6b8f91dd6cf7bd4e9bb1124cb59ef0038068d1b11eaa77677c81027571762be37a69b3b46790a59f3add819765a1f83fa88f8
DIST calculate-client-3.6.8.2.tar.bz2 31700 BLAKE2B 2188029d5c92dd70d3e925fc04c0fd8769d5278aa495172bcc78ae8b92379cdbeae178c0777a03b6da943a1161376389011940c19e80ee675e9fdab8eef16643 SHA512 f0bd6bbdb3bd18322cd9f700a31ea11858a589d4868df0b8f043e768ebc2642f245f34d0d52563aef164589a1e224341a9968c3c46c54c2a1341ce28b6f3662f
DIST calculate-client-3.6.9.1.tar.bz2 33706 BLAKE2B 54560219524331920f225902d5f376cd53c960da8410280f1b7cc20da781ed9ec7c3f459f8c5adcaaebe6c562c99afa5962a0da5b58bbaa26651a9eefb76b389 SHA512 7785c45709f0712099156bcc934418f9eebde0e12ff238b5fb87be5c65f6e61e416145440c6a300f8e1ccf051c515153af1e34a0756ea8781f920b668e8e81d5
DIST calculate-client-3.6.9.2.tar.bz2 33726 BLAKE2B 21685da116a0782bda87e530b6cb18138ec84024ee97ae93b09ba0336be8cac74e772dc49d01d75cd66f5dbb0100f6031857624586103d6b8b266a123fe079b1 SHA512 201ff61cb42878d528c41fe34d911cfce1efd71376c5c57b14a285a24dfc3c4019a10d8c8f67472f49e3e32c4b1375540b7909af87cc2e3941c33b1a7c060957
DIST calculate-client-3.6.9.tar.bz2 33720 BLAKE2B b79557317dbf0f958859c07d40d8a19ea40ded5bd3417ad12e007c417db0f01070391e1a62a1e8b92d2001eed799f70f000c3d21cdb2a86185ada35b5ca18c1d SHA512 4347cdf6bdf619c0895f03da41db44bce2e33452bccb0969d637cec4966ca2f87cc3b72d4a6eeec8a055ad05adcb8d76ecedcde8c6fad0fc59279531fa837013
DIST calculate-console-3.6.8.tar.bz2 24777 BLAKE2B ae2a75832940a91f7dc169493269b736fc53f41f61bf0b62ff16be3cbbf0d4732a90e8a5f4d1574a64fa7701d266b2ee6f232946fb777d08db7cdf545580dc34 SHA512 4917a2662fed949c07c039721d9aba1cfe46171dfe942894c6d1811f26be278c20629e20586fbe1d3b2b374089e51ca68c104a7b80c2fd4d55d49f0f3f17ee7a
DIST calculate-console-3.6.9.tar.bz2 24744 BLAKE2B 5e3d4ef8ae89a24aef15d3498b163555e519b5c6ee4ac3375380c04271fbbbfc4a05620395fad2228d5cb3b3165ece51976ab1a415f426901a3b57153bff4889 SHA512 c9d62161683dcfdfcbb9e0301d16d4ff595f41d270f7dc2f965652f625c29b3d1d8217d664ba109bc7d6ed1eefacf501010379bd6d70c017aadab7df71f86ab6

@ -0,0 +1,20 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="7"
PYTHON_COMPAT=(python2_7)
declare -A CALCULATE_MODULES=(
["client"]="3.6.9.2"
)
inherit calculate-utils-r12
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="amd64"
Loading…
Cancel
Save