diff --git a/merge/README.txt b/merge/README.txt index 288098b..1d0a811 100644 --- a/merge/README.txt +++ b/merge/README.txt @@ -21,6 +21,7 @@ app-portage/porthole Удалены шаблоны net-im/gajim - патч на отключение смены статуса в окне чата утсарел 0.16 уже удалена Удалены шаблоны net-im/riot-web - патчи устарели, пакет переименовался Удалены шаблоны net-im/skype - пакет полностью другой +Удалены шаблоны sys-auth/consolekit - так как пакет устрел и отсутствует в portage При переносе шаблонов app-office/libreoffice удалены шаблоны для x86 При переносе шаблонов app-portage/eix удалены условия и шаблоны для версии diff --git a/merge/sys-auth/.calculate_directory b/merge/sys-auth/.calculate_directory new file mode 100644 index 0000000..8e3df7f --- /dev/null +++ b/merge/sys-auth/.calculate_directory @@ -0,0 +1 @@ +{% calculate append = 'skip' %} diff --git a/merge/sys-auth/elogind/.calculate_directory b/merge/sys-auth/elogind/.calculate_directory new file mode 100644 index 0000000..c9163fb --- /dev/null +++ b/merge/sys-auth/elogind/.calculate_directory @@ -0,0 +1 @@ +{% calculate path='/lib/udev', name='rules.d', package='sys-auth/elogind' %} diff --git a/merge/sys-auth/elogind/73-seat-late.rules b/merge/sys-auth/elogind/73-seat-late.rules new file mode 100644 index 0000000..a48d001 --- /dev/null +++ b/merge/sys-auth/elogind/73-seat-late.rules @@ -0,0 +1 @@ +{% calculate append='remove', pkg('sys-fs/eudev') or pkg('sys-fs/udev') %} diff --git a/merge/sys-auth/pambase/.calculate_directory b/merge/sys-auth/pambase/.calculate_directory new file mode 100644 index 0000000..daa4100 --- /dev/null +++ b/merge/sys-auth/pambase/.calculate_directory @@ -0,0 +1 @@ +{% calculate path='/etc', name='pam.d', package='sys-auth/pambase' %} diff --git a/merge/sys-auth/pambase/su b/merge/sys-auth/pambase/su new file mode 100644 index 0000000..226899b --- /dev/null +++ b/merge/sys-auth/pambase/su @@ -0,0 +1,31 @@ +#%PAM-1.0 + +auth sufficient pam_rootok.so + +# If you want to restrict users begin allowed to su even more, +# create /etc/security/suauth.allow (or to that matter) that is only +# writable by root, and add users that are allowed to su to that +# file, one per line. +#auth required pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.allow + +# Uncomment this to allow users in the wheel group to su without +# entering a passwd. +#auth sufficient pam_wheel.so use_uid trust + +# Alternatively to above, you can implement a list of users that do +# not need to supply a passwd with a list. +#auth sufficient pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.nopass + +# Comment this to allow any user, even those not in the 'wheel' +# group to su +auth required pam_wheel.so use_uid + +auth include system-auth + +account include system-auth + +password include system-auth + +session include system-auth +session required pam_env.so +session optional pam_xauth.so diff --git a/merge/sys-auth/pambase/system-auth b/merge/sys-auth/pambase/system-auth new file mode 100644 index 0000000..f003653 --- /dev/null +++ b/merge/sys-auth/pambase/system-auth @@ -0,0 +1,20 @@ +{% calculate comment='#', chmod='644', chown='root:root' %} +auth required pam_env.so +auth required pam_unix.so try_first_pass + +account required pam_unix.so + +{% if pkg('sys-libs/pam') >= '1.4' %} +password required pam_passwdqc.so min=8,8,8,8,8 retry=3 +{% else %} +password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 +{% endif %} +password sufficient pam_unix.so nullok sha256 shadow use_authtok +password required pam_deny.so + +session required pam_limits.so +{% if pkg('sys-auth/elogind') %} +-session optional pam_loginuid.so +-session optional pam_elogind.so +{% endif %} +session required pam_unix.so diff --git a/merge/sys-auth/pambase/system-login b/merge/sys-auth/pambase/system-login new file mode 100644 index 0000000..da1d128 --- /dev/null +++ b/merge/sys-auth/pambase/system-login @@ -0,0 +1,19 @@ +{% calculate comment='#' %} + +auth required pam_nologin.so +auth substack system-auth +auth required pam_shells.so + +account required pam_access.so +account required pam_nologin.so +account include system-auth + +password include system-auth + +session required pam_env.so +session include system-auth +#session optional pam_motd.so motd=/etc/motd +session optional pam_mail.so +{% if pkg('sys-auth/pam_update') %} +session optional pam_update.so +{% endif %}