sparc64 bulk build report
Bulk build on sparc64-0a.ports.openbsd.org Started : Tue Dec 6 23:38:37 MST 2022 Finished: Sat Dec 10 02:31:29 MST 2022 Duration: 3 Days 2 hours 53 minutes Built using OpenBSD 7.2-current (GENERIC.MP) #1547: Tue Dec 6 01:22:10 MST 2022 Built 9353 packages Number of packages built each day: Dec 6: 4498 Dec 7: 3740 Dec 8: 1016 Dec 9: 97 Dec 10: 2 Critical path missing pkgs: http://build-failures.rhaalovely.net/sparc64/2022-12-06/summary.log Build failures: 44 http://build-failures.rhaalovely.net/sparc64/2022-12-06/astro/calcmysky.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/audio/espeak.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/audio/ocp.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/audio/solfege.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/cad/oce.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/devel/abseil-cpp.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/devel/avr/gcc.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/devel/clang-tools-extra.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/devel/difftastic.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/devel/kf5/kcoreaddons.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/devel/py-apipkg,python3.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/devel/py-jsonschema,python3.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/devel/py-thrift,python3.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/devel/qcoro.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/devel/quirks.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/devel/xsd.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/editors/helix.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/games/arx-libertatis.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/geo/pdal.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/graphics/aspect-crop.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/graphics/birdfont.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/graphics/gimp/snapshot.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/graphics/opencolorio.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/graphics/posterazor.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/graphics/py-termcolor,python3.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/inputmethods/libime.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/mail/mu.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/misc/open62541.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/multimedia/mkvtoolnix.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/multimedia/mpv.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/productivity/gnucash.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/security/veracrypt.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/sysutils/libportal.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/sysutils/py-platformdirs,python3.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/sysutils/u-boot-asahi.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/textproc/libmarisa.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/textproc/xxdiff.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/www/havp.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/www/linkchecker.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/x11/gnome/gjs.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/x11/gnome/secrets.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/x11/lumina.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/x11/qt5/qttranslations.log http://build-failures.rhaalovely.net/sparc64/2022-12-06/x11/qt6/qtdeclarative.log Recurrent failures: failures/astro/calcmysky.log failures/audio/espeak.log failures/audio/ocp.log failures/cad/oce.log failures/devel/avr/gcc.log failures/devel/clang-tools-extra.log failures/devel/difftastic.log failures/devel/py-thrift,python3.log failures/devel/qcoro.log failures/devel/quirks.log failures/devel/xsd.log failures/editors/helix.log failures/games/arx-libertatis.log failures/geo/pdal.log failures/graphics/aspect-crop.log failures/graphics/birdfont.log failures/graphics/gimp/snapshot.log failures/graphics/opencolorio.log failures/graphics/posterazor.log failures/inputmethods/libime.log failures/mail/mu.log failures/misc/open62541.log failures/multimedia/mkvtoolnix.log failures/productivity/gnucash.log failures/security/veracrypt.log failures/sysutils/libportal.log failures/sysutils/u-boot-asahi.log failures/textproc/libmarisa.log failures/textproc/xxdiff.log failures/www/havp.log failures/x11/gnome/gjs.log failures/x11/gnome/secrets.log failures/x11/lumina.log New failures: +failures/audio/solfege.log +failures/devel/abseil-cpp.log +fai
Re: update node_exporter to 1.5.0
On Fri, 9 Dec 2022 16:58:17 +0100, Claudio Jeker wrote: > ndex: modules.inc > === > RCS file: /cvs/ports/sysutils/node_exporter/modules.inc,v > retrieving revision 1.2 > diff -u -p -r1.2 modules.inc > --- modules.inc 11 Mar 2022 19:57:43 - 1.2 > +++ modules.inc 9 Dec 2022 14:47:42 - > @@ -1,6 +1,9 @@ > +MODGO_VERSION = v1.5.0 > + with this removed, ok danj@
update node_exporter to 1.5.0
Update node_exporter to 1.5.0 Works here and now also reports the CPU spin time now. -- :wq Claudio Index: Makefile === RCS file: /cvs/ports/sysutils/node_exporter/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- Makefile8 Nov 2022 11:17:11 - 1.14 +++ Makefile9 Dec 2022 15:06:24 - @@ -1,10 +1,9 @@ COMMENT = prometheus exporter for hardware and OS metrics MODGO_MODNAME =github.com/prometheus/node_exporter -MODGO_VERSION =v1.3.1 +MODGO_VERSION =v1.5.0 DISTNAME = node_exporter-${MODGO_VERSION} -REVISION = 0 CATEGORIES = sysutils Index: distinfo === RCS file: /cvs/ports/sysutils/node_exporter/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo14 Jan 2022 01:25:25 - 1.6 +++ distinfo9 Dec 2022 14:48:17 - @@ -21,6 +21,8 @@ SHA256 (go_modules/cloud.google.com/go/b SHA256 (go_modules/cloud.google.com/go/bigquery/@v/v1.7.0.mod) = HKRVvqUX0v5Jvzwvf+5NDNFa+penbMBDl5RGC4Hk8M0= SHA256 (go_modules/cloud.google.com/go/bigquery/@v/v1.8.0.mod) = toghopjskKDZvXw9jhgakkEk652JmdL6BXOk8VL6flU= SHA256 (go_modules/cloud.google.com/go/bigquery/@v/v1.8.0.zip) = iSsQkp1M+JsMjJiVwXze/2wNKPZeT/quZyWZdXLiEkk= +SHA256 (go_modules/cloud.google.com/go/compute/@v/v1.7.0.mod) = N8p9ZT+pBjQk8mI6PRNzRH8N9BHPdWHZ+UxwVLDT3Qg= +SHA256 (go_modules/cloud.google.com/go/compute/@v/v1.7.0.zip) = 5E4vu/47D5RQk5faNrulOiiFesLCmF3enCXLOR0J+GY= SHA256 (go_modules/cloud.google.com/go/datastore/@v/v1.0.0.mod) = A0xS+1OSg3+NsnVIX7DpXRDmzSUw3Ty2c9fTUJ4WsuY= SHA256 (go_modules/cloud.google.com/go/datastore/@v/v1.1.0.mod) = Yj/KeFSbpDuc5dHtTrHijciTKPpxM5eUBe4wnb0tt8A= SHA256 (go_modules/cloud.google.com/go/datastore/@v/v1.1.0.zip) = fa5WPcfC5USyKfMDIQOsBWhxIOjSVSGu8EtF80bsX/s= @@ -47,7 +49,8 @@ SHA256 (go_modules/github.com/alecthomas SHA256 (go_modules/github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod) = OCfpPXMq9WzJwaAz8pWZwTlzMN5FK7UWY9mJHHmYL1A= SHA256 (go_modules/github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod) = OCfpPXMq9WzJwaAz8pWZwTlzMN5FK7UWY9mJHHmYL1A= SHA256 (go_modules/github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod) = LmzNFLMluT0NWOQ6eA/MFSO5zW9mVJ/0zChP5tIQhpw= -SHA256 (go_modules/github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.zip) = 5rDMs4v7qF2QCS0cV2cdX3mWdXvXH28ZcMauL52uP24= +SHA256 (go_modules/github.com/alecthomas/units/@v/v0.0.0-20211218093645-b94a6e3cc137.mod) = ftH6kO7vq7UGWGCrf2fdM/5ysTVwVCejb0515qgQBls= +SHA256 (go_modules/github.com/alecthomas/units/@v/v0.0.0-20211218093645-b94a6e3cc137.zip) = tiQ310pSMImvRroBFezhzhG8peMh/h4dTJduzKbueKo= SHA256 (go_modules/github.com/beevik/ntp/@v/v0.3.0.mod) = GysQO0BL9yL2YJawqJmI6ow229d/R9po0fcDGJLp3dk= SHA256 (go_modules/github.com/beevik/ntp/@v/v0.3.0.zip) = mo4Jdbu2T3DbVi1Gjt2GOKibQrgHGrdrlqnfRaaV8XE= SHA256 (go_modules/github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod) = zE0fqtdZZfpp6xMSC/lWgncZAF/z7NxwSzb7WPsf0W4= @@ -57,25 +60,32 @@ SHA256 (go_modules/github.com/beorn7/per SHA256 (go_modules/github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod) = 2uZGOSlkAiNbVVh9FNJkBhXrNzb6hA5DJ9PBXbY8w0U= SHA256 (go_modules/github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip) = s8CfPmNdR7QThpWlR9HyxxOPOCy+WotYZbZqjggjNGE= SHA256 (go_modules/github.com/cespare/xxhash/v2/@v/v2.1.1.mod) = oJD46q9ZzCrfFjKZ6+/nl+Hco/at0sjoimo7kLpTiwI= -SHA256 (go_modules/github.com/cespare/xxhash/v2/@v/v2.1.1.zip) = W6oDHHLnPkJhfw/XTn2BM0SFC9amBzOBtqQWCl6ctZ4= +SHA256 (go_modules/github.com/cespare/xxhash/v2/@v/v2.1.2.mod) = oJD46q9ZzCrfFjKZ6+/nl+Hco/at0sjoimo7kLpTiwI= +SHA256 (go_modules/github.com/cespare/xxhash/v2/@v/v2.1.2.zip) = rGQayDMN9h9nfIdEj8Z5xHiGCH0pM6HkMVVvQjeC6jg= SHA256 (go_modules/github.com/chzyer/logex/@v/v1.1.10.mod) = 99MQTqxMVnTcSEfPWxGTwuA70k/lISQ6NNcscJrYOjo= SHA256 (go_modules/github.com/chzyer/logex/@v/v1.1.10.zip) = LJR3HB4zWixYqWREs3aLjgApd0fWzn58FLqy6LOdkb0= SHA256 (go_modules/github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod) = kAt5fFMfLfGC5DGolezTEJqs/t/d2rI6SPfAqdWnVlk= SHA256 (go_modules/github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.zip) = PchCZ3iHJ4+zPSUHjTda5qepS7d6jSBe4iMLWBtpR6Y= SHA256 (go_modules/github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod) = 0HXE5LZiTqb4AxiDyNZv9DCrwv/h+06Jw7kRVpnynDs= SHA256 (go_modules/github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.zip) = rYVQvtPEqUu+9XufxbsVgG6s7aAJJXFkBDIFgNYOL30= -SHA256 (go_modules/github.com/cilium/ebpf/@v/v0.5.0.mod) = 6L/sRpXEDBc8lDwKBYXxND4MbROv27O1dD3bf9T4rbQ= -SHA256 (go_modules/github.com/cilium/ebpf/@v/v0.7.0.mod) = ppaMHQSqLb40PdRK1Pw1hciAMXovg4D5D1b9e/TUNi0= -SHA256 (go_mo
Re: shells/bash: dlopen() of modules fails
On 2022-12-06, Christian Weisgerber wrote: > bash$ enable finfo > bash:/usr/local/lib/bash/finfo: undefined symbol 'sh_optind' > bash:/usr/local/lib/bash/finfo: undefined symbol 'sh_optarg' > bash: enable: finfo: not a shell builtin For the record: As jca@ reminded me, we need to link bash in such a way that symbols are exported for dynamic linking: -rdynamic (or -Wl,-export-dynamic or -Wl,-E; they all do the same). Also, I should have used nm -D to check whether the symbols are available. -- Christian "naddy" Weisgerber na...@mips.inka.de
update prometheus to 2.37.5
2.37.5 was released: [SECURITY] Security upgrade from go and upstream dependencies that include security fixes to the net/http and os packages. #11690 -- :wq Claudio Index: Makefile === RCS file: /cvs/ports/sysutils/prometheus/Makefile,v retrieving revision 1.18 diff -u -p -r1.18 Makefile --- Makefile9 Dec 2022 14:50:55 - 1.18 +++ Makefile9 Dec 2022 15:07:33 - @@ -1,6 +1,6 @@ COMMENT = systems monitoring and alerting toolkit -V =2.37.4 +V =2.37.5 GH_ACCOUNT = prometheus GH_PROJECT = prometheus GH_TAGNAME = v${V} Index: distinfo === RCS file: /cvs/ports/sysutils/prometheus/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo9 Dec 2022 14:50:55 - 1.8 +++ distinfo9 Dec 2022 15:07:33 - @@ -1,6 +1,7 @@ -SHA256 (prometheus-2.37.4.tar.gz) = gIP1R9TjewtfeusIL9ScOyRegGSqzG6g667+bRWKpNI= -SHA256 (prometheus-vendor-2.37.4.tar.gz) = UCoi3XIpdjwmUVrAb9wWzvDpMYj41vOXirbrIBPxk0E= -SHA256 (prometheus-web-ui-2.37.4.tar.gz) = TA/pT8Q0b46eVUrqrgG4omZ84EKZm5vEG/7VKd2nzDQ= -SIZE (prometheus-2.37.4.tar.gz) = 6048871 -SIZE (prometheus-vendor-2.37.4.tar.gz) = 11625254 -SIZE (prometheus-web-ui-2.37.4.tar.gz) = 4332951 +SHA256 (prometheus-2.37.5.tar.gz) = aCh6OeQy/3QP55KYg7WAsgp1SUgopX1FVxmfUNDXJDw= + +SHA256 (prometheus-vendor-2.37.5.tar.gz) = wd+Sdfp/EPvTRbdtqNqLC/zYTV49Vu+uJKaXW8efrwE= +SHA256 (prometheus-web-ui-2.37.5.tar.gz) = G/zuXX/m4xuPLV1xBHMkKk8sDq6+uUYiYL5fCskspVY= +SIZE (prometheus-2.37.5.tar.gz) = 6048663 +SIZE (prometheus-vendor-2.37.5.tar.gz) = 11745105 +SIZE (prometheus-web-ui-2.37.5.tar.gz) = 4331652
Re: [new port] getmail6
On 2022/12/09 15:25, Martin Ziemer wrote: > Am Fri, Dec 09, 2022 at 02:00:29PM + schrieb Stuart Henderson: > > I made a test setup, the only thing missing from my earlier diff was -f. > > > > OK? > Yes. Tested on two Systems. > > Sorry for the hassle with my unnecessary complicated searching for > a solution. (I tried your perfect hint with "-f" on the old string of > "^getmails$", so it failed for me) No worries :) Committed, thanks. Sorry I missed the sed in your patch; still that could have a small issue with the pid printing if $$ is a partial match on another pid. (Without -f, the process name that pgrep would have to match is just "sh", which would not be ideal ;)
Re: [new port] getmail6
Am Fri, Dec 09, 2022 at 02:00:29PM + schrieb Stuart Henderson: > I made a test setup, the only thing missing from my earlier diff was -f. > > OK? Yes. Tested on two Systems. Sorry for the hassle with my unnecessary complicated searching for a solution. (I tried your perfect hint with "-f" on the old string of "^getmails$", so it failed for me) > Index: Makefile > === > RCS file: /cvs/ports/mail/getmail/Makefile,v > retrieving revision 1.102 > diff -u -p -r1.102 Makefile > --- Makefile 11 Mar 2022 19:34:37 - 1.102 > +++ Makefile 9 Dec 2022 13:59:43 - > @@ -1,24 +1,22 @@ > COMMENT= IMAP/POP3/SDPS mail retriever > > -MODPY_EGG_VERSION= 5.16 > -DISTNAME=getmail-${MODPY_EGG_VERSION} > +MODPY_EGG_VERSION= 6.18.10 > +GH_ACCOUNT= getmail6 > +GH_PROJECT= getmail6 > +GH_TAGNAME= v${MODPY_EGG_VERSION} > +PKGNAME= getmail-${MODPY_EGG_VERSION} > CATEGORIES= mail > > -HOMEPAGE=http://pyropus.ca/software/getmail/ > +# https://github.com/getmail6/getmail6 > +HOMEPAGE=https://getmail6.org/ > > MAINTAINER= Martin Ziemer > > # GPLv2 > PERMIT_PACKAGE= Yes > > -MASTER_SITES=${HOMEPAGE}/old-versions/ > - > MODULES= lang/python > - > -# No Python 3 support as of 5.16 > -# https://pyropus.ca/software/getmail/documentation.html#python3 > -MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2} > - > +MODPY_PYBUILD= setuptools > NO_TEST= Yes > > EXDIR= ${PREFIX}/share/examples/getmail > Index: distinfo > === > RCS file: /cvs/ports/mail/getmail/distinfo,v > retrieving revision 1.81 > diff -u -p -r1.81 distinfo > --- distinfo 24 Nov 2021 09:06:39 - 1.81 > +++ distinfo 9 Dec 2022 13:59:43 - > @@ -1,2 +1,2 @@ > -SHA256 (getmail-5.16.tar.gz) = auj46u+avEZQUMO2TlWjGvvc1Mbt8xl7W1m71WymZ/o= > -SIZE (getmail-5.16.tar.gz) = 180577 > +SHA256 (getmail6-6.18.10.tar.gz) = > DlYXz6LMh8WyWWNPWfVyjfOyVoqSyqVkdn4lb3mGatY= > +SIZE (getmail6-6.18.10.tar.gz) = 205481 > Index: patches/patch-getmails > === > RCS file: patches/patch-getmails > diff -N patches/patch-getmails > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-getmails9 Dec 2022 13:59:43 - > @@ -0,0 +1,43 @@ > +# Fix for use on OpenBSD and ignore Directories in folder > + > +Index: getmails > +--- getmails.orig > getmails > +@@ -28,7 +28,7 @@ BASE1=${1##*/} > + [ "$BASE1" != "${BASE1#$2}" ] && return 0 || return 1 > + } > + UID_BY_ID=$(id -u) > +-PID_GETMAILS=$(pgrep -U $UID_BY_ID '^getmails$') > ++PID_GETMAILS=$(pgrep -f -U $UID_BY_ID '^/bin/sh /usr/local/bin/getmails$') > + if [ "x$PID_GETMAILS" != "x$$" ]; then > + echo "The getmails script is already running as PID=\"$PID_GETMAILS\" > ." >&2 > + exit 1 > +@@ -44,7 +44,7 @@ if [ -f $getmailrcdir/stop ]; then > + echo "Do not run getmail ... (if not, remove $getmailrcdir/stop)" >&2 > + exit 1 > + fi > +-rcfiles="/usr/bin/getmail" > ++rcfiles="/usr/local/bin/getmail" > + # Address concerns raised by #863856 > + # emacs backup files: foo~ foo# > + # vim backup files: foo~ foo.swp > +@@ -57,7 +57,8 @@ if $para ; then > +! endwith "$file" '#' && \ > +! startswith "$file" 'oldmail-' && \ > +! endwith "$file" '.swp' && \ > +- ! endwith "$file" '.bak' ; then > ++ ! endwith "$file" '.bak' && \ > ++ [ -f "$file" ]; then > + $rcfiles --rcfile "$file" "$@" & > + pids="$pids $!" > + fi > +@@ -79,7 +80,8 @@ else > +! endwith "$file" '#' && \ > +! startswith "$file" 'oldmail-' && \ > +! endwith "$file" '.swp' && \ > +- ! endwith "$file" '.bak' ; then > ++ ! endwith "$file" '.bak' && \ > ++ [ -f "$file" ]; then > + rcfiles="$rcfiles --rcfile \"$file\"" > + fi > + done > Index: patches/patch-setup_py > === > RCS file: /cvs/ports/mail/getmail/patches/patch-setup_py,v > retrieving revision 1.5 > diff -u -p -r1.5 patch-setup_py > --- patches/patch-setup_py11 Mar 2022 19:34:37 - 1.5 > +++ patches/patch-setup_py9 Dec 2022 13:59:43 - > @@ -1,25 +1,16 @@ > Index: setup.py > --- setup.py.orig > +++ setup.py > -@@ -39,12 +39,11 @@ GETMAILDOCDIR = os.path.join( > - datadir or prefix, > - 'share', > - 'doc', > --'getmail-%s' % __version__ > -+'getmail' > - ) > +@@ -36,10 +36,10 @@ for (pos, arg) in enumerate(args): > + # hack hack hack hack hack hack hack > + datadir = args[pos + 1] > > - GETMAILMANDIR = os.path.join( > - datadir or prefix, > --'share', > - 'man', > - 'man1' > - ) > -@@ -101,7 +100,6 @@ setup( > - data_files=[ > - (GETMAILDOCDIR, [ > - './README', > --
Re: [new port] getmail6
I made a test setup, the only thing missing from my earlier diff was -f. OK? Index: Makefile === RCS file: /cvs/ports/mail/getmail/Makefile,v retrieving revision 1.102 diff -u -p -r1.102 Makefile --- Makefile11 Mar 2022 19:34:37 - 1.102 +++ Makefile9 Dec 2022 13:59:43 - @@ -1,24 +1,22 @@ COMMENT= IMAP/POP3/SDPS mail retriever -MODPY_EGG_VERSION= 5.16 -DISTNAME= getmail-${MODPY_EGG_VERSION} +MODPY_EGG_VERSION= 6.18.10 +GH_ACCOUNT=getmail6 +GH_PROJECT=getmail6 +GH_TAGNAME=v${MODPY_EGG_VERSION} +PKGNAME= getmail-${MODPY_EGG_VERSION} CATEGORIES=mail -HOMEPAGE= http://pyropus.ca/software/getmail/ +# https://github.com/getmail6/getmail6 +HOMEPAGE= https://getmail6.org/ MAINTAINER=Martin Ziemer # GPLv2 PERMIT_PACKAGE=Yes -MASTER_SITES= ${HOMEPAGE}/old-versions/ - MODULES= lang/python - -# No Python 3 support as of 5.16 -# https://pyropus.ca/software/getmail/documentation.html#python3 -MODPY_VERSION =${MODPY_DEFAULT_VERSION_2} - +MODPY_PYBUILD= setuptools NO_TEST= Yes EXDIR= ${PREFIX}/share/examples/getmail Index: distinfo === RCS file: /cvs/ports/mail/getmail/distinfo,v retrieving revision 1.81 diff -u -p -r1.81 distinfo --- distinfo24 Nov 2021 09:06:39 - 1.81 +++ distinfo9 Dec 2022 13:59:43 - @@ -1,2 +1,2 @@ -SHA256 (getmail-5.16.tar.gz) = auj46u+avEZQUMO2TlWjGvvc1Mbt8xl7W1m71WymZ/o= -SIZE (getmail-5.16.tar.gz) = 180577 +SHA256 (getmail6-6.18.10.tar.gz) = DlYXz6LMh8WyWWNPWfVyjfOyVoqSyqVkdn4lb3mGatY= +SIZE (getmail6-6.18.10.tar.gz) = 205481 Index: patches/patch-getmails === RCS file: patches/patch-getmails diff -N patches/patch-getmails --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-getmails 9 Dec 2022 13:59:43 - @@ -0,0 +1,43 @@ +# Fix for use on OpenBSD and ignore Directories in folder + +Index: getmails +--- getmails.orig getmails +@@ -28,7 +28,7 @@ BASE1=${1##*/} + [ "$BASE1" != "${BASE1#$2}" ] && return 0 || return 1 + } + UID_BY_ID=$(id -u) +-PID_GETMAILS=$(pgrep -U $UID_BY_ID '^getmails$') ++PID_GETMAILS=$(pgrep -f -U $UID_BY_ID '^/bin/sh /usr/local/bin/getmails$') + if [ "x$PID_GETMAILS" != "x$$" ]; then + echo "The getmails script is already running as PID=\"$PID_GETMAILS\" ." >&2 + exit 1 +@@ -44,7 +44,7 @@ if [ -f $getmailrcdir/stop ]; then + echo "Do not run getmail ... (if not, remove $getmailrcdir/stop)" >&2 + exit 1 + fi +-rcfiles="/usr/bin/getmail" ++rcfiles="/usr/local/bin/getmail" + # Address concerns raised by #863856 + # emacs backup files: foo~ foo# + # vim backup files: foo~ foo.swp +@@ -57,7 +57,8 @@ if $para ; then +! endwith "$file" '#' && \ +! startswith "$file" 'oldmail-' && \ +! endwith "$file" '.swp' && \ +- ! endwith "$file" '.bak' ; then ++ ! endwith "$file" '.bak' && \ ++ [ -f "$file" ]; then + $rcfiles --rcfile "$file" "$@" & + pids="$pids $!" + fi +@@ -79,7 +80,8 @@ else +! endwith "$file" '#' && \ +! startswith "$file" 'oldmail-' && \ +! endwith "$file" '.swp' && \ +- ! endwith "$file" '.bak' ; then ++ ! endwith "$file" '.bak' && \ ++ [ -f "$file" ]; then + rcfiles="$rcfiles --rcfile \"$file\"" + fi + done Index: patches/patch-setup_py === RCS file: /cvs/ports/mail/getmail/patches/patch-setup_py,v retrieving revision 1.5 diff -u -p -r1.5 patch-setup_py --- patches/patch-setup_py 11 Mar 2022 19:34:37 - 1.5 +++ patches/patch-setup_py 9 Dec 2022 13:59:43 - @@ -1,25 +1,16 @@ Index: setup.py --- setup.py.orig +++ setup.py -@@ -39,12 +39,11 @@ GETMAILDOCDIR = os.path.join( - datadir or prefix, - 'share', - 'doc', --'getmail-%s' % __version__ -+'getmail' - ) +@@ -36,10 +36,10 @@ for (pos, arg) in enumerate(args): + # hack hack hack hack hack hack hack + datadir = args[pos + 1] - GETMAILMANDIR = os.path.join( - datadir or prefix, --'share', - 'man', - 'man1' - ) -@@ -101,7 +100,6 @@ setup( - data_files=[ - (GETMAILDOCDIR, [ - './README', --'./getmail.spec', - 'docs/BUGS', - 'docs/COPYING', - 'docs/CHANGELOG', +-DOCDIR = os.path.join('share','doc','getmail-%s' % __version__) ++DOCDIR = os.path.join('share','doc','getmail') + GETMAILDOCDIR = os.path.join(datadir or prefix, DOCDIR) + +-MANDIR = os.path.join('share','man','man1') ++MANDIR = os.path.join('man','man1') + GETMAILMANDIR = os.path.join( datadir or prefix, MANDIR) + + if '--show-default-install-dirs' in args: Index: pkg/PLIST =
Re: [new port] getmail6
Am Fri, Dec 09, 2022 at 10:23:03AM + schrieb Stuart Henderson: > On 2022/12/09 09:17, Martin Ziemer wrote: > > Am Tue, Dec 06, 2022 at 04:27:53PM + schrieb Stuart Henderson: > > > On 2022/12/06 16:50, Martin Ziemer wrote: > > > > Am Tue, Dec 06, 2022 at 03:42:10PM + schrieb Stuart Henderson: > > > > > On 2022/12/06 16:38, Martin Ziemer wrote: > > > > > > Am Tue, Dec 06, 2022 at 03:24:51PM + schrieb Stuart Henderson: > > > > > > > On 2022/12/06 15:22, Stuart Henderson wrote: > > > > > > > > I have left the getmails patch alone for now as I can't test it > > > > > > > > but the > > > > > > > > pgrep invocation is wrong, it should probably search for > > > > > > > > something like > > > > > > > > "^/bin/sh /usr/local/bin/getmails$" and then I expect the set > > > > > > > > -e will > > > > > > > > work. > > > > > > > ...or here's an (untested) version with that proposed change. > > > > > > > (sorry for the spam!) > > > > > > > +-PID_GETMAILS=$(pgrep -U $UID_BY_ID '^getmails$') > > > > > > > ++PID_GETMAILS=$(pgrep -U $UID_BY_ID '^/bin/sh > > > > > > > /usr/local/bin/getmails$') > > > > > > Just tested the getmails change: it still exits at the pgrep line. > > > > > Try pgrep -f [...] > > > > Does not work either. > > > > The problem is a premature end of the whole script, of pgrep finds > > > > noting, instead of just filling the variable to empty. > > > Have a poke around with pgrep while the script is running and see > > > what's needed to get it to match then; in particular this part of the > > > diff breaks the whole reason they're using pgrep: > > > > > > +-if [ "x$PID_GETMAILS" != "x$$" ]; then > > > ++if [ "x${PID_GETMAILS}x" != "xx" ]; then > > > > Today i got my hands on a Debian and a FreeBSD system. > > > > On Debian getmails is not distributed with the package. If i use > > getmails from git there, i get the same error. > > > > On FreeBSD getmails is distributed unpatched. It shows the same error > > (and tries to start getmail from /usr/bin/getmail) > > > > So i see 3 Options for us: > > > > 1. We do not distribute the script in the package > > 2. We patch getmails in a way like the diff below and install it (This > >version i use on my systems) > > 3. We ship a patched version as example > or 4. Actually fix it This was Option 2 for me. (Perhaps my Idea of fixing it was not the best) But your solution (Removing the Test altogether) sounds good. It would be the safest solution, I think. Diff for port with skipping concurrent start detection is below. > I must say I don't really understand going to the trouble of looking at > several OS rather than just figuring out what's needed to fix. Reason is, if i find a fix, which works on other systems too, there is a good chance, i can find someone in upstream, who accepts a solution for the problem i encountered. > > I tend to say for the moment not shipping it would be the safest way, > > until the version in upstream is better. > > The original getmail had no script for multiple configuration files, > > so we will get no problems with compatibility. > > > > --- /usr/obj/ports/getmail-6.18.10/getmail6-6.18.10/getmailsSun Sep > > 18 19:56:20 2022 > > +++ /usr/local/bin/getmails Fri Dec 9 08:15:44 2022 > > @@ -28,8 +28,8 @@ BASE1=${1##*/} > > [ "$BASE1" != "${BASE1#$2}" ] && return 0 || return 1 > > } > > UID_BY_ID=$(id -u) > > -PID_GETMAILS=$(pgrep -U $UID_BY_ID '^getmails$') > > -if [ "x$PID_GETMAILS" != "x$$" ]; then > > +PID_GETMAILS=$(pgrep -fU $UID_BY_ID '/usr/local/bin/getmails' | sed > > "s/$$//" | tr -d '\n' ) > > +if [ "x${PID_GETMAILS}x" != "xx" ]; then > > echo "The getmails script is already running as PID=\"$PID_GETMAILS\" > > ." >&2 > > This patched test is completely broken. It would be better to > remove the "are we already running" check completely than patch it > in a way that might at first glance look like a fix, but really > isn't. Think about what it's doing. pgrep should *always* return > at least one running instance here (the one which is currently > running), or more than one if another instance is running. > Then the 'if [ "x$PID_GETMAILS" != "x$$" ]' is checking whether the > string returned from pgrep is equal to the script's current pid. > If so, it's ok. If not (because it is " " > then it reports the duplicate. It works (on my systems). Reason is: the sed in the pipe removes the running pid. ($$ is our pid) The main problem (premature end of the script) is solved, because there is a pipe, which means the "set -e" only terminates, if the last command in pipe has a exit code. This version would also only report the "offending" pid, while the original version would also report our own pid als already running if there was another instance. But removing the check is perhaps the better solution, as there is less chance of failure. (And no code can not fail under circumstances, which I had not thought about) > > exit 1 > > fi > > @@ -44,7 +44,7 @@ if [ -f $getmailr
Re: [new port] getmail6
On 2022/12/09 09:17, Martin Ziemer wrote: > Am Tue, Dec 06, 2022 at 04:27:53PM + schrieb Stuart Henderson: > > On 2022/12/06 16:50, Martin Ziemer wrote: > > > Am Tue, Dec 06, 2022 at 03:42:10PM + schrieb Stuart Henderson: > > > > On 2022/12/06 16:38, Martin Ziemer wrote: > > > > > Am Tue, Dec 06, 2022 at 03:24:51PM + schrieb Stuart Henderson: > > > > > > On 2022/12/06 15:22, Stuart Henderson wrote: > > > > > > > I have left the getmails patch alone for now as I can't test it > > > > > > > but the > > > > > > > pgrep invocation is wrong, it should probably search for > > > > > > > something like > > > > > > > "^/bin/sh /usr/local/bin/getmails$" and then I expect the set -e > > > > > > > will > > > > > > > work. > > > > > > ...or here's an (untested) version with that proposed change. > > > > > > (sorry for the spam!) > > > > > > +-PID_GETMAILS=$(pgrep -U $UID_BY_ID '^getmails$') > > > > > > ++PID_GETMAILS=$(pgrep -U $UID_BY_ID '^/bin/sh > > > > > > /usr/local/bin/getmails$') > > > > > Just tested the getmails change: it still exits at the pgrep line. > > > > Try pgrep -f [...] > > > Does not work either. > > > The problem is a premature end of the whole script, of pgrep finds > > > noting, instead of just filling the variable to empty. > > Have a poke around with pgrep while the script is running and see > > what's needed to get it to match then; in particular this part of the > > diff breaks the whole reason they're using pgrep: > > > > +-if [ "x$PID_GETMAILS" != "x$$" ]; then > > ++if [ "x${PID_GETMAILS}x" != "xx" ]; then > > Today i got my hands on a Debian and a FreeBSD system. > > On Debian getmails is not distributed with the package. If i use > getmails from git there, i get the same error. > > On FreeBSD getmails is distributed unpatched. It shows the same error > (and tries to start getmail from /usr/bin/getmail) > > So i see 3 Options for us: > > 1. We do not distribute the script in the package > 2. We patch getmails in a way like the diff below and install it (This >version i use on my systems) > 3. We ship a patched version as example or 4. Actually fix it I must say I don't really understand going to the trouble of looking at several OS rather than just figuring out what's needed to fix. > > I tend to say for the moment not shipping it would be the safest way, > until the version in upstream is better. > The original getmail had no script for multiple configuration files, > so we will get no problems with compatibility. > > --- /usr/obj/ports/getmail-6.18.10/getmail6-6.18.10/getmails Sun Sep 18 > 19:56:20 2022 > +++ /usr/local/bin/getmails Fri Dec 9 08:15:44 2022 > @@ -28,8 +28,8 @@ BASE1=${1##*/} > [ "$BASE1" != "${BASE1#$2}" ] && return 0 || return 1 > } > UID_BY_ID=$(id -u) > -PID_GETMAILS=$(pgrep -U $UID_BY_ID '^getmails$') > -if [ "x$PID_GETMAILS" != "x$$" ]; then > +PID_GETMAILS=$(pgrep -fU $UID_BY_ID '/usr/local/bin/getmails' | sed > "s/$$//" | tr -d '\n' ) > +if [ "x${PID_GETMAILS}x" != "xx" ]; then > echo "The getmails script is already running as PID=\"$PID_GETMAILS\" > ." >&2 This patched test is completely broken. It would be better to remove the "are we already running" check completely than patch it in a way that might at first glance look like a fix, but really isn't. Think about what it's doing. pgrep should *always* return at least one running instance here (the one which is currently running), or more than one if another instance is running. Then the 'if [ "x$PID_GETMAILS" != "x$$" ]' is checking whether the string returned from pgrep is equal to the script's current pid. If so, it's ok. If not (because it is " " then it reports the duplicate. > exit 1 > fi > @@ -44,7 +44,7 @@ if [ -f $getmailrcdir/stop ]; then > echo "Do not run getmail ... (if not, remove $getmailrcdir/stop)" >&2 > exit 1 > fi > -rcfiles="/usr/bin/getmail" > +rcfiles="/usr/local/bin/getmail" > # Address concerns raised by #863856 > # emacs backup files: foo~ foo# > # vim backup files: foo~ foo.swp > @@ -57,7 +57,8 @@ if $para ; then > ! endwith "$file" '#' && \ > ! startswith "$file" 'oldmail-' && \ > ! endwith "$file" '.swp' && \ > - ! endwith "$file" '.bak' ; then > + ! endwith "$file" '.bak' && \ > + [ -f "$file" ]; then > $rcfiles --rcfile "$file" "$@" & > pids="$pids $!" > fi > @@ -79,7 +80,8 @@ else > ! endwith "$file" '#' && \ > ! startswith "$file" 'oldmail-' && \ > ! endwith "$file" '.swp' && \ > - ! endwith "$file" '.bak' ; then > + ! endwith "$file" '.bak' && \ > + [ -f "$file" ]; then > rcfiles="$rcfiles --rcfile \"$file\"" > fi > done
Re: desmume, any special reqs to run it?
On Thu, Dec 08, 2022 at 06:42:51PM -0800, Nam Nguyen wrote: > Here is a diff unbreaking desmume. I am attaching it because it contains > ^M being removed from an existing patch. > > I came across this same issue with my WIP-port of flycast. It has to be > adapted for immutable userland mappings in 7.2 -current. Ohh! I would be interested in a flycast port :) > This unbreaks the emulator with my testing of Chrono Trigger. Final Fantasy III and DSLinux are working fine, too. > Feedback and tests are welcome. OK? ok stsp@
Re: [new port] getmail6
Am Tue, Dec 06, 2022 at 04:27:53PM + schrieb Stuart Henderson: > On 2022/12/06 16:50, Martin Ziemer wrote: > > Am Tue, Dec 06, 2022 at 03:42:10PM + schrieb Stuart Henderson: > > > On 2022/12/06 16:38, Martin Ziemer wrote: > > > > Am Tue, Dec 06, 2022 at 03:24:51PM + schrieb Stuart Henderson: > > > > > On 2022/12/06 15:22, Stuart Henderson wrote: > > > > > > I have left the getmails patch alone for now as I can't test it but > > > > > > the > > > > > > pgrep invocation is wrong, it should probably search for something > > > > > > like > > > > > > "^/bin/sh /usr/local/bin/getmails$" and then I expect the set -e > > > > > > will > > > > > > work. > > > > > ...or here's an (untested) version with that proposed change. > > > > > (sorry for the spam!) > > > > > +-PID_GETMAILS=$(pgrep -U $UID_BY_ID '^getmails$') > > > > > ++PID_GETMAILS=$(pgrep -U $UID_BY_ID '^/bin/sh > > > > > /usr/local/bin/getmails$') > > > > Just tested the getmails change: it still exits at the pgrep line. > > > Try pgrep -f [...] > > Does not work either. > > The problem is a premature end of the whole script, of pgrep finds > > noting, instead of just filling the variable to empty. > Have a poke around with pgrep while the script is running and see > what's needed to get it to match then; in particular this part of the > diff breaks the whole reason they're using pgrep: > > +-if [ "x$PID_GETMAILS" != "x$$" ]; then > ++if [ "x${PID_GETMAILS}x" != "xx" ]; then Today i got my hands on a Debian and a FreeBSD system. On Debian getmails is not distributed with the package. If i use getmails from git there, i get the same error. On FreeBSD getmails is distributed unpatched. It shows the same error (and tries to start getmail from /usr/bin/getmail) So i see 3 Options for us: 1. We do not distribute the script in the package 2. We patch getmails in a way like the diff below and install it (This version i use on my systems) 3. We ship a patched version as example I tend to say for the moment not shipping it would be the safest way, until the version in upstream is better. The original getmail had no script for multiple configuration files, so we will get no problems with compatibility. --- /usr/obj/ports/getmail-6.18.10/getmail6-6.18.10/getmailsSun Sep 18 19:56:20 2022 +++ /usr/local/bin/getmails Fri Dec 9 08:15:44 2022 @@ -28,8 +28,8 @@ BASE1=${1##*/} [ "$BASE1" != "${BASE1#$2}" ] && return 0 || return 1 } UID_BY_ID=$(id -u) -PID_GETMAILS=$(pgrep -U $UID_BY_ID '^getmails$') -if [ "x$PID_GETMAILS" != "x$$" ]; then +PID_GETMAILS=$(pgrep -fU $UID_BY_ID '/usr/local/bin/getmails' | sed "s/$$//" | tr -d '\n' ) +if [ "x${PID_GETMAILS}x" != "xx" ]; then echo "The getmails script is already running as PID=\"$PID_GETMAILS\" ." >&2 exit 1 fi @@ -44,7 +44,7 @@ if [ -f $getmailrcdir/stop ]; then echo "Do not run getmail ... (if not, remove $getmailrcdir/stop)" >&2 exit 1 fi -rcfiles="/usr/bin/getmail" +rcfiles="/usr/local/bin/getmail" # Address concerns raised by #863856 # emacs backup files: foo~ foo# # vim backup files: foo~ foo.swp @@ -57,7 +57,8 @@ if $para ; then ! endwith "$file" '#' && \ ! startswith "$file" 'oldmail-' && \ ! endwith "$file" '.swp' && \ - ! endwith "$file" '.bak' ; then + ! endwith "$file" '.bak' && \ + [ -f "$file" ]; then $rcfiles --rcfile "$file" "$@" & pids="$pids $!" fi @@ -79,7 +80,8 @@ else ! endwith "$file" '#' && \ ! startswith "$file" 'oldmail-' && \ ! endwith "$file" '.swp' && \ - ! endwith "$file" '.bak' ; then + ! endwith "$file" '.bak' && \ + [ -f "$file" ]; then rcfiles="$rcfiles --rcfile \"$file\"" fi done