commit 958c0bfcab274fdee4305123bec23cd74df19add
Author: Jakub Bogusz <[email protected]>
Date: Sun Nov 26 21:23:22 2023 +0100
- added patch to adjust for libplist 2.3.0 + POSIX sh fix; release 2
usbmuxd-libplist.patch | 28 ++++++++++++++++++++++++++++
usbmuxd-sh.patch | 11 +++++++++++
usbmuxd.spec | 18 +++++++++++++++---
3 files changed, 54 insertions(+), 3 deletions(-)
---
diff --git a/usbmuxd.spec b/usbmuxd.spec
index e8f08c4..a42d1c8 100644
--- a/usbmuxd.spec
+++ b/usbmuxd.spec
@@ -14,15 +14,20 @@ Summary: Daemon for communicating with Apple's iPod
Touch and iPhone
Summary(pl.UTF-8): Demon do komunikacji z urządzeniami iPod Touch i iPhone
firmy Apple
Name: usbmuxd
Version: 1.1.1
-Release: 1
+Release: 2
License: GPL v2 or GPL v3
Group: Daemons
#Source0Download: https://libimobiledevice.org/
Source0:
https://github.com/libimobiledevice/usbmuxd/releases/download/%{version}/%{name}-%{version}.tar.bz2
# Source0-md5: 7450ab28776dcd10b593c9a4243e6755
+Patch0: %{name}-libplist.patch
+Patch1: %{name}-sh.patch
URL: https://libimobiledevice.org/
+BuildRequires: autoconf >= 2.64
+BuildRequires: automake
%{?with_preflight:BuildRequires: libimobiledevice-devel >= 1.3.0}
-BuildRequires: libplist-devel >= 2.2.0
+BuildRequires: libplist-devel >= 2.3.0
+BuildRequires: libtool
BuildRequires: libusb-devel >= 1.0.9
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.600
@@ -34,7 +39,7 @@ Requires(pre): /usr/bin/getgid
Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/sbin/useradd
%{?with_preflight:Requires: libimobiledevice >= 1.3.0}
-Requires: libplist >= 2.2.0
+Requires: libplist >= 2.3.0
Requires: libusb >= 1.0.9
Provides: group(usbmux)
Provides: user(usbmux)
@@ -54,8 +59,15 @@ urządzeniu.
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
%build
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
%configure \
--disable-silent-rules \
--without-systemd \
diff --git a/usbmuxd-libplist.patch b/usbmuxd-libplist.patch
new file mode 100644
index 0000000..1d3b529
--- /dev/null
+++ b/usbmuxd-libplist.patch
@@ -0,0 +1,28 @@
+--- usbmuxd-1.1.1/src/utils.h.orig 2020-03-19 19:59:46.000000000 +0100
++++ usbmuxd-1.1.1/src/utils.h 2023-11-26 21:15:02.510433950 +0100
+@@ -78,13 +78,8 @@ char *string_concat(const char *str, ...
+ int buffer_read_from_filename(const char *filename, char **buffer, uint64_t
*length);
+ int buffer_write_to_filename(const char *filename, const char *buffer,
uint64_t length);
+
+-enum plist_format_t {
+- PLIST_FORMAT_XML,
+- PLIST_FORMAT_BINARY
+-};
+-
+ int plist_read_from_filename(plist_t *plist, const char *filename);
+-int plist_write_to_filename(plist_t plist, const char *filename, enum
plist_format_t format);
++int plist_write_to_filename(plist_t plist, const char *filename,
plist_format_t format);
+
+ uint64_t mstime64(void);
+ void get_tick_count(struct timeval * tv);
+--- usbmuxd-1.1.1/src/utils.c.orig 2020-03-19 19:59:46.000000000 +0100
++++ usbmuxd-1.1.1/src/utils.c 2023-11-26 21:15:42.600216765 +0100
+@@ -302,7 +302,7 @@ int plist_read_from_filename(plist_t *pl
+ return 1;
+ }
+
+-int plist_write_to_filename(plist_t plist, const char *filename, enum
plist_format_t format)
++int plist_write_to_filename(plist_t plist, const char *filename,
plist_format_t format)
+ {
+ char *buffer = NULL;
+ uint32_t length;
diff --git a/usbmuxd-sh.patch b/usbmuxd-sh.patch
new file mode 100644
index 0000000..cdb354a
--- /dev/null
+++ b/usbmuxd-sh.patch
@@ -0,0 +1,11 @@
+--- usbmuxd-1.1.1/configure.ac.orig 2020-06-09 03:57:16.000000000 +0200
++++ usbmuxd-1.1.1/configure.ac 2023-11-26 21:16:44.713213603 +0100
+@@ -36,7 +36,7 @@ if test "x$have_limd" = "xyes"; then
+ AC_SUBST(libimobiledevice_CFLAGS)
+ AC_SUBST(libimobiledevice_LIBS)
+ CACHED_CFLAGS="$CFLAGS"
+- CFLAGS+=" $libimobiledevice_CFLAGS"
++ CFLAGS="$CFLAGS $libimobiledevice_CFLAGS"
+ AC_CACHE_CHECK(for enum idevice_connection_type,
ac_cv_enum_idevice_connection_type,
+ AC_TRY_COMPILE([
+ #include <libimobiledevice/libimobiledevice.h>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/usbmuxd.git/commitdiff/958c0bfcab274fdee4305123bec23cd74df19add
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
