diff options
| author | Andrew Crerar | 2017-11-03 12:38:51 -0400 |
|---|---|---|
| committer | Andrew Crerar | 2017-11-03 12:38:51 -0400 |
| commit | 50712bad7a8bd82049121227fb902f25fe9f0cb0 (patch) | |
| tree | 2b9c2114e91ccde560213d45cc90768bbed6a059 | |
| parent | 271c852ad8a33c602d53f86ed5c85adf9cd571ae (diff) | |
| download | aur-50712bad7a8bd82049121227fb902f25fe9f0cb0.tar.gz | |
Using sysusers for git account creation, minor cleanup
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | git-git.install | 10 | ||||
| -rw-r--r-- | git.sysusers | 1 |
4 files changed, 17 insertions, 12 deletions
@@ -32,15 +32,16 @@ pkgbase = git-git optdepends = subversion: git svn optdepends = cvsps2: git cvsimport optdepends = gnome-keyring: GNOME keyring credential helper - provides = git-core provides = git - conflicts = git-core + conflicts = git source = git+https://github.com/git/git.git source = git-daemon@.service source = git-daemon.socket + source = git.sysusers sha512sums = SKIP sha512sums = ad7f81859d5a3b9b93b48ab1fe317919940d666439e583984bf5287b6c62f570c192b990f4a004a5d0a2d983ed5e63aba2ccc95a42e05e1b93242fdbce2d07f5 sha512sums = bd4aff421e547044a2a91b8a77c86ce14f05321008aa2e28aab35154b297803ca716ccba3e0fca3805033d4adb455adb41086ceeca98200b8006582c13f2c7d3 + sha512sums = 17c6a884904d7336ea9975d28a15298fdc6d3ba8d00c3fc8a0f739b8e2e31e9fe4c558228f5a8509ec3c4481211e83575cf4b0d57dfc8f648c7c1b0729ee4bee pkgname = git-git @@ -25,15 +25,17 @@ optdepends=('tk: gitk and git gui' 'subversion: git svn' 'cvsps2: git cvsimport' 'gnome-keyring: GNOME keyring credential helper') -conflicts=(git-core) -provides=(git-core git) +conflicts=(git) +provides=(git) install=git-git.install source=('git+https://github.com/git/git.git' git-daemon@.service - git-daemon.socket) + git-daemon.socket + git.sysusers) sha512sums=('SKIP' 'ad7f81859d5a3b9b93b48ab1fe317919940d666439e583984bf5287b6c62f570c192b990f4a004a5d0a2d983ed5e63aba2ccc95a42e05e1b93242fdbce2d07f5' - 'bd4aff421e547044a2a91b8a77c86ce14f05321008aa2e28aab35154b297803ca716ccba3e0fca3805033d4adb455adb41086ceeca98200b8006582c13f2c7d3') + 'bd4aff421e547044a2a91b8a77c86ce14f05321008aa2e28aab35154b297803ca716ccba3e0fca3805033d4adb455adb41086ceeca98200b8006582c13f2c7d3' + '17c6a884904d7336ea9975d28a15298fdc6d3ba8d00c3fc8a0f739b8e2e31e9fe4c558228f5a8509ec3c4481211e83575cf4b0d57dfc8f648c7c1b0729ee4bee') pkgver() { cd "$srcdir/$_name" @@ -140,4 +142,7 @@ package() { # git-daemon via systemd socket activation install -D -m 644 "$srcdir/git-daemon@.service" "$pkgdir/usr/lib/systemd/system/git-daemon@.service" install -D -m 644 "$srcdir/git-daemon.socket" "$pkgdir/usr/lib/systemd/system/git-daemon.socket" + + # Add git-daemon sysuser + install -D -m 644 "$srcdir/git.sysusers" "$pkgdir/usr/lib/sysusers.d/git.conf" } diff --git a/git-git.install b/git-git.install index c011b4743142..3680c79dbf2d 100644 --- a/git-git.install +++ b/git-git.install @@ -1,15 +1,13 @@ #!/bin/sh post_install() { - if ! getent group git >/dev/null; then - groupadd --system git - fi - if ! getent passwd git >/dev/null; then - useradd --system -c 'git daemon user' -g git -d / -s /usr/bin/git-shell git - fi + systemd-sysusers git.conf + if ! grep -qe '^/usr/bin/git-shell$' etc/shells; then echo '/usr/bin/git-shell' >> etc/shells fi + + chsh -s /usr/bin/git-shell git } post_upgrade() { diff --git a/git.sysusers b/git.sysusers new file mode 100644 index 000000000000..5fed256634d8 --- /dev/null +++ b/git.sysusers @@ -0,0 +1 @@ +u git - "Git Daemon User" |