[gentoo-commits] repo/gentoo:master commit in: sys-apps/usbguard/files/, sys-apps/usbguard/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/usbguard/files/, sys-apps/usbguard/

[Sebastian Pipping]

commit:     418a356ac55fb3ac19acd269ec593ce436a0f456
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  3 00:17:53 2020 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Jan  3 00:22:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=418a356a

sys-apps/usbguard: 0.7.6 (new package)

Revision 1 is used because 0.7.6(-r0) exists in Pentoo.

Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-2.3.84, Repoman-2.3.20

 sys-apps/usbguard/Manifest                         |  1 +
 .../files/usbguard-0.7.6-usbguard-dbus.openrc      | 12 ++++
 .../usbguard/files/usbguard-0.7.6-usbguard.openrc  | 12 ++++
 sys-apps/usbguard/metadata.xml                     |  8 +++
 sys-apps/usbguard/usbguard-0.7.6-r1.ebuild         | 81 ++++++++++++++++++++++
 5 files changed, 114 insertions(+)

diff --git a/sys-apps/usbguard/Manifest b/sys-apps/usbguard/Manifest
new file mode 100644
index 00000000000..4929554c1e1
--- /dev/null
+++ b/sys-apps/usbguard/Manifest
@@ -0,0 +1 @@
+DIST usbguard-0.7.6.tar.gz 1189194 BLAKE2B 4fefd9ccf13b094f64942559f481144f08986dc71154b87c1623459d2429c07e2738a17877d3f6c275e83ce904067b1284c588c9a95023c7205cc5e21ca118f0 SHA512 0b0d42276e48baac2dc1f9031eec25e3f622a8d6178cb0400b97c7d32005bfa158b60fd286fdc66206a8684658fefaf6389ef93511e942f025e75671d7455628

diff --git a/sys-apps/usbguard/files/usbguard-0.7.6-usbguard-dbus.openrc b/sys-apps/usbguard/files/usbguard-0.7.6-usbguard-dbus.openrc
new file mode 100755
index 00000000000..2c923123c18
--- /dev/null
+++ b/sys-apps/usbguard/files/usbguard-0.7.6-usbguard-dbus.openrc
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/usbguard-dbus"
+command_args="--system"
+command_background="true"
+pidfile="/run/usbguard-dbus.pid"
+
+depend() {
+    need dbus usbguard
+}

diff --git a/sys-apps/usbguard/files/usbguard-0.7.6-usbguard.openrc b/sys-apps/usbguard/files/usbguard-0.7.6-usbguard.openrc
new file mode 100755
index 00000000000..3ea514cce16
--- /dev/null
+++ b/sys-apps/usbguard/files/usbguard-0.7.6-usbguard.openrc
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/usbguard-daemon"
+command_args="-k -c /etc/usbguard/usbguard-daemon.conf"
+command_background="true"
+pidfile="/run/usbguard.pid"
+
+depend() {
+    need udev localmount
+}

diff --git a/sys-apps/usbguard/metadata.xml b/sys-apps/usbguard/metadata.xml
new file mode 100644
index 00000000000..6d2298876fa
--- /dev/null
+++ b/sys-apps/usbguard/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+</pkgmetadata>

diff --git a/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild b/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
new file mode 100644
index 00000000000..ec5fcfb642d
--- /dev/null
+++ b/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion dbus ldap policykit systemd"
+
+REQUIRED_USE="policykit? ( dbus )"
+
+CDEPEND="
+	dev-libs/pegtl
+	>=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/dbus-glib-0.100
+		dev-libs/glib:2
+		sys-apps/dbus
+		policykit? ( sys-auth/polkit[introspection] )
+	)
+	ldap? ( net-nds/openldap )
+	systemd? ( sys-apps/systemd )
+	"
+RDEPEND="${CDEPEND}
+	virtual/udev
+	"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	dev-cpp/catch:1
+	dbus? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		dev-util/gdbus-codegen
+	)
+	"
+
+src_configure() {
+	local myargs=(
+		$(use_with dbus)
+		$(use_with ldap)
+		$(use_with policykit polkit)
+		$(use_enable systemd)
+		--disable-dependency-tracking
+	)
+
+	econf "${myargs[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir /var/lib/log/usbguard
+
+	newinitd "${FILESDIR}"/${P}-usbguard.openrc usbguard
+	use dbus && newinitd "${FILESDIR}"/${P}-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
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/usbguard/files/, sys-apps/usbguard/

[Sam James]

commit:     a476c8790b1af7e68090acf82fd18dea8bb04daa
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 03:38:05 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 03:38:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a476c879

sys-apps/usbguard: fix build w/ gcc 13

There's another PR upstream which drops a redundant include but I'd rather
just go with the obviously-correct one (as adding an include like this isn't
going to be a problem for standard headers guarded properly) to unblock
more testing.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/usbguard/files/usbguard-1.1.2-gcc-13.patch | 19 +++++++++++++++++++
 sys-apps/usbguard/usbguard-1.1.2.ebuild             |  6 +++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/sys-apps/usbguard/files/usbguard-1.1.2-gcc-13.patch b/sys-apps/usbguard/files/usbguard-1.1.2-gcc-13.patch
new file mode 100644
index 000000000000..79168f584ded
--- /dev/null
+++ b/sys-apps/usbguard/files/usbguard-1.1.2-gcc-13.patch
@@ -0,0 +1,19 @@
+https://github.com/USBGuard/usbguard/pull/582
+
+From a0083fd0eea3a513613a37262d40dfbe96e02e46 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 24 Jan 2023 14:54:28 -0500
+Subject: [PATCH] Fix compile with GCC 13
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+--- a/src/Library/Base64.hpp
++++ b/src/Library/Base64.hpp
+@@ -24,6 +24,7 @@
+ 
+ #include <string>
+ #include <cstddef>
++#include <cstdint>
+ 
+ namespace usbguard
+ {
+

diff --git a/sys-apps/usbguard/usbguard-1.1.2.ebuild b/sys-apps/usbguard/usbguard-1.1.2.ebuild
index 77e050da627a..d3722e624db9 100644
--- a/sys-apps/usbguard/usbguard-1.1.2.ebuild
+++ b/sys-apps/usbguard/usbguard-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -52,6 +52,10 @@ DEPEND="${CDEPEND}
 
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.2-gcc-13.patch
+)
+
 src_prepare() {
 	default
 	eautoreconf