nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-20 11:05:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

mstpd: Add derivation

Browse Source
This commit is contained in:
William A. Kennington III 2015-01-07 13:37:59 -08:00
parent 5b77abfbe4
commit 7c6cbdc145
3 changed files with 94 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/os-specific/linux/mstpd/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, fetchsvn }:
stdenv.mkDerivation rec {
name = "mstpd-svn-${toString version}";
version = 61;
src = fetchsvn {
url = "svn://svn.code.sf.net/p/mstpd/code/trunk";
rev = version;
sha256 = "0n5vqqqq8hk6iqdz100j9ps4zkz71vyl5qgz5bzjhayab2dyq1fd";
};
patches = [ ./fixes.patch ];
installFlags = [ "DESTDIR=\${out}" ];
meta = with stdenv.lib; {
description = "Multiple Spanning Tree Protocol daemon";
homepage = http://sourceforge.net/projects/mstpd/;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ wkennington ];
};
}

68
pkgs/os-specific/linux/mstpd/fixes.patch Normal file
View File

@ -0,0 +1,68 @@
diff --git a/Makefile b/Makefile
index dde9f81..9ebe035 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,6 +41,7 @@ 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
+ mkdir -p $(DESTDIR)/usr/share/man/man8 $(DESTDIR)/usr/share/man/man5
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
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>

2
pkgs/top-level/all-packages.nix
View File

@ -6523,6 +6523,8 @@ let
mpich2 = callPackage ../development/libraries/mpich2 { };
mstpd = callPackage ../os-specific/linux/mstpd { };
mtdev = callPackage ../development/libraries/mtdev { };
mtpfs = callPackage ../tools/filesystems/mtpfs { };