From patchwork Sun Aug 25 14:47:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Denis 'GNUtoo' Carikli X-Patchwork-Id: 67277 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 9DC8627BBEA; Sun, 25 Aug 2024 15:49:24 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS autolearn=ham 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 26FD127BBE2 for ; Sun, 25 Aug 2024 15:49:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1siEYM-0001r4-Pn; Sun, 25 Aug 2024 10:49:14 -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 1siEYK-0001q5-KW for guix-patches@gnu.org; Sun, 25 Aug 2024 10:49:12 -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 1siEYK-0004wK-9L for guix-patches@gnu.org; Sun, 25 Aug 2024 10:49:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=JNeXr3TYApXzZvipkCwGQqTbjlaK+VBxzsyrqGRtSCs=; b=vU4zshwszfCYHnhTqcx5WFzG8sU+AeCGJJGUD21zoAezDvnRUqm1OTu8zvk+UDA5qQT18VOhTTQkCZ5TL68Xti2TeRJsj5huMUrRooMCVHdimObTn4+EYj55xciR8Cz7xfOYNKQ8bsBBpDApet1C38dfUltdqG5o4OwguMPtYcBcubn2fHTBOvmO4t6KmFjgZhu/oYw2AEbi532DGcbboCMHh5XIyerJ+fHjICNHmtvDc8ChNC+LR7iE8StEgQEGIcsG0wOva1s4iaDi3gEB266eRZg1Q/QpkN8Q6IyyfcRohSKd57K/5MT01gO93ey/3c4LcWPph8WIk3lgcp240w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1siEZ8-0000C6-8d for guix-patches@gnu.org; Sun, 25 Aug 2024 10:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72804] [PATCH] gnu: add apt-cacher-ng. Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Aug 2024 14:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72804 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72804@debbugs.gnu.org Cc: Denis 'GNUtoo' Carikli X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1724597347658 (code B ref -1); Sun, 25 Aug 2024 14:50:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Aug 2024 14:49:07 +0000 Received: from localhost ([127.0.0.1]:43139 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1siEYE-0000AX-B7 for submit@debbugs.gnu.org; Sun, 25 Aug 2024 10:49:06 -0400 Received: from lists.gnu.org ([209.51.188.17]:56794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1siEYB-0000AO-SX for submit@debbugs.gnu.org; Sun, 25 Aug 2024 10:49: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 1siEXN-0001Ut-6J for guix-patches@gnu.org; Sun, 25 Aug 2024 10:48:13 -0400 Received: from cyberdimension.org ([79.143.250.36] helo=rockpro64.cyberdimension.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1siEXK-0004Ud-5b for guix-patches@gnu.org; Sun, 25 Aug 2024 10:48:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=jymEUPgMfTbymTx UqT+5QYYB1Su1eSuVCAAZD8xc138=; h=date:subject:cc:to:from; d=cyberdimension.org; b=I3GYWIknNumMn/lR5AU/Eu8dnxOX1IXKX+1q75k618xD7c TJvjUafezXY6y3SBQYRIT7p7iqbkrp1Ej9K0uUyIoIH206ZZfGCgZsvd5JWaDVNdAD6yhj JWt5/53s8shpG+PK6ezkmwgfMgGURvyaslSSQFCPDHtsiKjz650wA6kkVgFXN69pDorcth eUWoQiWElROC/4OM7M5zgRdIdEnmLPs1QKAPO/kYD8qe8Jw1PXZxAIDYW7jIdzfiKRpepZ ZjUdutER37M/DJv6FYPE1DwW3tc/4tCQV6Oed7xAUd/74Cv6iKsRyWgDo+R2gK9typA5Ww 7j3eDNMN098pSDSA== Received: from localhost.localdomain (localhost [127.0.0.1]) by rockpro64.cyberdimension.org (OpenSMTPD) with ESMTP id c03b42c7; Sun, 25 Aug 2024 14:48:05 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Sun, 25 Aug 2024 16:47:04 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Received-SPF: pass client-ip=79.143.250.36; envelope-from=GNUtoo@cyberdimension.org; helo=rockpro64.cyberdimension.org 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, T_SCC_BODY_TEXT_LINE=-0.01 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/debian.scm (apt-cacher-ng): New variable. Signed-off-by: Denis 'GNUtoo' Carikli Change-Id: Ia77fa38e3cd7dffef8c950a61c2e8c06971132f2 --- gnu/packages/debian.scm | 54 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) base-commit: f25ea6847fa4eb1bc0a6bfb965e145b94f20a6f8 diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 6f7b809fd2..a19a0791ad 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2018, 2020-2024 Efraim Flashner ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke -;;; Copyright © 2023 Denis 'GNUtoo' Carikli +;;; Copyright © 2023, 2024 Denis 'GNUtoo' Carikli ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,10 +25,12 @@ (define-module (gnu packages debian) #:use-module (guix git-download) #:use-module (guix gexp) #:use-module (guix packages) + #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) #:use-module (guix build-system trivial) + #:use-module (gnu packages adns) #:use-module (gnu packages autotools) #:use-module (gnu packages backup) #:use-module (gnu packages base) @@ -40,12 +42,14 @@ (define-module (gnu packages debian) #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) #:use-module (gnu packages guile) + #:use-module (gnu packages libevent) #:use-module (gnu packages linux) #:use-module (gnu packages man) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages wget) #:use-module (srfi srfi-1) @@ -529,6 +533,54 @@ (define-public debianutils "The SMAIL General Public License, see debian/copyright for more information."))))) +(define-public apt-cacher-ng + (package + (name "apt-cacher-ng") + (version "3.7.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/blade/apt-cacher-ng.git") + (commit "upstream/3.7.5"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wxqdmmm2gm27zng7v7lwai4zf6ppj26890r7z2ns237xx33jdp6")))) + (build-system cmake-build-system) + (inputs (list + bzip2 ;; optional + c-ares + libevent + openssl ;; optional + xz ;; optional + zlib)) + (native-inputs (list pkg-config)) + (arguments + (list + #:tests? #f ; Tests are "for development only". + #:phases + #~(modify-phases %standard-phases + ; We want to provide good defaults. Here apt-cacher-ng is built + ; without libwrap support so we disable that by default. + (add-before 'configure 'patch-config + (lambda _ + (substitute* "conf/acng.conf.in" + (("# UseWrap: 0") "UseWrap: 0"))))))) + (home-page "https://www.unix-ag.uni-kl.de/~bloch/acng/") + (synopsis "Caching proxy for packages of various software distributions or +repositories") + (description "It is mainly meant for caching packages of Debian or Debian +based distributions (like Trisquel) through HTTP. It also has partial support +for HTTPS and other distributions / repositories (OpenSUSE, Arch Linux, +Sourceforge mirror network, Cygwin mirrors) as this requires more +configuration and comes with some limitations. Packages can be imported +manually either by copying files from another apt-cacher-ng instance or by +importing them from CD, DVD, jigdo, etc. While apt-cacher-ng can work offline, +it requires some online access before that to build valid index files. It also +supports partial mirroring. It can be configured through configuration files +and/or a web interface and/or a command line tool.") + (license license:gpl3+))) + (define-public apt-mirror (let ((commit "e664486a5d8947c2579e16dd793d762ea3de4202") (revision "1"))