From 479e8fc6d6a31479e225017339709a94e1dec03e Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 11 May 2019 10:14:01 -0700
Subject: [PATCH] ubridge: update to 0.9.15.

---
 srcpkgs/ubridge/patches/00-cflags.patch | 28 -------------------------
 srcpkgs/ubridge/patches/01-arm64.patch  | 21 -------------------
 srcpkgs/ubridge/patches/02-musl.patch   | 10 ---------
 srcpkgs/ubridge/template                |  4 ++--
 4 files changed, 2 insertions(+), 61 deletions(-)
 delete mode 100644 srcpkgs/ubridge/patches/00-cflags.patch
 delete mode 100644 srcpkgs/ubridge/patches/01-arm64.patch
 delete mode 100644 srcpkgs/ubridge/patches/02-musl.patch

diff --git a/srcpkgs/ubridge/patches/00-cflags.patch b/srcpkgs/ubridge/patches/00-cflags.patch
deleted file mode 100644
index 2b5e68f5209..00000000000
--- a/srcpkgs/ubridge/patches/00-cflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit e5a77593ef6a32cdb0551e7588180bbc2b9dd392
-Author: Garri Djavadyan <g.djavadyan@gmail.com>
-Date:   Wed Mar 21 16:19:17 2018 +0500
-
-    Respect CFLAGS/LDFLAGS
-
-diff --git Makefile Makefile
-index c55c29f..bd946a7 100644
---- Makefile
-+++ Makefile
-@@ -40,7 +40,7 @@ OBJ     =   $(SRC:.c=.o)
- 
- CC      ?=   gcc
- 
--CFLAGS  =   -O3 -Wall
-+CFLAGS  +=   -Wall
- 
- BINDIR  =   /usr/local/bin
- 
-@@ -76,7 +76,7 @@ endif
- ##############################
- 
- $(NAME)	: $(OBJ)
--	$(CC) -o $(NAME) $(OBJ) $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(NAME) $(OBJ) $(LIBS)
- 
- .PHONY: clean
- 
diff --git a/srcpkgs/ubridge/patches/01-arm64.patch b/srcpkgs/ubridge/patches/01-arm64.patch
deleted file mode 100644
index 9431d2d3259..00000000000
--- a/srcpkgs/ubridge/patches/01-arm64.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 39162868afe6d51c1fb72d1b99defb51c7713fb6
-Author: Diego Dompe <ddompe@users.noreply.github.com>
-Date:   Thu Apr 12 20:02:40 2018 -0600
-
-    Correct runtime issue for ARM64
-    
-    The getopt return is an int, and with the current code on ARM64 is being interpreted as a 255 given the opt is a char, causing to go into the default switch statement (and aborting the program silently).
-
-diff --git src/ubridge.c src/ubridge.c
-index fd2af71..daf46b0 100644
---- src/ubridge.c
-+++ src/ubridge.c
-@@ -334,7 +334,7 @@ int main(int argc, char **argv)
- {
-   int hypervisor_tcp_port = 0;
-   char *hypervisor_ip_address = NULL;
--  char opt;
-+  int opt;
-   char *index;
-   size_t len;
- 
diff --git a/srcpkgs/ubridge/patches/02-musl.patch b/srcpkgs/ubridge/patches/02-musl.patch
deleted file mode 100644
index 71d8d9de844..00000000000
--- a/srcpkgs/ubridge/patches/02-musl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/netlink/nl.c.orig
-+++ src/netlink/nl.c
-@@ -30,6 +30,7 @@
- #include <stdlib.h>
- #include <linux/netlink.h>
- #include <linux/rtnetlink.h>
-+#include <sys/types.h>
- #include "nl.h"
- 
- #define NLMSG_TAIL(nmsg) \
diff --git a/srcpkgs/ubridge/template b/srcpkgs/ubridge/template
index 9131cdbbfd5..d364c5a5822 100644
--- a/srcpkgs/ubridge/template
+++ b/srcpkgs/ubridge/template
@@ -1,6 +1,6 @@
 # Template file for 'ubridge'
 pkgname=ubridge
-version=0.9.14
+version=0.9.15
 revision=1
 build_style=gnu-makefile
 make_build_args="SYSTEM_INIPARSER=1"
@@ -10,7 +10,7 @@ maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/GNS3/ubridge"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=d28538f15c02e7b889872a7478400855d5b9d9d26b0bdad621a0cc89395a3bc2
+checksum=23d76378d425da6763308be371a6e3d17a97661e63b785cd60876e7ef419b25a
 
 do_install() {
 	vbin ubridge