Добавлена поддержка samba-4.11 для calculate-server

4 years ago · e15abf1729
parent 1ffaaa3388
commit e15abf1729
6 changed files with 231 additions and 2 deletions
--- a/profiles/templates/3.6/2_ac_install_merge/net-fs/samba/smb.conf.client
+++ b/profiles/templates/3.6/2_ac_install_merge/net-fs/samba/smb.conf.client
@ -1,4 +1,9 @@
-# Calculate name=smb.conf format=samba pkg(kde-apps/kio-extras)!=||pkg(gnome-base/gvfs)!=&&grep(/etc/samba/smb.conf,client\x20max\x20protocol)==
+# Calculate 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#
--- a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini
+++ b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini
@ -2,4 +2,4 @@

 [overlay-calculate]
 # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
-remerge = 20200131
+remerge = 20200221
--- a/profiles/templates/3.6/6_ac_update_sync/remerge/2020/20200221
+++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2020/20200221
@ -0,0 +1,4 @@
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=net-fs/samba
+
+[overlay-calculate]
+remerge = #-cl_pass_file-#
--- a/profiles/templates/3.6/6_ac_update_sync/revision/2020/20200221-fix_samba_calculate-server
+++ b/profiles/templates/3.6/6_ac_update_sync/revision/2020/20200221-fix_samba_calculate-server
@ -0,0 +1,12 @@
+# Calculate run=/bin/bash ini(overlay-calculate.revision)=>20191116.3,#-cut(0,-,#-cl_pass_file-#)-#&&grep(/var/lib/calculate/calculate.env,sr_samba_set\x20=\x20on)!=
+
+#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-#
+
+if grep "server min protocol" /etc/samba/smb.conf &>/dev/null
+then
+	sed -i 's/server min protocol.*/server min protocol = NT1/' /etc/samba/smb.conf
+else
+	sed -i '/\[global\]/a\\tserver min protocol = NT1' /etc/samba/smb.conf
+fi
+
+exit 0
--- a/sys-apps/calculate-server/calculate-server-2.1.19-r12.ebuild
+++ b/sys-apps/calculate-server/calculate-server-2.1.19-r12.ebuild
@ -0,0 +1,195 @@
+# 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-r3
+	>=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
+		>=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=(
+		# fix init.d/sortmilter
+		"${FILESDIR}"/calculate-server-2.1.19-fix_sortmilter.patch
+		"${FILESDIR}"/calculate-server-2.1.19-fix_mailservice.patch
+		"${FILESDIR}"/calculate-server-2.1.19-fix_certgen.patch
+		"${FILESDIR}"/calculate-server-2.1.19-fix_jabber.patch
+		"${FILESDIR}"/calculate-server-2.1.19-fix_gendh.patch
+		"${FILESDIR}"/calculate-server-2.1.19-fix_sambaminversion.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"
+}
--- a/sys-apps/calculate-server/files/calculate-server-2.1.19-fix_sambaminversion.patch
+++ b/sys-apps/calculate-server/files/calculate-server-2.1.19-fix_sambaminversion.patch
@ -0,0 +1,13 @@
+diff --git a/profile/samba/etc/samba/smb.conf b/profile/samba/etc/samba/smb.conf
+index d11542c..4b1a877 100644
+--- a/profile/samba/etc/samba/smb.conf
+++ b/profile/samba/etc/samba/smb.conf
+@@ -86,7 +86,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
+  
+ 	# Поддержка wins
+ 	# --------------------------------------------------------------------