From patchwork Tue Oct 18 05:31:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Bavier X-Patchwork-Id: 16611 Received: (qmail 113311 invoked by uid 89); 18 Oct 2016 05:32:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=BAYES_00, RCVD_IN_SORBS_SPAM, RP_MATCHES_RCVD, SPF_PASS autolearn=no version=3.3.2 spammy=ses, UD:auth, Panel, 52, 6 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00, RCVD_IN_SORBS_SPAM, RP_MATCHES_RCVD, SPF_PASS autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: lists.gnu.org Received: from lists.gnu.org (HELO lists.gnu.org) (208.118.235.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 18 Oct 2016 05:32:12 +0000 Received: from localhost ([::1]:39033 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwN0U-0006gp-DC for patchwork@sourceware.org; Tue, 18 Oct 2016 01:32:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwN0O-0006gW-Cy for guix-devel@gnu.org; Tue, 18 Oct 2016 01:32:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bwN0K-0005Kx-Rp for guix-devel@gnu.org; Tue, 18 Oct 2016 01:32:04 -0400 Received: from smtp-fo.agate.dfw.synacor.com ([205.219.233.7]:12498 helo=mailrelay.embarq.synacor.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bwN0K-0005KC-I4 for guix-devel@gnu.org; Tue, 18 Oct 2016 01:32:00 -0400 DKIM-Signature: v=1; a=rsa-sha1; d=centurylink.net; s=ctl201402; c=relaxed/simple; q=dns/txt; i=@centurylink.net; t=1476768717; h=From:Subject:Date:To:MIME-Version:Content-Type; bh=GCOMybw07Mdl3SK2s3zQzB6OnCw=; b=cqqAFHeLYVUEBVJmpkN77dFQDo1aiWnIA92jv8+YyswcwQw9IMGStDnN+dEK7EmV iAzlfl+n6ZSJG9ZvKbV7kZUJOD6a+CNvhIcJlSZ8sFfMxfQmgVnXu/Bi3UwaR3oj oPgwS83C1OHUbXdIKXOY6Dzs5Er1fWWZXPOM1S2bBxIauDcVK2fTY6GCcre0J+Lt xulE592f0+7ful/kHwuaS7ZHELM3qCo1RLxKy2CwG0Jplvw8lFdXcmT42SzOPVqU MzGvmbSut0HInG2m/Tb3GTEcF5y/ipqbd9b0amZVbfJl4SioM6XZdhpy5/Ap5HzG 6cp6Eme3BBMu5uvCaQCbBQ==; X_CMAE_Category: , , X-CNFS-Analysis: v=2.2 cv=DM3N2GFb c=1 sm=1 tr=0 a=LoljmGom5ZskWn6bbyId1Q==:117 a=LoljmGom5ZskWn6bbyId1Q==:17 a=8HIUr6gADL2gdc8bhN0A:9 a=CjuIK1q_8ugA:10 a=inoG4m36AAAA:8 a=cLMV9jhUYnC28ZjoKnoA:9 a=MCCj2u2KmMgsg9Kly1IA:9 a=3c3os6SWQfysDkB5Z1cA:9 a=_Qgj-RFg6mImvLaOgLPg:22 X-CM-Score: 0 X-Scanned-by: Cloudmark Authority Engine X-Authed-Username: ZXJpY2JhdmllckBjZW50dXJ5bGluay5uZXQ= Authentication-Results: smtp03.agate.dfw.synacor.com smtp.user=ericbavier@centurylink.net; auth=pass (LOGIN) Received: from [174.30.196.128] ([174.30.196.128:63618] helo=localhost) by smtp.centurylink.net (envelope-from ) (ecelerity 3.5.1.37854 r(Momo-dev:3.5.1.0)) with ESMTPSA (cipher=AES256-GCM-SHA384) id 7C/4D-05547-DC3B5085; Tue, 18 Oct 2016 01:31:57 -0400 Date: Tue, 18 Oct 2016 00:31:56 -0500 From: Eric Bavier To: guix-devel@gnu.org Subject: [PATCH] gnu: slim: Do not reset session after failed login Message-ID: <20161018003156.78e68be2@centurylink.net> X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.30; x86_64-unknown-linux-gnu) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 205.219.233.7 X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: bavier@member.fsf.org Errors-To: guix-devel-bounces+patchwork=sourceware.org@gnu.org Sender: "Guix-devel" Hello Guix, The first patch fixes an often-bemoaned usability issue in SLiM. The second is mostly to improve aesthetics, IMHO. `~Eric From 7c0af8d1f41e730fe26fd608e7c669c8ac89d765 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Mon, 17 Oct 2016 17:20:24 -0500 Subject: [PATCH 2/2] gnu: slim: Display login message. * gnu/packages/patches/slim-login.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/display-managers.scm (slim)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/display-managers.scm | 1 + gnu/packages/patches/slim-login.patch | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 gnu/packages/patches/slim-login.patch diff --git a/gnu/local.mk b/gnu/local.mk index a22a22c..3955e6e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -821,6 +821,7 @@ dist_patch_DATA = \ %D%/packages/patches/slim-config.patch \ %D%/packages/patches/slim-sigusr1.patch \ %D%/packages/patches/slim-reset.patch \ + %D%/packages/patches/slim-login.patch \ %D%/packages/patches/slock-CVE-2016-6866.patch \ %D%/packages/patches/slurm-configure-remove-nonfree-contribs.patch \ %D%/packages/patches/soprano-find-clucene.patch \ diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 5479bb5..0eca945 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -200,6 +200,7 @@ create smooth, animated user interfaces.") (base32 "1pqhk22jb4aja4hkrm7rjgbgzjyh7i4zswdgf5nw862l2znzxpi1")) (patches (search-patches "slim-config.patch" "slim-reset.patch" + "slim-login.patch" "slim-session.patch" "slim-sigusr1.patch")))) (build-system cmake-build-system) diff --git a/gnu/packages/patches/slim-login.patch b/gnu/packages/patches/slim-login.patch new file mode 100644 index 0000000..eb1bf86 --- /dev/null +++ b/gnu/packages/patches/slim-login.patch @@ -0,0 +1,33 @@ +Display configurable login message after successful authentication. + +--- slim-1.3.6/panel.cpp.orig 1969-12-31 18:00:00.000000000 -0600 ++++ slim-1.3.6/panel.cpp 2016-10-17 17:00:07.259649063 -0500 +@@ -260,19 +260,19 @@ + + void Panel::ClosePanel() { + XUngrabKeyboard(Dpy, CurrentTime); ++ XClearWindow(Dpy, Root); + XUnmapWindow(Dpy, Win); + XDestroyWindow(Dpy, Win); + XFlush(Dpy); +--- slim-1.3.6/cfg.cpp.orig 2016-10-17 17:08:06.767666139 -0500 ++++ slim-1.3.6/cfg.cpp 2016-10-17 17:06:53.115663516 -0500 +@@ -52,6 +52,7 @@ + options.insert(option("lockfile","/var/run/slim.lock")); + options.insert(option("logfile","/var/log/slim.log")); + options.insert(option("authfile","/var/run/slim.auth")); ++ options.insert(option("login_msg","Logging in...")); + options.insert(option("shutdown_msg","The system is halting...")); + options.insert(option("reboot_msg","The system is rebooting...")); + options.insert(option("sessiondir","")); +--- slim-1.3.6/app.cpp.orig 2016-10-17 17:08:41.731667384 -0500 ++++ slim-1.3.6/app.cpp 2016-10-17 17:07:48.415665486 -0500 +@@ -520,6 +520,8 @@ + struct passwd *pw; + pid_t pid; + ++ LoginPanel->Message((char*)cfg->getOption("login_msg").c_str()); ++ + #ifdef USE_PAM + try{ + pam.open_session(); -- 2.10.0