From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: [PATCH 1/2] gnu: tlsdate: Use the system provided certificate store. Date: Mon, 5 Dec 2016 18:31:00 +0000 Message-ID: <20161205183101.5937-2-ng0@libertad.pw> References: <877f7emdzn.fsf@we.make.ritual.n0.is> <20161205183101.5937-1-ng0@libertad.pw> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:49217) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cDy2t-0005C2-EY for guix-devel@gnu.org; Mon, 05 Dec 2016 13:31:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cDy2s-0005dm-HC for guix-devel@gnu.org; Mon, 05 Dec 2016 13:31:23 -0500 Received: from aibo.runbox.com ([91.220.196.211]:33625) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cDy2s-0005bc-An for guix-devel@gnu.org; Mon, 05 Dec 2016 13:31:22 -0500 Received: from [10.9.9.212] (helo=mailfront12.runbox.com) by bars.runbox.com with esmtp (Exim 4.71) (envelope-from ) id 1cDy2r-0008Ue-5P for guix-devel@gnu.org; Mon, 05 Dec 2016 19:31:21 +0100 In-Reply-To: <20161205183101.5937-1-ng0@libertad.pw> 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 * gnu/packages/ntp.scm (tlsdate)[arguments]: Configure with unprivileged user and group. [arguments]: Build with the system provided certificates in a new phase. --- gnu/packages/ntp.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm index 13781fbda..45f334b57 100644 --- a/gnu/packages/ntp.scm +++ b/gnu/packages/ntp.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015 Ludovic Courtès ;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -134,8 +135,17 @@ minimalist than ntpd.") (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'autogen + '(#:configure-flags '("--with-unpriv-user=tlsdate" + "--with-unpriv-group=tlsdate") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'set-cert-path + ;; Use the system certificate store, not the + ;; application bundled certificates. + (lambda _ + (substitute* "Makefile.am" + (("$(sysconfdir)/tlsdate/ca-roots/tlsdate-ca-roots.conf") + "/etc/ssl/certs/ca-certificates.crt")))) + (add-after 'set-cert-path 'autogen (lambda _ ;; The ancestor of 'SOURCE_DATE_EPOCH'; it contains the ;; date that is recorded in binaries. It must be a -- 2.11.0