diff --git a/.gitignore b/.gitignore index 9428917..fb6a17e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ usbmuxd-1.0.5.tar.bz2 /usbmuxd-1.1.0.tar.bz2 /usbmuxd-1.1.1.tar.bz2 /usbmuxd-61b99ab5c25609c11369733a0df97c03a0581a56.tar.gz +/usbmuxd-0b1b233b57d581515978a09e5a4394bfa4ee4962.tar.gz +/usbmuxd-3ded00c9985a5108cfc7591a309f9a23d57a8cba.tar.gz diff --git a/sources b/sources index 735ee2b..83a15ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (usbmuxd-61b99ab5c25609c11369733a0df97c03a0581a56.tar.gz) = 1b67a41f43e78bbf0966cbe68c9e35351d5a163d7d82aa6e5caed6c4f8ffc3c28faf74dc96890a35481b4856f6b6d95ebec9e8d2a665a099d8909b91bf408381 +SHA512 (usbmuxd-3ded00c9985a5108cfc7591a309f9a23d57a8cba.tar.gz) = 2c5bd94ee1cf484507c3582a101d04a32a94b33296632992f99cf4a08bc87c56e71570cd5855fb20d285344cb6e382afa8c2b1aa0be50b693b229fd25069814b diff --git a/usbmuxd.spec b/usbmuxd.spec index 6794ac8..a9a4530 100644 --- a/usbmuxd.spec +++ b/usbmuxd.spec @@ -1,6 +1,6 @@ %global forgeurl https://github.com/libimobiledevice/usbmuxd -%global commit 61b99ab5c25609c11369733a0df97c03a0581a56 -%global date 20230720 +%global commit 3ded00c9985a5108cfc7591a309f9a23d57a8cba +%global date 20251205 %{?commit:%global shortcommit %(c=%{commit}; echo ${c:0:7})} Name: usbmuxd @@ -8,8 +8,10 @@ Version: 1.1.1^%{date}git%{shortcommit} Release: %autorelease Summary: Daemon for communicating with Apple's iOS devices License: GPL-3.0-only OR GPL-2.0-only -URL: https://www.libimobiledevice.org/ -Source: %{forgeurl}/archive/%{commit}/%{name}-%{commit}.tar.gz +URL: https://libimobiledevice.org +Source0: %{forgeurl}/archive/%{commit}/%{name}-%{commit}.tar.gz +Source1: %{name}.sysusers +Source2: %{name}.tmpfiles BuildRequires: autoconf BuildRequires: automake @@ -18,12 +20,14 @@ BuildRequires: libtool BuildRequires: make BuildRequires: sed BuildRequires: systemd +%{?sysusers_requires_compat} BuildRequires: libimobiledevice-devel BuildRequires: libplist-devel BuildRequires: libusbx-devel -Requires(pre): shadow-utils +Requires: systemd-udev +Recommends: systemd %description usbmuxd is a daemon used for communicating with Apple's iPod Touch, iPhone, @@ -49,12 +53,12 @@ NOCONFIGURE=1 ./autogen.sh %install %make_install +mkdir -p %{buildroot}%{_localstatedir}/lib/lockdown/ +install -Dpm0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/usbmuxd.conf +install -Dpm0644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/usbmuxd.conf + %pre -getent group usbmuxd >/dev/null || groupadd -r usbmuxd -g 113 -getent passwd usbmuxd >/dev/null || \ -useradd -r -g usbmuxd -d / -s /sbin/nologin \ - -c "usbmuxd user" -u 113 usbmuxd -exit 0 +%sysusers_create_compat %{SOURCE1} %post %systemd_post usbmuxd.service @@ -72,6 +76,9 @@ exit 0 %{_udevrulesdir}/39-usbmuxd.rules %{_sbindir}/usbmuxd %{_datadir}/man/man8/usbmuxd.8.gz +%attr(2775, usbmuxd, usbmuxd) %dir %{_localstatedir}/lib/lockdown/ +%{_sysusersdir}/usbmuxd.conf +%{_tmpfilesdir}/usbmuxd.conf %changelog %autochangelog diff --git a/usbmuxd.sysusers b/usbmuxd.sysusers new file mode 100644 index 0000000..011882a --- /dev/null +++ b/usbmuxd.sysusers @@ -0,0 +1,7 @@ +# UID and GID 113 are reserved for this package: +# https://src.fedoraproject.org/rpms/usbmuxd/c/c204e89b56d7f889f13c707581ebe3f838a7c2a9 +# https://pagure.io/setup/c/70e005798f1fb4c73b07f824ba8df518f32e5fc3 +# +#Type Name ID GECOS Home directory Shell +g usbmuxd 113 +u usbmuxd 113:113 "usbmuxd user" - - diff --git a/usbmuxd.tmpfiles b/usbmuxd.tmpfiles new file mode 100644 index 0000000..cd8eda2 --- /dev/null +++ b/usbmuxd.tmpfiles @@ -0,0 +1,2 @@ +#Type Path Mode User Group Age Argument +d /var/lib/lockdown 2775 usbmuxd usbmuxd - -