Merge branch 'kerberos_dependency' into 'master'

Kerberos dependency

See merge request !269
This commit is contained in:
Marin Jankovski 2014-12-18 11:28:45 +00:00
commit 66fd3a85cc
4 changed files with 54 additions and 3 deletions

View File

@ -0,0 +1,4 @@
6303c6303
< ac_fn_c_check_header_mongrel "$LINENO" "keyutils.h" "ac_cv_header_keyutils_h" "$ac_includes_default"
---
> #ac_fn_c_check_header_mongrel "$LINENO" "keyutils.h" "ac_cv_header_keyutils_h" "$ac_includes_default"

View File

@ -47,6 +47,7 @@ dependency "gitlab-ctl"
dependency "gitlab-cookbooks"
dependency "gitlab-selinux"
dependency "gitlab-config-template"
dependency "krb5"
# version manifest file
dependency "version-manifest"

46
config/software/krb5.rb Normal file
View File

@ -0,0 +1,46 @@
#
# Copyright:: Copyright (c) 2014 GitLab B.V.
# License:: Apache License, Version 2.0
#
# 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 "krb5"
default_version "1.13"
source url: "http://web.mit.edu/kerberos/dist/krb5/#{version}/krb5-#{version}-signed.tar",
md5: 'fa5d4dcd7b79e2165d0ec4affa0956ea'
relative_path "krb5-#{version}"
build do
env = with_standard_compiler_flags(with_embedded_path)
command "tar xf krb5-#{version}.tar.gz", cwd: Config.source_dir
# 'configure' will detect libkeyutils and set up the krb5 build
# to link against it. This gives us trouble during the Omnibus 'health
# check'. The patch below tries to corrupt 'configure' in such a way that
# 'libkeyutils' will not get added.
patch source: 'disable-keyutils.patch', target: 'src/configure'
command "./configure" \
" --prefix=#{install_dir}/embedded", env: env, cwd: "#{Config.source_dir}/krb5-#{version}/src"
command "./configure" \
" --prefix=#{install_dir}/embedded", env: env, cwd: "#{Config.source_dir}/krb5-#{version}/src"
command "make -j #{max_build_jobs}", env: env, cwd: "#{Config.source_dir}/krb5-#{version}/src"
command "make install", cwd: "#{Config.source_dir}/krb5-#{version}/src"
end

View File

@ -20,7 +20,7 @@ grep '^[^#]*PasswordAuthentication' /etc/ssh/sshd_config
sudo service ssh reload
# Install dependencies
sudo apt-get install ruby1.9.1 ruby1.9.1-dev git build-essential cmake
sudo apt-get install ruby1.9.1 ruby1.9.1-dev git build-essential cmake byacc
sudo gem install --no-ri --no-rdoc bundler
# Create the build user
@ -67,7 +67,7 @@ sudo service sshd reload
sudo yum groupinstall 'Development Tools'
# Install RedHat Software Collections to get Ruby 1.9.3
sudo yum install centos-release-SCL
sudo yum install ruby193 ruby193-ruby-devel
sudo yum install ruby193 ruby193-ruby-devel byacc
# Create the build user
sudo adduser -c 'Omnibus Build' omnibus-build
@ -112,7 +112,7 @@ grep '^[^#]*PasswordAuthentication' /etc/ssh/sshd_config
sudo systemctl reload sshd
sudo yum groupinstall 'Development Tools'
sudo yum install ruby ruby-devel cmake
sudo yum install ruby ruby-devel cmake byacc
sudo gem install bundler --no-ri --no-rdoc
# Create the build user