[gentoo-commits] repo/proj/guru:master commit in: net-wireless/eiwd/, net-wireless/eiwd/files/

[gentoo-commits] repo/proj/guru:master commit in: net-wireless/eiwd/, net-wireless/eiwd/files/

[Andrew Ammerlaan]

commit:     1fd01c26b6ce5ae14850f5df99973b2a51856b01
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Jun  6 09:25:38 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Jun  6 09:25:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1fd01c26

net-wireless/eiwd: Add resolvconf to RDEPEND

See https://github.com/kisslinux/repo/blob/master/extra/eiwd/post-install

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>

 net-wireless/eiwd/eiwd-1.6.1.ebuild |  9 +++++++--
 net-wireless/eiwd/eiwd-9999.ebuild  | 12 ++++++++----
 net-wireless/eiwd/files/iwd.initd   |  2 +-
 net-wireless/eiwd/files/main.conf   |  4 ++++
 net-wireless/eiwd/metadata.xml      |  3 +++
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/net-wireless/eiwd/eiwd-1.6.1.ebuild b/net-wireless/eiwd/eiwd-1.6.1.ebuild
index 3880b77..89de5dd 100644
--- a/net-wireless/eiwd/eiwd-1.6.1.ebuild
+++ b/net-wireless/eiwd/eiwd-1.6.1.ebuild
@@ -15,10 +15,11 @@ SRC_URI="https://github.com/dylanaraps/eiwd/releases/download/${MY_PV}/${MY_P}.t
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+system-ell"
+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"
@@ -38,5 +39,9 @@ src_configure() {
 src_install() {
 	default
 	keepdir /var/lib/iwd
-	newinitd "${FILESDIR}/iwd.initd" iwd
+	newinitd "${FILESDIR}"/iwd.initd iwd
+	if use resolvconf ; then
+		insinto /etc/iwd/
+		doins "${FILESDIR}"/main.conf
+	fi
 }

diff --git a/net-wireless/eiwd/eiwd-9999.ebuild b/net-wireless/eiwd/eiwd-9999.ebuild
index 12c7868..78157c4 100644
--- a/net-wireless/eiwd/eiwd-9999.ebuild
+++ b/net-wireless/eiwd/eiwd-9999.ebuild
@@ -15,11 +15,11 @@ EGIT_REPO_URI="https://github.com/dylanaraps/eiwd.git"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="+system-ell"
+IUSE="+resolvconf +system-ell"
 
-DEPEND="system-ell? ( >=dev-libs/ell-0.31 )
-	dev-python/docutils"
+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"
@@ -44,5 +44,9 @@ src_configure() {
 src_install() {
 	default
 	keepdir /var/lib/iwd
-	newinitd "${FILESDIR}/iwd.initd" iwd
+	newinitd "${FILESDIR}"/iwd.initd iwd
+	if use resolvconf ; then
+		insinto /etc/iwd/
+		doins "${FILESDIR}"/main.conf
+	fi
 }

diff --git a/net-wireless/eiwd/files/iwd.initd b/net-wireless/eiwd/files/iwd.initd
index 673bc47..6a1e086 100644
--- a/net-wireless/eiwd/files/iwd.initd
+++ b/net-wireless/eiwd/files/iwd.initd
@@ -9,6 +9,6 @@ command_background="yes"
 depend() {
 	provide net
 	after bootmisc modules
-	before dns dhcpcd net
+	before dns dhcpcd
 	keyword -shutdown
 }

diff --git a/net-wireless/eiwd/files/main.conf b/net-wireless/eiwd/files/main.conf
new file mode 100644
index 0000000..72ec4fb
--- /dev/null
+++ b/net-wireless/eiwd/files/main.conf
@@ -0,0 +1,4 @@
+[General]
+EnableNetworkConfiguration=true
+[Network] 
+NameResolvingService=resolvconf

diff --git a/net-wireless/eiwd/metadata.xml b/net-wireless/eiwd/metadata.xml
index 12f4ea9..31efe3f 100644
--- a/net-wireless/eiwd/metadata.xml
+++ b/net-wireless/eiwd/metadata.xml
@@ -9,5 +9,8 @@
 		<flag name="system-ell">
 			Use the system-wide <pkg>dev-libs/ell</pkg>instead of bundled.
 		</flag>
+		<flag name="resolvconf">
+			Use resolvconf to handle /etc/resolv.conf updates
+		</flag>
 	</use>
 </pkgmetadata>

[gentoo-commits] repo/proj/guru:master commit in: net-wireless/eiwd/, net-wireless/eiwd/files/

[Andrew Ammerlaan]

commit:     83bebc90c0368e697557e78df9bb6d1017e3b15f
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Jun  6 14:48:57 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Jun  6 14:49:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=83bebc90

net-wireless/eiwd: 20200416 (Version 1.7)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>

 .../eiwd/{eiwd-9999.ebuild => eiwd-20200416.ebuild}       |  4 ++++
 net-wireless/eiwd/eiwd-9999.ebuild                        |  1 +
 net-wireless/eiwd/files/20200416.patch                    | 15 +++++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/net-wireless/eiwd/eiwd-9999.ebuild b/net-wireless/eiwd/eiwd-20200416.ebuild
similarity index 92%
copy from net-wireless/eiwd/eiwd-9999.ebuild
copy to net-wireless/eiwd/eiwd-20200416.ebuild
index 78157c4..1453d6a 100644
--- a/net-wireless/eiwd/eiwd-9999.ebuild
+++ b/net-wireless/eiwd/eiwd-20200416.ebuild
@@ -11,6 +11,8 @@ 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"
@@ -26,6 +28,8 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}"/20200416.patch )
+
 src_prepare() {
 	default
 	eautoreconf

diff --git a/net-wireless/eiwd/eiwd-9999.ebuild b/net-wireless/eiwd/eiwd-9999.ebuild
index 78157c4..af4ac27 100644
--- a/net-wireless/eiwd/eiwd-9999.ebuild
+++ b/net-wireless/eiwd/eiwd-9999.ebuild
@@ -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"

diff --git a/net-wireless/eiwd/files/20200416.patch b/net-wireless/eiwd/files/20200416.patch
new file mode 100644
index 0000000..e559a21
--- /dev/null
+++ b/net-wireless/eiwd/files/20200416.patch
@@ -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;