diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/calculate-utils b/profiles/templates/3.5/2_ac_install_merge/Depends/calculate-utils index ceac43f1c..6e5b518b2 100644 --- a/profiles/templates/3.5/2_ac_install_merge/Depends/calculate-utils +++ b/profiles/templates/3.5/2_ac_install_merge/Depends/calculate-utils @@ -1 +1 @@ -# Calculate append=skip merge(sys-apps/calculate-utils)!= module(desktop)!=&&ini(merge-calculate.desktop)==||module(desktop)==&&ini(merge-calculate.desktop)!= merge=gnome-base/gdm,gnome-base/gnome-shell,kde-base/kdm,lxde-base/lxdm,x11-misc/slim,x11-misc/lightdm,x11-misc/sddm +# Calculate append=skip merge(sys-apps/calculate-utils)!= pkg(sys-apps/calculate-utils[desktop])!=&&ini(merge-calculate.desktop)==||pkg(sys-apps/calculate-utils[desktop])==&&ini(merge-calculate.desktop)!= merge=gnome-base/gdm,gnome-base/gnome-shell,kde-base/kdm,lxde-base/lxdm,x11-misc/slim,x11-misc/lightdm,x11-misc/sddm diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-base/kdm/kdmrc b/profiles/templates/3.5/2_ac_install_merge/kde-base/kdm/kdmrc index 52a8786be..961c8fbf2 100644 --- a/profiles/templates/3.5/2_ac_install_merge/kde-base/kdm/kdmrc +++ b/profiles/templates/3.5/2_ac_install_merge/kde-base/kdm/kdmrc @@ -21,13 +21,13 @@ AutoReLogin=false ClientLogFile=.xsession-errors-%d Resources=/usr/share/wallpapers/fulmine.jpg SessionsDirs=/usr/share/xsessions -#?module(desktop)!=# +#?pkg(sys-apps/calculate-utils[desktop])!=# Reset=/usr/share/calculate/xdm/xdm --logout Startup=/usr/share/calculate/xdm/xdm --login -#!module# +#!pkg# Reset=/usr/share/config/kdm/Xreset Startup=/usr/share/config/kdm/Xstartup -#module# +#pkg# [X-*-Greeter] AntiAliasing=true diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PostLogout b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PostLogout index 0faafc1fe..8f5d0548f 100755 --- a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PostLogout +++ b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PostLogout @@ -1,9 +1,9 @@ # Calculate comment=# chmod=0755 #!/bin/sh -#?module(desktop)!=# +#?pkg(sys-apps/calculate-utils[desktop])!=# /usr/bin/sessreg -d -l $DISPLAY $USER /usr/share/calculate/xdm/xdm --logout -#!module# +#!pkg# # Note: this is a sample and will not be run as is. -#module# +#pkg# diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre index 28a87e1ea..3cc4795b1 100755 --- a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre +++ b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre @@ -1,4 +1,4 @@ -# Calculate comment=# chmod=0755 module(desktop)!= +# Calculate comment=# chmod=0755 pkg(sys-apps/calculate-utils[desktop])!= #!/bin/sh # if pgrep -f 'xdm/xdm --logout' diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre.remove b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre.remove index 94fad2ecf..0d5a02cf4 100644 --- a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre.remove +++ b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre.remove @@ -1 +1 @@ -# Calculate append=remove name=Pre module(desktop)== +# Calculate append=remove name=Pre pkg(sys-apps/calculate-utils[desktop])== diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreLogin b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreLogin index 08064f503..8e9aa02c6 100755 --- a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreLogin +++ b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreLogin @@ -1,9 +1,9 @@ # Calculate comment=# chmod=0755 #!/bin/sh r -#?module(desktop)!=# +#?pkg(sys-apps/calculate-utils[desktop])!=# bash -c "/usr/bin/sessreg -a -l $DISPLAY $USER &" & /usr/share/calculate/xdm/xdm --login || kill -9 $PPID -#!module# +#!pkg# # Note: this is a sample and will not be run as is. -#module# +#pkg# diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreReboot b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreReboot index 6ed4ae15b..d66217c88 100755 --- a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreReboot +++ b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreReboot @@ -1,7 +1,7 @@ # Calculate comment=# chmod=0755 #!/bin/sh # -#?module(desktop)!=# +#?pkg(sys-apps/calculate-utils[desktop])!=# sleep 1 if pgrep -f 'xdm/xdm --logout' then @@ -18,6 +18,6 @@ then done kill -9 $XMESPID &>/dev/null fi -#!module# +#!pkg# # Note: this is a sample and will not be run as is. -#module# +#pkg# diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreShutdown b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreShutdown index 6ed4ae15b..d66217c88 100755 --- a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreShutdown +++ b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreShutdown @@ -1,7 +1,7 @@ # Calculate comment=# chmod=0755 #!/bin/sh # -#?module(desktop)!=# +#?pkg(sys-apps/calculate-utils[desktop])!=# sleep 1 if pgrep -f 'xdm/xdm --logout' then @@ -18,6 +18,6 @@ then done kill -9 $XMESPID &>/dev/null fi -#!module# +#!pkg# # Note: this is a sample and will not be run as is. -#module# +#pkg# diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-auth/pambase/system-auth b/profiles/templates/3.5/2_ac_install_merge/sys-auth/pambase/system-auth index 105f51244..ddcb30dbe 100644 --- a/profiles/templates/3.5/2_ac_install_merge/sys-auth/pambase/system-auth +++ b/profiles/templates/3.5/2_ac_install_merge/sys-auth/pambase/system-auth @@ -1,55 +1,12 @@ # Calculate chmod=0644 chown=root:root comment=# auth required pam_env.so -#?module(unix)==||server.sr_unix_set!=on# -#?pkg(sys-auth/pam_client)!=&&module(client)!=&&pkg(sys-apps/calculate-server)==# -auth [success=3 new_authtok_reqd=done default=ignore] pam_unix.so try_first_pass -auth requisite pam_client.so -auth [success=1 new_authtok_reqd=done default=ignore] pam_ldap.so use_first_pass -auth requisite pam_deny.so -auth required pam_permit.so -#pkg# -#module# -#?pkg(sys-apps/calculate-server)!=||module(unix)!=&&server.sr_unix_set==on# -auth [success=2 new_authtok_reqd=done default=ignore] pam_unix.so try_first_pass -auth [success=1 new_authtok_reqd=done default=ignore] pam_ldap.so use_first_pass -auth requisite pam_deny.so -auth required pam_permit.so -#pkg# -#?module(unix)==||server.sr_unix_set!=on# -#?pkg(sys-auth/pam_client)==&&pkg(sys-apps/calculate-server)==||module(client)==&&pkg(sys-apps/calculate-server)==# auth required pam_unix.so try_first_pass -#pkg# -#module# -#?pkg(sys-auth/pam_keystore)!=# -auth optional pam_keystore.so use_first_pass -#pkg# -#?pkg(sys-fs/ecryptfs-utils)!=# -auth optional pam_ecryptfs.so unwrap -#pkg# account required pam_unix.so -#?pkg(sys-auth/pam_client)!=&&module(client)!=||pkg(sys-apps/calculate-server)!=||module(unix)!=&&server.sr_unix_set==on# -account sufficient pam_ldap.so -#pkg# password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 password sufficient pam_unix.so nullok sha256 shadow use_authtok -#?pkg(sys-fs/ecryptfs-utils)!=# -password optional pam_ecryptfs.so -#pkg# -#?pkg(sys-auth/pam_client)!=&&module(client)!=||pkg(sys-apps/calculate-server)!=||module(unix)!=&&server.sr_unix_set==on# -password sufficient pam_ldap.so -#pkg# password required pam_deny.so session required pam_limits.so session required pam_unix.so -#?pkg(sys-fs/ecryptfs-utils)!=# -session optional pam_ecryptfs.so unwrap -#pkg# -#?pkg(sys-auth/pam_client)!=&&module(client)!=||pkg(sys-apps/calculate-server)!=||module(unix)!=&&server.sr_unix_set==on# -session optional pam_ldap.so -#pkg# -#?pkg(sys-apps/systemd)!=# -session optional pam_systemd.so -#pkg# diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/99lightdm b/profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/99lightdm index de97dd5df..e1437a77f 100644 --- a/profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/99lightdm +++ b/profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/99lightdm @@ -1,4 +1,4 @@ -# Calculate path=/usr/share/calculate/xdm/logout.d module(desktop)!= +# Calculate path=/usr/share/calculate/xdm/logout.d pkg(sys-apps/calculate-utils[desktop])!= #!/bin/bash chvt $(ps ax | grep -v root/$DISPLAY | sed -rn 's/^.*lightdm\/root.*vt([0-9]+).*$/\1/p' | awk '{print $1}') diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/99lightdm.remove b/profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/99lightdm.remove index 2e52d6fb4..1a9bcc177 100644 --- a/profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/99lightdm.remove +++ b/profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/99lightdm.remove @@ -1 +1 @@ -# Calculate path=/usr/share/calculate/xdm/logout.d name=99lightdm append=remove module(desktop)== +# Calculate path=/usr/share/calculate/xdm/logout.d name=99lightdm append=remove pkg(sys-apps/calculate-utils[desktop])== diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/lightdm.conf b/profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/lightdm.conf index 1a5e7e657..a75805a67 100644 --- a/profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/lightdm.conf +++ b/profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/lightdm.conf @@ -1,10 +1,10 @@ # Calculate format=kde path=/etc/lightdm [SeatDefaults] -#?module(desktop)!=# +#?pkg(sys-apps/calculate-utils[desktop])!=# session-setup-script=/usr/share/calculate/xdm/xdm --login session-cleanup-script=/usr/share/calculate/xdm/xdm --logout -#!module# +#!pkg# !session-setup-script= !session-cleanup-script= -#module# +#pkg# diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/scripts/Xlogin b/profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/scripts/Xlogin index b53ee5248..47bcc7110 100755 --- a/profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/scripts/Xlogin +++ b/profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/scripts/Xlogin @@ -2,9 +2,9 @@ #!/bin/sh # Xlogin - run as root before user login -#?module(desktop)!=# +#?pkg(sys-apps/calculate-utils[desktop])!=# VT="vt$(( ${DISPLAY#:} + 7 ))" XAUTHORITY=$(ps ax | sed -nr "s/.*usr\/bin\/X.*-auth (\S+).*$VT.*/\1/p") export XAUTHORITY /usr/share/calculate/xdm/xdm --login -#module# +#pkg# diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/scripts/Xlogout b/profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/scripts/Xlogout index 0d7a8d3b1..af487a03b 100755 --- a/profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/scripts/Xlogout +++ b/profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/scripts/Xlogout @@ -2,9 +2,9 @@ #!/bin/sh # Xlogout - run as root after user logout -#?module(desktop)!=# +#?pkg(sys-apps/calculate-utils[desktop])!=# VT="vt$(( ${DISPLAY#:} + 7 ))" XAUTHORITY=$(ps ax | sed -nr "s/.*usr\/bin\/X.*-auth (\S+).*$VT.*/\1/p") export XAUTHORITY /usr/share/calculate/xdm/xdm --logout -#module# +#pkg# diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/pambase/system-auth b/profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/pambase/system-auth new file mode 100644 index 000000000..d8e74016a --- /dev/null +++ b/profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/pambase/system-auth @@ -0,0 +1,56 @@ +# Calculate chmod=0644 chown=root:root comment=# +auth required pam_env.so +#?module(unix)==||server.sr_unix_set!=on# +#?pkg(sys-auth/pam_client)!=&&module(client)!=&&pkg(sys-apps/calculate-server)==# +auth [success=3 new_authtok_reqd=done default=ignore] pam_unix.so try_first_pass +auth requisite pam_client.so +auth [success=1 new_authtok_reqd=done default=ignore] pam_ldap.so use_first_pass +auth requisite pam_deny.so +auth required pam_permit.so +#pkg# +#module# +#?pkg(sys-apps/calculate-server)!=||module(unix)!=&&server.sr_unix_set==on# +auth [success=2 new_authtok_reqd=done default=ignore] pam_unix.so try_first_pass +auth [success=1 new_authtok_reqd=done default=ignore] pam_ldap.so use_first_pass +auth requisite pam_deny.so +auth required pam_permit.so +#pkg# +#?module(unix)==||server.sr_unix_set!=on# +#?pkg(sys-auth/pam_client)==&&pkg(sys-apps/calculate-server)==||module(client)==&&pkg(sys-apps/calculate-server)==# +auth required pam_unix.so try_first_pass +#pkg# +#module# +#?pkg(sys-auth/pam_keystore)!=# +auth optional pam_keystore.so use_first_pass +#pkg# +#?pkg(sys-fs/ecryptfs-utils)!=# +auth optional pam_ecryptfs.so unwrap +#pkg# + +account required pam_unix.so +#?pkg(sys-auth/pam_client)!=&&module(client)!=||pkg(sys-apps/calculate-server)!=||module(unix)!=&&server.sr_unix_set==on# +account sufficient pam_ldap.so +#pkg# + +password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 +password sufficient pam_unix.so nullok sha256 shadow use_authtok +#?pkg(sys-fs/ecryptfs-utils)!=# +password optional pam_ecryptfs.so +#pkg# +#?pkg(sys-auth/pam_client)!=&&module(client)!=||pkg(sys-apps/calculate-server)!=||module(unix)!=&&server.sr_unix_set==on# +password sufficient pam_ldap.so +#pkg# +password required pam_deny.so + +session required pam_env.so +session required pam_limits.so +session required pam_unix.so +#?pkg(sys-fs/ecryptfs-utils)!=# +session optional pam_ecryptfs.so unwrap +#pkg# +#?pkg(sys-auth/pam_client)!=&&module(client)!=||pkg(sys-apps/calculate-server)!=||module(unix)!=&&server.sr_unix_set==on# +session optional pam_ldap.so +#pkg# +#?pkg(sys-apps/systemd)!=# +session optional pam_systemd.so +#pkg# diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini b/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini index 313fb030d..0eb8ecda0 100644 --- a/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini +++ b/profiles/templates/3.5/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 = 20161222 +remerge = 20161222.1 diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161222.1 b/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161222.1 new file mode 100644 index 000000000..7f7fb6b04 --- /dev/null +++ b/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161222.1 @@ -0,0 +1,4 @@ +# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=kde-base/kdm,lxde-base/lxdm,sys-auth/pambase,x11-misc/lightdm,x11-misc/sddm + +[overlay-calculate] +remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.5/9_ac_install_merge/sys-apps/calculate-utils/ini.env b/profiles/templates/3.5/9_ac_install_merge/sys-apps/calculate-utils/ini.env index 32e9f4dda..e43e53e09 100644 --- a/profiles/templates/3.5/9_ac_install_merge/sys-apps/calculate-utils/ini.env +++ b/profiles/templates/3.5/9_ac_install_merge/sys-apps/calculate-utils/ini.env @@ -1,6 +1,6 @@ # Calculate format=samba [merge-calculate] -utils = #-module(core)-# -desktop = #-module(desktop)-# -client = #-module(client)-# +utils = #-pkg(sys-apps/calculate-utils)-# +desktop = #-pkg(sys-apps/calculate-utils[desktop])-# +client = #-pkg(sys-apps/calculate-utils[client])-#