Добавлена поддержка samba-4.11 для calculte-server, и calculate-utils[client]

mhiretskiy 2189
parent 35e89e4ce2
commit 76ade870da

@ -0,0 +1,5 @@
# Calculate format=openrc path=/etc/conf.d
#?pkg(sys-apps/calculate-server)!=#
daemon_list="smbd nmbd winbind"
#pkg#

@ -15,6 +15,16 @@
change_permissions() {
local directory=$1
[[ -d $1 ]] || return
local out="$(getfacl $directory 2>/dev/null)"
if ! (grep -q default:user:900:rwx <<<$out && grep -q ^user:900:rwx <<<$out)
then
setfacl -R -m d:u:900:rwx,u:900:rwx $directory
fi
if ! (grep -q "owner: portage" <<<$out )
then
chown 900 $directory
fi
addwrite ${directory}
# get owner from parent directory

@ -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 = 20200805
remerge = 20200821

@ -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-#

@ -0,0 +1,194 @@
# 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-r4
>=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=(
"${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_samba4.11.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,134 @@
diff --git a/profile/samba/etc/samba/smb.conf b/profile/samba/etc/samba/smb.conf
index d11542c..8b25c18 100644
--- a/profile/samba/etc/samba/smb.conf
+++ b/profile/samba/etc/samba/smb.conf
@@ -10,8 +10,7 @@ chown=root:root
# Права на создание файлов
# --------------------------------------------------------------------
- #маска создаваемых директорий для Windows и cifs-клиентов
- directory mask = 0755
+#?pkg(samba)<4.10#
#маска для изменения прав на директории для cifs-клиентов
directory security mask = 0755
#маска создаваемых директорий для smbfs-клиентов
@@ -20,11 +19,27 @@ chown=root:root
#для cifs и smbfs клиентов
security mask = 0644
force security mode = 0644
+#pkg#
+#?pkg(samba)>=4.10#
+ !directory security mask =
+ !force directory security mode =
+ !security mask =
+ !force security mode =
+#pkg#
+ #маска создаваемых директорий для Windows и cifs-клиентов
+ directory mask = 0755
+ force directory mode = 0755
#права файлов на создаваемые и модифицируемые файлы из Windows
create mask = 0644
+ force create mode = 0644
+#?pkg(samba)<4.10#
# добавление админских привилегий в домене группе Domain Admins
enable privileges = yes
+#pkg#
+#?pkg(samba)>=4.10#
+ !enable privileges =
+#pkg#
# Настройки LDAP
# --------------------------------------------------------------------
@@ -59,7 +74,12 @@ chown=root:root
dos charset = 866
unix charset = UTF-8
+#?pkg(samba)<4.10#
display charset = UTF-8
+#pkg#
+#?pkg(samba)>=4.10#
+ !display charset =
+#pkg#
local master = yes
domain master = yes
@@ -79,14 +99,25 @@ chown=root:root
#interfaces = 127.0.0.1 eth0
map to guest = bad user
security = user
+
+#?pkg(samba)<4.11#
encrypt passwords = yes
+#pkg#
+#?pkg(samba)>=4.11#
+ !encrypt passwords =
+#pkg#
# Запрет изменения пароля пользователя windows компьютера
- unix password sync = yes
+ unix password sync = no
+#?pkg(samba)<4.11#
null passwords = no
+#pkg#
+#?pkg(samba)>=4.11#
+ !null passwords =
+#pkg#
hide unreadable = yes
hide dot files = yes
socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
-
+ server min protocol = NT1
# Поддержка wins
# --------------------------------------------------------------------
@@ -124,12 +155,24 @@ chown=root:root
path = #-sr_samba_linprof_path-#/%u
browseable = No
writable = yes
+#?pkg(samba)<4.11#
directory mask = 0777
directory security mask = 0777
force directory security mode = 0
create mask = 0777
security mask = 0777
force security mode = 0
+#pkg#
+#?pkg(samba)>=4.11#
+ !directory security mask =
+ !force directory security mode =
+ !security mask =
+ !force security mode =
+ directory mask = 0777
+ force directory mode = 0
+ create mask = 0777
+ force create mode = 0
+#pkg#
force user = %U
valid users = %U
hide unreadable = no
@@ -162,7 +205,7 @@ chown=root:root
browseable = No
writable = yes
hide unreadable = yes
-#?pkg(net-fs/samba)>=3.5.8#
+#?pkg(net-fs/samba)<4.11#
security mask = 0664
force create mode = 0664
force security mode = 0664
@@ -170,6 +213,16 @@ chown=root:root
force directory mode = 2775
vfs objects = acl_xattr fake_perms
#pkg#
+#pkg(net-fs/samba)>=4.11#
+ force create mode = 0664
+ force directory mode = 2775
+ !security mask =
+ !force directory security mode =
+ vfs objects = acl_xattr
+ inherit acls = yes
+ inherit owner = yes
+ inherit permissions = yes
+#pkg#
#Удаляем ресурс для FTP - сервис FTP не установлен
#?sr_ftp_set==off#

@ -2,6 +2,7 @@ DIST calculate-builder-3.6.7.12.tar.bz2 42323 BLAKE2B 6c77528aed69feda29af6b30f0
DIST calculate-builder-3.6.7.7.tar.bz2 42466 BLAKE2B 7be5e5424d820d78dd284e3e177e046166e3306877ae5a44ecd6a2022842cff23046e13c88da9f8ea4bc03ce5194e22ed702e34c8b97c3d3cfe34a77e1710c78 SHA512 f60c90c1744c5d1f89ec1a3d06836b7f3e9145ae813f260eccf3e7e9cb312c365c01bc2bd792e92af11b7530d37be938d6a6b9d91aaa08d212abac89356af567
DIST calculate-builder-3.6.8.tar.bz2 42331 BLAKE2B 9d701b522d969f4f34ea6be5590b22875d76c27596c2d42dcc1f2ba2dd72a79c48ab3d758879562526783c9c7155fcf0f0cfed03448c4be122f6ec7645d5cfd6 SHA512 668c8bd99cdad2467115516a5fdf8be49e6b77c88f8bce363bd95e82666fb11f12fa09e4fe10252094c3670de097f07f4f2da31aebacc69f149de7d15eb3a081
DIST calculate-client-3.6.7.tar.bz2 31605 BLAKE2B 08686043d8607fdb1fff2edd5c45028f5e6ab6eb2720d48aab668582d33b2ad6385e570987c86aaacfd027e1f459eb9cc1a482f58df4c87a7e70d3d9707a7cc8 SHA512 97e1066c2d5ae90c86ede695c4f3746634b9ec64db9de84a7d7402d773290967eaac5ea75286c0caf573e6899f585dd719aed7412d2cbf04eaf8e7b33892d61f
DIST calculate-client-3.6.8.1.tar.bz2 31697 BLAKE2B 1af7b860dcb0ec2d8d17fd7c7a4120787ef22886748b6eca547d498e3f2571cb8e33c3208eacef0582dbfd92ade8838aef37ce241803ad5e365db147ae41648c SHA512 cd514235b6d1a70d1cf482009a547f89b1a3af0a68e2f11b446d0a05f317b07b6f820b4b2c41ed7417f5e5ed2ddc45d482962ed050c2234b26669c6fd490f796
DIST calculate-client-3.6.8.tar.bz2 31612 BLAKE2B 9b1bf1b4b318b98fc6573323f6b527ecd8e89edac36144fd0352cc7e168e70783eac64a64c5188cf425e76f50439602dd6ce51c2d7837d68b545c0737d25fd18 SHA512 87db61f7d1218127f386fedd4aea1e7713462b255dec3ddcb8a27fa9e06f4a3d31d6d6f67a26aa2dbf01693e2e02552d6ed7f51f27a3695649ccc107631223b1
DIST calculate-console-3.6.7.tar.bz2 24747 BLAKE2B 3f0e9a223b71a296225cf26d0904879144c20a623c59a1209470bcc5680f9f717585d25d650dcdf48a93d2fff864ab70ba30072c6218be504135acb11870479c SHA512 1210e7241362df7bfc0f7bcd6227fef54cdc6a0e1eb0c998f98c8bfc5ea36883ad948c5a8d11d997e30802cf5c1cf42334286676917ac00698659f7b97168138
DIST calculate-console-3.6.8.tar.bz2 24777 BLAKE2B ae2a75832940a91f7dc169493269b736fc53f41f61bf0b62ff16be3cbbf0d4732a90e8a5f4d1574a64fa7701d266b2ee6f232946fb777d08db7cdf545580dc34 SHA512 4917a2662fed949c07c039721d9aba1cfe46171dfe942894c6d1811f26be278c20629e20586fbe1d3b2b374089e51ca68c104a7b80c2fd4d55d49f0f3f17ee7a

@ -0,0 +1,22 @@
# 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=(
["core"]="3.6.8.2"
["client"]="3.6.8.1"
["desktop"]="3.6.8.6"
)
inherit calculate-utils-r9
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