Attachment 889922 Details for Bug 1091566 – Proposed patch

[patch] Proposed patch

saned_systemd.patch (text/plain), 2.32 KB, created by Sandro Mani on 2014-04-25 23:04:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sandro Mani

Created: 2014-04-25 23:04:02 UTC

Size: 2.32 KB

patch

obsolete

>diff -rupN sane-backends-1.0.24-9.fc21.src/sane-backends.spec sane-backends-1.0.24-9.fc21.src-new/sane-backends.spec
>--- sane-backends-1.0.24-9.fc21.src/sane-backends.spec	2014-04-14 21:22:47.000000000 +0200
>+++ sane-backends-1.0.24-9.fc21.src-new/sane-backends.spec	2014-04-26 00:41:06.919599622 +0200
>@@ -46,6 +46,8 @@ Group: System Environment/Libraries
> # Alioth Download URLs are amazing.
> Source0: https://alioth.debian.org/frs/download.php/latestfile/176/sane-backends-%{version}.tar.gz
> Source1: sane.png
>+Source2: saned.socket
>+Source3: saned@.service
> 
> # Fedora-specific, not generally applicable:
> Patch0: sane-backends-1.0.24-udev.patch
>@@ -93,6 +95,7 @@ BuildRequires: libtiff-devel
> BuildRequires: libv4l-devel
> BuildRequires: gettext
> BuildRequires: gphoto2-devel
>+BuildRequires: systemd-devel
> Requires: systemd >= 196
> Requires: sane-backends-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
> # Don't drag around obsoletes forever
>@@ -260,6 +263,9 @@ for f in *; do
> done
> popd
> 
>+install -Dm644 %{SOURCE2} %{buildroot}%{_unitdir}/saned.socket
>+install -Dm644 %{SOURCE3} %{buildroot}%{_unitdir}/saned@.service
>+
> %find_lang %name
> 
> %post
>@@ -285,6 +291,9 @@ udevadm hwdb --update >/dev/null 2>&1 ||
> %{_bindir}/scanimage
> %{_sbindir}/*
> 
>+%{_unitdir}/saned.socket
>+%{_unitdir}/saned@.service
>+
> %exclude %{_mandir}/man1/sane-config.1*
> %{_mandir}/*/*
> 
>diff -rupN sane-backends-1.0.24-9.fc21.src/saned@.service sane-backends-1.0.24-9.fc21.src-new/saned@.service
>--- sane-backends-1.0.24-9.fc21.src/saned@.service	1970-01-01 01:00:00.000000000 +0100
>+++ sane-backends-1.0.24-9.fc21.src-new/saned@.service	2014-04-26 00:35:43.990635776 +0200
>@@ -0,0 +1,12 @@
>+[Unit]
>+Description=Scanner Service
>+Requires=saned.socket
>+
>+[Service]
>+ExecStart=/usr/sbin/saned
>+User=saned
>+Group=saned
>+StandardInput=null
>+StandardOutput=syslog
>+StandardError=syslog
>+# Environment=SANE_CONFIG_DIR=/etc/sane.d SANE_DEBUG_DLL=255
>diff -rupN sane-backends-1.0.24-9.fc21.src/saned.socket sane-backends-1.0.24-9.fc21.src-new/saned.socket
>--- sane-backends-1.0.24-9.fc21.src/saned.socket	1970-01-01 01:00:00.000000000 +0100
>+++ sane-backends-1.0.24-9.fc21.src-new/saned.socket	2014-04-26 00:35:47.365687623 +0200
>@@ -0,0 +1,10 @@
>+[Unit]
>+Description=saned incoming socket
>+
>+[Socket]
>+ListenStream=6566
>+Accept=yes
>+MaxConnections=1
>+
>+[Install]
>+WantedBy=sockets.target

Actions: View | Diff

Attachments on bug 1091566: 889922 | 992152 | 1076042