From patchwork Wed May 25 18:30:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 39605 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 DEDBA27BBEA; Wed, 25 May 2022 19:32: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=-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 4095127BBE9 for ; Wed, 25 May 2022 19:32:25 +0100 (BST) Received: from localhost ([::1]:40562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ntvo0-00072x-Bp for patchwork@mira.cbaines.net; Wed, 25 May 2022 14:32:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37562) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntvnf-00072e-I5 for guix-patches@gnu.org; Wed, 25 May 2022 14:32:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34314) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ntvne-0003cq-J8 for guix-patches@gnu.org; Wed, 25 May 2022 14:32:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ntvne-0007g8-GZ for guix-patches@gnu.org; Wed, 25 May 2022 14:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55617] [PATCH 0/2] gnu: rsync: Update to 3.2.4. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 May 2022 18:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55617 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Cc: 55617@debbugs.gnu.org Received: via spool by 55617-submit@debbugs.gnu.org id=B55617.165350347829450 (code B ref 55617); Wed, 25 May 2022 18:32:02 +0000 Received: (at 55617) by debbugs.gnu.org; 25 May 2022 18:31:18 +0000 Received: from localhost ([127.0.0.1]:56444 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ntvml-0007el-Tw for submit@debbugs.gnu.org; Wed, 25 May 2022 14:31:18 -0400 Received: from mail-yb1-f175.google.com ([209.85.219.175]:41631) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ntvmh-0007e9-JT for 55617@debbugs.gnu.org; Wed, 25 May 2022 14:31:07 -0400 Received: by mail-yb1-f175.google.com with SMTP id x2so37383941ybi.8 for <55617@debbugs.gnu.org>; Wed, 25 May 2022 11:31:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=fVc/X+31IoI7/CtoCvVBIyw2XIg+W/8Pstehn1zaesY=; b=Xz0IoYiJO09pv2QQfL40nfh+74mPsesGoBalJ9mZ9zYVj8pXDbfq0aNvpAm9wsKc8d ZC6T3pM5xS0fWq/gXNCFukvOWz5KhdF7jlQcMEcDq2fsoG7yQubyc2cazhfAOalV2ctz EBqnNoZswPyG6nANLwZMyj/XQGF+ljwRjAv0STRMxA2MxUCyoAohwbianJVj7udUlgjk W8hqgvNjtJdaYDduuKv+eqRiLKeauC+UJH58OJrRp5MhgCGqG4V9PcSs5R5wJC50+LFb UaNbN3FAYeL7WOheG/9MLXg2r3FODJFQ3p97VxX6b5kHdVEWBZBA/Z6prxqOzR5aDH5M ypvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=fVc/X+31IoI7/CtoCvVBIyw2XIg+W/8Pstehn1zaesY=; b=ZD/QkYECzMDJ0av/qafrNckeKecNoYvMtV8i1oV/UM+OjFPeAX/djLXOVQ4YBgxA9J 5VdVQpq6wMyGonpYeTAuDvP+1whsVl8rEdWBrSQjATQw0R71cOQ5f10c/8uSDwn3HeFN 6my5q/qVz8K+djOeogLm4EXZDFG9shvQxsACrePX3mhPogvQgGOiDT2bATDFhJkd177P 8LTwWHII/qrszNS9CezdM4tPnsMvVHbtzc6YZoh+CZKgPiF9efzLj36Wm4eKesF/XPJ7 r9wkvcon5uZdVj2edPQ2Zy1b7rj3mTs+uQT0X0K9HOzBiyM6d+bTPKKwdWzL38IVdtHd 7M9g== X-Gm-Message-State: AOAM530O0YTVVj0YRWZYKC9czDaW/XIgRWfTScBFCx3dc4htPrPhEyjC 4BneJZxqm3aIas5jlx4efLe1xV0Tbk9XicFIuz1NaA== X-Google-Smtp-Source: ABdhPJxbs0qt/ivy6lXtTse5e8YxVtjjMNNXUzPBWQ0NtpbqzkxaP5QfvECbmnbFVYYu7PYWEK3Dt/h1VLA4LFRPVM4= X-Received: by 2002:a05:6902:1022:b0:64e:b3ae:f252 with SMTP id x2-20020a056902102200b0064eb3aef252mr33561227ybt.142.1653503457947; Wed, 25 May 2022 11:30:57 -0700 (PDT) MIME-Version: 1.0 References: <4f89b4161779047128bd6298b4e1a01aec565b4e.camel@telenet.be> In-Reply-To: <4f89b4161779047128bd6298b4e1a01aec565b4e.camel@telenet.be> From: Greg Hogan Date: Wed, 25 May 2022 14:30:46 -0400 Message-ID: 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 On Wed, May 25, 2022 at 10:42 AM Maxime Devos wrote: > > Greg Hogan schreef op di 24-05-2022 om 15:52 [-0400]: > > + (modify-phases %standard-phases > > + (add-before 'configure 'patch-build-flags > > + ;; Fix for change to warnings in GCC 10+ causing > > + ;; "error: argument 1 null where non-null expected [- > > Werror=nonnull]" > > + (lambda _ > > + (substitute* "meson.build" (("-Werror=format=2") > > ""))))))) > > This warning can easily indicate a real bug, has it been reported > upstream? It was reported upstream in 2017 but after the latest release. I have removed that substitute from the attached, updated patchset since I had overlooked that this change is not needed when building against the latest commit. > Greetings, > Maxime. From 208b49b03614d6412447e01b06ca8026de6dd668 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 3 May 2022 17:54:16 +0000 Subject: [PATCH 2/2] gnu: casync: Update to 99559cd1. * gnu/packages/sync.scm (casync): Update to 99559cd1. [source]: Remove patch. [arguments]: Fix installation. [native-inputs]: Add python. [inputs]: Add eudev. * gnu/packages/patches/casync-renameat2-declaration.patch: Delete file. * gnu/local.mk: Remove it. --- gnu/local.mk | 1 - .../casync-renameat2-declaration.patch | 27 -------- gnu/packages/sync.scm | 67 ++++++++++--------- 3 files changed, 37 insertions(+), 58 deletions(-) delete mode 100644 gnu/packages/patches/casync-renameat2-declaration.patch diff --git a/gnu/local.mk b/gnu/local.mk index a4250248ca..6207463091 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -926,7 +926,6 @@ dist_patch_DATA = \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-sqlite.patch \ %D%/packages/patches/calibre-remove-test-unrar.patch \ - %D%/packages/patches/casync-renameat2-declaration.patch \ %D%/packages/patches/catdoc-CVE-2017-11110.patch \ %D%/packages/patches/circos-remove-findbin.patch \ %D%/packages/patches/cdparanoia-fpic.patch \ diff --git a/gnu/packages/patches/casync-renameat2-declaration.patch b/gnu/packages/patches/casync-renameat2-declaration.patch deleted file mode 100644 index 74c2ca7b3c..0000000000 --- a/gnu/packages/patches/casync-renameat2-declaration.patch +++ /dev/null @@ -1,27 +0,0 @@ -Fix build failure on glibc 2.28 where 'renameat2' would end up being -declared twice: . - -From 625244ca47e8ee1375d2d0092271bfd13b0913ea Mon Sep 17 00:00:00 2001 -From: Daniel Mack -Date: Tue, 13 Nov 2018 17:52:48 +0100 -Subject: [PATCH] meson.build: pass -D_GNU_SOURCE when checking for functions - -As described in #166, -D_GNU_SOURCE needs to be passed to the meson function -availability checker. h/t to @tomeon for providing a link to the solution as -well. ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index f42ed16..c0f741e 100644 ---- a/meson.build -+++ b/meson.build -@@ -78,6 +78,6 @@ foreach ident : [ - ['copy_file_range', '''#include - #include '''], - ] -- have = cc.has_function(ident[0], prefix : ident[1]) -+ have = cc.has_function(ident[0], args : '-D_GNU_SOURCE', prefix : ident[1]) - conf.set10('HAVE_' + ident[0].to_upper(), have) - endforeach diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 801aef3f44..3dfaf40796 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -451,35 +451,42 @@ (define-public usync (license license:expat)))) (define-public casync - (package - (name "casync") - (version "2") - (home-page "https://github.com/systemd/casync/") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (sha256 - (base32 - "0znkp3fcksrykcsv06y2mjvf2lbwmin25snmvfa8i5qfm3f4rm88")) - (file-name (string-append name "-" version "-checkout")) - (patches (search-patches "casync-renameat2-declaration.patch")))) - (build-system meson-build-system) - (native-inputs - (list pkg-config python-sphinx rsync)) ;for tests - (inputs - (list xz ;for liblzma - `(,zstd "lib") - curl - acl - libselinux - fuse - openssl - zlib)) - (synopsis "File synchronization and backup system") - (description - "casync is a @dfn{content-addressable data synchronizer} that can be used + (let ((commit "99559cd1d8cea69b30022261b5ed0b8021415654") + (revision "0")) + (package + (name "casync") + (version (git-version "2" revision commit)) + (home-page "https://github.com/systemd/casync/") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (sha256 + (base32 + "139g82rkwv1kzss6crfmw3p01xnyjzz66b1ckprpbfncxb24047w")) + (file-name (string-append name "-" version "-checkout")))) + (build-system meson-build-system) + (arguments + `(#:configure-flags + (let ((out (assoc-ref %outputs "out"))) + (list (string-append "-Dudevrulesdir=" + out "/lib/udev/rules.d"))))) + (native-inputs + (list pkg-config python python-sphinx rsync)) ;for tests + (inputs + (list xz ;for liblzma + `(,zstd "lib") + curl + acl + libselinux + eudev + fuse + openssl + zlib)) + (synopsis "File synchronization and backup system") + (description + "casync is a @dfn{content-addressable data synchronizer} that can be used as the basis of a backup system. It is: @itemize @@ -490,7 +497,7 @@ (define-public casync over the Internet in an HTTP and CDN friendly way; @item An efficient backup system. @end itemize\n") - (license license:lgpl2.1+))) + (license license:lgpl2.1+)))) (define-public rclone (package -- 2.36.1