From patchwork Sat Aug 12 13:27:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 52772 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 EF8A727BBE9; Sat, 12 Aug 2023 14:33:25 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 8E39827BBE2 for ; Sat, 12 Aug 2023 14:33:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUojo-0006Sd-FT; Sat, 12 Aug 2023 09:33:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qUojn-0006SL-Hs for guix-patches@gnu.org; Sat, 12 Aug 2023 09:33:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qUojn-00069w-9q for guix-patches@gnu.org; Sat, 12 Aug 2023 09:33:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qUojm-0005FJ-Rx for guix-patches@gnu.org; Sat, 12 Aug 2023 09:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65247] [PATCH] gnu: smartdns: Update to 43. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 12 Aug 2023 13:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65247 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65247@debbugs.gnu.org Cc: Hilton Chain X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169184715320106 (code B ref -1); Sat, 12 Aug 2023 13:33:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Aug 2023 13:32:33 +0000 Received: from localhost ([127.0.0.1]:48888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUojI-0005EE-RE for submit@debbugs.gnu.org; Sat, 12 Aug 2023 09:32:33 -0400 Received: from lists.gnu.org ([2001:470:142::17]:34374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUojE-0005Dj-B2 for submit@debbugs.gnu.org; Sat, 12 Aug 2023 09:32:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qUoj9-00064J-2e for guix-patches@gnu.org; Sat, 12 Aug 2023 09:32:23 -0400 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qUoj7-0005xJ-EK for guix-patches@gnu.org; Sat, 12 Aug 2023 09:32:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691847128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=wM9CRjhoEfOq1bVFc7Sz3+OaEEF8xfe7JQHSOUfNIpQ=; b=D4T8L4fFSMZSDozNwIqY9H8kyeZaksGj6SBmkSUvU39Evp8cAmGL6Bkwe5BDkUifAsx0Aw d+BIPFe4JPe3gdxlCuRD6EIlxgWT8FIN6ufVkcSJAHvHzS9wUc3hquPaLfgyAJqtynMLwD d8Cy5TTxrjeLrLs1FI4HgH7lEcWm7523oNP/PW/MMcHHEuDTgrifiB8TDUfaiqAb2o0vti mGp+wo3pHdDCdrrWzY2iuUCwL6xn30jR6Ql/9rirw43oPX/yxGQ3QAIPLKED8PF9gW3M/S 1twpmC83Cb20cKjpsJGHa2aTr7YYA6tCx3ryDLdBPlkv/yIdw0VZY3wKv+bwdg== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Sat, 12 Aug 2023 21:27:35 +0800 Message-ID: <928218e0956afa751b1dbf87ece58328d478cd96.1691846836.git.hako@ultrarare.space> MIME-Version: 1.0 X-Spamd-Bar: + Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/dns.scm (smartdns): Update to 43. [arguments]<#:tests?>: Enable tests. <#:test-target>: Set to "test". <#:make-flags>: Set "VER". <#:phases>: Add phase 'skip-unavailable-tests, 'prepare-test-dir, 'enter-test-dir, 'leave-test-dir. [native-inputs]: Add googletest, isc-bind:utils. --- gnu/packages/dns.scm | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) base-commit: 19a7a824c35eae56ce56e2a460042fb7e2129234 diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index fdd10a6611..0fd8050286 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -1340,7 +1340,7 @@ (define-public openresolv (define-public smartdns (package (name "smartdns") - (version "42") + (version "43") (source (origin (method git-fetch) (uri (git-reference @@ -1352,18 +1352,43 @@ (define-public smartdns ((".*SYSTEMDSYSTEMUNITDIR.*") ""))) (sha256 (base32 - "17j0h5l7gig6rzk8b9180jwrx5khpnrylacjxvnnpgsi2725k8lq")))) + "0s789l6i4yirmarg80mknc1pp65rz01ky9f7gidgclkfcwzz41l3")))) (build-system gnu-build-system) (arguments - (list #:tests? #f ;no tests + (list #:test-target "test" #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) (string-append "DESTDIR=" #$output) - "PREFIX=''") + "PREFIX=''" + (string-append "VER=" #$version)) #:phases #~(modify-phases %standard-phases - (delete 'configure)))) + (delete 'configure) + (add-after 'unpack 'skip-unavailable-tests + (lambda _ + (with-directory-excursion "test/cases" + ;; Tests try to open /etc/resolv.conf + (substitute* "test-bind.cc" + ;; Bind.tls + (("smartdns::Server server_wrap;" all) + (string-append "GTEST_SKIP();" all))) + ;; Tests use ICMP ping. + (substitute* (find-files ".") + ((".*PING_TYPE_ICMP.*" all) + (string-append "GTEST_SKIP();" all))) + (delete-file "test-speed-check.cc")))) + ;; Compiled .o files in build phase can't be used for tests. + (add-after 'skip-unavailable-tests 'prepare-test-dir + (lambda _ + (copy-recursively "." "../test"))) + (add-before 'check 'enter-test-dir + (lambda _ + (chdir "../test/test"))) + (add-after 'check 'leave-test-dir + (lambda _ + (chdir "../../source")))))) (inputs (list openssl)) + (native-inputs (list googletest `(,isc-bind "utils"))) (home-page "https://github.com/pymumu/smartdns") (synopsis "Local DNS server") (description