Merge updates from master

This commit is contained in:
Repository mirror & CI
2020-06-07 08:34:58 +00:00
8 changed files with 223 additions and 0 deletions

View File

@@ -0,0 +1,58 @@
# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools flag-o-matic git-r3
MY_PV="$(ver_rs 2 '-')"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="iwd without dbus"
HOMEPAGE="https://github.com/dylanaraps/eiwd"
EGIT_REPO_URI="https://github.com/dylanaraps/eiwd.git"
# Version 1.7 Apr 16, 2020
EGIT_COMMIT="7b5545a"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS=""
IUSE="+resolvconf +system-ell"
DEPEND="system-ell? ( >=dev-libs/ell-0.31 )"
RDEPEND="${DEPEND}
resolvconf? ( || ( net-dns/openresolv net-misc/dhcpcd ) )
!net-wireless/iwd
net-wireless/wireless-regdb"
BDEPEND="virtual/pkgconfig"
S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/20200416.patch
"${FILESDIR}"/iwmon.patch )
src_prepare() {
default
eautoreconf
}
src_configure() {
append-cflags "-fsigned-char"
local myeconfargs=(
--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
--disable-dbus
$(use_enable system-ell external-ell)
)
econf "${myeconfargs[@]}"
}
src_install() {
default
keepdir /var/lib/iwd
newinitd "${FILESDIR}"/iwd.initd iwd
if use resolvconf ; then
insinto /etc/iwd/
doins "${FILESDIR}"/main.conf
fi
}

View File

@@ -11,6 +11,7 @@ MY_P="${PN}-${MY_PV}"
DESCRIPTION="iwd without dbus"
HOMEPAGE="https://github.com/dylanaraps/eiwd"
EGIT_REPO_URI="https://github.com/dylanaraps/eiwd.git"
EGIT_COMMIT="7b5545a"
LICENSE="LGPL-2.1"
SLOT="0"

View File

@@ -0,0 +1,15 @@
# Good for EGIT_COMMIT="7b5545a" which is Release 1.7
# https://github.com/dylanaraps/eiwd/commit/39ef23ea037fe97c060fafbcbd25af684ae0c55e
diff --git a/src/main.c b/src/main.c
index 549f1bae..2ab44355 100644
--- a/src/main.c
+++ b/src/main.c
@@ -49,6 +49,7 @@
#include "src/backtrace.h"
static struct l_genl *genl;
+static struct l_netlink *rtnl;
static struct l_settings *iwd_config;
static struct l_timeout *timeout;
static const char *interfaces;

View File

@@ -0,0 +1,62 @@
diff --git a/monitor/iwmon.1 b/monitor/iwmon.1
new file mode 100644
index 00000000..433ce18b
--- /dev/null
+++ b/monitor/iwmon.1
@@ -0,0 +1,56 @@
+.\" Man page generated from reStructuredText.
+.
+.TH IWMON 1 "22 September 2019" "iwmon" "Linux Connectivity"
+.SH NAME
+iwmon \- Internet wireless monitor utility
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.sp
+\fBiwmon\fP [\fIoptions\fP ...]
+.SH DESCRIPTION
+.sp
+Tool for monitoring and logging of Wireless control messages from nl80211.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \-\-version\fP,\fB \-v
+Show version number and exit.
+.TP
+.B \-\-help\fP,\fB \-h
+Show help message and exit.
+.UNINDENT
+.SH SEE ALSO
+.sp
+iwd(8)
+.SH AUTHOR
+Marcel Holtmann <marcel@holtmann.org>
+.SH COPYRIGHT
+2013-2019 Intel Corporation
+.\" Generated by docutils manpage writer.
+.

View File

@@ -0,0 +1 @@
DIST gromit-mpx-1.3.tar.gz 56835 BLAKE2B 900df398b22f0c818045b905eff3e2c63ad8fea3a3a03fab3cefea0f4a956a5633a5653cbe56a1f9a7f1fd2b5f9eebecfe8ce4a801c565d958cc372cfae22708 SHA512 7819c0d7684b05c812a476504df221edf005cc854c9184218cffda5c3692d865d358610d8541eb8ebd257e3d471e41d959afbca2aa118329826cfce99a13384f

View File

@@ -0,0 +1,37 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake
DESCRIPTION="Gromit-MPX is a multi-pointer GTK3 port of the Gromit desktop annotation tool"
HOMEPAGE="https://github.com/bk138/${PN}"
if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/bk138/${PN}.git"
KEYWORDS=""
else
SRC_URI="https://github.com/bk138/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
SLOT="0"
LICENSE="GPL-2"
RDEPEND="
x11-libs/gtk+:3
dev-libs/libappindicator:3
x11-libs/libX11
>=x11-apps/xinput-1.3
"
DEPEND="${RDEPEND}"
src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc
)
cmake_src_configure
}

View File

@@ -0,0 +1,37 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake
DESCRIPTION="Gromit-MPX is a multi-pointer GTK3 port of the Gromit desktop annotation tool"
HOMEPAGE="https://github.com/bk138/${PN}"
if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/bk138/${PN}.git"
KEYWORDS=""
else
SRC_URI="https://github.com/bk138/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
SLOT="0"
LICENSE="GPL-2"
RDEPEND="
x11-libs/gtk+:3
dev-libs/libappindicator:3
x11-libs/libX11
>=x11-apps/xinput-1.3
"
DEPEND="${RDEPEND}"
src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc
)
cmake_src_configure
}

View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>o.freyermuth@googlemail.com</email>
<name>Oliver Freyermuth</name>
</maintainer>
<upstream>
<bugs-to>https://github.com/bk138/gromit-mpx/issues</bugs-to>
<remote-id type="github">bk138/gromit-mpx</remote-id>
</upstream>
</pkgmetadata>