Merge branch 'telesphoreo'

24 files changed, 309 insertions, 15 deletions

diff --git a/data/apt7-key/_metadata/apt7-lib.ver.iphoneos-arm b/data/apt7-key/_metadata/apt7-lib.ver.iphoneos-arm
new file mode 100644
index 000000000..138a91ba8
--- /dev/null
+++ b/data/apt7-key/_metadata/apt7-lib.ver.iphoneos-arm
@@ -0,0 +1 @@
+0.7.25.3-7
diff --git a/data/bsdiff/_metadata/author b/data/bsdiff/_metadata/author
new file mode 100644
index 000000000..87f770791
--- /dev/null
+++ b/data/bsdiff/_metadata/author
@@ -0,0 +1 @@
+Colin Percival <cperciva@alumni.sfu.ca>
diff --git a/data/bsdiff/_metadata/bzip2.dep b/data/bsdiff/_metadata/bzip2.dep
new file mode 120000
index 000000000..15aa44a77
--- /dev/null
+++ b/data/bsdiff/_metadata/bzip2.dep
@@ -0,0 +1 @@
+../../bzip2
\ No newline at end of file
diff --git a/data/bsdiff/_metadata/description b/data/bsdiff/_metadata/description
new file mode 100644
index 000000000..abf0559e1
--- /dev/null
+++ b/data/bsdiff/_metadata/description
@@ -0,0 +1 @@
+binary is to text, as bsdiff is to diff
diff --git a/data/bsdiff/_metadata/homepage b/data/bsdiff/_metadata/homepage
new file mode 100644
index 000000000..726136cec
--- /dev/null
+++ b/data/bsdiff/_metadata/homepage
@@ -0,0 +1 @@
+http://www.daemonology.net/bsdiff/
diff --git a/data/bsdiff/_metadata/in.1443.00 b/data/bsdiff/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/bsdiff/_metadata/in.1443.00
diff --git a/data/bsdiff/_metadata/license b/data/bsdiff/_metadata/license
new file mode 100644
index 000000000..a53a16144
--- /dev/null
+++ b/data/bsdiff/_metadata/license
@@ -0,0 +1,25 @@
+/*-
+ * Copyright 2003-2005 Colin Percival
+ * All rights reserved
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted providing that the following conditions 
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
diff --git a/data/bsdiff/_metadata/maintainer b/data/bsdiff/_metadata/maintainer
new file mode 120000
index 000000000..0fa66e077
--- /dev/null
+++ b/data/bsdiff/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/saurik
\ No newline at end of file
diff --git a/data/bsdiff/_metadata/priority b/data/bsdiff/_metadata/priority
new file mode 100644
index 000000000..134d9bc32
--- /dev/null
+++ b/data/bsdiff/_metadata/priority
@@ -0,0 +1 @@
+optional
diff --git a/data/bsdiff/_metadata/role b/data/bsdiff/_metadata/role
new file mode 100644
index 000000000..52b4d7301
--- /dev/null
+++ b/data/bsdiff/_metadata/role
@@ -0,0 +1 @@
+hacker
diff --git a/data/bsdiff/_metadata/section b/data/bsdiff/_metadata/section
new file mode 100644
index 000000000..e0eb96881
--- /dev/null
+++ b/data/bsdiff/_metadata/section
@@ -0,0 +1 @@
+Development
diff --git a/data/bsdiff/_metadata/tags b/data/bsdiff/_metadata/tags
new file mode 100644
index 000000000..ad5d50831
--- /dev/null
+++ b/data/bsdiff/_metadata/tags
@@ -0,0 +1 @@
+purpose::console
diff --git a/data/bsdiff/_metadata/version b/data/bsdiff/_metadata/version
new file mode 100644
index 000000000..69df05f33
--- /dev/null
+++ b/data/bsdiff/_metadata/version
@@ -0,0 +1 @@
+4.3
diff --git a/data/bsdiff/bsdiff-4.3.tar.gz b/data/bsdiff/bsdiff-4.3.tar.gz
new file mode 100644
index 000000000..dca042b58
--- /dev/null
+++ b/data/bsdiff/bsdiff-4.3.tar.gz
diff --git a/data/bsdiff/make.sh b/data/bsdiff/make.sh
new file mode 100644
index 000000000..9fbcc4324
--- /dev/null
+++ b/data/bsdiff/make.sh
@@ -0,0 +1,8 @@
+pkg:setup
+
+for bin in bsdiff bspatch; do
+    "${PKG_TARG}-gcc" -o "${bin}" "${bin}.c" -lbz2
+done
+
+pkg: mkdir -p /usr/bin
+pkg: cp -a bsdiff bspatch /usr/bin
diff --git a/data/bsdiff/types.diff b/data/bsdiff/types.diff
new file mode 100644
index 000000000..6e81672a5
--- /dev/null
+++ b/data/bsdiff/types.diff
@@ -0,0 +1,11 @@
+diff -ru bsdiff-4.3/bspatch.c bsdiff-4.3+iPhone/bspatch.c
+--- bsdiff-4.3/bspatch.c	2005-08-16 22:14:00.000000000 +0000
++++ bsdiff-4.3+iPhone/bspatch.c	2010-04-01 23:54:50.000000000 +0000
+@@ -35,6 +35,7 @@
+ #include <err.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <sys/types.h>
+ 
+ static off_t offtin(u_char *buf)
+ {
diff --git a/data/debianutils/_metadata/license b/data/debianutils/_metadata/license
index 9c13a9a0f..b06d429c6 120000..100644
--- a/data/debianutils/_metadata/license
+++ b/data/debianutils/_metadata/license
@@ -1 +1,161 @@
-../../../licenses/gpl-2
\ No newline at end of file
+This is the Debian GNU/Linux package debianutils.
+
+It is an original Debian package.  Programs in it were maintained by
+Guy Maor <maor@debian.org>, and are now maintained by Clint Adams
+<schizo@debian.org>.
+
+All its programs except savelog, and which may be
+redistributed under the terms of the GNU GPL, Version 2 or later,
+found on Debian systems in the file /usr/share/common-licenses/GPL.
+
+which is in the public domain.
+
+savelog may be redistributed under the following terms: (The rest of
+this file consists of savelog's distribution terms.)
+
+#ident	"@(#)smail:RELEASE-3_2:COPYING,v 1.2 1996/06/14 18:59:10 woods Exp"
+
+		     SMAIL GENERAL PUBLIC LICENSE
+		       (Clarified 11 Feb 1988)
+
+ Copyright (C)  1988 Landon Curt Noll & Ronald S. Karr
+ Copyright (C)  1992 Ronald S. Karr
+ Copyleft (GNU) 1988 Landon Curt Noll & Ronald S. Karr
+
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license, but changing it is not allowed.  You can also
+ use this wording to make the terms for other programs.
+
+  The license agreements of most software companies keep you at the
+mercy of those companies.  By contrast, our general public license is
+intended to give everyone the right to share SMAIL.  To make sure that
+you get the rights we want you to have, we need to make restrictions
+that forbid anyone to deny you these rights or to ask you to surrender
+the rights.  Hence this license agreement.
+
+  Specifically, we want to make sure that you have the right to give
+away copies of SMAIL, that you receive source code or else can get it
+if you want it, that you can change SMAIL or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To make sure that everyone has such rights, we have to forbid you to
+deprive anyone else of these rights.  For example, if you distribute
+copies of SMAIL, you must give the recipients all the rights that you
+have.  You must make sure that they, too, receive or can get the
+source code.  And you must tell them their rights.
+
+  Also, for our own protection, we must make certain that everyone
+finds out that there is no warranty for SMAIL.  If SMAIL is modified by
+someone else and passed on, we want its recipients to know that what
+they have is not what we distributed, so that any problems introduced
+by others will not reflect on our reputation.
+
+  Therefore we (Landon Curt Noll and Ronald S. Karr) make the following 
+terms which say what you must do to be allowed to distribute or change 
+SMAIL.
+
+
+			COPYING POLICIES
+
+  1. You may copy and distribute verbatim copies of SMAIL source code
+as you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy a valid copyright notice "Copyright
+(C) 1988 Landon Curt Noll & Ronald S. Karr" (or with whatever year is
+appropriate); keep intact the notices on all files that refer to this
+License Agreement and to the absence of any warranty; and give any
+other recipients of the SMAIL program a copy of this License
+Agreement along with the program.  You may charge a distribution fee
+for the physical act of transferring a copy.
+
+  2. You may modify your copy or copies of SMAIL or any portion of it,
+and copy and distribute such modifications under the terms of
+Paragraph 1 above, provided that you also do the following:
+
+    a) cause the modified files to carry prominent notices stating
+    that you changed the files and the date of any change; and
+
+    b) cause the whole of any work that you distribute or publish,
+    that in whole or in part contains or is a derivative of SMAIL or
+    any part thereof, to be licensed at no charge to all third
+    parties on terms identical to those contained in this License
+    Agreement (except that you may choose to grant more extensive
+    warranty protection to some or all third parties, at your option).
+
+    c) You may charge a distribution fee for the physical act of
+    transferring a copy, and you may at your option offer warranty
+    protection in exchange for a fee.
+
+Mere aggregation of another unrelated program with this program (or its
+derivative) on a volume of a storage or distribution medium does not bring
+the other program under the scope of these terms.
+
+  3. You may copy and distribute SMAIL (or a portion or derivative of it,
+under Paragraph 2) in object code or executable form under the terms of
+Paragraphs 1 and 2 above provided that you also do one of the following:
+
+    a) accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of
+    Paragraphs 1 and 2 above; or,
+
+    b) accompany it with a written offer, valid for at least three
+    years, to give any third party free (except for a nominal
+    shipping charge) a complete machine-readable copy of the
+    corresponding source code, to be distributed under the terms of
+    Paragraphs 1 and 2 above; or,
+
+    c) accompany it with the information you received as to where the
+    corresponding source code may be obtained.  (This alternative is
+    allowed only for non-commercial distribution and only if you
+    received the program in object code or executable form alone.)
+
+For an executable file, complete source code means all the source code for
+all modules it contains; but, as a special exception, it need not include
+source code for modules which are standard libraries that accompany the
+operating system on which the executable file runs.
+
+  4. You may not copy, sublicense, distribute or transfer SMAIL
+except as expressly provided under this License Agreement.  Any attempt
+otherwise to copy, sublicense, distribute or transfer SMAIL is void and
+your rights to use the program under this License agreement shall be
+automatically terminated.  However, parties who have received computer
+software programs from you with this License Agreement will not have
+their licenses terminated so long as such parties remain in full compliance.
+
+  5. If you wish to incorporate parts of SMAIL into other free
+programs whose distribution conditions are different, write to Landon
+Curt Noll & Ronald S. Karr via the Free Software Foundation at 51
+Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.  We have not yet
+worked out a simple rule that can be stated here, but we will often
+permit this.  We will be guided by the two goals of preserving the
+free status of all derivatives of our free software and of promoting
+the sharing and reuse of software.
+
+Your comments and suggestions about our licensing policies and our
+software are welcome!  This contract was based on the contract made by
+the Free Software Foundation.  Please contact the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+USA, or call (617) 542-5942 for details on copylefted material in
+general.
+
+		       NO WARRANTY
+
+  BECAUSE SMAIL IS LICENSED FREE OF CHARGE, WE PROVIDE ABSOLUTELY NO
+WARRANTY, TO THE EXTENT PERMITTED BY APPLICABLE STATE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING, LANDON CURT NOLL & RONALD S. KARR AND/OR
+OTHER PARTIES PROVIDE SMAIL "AS IS" WITHOUT WARRANTY OF ANY KIND,
+EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF SMAIL IS WITH
+YOU.  SHOULD SMAIL PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW WILL LANDON CURT NOLL &
+RONALD S. KARR AND/OR ANY OTHER PARTY WHO MAY MODIFY AND REDISTRIBUTE
+SMAIL AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+LOST PROFITS, LOST MONIES, OR OTHER SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE
+(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+INACCURATE OR LOSSES SUSTAINED BY THIRD PARTIES OR A FAILURE OF THE
+PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS) SMAIL, EVEN IF YOU HAVE
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY CLAIM BY
+ANY OTHER PARTY.
diff --git a/data/debianutils/_metadata/role b/data/debianutils/_metadata/role
new file mode 100644
index 000000000..52b4d7301
--- /dev/null
+++ b/data/debianutils/_metadata/role
@@ -0,0 +1 @@
+hacker
diff --git a/data/libffi/_metadata/version b/data/libffi/_metadata/version
index e4604e3af..08ebb261e 100644
--- a/data/libffi/_metadata/version
+++ b/data/libffi/_metadata/version
@@ -1 +1 @@
-3.2.1
+1:3.2.1
diff --git a/data/libffi/assembler.diff b/data/libffi/assembler.diff
new file mode 100644
index 000000000..344d7efc6
--- /dev/null
+++ b/data/libffi/assembler.diff
@@ -0,0 +1,34 @@
+diff -ur libffi-3.2.1/src/arm/sysv.S libffi-3.2.1+iPhone/src/arm/sysv.S
+--- libffi-3.2.1/src/arm/sysv.S	2014-11-08 02:47:24.000000000 -1000
++++ libffi-3.2.1+iPhone/src/arm/sysv.S	2019-03-30 22:41:22.000000000 -1000
+@@ -322,7 +322,9 @@
+    Add VFP FPU directive here. This is only compiled into the library
+    under EABI.  */
+ #ifdef __ARM_EABI__
++#ifndef __APPLE__
+ 	.fpu	vfp
++#endif
+ 
+ 	@ r0:   fn
+ 	@ r1:   &ecif
+@@ -416,7 +418,9 @@
+ 
+ .ffi_call_VFP_end:
+ 	UNWIND .fnend
++#ifdef __ELF__
+         .size    CNAME(ffi_call_VFP),.ffi_call_VFP_end-CNAME(ffi_call_VFP)
++#endif
+ 
+ 
+ ARM_FUNC_START(ffi_closure_VFP)
+@@ -478,8 +482,10 @@
+ 
+ .ffi_closure_VFP_end:
+ 	UNWIND .fnend
++#ifdef __ELF__
+         .size    CNAME(ffi_closure_VFP),.ffi_closure_VFP_end-CNAME(ffi_closure_VFP)
+ #endif
++#endif
+ 
+ ENTRY(ffi_arm_trampoline)
+ 	stmfd sp!, {r0-r3}
diff --git a/data/libffi/clearcache.diff b/data/libffi/clearcache.diff
new file mode 100644
index 000000000..7e4566482
--- /dev/null
+++ b/data/libffi/clearcache.diff
@@ -0,0 +1,14 @@
+diff -ru libffi-3.0.10/src/arm/ffi.c libffi-3.0.10+iPhone/src/arm/ffi.c
+--- libffi-3.0.10/src/arm/ffi.c	2011-08-23 14:28:04.000000000 +0000
++++ libffi-3.0.10+iPhone/src/arm/ffi.c	2012-03-18 23:34:32.000000000 +0000
+@@ -32,6 +32,10 @@
+ 
+ #include <stdlib.h>
+ 
++#ifdef __APPLE__
++#define __clear_cache(a, b)
++#endif
++
+ /* Forward declares. */
+ static int vfp_type_p (ffi_type *);
+ static void layout_vfp_args (ffi_cif *);
diff --git a/data/libffi/incompetant.diff b/data/libffi/incompetant.diff
new file mode 100644
index 000000000..9f33cc57d
--- /dev/null
+++ b/data/libffi/incompetant.diff
@@ -0,0 +1,42 @@
+diff -ur libffi-3.2.1/src/arm/ffi.c libffi-3.2.1+iPhone/src/arm/ffi.c
+--- libffi-3.2.1/src/arm/ffi.c	2014-11-08 02:47:24.000000000 -1000
++++ libffi-3.2.1+iPhone/src/arm/ffi.c	2019-03-30 22:46:09.000000000 -1000
+@@ -749,7 +749,7 @@
+   free (closure);
+ }
+ 
+-#else
++#endif
+ 
+ #define FFI_INIT_TRAMPOLINE(TRAMP,FUN,CTX)				\
+ ({ unsigned char *__tramp = (unsigned char*)(TRAMP);			\
+@@ -765,8 +765,6 @@
+                                                     mapping.  */        \
+  })
+ 
+-#endif
+-
+ /* the cif must already be prep'ed */
+ 
+ ffi_status
+@@ -788,13 +786,19 @@
+     return FFI_BAD_ABI;
+ 
+ #if FFI_EXEC_TRAMPOLINE_TABLE
++if (closure != codeloc) {
+   void **config = FFI_TRAMPOLINE_CODELOC_CONFIG(codeloc);
+   config[0] = closure;
+   config[1] = closure_func;
+-#else
++} else {
++#endif
++
+   FFI_INIT_TRAMPOLINE (&closure->tramp[0], \
+ 		       closure_func,  \
+ 		       codeloc);
++
++#if FFI_EXEC_TRAMPOLINE_TABLE
++}
+ #endif
+ 
+   closure->cif  = cif;
diff --git a/data/libffi/make.sh b/data/libffi/make.sh
index d7183e3da..06a51d34b 100644
--- a/data/libffi/make.sh
+++ b/data/libffi/make.sh
@@ -1,6 +1,6 @@
 pkg:setup
 autoreconf -f -i
 pkg:configure
-pkg:make -j8
+pkg:make
 pkg:install
 pkg: rm -rvf /usr/share
diff --git a/data/libffi/private.diff b/data/libffi/private.diff
deleted file mode 100644
index 2ebff3a2a..000000000
--- a/data/libffi/private.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur libffi-3.2.1/src/aarch64/ffi.c libffi-3.2.1+iPhone/src/aarch64/ffi.c
---- libffi-3.2.1/src/aarch64/ffi.c	2014-11-12 01:57:29.000000000 -1000
-+++ libffi-3.2.1+iPhone/src/aarch64/ffi.c	2018-08-05 09:19:35.000000000 -1000
-@@ -960,7 +960,7 @@
-    descriptors, invokes the wrapped function, then marshalls the return
-    value back into the call context.  */
- 
--void FFI_HIDDEN
-+void
- ffi_closure_SYSV_inner (ffi_closure *closure, struct call_context *context,
- 			void *stack)
- {