CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2021/01/26 00:49:36 Modified files: www/nextcloud : Makefile distinfo www/nextcloud/pkg: PLIST Log message: Update for Nextcloud to 20.0.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/01/26 00:26:17 Modified files: net/py-libcloud: Makefile distinfo Log message: Update to py3-libcloud-3.3.1.
[Update] astro/gnuastro : Update to 0.14
Hi,
Here is a patch for astro/gnuastro to update to 0.14.
It build and run well on amd64-current system.
Cheers !
wen
Index: Makefile
===
RCS file: /cvs/ports/astro/gnuastro/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile9 Oct 2020 02:36:44 - 1.2
+++ Makefile26 Jan 2021 07:11:59 -
@@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.2 2020/10/09 02:36:44 bcallah Exp $
COMMENT = GNU Astronomy Utilities
-DISTNAME = gnuastro-0.13
+DISTNAME = gnuastro-0.14
CATEGORIES = astro
-SHARED_LIBS += gnuastro 1.0 # 11.0
+SHARED_LIBS += gnuastro 1.0 # 12.0
HOMEPAGE = https://www.gnu.org/software/gnuastro/
MAINTAINER = Brian Callahan
Index: distinfo
===
RCS file: /cvs/ports/astro/gnuastro/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo9 Oct 2020 02:36:44 - 1.2
+++ distinfo26 Jan 2021 07:11:59 -
@@ -1,2 +1,2 @@
-SHA256 (gnuastro-0.13.tar.gz) = YmT76h+z0f+Xi3Dm0w50tqqgpu+EFJvszknAQ5+HHiU=
-SIZE (gnuastro-0.13.tar.gz) = 5638209
+SHA256 (gnuastro-0.14.tar.gz) = hzu31d5KhCKfjyjPzHvoRUePt9E0TcF9DCeJU0g5w3c=
+SIZE (gnuastro-0.14.tar.gz) = 5844391
Index: patches/patch-configure
===
RCS file: /cvs/ports/astro/gnuastro/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- patches/patch-configure 9 Oct 2020 02:36:44 - 1.2
+++ patches/patch-configure 26 Jan 2021 07:11:59 -
@@ -1,23 +1,23 @@
-$OpenBSD: patch-configure,v 1.2 2020/10/09 02:36:44 bcallah Exp $
+$OpenBSD$
Remove hardcoded -O3
Index: configure
--- configure.orig
+++ configure
-@@ -20265,7 +20265,7 @@ fi
- if test "x$enable_debug" = "xyes"; then :
+@@ -20622,7 +20622,7 @@ if test "x$enable_debug" = "xyes"
+ then :
cflags_add="-g -O0"; enable_shared=no
- else
+ else $as_nop
- cflags_add="-O3"
+ cflags_add=""
fi
CFLAGS="-Wall $cflags_add $CFLAGS"
CXXFLAGS="-Wall $cflags_add $CXXFLAGS"
-@@ -28419,7 +28419,7 @@ $as_echo_n "checking for shell to use with libtool...
+@@ -29099,7 +29099,7 @@ printf %s "checking for shell to use with libtool... "
cprog=libtool_shell_test.c
- $as_echo "#include "[] >
$cprog
- $as_echo "int main(void){printf(\"success\\n\"); return 0;}" >> $cprog
+ printf "%s\n" "#include " >
$cprog
+ printf "%s\n" "int main(void){printf(\"success\\n\"); return 0;}" >>
$cprog
-ltargs="--quiet --tag=CC --mode=link $CC $cprog -O3 -o $outname"
+ltargs="--quiet --tag=CC --mode=link $CC $cprog -o $outname"
Index: pkg/PLIST
===
RCS file: /cvs/ports/astro/gnuastro/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 9 Oct 2020 02:36:44 - 1.2
+++ pkg/PLIST 26 Jan 2021 07:11:59 -
@@ -11,6 +11,7 @@
@bin bin/astmknoise
@bin bin/astmkprof
@bin bin/astnoisechisel
+@bin bin/astquery
bin/astscript-sort-by-night
@bin bin/astsegment
@bin bin/aststatistics
@@ -89,6 +90,7 @@ lib/pkgconfig/gnuastro.pc
@man man/man1/astmknoise.1
@man man/man1/astmkprof.1
@man man/man1/astnoisechisel.1
+@man man/man1/astquery.1
@man man/man1/astscript-sort-by-night.1
@man man/man1/astsegment.1
@man man/man1/aststatistics.1
@@ -123,6 +125,7 @@ share/examples/gnuastro/astmkprof.conf
@sample ${SYSCONFDIR}/astmkprof.conf
share/examples/gnuastro/astnoisechisel.conf
@sample ${SYSCONFDIR}/astnoisechisel.conf
+share/examples/gnuastro/astquery.conf
share/examples/gnuastro/astsegment.conf
@sample ${SYSCONFDIR}/astsegment.conf
share/examples/gnuastro/aststatistics.conf
[New] devel/p5-Devel-PatchPerl
Hi, ports@: Here is a patch to create devel/p5-Devel-PatchPerl, which is required to create perlbrew. It build well and pass all tests on amd64-current system. p5-Devel-PatchPerl.tar.gz Description: p5-Devel-PatchPerl.tar.gz
[New] devel/p5-CPAN-Perl-Releases
Hi, ports@: Here is a patch to create devel/p5-CPAN-Perl-Releases, which is required to create perlbrew. It build well and pass all tests on amd64-current system. wen p5-CPAN-Perl-Releases.tar.gz Description: p5-CPAN-Perl-Releases.tar.gz
回复: Perlbrew port?
To create port for perlbrew, 3 other new ports should be created： p5-CPAN-Perl-Releases p5-Devel-PatchPerl p5-Test-TempDir-Tiny I shall submitt the patch to create these ports later. wen 发件人: owner-po...@openbsd.org 代表 Andrew Hewus Fresh 发送时间: 2021年1月26日 8:53 收件人: bw-open...@gmx.de 抄送: ports@openbsd.org 主题: Re: Perlbrew port? On Mon, Jan 25, 2021 at 04:02:00PM +0100, bw-open...@gmx.de wrote: > Hello everyone, > > I'm currently diving into good ol' Perl programming and want to build a > local version of perl that will not mess with the base system. There is > a handy tool named perlbrew for that, which can be installed easily by > downloading a shell script and executing it (with the 'curl | sh' idiom > if you are wired that way). > > I would prefer having an OpenBSD package for that tool and I would be > interested in writing a port for this. Does that sound like a good idea? > Is anyone already working on such a port? Or is there even already a > port which I managed to overlook? I generally use plenv[0], not perlbrew[1] although for no particular reason other than that's what I got working first, so while I have a general idea of these things, I may have some details wrong for perlbrew. The main issue for plenv that I'm not sure exists in perlbrew is that it expects to install into your home directory and doesn't really have support for a "global" installation. I don't think there's anything particularly stopping it from working but I don't know that it's tested for that use case. I was going to look at setting up plenv as as a separate user for use on my cpan smoker machine, but I haven't gotten far enough to know if it actually works. In any case, I find it to be a useful tool for doing perl module development, if one of these showed up as a package I might consider using it. [0] https://apac01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Ftokuhirom%2Fplenvdata=04%7C01%7C%7Cd223224339f14033a0e408d8c195077d%7C84df9e7fe9f640afb435%7C1%7C0%7C637472193105020814%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000sdata=qCV3dqC2GyHZTfLx7D3Z8x19lIP88cGGTgAd4cY9mZo%3Dreserved=0 [1] https://apac01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fperlbrew.pl%2Fdata=04%7C01%7C%7Cd223224339f14033a0e408d8c195077d%7C84df9e7fe9f640afb435%7C1%7C0%7C637472193105020814%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000sdata=AHK7Nd80iWAN6TqNPYL8XDQZI%2BxdjmoxV%2FFvKnofUPs%3Dreserved=0 l8rZ, -- andrew - https://apac01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fafresh1.com%2Fdata=04%7C01%7C%7Cd223224339f14033a0e408d8c195077d%7C84df9e7fe9f640afb435%7C1%7C0%7C637472193105030780%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000sdata=%2BCGGzClfWMiJFqDO%2FjhnjmkUNyIzY2ltQ4BEj%2FljO0Q%3Dreserved=0 Computer Science: solving today's problems tomorrow.
Re: PostgreSQL 13.1 Upgrade
On Fri, 20 Nov 2020 17:06:13 -0800, Jeremy Evans wrote: > Could we please have this tested in a bulk? Assuming there are no > problems in a bulk, OKs? Thanks for the diff! I updated my server to it. It works fine for me. There is: /usr/ports/databases/postgresql$ make port-lib-depends-check postgresql-client-13.1(databases/postgresql,-main): Extra: iconv.7 lzma.2 postgresql-server-13.1(databases/postgresql,-server): Extra: iconv.7 lzma.2 postgresql-contrib-13.1(databases/postgresql,-contrib): Extra: iconv.7 lzma.2 postgresql-pg_upgrade-13.1(databases/postgresql,-pg_upgrade): Extra: iconv.7 lzma.2 postgresql-plpython-13.1(databases/postgresql,-plpython): Missing: intl.7 from gettext-runtime-0.21p0 (/usr/local/lib/postgresql/plpython2.so) WANTLIB += intl *** Error 1 in target 'port-lib-depends-check' (ignored) I haven't checked if the current 12.5 does the same or not, and I'm too lazy to move my ports tree back to it to check (when do we switch to got(1)?? :P). Also it seems the current maintainer is very busy/unresponsive so maybe it would make sense if you took maintainership? Cheers, Daniel
Re: Perlbrew port?
On Mon, Jan 25, 2021 at 04:02:00PM +0100, bw-open...@gmx.de wrote: > Hello everyone, > > I'm currently diving into good ol' Perl programming and want to build a > local version of perl that will not mess with the base system. There is > a handy tool named perlbrew for that, which can be installed easily by > downloading a shell script and executing it (with the 'curl | sh' idiom > if you are wired that way). > > I would prefer having an OpenBSD package for that tool and I would be > interested in writing a port for this. Does that sound like a good idea? > Is anyone already working on such a port? Or is there even already a > port which I managed to overlook? I generally use plenv[0], not perlbrew[1] although for no particular reason other than that's what I got working first, so while I have a general idea of these things, I may have some details wrong for perlbrew. The main issue for plenv that I'm not sure exists in perlbrew is that it expects to install into your home directory and doesn't really have support for a "global" installation. I don't think there's anything particularly stopping it from working but I don't know that it's tested for that use case. I was going to look at setting up plenv as as a separate user for use on my cpan smoker machine, but I haven't gotten far enough to know if it actually works. In any case, I find it to be a useful tool for doing perl module development, if one of these showed up as a package I might consider using it. [0] https://github.com/tokuhirom/plenv [1] https://perlbrew.pl/ l8rZ, -- andrew - http://afresh1.com Computer Science: solving today's problems tomorrow.
archivers/pigz: update to 2.5, build with -D_BSD_SOURCE
- Add --alias/-A option to set .zip name for stdin input
- Add --comment/-C option to add comment in .gz or .zip
- Fix a bug that misidentified a multi-entry .zip
- Fix a bug that did not emit double syncs for -i -p 1
- Fix a bug in yarn that could try to access freed data
- Do not delete multi-entry .zip files when extracting
- Do not reject .zip entries with bit 11 set
- Avoid a possible threads lock-order inversion
- Ignore trailing junk after a gzip stream by default
Besides the routine update, I had to amend CFLAGS to fix the following
warning:
cc -O2 -pipe -Wall -Wextra -c pigz.c
pigz.c:4543:9: warning: implicit declaration of function 'pledge' is
invalid in C99 [-Wimplicit-function-declaration]
if (pledge("stdio rpath wpath cpath fattr chown", NULL) == -1) {
^
That's because of this change in 2.5:
--- pig.c Mon Jan 25 23:26:18 2021
+++ pig.c Mon Jan 25 23:42:30 2021
@@ -321,8 +330,10 @@
buffers to about the same number.
*/
-// Use large file functions if available.
-#define _FILE_OFFSET_BITS 64
+// Portability defines.
+#define _FILE_OFFSET_BITS 64// Use large file functions
+#define _LARGE_FILES// Same thing for AIX
+#define _POSIX_C_SOURCE 200809L // For MinGW
// Included headers and what is expected from each.
#include // fflush(), fprintf(), fputs(), getchar(), putc(),
_POSIX_C_SOURCE makes define __POSIX_VISIBLE and, because
_BSD_SOURCE is not defined, therefore also define __BSD_VISIBLE 0.
only protoypes pledge(2) under __BSD_VISIBLE, so fix the
warning by defining _BSD_SOURCE such that defines
__BSD_VISIBLE 1.
This does result in object change.
Feedback? OK?
Index: Makefile
===
RCS file: /cvs/ports/archivers/pigz/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile12 Jul 2019 20:43:29 - 1.8
+++ Makefile25 Jan 2021 23:18:26 -
@@ -5,8 +5,7 @@ NOT_FOR_ARCHS= ${GCC3_ARCHS}
COMMENT = parallel implementation of gzip utilizing multiple cores
-DISTNAME = pigz-2.4
-REVISION = 0
+DISTNAME = pigz-2.5
CATEGORIES = archivers
HOMEPAGE = https://zlib.net/pigz/
@@ -22,6 +21,10 @@ MASTER_SITES = https://zlib.net/pigz/
MAKE_FLAGS = CC="${CC}" \
CFLAGS="${CFLAGS} -Wall -Wextra"
+
+# pigz.c 2.5 defines _POSIX_C_SOURCE which prevents from
+# prototyping pledge(2), override the define
+CFLAGS += -D_BSD_SOURCE
ALL_TARGET = pigz
Index: distinfo
===
RCS file: /cvs/ports/archivers/pigz/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo25 Jan 2018 10:34:49 - 1.4
+++ distinfo25 Jan 2021 22:26:27 -
@@ -1,2 +1,2 @@
-SHA256 (pigz-2.4.tar.gz) = pPgWIip7Qmm9IyaAWQtXnMxyWR8bta2vzXIIynfhT3M=
-SIZE (pigz-2.4.tar.gz) = 98234
+SHA256 (pigz-2.5.tar.gz) = oAZkVwLKrsrOYzqJ61w3FIK0SkjQTzTgBY4rhdddTDY=
+SIZE (pigz-2.5.tar.gz) = 106438
Index: patches/patch-pigz_c
===
RCS file: /cvs/ports/archivers/pigz/patches/patch-pigz_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-pigz_c
--- patches/patch-pigz_c10 Jul 2018 13:32:44 - 1.1
+++ patches/patch-pigz_c25 Jan 2021 22:26:28 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-pigz_c,v 1.1 2018/07/10
Index: pigz.c
--- pigz.c.orig
+++ pigz.c
-@@ -4307,6 +4307,11 @@ int main(int argc, char **argv) {
+@@ -4540,6 +4540,11 @@ int main(int argc, char **argv) {
char *opts, *p; // environment default options, marker
ball_t err; // error information from throw()
@@ -15,7 +15,7 @@ Index: pigz.c
g.ret = 0;
try {
// initialize globals
-@@ -4408,6 +4413,12 @@ int main(int argc, char **argv) {
+@@ -4646,6 +4651,12 @@ int main(int argc, char **argv) {
else if (option(argv[n])) // process argument
argv[n] = NULL; // remove if option
option(NULL); // check for missing parameter
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/01/25 14:07:50 Modified files: devel/ccache/patches: patch-CMakeLists_txt patch-cmake_GenerateConfigurationFile_cmake patch-cmake_config_h_in patch-src_system_hpp Log message: ccache: pthread_mutexattr_setpshared patches committed upstream
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: mgloc...@cvs.openbsd.org2021/01/25 12:28:00 Modified files: graphics/sane-backends: Makefile Added files: graphics/sane-backends/patches: patch-backend_pixma_pixma_io_sanei_c Log message: Add patch to fix timeout issue seen on some PIXMA scanners. ok ajacoutot@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2021/01/25 12:09:16 Modified files: security/fwbuilder: Makefile distinfo security/fwbuilder/pkg: PLIST Added files: security/fwbuilder/patches: patch-CMakeLists_txt patch-cmake_VERSION_cmake Removed files: security/fwbuilder/patches: patch-autogen_sh Log message: fwbuilder: update to 6.0.0-rc1 This comes from a new upstream, that focused on moving fwbuilder from Qt4 to Qt5. There is no other functional changes to be expected by this update. OK rsadowski@
[new] misc/trash-cli
Hi, trash-cli (https://github.com/andreafrancia/trash-cli) is a command line interface to FreeDesktop.org Trash. * Change distutils.core to setuptools in setup.py because trash-cli uses install_requires and long_description, which generates warning while building port. * Change python to python3 in test_end_to_end_restore.py It builds well on amd64. There are following issues though: * There is a javascript project also called trash-cli (https://github.com/sindresorhus/trash-cli). Is modification to port's name required? If so, what is the recommended practice? * pytest fail with 2 errors because it tries to run 'chmod +t' on a file: chmod: sandbox/sticky: Inappropriate file type or format I think it is chmod's expected behavior. How should I deal with these errors? Maybe use @pytest.mark.skip? cckuan trash-cli.tgz Description: GNU Zip compressed data
Re: UPDATE: graphics/sane-backends
Sure thanks Can you add the link to the issue as a comment in the patch. Thanks. — Antoine > On 25 Jan 2021, at 15:25, Marcus Glocker wrote: > > Hi Antoine, > > This patch fixes some broken PIXMA scanners, as successfully tested by > Mikolaj Kucharski and myself. The patch has been already sent upstream > but not verified/accepted yet: > >https://gitlab.com/sane-project/backends/-/issues/412 > > OK to get the patch in until there is a solution provided by upstream? > > Thanks, > Marcus > > > Index: graphics/sane-backends/Makefile > === > RCS file: /cvs/ports/graphics/sane-backends/Makefile,v > retrieving revision 1.95 > diff -u -p -u -p -r1.95 Makefile > --- graphics/sane-backends/Makefile20 Dec 2020 09:56:36 -1.95 > +++ graphics/sane-backends/Makefile9 Jan 2021 22:07:38 - > @@ -5,7 +5,7 @@ BROKEN-alpha=ICE hp5590.c:1141: error: > COMMENT=API for accessing scanners, backends > > DISTNAME=sane-backends-1.0.31 > -REVISION=1 > +REVISION=2 > > SHARED_LIBS += sane 2.1 # unknown > > Index: graphics/sane-backends/patches/patch-backend_pixma_pixma_io_sanei_c > === > RCS file: graphics/sane-backends/patches/patch-backend_pixma_pixma_io_sanei_c > diff -N graphics/sane-backends/patches/patch-backend_pixma_pixma_io_sanei_c > --- /dev/null1 Jan 1970 00:00:00 - > +++ graphics/sane-backends/patches/patch-backend_pixma_pixma_io_sanei_c9 > Jan 2021 22:07:38 - > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +Index: backend/pixma/pixma_io_sanei.c > +--- backend/pixma/pixma_io_sanei.c.origSun Aug 23 13:59:20 2020 > backend/pixma/pixma_io_sanei.cTue Jan 5 15:30:06 2021 > +@@ -538,8 +538,7 @@ pixma_wait_interrupt (pixma_io_t * io, void *buf, unsi > + #endif > + error = map_error (sanei_usb_read_int (io->dev, buf, )); > + } > +- if (error == PIXMA_EIO || > +- (io->interface == INT_BJNP && error == PIXMA_EOF)) /* EOF is a > bjnp timeout error! */ > ++ if (error == PIXMA_EIO || error == PIXMA_EOF) > + error = PIXMA_ETIMEDOUT;/* FIXME: SANE doesn't have ETIMEDOUT!! */ > + if (error == 0) > + error = count; >
Re: collision in python-3.8.6 when upgrading 6.7 to snapshot
On Mon, Jan 25, 2021 at 01:48:07PM +, Stuart Henderson wrote: > On 2021/01/25 03:34, James Cook wrote: > > On Thu, Oct 08, 2020 at 11:42:53AM +0100, Stuart Henderson wrote: > > > On 2020/10/08 02:33, James Cook wrote: > > > > I'm reporting a slight hiccup upgrading from 6.7 to snapshot. This might > > > > count as my own fault, but reporting it in case it's something that's > > > > supposed to run smoothly. (I was able to recover; no help needed.) > > > > > > > > I upgraded from 6.7 to a snapshot (with sysupgrade -s), then ran > > > > "doas pkg_add -u", and got this: > > > > > > > > > > > > Collision in python-3.8.6: the following files already exist > > > > /usr/local/bin/2to3 from python-3.8.6 > > > > /usr/local/bin/pydoc3 from python-3.8.6 > > > > /usr/local/bin/python3 from python-3.8.6 > > > > /usr/local/bin/python3-config from python-3.8.6 > > > > /usr/local/lib/pkgconfig/python3.pc from python-3.8.6 > > > > It seems to be a missing package registration > > > > > > This is because, > > > > > > 1) The default Python version in ports was switched from 3.7 to 3.8, > > > so the symlinks for the "default names" moved at that time > > > > > > 2) After this, Python 3.7 was updated in 6.7-stable > > > > > > The @conflict lines in the PLIST files for 3.8 in -current should have > > > been updated after the -stable update, so pkg_add doesn't know that > > > it needs to update 3.7.9 to the "6.8 version" (without the symlinks) > > > before installing 3.8. > > > > > > We can't do anything for the main 6.8 release packages now, but it can > > > be fixed in 6.8-stable once it's open. For those arches with -stable > > > packages available, once those packages are built it shouldn't be > > > noticeable to users. > > > > > > > After this, pkg_delete partial-python; pkg_add python3; pkg_add -u > > > > completed the upgrade without trouble (though I haven't tested > > > > anything). > > > > > > Yes that should do the trick. > > > > Somehow, this old problem is still haunting my computer. I'm reviving > > this old thread for two reasons: > > > > 1. In case the below is a useful bug report. > > > > 2. To request advice dealing with it. (My goal: I'd like to have a > >functioning /usr/local/bin/python3 symlink, and no > >"partial-python-3.8.7" package.) > > > > > > > > Ever since the problem I reported above, I've had trouble with the > > Python3 symlinks whenever I run pkg_add -u on that same system. I > > haven't kept careful track, so I'll start with the most recent > > symptoms: > > > > * Today, I noticed that I had no /usr/local/bin/python3 symlink, even > > though I have python-3.8.7 installed. (This is probably because I had > > earlier uninstalled the "partial-python-3.(something)" package.) > > > > * Seeing that, I decided to force-reinstall Python 3.8, resulting in > > the following: > > > > falsifian angel tmp $ doas pkg_add -u -D installed python-3.8.7 > > quirks-3.519 signed on 2021-01-24T21:22:51Z > > quirks-3.519->3.519: ok > > python-3.8.7:libffi-3.3->3.3: ok > > python-3.8.7:libiconv-1.16p0->1.16p0: ok > > python-3.8.7:gettext-runtime-0.21p0->0.21p0: ok > > python-3.8.7:sqlite3-3.34.0->3.34.0: ok > > python-3.8.7:xz-5.2.5->5.2.5: ok > > python-3.8.7:bzip2-1.0.8p0->1.0.8p0: ok > > Bogus symlink: /usr/local/bin/2to3 > > Bogus symlink: /usr/local/bin/pydoc3 > > Bogus symlink: /usr/local/bin/python3 > > Bogus symlink: /usr/local/bin/python3-config > > Bogus symlink: /usr/local/lib/pkgconfig/python3.pc > > Bad rename /usr/local/bin/2to3 to /usr/local/bin/2to3.HZzyyvf4Qq: No such > > file or directory > > Bad rename /usr/local/bin/pydoc3 to /usr/local/bin/pydoc3.IA1AJiEcMU: No > > such file or directory > > Bad rename /usr/local/bin/python3 to /usr/local/bin/python3.puMIJ7N7oe: > > No such file or directory > > Bad rename /usr/local/bin/python3-config to > > /usr/local/bin/python3-config.QD8CNhk2EW: No such file or directory > > Bad rename /usr/local/lib/pkgconfig/python3.pc to > > /usr/local/lib/pkgconfig/python3.pc.jrFTvKCyzK: No such file or directory > > python-3.8.7->3.8.7: ok > > Read shared items: ok > > --- -python-3.8.7 --- > > Files kept as partial-python-3.8.7 package > > > > I have no idea what's happening here. Somehow, pkg_add has decided that > > the symlinks (which didn't exist before I ran the command) should now > > be part of a new "partial-python-3.8.7" package: > > > > falsifian angel tmp $ pkg_info -L partial-python-3.8.7 > > Information for inst:partial-python-3.8.7 > > > > Files: > > /usr/local/bin/2to3 > > /usr/local/bin/pydoc3 > > /usr/local/bin/python3 > > /usr/local/bin/python3-config > > /usr/local/lib/pkgconfig/python3.pc > > > > Here's what I remember from the time between the October 2020 thread > > and today: > > > > * For a while (possibly still continuing to today; I haven't been > > paying close
additional build flavor for audio/ncmpcpp
Hey all, I'm thinking about adding an additional flavor to audio/ncmpcpp to allow music visualisation with fftw3. Is there someone interested in / already working on this (or ncmpcpp in general)? -- Best regards Paul Kopp
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/01/25 09:58:39 Modified files: devel/doxygen : Makefile distinfo devel/doxygen/patches: patch-doc_CMakeLists_txt devel/doxygen-gui: Makefile distinfo Log message: Update doxygen to 1.9.1 All consumer builds are happy.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/01/25 09:58:12 Modified files: x11/xfce4/xfce4-mixer: Makefile distinfo Removed files: x11/xfce4/xfce4-mixer/patches: patch-panel-plugin_xfce-volume-button_c Log message: x11/xfce4/xfce4-mixer: update to 4.15.0pre0 my sndio branch was merged, so use master from the right repo. drops dbus-glib dependency while here.
UPDATE: net/bitcoin
Update bitcoin to the latest stable version.
Tests and feedback welcome!
diff --git a/net/bitcoin/Makefile b/net/bitcoin/Makefile
index 005370af81b..acbb303bc76 100644
--- a/net/bitcoin/Makefile
+++ b/net/bitcoin/Makefile
@@ -1,4 +1,4 @@
- $OpenBSD: Makefile,v 1.25 2020/08/14 11:12:12 rsadowski Exp $
+$OpenBSD: Makefile,v 1.25 2020/08/14 11:12:12 rsadowski Exp $
BROKEN-sparc64 = clang problem, probably needs newer binutils
@@ -6,10 +6,10 @@ COMMENT = P2P payment system
GH_ACCOUNT = bitcoin
GH_PROJECT = bitcoin
-GH_TAGNAME = v0.20.1
+GH_TAGNAME = v0.21.0
-SHARED_LIBS += bitcoinconsensus 3.0 # 0.0
-SHARED_LIBS += secp256k1 0.0 # 0.0
+SHARED_LIBS += bitcoinconsensus 4.0 # 0.0
+SHARED_LIBS += secp256k1 0.1 # 0.0
SHARED_LIBS += univalue 0.0 # 100.3
CATEGORIES = net
@@ -22,8 +22,8 @@ MAINTAINER = Rafael Sadowski
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} boost_filesystem
-WANTLIB += boost_system boost_system-mt boost_thread-mt c crypto
-WANTLIB += db_cxx event_core event_extra event_pthreads icuio
+WANTLIB += boost_system boost_thread-mt c crypto
+WANTLIB += db_cxx event_core event_extra event_pthreads
WANTLIB += m sodium ssl zmq zstd
LIB_DEPENDS = archivers/zstd \
@@ -65,7 +65,7 @@ WANTLIB += expat freetype glapi glib-2.0 graphite2 gthread-2.0
WANTLIB += harfbuzz iconv icudata icui18n icuuc intl miniupnpc
WANTLIB += pcre pcre2-16 png qrencode xcb xcb-dri2 double-conversion
WANTLIB += xcb-dri3 xcb-glx xcb-present xcb-sync xcb-xfixes xshmfence
-WANTLIB += z
+WANTLIB += Xau Xdmcp sqlite3 z
MODULES += x11/qt5
diff --git a/net/bitcoin/distinfo b/net/bitcoin/distinfo
index 0bb02d6c39b..3ec24a6956f 100644
--- a/net/bitcoin/distinfo
+++ b/net/bitcoin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bitcoin-0.20.1.tar.gz) = S71i/WrPpemGTr83okoEvC3P4+MiLwVgViiNhUxTuXg=
-SIZE (bitcoin-0.20.1.tar.gz) = 6981793
+SHA256 (bitcoin-0.21.0.tar.gz) = GpEgLGLuSftk1XpSuNbQHNOS//y+8le1c4APkollXzc=
+SIZE (bitcoin-0.21.0.tar.gz) = 7531395
diff --git a/net/bitcoin/patches/patch-configure_ac
b/net/bitcoin/patches/patch-configure_ac
index fece1600cf3..e38981805e3 100644
--- a/net/bitcoin/patches/patch-configure_ac
+++ b/net/bitcoin/patches/patch-configure_ac
@@ -5,10 +5,10 @@ We already uses PIE as default. Unbreak with lld
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -748,7 +748,6 @@ if test x$use_hardening != xno; then
- AX_CHECK_LINK_FLAG([[-Wl,--high-entropy-va]],
[HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,--high-entropy-va"])
- AX_CHECK_LINK_FLAG([[-Wl,-z,relro]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS
-Wl,-z,relro"])
- AX_CHECK_LINK_FLAG([[-Wl,-z,now]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS
-Wl,-z,now"])
+@@ -840,7 +840,6 @@ if test x$use_hardening != xno; then
+ AX_CHECK_LINK_FLAG([[-Wl,-z,relro]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS
-Wl,-z,relro"],, [[$LDFLAG_WERROR]])
+ AX_CHECK_LINK_FLAG([[-Wl,-z,now]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS
-Wl,-z,now"],, [[$LDFLAG_WERROR]])
+ AX_CHECK_LINK_FLAG([[-Wl,-z,separate-code]],
[HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,separate-code"],,
[[$LDFLAG_WERROR]])
- AX_CHECK_LINK_FLAG([[-fPIE -pie]], [PIE_FLAGS="-fPIE";
HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"],, [[$CXXFLAG_WERROR]])
case $host in
diff --git a/net/bitcoin/patches/patch-src_wallet_db_cpp
b/net/bitcoin/patches/patch-src_wallet_bdb_cpp
similarity index 58%
rename from net/bitcoin/patches/patch-src_wallet_db_cpp
rename to net/bitcoin/patches/patch-src_wallet_bdb_cpp
index 6ccf0e48487..95b8b48cd8c 100644
--- a/net/bitcoin/patches/patch-src_wallet_db_cpp
+++ b/net/bitcoin/patches/patch-src_wallet_bdb_cpp
@@ -1,14 +1,9 @@
-$OpenBSD: patch-src_wallet_db_cpp,v 1.6 2020/06/08 20:32:55 rsadowski Exp $
-Index: src/wallet/db.cpp
src/wallet/db.cpp.orig
-+++ src/wallet/db.cpp
-@@ -1,4 +1,4 @@
--// Copyright (c) 2009-2010 Satoshi Nakamoto
-+
- // Copyright (c) 2009-2020 The Bitcoin Core developers
- // Distributed under the MIT software license, see the accompanying
- // file COPYING or http://www.opensource.org/licenses/mit-license.php.
-@@ -195,7 +195,9 @@ bool BerkeleyEnvironment::Open(bool retry)
+$OpenBSD$
+
+Index: src/wallet/bdb.cpp
+--- src/wallet/bdb.cpp.orig
src/wallet/bdb.cpp
+@@ -158,7 +158,9 @@ bool BerkeleyEnvironment::Open(bilingual_str& err)
dbenv->set_errfile(fsbridge::fopen(pathErrorFile, "a")); /// debug
dbenv->set_flags(DB_AUTO_COMMIT, 1);
dbenv->set_flags(DB_TXN_WRITE_NOSYNC, 1);
@@ -18,7 +13,7 @@ Index: src/wallet/db.cpp
int ret = dbenv->open(strPath.c_str(),
DB_CREATE |
DB_INIT_LOCK |
-@@ -250,7 +252,9 @@ BerkeleyEnvironment::BerkeleyEnvironment()
+@@ -201,7 +203,9 @@ BerkeleyEnvironment::BerkeleyEnvironment()
dbenv->set_lk_max_locks(1);
Re: promplot - assistance with golang port
On Mon, Jan 25, 2021 at 09:04:03AM -0700, Aaron Bieber wrote: > > > Thank you! <3 > > > > Do you see something like this on your end by any chance? > > > > $ make modgo-gen-modules > > malformed JSON string, neither array, object, number, string or atom, at > > character offset 0 (before "(end of string)") at > > /home/mkucharski/openbsd/ports/infrastructure/bin/../lib/OpenBSD/PortGen/Port.pm > > line 58. > > *** Error 255 in /home/mkucharski/openbsd/mystuff/graphics/promplot > > (/home/mkucharski/openbsd/ports/lang/go/go.port.mk:183 'modgo-gen-modules') > > > > I know your port had MODGO_MODULES and MODGO_MODFILES generated, but I > > just run above make command as a test and it failed. > > Ya. There are a combo of things happening: > > 1. https://proxy.golang.org/qvl.io/promplot/@v/v0.16.0.mod shows no >dependencies > 2. The version comparison check in the portgen code is incorrect and the >versions listed on https://proxy.golang.org/qvl.io/promplot/@v/list >are not being correctly chosen. > > I have a in-tree diff that isn't ready yet, but fixes the issues. I am > not sure why v0.16.0.mod shows no dependencies. It could be that > upstream pushed it before actually having the deps filled out.. I > haven't looked yet. I see. Thanks again for helping me with creating the port. -- Regards, Mikolaj
Re: promplot - assistance with golang port
Mikolaj Kucharski writes: > On Mon, Jan 25, 2021 at 07:48:09AM -0700, Aaron Bieber wrote: >> On Mon, 25 Jan 2021 at 07:40:56 -0700, Aaron Bieber wrote: >> > On Sun, 24 Jan 2021 at 14:38:01 +, Mikolaj Kucharski wrote: >> > > If some kind soul could push me in the right direction, I would greatly >> > > appreciate it. See reattached port, what I have so far. >> > > >> > > On Fri, Jan 01, 2021 at 02:17:31PM +, Mikolaj Kucharski wrote: >> > > > >> > > > I looking for a tool which can easily generate a screenshot from >> > > > Prometheus metrics and I found https://github.com/qvl/promplot >> > > > >> > > > I have work in progress port, but it fails to build with: >> > > > >> > > > ... >> > > > go install -modcacherw -v -p 1 github.com/qvl/promplot ; fi; >> > > > cannot find module providing package github.com/qvl/promplot: working >> > > > directory is not part of a module >> > > > *** Error 1 in . >> > > > (/home/mkucharski/openbsd/ports/lang/go/go.port.mk:153 'do-build') >> > > > >> > > > Any idea what I'm doing wrong? >> > >> > MODGO_MODNAME needs to be set to the actual Go module name. Not a git repo. >> > >> > The module name will be the first like in the 'go.mod' file. In this case >> > it's >> > "qvl.io/promplot". >> > >> > Normally, I would recommend creating the initial port with portgen, but it >> > seems that this program hits a few bugs. I'll poke at it and see if I can >> > come >> > up with a fix. >> > >> >> Attached is a portgen'd version (found the bug, but I need to do more >> testing). >> >> This should be enough to get ya going! >> > > Thank you! <3 > > Do you see something like this on your end by any chance? > > $ make modgo-gen-modules > malformed JSON string, neither array, object, number, string or atom, at > character offset 0 (before "(end of string)") at > /home/mkucharski/openbsd/ports/infrastructure/bin/../lib/OpenBSD/PortGen/Port.pm > line 58. > *** Error 255 in /home/mkucharski/openbsd/mystuff/graphics/promplot > (/home/mkucharski/openbsd/ports/lang/go/go.port.mk:183 'modgo-gen-modules') > > I know your port had MODGO_MODULES and MODGO_MODFILES generated, but I > just run above make command as a test and it failed. Ya. There are a combo of things happening: 1. https://proxy.golang.org/qvl.io/promplot/@v/v0.16.0.mod shows no dependencies 2. The version comparison check in the portgen code is incorrect and the versions listed on https://proxy.golang.org/qvl.io/promplot/@v/list are not being correctly chosen. I have a in-tree diff that isn't ready yet, but fixes the issues. I am not sure why v0.16.0.mod shows no dependencies. It could be that upstream pushed it before actually having the deps filled out.. I haven't looked yet.
NEW: graphics/promplot
Hi, I was looking for a tool which can easily generate a screenshot from Prometheus metrics and I found: https://github.com/qvl/promplot > Comment: > create plots from Prometheus metrics > > Description: > promplot is an opinionated tool to create plots from Prometheus > metrics and automatically sends them to Slack or saves the image > to a file or stdout. With help from Aaron Bieber I've created attached port. It compiles and I can generate PNG files with Prometheus metrics via the tool. -- Regards, Mikolaj promplot-0.17.0-port.tgz Description: application/tar-gz
Re: promplot - assistance with golang port
On Mon, Jan 25, 2021 at 07:48:09AM -0700, Aaron Bieber wrote: > On Mon, 25 Jan 2021 at 07:40:56 -0700, Aaron Bieber wrote: > > On Sun, 24 Jan 2021 at 14:38:01 +, Mikolaj Kucharski wrote: > > > If some kind soul could push me in the right direction, I would greatly > > > appreciate it. See reattached port, what I have so far. > > > > > > On Fri, Jan 01, 2021 at 02:17:31PM +, Mikolaj Kucharski wrote: > > > > > > > > I looking for a tool which can easily generate a screenshot from > > > > Prometheus metrics and I found https://github.com/qvl/promplot > > > > > > > > I have work in progress port, but it fails to build with: > > > > > > > > ... > > > > go install -modcacherw -v -p 1 github.com/qvl/promplot ; fi; > > > > cannot find module providing package github.com/qvl/promplot: working > > > > directory is not part of a module > > > > *** Error 1 in . (/home/mkucharski/openbsd/ports/lang/go/go.port.mk:153 > > > > 'do-build') > > > > > > > > Any idea what I'm doing wrong? > > > > MODGO_MODNAME needs to be set to the actual Go module name. Not a git repo. > > > > The module name will be the first like in the 'go.mod' file. In this case > > it's > > "qvl.io/promplot". > > > > Normally, I would recommend creating the initial port with portgen, but it > > seems that this program hits a few bugs. I'll poke at it and see if I can > > come > > up with a fix. > > > > Attached is a portgen'd version (found the bug, but I need to do more > testing). > > This should be enough to get ya going! > Thank you! <3 Do you see something like this on your end by any chance? $ make modgo-gen-modules malformed JSON string, neither array, object, number, string or atom, at character offset 0 (before "(end of string)") at /home/mkucharski/openbsd/ports/infrastructure/bin/../lib/OpenBSD/PortGen/Port.pm line 58. *** Error 255 in /home/mkucharski/openbsd/mystuff/graphics/promplot (/home/mkucharski/openbsd/ports/lang/go/go.port.mk:183 'modgo-gen-modules') I know your port had MODGO_MODULES and MODGO_MODFILES generated, but I just run above make command as a test and it failed. -- Regards, Mikolaj
[new] security/rbw a command line Bitwarden client
Hi! Here is a port of rbw - a command line client for Bitwaden. It's written in rust so you know it's Good™! Huge thanks to tb@ for the portability fixes! I will try to upstream them here before too long. I tested on amd64 and arm64 without issue. OK to import? Cheers, Aaron rbw.tgz Description: Binary data
Perlbrew port?
Hello everyone, I'm currently diving into good ol' Perl programming and want to build a local version of perl that will not mess with the base system. There is a handy tool named perlbrew for that, which can be installed easily by downloading a shell script and executing it (with the 'curl | sh' idiom if you are wired that way). I would prefer having an OpenBSD package for that tool and I would be interested in writing a port for this. Does that sound like a good idea? Is anyone already working on such a port? Or is there even already a port which I managed to overlook? Best regards - Bastian
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/01/25 07:53:55 Modified files: security/py-tlsfuzzer: Makefile distinfo Log message: Update to tlsfuzzer 20210125
Re: promplot - assistance with golang port
On Mon, 25 Jan 2021 at 07:40:56 -0700, Aaron Bieber wrote: > On Sun, 24 Jan 2021 at 14:38:01 +, Mikolaj Kucharski wrote: > > If some kind soul could push me in the right direction, I would greatly > > appreciate it. See reattached port, what I have so far. > > > > On Fri, Jan 01, 2021 at 02:17:31PM +, Mikolaj Kucharski wrote: > > > > > > I looking for a tool which can easily generate a screenshot from > > > Prometheus metrics and I found https://github.com/qvl/promplot > > > > > > I have work in progress port, but it fails to build with: > > > > > > ... > > > go install -modcacherw -v -p 1 github.com/qvl/promplot ; fi; > > > cannot find module providing package github.com/qvl/promplot: working > > > directory is not part of a module > > > *** Error 1 in . (/home/mkucharski/openbsd/ports/lang/go/go.port.mk:153 > > > 'do-build') > > > > > > Any idea what I'm doing wrong? > > MODGO_MODNAME needs to be set to the actual Go module name. Not a git repo. > > The module name will be the first like in the 'go.mod' file. In this case it's > "qvl.io/promplot". > > Normally, I would recommend creating the initial port with portgen, but it > seems that this program hits a few bugs. I'll poke at it and see if I can come > up with a fix. > Attached is a portgen'd version (found the bug, but I need to do more testing). This should be enough to get ya going! > > > > > > > -- > > Regards, > > Mikolaj > > promplot.tgz Description: Binary data
Re: promplot - assistance with golang port
On Sun, 24 Jan 2021 at 14:38:01 +, Mikolaj Kucharski wrote: > If some kind soul could push me in the right direction, I would greatly > appreciate it. See reattached port, what I have so far. > > On Fri, Jan 01, 2021 at 02:17:31PM +, Mikolaj Kucharski wrote: > > > > I looking for a tool which can easily generate a screenshot from > > Prometheus metrics and I found https://github.com/qvl/promplot > > > > I have work in progress port, but it fails to build with: > > > > ... > > go install -modcacherw -v -p 1 github.com/qvl/promplot ; fi; > > cannot find module providing package github.com/qvl/promplot: working > > directory is not part of a module > > *** Error 1 in . (/home/mkucharski/openbsd/ports/lang/go/go.port.mk:153 > > 'do-build') > > > > Any idea what I'm doing wrong? MODGO_MODNAME needs to be set to the actual Go module name. Not a git repo. The module name will be the first like in the 'go.mod' file. In this case it's "qvl.io/promplot". Normally, I would recommend creating the initial port with portgen, but it seems that this program hits a few bugs. I'll poke at it and see if I can come up with a fix. > > > > -- > Regards, > Mikolaj
Re: Icewm update 2.1.0
There's 2.1.1 as well now:
Fix issue #542 for texturing background of task pane.
Don't unarm menu popup buttons for issue #527.
Provide drawable context when creating pixmap cursors with Imlib2 for issue
#541.
I've committed an update to that based on Timo's diff (plus synced
WANTLIB, opus was missing).
On 2021/01/23 11:35, John Batteen wrote:
> Works for me, has fixed the bug. Thanks!!
>
> John
>
> On 1/23/21 12:50 AM, Timo Myyrä wrote:
> > John Batteen [2021-01-22, 18:52 -0600]:
> >
> > > Hi ports,
> > >
> > > IceWM has released 2.1.0 to fix a bug introduced in 2.0.0, related to
> > > going from a maximized window to fullscreen and back again. Making the
> > > new port myself is beyond my abilities, sorry.
> > >
> > > Thanks for making a great operating system.
> > >
> > > John
> >
> > Here's an patch for icewm, very lightly tested on amd64 so far. More
> > tests welcome.
> >
> > timo
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/x11/icewm/Makefile,v
> > retrieving revision 1.77
> > diff -u -p -u -p -r1.77 Makefile
> > --- Makefile29 Dec 2020 10:47:00 - 1.77
> > +++ Makefile23 Jan 2021 06:49:03 -
> > @@ -3,7 +3,7 @@
> > # unconditionally uses machine/apmvar.h and related structures/defines
> > ONLY_FOR_ARCHS= ${APM_ARCHS}
> > -V= 2.0.0
> > +V= 2.1.0
> > COMMENT= small and fast window manager
> > DISTNAME= icewm-${V}
> > EXTRACT_SUFX= .tar.lz
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/x11/icewm/distinfo,v
> > retrieving revision 1.26
> > diff -u -p -u -p -r1.26 distinfo
> > --- distinfo29 Dec 2020 10:47:00 - 1.26
> > +++ distinfo23 Jan 2021 06:49:03 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (icewm-2.0.0.tar.lz) = RHgXK5Nvf33PwhIL6NjxU/11WTO/mLjpjj6uUMQUk5w=
> > -SIZE (icewm-2.0.0.tar.lz) = 1694653
> > +SHA256 (icewm-2.1.0.tar.lz) = 6d4xXkb67Ic3mmC3LuXy2UBEF/yIhJ5XI195GnikC0o=
> > +SIZE (icewm-2.1.0.tar.lz) = 1696214
> >
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/01/25 07:29:54 Modified files: x11/icewm : Makefile distinfo x11/icewm/patches: patch-src_icesh_cc Log message: update to icewm-2.1.1, based on a 2.1.0 diff from Timo Myyrä
UPDATE: graphics/sane-backends
Hi Antoine, This patch fixes some broken PIXMA scanners, as successfully tested by Mikolaj Kucharski and myself. The patch has been already sent upstream but not verified/accepted yet: https://gitlab.com/sane-project/backends/-/issues/412 OK to get the patch in until there is a solution provided by upstream? Thanks, Marcus Index: graphics/sane-backends/Makefile === RCS file: /cvs/ports/graphics/sane-backends/Makefile,v retrieving revision 1.95 diff -u -p -u -p -r1.95 Makefile --- graphics/sane-backends/Makefile 20 Dec 2020 09:56:36 - 1.95 +++ graphics/sane-backends/Makefile 9 Jan 2021 22:07:38 - @@ -5,7 +5,7 @@ BROKEN-alpha= ICE hp5590.c:1141: error: COMMENT= API for accessing scanners, backends DISTNAME= sane-backends-1.0.31 -REVISION= 1 +REVISION= 2 SHARED_LIBS += sane 2.1 # unknown Index: graphics/sane-backends/patches/patch-backend_pixma_pixma_io_sanei_c === RCS file: graphics/sane-backends/patches/patch-backend_pixma_pixma_io_sanei_c diff -N graphics/sane-backends/patches/patch-backend_pixma_pixma_io_sanei_c --- /dev/null 1 Jan 1970 00:00:00 - +++ graphics/sane-backends/patches/patch-backend_pixma_pixma_io_sanei_c 9 Jan 2021 22:07:38 - @@ -0,0 +1,15 @@ +$OpenBSD$ + +Index: backend/pixma/pixma_io_sanei.c +--- backend/pixma/pixma_io_sanei.c.origSun Aug 23 13:59:20 2020 backend/pixma/pixma_io_sanei.c Tue Jan 5 15:30:06 2021 +@@ -538,8 +538,7 @@ pixma_wait_interrupt (pixma_io_t * io, void *buf, unsi + #endif + error = map_error (sanei_usb_read_int (io->dev, buf, )); + } +- if (error == PIXMA_EIO || +- (io->interface == INT_BJNP && error == PIXMA_EOF)) /* EOF is a bjnp timeout error! */ ++ if (error == PIXMA_EIO || error == PIXMA_EOF) + error = PIXMA_ETIMEDOUT; /* FIXME: SANE doesn't have ETIMEDOUT!! */ + if (error == 0) + error = count;
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/01/25 07:21:29 Modified files: security : Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm Removed files: security/acme-client: Makefile distinfo security/acme-client/patches: patch-http_c security/acme-client/pkg: DESCR MESSAGE PLIST Log message: Remove the old ACMEv1-only version of acme-client from ports. letsencrypt have already stopped allowing ACMEv1 for new domain validations, and are now doing "brownouts" for all ACMEv1 access, disabling it temporarily twice a month for increasing lengths of time (6/24/48/72/120/168 hours) in the run up to disabling it completely on June 1st.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/01/25 07:02:45 Modified files: lang/php/7.2 : Makefile lang/php/7.3 : Makefile lang/php/7.4 : Makefile lang/php/files : README-main Log message: tweak php pkg-readme
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/01/25 07:01:52 Modified files: lang/php : php.port.mk mail/kopano/core: Makefile geo/mapserver : Makefile www/pear : Makefile Log message: Set MODPHP_BUILDDEP to No by default, set it to Yes in the ports that need it. The typical ports for PHP-based software are just untarring files and there's no need to have PHP itself on build machines for that.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2021/01/25 06:52:17 Modified files: graphics/unwebp: Makefile distinfo Log message: minor release: - smarter algorithm for existing files: check timestamp and overwrite if the source file is newer - copy constant animation delay from webp to gif (instead of setting it to 0)
Re: collision in python-3.8.6 when upgrading 6.7 to snapshot
On 2021/01/25 03:34, James Cook wrote: > On Thu, Oct 08, 2020 at 11:42:53AM +0100, Stuart Henderson wrote: > > On 2020/10/08 02:33, James Cook wrote: > > > I'm reporting a slight hiccup upgrading from 6.7 to snapshot. This might > > > count as my own fault, but reporting it in case it's something that's > > > supposed to run smoothly. (I was able to recover; no help needed.) > > > > > > I upgraded from 6.7 to a snapshot (with sysupgrade -s), then ran > > > "doas pkg_add -u", and got this: > > > > > > > > > Collision in python-3.8.6: the following files already exist > > > /usr/local/bin/2to3 from python-3.8.6 > > > /usr/local/bin/pydoc3 from python-3.8.6 > > > /usr/local/bin/python3 from python-3.8.6 > > > /usr/local/bin/python3-config from python-3.8.6 > > > /usr/local/lib/pkgconfig/python3.pc from python-3.8.6 > > > It seems to be a missing package registration > > > > This is because, > > > > 1) The default Python version in ports was switched from 3.7 to 3.8, > > so the symlinks for the "default names" moved at that time > > > > 2) After this, Python 3.7 was updated in 6.7-stable > > > > The @conflict lines in the PLIST files for 3.8 in -current should have > > been updated after the -stable update, so pkg_add doesn't know that > > it needs to update 3.7.9 to the "6.8 version" (without the symlinks) > > before installing 3.8. > > > > We can't do anything for the main 6.8 release packages now, but it can > > be fixed in 6.8-stable once it's open. For those arches with -stable > > packages available, once those packages are built it shouldn't be > > noticeable to users. > > > > > After this, pkg_delete partial-python; pkg_add python3; pkg_add -u > > > completed the upgrade without trouble (though I haven't tested anything). > > > > Yes that should do the trick. > > Somehow, this old problem is still haunting my computer. I'm reviving > this old thread for two reasons: > > 1. In case the below is a useful bug report. > > 2. To request advice dealing with it. (My goal: I'd like to have a >functioning /usr/local/bin/python3 symlink, and no >"partial-python-3.8.7" package.) > > > > Ever since the problem I reported above, I've had trouble with the > Python3 symlinks whenever I run pkg_add -u on that same system. I > haven't kept careful track, so I'll start with the most recent > symptoms: > > * Today, I noticed that I had no /usr/local/bin/python3 symlink, even > though I have python-3.8.7 installed. (This is probably because I had > earlier uninstalled the "partial-python-3.(something)" package.) > > * Seeing that, I decided to force-reinstall Python 3.8, resulting in > the following: > > falsifian angel tmp $ doas pkg_add -u -D installed python-3.8.7 > quirks-3.519 signed on 2021-01-24T21:22:51Z > quirks-3.519->3.519: ok > python-3.8.7:libffi-3.3->3.3: ok > python-3.8.7:libiconv-1.16p0->1.16p0: ok > python-3.8.7:gettext-runtime-0.21p0->0.21p0: ok > python-3.8.7:sqlite3-3.34.0->3.34.0: ok > python-3.8.7:xz-5.2.5->5.2.5: ok > python-3.8.7:bzip2-1.0.8p0->1.0.8p0: ok > Bogus symlink: /usr/local/bin/2to3 > Bogus symlink: /usr/local/bin/pydoc3 > Bogus symlink: /usr/local/bin/python3 > Bogus symlink: /usr/local/bin/python3-config > Bogus symlink: /usr/local/lib/pkgconfig/python3.pc > Bad rename /usr/local/bin/2to3 to /usr/local/bin/2to3.HZzyyvf4Qq: No such > file or directory > Bad rename /usr/local/bin/pydoc3 to /usr/local/bin/pydoc3.IA1AJiEcMU: No > such file or directory > Bad rename /usr/local/bin/python3 to /usr/local/bin/python3.puMIJ7N7oe: No > such file or directory > Bad rename /usr/local/bin/python3-config to > /usr/local/bin/python3-config.QD8CNhk2EW: No such file or directory > Bad rename /usr/local/lib/pkgconfig/python3.pc to > /usr/local/lib/pkgconfig/python3.pc.jrFTvKCyzK: No such file or directory > python-3.8.7->3.8.7: ok > Read shared items: ok > --- -python-3.8.7 --- > Files kept as partial-python-3.8.7 package > > I have no idea what's happening here. Somehow, pkg_add has decided that > the symlinks (which didn't exist before I ran the command) should now > be part of a new "partial-python-3.8.7" package: > > falsifian angel tmp $ pkg_info -L partial-python-3.8.7 > Information for inst:partial-python-3.8.7 > > Files: > /usr/local/bin/2to3 > /usr/local/bin/pydoc3 > /usr/local/bin/python3 > /usr/local/bin/python3-config > /usr/local/lib/pkgconfig/python3.pc > > Here's what I remember from the time between the October 2020 thread > and today: > > * For a while (possibly still continuing to today; I haven't been > paying close attention) every time I ran pkg_add -u, I would see > error messages related to /usr/local/bin/python3 and other symlinks > (but the upgrade seems to work). I think the error messages were > generally similar to what's shown above, but I'm not sure. > > * The symlinks were generally kept in a
Re: Update micro editor to v2.0.8
On Fri, 22 Jan 2021 at 15:35:04 +0100, Thaison Nguyen wrote:
> Hi,
>
> I have updated micro to the latest version (2.0.8). I had to change quite
> a lot because of the go modules. The modules list I have retrieved using
> the new macro.
> I have only tested it on amd64.
>
> OK?
>
Looks good! One of the things our Go build stuff sets is "-modcacherw" - this
fixes cleanup issues when running with PORTS_PRIVSEP=Yes set.
OK abieber@ once a patch is added to set that. :D
> Regards,
> Thaison
>
>
> Index: editors/micro/Makefile
> ===
> RCS file: /cvs/ports/editors/micro/Makefile,v
> retrieving revision 1.4
> diff -u -p -u -r1.4 Makefile
> --- editors/micro/Makefile12 Jul 2019 20:46:06 - 1.4
> +++ editors/micro/Makefile22 Jan 2021 13:40:20 -
> @@ -2,11 +2,11 @@
>
> COMMENT =modern and intuitive terminal-based text editor
>
> -V = 1.1.3
> -DISTNAME = micro-${V}-src
> -PKGNAME =micro-${V}
> -REVISION = 0
> +MODGO_MODNAME = github.com/zyedidia/micro/v2
> +MODGO_VERSION = v2.0.8
>
> +
> +DISTNAME = micro-${MODGO_VERSION}
> CATEGORIES = editors
> HOMEPAGE = https://micro-editor.github.io/
> MAINTAINER = Edd Barrett
> @@ -16,11 +16,60 @@ PERMIT_PACKAGE = Yes
>
> WANTLIB += c pthread
>
> -MASTER_SITES =
> https://github.com/zyedidia/micro/releases/download/v${V}/
> -
> MODULES =lang/go
> MODGO_TYPE =bin
> -WRKDIST =${WRKDIR}/micro
> +
> +MODGO_MODULES = \
> + github.com/blang/semver v3.5.1+incompatible \
> + github.com/chzyer/logex v1.1.10 \
> + github.com/chzyer/readline
> v0.0.0-20180603132655-2972be24d48e \
> + github.com/chzyer/test
> v0.0.0-20180213035817-a1ea475d72b1 \
> + github.com/davecgh/go-spew v1.1.1 \
> + github.com/dustin/go-humanizev1.0.0 \
> + github.com/gdamore/encoding v1.0.0 \
> + github.com/go-errors/errors v1.0.1 \
> + github.com/kballard/go-shellquote
> v0.0.0-20180428030007-95032a82bc51 \
> + github.com/kr/pretty v0.1.0 \
> + github.com/kr/ptyv1.1.1 \
> + github.com/kr/text v0.1.0 \
> + github.com/lucasb-eyer/go-colorful v1.0.3 \
> + github.com/mattn/go-isatty v0.0.11 \
> + github.com/mattn/go-runewidthv0.0.7 \
> + github.com/mitchellh/go-homedir v1.1.0 \
> + github.com/p-e-w/go-runewidth
> v0.0.10-0.20200613030200-3e1705c5c059 \
> + github.com/pmezard/go-difflibv1.0.0 \
> + github.com/robertkrimen/otto
> v0.0.0-20191219234010-c382bd3c16ff \
> + github.com/sergi/go-diff v1.1.0 \
> + github.com/stretchr/objx v0.1.0 \
> + github.com/stretchr/testify v1.4.0 \
> + github.com/xo/terminfo
> v0.0.0-20200218205459-454e5b68f9e8 \
> + github.com/yuin/gopher-lua
> v0.0.0-20191220021717-ab39c6098bdb \
> + github.com/zyedidia/clipboardv1.0.3 \
> + github.com/zyedidia/glob
> v0.0.0-20170209203856-dd4023a66dc3 \
> + github.com/zyedidia/go-shellquote
> v0.0.0-20200613203517-eccd813c0655 \
> + github.com/zyedidia/highlight
> v0.0.0-20170330143449-201131ce5cf5 \
> + github.com/zyedidia/json5
> v0.0.0-20200102012142-2da050b1a98d \
> + github.com/zyedidia/poller v1.0.1 \
> + github.com/zyedidia/pty v2.0.0+incompatible \
> + github.com/zyedidia/tcell/v2 v2.0.6 \
> + github.com/zyedidia/terminal
> v0.0.0-20180726154117-533c623e2415 \
> + golang.org/x/sys
> v0.0.0-20191026070338-33540a1f6037 \
> + golang.org/x/textv0.3.2 \
> + golang.org/x/tools
> v0.0.0-20180917221912-90fa682c2a6e \
> + gopkg.in/check.v1
> v1.0.0-20190902080502-41f04d3bba15 \
> + gopkg.in/sourcemap.v1v1.0.5 \
> + gopkg.in/yaml.v2 v2.2.7 \
> + layeh.com/gopher-luarv1.0.7
> +
> +MODGO_MODFILES = \
> + github.com/davecgh/go-spew v1.1.0 \
> + github.com/yuin/gopher-lua v0.0.0-20190206043414-8bfc7677f583 \
> + golang.org/x/sys v0.0.0-20190204203706-41f3e6584952 \
> + golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756 \
> + golang.org/x/textv0.3.0 \
> + gopkg.in/check.v1v0.0.0-20161208181325-20d25e280405 \
> + gopkg.in/yaml.v2 v2.2.2 \
> + gopkg.in/yaml.v2 v2.2.4
>
> do-build:
> cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} build-quick
[stellarium/qt5] uncaught exception of type std::bad_alloc
astro/stellarium build is now failing on i386: FAILED: translations/stellarium-planetary-features/af.qm cd /pobj/stellarium-0.20.4/build-i386/po/stellarium-planetary-features && /usr/local/lib/qt5/bin/lconvert -i /pobj/stellarium-0.20.4/stellarium-0.20.4/po/stellarium-planetary-features/af.po -o /pobj/stellarium-0.20.4/build-i386/translations/stellarium-planetary-features/af.qm terminating with uncaught exception of type std::bad_alloc: std::bad_alloc Abort trap (core dumped) ninja: build stopped: subcommand failed. Built OK on 20210118 (post libc++ update), failed on 20210121, so I think this must have been following the Qt update.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/01/25 05:52:20 Modified files: net/samba : Makefile Log message: missed bump after databases/tdb commit, missed dep on databases/tdb,-python
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2021/01/25 05:32:15 Modified files: x11/enlightenment: Makefile distinfo Removed files: x11/enlightenment/patches: patch-configure_ac patch-eesh_main_c patch-src_Makefile_am patch-src_sound_c Log message: Update to Enlightenment E16 1.0.22
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org 2021/01/25 04:09:22
Modified files:
devel/ccache/patches: patch-CMakeLists_txt
patch-cmake_GenerateConfigurationFile_cmake
patch-cmake_config_h_in
patch-src_system_hpp
Log message:
ccache: fix the pthread_mutexattr_setpshared check patch ("works" for us
but broken on OS which actually have it). add link to pull request for that.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/01/25 02:39:23 Modified files: geo/pgrouting : Makefile distinfo geo/pgrouting/pkg: PLIST Log message: geo/pgrouting: update to 3.1.3 See https://github.com/pgRouting/pgrouting/releases/tag/v3.1.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: mes...@cvs.openbsd.org 2021/01/25 02:14:28 Modified files: www/youtube-dl : Makefile Log message: bump REVISION due to my previous hiccup prompted by sthen@
