[arch-commits] Commit in gitlab-shell/trunk (3 files)

2019-10-29 Thread Sven-Hendrik Haase via arch-commits 
Date: Tuesday, October 29, 2019 @ 08:40:57
  Author: svenstaro
Revision: 520880

upgpkg: gitlab-shell 2:10.2.0-2

Try to fix FS#64251

Modified:
  gitlab-shell/trunk/PKGBUILD
  gitlab-shell/trunk/gitlab-shell.install
  gitlab-shell/trunk/gitlab-shell.sysusers

---+
 PKGBUILD  |7 +--
 gitlab-shell.install  |2 +-
 gitlab-shell.sysusers |2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-29 08:23:32 UTC (rev 520879)
+++ PKGBUILD2019-10-29 08:40:57 UTC (rev 520880)
@@ -12,7 +12,7 @@
 # need this again at some point in the future.
 pkgname=gitlab-shell
 pkgver=10.2.0
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc="Git management software"
 arch=('x86_64')
@@ -32,7 +32,7 @@
 "gitlab-shell.sysusers")
 
sha512sums=('2be081d2617409dd5612d0d44a42e5e88959fe267f1775313e5a43cb6acf3d737978189d7ba270c99bf3fb1d59e4ec701e74e9f89f3d2aaf54ce548ce8c16f35'
 
'5caafe5300621ced58479e724b39656afc17f32a64ecde5dfa4919683ef37d9121552c78f066678472acb56e0a34b5c3cf34d9b44414d1ed5d91f725d180fa43'
-
'196fd5519f1019815562da5b8bfde1d8082614cee6e63d75a7bb673db8b3c409384177dcf3dd0436c2adeec273b4ffea690058c2c457ae6a82d4f805e860495f')
+
'616188911fa7b7c569bc2d5e2024177e67366c48b4ffef1f7ad4dc8e4e9e2cdb421b687f45a1e9bdec8bf2736a157ca9f1e0ba24edae2f073b8c7b5ac42745e8')
 
 _datadir="/usr/share/webapps/${pkgname}"
 _etcdir="/etc/webapps/${pkgname}"
@@ -92,6 +92,9 @@
   cp -r VERSION bin hooks spec support "${pkgdir}${_datadir}"
   ln -fs "${_datadir}" "${pkgdir}/${_homedir}/"
 
+  # Compatibility for FS#64251
+  ln -s gitlab-shell "$pkgdir"/${_datadir}/bin/gitlab-shell-ruby
+
   install -dm2770 -o 105 -g 105 "${pkgdir}${_homedir}/repositories"
 
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"

Modified: gitlab-shell.install
===
--- gitlab-shell.install2019-10-29 08:23:32 UTC (rev 520879)
+++ gitlab-shell.install2019-10-29 08:40:57 UTC (rev 520880)
@@ -5,5 +5,5 @@
 
 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"
+echo "usermod -s /usr/share/webapps/gitlab-shell/bin/gitlab-shell gitlab"
 }

Modified: gitlab-shell.sysusers
===
--- gitlab-shell.sysusers   2019-10-29 08:23:32 UTC (rev 520879)
+++ gitlab-shell.sysusers   2019-10-29 08:40:57 UTC (rev 520880)
@@ -1 +1 @@
-u gitlab 105 - /var/lib/gitlab 
/usr/share/webapps/gitlab-shell/bin/gitlab-shell-ruby
+u gitlab 105 - /var/lib/gitlab /usr/share/webapps/gitlab-shell/bin/gitlab-shell

[arch-commits] Commit in gitlab-shell/trunk (3 files)

2019-03-16 Thread Sven-Hendrik Haase via arch-commits 
Date: Saturday, March 16, 2019 @ 11:01:16
  Author: svenstaro
Revision: 442209

upgpkg: gitlab-shell 2:8.7.1-2

Try to workaround FS#61863

Modified:
  gitlab-shell/trunk/PKGBUILD
  gitlab-shell/trunk/gitlab-shell.install
  gitlab-shell/trunk/gitlab-shell.sysusers

---+
 PKGBUILD  |4 ++--
 gitlab-shell.install  |5 +
 gitlab-shell.sysusers |2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-16 08:50:44 UTC (rev 442208)
+++ PKGBUILD2019-03-16 11:01:16 UTC (rev 442209)
@@ -12,7 +12,7 @@
 # need this again at some point in the future.
 pkgname=gitlab-shell
 pkgver=8.7.1
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc="Git management software"
 arch=('x86_64')
@@ -33,7 +33,7 @@
 252.patch)
 
sha512sums=('21ff2bcc9b57d47a4e69de00f13711dabd9a9d9437978fc1f6c43fe6432547d814ef8632001e8a012f746a15e1a7448a2e075af2d9e81a6b728417402413a06f'
 
'5caafe5300621ced58479e724b39656afc17f32a64ecde5dfa4919683ef37d9121552c78f066678472acb56e0a34b5c3cf34d9b44414d1ed5d91f725d180fa43'
-
'616188911fa7b7c569bc2d5e2024177e67366c48b4ffef1f7ad4dc8e4e9e2cdb421b687f45a1e9bdec8bf2736a157ca9f1e0ba24edae2f073b8c7b5ac42745e8'
+
'196fd5519f1019815562da5b8bfde1d8082614cee6e63d75a7bb673db8b3c409384177dcf3dd0436c2adeec273b4ffea690058c2c457ae6a82d4f805e860495f'
 
'd8f24575a3ff848c2eb1b8c32f98942377d17729a874048a3a1ab97f8bdbbca556fe0e8c1e87ef301aa3abd7b3a62fb414a46d99cd346dde51b792e4622d2a49')
 
 _datadir="/usr/share/webapps/${pkgname}"

Modified: gitlab-shell.install
===
--- gitlab-shell.install2019-03-16 08:50:44 UTC (rev 442208)
+++ gitlab-shell.install2019-03-16 11:01:16 UTC (rev 442209)
@@ -2,3 +2,8 @@
 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"
+}

Modified: gitlab-shell.sysusers
===
--- gitlab-shell.sysusers   2019-03-16 08:50:44 UTC (rev 442208)
+++ gitlab-shell.sysusers   2019-03-16 11:01:16 UTC (rev 442209)
@@ -1 +1 @@
-u gitlab 105 - /var/lib/gitlab /usr/share/webapps/gitlab-shell/bin/gitlab-shell
+u gitlab 105 - /var/lib/gitlab 
/usr/share/webapps/gitlab-shell/bin/gitlab-shell-ruby

[arch-commits] Commit in gitlab-shell/trunk (3 files)

2018-03-07 Thread Sven-Hendrik Haase via arch-commits 
Date: Wednesday, March 7, 2018 @ 20:54:41
  Author: svenstaro
Revision: 304144

upgpkg: gitlab-shell 2:6.0.4-1

Modified:
  gitlab-shell/trunk/PKGBUILD
  gitlab-shell/trunk/gitlab-shell.install
  gitlab-shell/trunk/gitlab-shell.sysusers

---+
 PKGBUILD  |6 +++---
 gitlab-shell.install  |3 ---
 gitlab-shell.sysusers |2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-07 20:39:24 UTC (rev 304143)
+++ PKGBUILD2018-03-07 20:54:41 UTC (rev 304144)
@@ -7,7 +7,7 @@
 # Contributor: Stefan Tatschner 
 
 pkgname=gitlab-shell
-pkgver=6.0.3
+pkgver=6.0.4
 pkgrel=1
 epoch=2
 pkgdesc="Git management software"
@@ -26,9 +26,9 @@
 
source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/gitlab-org/gitlab-shell/repository/archive.tar.gz?ref=v${pkgver}";
 "gitlab-shell.gitconfig"
 "gitlab-shell.sysusers")
-sha512sums=('62ca96c52d46934aab20aa440c7d16f98577fe1fec820e8b15f157d6ff921a5a225516f30cdb03aa3b863af6ef77bbb6336d1afa6f6a4d5990a2c719564caa30'
+sha512sums=('65237759bd33615231bd0ed6d0a4a26979c831afb0b3fd7fe40ec727450945aee98cb95b3e0bb3dbfc8896402a0a1c9e45108ac4185b44f99bb93b19a05530ac'
 
'9428eaba40eb3ef52024bb01321de860e149242a15465543030317233486aa37b40c5b946aba57451d07cec98b35fcc95d60fd7b376f77c218034b6cf94d191d'
-
'5c6306494694fdd07ee475a58a6e5b83613ac7ef294ebb13f52eaa5dbe72ffcee034726245206d7edbba4b5c5e808abdfe5be7631b722492d3334407fd69840f')
+
'616188911fa7b7c569bc2d5e2024177e67366c48b4ffef1f7ad4dc8e4e9e2cdb421b687f45a1e9bdec8bf2736a157ca9f1e0ba24edae2f073b8c7b5ac42745e8')
 
 _datadir="/usr/share/webapps/${pkgname}"
 _etcdir="/etc/webapps/${pkgname}"

Modified: gitlab-shell.install
===
--- gitlab-shell.install2018-03-07 20:39:24 UTC (rev 304143)
+++ gitlab-shell.install2018-03-07 20:54:41 UTC (rev 304144)
@@ -1,9 +1,6 @@
 post_install() {
-
 # make sure the user exists...
 systemd-sysusers gitlab-shell.conf
-# ... and change the shell.
-usermod -s "/usr/share/webapps/gitlab-shell/bin/gitlab-shell" gitlab
 
 echo "Configure gitlab-shell in /etc/webapps/gitlab-shell/config.yml"
 echo "Put a secret bytestring to /etc/webapps/gitlab-shell/secret"

Modified: gitlab-shell.sysusers
===
--- gitlab-shell.sysusers   2018-03-07 20:39:24 UTC (rev 304143)
+++ gitlab-shell.sysusers   2018-03-07 20:54:41 UTC (rev 304144)
@@ -1 +1 @@
-u gitlab 105 - /var/lib/gitlab
+u gitlab 105 - /var/lib/gitlab /usr/share/webapps/gitlab-shell/bin/gitlab-shell

[arch-commits] Commit in gitlab-shell/trunk (3 files)

2018-02-06 Thread Sven-Hendrik Haase via arch-commits 
Date: Tuesday, February 6, 2018 @ 08:54:08
  Author: svenstaro
Revision: 289377

upgpkg: gitlab-shell 2:6.0.2-2

Use sysusers file

Added:
  gitlab-shell/trunk/gitlab-shell.sysusers
Modified:
  gitlab-shell/trunk/PKGBUILD
  gitlab-shell/trunk/gitlab-shell.install

---+
 PKGBUILD  |   11 ---
 gitlab-shell.install  |7 +--
 gitlab-shell.sysusers |1 +
 3 files changed, 14 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-06 03:37:16 UTC (rev 289376)
+++ PKGBUILD2018-02-06 08:54:08 UTC (rev 289377)
@@ -8,7 +8,7 @@
 
 pkgname=gitlab-shell
 pkgver=6.0.2
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc="Git management software"
 arch=('x86_64')
@@ -24,9 +24,11 @@
 "etc/webapps/${pkgname}/authorized_keys"
 "etc/webapps/${pkgname}/")
 
source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/gitlab-org/gitlab-shell/repository/archive.tar.gz?ref=v${pkgver}";
-"gitlab-shell.gitconfig")
+"gitlab-shell.gitconfig"
+"gitlab-shell.sysusers")
 
sha512sums=('a154ab0817327cd404116f1ec0b7109f1a5c0eb1185899b2d6630862f1ae62a91188dd715e6f60fbc5d0fcc13daa04b0552e5a40d6155f4d67504ccf1a19'
-
'9428eaba40eb3ef52024bb01321de860e149242a15465543030317233486aa37b40c5b946aba57451d07cec98b35fcc95d60fd7b376f77c218034b6cf94d191d')
+
'9428eaba40eb3ef52024bb01321de860e149242a15465543030317233486aa37b40c5b946aba57451d07cec98b35fcc95d60fd7b376f77c218034b6cf94d191d'
+
'5c6306494694fdd07ee475a58a6e5b83613ac7ef294ebb13f52eaa5dbe72ffcee034726245206d7edbba4b5c5e808abdfe5be7631b722492d3334407fd69840f')
 
 _datadir="/usr/share/webapps/${pkgname}"
 _etcdir="/etc/webapps/${pkgname}"
@@ -66,6 +68,9 @@
   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"

Modified: gitlab-shell.install
===
--- gitlab-shell.install2018-02-06 03:37:16 UTC (rev 289376)
+++ gitlab-shell.install2018-02-06 08:54:08 UTC (rev 289377)
@@ -1,7 +1,10 @@
 post_install() {
-getent group gitlab > /dev/null || groupadd -g 105 gitlab 1>/dev/null
-getent passwd gitlab > /dev/null || useradd -u 105 -d "/var/lib/gitlab" -g 
gitlab -s "/usr/share/webapps/gitlab-shell/bin/gitlab-shell" gitlab 1>/dev/null
 
+# make sure the user exists...
+systemd-sysusers gitlab-shell.conf
+# ... and change the shell.
+usermod -s "/usr/share/webapps/gitlab-shell/bin/gitlab-shell" gitlab
+
 echo "Configure gitlab-shell in /etc/webapps/gitlab-shell/config.yml"
 echo "Put a secret bytestring to /etc/webapps/gitlab-shell/secret"
 }

Added: gitlab-shell.sysusers
===
--- gitlab-shell.sysusers   (rev 0)
+++ gitlab-shell.sysusers   2018-02-06 08:54:08 UTC (rev 289377)
@@ -0,0 +1 @@
+u gitlab 105 - /var/lib/gitlab