Attachment 147696 Details for Bug 193952 – Patch that removes run-time dependency on bash

[patch] Patch that removes run-time dependency on bash

hal-remove-runtime-dependency-on-bash.patch (text/plain), 4.44 KB, created by Jan Kokemüller on 2014-09-26 15:12:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kokemüller

Created: 2014-09-26 15:12:29 UTC

Size: 4.44 KB

patch

obsolete

>diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
>index 3c6b86a..fbd884f 100644
>--- a/sysutils/hal/Makefile
>+++ b/sysutils/hal/Makefile
>@@ -16,8 +16,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l
> LIB_DEPENDS=	libpolkit.so.2:${PORTSDIR}/sysutils/policykit \
> 		libvolume_id.so:${PORTSDIR}/devel/libvolume_id \
> 		libck-connector.so:${PORTSDIR}/sysutils/consolekit
>-RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids \
>-		bash:${PORTSDIR}/shells/bash
>+RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
> 
> USES=		gettext gmake libtool:keepla pathfix pkgconfig shebangfix
> USE_GNOME=	intlhack
>diff --git a/sysutils/hal/files/patch-tools__hal-luks-remove b/sysutils/hal/files/patch-tools__hal-luks-remove
>new file mode 100644
>index 0000000..d60bafb
>--- /dev/null
>+++ b/sysutils/hal/files/patch-tools__hal-luks-remove
>@@ -0,0 +1,8 @@
>+--- tools/hal-luks-remove.orig	2014-09-26 14:56:05 UTC
>++++ tools/hal-luks-remove
>+@@ -1,4 +1,4 @@
>+-#!/bin/bash
>++#!/bin/sh
>+ 
>+ # Copyright (C) 2005 W. Michael Petullo <mike@flyn.org>
>+ # Copyright (C) 2006 David Zeuthen <davidz@redhat.com>
>diff --git a/sysutils/hal/files/patch-tools__hal-luks-setup b/sysutils/hal/files/patch-tools__hal-luks-setup
>new file mode 100644
>index 0000000..cef8651
>--- /dev/null
>+++ b/sysutils/hal/files/patch-tools__hal-luks-setup
>@@ -0,0 +1,20 @@
>+--- tools/hal-luks-setup.orig	2014-09-26 14:56:12 UTC
>++++ tools/hal-luks-setup
>+@@ -1,4 +1,4 @@
>+-#!/bin/bash
>++#!/bin/sh
>+ 
>+ # Copyright (C) 2005 W. Michael Petullo <mike@flyn.org>
>+ # Copyright (C) 2006 David Zeuthen <davidz@redhat.com>
>+@@ -44,9 +44,9 @@
>+ fi
>+ 
>+ IS_HOTPLUGGABLE=`hal-get-property --udi $HAL_PROP_BLOCK_STORAGE_DEVICE --key storage.hotpluggable`
>+-if [ "$IS_HOTPLUGGABLE" == "true" ] ; then
>++if [ "$IS_HOTPLUGGABLE" = "true" ] ; then
>+     ACTION="org.freedesktop.hal.storage.crypto-setup-removable"
>+-elif [ "$IS_HOTPLUGGABLE" == "false" ] ; then
>++elif [ "$IS_HOTPLUGGABLE" = "false" ] ; then
>+     ACTION="org.freedesktop.hal.storage.crypto-setup-fixed"
>+ else
>+     unknown_error
>diff --git a/sysutils/hal/files/patch-tools__hal-luks-teardown b/sysutils/hal/files/patch-tools__hal-luks-teardown
>new file mode 100644
>index 0000000..126e820
>--- /dev/null
>+++ b/sysutils/hal/files/patch-tools__hal-luks-teardown
>@@ -0,0 +1,20 @@
>+--- tools/hal-luks-teardown.orig	2014-09-26 14:56:27 UTC
>++++ tools/hal-luks-teardown
>+@@ -1,4 +1,4 @@
>+-#!/bin/bash
>++#!/bin/sh
>+ 
>+ # Copyright (C) 2005 W. Michael Petullo <mike@flyn.org>
>+ # Copyright (C) 2006 David Zeuthen <davidz@redhat.com>
>+@@ -47,9 +47,9 @@
>+ # TODO: this is a little sketchy; we should check for hal-storage-crypto-teardown-others?
>+ #
>+ IS_HOTPLUGGABLE=`hal-get-property --udi $HAL_PROP_BLOCK_STORAGE_DEVICE --key storage.hotpluggable`
>+-if [ "$IS_HOTPLUGGABLE" == "true" ] ; then
>++if [ "$IS_HOTPLUGGABLE" = "true" ] ; then
>+     ACTION="org.freedesktop.hal.storage.crypto-setup-removable"
>+-elif [ "$IS_HOTPLUGGABLE" == "false" ] ; then
>++elif [ "$IS_HOTPLUGGABLE" = "false" ] ; then
>+     ACTION="org.freedesktop.hal.storage.crypto-setup-fixed"
>+ else
>+     unknown_error
>diff --git a/sysutils/hal/files/patch-tools__hal-system-wol-enable b/sysutils/hal/files/patch-tools__hal-system-wol-enable
>new file mode 100644
>index 0000000..d7a409f
>--- /dev/null
>+++ b/sysutils/hal/files/patch-tools__hal-system-wol-enable
>@@ -0,0 +1,8 @@
>+--- tools/hal-system-wol-enable.orig	2014-09-26 14:55:51 UTC
>++++ tools/hal-system-wol-enable
>+@@ -1,4 +1,4 @@
>+-#!/bin/bash
>++#!/bin/sh
>+ #
>+ # Copyright (C) 2007 Holger Macht <holger@homac.de>
>+ #
>diff --git a/sysutils/hal/files/patch-tools__hal-system-wol-enabled b/sysutils/hal/files/patch-tools__hal-system-wol-enabled
>new file mode 100644
>index 0000000..689532e
>--- /dev/null
>+++ b/sysutils/hal/files/patch-tools__hal-system-wol-enabled
>@@ -0,0 +1,8 @@
>+--- tools/hal-system-wol-enabled.orig	2014-09-26 14:55:57 UTC
>++++ tools/hal-system-wol-enabled
>+@@ -1,4 +1,4 @@
>+-#!/bin/bash
>++#!/bin/sh
>+ #
>+ # Copyright (C) 2007 Holger Macht <holger@homac.de>
>+ #
>diff --git a/sysutils/hal/files/patch-tools__hal-system-wol-supported b/sysutils/hal/files/patch-tools__hal-system-wol-supported
>new file mode 100644
>index 0000000..6089d1d
>--- /dev/null
>+++ b/sysutils/hal/files/patch-tools__hal-system-wol-supported
>@@ -0,0 +1,8 @@
>+--- tools/hal-system-wol-supported.orig	2014-09-26 14:56:01 UTC
>++++ tools/hal-system-wol-supported
>+@@ -1,4 +1,4 @@
>+-#!/bin/bash
>++#!/bin/sh
>+ #
>+ # Copyright (C) 2007 Holger Macht <holger@homac.de>
>+ #

Actions: View | Diff

Attachments on bug 193952: 147696