Attachment 947896 Details for Bug 1154077 – Use patch instead of sed

[patch] Use patch instead of sed

0001-Replace-sed-substitutions-in-.spec-with-proper-patch.patch (text/plain), 3.34 KB, created by Christophe Fergeau on 2014-10-17 13:24:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christophe Fergeau

Created: 2014-10-17 13:24:18 UTC

Size: 3.34 KB

patch

obsolete

>From 2302b0263fd4e3a193297275ec2bd5efb304dccd Mon Sep 17 00:00:00 2001
>From: Christophe Fergeau <cfergeau@redhat.com>
>Date: Fri, 17 Oct 2014 15:22:14 +0200
>Subject: [PATCH] Replace sed substitutions in .spec with proper patch
>
>The spec file was manually patching the user usbmuxd runs under using
>sed commands. However, one of these sed command silently stopped working
>because the matched pattern changed upstream. Using a patch will cause a
>conflict if this changes again in the future.
>---
> 0001-Run-usbmuxd-as-the-usbmuxd-user.patch | 34 ++++++++++++++++++++++++++++++
> usbmuxd.spec                               |  6 ++----
> 2 files changed, 36 insertions(+), 4 deletions(-)
> create mode 100644 0001-Run-usbmuxd-as-the-usbmuxd-user.patch
>
>diff --git a/0001-Run-usbmuxd-as-the-usbmuxd-user.patch b/0001-Run-usbmuxd-as-the-usbmuxd-user.patch
>new file mode 100644
>index 0000000..eeeae2d
>--- /dev/null
>+++ b/0001-Run-usbmuxd-as-the-usbmuxd-user.patch
>@@ -0,0 +1,34 @@
>+From f71756ecbff0de2d7ce4678fbd12a3235349c18f Mon Sep 17 00:00:00 2001
>+From: Christophe Fergeau <cfergeau@redhat.com>
>+Date: Fri, 17 Oct 2014 15:20:15 +0200
>+Subject: [PATCH] Run usbmuxd as the 'usbmuxd' user
>+
>+---
>+ systemd/usbmuxd.service.in | 2 +-
>+ udev/39-usbmuxd.rules.in   | 2 +-
>+ 2 files changed, 2 insertions(+), 2 deletions(-)
>+
>+diff --git a/systemd/usbmuxd.service.in b/systemd/usbmuxd.service.in
>+index c2bd617..c149735 100644
>+--- a/systemd/usbmuxd.service.in
>++++ b/systemd/usbmuxd.service.in
>+@@ -3,5 +3,5 @@ Description=Socket daemon for the usbmux protocol used by Apple devices
>+ 
>+ [Service]
>+ Type=simple
>+-ExecStart=@sbindir@/usbmuxd --user usbmux --systemd
>++ExecStart=@sbindir@/usbmuxd --user usbmuxd --systemd
>+ PIDFile=@localstatedir@/run/usbmuxd.pid
>+diff --git a/udev/39-usbmuxd.rules.in b/udev/39-usbmuxd.rules.in
>+index 91b14db..f7a7f1e 100644
>+--- a/udev/39-usbmuxd.rules.in
>++++ b/udev/39-usbmuxd.rules.in
>+@@ -1,7 +1,7 @@
>+ # usbmuxd (Apple Mobile Device Muxer listening on /var/run/usbmuxd)
>+ 
>+ # Initialize iOS devices into "deactivated" USB configuration state and activate usbmuxd
>+-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}="0", OWNER="usbmux", @udev_activation_rule@
>++ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}="0", OWNER="usbmuxd", @udev_activation_rule@
>+ 
>+ # Exit usbmuxd when the last device is removed
>+ ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="@sbindir@/usbmuxd -x"
>diff --git a/usbmuxd.spec b/usbmuxd.spec
>index e406cec..18994cd 100644
>--- a/usbmuxd.spec
>+++ b/usbmuxd.spec
>@@ -8,6 +8,7 @@ Group:         Applications/System
> License:       GPLv3+ or GPLv2+
> URL:           http://www.libimobiledevice.org/
> Source0:       http://www.libimobiledevice.org/downloads/%{name}-%{version}.tar.bz2
>+Patch0:        0001-Run-usbmuxd-as-the-usbmuxd-user.patch
> 
> BuildRequires: libimobiledevice-devel
> BuildRequires: libplist-devel
>@@ -28,10 +29,7 @@ accessed simultaneously.
> 
> %prep
> %setup -q
>-
>-# Set the owner of the device node to be usbmuxd
>-sed -i.owner 's/OWNER="usbmux"/OWNER="usbmuxd"/' udev/39-usbmuxd.rules.in
>-sed -i.user 's/--user usbmux/--user usbmuxd/' systemd/usbmuxd.service.in
>+%patch0 -p1
> 
> %build
> %configure
>-- 
>2.1.0
>

Actions: View | Diff

Attachments on bug 1154077: 947894 | 947896