Date: Tue, 14 May 2013 21:34:13 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318203 - in head/x11/slim: . files Message-ID: <201305142134.r4ELYDqJ006418@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Tue May 14 21:34:12 2013 New Revision: 318203 URL: http://svnweb.freebsd.org/changeset/ports/318203 Log: - Update to 1.3.5. PR: ports/177857 Submitted by: Kevin Zheng <kevinz5000@gmail.com> Approved by: Henry Hu <henry.hu.sh@gmail.com> (maintainer) Deleted: head/x11/slim/files/patch-libpng-setjmp-image.cpp head/x11/slim/files/patch-log.h Modified: head/x11/slim/Makefile head/x11/slim/distinfo head/x11/slim/files/patch-Ck.cpp head/x11/slim/files/patch-PAM.cpp head/x11/slim/files/patch-app.cpp head/x11/slim/files/patch-slim.conf head/x11/slim/files/patch-switchuser.cpp head/x11/slim/files/patch-themes__default__slim.theme head/x11/slim/files/slim.in head/x11/slim/pkg-plist Modified: head/x11/slim/Makefile ============================================================================== --- head/x11/slim/Makefile Tue May 14 21:33:29 2013 (r318202) +++ head/x11/slim/Makefile Tue May 14 21:34:12 2013 (r318203) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= slim -PORTVERSION= 1.3.4 -PORTREVISION= 5 +PORTVERSION= 1.3.5 CATEGORIES= x11 -MASTER_SITES= http://slim.berlios.de/releases/ +MASTER_SITES= ftp://ftp.berlios.de/pub/slim/ \ + SF/slim.berlios MAINTAINER= henry.hu.sh@gmail.com COMMENT= Graphical login manager for X11, derived from Login.app @@ -44,22 +44,17 @@ PLIST_SUB+= PAM="@comment " .endif post-patch: - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/${PORTNAME}.conf - @${REINPLACE_CMD} -e 's|"/etc"|"${PREFIX}/etc"|' \ - -e 's|slim.conf|slim.conf.sample|' \ - -e 's|set(MANDIR "$${CMAKE_INSTALL_PREFIX}/share/man")|set(MANDIR "${PREFIX}/man")|' \ - ${WRKSRC}/CMakeLists.txt - @${MV} ${WRKSRC}/slim.conf ${WRKSRC}/slim.conf.sample - @${REINPLACE_CMD} -e 's|std::snprintf|snprintf|' ${WRKSRC}/Ck.cpp - -# Fix a previous bad install - Ok to remove at version 1.3.5 or later -pre-install: - @${RM} -f ${LOCALBASE}/share/man/man1/slim.1 - @${RMDIR} ${LOCALBASE}/share/man/man1 2>/dev/null || true - @${RMDIR} ${LOCALBASE}/share/man 2>/dev/null || true + @${CP} ${WRKSRC}/slim.conf ${WRKSRC}/slim.conf.sample + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/slim.conf.sample + @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \ + -e 's|/etc|${PREFIX}/etc|' \ + -e 's|share/man|man|' \ + -e 's|slim.conf|slim.conf.sample|' \ + -e '/systemd/d' \ + ${WRKSRC}/CMakeLists.txt post-install: - @${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1 @if [ ! -f ${PREFIX}/etc/slim.conf ]; then \ ${CP} ${PREFIX}/etc/slim.conf.sample ${PREFIX}/etc/slim.conf ; \ fi Modified: head/x11/slim/distinfo ============================================================================== --- head/x11/slim/distinfo Tue May 14 21:33:29 2013 (r318202) +++ head/x11/slim/distinfo Tue May 14 21:34:12 2013 (r318203) @@ -1,2 +1,2 @@ -SHA256 (slim-1.3.4.tar.gz) = 155c26460c98b9f0925624028b4254afc0de4fda33300f3ac45606b2c5cbd501 -SIZE (slim-1.3.4.tar.gz) = 227197 +SHA256 (slim-1.3.5.tar.gz) = 818d209f51e2fa8d5b94ef75ce90a7415be48b45e796d66f8083a9532b655629 +SIZE (slim-1.3.5.tar.gz) = 226413 Modified: head/x11/slim/files/patch-Ck.cpp ============================================================================== --- head/x11/slim/files/patch-Ck.cpp Tue May 14 21:33:29 2013 (r318202) +++ head/x11/slim/files/patch-Ck.cpp Tue May 14 21:34:12 2013 (r318203) @@ -1,11 +1,11 @@ ---- Ck.cpp.orig 2012-02-22 03:59:52.000000000 +0400 -+++ Ck.cpp 2012-07-19 00:03:34.000000000 +0400 +--- ./Ck.cpp.orig 2012-12-31 07:03:42.000000000 -0600 ++++ ./Ck.cpp 2013-03-23 14:10:35.000000000 -0500 @@ -91,7 +91,7 @@ - vt = *((long *)return_value); + vt = *((long *)return_value); -- std::snprintf(device, 32, "/dev/tty%ld", vt); -+ std::snprintf(device, 32, "/dev/ttyv%ld", vt - 1); +- std::snprintf(device, 32, "/dev/tty%ld", vt); ++ snprintf(device, 32, "/dev/ttyv%ld", vt - 1); - if(return_value) - XFree(return_value); + if(return_value) + XFree(return_value); Modified: head/x11/slim/files/patch-PAM.cpp ============================================================================== --- head/x11/slim/files/patch-PAM.cpp Tue May 14 21:33:29 2013 (r318202) +++ head/x11/slim/files/patch-PAM.cpp Tue May 14 21:34:12 2013 (r318203) @@ -1,10 +1,10 @@ ---- PAM.cpp.orig 2012-06-26 12:20:14.000000000 +0400 -+++ PAM.cpp 2012-12-16 16:05:09.000000000 +0400 -@@ -128,6 +128,7 @@ - case PAM_MAXTRIES: - case PAM_CRED_INSUFFICIENT: - case PAM_AUTH_ERR: -+ case PAM_CONV_ERR: - throw Auth_Exception(pam_handle, "pam_authentication()", last_result); +--- ./PAM.cpp.orig 2012-12-31 07:03:42.000000000 -0600 ++++ ./PAM.cpp 2013-03-23 14:10:35.000000000 -0500 +@@ -127,6 +127,7 @@ + case PAM_MAXTRIES: + case PAM_CRED_INSUFFICIENT: + case PAM_AUTH_ERR: ++ case PAM_CONV_ERR: + throw Auth_Exception(pam_handle, "pam_authentication()", last_result); - case PAM_SUCCESS: + case PAM_SUCCESS: Modified: head/x11/slim/files/patch-app.cpp ============================================================================== --- head/x11/slim/files/patch-app.cpp Tue May 14 21:33:29 2013 (r318202) +++ head/x11/slim/files/patch-app.cpp Tue May 14 21:34:12 2013 (r318203) @@ -1,11 +1,11 @@ ---- app.cpp.orig 2008-10-04 13:45:58.000000000 +0200 -+++ app.cpp 2008-10-04 13:46:07.000000000 +0200 -@@ -887,7 +887,7 @@ - } +--- ./app.cpp.orig 2012-12-31 07:03:42.000000000 -0600 ++++ ./app.cpp 2013-03-23 14:10:35.000000000 -0500 +@@ -931,7 +931,7 @@ + } - if (!hasVtSet && daemonmode) { -- server[argc++] = (char*)"vt07"; -+ server[argc++] = (char*)"vt09"; - } - server[argc] = NULL; + if (!hasVtSet && daemonmode) { +- server[argc++] = (char*)"vt07"; ++ server[argc++] = (char*)"vt09"; + } + server[argc] = NULL; Modified: head/x11/slim/files/patch-slim.conf ============================================================================== --- head/x11/slim/files/patch-slim.conf Tue May 14 21:33:29 2013 (r318202) +++ head/x11/slim/files/patch-slim.conf Tue May 14 21:34:12 2013 (r318203) @@ -1,5 +1,5 @@ ---- slim.conf.orig 2008-10-04 13:49:03.000000000 +0200 -+++ slim.conf 2008-10-04 13:52:44.000000000 +0200 +--- ./slim.conf.orig 2012-12-31 07:03:42.000000000 -0600 ++++ ./slim.conf 2013-03-23 14:10:35.000000000 -0500 @@ -1,17 +1,19 @@ # Path, X server and arguments (if needed) # Note: -xauth $authfile is automatically appended Modified: head/x11/slim/files/patch-switchuser.cpp ============================================================================== --- head/x11/slim/files/patch-switchuser.cpp Tue May 14 21:33:29 2013 (r318202) +++ head/x11/slim/files/patch-switchuser.cpp Tue May 14 21:34:12 2013 (r318203) @@ -1,13 +1,11 @@ ---- switchuser.cpp 2009-10-14 16:28:20.000000000 +0800 -+++ switchuser.cpp 2009-10-14 16:34:23.000000000 +0800 -@@ -38,6 +38,8 @@ +--- ./switchuser.cpp.orig 2012-12-31 07:03:42.000000000 -0600 ++++ ./switchuser.cpp 2013-03-23 14:10:35.000000000 -0500 +@@ -36,6 +36,8 @@ void SwitchUser::SetUserId() { - if( (Pw == 0) || -+ (setsid() == -1) || -+ (setlogin(Pw->pw_name) != 0) || - (initgroups(Pw->pw_name, Pw->pw_gid) != 0) || - (setgid(Pw->pw_gid) != 0) || - (setuid(Pw->pw_uid) != 0) ) { - - + if( (Pw == 0) || ++ (setsid() == -1) || ++ (setlogin(Pw->pw_name) != 0) || + (initgroups(Pw->pw_name, Pw->pw_gid) != 0) || + (setgid(Pw->pw_gid) != 0) || + (setuid(Pw->pw_uid) != 0) ) { Modified: head/x11/slim/files/patch-themes__default__slim.theme ============================================================================== --- head/x11/slim/files/patch-themes__default__slim.theme Tue May 14 21:33:29 2013 (r318202) +++ head/x11/slim/files/patch-themes__default__slim.theme Tue May 14 21:34:12 2013 (r318203) @@ -1,5 +1,5 @@ ---- themes/default/slim.theme.orig 2012-02-21 15:59:52.000000000 -0800 -+++ themes/default/slim.theme 2012-06-02 23:23:10.000000000 -0700 +--- ./themes/default/slim.theme.orig 2012-12-31 07:03:42.000000000 -0600 ++++ ./themes/default/slim.theme 2013-03-23 14:10:35.000000000 -0500 @@ -1,9 +1,10 @@ # text04 theme for SLiM # by Johannes Winkelmann Modified: head/x11/slim/files/slim.in ============================================================================== --- head/x11/slim/files/slim.in Tue May 14 21:33:29 2013 (r318202) +++ head/x11/slim/files/slim.in Tue May 14 21:34:12 2013 (r318203) @@ -6,9 +6,8 @@ # REQUIRE: LOGIN dbus hald # KEYWORD: shutdown # -# Add the following lines to /etc/rc.conf to enable slim: -# slim_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable slim +# Add the following line to /etc/rc.conf to enable slim: +# slim_enable="YES" # # Alternatively, edit /etc/ttys and change the line below # ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure Modified: head/x11/slim/pkg-plist ============================================================================== --- head/x11/slim/pkg-plist Tue May 14 21:33:29 2013 (r318202) +++ head/x11/slim/pkg-plist Tue May 14 21:34:12 2013 (r318203) @@ -11,6 +11,3 @@ etc/slim.conf.sample %%PAM%%@unexec if cmp -s %D/etc/pam.d/slim.default %D/etc/pam.d/slim; then rm -f %D/etc/pam.d/slim ; fi %%PAM%%etc/pam.d/slim.default %%PAM%%@exec if [ ! -f %D/etc/pam.d/slim ] ; then cp -p %D/%F %B/slim; fi -@exec /bin/rm -f %D/share/man/man1/slim.1 -@exec rmdir "%D/share/man/man1" 2>/dev/null || true -@exec rmdir "%D/share/man" 2>/dev/null || true
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305142134.r4ELYDqJ006418>