Merge ~hectorcao/ubuntu/+source/wget:merge-lp2065883 into ubuntu/+source/wget:debian/sid

[Hector CAO]

[Simon Chopin (schopin)]

Uploaded :)

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 1d05665..9623cac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+wget (1.24.5-1ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes (LP: #2065883):
+    - d/control: Don't Build-Depend on libgnutls28-dev, only on libssl-dev.
+    - d/rules: Pass --with-ssl=openssl
+
+ -- Hector Cao <[e-mail]>  Thu, 16 May 2024 14:11:11 +0200
+
 wget (1.24.5-1) unstable; urgency=medium
 
   * new upstream release from 2024-03-10
@@ -6,6 +14,32 @@ wget (1.24.5-1) unstable; urgency=medium
 
  -- Noël Köthe <[e-mail]>  Sun, 17 Mar 2024 11:31:58 +0100
 
+wget (1.21.4-1ubuntu4) noble; urgency=high
+
+  * No change rebuild against libssl3t64.
+
+ -- Julian Andres Klode <[e-mail]>  Mon, 08 Apr 2024 16:52:02 +0200
+
+wget (1.21.4-1ubuntu3) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- Steve Langasek <[e-mail]>  Sun, 31 Mar 2024 17:25:35 +0000
+
+wget (1.21.4-1ubuntu2) noble; urgency=medium
+
+  * No-change rebuild against libssl3t64
+
+ -- Steve Langasek <[e-mail]>  Tue, 05 Mar 2024 02:16:23 +0000
+
+wget (1.21.4-1ubuntu1) noble; urgency=low
+
+  * Merge from Debian unstable. Remaining changes: (LP: #2039429)
+    - d/control: Don't Build-Depend on libgnutls28-dev, only on libssl-dev.
+    - d/rules: Pass --with-ssl=openssl
+
+ -- Nathan Pratta Teodosio <[e-mail]>  Mon, 16 Oct 2023 11:47:48 +0200
+
 wget (1.21.4-1) unstable; urgency=medium
 
   * new upstream from 2023-05-10
@@ -13,6 +47,14 @@ wget (1.21.4-1) unstable; urgency=medium
 
  -- Noël Köthe <[e-mail]>  Sat, 09 Sep 2023 12:05:49 +0200
 
+wget (1.21.3-1ubuntu1) kinetic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes: (LP: #1974046)
+    - d/control: Don't Build-Depend on libgnutls28-dev, only on libssl-dev.
+    - d/rules: Pass --with-ssl=openssl
+
+ -- Nathan Pratta Teodosio <[e-mail]>  Wed, 18 May 2022 14:23:07 -0300
+
 wget (1.21.3-1) unstable; urgency=medium
 
   * new upstream from 2022-02-26
@@ -21,6 +63,14 @@ wget (1.21.3-1) unstable; urgency=medium
 
  -- Noël Köthe <[e-mail]>  Tue, 29 Mar 2022 19:40:59 +0200
 
+wget (1.21.2-2ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Don't Build-Depend on libgnutls28-dev, only on libssl-dev.
+    - Pass --with-ssl=openssl
+
+ -- Lukas Märdian <[e-mail]>  Mon, 24 Jan 2022 12:59:00 +0100
+
 wget (1.21.2-2) unstable; urgency=medium
 
   * cherry pick to fix SSL_INIT output wget#61125 closes: Bug#996174
@@ -33,6 +83,40 @@ wget (1.21.2-1) unstable; urgency=medium
 
  -- Noël Köthe <[e-mail]>  Sun, 10 Oct 2021 16:31:17 +0200
 
+wget (1.21-1ubuntu5) jammy; urgency=medium
+
+  * No-change rebuild against openssl3
+
+ -- Simon Chopin <[e-mail]>  Wed, 24 Nov 2021 13:58:06 +0000
+
+wget (1.21-1ubuntu4) impish; urgency=medium
+
+  * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <[e-mail]>  Thu, 07 Oct 2021 12:26:23 +0200
+
+wget (1.21-1ubuntu3) hirsute; urgency=medium
+
+  * Rebuild again so s390x picks up the right debhelper
+
+ -- Sebastien Bacher <[e-mail]>  Wed, 24 Feb 2021 16:32:45 +0100
+
+wget (1.21-1ubuntu2) hirsute; urgency=medium
+
+  * No-change rebuild to drop the udeb package.
+
+ -- Matthias Klose <[e-mail]>  Mon, 22 Feb 2021 10:36:36 +0100
+
+wget (1.21-1ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Don't Build-Depend on libgnutls28-dev, only on libssl-dev.
+    - Pass --with-ssl=openssl
+  * Dropped changes, included in Debian:
+    - Enable parallel builds.
+
+ -- Steve Langasek <[e-mail]>  Wed, 06 Jan 2021 18:19:35 -0800
+
 wget (1.21-1) unstable; urgency=medium
 
   * new upstream release from 2020-12-31
@@ -43,6 +127,20 @@ wget (1.21-1) unstable; urgency=medium
 
  -- Noël Köthe <[e-mail]>  Sat, 02 Jan 2021 11:58:25 +0100
 
+wget (1.20.3-1ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Don't Build-Depend on libgnutls28-dev, only on libssl-dev.
+    - Pass --with-ssl=openssl
+    - Enable parallel builds.
+  * Dropped changes, no longer needed:
+    - debian/patches/disable-SSLv3.patch: with openssl 1.1.1 both defines
+      exist so there is no need for a delta.
+  * Dropped changes, included upstream:
+    - debian/control: add pkg-config to Build-Depends.
+
+ -- Steve Langasek <[e-mail]>  Wed, 24 Jul 2019 12:40:25 -0700
+
 wget (1.20.3-1) unstable; urgency=medium
 
   * new upstream release from 2019-04-05
@@ -50,6 +148,21 @@ wget (1.20.3-1) unstable; urgency=medium
 
  -- Noël Köthe <[e-mail]>  Sat, 20 Jul 2019 18:10:06 +0200
 
+wget (1.20.1-1.1ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Don't Build-Depend on libgnutls28-dev.
+    - Pass --with-ssl=openssl
+    - Enable parallel builds.
+    - debian/patches/disable-SSLv3.patch: properly detect SSLv3 being
+      disabled on Ubuntu because the method still exists for ABI reasons.
+    - debian/control: add pkg-config to Build-Depends.
+  * Dropped changes, included in Debian:
+    - debian/patches/CVE-2019-5953-*.patch: fix buffer overflow in
+      src/iri.c.
+
+ -- Steve Langasek <[e-mail]>  Sat, 04 May 2019 21:00:19 -0700
+
 wget (1.20.1-1.1) unstable; urgency=high
 
   * Non-maintainer upload.
@@ -57,6 +170,39 @@ wget (1.20.1-1.1) unstable; urgency=high
 
  -- Salvatore Bonaccorso <[e-mail]>  Fri, 05 Apr 2019 15:36:38 +0200
 
+wget (1.20.1-1ubuntu4) disco; urgency=medium
+
+  * SECURITY UPDATE: Buffer overflow
+    - debian/patches/CVE-2019-5953-*.patch: fix in
+      src/iri.c.
+    - CVE-2019-5953
+
+ -- Leonidas S. Barbosa <[e-mail]>  Tue, 09 Apr 2019 10:35:13 -0300
+
+wget (1.20.1-1ubuntu3) disco; urgency=medium
+
+  * Revert switching to pcre3 since pcre2 is in main (LP: #1792544)
+
+ -- Jeremy Bicha <[e-mail]>  Wed, 23 Jan 2019 11:56:34 -0500
+
+wget (1.20.1-1ubuntu2) disco; urgency=medium
+
+  * TEMPORARY: Switch back to pcre3 until pcre2 is in main (see LP #1636666)
+
+ -- Julian Andres Klode <[e-mail]>  Wed, 09 Jan 2019 13:37:13 +0100
+
+wget (1.20.1-1ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Don't Build-Depend on libgnutls28-dev.
+    - Pass --with-ssl=openssl
+    - Enable parallel builds.
+    - debian/patches/disable-SSLv3.patch: properly detect SSLv3 being
+      disabled on Ubuntu because the method still exists for ABI reasons.
+    - debian/control: add pkg-config to Build-Depends.
+
+ -- Julian Andres Klode <[e-mail]>  Mon, 07 Jan 2019 08:36:22 +0100
+
 wget (1.20.1-1) unstable; urgency=high
 
   * new upstream release 2018-12-26
@@ -73,6 +219,18 @@ wget (1.20-1) unstable; urgency=medium
 
  -- Noël Köthe <[e-mail]>  Sat, 15 Dec 2018 18:07:46 +0100
 
+wget (1.19.5-2ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Don't Build-Depend on libgnutls28-dev.
+    - Pass --with-ssl=openssl
+    - Enable parallel builds.
+    - debian/patches/disable-SSLv3.patch: properly detect SSLv3 being
+      disabled on Ubuntu because the method still exists for ABI reasons.
+    - debian/control: add pkg-config to Build-Depends.
+
+ -- Julian Andres Klode <[e-mail]>  Mon, 12 Nov 2018 10:54:07 +0100
+
 wget (1.19.5-2) unstable; urgency=medium
 
   * switch to new libpcre2 (was libpcre3)
@@ -82,6 +240,18 @@ wget (1.19.5-2) unstable; urgency=medium
 
  -- Noël Köthe <[e-mail]>  Mon, 17 Sep 2018 12:08:18 +0200
 
+wget (1.19.5-1ubuntu1) cosmic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Don't Build-Depend on libgnutls28-dev.
+    - Pass --with-ssl=openssl
+    - Enable parallel builds.
+    - debian/patches/disable-SSLv3.patch: properly detect SSLv3 being
+      disabled on Ubuntu because the method still exists for ABI reasons.
+    - debian/control: add pkg-config to Build-Depends.
+
+ -- Julian Andres Klode <[e-mail]>  Mon, 07 May 2018 17:26:32 +0200
+
 wget (1.19.5-1) unstable; urgency=medium
 
   * new upstream release from 2018-05-06
@@ -89,6 +259,24 @@ wget (1.19.5-1) unstable; urgency=medium
 
  -- Noël Köthe <[e-mail]>  Sun, 06 May 2018 20:44:40 +0200
 
+wget (1.19.4-1ubuntu2) bionic; urgency=high
+
+  * No change rebuild against openssl1.1.
+
+ -- Dimitri John Ledkov <[e-mail]>  Mon, 05 Feb 2018 16:55:42 +0000
+
+wget (1.19.4-1ubuntu1) bionic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Don't Build-Depend on libgnutls28-dev.
+    - Pass --with-ssl=openssl
+    - Enable parallel builds.
+    - debian/patches/disable-SSLv3.patch: properly detect SSLv3 being
+      disabled on Ubuntu because the method still exists for ABI reasons.
+    - debian/control: add pkg-config to Build-Depends.
+
+ -- Julian Andres Klode <[e-mail]>  Mon, 05 Feb 2018 14:38:47 +0100
+
 wget (1.19.4-1) unstable; urgency=medium
 
   * new upstream release from 2018-01-21
@@ -98,6 +286,18 @@ wget (1.19.4-1) unstable; urgency=medium
 
  -- Noël Köthe <[e-mail]>  Tue, 30 Jan 2018 18:51:28 +0100
 
+wget (1.19.3-2ubuntu1) bionic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Don't Build-Depend on libgnutls28-dev.
+    - Pass --with-ssl=openssl
+    - Enable parallel builds.
+    - debian/patches/disable-SSLv3.patch: properly detect SSLv3 being
+      disabled on Ubuntu because the method still exists for ABI reasons.
+    - debian/control: add pkg-config to Build-Depends.
+
+ -- Julian Andres Klode <[e-mail]>  Tue, 23 Jan 2018 16:26:53 +0100
+
 wget (1.19.3-2) unstable; urgency=medium
 
   * added upstream patches:
@@ -125,6 +325,20 @@ wget (1.19.2-2) unstable; urgency=medium
 
  -- Noël Köthe <[e-mail]>  Thu, 04 Jan 2018 17:10:07 +0100
 
+wget (1.19.2-1ubuntu1) bionic; urgency=medium
+
+  * Merge with Debian, remaining changes:
+    - Don't Build-Depend on libgnutls28-dev.
+    - Pass --with-ssl=openssl
+    - Enable parallel builds.
+    - debian/patches/disable-SSLv3.patch: properly detect SSLv3 being
+      disabled on Ubuntu because the method still exists for ABI reasons.
+    - debian/control: add pkg-config to Build-Depends.
+  * Dropped changes:
+    - Don't build with libpsl-dev, which is in universe. (it's in main now)
+
+ -- Marc Deslauriers <[e-mail]>  Fri, 10 Nov 2017 08:45:48 -0500
+
 wget (1.19.2-1) unstable; urgency=high
 
   * new upstream release from 2017-10-27 fixes
@@ -154,6 +368,32 @@ wget (1.19.1-4) unstable; urgency=medium
 
  -- Noël Köthe <[e-mail]>  Mon, 26 Jun 2017 08:07:18 +0200
 
+wget (1.19.1-3ubuntu1.1) artful-security; urgency=medium
+
+  * SECURITY UPDATE: stack overflow in HTTP protocol handling
+    - debian/patches/CVE-2017-13089.patch: return error on negative chunk
+      size in src/http.c.
+    - CVE-2017-13089
+  * SECURITY UPDATE: heap overflow in HTTP protocol handling
+    - debian/patches/CVE-2017-13090.patch: stop processing on negative
+      chunk size in src/retr.c.
+    - CVE-2017-13090
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 23 Oct 2017 15:17:58 -0400
+
+wget (1.19.1-3ubuntu1) artful; urgency=medium
+
+  * Merge with Debian, remaining changes:
+    - Don't Build-Depend on libgnutls28-dev.
+    - Pass --with-ssl=openssl
+    - Don't build with libpsl-dev, which is in universe.
+    - Enable parallel builds.
+    - debian/patches/disable-SSLv3.patch: properly detect SSLv3 being
+      disabled on Ubuntu because the method still exists for ABI reasons.
+  * debian/control: add pkg-config to Build-Depends.
+
+ -- Marc Deslauriers <[e-mail]>  Wed, 03 May 2017 08:47:18 -0400
+
 wget (1.19.1-3) unstable; urgency=medium
 
   * also apply the patch in 1.19.1-2 m(
@@ -197,6 +437,18 @@ wget (1.18-3) unstable; urgency=medium
 
  -- Noël Köthe <[e-mail]>  Thu, 22 Sep 2016 17:04:27 +0200
 
+wget (1.18-2ubuntu1) yakkety; urgency=medium
+
+  * Merge with Debian, remaining changes:
+    - Don't Build-Depend on libgnutls28-dev.
+    - Pass --with-ssl=openssl
+    - Don't build with libpsl-dev, which is in universe.
+    - Enable parallel builds.
+  * debian/patches/disable-SSLv3.patch: properly detect SSLv3 being
+    disabled on Ubuntu because the method still exists for ABI reasons.
+
+ -- Marc Deslauriers <[e-mail]>  Fri, 15 Jul 2016 08:24:54 -0400
+
 wget (1.18-2) unstable; urgency=medium
 
   * added OpenSSl 1.1.0 patch from upstream git. closes: #828599
@@ -223,6 +475,29 @@ wget (1.17.1-2) unstable; urgency=low
 
  -- Noël Köthe <[e-mail]>  Thu, 05 May 2016 16:39:24 +0200
 
+wget (1.17.1-1ubuntu2) yakkety; urgency=medium
+
+  * SECURITY UPDATE: http to ftp redirect spoofed filenames
+    - debian/patches/CVE-2016-4971.patch: understand --trust-server-names
+      on a HTTP->FTP redirect in src/ftp.*, src/retr.c.
+    - CVE-2016-4971
+
+ -- Marc Deslauriers <[e-mail]>  Tue, 14 Jun 2016 10:36:24 +0300
+
+wget (1.17.1-1ubuntu1) xenial; urgency=medium
+
+  * Merge with Debian experimental, remaining changes:
+    - Add wget-udeb to ship wget as alternative to busybox wget.
+    - Build-Depend on libssl-dev instead of libgnutls28-dev.
+    - Pass --with-ssl=openssl; there's no udeb for gnutls.
+    - Add a second build pass for the udeb, so we can build with -Os and
+      without libidn.
+    - Use dh_autotools-dev instead of custom config.{sub,guess} copy.
+    - Don't build with libpsl-dev, which is in universe.
+  * Enable parallel builds.
+
+ -- Matthias Klose <[e-mail]>  Fri, 08 Jan 2016 14:07:18 +0100
+
 wget (1.17.1-1) unstable; urgency=medium
 
   * new upstream relase from 2015-12-11
@@ -276,6 +551,20 @@ wget (1.16.2-1) experimental; urgency=medium
 
  -- Noël Köthe <[e-mail]>  Sat, 28 Feb 2015 19:35:53 +0100
 
+wget (1.16.1-1ubuntu1) vivid; urgency=medium
+
+  * Merge with Debian experimental, remaining changes:
+    - Add wget-udeb to ship wget as alternative to busybox wget.
+    - Build-Depend on libssl-dev instead of libgnutls28-dev.
+    - Pass --with-ssl=openssl; there's no udeb for gnutls.
+    - Add a second build pass for the udeb, so we can build with -Os and
+      without libidn.
+    - Use dh_autotools-dev instead of custom config.{sub,guess} copy.
+    - Don't build with libpsl-dev, which is in universe.
+  * Drop fix-openssl-implicit-decl-warning.patch, applied upstream.
+
+ -- Dmitry Shachnev <[e-mail]>  Tue, 13 Jan 2015 17:51:26 +0300
+
 wget (1.16.1-1) experimental; urgency=medium
 
   * new upstream release from 2014-12-08 to experimental until jessie release
@@ -307,6 +596,24 @@ wget (1.16-2) unstable; urgency=medium
 
  -- Noël Köthe <[e-mail]>  Wed, 05 Nov 2014 12:15:02 +0100
 
+wget (1.16-1ubuntu1) vivid; urgency=medium
+
+  * Resynchronise with Debian. Remaining changes:
+    - Add wget-udeb to ship wget as alternative to busybox wget.
+    - Build-Depend on libssl-dev instead of libgnutls28-dev.
+    - Pass --with-ssl=openssl; there's no udeb for gnutls.
+    - Add a second build pass for the udeb, so we can build with -Os and
+      without libidn.
+    - Use dh_autotools-dev instead of custom config.{sub,guess} copy.
+  * Don't build with Public Suffix List cookie domain checking (required
+    library is in universe)
+    - debian/control: remove libpsl-dev from Build-Depends.
+  * Fix openssl build
+    - debian/patches/fix-openssl-implicit-decl-warning.patch: added missing
+      include to src/openssl.c.
+
+ -- Marc Deslauriers <[e-mail]>  Thu, 30 Oct 2014 10:37:04 -0400
+
 wget (1.16-1) unstable; urgency=medium
 
   * new upstream release from 2014-10-27
@@ -318,6 +625,23 @@ wget (1.16-1) unstable; urgency=medium
 
  -- Noël Köthe <[e-mail]>  Mon, 27 Oct 2014 11:29:29 +0100
 
+wget (1.15-1ubuntu1) trusty; urgency=medium
+
+  [ Colin Watson ]
+  * Resynchronise with Debian.  Remaining changes:
+    - Add wget-udeb to ship wget.gnu as alternative to busybox wget.
+    - Build-depend on libssl-dev 0.9.8k-7ubuntu4.
+    - Pass --with-ssl=openssl; there's no udeb for gnutls.
+    - Add a second build pass for the udeb, so we can build with -Os and
+      without libidn.
+    - Use dh_autotools-dev instead of custom config.{sub,guess} copy.
+
+  [ Mark Russell ]
+  * debian/rules: build wget-udeb to install its binary as /usr/bin/wget
+    instead of /usr/bin/wget.gnu (LP: #1172101).
+
+ -- Colin Watson <[e-mail]>  Fri, 07 Feb 2014 17:42:45 +0000
+
 wget (1.15-1) unstable; urgency=medium
 
   * new upstream release from 2014-01-19
@@ -363,6 +687,18 @@ wget (1.14.96.38327-1) experimental; urgency=low
 
  -- Noël Köthe <[e-mail]>  Fri, 08 Nov 2013 08:14:32 +0100
 
+wget (1.14-5ubuntu1) trusty; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - Add wget-udeb to ship wget.gnu as alternative to busybox wget.
+    - Build-depend on libssl-dev 0.9.8k-7ubuntu4
+    - Pass --with-ssl=openssl; there's no udeb for gnutls.
+    - Add a second build pass for the udeb, so we can build
+      with -Os and without libidn.
+  * Use dh_autotools-dev instead of custom config.{sub,guess} copy.
+
+ -- Adam Conrad <[e-mail]>  Tue, 10 Dec 2013 23:53:45 -0700
+
 wget (1.14-4) unstable; urgency=low
 
   * fix manpage building error "Expected text after =item, not a number"
@@ -381,6 +717,21 @@ wget (1.14-3) experimental; urgency=low
 
  -- Noël Köthe <[e-mail]>  Tue, 13 Aug 2013 15:35:05 +0200
 
+wget (1.14-2ubuntu1) saucy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Add wget-udeb to ship wget.gnu as alternative to busybox wget
+      implementation.
+    - Depend on libssl-dev 0.9.8k-7ubuntu4
+    - Pass --with-ssl=openssl; we don't want to use gnutls, there's no udeb
+      for it.
+    - Add a second build pass for the udeb, so we can build without libidn.
+    - d/rules: Compile with -Os and disabling NLS/DEBUG in udeb to reduce
+      code size.
+    - d/rules: change backticks to $(shell ...) to fix FTBFS in sbuild
+
+ -- Oussama Bounaim <[e-mail]>  Thu, 18 Jul 2013 14:29:40 +0100
+
 wget (1.14-2) unstable; urgency=low
 
   * fix changed Texinfo 5 itemx vs item behaviour
@@ -392,6 +743,21 @@ wget (1.14-2) unstable; urgency=low
 
  -- Noël Köthe <[e-mail]>  Tue, 04 Jun 2013 10:58:22 +0200
 
+wget (1.14-1ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Add wget-udeb to ship wget.gnu as alternative to busybox wget
+      implementation.
+    - Depend on libssl-dev 0.9.8k-7ubuntu4
+    - Pass --with-ssl=openssl; we don't want to use gnutls, there's no udeb
+      for it.
+    - Add a second build pass for the udeb, so we can build without libidn.
+    - d/rules: Compile with -Os and disabling NLS/DEBUG in udeb to reduce
+      code size.
+    - d/rules: change backticks to $(shell ...) to fix FTBFS in sbuild
+
+ -- Clint Byrum <[e-mail]>  Wed, 07 Nov 2012 09:11:39 -0800
+
 wget (1.14-1) unstable; urgency=low
 
   * new upstream release from 2012-08-07
@@ -422,6 +788,21 @@ wget (1.13.4.59-1) experimental; urgency=low
 
  -- Noël Köthe <[e-mail]>  Mon, 09 Jul 2012 17:12:56 +0200
 
+wget (1.13.4-3ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable, Remaining Changes:
+    - Add wget-udeb to ship wget.gnu as alternative to busybox wget
+      implementation.
+    - Depend on libssl-dev 0.9.8k-7ubuntu4
+    - Pass --with-ssl=openssl; we don't want to use gnutls, there's no udeb
+      for it.
+    - Add a second build pass for the udeb, so we can build without libidn.
+    - d/rules: Compile with -Os and disabling NLS/DEBUGin udeb to reduce
+      code size.
+    - d/rules: change backticks to $(shell ...) to fix FTBFS in sbuild
+
+ -- Clint Byrum <[e-mail]>  Thu, 14 Jun 2012 12:29:44 -0700
+
 wget (1.13.4-3) unstable; urgency=low
 
   [ Daniel Kahn Gillmor ]
@@ -434,6 +815,21 @@ wget (1.13.4-3) unstable; urgency=low
 
  -- Noël Köthe <[e-mail]>  Mon, 09 Apr 2012 19:38:36 +0200
 
+wget (1.13.4-2ubuntu1) precise; urgency=low
+
+  * Merge from Debian unstable, Remaining Changes:
+    - Add wget-udeb to ship wget.gnu as alternative to busybox wget
+      implementation.
+    - Depend on libssl-dev 0.9.8k-7ubuntu4
+    - Pass --with-ssl=openssl; we don't want to use gnutls, there's no udeb
+      for it.
+    - Add a second build pass for the udeb, so we can build without libidn.
+    - d/rules: Compile with -Os and disabling NLS/DEBUGin udeb to reduce
+      code size.
+  * d/rules: change backticks to $(shell ...) to fix FTBFS in sbuild
+
+ -- Clint Byrum <[e-mail]>  Fri, 10 Feb 2012 17:01:43 -0800
+
 wget (1.13.4-2) unstable; urgency=low
 
   * added hardened build flag. thx Moritz for the patch
@@ -441,12 +837,49 @@ wget (1.13.4-2) unstable; urgency=low
 
  -- Noël Köthe <[e-mail]>  Fri, 13 Jan 2012 16:31:57 +0100
 
+wget (1.13.4-1ubuntu2) precise; urgency=low
+
+  * d/rules: Compile with -Os and disabling NLS/DEBUGin udeb to reduce
+    code size. (LP: #893308)
+
+ -- Clint Byrum <[e-mail]>  Mon, 21 Nov 2011 16:14:12 -0800
+
+wget (1.13.4-1ubuntu1) precise; urgency=low
+
+  * Merge from Debian testing, remaining changes:
+    - Add wget-udeb to ship wget.gnu as alternative to busybox wget
+      implementation.
+    - Depend on libssl-dev 0.9.8k-7ubuntu4
+    - Pass --with-ssl=openssl; we don't want to use gnutls, there's no udeb
+      for it.
+    - Add a second build pass for the udeb, so we can build without libidn.
+
+ -- Steve Langasek <[e-mail]>  Tue, 01 Nov 2011 17:42:30 -0400
+
 wget (1.13.4-1) unstable; urgency=low
 
   * new upstream release 1.13.4 from 2011-09-17
 
  -- Noël Köthe <[e-mail]>  Fri, 21 Oct 2011 17:43:13 +0200
 
+wget (1.13-1ubuntu1) precise; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - Add wget-udeb to ship wget.gnu as alternative to busybox wget
+      implementation.
+    - Depend on libssl-dev 0.9.8k-7ubuntu4 (LP: #503339)
+  * Dropped changes, superseded in Debian:
+    - Keep build dependencies in main:
+      + debian/control: remove info2man build-dep
+      + debian/patches/series: disable wget-infopod_generated_manpage
+    - Mark wget Multi-Arch: foreign, so packages that aren't of the same arch
+      can depend on it.
+  * Pass --with-ssl=openssl; we don't want to use gnutls, there's no udeb for
+    it.
+  * Add a second build pass for the udeb, so we can build without libidn.
+
+ -- Steve Langasek <[e-mail]>  Wed, 19 Oct 2011 00:00:09 +0000
+
 wget (1.13-1) unstable; urgency=low
 
   * new upstream release 1.13 from 2011-08-09
@@ -525,6 +958,20 @@ wget (1.12-4) unstable; urgency=low
 
  -- Noèl Köthe <[e-mail]>  Fri, 22 Jul 2011 10:22:53 +0200
 
+wget (1.12-3.1ubuntu1) oneiric; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - Add wget-udeb to ship wget.gnu as alternative to busybox wget
+      implementation.
+    - Keep build dependencies in main:
+      + debian/control: remove info2man build-dep
+      + debian/patches/series: disable wget-infopod_generated_manpage
+    - Depend on libssl-dev 0.9.8k-7ubuntu4 (LP: #503339)
+    - Mark wget Multi-Arch: foreign, so packages that aren't of the same arch
+      can depend on it.
+
+ -- Steve Langasek <[e-mail]>  Tue, 17 May 2011 19:46:25 +0000
+
 wget (1.12-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -552,6 +999,33 @@ wget (1.12-3) unstable; urgency=low
 
  -- Filippo Rusconi <[e-mail]>  Thu, 17 Mar 2011 20:28:53 +0100
 
+wget (1.12-2.1ubuntu2) natty; urgency=low
+
+  * Mark wget Multi-Arch: foreign, so packages that aren't of the same arch
+    can depend on it.
+
+ -- Steve Langasek <[e-mail]>  Sun, 20 Feb 2011 02:58:07 -0800
+
+wget (1.12-2.1ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable (LP: #403070), remaining changes:
+    - Add wget-udeb to ship wget.gnu as alternative to busybox wget
+      implementation.
+    - Keep build dependencies in main:
+      + debian/control: remove info2man build-dep
+      + debian/patches/00list: disable wget-infopod_generated_manpage.dpatch
+    - Depend on libssl-dev 0.9.8k-7ubuntu4 (LP: #503339)
+  * Dropped changes:
+    - SECURITY UPDATE: arbitrary file overwrite via 3xx redirect
+      + debian/patches/CVE-2010-2252.dpatch: don't use server names in
+        doc/wget.texi, src/{http.*,init.c,main.c,options.h,retr.c}.
+      + This update changes previous behaviour by ignoring the filename
+        supplied by the server during redirects. To re-enable previous
+        behaviour, see the new --trust-server-names option.
+      + CVE-2010-2252: fixed in debian
+
+ -- Lorenzo De Liso <[e-mail]>  Tue, 02 Nov 2010 15:17:29 +0100
+
 wget (1.12-2.1) unstable; urgency=high
 
   * Non-maintainer upload by the Security Team.
@@ -581,6 +1055,36 @@ wget (1.12-1.2) unstable; urgency=low
 
  -- Anthony Fok <[e-mail]>  Wed, 17 Mar 2010 06:19:26 +0800
 
+wget (1.12-1.1ubuntu3) maverick; urgency=low
+
+  * SECURITY UPDATE: arbitrary file overwrite via 3xx redirect
+    - debian/patches/CVE-2010-2252.dpatch: don't use server names in
+      doc/wget.texi, src/{http.*,init.c,main.c,options.h,retr.c}.
+    - This update changes previous behaviour by ignoring the filename
+      supplied by the server during redirects. To re-enable previous
+      behaviour, see the new --trust-server-names option.
+    - CVE-2010-2252
+
+ -- Marc Deslauriers <[e-mail]>  Fri, 03 Sep 2010 09:19:11 -0400
+
+wget (1.12-1.1ubuntu2) lucid; urgency=low
+
+  * Rebuild against libssl-dev 0.9.8k-7ubuntu4 to fix wget-udeb dependencies
+    (LP: #503339).
+
+ -- Colin Watson <[e-mail]>  Tue, 05 Jan 2010 16:31:46 +0000
+
+wget (1.12-1.1ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing, remaining changes:
+    - Add wget-udeb to ship wget.gnu as alternative to busybox wget
+      implementation.
+  * Keep build dependencies in main:
+    - debian/control: remove info2man build-dep
+    - debian/patches/00list: disable wget-infopod_generated_manpage.dpatch
+
+ -- Marc Deslauriers <[e-mail]>  Sat, 12 Dec 2009 08:15:59 -0500 
+
 wget (1.12-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -634,6 +1138,23 @@ wget (1.11.4-3) unstable; urgency=low
 
  -- Noèl Köthe <[e-mail]>  Tue, 21 Jul 2009 21:56:21 +0200
 
+wget (1.11.4-2ubuntu2) karmic; urgency=low
+
+  * SECURITY UPDATE: SSL certificate bypass with NULL CN byte.
+    - debian/patches/security-CVE-2009-3490.dpatch: make sure there is no
+      NULL in the common-name in src/openssl.c.
+    - CVE-2009-3490
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 05 Oct 2009 14:32:57 -0400
+
+wget (1.11.4-2ubuntu1) jaunty; urgency=low
+
+  * Merge from Debian unstable (LP: #295181), Ubuntu remaining changes:
+    - Add wget-udeb to ship wget.gnu as alternative to busybox wget
+      implementation.
+
+ -- Pedro Fragoso <[e-mail]>  Wed, 05 Nov 2008 03:41:48 +0000
+
 wget (1.11.4-2) unstable; urgency=low
 
   * debian/copyright added missing GFDL notice
@@ -641,6 +1162,15 @@ wget (1.11.4-2) unstable; urgency=low
 
  -- Noèl Köthe <[e-mail]>  Sun, 07 Sep 2008 22:13:29 +0200
 
+wget (1.11.4-1ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian unstable (LP: #249277), Ubuntu remaining changes:
+    - Add wget-udeb to ship wget.gnu as alternative to busybox wget
+      implementation.
+  * Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Pedro Fragoso <[e-mail]>  Tue, 01 Jul 2008 11:58:02 +0100
+
 wget (1.11.4-1) unstable; urgency=low
 
   * new upstream release from 2008-06-30
@@ -650,6 +1180,14 @@ wget (1.11.4-1) unstable; urgency=low
 
  -- Noèl Köthe <[e-mail]>  Mon, 30 Jun 2008 21:50:41 +0200
 
+wget (1.11.3-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Add wget-udeb to ship wget.gnu as alternative to busybox wget
+      implementation.
+
+ -- Michael Vogt <[e-mail]>  Mon, 09 Jun 2008 17:15:56 +0200
+
 wget (1.11.3-1) unstable; urgency=low
 
   * new upstream release from 2008-05-29
@@ -657,6 +1195,14 @@ wget (1.11.3-1) unstable; urgency=low
 
  -- Noèl Köthe <[e-mail]>  Fri, 06 Jun 2008 22:13:19 +0200
 
+wget (1.11.2-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Add wget-udeb to ship wget.gnu as alternative to busybox wget
+      implementation.
+
+ -- Michael Vogt <[e-mail]>  Tue, 27 May 2008 11:49:54 +0200
+
 wget (1.11.2-1) unstable; urgency=low
 
   * new upstream release from 2008-05-01
@@ -693,6 +1239,40 @@ wget (1.11-1) unstable; urgency=low
 
  -- Noèl Köthe <[e-mail]>  Wed, 19 Mar 2008 14:20:22 +0100
 
+wget (1.10.2-3ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Add wget-udeb to ship wget.gnu as alternative to busybox wget
+      implementation.
+    - Ubuntu Maintainer foobar.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Mon, 18 Jun 2007 10:20:55 +0200
+
+wget (1.10.2-3) unstable; urgency=low
+
+  * Generate a POT file (thanks Martin)
+    (closes: Bug#376075)
+  * added missing -O2 optimization
+    (closes: Bug#415421)
+  * removed unneeded groff build-dep
+    (closes: Bug#399478)
+  * corrected lintian warning debian-rules-sets-DH_COMPAT
+
+ -- Noèl Köthe <[e-mail]>  Sat, 16 Jun 2007 13:19:56 +0200
+
+wget (1.10.2-2ubuntu2) feisty; urgency=low
+
+  * Add wget-udeb to ship wget.gnu as alternative to busybox wget
+    implementation.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Wed, 13 Dec 2006 11:41:09 +0100
+
+wget (1.10.2-2ubuntu1) edgy; urgency=low
+
+  * Merge to Debian unstable (only change: POT file generation).
+
+ -- Martin Pitt <[e-mail]>  Fri, 30 Jun 2006 08:34:48 +0200
+
 wget (1.10.2-2) unstable; urgency=medium
 
   * updating wget.texi from upstream svn (r2167)
@@ -702,6 +1282,12 @@ wget (1.10.2-2) unstable; urgency=medium
 
  -- Noèl Köthe <[e-mail]>  Wed, 28 Jun 2006 18:12:56 +0200
 
+wget (1.10.2-1ubuntu1) dapper; urgency=low
+
+  * debian/rules: Generate a POT file, remove it in clean rule.
+
+ -- Martin Pitt <[e-mail]>  Thu,  4 May 2006 04:50:47 +0200
+
 wget (1.10.2-1) unstable; urgency=high
 
   * new upstream release which fixes a NTLM Buffer Overflow Vulnerability
@@ -1445,3 +2031,4 @@ wget (1.4.0-1) unstable; urgency=low
   * Initial Release.
 
  -- Christian Schwarz <[e-mail]>  Mon, 18 Nov 1996 00:59:57 +0100
+
diff --git a/debian/control b/debian/control
index 466eb9e..f9b7d21 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,9 @@
 Source: wget
 Section: web
 Priority: standard
-Maintainer: Noël Köthe <[e-mail]>
-Build-Depends: debhelper-compat (= 13), pkgconf, gettext, texinfo, libidn2-dev, uuid-dev, libpsl-dev, libpcre2-dev, libgnutls28-dev (>= 3.3.15-5), automake, libssl-dev (>= 0.9.8k), zlib1g-dev, dh-strip-nondeterminism
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Noël Köthe <[e-mail]>
+Build-Depends: debhelper-compat (= 13), pkgconf, gettext, texinfo, libidn2-dev, uuid-dev, libpsl-dev, libpcre2-dev, automake, libssl-dev (>= 0.9.8k), zlib1g-dev, dh-strip-nondeterminism
 Standards-Version: 4.6.0
 Homepage: https://www.gnu.org/software/wget/
 Rules-Requires-Root: no
diff --git a/debian/rules b/debian/rules
index e055f9f..498252b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ configure-stamp: configure-udeb-stamp
 			--infodir=\$${prefix}/share/info \
 			--sysconfdir=/etc \
 			--enable-ipv6 \
-			--with-ssl \
+			--with-ssl=openssl \
 			--with-libidn=/usr $(confflags)
 
 	touch configure-stamp