From mboxrd@z Thu Jan 1 00:00:00 1970 From: contact.ng0@cryptolab.net Subject: [PATCH 2/2] gnu: shadow: Update to 4.4. Date: Thu, 19 Jan 2017 20:06:36 +0000 Message-ID: <20170119200636.2767-3-contact.ng0@cryptolab.net> References: <20170119200636.2767-1-contact.ng0@cryptolab.net> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:50979) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUIxy-0002RE-Em for guix-devel@gnu.org; Thu, 19 Jan 2017 15:05:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cUIxu-0003aE-Uq for guix-devel@gnu.org; Thu, 19 Jan 2017 15:05:50 -0500 Received: from aibo.runbox.com ([91.220.196.211]:39552) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cUIxu-0003Zk-NE for guix-devel@gnu.org; Thu, 19 Jan 2017 15:05:46 -0500 Received: from [10.9.9.210] (helo=mailfront10.runbox.com) by bars.runbox.com with esmtp (Exim 4.71) (envelope-from ) id 1cUIxt-0006uC-JG for guix-devel@gnu.org; Thu, 19 Jan 2017 21:05:45 +0100 In-Reply-To: <20170119200636.2767-1-contact.ng0@cryptolab.net> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org Cc: ng0 From: ng0 * gnu/packages/admin.scm (shadow): Update to 4.4. [source]: Adjust URL. * gnu/packages/patches/shadow-4.4-su-snprintf-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 9 ++++--- .../patches/shadow-4.4-su-snprintf-fix.patch | 29 ++++++++++++++++++++++ 3 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/shadow-4.4-su-snprintf-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2da8b82db..4446519b0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -875,6 +875,7 @@ dist_patch_DATA = \ %D%/packages/patches/seq24-rename-mutex.patch \ %D%/packages/patches/serf-comment-style-fix.patch \ %D%/packages/patches/serf-deflate-buckets-test-fix.patch \ + %D%/packages/patches/shadow-4.4-su-snprintf-fix.patch \ %D%/packages/patches/slim-session.patch \ %D%/packages/patches/slim-config.patch \ %D%/packages/patches/slim-sigusr1.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ed02258ed..48f3328b1 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -270,15 +270,16 @@ client and server, a telnet client and server, and an rsh client and server.") (define-public shadow (package (name "shadow") - (version "4.2.1") + (version "4.4") (source (origin (method url-fetch) (uri (string-append - "http://pkg-shadow.alioth.debian.org/releases/" - name "-" version ".tar.xz")) + "https://github.com/shadow-maint/shadow/releases/" + "download/" version "/shadow-" version ".tar.xz")) + (patches (search-patches "shadow-4.4-su-snprintf-fix.patch")) (sha256 (base32 - "0h9x1zdbq0pqmygmc1x459jraiqw4gqz8849v268crk78z8r621v")))) + "0g7hf55ar2pafg5g3ldx0fwzjk36wf4xb21p4ndanbjm3c2a9ab1")))) (build-system gnu-build-system) (arguments '(;; Assume System V `setpgrp (void)', which is the default on GNU diff --git a/gnu/packages/patches/shadow-4.4-su-snprintf-fix.patch b/gnu/packages/patches/shadow-4.4-su-snprintf-fix.patch new file mode 100644 index 000000000..45667c8e4 --- /dev/null +++ b/gnu/packages/patches/shadow-4.4-su-snprintf-fix.patch @@ -0,0 +1,29 @@ +fix from upstream + +From 67d2bb6e0a5ac124ce1f026dd5723217b1493194 Mon Sep 17 00:00:00 2001 +From: Serge Hallyn +Date: Sun, 18 Sep 2016 21:31:18 -0500 +Subject: [PATCH] su.c: fix missing length argument to snprintf + +--- + src/su.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/su.c b/src/su.c +index 0c50a9456afd..93ffd2fbe2b4 100644 +--- a/src/su.c ++++ b/src/su.c +@@ -373,8 +373,8 @@ static void prepare_pam_close_session (void) + stderr); + (void) kill (-pid_child, caught); + +- snprintf (kill_msg, _(" ...killed.\n")); +- snprintf (wait_msg, _(" ...waiting for child to terminate.\n")); ++ snprintf (kill_msg, 256, _(" ...killed.\n")); ++ snprintf (wait_msg, 256, _(" ...waiting for child to terminate.\n")); + + (void) signal (SIGALRM, kill_child); + (void) alarm (2); +-- +2.11.0.rc2 + -- 2.11.0