ftp/wget: version 1.20

6 files changed, 12 insertions, 32 deletions

diff --git a/ftp/wget/DEPENDS b/ftp/wget/DEPENDS
index 8da3ab9566..d104e262a3 100755
--- a/ftp/wget/DEPENDS
+++ b/ftp/wget/DEPENDS
@@ -6,6 +6,11 @@ optional_depends pcre \
                  "--disable-pcre" \
                  "for Perl-style regular expressions" &&
 
+optional_depends pcre2 \
+                 "--enable-pcre2" \
+                 "--disable-pcre2" \
+                 "for PCRE2 regular expressions" &&
+
 optional_depends libidn \
                  "--enable-iri" \
                  "--disable-iri" \
diff --git a/ftp/wget/DETAILS b/ftp/wget/DETAILS
index 6d2be57f28..d74b8b49d8 100755
--- a/ftp/wget/DETAILS
+++ b/ftp/wget/DETAILS
@@ -1,12 +1,9 @@
            SPELL=wget
-         VERSION=1.19.5
+         VERSION=1.20
+     SOURCE_HASH=sha1:467c0ec7dab302cf1826970c1925999d64a6ee9d:UPSTREAM_HASH
   SECURITY_PATCH=5
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
-      SOURCE_GPG=wget.gpg:$SOURCE.sig:UPSTREAM_KEY
-         SOURCE2=$SOURCE.sig
-  SOURCE2_URL[0]=$SOURCE_URL.sig
-  SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         DOC_DIRS=""
         WEB_SITE=http://www.gnu.org/software/wget/
diff --git a/ftp/wget/HISTORY b/ftp/wget/HISTORY
index 8fa286b841..77ca886ea9 100644
--- a/ftp/wget/HISTORY
+++ b/ftp/wget/HISTORY
@@ -1,3 +1,8 @@
+2018-11-30 Pavel Vinogradov <public@sourcemage.org>
+	* DETAILS: version 1.20, gpg -> UPSTREAM_HASH
+	* DEPENDS: added pcre2, optionally
+	* PRE_BUILD, cares.patch, wget.gpg: removed
+
 2018-05-12 Vlad Glagolev <stealth@sourcemage.org>
 	* DEPENDS: added c-ares optional dependency
 	* PRE_BUILD: added, to apply patch
diff --git a/ftp/wget/PRE_BUILD b/ftp/wget/PRE_BUILD
deleted file mode 100755
index 9a34989605..0000000000
--- a/ftp/wget/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-
-patch -p1 < "${SPELL_DIRECTORY}/cares.patch"
diff --git a/ftp/wget/cares.patch b/ftp/wget/cares.patch
deleted file mode 100644
index 6f62b707a5..0000000000
--- a/ftp/wget/cares.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 7eff94e881b94d119ba22fc0c29edd65f4e6798b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
-Date: Tue, 8 May 2018 09:36:45 +0200
-Subject: [PATCH] * src/host.c (wait_ares): Remove void assignment
-
-Reported-by: Josef Moellers
----
- src/host.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/host.c b/src/host.c
-index 4597f46aa..b42cd6e8d 100644
---- a/src/host.c
-+++ b/src/host.c
-@@ -732,7 +732,7 @@ wait_ares (ares_channel channel)
-         ares_process (channel, &read_fds, &write_fds);
-     }
-   if (timer)
--    timer = ptimer_destroy (timer);
-+    ptimer_destroy (timer);
- }
- 
- static void
diff --git a/ftp/wget/wget.gpg b/ftp/wget/wget.gpg
deleted file mode 100644
index ab65acfc1d..0000000000
--- a/ftp/wget/wget.gpg
+++ /dev/null