From patchwork Sun Feb 12 03:44:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 46868 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 CC2F816625; Sun, 12 Feb 2023 03:51:30 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_PDS_PRO_TLD,URIBL_BLOCKED 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 62E9E16618 for ; Sun, 12 Feb 2023 03:51:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pR3OL-0006Tu-Gj; Sat, 11 Feb 2023 22:51:05 -0500 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 1pR3OI-0006Te-QS for guix-patches@gnu.org; Sat, 11 Feb 2023 22:51:02 -0500 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 1pR3OI-0007An-GF for guix-patches@gnu.org; Sat, 11 Feb 2023 22:51:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pR3OI-0008Iu-8b for guix-patches@gnu.org; Sat, 11 Feb 2023 22:51:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61443] [PATCH] gnu: Remove and deprecate tidy for tidy-html Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Feb 2023 03:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61443 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61443@debbugs.gnu.org Cc: Morgan Smith X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167617384431891 (code B ref -1); Sun, 12 Feb 2023 03:51:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Feb 2023 03:50:44 +0000 Received: from localhost ([127.0.0.1]:43715 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pR3Ny-0008II-Q3 for submit@debbugs.gnu.org; Sat, 11 Feb 2023 22:50:43 -0500 Received: from lists.gnu.org ([209.51.188.17]:58248) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pR3Nt-0008I4-Pq for submit@debbugs.gnu.org; Sat, 11 Feb 2023 22:50:41 -0500 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 1pR3Nt-0006S6-6q for guix-patches@gnu.org; Sat, 11 Feb 2023 22:50:37 -0500 Received: from mail-co1nam11olkn2082c.outbound.protection.outlook.com ([2a01:111:f400:7eab::82c] helo=NAM11-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pR3Np-0006zw-NF for guix-patches@gnu.org; Sat, 11 Feb 2023 22:50:36 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BSDrQJms34z3Z0J+V9PuN99gdfxzvXPbwISC+Fr7Bn1PWT/IR3CDzpzDucNYUaqpwnJcEAQnDrCpN9yGI0ZnpFy635biwgxDbKufJmQ7oZdgGFvHuC31ij8nJZFjzZMfcIRtUDQkAqrvaeodA82eL/Lnoqdx43YVLLqNSpBDckmC7dAtG9C//Jxa2A0mAzKV41Me5DpFBTe4bGHlxHACvT6pt7vv/setOHiLYXwbIU9pRcWWkmxlo2lWMjpBiBoj0wQunlOlgGIdoqylCsktDX5lo/KHg+FdrL53qwqL+x6porJc/dSa5DWqj50qtDBwwgByWE/odiyob0HYsvoVjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zUXO+Q2XCcSAXwRJDsZpbtHv+elB1+FozF2qKoVBPd4=; b=J8LJ+P3XpT1N0AjS0/Ew0m11z1FeIna//rKp8dAe5i7di9F3CYltYGBwg3dettQNch58PXdxQ6ZlWbgL2W1p9NKe7WQMpCh/0p5iZM07Z3TP4AoyPTvYHRSGPp1EBGKxaCtT8hE90KR08o8+0qti4naU8NcYmg4a2nqPuaSKWa7vG7TrFTKyCcaF6XnW5uaBIrJOJXV3NIiAJ7WPh1v9K6M1DYUaqJJwgtFaGh4lLgsRSSG41iIWwCIMTCuB6iuH99KCsqDug5m44t6Noa6E6vwqGowJwVS+wjf7lFj/A9mIa9UK6iCZuyG8XLVmRFzPqbtGDehfTvM5t9PfFJsjxA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zUXO+Q2XCcSAXwRJDsZpbtHv+elB1+FozF2qKoVBPd4=; b=Yqgo9JBmhSpAQUC6A2nod4e+U4Jwe7CkRXDfsru+3qrBNWZcNb+IBGH8wMGkb5M68gylhBwELIsGPSikQZZ9CIFW4C7JHr3NV8jQWbLmkAvdLGfgkPjyqQAHbCD63fL2HjwF7dEiicgU8NL4x6fF0JqBOh4HKZo0FtEMdoBW0NdHimqgQ4stYIYJOzIytr4aZpNgEQe700Jg0cR/q6RQxZUyuFdftN2eXyYuv275vF2+xxH38k/J0zphxLqmVSgxLdPVOLphB+LX68uEUB0sR6DraEa+phBXDh1ocXv6AXMNckQRuhYG3Zjh5Alr1BV2KjrBjUhW73CUfw9zjMY8iQ== Received: from CY4PR03MB3159.namprd03.prod.outlook.com (2603:10b6:910:56::21) by BY5PR03MB5265.namprd03.prod.outlook.com (2603:10b6:a03:22c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.23; Sun, 12 Feb 2023 03:45:26 +0000 Received: from CY4PR03MB3159.namprd03.prod.outlook.com ([fe80::8953:ecaf:3cd:4a24]) by CY4PR03MB3159.namprd03.prod.outlook.com ([fe80::8953:ecaf:3cd:4a24%7]) with mapi id 15.20.6002.033; Sun, 12 Feb 2023 03:45:26 +0000 From: Morgan.J.Smith@outlook.com Date: Sat, 11 Feb 2023 22:44:27 -0500 Message-ID: X-Mailer: git-send-email 2.39.1 X-TMN: [wCt14rzq5tlwEKrwDDcjwoN5z/jIZi5AQ2R0BqIOQqgaFCZE+WVN/w==] X-ClientProxiedBy: YQBPR0101CA0130.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:5::33) To CY4PR03MB3159.namprd03.prod.outlook.com (2603:10b6:910:56::21) X-Microsoft-Original-Message-ID: <20230212034426.27005-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PR03MB3159:EE_|BY5PR03MB5265:EE_ X-MS-Office365-Filtering-Correlation-Id: 7ca41eff-0341-40e2-ec53-08db0cab936c X-MS-Exchange-SLBlob-MailProps: V85gaVfRD495c5cEKwC5I7ES5jsoawqNxp/2W0BUjgFe1mRuu/Qors5dnmZNEZcRb+0v9QXUr7+qAEZ4TaGiD6WlYQLSFICb9VmSsz2b1gUwjeH8fryluPrrhBZCFlBB3Ap5aC6qy+UaeXWJXK5Xkr4hrSL1NVWNEeTGRsr+O4cvjUUX0GfBBbg5gGmZb1G5xzft+GAlATsq1GL9ZMhs4cByT1rSg4MgrO0PGgdqo15J+vCyW2SPH16OihTgpwmWenng2aPfadzYAu4TYcCEmHi+bxrmyAmzXWp40ugt1Fs1cTrNiY5WOuU/9RhblpsmvalSM3L6RyoTXtJVjMPrv/eGssFBpkSVyxvJTcyLhUSB29EF1GPkZ1CZdyhz0n6w9HG9vCCu/M54DPkxuVc3eih19YP8TWzSu+q9NM5DQdcnwCmn3kCu5X15zOGq1g+uAj1Z1hQFxAl0/2n1HStsyJANf3zcndK3BCZCm1bYqyZSU7UVgG0OKj9nDLWvJ/bGnPHfnOZCc3E/iAiNmhOZauvPZWQW9DqUJFxkSlNLJiZSSIZoIjVvWtev/NBxXEzPUoOX9o0Ac2ri/0HJHOQldeF7u9YWY5xChbxo/JRob350W3O9SC42U/65BJrUDdj1PIdO2VEXzWdWz6H8+DCGlbeFOUsGNNvF0oM5EDqBrdCx2hyhCwXkgRKWqHgKrLWUpT/nCEA/szCfqSyHu/Rrt4F0V0wJ31fj5cR9otG9dzaZsvGg81r8K2snzVdl879HW8yFB0u4XQDEOGuMwT8ke46xuacUA+IweZdbK4SkzQAhbn44cEMi+7/x12IPOc3DkXuaMM2Tr7cqAtpBV+lRxw== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jraBFHDliH+jiUXU8lXVq4mkV/frKNGO/6ECVyGIDrG9n6UXQb73YXsko9V2e8ydzQ7tL69aaBiL4y4UpmMrabVbAQWtMdfEPtP+V/imqjsKR0BSjfCeBpTlY42qgvX99XvsPAtZsYNl4tLp0lboQPdb343WGvFrutxTju1muck6lg8xzmm1ktApITKwJAsw9CKWJqTLmqh/o5MfLPB9zhySEcS4CawBM2W1StTHOlIoGWAicLBqDsH2kkr86hoGfOJcuBYlu5wk0Y5Qgnujmm+tqRMpwueRWJuIKB3pDAhJcgPq2sBOXPCKu7KMV/sZhoZE019whIsnDgo9uP+44o1Yz5wYzv5ho04RPfI8xwQAgDmFvgP0W0/GDYyhsa7lGTnk/+9wornMnTU7lPQM7UVxwbPq+Bs+YPiDzC91GX3bI9Z4bszjfa9Um80vToMPLsQ1lcJnunpNCFHE9s962NCnNstsmFKXPRO4JIAB6IEkKiiPhhaZW6ItuX1uGRCukd4h3sQN9bYAjmT50PEpc+gU8oenDB0K7Gkfkl5N2F7yeQOXZRgj/i5ItGA2cHGv1aIZVyYDl9YdKCL2GY8Go7Ag/R5UVlIq2GNf0upZa/5zTdA0Zb3jxNh+LFx+L81sHufPsw+mkyWMX+O352PGpQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5VCV345yiSXmHhn3Pt4R4zskVTKslok/8QNx07ApG79MgPh+y8nAI1AzQhlxowTUB5rRs1S3FbWeNK82o9oQeZiXuQN9VoBdS9aLjphI1w7xZttxjFVnRtJNBql52ChV/DD3kyMcBJlh+MBPj4ek/ou/uicWwCA7v3q+siOw6HG0wwHQmphlEyW0vaVHlaYQeuQuUr1lGUHcmJhVH+QTekywbj7R3FQGqorNXxr3g27lLF0G8ed/9i34EAwX4iAGd/hxOMv20ZXLgKcUjJTsARckRwKbLBJMNicwwLPjn+rNWNcrB+1ZRMYpkc6S4Fm6YJeLQmOIDGjpJ7XteHMjtfQLcuKdG57Bxuk0/gmGU540txRcDZP4s7LqEQQ/m5v6MVmUDuN27bFnvSGVgoBbPQ3Z6UxdB8k3xknALE5PCAooW68XkHbStBJw9nstX6I4I2XBIYGNAZ/MyvGr66dpjhUVPYEMYh6Jad1OYqUqEwwh4wsopELescEvzBEqKGKensXKJb+wyuPAU1JjbJvCl/C7xHo0MwXFOOa4MktZ0DbZTVwddesIEV+75omYQHkZCq9L6rYsbBkEWfaOzP4UuncEhno2l8p+k54XoPm85lZPhHlzlmX9s6qVWf4pqPXdm+UU7HpDNckDFExgXAsKdPB1BwCpCwj+EV4c1CRoppURMhGhVleOACQ/mm43l/QmaXzsWwtUpQrOmzD0N524IbT1eW0VsbxKj7l6swDSdTKQj5gHCsDaiITiwGbU/QYrFGmiXTfUzoA8Q+VwZlFvhSjPudWLO0HT36aKwx1foowAyt9C1z1l+6tasmEvVIm+6n44CIus2yR39p0Aosff32Rg0twODuiDZyjDM3B0vCTx1X1s3oAga4A2ixfGS7+s6K+QwlvnX8+5CnlI9YyS5QMH9HjRkMYlZAqUCPvLPgR4yoPZRAcXMV24vrIXnlrUWXfv6tTlVYCE/yT7oyVPPHss4ox5S81OKyCDw0JmdExwJKtY3vIqYWFwVTRm4cOrqxK3a5RJo/7/a/YwTxUhalRW82bQ5BKWxV8D2GjxkflmSLFqoxsdQ6kdv0UKRlSIdw5k6b7+clpfy0Q9GU/FTgBlq1Ghw+/oTXWWJZnMrnZyHIIdCkxvdctOoPqtWD6NtrWbchcEtBhD7by5dKlCseU/EIrJYinI1xMisQenwVjX9l0ST92YbDRL35sVCUmkmzq3+UIfMaH7tgnl2V2Kl//Cd+mkLPEmyCC+QxW0t0M/sFdWJed8Dn1Rh0zv/9dJIBS05P5ZtFIjsO/T10MdlgNgzxfamxe7iGaUfk2+NJVVJSa+y88gxeuHZOZ2W7oT X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7ca41eff-0341-40e2-ec53-08db0cab936c X-MS-Exchange-CrossTenant-AuthSource: CY4PR03MB3159.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2023 03:45:26.4761 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR03MB5265 Received-SPF: pass client-ip=2a01:111:f400:7eab::82c; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM11-CO1-obe.outbound.protection.outlook.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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_PDS_PRO_TLD=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 From: Morgan Smith * gnu/packages/web.scm (tidy): Change to deprecated alias for tidy-html * gnu/packages/pumpio.scm (pumpa): Use tidy-html instead of tidy and correct header name. * gnu/packages/markup.scm (hoedown): * gnu/packages/photo.scm (enblend-enfuse): * gnu/packages/php.scm (php): * gnu/packages/python-xyz.scm (python-pytidylib): Use tidy-html instead of tidy. --- gnu/packages/markup.scm | 2 +- gnu/packages/photo.scm | 2 +- gnu/packages/php.scm | 2 +- gnu/packages/pumpio.scm | 4 +++- gnu/packages/python-xyz.scm | 2 +- gnu/packages/web.scm | 37 +++---------------------------------- 6 files changed, 10 insertions(+), 39 deletions(-) diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 35dd6d257b..9162b008e0 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -73,7 +73,7 @@ (define-public hoedown #:test-target "test")) (native-inputs `(("python" ,python-2) - ("tidy" ,tidy))) + ("tidy" ,tidy-html))) (synopsis "Markdown processing library") (description "Hoedown is a standards compliant, fast, secure markdown processing library written in C.") diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index d658b3d3e7..d66daf42a6 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -383,7 +383,7 @@ (define-public enblend-enfuse imagemagick libxml2 texlive-tiny - tidy + tidy-html transfig)) (inputs (list boost diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index e0cd47b846..974ccf8039 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -410,7 +410,7 @@ (define-public php ("postgresql" ,postgresql) ("readline" ,readline) ("sqlite" ,sqlite) - ("tidy" ,tidy) + ("tidy" ,tidy-html) ("zlib" ,zlib))) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/pumpio.scm b/gnu/packages/pumpio.scm index 2f4dd359d1..5fb6e338e8 100644 --- a/gnu/packages/pumpio.scm +++ b/gnu/packages/pumpio.scm @@ -47,6 +47,8 @@ (define-public pumpa (modify-phases %standard-phases (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "src/util.cpp" + (("buffio\\.h") "tidybuffio.h")) ;; Fix dependency tests. (substitute* "pumpa.pro" (("/usr/include/tidy\\.h") @@ -59,7 +61,7 @@ (define-public pumpa (invoke "qmake" prefix)) #t))))) (inputs - (list aspell qtbase-5 tidy)) + (list aspell qtbase-5 tidy-html)) (synopsis "Qt-based pump.io client") (description "Pumpa is a simple pump.io client written in C++ and Qt.") (home-page "https://pumpa.branchable.com/") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 445f5a787d..9b16fc85be 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27161,7 +27161,7 @@ (define-public python-pytidylib (("ctypes\\.util\\.find_library\\('tidy'\\)") (format #f "'~a'" libtidy))) #t)))))) - (inputs (list tidy)) + (inputs (list tidy-html)) (home-page "https://github.com/countergram/pytidylib") (synopsis "Python wrapper for HTML Tidy library") (description diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7e49f798ea..43fef91110 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1718,40 +1718,6 @@ (define-public libpsl UTS#46.") (license license:x11))) -(define-public tidy - (package - (name "tidy") - (version "20091223") - (source (origin - (method cvs-fetch) - (uri (cvs-reference - (root-directory - ":pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy") - (module "tidy") - (revision "2009-12-23"))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "14dsnmirjcrvwsffqp3as70qr6bbfaig2fv3zvs5g7005jrsbvpb")) - (patches (search-patches "tidy-CVE-2015-5522+5523.patch")))) - (build-system gnu-build-system) - (arguments - '(#:phases (modify-phases %standard-phases - (replace 'bootstrap - (lambda* (#:key inputs #:allow-other-keys) - ;; configure.in and Makefile.am aren't in the root of the - ;; source tree. - (copy-recursively "build/gnuauto" ".") - (setenv "AUTOMAKE" "automake --foreign") - (invoke "autoreconf" "-vfi")))))) - (native-inputs - (list automake autoconf libtool)) - (synopsis "HTML validator and tidier") - (description "HTML Tidy is a command-line tool and C library that can be -used to validate and fix HTML data.") - (home-page "http://tidy.sourceforge.net/") - (license (license:x11-style "file:///include/tidy.h")))) - (define-public esbuild (package (name "esbuild") @@ -6204,6 +6170,9 @@ (define-public tidy-html functions of Tidy.") (license license:bsd-3))) +(define-public tidy + (deprecated-package "tidy" tidy-html)) + (define-public hiawatha (package (name "hiawatha")