* [gentoo-commits] repo/gentoo:master commit in: sys-apps/usbguard/, sys-apps/usbguard/files/
@ 2021-01-31 17:22 Sebastian Pipping
0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Pipping @ 2021-01-31 17:22 UTC (permalink / raw
To: gentoo-commits
commit: 4513980b9b0042067415a706732fccde87014d7f
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 17:19:19 2021 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 17:21:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4513980b
sys-apps/usbguard: Fix pthreads linking issue
Thanks for the patch (that went upstream) to Dennis Schridde!
Closes: https://bugs.gentoo.org/754906
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.14, Repoman-3.0.2
.../files/usbguard-1.0.0-pthreads-link.patch | 36 ++++++++++++++++++++++
sys-apps/usbguard/usbguard-0.7.8.ebuild | 13 +++++++-
sys-apps/usbguard/usbguard-1.0.0.ebuild | 11 +++++++
3 files changed, 59 insertions(+), 1 deletion(-)
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
new file mode 100644
index 00000000000..7edeb86b60b
--- /dev/null
+++ b/sys-apps/usbguard/files/usbguard-1.0.0-pthreads-link.patch
@@ -0,0 +1,36 @@
+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-0.7.8.ebuild b/sys-apps/usbguard/usbguard-0.7.8.ebuild
index 317ca17a882..be1f9ae5b84 100644
--- a/sys-apps/usbguard/usbguard-0.7.8.ebuild
+++ b/sys-apps/usbguard/usbguard-0.7.8.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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"
@@ -45,6 +47,15 @@ DEPEND="${CDEPEND}
)
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.0.0-pthreads-link.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
src_configure() {
local myargs=(
$(use_with dbus)
diff --git a/sys-apps/usbguard/usbguard-1.0.0.ebuild b/sys-apps/usbguard/usbguard-1.0.0.ebuild
index 761a616c07c..78b104813da 100644
--- a/sys-apps/usbguard/usbguard-1.0.0.ebuild
+++ b/sys-apps/usbguard/usbguard-1.0.0.ebuild
@@ -3,6 +3,8 @@
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"
@@ -45,6 +47,15 @@ DEPEND="${CDEPEND}
)
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.0.0-pthreads-link.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
src_configure() {
local myargs=(
$(use_with dbus)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/usbguard/, sys-apps/usbguard/files/
@ 2021-07-31 0:18 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-07-31 0:18 UTC (permalink / raw
To: gentoo-commits
commit: 422737f5b83682f126d435dfdf22f6a7eb978b75
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 25 03:04:17 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 31 00:17:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=422737f5
sys-apps/usbguard: [QA] unconditionally install completion files
QA policy [0] says that we don't conditionalise installation of
small files. It's a wasteful rebuild and inconsistent across packages
for when users desire completions to be available.
[0] https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0301
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../usbguard-1.0.0-bash-completion-configure.patch | 105 +++++++++++++++++++++
...rd-1.0.0-r1.ebuild => usbguard-1.0.0-r2.ebuild} | 7 +-
2 files changed, 109 insertions(+), 3 deletions(-)
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
new file mode 100644
index 00000000000..c63a85f23a5
--- /dev/null
+++ b/sys-apps/usbguard/files/usbguard-1.0.0-bash-completion-configure.patch
@@ -0,0 +1,105 @@
+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/usbguard-1.0.0-r1.ebuild b/sys-apps/usbguard/usbguard-1.0.0-r2.ebuild
similarity index 91%
rename from sys-apps/usbguard/usbguard-1.0.0-r1.ebuild
rename to sys-apps/usbguard/usbguard-1.0.0-r2.ebuild
index 45cb81c1a51..cf0a6c5a14d 100644
--- a/sys-apps/usbguard/usbguard-1.0.0-r1.ebuild
+++ b/sys-apps/usbguard/usbguard-1.0.0-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools
+inherit autotools bash-completion-r1
DESCRIPTION="Daemon protecting your computer against BadUSB"
HOMEPAGE="https://github.com/USBGuard/usbguard"
@@ -12,7 +12,7 @@ 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"
+IUSE="dbus ldap policykit static-libs systemd test umockdev"
REQUIRED_USE="policykit? ( dbus )"
@@ -29,7 +29,6 @@ CDEPEND="
>=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
@@ -56,6 +55,7 @@ RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}"/${PN}-1.0.0-pthreads-link.patch
+ "${FILESDIR}"/${PN}-1.0.0-bash-completion-configure.patch
)
src_prepare() {
@@ -65,6 +65,7 @@ src_prepare() {
src_configure() {
local myargs=(
+ --with-bash-completion-dir=$(get_bashcompdir)
$(use_with dbus)
$(use_with ldap)
$(use_with policykit polkit)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/usbguard/, sys-apps/usbguard/files/
@ 2022-03-15 20:47 Sebastian Pipping
0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Pipping @ 2022-03-15 20:47 UTC (permalink / raw
To: gentoo-commits
commit: 65a99533a3f0dc42fb8c466a2e87b4fac823ce0e
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 20:45:44 2022 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 20:47:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65a99533
sys-apps/usbguard: Drop vulnerable
Bug: https://bugs.gentoo.org/833947
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
sys-apps/usbguard/Manifest | 1 -
.../usbguard-1.0.0-bash-completion-configure.patch | 105 ---------------------
.../files/usbguard-1.0.0-pthreads-link.patch | 36 -------
sys-apps/usbguard/usbguard-1.0.0-r2.ebuild | 100 --------------------
sys-apps/usbguard/usbguard-1.0.0-r4.ebuild | 102 --------------------
sys-apps/usbguard/usbguard-1.0.0-r5.ebuild | 103 --------------------
6 files changed, 447 deletions(-)
diff --git a/sys-apps/usbguard/Manifest b/sys-apps/usbguard/Manifest
index 0cb8cceb865d..d1582fa4270f 100644
--- a/sys-apps/usbguard/Manifest
+++ b/sys-apps/usbguard/Manifest
@@ -1,3 +1,2 @@
-DIST usbguard-1.0.0.tar.gz 1260374 BLAKE2B ea9b48f14a4091f4ce61b6c171947cf2412c47e9aa3edb816e933f7aad6247b32e89bee90675ca5a0136b460fef8f2d423c0c81ad49d52453d0d3803b881503a SHA512 068a9be8bd5ea05efcdad79e2c4beb5e8b646b4703fbe1f8bb262e37ae9a6284a6eeb811a6bd441250a38bce1e45b7f44ad15726aa5963da2e1b56e85f5e16fd
DIST usbguard-1.1.0.tar.gz 1648078 BLAKE2B 99dd7fef6cf93f72b87a00874757c1a2447530aa48405f2d260c3f3295881e3e6521c77195467af84c5b4554510250149eba5181eb44e9a997a120217e32bbea SHA512 f882e8ba38743c044984520d5514035e0e76e185328c2f16226ce8fb14b5dbde0c021327b3dabfdea36e18428be5fb23b559f6837ef7f81dabb5e9b4ed4e1e91
DIST usbguard-1.1.1.tar.gz 1651887 BLAKE2B ef736740592fb9a9589d53eaccd17fd8f0ebb4ca6f39794674aaad2edb3e259048452a63e6966a527a040cea83576d79a37b870d85cc4fff7603a6502dab4973 SHA512 7810471a3778b4bca644565cefa2666f98d53c2747bff7262b9bbb0327e7dba7a1e8c067c96d89e6742ccec5f65410f4e273bf84ee2bb1fbc7ff5738df3af780
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-r4.ebuild b/sys-apps/usbguard/usbguard-1.0.0-r4.ebuild
deleted file mode 100644
index 6ce52a2cf93e..000000000000
--- a/sys-apps/usbguard/usbguard-1.0.0-r4.ebuild
+++ /dev/null
@@ -1,102 +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 /etc/usbguard/IPCAccessControl.d # bug 808801
- keepdir /var/lib/log/usbguard
- chmod 0600 "${ED}"/etc/usbguard/IPCAccessControl.d/.keep* || die # bug 808801
-
- 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.0.0-r5.ebuild
deleted file mode 100644
index 42ed8e9db739..000000000000
--- a/sys-apps/usbguard/usbguard-1.0.0-r5.ebuild
+++ /dev/null
@@ -1,103 +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 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/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
- selinux? ( sec-policy/selinux-usbguard )
- "
-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 /etc/usbguard/IPCAccessControl.d # bug 808801
- keepdir /var/lib/log/usbguard
- chmod 0600 "${ED}"/etc/usbguard/IPCAccessControl.d/.keep* || die # bug 808801
-
- 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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-03-15 21:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-31 0:18 [gentoo-commits] repo/gentoo:master commit in: sys-apps/usbguard/, sys-apps/usbguard/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-03-15 20:47 Sebastian Pipping
2021-01-31 17:22 Sebastian Pipping
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox