diff --git a/sys-apps/usbguard/Manifest b/sys-apps/usbguard/Manifest index 16e1fb1..e1b5247 100644 --- a/sys-apps/usbguard/Manifest +++ b/sys-apps/usbguard/Manifest @@ -1 +1,2 @@ -EBUILD usbguard-9999.ebuild 2279 SHA256 6680112af1e7f57315cc623d9ef2562cd801415bb743e807017faa69b1591d7b SHA512 0ed082b07eeb0cd18e841c9ca8f75366f25d479549b588db47c3023716a36b1d6c07fdd52858e57291ea7d86b6368b490c63ddbfb9c748725f8dfbf7a2e600a2 WHIRLPOOL 587629e6242e76f99a91c6626874b6325b8e1a8890b9613f56a0e00fa8d0dfded296d5a6b54bd995991b9d67b22011d419f89b95a6064aef998c9890bd64f452 +AUX openrc-support.patch 1979 BLAKE2B d774ee7bb7fca81376b806d162915b034c458af704d0bd0478a37c1f0246dbba45dc8588f7668f51851b8bae7be49d2456d99da797f1f6aae95672ee75bb1342 SHA512 1a3723f983b5544ece63e599d956c4cec0ef078c0bf193f62eabef640a84116cf07730bb03e1fe6fae266f503c496ee7e15ed09243e1607617cf5f6f35a9ed55 +EBUILD usbguard-9999.ebuild 2588 BLAKE2B 61779e6a28239f593622af1dd9b77a55681d4008d717db6ba0f2c3ef9f43ee44609c519f22b32b8d26e04737ed9e1e7199f293a9797131a14f2e52d19bc4b8d0 SHA512 dedab155603b31a3126a8244416fd278d143ba39d9eee29d36de4fbedcc6abf4dff0e7fae8c123c85c20d2ee0914b3d98b5a9cf0e1934b0c0a225031a407bfc0 diff --git a/sys-apps/usbguard/files/openrc-support.patch b/sys-apps/usbguard/files/openrc-support.patch new file mode 100644 index 0000000..3694bcb --- /dev/null +++ b/sys-apps/usbguard/files/openrc-support.patch @@ -0,0 +1,65 @@ +Les fichiers binaires usbguard/.git/index et usbguard-tmp/.git/index sont différents +diff -crB --new-file usbguard/openRC/conf.d/usbguard-dbus usbguard-tmp/openRC/conf.d/usbguard-dbus +*** usbguard/openRC/conf.d/usbguard-dbus 1970-01-01 01:00:00.000000000 +0100 +--- usbguard-tmp/openRC/conf.d/usbguard-dbus 2018-04-27 10:12:23.721001263 +0200 +*************** +*** 0 **** +--- 1,2 ---- ++ #Options, by default contains -s, which tell the dbus bridge to listen on the system bus ++ APPEND="-s" +diff -crB --new-file usbguard/openRC/usbguard usbguard-tmp/openRC/usbguard +*** usbguard/openRC/usbguard 2018-04-27 10:04:01.200283636 +0200 +--- usbguard-tmp/openRC/usbguard 2018-04-27 10:13:32.168145556 +0200 +*************** +*** 1,12 **** + #!/sbin/openrc-run + + depend() { +- # (Dependency information) + need localmount + after consolekit + after bootmisc + use logger + provide usb-access-control + } + + start_pre() { +--- 1,12 ---- + #!/sbin/openrc-run + + depend() { + need localmount + after consolekit + after bootmisc + use logger + provide usb-access-control ++ provide usbguard + } + + start_pre() { +diff -crB --new-file usbguard/openRC/usbguard-dbus usbguard-tmp/openRC/usbguard-dbus +*** usbguard/openRC/usbguard-dbus 1970-01-01 01:00:00.000000000 +0100 +--- usbguard-tmp/openRC/usbguard-dbus 2018-04-27 10:11:17.633827466 +0200 +*************** +*** 0 **** +--- 1,20 ---- ++ #!/sbin/openrc-run ++ ++ depend() { ++ need localmount ++ need dbus ++ need usbguard ++ need usb-access-control ++ } ++ ++ start() { ++ ebegin "Starting usbguard dbus bridge" ++ start-stop-daemon --start --background --make-pidfile --pidfile /var/run/usbguard-dbus.pid --exec /usr/sbin/usbguard-dbus -- $APPEND ++ eend $? ++ } ++ ++ stop() { ++ ebegin "Stopping usbguard dbus bridge" ++ start-stop-daemon --stop --background --make-pidfile --pidfile /var/run/usbguard-dbus.pid --exec /usr/sbin/usbguard-dbus -- $APPEND ++ eend $? ++ } diff --git a/sys-apps/usbguard/usbguard-9999.ebuild b/sys-apps/usbguard/usbguard-9999.ebuild index ef90455..5c31a78 100644 --- a/sys-apps/usbguard/usbguard-9999.ebuild +++ b/sys-apps/usbguard/usbguard-9999.ebuild @@ -57,10 +57,16 @@ REQUIRED_USE=" ) ) ?? ( qt4 qt5 )" + +PATCHES=( + "${FILESDIR}/openrc-support.patch" +) + src_prepare() { default eautoreconf + eapply "${WORKDIR}"/openrc-support.patch } src_configure() { @@ -88,6 +94,8 @@ src_configure() { --with-bundled-catch \ --with-bundled-pegtl \ "${myconf[@]}" + + } src_compile() { @@ -107,6 +115,11 @@ src_install() { systemd_dounit usbguard.service fi + doinitd "${WORKDIR}"/openRC/usbguard + doinitd "${WORKDIR}"/openRC/usbguard-dbus + doconfd "${WORKDIR}"/openRC/conf.d/usbguard + doconfd "${WORKDIR}"/openRC/conf.d/usbguard-dbus + insinto /etc/usbguard doins usbguard-daemon.conf } diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest index c2c111f..ce9b57b 100644 --- a/sys-auth/fprintd/Manifest +++ b/sys-auth/fprintd/Manifest @@ -1,2 +1,2 @@ DIST fprintd-0.8.0.tar.bz2 73740 BLAKE2B 3d8f9e16b9895c0cf0a3fb5a7a121c3ceb9eb4883f9523400224f52d8c5d1525ce09aaef87a86ddd2b908810ab03fe78e976ee349730b8136545a6158a83a16d SHA512 5750395ba9c55ca68f05ad2842b5919debe57479cd773a627e65efad7303f58b85b9f73cf663479d8bbfd42f40542d6c0d862dcc6aa24d2acba60e74c0062f8e -EBUILD fprintd-0.8.0.ebuild 1609 BLAKE2B 8ad43b988b1cdaec81ffdfaba69a2dedda4fe4e390c7ed13345a33a7b5f1c7680017d9c614a96d8c3852b6e5b939ebed9855cf0e7d916a16161f9e2532b060d8 SHA512 6bc0d2bc79b386dfee1934240cf79abfa28e1cbca5339764b4c9afb4b7f060d204574810f2cb20b53770a31f4e0a1709a4626c640627e0dd2eb6fa6b2305b7e1 +EBUILD fprintd-0.8.0.ebuild 1517 BLAKE2B b2da7cefc22cd6a78cf2a2541451614887b91cfb1b6df6b01a0ccb0443f0aed518219609de09d0c243506718fabd6a535945788961b68f239ac0a2d14a4f73f6 SHA512 278a8e6c01a32ffe906b3ee4a89ee579f2ee3b2ab914358bc434fab8f35883e0cd9310b9618add7d58f5b6719e82def1e9edf15e287d88a2c1a81cbf389b299c diff --git a/sys-auth/fprintd/fprintd-0.8.0.ebuild b/sys-auth/fprintd/fprintd-0.8.0.ebuild index 4f9991e..23d5ec0 100644 --- a/sys-auth/fprintd/fprintd-0.8.0.ebuild +++ b/sys-auth/fprintd/fprintd-0.8.0.ebuild @@ -44,8 +44,6 @@ src_install() { emake DESTDIR="${D}" install \ pammoddir=$(getpam_mod_dir) - einfo "Pam mod folder : $(getpam_mod_dir)" - dopammod "${D}/pam/.libs/pam_fprintd.so" keepdir /var/lib/fprint find "${D}" -name "*.la" -delete || die