backend: updated dependencies

osy · May 5, 2022 · a89f506 · a89f506
1 parent 1ca3e60
commit a89f506
Show file tree

Hide file tree

Showing 10 changed files with 190 additions and 71 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "Libraries/libimobiledevice"]
 	path = Libraries/libimobiledevice
 	url = https://github.com/libimobiledevice/libimobiledevice.git
+[submodule "Libraries/libimobiledevice-glue"]
+	path = Libraries/libimobiledevice-glue
+	url = https://github.com/libimobiledevice/libimobiledevice-glue.git
diff --git a/Jitterbug.xcodeproj/project.pbxproj b/Jitterbug.xcodeproj/project.pbxproj
diff --git a/Jitterbug/CacheStorage.c b/Jitterbug/CacheStorage.c
@@ -16,7 +16,7 @@
 
 #include "CacheStorage.h"
 #include "Jitterbug.h"
-#include "collection.h"
+#include <libimobiledevice-glue/collection.h>
 
 typedef struct {
     char *udid;

diff --git a/Jitterbug/JBHostDevice.m b/Jitterbug/JBHostDevice.m
@@ -22,8 +22,8 @@
 #include <libimobiledevice/mobile_image_mounter.h>
 #include <libimobiledevice/sbservices.h>
 #include <libimobiledevice/service.h>
+#include <libimobiledevice-glue/utils.h>
 #include "common/userpref.h"
-#include "common/utils.h"
 #import "JBApp.h"
 #import "JBHostDevice.h"
 #import "Jitterbug.h"

diff --git a/JitterbugPair/main.c b/JitterbugPair/main.c
@@ -18,8 +18,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <libimobiledevice-glue/utils.h>
 #include "common/userpref.h"
-#include "common/utils.h"
 
 #include <libimobiledevice/libimobiledevice.h>
 #include <libimobiledevice/lockdown.h>

diff --git a/Libraries/libimobiledevice b/Libraries/libimobiledevice
diff --git a/Libraries/libimobiledevice-glue b/Libraries/libimobiledevice-glue
diff --git a/Libraries/libplist b/Libraries/libplist
diff --git a/Libraries/libusbmuxd b/Libraries/libusbmuxd
diff --git a/meson.build b/meson.build
@@ -4,7 +4,8 @@ sources = ['JitterbugPair/main.c']
 incdir = include_directories(['Libraries/include',
                               'Libraries/libimobiledevice',
                               'Libraries/libimobiledevice/common',
-                              'Libraries/libimobiledevice/include'])
+                              'Libraries/libimobiledevice/include',
+                              'Libraries/libimobiledevice-glue/include'])
 
 os = host_machine.system()
 cflags = []
+1 −0		.gitattributes
+96 −10		.github/workflows/build.yml
+1 −6		.github/workflows/codeql-analysis.yml
+3 −0		.gitignore
+6 −2		Makefile.am
+1 −1		README.md
+58 −28		configure.ac
+5 −1		cython/Makefile.am
+10 −4		docs/plistutil.1
+7 −1		fuzz/Makefile.am
+8 −1		fuzz/init-fuzzers.sh
+1 −0		fuzz/jplist-crashes/clusterfuzz-testcase-minimized-jplist_fuzzer-5149455463088128
+1 −0		fuzz/jplist-crashes/clusterfuzz-testcase-minimized-jplist_fuzzer-5486807695884288
+1 −0		fuzz/jplist-crashes/clusterfuzz-testcase-minimized-jplist_fuzzer-5576833398079488
+1 −0		fuzz/jplist-crashes/clusterfuzz-testcase-minimized-jplist_fuzzer-5704016686874624
+1 −0		fuzz/jplist-leaks/clusterfuzz-testcase-minimized-jplist_fuzzer-4881933237092352
+1 −0		fuzz/jplist-leaks/clusterfuzz-testcase-minimized-jplist_fuzzer-5069883912617984
+1 −0		fuzz/jplist-leaks/clusterfuzz-testcase-minimized-jplist_fuzzer-5816111696838656
+52 −0		fuzz/jplist.dict
+32 −0		fuzz/jplist_fuzzer.cc
+3 −0		fuzz/jplist_fuzzer.options
+8 −2		fuzz/test-fuzzers.sh
+19 −0		git-version-gen
+1 −1		include/plist/Array.h
+1 −1		include/plist/Boolean.h
+1 −1		include/plist/Data.h
+1 −1		include/plist/Date.h
+1 −1		include/plist/Dictionary.h
+1 −1		include/plist/Integer.h
+1 −1		include/plist/Key.h
+1 −1		include/plist/Real.h
+1 −1		include/plist/String.h
+1 −1		include/plist/Uid.h
+94 −32		include/plist/plist.h
+2 −2		m4/as-compiler-flag.m4
+144 −107		m4/ax_pthread.m4
+1 −1		m4/cython_python.m4
+4 −6		src/Array.cpp
+1 −1		src/Boolean.cpp
+2 −2		src/Data.cpp
+1 −1		src/Date.cpp
+3 −3		src/Dictionary.cpp
+1 −1		src/Integer.cpp
+3 −8		src/Key.cpp
+2 −0		src/Makefile.am
+1 −1		src/Real.cpp
+3 −8		src/String.cpp
+2 −2		src/Structure.cpp
+1 −1		src/Uid.cpp
+56 −19		src/bplist.c
+832 −0		src/jplist.c
+289 −0		src/jsmn.c
+92 −0		src/jsmn.h
+65 −26		src/plist.c
+1 −1		src/plist.h
+4 −4		src/time64.c
+71 −24		src/xplist.c
+22 −3		test/Makefile.am
+5 −3		test/amp.test
+ −		test/data/data.bplist
+1 −0		test/data/int64_min_max.json
+1 −0		test/data/j1.json
+1 −0		test/data/j2.json
+ −		test/data/uid.bplist
+5 −3		test/invalid_tag.test
+19 −0		test/json-int64-min-max.test
+33 −0		test/json-invalid-types.test
+19 −0		test/json1.test
+19 −0		test/json2.test
+24 −0		test/json3.test
+6 −2		test/malformed_dict.test
+131 −0		test/plist_btest.c
+7 −0		test/plist_cmp.c
+131 −0		test/plist_jtest.c
+6 −2		test/recursion.test
+15 −0		test/uid.test
+63 −47		tools/plistutil.c
+1 −0		.gitattributes
+180 −0		.github/workflows/build.yml
+6 −2		Makefile.am
+6 −2		README.md
+0 −16		common/Makefile.am
+0 −91		common/collection.c
+0 −47		common/collection.h
+0 −1,171		common/socket.c
+0 −68		common/socket.h
+0 −140		common/thread.c
+0 −76		common/thread.h
+26 −19		configure.ac
+19 −0		git-version-gen
+1 −1		include/usbmuxd.h
+2 −2		m4/as-compiler-flag.m4
+146 −109		m4/ax_pthread.m4
+4 −4		src/Makefile.am
+1 −1		src/libusbmuxd-2.0.pc.in
+27 −19		src/libusbmuxd.c
+4 −4		tools/Makefile.am
+6 −6		tools/inetcat.c
+14 −22		tools/iproxy.c