From 95fd99cf25645eac3097ddfc392c5f4575a21ee2 Mon Sep 17 00:00:00 2001 From: rakuco Date: Tue, 14 May 2013 21:34:12 +0000 Subject: - Update to 1.3.5. PR: ports/177857 Submitted by: Kevin Zheng Approved by: Henry Hu (maintainer) --- x11/slim/Makefile | 29 +++++++++------------ x11/slim/distinfo | 4 +-- x11/slim/files/patch-Ck.cpp | 14 +++++----- x11/slim/files/patch-PAM.cpp | 18 ++++++------- x11/slim/files/patch-app.cpp | 18 ++++++------- x11/slim/files/patch-libpng-setjmp-image.cpp | 33 ------------------------ x11/slim/files/patch-log.h | 15 ----------- x11/slim/files/patch-slim.conf | 4 +-- x11/slim/files/patch-switchuser.cpp | 20 +++++++------- x11/slim/files/patch-themes__default__slim.theme | 4 +-- x11/slim/files/slim.in | 5 ++-- x11/slim/pkg-plist | 3 --- 12 files changed, 54 insertions(+), 113 deletions(-) delete mode 100644 x11/slim/files/patch-libpng-setjmp-image.cpp delete mode 100644 x11/slim/files/patch-log.h (limited to 'x11') diff --git a/x11/slim/Makefile b/x11/slim/Makefile index 739e6fcf859b..cfd7211fd6d2 100644 --- a/x11/slim/Makefile +++ b/x11/slim/Makefile @@ -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 diff --git a/x11/slim/distinfo b/x11/slim/distinfo index db2a7ff2664e..30e1f9476b32 100644 --- a/x11/slim/distinfo +++ b/x11/slim/distinfo @@ -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 diff --git a/x11/slim/files/patch-Ck.cpp b/x11/slim/files/patch-Ck.cpp index 6eaeca0ab537..e3a65888b7f0 100644 --- a/x11/slim/files/patch-Ck.cpp +++ b/x11/slim/files/patch-Ck.cpp @@ -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); diff --git a/x11/slim/files/patch-PAM.cpp b/x11/slim/files/patch-PAM.cpp index 2858eb657d88..6cbff84b69f1 100644 --- a/x11/slim/files/patch-PAM.cpp +++ b/x11/slim/files/patch-PAM.cpp @@ -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: diff --git a/x11/slim/files/patch-app.cpp b/x11/slim/files/patch-app.cpp index 239ce63480d9..482c7904f0bd 100644 --- a/x11/slim/files/patch-app.cpp +++ b/x11/slim/files/patch-app.cpp @@ -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; diff --git a/x11/slim/files/patch-libpng-setjmp-image.cpp b/x11/slim/files/patch-libpng-setjmp-image.cpp deleted file mode 100644 index ddbd4f9f92a9..000000000000 --- a/x11/slim/files/patch-libpng-setjmp-image.cpp +++ /dev/null @@ -1,33 +0,0 @@ ---- image.cpp.orig 2012-07-05 11:54:10.000000000 +0400 -+++ image.cpp 2012-07-05 12:20:08.000000000 +0400 -@@ -746,6 +746,10 @@ - return(ret); - } - -+#if (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5) || PNG_LIBPNG_VER_MAJOR > 1 -+#define PNG_NEW_SETJMP_API -+#endif -+ - int - Image::readPng(const char *filename, int *width, int *height, - unsigned char **rgb, unsigned char **alpha) -@@ -781,7 +785,13 @@ - (png_infopp) NULL); - } - -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp( -+#ifdef PNG_NEW_SETJMP_API -+(png_jmpbuf(png_ptr)) -+#else -+png_ptr->jmpbuf -+#endif -+ )) { - goto png_destroy; - } - -@@ -894,3 +904,4 @@ - fclose(infile); - return(ret); - } -+#undef PNG_NEW_SETJMP_API diff --git a/x11/slim/files/patch-log.h b/x11/slim/files/patch-log.h deleted file mode 100644 index 054e8051dab4..000000000000 --- a/x11/slim/files/patch-log.h +++ /dev/null @@ -1,15 +0,0 @@ ---- log.h.orig 2012-06-26 10:20:14.000000000 +0200 -+++ log.h 2012-11-25 20:00:39.294546666 +0100 -@@ -1,6 +1,12 @@ - #ifndef _LOG_H_ - #define _LOG_H_ - -+#ifdef USE_CONSOLEKIT -+#include "Ck.h" -+#endif -+#ifdef USE_CONSOLEKIT -+#include "PAM.h" -+#endif - #include "const.h" - #include - diff --git a/x11/slim/files/patch-slim.conf b/x11/slim/files/patch-slim.conf index dde0e1a149c4..86e2e22833a0 100644 --- a/x11/slim/files/patch-slim.conf +++ b/x11/slim/files/patch-slim.conf @@ -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 diff --git a/x11/slim/files/patch-switchuser.cpp b/x11/slim/files/patch-switchuser.cpp index 056a134359f6..8c2a94e7ceeb 100644 --- a/x11/slim/files/patch-switchuser.cpp +++ b/x11/slim/files/patch-switchuser.cpp @@ -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) ) { diff --git a/x11/slim/files/patch-themes__default__slim.theme b/x11/slim/files/patch-themes__default__slim.theme index 10ebf78dd9fc..5bf34c576ee0 100644 --- a/x11/slim/files/patch-themes__default__slim.theme +++ b/x11/slim/files/patch-themes__default__slim.theme @@ -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 diff --git a/x11/slim/files/slim.in b/x11/slim/files/slim.in index d54bd26d2c31..040b3558aa5b 100644 --- a/x11/slim/files/slim.in +++ b/x11/slim/files/slim.in @@ -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 diff --git a/x11/slim/pkg-plist b/x11/slim/pkg-plist index d4ac8c4cafce..1fba1bd91f73 100644 --- a/x11/slim/pkg-plist +++ b/x11/slim/pkg-plist @@ -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 -- cgit