Revert "Revert "Merge branch '2836-bundle-gpgme' into 'master'""

This reverts commit 97eaa423.

CHANGELOG.md

@@ -7,6 +7,7 @@ omnibus-gitlab repository.
 - Add workhorse metrics to Prometheus
 - Add sidekiq metrics to Prometheus
+- Include gpgme, gnupg and their dependencies
 - Make it possible to configure an external Geo tracking database
 - Add gitaly metrics to Prometheus
 - Upgrade node-exporter to 0.15.2

config/software/gitlab-rails.rb

@@ -48,6 +48,7 @@ dependency 'registry'
 dependency 'gitlab-pages'
 dependency 'unzip'
 dependency 'libre2'
+dependency 'gpgme'
 if EE
   dependency 'mysql-client'
@@ -70,6 +71,7 @@ build do
   bundle_without = %w(development test)
   bundle_without << 'mysql' unless EE
   bundle 'config build.rugged --no-use-system-libraries', env: env
+  bundle 'config build.gpgme --use-system-libraries', env: env
   bundle "install --without #{bundle_without.join(' ')} --jobs #{workers} --retry 5", env: env
   # One of our gems, google-protobuf is known to have issues with older gcc versions

config/software/gnupg.rb

+#
+# Copyright:: Copyright (c) 2017 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 'gnupg'
+default_version '2.1.15'
+
+dependency 'libassuan'
+dependency 'npth'
+dependency 'libgcrypt'
+dependency 'libksba'
+
+license 'LGPL-2.1'
+license_file 'COPYING.LGPL3'
+
+source url: "https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-#{version}.tar.bz2",
+       sha256: 'c28c1a208f1b8ad63bdb6b88d252f6734ff4d33de6b54e38494b11d49e00ffdd'
+
+relative_path "gnupg-#{version}"
+
+build do
+  env = with_standard_compiler_flags(with_embedded_path)
+  command './configure ' \
+    "--prefix=#{install_dir}/embedded --disable-doc", env: env
+
+  make "-j #{workers}", env: env
+  make 'install', env: env
+end

config/software/gpgme.rb

+#
+# Copyright:: Copyright (c) 2017 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 'gpgme'
+default_version '1.9.0'
+
+dependency 'libassuan'
+dependency 'gnupg'
+
+license 'LGPL-2.1'
+license_file 'COPYING.LESSER'
+
+source url: "https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-#{version}.tar.bz2",
+       sha256: '1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb'
+
+relative_path "gpgme-#{version}"
+
+build do
+  env = with_standard_compiler_flags(with_embedded_path)
+  command './configure ' \
+    "--prefix=#{install_dir}/embedded --disable-doc", env: env
+
+  make "-j #{workers}", env: env
+  make 'install', env: env
+end

config/software/libassuan.rb

+#
+# Copyright:: Copyright (c) 2017 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 'libassuan'
+default_version '2.4.4'
+
+license 'LGPL-2.1'
+license_file 'COPYING.LIB'
+
+source url: "https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-#{version}.tar.bz2",
+       sha256: '9e69a102272324de0bb56025779f84fd44901afcc6eac51505f6a63ea5737ca1'
+
+dependency 'libgpg-error'
+
+relative_path "libassuan-#{version}"
+
+build do
+  env = with_standard_compiler_flags(with_embedded_path)
+  command './configure ' \
+    "--prefix=#{install_dir}/embedded --disable-doc", env: env
+
+  make "-j #{workers}", env: env
+  make 'install', env: env
+end

config/software/libgcrypt.rb

+#
+# Copyright:: Copyright (c) 2017 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 'libgcrypt'
+default_version '1.8.1'
+
+dependency 'libgpg-error'
+
+license 'LGPL-2.1'
+license_file 'COPYING.LIB'
+
+source url: "https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-#{version}.tar.bz2",
+       sha256: '7a2875f8b1ae0301732e878c0cca2c9664ff09ef71408f085c50e332656a78b3'
+
+relative_path "libgcrypt-#{version}"
+
+build do
+  env = with_standard_compiler_flags(with_embedded_path)
+  command './configure ' \
+    "--prefix=#{install_dir}/embedded --disable-doc", env: env
+
+  make "-j #{workers}", env: env
+  make 'install', env: env
+end

config/software/libgpg-error.rb

+#
+# Copyright:: Copyright (c) 2017 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 'libgpg-error'
+default_version '1.27'
+
+license 'LGPL-2.1'
+license_file 'COPYING.LIB'
+
+source url: "https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-#{version}.tar.bz2",
+       sha256: '4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2'
+
+relative_path "libgpg-error-#{version}"
+
+build do
+  env = with_standard_compiler_flags(with_embedded_path)
+  command './configure ' \
+    "--prefix=#{install_dir}/embedded --disable-doc", env: env
+
+  make "-j #{workers}", env: env
+  make 'install', env: env
+end

config/software/libksba.rb

+#
+# Copyright:: Copyright (c) 2017 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 'libksba'
+default_version '1.3.5'
+
+dependency 'libgpg-error'
+
+license 'LGPL-3'
+license_file 'COPYING.LGPLv3'
+
+source url: "https://www.gnupg.org/ftp/gcrypt/libksba/libksba-#{version}.tar.bz2",
+       sha256: '41444fd7a6ff73a79ad9728f985e71c9ba8cd3e5e53358e70d5f066d35c1a340'
+
+relative_path "libksba-#{version}"
+
+build do
+  env = with_standard_compiler_flags(with_embedded_path)
+  command './configure ' \
+    "--prefix=#{install_dir}/embedded --disable-doc", env: env
+
+  make "-j #{workers}", env: env
+  make 'install', env: env
+end

config/software/npth.rb

+#
+# Copyright:: Copyright (c) 2017 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 'npth'
+default_version '1.5'
+
+license 'LGPL-2.1'
+license_file 'COPYING.LIB'
+
+source url: "https://www.gnupg.org/ftp/gcrypt/npth/npth-#{version}.tar.bz2",
+       sha256: '294a690c1f537b92ed829d867bee537e46be93fbd60b16c04630fbbfcd9db3c2'
+
+relative_path "npth-#{version}"
+
+build do
+  env = with_standard_compiler_flags(with_embedded_path)
+  command './configure ' \
+    "--prefix=#{install_dir}/embedded --disable-doc", env: env
+
+  make "-j #{workers}", env: env
+  make 'install', env: env
+end