Accepting request 1321526 from hardware

OBS-URL: https://build.opensuse.org/request/show/1321526
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/usbmuxd?expand=0&rev=40

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/libimobiledevice/usbmuxd</param>
-              <param name="changesrevision">01c94c77f59404924f1c46d99c4e5e0c7817281b</param></service></servicedata>
+              <param name="changesrevision">3ded00c9985a5108cfc7591a309f9a23d57a8cba</param></service></servicedata>

harden_usbmuxd.service.patch

@@ -1,7 +1,7 @@
-Index: usbmuxd-1.1.1/systemd/usbmuxd.service.in
+Index: usbmuxd-1.1.1+git72.3ded00c/systemd/usbmuxd.service.in
 ===================================================================
---- usbmuxd-1.1.1.orig/systemd/usbmuxd.service.in
-+++ usbmuxd-1.1.1/systemd/usbmuxd.service.in
+--- usbmuxd-1.1.1+git72.3ded00c.orig/systemd/usbmuxd.service.in
++++ usbmuxd-1.1.1+git72.3ded00c/systemd/usbmuxd.service.in
 @@ -3,5 +3,16 @@ Description=Socket daemon for the usbmux
  Documentation=man:usbmuxd(8)
  
@@ -17,5 +17,5 @@ Index: usbmuxd-1.1.1/systemd/usbmuxd.service.in
 +ProtectControlGroups=true
 +RestrictRealtime=true
 +# end of automatic additions 
- ExecStart=@sbindir@/usbmuxd --user usbmux --systemd -S /run/usbmuxd -P /run/usbmuxd.pid
- PIDFile=/run/usbmuxd.pid
+ ExecStart=@sbindir@/usbmuxd --user usbmux --systemd
+ PIDFile=@runstatedir@/usbmuxd.pid

usbmuxd-1.1.1+git48.01c94c7.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:abdca97fb5f656f3e77167e0c317c263d62c57c8fbd9aa48245b283f834c3d1a
-size 67978

usbmuxd-1.1.1+git72.3ded00c.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:80373a7d721c7df9702e76ab3940dc43a22e3b23c8a8f944c1c838c51feeb952
+size 68180

usbmuxd-run-dir.patch

@@ -1,11 +0,0 @@
-diff -urp usbmuxd-1.1.1.orig/systemd/usbmuxd.service.in usbmuxd-1.1.1/systemd/usbmuxd.service.in
---- usbmuxd-1.1.1.orig/systemd/usbmuxd.service.in	2020-06-15 13:21:24.000000000 -0500
-+++ usbmuxd-1.1.1/systemd/usbmuxd.service.in	2021-04-23 12:15:34.863057718 -0500
-@@ -3,5 +3,5 @@ Description=Socket daemon for the usbmux
- Documentation=man:usbmuxd(8)
- 
- [Service]
--ExecStart=@sbindir@/usbmuxd --user usbmux --systemd
--PIDFile=@localstatedir@/run/usbmuxd.pid
-+ExecStart=@sbindir@/usbmuxd --user usbmux --systemd -S /run/usbmuxd -P /run/usbmuxd.pid
-+PIDFile=/run/usbmuxd.pid

usbmuxd.changes

@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Mon Dec  8 08:22:27 UTC 2025 - Wolfgang Frisch <wolfgang.frisch@suse.com>
+
+- Update to version 1.1.1+git72.3ded00c:
+  - Allow specifying configuration directory to use
+  - conf: Make sure to sanitize input for SavePairRecord command (bsc#1254302)
+- Refresh harden_usbmuxd.service.patch.
+
+-------------------------------------------------------------------
+Sun Feb 23 23:42:17 UTC 2025 - sbrabec@suse.com
+
+- Update to version 1.1.1+git69.523f700:
+  * Updated README
+  * Update libplist requirement to 2.6.0 and use PLIST_DICT helper
+    for cleaner code
+  * conf: fix false plist write error in config_set_device_record
+  * usb: add support for modes 4 and 5
+  * usb: correctly display 10 Gbps USB 3.x
+  * usb: Revert default mode back to 1
+  * device: Fix crash caused by wrong variable when logging an
+    error
+  * usb: Set default mode to 3 to include CDC NCM, and fix a log
+    message
+  * systemd: use runstatedir (drop usbmuxd-run-dir.patch).
+  * udev: Make sure iBridge (T1) doesn't end up in an unconfigured
+    state
+- Refresh harden_usbmuxd.service.patch.
+
+-------------------------------------------------------------------
+Wed Jan 22 16:14:33 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Drop rcFOO symlinks for CODE16 (PED-266).
+
 -------------------------------------------------------------------
 Mon Jun 12 06:22:59 UTC 2023 - msuchanek@suse.com
 

usbmuxd.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package usbmuxd
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %{!?_udevrulesdir: %global _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d}
 Name:           usbmuxd
-Version:        1.1.1+git48.01c94c7
+Version:        1.1.1+git72.3ded00c
 Release:        0
 Summary:        A socket daemon to multiplex connections from and to iOS devices
 License:        GPL-2.0-only OR GPL-3.0-only
@@ -27,7 +27,6 @@ URL:            https://github.com/libimobiledevice/usbmuxd
 Source:         %{name}-%{version}.tar.gz
 Source1:        %{name}.sysusers
 Source99:       baselibs.conf
-Patch2:         usbmuxd-run-dir.patch
 Patch3:         harden_usbmuxd.service.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -36,7 +35,7 @@ BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  sysuser-tools
 BuildRequires:  pkgconfig(libimobiledevice-1.0) >= 1.3.0
-BuildRequires:  pkgconfig(libplist-2.0) >= 2.3.0
+BuildRequires:  pkgconfig(libplist-2.0) >= 2.6.0
 BuildRequires:  pkgconfig(libusb-1.0) >= 1.0.9
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(udev)
@@ -65,7 +64,9 @@ autoreconf -fiv
 
 %install
 %make_install
+%if 0%{?suse_version} < 1600
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
+%endif
 install -Dm0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/%{name}.conf
 
 %pre -f %{name}.pre
@@ -85,7 +86,9 @@ install -Dm0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/%{name}.conf
 %license COPYING.GPLv2 COPYING.GPLv3
 %doc AUTHORS README.md
 %{_sbindir}/usbmuxd
+%if 0%{?suse_version} < 1600
 %{_sbindir}/rc%{name}
+%endif
 %{_mandir}/man8/usbmuxd.8%{?ext_man}
 %{_udevrulesdir}/39-usbmuxd.rules
 %{_unitdir}/usbmuxd.service