From 8ab4eb1b4ca607e3bebfcf968de048f1f2b73326 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 4 Dec 2017 17:39:44 +0100
Subject: mstpd: svn 61 -> 0.0.5.20171113

Also fetches package from it's new home on GitHub and fixes compilation
with gcc-7 (#31747).
---
 pkgs/os-specific/linux/mstpd/default.nix | 20 ++++-----
 pkgs/os-specific/linux/mstpd/fixes.patch | 72 --------------------------------
 2 files changed, 10 insertions(+), 82 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/mstpd/fixes.patch

diff --git a/pkgs/os-specific/linux/mstpd/default.nix b/pkgs/os-specific/linux/mstpd/default.nix
index ce9136e2ddb..e9d654add49 100644
--- a/pkgs/os-specific/linux/mstpd/default.nix
+++ b/pkgs/os-specific/linux/mstpd/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchsvn }:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
 
-stdenv.mkDerivation rec {
-  name = "mstpd-svn-${toString version}";
-  version = 61;
+stdenv.mkDerivation {
+  name = "mstpd-0.0.5.20171113";
 
-  src = fetchsvn {
-    url = "svn://svn.code.sf.net/p/mstpd/code/trunk";
-    rev = version;
-    sha256 = "0n5vqqqq8hk6iqdz100j9ps4zkz71vyl5qgz5bzjhayab2dyq1fd";
+  src = fetchFromGitHub {
+    owner = "mstpd";
+    repo = "mstpd";
+    rev = "2522c6eed201bce8dd81e1583f28748e9c552d0d";
+    sha256 = "0ckk386inwcx3776hf15w78hpw4db2rgv4zgf0i3zcylr83hhsr2";
   };
 
-  patches = [ ./fixes.patch ];
+  nativeBuildInputs = [ autoreconfHook ];
 
-  installFlags = [ "DESTDIR=\${out}" ];
+  installFlags = [ "DESTDIR=$(out)" ];
 
   meta = with stdenv.lib; {
     description = "Multiple Spanning Tree Protocol daemon";
diff --git a/pkgs/os-specific/linux/mstpd/fixes.patch b/pkgs/os-specific/linux/mstpd/fixes.patch
deleted file mode 100644
index 7303e1d7b4d..00000000000
--- a/pkgs/os-specific/linux/mstpd/fixes.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/Makefile b/Makefile
-index dde9f81..5af7cab 100644
---- a/Makefile
-+++ b/Makefile
-@@ -34,7 +34,6 @@ install: all
- 	-mkdir -pv $(DESTDIR)/sbin
- 	install -m 755 mstpd $(DESTDIR)/sbin/mstpd
- 	install -m 755 mstpctl $(DESTDIR)/sbin/mstpctl
--	install -m 755 bridge-stp /sbin/bridge-stp
- 	-mkdir -pv $(DESTDIR)/lib/mstpctl-utils/
- 	cp -rv lib/* $(DESTDIR)/lib/mstpctl-utils/
- 	gzip -f $(DESTDIR)/lib/mstpctl-utils/mstpctl.8
-@@ -42,8 +41,9 @@ install: all
- 	if [ -d $(DESTDIR)/etc/network/if-pre-up.d ] ; then ln -sf /lib/mstpctl-utils/ifupdown.sh $(DESTDIR)/etc/network/if-pre-up.d/mstpctl ; fi
- 	if [ -d $(DESTDIR)/etc/network/if-pre-up.d ] ; then ln -sf /lib/mstpctl-utils/ifupdown.sh $(DESTDIR)/etc/network/if-post-down.d/mstpctl ; fi
- 	if [ -d $(DESTDIR)/etc/bash_completion.d ] ; then ln -sf /lib/mstpctl-utils/bash_completion $(DESTDIR)/etc/bash_completion.d/mstpctl ; fi
--	ln -sf /lib/mstpctl-utils/mstpctl.8.gz $(DESTDIR)/usr/share/man/man8/mstpctl.8.gz
--	ln -sf /lib/mstpctl-utils/mstpctl-utils-interfaces.5.gz $(DESTDIR)/usr/share/man/man5/mstpctl-utils-interfaces.5.gz
-+	mkdir -p $(DESTDIR)/share/man/man8 $(DESTDIR)/share/man/man5
-+	ln -sf /lib/mstpctl-utils/mstpctl.8.gz $(DESTDIR)/share/man/man8/mstpctl.8.gz
-+	ln -sf /lib/mstpctl-utils/mstpctl-utils-interfaces.5.gz $(DESTDIR)/share/man/man5/mstpctl-utils-interfaces.5.gz
- 
- romfs: all
- 	$(ROMFSINST) /sbin/mstpd
-diff --git a/bridge_track.c b/bridge_track.c
-index c92fdf6..0c01aec 100644
---- a/bridge_track.c
-+++ b/bridge_track.c
-@@ -28,6 +28,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <linux/param.h>
-+#include <linux/in6.h>
- #include <linux/if_bridge.h>
- #include <asm/byteorder.h>
- 
-diff --git a/broadcom_xstrata/driver_deps.c b/broadcom_xstrata/driver_deps.c
-index e72e9e3..5194253 100644
---- a/broadcom_xstrata/driver_deps.c
-+++ b/broadcom_xstrata/driver_deps.c
-@@ -14,6 +14,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <asm/byteorder.h>
-+#include <linux/in6.h>
- #include <linux/if_bridge.h>
- 
- #include "log.h"
-diff --git a/ctl_functions.h b/ctl_functions.h
-index 9c3b914..df464de 100644
---- a/ctl_functions.h
-+++ b/ctl_functions.h
-@@ -27,6 +27,7 @@
- #ifndef CTL_SOCKET_H
- #define CTL_SOCKET_H
- 
-+#include <linux/in6.h>
- #include <linux/if_bridge.h>
- #include <asm/byteorder.h>
- 
-diff --git a/mstp.c b/mstp.c
-index 1c6a2df..b2a1acd 100644
---- a/mstp.c
-+++ b/mstp.c
-@@ -37,6 +37,7 @@
- 
- #include <string.h>
- #include <sys/time.h>
-+#include <linux/in6.h>
- #include <linux/if_bridge.h>
- #include <asm/byteorder.h>
- 
-- 
cgit 1.4.1