Received: by mail.netbsd.org (Postfix, from userid 605) id 4204B84D78; Sun, 3 Nov 2019 14:05:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BC6E284D67 for ; Sun, 3 Nov 2019 14:05:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id O9y9LlfBgdCD for ; Sun, 3 Nov 2019 14:05:20 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 0C5A984D37 for ; Sun, 3 Nov 2019 14:05:20 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C6040FA93; Sun, 3 Nov 2019 14:05:19 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_157278991918920" MIME-Version: 1.0 Date: Sun, 3 Nov 2019 14:05:19 +0000 From: =?UTF-8?B?RnLDqWTDqXJpYyBGYXViZXJ0ZWF1?= Subject: CVS commit: pkgsrc/www/davical To: pkgsrc-changes@NetBSD.org Reply-To: triaxx@netbsd.org X-Mailer: log_accum Message-Id: <20191103140519.C6040FA93@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_157278991918920 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: triaxx Date: Sun Nov 3 14:05:19 UTC 2019 Modified Files: pkgsrc/www/davical: Makefile distinfo pkgsrc/www/davical/patches: patch-aa Log Message: davical: fix dba/create-database.sh script pkgsrc changes: * Fix the script that initialize PostgreSQL database. Patch for AWL directory was broken. Add '-U @PGUSER@' to psql command because it is the default database administrator out of the box. * Bump revision. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 pkgsrc/www/davical/Makefile cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/davical/distinfo cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/davical/patches/patch-aa Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_157278991918920 Content-Disposition: inline Content-Length: 5295 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/davical/Makefile diff -u pkgsrc/www/davical/Makefile:1.38 pkgsrc/www/davical/Makefile:1.39 --- pkgsrc/www/davical/Makefile:1.38 Fri Sep 20 07:45:21 2019 +++ pkgsrc/www/davical/Makefile Sun Nov 3 14:05:19 2019 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.38 2019/09/20 07:45:21 triaxx Exp $ +# $NetBSD: Makefile,v 1.39 2019/11/03 14:05:19 triaxx Exp $ DISTNAME= davical-${DAVICAL_VERSION} PKGNAME= ${PHP_PKG_PREFIX}-davical-${DAVICAL_VERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= www MASTER_SITES= -https://gitlab.com/davical-project/davical/repository/archive.tar.gz?ref=${GITLAB_TAG} @@ -85,7 +85,7 @@ SUBST_MESSAGE.conf-path=Fixing configura SUBST_CLASSES+= inc-path SUBST_STAGE.inc-path= pre-configure SUBST_VARS.inc-path+= PKG_SYSCONFDIR -SUBST_FILES.inc-path= davical.conf inc/always.php.in +SUBST_FAWLDIRILES.inc-path= davical.conf inc/always.php.in SUBST_FILES.inc-path+= scripts/po/rebuild-translations.sh SUBST_FILES.inc-path+= dba/create-database.sh SUBST_SED.inc-path+= -e "s|@LIBAWLPATH@|${PREFIX}/${LIBAWLDIR}|g" @@ -103,6 +103,12 @@ SUBST_VARS.files+= DAVICALDIR SUBST_FILES.files= davical.conf SUBST_MESSAGE.files= Fixing DAViCal configuration file for Apache. +SUBST_CLASSES+= postgres +SUBST_STAGE.postgres= pre-configure +SUBST_VARS.postgres= PGUSER +SUBST_FILES.postgres= dba/create-database.sh +SUBST_MESSAGE.postgres= Fixing PostgreSQL variables. + pre-patch: ${MV} ${WRKDIR}/davical-${GITLAB_TAG}-${GITLAB_REV} ${WRKSRC} ${CP} ${FILESDIR}/davical.conf ${WRKSRC}/davical.conf Index: pkgsrc/www/davical/distinfo diff -u pkgsrc/www/davical/distinfo:1.15 pkgsrc/www/davical/distinfo:1.16 --- pkgsrc/www/davical/distinfo:1.15 Fri May 10 12:25:04 2019 +++ pkgsrc/www/davical/distinfo Sun Nov 3 14:05:19 2019 @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.15 2019/05/10 12:25:04 hauke Exp $ +$NetBSD: distinfo,v 1.16 2019/11/03 14:05:19 triaxx Exp $ SHA1 (davical-1.1.8.tar.gz) = b42da3733fa9d92f3e43529e4b19428707c0f4a2 RMD160 (davical-1.1.8.tar.gz) = 620e2b16220a859cca6f751c10f847dcca30f997 SHA512 (davical-1.1.8.tar.gz) = 86987599e4e3af5b1995ad25e589a83bb1634f5c740691b9f6d7deb7dc9970019a86ffb4e0a51e91061b11ed44046a78d873ba874a78eab0700f33f70a04cd6a Size (davical-1.1.8.tar.gz) = 1837037 bytes -SHA1 (patch-aa) = a2a8be1a131cd47c6541c0a0793a00a33ba3a9f2 +SHA1 (patch-aa) = 39d61a0bd2bc76d111fb7f03ea663ffac7dbd12f SHA1 (patch-ab) = 7ae06c595f54d3a959db481d303978b29ebbd899 SHA1 (patch-ac) = 357abb2ad470121f3f30d19a4602692c77661872 SHA1 (patch-ad) = ecbac45e18ed6cea2915caadfb4dca1a2ce32667 Index: pkgsrc/www/davical/patches/patch-aa diff -u pkgsrc/www/davical/patches/patch-aa:1.3 pkgsrc/www/davical/patches/patch-aa:1.4 --- pkgsrc/www/davical/patches/patch-aa:1.3 Sun Jun 18 15:27:24 2017 +++ pkgsrc/www/davical/patches/patch-aa Sun Nov 3 14:05:19 2019 @@ -1,18 +1,61 @@ -$NetBSD: patch-aa,v 1.3 2017/06/18 15:27:24 taca Exp $ +$NetBSD: patch-aa,v 1.4 2019/11/03 14:05:19 triaxx Exp $ Set pkgsrc AWLDIR. ---- dba/create-database.sh.orig 2017-01-23 22:04:46.000000000 +0000 +--- dba/create-database.sh.orig 2019-01-30 21:53:08.000000000 +0000 +++ dba/create-database.sh @@ -12,7 +12,7 @@ INSTALL_NOTE_FN="`mktemp -t tmp.XXXXXXXX # Candidate locations of the AWL directory -awldirs="${DBADIR}/../../awl -+AWLDIR="@LIBAWLPATH@" ++awldirs="@LIBAWLPATH@ /usr/share/awl /usr/share/php/awl /usr/local/share/awl" +@@ -41,19 +41,19 @@ AWL_APPUSER="${4:-davical_app}" + # set -x + + # Get the major version for PostgreSQL +-export DBVERSION="`psql -qXAt ${PSQLOPTS} -c "SELECT version();" template1 | cut -f2 -d' ' | cut -f1-2 -d'.'`" ++export DBVERSION="`psql -U @PGUSER@ -qXAt ${PSQLOPTS} -c "SELECT version();" template1 | cut -f2 -d' ' | cut -f1-2 -d'.'`" + + install_note() { + cat >>"${INSTALL_NOTE_FN}" + } + + db_users() { +- psql -qXAt ${PSQLOPTS} -c "SELECT usename FROM pg_user;" template1 ++ psql -U @PGUSER@ -qXAt ${PSQLOPTS} -c "SELECT usename FROM pg_user;" template1 + } + + create_db_user() { + if ! db_users | grep "^${1}$" >/dev/null ; then +- psql -qXAt ${PSQLOPTS} -c "CREATE USER ${1} NOCREATEDB NOCREATEROLE;" template1 ++ psql -U @PGUSER@ -qXAt ${PSQLOPTS} -c "CREATE USER ${1} NOCREATEDB NOCREATEROLE;" template1 + cat <