gentoo resync : 11.07.2019

3 files changed, 89 insertions, 0 deletions

diff --git a/net-misc/ubridge/Manifest b/net-misc/ubridge/Manifest
index 0e29d1fa5050..7799bc105ad5 100644
--- a/net-misc/ubridge/Manifest
+++ b/net-misc/ubridge/Manifest
@@ -1,4 +1,7 @@
 AUX ubridge-0.9.14-respect-flags.patch 395 BLAKE2B 746f481789bca31b87759eb879521288e27b4cf16d3e2d83ea593d76bf03f614ecad6a0f2c0b001d47c08ca57ab898b2c4c9d475d34bd0b54ce7da4bdf507746 SHA512 4a86af19f8462ff3d81d509e6d264240cb3769f3175e0b1c0142cee30d7b61354c86ffec57d31f0bfbca46c0dad078efa6d3c61d19e29ca9ab6dec43f401eccc
+AUX ubridge-0.9.16_add_slotted_iniparser-4.1+_support.patch 1008 BLAKE2B d518f3d2b5fc5fd9c6c15c39f755d05b04738dc8cd443b55019ba14d858a9796d2e73190a4956f1f13896d30e2cf49f203755c37d3ccfeb73b484da3421a37f1 SHA512 d9afe86a35ff50d9455bac90c0a0fbe830816c043c4580bff10e1a556ef3b0de92a697188b3efcf5f87ce8672015320b5795f393a6916e2d96619c465344c80b
 DIST ubridge-0.9.14.tar.gz 63492 BLAKE2B 4c19bb79c264c9bec2ca39fea8b386817f6eb41d23b35f9fbd0a1407b45398ad5362bd76cbb81597438367a2af8d80308f13d3e8faa4e75c6173bbeb23da177d SHA512 7e92ca6ee8dd5815991c5d157278487cfad69710f0a63fc217d5d0e61678d272bf5a0d31b6afe25b1060df1ad13e229f1d573c03fecb1453167a9ff364283a5f
+DIST ubridge-0.9.16.tar.gz 64106 BLAKE2B ea5292bb7895034f18fde2c78e6ec22a043d3f712af0f699240073778bf72ade4ba9fc9be56d5ff13ce4119c6d90265daf86e84405597483c07c900e80b4e579 SHA512 409b5705e178d0edda17f5a321bc28a4a03d417c59893228e022a88025a51e4d4f9a18e548ec71f1b36df24b204cfdf73bc2efb8fe9e39893d29c16b3695380c
 EBUILD ubridge-0.9.14.ebuild 1003 BLAKE2B ef1bf86ff6eb34a06748f14a98bc086a9ed39247d4a649feff896c06a210c3cc78d7e644be9e9c5f9412cd1b731abc2b7acb8445acf23b8f28182f3ed48f634c SHA512 9fea9b1c5270159bc592d5ba42e14ebd037bce7660fb38b59c02a72184833d48956f4ea53b1c4ded2b1c7dce19beb177fe5a79f1632d87fa532e7da131401109
+EBUILD ubridge-0.9.16.ebuild 1101 BLAKE2B f4c0635d72e6fc2eb2dca231ef68a26d57daedfc060a7dd9425df636912efee26f0990efd8b48338043ddba687b394cfa5eff04b45e9aa1488ba08650c395b3c SHA512 8052e0e2d5028c4b16e0aca688aa234d5048f06447f9c1c9d0a5a4527037249fa8b77a52cb042ddc19b0c26371b4f7ff731aeac5b56793485ec18251b2ea1e23
 MISC metadata.xml 620 BLAKE2B 0b56364ec1f6e18cc56a58c0ed36480114d4ff8b3ef90963d1b964f5dbdeb1fa905336e8fdf0014476927b9b530e9f0be9bf70810d02b8437253813d886e7005 SHA512 ab05ab88363c0d3fbb703af5e98180ac925331b81a50061a53526dbcbfe28ca0aae1dfc2b74e0689a494068251f834e54917e9557eb4e00cf52e69a48b998f19
diff --git a/net-misc/ubridge/files/ubridge-0.9.16_add_slotted_iniparser-4.1+_support.patch b/net-misc/ubridge/files/ubridge-0.9.16_add_slotted_iniparser-4.1+_support.patch
new file mode 100644
index 000000000000..4d4825f477aa
--- /dev/null
+++ b/net-misc/ubridge/files/ubridge-0.9.16_add_slotted_iniparser-4.1+_support.patch
@@ -0,0 +1,36 @@
+diff -ur a/Makefile b/Makefile
+--- a/Makefile	2019-05-20 10:02:14.000000000 +0300
++++ b/Makefile	2019-05-20 10:32:04.972039000 +0300
+@@ -67,7 +67,7 @@
+ 
+ ifeq ($(SYSTEM_INIPARSER),1)
+     CFLAGS += -DUSE_SYSTEM_INIPARSER
+-    LIBS += -liniparser
++    LIBS += -liniparser4
+ else
+     SRC += src/iniparser/iniparser.c   \
+ 	   src/iniparser/dictionary.c
+diff -ur a/src/parse.h b/src/parse.h
+--- a/src/parse.h	2019-05-20 10:02:14.000000000 +0300
++++ b/src/parse.h	2019-05-20 10:32:04.968039000 +0300
+@@ -24,7 +24,7 @@
+ #include "ubridge.h"
+ 
+ #ifdef USE_SYSTEM_INIPARSER
+-#include <iniparser.h>
++#include <iniparser4/iniparser.h>
+ #else
+ #include "iniparser/iniparser.h"
+ #endif
+diff -ur a/src/ubridge.c b/src/ubridge.c
+--- a/src/ubridge.c	2019-05-20 10:02:14.000000000 +0300
++++ b/src/ubridge.c	2019-05-20 10:32:04.968039000 +0300
+@@ -26,7 +26,7 @@
+ #include <pthread.h>
+ 
+ #ifdef USE_SYSTEM_INIPARSER
+-#include <iniparser.h>
++#include <iniparser4/iniparser.h>
+ #else
+ #include "iniparser/iniparser.h"
+ #endif
diff --git a/net-misc/ubridge/ubridge-0.9.16.ebuild b/net-misc/ubridge/ubridge-0.9.16.ebuild
new file mode 100644
index 000000000000..b09d2fdadaab
--- /dev/null
+++ b/net-misc/ubridge/ubridge-0.9.16.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps toolchain-funcs user
+
+DESCRIPTION="Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces"
+HOMEPAGE="https://github.com/GNS3/ubridge"
+SRC_URI="https://github.com/GNS3/ubridge/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+
+RDEPEND="
+	net-libs/libpcap
+	dev-libs/iniparser:4="
+
+DEPEND="${RDEPEND}"
+
+# Bugs: https://bugs.gentoo.org/647588
+#       https://github.com/GNS3/ubridge/issues/60
+PATCHES=( "${FILESDIR}/${P}_add_slotted_iniparser-4.1+_support.patch" )
+
+pkg_setup() {
+	enewgroup ubridge
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		SYSTEM_INIPARSER=1
+}
+
+src_install() {
+	exeinto /usr/bin
+	exeopts -m 710 -g ubridge
+	doexe ubridge
+
+	dodoc README.rst
+}
+
+pkg_postinst() {
+	fcaps -g ubridge -m 4710 -M 0710 cap_net_raw,cap_net_admin \
+		"${EROOT}"/usr/bin/ubridge
+
+	einfo "\nNOTE: To read packets from the network interfaces with ubridge as"
+	einfo "normal user you have to add trusted users to the \"ubridge\" group.\n"
+}