diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2020-02-07 22:32:38 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2020-02-08 08:59:48 +0100 |
commit | 080300e1e7dec7bb1a6297b5a4406e2c0be46048 (patch) | |
tree | 4ca397920d9a177af9eb3ca6781e2c8498b3672d /source/x/x11 | |
parent | 194ec853e8f20fd32d5a91eec74ff77383093f4e (diff) | |
download | current-080300e1e7dec7bb1a6297b5a4406e2c0be46048.tar.gz |
Fri Feb 7 22:32:38 UTC 202020200207223238
a/kernel-firmware-20200206_5351afe-noarch-1.txz: Upgraded.
ap/ghostscript-9.50-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
ap/gutenprint-5.3.3-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
ap/nano-4.8-x86_64-1.txz: Upgraded.
ap/screen-4.8.0-x86_64-1.txz: Upgraded.
ap/vim-8.2.0224-x86_64-1.txz: Upgraded.
d/cvs-1.11.23-x86_64-4.txz: Rebuilt.
Recompiled against krb5-1.17.1.
d/strace-5.5-x86_64-1.txz: Upgraded.
kde/kdelibs-4.14.38-x86_64-6.txz: Rebuilt.
Recompiled against krb5-1.17.1.
l/gtk+2-2.24.32-x86_64-3.txz: Rebuilt.
Recompiled against krb5-1.17.1.
l/gtk+3-3.24.13-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
l/libsoup-2.68.3-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
l/libssh-0.9.3-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
l/loudmouth-1.5.3-x86_64-4.txz: Rebuilt.
Recompiled against krb5-1.17.1.
l/neon-0.30.2-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
n/cifs-utils-6.10-x86_64-2.txz: Rebuilt.
Recompiled to build cifs.upcall.
n/curl-7.68.0-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
n/cyrus-sasl-2.1.27-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
xap/vim-gvim-8.2.0224-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/x/x11')
-rw-r--r-- | source/x/x11/configure/xdm | 19 | ||||
-rw-r--r-- | source/x/x11/doinst.sh/xdm | 5 | ||||
-rw-r--r-- | source/x/x11/post-install/xdm.post-install | 5 | ||||
-rw-r--r-- | source/x/x11/post-install/xdm/xdm.pamd | 9 |
4 files changed, 38 insertions, 0 deletions
diff --git a/source/x/x11/configure/xdm b/source/x/x11/configure/xdm new file mode 100644 index 00000000..1c7dc7cc --- /dev/null +++ b/source/x/x11/configure/xdm @@ -0,0 +1,19 @@ +if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then + XDM_PAM_OPTION="--with-pam" +else + unset XDM_PAM_OPTION +fi + +CFLAGS=$SLKCFLAGS \ +CXXFLAGS=$SLKCFLAGS \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --infodir=/usr/info \ + --mandir=/usr/man \ + --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \ + $XDM_PAM_OPTION \ + --disable-static \ + --build=$ARCH-slackware-linux diff --git a/source/x/x11/doinst.sh/xdm b/source/x/x11/doinst.sh/xdm index 871a3897..68c356c5 100644 --- a/source/x/x11/doinst.sh/xdm +++ b/source/x/x11/doinst.sh/xdm @@ -9,6 +9,11 @@ config() { fi # Otherwise, we leave the .new copy for the admin to consider... } + +if [ -r etc/pam.d/xdm.new ]; then + config etc/pam.d/xdm.new +fi + for conffile in \ Xaccess Xreset Xresources Xservers Xsession Xsetup_0 Xstartup Xwilling \ GiveConsole TakeConsole xdm-config ../app-defaults/Chooser ; diff --git a/source/x/x11/post-install/xdm.post-install b/source/x/x11/post-install/xdm.post-install index 8410a8fa..31b390d8 100644 --- a/source/x/x11/post-install/xdm.post-install +++ b/source/x/x11/post-install/xdm.post-install @@ -14,6 +14,11 @@ mv $PKG/etc/X11/xdm/Xsetup_0 $PKG/usr/doc/xdm-$MODULAR_PACKAGE_VERSION/Xsetup_0. cp -a $CWD/post-install/xdm/Xsession $PKG/etc/X11/xdm/Xsession cp -a $CWD/post-install/xdm/Xsetup_0 $PKG/etc/X11/xdm/Xsetup_0 +if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then + mkdir -p $PKG/etc/pam.d + cat $CWD/post-install/xdm/xdm.pamd > $PKG/etc/pam.d/xdm.new +fi + chown root:root $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsetup_0 chmod 0755 $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsetup_0 diff --git a/source/x/x11/post-install/xdm/xdm.pamd b/source/x/x11/post-install/xdm/xdm.pamd new file mode 100644 index 00000000..a3b9decf --- /dev/null +++ b/source/x/x11/post-install/xdm/xdm.pamd @@ -0,0 +1,9 @@ +#%PAM-1.0 +auth include system-auth +account required pam_nologin.so +account include system-auth +password include system-auth +session include system-auth +session required pam_loginuid.so +session optional pam_ck_connector.so +session include postlogin |