From d2ee789268d92e66694c967d3cc4c3104a46675d Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Tue, 28 Jul 2020 07:32:59 -0600
Subject: [PATCH] pgbouncer: more fixes for this shitty package

---
 sr.ht/pgbouncer/APKBUILD              | 2 +-
 sr.ht/pgbouncer/pgbouncer.initd       | 2 +-
 sr.ht/pgbouncer/pgbouncer.pre-install | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sr.ht/pgbouncer/APKBUILD b/sr.ht/pgbouncer/APKBUILD
index 0cae2ea..60a5f04 100644
--- a/sr.ht/pgbouncer/APKBUILD
+++ b/sr.ht/pgbouncer/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=pgbouncer
 pkgver=1.14.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A lightweight connection pooler for PostgreSQL"
 url="https://wiki.postgresql.org/wiki/PgBouncer"
 arch="all"
diff --git a/sr.ht/pgbouncer/pgbouncer.initd b/sr.ht/pgbouncer/pgbouncer.initd
index 2a3324d..29a9328 100644
--- a/sr.ht/pgbouncer/pgbouncer.initd
+++ b/sr.ht/pgbouncer/pgbouncer.initd
@@ -87,6 +87,6 @@ get_config() {
 		  s/\s*$//;                            # trim trailing whitespaces
 		  s/^['\"](.*)['\"]$/\1/;              # remove delimiting quotes
 		  p
-		}" "$conffile" \
+		}" "$cfgfile" \
 		| grep . || printf '%s\n' "$default"
 }
diff --git a/sr.ht/pgbouncer/pgbouncer.pre-install b/sr.ht/pgbouncer/pgbouncer.pre-install
index fd05886..18ffc5f 100644
--- a/sr.ht/pgbouncer/pgbouncer.pre-install
+++ b/sr.ht/pgbouncer/pgbouncer.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-addgroup -S postgres || true 2>/dev/null
-adduser -S -D -H -h /dev/null -s /sbin/nologin -G postgres -g pgbouncer pgbouncer 2>/dev/null
+addgroup -S postgres || true
+adduser -SDH -s /sbin/nologin -G postgres -g pgbouncer pgbouncer || true
-- 
2.45.2