Hi!
Here's an update to slim-1.3.6.
I've a positive report about the improved rc.d script.
Ciao,
David
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/slim/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile 25 Sep 2013 07:12:54 -0000 1.24
+++ Makefile 30 Oct 2013 09:16:03 -0000
@@ -1,9 +1,12 @@
# $OpenBSD: Makefile,v 1.24 2013/09/25 07:12:54 rpointel Exp $
+SHARED_ONLY= Yes
+
COMMENT= simple login manager
-DISTNAME= slim-1.3.5
-REVISION= 0
+DISTNAME= slim-1.3.6
+
+SHARED_LIBS= slim 0.0 # 1.3
CATEGORIES= x11
MAINTAINER = Landry Breuil <lan...@openbsd.org>
@@ -20,10 +23,10 @@ LIB_DEPENDS= graphics/jpeg \
x11/dbus \
graphics/png
-WANTLIB += X11 Xft Xmu Xrender c ck-connector dbus-1 fontconfig
-WANTLIB += freetype jpeg m png pthread stdc++ z
+WANTLIB += X11 Xft Xmu Xrandr Xrender c ck-connector dbus-1
+WANTLIB += fontconfig freetype jpeg m png pthread stdc++ z
-CONFIGURE_ARGS= -DUSE_CONSOLEKIT="yes"
+CONFIGURE_ARGS= -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.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo 18 Apr 2013 12:00:45 -0000 1.5
+++ distinfo 30 Oct 2013 09:16:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (slim-1.3.5.tar.gz) = gY0gn1Hi+o1blO91zpCnQVvki0XnltZvgIOpUytlVik=
-SIZE (slim-1.3.5.tar.gz) = 226413
+SHA256 (slim-1.3.6.tar.gz) = Id7+7RdUGMRtca9x/Uk80Mv/1pP51DwhUVKRJYWYEN8=
+SIZE (slim-1.3.6.tar.gz) = 232547
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/x11/slim/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 18 Apr 2013 12:00:45 -0000 1.2
+++ patches/patch-CMakeLists_txt 30 Oct 2013 09:16:03 -0000
@@ -1,26 +1,26 @@
$OpenBSD: patch-CMakeLists_txt,v 1.2 2013/04/18 12:00:45 gonzalo Exp $
---- CMakeLists.txt.orig Mon Dec 31 10:03:42 2012
-+++ CMakeLists.txt Wed Apr 17 11:38:56 2013
-@@ -24,7 +24,7 @@ set(SLIM_VERSION "${SLIM_VERSION_MAJOR}.${SLIM_VERSION
- set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Installation Directory")
+--- CMakeLists.txt.orig Wed Oct 2 00:38:05 2013
++++ CMakeLists.txt Wed Oct 30 09:16:53 2013
+@@ -25,7 +25,7 @@ set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Inst
set(PKGDATADIR "${CMAKE_INSTALL_PREFIX}/share/slim")
set(SYSCONFDIR "/etc")
+ set(LIBDIR "/lib")
-set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man")
+set(MANDIR "${CMAKE_INSTALL_PREFIX}/man")
set(SLIM_DEFINITIONS)
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR
-@@ -132,8 +132,6 @@ endif(USE_CONSOLEKIT)
+@@ -158,8 +158,6 @@ endif(USE_CONSOLEKIT)
# system librarys
find_library(M_LIB m)
-find_library(RT_LIB rt)
-find_library(CRYPTO_LIB crypt)
+ find_package(Threads)
add_definitions(${SLIM_DEFINITIONS})
-
-@@ -152,8 +150,6 @@ include_directories(
- #Set up library with all found packages
+@@ -185,8 +183,6 @@ target_link_libraries(libslim
+ #Set up library with all found packages for slim
target_link_libraries(${PROJECT_NAME}
${M_LIB}
- ${RT_LIB}
@@ -28,14 +28,35 @@ $OpenBSD: patch-CMakeLists_txt,v 1.2 201
${X11_X11_LIB}
${X11_Xft_LIB}
${X11_Xrender_LIB}
-@@ -169,8 +165,8 @@ install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bi
+@@ -202,8 +198,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 +215,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 +232,11 @@ endif (BUILD_SHARED_LIBS)
+
# man file
install(FILES slim.1 DESTINATION ${MANDIR}/man1/)
++if(BUILD_SLIMLOCK)
+ install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
++endif(BUILD_SLIMLOCK)
# configure
-install(FILES slim.conf DESTINATION ${SYSCONFDIR})
+install(FILES slim.conf DESTINATION
${CMAKE_INSTALL_PREFIX}/share/examples/slim/)
# systemd service file
--install(FILES slim.service DESTINATION usr/lib/systemd/system)
-+#install(FILES slim.service DESTINATION usr/lib/systemd/system)
- # themes directory
- subdirs(themes)
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ install(FILES slim.service DESTINATION ${LIBDIR}/systemd/system)
Index: patches/patch-app_cpp
===================================================================
RCS file: /cvs/ports/x11/slim/patches/patch-app_cpp,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-app_cpp
--- patches/patch-app_cpp 18 Apr 2013 12:00:45 -0000 1.5
+++ patches/patch-app_cpp 30 Oct 2013 09:16:03 -0000
@@ -2,8 +2,8 @@ $OpenBSD: patch-app_cpp,v 1.5 2013/04/18
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 Mon Dec 31 10:03:42 2012
-+++ app.cpp Wed Apr 17 13:09:39 2013
+--- app.cpp.orig Wed Oct 2 00:38:05 2013
++++ app.cpp Wed Oct 30 08:30:31 2013
@@ -30,6 +30,11 @@
#include <shadow.h>
#endif
@@ -16,7 +16,7 @@ don't exit if the ck session fails to st
using namespace std;
#ifdef USE_PAM
-@@ -462,6 +467,12 @@ bool App::AuthenticateUser(bool focuspass){
+@@ -472,6 +477,12 @@ bool App::AuthenticateUser(bool focuspass){
if(pw == 0)
return false;
@@ -29,7 +29,7 @@ don't exit if the ck session fails to st
#ifdef HAVE_SHADOW
struct spwd *sp = getspnam(pw->pw_name);
endspent();
-@@ -565,7 +576,6 @@ void App::Login() {
+@@ -575,7 +586,6 @@ void App::Login() {
}
catch(Ck::Exception &e) {
logStream << APPNAME << ": " << e << endl;
@@ -37,7 +37,7 @@ don't exit if the ck session fails to st
}
#endif
-@@ -578,6 +588,7 @@ void App::Login() {
+@@ -588,6 +598,7 @@ void App::Login() {
char** child_env = pam.getenvlist();
# ifdef USE_CONSOLEKIT
@@ -45,7 +45,7 @@ don't exit if the ck session fails to st
char** old_env = child_env;
/* Grow the copy of the environment for the session cookie */
-@@ -590,6 +601,7 @@ void App::Login() {
+@@ -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;
@@ -53,7 +53,7 @@ don't exit if the ck session fails to st
# endif /* USE_CONSOLEKIT */
#else
-@@ -611,6 +623,7 @@ void App::Login() {
+@@ -621,6 +633,7 @@ void App::Login() {
child_env[n++]=StrConcat("MAIL=", maildir.c_str());
child_env[n++]=StrConcat("XAUTHORITY=", xauthority.c_str());
# ifdef USE_CONSOLEKIT
@@ -61,7 +61,7 @@ don't exit if the ck session fails to st
child_env[n++]=StrConcat("XDG_SESSION_COOKIE=",
ck.get_xdg_session_cookie());
# endif /* USE_CONSOLEKIT */
child_env[n++]=0;
-@@ -657,6 +670,7 @@ void App::Login() {
+@@ -667,6 +680,7 @@ void App::Login() {
#ifdef USE_CONSOLEKIT
try {
Index: patches/patch-log_h
===================================================================
RCS file: patches/patch-log_h
diff -N patches/patch-log_h
--- patches/patch-log_h 18 Apr 2013 12:00:45 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-log_h,v 1.1 2013/04/18 12:00:45 gonzalo Exp $
---- log.h.orig Wed Apr 17 11:16:47 2013
-+++ log.h Wed Apr 17 11:18:06 2013
-@@ -4,9 +4,6 @@
- #ifdef USE_CONSOLEKIT
- #include "Ck.h"
- #endif
--#ifdef USE_CONSOLEKIT
--#include "PAM.h"
--#endif
- #include "const.h"
- #include <fstream>
-
Index: patches/patch-slim_conf
===================================================================
RCS file: /cvs/ports/x11/slim/patches/patch-slim_conf,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-slim_conf
--- patches/patch-slim_conf 2 Sep 2012 09:22:59 -0000 1.6
+++ patches/patch-slim_conf 30 Oct 2013 09:16:03 -0000
@@ -7,7 +7,7 @@ $OpenBSD: patch-slim_conf,v 1.6 2012/09/
-default_path /bin:/usr/bin:/usr/local/bin
-default_xserver /usr/bin/X
-#xserver_arguments -dpi 75
-+default_path :/bin:/usr/bin:${LOCALBASE}/bin:${X11BASE}/bin
++default_path /bin:/usr/bin:${LOCALBASE}/bin:${X11BASE}/bin
+default_xserver ${X11BASE}/bin/X
+xserver_arguments vt05
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/slim/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST 17 Jan 2011 14:57:38 -0000 1.4
+++ pkg/PLIST 30 Oct 2013 09:16:03 -0000
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.4 2011/01/17 14:57:38 landry Exp $
@pkgpath x11/slim,-main
@bin bin/slim
+@lib lib/libslim.so.${LIBslim_VERSION}
@man man/man1/slim.1
share/doc/pkg-readmes/${FULLPKGNAME}
share/examples/slim/
Index: pkg/README
===================================================================
RCS file: /cvs/ports/x11/slim/pkg/README,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 README
--- pkg/README 2 Jun 2011 13:41:42 -0000 1.3
+++ pkg/README 30 Oct 2013 09:16:03 -0000
@@ -10,7 +10,7 @@ If you're on a zaurus you'll have to cha
${SYSCONFDIR}/slim.conf.
If you're on an arch which doesn't handle virtual terminals (like
-macppc, sparc, sparc64, TGA-based alpha, hp300 or vax), you will have to
+sparc, sparc64, TGA-based alpha, hp300 or vax), you will have to
explicitely set getty off on ttyC0 in /etc/ttys to avoid input
conflicts:
Index: pkg/slim.rc
===================================================================
RCS file: /cvs/ports/x11/slim/pkg/slim.rc,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 slim.rc
--- pkg/slim.rc 17 Dec 2011 22:01:14 -0000 1.3
+++ pkg/slim.rc 30 Oct 2013 09:16:03 -0000
@@ -9,7 +9,14 @@ daemon="${TRUEPREFIX}/bin/slim -d"
rc_reload=NO
rc_start() {
- (sleep 5; ${rcexec} "${daemon} ${daemon_flags}")&
+ ( i=0
+ while [ $i -le 10 ]; do
+ pgrep -qf "^/usr/libexec/getty " && break
+ sleep 1
+ i=`expr $i + 1`
+ done
+ [[ $i -gt 10 ]] && return 1
+ ${rcexec} "${daemon} ${daemon_flags}" ) &
}
rc_cmd $1
