From 96808a8a3edd24009f10e3dad005eed7a0a6e551 Mon Sep 17 00:00:00 2001
From: MCApollo <34170230+MCApollo@users.noreply.github.com>
Date: Thu, 25 Apr 2019 19:43:37 +0000
Subject: Added libtiff

---
 data/_libtiff/.beer                       |  35 +++++++++++++++++++++
 data/_libtiff/_metadata/description       |   1 +
 data/_libtiff/_metadata/homepage          |   1 +
 data/_libtiff/_metadata/in.1443.00        |   0
 data/_libtiff/_metadata/libjpeg-turbo.dep |   1 +
 data/_libtiff/_metadata/maintainer        |   1 +
 data/_libtiff/_metadata/name              |   1 +
 data/_libtiff/_metadata/priority          |   1 +
 data/_libtiff/_metadata/role              |   1 +
 data/_libtiff/_metadata/section           |   1 +
 data/_libtiff/_metadata/tags              |   1 +
 data/_libtiff/_metadata/version           |   1 +
 data/_libtiff/download.sh                 |   1 +
 data/_libtiff/libtiff-CVE-2019-6128.patch |  49 ++++++++++++++++++++++++++++++
 data/_libtiff/make.sh                     |   4 +++
 data/_libtiff/patches.sh                  |   1 +
 data/_libtiff/tiff-4.0.10.tar.gz          | Bin 0 -> 2402867 bytes
 data/libtiff-dev/_metadata/_libtiff.dep   |   1 +
 data/libtiff-dev/_metadata/description    |   1 +
 data/libtiff-dev/_metadata/homepage       |   1 +
 data/libtiff-dev/_metadata/in.1443.00     |   0
 data/libtiff-dev/_metadata/maintainer     |   1 +
 data/libtiff-dev/_metadata/priority       |   1 +
 data/libtiff-dev/_metadata/role           |   1 +
 data/libtiff-dev/_metadata/section        |   1 +
 data/libtiff-dev/_metadata/tags           |   1 +
 data/libtiff-dev/_metadata/version        |   1 +
 data/libtiff-dev/make.sh                  |   3 ++
 data/libtiff5/_metadata/_libtiff.dep      |   1 +
 data/libtiff5/_metadata/description       |   1 +
 data/libtiff5/_metadata/homepage          |   1 +
 data/libtiff5/_metadata/in.1443.00        |   0
 data/libtiff5/_metadata/maintainer        |   1 +
 data/libtiff5/_metadata/name              |   1 +
 data/libtiff5/_metadata/priority          |   1 +
 data/libtiff5/_metadata/role              |   1 +
 data/libtiff5/_metadata/section           |   1 +
 data/libtiff5/_metadata/tags              |   1 +
 data/libtiff5/_metadata/version           |   1 +
 data/libtiff5/make.sh                     |   4 +++
 40 files changed, 126 insertions(+)
 create mode 100644 data/_libtiff/.beer
 create mode 100644 data/_libtiff/_metadata/description
 create mode 100644 data/_libtiff/_metadata/homepage
 create mode 100644 data/_libtiff/_metadata/in.1443.00
 create mode 120000 data/_libtiff/_metadata/libjpeg-turbo.dep
 create mode 120000 data/_libtiff/_metadata/maintainer
 create mode 100644 data/_libtiff/_metadata/name
 create mode 100644 data/_libtiff/_metadata/priority
 create mode 100644 data/_libtiff/_metadata/role
 create mode 100644 data/_libtiff/_metadata/section
 create mode 100644 data/_libtiff/_metadata/tags
 create mode 100644 data/_libtiff/_metadata/version
 create mode 100755 data/_libtiff/download.sh
 create mode 100644 data/_libtiff/libtiff-CVE-2019-6128.patch
 create mode 100644 data/_libtiff/make.sh
 create mode 100755 data/_libtiff/patches.sh
 create mode 100644 data/_libtiff/tiff-4.0.10.tar.gz
 create mode 120000 data/libtiff-dev/_metadata/_libtiff.dep
 create mode 100644 data/libtiff-dev/_metadata/description
 create mode 100644 data/libtiff-dev/_metadata/homepage
 create mode 100644 data/libtiff-dev/_metadata/in.1443.00
 create mode 120000 data/libtiff-dev/_metadata/maintainer
 create mode 100644 data/libtiff-dev/_metadata/priority
 create mode 100644 data/libtiff-dev/_metadata/role
 create mode 100644 data/libtiff-dev/_metadata/section
 create mode 100644 data/libtiff-dev/_metadata/tags
 create mode 100644 data/libtiff-dev/_metadata/version
 create mode 100644 data/libtiff-dev/make.sh
 create mode 120000 data/libtiff5/_metadata/_libtiff.dep
 create mode 100644 data/libtiff5/_metadata/description
 create mode 100644 data/libtiff5/_metadata/homepage
 create mode 100644 data/libtiff5/_metadata/in.1443.00
 create mode 120000 data/libtiff5/_metadata/maintainer
 create mode 100644 data/libtiff5/_metadata/name
 create mode 100644 data/libtiff5/_metadata/priority
 create mode 100644 data/libtiff5/_metadata/role
 create mode 100644 data/libtiff5/_metadata/section
 create mode 100644 data/libtiff5/_metadata/tags
 create mode 100644 data/libtiff5/_metadata/version
 create mode 100644 data/libtiff5/make.sh

diff --git a/data/_libtiff/.beer b/data/_libtiff/.beer
new file mode 100644
index 000000000..2f85bea9d
--- /dev/null
+++ b/data/_libtiff/.beer
@@ -0,0 +1,35 @@
+{
+    "name": "Libtiff",
+    "description": "TIFF library and utilities",
+    "url": "https://download.osgeo.org/libtiff/tiff-4.0.10.tar.gz",
+    "mirror": "https://fossies.org/linux/misc/tiff-4.0.10.tar.gz",
+    "homepage": "http://libtiff.maptools.org/",
+    "depends": [
+        {
+            "depend": "jpeg",
+            "build-depend": false
+        }
+    ],
+    "resource": [],
+    "conflicts": [],
+    "patches": [
+        {
+            "url": "https://raw.githubusercontent.com/Homebrew/formula-patches/d15e00544e7df009b5ad34f3b65351fc249092c0/libtiff/libtiff-CVE-2019-6128.patch",
+            "strip": "1"
+        }
+    ],
+    "install": [
+        "args = %W[",
+        "--prefix=#{prefix}",
+        "--disable-dependency-tracking",
+        "--disable-lzma",
+        "--with-jpeg-include-dir=#{Formula[\"jpeg\"].opt_include}",
+        "--with-jpeg-lib-dir=#{Formula[\"jpeg\"].opt_lib}",
+        "--without-x",
+        "]",
+        "system \"./configure\", *args",
+        "system \"make\", \"install\""
+    ],
+    "version": "4.0.10",
+    "file": "libtiff.rb"
+}
\ No newline at end of file
diff --git a/data/_libtiff/_metadata/description b/data/_libtiff/_metadata/description
new file mode 100644
index 000000000..55244923d
--- /dev/null
+++ b/data/_libtiff/_metadata/description
@@ -0,0 +1 @@
+TIFF library and utilities
diff --git a/data/_libtiff/_metadata/homepage b/data/_libtiff/_metadata/homepage
new file mode 100644
index 000000000..9639140d2
--- /dev/null
+++ b/data/_libtiff/_metadata/homepage
@@ -0,0 +1 @@
+http://libtiff.maptools.org/
diff --git a/data/_libtiff/_metadata/in.1443.00 b/data/_libtiff/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
diff --git a/data/_libtiff/_metadata/libjpeg-turbo.dep b/data/_libtiff/_metadata/libjpeg-turbo.dep
new file mode 120000
index 000000000..b905b9550
--- /dev/null
+++ b/data/_libtiff/_metadata/libjpeg-turbo.dep
@@ -0,0 +1 @@
+../../libjpeg-turbo
\ No newline at end of file
diff --git a/data/_libtiff/_metadata/maintainer b/data/_libtiff/_metadata/maintainer
new file mode 120000
index 000000000..0c538aadb
--- /dev/null
+++ b/data/_libtiff/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/mac
\ No newline at end of file
diff --git a/data/_libtiff/_metadata/name b/data/_libtiff/_metadata/name
new file mode 100644
index 000000000..b5d927294
--- /dev/null
+++ b/data/_libtiff/_metadata/name
@@ -0,0 +1 @@
+libtiff
diff --git a/data/_libtiff/_metadata/priority b/data/_libtiff/_metadata/priority
new file mode 100644
index 000000000..134d9bc32
--- /dev/null
+++ b/data/_libtiff/_metadata/priority
@@ -0,0 +1 @@
+optional
diff --git a/data/_libtiff/_metadata/role b/data/_libtiff/_metadata/role
new file mode 100644
index 000000000..8d0320866
--- /dev/null
+++ b/data/_libtiff/_metadata/role
@@ -0,0 +1 @@
+developer
diff --git a/data/_libtiff/_metadata/section b/data/_libtiff/_metadata/section
new file mode 100644
index 000000000..e0eb96881
--- /dev/null
+++ b/data/_libtiff/_metadata/section
@@ -0,0 +1 @@
+Development
diff --git a/data/_libtiff/_metadata/tags b/data/_libtiff/_metadata/tags
new file mode 100644
index 000000000..a8928cec8
--- /dev/null
+++ b/data/_libtiff/_metadata/tags
@@ -0,0 +1 @@
+purpose::library
diff --git a/data/_libtiff/_metadata/version b/data/_libtiff/_metadata/version
new file mode 100644
index 000000000..2d2d68106
--- /dev/null
+++ b/data/_libtiff/_metadata/version
@@ -0,0 +1 @@
+4.0.10
diff --git a/data/_libtiff/download.sh b/data/_libtiff/download.sh
new file mode 100755
index 000000000..12425d31e
--- /dev/null
+++ b/data/_libtiff/download.sh
@@ -0,0 +1 @@
+wget https://download.osgeo.org/libtiff/tiff-4.0.10.tar.gz || wget https://fossies.org/linux/misc/tiff-4.0.10.tar.gz
\ No newline at end of file
diff --git a/data/_libtiff/libtiff-CVE-2019-6128.patch b/data/_libtiff/libtiff-CVE-2019-6128.patch
new file mode 100644
index 000000000..192ea592a
--- /dev/null
+++ b/data/_libtiff/libtiff-CVE-2019-6128.patch
@@ -0,0 +1,49 @@
+From 99cab41801c37588f67396d836c5b677aba498ce Mon Sep 17 00:00:00 2001
+From: Scott Gayou <github.scott@gmail.com>
+Date: Wed, 23 Jan 2019 15:03:53 -0500
+Subject: [PATCH] Fix for simple memory leak that was assigned CVE-2019-6128.
+
+pal2rgb failed to free memory on a few errors. This was reported
+here: http://bugzilla.maptools.org/show_bug.cgi?id=2836.
+---
+ tools/pal2rgb.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/tools/pal2rgb.c b/tools/pal2rgb.c
+index 01d8502..9492f1c 100644
+--- a/tools/pal2rgb.c
++++ b/tools/pal2rgb.c
+@@ -118,12 +118,14 @@ main(int argc, char* argv[])
+ 	    shortv != PHOTOMETRIC_PALETTE) {
+ 		fprintf(stderr, "%s: Expecting a palette image.\n",
+ 		    argv[optind]);
++		(void) TIFFClose(in);
+ 		return (-1);
+ 	}
+ 	if (!TIFFGetField(in, TIFFTAG_COLORMAP, &rmap, &gmap, &bmap)) {
+ 		fprintf(stderr,
+ 		    "%s: No colormap (not a valid palette image).\n",
+ 		    argv[optind]);
++		(void) TIFFClose(in);
+ 		return (-1);
+ 	}
+ 	bitspersample = 0;
+@@ -131,11 +133,14 @@ main(int argc, char* argv[])
+ 	if (bitspersample != 8) {
+ 		fprintf(stderr, "%s: Sorry, can only handle 8-bit images.\n",
+ 		    argv[optind]);
++		(void) TIFFClose(in);
+ 		return (-1);
+ 	}
+ 	out = TIFFOpen(argv[optind+1], "w");
+-	if (out == NULL)
++	if (out == NULL) {
++		(void) TIFFClose(in);
+ 		return (-2);
++	}
+ 	cpTags(in, out);
+ 	TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &imagewidth);
+ 	TIFFGetField(in, TIFFTAG_IMAGELENGTH, &imagelength);
+-- 
+2.17.2
+
diff --git a/data/_libtiff/make.sh b/data/_libtiff/make.sh
new file mode 100644
index 000000000..b78ddd2d2
--- /dev/null
+++ b/data/_libtiff/make.sh
@@ -0,0 +1,4 @@
+pkg:setup
+pkg:configure
+pkg:make
+pkg:install
diff --git a/data/_libtiff/patches.sh b/data/_libtiff/patches.sh
new file mode 100755
index 000000000..f692ec1a3
--- /dev/null
+++ b/data/_libtiff/patches.sh
@@ -0,0 +1 @@
+wget https://raw.githubusercontent.com/Homebrew/formula-patches/d15e00544e7df009b5ad34f3b65351fc249092c0/libtiff/libtiff-CVE-2019-6128.patch
diff --git a/data/_libtiff/tiff-4.0.10.tar.gz b/data/_libtiff/tiff-4.0.10.tar.gz
new file mode 100644
index 000000000..28cb56d66
Binary files /dev/null and b/data/_libtiff/tiff-4.0.10.tar.gz differ
diff --git a/data/libtiff-dev/_metadata/_libtiff.dep b/data/libtiff-dev/_metadata/_libtiff.dep
new file mode 120000
index 000000000..e7b868887
--- /dev/null
+++ b/data/libtiff-dev/_metadata/_libtiff.dep
@@ -0,0 +1 @@
+../../_libtiff
\ No newline at end of file
diff --git a/data/libtiff-dev/_metadata/description b/data/libtiff-dev/_metadata/description
new file mode 100644
index 000000000..b274f794c
--- /dev/null
+++ b/data/libtiff-dev/_metadata/description
@@ -0,0 +1 @@
+TIFF library and utilities (Development)
diff --git a/data/libtiff-dev/_metadata/homepage b/data/libtiff-dev/_metadata/homepage
new file mode 100644
index 000000000..9639140d2
--- /dev/null
+++ b/data/libtiff-dev/_metadata/homepage
@@ -0,0 +1 @@
+http://libtiff.maptools.org/
diff --git a/data/libtiff-dev/_metadata/in.1443.00 b/data/libtiff-dev/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
diff --git a/data/libtiff-dev/_metadata/maintainer b/data/libtiff-dev/_metadata/maintainer
new file mode 120000
index 000000000..0c538aadb
--- /dev/null
+++ b/data/libtiff-dev/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/mac
\ No newline at end of file
diff --git a/data/libtiff-dev/_metadata/priority b/data/libtiff-dev/_metadata/priority
new file mode 100644
index 000000000..134d9bc32
--- /dev/null
+++ b/data/libtiff-dev/_metadata/priority
@@ -0,0 +1 @@
+optional
diff --git a/data/libtiff-dev/_metadata/role b/data/libtiff-dev/_metadata/role
new file mode 100644
index 000000000..8d0320866
--- /dev/null
+++ b/data/libtiff-dev/_metadata/role
@@ -0,0 +1 @@
+developer
diff --git a/data/libtiff-dev/_metadata/section b/data/libtiff-dev/_metadata/section
new file mode 100644
index 000000000..e0eb96881
--- /dev/null
+++ b/data/libtiff-dev/_metadata/section
@@ -0,0 +1 @@
+Development
diff --git a/data/libtiff-dev/_metadata/tags b/data/libtiff-dev/_metadata/tags
new file mode 100644
index 000000000..a8928cec8
--- /dev/null
+++ b/data/libtiff-dev/_metadata/tags
@@ -0,0 +1 @@
+purpose::library
diff --git a/data/libtiff-dev/_metadata/version b/data/libtiff-dev/_metadata/version
new file mode 100644
index 000000000..2d2d68106
--- /dev/null
+++ b/data/libtiff-dev/_metadata/version
@@ -0,0 +1 @@
+4.0.10
diff --git a/data/libtiff-dev/make.sh b/data/libtiff-dev/make.sh
new file mode 100644
index 000000000..156f693d7
--- /dev/null
+++ b/data/libtiff-dev/make.sh
@@ -0,0 +1,3 @@
+pkg: mkdir -p "${PKG_TAPF:-/usr}"/lib
+cp -a "$(PKG_DEST_ _libtiff)""${PKG_TAPF:-/usr}"/include "${PKG_DEST}""${PKG_TAPF:-/usr}"/
+cp -a "$(PKG_DEST_ _libtiff)""${PKG_TAPF:-/usr}"/lib/pkgconfig "${PKG_DEST}""${PKG_TAPF:-/usr}"/lib/
diff --git a/data/libtiff5/_metadata/_libtiff.dep b/data/libtiff5/_metadata/_libtiff.dep
new file mode 120000
index 000000000..e7b868887
--- /dev/null
+++ b/data/libtiff5/_metadata/_libtiff.dep
@@ -0,0 +1 @@
+../../_libtiff
\ No newline at end of file
diff --git a/data/libtiff5/_metadata/description b/data/libtiff5/_metadata/description
new file mode 100644
index 000000000..55244923d
--- /dev/null
+++ b/data/libtiff5/_metadata/description
@@ -0,0 +1 @@
+TIFF library and utilities
diff --git a/data/libtiff5/_metadata/homepage b/data/libtiff5/_metadata/homepage
new file mode 100644
index 000000000..9639140d2
--- /dev/null
+++ b/data/libtiff5/_metadata/homepage
@@ -0,0 +1 @@
+http://libtiff.maptools.org/
diff --git a/data/libtiff5/_metadata/in.1443.00 b/data/libtiff5/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
diff --git a/data/libtiff5/_metadata/maintainer b/data/libtiff5/_metadata/maintainer
new file mode 120000
index 000000000..0c538aadb
--- /dev/null
+++ b/data/libtiff5/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/mac
\ No newline at end of file
diff --git a/data/libtiff5/_metadata/name b/data/libtiff5/_metadata/name
new file mode 100644
index 000000000..b5d927294
--- /dev/null
+++ b/data/libtiff5/_metadata/name
@@ -0,0 +1 @@
+libtiff
diff --git a/data/libtiff5/_metadata/priority b/data/libtiff5/_metadata/priority
new file mode 100644
index 000000000..134d9bc32
--- /dev/null
+++ b/data/libtiff5/_metadata/priority
@@ -0,0 +1 @@
+optional
diff --git a/data/libtiff5/_metadata/role b/data/libtiff5/_metadata/role
new file mode 100644
index 000000000..8d0320866
--- /dev/null
+++ b/data/libtiff5/_metadata/role
@@ -0,0 +1 @@
+developer
diff --git a/data/libtiff5/_metadata/section b/data/libtiff5/_metadata/section
new file mode 100644
index 000000000..593877746
--- /dev/null
+++ b/data/libtiff5/_metadata/section
@@ -0,0 +1 @@
+Multimedia
diff --git a/data/libtiff5/_metadata/tags b/data/libtiff5/_metadata/tags
new file mode 100644
index 000000000..a8928cec8
--- /dev/null
+++ b/data/libtiff5/_metadata/tags
@@ -0,0 +1 @@
+purpose::library
diff --git a/data/libtiff5/_metadata/version b/data/libtiff5/_metadata/version
new file mode 100644
index 000000000..2d2d68106
--- /dev/null
+++ b/data/libtiff5/_metadata/version
@@ -0,0 +1 @@
+4.0.10
diff --git a/data/libtiff5/make.sh b/data/libtiff5/make.sh
new file mode 100644
index 000000000..b3c32c0db
--- /dev/null
+++ b/data/libtiff5/make.sh
@@ -0,0 +1,4 @@
+pkg: mkdir -p "${PKG_TAPF}"/lib
+#  XXX: Should we split the bins too?
+cp -a "$(PKG_DEST_ _libtiff)"/"${PKG_TAPF}"/lib/lib*.dylib "${PKG_DEST}"/"${PKG_TAPF}"/lib
+cp -a "$(PKG_DEST_ _libtiff)"/"${PKG_TAPF}"/bin "${PKG_DEST}"/"${PKG_TAPF}"/
-- 
cgit v1.2.3