Created attachment 225225 [details] patch in diff format
Maintainer informed via mail
## ## testresults by patching current webtrees-2.0.13 with webtrees20-2.0.16.diff ## 1) cat the test script ## 2) run the test script ## root@web-int:~/newport/webtrees20 # cat testport #!/bin/sh set -x set -e : : apply the update : uname -a cd /usr/ports/www/webtrees20/ make deinstall make clean patch < /root/newport/webtrees20/workdir/webtrees20-2.0.16.diff : : Testing with FreeBSD port tool : pkg which $(which port) port test : : Testing according to https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/porting-testing.html : make stage make stage-qa make package make install make deinstall make clean chown testuser . echo "id; make package" | su testuser chown root . make package make clean root@web-int:~/newport/webtrees20 # ./testport + set -e + : + : apply the update + : + uname -a FreeBSD web-int 12.2-RELEASE-p6 FreeBSD 12.2-RELEASE-p6 GENERIC amd64 + cd /usr/ports/www/webtrees20/ + make deinstall ===> Deinstalling for webtrees20 ===> webtrees20 not installed, skipping + make clean ===> Cleaning for webtrees20-2.0.13 + patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/www/webtrees20/Makefile b/www/webtrees20/Makefile |index 56d5e05f80ac..6d5cfb63c0e3 100644 |--- a/www/webtrees20/Makefile |+++ b/www/webtrees20/Makefile -------------------------- Patching file Makefile using Plan A... Hunk #1 succeeded at 1. Hunk #2 succeeded at 10. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/www/webtrees20/distinfo b/www/webtrees20/distinfo |index c5b8ad2d882c..ecf94ee9e321 100644 |--- a/www/webtrees20/distinfo |+++ b/www/webtrees20/distinfo -------------------------- Patching file distinfo using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/www/webtrees20/pkg-plist b/www/webtrees20/pkg-plist |index 4da0e732a555..f5d63fe459e3 100644 |--- a/www/webtrees20/pkg-plist |+++ b/www/webtrees20/pkg-plist -------------------------- Patching file pkg-plist using Plan A... Hunk #1 succeeded at 145. Hunk #2 succeeded at 176. Hunk #3 succeeded at 222. Hunk #4 succeeded at 286. Hunk #5 succeeded at 875. Hunk #6 succeeded at 984. Hunk #7 succeeded at 2383. Hunk #8 succeeded at 2410. Hunk #9 succeeded at 2421. Hunk #10 succeeded at 2437. Hunk #11 succeeded at 2552. Hunk #12 succeeded at 2564. Hunk #13 succeeded at 2575. Hunk #14 succeeded at 2636. Hunk #15 succeeded at 2694. Hunk #16 succeeded at 2731. Hunk #17 succeeded at 2756. Hunk #18 succeeded at 4933. Hunk #19 succeeded at 4956. Hunk #20 succeeded at 5669. Hunk #21 succeeded at 6715. Hunk #22 succeeded at 7131. done + : + : Testing with FreeBSD port tool + : + which port + pkg which /usr/local/bin/port /usr/local/bin/port was installed by package porttools-1.10 + port test ===> Using ports tree /usr/ports ===> Validating port with portlint looks fine. ===> flags: PREFIX=/tmp/webtrees20-2.0.16 NO_DEPENDS=yes PKG_DBDIR=/tmp/pkg_db.EaDLYYqM PORTSDIR=/usr/ports -- ===> Cleaning workspace before port test ===> Cleaning for webtrees20-2.0.16 ===> License GPLv3+ accepted by the user ===> Fetching all distfiles required by webtrees20-2.0.16 for building ===> Extracting for webtrees20-2.0.16 => SHA256 Checksum OK for webtrees-2.0.16.zip. ===> Patching for webtrees20-2.0.16 ===> Configuring for webtrees20-2.0.16 ===> Staging for webtrees20-2.0.16 ===> Generating temporary packing list /bin/mkdir -p /usr/ports/www/webtrees20/work/stage/tmp/webtrees20-2.0.16/www/webtrees20 ====> Compressing man pages (compress-man) ====> Checking for pkg-plist issues (check-plist) ===> Parsing plist ===> Checking for items in STAGEDIR missing from pkg-plist ===> Checking for items in pkg-plist which are not in STAGEDIR ===> No pkg-plist issues found (check-plist) ===> Building package for webtrees20-2.0.16 ===> Installing for webtrees20-2.0.16 ===> Checking if webtrees20 is already installed ===> Registering installation for webtrees20-2.0.16 Installing webtrees20-2.0.16... The following configuration will need to be done prior to using webtrees for the first time: 1. For installation on the apache web server, add the following to your apache site configuration, and restart the web server: Alias /webtrees20 /tmp/webtrees20-2.0.16/www/webtrees20/ ### Add the AcceptPathInfo directive only for Apache 2.0.30 ### or later. AcceptPathInfo On <Directory /tmp/webtrees20-2.0.16/www/webtrees20> AllowOverride None Order Allow,Deny Allow from all </Directory> 2. Webtrees uses a MySQL database. Configure a MySQL webtrees user and database using commands such as (substitute PASSWD for something of your own choosing): mysql> create user webtrees20@localhost identified by PASSWD; mysql> create database webtrees20; mysql> grant all on webtrees20.* to webtrees20@localhost; 3. Configure webtrees by browsing to the webtrees URL: http://your.server.com/webtrees20/ and you should be taken to the setup wizard, which will lead you through setting up webtrees: asking for the database server, database user and database name, and then assist you in creating a webtrees admin account, etc. ===> Checking pkg info webtrees20-2.0.16 Name : webtrees20 Version : 2.0.16 Installed on : Mon May 24 17:14:47 2021 CEST Origin : www/webtrees20 Architecture : FreeBSD:12:* Prefix : /tmp/webtrees20-2.0.16 Categories : www Licenses : GPLv3+ Maintainer : freebsd-ports@misc.ark-ict.nl WWW : http://webtrees.net/ Comment : Online genealogy viewer (for PHP 7.1-7.4) Annotations : cpe : cpe:2.3:a:webtrees:webtrees:2.0.16:::::freebsd12:x64 Flat size : 69.9MiB Description : webtrees is the web's leading online collaborative genealogy application. webtrees works from standard GEDCOM files, and is therefore compatible with every major desktop application. webtrees aims to be efficient and effective by using the right combination of third-party tools, design techniques and open standards. WWW: http://webtrees.net/ ===> Checking shared library dependencies ===> Deinstalling for webtrees20 ===> Deinstalling webtrees20-2.0.16 Updating database digests format: 100% Checking integrity... done (0 conflicting) Deinstallation has been requested for the following 1 packages (of 0 packages in the universe): Installed packages to be REMOVED: webtrees20: 2.0.16 Number of packages to be removed: 1 The operation will free 70 MiB. [1/1] Deinstalling webtrees20-2.0.16... [1/1] Deleting files for webtrees20-2.0.16: 100% ========================================================================= There remains some webtrees local configuration in /tmp/webtrees20-2.0.16/www/webtrees20/data. If you plan on reinstalling webtrees, leave this configuration there and it will be reused by the new version. If you are completely uninstalling webtrees, please delete this directory and /tmp/webtrees20-2.0.16/www/webtrees20 by hand. You may want to save your GEDCOM file(s) from the MySQL server, too. To do that, you will need to reinstall webtrees, log on as an administrator and select: My Page >> GEDCOM Administration >> Download This will let you save your family tree data in a foo.ged GEDCOM file which you can upload into most other ancestry software or websites. ========================================================================= ===> Extra files and directories check ===> Cleaning up after port test ===> Cleaning for webtrees20-2.0.16 ===> Removing existing /tmp/webtrees20-2.0.16 dir ===> Done. + : + : Testing according to https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/porting-testing.html + : + make stage ===> License GPLv3+ accepted by the user ===> webtrees20-2.0.16 depends on file: /usr/local/sbin/pkg - found ===> Fetching all distfiles required by webtrees20-2.0.16 for building ===> Extracting for webtrees20-2.0.16 => SHA256 Checksum OK for webtrees-2.0.16.zip. ===> Patching for webtrees20-2.0.16 ===> Configuring for webtrees20-2.0.16 ===> Staging for webtrees20-2.0.16 ===> webtrees20-2.0.16 depends on file: /usr/local/include/php/main/php.h - found ===> webtrees20-2.0.16 depends on file: /usr/local/lib/php/20190902-zts/calendar.so - found ===> webtrees20-2.0.16 depends on file: /usr/local/lib/php/20190902-zts/dom.so - found ===> webtrees20-2.0.16 depends on file: /usr/local/lib/php/20190902-zts/filter.so - found ===> webtrees20-2.0.16 depends on file: /usr/local/lib/php/20190902-zts/gd.so - found ===> webtrees20-2.0.16 depends on file: /usr/local/lib/php/20190902-zts/json.so - found ===> webtrees20-2.0.16 depends on file: /usr/local/lib/php/20190902-zts/pdo_mysql.so - found ===> webtrees20-2.0.16 depends on file: /usr/local/lib/php/20190902-zts/session.so - found ===> webtrees20-2.0.16 depends on file: /usr/local/lib/php/20190902-zts/simplexml.so - found ===> webtrees20-2.0.16 depends on file: /usr/local/lib/php/20190902-zts/xml.so - found ===> Generating temporary packing list /bin/mkdir -p /usr/ports/www/webtrees20/work/stage/usr/local/www/webtrees20 ====> Compressing man pages (compress-man) + make stage-qa ====> Running Q/A tests (stage-qa) /!\ To run stage-qa automatically add DEVELOPER=yes to your environment /!\ + make package ===> Building package for webtrees20-2.0.16 + make install ===> Installing for webtrees20-2.0.16 ===> Checking if webtrees20 is already installed ===> Registering installation for webtrees20-2.0.16 Installing webtrees20-2.0.16... The following configuration will need to be done prior to using webtrees for the first time: 1. For installation on the apache web server, add the following to your apache site configuration, and restart the web server: Alias /webtrees20 /usr/local/www/webtrees20/ ### Add the AcceptPathInfo directive only for Apache 2.0.30 ### or later. AcceptPathInfo On <Directory /usr/local/www/webtrees20> AllowOverride None Order Allow,Deny Allow from all </Directory> 2. Webtrees uses a MySQL database. Configure a MySQL webtrees user and database using commands such as (substitute PASSWD for something of your own choosing): mysql> create user webtrees20@localhost identified by PASSWD; mysql> create database webtrees20; mysql> grant all on webtrees20.* to webtrees20@localhost; 3. Configure webtrees by browsing to the webtrees URL: http://your.server.com/webtrees20/ and you should be taken to the setup wizard, which will lead you through setting up webtrees: asking for the database server, database user and database name, and then assist you in creating a webtrees admin account, etc. + make deinstall ===> Deinstalling for webtrees20 ===> Deinstalling webtrees20-2.0.16 Updating database digests format: 100% Checking integrity... done (0 conflicting) Deinstallation has been requested for the following 1 packages (of 0 packages in the universe): Installed packages to be REMOVED: webtrees20: 2.0.16 Number of packages to be removed: 1 The operation will free 70 MiB. [1/1] Deinstalling webtrees20-2.0.16... [1/1] Deleting files for webtrees20-2.0.16: 100% ========================================================================= There remains some webtrees local configuration in /usr/local/www/webtrees20/data. If you plan on reinstalling webtrees, leave this configuration there and it will be reused by the new version. If you are completely uninstalling webtrees, please delete this directory and /usr/local/www/webtrees20 by hand. You may want to save your GEDCOM file(s) from the MySQL server, too. To do that, you will need to reinstall webtrees, log on as an administrator and select: My Page >> GEDCOM Administration >> Download This will let you save your family tree data in a foo.ged GEDCOM file which you can upload into most other ancestry software or websites. ========================================================================= + make clean ===> Cleaning for webtrees20-2.0.16 + chown testuser . + echo 'id; make package' + su testuser uid=1003(testuser) gid=1003(testuser) groups=1003(testuser) ===> License GPLv3+ accepted by the user ===> webtrees20-2.0.16 depends on file: /usr/local/sbin/pkg - found ===> Fetching all distfiles required by webtrees20-2.0.16 for building ===> Extracting for webtrees20-2.0.16 => SHA256 Checksum OK for webtrees-2.0.16.zip. ===> Patching for webtrees20-2.0.16 ===> Configuring for webtrees20-2.0.16 ===> Staging for webtrees20-2.0.16 ===> webtrees20-2.0.16 depends on file: /usr/local/include/php/main/php.h - found ===> webtrees20-2.0.16 depends on file: /usr/local/lib/php/20190902-zts/calendar.so - found ===> webtrees20-2.0.16 depends on file: /usr/local/lib/php/20190902-zts/dom.so - found ===> webtrees20-2.0.16 depends on file: /usr/local/lib/php/20190902-zts/filter.so - found ===> webtrees20-2.0.16 depends on file: /usr/local/lib/php/20190902-zts/gd.so - found ===> webtrees20-2.0.16 depends on file: /usr/local/lib/php/20190902-zts/json.so - found ===> webtrees20-2.0.16 depends on file: /usr/local/lib/php/20190902-zts/pdo_mysql.so - found ===> webtrees20-2.0.16 depends on file: /usr/local/lib/php/20190902-zts/session.so - found ===> webtrees20-2.0.16 depends on file: /usr/local/lib/php/20190902-zts/simplexml.so - found ===> webtrees20-2.0.16 depends on file: /usr/local/lib/php/20190902-zts/xml.so - found ===> Generating temporary packing list /bin/mkdir -p /usr/ports/www/webtrees20/work/stage/usr/local/www/webtrees20 ====> Compressing man pages (compress-man) ===> Building package for webtrees20-2.0.16 + chown root . + make package + make clean ===> Cleaning for webtrees20-2.0.16 root@web-int:~/newport/webtrees20 #
^Triage: If there is a changelog or release notes URL available for this version, please add it to the URL field. ^Triage: Please set the maintainer-approval attachment flag (to ?) and set the requestee field to the e-mail address of the maintainer to ask for maintainer approval Attachment -> Details -> maintainer-approval [?] Thanks!
Comment on attachment 225225 [details] patch in diff format I created the upgrade patch in the attachment, so I approve
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee36e2032150e3c99932a2d779e08bd460ac62e6 commit ee36e2032150e3c99932a2d779e08bd460ac62e6 Author: Fernando ApesteguÃa <fernape@FreeBSD.org> AuthorDate: 2021-05-25 11:35:29 +0000 Commit: Fernando ApesteguÃa <fernape@FreeBSD.org> CommitDate: 2021-05-25 11:36:35 +0000 www/webtrees20: update to 2.0.16 ChangeLog: https://webtrees.net/blog/ PR: 256124 Reported by: freebsd-ports@andre.rikkertdekoe.nl (maintainer) www/webtrees20/Makefile | 19 +++---- www/webtrees20/distinfo | 6 +-- www/webtrees20/pkg-plist | 133 ++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 140 insertions(+), 18 deletions(-)
Committed, Thanks!
Thanks for the fast commit.