commit c7bb8df0bb68ff0095ecd3c5f8359fd25b9b6327 Author: Matt Housh <jaeger@crux.ninja> Date: Sun May 28 12:57:39 2023 -0500 slim: switched to maintained fork, updated to version 1.4.0 diff --git a/slim/.footprint b/slim/.footprint index 8f4f2e73d..aedef7d76 100644 --- a/slim/.footprint +++ b/slim/.footprint @@ -1,17 +1,21 @@ drwxr-xr-x root/root etc/ +drwxr-xr-x root/root etc/pam.d/ +-rw-r--r-- root/root etc/pam.d/slim drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/slim -rw-r--r-- root/root etc/slim.conf drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/slim +-rwsr-xr-x root/root usr/bin/slimlock drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/libslim.so -> libslim.so.1.3.6 --rwxr-xr-x root/root usr/lib/libslim.so.1.3.6 +lrwxrwxrwx root/root usr/lib/libslim.so -> libslim.so.1.4.0 +-rwxr-xr-x root/root usr/lib/libslim.so.1.4.0 drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/slim.1.gz +-rw-r--r-- root/root usr/share/man/man1/slimlock.1.gz drwxr-xr-x root/root usr/share/slim/ drwxr-xr-x root/root usr/share/slim/themes/ drwxr-xr-x root/root usr/share/slim/themes/crux-smooth/ @@ -22,3 +26,7 @@ drwxr-xr-x root/root usr/share/slim/themes/default/ -rw-r--r-- root/root usr/share/slim/themes/default/background.jpg -rw-r--r-- root/root usr/share/slim/themes/default/panel.png -rw-r--r-- root/root usr/share/slim/themes/default/slim.theme +drwxr-xr-x root/root usr/share/slim/themes/original/ +-rw-r--r-- root/root usr/share/slim/themes/original/background.jpg +-rw-r--r-- root/root usr/share/slim/themes/original/panel.png +-rw-r--r-- root/root usr/share/slim/themes/original/slim.theme diff --git a/slim/.signature b/slim/.signature index 843793db8..f4038a167 100644 --- a/slim/.signature +++ b/slim/.signature @@ -1,8 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ehfcKMMofb8qZia5mvR7jbEA6KgiLQbmCnnwCQpKlfmkabqM28zaoTeKa6Dg/WabU0/vl7ba3G+lJqcGyK4uwE= -SHA256 (Pkgfile) = 603ae627ed8158e3ba7da34677c0de17e6ac0e2a1795a71c7b9b9e30231f1078 -SHA256 (.footprint) = 58d4f98570e611e4d175f24b0afa122c075444f01ec5c2ffb9dc9d5fda571976 -SHA256 (slim-1.3.6.tar.gz) = 21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df +RWSE3ohX2g5d/Td6bBLcM5yRUr8Iim+TlIApX4XhRFtXiAab18D7430VnhrUryYVob5hA2qMq+NJuQiReXnh21mZgGDHMR4UygU= +SHA256 (Pkgfile) = d1fd84f04a8f9b27740108b0e513066a0443ede21dd37f538d1001915b0bbb51 +SHA256 (.footprint) = 12f38b86ed47e8577922817615fa77369a4f7da349a9b77611a566a3600404e6 +SHA256 (slim-1.4.0.tar.gz) = 350b31d5070002e9729ea63e1d62f97596ba0062151c0f3ee16f02af67753204 SHA256 (slim-crux-smooth.tar.gz) = 19d9106386b2965f151cf5813952f0da836138543dc713348a92c641ccf651fb SHA256 (slim.rc) = a59dd5e96b89b1b1f88fece37aa24bd00e643341057bf08d361d761043942ef0 -SHA256 (signed-comparison.patch) = 8a9f9c4af9359c3622799ac60e92ec82574702a98d02c7556a663883c443592b +SHA256 (slim.pam) = 874532f69b362bdd6b7c5aa2215520b6165efd25df88cae88948b4e479093396 diff --git a/slim/Pkgfile b/slim/Pkgfile index 6bc0acbdc..8bdf175c1 100644 --- a/slim/Pkgfile +++ b/slim/Pkgfile @@ -1,25 +1,23 @@ -# Description: a graphical login utility -# URL: https://sourceforge.net/projects/slim.berlios/ -# Maintainer: Matt Housh, jaeger at crux dot ninja -# Depends on: xorg-xauth libjpeg-turbo +# Description: Simple Login Manager +# URL: https://slim-fork.sourceforge.io/ +# Maintainer: Matt Housh, jaeger at crux dot ninja +# Depends on: xorg-xauth libjpeg-turbo name=slim -version=1.3.6 +version=1.4.0 release=1 -source=(http://downloads.sourceforge.net/project/slim.berlios/slim-$version.tar.gz - https://crux.nu/files/slim-crux-smooth.tar.gz $name.rc - signed-comparison.patch) +source=(https://sourceforge.net/projects/slim-fork/files/$name-$version.tar.gz + https://crux.nu/files/slim-crux-smooth.tar.gz $name.rc $name.pam) build () { cd $name-$version - # https://bugs.gentoo.org/786498 - patch -p1 -i $SRC/signed-comparison.patch - - # do NOT build slimlock (because of pam) - sed -i -e '224d' CMakeLists.txt - - cmake -DCMAKE_INSTALL_PREFIX=/usr + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_BUILD_TYPE=Release \ + -DUSE_PAM=yes \ + -DBUILD_SLIMLOCK=yes \ + -DUSE_CONSOLEKIT=no make make DESTDIR=$PKG install @@ -31,6 +29,5 @@ build () { cp -r slim-crux-smooth $PKG/usr/share/slim/themes/crux-smooth chmod 0644 $PKG/usr/share/slim/themes/crux-smooth/* - # no systemd support - rm -r $PKG/lib $PKG/usr/share/man/man1/slimlock.1 + install -Dm 0644 $name.pam $PKG/etc/pam.d/$name } diff --git a/slim/signed-comparison.patch b/slim/signed-comparison.patch deleted file mode 100644 index f91cee9d4..000000000 --- a/slim/signed-comparison.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 1/panel.cpp -+++ 1/panel.cpp -@@ -48,7 +48,7 @@ - gcm = GCGraphicsExposures; - gcv.graphics_exposures = False; - WinGC = XCreateGC(Dpy, Win, gcm, &gcv); -- if (WinGC < 0) { -+ if (WinGC == 0) { - cerr << APPNAME - << ": failed to create pixmap\n."; - exit(ERR_EXIT); diff --git a/slim/slim.pam b/slim/slim.pam new file mode 100644 index 000000000..78a981f74 --- /dev/null +++ b/slim/slim.pam @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so +auth required pam_unix.so +account required pam_unix.so +password required pam_unix.so +session required pam_limits.so +session required pam_unix.so +session optional pam_loginuid.so +session optional pam_ck_connector.so