diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /sys-apps/usbguard | |
parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) |
gentoo resync : 20.03.2022
Diffstat (limited to 'sys-apps/usbguard')
-rw-r--r-- | sys-apps/usbguard/Manifest | 10 | ||||
-rw-r--r-- | sys-apps/usbguard/files/usbguard-1.0.0-bash-completion-configure.patch | 105 | ||||
-rw-r--r-- | sys-apps/usbguard/files/usbguard-1.0.0-pthreads-link.patch | 36 | ||||
-rw-r--r-- | sys-apps/usbguard/usbguard-1.0.0-r2.ebuild | 100 | ||||
-rw-r--r-- | sys-apps/usbguard/usbguard-1.1.0.ebuild (renamed from sys-apps/usbguard/usbguard-1.0.0-r5.ebuild) | 17 | ||||
-rw-r--r-- | sys-apps/usbguard/usbguard-1.1.1.ebuild (renamed from sys-apps/usbguard/usbguard-1.0.0-r4.ebuild) | 20 |
6 files changed, 16 insertions, 272 deletions
diff --git a/sys-apps/usbguard/Manifest b/sys-apps/usbguard/Manifest index 18d8014d0010..2b91a9778d83 100644 --- a/sys-apps/usbguard/Manifest +++ b/sys-apps/usbguard/Manifest @@ -1,9 +1,7 @@ AUX usbguard-0.7.6-usbguard-dbus.openrc 278 BLAKE2B 58f11c693e25436605af6ad41a1f618e30b20f336cda6a11db480fdda65022c28ce84d6aa9e804c1344221f3aa4ab8a262094106bb677414c2b24e7971f9acad SHA512 f66bee161324610755371fa04199fcd81887c1a55ab73cc1922be719d61e8315b7a869e1d8af6c3df2d6922b07027dced3605e63b130e8f094fcb606aea20b9e AUX usbguard-0.7.6-usbguard.openrc 309 BLAKE2B d5297058d0ee8ce0f9fc91f2158f4aef5f077e1087800449a0319038d677a2a70274305058cd104ba30529b3c9daf82ffbe16ca5cdf20a3b4817e66d499d08c5 SHA512 512a08f59caf9de22b0776473a1ea9a4322b05c6286c99dac3055e0c6d52c78542448c33e19708338080cfdcdfcfb0f9868e8c523155e978c0161c262081da09 -AUX usbguard-1.0.0-bash-completion-configure.patch 3598 BLAKE2B 7b8ed24d698c37a68adec76607b3eaf8f7315f2f151f1a9be814faa66572962e00802ee6a38b6f047e4feca86689e52959619086d3c7a2a37ef5a8dcb7ea5545 SHA512 cf523f671b1266cce94a951e06fdeb2d520b8fbcf67769dd597b34c74fa702af7ffc2774ae0088d512f8f43fb7b9c17b49d1b100f6e7175a6e717a243efb1e50 -AUX usbguard-1.0.0-pthreads-link.patch 1013 BLAKE2B 78daa200908b47e3db9b779383958711add034c521a5cf95718b62ef89259007dafc7318df0a9722228ba36419593636383a7dea069947c99baeddc3449f046b SHA512 a5634f6ca80d46d37af803106d3c44313408f7fdaaa160ce713562210cbb28cb4d3f9180cda0855c73bf85410b0d77b0c1758803adc757888c7876db9fb761e7 -DIST usbguard-1.0.0.tar.gz 1260374 BLAKE2B ea9b48f14a4091f4ce61b6c171947cf2412c47e9aa3edb816e933f7aad6247b32e89bee90675ca5a0136b460fef8f2d423c0c81ad49d52453d0d3803b881503a SHA512 068a9be8bd5ea05efcdad79e2c4beb5e8b646b4703fbe1f8bb262e37ae9a6284a6eeb811a6bd441250a38bce1e45b7f44ad15726aa5963da2e1b56e85f5e16fd -EBUILD usbguard-1.0.0-r2.ebuild 2375 BLAKE2B ae31b853b32157a6b5e654f2e3fc792f228fd190e96c3f67261751e6748b6908902ac1d22c315f17892082d164ff1e8c168bd167e7284361b33be7d367b63b15 SHA512 08fd0ac7e120c6cbc10decabdc42957a44fd3c00a0dac307dfa4d1e8d9e4da2950de1c6a47c793fcfa037894f00670baa8e084a3812ca1a4dec8e215e989899e -EBUILD usbguard-1.0.0-r4.ebuild 2511 BLAKE2B 0a75cbee4fa70f07e3fa8d38316ec679f54b08f35cdc85832e53da69d16b9e1b648f1703d9b6b99a4482abb1a35d5d71d5909c58b65a3fddf9d990d2e3cc687a SHA512 3b3a1fc45429735fd0f6b78b4edec726526a292071098722b513915b923341c910b7f5102c438e8599b14cf0031702b8a69047e9f69a2a88b7be244db350e65f -EBUILD usbguard-1.0.0-r5.ebuild 2561 BLAKE2B daa9a737999a57030c36a9479df68fa3df9590fdcf059453f7900e0cd605b6a1a08c8d9b03ca898618d40ee886f2ec238f6bde2465fe93da5ab7713e2417c69a SHA512 dc922d992dce4c11a7cc6fe004a381ea5087921e0ecf9a5a1a393fc96191e4ce96655bb73ea4b71011af3751f08383a206708fe72cafffe5f927646e803edaeb +DIST usbguard-1.1.0.tar.gz 1648078 BLAKE2B 99dd7fef6cf93f72b87a00874757c1a2447530aa48405f2d260c3f3295881e3e6521c77195467af84c5b4554510250149eba5181eb44e9a997a120217e32bbea SHA512 f882e8ba38743c044984520d5514035e0e76e185328c2f16226ce8fb14b5dbde0c021327b3dabfdea36e18428be5fb23b559f6837ef7f81dabb5e9b4ed4e1e91 +DIST usbguard-1.1.1.tar.gz 1651887 BLAKE2B ef736740592fb9a9589d53eaccd17fd8f0ebb4ca6f39794674aaad2edb3e259048452a63e6966a527a040cea83576d79a37b870d85cc4fff7603a6502dab4973 SHA512 7810471a3778b4bca644565cefa2666f98d53c2747bff7262b9bbb0327e7dba7a1e8c067c96d89e6742ccec5f65410f4e273bf84ee2bb1fbc7ff5738df3af780 +EBUILD usbguard-1.1.0.ebuild 2383 BLAKE2B 93eb01dead9b410fb401504569fdc0c705fdf913382bbdd9e589342ea3015be48517c4b994c1528ed8a99ff2fe7b8e618f30582b0f514d44f5b5635b0b3622e3 SHA512 3d9a3489189148b8526c84b335a822c97c69c9a7022f87930869a7875c48cf450d0b79135ed173dc8047c14d69705ad5b88ff45b69c32f9182e67e7f69201f7e +EBUILD usbguard-1.1.1.ebuild 2383 BLAKE2B 93eb01dead9b410fb401504569fdc0c705fdf913382bbdd9e589342ea3015be48517c4b994c1528ed8a99ff2fe7b8e618f30582b0f514d44f5b5635b0b3622e3 SHA512 3d9a3489189148b8526c84b335a822c97c69c9a7022f87930869a7875c48cf450d0b79135ed173dc8047c14d69705ad5b88ff45b69c32f9182e67e7f69201f7e MISC metadata.xml 345 BLAKE2B ee71f0699ba99d30148f602e0af3b921c5c243e23e8587428df56ea8fa841f929103687b38d35fb7eb6812c0ccc2d811df0670db7a0beb915a61a8cf3914a7b2 SHA512 97c84d9a097784f95b0f33bef9855a3d81732eb29371de1c4ec2d9313c5346ad46832bec29bd6135fcf48540cbc683b2b13cf217f0f29df9995c0bd6b1b035b9 diff --git a/sys-apps/usbguard/files/usbguard-1.0.0-bash-completion-configure.patch b/sys-apps/usbguard/files/usbguard-1.0.0-bash-completion-configure.patch deleted file mode 100644 index c63a85f23a50..000000000000 --- a/sys-apps/usbguard/files/usbguard-1.0.0-bash-completion-configure.patch +++ /dev/null @@ -1,105 +0,0 @@ -https://github.com/USBGuard/usbguard/pull/483 - -From b3bb39e0e5de61e1c713cb98ebca5e4c6529e2b9 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Sun, 18 Jul 2021 03:42:21 +0100 -Subject: [PATCH] configure.ac: Use standard --with-bash-completion-dir option - -Rationale: -This makes it a lot easier to enable/disable installation -of bash completion files rather than it being based on -a certain package being installed (or not). It's useful -in Gentoo Linux for example where we may want to always -install Bash completion files to the right location, even -if the user isn't using it yet, to save rebuilds. - -This makes a few changes to the current Bash completion logic, mainly: -* Falls back gracefully to a standard directory if bash-completion - itself is not installed (in that case, we can't ask it via pkgconfig - where to place files). - -* So the behaviour is now: - * no argument / --with-bash-completion-dir=yes: - - Asks pkgconfig, but falls back to standard directory. - - * --with-bash-completion-dir=dir: - - Use the given directory with no detection. - - * --without-bash-completion-dir: - - No installation of Bash completion files. - -Signed-off-by: Sam James <sam@gentoo.org> ---- - Makefile.am | 2 +- - configure.ac | 32 ++++++++++++++------------------ - 2 files changed, 15 insertions(+), 19 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 34a2e96..910c3c5 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -438,7 +438,7 @@ usbguard_LDADD=\ - $(top_builddir)/libusbguard.la \ - ${PTHREAD_LIBS} - --if BASH_COMPLETION_ENABLED -+if ENABLE_BASH_COMPLETION - bashcompletiondir = $(BASH_COMPLETION_DIR) - dist_bashcompletion_DATA = $(top_srcdir)/scripts/bash_completion/usbguard - endif -diff --git a/configure.ac b/configure.ac -index 73021b6..4207ae2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -663,11 +663,18 @@ AC_ARG_ENABLE([systemd], - *) AC_MSG_ERROR([bad value ${enableval} for --enable-systemd]) ;; - esac], [systemd=no]) - -- --PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], -- [bash_completion_dir="`$PKG_CONFIG --variable=completionsdir bash-completion`" -- bash_completion=yes], -- [bash_completion=no]) -+AC_ARG_WITH([bash-completion-dir], -+ AS_HELP_STRING([--with-bash-completion-dir[=PATH]], -+ [Enable bash auto-completion. Uses pkgconfig if no path given. @<:@default=yes@:>@]), -+ [], [with_bash_completion_dir=yes]) -+ -+if test "x$with_bash_completion_dir" = "xyes"; then -+ PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], -+ [BASH_COMPLETION_DIR=$($PKG_CONFIG --variable=completionsdir bash-completion)], -+ [BASH_COMPLETION_DIR="$datadir/bash-completion/completions"]) -+else -+ BASH_COMPLETION_DIR="$with_bash_completion_dir" -+fi - - if test "x$debug" = xyes; then - CXXFLAGS="$CXXFLAGS $CXXFLAGS_DEBUG_ENABLED" -@@ -706,19 +713,8 @@ fi - - AC_SUBST([ANALYZE_CONFIGURE_ARGS], $ac_configure_args) - --case "$bash_completion_dir" in -- /usr/share/*|/usr/local/share/*) -- bash_completion_dir=$(echo "$bash_completion_dir" | sed -r 's,^(/usr/share|/usr/local/share),${datadir},') -- ;; -- /usr/*|/usr/local/*) -- bash_completion_dir=$(echo "$bash_completion_dir" | sed -r 's,^(/usr|/usr/local),${prefix},') -- ;; -- /*) -- bash_completion_dir='${prefix}'"$bash_completion_dir" -- ;; --esac -- --AC_SUBST([BASH_COMPLETION_DIR], $bash_completion_dir) -+AC_SUBST([BASH_COMPLETION_DIR]) -+AM_CONDITIONAL([ENABLE_BASH_COMPLETION], [test "x$with_bash_completion_dir" != "xno"]) - - AM_CONDITIONAL([SYSTEMD_SUPPORT_ENABLED], [test "x$systemd" = xyes ]) - AM_CONDITIONAL([DBUS_ENABLED], [test "x$with_dbus" = xyes ]) --- -2.32.0 - diff --git a/sys-apps/usbguard/files/usbguard-1.0.0-pthreads-link.patch b/sys-apps/usbguard/files/usbguard-1.0.0-pthreads-link.patch deleted file mode 100644 index 7edeb86b60bf..000000000000 --- a/sys-apps/usbguard/files/usbguard-1.0.0-pthreads-link.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9249ff391ee0765ac5e8d4e113e28b8a908c136f Mon Sep 17 00:00:00 2001 -From: Dennis Schridde <devurandom@gmx.net> -Date: Sat, 16 Jan 2021 10:40:26 +0100 -Subject: [PATCH] Link against libpthread - -`CFLAGS` is needed in addition to `LIBS`, because on some systems it -contains `-pthread` and `LIBS` is empty. - -Closes: https://github.com/USBGuard/usbguard/issues/432 ---- - Makefile.am | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 402854fd..34a2e960 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -167,6 +167,7 @@ libusbguard_la_CPPFLAGS=\ - -I$(top_srcdir)/src/Library/public \ - -I$(top_builddir)/src/Library/IPC \ - ${BOOST_CPPFLAGS} \ -+ ${PTHREAD_CPPFLAGS} \ - @qb_CFLAGS@ \ - @protobuf_CFLAGS@ \ - @crypto_CFLAGS@ \ -@@ -185,7 +186,9 @@ libusbguard_la_LIBADD=\ - @pegtl_LIBS@ \ - @atomic_LIBS@ \ - @umockdev_LIBS@ \ -- ${BOOST_IOSTREAMS_LIB} -+ ${BOOST_IOSTREAMS_LIB} \ -+ ${PTHREAD_CFLAGS} \ -+ ${PTHREAD_LIBS} - - EXTRA_DIST+=\ - src/Library/IPC/Devices.proto \ diff --git a/sys-apps/usbguard/usbguard-1.0.0-r2.ebuild b/sys-apps/usbguard/usbguard-1.0.0-r2.ebuild deleted file mode 100644 index cf0a6c5a14dd..000000000000 --- a/sys-apps/usbguard/usbguard-1.0.0-r2.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools bash-completion-r1 - -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="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 - 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 - "${FILESDIR}"/${PN}-1.0.0-bash-completion-configure.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myargs=( - --with-bash-completion-dir=$(get_bashcompdir) - $(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-r5.ebuild b/sys-apps/usbguard/usbguard-1.1.0.ebuild index 42ed8e9db739..cb6d70408cdb 100644 --- a/sys-apps/usbguard/usbguard-1.0.0-r5.ebuild +++ b/sys-apps/usbguard/usbguard-1.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,14 +14,12 @@ SLOT="0/1" # due to libusbguard.so.<1>.0.0 KEYWORDS="~amd64 ~x86" IUSE="dbus ldap policykit selinux 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/pegtl >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= @@ -32,7 +30,7 @@ CDEPEND=" dbus? ( dev-libs/glib:2 sys-apps/dbus - policykit? ( sys-auth/polkit[introspection] ) + sys-auth/polkit[introspection] ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) @@ -44,7 +42,7 @@ RDEPEND="${CDEPEND} " DEPEND="${CDEPEND} app-text/asciidoc - dev-cpp/catch:1 + dev-cpp/catch:0 dbus? ( dev-libs/libxml2 dev-libs/libxslt @@ -54,11 +52,6 @@ DEPEND="${CDEPEND} RESTRICT="!test? ( test )" -PATCHES=( - "${FILESDIR}"/${PN}-1.0.0-pthreads-link.patch - "${FILESDIR}"/${PN}-1.0.0-bash-completion-configure.patch -) - src_prepare() { default eautoreconf @@ -68,8 +61,8 @@ src_configure() { local myargs=( --with-bash-completion-dir=$(get_bashcompdir) $(use_with dbus) + $(use_with dbus polkit) $(use_with ldap) - $(use_with policykit polkit) $(use_enable static-libs static) $(use_enable systemd) $(use_enable umockdev) diff --git a/sys-apps/usbguard/usbguard-1.0.0-r4.ebuild b/sys-apps/usbguard/usbguard-1.1.1.ebuild index 6ce52a2cf93e..cb6d70408cdb 100644 --- a/sys-apps/usbguard/usbguard-1.0.0-r4.ebuild +++ b/sys-apps/usbguard/usbguard-1.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,16 +12,14 @@ 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="dbus ldap policykit static-libs systemd test umockdev" - -REQUIRED_USE="policykit? ( dbus )" +IUSE="dbus ldap policykit selinux static-libs systemd test umockdev" # https://github.com/USBGuard/usbguard/issues/449 # https://bugs.gentoo.org/769692 REQUIRED_USE+=" test? ( static-libs )" CDEPEND=" - <dev-libs/pegtl-3 + dev-libs/pegtl >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= @@ -32,7 +30,7 @@ CDEPEND=" dbus? ( dev-libs/glib:2 sys-apps/dbus - policykit? ( sys-auth/polkit[introspection] ) + sys-auth/polkit[introspection] ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) @@ -40,10 +38,11 @@ CDEPEND=" " RDEPEND="${CDEPEND} virtual/udev + selinux? ( sec-policy/selinux-usbguard ) " DEPEND="${CDEPEND} app-text/asciidoc - dev-cpp/catch:1 + dev-cpp/catch:0 dbus? ( dev-libs/libxml2 dev-libs/libxslt @@ -53,11 +52,6 @@ DEPEND="${CDEPEND} RESTRICT="!test? ( test )" -PATCHES=( - "${FILESDIR}"/${PN}-1.0.0-pthreads-link.patch - "${FILESDIR}"/${PN}-1.0.0-bash-completion-configure.patch -) - src_prepare() { default eautoreconf @@ -67,8 +61,8 @@ src_configure() { local myargs=( --with-bash-completion-dir=$(get_bashcompdir) $(use_with dbus) + $(use_with dbus polkit) $(use_with ldap) - $(use_with policykit polkit) $(use_enable static-libs static) $(use_enable systemd) $(use_enable umockdev) |