From 0d3f0f05e20672e2f021df855fb2b8b5482637fe Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 20 Dec 2016 21:49:20 +0100
Subject: [PATCH] libupnp: 1.6.20 -> 1.6.21 for CVE-2016-8863

Switching to git tags means we don't get pre-generated configure
scripts. Thusly, run bootstrap ourselves.

For https://github.com/NixOS/nixpkgs/issues/21289
For CVE-2016-8863 (remote code execution)
---
 pkgs/development/libraries/pupnp/default.nix | 23 +++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix
index b1d2b1fd92e..389e575dbb1 100644
--- a/pkgs/development/libraries/pupnp/default.nix
+++ b/pkgs/development/libraries/pupnp/default.nix
@@ -1,15 +1,28 @@
-{ fetchurl, stdenv }:
+{ fetchFromGitHub, stdenv, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "libupnp-1.6.20";
+  name = "libupnp-${version}";
+  version = "1.6.20";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/pupnp/${name}.tar.bz2";
-    sha256 = "0qrsdsb1qm85hc4jy04qph895613d148f0x1mmk6z99y3q43fdgf";
+  src = fetchFromGitHub {
+    owner = "mrjimenez";
+    repo = "pupnp";
+    rev = "release-${version}";
+    sha256 = "10583dkz1l5sjp2833smql8w428x2nbh1fni8j6h9rji6ma2yhs0";
   };
 
+  buildInputs = [
+    autoconf
+    automake
+    libtool
+  ];
+
   hardeningDisable = [ "fortify" ];
 
+  preConfigure = ''
+    ./bootstrap
+  '';
+
   meta = {
     description = "libupnp, an open source UPnP development kit for Linux";