From ff2a1f59b00f3e68257ca4adf5de482660b4deb7 Mon Sep 17 00:00:00 2001
From: Sertonix <sertonix@posteo.net>
Date: Mon, 8 Jan 2024 12:43:29 +0100
Subject: [PATCH] */*: replace adduser -s /bin/ash with /bin/sh
---
community/apk-deploy-tool/APKBUILD | 2 +-
community/apk-deploy-tool/apk-deploy-tool.pre-install | 2 +-
community/gitea/APKBUILD | 2 +-
community/gitea/gitea.pre-install | 2 +-
community/gogs/APKBUILD | 2 +-
community/gogs/gogs.pre-install | 2 +-
testing/forgejo/APKBUILD | 2 +-
testing/forgejo/forgejo.pre-install | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/community/apk-deploy-tool/APKBUILD b/community/apk-deploy-tool/APKBUILD
index 814d506d3d4a..763d2ba7c4d0 100644
--- a/community/apk-deploy-tool/APKBUILD
+++ b/community/apk-deploy-tool/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=apk-deploy-tool
pkgver=0.5.3
-pkgrel=0
+pkgrel=1
pkgdesc="Tool for easily deploying applications or configuration packaged in APK via SSH"
url="https://github.com/jirutka/apk-deploy-tool"
arch="noarch"
diff --git a/community/apk-deploy-tool/apk-deploy-tool.pre-install b/community/apk-deploy-tool/apk-deploy-tool.pre-install
index 2614e0edf732..95106aececbb 100644
--- a/community/apk-deploy-tool/apk-deploy-tool.pre-install
+++ b/community/apk-deploy-tool/apk-deploy-tool.pre-install
@@ -1,7 +1,7 @@
#!/bin/sh
addgroup -S deploy 2>/dev/null
-adduser -S -D -h /var/lib/apk-deploy -s /bin/ash -G deploy -k /var/empty \
+adduser -S -D -h /var/lib/apk-deploy -s /bin/sh -G deploy -k /var/empty \
-g "added for apk-deploy-tool" deploy 2>/dev/null \
&& echo "deploy:*" | chpasswd -e # unlock account
diff --git a/community/gitea/APKBUILD b/community/gitea/APKBUILD
index 97b7a59644df..f892ebcc4262 100644
--- a/community/gitea/APKBUILD
+++ b/community/gitea/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: 6543 <6543@obermui.de>
pkgname=gitea
pkgver=1.21.4
-pkgrel=0
+pkgrel=1
pkgdesc="Self-hosted Git service written in Go"
url="https://about.gitea.com"
arch="all"
diff --git a/community/gitea/gitea.pre-install b/community/gitea/gitea.pre-install
index 0c508e75b8d7..01958a617371 100644
--- a/community/gitea/gitea.pre-install
+++ b/community/gitea/gitea.pre-install
@@ -1,7 +1,7 @@
#!/bin/sh
addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -D -h /var/lib/gitea -s /bin/ash -G www-data -g gitea gitea 2>/dev/null \
+adduser -S -D -h /var/lib/gitea -s /bin/sh -G www-data -g gitea gitea 2>/dev/null \
&& passwd -u gitea 2>/dev/null
exit 0
diff --git a/community/gogs/APKBUILD b/community/gogs/APKBUILD
index 02f8f3177978..35a86b20dddd 100644
--- a/community/gogs/APKBUILD
+++ b/community/gogs/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Will Sinatra <wpsinatra@gmail.com>
pkgname=gogs
pkgver=0.13.0
-pkgrel=8
+pkgrel=9
pkgdesc="Painless self-hosted Git service"
url="https://gogs.io/"
arch="all"
diff --git a/community/gogs/gogs.pre-install b/community/gogs/gogs.pre-install
index 80d9ac0763da..ae3ebcfa5680 100644
--- a/community/gogs/gogs.pre-install
+++ b/community/gogs/gogs.pre-install
@@ -1,7 +1,7 @@
#!/bin/sh
addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -D -h /var/lib/gogs -s /bin/ash -G www-data -g gogs gogs 2>/dev/null \
+adduser -S -D -h /var/lib/gogs -s /bin/sh -G www-data -g gogs gogs 2>/dev/null \
&& passwd -u gogs 2>/dev/null
exit 0
diff --git a/testing/forgejo/APKBUILD b/testing/forgejo/APKBUILD
index eea8a80f9a79..dcb4806c5c66 100644
--- a/testing/forgejo/APKBUILD
+++ b/testing/forgejo/APKBUILD
@@ -5,7 +5,7 @@
pkgname=forgejo
_pkgver=1.21.4-0
pkgver=${_pkgver/-/.}
-pkgrel=0
+pkgrel=1
pkgdesc="Self-hosted Git service written in Go"
url="https://forgejo.org"
arch="all"
diff --git a/testing/forgejo/forgejo.pre-install b/testing/forgejo/forgejo.pre-install
index e65e3ef1759c..c7e8b7bbcccb 100644
--- a/testing/forgejo/forgejo.pre-install
+++ b/testing/forgejo/forgejo.pre-install
@@ -1,7 +1,7 @@
#!/bin/sh
addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -D -h /var/lib/forgejo -s /bin/ash -G www-data -g forgejo forgejo 2>/dev/null \
+adduser -S -D -h /var/lib/forgejo -s /bin/sh -G www-data -g forgejo forgejo 2>/dev/null \
&& passwd -u forgejo 2>/dev/null
exit 0
--
GitLab