From bec79e890448e5cab9d45ec23b382fee4796fb52 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: Wed, 9 Dec 2020 11:44:48 +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=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20sys-libs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* sys-libs/glibc
* sys-libs/gpm
* sys-libs/pam
---
 merge/sys-libs/.calculate_directory       |  1 +
 merge/sys-libs/glibc/.calculate_directory |  1 +
 merge/sys-libs/glibc/conf.d.nscd          |  4 +++
 merge/sys-libs/glibc/locale.gen           | 40 +++++++++++++++++++++++
 merge/sys-libs/glibc/nscd-cache.conf      | 19 +++++++++++
 merge/sys-libs/glibc/nscd-refresh         | 19 +++++++++++
 merge/sys-libs/glibc/nscd.conf            | 18 ++++++++++
 merge/sys-libs/glibc/nsswitch.conf        | 37 +++++++++++++++++++++
 merge/sys-libs/gpm/.calculate_directory   |  1 +
 merge/sys-libs/gpm/gpm                    |  3 ++
 merge/sys-libs/pam/.calculate_directory   |  1 +
 merge/sys-libs/pam/CDS.conf               |  3 ++
 12 files changed, 147 insertions(+)
 create mode 100644 merge/sys-libs/.calculate_directory
 create mode 100644 merge/sys-libs/glibc/.calculate_directory
 create mode 100644 merge/sys-libs/glibc/conf.d.nscd
 create mode 100644 merge/sys-libs/glibc/locale.gen
 create mode 100644 merge/sys-libs/glibc/nscd-cache.conf
 create mode 100644 merge/sys-libs/glibc/nscd-refresh
 create mode 100644 merge/sys-libs/glibc/nscd.conf
 create mode 100644 merge/sys-libs/glibc/nsswitch.conf
 create mode 100644 merge/sys-libs/gpm/.calculate_directory
 create mode 100644 merge/sys-libs/gpm/gpm
 create mode 100644 merge/sys-libs/pam/.calculate_directory
 create mode 100644 merge/sys-libs/pam/CDS.conf

diff --git a/merge/sys-libs/.calculate_directory b/merge/sys-libs/.calculate_directory
new file mode 100644
index 0000000..fe9987a
--- /dev/null
+++ b/merge/sys-libs/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append='skip' %}
diff --git a/merge/sys-libs/glibc/.calculate_directory b/merge/sys-libs/glibc/.calculate_directory
new file mode 100644
index 0000000..09f852d
--- /dev/null
+++ b/merge/sys-libs/glibc/.calculate_directory
@@ -0,0 +1 @@
+{% calculate name='etc', package='sys-libs/glibc' %}
diff --git a/merge/sys-libs/glibc/conf.d.nscd b/merge/sys-libs/glibc/conf.d.nscd
new file mode 100644
index 0000000..917a8f9
--- /dev/null
+++ b/merge/sys-libs/glibc/conf.d.nscd
@@ -0,0 +1,4 @@
+{% calculate format='openrc', path='/etc/conf.d', name='nscd' %}
+
+rc_use="!net logger root"
+rc_before="dbus xdm"
diff --git a/merge/sys-libs/glibc/locale.gen b/merge/sys-libs/glibc/locale.gen
new file mode 100644
index 0000000..4bd2af0
--- /dev/null
+++ b/merge/sys-libs/glibc/locale.gen
@@ -0,0 +1,40 @@
+{% calculate comment='#' %}
+be_BY.UTF-8 UTF-8
+bg_BG.UTF-8 UTF-8
+bs_BA.UTF-8 UTF-8
+cs_CZ.UTF-8 UTF-8
+da_DK.UTF-8 UTF-8
+de_DE.UTF-8 UTF-8
+en_AU.UTF-8 UTF-8
+en_GB.UTF-8 UTF-8
+en_US.UTF-8 UTF-8
+es_ES.UTF-8 UTF-8
+es_UY.UTF-8 UTF-8
+es_VE.UTF-8 UTF-8
+et_EE.UTF-8 UTF-8
+fi_FI.UTF-8 UTF-8
+fr_BE.UTF-8 UTF-8
+fr_CA.UTF-8 UTF-8
+fr_FR.UTF-8 UTF-8
+hr_HR.UTF-8 UTF-8
+hu_HU.UTF-8 UTF-8
+is_IS.UTF-8 UTF-8
+it_IT.UTF-8 UTF-8
+kk_KZ.UTF-8 UTF-8
+lt_LT.UTF-8 UTF-8
+lv_LV.UTF-8 UTF-8
+nl_BE.UTF-8 UTF-8
+nl_NL.UTF-8 UTF-8
+nb_NO.UTF-8 UTF-8
+nn_NO.UTF-8 UTF-8
+pl_PL.UTF-8 UTF-8
+pt_BR.UTF-8 UTF-8
+pt_PT.UTF-8 UTF-8
+ro_RO.UTF-8 UTF-8
+ru_RU.UTF-8 UTF-8
+sk_SK.UTF-8 UTF-8
+sl_SI.UTF-8 UTF-8
+sq_AL.UTF-8 UTF-8
+sr_RS.UTF-8 UTF-8
+sv_SE.UTF-8 UTF-8
+uk_UA.UTF-8 UTF-8
diff --git a/merge/sys-libs/glibc/nscd-cache.conf b/merge/sys-libs/glibc/nscd-cache.conf
new file mode 100644
index 0000000..ae66e6c
--- /dev/null
+++ b/merge/sys-libs/glibc/nscd-cache.conf
@@ -0,0 +1,19 @@
+{% calculate comment='#' %}
+#
+# /etc/nscd.conf
+
+	enable-cache			passwd		yes
+	positive-time-to-live	passwd		604800
+	negative-time-to-live	passwd		20
+	suggested-size			passwd		211
+	check-files				passwd		yes
+	persistent				passwd		yes
+	shared					passwd		yes
+
+	enable-cache			group		yes
+	positive-time-to-live	group		604800
+	negative-time-to-live	group		40
+	suggested-size			group		211
+	check-files				group		yes
+	persistent				group		yes
+	shared					group		yes
diff --git a/merge/sys-libs/glibc/nscd-refresh b/merge/sys-libs/glibc/nscd-refresh
new file mode 100644
index 0000000..c9678eb
--- /dev/null
+++ b/merge/sys-libs/glibc/nscd-refresh
@@ -0,0 +1,19 @@
+{% calculate path='/usr/sbin', chmod='755' %}
+#!/bin/sh
+# Updating of domain users nss-cache.
+# The NSS-cache is used for fix resume from suspend mode of domain users.
+#
+#?os_install_locale_language==ru#
+# Обновление кэша пользователей домена.
+# Кэширование используется для поддержки спящего режима доменных машин.
+# Обновление вызывается из cron.hourly, при входе в сеанс, при разблокировке.
+#?os_install_locale_language#
+
+# invalidate passwd and group caches
+nscd -i passwd
+nscd -i group
+# get information about all users
+getent passwd | cut -d: -f1 |
+while read user;do
+    id $user &>/dev/null
+done
diff --git a/merge/sys-libs/glibc/nscd.conf b/merge/sys-libs/glibc/nscd.conf
new file mode 100644
index 0000000..6d2da02
--- /dev/null
+++ b/merge/sys-libs/glibc/nscd.conf
@@ -0,0 +1,18 @@
+{% calculate comment='#' %}
+# /etc/nscd.conf
+
+	enable-cache			passwd		yes
+	positive-time-to-live	passwd		0
+	negative-time-to-live	passwd		0
+	suggested-size			passwd		211
+	check-files				passwd		yes
+	persistent				passwd		yes
+	shared					passwd		yes
+
+	enable-cache			group		yes
+	positive-time-to-live	group		0
+	negative-time-to-live	group		0
+	suggested-size			group		211
+	check-files				group		yes
+	persistent				group		yes
+	shared					group		yes
diff --git a/merge/sys-libs/glibc/nsswitch.conf b/merge/sys-libs/glibc/nsswitch.conf
new file mode 100644
index 0000000..c7905b1
--- /dev/null
+++ b/merge/sys-libs/glibc/nsswitch.conf
@@ -0,0 +1,37 @@
+{% calculate append='replace', format='ldap', path='/etc', chmod='644', chown='root:root' %}
+{% if pkg('sys-auth/nss_ldap') %}
+passwd:      files ldap
+shadow:      files ldap
+group:       files ldap
+{% else %}
+passwd:      files
+shadow:      files
+group:       files
+{% endif %}
+
+hosts:       files dns
+networks:    files dns
+
+{% if pkg('sys-auth/nss_ldap') %}
+services:    files ldap
+protocols:   files ldap
+{% else %}
+services:    db files
+protocols:   db files
+{% endif %}
+rpc:         db files
+ethers:      db files
+netmasks:    files
+{% if pkg('sys-auth/nss_ldap') %}
+netgroup:    files ldap
+{% else %}
+netgroup:    files
+{% endif %}
+bootparams:  files
+
+{% if pkg('sys-auth/nss_ldap') %}
+automount:   files ldap
+{% else %}
+automount:   files
+{% endif %}
+aliases:     files
diff --git a/merge/sys-libs/gpm/.calculate_directory b/merge/sys-libs/gpm/.calculate_directory
new file mode 100644
index 0000000..4423174
--- /dev/null
+++ b/merge/sys-libs/gpm/.calculate_directory
@@ -0,0 +1 @@
+{% calculate path='/etc', name='conf.d', package='sys-libs/gpm' %}
diff --git a/merge/sys-libs/gpm/gpm b/merge/sys-libs/gpm/gpm
new file mode 100644
index 0000000..2577ae0
--- /dev/null
+++ b/merge/sys-libs/gpm/gpm
@@ -0,0 +1,3 @@
+{% calculate comment='#' %}
+MOUSE=imps2
+MOUSEDEV=/dev/psaux
diff --git a/merge/sys-libs/pam/.calculate_directory b/merge/sys-libs/pam/.calculate_directory
new file mode 100644
index 0000000..0f7b7a7
--- /dev/null
+++ b/merge/sys-libs/pam/.calculate_directory
@@ -0,0 +1 @@
+{% calculate path='/etc/security', name='limits.d', package='sys-libs/pam', install.os.linux.system == 'server' %}
diff --git a/merge/sys-libs/pam/CDS.conf b/merge/sys-libs/pam/CDS.conf
new file mode 100644
index 0000000..38aaaf6
--- /dev/null
+++ b/merge/sys-libs/pam/CDS.conf
@@ -0,0 +1,3 @@
+{% calculate comment='#' %}
+# need for openldap
+* - nofile 10240