[arch-commits] Commit in gitlab-gitaly/repos (4 files)
Date: Saturday, December 19, 2020 @ 06:53:49 Author: felixonmars Revision: 779764 archrelease: copy trunk to community-staging-x86_64 Added: gitlab-gitaly/repos/community-staging-x86_64/ gitlab-gitaly/repos/community-staging-x86_64/PKGBUILD (from rev 779763, gitlab-gitaly/trunk/PKGBUILD) gitlab-gitaly/repos/community-staging-x86_64/configs.patch (from rev 779763, gitlab-gitaly/trunk/configs.patch) gitlab-gitaly/repos/community-staging-x86_64/gitlab-gitaly.service (from rev 779763, gitlab-gitaly/trunk/gitlab-gitaly.service) ---+ PKGBUILD | 53 + configs.patch | 99 gitlab-gitaly.service | 14 ++ 3 files changed, 166 insertions(+) Copied: gitlab-gitaly/repos/community-staging-x86_64/PKGBUILD (from rev 779763, gitlab-gitaly/trunk/PKGBUILD) === --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2020-12-19 06:53:49 UTC (rev 779764) @@ -0,0 +1,53 @@ +# Maintainer: Sven-Hendrik Haase + +# 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-gitaly +pkgver=13.6.1 +pkgrel=2 +pkgdesc="Speed up Git access using caching" +arch=('x86_64') +url="https://gitlab.com/gitlab-org/gitaly; +license=('MIT') +depends=(glibc ruby libxml2 libxslt libssh2) +options=(!buildflags) +makedepends=(go ruby-bundler cmake git) +backup=("etc/gitlab-gitaly/config.toml") +_tag=v${pkgver} +source=("https://gitlab.com/gitlab-org/gitaly/-/archive/${_tag}/gitaly-${_tag}.tar.gz; +"configs.patch" +"gitlab-gitaly.service") +sha512sums=('a48f4f991af2e0589314636e1757e39f44742ffbd2b93d5a5669911728a42ba497d4782016f4a98f001f879af3933721f8d2cb5566b2571c23a0ed0ad9970796' + '1b83abe2034a195c33a6dbb7907f93d33b53bd94dc983be5dee5533a1e61cc41fd5228e04dcd2b2576a87a371bf5ab7c81212262421ee7c6ec46c949da4c1153' + '7f5cd528c873a5e43e18aa6a88bd7298422c047e0e61cf3208be7d9fcfdfdc8a844b5c439ab6afc2098c5c4c60ed9c3d167c2f87517f1e93b34f39be3d3dad09') + +prepare() { + cd gitaly-$_tag + + patch -p1 < ../configs.patch + # At this point the config file should not contain any references to '/home/git' + + # https://github.com/bundler/bundler/issues/6882 + sed -e '/BUNDLED WITH/,+1d' -i ruby/Gemfile.lock +} + +build() { + cd gitaly-$_tag + + bundle config force_ruby_platform true # build from sources as some prebuilt gems are not available for newer ruby + make BUILD_TAGS="tracer_static tracer_static_jaeger" +} + +package() { + cd gitaly-$_tag + + make PREFIX=/usr DESTDIR="${pkgdir}" install + mkdir -p "${pkgdir}"/etc/gitlab-gitaly + mkdir -p "${pkgdir}"/usr/share/webapps/gitlab-gitaly + cp -r ruby "${pkgdir}"/usr/share/webapps/gitlab-gitaly/ruby + + install -Dm644 config.toml.example "${pkgdir}"/etc/${pkgname}/config.toml + install -Dm644 "LICENSE" "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + install -Dm0644 "${srcdir}"/gitlab-gitaly.service "${pkgdir}"/usr/lib/systemd/system/gitlab-gitaly.service +} Copied: gitlab-gitaly/repos/community-staging-x86_64/configs.patch (from rev 779763, gitlab-gitaly/trunk/configs.patch) === --- community-staging-x86_64/configs.patch (rev 0) +++ community-staging-x86_64/configs.patch 2020-12-19 06:53:49 UTC (rev 779764) @@ -0,0 +1,99 @@ +commit 438448e3b000359b1c9ec16d2918605888f5903e +Author: Anatol Pomozov +Date: Tue May 26 00:26:02 2020 -0700 + +Patch config files with Arch Linux specific locations + +Arch uses upstream's default config files as a base for its configs. +But directory structure at Arch is completely different from the default +one specified by gitlab project. +We used to have a lot of seds expressions to adjust the files but as +complexity of configs grew 'sed' makes it easy to miss a changed/added +option. + +Track set of diffs as a patch. If upstream modifies config file then it +will cause a conflict that needs to be reviewed manually. + +diff --git a/config.toml.example b/config.toml.example +index befe90a3..d4317462 100644 +--- a/config.toml.example b/config.toml.example +@@ -2,10 +2,10 @@ + # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and + # https://docs.gitlab.com/ee//administration/gitaly/reference + +-socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" ++socket_path = "/run/gitlab/gitlab-gitaly.socket" + + # The directory where Gitaly's executables are stored +-bin_dir = "/home/git/gitaly" ++bin_dir = "/usr/bin" + + # # Optional: listen on a TCP socket. This is insecure (no
[arch-commits] Commit in gitlab-gitaly/repos (4 files)
Date: Thursday, December 3, 2020 @ 17:02:51 Author: anatolik Revision: 769713 archrelease: copy trunk to community-testing-x86_64 Added: gitlab-gitaly/repos/community-testing-x86_64/ gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 769712, gitlab-gitaly/trunk/PKGBUILD) gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 769712, gitlab-gitaly/trunk/configs.patch) gitlab-gitaly/repos/community-testing-x86_64/gitlab-gitaly.service (from rev 769712, gitlab-gitaly/trunk/gitlab-gitaly.service) ---+ PKGBUILD | 53 + configs.patch | 99 gitlab-gitaly.service | 14 ++ 3 files changed, 166 insertions(+) Copied: gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 769712, gitlab-gitaly/trunk/PKGBUILD) === --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2020-12-03 17:02:51 UTC (rev 769713) @@ -0,0 +1,53 @@ +# Maintainer: Sven-Hendrik Haase + +# 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-gitaly +pkgver=13.6.1 +pkgrel=1 +pkgdesc="Speed up Git access using caching" +arch=('x86_64') +url="https://gitlab.com/gitlab-org/gitaly; +license=('MIT') +depends=(glibc ruby libxml2 libxslt libssh2) +options=(!buildflags) +makedepends=(go ruby-bundler cmake git) +backup=("etc/gitlab-gitaly/config.toml") +_tag=v${pkgver} +source=("https://gitlab.com/gitlab-org/gitaly/-/archive/${_tag}/gitaly-${_tag}.tar.gz; +"configs.patch" +"gitlab-gitaly.service") +sha512sums=('a48f4f991af2e0589314636e1757e39f44742ffbd2b93d5a5669911728a42ba497d4782016f4a98f001f879af3933721f8d2cb5566b2571c23a0ed0ad9970796' + '1b83abe2034a195c33a6dbb7907f93d33b53bd94dc983be5dee5533a1e61cc41fd5228e04dcd2b2576a87a371bf5ab7c81212262421ee7c6ec46c949da4c1153' + '7f5cd528c873a5e43e18aa6a88bd7298422c047e0e61cf3208be7d9fcfdfdc8a844b5c439ab6afc2098c5c4c60ed9c3d167c2f87517f1e93b34f39be3d3dad09') + +prepare() { + cd gitaly-$_tag + + patch -p1 < ../configs.patch + # At this point the config file should not contain any references to '/home/git' + + # https://github.com/bundler/bundler/issues/6882 + sed -e '/BUNDLED WITH/,+1d' -i ruby/Gemfile.lock +} + +build() { + cd gitaly-$_tag + + bundle config force_ruby_platform true # build from sources as some prebuilt gems are not available for newer ruby + make BUILD_TAGS="tracer_static tracer_static_jaeger" +} + +package() { + cd gitaly-$_tag + + make PREFIX=/usr DESTDIR="${pkgdir}" install + mkdir -p "${pkgdir}"/etc/gitlab-gitaly + mkdir -p "${pkgdir}"/usr/share/webapps/gitlab-gitaly + cp -r ruby "${pkgdir}"/usr/share/webapps/gitlab-gitaly/ruby + + install -Dm644 config.toml.example "${pkgdir}"/etc/${pkgname}/config.toml + install -Dm644 "LICENSE" "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + install -Dm0644 "${srcdir}"/gitlab-gitaly.service "${pkgdir}"/usr/lib/systemd/system/gitlab-gitaly.service +} Copied: gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 769712, gitlab-gitaly/trunk/configs.patch) === --- community-testing-x86_64/configs.patch (rev 0) +++ community-testing-x86_64/configs.patch 2020-12-03 17:02:51 UTC (rev 769713) @@ -0,0 +1,99 @@ +commit 438448e3b000359b1c9ec16d2918605888f5903e +Author: Anatol Pomozov +Date: Tue May 26 00:26:02 2020 -0700 + +Patch config files with Arch Linux specific locations + +Arch uses upstream's default config files as a base for its configs. +But directory structure at Arch is completely different from the default +one specified by gitlab project. +We used to have a lot of seds expressions to adjust the files but as +complexity of configs grew 'sed' makes it easy to miss a changed/added +option. + +Track set of diffs as a patch. If upstream modifies config file then it +will cause a conflict that needs to be reviewed manually. + +diff --git a/config.toml.example b/config.toml.example +index befe90a3..d4317462 100644 +--- a/config.toml.example b/config.toml.example +@@ -2,10 +2,10 @@ + # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and + # https://docs.gitlab.com/ee//administration/gitaly/reference + +-socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" ++socket_path = "/run/gitlab/gitlab-gitaly.socket" + + # The directory where Gitaly's executables are stored +-bin_dir = "/home/git/gitaly" ++bin_dir = "/usr/bin" + + # # Optional: listen on a TCP socket. This is insecure (no authentication) +
[arch-commits] Commit in gitlab-gitaly/repos (4 files)
Date: Monday, October 26, 2020 @ 18:54:14 Author: anatolik Revision: 734022 archrelease: copy trunk to community-testing-x86_64 Added: gitlab-gitaly/repos/community-testing-x86_64/ gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 734021, gitlab-gitaly/trunk/PKGBUILD) gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 734021, gitlab-gitaly/trunk/configs.patch) gitlab-gitaly/repos/community-testing-x86_64/gitlab-gitaly.service (from rev 734021, gitlab-gitaly/trunk/gitlab-gitaly.service) ---+ PKGBUILD | 53 + configs.patch | 99 gitlab-gitaly.service | 14 ++ 3 files changed, 166 insertions(+) Copied: gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 734021, gitlab-gitaly/trunk/PKGBUILD) === --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2020-10-26 18:54:14 UTC (rev 734022) @@ -0,0 +1,53 @@ +# Maintainer: Sven-Hendrik Haase + +# 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-gitaly +pkgver=13.5.1 +pkgrel=1 +pkgdesc="Speed up Git access using caching" +arch=('x86_64') +url="https://gitlab.com/gitlab-org/gitaly; +license=('MIT') +depends=(glibc ruby libxml2 libxslt libssh2) +options=(!buildflags) +makedepends=(go ruby-bundler cmake git) +backup=("etc/gitlab-gitaly/config.toml") +_tag=v${pkgver} +source=("https://gitlab.com/gitlab-org/gitaly/-/archive/${_tag}/gitaly-${_tag}.tar.gz; +"configs.patch" +"gitlab-gitaly.service") +sha512sums=('0295ff617052c02af1fa69a249d488f0b7f225f8824894fe289b76d9f0cf40589db45e98825ccaee9450cf39c2368b6d22ca40a7bb8368dca2446effee52459e' + '1b83abe2034a195c33a6dbb7907f93d33b53bd94dc983be5dee5533a1e61cc41fd5228e04dcd2b2576a87a371bf5ab7c81212262421ee7c6ec46c949da4c1153' + '7f5cd528c873a5e43e18aa6a88bd7298422c047e0e61cf3208be7d9fcfdfdc8a844b5c439ab6afc2098c5c4c60ed9c3d167c2f87517f1e93b34f39be3d3dad09') + +prepare() { + cd gitaly-$_tag + + patch -p1 < ../configs.patch + # At this point the config file should not contain any references to '/home/git' + + # https://github.com/bundler/bundler/issues/6882 + sed -e '/BUNDLED WITH/,+1d' -i ruby/Gemfile.lock +} + +build() { + cd gitaly-$_tag + + bundle config force_ruby_platform true # build from sources as some prebuilt gems are not available for newer ruby + make BUILD_TAGS="tracer_static tracer_static_jaeger" +} + +package() { + cd gitaly-$_tag + + make PREFIX=/usr DESTDIR="${pkgdir}" install + mkdir -p "${pkgdir}"/etc/gitlab-gitaly + mkdir -p "${pkgdir}"/usr/share/webapps/gitlab-gitaly + cp -r ruby "${pkgdir}"/usr/share/webapps/gitlab-gitaly/ruby + + install -Dm644 config.toml.example "${pkgdir}"/etc/${pkgname}/config.toml + install -Dm644 "LICENSE" "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + install -Dm0644 "${srcdir}"/gitlab-gitaly.service "${pkgdir}"/usr/lib/systemd/system/gitlab-gitaly.service +} Copied: gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 734021, gitlab-gitaly/trunk/configs.patch) === --- community-testing-x86_64/configs.patch (rev 0) +++ community-testing-x86_64/configs.patch 2020-10-26 18:54:14 UTC (rev 734022) @@ -0,0 +1,99 @@ +commit 438448e3b000359b1c9ec16d2918605888f5903e +Author: Anatol Pomozov +Date: Tue May 26 00:26:02 2020 -0700 + +Patch config files with Arch Linux specific locations + +Arch uses upstream's default config files as a base for its configs. +But directory structure at Arch is completely different from the default +one specified by gitlab project. +We used to have a lot of seds expressions to adjust the files but as +complexity of configs grew 'sed' makes it easy to miss a changed/added +option. + +Track set of diffs as a patch. If upstream modifies config file then it +will cause a conflict that needs to be reviewed manually. + +diff --git a/config.toml.example b/config.toml.example +index befe90a3..d4317462 100644 +--- a/config.toml.example b/config.toml.example +@@ -2,10 +2,10 @@ + # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and + # https://docs.gitlab.com/ee//administration/gitaly/reference + +-socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" ++socket_path = "/run/gitlab/gitlab-gitaly.socket" + + # The directory where Gitaly's executables are stored +-bin_dir = "/home/git/gitaly" ++bin_dir = "/usr/bin" + + # # Optional: listen on a TCP socket. This is insecure (no authentication) + #
[arch-commits] Commit in gitlab-gitaly/repos (4 files)
Date: Tuesday, August 25, 2020 @ 16:44:20 Author: anatolik Revision: 688484 archrelease: copy trunk to community-testing-x86_64 Added: gitlab-gitaly/repos/community-testing-x86_64/ gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 688483, gitlab-gitaly/trunk/PKGBUILD) gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 688483, gitlab-gitaly/trunk/configs.patch) gitlab-gitaly/repos/community-testing-x86_64/gitlab-gitaly.service (from rev 688483, gitlab-gitaly/trunk/gitlab-gitaly.service) ---+ PKGBUILD | 53 + configs.patch | 99 gitlab-gitaly.service | 14 ++ 3 files changed, 166 insertions(+) Copied: gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 688483, gitlab-gitaly/trunk/PKGBUILD) === --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2020-08-25 16:44:20 UTC (rev 688484) @@ -0,0 +1,53 @@ +# Maintainer: Sven-Hendrik Haase + +# 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-gitaly +pkgver=13.3.1 +pkgrel=1 +pkgdesc="Speed up Git access using caching" +arch=('x86_64') +url="https://gitlab.com/gitlab-org/gitaly; +license=('MIT') +depends=(glibc ruby libxml2 libxslt libssh2) +options=(!buildflags) +makedepends=(go ruby-bundler cmake) +backup=("etc/gitlab-gitaly/config.toml") +_tag=v${pkgver} +source=("https://gitlab.com/gitlab-org/gitaly/-/archive/${_tag}/gitaly-${_tag}.tar.gz; +"configs.patch" +"gitlab-gitaly.service") +sha512sums=('e5a49782745954d034c1b42fe465d0272d5877e86e23b73ed97fa32c7bc61f900f992edbdd661822cdfde9b1a64873199b7ecf45ed1fdb468b43625bfb82291f' + '6565b3dbed2653c31d5a49043dd8227812d9c8a1f6d716ed65fed5878b9c9bd6def84e8b00ff23ddb37d8bf2f484ecb229dcb1528e8276fff7fbbb1099790850' + '7f5cd528c873a5e43e18aa6a88bd7298422c047e0e61cf3208be7d9fcfdfdc8a844b5c439ab6afc2098c5c4c60ed9c3d167c2f87517f1e93b34f39be3d3dad09') + +prepare() { + cd gitaly-$_tag + + patch -p1 < ../configs.patch + # At this point the config file should not contain any references to '/home/git' + + # https://github.com/bundler/bundler/issues/6882 + sed -e '/BUNDLED WITH/,+1d' -i ruby/Gemfile.lock +} + +build() { + cd gitaly-$_tag + + bundle config force_ruby_platform true # build from sources as some prebuilt gems are not available for newer ruby + make BUILD_TAGS="tracer_static tracer_static_jaeger" +} + +package() { + cd gitaly-$_tag + + make PREFIX=/usr DESTDIR=${pkgdir} install + mkdir -p ${pkgdir}/etc/gitlab-gitaly + mkdir -p ${pkgdir}/usr/share/webapps/gitlab-gitaly + cp -r ruby ${pkgdir}/usr/share/webapps/gitlab-gitaly/ruby + + install -Dm644 config.toml.example "${pkgdir}/etc/${pkgname}/config.toml" + install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm0644 "${srcdir}/gitlab-gitaly.service" "${pkgdir}/usr/lib/systemd/system/gitlab-gitaly.service" +} Copied: gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 688483, gitlab-gitaly/trunk/configs.patch) === --- community-testing-x86_64/configs.patch (rev 0) +++ community-testing-x86_64/configs.patch 2020-08-25 16:44:20 UTC (rev 688484) @@ -0,0 +1,99 @@ +commit 487d724f098441298088e59805af2faba7843fbe +Author: Anatol Pomozov +Date: Tue May 26 00:26:02 2020 -0700 + +Patch config files with Arch Linux specific locations + +Arch uses upstream's default config files as a base for its configs. +But directory structure at Arch is completely different from the default +one specified by gitlab project. +We used to have a lot of seds expressions to adjust the files but as +complexity of configs grew 'sed' makes it easy to miss a changed/added +option. + +Track set of diffs as a patch. If upstream modifies config file then it +will cause a conflict that needs to be reviewed manually. + +diff --git a/config.toml.example b/config.toml.example +index 85fbf6ba..9f8e6c99 100644 +--- a/config.toml.example b/config.toml.example +@@ -2,10 +2,10 @@ + # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and + # https://docs.gitlab.com/ee//administration/gitaly/reference + +-socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" ++socket_path = "/run/gitlab/gitlab-gitaly.socket" + + # The directory where Gitaly's executables are stored +-bin_dir = "/home/git/gitaly" ++bin_dir = "/usr/bin" + + # # Optional: listen on a TCP socket. This is insecure (no authentication) + # listen_addr
[arch-commits] Commit in gitlab-gitaly/repos (4 files)
Date: Tuesday, July 21, 2020 @ 18:07:12 Author: anatolik Revision: 664761 archrelease: copy trunk to community-testing-x86_64 Added: gitlab-gitaly/repos/community-testing-x86_64/ gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 664760, gitlab-gitaly/trunk/PKGBUILD) gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 664760, gitlab-gitaly/trunk/configs.patch) gitlab-gitaly/repos/community-testing-x86_64/gitlab-gitaly.service (from rev 664760, gitlab-gitaly/trunk/gitlab-gitaly.service) ---+ PKGBUILD | 53 + configs.patch | 99 gitlab-gitaly.service | 14 ++ 3 files changed, 166 insertions(+) Copied: gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 664760, gitlab-gitaly/trunk/PKGBUILD) === --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2020-07-21 18:07:12 UTC (rev 664761) @@ -0,0 +1,53 @@ +# Maintainer: Sven-Hendrik Haase + +# 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-gitaly +pkgver=13.2.0 +pkgrel=1 +pkgdesc="Speed up Git access using caching" +arch=('x86_64') +url="https://gitlab.com/gitlab-org/gitaly; +license=('MIT') +depends=(glibc ruby libxml2 libxslt libssh2) +options=(!buildflags) +makedepends=(go ruby-bundler cmake) +backup=("etc/gitlab-gitaly/config.toml") +_tag=v${pkgver} +source=("https://gitlab.com/gitlab-org/gitaly/-/archive/${_tag}/gitaly-${_tag}.tar.gz; +"configs.patch" +"gitlab-gitaly.service") +sha512sums=('7589687f31dc46c3ed568d7086c22667741786835b49606ec1ee8060180441746e0b816cddd7fcfd914689af66ec3035777f6382f6b2270d4bda001a67a12127' + '6565b3dbed2653c31d5a49043dd8227812d9c8a1f6d716ed65fed5878b9c9bd6def84e8b00ff23ddb37d8bf2f484ecb229dcb1528e8276fff7fbbb1099790850' + '7f5cd528c873a5e43e18aa6a88bd7298422c047e0e61cf3208be7d9fcfdfdc8a844b5c439ab6afc2098c5c4c60ed9c3d167c2f87517f1e93b34f39be3d3dad09') + +prepare() { + cd gitaly-$_tag + + patch -p1 < ../configs.patch + # At this point the config file should not contain any references to '/home/git' + + # https://github.com/bundler/bundler/issues/6882 + sed -e '/BUNDLED WITH/,+1d' -i ruby/Gemfile.lock +} + +build() { + cd gitaly-$_tag + + bundle config force_ruby_platform true # build from sources as some prebuilt gems are not available for newer ruby + make BUILD_TAGS="tracer_static tracer_static_jaeger" +} + +package() { + cd gitaly-$_tag + + make PREFIX=/usr DESTDIR=${pkgdir} install + mkdir -p ${pkgdir}/etc/gitlab-gitaly + mkdir -p ${pkgdir}/usr/share/webapps/gitlab-gitaly + cp -r ruby ${pkgdir}/usr/share/webapps/gitlab-gitaly/ruby + + install -Dm644 config.toml.example "${pkgdir}/etc/${pkgname}/config.toml" + install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm0644 "${srcdir}/gitlab-gitaly.service" "${pkgdir}/usr/lib/systemd/system/gitlab-gitaly.service" +} Copied: gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 664760, gitlab-gitaly/trunk/configs.patch) === --- community-testing-x86_64/configs.patch (rev 0) +++ community-testing-x86_64/configs.patch 2020-07-21 18:07:12 UTC (rev 664761) @@ -0,0 +1,99 @@ +commit 487d724f098441298088e59805af2faba7843fbe +Author: Anatol Pomozov +Date: Tue May 26 00:26:02 2020 -0700 + +Patch config files with Arch Linux specific locations + +Arch uses upstream's default config files as a base for its configs. +But directory structure at Arch is completely different from the default +one specified by gitlab project. +We used to have a lot of seds expressions to adjust the files but as +complexity of configs grew 'sed' makes it easy to miss a changed/added +option. + +Track set of diffs as a patch. If upstream modifies config file then it +will cause a conflict that needs to be reviewed manually. + +diff --git a/config.toml.example b/config.toml.example +index 85fbf6ba..9f8e6c99 100644 +--- a/config.toml.example b/config.toml.example +@@ -2,10 +2,10 @@ + # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and + # https://docs.gitlab.com/ee//administration/gitaly/reference + +-socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" ++socket_path = "/run/gitlab/gitlab-gitaly.socket" + + # The directory where Gitaly's executables are stored +-bin_dir = "/home/git/gitaly" ++bin_dir = "/usr/bin" + + # # Optional: listen on a TCP socket. This is insecure (no authentication) + # listen_addr =
[arch-commits] Commit in gitlab-gitaly/repos (4 files)
Date: Thursday, July 2, 2020 @ 00:23:33 Author: anatolik Revision: 657449 archrelease: copy trunk to community-testing-x86_64 Added: gitlab-gitaly/repos/community-testing-x86_64/ gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 657448, gitlab-gitaly/trunk/PKGBUILD) gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 657448, gitlab-gitaly/trunk/configs.patch) gitlab-gitaly/repos/community-testing-x86_64/gitlab-gitaly.service (from rev 657448, gitlab-gitaly/trunk/gitlab-gitaly.service) ---+ PKGBUILD | 53 + configs.patch | 99 gitlab-gitaly.service | 14 ++ 3 files changed, 166 insertions(+) Copied: gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 657448, gitlab-gitaly/trunk/PKGBUILD) === --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2020-07-02 00:23:33 UTC (rev 657449) @@ -0,0 +1,53 @@ +# Maintainer: Sven-Hendrik Haase + +# 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-gitaly +pkgver=13.1.2 +pkgrel=1 +pkgdesc="Speed up Git access using caching" +arch=('x86_64') +url="https://gitlab.com/gitlab-org/gitaly; +license=('MIT') +depends=(glibc ruby libxml2 libxslt libssh2) +options=(!buildflags) +makedepends=(go ruby-bundler cmake) +backup=("etc/gitlab-gitaly/config.toml") +_tag=v${pkgver} +source=("https://gitlab.com/gitlab-org/gitaly/-/archive/${_tag}/gitaly-${_tag}.tar.gz; +"configs.patch" +"gitlab-gitaly.service") +sha512sums=('37ae8a5465aaac6a4e7b718660235ccb00718320d36a876cca8a3836ad27f9ef2368f7779163ee4ba7434455d0ce481d28f654dd53dfecd24b02be3e2cb65e91' + '6565b3dbed2653c31d5a49043dd8227812d9c8a1f6d716ed65fed5878b9c9bd6def84e8b00ff23ddb37d8bf2f484ecb229dcb1528e8276fff7fbbb1099790850' + '7f5cd528c873a5e43e18aa6a88bd7298422c047e0e61cf3208be7d9fcfdfdc8a844b5c439ab6afc2098c5c4c60ed9c3d167c2f87517f1e93b34f39be3d3dad09') + +prepare() { + cd gitaly-$_tag + + patch -p1 < ../configs.patch + # At this point the config file should not contain any references to '/home/git' + + # https://github.com/bundler/bundler/issues/6882 + sed -e '/BUNDLED WITH/,+1d' -i ruby/Gemfile.lock +} + +build() { + cd gitaly-$_tag + + bundle config force_ruby_platform true # build from sources as some prebuilt gems are not available for newer ruby + make BUILD_TAGS="tracer_static tracer_static_jaeger" +} + +package() { + cd gitaly-$_tag + + make PREFIX=/usr DESTDIR=${pkgdir} install + mkdir -p ${pkgdir}/etc/gitlab-gitaly + mkdir -p ${pkgdir}/usr/share/webapps/gitlab-gitaly + cp -r ruby ${pkgdir}/usr/share/webapps/gitlab-gitaly/ruby + + install -Dm644 config.toml.example "${pkgdir}/etc/${pkgname}/config.toml" + install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm0644 "${srcdir}/gitlab-gitaly.service" "${pkgdir}/usr/lib/systemd/system/gitlab-gitaly.service" +} Copied: gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 657448, gitlab-gitaly/trunk/configs.patch) === --- community-testing-x86_64/configs.patch (rev 0) +++ community-testing-x86_64/configs.patch 2020-07-02 00:23:33 UTC (rev 657449) @@ -0,0 +1,99 @@ +commit 487d724f098441298088e59805af2faba7843fbe +Author: Anatol Pomozov +Date: Tue May 26 00:26:02 2020 -0700 + +Patch config files with Arch Linux specific locations + +Arch uses upstream's default config files as a base for its configs. +But directory structure at Arch is completely different from the default +one specified by gitlab project. +We used to have a lot of seds expressions to adjust the files but as +complexity of configs grew 'sed' makes it easy to miss a changed/added +option. + +Track set of diffs as a patch. If upstream modifies config file then it +will cause a conflict that needs to be reviewed manually. + +diff --git a/config.toml.example b/config.toml.example +index 85fbf6ba..9f8e6c99 100644 +--- a/config.toml.example b/config.toml.example +@@ -2,10 +2,10 @@ + # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and + # https://docs.gitlab.com/ee//administration/gitaly/reference + +-socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" ++socket_path = "/run/gitlab/gitlab-gitaly.socket" + + # The directory where Gitaly's executables are stored +-bin_dir = "/home/git/gitaly" ++bin_dir = "/usr/bin" + + # # Optional: listen on a TCP socket. This is insecure (no authentication) + # listen_addr =
[arch-commits] Commit in gitlab-gitaly/repos (4 files)
Date: Monday, June 29, 2020 @ 08:24:06 Author: anatolik Revision: 655926 archrelease: copy trunk to community-testing-x86_64 Added: gitlab-gitaly/repos/community-testing-x86_64/ gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 655925, gitlab-gitaly/trunk/PKGBUILD) gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 655925, gitlab-gitaly/trunk/configs.patch) gitlab-gitaly/repos/community-testing-x86_64/gitlab-gitaly.service (from rev 655925, gitlab-gitaly/trunk/gitlab-gitaly.service) ---+ PKGBUILD | 53 + configs.patch | 99 gitlab-gitaly.service | 14 ++ 3 files changed, 166 insertions(+) Copied: gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 655925, gitlab-gitaly/trunk/PKGBUILD) === --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2020-06-29 08:24:06 UTC (rev 655926) @@ -0,0 +1,53 @@ +# Maintainer: Sven-Hendrik Haase + +# 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-gitaly +pkgver=13.1.1 +pkgrel=1 +pkgdesc="Speed up Git access using caching" +arch=('x86_64') +url="https://gitlab.com/gitlab-org/gitaly; +license=('MIT') +depends=(glibc ruby libxml2 libxslt libssh2) +options=(!buildflags) +makedepends=(go ruby-bundler cmake) +backup=("etc/gitlab-gitaly/config.toml") +_tag=v${pkgver} +source=("https://gitlab.com/gitlab-org/gitaly/-/archive/${_tag}/gitaly-${_tag}.tar.gz; +"configs.patch" +"gitlab-gitaly.service") +sha512sums=('62bc2a5a1fb041a646a2c4717e1845f815d771ee762ca0d337571e4ea79050df196a0ee0da811ec544f13358be29bd706efa4b8dc192bcee8e284bd46bad08d7' + '6565b3dbed2653c31d5a49043dd8227812d9c8a1f6d716ed65fed5878b9c9bd6def84e8b00ff23ddb37d8bf2f484ecb229dcb1528e8276fff7fbbb1099790850' + '7f5cd528c873a5e43e18aa6a88bd7298422c047e0e61cf3208be7d9fcfdfdc8a844b5c439ab6afc2098c5c4c60ed9c3d167c2f87517f1e93b34f39be3d3dad09') + +prepare() { + cd gitaly-$_tag + + patch -p1 < ../configs.patch + # At this point the config file should not contain any references to '/home/git' + + # https://github.com/bundler/bundler/issues/6882 + sed -e '/BUNDLED WITH/,+1d' -i ruby/Gemfile.lock +} + +build() { + cd gitaly-$_tag + + bundle config force_ruby_platform true # build from sources as some prebuilt gems are not available for newer ruby + make BUILD_TAGS="tracer_static tracer_static_jaeger" +} + +package() { + cd gitaly-$_tag + + make PREFIX=/usr DESTDIR=${pkgdir} install + mkdir -p ${pkgdir}/etc/gitlab-gitaly + mkdir -p ${pkgdir}/usr/share/webapps/gitlab-gitaly + cp -r ruby ${pkgdir}/usr/share/webapps/gitlab-gitaly/ruby + + install -Dm644 config.toml.example "${pkgdir}/etc/${pkgname}/config.toml" + install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm0644 "${srcdir}/gitlab-gitaly.service" "${pkgdir}/usr/lib/systemd/system/gitlab-gitaly.service" +} Copied: gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 655925, gitlab-gitaly/trunk/configs.patch) === --- community-testing-x86_64/configs.patch (rev 0) +++ community-testing-x86_64/configs.patch 2020-06-29 08:24:06 UTC (rev 655926) @@ -0,0 +1,99 @@ +commit 487d724f098441298088e59805af2faba7843fbe +Author: Anatol Pomozov +Date: Tue May 26 00:26:02 2020 -0700 + +Patch config files with Arch Linux specific locations + +Arch uses upstream's default config files as a base for its configs. +But directory structure at Arch is completely different from the default +one specified by gitlab project. +We used to have a lot of seds expressions to adjust the files but as +complexity of configs grew 'sed' makes it easy to miss a changed/added +option. + +Track set of diffs as a patch. If upstream modifies config file then it +will cause a conflict that needs to be reviewed manually. + +diff --git a/config.toml.example b/config.toml.example +index 85fbf6ba..9f8e6c99 100644 +--- a/config.toml.example b/config.toml.example +@@ -2,10 +2,10 @@ + # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and + # https://docs.gitlab.com/ee//administration/gitaly/reference + +-socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" ++socket_path = "/run/gitlab/gitlab-gitaly.socket" + + # The directory where Gitaly's executables are stored +-bin_dir = "/home/git/gitaly" ++bin_dir = "/usr/bin" + + # # Optional: listen on a TCP socket. This is insecure (no authentication) + # listen_addr =
[arch-commits] Commit in gitlab-gitaly/repos (4 files)
Date: Sunday, June 21, 2020 @ 18:54:37 Author: anatolik Revision: 650254 archrelease: copy trunk to community-testing-x86_64 Added: gitlab-gitaly/repos/community-testing-x86_64/ gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 650253, gitlab-gitaly/trunk/PKGBUILD) gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 650253, gitlab-gitaly/trunk/configs.patch) gitlab-gitaly/repos/community-testing-x86_64/gitlab-gitaly.service (from rev 650253, gitlab-gitaly/trunk/gitlab-gitaly.service) ---+ PKGBUILD | 53 + configs.patch | 99 gitlab-gitaly.service | 25 3 files changed, 177 insertions(+) Copied: gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 650253, gitlab-gitaly/trunk/PKGBUILD) === --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2020-06-21 18:54:37 UTC (rev 650254) @@ -0,0 +1,53 @@ +# Maintainer: Sven-Hendrik Haase + +# 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-gitaly +pkgver=13.1.0 +pkgrel=1 +pkgdesc="Speed up Git access using caching" +arch=('x86_64') +url="https://gitlab.com/gitlab-org/gitaly; +license=('MIT') +depends=(glibc ruby libxml2 libxslt libssh2) +options=(!buildflags) +makedepends=(go ruby-bundler cmake) +backup=("etc/gitlab-gitaly/config.toml") +_tag=v${pkgver} +source=("https://gitlab.com/gitlab-org/gitaly/-/archive/${_tag}/gitaly-${_tag}.tar.gz; +"configs.patch" +"gitlab-gitaly.service") +sha512sums=('f9c5ddf4de13a3e64bbfef367e8b431a3224c3b2a97f11e7abe1037406526c7e319d238dcc16fc7bd5f4f3690f6574eff2956691bde75086fd7c1da52db727da' + '6565b3dbed2653c31d5a49043dd8227812d9c8a1f6d716ed65fed5878b9c9bd6def84e8b00ff23ddb37d8bf2f484ecb229dcb1528e8276fff7fbbb1099790850' + 'e6c31cab200424af118ee9da4def0963a52727f33025fdbdb515c6c1337a9b32f4a377bd925fdd33ffe7b91371ce1d5d70847e07c2b73eac1e85d3f38f5e1261') + +prepare() { + cd gitaly-$_tag + + patch -p1 < ../configs.patch + # At this point the config file should not contain any references to '/home/git' + + # https://github.com/bundler/bundler/issues/6882 + sed -e '/BUNDLED WITH/,+1d' -i ruby/Gemfile.lock +} + +build() { + cd gitaly-$_tag + + bundle config force_ruby_platform true # build from sources as some prebuilt gems are not available for newer ruby + make BUILD_TAGS="tracer_static tracer_static_jaeger" +} + +package() { + cd gitaly-$_tag + + make PREFIX=/usr DESTDIR=${pkgdir} install + mkdir -p ${pkgdir}/etc/gitlab-gitaly + mkdir -p ${pkgdir}/usr/share/webapps/gitlab-gitaly + cp -r ruby ${pkgdir}/usr/share/webapps/gitlab-gitaly/ruby + + install -Dm644 config.toml.example "${pkgdir}/etc/${pkgname}/config.toml" + install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm0644 "${srcdir}/gitlab-gitaly.service" "${pkgdir}/usr/lib/systemd/system/gitlab-gitaly.service" +} Copied: gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 650253, gitlab-gitaly/trunk/configs.patch) === --- community-testing-x86_64/configs.patch (rev 0) +++ community-testing-x86_64/configs.patch 2020-06-21 18:54:37 UTC (rev 650254) @@ -0,0 +1,99 @@ +commit 487d724f098441298088e59805af2faba7843fbe +Author: Anatol Pomozov +Date: Tue May 26 00:26:02 2020 -0700 + +Patch config files with Arch Linux specific locations + +Arch uses upstream's default config files as a base for its configs. +But directory structure at Arch is completely different from the default +one specified by gitlab project. +We used to have a lot of seds expressions to adjust the files but as +complexity of configs grew 'sed' makes it easy to miss a changed/added +option. + +Track set of diffs as a patch. If upstream modifies config file then it +will cause a conflict that needs to be reviewed manually. + +diff --git a/config.toml.example b/config.toml.example +index 85fbf6ba..9f8e6c99 100644 +--- a/config.toml.example b/config.toml.example +@@ -2,10 +2,10 @@ + # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and + # https://docs.gitlab.com/ee//administration/gitaly/reference + +-socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" ++socket_path = "/run/gitlab/gitlab-gitaly.socket" + + # The directory where Gitaly's executables are stored +-bin_dir = "/home/git/gitaly" ++bin_dir = "/usr/bin" + + # # Optional: listen on a TCP socket. This is insecure (no authentication) + #
[arch-commits] Commit in gitlab-gitaly/repos (4 files)
Date: Tuesday, June 16, 2020 @ 14:17:26 Author: felixonmars Revision: 646219 archrelease: copy trunk to community-testing-x86_64 Added: gitlab-gitaly/repos/community-testing-x86_64/ gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 646218, gitlab-gitaly/trunk/PKGBUILD) gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 646218, gitlab-gitaly/trunk/configs.patch) gitlab-gitaly/repos/community-testing-x86_64/gitlab-gitaly.service (from rev 646218, gitlab-gitaly/trunk/gitlab-gitaly.service) ---+ PKGBUILD | 59 + configs.patch | 95 gitlab-gitaly.service | 25 3 files changed, 179 insertions(+) Copied: gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 646218, gitlab-gitaly/trunk/PKGBUILD) === --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2020-06-16 14:17:26 UTC (rev 646219) @@ -0,0 +1,59 @@ +# Maintainer: Sven-Hendrik Haase + +# 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-gitaly +pkgver=13.0.5 +pkgrel=1 +pkgdesc="Speed up Git access using caching" +arch=('x86_64') +url="https://gitlab.com/gitlab-org/gitaly; +license=('MIT') +depends=(glibc ruby libxml2 libxslt libssh2) +options=(!buildflags) +makedepends=(go ruby-bundler cmake) +backup=("etc/gitlab-gitaly/config.toml") +_tag=v${pkgver} +source=("https://gitlab.com/gitlab-org/gitaly/-/archive/${_tag}/gitaly-${_tag}.tar.gz; + "ruby27.patch::https://gitlab.com/gitlab-org/gitaly/-/merge_requests/2227.patch; +"configs.patch" +"gitlab-gitaly.service") +sha512sums=('04c0e12cf01ba3917bfb1e44029b467eecda25603a34c6eb1dec92f0b23c6e9179f8085169faeb968c8974caebe4b1c73b14e12e4898c2beead98640b74de565' + '76ed13110aab0bf5075eebd45c97e2c2499e0f035dfd51a9e20f95f968f8d4d3c2ad7b097b0590b7a70e6b61f783cc3aab5517b0bcf02acc7b02833c1a88ef0c' + '28bfb8f290d6d6206b75e2f35d8fd15b298baa005b533648550f224c6bf4fd16eeda4e2b8ff3231873ef208172f391a553956684f81867451bc08b7ad18d581f' + 'e6c31cab200424af118ee9da4def0963a52727f33025fdbdb515c6c1337a9b32f4a377bd925fdd33ffe7b91371ce1d5d70847e07c2b73eac1e85d3f38f5e1261') + +prepare() { + cd gitaly-$_tag + + patch -p1 < ../configs.patch + # At this point the config file should not contain any references to '/home/git' + + patch -p1 < ../ruby27.patch + + # https://github.com/bundler/bundler/issues/6882 + sed -e '/BUNDLED WITH/,+1d' -i ruby/Gemfile.lock +} + +build() { + cd gitaly-$_tag + + bundle config force_ruby_platform true # build from sources as some prebuilt gems are not available for newer ruby + make BUILD_TAGS="tracer_static tracer_static_jaeger" +} + +package() { + cd gitaly-$_tag + + make PREFIX=/usr DESTDIR=${pkgdir} install + mkdir -p ${pkgdir}/etc/gitlab-gitaly + mkdir -p ${pkgdir}/usr/share/webapps/gitlab-gitaly + cp -r ruby ${pkgdir}/usr/share/webapps/gitlab-gitaly/ruby + + install -Dm644 config.toml.example "${pkgdir}/etc/${pkgname}/config.toml" + install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm0644 "${srcdir}/gitlab-gitaly.service" "${pkgdir}/usr/lib/systemd/system/gitlab-gitaly.service" +} + +# vim:set ts=2 sw=2 et: Copied: gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 646218, gitlab-gitaly/trunk/configs.patch) === --- community-testing-x86_64/configs.patch (rev 0) +++ community-testing-x86_64/configs.patch 2020-06-16 14:17:26 UTC (rev 646219) @@ -0,0 +1,95 @@ +commit e70c0ab485e0ee789ae2d3c2657f8b3ad5f2a6db +Author: Anatol Pomozov +Date: Tue May 26 00:26:02 2020 -0700 + +Patch config files with Arch Linux specific locations + +Arch uses upstream's default config files as a base for its configs. +But directory structure at Arch is completely different from the default +one specified by gitlab project. +We used to have a lot of seds expressions to adjust the files but as +complexity of configs grew 'sed' makes it easy to miss a changed/added +option. + +Track set of diffs as a patch. If upstream modifies config file then it +will cause a conflict that needs to be reviewed manually. + +diff --git a/config.toml.example b/config.toml.example +index aaab83c2..46bbad26 100644 +--- a/config.toml.example b/config.toml.example +@@ -2,10 +2,10 @@ + # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and + # https://docs.gitlab.com/ee//administration/gitaly/reference + +-socket_path =
[arch-commits] Commit in gitlab-gitaly/repos (4 files)
Date: Tuesday, June 9, 2020 @ 20:02:01 Author: felixonmars Revision: 640914 archrelease: copy trunk to community-testing-x86_64 Added: gitlab-gitaly/repos/community-testing-x86_64/ gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 640913, gitlab-gitaly/trunk/PKGBUILD) gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 640913, gitlab-gitaly/trunk/configs.patch) gitlab-gitaly/repos/community-testing-x86_64/gitlab-gitaly.service (from rev 640913, gitlab-gitaly/trunk/gitlab-gitaly.service) ---+ PKGBUILD | 59 + configs.patch | 95 gitlab-gitaly.service | 25 3 files changed, 179 insertions(+) Copied: gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 640913, gitlab-gitaly/trunk/PKGBUILD) === --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2020-06-09 20:02:01 UTC (rev 640914) @@ -0,0 +1,59 @@ +# Maintainer: Sven-Hendrik Haase + +# 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-gitaly +pkgver=13.0.4 +pkgrel=1 +pkgdesc="Speed up Git access using caching" +arch=('x86_64') +url="https://gitlab.com/gitlab-org/gitaly; +license=('MIT') +depends=(glibc ruby libxml2 libxslt libssh2) +options=(!buildflags) +makedepends=(go ruby-bundler cmake) +backup=("etc/gitlab-gitaly/config.toml") +_tag=v${pkgver} +source=("https://gitlab.com/gitlab-org/gitaly/-/archive/${_tag}/gitaly-${_tag}.tar.gz; + "ruby27.patch::https://gitlab.com/gitlab-org/gitaly/-/merge_requests/2227.patch; +"configs.patch" +"gitlab-gitaly.service") +sha512sums=('6b47f5873290cbe92dbd5a475e0950ccd738702d27f43d51bfd0841ad40ccd164d83c29871127f30171cee0b0aa5cad2b26ba417b79cf53615e9f3524be72e6b' + 'ffb96b3cb8360654e2bbfa5014d7bf569169ef43e0466f2553169fba8757555c4efeda07828b3491ed0397a9be6ffe5320ee7a6e882c28ca211bd13007122c93' + '28bfb8f290d6d6206b75e2f35d8fd15b298baa005b533648550f224c6bf4fd16eeda4e2b8ff3231873ef208172f391a553956684f81867451bc08b7ad18d581f' + 'e6c31cab200424af118ee9da4def0963a52727f33025fdbdb515c6c1337a9b32f4a377bd925fdd33ffe7b91371ce1d5d70847e07c2b73eac1e85d3f38f5e1261') + +prepare() { + cd gitaly-$_tag + + patch -p1 < ../configs.patch + # At this point the config file should not contain any references to '/home/git' + + patch -p1 < ../ruby27.patch + + # https://github.com/bundler/bundler/issues/6882 + sed -e '/BUNDLED WITH/,+1d' -i ruby/Gemfile.lock +} + +build() { + cd gitaly-$_tag + + bundle config force_ruby_platform true # build from sources as some prebuilt gems are not available for newer ruby + make BUILD_TAGS="tracer_static tracer_static_jaeger" +} + +package() { + cd gitaly-$_tag + + make PREFIX=/usr DESTDIR=${pkgdir} install + mkdir -p ${pkgdir}/etc/gitlab-gitaly + mkdir -p ${pkgdir}/usr/share/webapps/gitlab-gitaly + cp -r ruby ${pkgdir}/usr/share/webapps/gitlab-gitaly/ruby + + install -Dm644 config.toml.example "${pkgdir}/etc/${pkgname}/config.toml" + install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm0644 "${srcdir}/gitlab-gitaly.service" "${pkgdir}/usr/lib/systemd/system/gitlab-gitaly.service" +} + +# vim:set ts=2 sw=2 et: Copied: gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 640913, gitlab-gitaly/trunk/configs.patch) === --- community-testing-x86_64/configs.patch (rev 0) +++ community-testing-x86_64/configs.patch 2020-06-09 20:02:01 UTC (rev 640914) @@ -0,0 +1,95 @@ +commit e70c0ab485e0ee789ae2d3c2657f8b3ad5f2a6db +Author: Anatol Pomozov +Date: Tue May 26 00:26:02 2020 -0700 + +Patch config files with Arch Linux specific locations + +Arch uses upstream's default config files as a base for its configs. +But directory structure at Arch is completely different from the default +one specified by gitlab project. +We used to have a lot of seds expressions to adjust the files but as +complexity of configs grew 'sed' makes it easy to miss a changed/added +option. + +Track set of diffs as a patch. If upstream modifies config file then it +will cause a conflict that needs to be reviewed manually. + +diff --git a/config.toml.example b/config.toml.example +index aaab83c2..46bbad26 100644 +--- a/config.toml.example b/config.toml.example +@@ -2,10 +2,10 @@ + # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and + # https://docs.gitlab.com/ee//administration/gitaly/reference + +-socket_path =
[arch-commits] Commit in gitlab-gitaly/repos (4 files)
Date: Saturday, May 30, 2020 @ 03:01:43 Author: anatolik Revision: 637311 archrelease: copy trunk to community-testing-x86_64 Added: gitlab-gitaly/repos/community-testing-x86_64/ gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 637310, gitlab-gitaly/trunk/PKGBUILD) gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 637310, gitlab-gitaly/trunk/configs.patch) gitlab-gitaly/repos/community-testing-x86_64/gitlab-gitaly.service (from rev 637310, gitlab-gitaly/trunk/gitlab-gitaly.service) ---+ PKGBUILD | 59 + configs.patch | 95 gitlab-gitaly.service | 25 3 files changed, 179 insertions(+) Copied: gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 637310, gitlab-gitaly/trunk/PKGBUILD) === --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2020-05-30 03:01:43 UTC (rev 637311) @@ -0,0 +1,59 @@ +# Maintainer: Sven-Hendrik Haase + +# 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-gitaly +pkgver=13.0.3 +pkgrel=1 +pkgdesc="Speed up Git access using caching" +arch=('x86_64') +url="https://gitlab.com/gitlab-org/gitaly; +license=('MIT') +depends=(glibc ruby libxml2 libxslt libssh2) +options=(!buildflags) +makedepends=(go ruby-bundler cmake) +backup=("etc/gitlab-gitaly/config.toml") +_tag=v${pkgver} +source=("https://gitlab.com/gitlab-org/gitaly/-/archive/${_tag}/gitaly-${_tag}.tar.gz; + "ruby27.patch::https://gitlab.com/gitlab-org/gitaly/-/merge_requests/2227.patch; +"configs.patch" +"gitlab-gitaly.service") +sha512sums=('d6250ca446227b00ccb5a402953a14cca1736f36806be53d9502b06153e0249730a1ffd27c6653b17f13098f53887ff09e6c016f474cadcc23cc79a4dc9c8de5' + 'e51d384769ebf40be76043572cd0287ab0c2df192e764b814c12e5780ebbac2eac5082594ec93436cffa5d62e47942219fa4b37c476652f5120d16c98945a053' + '28bfb8f290d6d6206b75e2f35d8fd15b298baa005b533648550f224c6bf4fd16eeda4e2b8ff3231873ef208172f391a553956684f81867451bc08b7ad18d581f' + 'e6c31cab200424af118ee9da4def0963a52727f33025fdbdb515c6c1337a9b32f4a377bd925fdd33ffe7b91371ce1d5d70847e07c2b73eac1e85d3f38f5e1261') + +prepare() { + cd gitaly-$_tag + + patch -p1 < ../configs.patch + # At this point the config file should not contain any references to '/home/git' + + patch -p1 < ../ruby27.patch + + # https://github.com/bundler/bundler/issues/6882 + sed -e '/BUNDLED WITH/,+1d' -i ruby/Gemfile.lock +} + +build() { + cd gitaly-$_tag + + bundle config force_ruby_platform true # build from sources as some prebuilt gems are not available for newer ruby + make BUILD_TAGS="tracer_static tracer_static_jaeger" +} + +package() { + cd gitaly-$_tag + + make PREFIX=/usr DESTDIR=${pkgdir} install + mkdir -p ${pkgdir}/etc/gitlab-gitaly + mkdir -p ${pkgdir}/usr/share/webapps/gitlab-gitaly + cp -r ruby ${pkgdir}/usr/share/webapps/gitlab-gitaly/ruby + + install -Dm644 config.toml.example "${pkgdir}/etc/${pkgname}/config.toml" + install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm0644 "${srcdir}/gitlab-gitaly.service" "${pkgdir}/usr/lib/systemd/system/gitlab-gitaly.service" +} + +# vim:set ts=2 sw=2 et: Copied: gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 637310, gitlab-gitaly/trunk/configs.patch) === --- community-testing-x86_64/configs.patch (rev 0) +++ community-testing-x86_64/configs.patch 2020-05-30 03:01:43 UTC (rev 637311) @@ -0,0 +1,95 @@ +commit e70c0ab485e0ee789ae2d3c2657f8b3ad5f2a6db +Author: Anatol Pomozov +Date: Tue May 26 00:26:02 2020 -0700 + +Patch config files with Arch Linux specific locations + +Arch uses upstream's default config files as a base for its configs. +But directory structure at Arch is completely different from the default +one specified by gitlab project. +We used to have a lot of seds expressions to adjust the files but as +complexity of configs grew 'sed' makes it easy to miss a changed/added +option. + +Track set of diffs as a patch. If upstream modifies config file then it +will cause a conflict that needs to be reviewed manually. + +diff --git a/config.toml.example b/config.toml.example +index aaab83c2..46bbad26 100644 +--- a/config.toml.example b/config.toml.example +@@ -2,10 +2,10 @@ + # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and + # https://docs.gitlab.com/ee//administration/gitaly/reference + +-socket_path =
[arch-commits] Commit in gitlab-gitaly/repos (4 files)
Date: Wednesday, May 27, 2020 @ 20:15:16 Author: anatolik Revision: 636034 archrelease: copy trunk to community-testing-x86_64 Added: gitlab-gitaly/repos/community-testing-x86_64/ gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 636033, gitlab-gitaly/trunk/PKGBUILD) gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 636033, gitlab-gitaly/trunk/configs.patch) gitlab-gitaly/repos/community-testing-x86_64/gitlab-gitaly.service (from rev 636033, gitlab-gitaly/trunk/gitlab-gitaly.service) ---+ PKGBUILD | 55 +++ configs.patch | 95 gitlab-gitaly.service | 25 3 files changed, 175 insertions(+) Copied: gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 636033, gitlab-gitaly/trunk/PKGBUILD) === --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2020-05-27 20:15:16 UTC (rev 636034) @@ -0,0 +1,55 @@ +# Maintainer: Sven-Hendrik Haase + +# 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-gitaly +pkgver=13.0.1 +pkgrel=1 +pkgdesc="Speed up Git access using caching" +arch=('x86_64') +url="https://gitlab.com/gitlab-org/gitaly; +license=('MIT') +depends=(glibc ruby libxml2 libxslt libssh2) +options=(!buildflags) +makedepends=(go ruby-bundler cmake) +backup=("etc/gitlab-gitaly/config.toml") +_tag=v${pkgver} +source=("https://gitlab.com/gitlab-org/gitaly/-/archive/${_tag}/gitaly-${_tag}.tar.gz; +"configs.patch" +"gitlab-gitaly.service") +sha512sums=('48bcd1aa5efc33c3c9bb9028dc1ff7b459a65cf11601847f7989d25100ad3106b71658939763eef6d9063a8e01c936a4b8a57da32426cc83b928dc7203d6592f' + '28bfb8f290d6d6206b75e2f35d8fd15b298baa005b533648550f224c6bf4fd16eeda4e2b8ff3231873ef208172f391a553956684f81867451bc08b7ad18d581f' + 'e6c31cab200424af118ee9da4def0963a52727f33025fdbdb515c6c1337a9b32f4a377bd925fdd33ffe7b91371ce1d5d70847e07c2b73eac1e85d3f38f5e1261') + +prepare() { + cd gitaly-$_tag + + patch -p1 < ../configs.patch + # At this point the config file should not contain any references to '/home/git' + + # https://github.com/bundler/bundler/issues/6882 + sed -e '/BUNDLED WITH/,+1d' -i ruby/Gemfile.lock +} + +build() { + cd gitaly-$_tag + + bundle config force_ruby_platform true # build from sources as some prebuilt gems are not available for newer ruby + make BUILD_TAGS="tracer_static tracer_static_jaeger" +} + +package() { + cd gitaly-$_tag + + make PREFIX=/usr DESTDIR=${pkgdir} install + mkdir -p ${pkgdir}/etc/gitlab-gitaly + mkdir -p ${pkgdir}/usr/share/webapps/gitlab-gitaly + cp -r ruby ${pkgdir}/usr/share/webapps/gitlab-gitaly/ruby + + install -Dm644 config.toml.example "${pkgdir}/etc/${pkgname}/config.toml" + install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm0644 "${srcdir}/gitlab-gitaly.service" "${pkgdir}/usr/lib/systemd/system/gitlab-gitaly.service" +} + +# vim:set ts=2 sw=2 et: Copied: gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 636033, gitlab-gitaly/trunk/configs.patch) === --- community-testing-x86_64/configs.patch (rev 0) +++ community-testing-x86_64/configs.patch 2020-05-27 20:15:16 UTC (rev 636034) @@ -0,0 +1,95 @@ +commit e70c0ab485e0ee789ae2d3c2657f8b3ad5f2a6db +Author: Anatol Pomozov +Date: Tue May 26 00:26:02 2020 -0700 + +Patch config files with Arch Linux specific locations + +Arch uses upstream's default config files as a base for its configs. +But directory structure at Arch is completely different from the default +one specified by gitlab project. +We used to have a lot of seds expressions to adjust the files but as +complexity of configs grew 'sed' makes it easy to miss a changed/added +option. + +Track set of diffs as a patch. If upstream modifies config file then it +will cause a conflict that needs to be reviewed manually. + +diff --git a/config.toml.example b/config.toml.example +index aaab83c2..46bbad26 100644 +--- a/config.toml.example b/config.toml.example +@@ -2,10 +2,10 @@ + # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and + # https://docs.gitlab.com/ee//administration/gitaly/reference + +-socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" ++socket_path = "/run/gitlab/gitlab-gitaly.socket" + + # The directory where Gitaly's executables are stored +-bin_dir = "/home/git/gitaly" ++bin_dir = "/usr/bin" + + # # Optional: listen on a TCP socket. This is insecure
[arch-commits] Commit in gitlab-gitaly/repos (4 files)
Date: Tuesday, May 26, 2020 @ 08:43:03 Author: anatolik Revision: 635014 archrelease: copy trunk to community-testing-x86_64 Added: gitlab-gitaly/repos/community-testing-x86_64/ gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 635013, gitlab-gitaly/trunk/PKGBUILD) gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 635013, gitlab-gitaly/trunk/configs.patch) gitlab-gitaly/repos/community-testing-x86_64/gitlab-gitaly.service (from rev 635013, gitlab-gitaly/trunk/gitlab-gitaly.service) ---+ PKGBUILD | 55 +++ configs.patch | 95 gitlab-gitaly.service | 25 3 files changed, 175 insertions(+) Copied: gitlab-gitaly/repos/community-testing-x86_64/PKGBUILD (from rev 635013, gitlab-gitaly/trunk/PKGBUILD) === --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2020-05-26 08:43:03 UTC (rev 635014) @@ -0,0 +1,55 @@ +# Maintainer: Sven-Hendrik Haase + +# 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-gitaly +pkgver=13.0.0 +pkgrel=2 +pkgdesc="Speed up Git access using caching" +arch=('x86_64') +url="https://gitlab.com/gitlab-org/gitaly; +license=('MIT') +depends=(glibc ruby libxml2 libxslt libssh2) +options=(!buildflags) +makedepends=(go ruby-bundler cmake) +backup=("etc/gitlab-gitaly/config.toml") +_tag=v${pkgver} +source=("https://gitlab.com/gitlab-org/gitaly/-/archive/${_tag}/gitaly-${_tag}.tar.gz; +"configs.patch" +"gitlab-gitaly.service") +sha512sums=('dc8cac8fec10e1d60acc192478a718ee8f0e059f84cfbfea77ff33f109b41aa26e6a232a948830598926d648170b3fff2116139d9c184ec398f295c1cc3a77a5' + '28bfb8f290d6d6206b75e2f35d8fd15b298baa005b533648550f224c6bf4fd16eeda4e2b8ff3231873ef208172f391a553956684f81867451bc08b7ad18d581f' + 'e6c31cab200424af118ee9da4def0963a52727f33025fdbdb515c6c1337a9b32f4a377bd925fdd33ffe7b91371ce1d5d70847e07c2b73eac1e85d3f38f5e1261') + +prepare() { + cd gitaly-$_tag + + patch -p1 < ../configs.patch + # At this point the config file should not contain any references to '/home/git' + + # https://github.com/bundler/bundler/issues/6882 + sed -e '/BUNDLED WITH/,+1d' -i ruby/Gemfile.lock +} + +build() { + cd gitaly-$_tag + + bundle config force_ruby_platform true # build from sources as some prebuilt gems are not available for newer ruby + make BUILD_TAGS="tracer_static tracer_static_jaeger" +} + +package() { + cd gitaly-$_tag + + make PREFIX=/usr DESTDIR=${pkgdir} install + mkdir -p ${pkgdir}/etc/gitlab-gitaly + mkdir -p ${pkgdir}/usr/share/webapps/gitlab-gitaly + cp -r ruby ${pkgdir}/usr/share/webapps/gitlab-gitaly/ruby + + install -Dm644 config.toml.example "${pkgdir}/etc/${pkgname}/config.toml" + install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm0644 "${srcdir}/gitlab-gitaly.service" "${pkgdir}/usr/lib/systemd/system/gitlab-gitaly.service" +} + +# vim:set ts=2 sw=2 et: Copied: gitlab-gitaly/repos/community-testing-x86_64/configs.patch (from rev 635013, gitlab-gitaly/trunk/configs.patch) === --- community-testing-x86_64/configs.patch (rev 0) +++ community-testing-x86_64/configs.patch 2020-05-26 08:43:03 UTC (rev 635014) @@ -0,0 +1,95 @@ +commit e70c0ab485e0ee789ae2d3c2657f8b3ad5f2a6db +Author: Anatol Pomozov +Date: Tue May 26 00:26:02 2020 -0700 + +Patch config files with Arch Linux specific locations + +Arch uses upstream's default config files as a base for its configs. +But directory structure at Arch is completely different from the default +one specified by gitlab project. +We used to have a lot of seds expressions to adjust the files but as +complexity of configs grew 'sed' makes it easy to miss a changed/added +option. + +Track set of diffs as a patch. If upstream modifies config file then it +will cause a conflict that needs to be reviewed manually. + +diff --git a/config.toml.example b/config.toml.example +index aaab83c2..46bbad26 100644 +--- a/config.toml.example b/config.toml.example +@@ -2,10 +2,10 @@ + # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and + # https://docs.gitlab.com/ee//administration/gitaly/reference + +-socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" ++socket_path = "/run/gitlab/gitlab-gitaly.socket" + + # The directory where Gitaly's executables are stored +-bin_dir = "/home/git/gitaly" ++bin_dir = "/usr/bin" + + # # Optional: listen on a TCP socket. This is insecure (no