Date: Thursday, October 24, 2019 @ 18:58:01 Author: svenstaro Revision: 518824
archrelease: copy trunk to community-x86_64 Added: gitlab-shell/repos/community-x86_64/PKGBUILD (from rev 518823, gitlab-shell/trunk/PKGBUILD) gitlab-shell/repos/community-x86_64/gitlab-shell.gitconfig (from rev 518823, gitlab-shell/trunk/gitlab-shell.gitconfig) gitlab-shell/repos/community-x86_64/gitlab-shell.install (from rev 518823, gitlab-shell/trunk/gitlab-shell.install) gitlab-shell/repos/community-x86_64/gitlab-shell.sysusers (from rev 518823, gitlab-shell/trunk/gitlab-shell.sysusers) Deleted: gitlab-shell/repos/community-x86_64/PKGBUILD gitlab-shell/repos/community-x86_64/gitlab-shell.gitconfig gitlab-shell/repos/community-x86_64/gitlab-shell.install gitlab-shell/repos/community-x86_64/gitlab-shell.sysusers ------------------------+ PKGBUILD | 202 +++++++++++++++++++++++------------------------ gitlab-shell.gitconfig | 10 +- gitlab-shell.install | 18 ++-- gitlab-shell.sysusers | 2 4 files changed, 116 insertions(+), 116 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-10-24 18:57:45 UTC (rev 518823) +++ PKGBUILD 2019-10-24 18:58:01 UTC (rev 518824) @@ -1,101 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Contributor: Pavol (Lopo) Hluchy <lopo AT losys DOT eu> -# Contributor: Massimiliano Torromeo <massimiliano.torro...@gmail.com> -# Contributor: Jonas Heinrich <o...@project-insnaity.org> -# Contributor: Lee Watson <a...@revthefox.co.uk> -# Contributor: Tobias Hunger <tobias DOT hunger AT gmail DOT com> -# Contributor: Stefan Tatschner <ste...@sevenbyte.org> - - -# NOTE: Gitlab isn't always compatible with modern Ruby versions. In that case, check the -# commit log for an old fix on how to tell it to use older versions of Ruby. I'm afraid we'll -# need this again at some point in the future. -pkgname=gitlab-shell -pkgver=10.0.0 -pkgrel=2 -epoch=2 -pkgdesc="Git management software" -arch=('x86_64') -url="https://gitlab.com/gitlab-org/gitlab-shell/" -license=('MIT') -depends=('ruby2.5' 'redis' 'git') -makedepends=('go-pie') -options=('!strip') -install=gitlab-shell.install -backup=("etc/webapps/${pkgname}/config.yml" - "etc/webapps/${pkgname}/secret" - "etc/webapps/${pkgname}/gitconfig" - "etc/webapps/${pkgname}/authorized_keys" - "etc/webapps/${pkgname}/") -source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/api/v4/projects/gitlab-org%2Fgitlab-shell/repository/archive?sha=v${pkgver}" - "gitlab-shell.gitconfig" - "gitlab-shell.sysusers") -sha512sums=('6c31dcb83bb5d0bd1e282fb143e9ff135c2fcd224208f4a6fa4332d84f7d56d6d03490e97431a6bba97f7aa80cc2007a7b54c53e48546ed12ec01dc7931cb010' - '5caafe5300621ced58479e724b39656afc17f32a64ecde5dfa4919683ef37d9121552c78f066678472acb56e0a34b5c3cf34d9b44414d1ed5d91f725d180fa43' - '196fd5519f1019815562da5b8bfde1d8082614cee6e63d75a7bb673db8b3c409384177dcf3dd0436c2adeec273b4ffea690058c2c457ae6a82d4f805e860495f') - -_datadir="/usr/share/webapps/${pkgname}" -_etcdir="/etc/webapps/${pkgname}" -_homedir="/var/lib/gitlab" -_logdir="/var/log/gitlab" -_srcdir="gitlab-shell-v${pkgver}" - -prepare() { - cd "${srcdir}/${_srcdir}"-* - - sed -e "s|user: git|user: gitlab|" \ - -e "s|/home/git|${_homedir}|" \ - -e "s|# log_file: .*|log_file: \"${_logdir}/gitlab-shell.log\"|" \ - -e "s|# host:|host:|" \ - -e "s|# port:|port:|" \ - -e "s|socket:|# socket:|" \ - config.yml.example > config.yml - - for file in {bin,hooks}/*; do - sed -i s/ruby/ruby-2.5/g ${file} - done -} - -build() { - cd "${srcdir}/${_srcdir}"-* - - ./bin/compile -} - -package() { - cd "${srcdir}/${_srcdir}"-* - - install -dm755 -o root -g root "${pkgdir}${_datadir}" - install -dm750 -o 105 -g 105 "${pkgdir}${_homedir}" - install -dm750 -o 105 -g 105 "${pkgdir}${_homedir}/satellites" - install -dm700 -o 105 -g 105 "${pkgdir}${_homedir}/.ssh" - install -dm750 -o 105 -g 105 "${pkgdir}${_etcdir}" - install -dm770 -o 105 -g root "${pkgdir}${_logdir}" - - # sysusers - install -Dm644 "${srcdir}/gitlab-shell.sysusers" "${pkgdir}/usr/lib/sysusers.d/gitlab-shell.conf" - - # .gitconfig - install -Dm644 -o 105 -g 105 "${srcdir}/gitlab-shell.gitconfig" "${pkgdir}${_etcdir}/.gitconfig" - ln -fs "${_etcdir}/.gitconfig" "${pkgdir}${_homedir}/.gitconfig" - - # .gitlab_shell_secret - touch "${pkgdir}${_etcdir}/secret" - chmod 640 "${pkgdir}${_etcdir}/secret" - chown root:105 "${pkgdir}${_etcdir}/secret" - ln -fs "${_etcdir}/secret" "${pkgdir}${_datadir}/.gitlab_shell_secret" - - # config.yml - mv config.yml "${pkgdir}${_etcdir}" - ln -fs "${_etcdir}/config.yml" "${pkgdir}${_datadir}/config.yml" - - cp -r VERSION bin hooks lib spec support "${pkgdir}${_datadir}" - ln -fs "${_datadir}" "${pkgdir}/${_homedir}/" - - install -dm2770 -o 105 -g 105 "${pkgdir}${_homedir}/repositories" - - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md" -} - -# vim:set ts=2 sw=2 et: Copied: gitlab-shell/repos/community-x86_64/PKGBUILD (from rev 518823, gitlab-shell/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-10-24 18:58:01 UTC (rev 518824) @@ -0,0 +1,101 @@ +# Maintainer: Sven-Hendrik Haase <svenst...@gmail.com> +# Contributor: Pavol (Lopo) Hluchy <lopo AT losys DOT eu> +# Contributor: Massimiliano Torromeo <massimiliano.torro...@gmail.com> +# Contributor: Jonas Heinrich <o...@project-insnaity.org> +# Contributor: Lee Watson <a...@revthefox.co.uk> +# Contributor: Tobias Hunger <tobias DOT hunger AT gmail DOT com> +# Contributor: Stefan Tatschner <ste...@sevenbyte.org> + + +# NOTE: Gitlab isn't always compatible with modern Ruby versions. In that case, check the +# commit log for an old fix on how to tell it to use older versions of Ruby. I'm afraid we'll +# need this again at some point in the future. +pkgname=gitlab-shell +pkgver=10.2.0 +pkgrel=1 +epoch=2 +pkgdesc="Git management software" +arch=('x86_64') +url="https://gitlab.com/gitlab-org/gitlab-shell/" +license=('MIT') +depends=('ruby2.5' 'redis' 'git') +makedepends=('go-pie') +options=('!strip') +install=gitlab-shell.install +backup=("etc/webapps/${pkgname}/config.yml" + "etc/webapps/${pkgname}/secret" + "etc/webapps/${pkgname}/gitconfig" + "etc/webapps/${pkgname}/authorized_keys" + "etc/webapps/${pkgname}/") +source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/api/v4/projects/gitlab-org%2Fgitlab-shell/repository/archive?sha=v${pkgver}" + "gitlab-shell.gitconfig" + "gitlab-shell.sysusers") +sha512sums=('2be081d2617409dd5612d0d44a42e5e88959fe267f1775313e5a43cb6acf3d737978189d7ba270c99bf3fb1d59e4ec701e74e9f89f3d2aaf54ce548ce8c16f35' + '5caafe5300621ced58479e724b39656afc17f32a64ecde5dfa4919683ef37d9121552c78f066678472acb56e0a34b5c3cf34d9b44414d1ed5d91f725d180fa43' + '196fd5519f1019815562da5b8bfde1d8082614cee6e63d75a7bb673db8b3c409384177dcf3dd0436c2adeec273b4ffea690058c2c457ae6a82d4f805e860495f') + +_datadir="/usr/share/webapps/${pkgname}" +_etcdir="/etc/webapps/${pkgname}" +_homedir="/var/lib/gitlab" +_logdir="/var/log/gitlab" +_srcdir="gitlab-shell-v${pkgver}" + +prepare() { + cd "${srcdir}/${_srcdir}"-* + + sed -e "s|user: git|user: gitlab|" \ + -e "s|/home/git|${_homedir}|" \ + -e "s|# log_file: .*|log_file: \"${_logdir}/gitlab-shell.log\"|" \ + -e "s|# host:|host:|" \ + -e "s|# port:|port:|" \ + -e "s|socket:|# socket:|" \ + config.yml.example > config.yml + + for file in {bin,hooks}/*; do + sed -i s/ruby/ruby-2.5/g ${file} + done +} + +build() { + cd "${srcdir}/${_srcdir}"-* + + ./bin/compile +} + +package() { + cd "${srcdir}/${_srcdir}"-* + + install -dm755 -o root -g root "${pkgdir}${_datadir}" + install -dm750 -o 105 -g 105 "${pkgdir}${_homedir}" + install -dm750 -o 105 -g 105 "${pkgdir}${_homedir}/satellites" + install -dm700 -o 105 -g 105 "${pkgdir}${_homedir}/.ssh" + install -dm750 -o 105 -g 105 "${pkgdir}${_etcdir}" + install -dm770 -o 105 -g root "${pkgdir}${_logdir}" + + # sysusers + install -Dm644 "${srcdir}/gitlab-shell.sysusers" "${pkgdir}/usr/lib/sysusers.d/gitlab-shell.conf" + + # .gitconfig + install -Dm644 -o 105 -g 105 "${srcdir}/gitlab-shell.gitconfig" "${pkgdir}${_etcdir}/.gitconfig" + ln -fs "${_etcdir}/.gitconfig" "${pkgdir}${_homedir}/.gitconfig" + + # .gitlab_shell_secret + touch "${pkgdir}${_etcdir}/secret" + chmod 640 "${pkgdir}${_etcdir}/secret" + chown root:105 "${pkgdir}${_etcdir}/secret" + ln -fs "${_etcdir}/secret" "${pkgdir}${_datadir}/.gitlab_shell_secret" + + # config.yml + mv config.yml "${pkgdir}${_etcdir}" + ln -fs "${_etcdir}/config.yml" "${pkgdir}${_datadir}/config.yml" + + cp -r VERSION bin hooks spec support "${pkgdir}${_datadir}" + ln -fs "${_datadir}" "${pkgdir}/${_homedir}/" + + install -dm2770 -o 105 -g 105 "${pkgdir}${_homedir}/repositories" + + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md" +} + +# vim:set ts=2 sw=2 et: Deleted: gitlab-shell.gitconfig =================================================================== --- gitlab-shell.gitconfig 2019-10-24 18:57:45 UTC (rev 518823) +++ gitlab-shell.gitconfig 2019-10-24 18:58:01 UTC (rev 518824) @@ -1,5 +0,0 @@ -[user] - name = GitLab - email = gitlab@localhost -[core] - autocrlf = input Copied: gitlab-shell/repos/community-x86_64/gitlab-shell.gitconfig (from rev 518823, gitlab-shell/trunk/gitlab-shell.gitconfig) =================================================================== --- gitlab-shell.gitconfig (rev 0) +++ gitlab-shell.gitconfig 2019-10-24 18:58:01 UTC (rev 518824) @@ -0,0 +1,5 @@ +[user] + name = GitLab + email = gitlab@localhost +[core] + autocrlf = input Deleted: gitlab-shell.install =================================================================== --- gitlab-shell.install 2019-10-24 18:57:45 UTC (rev 518823) +++ gitlab-shell.install 2019-10-24 18:58:01 UTC (rev 518824) @@ -1,9 +0,0 @@ -post_install() { - echo "Configure gitlab-shell in /etc/webapps/gitlab-shell/config.yml" - echo "Put a secret bytestring to /etc/webapps/gitlab-shell/secret" -} - -post_upgrade() { - echo "If you have previously installed gitlab-shell and now git pull fails on a repo, try changing the shell:" - echo "usermod -s /usr/share/webapps/gitlab-shell/bin/gitlab-shell-ruby gitlab" -} Copied: gitlab-shell/repos/community-x86_64/gitlab-shell.install (from rev 518823, gitlab-shell/trunk/gitlab-shell.install) =================================================================== --- gitlab-shell.install (rev 0) +++ gitlab-shell.install 2019-10-24 18:58:01 UTC (rev 518824) @@ -0,0 +1,9 @@ +post_install() { + echo "Configure gitlab-shell in /etc/webapps/gitlab-shell/config.yml" + echo "Put a secret bytestring to /etc/webapps/gitlab-shell/secret" +} + +post_upgrade() { + echo "If you have previously installed gitlab-shell and now git pull fails on a repo, try changing the shell:" + echo "usermod -s /usr/share/webapps/gitlab-shell/bin/gitlab-shell-ruby gitlab" +} Deleted: gitlab-shell.sysusers =================================================================== --- gitlab-shell.sysusers 2019-10-24 18:57:45 UTC (rev 518823) +++ gitlab-shell.sysusers 2019-10-24 18:58:01 UTC (rev 518824) @@ -1 +0,0 @@ -u gitlab 105 - /var/lib/gitlab /usr/share/webapps/gitlab-shell/bin/gitlab-shell-ruby Copied: gitlab-shell/repos/community-x86_64/gitlab-shell.sysusers (from rev 518823, gitlab-shell/trunk/gitlab-shell.sysusers) =================================================================== --- gitlab-shell.sysusers (rev 0) +++ gitlab-shell.sysusers 2019-10-24 18:58:01 UTC (rev 518824) @@ -0,0 +1 @@ +u gitlab 105 - /var/lib/gitlab /usr/share/webapps/gitlab-shell/bin/gitlab-shell-ruby