gentoo (valentine's day) resync : 14.02.2021

6 files changed, 118 insertions, 9 deletions

diff --git a/sys-apps/usbguard/Manifest b/sys-apps/usbguard/Manifest
index 7ffa9753f686..1893d8047fa1 100644
--- a/sys-apps/usbguard/Manifest
+++ b/sys-apps/usbguard/Manifest
@@ -4,7 +4,8 @@ AUX usbguard-1.0.0-pthreads-link.patch 1013 BLAKE2B 78daa200908b47e3db9b77938395
 DIST usbguard-0.7.6.tar.gz 1189194 BLAKE2B 4fefd9ccf13b094f64942559f481144f08986dc71154b87c1623459d2429c07e2738a17877d3f6c275e83ce904067b1284c588c9a95023c7205cc5e21ca118f0 SHA512 0b0d42276e48baac2dc1f9031eec25e3f622a8d6178cb0400b97c7d32005bfa158b60fd286fdc66206a8684658fefaf6389ef93511e942f025e75671d7455628
 DIST usbguard-0.7.8.tar.gz 1220764 BLAKE2B 8127acc0ef5dd89cc540097a71f10d56f3cb0a166453e27161e444d37dbf51cc4861bc9c71dcca16e9fec7187b3dcabb2bf08af522b2aaa4693fa4f4913a9ae0 SHA512 315c25ed7eb61cc0920047836dcca035cb07aecb6dfece9e4f6dc2ad61aaf6fdbf86898e43493958f3d12a146eb4c8f88b90bb246da0df83bb2097ce5b853e88
 DIST usbguard-1.0.0.tar.gz 1260374 BLAKE2B ea9b48f14a4091f4ce61b6c171947cf2412c47e9aa3edb816e933f7aad6247b32e89bee90675ca5a0136b460fef8f2d423c0c81ad49d52453d0d3803b881503a SHA512 068a9be8bd5ea05efcdad79e2c4beb5e8b646b4703fbe1f8bb262e37ae9a6284a6eeb811a6bd441250a38bce1e45b7f44ad15726aa5963da2e1b56e85f5e16fd
-EBUILD usbguard-0.7.6-r1.ebuild 1907 BLAKE2B 5cde16f4d987a58407ced3161b78840464b349d647cb32652cc6090e3d18946b711226610af2a69bb2facabf58708eac7fa2dc74976d9f0775c608c774906e3c SHA512 3678951cba045a47164edf3bf18ec977fd96a14ca89a14afca515d6c83a22f9ea3273286c463d80147befa52c60ecda53a52f94c8c03ab04a06b83f72147c6b1
-EBUILD usbguard-0.7.8.ebuild 2059 BLAKE2B 9dfb64b540267df979a03555281852ae50b702ec64d21fe8b72f9fabb9cc4d4c6c9203ba86c2245ea54833b1aa647625a85ac29dda9db335b7e677a0db865ca2 SHA512 9e382c96108b99636d729d37ced81561895ccbbb85971a5a3f42bfc02dbd00073f8d999d8fd3320a0769e808f71aed34ebb4749960985f928453dd1ae49421c1
-EBUILD usbguard-1.0.0.ebuild 2094 BLAKE2B 510b7259924cda2a6ed12fbfd196b6ac2ddefb42e7d416d6bb1887ed5b03fb9fa643bbb0eb25555f34088e256a19d8ee37a65484aa4f5d07ba197e0cbfb15cb6 SHA512 3b57af8206eab8940dc7feeedeea6ff102dadfa175f9c64eb59f8791c6f42d2525da6c40624ea19bc21750db3c3e6bd1f09bfa195a6274607d7a6972003ba3ab
-MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
+EBUILD usbguard-0.7.6-r1.ebuild 1910 BLAKE2B d708d26de6da007518ea857a9d8852d3444cb76ce688eebfeeb9f27a7bb182a2ab847db3259d1cc2593f8b5a87e1169c69ae33fb5114e18b117e357228d5d925 SHA512 8d47d66b6d022382610354e744d3ab18fb595391a4a9a7285809816763988e126cc9a50d3f1c6bb8293942de00fd52be3c453c8247a53749ec0fff3b1c3cffb0
+EBUILD usbguard-0.7.8.ebuild 2062 BLAKE2B cf1d12238d7b2b846119fc11454347cc92cb550aa404fbe8afb3364c29b49abb444f4cbf559eb3aeda68fe0f73ba59f134a7d4b8a947f81687e14a148c8bcd06 SHA512 e8efc8156d5b5d565843baff754b70a12dabe43aa65f2090249901fc088587821fa6b5fed7668933105319cf58a22576764b4cb43e688ce142ee9e34a604e916
+EBUILD usbguard-1.0.0-r1.ebuild 2320 BLAKE2B e96e88d83a14f93283f708e9b81f1ee221c97400189434093f77de6b3d99f498d29a343c5b825640e5f573daedb8d9a8f44447b3a819e671dfb65ff137a5bb22 SHA512 bf4ef727a7c5545262385d4e11a85074026d18f38f5cfe941da2999e104e20d936ee822992c5b38e5a752ced29d0c6adff43ae5b82055df8a6af363b7cd4344a
+EBUILD usbguard-1.0.0.ebuild 2253 BLAKE2B 036fed4776dfc7d13e05f006be5a15e31522cd8eb22cc3e80d1f3fcba48aa3941d82a97354582b297b37d8b17b777952eb762ec7606201235517b5435cff5a2e SHA512 b88fe2ec0a531fb533bd85e85fb8a9e89be89e1ce2eb52c10e1f7ea284c5be0edf1520ab34f54cf8b37311ed68c4e2f0564e0b20d6703b1a0226876a877b1d6c
+MISC metadata.xml 344 BLAKE2B ccb8c1c611694dea10c4d0809ab46ccdc30efeadcd60904ffe6aa98420d489ea64bf8b1f0f46caea3d77ef448bd2b8d510f355aeee6ce98e5f3a3f76c6fbe141 SHA512 a661530757754d0640302d966aaa1156dfdda95430a3c0d80cf178ec4ffcfdcc13e9c19de7a22fd5269bc877d177d7a80fd15e9875247ea1f829601c2be19777
diff --git a/sys-apps/usbguard/metadata.xml b/sys-apps/usbguard/metadata.xml
index 6d2298876faa..2335eab4d864 100644
--- a/sys-apps/usbguard/metadata.xml
+++ b/sys-apps/usbguard/metadata.xml
@@ -5,4 +5,7 @@
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
+	<use>
+		<flag name="umockdev">Enables support for <pkg>dev-util/umockdev</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild b/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
index aa7debe0b591..3f76442a7df2 100644
--- a/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
+++ b/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ IUSE="bash-completion dbus ldap policykit systemd"
 REQUIRED_USE="policykit? ( dbus )"
 
 CDEPEND="
-	dev-libs/pegtl
+	<dev-libs/pegtl-3
 	>=dev-libs/libsodium-0.4.5:=
 	>=dev-libs/protobuf-2.5.0:=
 	>=sys-cluster/libqb-0.16.0:=
diff --git a/sys-apps/usbguard/usbguard-0.7.8.ebuild b/sys-apps/usbguard/usbguard-0.7.8.ebuild
index be1f9ae5b840..cc4ab8ff6f37 100644
--- a/sys-apps/usbguard/usbguard-0.7.8.ebuild
+++ b/sys-apps/usbguard/usbguard-0.7.8.ebuild
@@ -17,7 +17,7 @@ IUSE="bash-completion dbus ldap policykit static-libs systemd"
 REQUIRED_USE="policykit? ( dbus )"
 
 CDEPEND="
-	dev-libs/pegtl
+	<dev-libs/pegtl-3
 	>=dev-libs/libsodium-0.4.5:=
 	>=dev-libs/protobuf-2.5.0:=
 	>=sys-cluster/libqb-0.16.0:=
diff --git a/sys-apps/usbguard/usbguard-1.0.0-r1.ebuild b/sys-apps/usbguard/usbguard-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..45cb81c1a51a
--- /dev/null
+++ b/sys-apps/usbguard/usbguard-1.0.0-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Daemon protecting your computer against BadUSB"
+HOMEPAGE="https://github.com/USBGuard/usbguard"
+SRC_URI="https://github.com/USBGuard/usbguard/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/1"  # due to libusbguard.so.<1>.0.0
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion dbus ldap policykit static-libs systemd test umockdev"
+
+REQUIRED_USE="policykit? ( dbus )"
+
+# https://github.com/USBGuard/usbguard/issues/449
+# https://bugs.gentoo.org/769692
+REQUIRED_USE+=" test? ( static-libs )"
+
+CDEPEND="
+	<dev-libs/pegtl-3
+	>=dev-libs/libsodium-0.4.5:=
+	>=dev-libs/protobuf-2.5.0:=
+	>=sys-cluster/libqb-0.16.0:=
+	sys-devel/gcc:*[cxx]
+	>=sys-libs/libcap-ng-0.7.0
+	>=sys-libs/libseccomp-2.0.0
+	>=sys-process/audit-2.7.7
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	dbus? (
+		dev-libs/glib:2
+		sys-apps/dbus
+		policykit? ( sys-auth/polkit[introspection] )
+	)
+	ldap? ( net-nds/openldap )
+	systemd? ( sys-apps/systemd )
+	umockdev? ( dev-util/umockdev )
+	"
+RDEPEND="${CDEPEND}
+	virtual/udev
+	"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	dev-cpp/catch:1
+	dbus? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		dev-util/gdbus-codegen
+	)
+	"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.0-pthreads-link.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myargs=(
+		$(use_with dbus)
+		$(use_with ldap)
+		$(use_with policykit polkit)
+		$(use_enable static-libs static)
+		$(use_enable systemd)
+		$(use_enable umockdev)
+	)
+
+	econf "${myargs[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir /var/lib/log/usbguard
+
+	newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard.openrc usbguard
+	use dbus && newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard-dbus.openrc usbguard-dbus
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn 'BEFORE STARTING USBGUARD please be sure to create/generate'
+	ewarn '                         a rules file at /etc/usbguard/rules.conf'
+	ewarn '                         so that you do not'
+	ewarn '                                            GET LOCKED OUT'
+	ewarn "                         of this system (\"$(hostname)\")."
+	ewarn
+	ewarn 'This command may be of help:'
+	ewarn '  sudo sh -c "usbguard generate-policy > /etc/usbguard/rules.conf"'
+	ewarn
+}
diff --git a/sys-apps/usbguard/usbguard-1.0.0.ebuild b/sys-apps/usbguard/usbguard-1.0.0.ebuild
index 78b104813dad..f93887630a22 100644
--- a/sys-apps/usbguard/usbguard-1.0.0.ebuild
+++ b/sys-apps/usbguard/usbguard-1.0.0.ebuild
@@ -12,12 +12,16 @@ SRC_URI="https://github.com/USBGuard/usbguard/releases/download/${P}/${P}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0/1"  # due to libusbguard.so.<1>.0.0
 KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion dbus ldap policykit static-libs systemd"
+IUSE="bash-completion dbus ldap policykit static-libs systemd test"
 
 REQUIRED_USE="policykit? ( dbus )"
 
+# https://github.com/USBGuard/usbguard/issues/449
+# https://bugs.gentoo.org/769692
+REQUIRED_USE+=" test? ( static-libs )"
+
 CDEPEND="
-	dev-libs/pegtl
+	<dev-libs/pegtl-3
 	>=dev-libs/libsodium-0.4.5:=
 	>=dev-libs/protobuf-2.5.0:=
 	>=sys-cluster/libqb-0.16.0:=
@@ -47,6 +51,8 @@ DEPEND="${CDEPEND}
 	)
 	"
 
+RESTRICT="!test? ( test )"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.0-pthreads-link.patch
 )