!25 同步23.03-lts-sp3分支的代码到24.03

From: @cherry530 
Reviewed-by: @wang--ge 
Signed-off-by: @wang--ge

0001-Fix-typo-in-usbmuxd-proto.h.patch

@@ -0,0 +1,26 @@
+From ecb81751f14af6699aef2ea03d54ec08401a40d5 Mon Sep 17 00:00:00 2001
+From: Nikias Bassen <nikias@gmx.li>
+Date: Sat, 9 Jan 2021 04:22:41 +0100
+Subject: [PATCH] Fix typo in usbmuxd-proto.h
+
+Thanks to @timgates32 for spotting this.
+---
+ src/usbmuxd-proto.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/usbmuxd-proto.h b/src/usbmuxd-proto.h
+index 9416416..93df00e 100644
+--- a/src/usbmuxd-proto.h
++++ b/src/usbmuxd-proto.h
+@@ -19,7 +19,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
+-/* Protocol defintion for usbmuxd proxy protocol */
++/* Protocol definition for usbmuxd proxy protocol */
+ #ifndef USBMUXD_PROTO_H
+ #define USBMUXD_PROTO_H
+ 
+-- 
+2.33.0
+

0001-README-Fix-typo.patch

@@ -0,0 +1,25 @@
+From 4eb83b705fe9cfe3cdb1de158182bddd988ae07b Mon Sep 17 00:00:00 2001
+From: Nikias Bassen <nikias@gmx.li>
+Date: Wed, 30 Jun 2021 02:33:04 +0200
+Subject: [PATCH] README: Fix typo
+
+---
+ README.md | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/README.md b/README.md
+index 53d9cf5..cf85997 100644
+--- a/README.md
++++ b/README.md
+@@ -122,7 +122,7 @@ ticket first to discuss the idea upfront to ensure less effort for everyone.
+ 
+ Please make sure your contribution adheres to:
+ * Try to follow the code style of the project
+-* Commit messages should describe the change well without being to short
++* Commit messages should describe the change well without being too short
+ * Try to split larger changes into individual commits of a common domain
+ * Use your real name and a valid email address for your commits
+ 
+-- 
+2.33.0
+

usbmuxd.spec

@@ -1,12 +1,15 @@
 Name:             usbmuxd
 Version:          1.1.1
-Release:          2
+Release:          4
 Summary:          Daemon for communicating with Apple's iOS devices
 License:          GPLv3+ or GPLv2+
 URL:              http://www.libimobiledevice.org/
 Source0:          https://github.com/libimobiledevice/usbmuxd/releases/download/%{version}/usbmuxd-%{version}.tar.bz2
 
 Patch1:           0001-Fix-typo-in-NEWS-for-last-release-notes.patch 
+Patch2:           0001-Fix-typo-in-usbmuxd-proto.h.patch
+Patch3:           0001-README-Fix-typo.patch
+
 BuildRequires:    gcc libimobiledevice-devel libplist-devel libusbx-devel systemd autoconf libtool automake
 Requires(pre):    shadow-utils
 Requires(post):   systemd
@@ -60,6 +63,12 @@ exit 0
 %{_datadir}/man/man8/usbmuxd.8.gz
 
 %changelog
+* Mon Jan 9 2023 caofei <caofei@xfusion.com> - 1.1.1-4
+- README: Fix typo
+
+* Sat Jan 7 2023 caofei <caofei@xfusion.com> - 1.1.1-3
+-   Fix typo in usbmuxd-proto.h
+
 * Fri Jan 6 2023 lingsheng <lingsheng@huawei.com> - 1.1.1-2
 -  Fix typo in NEWS for last release notes