From nobody Tue May 10 09:02:36 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5581C1AE45AC; Tue, 10 May 2022 09:02:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KyBrX1zNBz4blw; Tue, 10 May 2022 09:02:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652173356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=19crZJ0TWytumP3ft5GUeFucUIIN5E9VzfiN2GUlFJ0=; b=DiuQDFQLs8ZsgK3pknTjrnw5UD3RPuP8KrxAJvMkSSberKW8EWNVAj3RNoDulvM/J7ekPm U9Mei3sZ3u4sgB1vwJZK9Wn26SybmzRMN7Q7AM7QfO4P10K5zZ9vhHd/RdRX0rvvzJxm6k xr4/p62MeCn67iZcITlWN1/jX9c67ofApqtfcQgh8YNiIUy/HflNUgLXEYEFcmAnC8b8Ow XIKAEBaFUDrWpjb1b75SfPeUvNEXXuxWpkuFXwewyrB8n768j815dBd6tIJNNJcUHawNdL 7hW12KAWFlgmy+BVwAzV/xSmAJqlcS6SPiRsodLZtcZbNaPAlZfsHl1KstpAGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 23F9122577; Tue, 10 May 2022 09:02:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24A92ajO010564; Tue, 10 May 2022 09:02:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24A92aFN010563; Tue, 10 May 2022 09:02:36 GMT (envelope-from git) Date: Tue, 10 May 2022 09:02:36 GMT Message-Id: <202205100902.24A92aFN010563@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Wen Heping Subject: git: 76812bb34dfd - main - www/ilias: Update to 7.10 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76812bb34dfdfd0a0c665713dec7486f1c17cec9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652173356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=19crZJ0TWytumP3ft5GUeFucUIIN5E9VzfiN2GUlFJ0=; b=DhTBgagL9RkoGjn5LC17rKvcdbS3fnvV0hM7hb60nrv4OIOrd7VXsi6yqSC+LTOnQMd6Fy 61rCRdW3/OnbPaAbG73rjaqFyv4DvS/+t+G1WeOCVrPvmivfGV1l7a/5P6DTw23hOyeL5+ yCrK+GEm20nJUYNOL0Kr7HMgeqZ/yBQDYLxOV/gPYF0bew2jjCLVKEFE/rmuiFQUu7ODee UtWcKLpRKcg9xa5hjLfzX+VuJDhOozVLaHM4r/5cbDBQctf8q1EgPP7utWKB82DH4kOsR9 e+JUq+LXja/AnFQCkFh8nSCwP9DyJj8KbblU6YifsC2fwXvqUmHxt1LCcrIX/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652173356; a=rsa-sha256; cv=none; b=KjuWjykPkfp0LW5hoeG4sMVnwsZLNO5t8dM8yV564M+taQhOdjj3JSlWxoPGlfC8M7fJUj j6tlzF2RsfEIQdKp5RxKvMdyyYSvIzwhFiVSH3jLYcQbp1TwsZ2sQsKngWGvDHA3EMwkVF oCZyi+ukiPykzH4lRu4mjW+By12j9CaIohypW9XnnLMW4vVdTLpnh7ozRvApYKTg3kROV+ psZ2VpCyJp+Evrsmhm9uTm0XDmI+V5UD3+7F5/q/qWaxP6WOZ4kzL0l8ACZYHKRbVHKakM MpUJEkJP7MMDiqgCkxSar10XqDcO80Xd3L36cdizBujR0cxbjeSxFrT+IYQqqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wen: URL: https://cgit.FreeBSD.org/ports/commit/?id=76812bb34dfdfd0a0c665713dec7486f1c17cec9 commit 76812bb34dfdfd0a0c665713dec7486f1c17cec9 Author: Wen Heping AuthorDate: 2022-05-10 08:15:20 +0000 Commit: Wen Heping CommitDate: 2022-05-10 08:15:20 +0000 www/ilias: Update to 7.10 Update pkg-message Update DEPENDS Add missing PHP modules Add a config.json file --- www/ilias/Makefile | 55 +++++++++++++++++++++++++++++++++--------- www/ilias/distinfo | 6 ++--- www/ilias/files/config.json | 36 +++++++++++++++++++++++++++ www/ilias/files/pkg-message.in | 16 ++++++------ 4 files changed, 90 insertions(+), 23 deletions(-) diff --git a/www/ilias/Makefile b/www/ilias/Makefile index be676e7ffa14..30cd61209629 100644 --- a/www/ilias/Makefile +++ b/www/ilias/Makefile @@ -1,7 +1,7 @@ # Created by: Bartlomiej Rutkowski PORTNAME= ilias -PORTVERSION= 7.7 +PORTVERSION= 7.10 DISTVERSIONPREFIX= v CATEGORIES= www education @@ -16,25 +16,28 @@ RUN_DEPENDS= ${LOCALBASE}/share/pear/Auth/Auth.php:security/pear-Auth@${PHP_FLAV ${LOCALBASE}/share/pear/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} \ ${LOCALBASE}/share/pear/PEAR.php:devel/pear@${PHP_FLAVOR} \ ${UNZIP_CMD}:archivers/unzip \ - composer:devel/php-composer \ + composer:devel/php-composer2 \ + sudo:security/sudo \ zip:archivers/zip USES= cpe jpeg magick:6,run php USE_GITHUB= yes GH_ACCOUNT= ILIAS-eLearning GH_PROJECT= ILIAS -USE_PHP= curl dom gd ldap pcre pdf pdo_mysql session simplexml soap \ - xmlrpc xmlwriter xsl zlib +USE_PHP= curl dom gd ldap fileinfo pcre pdf \ + pdo_mysql session simplexml soap \ + tokenizer xmlrpc xmlwriter xsl zlib + IGNORE_WITH_PHP= 80 81 CONFLICTS= ilias6 NO_BUILD= yes SUB_FILES= pkg-message -SUB_LIST= ILIASDATADIR=${ILIASDATADIR} +SUB_LIST= ILIASFILESDIR=${ILIASFILESDIR} PLIST= ${WRKDIR}/plist -PLIST_SUB= ILIASDATADIR=${ILIASDATADIR} +PLIST_SUB= ILIASFILESDIR=${ILIASFILESDIR} OPTIONS_DEFINE= CHECKER MAIL SCORM2004 @@ -43,28 +46,58 @@ MAIL_RUN_DEPENDS= ${LOCALBASE}/share/pear/Mail.php:mail/pear-Mail@${PHP_FLAVOR} SCORM2004_USE= PHP=json ILIASDIR= www/ilias -ILIASDATADIR= www/iliasdata +ILIASFILESDIR= www/iliasfiles EXTRA_FILES= %%WWWDIR%%/Modules/Chatroom/chat/node_modules/.bin/mime \ %%WWWDIR%%/Modules/Chatroom/chat/node_modules/.bin/uuid \ - %%WWWDIR%%/Modules/Chatroom/chat/node_modules/send/node_modules/.bin/mime + %%WWWDIR%%/node_modules/.bin/_mocha \ + %%WWWDIR%%/node_modules/.bin/atob \ + %%WWWDIR%%/node_modules/.bin/errno \ + %%WWWDIR%%/node_modules/.bin/flat \ + %%WWWDIR%%/node_modules/.bin/gl-style-composite \ + %%WWWDIR%%/node_modules/.bin/gl-style-format \ + %%WWWDIR%%/node_modules/.bin/gl-style-migrate \ + %%WWWDIR%%/node_modules/.bin/gl-style-validate \ + %%WWWDIR%%/node_modules/.bin/he \ + %%WWWDIR%%/node_modules/.bin/image-size \ + %%WWWDIR%%/node_modules/.bin/js-yaml \ + %%WWWDIR%%/node_modules/.bin/lessc \ + %%WWWDIR%%/node_modules/.bin/loose-envify \ + %%WWWDIR%%/node_modules/.bin/mime \ + %%WWWDIR%%/node_modules/.bin/mocha \ + %%WWWDIR%%/node_modules/.bin/nanoid \ + %%WWWDIR%%/node_modules/.bin/needle \ + %%WWWDIR%%/node_modules/.bin/node-gyp-build \ + %%WWWDIR%%/node_modules/.bin/node-gyp-build-optional \ + %%WWWDIR%%/node_modules/.bin/node-gyp-build-test \ + %%WWWDIR%%/node_modules/.bin/node-which \ + %%WWWDIR%%/node_modules/.bin/opencollective-postinstall \ + %%WWWDIR%%/node_modules/.bin/pbf \ + %%WWWDIR%%/node_modules/.bin/rollup \ + %%WWWDIR%%/node_modules/.bin/semver \ + %%WWWDIR%%/node_modules/.bin/terser \ + %%WWWDIR%%/node_modules/.bin/uuid \ + %%WWWDIR%%/test/filter.test.js \ + %%WWWDIR%%/test/mainbar.test.js pre-install: @${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST} @${ECHO_CMD} "@group ${WWWGRP}" >> ${PLIST} @${ECHO_CMD} "@mode 755" >> ${PLIST} @${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${ILIASDIR}?g" >> ${PLIST} + @${FIND} -s -d ${WRKSRC} -type d | ${SED} "s?${WRKSRC}?@dir ${ILIASDIR}?g" >> ${PLIST} .for i in ${EXTRA_FILES} @${ECHO_CMD} ${i} >> ${PLIST} .endfor - @${ECHO} @dir ${ILIASDIR} >> ${PLIST} - @${ECHO} @dir ${ILIASDATADIR} >> ${PLIST} + @${ECHO_CMD} "${ILIASFILESDIR}/config.json" >> ${PLIST} + @${ECHO_CMD} @dir ${ILIASFILESDIR} >> ${PLIST} @${ECHO_CMD} "@mode" >> ${PLIST} @${ECHO_CMD} "@group" >> ${PLIST} @${ECHO_CMD} "@owner" >> ${PLIST} do-install: @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} - @${INSTALL} -d ${STAGEDIR}${PREFIX}/${ILIASDATADIR} + @${INSTALL} -d ${STAGEDIR}${PREFIX}/${ILIASFILESDIR} + @${CP} ${FILESDIR}/config.json ${STAGEDIR}${PREFIX}/${ILIASFILESDIR} .include diff --git a/www/ilias/distinfo b/www/ilias/distinfo index a8fcc7e37621..ae60bb0f0f3b 100644 --- a/www/ilias/distinfo +++ b/www/ilias/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1648485881 -SHA256 (ILIAS-eLearning-ILIAS-v7.7_GH0.tar.gz) = ef2a03d2d9749770e668420c76bb8fa5fb761043cafc6f0b8f45fe3f456d4000 -SIZE (ILIAS-eLearning-ILIAS-v7.7_GH0.tar.gz) = 185629427 +TIMESTAMP = 1651737286 +SHA256 (ILIAS-eLearning-ILIAS-v7.10_GH0.tar.gz) = d774978925da1aaf07d335d64d6cc6f0745a3845cf81f9158863da301a35e624 +SIZE (ILIAS-eLearning-ILIAS-v7.10_GH0.tar.gz) = 185576672 diff --git a/www/ilias/files/config.json b/www/ilias/files/config.json new file mode 100644 index 000000000000..59cfcb6f19e8 --- /dev/null +++ b/www/ilias/files/config.json @@ -0,0 +1,36 @@ +{ + "common" : { + "client_id" : "myilias" + }, + "database" : { + "user" : "xxx", + "password" : "xxx" + }, + "filesystem" : { + "data_dir" : "/usr/local/www/iliasfiles" + }, + "http" : { + "path" : "http://www.xxx.com" + }, + "language" : { + "default_language" : "en", + "install_languages" : ["en"] + }, + "logging" : { + "enable" : true, + "path_to_logfile" : "/var/www/logs/ilias.log", + "errorlog_dir" : "/var/www/logs/" + }, + "systemfolder" : { + "contact" : { + "firstname" : "Richard", + "lastname" : "Klees", + "email" : "richard.klees@concepts-and-training.de" + } + }, + "utilities" : { + "path_to_convert" : "/usr/local/bin/convert", + "path_to_zip" : "/usr/local/bin/zip", + "path_to_unzip" : "/usr/local/bin/unzip" + } +} diff --git a/www/ilias/files/pkg-message.in b/www/ilias/files/pkg-message.in index 6ae9c41a872c..4ebd6ea0baf2 100644 --- a/www/ilias/files/pkg-message.in +++ b/www/ilias/files/pkg-message.in @@ -22,20 +22,18 @@ some virus scanner by yourself. Require all granted -4 If you use MySQL, Strict SQL Mode MUST be disabled. - -5 After installation, you should use 'composer install' +4 After installation, you should use 'composer install' in the directory %%WWWDIR%%/libs/composer. -6 Then feel free to proceed to ILIAS web setup proccess. - When input Ilias data directory, please use - %%PREFIX%%/%%ILIASDATADIR%% and uncheck the create option. +5 Edit the config.json file and run ilias Setup on the commang-line +in directory %%WWWDIR%%: + $ sudo -u www -g www php setup/setup.php install ../iliasfiles/config.json -7 If all is OK, you can login into the system with +6 If all is OK, you can login into the system with username/root and password/homer as the administrator. -For more information, see the INSTALL DOCUMENTATION: -http://www.ilias.de/docu/goto.php?target=lm_367&client_id=docu +7 More information please visit : +https://docu.ilias.de/goto_docu_lm_367.html, EOM } ]