<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1a36a473fccd72e8fba1b21c08a62e611760f337">https://github.com/macports/macports-ports/commit/1a36a473fccd72e8fba1b21c08a62e611760f337</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 1a36a473fcc postgresql96-server: Bugfix startupitem
</span>1a36a473fcc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1a36a473fccd72e8fba1b21c08a62e611760f337
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Tue Mar 22 13:01:11 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> postgresql96-server: Bugfix startupitem
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Bugfix startupitem with `sudo`, not `su`
</span><span style='display:block; white-space:pre;color:#404040;'> * Use tcl commands in Portfile rather than `system` calls
</span>---
databases/postgresql96-server/Portfile | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql96-server/Portfile b/databases/postgresql96-server/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index da069cb752b..fad079409d9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgresql96-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgresql96-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name postgresql96-server
version 9.6.24
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories databases
maintainers {jwa @jyrkiwahlstedt}
license Permissive
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +31,8 @@ add_users ${dbuser} group=${dbgrp} \
</span> home=${prefix}/var/db/${rname} \
realname=PostgreSQL-96\ Server
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run port:${rname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run port:bash \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${rname}
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,13 +40,14 @@ build {}
</span>
startupitem.create yes
startupitem.init "PGCTL=${libdir}/bin/pg_ctl"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.start "su ${dbuser} -c \"\${PGCTL} -D \${POSTGRESQL96DATA:=${dbdir}} start -l ${logdir}/postgres.log\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.stop "su ${dbuser} -c \"\${PGCTL} -D \${POSTGRESQL96DATA:=${dbdir}} stop -s -m fast\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.start "sudo -u ${dbuser} ${prefix}/bin/bash -c \"\${PGCTL} -D \${POSTGRESQL96DATA:=${dbdir}} start -l ${logdir}/postgres.log\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.stop "sudo -u ${dbuser} ${prefix}/bin/bash -c \"\${PGCTL} -D \${POSTGRESQL96DATA:=${dbdir}} stop -s -m fast\""
</span>
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${logdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "touch ${destroot}${logdir}/postgres.log"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "chown ${dbuser}:${dbgrp} ${destroot}${logdir}/postgres.log"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${logdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ touch ${destroot}${logdir}/postgres.log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file attributes ${destroot}${logdir}/postgres.log \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -owner ${dbuser} -group ${dbgrp}
</span> }
# https://trac.macports.org/ticket/64286
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,6 +62,6 @@ post-activate {
</span> notes "\nTo create a database instance, after install do\n\
sudo mkdir -p ${dbdir}\n\
sudo chown ${dbuser}:${dbgrp} ${dbdir}\n\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo su ${dbuser} -c \'cd ${dbhome} && ${libdir}/bin/initdb -D ${dbdir}\' "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo -u ${dbuser} bash -c \'cd ${dbhome} && ${libdir}/bin/initdb -D ${dbdir}\'"
</span>
livecheck.type none
</pre><pre style='margin:0'>
</pre>