From a666e8e838e5f8bdfba7c2388fc1fc1da133ea0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= <mh@calculate.ru>
Date: Fri, 27 Nov 2020 11:54:01 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D1=8B=20net?=
 =?UTF-8?q?-fs/samba?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 merge/README.txt                        | 2 ++
 merge/net-fs/.calculate_directory       | 1 +
 merge/net-fs/samba/.calculate_directory | 1 +
 merge/net-fs/samba/samba                | 3 +++
 merge/net-fs/samba/smb.conf             | 1 +
 merge/net-fs/samba/smb.conf.client      | 9 +++++++++
 6 files changed, 17 insertions(+)
 create mode 100644 merge/net-fs/.calculate_directory
 create mode 100644 merge/net-fs/samba/.calculate_directory
 create mode 100644 merge/net-fs/samba/samba
 create mode 100644 merge/net-fs/samba/smb.conf
 create mode 100644 merge/net-fs/samba/smb.conf.client

diff --git a/merge/README.txt b/merge/README.txt
index 6680a78..59e2ee4 100644
--- a/merge/README.txt
+++ b/merge/README.txt
@@ -32,3 +32,5 @@ desktop файл содержит то же самое значение
 
 Пропущен gfxboot-themes-calculate, так как пока не поддерживается формат backgrounds
 
+Из шаблонов samba убран параметр protected (unbound), необходимо проверить новый механизм изменённых пользователем параметров
+
diff --git a/merge/net-fs/.calculate_directory b/merge/net-fs/.calculate_directory
new file mode 100644
index 0000000..8e3df7f
--- /dev/null
+++ b/merge/net-fs/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append = 'skip' %}
diff --git a/merge/net-fs/samba/.calculate_directory b/merge/net-fs/samba/.calculate_directory
new file mode 100644
index 0000000..0b83b20
--- /dev/null
+++ b/merge/net-fs/samba/.calculate_directory
@@ -0,0 +1 @@
+{% calculate path='/etc', package='net-fs/samba' %}
diff --git a/merge/net-fs/samba/samba b/merge/net-fs/samba/samba
new file mode 100644
index 0000000..8cdf8c1
--- /dev/null
+++ b/merge/net-fs/samba/samba
@@ -0,0 +1,3 @@
+{% calculate format='openrc', path='/etc/conf.d', pkg('sys-apps/calculate-server') %}
+
+daemon_list="smbd nmbd winbind"
diff --git a/merge/net-fs/samba/smb.conf b/merge/net-fs/samba/smb.conf
new file mode 100644
index 0000000..953050c
--- /dev/null
+++ b/merge/net-fs/samba/smb.conf
@@ -0,0 +1 @@
+{% calculate format='raw', (not exists('/etc/samba/smb.conf')) %}
diff --git a/merge/net-fs/samba/smb.conf.client b/merge/net-fs/samba/smb.conf.client
new file mode 100644
index 0000000..26b1a3d
--- /dev/null
+++ b/merge/net-fs/samba/smb.conf.client
@@ -0,0 +1,9 @@
+{% calculate name='smb.conf', format='samba', pkg('kde-apps/kio-extras') or pkg('gnome-base/gvfs') %}
+
+[global]
+{% if not grep('/etc/samba/smb.conf', 'client max protocol') %}
+client max protocol = NT1
+{% endif %}
+{% if not grep('/etc/samba/smb.conf', 'client min protocol') %}
+client min protocol = NT1
+{% endif %}