[arch-commits] Commit in urlwatch/trunk (PKGBUILD escape.patch)

[Maxim Baz]

    Date: Friday, November 15, 2019 @ 21:46:59
  Author: maximbaz
Revision: 529455

urlwatch: patch to make it work with py3.8, fixes FS#64521

Added:
  urlwatch/trunk/escape.patch
Modified:
  urlwatch/trunk/PKGBUILD

--------------+
 PKGBUILD     |   23 +++++++++++++++--------
 escape.patch |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-15 21:46:19 UTC (rev 529454)
+++ PKGBUILD	2019-11-15 21:46:59 UTC (rev 529455)
@@ -5,7 +5,7 @@
 
 pkgname=urlwatch
 pkgver=2.17
-pkgrel=2
+pkgrel=3
 pkgdesc="Tool for monitoring webpages for updates"
 arch=('any')
 url="https://thp.io/2008/urlwatch/"
@@ -14,16 +14,23 @@
 optdepends=('lynx: convert HTML to plain text'
             'python-beautifulsoup4: prettify HTML'
             'python-html2text: convert HTML to plain text')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/thp/urlwatch/archive/$pkgver.tar.gz")
-sha256sums=('83101382c2cbc6e84752f12cdbdefed67b3018085fa5ffb68923d6b1fe97854d')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/thp/urlwatch/archive/${pkgver}.tar.gz"
+        "escape.patch")
+sha256sums=('83101382c2cbc6e84752f12cdbdefed67b3018085fa5ffb68923d6b1fe97854d'
+            '421653801e8c397c5147db30a67fcf44aaff8f471af33db83bf16847c2f90ecc')
 
+prepare() {
+    cd "${pkgname}-${pkgver}"
+    patch -Np1 -i "${srcdir}/escape.patch"
+}
+
 build() {
-  cd $pkgname-$pkgver
-  python3 setup.py build
+    cd "${pkgname}-${pkgver}"
+    python3 setup.py build
 }
 
 package() {
-  cd $pkgname-$pkgver
-  python3 setup.py install --root="$pkgdir" --optimize=1
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+    cd "${pkgname}-${pkgver}"
+    python3 setup.py install --root="${pkgdir}" --optimize=1
+    install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }

Added: escape.patch
===================================================================
--- escape.patch	                        (rev 0)
+++ escape.patch	2019-11-15 21:46:59 UTC (rev 529455)
@@ -0,0 +1,34 @@
+From 7d1e89237f547ce57fa52360a5f8822474982780 Mon Sep 17 00:00:00 2001
+From: cfbao <cfbao.is at gmail.com>
+Date: Tue, 29 Oct 2019 23:37:57 -0400
+Subject: [PATCH] Replace `cgi.escape` with `html.escape`
+
+`cgi.escape` is unsafe and removed in Python 3.8.
+---
+ lib/urlwatch/reporters.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/urlwatch/reporters.py b/lib/urlwatch/reporters.py
+index 29d7fd0..5de0b3a 100644
+--- a/lib/urlwatch/reporters.py
++++ b/lib/urlwatch/reporters.py
+@@ -38,7 +38,7 @@
+ import os
+ import sys
+ import time
+-import cgi
++import html
+ import functools
+ 
+ import requests
+@@ -140,8 +140,8 @@ def __str__(self):
+         return self.s
+ 
+     def format(self, *args, **kwargs):
+-        return str(self).format(*(cgi.escape(str(arg)) for arg in args),
+-                                **{k: cgi.escape(str(v)) for k, v in kwargs.items()})
++        return str(self).format(*(html.escape(str(arg)) for arg in args),
++                                **{k: html.escape(str(v)) for k, v in kwargs.items()})
+ 
+ 
+ class HtmlReporter(ReporterBase):