From owner-dev-commits-ports-main@freebsd.org Sun Sep 12 14:24:12 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6B294666D46; Sun, 12 Sep 2021 14:24:12 +0000 (UTC) (envelope-from 6yearold@gmail.com) Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H6sLN1CXtz4vBq; Sun, 12 Sep 2021 14:24:12 +0000 (UTC) (envelope-from 6yearold@gmail.com) Received: by mail-lj1-f180.google.com with SMTP id q21so12236387ljj.6; Sun, 12 Sep 2021 07:24:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=YlUAff6Lxt07+AtZkcJWBP1QiuM83/xKz7qU3IOHStw=; b=uIOTZPX7IXTv3VT8TC2X2wVJDTny1yqGYOyH0IuKGkZPebhsurA9m60Zq/vsDf/WEE /JLkDc0Mz/6zQ8warr2j7mQBET5fhh9EB2PmABkxLvZ4NagVREpa4VL40aCQ+hwqmoi5 EWeUseTh3JFAU/faLOO1IXRSPrbczVx12UzF3y2ZrR7TwWP97zIPqD7TBomR1p9W7S21 cprAAQtkIV3cao9YDgl3Z6NQsV6A/NbzWEzw7FmdznMdkECEU30qmcYdLlgrD87ukeYF nhoO0uw0GA3L3+Xj2PD3nJJcpz3UCXliZylXelKdnpPhwJyQtCdeSaD3dIWvB1HF1FdB ONKQ== X-Gm-Message-State: AOAM532ulwk1qX1upNHbj0W2ThjZgQZ69JwpYnyTj/tSIa7NAWYeEMTa kRtQ6RwucuFldhFScTeDnwLDC6jb4LYL0ALh X-Google-Smtp-Source: ABdhPJzwlvEus113dzTxyhPyqrXsBZ+erjxW8JirGS+QHCcbV8D3wx203AhptLNNkj4yKNVWWUzkhQ== X-Received: by 2002:a2e:b5dc:: with SMTP id g28mr6260505ljn.96.1631456645279; Sun, 12 Sep 2021 07:24:05 -0700 (PDT) Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com. [209.85.167.53]) by smtp.gmail.com with ESMTPSA id s2sm596487ljj.83.2021.09.12.07.24.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 12 Sep 2021 07:24:05 -0700 (PDT) Received: by mail-lf1-f53.google.com with SMTP id bq5so15199295lfb.9; Sun, 12 Sep 2021 07:24:04 -0700 (PDT) X-Received: by 2002:ac2:4106:: with SMTP id b6mr5821451lfi.89.1631456644785; Sun, 12 Sep 2021 07:24:04 -0700 (PDT) MIME-Version: 1.0 References: <202109121258.18CCwquw080465@gitrepo.freebsd.org> In-Reply-To: <202109121258.18CCwquw080465@gitrepo.freebsd.org> From: Gleb Popov Date: Sun, 12 Sep 2021 17:23:38 +0300 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 053deaf42fd2 - main - www/nextcloud: Add occ wrapper To: Bernard Spil Cc: ports-committers , dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org X-Rspamd-Queue-Id: 4H6sLN1CXtz4vBq X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Sep 2021 14:24:12 -0000 On Sun, Sep 12, 2021 at 3:58 PM Bernard Spil wrote: > The branch main has been updated by brnrd: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=053deaf42fd2b9034fc52402296098e023f77fdd > > commit 053deaf42fd2b9034fc52402296098e023f77fdd > Author: Bernard Spil > AuthorDate: 2021-09-12 12:58:09 +0000 > Commit: Bernard Spil > CommitDate: 2021-09-12 12:58:09 +0000 > > www/nextcloud: Add occ wrapper > --- > www/nextcloud/Makefile | 4 +++- > www/nextcloud/files/occ.in | 13 +++++++++++++ > www/nextcloud/files/pkg-message.in | 5 ++--- > www/nextcloud/pkg-plist | 1 + > 4 files changed, 19 insertions(+), 4 deletions(-) > > diff --git a/www/nextcloud/Makefile b/www/nextcloud/Makefile > index f812e213ba58..d698c562901a 100644 > --- a/www/nextcloud/Makefile > +++ b/www/nextcloud/Makefile > @@ -1,5 +1,6 @@ > PORTNAME= nextcloud > PORTVERSION= 22.1.1 > +PORTREVISION= 1 > CATEGORIES= www > MASTER_SITES= https://download.nextcloud.com/server/releases/ > PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} > @@ -21,7 +22,7 @@ NEXTCLOUD_GROUPNAME?= ${WWWGRP} > WRKSRC= ${WRKDIR}/${PORTNAME} > NO_BUILD= yes > NO_ARCH= yes > -SUB_FILES= config.sample.php pkg-message plist.post > +SUB_FILES= config.sample.php occ pkg-message plist.post > SUB_LIST= NEXTCLOUD_USERNAME=${NEXTCLOUD_USERNAME} \ > NEXTCLOUD_GROUPNAME=${NEXTCLOUD_GROUPNAME} > PLIST_SUB= ${SUB_LIST} > @@ -81,5 +82,6 @@ do-install: > -e '/^\.\/config\/config\.sample\.php/d' \ > -e 's,^\.,${WWWDIR_REL},' >> ${TMPPLIST} > ${CAT} ${WRKDIR}/plist.post >> ${TMPPLIST} > + ${INSTALL_SCRIPT} ${WRKDIR}/occ ${STAGEDIR}${LOCALBASE}/bin/occ > > .include > diff --git a/www/nextcloud/files/occ.in b/www/nextcloud/files/occ.in > new file mode 100644 > index 000000000000..dbf4550b8c6b > --- /dev/null > +++ b/www/nextcloud/files/occ.in > @@ -0,0 +1,13 @@ > +#/bin/sh > + > +args= > +for arg in "$@" ; do > + if [ "${arg#* }" != "${arg}" ] ; then > + args="${args} '${arg}'" > + else > + args="${args} ${arg}" > + fi > +done > + > +cd %%WWWDIR%% > +su -m %%NEXTCLOUD_USERNAME%% -c "%%LOCALBASE%%/bin/php %%WWWDIR%%/occ > ${args}" > On some of my servers I had to add `--define apc.enable_cli=1` to the occ command line. It'd be harder to do this now. Can anything be done about this?