Add libtiff license as accepted

The libtiff license is BSD-3-clause compatible, but written with more
MIT style language choice.

.custom_sources.yml

@@ -97,6 +97,9 @@ libpng:
 libjpeg-turbo:
   remote: "git@dev.gitlab.org:omnibus-mirror/libjpeg-turbo.git"
   alternative: "https://gitlab.com/gitlab-org/build/omnibus-mirror/libjpeg-turbo.git"
+libtiff:
+  remote: "git@dev.gitlab.org:omnibus-mirror/libtiff.git"
+  alternative: "https://gitlab.com/gitlab-org/build/omnibus-mirror/libtiff.git"
 exiftool:
   remote: "git@dev.gitlab.org:omnibus-mirror/exiftool.git"
   alternative: "https://gitlab.com/gitlab-org/build/omnibus-mirror/exiftool.git"

changelogs/unreleased/add-libtiff-library.yml

+---
+title: Add libtiff as a dependency
+merge_request: 4047
+author:
+type: added

config/software/graphicsmagick.rb

@@ -24,6 +24,7 @@ skip_transitive_dependency_licensing true
 dependency 'libpng'
 dependency 'libjpeg-turbo'
+dependency 'libtiff'
 dependency 'zlib'
 source url: "https://ftp.icm.edu.pl/pub/unix/graphics/GraphicsMagick/1.3/GraphicsMagick-#{version}.tar.gz",
@@ -48,14 +49,14 @@ build do
     '--without-webp',
     '--without-jp2',
     '--without-lcms2',
-    '--without-lzma',
-    '--without-tiff',
     '--without-trio',
     '--without-ttf',
     '--without-umem',
     '--without-wmf',
     '--without-xml',
     '--without-x',
+    '--with-tiff=yes',
+    '--with-lzma=yes',
     '--with-jpeg=yes',
     '--with-zlib=yes',
     '--with-png=yes',

config/software/libjpeg-turbo.rb

@@ -34,6 +34,7 @@ build do
   configure_command = [
     'cmake',
     '-G"Unix Makefiles"',
+    "-DCMAKE_INSTALL_LIBDIR:PATH=lib", # ensure lib64 isn't used
     "-DCMAKE_INSTALL_PREFIX=#{install_dir}/embedded"
   ]

config/software/libtiff.rb

+#
+# Copyright:: Copyright (c) 2020 GitLab Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name 'libtiff'
+version = Gitlab::Version.new('libtiff', 'v4.1.0')
+
+default_version version.print(false)
+
+license 'libtiff' # BSD-3 Clause compatible
+license_file 'COPYRIGHT'
+
+skip_transitive_dependency_licensing true
+
+dependency 'libtool'
+dependency 'zlib'
+dependency 'liblzma'
+dependency 'libjpeg-turbo'
+
+source git: version.remote
+
+build do
+  env = with_standard_compiler_flags(with_embedded_path)
+
+  # Use cmake for CentOS 6 builds
+  # CentOS 6 doesn't have a new enough version of automake, so we need to use
+  # the cmake build steps, but the cmake steps aren't working properly in
+  # Debian 8, which is why we don't just switch to cmake for all platforms
+  if ohai['platform'] =~ /centos/ && ohai['platform_version'] =~ /^6/
+    configure_command = [
+      'cmake',
+      '-G"Unix Makefiles"',
+      '-Dzstd=OFF',
+      "-DZLIB_ROOT=#{install_dir}/embedded",
+      "-DCMAKE_INSTALL_LIBDIR:PATH=lib", # ensure lib64 isn't used
+      "-DCMAKE_INSTALL_RPATH=#{install_dir}/embedded/lib",
+      "-DCMAKE_FIND_ROOT_PATH=#{install_dir}/embedded",
+      "-DCMAKE_PREFIX_PATH=#{install_dir}/embedded",
+      "-DCMAKE_INSTALL_PREFIX=#{install_dir}/embedded"
+    ]
+  else
+    command './autogen.sh', env: env
+
+    configure_command = [
+      './configure',
+      '--disable-zstd',
+      "--prefix=#{install_dir}/embedded"
+    ]
+  end
+
+  command configure_command.join(' '), env: env
+
+  make "-j #{workers} install", env: env
+end

deps.yml

@@ -147,6 +147,12 @@ dependencies:
         replace_in_files:
         - filename: config/software/libjpeg-turbo.rb
           pattern: "Gitlab::Version.new\\('libjpeg-turbo', '(\\S+)'\\)"
+      #libtiff
+      https://gitlab.com/libtiff/libtiff.git:
+        replace_in_files:
+        - filename: config/software/libtiff.rb
+          pattern: "Gitlab::Version.new\\('libtiff', 'v(\\S+)'\\)"
+          tag_prefix: 'v'
       # deps that need updated filtering to work https://github.com/dropseed/deps-git/issues/2
       # krb5

lib/gitlab/license/analyzer.rb

@@ -7,7 +7,7 @@ module License
                                         /Unlicense/i, /Artistic/i, /MPL/i, /AFL/i,
                                         /CC-BY-[0-9]*/, /^project_license$/, /OpenSSL/i,
                                         /ZLib/i, /jemalloc/i, /Python/i, /PostgreSQL/i,
-                                        /Info-Zip/i, /Libpng/i, /Mozilla Public/i, /WTFPL/, /CC0/])
+                                        /Info-Zip/i, /Libpng/i, /Mozilla Public/i, /libtiff/i, /WTFPL/, /CC0/])
     # TODO: Re-confirm that licenses Python, Info-Zip, OpenSSL and CC-BY are
     # OK to be shipped. https://gitlab.com/gitlab-org/omnibus-gitlab/issues/2448