From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 4F4mIlW9d2A+lAAAgWs5BA (envelope-from ) for ; Thu, 15 Apr 2021 06:13:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 6JfgHFW9d2A0OAAAB5/wlQ (envelope-from ) for ; Thu, 15 Apr 2021 04:13:09 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 33D2320359 for ; Thu, 15 Apr 2021 06:13:08 +0200 (CEST) Received: from localhost ([::1]:42560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWtNL-0003IY-Ga for larch@yhetil.org; Thu, 15 Apr 2021 00:13:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWtNG-0003ID-Le for guix-patches@gnu.org; Thu, 15 Apr 2021 00:13:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52860) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWtNG-0008Vk-DS for guix-patches@gnu.org; Thu, 15 Apr 2021 00:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWtNG-0007Hh-8i for guix-patches@gnu.org; Thu, 15 Apr 2021 00:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47787] [PATCH] gnu: rss-bridge: Update to 2020-11-10. Resent-From: la snesne Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 Apr 2021 04:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47787 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47787@debbugs.gnu.org Cc: la snesne X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161845995127961 (code B ref -1); Thu, 15 Apr 2021 04:13:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Apr 2021 04:12:31 +0000 Received: from localhost ([127.0.0.1]:36173 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWtMg-0007Gr-U0 for submit@debbugs.gnu.org; Thu, 15 Apr 2021 00:12:31 -0400 Received: from lists.gnu.org ([209.51.188.17]:44172) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWtMf-0007Gj-6h for submit@debbugs.gnu.org; Thu, 15 Apr 2021 00:12:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWtMe-0003Fz-WB for guix-patches@gnu.org; Thu, 15 Apr 2021 00:12:25 -0400 Received: from [14.51.6.220] (port=53470 helo=localhost) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWtMd-00086G-8i for guix-patches@gnu.org; Thu, 15 Apr 2021 00:12:24 -0400 Received: from lagunposprasihopre.org (DD-WRT [192.168.1.1]) by localhost (OpenSMTPD) with ESMTPSA id 5a7d6cd2 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Thu, 15 Apr 2021 04:12:18 +0000 (UTC) From: la snesne Date: Thu, 15 Apr 2021 13:12:07 +0900 Message-Id: <20210415041207.14491-1-lasnesne@lagunposprasihopre.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 14.51.6.220 (failed) Received-SPF: none client-ip=14.51.6.220; envelope-from=lasnesne@lagunposprasihopre.org; helo=localhost X-Spam_score_int: 27 X-Spam_score: 2.7 X-Spam_bar: ++ X-Spam_report: (2.7 / 5.0 requ) BAYES_00=-1.9, FSL_HELO_NON_FQDN_1=0.001, HELO_LOCALHOST=3.828, RDNS_NONE=0.793, SPF_NONE=0.001 autolearn=no 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1618459989; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=p4AWN2qtp6M4rnI6X4pO7v8i5A4hcvCsWhs+N+glXMk=; b=d4JUwNGxn6cd9aXoAzaDnupNXDtsNxlVWKHpcSjNBeR6csWMt0cw0DODDJ2TCJv9z2bvfs cKp0kfU4KMod/7Qd1gReWmdB7D/Kdp4q4sezLWns3YEhuUv6fsWXlaEc5qEJXzzPGmky6E Xsg2DETvaT1YUPs72CZH00UMo1za/lYNJoLnRWOMBZFzAVg1yq2w8zPWofJXhABU5XDCxY rBpanBLDUuvxJofungFo4BwNRJ07rfCiGWS2Xkps9wkK4BPFi6IntM2nJotx9MAnW9zZzs u9U3ywSVYhgPE38ksNfx21qgxQ1Y1Leqf7HjODNr62/WYLrMWq5jrj5VuRQh/Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1618459989; a=rsa-sha256; cv=none; b=M3IUpPW0hY6eLMlx1MTcVu2nIHCdaPsWTbj0NfrPdEevAGAeqzkFi86ka38rbZkAFZX6Q6 64bBVAuquFcimH71dZb7NaVJnYDasq5JOVf243wF2PMz435LjN1Em76/L2ZeDpYb4DEn2Z zk8OAZB5V5ei10yq6S2sJxPfdNJmGyCl6cCUjmt7KYLcAC5F+QQAfzzohtbyvxTuKTOQV7 E/kWbI0xyNUR/P25/CJfQQ6XoMTth/TsY8+DCIjpEo1KpAt6mFK30zkauZdQh+uXGOucYf ZC7DhQfKeHzdzKvxMf5nn/JGdGHsJwTyAIHa00dFoKtQuGdnvfMteIFNhXaa9w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 0.06 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 33D2320359 X-Spam-Score: 0.06 X-Migadu-Scanner: scn0.migadu.com X-TUID: EcP40OQCoL+b * gnu/packages/web.scm (rss-bridge): Update to 2020-11-10. [build-system]: Switch to copy-build-system. [arguments]: Adjust to new build system. Add phase "patch-paths". --- gnu/packages/web.scm | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 165a4fc236..45bbcd2103 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -48,6 +48,7 @@ ;;; Copyright © 2020, 2021 Ryan Prior ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2021 Stefan Reichör +;;; Copyright © 2021 la snesne ;;; ;;; This file is part of GNU Guix. ;;; @@ -6496,7 +6497,7 @@ snippets on @url{https://commandlinefu.com}.") (define-public rss-bridge (package (name "rss-bridge") - (version "2019-09-12") + (version "2020-11-10") (source (origin (method git-fetch) @@ -6505,19 +6506,23 @@ snippets on @url{https://commandlinefu.com}.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1mx7f3l45nqhcrng531l4cq8kpzm164hhbwn26g5akb2pamdlnra")))) - (build-system trivial-build-system) + (base32 "1mir6mcm37sbdrhl5kgs6schpp3l4r5mfamhiic0yfbz4hqwmg44")))) + (build-system copy-build-system) (arguments - '(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils) - (ice-9 match)) - (let* ((out (assoc-ref %outputs "out")) - (share-rss-bridge (string-append out "/share/rss-bridge"))) - (mkdir-p share-rss-bridge) - (copy-recursively (assoc-ref %build-inputs "source") share-rss-bridge) - #t)))) + '(#:install-plan + '(("." "share/rss-bridge")) + #:phases + (modify-phases %standard-phases + ;;Change paths to not use source directory. + (add-before 'install 'patch-paths + (lambda _ + (substitute* "lib/rssbridge.php" + (("PATH_ROOT . 'cache/'") + "'/var/cache/rss-bridge/'") + (("PATH_ROOT . 'whitelist.txt'") + "'/etc/rss-bridge/whitelist.txt'") + (("PATH_ROOT . 'config.ini.php'") + "'/etc/rss-bridge/config.ini.php'"))))))) (home-page "https://github.com/RSS-Bridge/rss-bridge") (synopsis "Generate Atom feeds for social networking websites") (description "rss-bridge generates Atom feeds for social networking -- 2.31.1