On Thu, Feb 18, 2021 at 04:36:34PM +0100, Landry Breuil wrote: > On Thu, Feb 18, 2021 at 02:47:28PM +0100, Damien Couderc wrote: > > Le 18/02/2021 à 13:11, Jonathan Gray a écrit : > > > On Thu, Feb 18, 2021 at 11:34:19AM +0000, Stuart Henderson wrote: > > > > On 2021/02/18 22:24, Jonathan Gray wrote: > > > > > On Thu, Feb 18, 2021 at 12:01:28PM +0100, Mark Kettenis wrote: > > > > > > > Date: Thu, 18 Feb 2021 21:18:51 +1100 > > > > > > > From: Jonathan Gray <[email protected]> > > > > > > I suspect that there are some ports that need to get their unveils > > > > > > updated if we do this. > > > > > firefox ports were updated. Not aware of anything else in ports that > > > > > unveils /dev/drm. > > > > unveils: not afaik > > > > > > > > others: gdm already handled it, some other ports will need patches > > > > changing: > > > > > > > > graphics/clutter/cogl/patches/patch-cogl_winsys_cogl-winsys-egl-kms_c > > > > graphics/waffle/patches/patch-src_waffle_gbm_wgbm_display_c > > > > x11/compton/patches/patch-src_compton_c > > > > x11/slim/patches/patch-slim_conf > > > This is a display manager like xdm/gdm. The last upstream release was > > > in 2013. I can patch it after the xenocara changes go in or perhaps we > > > remove it as landry suggested in > > > > I am using slim on my children computers since many years now and it works > > very well. This could explain why there is nothing done upstream: no bug, no > > fix and features are already there. > > Well it's a login manager (so a tiny bit security sensitive, no ? :), > last i looked at the code it wasnt that pretty > (https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-2945, > https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-1756 ...), and > all distros shipping it heavily patch it with various features for > systemd/logind/pam/consolekit/etc... a bit of a frankeinstein i'd say. > Sure, it "works", but i wouldnt say it's the best maintained login > manager out there :) And i'd argue that if grok X properties, you can > easily achieve the same look'n' feel with xenodm.
So the dev/dri/card0 thing was fixed, and here's a diff to update slim to this github fork (https://github.com/PeteGozz/slim), which was 'maintained' until 2018 by (apparently) a devuan contributor, from what i can tell. Some patches from debian were merged, esp support for xsessiondir which lists available sessions in /usr/local/share/xsessions (cf https://sources.debian.org/patches/slim/1.3.6-5.2/slim-add-sessiondir.patch/) and it seems to work fine in basic testing. There's a new theme that upstream set as default but it's a bit too psychedelic to my taste, so i've set the original slim default theme. Users of the existing slim port are more than welcome to test this update. Otherwise the port might just hit the attic... Landry
Index: Makefile =================================================================== RCS file: /cvs/ports/x11/slim/Makefile,v retrieving revision 1.56 diff -u -r1.56 Makefile --- Makefile 19 Feb 2021 17:20:18 -0000 1.56 +++ Makefile 19 Feb 2021 20:53:31 -0000 @@ -2,15 +2,14 @@ COMMENT= simple login manager -DISTNAME= slim-1.3.6 -REVISION= 25 +GH_ACCOUNT= PeteGozz +GH_PROJECT= slim +GH_COMMIT= fe15768a24a84a028acae16be4b76b8040c08b3c +DISTNAME= slim-1.3.9 SHARED_LIBS= slim 0.0 # 1.3 CATEGORIES= x11 -HOMEPAGE= https://github.com/iwamatsu/slim - -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=slim.berlios/} # GPLv2 PERMIT_PACKAGE= Yes @@ -26,7 +25,7 @@ COMPILER = base-clang ports-gcc base-gcc -CONFIGURE_ARGS= -DUSE_CONSOLEKIT:Bool=Yes +CONFIGURE_ARGS= -DUSE_PAM:Bool=no -DUSE_CONSOLEKIT:Bool=Yes pre-configure: ${SUBST_CMD} ${WRKSRC}/slim.1 ${WRKSRC}/slim.conf Index: distinfo =================================================================== RCS file: /cvs/ports/x11/slim/distinfo,v retrieving revision 1.6 diff -u -r1.6 distinfo --- distinfo 31 Oct 2013 09:03:33 -0000 1.6 +++ distinfo 19 Feb 2021 20:53:31 -0000 @@ -1,2 +1,2 @@ -SHA256 (slim-1.3.6.tar.gz) = Id7+7RdUGMRtca9x/Uk80Mv/1pP51DwhUVKRJYWYEN8= -SIZE (slim-1.3.6.tar.gz) = 232547 +SHA256 (slim-1.3.9-fe15768a.tar.gz) = 7QlotgAPSEtimbjurlBpSxxuH4zvuMK8obM4qzYZdlE= +SIZE (slim-1.3.9-fe15768a.tar.gz) = 1487115 Index: patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/x11/slim/patches/patch-CMakeLists_txt,v retrieving revision 1.4 diff -u -r1.4 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt 26 Mar 2014 06:50:58 -0000 1.4 +++ patches/patch-CMakeLists_txt 19 Feb 2021 20:53:31 -0000 @@ -1,7 +1,8 @@ $OpenBSD: patch-CMakeLists_txt,v 1.4 2014/03/26 06:50:58 dcoppa Exp $ ---- CMakeLists.txt.orig Wed Oct 2 00:38:05 2013 -+++ CMakeLists.txt Wed Mar 26 07:50:25 2014 -@@ -25,7 +25,7 @@ set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Inst +Index: CMakeLists.txt +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -27,11 +27,12 @@ set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Inst set(PKGDATADIR "${CMAKE_INSTALL_PREFIX}/share/slim") set(SYSCONFDIR "/etc") set(LIBDIR "/lib") @@ -9,28 +10,33 @@ +set(MANDIR "${CMAKE_INSTALL_PREFIX}/man") set(SLIM_DEFINITIONS) - if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR -@@ -42,11 +42,6 @@ set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DVERSION=\" + + if(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" OR ++ ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD" OR + ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" + ) + set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DNEEDS_BASENAME") +@@ -46,11 +47,6 @@ set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DVERSION=\" set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DPKGDATADIR=\"${PKGDATADIR}\"") set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DSYSCONFDIR=\"${SYSCONFDIR}\"") --# Flags +-# Compiler Flags -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O2") -set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -Wall -g -O2") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -O2") - - # source + # sources set(slim_srcs - main.cpp -@@ -101,7 +96,6 @@ find_package(X11 REQUIRED) + main.cpp +@@ -87,7 +83,6 @@ find_package(X11 REQUIRED) find_package(Freetype REQUIRED) find_package(JPEG REQUIRED) find_package(PNG REQUIRED) -find_package(ZLIB REQUIRED) + find_package(PAM) # Fontconfig - set(FONTCONFIG_DIR ${CMAKE_MODULE_PATH}) -@@ -158,8 +152,6 @@ endif(USE_CONSOLEKIT) +@@ -174,8 +169,6 @@ endif(BUILD_SHARED_LIBS) # system librarys find_library(M_LIB m) @@ -39,51 +45,40 @@ find_package(Threads) add_definitions(${SLIM_DEFINITIONS}) -@@ -172,21 +164,20 @@ include_directories( - ${X11_Xrandr_INCLUDE_PATH} - ${FREETYPE_INCLUDE_DIR_freetype2} - ${X11_Xmu_INCLUDE_PATH} -- ${ZLIB_INCLUDE_DIR} - ${JPEG_INCLUDE_DIR} - ${PNG_INCLUDE_DIR} - ) +@@ -188,12 +181,13 @@ include_directories( + ${X11_Xrandr_INCLUDE_PATH} + ${FREETYPE_INCLUDE_DIR_freetype2} + ${X11_Xmu_INCLUDE_PATH} +- ${ZLIB_INCLUDE_DIR} + ${JPEG_INCLUDE_DIR} + ${PNG_INCLUDE_DIR} + ) target_link_libraries(libslim -- ${JPEG_LIBRARIES} -+ ${X11_Xft_LIB} -+ ${X11_Xrandr_LIB} -+ ${JPEG_LIBRARIES} - ${PNG_LIBRARIES} - ) - ++ ${X11_Xft_LIB} ++ ${X11_Xrandr_LIB} + ${JPEG_LIBRARIES} + ${PNG_LIBRARIES} + ) +@@ -201,8 +195,6 @@ target_link_libraries(libslim #Set up library with all found packages for slim target_link_libraries(${PROJECT_NAME} - ${M_LIB} -- ${RT_LIB} -- ${CRYPTO_LIB} - ${X11_X11_LIB} - ${X11_Xft_LIB} - ${X11_Xrender_LIB} -@@ -202,8 +193,6 @@ if(BUILD_SLIMLOCK) - #Set up library with all found packages for slimlock - target_link_libraries(slimlock - ${M_LIB} -- ${RT_LIB} -- ${CRYPTO_LIB} - ${X11_X11_LIB} - ${X11_Xft_LIB} - ${X11_Xrender_LIB} -@@ -221,7 +210,9 @@ endif(BUILD_SLIMLOCK) - ####### install - # slim - install(TARGETS slim RUNTIME DESTINATION bin) -+if(BUILD_SLIMLOCK) - install(TARGETS slimlock RUNTIME DESTINATION bin) -+endif(BUILD_SLIMLOCK) - - if (BUILD_SHARED_LIBS) - set_target_properties(libslim PROPERTIES -@@ -236,9 +227,11 @@ endif (BUILD_SHARED_LIBS) + ${M_LIB} +- ${RT_LIB} +- ${CRYPTO_LIB} + ${X11_X11_LIB} + ${X11_Xft_LIB} + ${X11_Xrender_LIB} +@@ -218,8 +210,6 @@ if(BUILD_SLIMLOCK) + #Set up library with all found packages for slimlock + target_link_libraries(slimlock + ${M_LIB} +- ${RT_LIB} +- ${CRYPTO_LIB} + ${X11_X11_LIB} + ${X11_Xft_LIB} + ${X11_Xrender_LIB} +@@ -260,9 +250,11 @@ endif (BUILD_SHARED_LIBS) # man file install(FILES slim.1 DESTINATION ${MANDIR}/man1/) @@ -93,6 +88,6 @@ # configure -install(FILES slim.conf DESTINATION ${SYSCONFDIR}) +install(FILES slim.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/share/examples/slim/) - # systemd service file + # systemd service file: mostly harmless + # debian sysV style /etc/init.d/ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - install(FILES slim.service DESTINATION ${LIBDIR}/systemd/system) Index: patches/patch-Ck_cpp =================================================================== RCS file: /cvs/ports/x11/slim/patches/patch-Ck_cpp,v retrieving revision 1.2 diff -u -r1.2 patch-Ck_cpp --- patches/patch-Ck_cpp 18 Apr 2013 12:00:45 -0000 1.2 +++ patches/patch-Ck_cpp 19 Feb 2021 20:53:31 -0000 @@ -1,20 +1,21 @@ $OpenBSD: patch-Ck_cpp,v 1.2 2013/04/18 12:00:45 gonzalo Exp $ Keep track of the successful consolekit session opening ---- Ck.cpp.orig Mon Dec 31 10:03:42 2012 -+++ Ck.cpp Mon Apr 15 12:52:25 2013 -@@ -101,6 +101,7 @@ namespace Ck { +Index: Ck.cpp +--- Ck.cpp.orig ++++ Ck.cpp +@@ -103,6 +103,7 @@ namespace Ck { - void Session::open_session(const std::string &display, uid_t uid) - { -+ session = false; - ckc = ck_connector_new(); + void Session::open_session(const std::string &display, uid_t uid) + { ++ session = false; + ckc = ck_connector_new(); - if(!ckc) -@@ -113,6 +114,7 @@ namespace Ck { - throw Exception(__func__, "cannot open ConsoleKit session: OOM, DBus system bus " - " not available or insufficient privileges"); + if(!ckc) +@@ -116,6 +117,7 @@ namespace Ck { + " DBus system bus not available or insufficient" + " privileges"); + } ++ session = true; } -+ session = true; - } - const char * Session::get_xdg_session_cookie() + const char * Session::get_xdg_session_cookie() Index: patches/patch-Ck_h =================================================================== RCS file: /cvs/ports/x11/slim/patches/patch-Ck_h,v retrieving revision 1.2 diff -u -r1.2 patch-Ck_h --- patches/patch-Ck_h 18 Apr 2013 12:00:45 -0000 1.2 +++ patches/patch-Ck_h 19 Feb 2021 20:53:31 -0000 @@ -1,18 +1,19 @@ $OpenBSD: patch-Ck_h,v 1.2 2013/04/18 12:00:45 gonzalo Exp $ Add a boolean to track the consolekit session success ---- Ck.h.orig Mon Dec 31 10:03:42 2012 -+++ Ck.h Mon Apr 15 12:50:24 2013 +Index: Ck.h +--- Ck.h.orig ++++ Ck.h @@ -28,11 +28,13 @@ namespace Ck { - CkConnector *ckc; - DBusError error; + CkConnector *ckc; + DBusError error; -+ bool session; - const char * get_x11_device(const std::string &display); - dbus_bool_t ck_connector_open_graphic_session(const std::string &display, - uid_t uid); ++ bool session; + const char *get_x11_device(const std::string &display); + dbus_bool_t ck_connector_open_graphic_session(const std::string &display, + uid_t uid); public: - const char * get_xdg_session_cookie(); -+ bool has_session() {return session;} - void open_session(const std::string &display, uid_t uid); - void close_session(); + const char *get_xdg_session_cookie(); ++ bool has_session() {return session;} + void open_session(const std::string &display, uid_t uid); + void close_session(); Index: patches/patch-app_cpp =================================================================== RCS file: /cvs/ports/x11/slim/patches/patch-app_cpp,v retrieving revision 1.6 diff -u -r1.6 patch-app_cpp --- patches/patch-app_cpp 31 Oct 2013 09:03:33 -0000 1.6 +++ patches/patch-app_cpp 19 Feb 2021 20:53:31 -0000 @@ -2,8 +2,9 @@ add support for bsd_auth/auth_userokay on OpenBSD only call the consolekit stuff if the ck session is okay don't exit if the ck session fails to start ---- app.cpp.orig Wed Oct 2 00:38:05 2013 -+++ app.cpp Wed Oct 30 08:30:31 2013 +Index: app.cpp +--- app.cpp.orig ++++ app.cpp @@ -30,6 +30,11 @@ #include <shadow.h> #endif @@ -16,10 +17,10 @@ using namespace std; #ifdef USE_PAM -@@ -472,6 +477,12 @@ bool App::AuthenticateUser(bool focuspass){ - if(pw == 0) - return false; - +@@ -470,6 +475,12 @@ bool App::AuthenticateUser(bool focuspass){ + if(pw == 0) + return false; + +#ifdef __OpenBSD__ + char * pass = strdup(LoginPanel->GetPasswd().c_str()); + int ret = auth_userokay(pw->pw_name, NULL, "auth-slim", pass); @@ -27,45 +28,45 @@ + return ret; +#endif #ifdef HAVE_SHADOW - struct spwd *sp = getspnam(pw->pw_name); - endspent(); -@@ -575,7 +586,6 @@ void App::Login() { + struct spwd *sp = getspnam(pw->pw_name); + endspent(); +@@ -573,7 +584,6 @@ void App::Login() { } catch(Ck::Exception &e) { - logStream << APPNAME << ": " << e << endl; -- exit(ERR_EXIT); + logStream << APPNAME << ": " << e << endl; +- exit(ERR_EXIT); } #endif -@@ -588,6 +598,7 @@ void App::Login() { - char** child_env = pam.getenvlist(); +@@ -586,6 +596,7 @@ void App::Login() { + char** child_env = pam.getenvlist(); # ifdef USE_CONSOLEKIT + if(ck.has_session()) { - char** old_env = child_env; - - /* Grow the copy of the environment for the session cookie */ -@@ -600,6 +611,7 @@ void App::Login() { - memcpy(child_env, old_env, sizeof(char*)*n+1); - child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie()); - child_env[n] = NULL; + char** old_env = child_env; + + /* Grow the copy of the environment for the session cookie */ +@@ -598,6 +609,7 @@ void App::Login() { + memcpy(child_env, old_env, sizeof(char*)*n); + child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie()); + child_env[n] = NULL; + } # endif /* USE_CONSOLEKIT */ #else - -@@ -621,6 +633,7 @@ void App::Login() { - child_env[n++]=StrConcat("MAIL=", maildir.c_str()); - child_env[n++]=StrConcat("XAUTHORITY=", xauthority.c_str()); + +@@ -619,6 +631,7 @@ void App::Login() { + child_env[n++]=StrConcat("MAIL=", maildir.c_str()); + child_env[n++]=StrConcat("XAUTHORITY=", xauthority.c_str()); # ifdef USE_CONSOLEKIT -+ if (ck.has_session()) - child_env[n++]=StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie()); ++ if(ck.has_session()) + child_env[n++]=StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie()); # endif /* USE_CONSOLEKIT */ - child_env[n++]=0; -@@ -667,6 +680,7 @@ void App::Login() { - + child_env[n++]=0; +@@ -666,6 +679,7 @@ void App::Login() { + #ifdef USE_CONSOLEKIT try { -+ if (ck.has_session()) - ck.close_session(); ++ if(ck.has_session()) + ck.close_session(); } catch(Ck::Exception &e) { Index: patches/patch-slim_conf =================================================================== RCS file: /cvs/ports/x11/slim/patches/patch-slim_conf,v retrieving revision 1.9 diff -u -r1.9 patch-slim_conf --- patches/patch-slim_conf 19 Feb 2021 17:20:18 -0000 1.9 +++ patches/patch-slim_conf 19 Feb 2021 20:53:31 -0000 @@ -1,45 +1,51 @@ $OpenBSD: patch-slim_conf,v 1.9 2021/02/19 17:20:18 landry Exp $ ---- slim.conf.orig Wed Oct 2 00:38:05 2013 -+++ slim.conf Mon Jan 13 20:50:42 2014 -@@ -1,17 +1,17 @@ - # Path, X server and arguments (if needed) - # Note: -xauth $authfile is automatically appended --default_path /bin:/usr/bin:/usr/local/bin --default_xserver /usr/bin/X --#xserver_arguments -dpi 75 +Index: slim.conf +--- slim.conf.orig ++++ slim.conf +@@ -4,20 +4,20 @@ + # see: THEMES + + # Paths +-default_path /usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games +-default_xserver /usr/bin/X11/X +default_path /bin:/usr/bin:${LOCALBASE}/bin:${X11BASE}/bin +default_xserver ${X11BASE}/bin/X -+xserver_arguments vt05 + # Full path to the xauth binary +-xauth_path /usr/bin/X11/xauth ++xauth_path ${X11BASE}/bin/xauth + # Xauth file for server + authfile /var/run/slim.auth + # -xauth $authfile is automatically appended to "xserver_arguments" +-xserver_arguments -nolisten tcp ++xserver_arguments -nolisten tcp vt05 - # Commands for halt, login, etc. + # :: Login Prompt Commands :: + # halt reboot console (also exit) -halt_cmd /sbin/shutdown -h now +halt_cmd /sbin/shutdown -ph now reboot_cmd /sbin/shutdown -r now --console_cmd /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login" +-console_cmd /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue.net; exec /bin/login" +console_cmd ${X11BASE}/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/usr/bin/head -1 /etc/motd; exec /usr/bin/login" #suspend_cmd /usr/sbin/suspend - # Full path to the xauth binary --xauth_path /usr/bin/xauth -+xauth_path ${X11BASE}/bin/xauth - - # Xauth file for server - authfile /var/run/slim.auth -@@ -32,16 +32,18 @@ authfile /var/run/slim.auth - # NOTE: if your system does not have bash you need - # to adjust the command according to your preferred shell, - # i.e. for freebsd use: --# login_cmd exec /bin/sh - ~/.xinitrc %session --login_cmd exec /bin/bash -login ~/.xinitrc %session -+login_cmd exec /bin/sh -l ~/.xinitrc %session -+# login_cmd exec /bin/bash -login ~/.xinitrc %session + # Activate numlock when slim starts. Valid values: on|off +@@ -33,11 +33,11 @@ console_cmd /usr/bin/xterm -C -fg white -bg bl + # NOTE: adjust the command according to your shell + # and system X initialisations. + #a:# call sh not bash: +-#login_cmd exec /bin/sh - ~/.xinitrc %session ++login_cmd exec /bin/sh - ~/.xinitrc %session + #b:# A System Xsession which may (finally) load ~/ .xession or .xinitrc + #login_cmd exec /bin/bash -login /etc/X11/Xsession %session + #c:# USERS home .xinitrc and hardcoded default. +-login_cmd exec /bin/bash -login ~/.xinitrc %session ++#login_cmd exec /bin/bash -login ~/.xinitrc %session + # please see: xinitrc.sample # Commands executed when starting and exiting a session. - # They can be used for registering a X11 session with - # sessreg. You can use the %user variable - # --# sessionstart_cmd some command --# sessionstop_cmd some command +@@ -47,6 +47,10 @@ login_cmd exec /bin/bash -login ~/.xinitrc %session + # sessionstart_cmd some command + # sessionstop_cmd some command +# transfer /dev/dri/card0 ownership to the logged in user +sessionstart_cmd chown %user /dev/dri/card0 @@ -48,19 +54,25 @@ # Start in daemon mode. Valid values: yes | no # Note that this can be overriden by the command line # options "-d" and "-nodaemon" -@@ -54,7 +56,7 @@ login_cmd exec /bin/bash -login ~/.xinitrc % - sessions xfce4,icewm-session,wmaker,blackbox - - # Executed when pressing F11 (requires imagemagick) --screenshot_cmd import -window root /slim.png -+screenshot_cmd import -window root /tmp/slim.png - - # welcome message. Available variables: %host, %domain - welcome_msg Welcome to %host -@@ -84,7 +86,7 @@ reboot_msg The system is rebooting... - current_theme default +@@ -58,7 +62,7 @@ login_cmd exec /bin/bash -login ~/.xinitrc %session + #sessions xfce4-session,openbox-session,fluxbox,wmaker,icewm-session,blackbox,dwm,twm + ## OR enable *[F1]* selection instead. + ## this probably _requires dbus_ running (XDG.desktop files) +-sessiondir /usr/share/xsessions/ ++sessiondir ${LOCALBASE}/share/xsessions/ + ## see also the xinitrc.sample example file shipped with slim sources. + # or at /usr/share/doc/slim/example/xinitrc.sample + +@@ -96,12 +100,12 @@ reboot_msg This system is rebooting ... + # Comma separated list to randomly choose from + # or a single directory. + # "default" is coded as default. +-current_theme xamplar ++current_theme default + #current_theme default,xamplar + #current_theme desktop-slim-theme,devuan-failsafe - # Lock file + # Lock file -lockfile /var/run/slim.lock +lockfile /var/run/slim.pid Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/slim/pkg/PLIST,v retrieving revision 1.6 diff -u -r1.6 PLIST --- pkg/PLIST 4 Sep 2018 12:46:28 -0000 1.6 +++ pkg/PLIST 19 Feb 2021 20:53:31 -0000 @@ -1,5 +1,6 @@ @comment $OpenBSD: PLIST,v 1.6 2018/09/04 12:46:28 espie Exp $ @pkgpath x11/slim,-main +@rcscript ${RCDIR}/slim @bin bin/slim @lib lib/libslim.so.${LIBslim_VERSION} @man man/man1/slim.1 @@ -13,4 +14,7 @@ share/slim/themes/default/background.jpg share/slim/themes/default/panel.png share/slim/themes/default/slim.theme -@rcscript ${RCDIR}/slim +share/slim/themes/xamplar/ +share/slim/themes/xamplar/background.png +share/slim/themes/xamplar/panel.png +share/slim/themes/xamplar/slim.theme
