From 60feabdb7c8a13957f7a41f6736302f4ef4e5a36 Mon Sep 17 00:00:00 2001
From: MCApollo <34170230+MCApollo@users.noreply.github.com>
Date: Fri, 3 May 2019 19:35:53 +0000
Subject: Devel package (4)

---
 data/libtiff/.beer                       |  35 ----------------------
 data/libtiff/_metadata/_libtiff.dep      |   1 +
 data/libtiff/_metadata/description       |   2 +-
 data/libtiff/_metadata/homepage          |   2 +-
 data/libtiff/_metadata/in.1443.00        |   1 +
 data/libtiff/_metadata/maintainer        |   1 +
 data/libtiff/_metadata/name              |   2 +-
 data/libtiff/_metadata/priority          |   2 +-
 data/libtiff/_metadata/role              |   2 +-
 data/libtiff/_metadata/section           |   2 +-
 data/libtiff/_metadata/tags              |   2 +-
 data/libtiff/_metadata/version           |   2 +-
 data/libtiff/download.sh                 |   1 -
 data/libtiff/libtiff-CVE-2019-6128.patch |  49 -------------------------------
 data/libtiff/make.sh                     |   8 ++---
 data/libtiff/patches.sh                  |   1 -
 data/libtiff/tiff-4.0.10.tar.gz          | Bin 2402867 -> 0 bytes
 17 files changed, 15 insertions(+), 98 deletions(-)
 delete mode 100644 data/libtiff/.beer
 create mode 120000 data/libtiff/_metadata/_libtiff.dep
 mode change 100644 => 120000 data/libtiff/_metadata/description
 mode change 100644 => 120000 data/libtiff/_metadata/homepage
 mode change 100644 => 120000 data/libtiff/_metadata/in.1443.00
 create mode 120000 data/libtiff/_metadata/maintainer
 mode change 100644 => 120000 data/libtiff/_metadata/name
 mode change 100644 => 120000 data/libtiff/_metadata/priority
 mode change 100644 => 120000 data/libtiff/_metadata/role
 mode change 100644 => 120000 data/libtiff/_metadata/section
 mode change 100644 => 120000 data/libtiff/_metadata/tags
 mode change 100644 => 120000 data/libtiff/_metadata/version
 delete mode 100755 data/libtiff/download.sh
 delete mode 100644 data/libtiff/libtiff-CVE-2019-6128.patch
 delete mode 100755 data/libtiff/patches.sh
 delete mode 100644 data/libtiff/tiff-4.0.10.tar.gz

(limited to 'data/libtiff')

diff --git a/data/libtiff/.beer b/data/libtiff/.beer
deleted file mode 100644
index 2f85bea9d..000000000
--- a/data/libtiff/.beer
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "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/_libtiff.dep b/data/libtiff/_metadata/_libtiff.dep
new file mode 120000
index 000000000..e7b868887
--- /dev/null
+++ b/data/libtiff/_metadata/_libtiff.dep
@@ -0,0 +1 @@
+../../_libtiff
\ No newline at end of file
diff --git a/data/libtiff/_metadata/description b/data/libtiff/_metadata/description
deleted file mode 100644
index 55244923d..000000000
--- a/data/libtiff/_metadata/description
+++ /dev/null
@@ -1 +0,0 @@
-TIFF library and utilities
diff --git a/data/libtiff/_metadata/description b/data/libtiff/_metadata/description
new file mode 120000
index 000000000..05c257ed2
--- /dev/null
+++ b/data/libtiff/_metadata/description
@@ -0,0 +1 @@
+../../_libtiff/_metadata/description
\ No newline at end of file
diff --git a/data/libtiff/_metadata/homepage b/data/libtiff/_metadata/homepage
deleted file mode 100644
index 9639140d2..000000000
--- a/data/libtiff/_metadata/homepage
+++ /dev/null
@@ -1 +0,0 @@
-http://libtiff.maptools.org/
diff --git a/data/libtiff/_metadata/homepage b/data/libtiff/_metadata/homepage
new file mode 120000
index 000000000..5c7a98382
--- /dev/null
+++ b/data/libtiff/_metadata/homepage
@@ -0,0 +1 @@
+../../_libtiff/_metadata/homepage
\ No newline at end of file
diff --git a/data/libtiff/_metadata/in.1443.00 b/data/libtiff/_metadata/in.1443.00
deleted file mode 100644
index e69de29bb..000000000
diff --git a/data/libtiff/_metadata/in.1443.00 b/data/libtiff/_metadata/in.1443.00
new file mode 120000
index 000000000..e37359bd2
--- /dev/null
+++ b/data/libtiff/_metadata/in.1443.00
@@ -0,0 +1 @@
+../../_libtiff/_metadata/in.1443.00
\ 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
deleted file mode 100644
index b5d927294..000000000
--- a/data/libtiff/_metadata/name
+++ /dev/null
@@ -1 +0,0 @@
-libtiff
diff --git a/data/libtiff/_metadata/name b/data/libtiff/_metadata/name
new file mode 120000
index 000000000..ef35aab7e
--- /dev/null
+++ b/data/libtiff/_metadata/name
@@ -0,0 +1 @@
+../../_libtiff/_metadata/name
\ No newline at end of file
diff --git a/data/libtiff/_metadata/priority b/data/libtiff/_metadata/priority
deleted file mode 100644
index 134d9bc32..000000000
--- a/data/libtiff/_metadata/priority
+++ /dev/null
@@ -1 +0,0 @@
-optional
diff --git a/data/libtiff/_metadata/priority b/data/libtiff/_metadata/priority
new file mode 120000
index 000000000..7b0fe1153
--- /dev/null
+++ b/data/libtiff/_metadata/priority
@@ -0,0 +1 @@
+../../_libtiff/_metadata/priority
\ No newline at end of file
diff --git a/data/libtiff/_metadata/role b/data/libtiff/_metadata/role
deleted file mode 100644
index 8d0320866..000000000
--- a/data/libtiff/_metadata/role
+++ /dev/null
@@ -1 +0,0 @@
-developer
diff --git a/data/libtiff/_metadata/role b/data/libtiff/_metadata/role
new file mode 120000
index 000000000..709eff406
--- /dev/null
+++ b/data/libtiff/_metadata/role
@@ -0,0 +1 @@
+../../_libtiff/_metadata/role
\ No newline at end of file
diff --git a/data/libtiff/_metadata/section b/data/libtiff/_metadata/section
deleted file mode 100644
index e0eb96881..000000000
--- a/data/libtiff/_metadata/section
+++ /dev/null
@@ -1 +0,0 @@
-Development
diff --git a/data/libtiff/_metadata/section b/data/libtiff/_metadata/section
new file mode 120000
index 000000000..288f48688
--- /dev/null
+++ b/data/libtiff/_metadata/section
@@ -0,0 +1 @@
+../../_libtiff/_metadata/section
\ No newline at end of file
diff --git a/data/libtiff/_metadata/tags b/data/libtiff/_metadata/tags
deleted file mode 100644
index a8928cec8..000000000
--- a/data/libtiff/_metadata/tags
+++ /dev/null
@@ -1 +0,0 @@
-purpose::library
diff --git a/data/libtiff/_metadata/tags b/data/libtiff/_metadata/tags
new file mode 120000
index 000000000..9c8b049b0
--- /dev/null
+++ b/data/libtiff/_metadata/tags
@@ -0,0 +1 @@
+../../_libtiff/_metadata/tags
\ No newline at end of file
diff --git a/data/libtiff/_metadata/version b/data/libtiff/_metadata/version
deleted file mode 100644
index 2d2d68106..000000000
--- a/data/libtiff/_metadata/version
+++ /dev/null
@@ -1 +0,0 @@
-4.0.10
diff --git a/data/libtiff/_metadata/version b/data/libtiff/_metadata/version
new file mode 120000
index 000000000..1bfe805ed
--- /dev/null
+++ b/data/libtiff/_metadata/version
@@ -0,0 +1 @@
+../../_libtiff/_metadata/version
\ No newline at end of file
diff --git a/data/libtiff/download.sh b/data/libtiff/download.sh
deleted file mode 100755
index 12425d31e..000000000
--- a/data/libtiff/download.sh
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 192ea592a..000000000
--- a/data/libtiff/libtiff-CVE-2019-6128.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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
index b78ddd2d2..b3c32c0db 100644
--- a/data/libtiff/make.sh
+++ b/data/libtiff/make.sh
@@ -1,4 +1,4 @@
-pkg:setup
-pkg:configure
-pkg:make
-pkg:install
+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}"/
diff --git a/data/libtiff/patches.sh b/data/libtiff/patches.sh
deleted file mode 100755
index f692ec1a3..000000000
--- a/data/libtiff/patches.sh
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 28cb56d66..000000000
Binary files a/data/libtiff/tiff-4.0.10.tar.gz and /dev/null differ
-- 
cgit v1.2.3