From patchwork Sat Aug 27 04:47:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: rennes@openmailbox.org X-Patchwork-Id: 14995 Received: (qmail 78713 invoked by uid 89); 27 Aug 2016 04:48:28 -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=-2.2 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=6457 X-Spam-Status: No, score=-2.2 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham 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; Sat, 27 Aug 2016 04:48:17 +0000 Received: from localhost ([::1]:34689 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bdVXL-0003OH-Up for patchwork@sourceware.org; Sat, 27 Aug 2016 00:48:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51670) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bdVXD-0003MW-Kv for guix-devel@gnu.org; Sat, 27 Aug 2016 00:48:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bdVXA-00031G-4U for guix-devel@gnu.org; Sat, 27 Aug 2016 00:47:59 -0400 Received: from mail2.openmailbox.org ([62.4.1.33]:35839) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bdVX9-00030u-Qn for guix-devel@gnu.org; Sat, 27 Aug 2016 00:47:56 -0400 Received: by mail2.openmailbox.org (Postfix, from userid 1001) id 43B1F107065; Sat, 27 Aug 2016 06:47:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1472273245; bh=5lTU3GF98gHdTawkdhq9qLcOd2cSgmKNcIazbotUTvk=; h=Date:From:To:Cc:Subject:From; b=BuNwuyOJJvCRfs0Ci067bnf/xs04n4Rjp62T2hak87jQpiBfC3FscRI/kKZEGR8u2 Rl+/wzhDykVNGj+JYzHW1Owahpi5LXl9s+VXKOBIhnX8HqYNRK6D8j7bm2UoIUOfa4 tcpKgngDbh9ZtCPg+cD+WGtQMrz037Idicqqxx5E= Received: from www.openmailbox.org (unknown [10.91.130.55]) by mail2.openmailbox.org (Postfix) with ESMTP id 7D6ED10725E; Sat, 27 Aug 2016 06:47:22 +0200 (CEST) MIME-Version: 1.0 Date: Fri, 26 Aug 2016 23:47:22 -0500 From: rennes@openmailbox.org To: guix-devel@gnu.org Subject: [PATCH] gnu: Add linux-pam. Message-ID: X-Sender: rennes@openmailbox.org User-Agent: Roundcube Webmail/1.0.6 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 62.4.1.33 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: , Errors-To: guix-devel-bounces+patchwork=sourceware.org@gnu.org Sender: "Guix-devel" This is a patch for linux-pam, at compile on the Hurd system searches the file fsuid.h. The patch was taken from the Debian project. * This patch is prerequisite for lsh/openssh packages. * The patch was build and installed on Linux and the Hurd systems. Thanks From c7ddf09a79ad33d69b5ac8080b6131763e836ae5 Mon Sep 17 00:00:00 2001 From: Rene Saavedra Date: Fri, 26 Aug 2016 23:19:14 -0500 Subject: [PATCH] gnu: Add linux-pam. * gnu/packages/linux.scm (linux-pam): Use it. * gnu/packages/patches/linux-pam-no-setfsuid.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 2 + gnu/packages/linux.scm | 6 +- gnu/packages/patches/linux-pam-no-setfsuid.patch | 79 ++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/linux-pam-no-setfsuid.patch diff --git a/gnu/local.mk b/gnu/local.mk index b8c5378..391aa8a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -5,6 +5,7 @@ # Copyright © 2013, 2014, 2015, 2016 Mark H Weaver # Copyright © 2016 Chris Marusich # Copyright © 2016 Kei Kebreau +# Copyright © 2016 Rene Saavedra # # This file is part of GNU Guix. # @@ -644,6 +645,7 @@ dist_patch_DATA = \ %D%/packages/patches/libwmf-CVE-2015-4695.patch \ %D%/packages/patches/libwmf-CVE-2015-4696.patch \ %D%/packages/patches/libxslt-generated-ids.patch \ + %D%/packages/patches/linux-pam-no-setfsuid.patch \ %D%/packages/patches/lirc-localstatedir.patch \ %D%/packages/patches/lm-sensors-hwmon-attrs.patch \ %D%/packages/patches/lua-CVE-2014-5461.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1fd792d..8d7ff4c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2016 Nicolas Goaziou ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016 David Craven +;;; Copyright © 2016 Rene Saavedra ;;; ;;; This file is part of GNU Guix. ;;; @@ -390,7 +391,10 @@ It has been modified to remove all non-free binary blobs.") version ".tar.bz2"))) (sha256 (base32 - "1n9lnf9gjs72kbj1g354v1xhi2j27aqaah15vykh7cnkq08i4arl")))) + "1n9lnf9gjs72kbj1g354v1xhi2j27aqaah15vykh7cnkq08i4arl")) + ;; On the Hurd system in the 'build' phase seeks fsuid.h file. + (patches (search-patches + "linux-pam-no-setfsuid.patch")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) diff --git a/gnu/packages/patches/linux-pam-no-setfsuid.patch b/gnu/packages/patches/linux-pam-no-setfsuid.patch new file mode 100644 index 0000000..7940c5a --- /dev/null +++ b/gnu/packages/patches/linux-pam-no-setfsuid.patch @@ -0,0 +1,79 @@ +The patch originates from the Debian project for the Hurd system. + +On systems without setfsuid(), use setreuid() instead. + +Authors: Steve Langasek + +Upstream status: to be forwarded, now that pam_modutil_{drop,regain}_priv + are implemented + +Index: pam.debian/libpam/pam_modutil_priv.c +=================================================================== +--- pam.debian.orig/libpam/pam_modutil_priv.c ++++ pam.debian/libpam/pam_modutil_priv.c +@@ -14,7 +14,9 @@ + #include + #include + #include ++#ifdef HAVE_SYS_FSUID_H + #include ++#endif /* HAVE_SYS_FSUID_H */ + + /* + * Two setfsuid() calls in a row are necessary to check +@@ -22,17 +24,55 @@ + */ + static int change_uid(uid_t uid, uid_t *save) + { ++#ifdef HAVE_SYS_FSUID_H + uid_t tmp = setfsuid(uid); + if (save) + *save = tmp; + return (uid_t) setfsuid(uid) == uid ? 0 : -1; ++#else ++ uid_t euid = geteuid(); ++ uid_t ruid = getuid(); ++ if (save) ++ *save = ruid; ++ if (ruid == uid && uid != 0) ++ if (setreuid(euid, uid)) ++ return -1; ++ else { ++ setreuid(0, -1); ++ if (setreuid(-1, uid)) { ++ setreuid(-1, 0); ++ setreuid(0, -1); ++ if (setreuid(-1, uid)) ++ return -1; ++ } ++ } ++#endif + } + static int change_gid(gid_t gid, gid_t *save) + { ++#ifdef HAVE_SYS_FSUID_H + gid_t tmp = setfsgid(gid); + if (save) + *save = tmp; + return (gid_t) setfsgid(gid) == gid ? 0 : -1; ++#else ++ gid_t egid = getegid(); ++ gid_t rgid = getgid(); ++ if (save) ++ *save = rgid; ++ if (rgid == gid) ++ if (setregid(egid, gid)) ++ return -1; ++ else { ++ setregid(0, -1); ++ if (setregid(-1, gid)) { ++ setregid(-1, 0); ++ setregid(0, -1); ++ if (setregid(-1, gid)) ++ return -1; ++ } ++ } ++#endif + } + + static int cleanup(struct pam_modutil_privs *p) -- 2.6.3