From patchwork Wed Mar 15 22:43:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 48039 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 408BF16D28; Wed, 15 Mar 2023 22:45:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 8677E16C7B for ; Wed, 15 Mar 2023 22:45:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcZrl-0007mb-O6; Wed, 15 Mar 2023 18:45:05 -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 1pcZrj-0007m7-KV for guix-patches@gnu.org; Wed, 15 Mar 2023 18:45:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcZrj-0004SK-16 for guix-patches@gnu.org; Wed, 15 Mar 2023 18:45:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcZri-0004nj-GM for guix-patches@gnu.org; Wed, 15 Mar 2023 18:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62212] [PATCH] gnu: thc-ipv6: Update to 3.8. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 22:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62212 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62212@debbugs.gnu.org Cc: Sharlatan Hellseher X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167892024918375 (code B ref -1); Wed, 15 Mar 2023 22:45:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Mar 2023 22:44:09 +0000 Received: from localhost ([127.0.0.1]:40686 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcZqr-0004mI-7x for submit@debbugs.gnu.org; Wed, 15 Mar 2023 18:44:09 -0400 Received: from lists.gnu.org ([209.51.188.17]:51934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcZqo-0004m9-Pv for submit@debbugs.gnu.org; Wed, 15 Mar 2023 18:44:07 -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 1pcZqo-0007gV-JL for guix-patches@gnu.org; Wed, 15 Mar 2023 18:44:06 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcZqm-0004KS-JB for guix-patches@gnu.org; Wed, 15 Mar 2023 18:44:06 -0400 Received: by mail-wr1-x436.google.com with SMTP id j2so18667769wrh.9 for ; Wed, 15 Mar 2023 15:44:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678920243; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=FEiVhFEnlgwG0yS7xe1JaNtk40qEcWcoBOdn1E8szqc=; b=iTuOXQSnziaV2+iD8dQJwT4ngJ+APLOA0ShvkahfGDdRyO5hFEBHc1YmjqaFliYQ4K uwm2kFukWUvk8XvVaZUkLq0R9UojdbVH8VWVF8gqEjxrdXOKdVloJlFbTJBo5GnREv2j AuoYG0IWaVZUfqD20fdpcduRBcOurtlDbpcpQ1kj/AD0eu5Oi4Ty6mJYjmyVjrUPjkfB xRDZup+/DIV5Q0h9mJWeZMNm/hZ6avCzlyMUVC4c/J9VUGye4J9eplFMAD/UDmZmCUev GFU2WbUejx/aZSH+KQBP+XxLvD3ZEQcKZXCy+4vioHfnJPbc+LV9kzhZBffMdLN8n4Ew vUFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678920243; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=FEiVhFEnlgwG0yS7xe1JaNtk40qEcWcoBOdn1E8szqc=; b=lTX9SwROVe+41EoGPOJKh7W34UP/0NIxv9HGK/BvGpahEhmCyKlM9pP+2l/VElt5DC PDnpOtR4r04Hg+qMER+08SG/bSU9K83uYFJPoO5e1FARMCssgz9YyAcNSjbx2/MAh1Nw gDvPkFuA+dKzuWLHXLUgsuOx/VE9A+f7Ttmt14yEXTNyvaZ7LRZSgVlxrRwdsQJOWD3x vPgNyTmAEWPQAr+xYJRHyxLEPv8ono534cIXVaxEF+771NIhJAa5l/yytUNq1CFAUzjS 1ehlwjCTL+3cJl1H6U96g6dfEjTH2vs6OSgcPpAJu3lRFewCo1mwr0L+/xISqfT7RiUn 3bHg== X-Gm-Message-State: AO0yUKWlxDRdRDTmj7cf1j7uBKUySYvxYopylSjX5iLjfWkD6yLFOlF5 UpswJ9csG0riA+3O0IfBfsqEUVpj0EU= X-Google-Smtp-Source: AK7set/xHvN4VCz0RZCKFJKrhxjuoPM/AeQN/nZpqtjPy1Y+2RVgTtijGWWDsVbNMgbu0Q/r5zmlBA== X-Received: by 2002:a5d:448c:0:b0:2d0:bba8:3901 with SMTP id j12-20020a5d448c000000b002d0bba83901mr2601927wrq.62.1678920242828; Wed, 15 Mar 2023 15:44:02 -0700 (PDT) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id w7-20020adfd4c7000000b002c557f82e27sm5813421wrk.99.2023.03.15.15.44.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 15:44:02 -0700 (PDT) From: Sharlatan Hellseher Date: Wed, 15 Mar 2023 22:43:59 +0000 Message-Id: <20230315224359.6875-1-sharlatanus@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=sharlatanus@gmail.com; helo=mail-wr1-x436.google.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: , 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/networking.scm (thc-ipv6): Update to 3.8. Use latest version tag in stead of commit, simplify package. [arguments]: Use Gexp. [arguments]{make-flags}: Use cc-for-target as it's commented out in Makefile. [arguments]{phases}: Merge use-source-date-epoch-in-manpages with patch-paths phases into patch-makefile. Simplify install-more-docs phase. [inputs]: Add libnetfilter-queue, libnfnetlink. --- gnu/packages/networking.scm | 95 ++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 48 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index acf2e87d89..bf5f7ad2e7 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -56,6 +56,7 @@ ;;; Copyright © 2022 Reza Alizadeh Majd ;;; Copyright © 2022 Nicolas Graves ;;; Copyright © 2023 Andreas Enge +;;; Copyright © 2023 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -3057,56 +3058,54 @@ (define-public bgpq3 license:bsd-2)))) ; everything else, but missing headers (define-public thc-ipv6 - (let ((revision "0") - (commit "4bb72573e0950ce6f8ca2800a10748477020029e")) - (package - (name "thc-ipv6") - (version (git-version "3.4" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/vanhauser-thc/thc-ipv6") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1x5i6vbsddqc2yks7r1a2fw2fk16qxvd6hpzh1lykjfpkal8fdir")))) - (build-system gnu-build-system) - (arguments - `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:tests? #f ; No test suite. - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'use-source-date-epoch-in-manpages - ;; For reproducible builds - (lambda _ - (substitute* "Makefile" - (("date --iso-8601") - "date --iso-8601 --utc --date=@$(SOURCE_DATE_EPOCH)")))) - (delete 'configure) ; No ./configure script. - (add-before 'build 'patch-paths - (lambda _ - (substitute* "Makefile" - (("/bin/echo") "echo")) - #t)) - (add-after 'install 'install-more-docs - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/thc-ipv6/doc"))) - (install-file "README" doc) - (install-file "HOWTO-INJECT" doc) - #t)))))) - ;; TODO Add libnetfilter-queue once packaged. - (inputs - (list libpcap openssl perl)) - (home-page "https://github.com/vanhauser-thc/thc-ipv6") - (synopsis "IPv6 security research toolkit") - (description "The THC IPv6 Toolkit provides command-line tools and a library + (package + (name "thc-ipv6") + (version "3.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vanhauser-thc/thc-ipv6") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "07kwika1zdq62s5p5z94xznm77dxjxdg8k0hrg7wygz50151nzmx")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ; No test suite. + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-makefile + (lambda _ + (substitute* "Makefile" + ;; For reproducible builds + (("date --iso-8601") + "date --iso-8601 --utc --date=@$(SOURCE_DATE_EPOCH)") + (("/bin/echo") "echo")))) + (delete 'configure) ; No ./configure script. + (add-after 'install 'install-more-docs + (lambda _ + (let ((doc (string-append #$output "/share/thc-ipv6/doc"))) + (install-file "README" doc) + (install-file "HOWTO-INJECT" doc))))))) + (inputs + (list libnetfilter-queue + libnfnetlink + libpcap + openssl + perl)) + (home-page "https://github.com/vanhauser-thc/thc-ipv6") + (synopsis "IPv6 security research toolkit") + (description "The THC IPv6 Toolkit provides command-line tools and a library for researching IPv6 implementations and deployments. It requires Linux 2.6 or newer and only works on Ethernet network interfaces.") - ;; AGPL 3 with exception for linking with OpenSSL. See the 'LICENSE' file in - ;; the source distribution for more information. - (license license:agpl3)))) + ;; AGPL 3 with exception for linking with OpenSSL. See the 'LICENSE' file in + ;; the source distribution for more information. + (license license:agpl3))) (define-public bmon (package