Merge branch 'telesphoreo'

15 files changed, 54 insertions, 0 deletions

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)
+ {