From 338969701c0cbfd868d39278fd36c73cfaa491eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 28 May 2014 15:22:51 +0200 Subject: [PATCH] Fixing upnp in syncthing --- .../networking/syncthing/default.nix | 2 ++ .../networking/syncthing/upnp.patch | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/networking/syncthing/upnp.patch diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 12aa98758ad..28603daa9c6 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ go ]; + patches = [ ./upnp.patch ]; + buildPhase = '' mkdir -p "./dependencies/src/github.com/calmh/syncthing" diff --git a/pkgs/applications/networking/syncthing/upnp.patch b/pkgs/applications/networking/syncthing/upnp.patch new file mode 100644 index 00000000000..f4164b4f6bc --- /dev/null +++ b/pkgs/applications/networking/syncthing/upnp.patch @@ -0,0 +1,28 @@ +Trying to fix upnp for miniupnpd: +https://github.com/calmh/syncthing/issues/211 + +diff --git a/upnp/upnp.go b/upnp/upnp.go +index 9de719a..9c85b23 100644 +--- a/upnp/upnp.go ++++ b/upnp/upnp.go +@@ -60,14 +60,12 @@ func Discover() (*IGD, error) { + return nil, err + } + +- search := []byte(` +-M-SEARCH * HTTP/1.1 +-Host: 239.255.255.250:1900 +-St: urn:schemas-upnp-org:device:InternetGatewayDevice:1 +-Man: "ssdp:discover" +-Mx: 3 +- +-`) ++ search := []byte("M-SEARCH * HTTP/1.1\r\n" + ++"Host: 239.255.255.250:1900\r\n" + ++"St: urn:schemas-upnp-org:device:InternetGatewayDevice:1\r\n" + ++"Man: \"ssdp:discover\"\r\n" + ++"Mx: 3\r\n" + ++"\r\n") + + _, err = socket.WriteTo(search, ssdp) + if err != nil {