Created attachment 232620 [details] update created by following porters-handbook/port-upgrading.html ## ## testresults by patching current gitlist-1.0.2 with gitlist-1.1.1.diff ## 1) cat the test script ## 2) run the test script ## [root@web-int ~/newport2/gitlist]# cat testport #!/bin/sh set -x set -e : : apply the update : uname -a cd /usr/ports/devel/gitlist make deinstall make clean patch < /root/newport2/gitlist/gitlist-1.1.1.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 ~/newport2/gitlist]# [root@web-int ~/newport2/gitlist]# [root@web-int ~/newport2/gitlist]# [root@web-int ~/newport2/gitlist]# ./testport + set -e + : + : apply the update + : + uname -a FreeBSD web-int 12.2-RELEASE-p14 FreeBSD 12.2-RELEASE-p14 GENERIC amd64 + cd /usr/ports/devel/gitlist + make deinstall ===> Deinstalling for gitlist ===> Deinstalling gitlist-1.0.2 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: gitlist: 1.0.2 Number of packages to be removed: 1 The operation will free 15 MiB. [1/1] Deinstalling gitlist-1.0.2... [1/1] Deleting files for gitlist-1.0.2: 100% + make clean ===> Cleaning for gitlist-1.0.2 + patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/devel/gitlist/Makefile b/devel/gitlist/Makefile |index c23ea1115967..7eb6403270db 100644 |--- a/devel/gitlist/Makefile |+++ b/devel/gitlist/Makefile -------------------------- Patching file Makefile using Plan A... Hunk #1 succeeded at 1. Hunk #2 succeeded at 15. Hunk #3 succeeded at 30. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/devel/gitlist/distinfo b/devel/gitlist/distinfo |index 0296b42f5a4f..f35e590f678b 100644 |--- a/devel/gitlist/distinfo |+++ b/devel/gitlist/distinfo -------------------------- Patching file distinfo using Plan A... Hunk #1 succeeded at 1. 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/gitlist-1.1.1 NO_DEPENDS=yes PKG_DBDIR=/tmp/pkg_db.WpTLl0NI PORTSDIR=/usr/ports -- ===> Cleaning workspace before port test ===> Cleaning for gitlist-1.1.1 ===> License BSD3CLAUSE accepted by the user ===> Fetching all distfiles required by gitlist-1.1.1 for building ===> Extracting for gitlist-1.1.1 => SHA256 Checksum OK for gitlist-1.1.1.zip. ===> Patching for gitlist-1.1.1 /bin/mkdir -p /usr/ports/devel/gitlist/work/gitlist-1.1.1/cache cd /usr/ports/devel/gitlist/work/gitlist-1.1.1; /usr/bin/sed -i.bak -e 's|/usr/bin/git|/usr/local/bin/git|g' config.ini-example; /usr/bin/find . ! -type d | /usr/bin/sort | /usr/bin/sed -e "s,^\.,%%WWWDIR%%," > /usr/ports/devel/gitlist/work/plist; echo "@dir(www,www,) %%WWWDIR%%/vendor/twig/twig/doc" >> /usr/ports/devel/gitlist/work/plist echo "@dir(www,www,) %%WWWDIR%%/cache" >> /usr/ports/devel/gitlist/work/plist ===> Configuring for gitlist-1.1.1 ===> Staging for gitlist-1.1.1 ===> Generating temporary packing list ===> Creating groups. ===> Creating users cd /usr/ports/devel/gitlist/work/gitlist-1.1.1; IFS="$(printf '\n\t')"; for src in $( /usr/bin/find . ); do dst="/usr/ports/devel/gitlist/work/stage/tmp/gitlist-1.1.1/www/gitlist${src#.}"; if test -d "$src"; then /bin/mkdir -p "$dst"; else install -m 0644 "$src" "$dst"; fi done /bin/rm -f -r "/tmp/gitlist-1.1.1/www/gitlist/cache/views" ====> 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 gitlist-1.1.1 ===> Installing for gitlist-1.1.1 ===> Checking if gitlist is already installed ===> Registering installation for gitlist-1.1.1 Installing gitlist-1.1.1... ===> Creating groups. Using existing group 'www'. ===> Creating users Using existing user 'www'. The port will install an htdocs dir /tmp/gitlist-1.1.1/www/gitlist. Copy /tmp/gitlist-1.1.1/www/gitlist/config.ini-example to /tmp/gitlist-1.1.1/www/gitlist/config.ini and edit it to make it use your git repositories. Then configure your webserver to use the htdocs directory. Make sure mod_rewrite is enabled in your webserver, else the url-rewrite will not work and result in a 404 when accessing a repository. ===> Checking pkg info gitlist-1.1.1 Name : gitlist Version : 1.1.1 Installed on : Mon Mar 21 23:21:24 2022 CET Origin : devel/gitlist Architecture : FreeBSD:12:amd64 Prefix : /tmp/gitlist-1.1.1 Categories : devel www Licenses : BSD3CLAUSE Maintainer : freebsd-ports@misc.ark-ict.nl WWW : http://gitlist.org Comment : Web based Git repository browser written in PHP Annotations : FreeBSD_version: 1202000 cpe : cpe:2.3:a:gitlist:gitlist:1.1.1:::::freebsd12:x64 Flat size : 7.06MiB Description : GitList is a web based git repository browser written in PHP similar to GitHub WWW: http://gitlist.org ===> Checking shared library dependencies ===> Deinstalling for gitlist ===> Deinstalling gitlist-1.1.1 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: gitlist: 1.1.1 Number of packages to be removed: 1 The operation will free 7 MiB. [1/1] Deinstalling gitlist-1.1.1... [1/1] Deleting files for gitlist-1.1.1: 100% ===> Extra files and directories check ===> Cleaning up after port test ===> Cleaning for gitlist-1.1.1 ===> Removing existing /tmp/gitlist-1.1.1 dir ===> Done. + : + : Testing according to https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/porting-testing.html + : + make stage ===> License BSD3CLAUSE accepted by the user ===> gitlist-1.1.1 depends on file: /usr/local/sbin/pkg - found ===> Fetching all distfiles required by gitlist-1.1.1 for building ===> Extracting for gitlist-1.1.1 => SHA256 Checksum OK for gitlist-1.1.1.zip. ===> Patching for gitlist-1.1.1 /bin/mkdir -p /usr/ports/devel/gitlist/work/gitlist-1.1.1/cache cd /usr/ports/devel/gitlist/work/gitlist-1.1.1; /usr/bin/sed -i.bak -e 's|/usr/bin/git|/usr/local/bin/git|g' config.ini-example; /usr/bin/find . ! -type d | /usr/bin/sort | /usr/bin/sed -e "s,^\.,%%WWWDIR%%," > /usr/ports/devel/gitlist/work/plist; echo "@dir(www,www,) %%WWWDIR%%/vendor/twig/twig/doc" >> /usr/ports/devel/gitlist/work/plist echo "@dir(www,www,) %%WWWDIR%%/cache" >> /usr/ports/devel/gitlist/work/plist ===> Configuring for gitlist-1.1.1 ===> Staging for gitlist-1.1.1 ===> gitlist-1.1.1 depends on executable: git - found ===> gitlist-1.1.1 depends on file: /usr/local/include/php/main/php.h - found ===> gitlist-1.1.1 depends on file: /usr/local/lib/php/20190902-zts/ctype.so - found ===> gitlist-1.1.1 depends on file: /usr/local/lib/php/20190902-zts/json.so - found ===> gitlist-1.1.1 depends on file: /usr/local/lib/php/20190902-zts/simplexml.so - found ===> Generating temporary packing list ===> Creating groups. ===> Creating users cd /usr/ports/devel/gitlist/work/gitlist-1.1.1; IFS="$(printf '\n\t')"; for src in $( /usr/bin/find . ); do dst="/usr/ports/devel/gitlist/work/stage/usr/local/www/gitlist${src#.}"; if test -d "$src"; then /bin/mkdir -p "$dst"; else install -m 0644 "$src" "$dst"; fi done /bin/rm -f -r "/usr/local/www/gitlist/cache/views" ====> 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 gitlist-1.1.1 + make install ===> Installing for gitlist-1.1.1 ===> Checking if gitlist is already installed ===> Registering installation for gitlist-1.1.1 Installing gitlist-1.1.1... ===> Creating groups. Using existing group 'www'. ===> Creating users Using existing user 'www'. The port will install an htdocs dir /usr/local/www/gitlist. Copy /usr/local/www/gitlist/config.ini-example to /usr/local/www/gitlist/config.ini and edit it to make it use your git repositories. Then configure your webserver to use the htdocs directory. Make sure mod_rewrite is enabled in your webserver, else the url-rewrite will not work and result in a 404 when accessing a repository. + make deinstall ===> Deinstalling for gitlist ===> Deinstalling gitlist-1.1.1 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: gitlist: 1.1.1 Number of packages to be removed: 1 The operation will free 7 MiB. [1/1] Deinstalling gitlist-1.1.1... [1/1] Deleting files for gitlist-1.1.1: 100% + make clean ===> Cleaning for gitlist-1.1.1 + chown testuser . + echo 'id; make package' + su testuser uid=1003(testuser) gid=1003(testuser) groups=1003(testuser) ===> License BSD3CLAUSE accepted by the user ===> gitlist-1.1.1 depends on file: /usr/local/sbin/pkg - found ===> Fetching all distfiles required by gitlist-1.1.1 for building ===> Extracting for gitlist-1.1.1 => SHA256 Checksum OK for gitlist-1.1.1.zip. ===> Patching for gitlist-1.1.1 /bin/mkdir -p /usr/ports/devel/gitlist/work/gitlist-1.1.1/cache cd /usr/ports/devel/gitlist/work/gitlist-1.1.1; /usr/bin/sed -i.bak -e 's|/usr/bin/git|/usr/local/bin/git|g' config.ini-example; /usr/bin/find . ! -type d | /usr/bin/sort | /usr/bin/sed -e "s,^\.,%%WWWDIR%%," > /usr/ports/devel/gitlist/work/plist; echo "@dir(www,www,) %%WWWDIR%%/vendor/twig/twig/doc" >> /usr/ports/devel/gitlist/work/plist echo "@dir(www,www,) %%WWWDIR%%/cache" >> /usr/ports/devel/gitlist/work/plist ===> Configuring for gitlist-1.1.1 ===> Staging for gitlist-1.1.1 ===> gitlist-1.1.1 depends on executable: git - found ===> gitlist-1.1.1 depends on file: /usr/local/include/php/main/php.h - found ===> gitlist-1.1.1 depends on file: /usr/local/lib/php/20190902-zts/ctype.so - found ===> gitlist-1.1.1 depends on file: /usr/local/lib/php/20190902-zts/json.so - found ===> gitlist-1.1.1 depends on file: /usr/local/lib/php/20190902-zts/simplexml.so - found ===> Generating temporary packing list ===> Creating groups. ===> Creating users cd /usr/ports/devel/gitlist/work/gitlist-1.1.1; IFS="$(printf '\n\t')"; for src in $( /usr/bin/find . ); do dst="/usr/ports/devel/gitlist/work/stage/usr/local/www/gitlist${src#.}"; if test -d "$src"; then /bin/mkdir -p "$dst"; else install -m 0644 "$src" "$dst"; fi done /bin/rm -f -r "/usr/local/www/gitlist/cache/views" ====> Compressing man pages (compress-man) ===> Building package for gitlist-1.1.1 + chown root . + make package + make clean ===> Cleaning for gitlist-1.1.1 [root@web-int ~/newport2/gitlist]#
Maintainer informed via mail
Note that https://github.com/klaussilveira/gitlist/releases/tag/2.0.0 is released. However this new major release cannot automatically be upgraded from release 1. While 1.x can be upgraded using this PR without changing config files. Plan is to create a new gitlist2 port for the 2.x release. I'm working on this.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=915ee129534e8862a86d0c7865c616886950122c commit 915ee129534e8862a86d0c7865c616886950122c Author: Andre Rikkert de Koe - ARK-ICT <freebsd-ports@andre.rikkertdekoe.nl> AuthorDate: 2022-03-21 23:00:13 +0000 Commit: Neel Chauhan <nc@FreeBSD.org> CommitDate: 2022-03-21 23:00:13 +0000 devel/gitlist: update to 1.1.1 PR: 262712 devel/gitlist/Makefile | 7 ++++--- devel/gitlist/distinfo | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-)
Committed!
(In reply to Neel Chauhan from comment #4) Thanks for the fast commit.