From patchwork Thu May 26 13:13:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Attila Lendvai X-Patchwork-Id: 39617 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EA61927BBEA; Thu, 26 May 2022 14:18:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6194C27BBE9 for ; Thu, 26 May 2022 14:18:10 +0100 (BST) Received: from localhost ([::1]:40864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nuDNR-00016D-J9 for patchwork@mira.cbaines.net; Thu, 26 May 2022 09:18:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nuDNK-000161-AD for guix-patches@gnu.org; Thu, 26 May 2022 09:18:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35290) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nuDNJ-0006TM-UE for guix-patches@gnu.org; Thu, 26 May 2022 09:18:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nuDNJ-00042o-QB for guix-patches@gnu.org; Thu, 26 May 2022 09:18:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55659] [PATCH 2/2] gnu: ddclient: Update to 3.10.0_2 (RC2). References: <20220526130912.29483-1-attila@lendvai.name> In-Reply-To: <20220526130912.29483-1-attila@lendvai.name> Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 May 2022 13:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55659 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55659@debbugs.gnu.org Cc: Attila Lendvai Received: via spool by 55659-submit@debbugs.gnu.org id=B55659.165357102815482 (code B ref 55659); Thu, 26 May 2022 13:18:01 +0000 Received: (at 55659) by debbugs.gnu.org; 26 May 2022 13:17:08 +0000 Received: from localhost ([127.0.0.1]:57420 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nuDMS-00041e-2l for submit@debbugs.gnu.org; Thu, 26 May 2022 09:17:08 -0400 Received: from mail-ej1-f46.google.com ([209.85.218.46]:34395) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nuDMO-00040y-Ij for 55659@debbugs.gnu.org; Thu, 26 May 2022 09:17:07 -0400 Received: by mail-ej1-f46.google.com with SMTP id q21so3013053ejm.1 for <55659@debbugs.gnu.org>; Thu, 26 May 2022 06:17:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9K6P1TcWjizrx8LKD08gFuuVFQh1PNZzfu/V1pdzh4A=; b=YRiqH/i3XV7z9/fmHXEMxq7x33rNRJQSn55YHRQtw7fMt2n2icK4cZouDX5N/iZyBQ 4ti3OXkHY4h6mBGw8lcQH6M/HVgHr3RQuwI8nNXPiQ7nLDwWrTqWcp+++EfOZ0JC9Own 3OU3vsD83H0cuTX5JulqSDL10Uo3jKfECQVWGeWEvTw7nEG+GSkfci17O8H9qqGNoYAt kpY0JtaS3ElCej5UlTavzXtCw3xEEf4+z8lCI/61/XR5Ex4+eXKK6LlBe4zR4eQio5dL BOowHEDWnhcL8+lJS/UM9D3SXJf6VZAD7Y6odKINhkhPNiF6ZpF7LfVlG1QAWYu+ELE3 DNsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=9K6P1TcWjizrx8LKD08gFuuVFQh1PNZzfu/V1pdzh4A=; b=tIYu4GWUS9j3rSNzpyFWmY7/VRLBlQKYEcs8ZZW5ToQ1aDeqtBDTFc1D+DQy6UBZnw LBsK/vr2nzvxLfoKiXhjqGtwNsX9RwNwfPn1VS2EN1wOiJ1bIc5V48tChsGd0TSWW30k 9Obq24ybcCvb8Li6Ve/evNUn6BNDR1SYSj1EgYVRHb2/kjm2QOLmtFsdx7I1IqunlTQ3 Php8mO2D2CWEU5xlMbktUZz5y6yk6i0HZ054LAWkdabF++GfcrZ0zMziiZnDk78tbkw0 PBdljAh9tkrWVq8qkyUqrbMs2MCbSxEksWw7VlN7crd0F3WlHDsHeTRKF1fO4LQbDPXQ bNoQ== X-Gm-Message-State: AOAM533FnSwS9hKTuyfGuExu2blkEYTVbBQkFCS5a4wlqIy83vnYqLjf sXDpejisCkkSo6YK+iOQARkPPm+adkQ= X-Google-Smtp-Source: ABdhPJwLdqDmooXeGZkaLGnOHcx8YX8DxUyGz6llyn7N9BSiwtL5CaF7FFVP9UBKfgFAYy1XDsfMGQ== X-Received: by 2002:a17:907:3e86:b0:6f5:917:10cc with SMTP id hs6-20020a1709073e8600b006f5091710ccmr32304642ejc.53.1653571018759; Thu, 26 May 2022 06:16:58 -0700 (PDT) Received: from lelap.local (catv-89-132-245-188.catv.fixed.vodafone.hu. [89.132.245.188]) by smtp.gmail.com with ESMTPSA id o3-20020a170906774300b006f3ef214db7sm523039ejn.29.2022.05.26.06.16.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 May 2022 06:16:58 -0700 (PDT) From: Attila Lendvai Date: Thu, 26 May 2022 15:13:16 +0200 Message-Id: <20220526131315.30515-2-attila@lendvai.name> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- note that this seems to work, but is not fully tested. i have abandoned the use of ddclient and with that this patchset. also note that i'm not sure why the use of wrap-program is needed, but without that it was missing some perl modules at runtime. gnu/packages/dns.scm | 76 ++++++++++++++++---------------------------- 1 file changed, 27 insertions(+), 49 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index fea255c930..0430415b3f 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -64,6 +64,7 @@ (define-module (gnu packages dns) #:use-module (gnu packages nettle) #:use-module (gnu packages networking) #:use-module (gnu packages perl) + #:use-module (gnu packages perl-check) #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) @@ -1094,7 +1095,7 @@ (define-public knot-resolver (define-public ddclient (package (name "ddclient") - (version "3.9.1") + (version "3.10.0_2") (source (origin (method git-fetch) @@ -1103,62 +1104,39 @@ (define-public ddclient (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0hf377g4j9r9sac75xp17nk2h58mazswz4vkg4g2gl2yyhvzq91w")))) - (build-system trivial-build-system) ; no Makefile.PL + (base32 "0jl658yr867y65hh054wg5gbzxsgpsf57qlc182ni4vwgqkrsrd1")))) + (build-system gnu-build-system) (native-inputs - (list bash perl)) + (list bash autoconf automake + perl + ;; For the tests. + perl-try-tiny perl-test-warnings perl-http-daemon-ssl + perl-io-socket-inet6 perl-test-www-mechanize-psgi + perl-test-mockmodule)) (inputs (list inetutils ; logger net-tools + perl perl-data-validate-ip perl-digest-sha1 perl-io-socket-ssl)) (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils) - (ice-9 match) - (srfi srfi-26)) - (setenv "PATH" (string-append - (assoc-ref %build-inputs "bash") "/bin" ":" - (assoc-ref %build-inputs "perl") "/bin")) - - ;; Copy the (read-only) source into the (writable) build directory. - (copy-recursively (assoc-ref %build-inputs "source") ".") - - ;; Install. - (let* ((out (assoc-ref %outputs "out")) - (bin (string-append out "/bin"))) - (let ((file "ddclient")) - (substitute* file - (("/usr/bin/perl") (which "perl")) - ;; Strictly use ‘/etc/ddclient/ddclient.conf’. - (("\\$\\{program\\}\\.conf") "/etc/ddclient/ddclient.conf") - (("\\$etc\\$program.conf") "/etc/ddclient/ddclient.conf") - ;; Strictly use ‘/var/cache/ddclient/ddclient.cache’ - (("\\$cachedir\\$program\\.cache") - "/var/cache/ddclient/ddclient.cache")) - (install-file file bin) - (wrap-program (string-append bin "/" file) - `("PATH" ":" = - ("$PATH" - ,@(map (lambda (input) - (match input - ((name . store) - (string-append store "/bin")))) - %build-inputs))) - `("PERL5LIB" ":" = - ,(delete - "" - (map (match-lambda - (((? (cut string-prefix? "perl-" <>) name) . dir) - (string-append dir "/lib/perl5/site_perl")) - (_ "")) - %build-inputs))))) - (for-each (cut install-file <> (string-append out - "/share/ddclient")) - (find-files "." "sample.*$")))))) + ;; The tests run mostly clean (6 failures), but I think they depend on + ;; the network config of the machine running them, so I turned them off. + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'change-dependencies + (lambda* (#:key native-inputs target #:allow-other-keys) + (substitute* "configure.ac" + (("HTTP::Daemon=6.12") "HTTP::Daemon=6.14")))) + (add-after 'install 'wrap-ddclient + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/ddclient") + `("PERL5LIB" ":" prefix + (,(getenv "PERL5LIB") + ,(string-append out "/lib/perl5/site_perl")))))))))) (home-page "https://ddclient.net/") (synopsis "Address updating utility for dynamic DNS services") (description "This package provides a client to update dynamic IP