unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: ng0 <ng0@libertad.pw>
To: guix-devel@gnu.org
Subject: [PATCH 1/2] gnu: tlsdate: Use the system provided certificate store.
Date: Mon,  5 Dec 2016 18:31:00 +0000	[thread overview]
Message-ID: <20161205183101.5937-2-ng0@libertad.pw> (raw)
In-Reply-To: <20161205183101.5937-1-ng0@libertad.pw>

* 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 <taylanbayirli@gmail.com>
 ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 ng0 <ng0@libertad.pw>
 ;;;
 ;;; 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

  reply	other threads:[~2016-12-05 18:31 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-05 18:20 (unknown), ng0
2016-12-05 18:20 ` [PATCH 1/2] gnu: tlsdate: Use the system provided certificate store ng0
2016-12-07 22:19   ` Ludovic Courtès
2016-12-07 23:40     ` ng0
2016-12-08  9:35       ` Ludovic Courtès
2017-01-18 20:31         ` ng0
2017-01-20 13:31           ` Ludovic Courtès
2016-12-05 18:20 ` [PATCH 2/2] services: Add tlsdate-service ng0
2016-12-05 18:23   ` ng0
2016-12-05 18:30     ` v2 tlsdate-service ng0
2016-12-05 18:31       ` ng0 [this message]
2016-12-05 18:31       ` [PATCH 2/2] services: Add tlsdate-service ng0
2016-12-07  7:18         ` Chris Marusich
2016-12-07 12:04           ` ng0
2016-12-09  6:29             ` Chris Marusich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161205183101.5937-2-ng0@libertad.pw \
    --to=ng0@libertad.pw \
    --cc=guix-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).