* [gentoo-commits] repo/gentoo:master commit in: app-crypt/moolticute/files/, app-crypt/moolticute/
@ 2023-02-22 18:38 Viorel Munteanu
0 siblings, 0 replies; 3+ messages in thread
From: Viorel Munteanu @ 2023-02-22 18:38 UTC (permalink / raw
To: gentoo-commits
commit: c6b692cbc96a8f34baa10ec50016b95854b6fdb4
Author: Casper Hanegreefs <casinvictusgentoo <AT> proton <DOT> me>
AuthorDate: Mon Feb 20 16:26:20 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 18:37:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6b692cb
app-crypt/moolticute: v0.43.19 fixes udev, systemd USE flag, EAPI 8
Signed-off-by: Casper Hanegreefs <casinvictusgentoo <AT> proton.me>
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
app-crypt/moolticute/files/50-mooltipass.rule | 1 -
app-crypt/moolticute/files/50-mooltipass.rules | 15 +++++
app-crypt/moolticute/files/moolticuted.init | 6 +-
app-crypt/moolticute/files/moolticuted.init-r1 | 12 ----
app-crypt/moolticute/moolticute-0.43.19-r1.ebuild | 66 ----------------------
...0.43.19.ebuild => moolticute-0.43.19-r2.ebuild} | 20 ++++---
6 files changed, 29 insertions(+), 91 deletions(-)
diff --git a/app-crypt/moolticute/files/50-mooltipass.rule b/app-crypt/moolticute/files/50-mooltipass.rule
deleted file mode 100644
index 4bfd907d7257..000000000000
--- a/app-crypt/moolticute/files/50-mooltipass.rule
+++ /dev/null
@@ -1 +0,0 @@
-SUBSYSTEM=="usb", ATTRS{idVendor}=="16d0", ATTRS{idProduct}=="09a0", TAG+="uaccess"
diff --git a/app-crypt/moolticute/files/50-mooltipass.rules b/app-crypt/moolticute/files/50-mooltipass.rules
new file mode 100644
index 000000000000..8492743bab93
--- /dev/null
+++ b/app-crypt/moolticute/files/50-mooltipass.rules
@@ -0,0 +1,15 @@
+# udev rules for allowing console user(s) and libusb access to Mooltipass Mini devices
+# Used udev rules from https://github.com/mooltipass/mooltipass-udev
+ACTION!="add|change", GOTO="mooltipass_end"
+
+# console user
+SUBSYSTEM=="hidraw", ATTRS{idVendor}=="16d0", ATTRS{idProduct}=="09a0", MODE="0660", SYMLINK+="mooltipass_keyboard", TAG+="uaccess", TAG+="udev-acl"
+SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="4321", MODE="0660", SYMLINK+="mooltipass_keyboard", TAG+="uaccess", TAG+="udev-acl"
+# libusb
+SUBSYSTEM=="usb", ATTRS{idVendor}=="16d0", ATTRS{idProduct}=="09a0", MODE="0660", SYMLINK+="mooltipass_device", TAG+="uaccess"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="4321", MODE="0660", SYMLINK+="mooltipass_device", TAG+="uaccess"
+
+# required for newer versions of bluez
+SUBSYSTEM=="hidraw", KERNELS=="*1209:4321*", MODE="0660", SYMLINK+="mooltipass_keyboard", TAG+="uaccess", TAG+="udev-acl"
+
+LABEL="mooltipass_end"
diff --git a/app-crypt/moolticute/files/moolticuted.init b/app-crypt/moolticute/files/moolticuted.init
index 4a331db1c3a4..56b15ff3d5c2 100644
--- a/app-crypt/moolticute/files/moolticuted.init
+++ b/app-crypt/moolticute/files/moolticuted.init
@@ -1,11 +1,11 @@
#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
command=/usr/bin/moolticuted
-command_args=""
+command_background="yes"
pidfile=/var/run/moolticuted.pid
-start_stop_daemon_args="--make-pidfile --background --user nobody --group usb"
+command_user="nobody:usb"
depend() {
need udev
diff --git a/app-crypt/moolticute/files/moolticuted.init-r1 b/app-crypt/moolticute/files/moolticuted.init-r1
deleted file mode 100644
index 8c4942a34935..000000000000
--- a/app-crypt/moolticute/files/moolticuted.init-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-command=/usr/bin/moolticuted
-command_background="yes"
-pidfile=/var/run/moolticuted.pid
-command_user="nobody:usb"
-
-depend() {
- need udev
-}
diff --git a/app-crypt/moolticute/moolticute-0.43.19-r1.ebuild b/app-crypt/moolticute/moolticute-0.43.19-r1.ebuild
deleted file mode 100644
index ea058a356a20..000000000000
--- a/app-crypt/moolticute/moolticute-0.43.19-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999* ]]; then
- EGIT_REPO_URI="https://github.com/mooltipass/moolticute.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/mooltipass/moolticute/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm"
-fi
-
-inherit xdg-utils qmake-utils udev
-
-DESCRIPTION="Mooltipass crossplatform daemon/tools"
-HOMEPAGE="https://github.com/mooltipass/moolticute"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/libusb-1.0.20
- dev-qt/qtdbus:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qttest:5
- dev-qt/qtwebsockets:5
- dev-qt/qtwidgets:5
-"
-BDEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_prepare() {
- default
-
- # Fill version.h with package version
- if [[ ${PV} != 9999* ]]; then
- sed -i "s/\"git\"/\"v${PV/_/-}\"/" src/version.h || die
- fi
-}
-
-src_configure() {
- eqmake5 PREFIX="/usr" Moolticute.pro
-}
-
-src_install() {
- emake install INSTALL_ROOT="${D}"
-
- udev_dorules "${FILESDIR}/50-mooltipass.rule"
- newinitd "${FILESDIR}/moolticuted.init-r1" moolticuted
-}
-
-pkg_postinst() {
- udev_reload
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/app-crypt/moolticute/moolticute-0.43.19.ebuild b/app-crypt/moolticute/moolticute-0.43.19-r2.ebuild
similarity index 72%
rename from app-crypt/moolticute/moolticute-0.43.19.ebuild
rename to app-crypt/moolticute/moolticute-0.43.19-r2.ebuild
index b4fd0cdb9d53..d7fa4843bf98 100644
--- a/app-crypt/moolticute/moolticute-0.43.19.ebuild
+++ b/app-crypt/moolticute/moolticute-0.43.19-r2.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+
+inherit qmake-utils systemd udev xdg-utils
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/mooltipass/moolticute.git"
inherit git-r3
else
- SRC_URI="https://github.com/mooltipass/moolticute/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/mooltipass/moolticute/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm"
fi
-inherit xdg-utils qmake-utils udev
-
DESCRIPTION="Mooltipass crossplatform daemon/tools"
HOMEPAGE="https://github.com/mooltipass/moolticute"
LICENSE="GPL-3"
SLOT="0"
-IUSE=""
+IUSE="systemd"
RDEPEND="
>=dev-libs/libusb-1.0.20
@@ -29,13 +29,13 @@ RDEPEND="
dev-qt/qttest:5
dev-qt/qtwebsockets:5
dev-qt/qtwidgets:5
+ systemd? ( sys-apps/systemd )
+ !systemd? ( sys-apps/systemd-utils )
"
BDEPEND="${RDEPEND}
dev-qt/linguist-tools:5
"
-S="${WORKDIR}/${P/_/-}"
-
src_prepare() {
default
@@ -52,7 +52,8 @@ src_configure() {
src_install() {
emake install INSTALL_ROOT="${D}"
- udev_dorules "${FILESDIR}/50-mooltipass.rule"
+ udev_dorules "${FILESDIR}/50-mooltipass.rules"
+ systemd_dounit systemd/moolticuted.service
newinitd "${FILESDIR}/moolticuted.init" moolticuted
}
@@ -62,5 +63,6 @@ pkg_postinst() {
}
pkg_postrm() {
+ udev_reload
xdg_icon_cache_update
}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-crypt/moolticute/files/, app-crypt/moolticute/
@ 2022-06-03 5:32 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-06-03 5:32 UTC (permalink / raw
To: gentoo-commits
commit: 6c9fd029ec53ec921bcbbce3ea12f6c5d01eb270
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 3 05:24:36 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 3 05:29:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c9fd029
app-crypt/moolticute: Improve OpenRC script
The attached script updates a couple things which effectively is the same as
the current model however it follows the modular nature of the declarative
syntax.
Changes:
* Splits start_stop_daemon_args into command_background and command_user options.
Closes: https://bugs.gentoo.org/828074
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-crypt/moolticute/files/moolticuted.init-r1 | 12 ++++++++++++
.../{moolticute-9999.ebuild => moolticute-0.43.19-r1.ebuild} | 4 ++--
app-crypt/moolticute/moolticute-9999.ebuild | 4 ++--
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/app-crypt/moolticute/files/moolticuted.init-r1 b/app-crypt/moolticute/files/moolticuted.init-r1
new file mode 100644
index 000000000000..8c4942a34935
--- /dev/null
+++ b/app-crypt/moolticute/files/moolticuted.init-r1
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command=/usr/bin/moolticuted
+command_background="yes"
+pidfile=/var/run/moolticuted.pid
+command_user="nobody:usb"
+
+depend() {
+ need udev
+}
diff --git a/app-crypt/moolticute/moolticute-9999.ebuild b/app-crypt/moolticute/moolticute-0.43.19-r1.ebuild
similarity index 92%
copy from app-crypt/moolticute/moolticute-9999.ebuild
copy to app-crypt/moolticute/moolticute-0.43.19-r1.ebuild
index 08512b4847b9..ea058a356a20 100644
--- a/app-crypt/moolticute/moolticute-9999.ebuild
+++ b/app-crypt/moolticute/moolticute-0.43.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -53,7 +53,7 @@ src_install() {
emake install INSTALL_ROOT="${D}"
udev_dorules "${FILESDIR}/50-mooltipass.rule"
- newinitd "${FILESDIR}/moolticuted.init" moolticuted
+ newinitd "${FILESDIR}/moolticuted.init-r1" moolticuted
}
pkg_postinst() {
diff --git a/app-crypt/moolticute/moolticute-9999.ebuild b/app-crypt/moolticute/moolticute-9999.ebuild
index 08512b4847b9..ea058a356a20 100644
--- a/app-crypt/moolticute/moolticute-9999.ebuild
+++ b/app-crypt/moolticute/moolticute-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -53,7 +53,7 @@ src_install() {
emake install INSTALL_ROOT="${D}"
udev_dorules "${FILESDIR}/50-mooltipass.rule"
- newinitd "${FILESDIR}/moolticuted.init" moolticuted
+ newinitd "${FILESDIR}/moolticuted.init-r1" moolticuted
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-crypt/moolticute/files/, app-crypt/moolticute/
@ 2017-09-24 21:56 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2017-09-24 21:56 UTC (permalink / raw
To: gentoo-commits
commit: 51a6aef7d31ccebc610092afd9e407f6947fd033
Author: Pierre-Olivier Mercier <nemunaire <AT> nemunai <DOT> re>
AuthorDate: Thu Aug 24 08:07:07 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 21:56:12 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51a6aef7
app-crypt/moolticute: new package
Closes: https://github.com/gentoo/gentoo/pull/5520
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-crypt/moolticute/Manifest | 1 +
app-crypt/moolticute/files/50-mooltipass.rule | 1 +
app-crypt/moolticute/files/moolticuted.init | 12 +++++
app-crypt/moolticute/metadata.xml | 16 +++++++
app-crypt/moolticute/moolticute-0.9.8_beta.ebuild | 55 +++++++++++++++++++++++
app-crypt/moolticute/moolticute-9999.ebuild | 55 +++++++++++++++++++++++
6 files changed, 140 insertions(+)
diff --git a/app-crypt/moolticute/Manifest b/app-crypt/moolticute/Manifest
new file mode 100644
index 00000000000..4d89ad9c799
--- /dev/null
+++ b/app-crypt/moolticute/Manifest
@@ -0,0 +1 @@
+DIST moolticute-0.9.8_beta.tar.gz 4471922 SHA256 6d1524d104579c03901e1727c7eed3511fe74ce4dc538d846e69d28652129ddb SHA512 9b5829105172b9e461bfccf60de42aa0dc8529e319292006449f54f8590b3cf002c0e9b555b8ab379a6bfe6dad2e40ed142ea140e254337fa035f09e97e49465 WHIRLPOOL de95aed7084b974e370c14bafd989c4f07494fa5bccec64543bb944db73baf3cb0c5cb80bd7fc6314c38b3d30c661862aae72f19e098411f24db73710ffbf60b
diff --git a/app-crypt/moolticute/files/50-mooltipass.rule b/app-crypt/moolticute/files/50-mooltipass.rule
new file mode 100644
index 00000000000..4bfd907d725
--- /dev/null
+++ b/app-crypt/moolticute/files/50-mooltipass.rule
@@ -0,0 +1 @@
+SUBSYSTEM=="usb", ATTRS{idVendor}=="16d0", ATTRS{idProduct}=="09a0", TAG+="uaccess"
diff --git a/app-crypt/moolticute/files/moolticuted.init b/app-crypt/moolticute/files/moolticuted.init
new file mode 100644
index 00000000000..4a331db1c3a
--- /dev/null
+++ b/app-crypt/moolticute/files/moolticuted.init
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command=/usr/bin/moolticuted
+command_args=""
+pidfile=/var/run/moolticuted.pid
+start_stop_daemon_args="--make-pidfile --background --user nobody --group usb"
+
+depend() {
+ need udev
+}
diff --git a/app-crypt/moolticute/metadata.xml b/app-crypt/moolticute/metadata.xml
new file mode 100644
index 00000000000..ff819ee05d4
--- /dev/null
+++ b/app-crypt/moolticute/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>nemunaire@nemunai.re</email>
+ <name>Pierre-Olivier Mercier</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">raoulh/moolticute</remote-id>
+ <bugs-to>https://github.com/raoulh/moolticute/issues</bugs-to>
+ </upstream>
+</pkgmetadata>
diff --git a/app-crypt/moolticute/moolticute-0.9.8_beta.ebuild b/app-crypt/moolticute/moolticute-0.9.8_beta.ebuild
new file mode 100644
index 00000000000..8609d2fec94
--- /dev/null
+++ b/app-crypt/moolticute/moolticute-0.9.8_beta.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/raoulh/moolticute.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/raoulh/moolticute/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm"
+fi
+
+inherit gnome2-utils qmake-utils udev
+
+DESCRIPTION="Mooltipass crossplatform daemon/tools"
+HOMEPAGE="https://github.com/raoulh/moolticute"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/libusb-1.0.20
+ >=dev-qt/qtcore-5.6:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qttest:5
+ dev-qt/qtwebsockets:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+ eqmake5 PREFIX="/usr" Moolticute.pro
+}
+
+src_install() {
+ emake install INSTALL_ROOT="${D}"
+
+ udev_dorules "${FILESDIR}/50-mooltipass.rule"
+ newinitd "${FILESDIR}/moolticuted.init" moolticuted
+}
+
+pkg_postinst() {
+ udev_reload
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/app-crypt/moolticute/moolticute-9999.ebuild b/app-crypt/moolticute/moolticute-9999.ebuild
new file mode 100644
index 00000000000..8609d2fec94
--- /dev/null
+++ b/app-crypt/moolticute/moolticute-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/raoulh/moolticute.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/raoulh/moolticute/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm"
+fi
+
+inherit gnome2-utils qmake-utils udev
+
+DESCRIPTION="Mooltipass crossplatform daemon/tools"
+HOMEPAGE="https://github.com/raoulh/moolticute"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/libusb-1.0.20
+ >=dev-qt/qtcore-5.6:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qttest:5
+ dev-qt/qtwebsockets:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+ eqmake5 PREFIX="/usr" Moolticute.pro
+}
+
+src_install() {
+ emake install INSTALL_ROOT="${D}"
+
+ udev_dorules "${FILESDIR}/50-mooltipass.rule"
+ newinitd "${FILESDIR}/moolticuted.init" moolticuted
+}
+
+pkg_postinst() {
+ udev_reload
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-02-22 18:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-22 18:38 [gentoo-commits] repo/gentoo:master commit in: app-crypt/moolticute/files/, app-crypt/moolticute/ Viorel Munteanu
-- strict thread matches above, loose matches on Subject: below --
2022-06-03 5:32 Sam James
2017-09-24 21:56 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox