CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/24 00:59:36 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: fix missing , spotted by daniel@, fix typo
Re: mail/sma: -fno-common fix
Theo Buehler writes:
> This is straightforward. I don't have a sendmail setup with logs to test
> this against...
>
> FreeBSD moved all variable definitions from sma.h to sma.c and externed
> them in the header. I decided to move a few of them into init.c since
> they're allocated/initialized there (usually via strdup). They're never
> freed.
OK gnezdo
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/sma/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- Makefile 12 Jul 2019 20:47:38 - 1.10
> +++ Makefile 23 Feb 2021 21:58:56 -
> @@ -4,7 +4,7 @@ COMMENT= Sendmail Log Analysis Report
>
> VERSION= 1.4
> DISTNAME=sma-${VERSION}
> -REVISION=1
> +REVISION=2
> CATEGORIES= mail
>
> HOMEPAGE=http://www.klake.org/sma/
> Index: patches/patch-Makefile
> ===
> RCS file: /cvs/ports/mail/sma/patches/patch-Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-Makefile
> --- patches/patch-Makefile25 Jan 2005 06:57:45 - 1.4
> +++ patches/patch-Makefile23 Feb 2021 22:00:10 -
> @@ -1,8 +1,9 @@
> $OpenBSD: patch-Makefile,v 1.4 2005/01/25 06:57:45 matthieu Exp $
> Makefile.origSat Dec 28 15:38:05 2002
> -+++ Makefile Sun Jan 9 10:26:36 2005
> -@@ -2,12 +2,12 @@
> - # $Id: patch-Makefile,v 1.4 2005/01/25 06:57:45 matthieu Exp $
> +
> +Index: Makefile
> +--- Makefile.orig
> Makefile
> +@@ -3,11 +3,11 @@
> #
>
> -BINDIR = /usr/local/bin
> Index: patches/patch-init_c
> ===
> RCS file: patches/patch-init_c
> diff -N patches/patch-init_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-init_c 23 Feb 2021 21:58:03 -
> @@ -0,0 +1,33 @@
> +$OpenBSD$
> +
> +Fix for -fno-common
> +
> +Index: init.c
> +--- init.c.orig
> init.c
> +@@ -34,6 +34,25 @@
> +
> + int isspace(int);
> +
> ++int pgflag;
> ++const char *bechar;
> ++const char *cfchar;
> ++const char *puchar;
> ++const char *pachar;
> ++const char *plchar;
> ++const char *ppchar;
> ++const char *htchar;
> ++const char *ftchar;
> ++int csflag;
> ++int lrflag;
> ++int rrflag;
> ++int clsflag;
> ++unsigned int stnum;
> ++unsigned int rsnum;
> ++unsigned int rsrnum;
> ++unsigned int epnum;
> ++unsigned int rpnum;
> ++
> + void
> + init(FILE *conf) {
> + char buff[1024];
> Index: patches/patch-sma_c
> ===
> RCS file: patches/patch-sma_c
> diff -N patches/patch-sma_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-sma_c 23 Feb 2021 21:58:00 -
> @@ -0,0 +1,115 @@
> +$OpenBSD$
> +
> +Fix for -fno-common
> +
> +Index: sma.c
> +--- sma.c.orig
> sma.c
> +@@ -34,6 +34,107 @@ extern int sma_optind;
> +
> + #include "sma.h"
> +
> ++/* pointer to program name: */
> ++char *pname;
> ++
> ++/* current time: */
> ++time_t tval;
> ++struct tm *curr;
> ++struct tm tp;
> ++
> ++/*
> ++ * Command line arguments
> ++ * xflag sets argument x on/off
> ++ * xchar is pointer to argument string if x requires an argument
> ++ */
> ++int aflag;
> ++int cflag;
> ++int dflag;
> ++int hflag;
> ++int nflag;
> ++int sflag;
> ++int qflag;
> ++int lflag;
> ++int vflag;
> ++int wflag;
> ++unsigned int lnum;
> ++unsigned int lrnum;
> ++int rflag;
> ++unsigned int rnum;
> ++unsigned int rrnum;
> ++int bflag;
> ++const char *bchar;
> ++int fflag;
> ++const char *fchar;
> ++int oflag;
> ++const char *ochar;
> ++int Lflag;
> ++const char *Lchar;
> ++int Oflag;
> ++const char *Ochar;
> ++int Dflag;
> ++const char *Dchar;
> ++int pflag;
> ++int iflag;
> ++int tflag;
> ++int dcaddrflag;
> ++const char *tchar;
> ++
> ++/* Configuration file parameters: */
> ++int Hflag;
> ++const char *Hchar;
> ++int Cflag;
> ++const char *Cchar;
> ++int Fflag;
> ++const char *tbchar;
> ++
> ++/* Start and end times: */
> ++char *sstring;
> ++char *estring;
> ++char *tstring;
> ++time_t sstime;
> ++time_t eetime;
> ++int syear;
> ++int smonth;
> ++int sday;
> ++int shour;
> ++int sminute;
> ++int ssecond;
> ++int eyear;
> ++int emonth;
> ++int eday;
> ++int ehour;
> ++int eminute;
> ++int esecond;
> ++
> ++/* hash table sizes: */
> ++int asize;
> ++int rsize;
> ++char *hsstring;
> ++char *hastring;
> ++char *hrstring;
> ++
> ++/* Filters */
> ++char *sef;
> ++char *ref;
> ++char *srf;
> ++char *rrf;
> ++#ifdef USE_REGEXP
> ++regex_t csef;
> ++regex_t cref;
> ++regex_t csrf;
> ++regex_t crrf;
> ++#endif
> ++
> ++/* Output file handle: */
> ++FILE *ofp;
> ++
> ++/* total number of hosts: */
> ++int hosts;
> ++
> ++/* inital host structure: */
> ++struct host first;
> ++
> + int
> + main(int argc, char **argv) {
> + FILE *fp = NULL;
> Index: patches/patch-sma_h
> ===
> RCS file: patches/patch-sma_h
> diff -N patches/patch-sma_h
> ---
Re: net/argus-clients: fix for -fno-common
Christian Weisgerber writes: > net/argus-clients: fix for -fno-common > > This removes an unused variable from the static library argus_common.a. > It clashes with one in the raconvert tool. You could argue the latter > one should be renamed instead, but then again, the library variable > isn't referenced anywhere. > > OK? OK gnezdo > > Index: Makefile > === > RCS file: /cvs/ports/net/argus-clients/Makefile,v > retrieving revision 1.18 > diff -u -p -r1.18 Makefile > --- Makefile 20 Mar 2020 16:44:25 - 1.18 > +++ Makefile 23 Feb 2021 21:40:01 - > @@ -3,7 +3,7 @@ > COMMENT =utilities to read and parse Argus data > > DISTNAME = argus-clients-3.0.8.2 > -REVISION = 2 > +REVISION = 3 > CATEGORIES = net > > HOMEPAGE = http://qosient.com/argus/ > Index: patches/patch-common_argus_util_c > === > RCS file: /cvs/ports/net/argus-clients/patches/patch-common_argus_util_c,v > retrieving revision 1.5 > diff -u -p -r1.5 patch-common_argus_util_c > --- patches/patch-common_argus_util_c 12 Aug 2016 21:39:14 - 1.5 > +++ patches/patch-common_argus_util_c 23 Feb 2021 21:40:01 - > @@ -1,7 +1,19 @@ > $OpenBSD: patch-common_argus_util_c,v 1.5 2016/08/12 21:39:14 steven Exp $ > common/argus_util.c.orig Wed Jun 1 21:17:28 2016 > -+++ common/argus_util.c Fri Jun 3 19:23:33 2016 > -@@ -22679,8 +22679,8 @@ ArgusLog (int priority, char *fmt, ...) > + > +First hunk: remove unused variable that clashes with one in raconvert > + > +Index: common/argus_util.c > +--- common/argus_util.c.orig > common/argus_util.c > +@@ -6634,7 +6634,6 @@ ArgusGetIndicatorString (struct ArgusParserStruct *par > + > + > + char argus_strbuf[MAXSTRLEN]; > +-u_short ArgusThisProto; > + > + void > + ArgusPrintSourceID (struct ArgusParserStruct *parser, char *buf, struct > ArgusRecordStruct *argus, int len) > +@@ -22679,8 +22678,8 @@ ArgusLog (int priority, char *fmt, ...) > *tptr++ = buf[i]; >}
Re: net/argus: fix for -fno-common
Christian Weisgerber writes:
> net/argus: fix the build with -fno-common
>
> This is just unused code that is copy-pasted from ArgusUdp.c where
> is also unused.
>
> OK?
OK gnezdo
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/argus/Makefile,v
> retrieving revision 1.25
> diff -u -p -r1.25 Makefile
> --- Makefile 20 Mar 2020 16:44:25 - 1.25
> +++ Makefile 23 Feb 2021 21:37:21 -
> @@ -3,7 +3,7 @@
> COMMENT =Audit Record Generation and Utilization System
>
> DISTNAME = argus-3.0.8.2
> -REVISION = 1
> +REVISION = 2
> CATEGORIES = net
>
> HOMEPAGE = http://qosient.com/argus/
> Index: patches/patch-argus_ArgusUdt_c
> ===
> RCS file: patches/patch-argus_ArgusUdt_c
> diff -N patches/patch-argus_ArgusUdt_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-argus_ArgusUdt_c23 Feb 2021 21:37:21 -
> @@ -0,0 +1,17 @@
> +$OpenBSD$
> +
> +Fix for -fno-common: remove unused variable duplicated in ArgusUdp.c
> +
> +Index: argus/ArgusUdt.c
> +--- argus/ArgusUdt.c.orig
> argus/ArgusUdt.c
> +@@ -40,9 +40,6 @@
> + #include
> + #include
> +
> +-#include
> +-struct bootp *bp;
> +-
> + struct ArgusSystemFlow *
> + ArgusCreateUDTFlow (struct ArgusModelerStruct *model, struct udt_header
> *udt)
> + {
Re: CVS: cvs.openbsd.org: ports
> On Feb 23, 2021, at 7:49 AM, Klemens Nanni wrote: > > CVSROOT:/cvs > Module name:ports > Changes by:k...@cvs.openbsd.org2021/02/23 05:48:54 > > Modified files: >devel : Makefile >devel/quirks : Makefile >devel/quirks/files: Quirks.pm > Removed files: >devel/mk : Makefile distinfo >devel/mk/files : Make.OpenBSD >devel/mk/patches: patch-Makefile >devel/mk/pkg : DESCR PLIST > > Log message: > Remove devel/mk > > Fails with "-fno-common" and upstream HOMEPAGE (equals MASTER_SITES) now > points to https://9fans.github.io/plan9port/unix/ which provides > unversioned tarballs with links to checksums that yield 404; same story > for their manual page links on that page. The GitHub repository does > not contain releases either. > > This is now unportable but there is an up-to-date plan9/plan9port which > packages from the very same upstream (using git commit hashes and dates as > versions) which ships also ships mk(1). > > OK sthen Think Quirks.pm is missing a comma on line 2200 after the quote. perl -c Quirks.pm would show the problem. >
Re: move flask rdeps to py3 only
> On Feb 23, 2021, at 8:08 AM, Lucas Raab wrote: > > Hello, > > Here are the rdeps for Flask all moved to py3-only with the exception > of www/py-httpbin. There ends up being a chain up to www/py-requests > which I haven't looked at yet. > > Did I miss anything in the transition? Committed with a few tweaks. It is customary to bump the quirks package which was missed. “FLAVOR ?= “ should have removed the question mark I saw you removed the version constraints on Sphinx. I put those back in. In one of the ports I reshuffled the makefile slightly to be more standard. > > cc: maintainer of py-pygal > > Thanks, > Lucas >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2021/02/23 19:22:04 Modified files: databases : Makefile graphics : Makefile www: Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm databases/py-flask-sqlalchemy: Makefile databases/py-flask-sqlalchemy/pkg: PLIST graphics/py-pygal: Makefile graphics/py-pygal/pkg: PLIST www/py-flask-login: Makefile www/py-flask-login/pkg: PLIST www/py-flask-wtf: Makefile www/py-flask-wtf/pkg: PLIST www/py-wtforms : Makefile www/py-wtforms/pkg: PLIST Log message: switch a few flask ports over to python3 from Lucas Raab with tweaks from me
Re: [MAINTAINER UPDATE] graphics/openimageio -> 2.2.11.1
> On Feb 23, 2021, at 4:17 AM, Dimitri Karamazov > wrote: > > On Mon, Feb 22, 2021 at 01:28:26AM -0500, Daniel Dickman wrote: >> >> >>> On Mon, 22 Feb 2021, Rafael Sadowski wrote: >>> > > Bump for a new release. >>> >>> Still OK for me but we need to import robin-map first. A second OK is >>> needed. >>> >> >> Where is the port for robin-map? Can someone resend it? > > Avoid the previous diff as there is a mistake and the robin-map > port has been attached at the very end. What are the cmake files that are installed needed for?
Re: Remove devel/mk
On Tue, Feb 23, 2021 at 04:36:49PM +0100, Klemens Nanni wrote: > On Tue, Feb 23, 2021 at 11:59:12PM +1100, Jonathan Gray wrote: > > devel/mk was also the only use of > > > > devel/libfmt > > devel/libbio > > devel/libregexp9 > > devel/libutf > Correct, those we can tackle now; I had not yet checked their relation > to plan9/plan9port. > > Only libbio and libregexp9 seem to be part of plan9port, i.e. > > $ pkg_info -L plan9port | egrep 'lib/lib(fmt|bio|regexp9|utf)' > /usr/local/plan9/lib/libbio.a > /usr/local/plan9/lib/libregexp9.a libfmt and libutf are part of lib9 in plan9port and libc in plan 9. > > Due to the dependencies between those ports we can only only delete all > of them as far as I can tell. > > They all build but it is doubtworthy whether anyone uses them. > > None of them have seen any updates since import in 2003 and it's the > story with upstream not providing any versions. > > OK to remove those? I think so, perhaps markus can confirm?
Updated devel/remake to remake-4.3+dbg-1.5 [-fno-common]
The installed package produced believable output in own pobj.
OK?
Subject: [PATCH] Updated devel/remake to remake-4.3+dbg-1.5 [-fno-common]
Slightly massaged patches from:
https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d3f45f6f1ac0dbe8d987af727a0f7445cd30048
Passes all tests:
653 Tests in 124 Categories Complete ... No Failures :-)
---
devel/remake/Makefile | 15
devel/remake/distinfo | 4 +-
devel/remake/patches/patch-glob_glob_h| 37 ---
devel/remake/patches/patch-src_dbg_cmd_c | 27 --
.../patches/patch-src_debugger_file2line_c| 18 +
.../patches/patch-src_debugger_file2line_h| 16
devel/remake/patches/patch-src_dep_h | 16
devel/remake/patches/patch-src_globals_h | 21 +++
devel/remake/patches/patch-src_main_c | 16
devel/remake/patches/patch-src_main_h | 18 +
devel/remake/patches/patch-src_make_h | 16
devel/remake/patches/patch-src_print_h| 16
devel/remake/patches/patch-src_variable_c | 15
devel/remake/patches/patch-src_variable_h | 15
.../patch-tests_scripts_debugger_trace| 11 --
15 files changed, 176 insertions(+), 85 deletions(-)
delete mode 100644 devel/remake/patches/patch-glob_glob_h
delete mode 100644 devel/remake/patches/patch-src_dbg_cmd_c
create mode 100644 devel/remake/patches/patch-src_debugger_file2line_c
create mode 100644 devel/remake/patches/patch-src_debugger_file2line_h
create mode 100644 devel/remake/patches/patch-src_dep_h
create mode 100644 devel/remake/patches/patch-src_globals_h
create mode 100644 devel/remake/patches/patch-src_main_c
create mode 100644 devel/remake/patches/patch-src_main_h
create mode 100644 devel/remake/patches/patch-src_make_h
create mode 100644 devel/remake/patches/patch-src_print_h
create mode 100644 devel/remake/patches/patch-src_variable_c
create mode 100644 devel/remake/patches/patch-src_variable_h
delete mode 100644 devel/remake/patches/patch-tests_scripts_debugger_trace
diff --git a/devel/remake/Makefile b/devel/remake/Makefile
index 7828c24801c..b44e1ce5a80 100644
--- a/devel/remake/Makefile
+++ b/devel/remake/Makefile
@@ -2,9 +2,8 @@
COMMENT= GNU make debugger
-PKGNAME= remake-0.61p0
-DISTNAME= remake-3.80+dbg-0.61
-REVISION= 2
+PKGNAME= remake-1.5
+DISTNAME= remake-4.3+dbg-1.5
CATEGORIES=devel
@@ -18,11 +17,11 @@ WANTLIB += c curses readline
CONFIGURE_STYLE= gnu
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/src/make ${PREFIX}/bin/remake
- ${INSTALL_MAN} ${WRKSRC}/make.1 ${PREFIX}/man/man1/remake.1
+# The test suite expects to find SHELL.
+MAKE_ENV +=SHELL=/bin/ksh
-pre-test:
- rm -f ${WRKSRC}/tests/scripts/debugger/trace.orig
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/make ${PREFIX}/bin/remake
+ ${INSTALL_MAN} ${WRKSRC}/doc/make.1 ${PREFIX}/man/man1/remake.1
.include
diff --git a/devel/remake/distinfo b/devel/remake/distinfo
index 6c1cc5e4114..90ea338cfdc 100644
--- a/devel/remake/distinfo
+++ b/devel/remake/distinfo
@@ -1,2 +1,2 @@
-SHA256 (remake-3.80+dbg-0.61.tar.gz) =
WFbqUR+HUoSltUIF33e2eCKkmv+ns67rpCecBuZXcfo=
-SIZE (remake-3.80+dbg-0.61.tar.gz) = 139
+SHA256 (remake-4.3+dbg-1.5.tar.gz) =
Lm63CfPmuFiT8U8V40tMm3VKzq7wuSu2yjoCXxARnXY=
+SIZE (remake-4.3+dbg-1.5.tar.gz) = 2546056
diff --git a/devel/remake/patches/patch-glob_glob_h
b/devel/remake/patches/patch-glob_glob_h
deleted file mode 100644
index c37b4c4cc9c..000
--- a/devel/remake/patches/patch-glob_glob_h
+++ /dev/null
@@ -1,37 +0,0 @@
-$OpenBSD: patch-glob_glob_h,v 1.1.1.1 2006/12/26 18:16:09 deanna Exp $
glob/glob.h.orig Sat Dec 16 22:41:12 2006
-+++ glob/glob.hSat Dec 16 22:41:27 2006
-@@ -33,33 +33,6 @@
- # define __ptr_t char *
- #endif /* C++ or ANSI C. */
-
--/* We need `size_t' for the following definitions. */
--#ifndef __size_t
--# if defined __FreeBSD__
--# define __size_t size_t
--# else
--# if defined __GNUC__ && __GNUC__ >= 2
--typedef __SIZE_TYPE__ __size_t;
--# else
--/* This is a guess. */
--/*hb
-- *Conflicts with DECCs aready defined type __size_t.
-- *Defining an own type with a name beginning with '__' is no good.
-- *Anyway if DECC is used and __SIZE_T is defined then __size_t is
-- *already defined (and I hope it's exactly the one we need here).
-- */
--# if !(defined __DECC && defined __SIZE_T)
--typedef unsigned long int __size_t;
--# endif
--# endif
--# endif
--#else
--/* The GNU CC stddef.h version defines __size_t as empty. We need a real
-- definition. */
--# undef __size_t
--# define __size_t size_t
--#endif
--
- /* Bits set in the FLAGS argument to `glob'. */
- #define GLOB_ERR(1 << 0)/* Return on read errors. */
- #define
Re: Update libtool
Stuart Henderson writes: > On 2021/02/23 15:25, Stuart Henderson wrote: >> I'll do some testing, I'm using this updated diff > > Oh yuk, gnu m4 is now needed at runtime for libtoolize. > Is there a way around that? This is probably from - GNU M4 is required to run libtoolize in a directory with a 'configure.ac' (or 'configure.in') that needs tracing to determine what modes and directories have been specified. But unfortunately I have no idea how to avoid it, sorry. Maybe libtoolize could be on its own sub package and only that depends on m4? Cheers, Rafael
Re: [update] Redis 6.2.0
On Tue, 23 Feb 2021 17:21:46 +0100, Theo Buehler
wrote:
> So danj conned me into looking at Redis again...
Thank you so much!
> I replaced some lua related patches with sed + CFLAGS and dropped two
> hunks in our diff to deps/Makefile which tended to produce conflicts.
Awesome!
> I also decided to move the server and the sentinel from sbin to bin to
> avoid some Makefile patching that conflicted more than once (the new
> symlinks would have added complexity to that hunk).
Yeah f those patches. I spent too much time on this conflicts.
Index: patches/patch-src_zmalloc_c
> ===
> RCS file: patches/patch-src_zmalloc_c
> diff -N patches/patch-src_zmalloc_c
Can we go instead with upstream diff (since we're going to run it
sooner or later)?
$OpenBSD$
Backport from upstream:
https://github.com/redis/redis/pull/8533/commits/cdfa9601d7b374b3ef6859a4c093046ad331f903
Index: src/zmalloc.c
--- src/zmalloc.c.orig
+++ src/zmalloc.c
@@ -32,6 +32,7 @@
#include
#include
#include
+#include
/* This function provide us access to the original libc free(). This is useful
* for instance to free results obtained by backtrace_symbols(). We need
@@ -49,18 +50,14 @@ void zlibc_free(void *ptr) {
#ifdef HAVE_MALLOC_SIZE
#define PREFIX_SIZE (0)
+#define ASSERT_NO_SIZE_OVERFLOW(sz)
#else
#if defined(__sun) || defined(__sparc) || defined(__sparc__)
#define PREFIX_SIZE (sizeof(long long))
#else
#define PREFIX_SIZE (sizeof(size_t))
#endif
-#endif
-
-#if PREFIX_SIZE > 0
#define ASSERT_NO_SIZE_OVERFLOW(sz) assert((sz) + PREFIX_SIZE > (sz))
-#else
-#define ASSERT_NO_SIZE_OVERFLOW(sz)
#endif
/* Explicitly override malloc/free etc when using tcmalloc. */
(ftp -o /usr/ports/databases/redis/patches/patch-src_zmalloc_c
https://static.chown.me/private/paste/e89b08cfaa638fd0c8a424a382ecd6cd9a60639473053314ca65553ee3eb4072
if it helps)
ok danj@ either way
Cheers,
Daniel
Re: Remove x11/golem?
On Wed, Feb 24, 2021 at 12:09:16AM +0100, Christian Weisgerber wrote: > x11/golem is an old window manager. This is another port that is > broken by -fno-common. > > Our port is at version 0.0.5, which is 19 years old. When you start > it, there is a spew of errors about undefined symbols and the plugins > can't be loaded. I don't think anybody uses this. > > There is a newer development version 0.0.6 on Sourceforge. It's > from 2007. It relies on an included copy of complib, which is > Linux-only. > > FreeBSD somehow had a port of 0.0.6, but they deleted it in 2019: > BROKEN= All plugins fail to load with Undefined symbol "display" > DEPRECATED= Broken for more than 6 months > BROKEN_aarch64= fails to link: can't create dynamic relocation > R_AARCH64_ADR_PREL_PG_HI21 against symbol: display in readonly segment > > Does anybody want to fix this? No? > Remove it? Yes, let's remove this. ok aja -- Antoine
Re: Remove x11/golem?
On Wed, Feb 24, 2021 at 12:09:16AM +0100, Christian Weisgerber wrote: > Remove it? OK kn
Remove x11/golem?
x11/golem is an old window manager. This is another port that is broken by -fno-common. Our port is at version 0.0.5, which is 19 years old. When you start it, there is a spew of errors about undefined symbols and the plugins can't be loaded. I don't think anybody uses this. There is a newer development version 0.0.6 on Sourceforge. It's from 2007. It relies on an included copy of complib, which is Linux-only. FreeBSD somehow had a port of 0.0.6, but they deleted it in 2019: BROKEN= All plugins fail to load with Undefined symbol "display" DEPRECATED= Broken for more than 6 months BROKEN_aarch64= fails to link: can't create dynamic relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol: display in readonly segment Does anybody want to fix this? No? Remove it? -- Christian "naddy" Weisgerber na...@mips.inka.de
mail/sma: -fno-common fix
This is straightforward. I don't have a sendmail setup with logs to test
this against...
FreeBSD moved all variable definitions from sma.h to sma.c and externed
them in the header. I decided to move a few of them into init.c since
they're allocated/initialized there (usually via strdup). They're never
freed.
Index: Makefile
===
RCS file: /cvs/ports/mail/sma/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile12 Jul 2019 20:47:38 - 1.10
+++ Makefile23 Feb 2021 21:58:56 -
@@ -4,7 +4,7 @@ COMMENT=Sendmail Log Analysis Report
VERSION= 1.4
DISTNAME= sma-${VERSION}
-REVISION= 1
+REVISION= 2
CATEGORIES=mail
HOMEPAGE= http://www.klake.org/sma/
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/mail/sma/patches/patch-Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile
--- patches/patch-Makefile 25 Jan 2005 06:57:45 - 1.4
+++ patches/patch-Makefile 23 Feb 2021 22:00:10 -
@@ -1,8 +1,9 @@
$OpenBSD: patch-Makefile,v 1.4 2005/01/25 06:57:45 matthieu Exp $
Makefile.orig Sat Dec 28 15:38:05 2002
-+++ Makefile Sun Jan 9 10:26:36 2005
-@@ -2,12 +2,12 @@
- # $Id: patch-Makefile,v 1.4 2005/01/25 06:57:45 matthieu Exp $
+
+Index: Makefile
+--- Makefile.orig
Makefile
+@@ -3,11 +3,11 @@
#
-BINDIR = /usr/local/bin
Index: patches/patch-init_c
===
RCS file: patches/patch-init_c
diff -N patches/patch-init_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-init_c23 Feb 2021 21:58:03 -
@@ -0,0 +1,33 @@
+$OpenBSD$
+
+Fix for -fno-common
+
+Index: init.c
+--- init.c.orig
init.c
+@@ -34,6 +34,25 @@
+
+ int isspace(int);
+
++int pgflag;
++const char *bechar;
++const char *cfchar;
++const char *puchar;
++const char *pachar;
++const char *plchar;
++const char *ppchar;
++const char *htchar;
++const char *ftchar;
++int csflag;
++int lrflag;
++int rrflag;
++int clsflag;
++unsigned int stnum;
++unsigned int rsnum;
++unsigned int rsrnum;
++unsigned int epnum;
++unsigned int rpnum;
++
+ void
+ init(FILE *conf) {
+ char buff[1024];
Index: patches/patch-sma_c
===
RCS file: patches/patch-sma_c
diff -N patches/patch-sma_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-sma_c 23 Feb 2021 21:58:00 -
@@ -0,0 +1,115 @@
+$OpenBSD$
+
+Fix for -fno-common
+
+Index: sma.c
+--- sma.c.orig
sma.c
+@@ -34,6 +34,107 @@ extern int sma_optind;
+
+ #include "sma.h"
+
++/* pointer to program name: */
++char *pname;
++
++/* current time: */
++time_t tval;
++struct tm *curr;
++struct tm tp;
++
++/*
++ * Command line arguments
++ * xflag sets argument x on/off
++ * xchar is pointer to argument string if x requires an argument
++ */
++int aflag;
++int cflag;
++int dflag;
++int hflag;
++int nflag;
++int sflag;
++int qflag;
++int lflag;
++int vflag;
++int wflag;
++unsigned int lnum;
++unsigned int lrnum;
++int rflag;
++unsigned int rnum;
++unsigned int rrnum;
++int bflag;
++const char *bchar;
++int fflag;
++const char *fchar;
++int oflag;
++const char *ochar;
++int Lflag;
++const char *Lchar;
++int Oflag;
++const char *Ochar;
++int Dflag;
++const char *Dchar;
++int pflag;
++int iflag;
++int tflag;
++int dcaddrflag;
++const char *tchar;
++
++/* Configuration file parameters: */
++int Hflag;
++const char *Hchar;
++int Cflag;
++const char *Cchar;
++int Fflag;
++const char *tbchar;
++
++/* Start and end times: */
++char *sstring;
++char *estring;
++char *tstring;
++time_t sstime;
++time_t eetime;
++int syear;
++int smonth;
++int sday;
++int shour;
++int sminute;
++int ssecond;
++int eyear;
++int emonth;
++int eday;
++int ehour;
++int eminute;
++int esecond;
++
++/* hash table sizes: */
++int asize;
++int rsize;
++char *hsstring;
++char *hastring;
++char *hrstring;
++
++/* Filters */
++char *sef;
++char *ref;
++char *srf;
++char *rrf;
++#ifdef USE_REGEXP
++regex_t csef;
++regex_t cref;
++regex_t csrf;
++regex_t crrf;
++#endif
++
++/* Output file handle: */
++FILE *ofp;
++
++/* total number of hosts: */
++int hosts;
++
++/* inital host structure: */
++struct host first;
++
+ int
+ main(int argc, char **argv) {
+ FILE *fp = NULL;
Index: patches/patch-sma_h
===
RCS file: patches/patch-sma_h
diff -N patches/patch-sma_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-sma_h 23 Feb 2021 21:58:24 -
@@ -0,0 +1,229 @@
+$OpenBSD$
+
+Fix for -fno-common
+
+Index: sma.h
+--- sma.h.orig
sma.h
+@@ -55,102 +55,102 @@
+ #define FORMAT_CLOG 5
+
+ /* pointer to program name: */
+-char *pname;
++extern char *pname;
+
+ /* current time: */
+-time_t tval;
+-struct tm *curr;
+-struct tm tp;
++extern time_t tval;
++extern struct tm *curr;
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org 2021/02/23 15:04:35
Modified files:
lang/python: python.port.mk
www/kore : Makefile
security/sudo : Makefile
devel/subversion: Makefile
net/toxic : Makefile
editors/libreoffice: Makefile
emulators/qemu : Makefile
fonts/terminus-font: Makefile
graphics/sane-backends: Makefile
net/flow-tools : Makefile
net/isc-bind : Makefile
net/openconnect: Makefile
sysutils/u-boot: Makefile
Log message:
automatically handle ports which use the python module and have flavours
other than the usual "python3/" python version selection and
remove setting MODPY_VERSION=${MODPY_DEFAULT_VERSION_3} again from the
affected ports.
Re: Update libtool
On 2021/02/23 21:33, Stuart Henderson wrote: > On 2021/02/23 15:25, Stuart Henderson wrote: > > I'll do some testing, I'm using this updated diff > > Oh yuk, gnu m4 is now needed at runtime for libtoolize. > Is there a way around that? Also requires help2man as a BUILD_DEPENDS (but that's not so bad).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/23 14:45:50 Modified files: www/kore : Makefile security/sudo : Makefile devel/subversion: Makefile net/toxic : Makefile editors/libreoffice: Makefile emulators/qemu : Makefile fonts/terminus-font: Makefile graphics/sane-backends: Makefile net/flow-tools : Makefile net/isc-bind : Makefile net/openconnect: Makefile sysutils/u-boot: Makefile Log message: ports which use the python module and have flavours other than the usual "python3/" python version selection still require setting MODPY_VERSION for now.
net/argus-clients: fix for -fno-common
net/argus-clients: fix for -fno-common This removes an unused variable from the static library argus_common.a. It clashes with one in the raconvert tool. You could argue the latter one should be renamed instead, but then again, the library variable isn't referenced anywhere. OK? Index: Makefile === RCS file: /cvs/ports/net/argus-clients/Makefile,v retrieving revision 1.18 diff -u -p -r1.18 Makefile --- Makefile20 Mar 2020 16:44:25 - 1.18 +++ Makefile23 Feb 2021 21:40:01 - @@ -3,7 +3,7 @@ COMMENT = utilities to read and parse Argus data DISTNAME = argus-clients-3.0.8.2 -REVISION = 2 +REVISION = 3 CATEGORIES = net HOMEPAGE = http://qosient.com/argus/ Index: patches/patch-common_argus_util_c === RCS file: /cvs/ports/net/argus-clients/patches/patch-common_argus_util_c,v retrieving revision 1.5 diff -u -p -r1.5 patch-common_argus_util_c --- patches/patch-common_argus_util_c 12 Aug 2016 21:39:14 - 1.5 +++ patches/patch-common_argus_util_c 23 Feb 2021 21:40:01 - @@ -1,7 +1,19 @@ $OpenBSD: patch-common_argus_util_c,v 1.5 2016/08/12 21:39:14 steven Exp $ common/argus_util.c.orig Wed Jun 1 21:17:28 2016 -+++ common/argus_util.cFri Jun 3 19:23:33 2016 -@@ -22679,8 +22679,8 @@ ArgusLog (int priority, char *fmt, ...) + +First hunk: remove unused variable that clashes with one in raconvert + +Index: common/argus_util.c +--- common/argus_util.c.orig common/argus_util.c +@@ -6634,7 +6634,6 @@ ArgusGetIndicatorString (struct ArgusParserStruct *par + + + char argus_strbuf[MAXSTRLEN]; +-u_short ArgusThisProto; + + void + ArgusPrintSourceID (struct ArgusParserStruct *parser, char *buf, struct ArgusRecordStruct *argus, int len) +@@ -22679,8 +22678,8 @@ ArgusLog (int priority, char *fmt, ...) *tptr++ = buf[i]; } -- Christian "naddy" Weisgerber na...@mips.inka.de
net/argus: fix for -fno-common
net/argus: fix the build with -fno-common
This is just unused code that is copy-pasted from ArgusUdp.c where
is also unused.
OK?
Index: Makefile
===
RCS file: /cvs/ports/net/argus/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile20 Mar 2020 16:44:25 - 1.25
+++ Makefile23 Feb 2021 21:37:21 -
@@ -3,7 +3,7 @@
COMMENT = Audit Record Generation and Utilization System
DISTNAME = argus-3.0.8.2
-REVISION = 1
+REVISION = 2
CATEGORIES = net
HOMEPAGE = http://qosient.com/argus/
Index: patches/patch-argus_ArgusUdt_c
===
RCS file: patches/patch-argus_ArgusUdt_c
diff -N patches/patch-argus_ArgusUdt_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-argus_ArgusUdt_c 23 Feb 2021 21:37:21 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix for -fno-common: remove unused variable duplicated in ArgusUdp.c
+
+Index: argus/ArgusUdt.c
+--- argus/ArgusUdt.c.orig
argus/ArgusUdt.c
+@@ -40,9 +40,6 @@
+ #include
+ #include
+
+-#include
+-struct bootp *bp;
+-
+ struct ArgusSystemFlow *
+ ArgusCreateUDTFlow (struct ArgusModelerStruct *model, struct udt_header *udt)
+ {
--
Christian "naddy" Weisgerber na...@mips.inka.de
Re: Update libtool
On 2021/02/23 15:25, Stuart Henderson wrote:
> I'll do some testing, I'm using this updated diff
Oh yuk, gnu m4 is now needed at runtime for libtoolize.
Is there a way around that?
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/libtool/Makefile,v
> retrieving revision 1.85
> diff -u -p -r1.85 Makefile
> --- Makefile 12 Jul 2019 20:44:40 - 1.85
> +++ Makefile 23 Feb 2021 15:22:13 -
> @@ -3,12 +3,10 @@
> COMMENT-main=generic shared library support script
> COMMENT-ltdl=GNU libtool system independent dlopen wrapper
>
> -VERSION= 2.4.2
> +VERSION= 2.4.6
> DISTNAME=libtool-${VERSION}
> PKGNAME-main=${DISTNAME}
> PKGNAME-ltdl=libltdl-${VERSION}
> -REVISION-main= 0
> -REVISION-ltdl= 1
> CATEGORIES= devel
> MASTER_SITES=${MASTER_SITE_GNU:=libtool/}
>
> @@ -21,8 +19,9 @@ MAINTAINER= Brad Smith # GPLv2+
> PERMIT_PACKAGE= Yes
>
> -AUTOCONF_VERSION= 2.67
> -BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS}
> +AUTOCONF_VERSION= 2.69
> +BUILD_DEPENDS= devel/m4
> +TEST_DEPENDS=${MODGNU_AUTOCONF_DEPENDS}
>
> MAKE_ENV+= ${_lt_libs}
> MAKE_FLAGS+= ${_lt_libs}
> @@ -45,6 +44,8 @@ RUN_DEPENDS-main= devel/libtool,-ltdl
>
> pre-configure:
> @cd ${WRKDIR}/bin && ln -sf /usr/bin/true g77
> + cd ${WRKSRC}; \
> + touch -r .version Makefile.in aclocal.m4 m4/ltversion.m4 configure
>
> do-test:
> @cd ${WRKDIR}/bin && ln -sf \
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/libtool/distinfo,v
> retrieving revision 1.16
> diff -u -p -r1.16 distinfo
> --- distinfo 18 Jan 2015 03:13:17 - 1.16
> +++ distinfo 23 Feb 2021 15:22:13 -
> @@ -1,2 +1,2 @@
> -SHA256 (libtool-2.4.2.tar.gz) = s43kSGKphyk809jfrhxAnVFLbE55TryTZI/r+a/DiRg=
> -SIZE (libtool-2.4.2.tar.gz) = 2632347
> +SHA256 (libtool-2.4.6.tar.gz) = 471NXT0CWjbCHdavfqgYoq/NTfwepaF7OdeFS80MBuM=
> +SIZE (libtool-2.4.6.tar.gz) = 1806697
> Index: patches/patch-doc_libtool_texi
> ===
> RCS file: /cvs/ports/devel/libtool/patches/patch-doc_libtool_texi,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-doc_libtool_texi
> --- patches/patch-doc_libtool_texi22 Sep 2011 21:10:19 - 1.4
> +++ patches/patch-doc_libtool_texi23 Feb 2021 15:22:13 -
> @@ -1,11 +1,12 @@
> $OpenBSD: patch-doc_libtool_texi,v 1.4 2011/09/22 21:10:19 jasper Exp $
> doc/libtool.texi.origWed Jun 8 11:04:53 2011
> -+++ doc/libtool.texi Wed Jun 8 11:05:44 2011
> -@@ -11,16 +11,16 @@
> - @set MAILLIST the Libtool mailing list @email{libtool@@gnu.org}
> - @set objdir .libs
> +Index: doc/libtool.texi
> +--- doc/libtool.texi.orig
> doc/libtool.texi
> +@@ -30,15 +30,15 @@ and with no Back-Cover Texts. A copy of the license i
> + the section entitled ``GNU Free Documentation License''.
> + @end copying
>
> --@dircategory GNU programming tools
> +-@dircategory Software development
> +@dircategory Programming & development tools
> @direntry
> * Libtool: (libtool). Generic shared library support script.
> @@ -13,11 +14,10 @@ $OpenBSD: patch-doc_libtool_texi,v 1.4 2
>
> @dircategory Individual utilities
> @direntry
> --* libtool-invocation: (libtool)Invoking libtool.
> -+* libtool-invocation: (libtool) Invoking libtool.
> - Running the @code{libtool}
> script.
> --* libtoolize: (libtool)Invoking libtoolize. Adding libtool support.
> -+* libtoolize: (libtool) Invoking libtoolize. Adding libtool support.
> +-* libtool-invocation: (libtool)Invoking libtool. Running the @code{libtool}
> script.
> +-* libtoolize: (libtool)Invoking libtoolize. Adding libtool support.
> ++* libtool-invocation: (libtool) Invoking libtool. Running the
> @code{libtool} script.
> ++* libtoolize: (libtool) Invoking libtoolize. Adding libtool
> support.
> @end direntry
>
> - @ifnottex
> + @titlepage
> Index: patches/patch-libltdl_config_ltmain_sh
> ===
> RCS file: /cvs/ports/devel/libtool/patches/patch-libltdl_config_ltmain_sh,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-libltdl_config_ltmain_sh
> --- patches/patch-libltdl_config_ltmain_sh1 Nov 2011 16:07:31 -
> 1.2
> +++ patches/patch-libltdl_config_ltmain_sh23 Feb 2021 15:22:13 -
> @@ -1,9 +1,11 @@
> -$OpenBSD: patch-libltdl_config_ltmain_sh,v 1.2 2011/11/01 16:07:31 jasper
> Exp $
> libltdl/config/ltmain.sh.origMon Oct 17 06:19:35 2011
> -+++ libltdl/config/ltmain.sh Sat Oct 29 07:05:47 2011
> -@@ -2714,51 +2714,6 @@ func_mode_finish ()
> +$OpenBSD$
> +
> +Index: build-aux/ltmain.sh
> +--- build-aux/ltmain.sh.orig
> build-aux/ltmain.sh
> +@@ -4033,51 +4033,6 @@ func_mode_finish ()
> # Exit here
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/23 13:55:02 Modified files: lang/python: python.port.mk Log message: fix for unflavoured py3 ports
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/23 13:44:38 Modified files: lang/python: python.port.mk Log message: oops, I deleted a line by mistake before committing this. unbreak the tree.
Re: portgen following MODPY_VERSION flip
On 2021/02/23 15:32, Kurt Mosiejczuk wrote: > On Tue, Feb 23, 2021 at 07:59:34PM +, Stuart Henderson wrote: > > Here's a first cut at fixing python version handling in portgen > > now the default has changed to MODPY_DEFAULT_VERSION_3. > > > For a port with just a py3 version it currently uses > > > FLAVORS = python3 > > FLAVOR ?= python3 > > > It ought to use > > > FLAVORS = python3 > > FLAVOR =python3 > > > but I can't figure out where it's deciding to use ?= instead of =. > > Does anyone see where that's coming from? > > I have a vague recollection that the "=" versus "?=" thing is handled in > some of the support libraries above the language-specific stuff. Oh...it copies it from /usr/ports/infrastructure/templates/Makefile.template Hm
Re: portgen following MODPY_VERSION flip
On Tue, Feb 23, 2021 at 07:59:34PM +, Stuart Henderson wrote:
> Here's a first cut at fixing python version handling in portgen
> now the default has changed to MODPY_DEFAULT_VERSION_3.
> For a port with just a py3 version it currently uses
> FLAVORS = python3
> FLAVOR ?= python3
> It ought to use
> FLAVORS = python3
> FLAVOR = python3
> but I can't figure out where it's deciding to use ?= instead of =.
> Does anyone see where that's coming from?
I have a vague recollection that the "=" versus "?=" thing is handled in
some of the support libraries above the language-specific stuff.
--Kurt
>
> Index: infrastructure/lib/OpenBSD/PortGen/Port/PyPI.pm
> ===
> RCS file: /cvs/ports/infrastructure/lib/OpenBSD/PortGen/Port/PyPI.pm,v
> retrieving revision 1.19
> diff -u -p -r1.19 PyPI.pm
> --- infrastructure/lib/OpenBSD/PortGen//Port/PyPI.pm 30 Apr 2020 23:04:48
> - 1.19
> +++ infrastructure/lib/OpenBSD/PortGen//Port/PyPI.pm 23 Feb 2021 19:54:18
> -
> @@ -115,15 +115,20 @@ sub fill_in_makefile
> };
>
> if ( @versions > 1 ) {
> + # XXX needs more when there's something other than just 2+3
> shift @versions;# remove default, lowest
> $self->{reset_values}{MODPY_VERSION} = 1;
> $self->set_other( 'FLAVORS', "python$_" ) for @versions;
> $self->set_other( 'FLAVOR', "python$versions[-1]" );
> - } elsif ( @versions && $versions[0] != 2 ) {
> + } elsif ( @versions && $versions[0] == 2 ) {
> $self->{reset_values}{$_} = 1 for qw( FLAVORS FLAVOR );
> $self->set_other(
> MODPY_VERSION => "\${MODPY_DEFAULT_VERSION_$_}" )
> for @versions;
> + } else {
> + $self->{reset_values}{MODPY_VERSION} = 1;
> + $self->set_other( 'FLAVORS', "python$_" ) for @versions;
> + $self->set_other( 'FLAVOR', "python$versions[-1]" );
> }
> }
>
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2021/02/23 13:06:01 Modified files: net/weex : Makefile distinfo net/weex/patches: patch-configure_in net/weex/pkg : PLIST Added files: net/weex/patches: patch-Makefile_am patch-po_fr_po Removed files: net/weex/patches: patch-aclocal_m4 patch-po_Makefile_in_in patch-src_Makefile_in patch-src_log_c Log message: net/weex: update to 2.8.3, which also fixes the build with -fno-common With some guidance from the FreeBSD port how to wrangle the incoherent autotool files into buildable shape.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2021/02/23 13:03:29 Modified files: graphics/gimp/liquid-rescale: Makefile distinfo graphics/gimp/liquid-rescale/pkg: PLIST Added files: graphics/gimp/liquid-rescale/patches: patch-src_interface_I_c patch-src_interface_aux_c Log message: graphics/gimp/liquid-rescale: update to 0.7.2 and fix build with -fno-common Update to maintenance release 0.7.2. Regen WANTLIB and PLIST. Take unreleased -fno-common fixes from upstream repository. ok espie@ who had a subset of this
portgen following MODPY_VERSION flip
Here's a first cut at fixing python version handling in portgen
now the default has changed to MODPY_DEFAULT_VERSION_3.
For a port with just a py3 version it currently uses
FLAVORS = python3
FLAVOR ?= python3
It ought to use
FLAVORS = python3
FLAVOR =python3
but I can't figure out where it's deciding to use ?= instead of =.
Does anyone see where that's coming from?
Index: infrastructure/lib/OpenBSD/PortGen/Port/PyPI.pm
===
RCS file: /cvs/ports/infrastructure/lib/OpenBSD/PortGen/Port/PyPI.pm,v
retrieving revision 1.19
diff -u -p -r1.19 PyPI.pm
--- infrastructure/lib/OpenBSD/PortGen//Port/PyPI.pm30 Apr 2020 23:04:48
- 1.19
+++ infrastructure/lib/OpenBSD/PortGen//Port/PyPI.pm23 Feb 2021 19:54:18
-
@@ -115,15 +115,20 @@ sub fill_in_makefile
};
if ( @versions > 1 ) {
+ # XXX needs more when there's something other than just 2+3
shift @versions;# remove default, lowest
$self->{reset_values}{MODPY_VERSION} = 1;
$self->set_other( 'FLAVORS', "python$_" ) for @versions;
$self->set_other( 'FLAVOR', "python$versions[-1]" );
- } elsif ( @versions && $versions[0] != 2 ) {
+ } elsif ( @versions && $versions[0] == 2 ) {
$self->{reset_values}{$_} = 1 for qw( FLAVORS FLAVOR );
$self->set_other(
MODPY_VERSION => "\${MODPY_DEFAULT_VERSION_$_}" )
for @versions;
+ } else {
+ $self->{reset_values}{MODPY_VERSION} = 1;
+ $self->set_other( 'FLAVORS', "python$_" ) for @versions;
+ $self->set_other( 'FLAVOR', "python$versions[-1]" );
}
}
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/23 12:39:53 Modified files: archivers/py-backports-lzma: Makefile archivers/py-lzo: Makefile astro/py-metar : Makefile astro/stellarium: Makefile audio/audacity : Makefile audio/beets: Makefile audio/cplay: Makefile audio/curseradio: Makefile audio/ffmpeg-normalize: Makefile audio/libsndfile: Makefile audio/mkplaylist: Makefile audio/picard : Makefile audio/pithos : Makefile audio/puddletag: Makefile audio/py-ao: Makefile audio/py-cddb : Makefile audio/py-eyed3 : Makefile audio/pykaraoke: Makefile audio/quodlibet: Makefile audio/rgain: Makefile audio/rhythmbox: Makefile audio/schismtracker: Makefile audio/snack: Makefile audio/solfege : Makefile audio/sonata : Makefile audio/speech-dispatcher: Makefile audio/xmms2: Makefile audio/yt-audio : Makefile benchmarks/netperf-wrapper: Makefile benchmarks/speedtest-cli: Makefile benchmarks/tsung: Makefile cad/dxf2gcode : Makefile cad/kicad : Makefile cad/netgen : Makefile cad/openscad : Makefile cad/qflow : Makefile cad/yosys : Makefile comms/chirp: Makefile comms/gnuradio : Makefile comms/hamlib : Makefile comms/pterm: Makefile comms/py-gammu : Makefile comms/sigrok/libsigrok: Makefile comms/sigrok/libsigrokdecode: Makefile comms/wammu: Makefile converters/libpst: Makefile converters/opencc: Makefile converters/recode: Makefile converters/unoconv: Makefile databases/barman: Makefile databases/evolution-data-server: Makefile databases/kdb : Makefile databases/kexi : Makefile databases/libpqxx: Makefile databases/mongodb: Makefile databases/mysql-utilities: Makefile databases/pgloader: Makefile databases/postgresql: Makefile databases/postgresql-previous: Makefile databases/py-pg_activity: Makefile databases/py-sqlite: Makefile databases/py-sqlite2: Makefile databases/py-storm: Makefile databases/py-sybase: Makefile databases/recoll: Makefile databases/skytools: Makefile databases/tdb : Makefile databases/web2ldap: Makefile databases/xapian-bindings: Makefile devel/angr : Makefile.inc devel/arduino-esp32: Makefile devel/arduino-esp8266: Makefile devel/arduino-makefile: Makefile devel/arm-none-eabi/gdb: Makefile devel/automake/1.10: Makefile devel/automake/1.11: Makefile devel/automake/1.12: Makefile devel/automake/1.13: Makefile devel/automake/1.14: Makefile devel/automake/1.15: Makefile devel/automake/1.16: Makefile devel/automake/1.9: Makefile devel/boost: Makefile devel/bzr : Makefile devel/bzr-svn : Makefile devel/cabal-install: Makefile devel/catch2 : Makefile devel/clang-tools-extra: Makefile devel/cmake: Makefile devel/coccigrep: Makefile devel/coccinelle: Makefile devel/cppcheck : Makefile devel/cutter : Makefile devel/cvs-fast-export: Makefile devel/cvs20hg : Makefile devel/cvs2gitdump: Makefile devel/cvs2svn : Makefile devel/dissy: Makefile devel/distcc : Makefile devel/doxygen : Makefile devel/doxygen-gui: Makefile devel/electron : Makefile devel/flake8 : Makefile devel/flawfinder: Makefile devel/gconf2 : Makefile devel/gdb : Makefile devel/git : Makefile devel/git-cola : Makefile devel/git-cvs : Makefile devel/github-backup: Makefile devel/glade: Makefile devel/glib2: Makefile devel/gobject-introspection: Makefile devel/goopy: Makefile devel/gyp : Makefile devel/include-what-you-use: Makefile devel/iso-codes: Makefile devel/jsoncpp : Makefile devel/kdevelop : Makefile devel/keystone/main: Makefile devel/kf5/extra-cmake-modules: Makefile devel/kf5/kapidox: Makefile devel/kf5/kdelibs4support: Makefile devel/kf5/kdesu: Makefile devel/kf5/kfilemetadata: Makefile devel/kf5/ki18n: Makefile devel/kproperty: Makefile devel/leatherman: Makefile devel/legit: Makefile devel/libcdada :
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: js...@cvs.openbsd.org 2021/02/23 10:32:57 Modified files: lang/go: Makefile distinfo Log message: Switch lang/go on i386 to use a binary bootstrap. This allows us to build with GO386=softfloat. Discussed with abieber@ and sthen@
shotcut-20.07.11 fix for blank file dialog/chooser windows
I had problems with all the file|open dialog windows in Shotcut, the video editing application. I would get an empty window instead of a file chooser and the application would hang with a GtkDialog error in its log, followed by other gtk errors. I am running openbsd 6.8 with fvwm, and had installed shotcut-20.07.11 using pkg_add. I was able to fix this by installing the qt5ct package and setting the environment variable QT_QPA_PLATFORMTHEME to "qt5ct". I got the idea for this fix from someone who appears to have had the same gtk errors in a different application also running on openbsd, https://github.com/qgis/QGIS/issues/25720 I'm not knowledgeable enough to troubleshoot this further, but thought to pass this fix along in case it might help anyone else. Mike
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2021/02/23 09:37:54 Modified files: sysutils/apachetop: Makefile distinfo Log message: Update for Apachetop to 0.19.7 OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2021/02/23 09:29:14 Modified files: emulators/libretro-genesis-plus-gx: Makefile distinfo emulators/libretro-genesis-plus-gx/patches: patch-Makefile_libretro emulators/libretro-genesis-plus-gx/pkg: PLIST Removed files: emulators/libretro-genesis-plus-gx/patches: patch-core_loadrom_c Log message: Update to latest libretro-genesis-plus-gx GitHub commit Fixes -fno-common issues. OK bentley@
Re: Update libtool
Stuart Henderson writes: > On 2021/02/23 07:44, Rafael Ávila de Espíndola wrote: >> Thanks! >> >> I see that you added >> >> touch -r .version Makefile.in aclocal.m4 m4/ltversion.m4 configure >> >> Which I assume is to prevent make from trying to recreate those files. I >> also see that you upgraded autoconf: > > Yes, it happens because the timestamps in the distfile were out of order. > I added -dm to MAKE_FLAGS while I was figuring this out. None of the > patches in the port touch autoconf/automake input files so this is ok. > >> AUTOCONF_VERSION= 2.69 >> >> But given the "touch", is autoconf still needed? > > It's needed for tests, I moved it to TEST_DEPENDS as well. (I made sure > that those still work when libtool is configured/built with autoconf > not present). > > Re AUTOCONF_VERSION, I checked the version of the bundled generated > configure script and set the same, this is usually the best method for > ports. Makes sense. Thanks for the tips. Cheers, Rafael
[update] Redis 6.2.0
So danj conned me into looking at Redis again...
This is a major upgrade from the 6.0 branch, but as the releaese notes
put it:
Redis 6.2 includes many new commands and improvements, but no big features. It
mainly makes Redis more complete and addresses issues that have been requested
by many users frequently or for a long time.
Details: https://github.com/redis/redis/blob/6.2/00-RELEASENOTES
Especially:
* Command behavior changes
* Other behavior changes
ILP32 arches have a buffer overflow due to missing checks in zmalloc.c
which are addressed in this release. Unfortunately, I needed add a patch
because their fix doesn't compile with USE_JEMALLOC=no. Upstream will
include a similar fix to mine in a subsequent release.
I replaced some lua related patches with sed + CFLAGS and dropped two
hunks in our diff to deps/Makefile which tended to produce conflicts.
I also decided to move the server and the sentinel from sbin to bin to
avoid some Makefile patching that conflicted more than once (the new
symlinks would have added complexity to that hunk).
The port still patches a lot more than I would like it to.
I ran tests on amd64 and sparc64.
Index: Makefile
===
RCS file: /cvs/ports/databases/redis/Makefile,v
retrieving revision 1.118
diff -u -p -r1.118 Makefile
--- Makefile23 Jan 2021 14:58:19 - 1.118
+++ Makefile23 Feb 2021 16:19:53 -
@@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.118 2021/01/23 14:58:19 danj Exp $
COMMENT = persistent key-value database
-DISTNAME = redis-6.0.10
+
+DISTNAME = redis-6.2.0
CATEGORIES = databases
HOMEPAGE = https://redis.io/
@@ -30,6 +31,8 @@ MAKE_FLAGS = BUILD_TLS=yes \
OPTIMIZATION="" \
V=1
+CFLAGS += -I${MODLUA_INCL_DIR}
+
# Fix "undefined reference to `__atomic_store_8'"
.if ${MACHINE_ARCH:Mhppa}
WANTLIB += atomic
@@ -49,12 +52,15 @@ TEST_FLAGS =TCL_BIN="${MODTCL_BIN}"
DBDIR =${VARBASE}/redis
SUBST_VARS += DBDIR
-pre-configure:
+post-patch:
cp ${WRKSRC}/deps/lua/src/fpconv.? ${WRKSRC}/src/
cp ${WRKSRC}/deps/lua/src/strbuf.? ${WRKSRC}/src/
cp ${WRKSRC}/deps/lua/src/lua_*.c ${WRKSRC}/src/
- rm -rf ${WRKSRC}/deps/jemalloc
- rm -rf ${WRKSRC}/deps/lua
+ sed -i -E 's/^#include "(lua|lauxlib)\.h"/#include <\1.h>/' \
+ ${WRKSRC}/src/lua_*.c
+ unifdef -x 1 -m -DENABLE_CJSON_GLOBAL ${WRKSRC}/src/lua_cjson.c
+
+pre-configure:
${SUBST_CMD} ${WRKSRC}/src/Makefile
post-install:
Index: distinfo
===
RCS file: /cvs/ports/databases/redis/distinfo,v
retrieving revision 1.92
diff -u -p -r1.92 distinfo
--- distinfo23 Jan 2021 14:58:19 - 1.92
+++ distinfo23 Feb 2021 14:54:34 -
@@ -1,2 +1,2 @@
-SHA256 (redis-6.0.10.tar.gz) = ebu4lPnc6zPKaZ7jykpOEii+f7VUeusvmdkh6GwShb0=
-SIZE (redis-6.0.10.tar.gz) = 2271970
+SHA256 (redis-6.2.0.tar.gz) = Z9Ykwl2WK9aK/4gSoTXfhbrQdVa4gl87zVtSKpky28o=
+SIZE (redis-6.2.0.tar.gz) = 2435539
Index: patches/patch-deps_Makefile
===
RCS file: /cvs/ports/databases/redis/patches/patch-deps_Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 patch-deps_Makefile
--- patches/patch-deps_Makefile 8 Jun 2020 07:32:47 - 1.12
+++ patches/patch-deps_Makefile 23 Feb 2021 14:38:37 -
@@ -1,17 +1,9 @@
$OpenBSD: patch-deps_Makefile,v 1.12 2020/06/08 07:32:47 tb Exp $
+
Index: deps/Makefile
--- deps/Makefile.orig
+++ deps/Makefile
-@@ -35,8 +35,6 @@ endif
- distclean:
- -(cd hiredis && $(MAKE) clean) > /dev/null || true
- -(cd linenoise && $(MAKE) clean) > /dev/null || true
-- -(cd lua && $(MAKE) clean) > /dev/null || true
-- -(cd jemalloc && [ -f Makefile ] && $(MAKE) distclean) > /dev/null ||
true
- -(rm -f .make-*)
-
- .PHONY: distclean
-@@ -46,42 +44,11 @@ ifeq ($(BUILD_TLS),yes)
+@@ -47,19 +47,16 @@ ifeq ($(BUILD_TLS),yes)
endif
hiredis: .make-prerequisites
@@ -25,32 +17,9 @@ Index: deps/Makefile
cd linenoise && $(MAKE)
.PHONY: linenoise
--
--ifeq ($(uname_S),SunOS)
-- # Make isinf() available
-- LUA_CFLAGS= -D__C99FEATURES__=1
--endif
--
--LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC=''
$(CFLAGS)
--LUA_LDFLAGS+= $(LDFLAGS)
--# lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
--# challenging to cross-compile lua (and redis). These defines make it easier
--# to fit redis into cross-compilation environments, which typically set AR.
--AR=ar
--ARFLAGS=rcu
--
--lua: .make-prerequisites
-- @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
-- cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)"
MYLDFLAGS="$(LUA_LDFLAGS)"
Re: [update] net/sniproxy -> 0.6.2
On Sat, 20 Feb 2021 10:40:30 +0100 Renaud Allard : > Hello, > > net/sniproxy has numerous fixes that have been committed to the original > project but never included in a release. Amongst them, an fd leak, an > use after free, etc. The original developer doesn't seem very interested > in making releases anymore. Therefore, I forked the project and made a > release which includes all the patches. This also allows to remove all > the local OpenBSD patches within that port. I might also add some > features which are currently in the proposed pull requests. > Here is the diff, what do you think? > > Thank you This is fine to me, it's not possible to use the current project with latest commit because of many pull requests that are left abandoned and unmerged... If no one has objection for this, I'll commit this soon. Renaud, you better have to keep it updated as you will be upstream now :)
Re: Update libtool
On 2021/02/23 07:44, Rafael Ávila de Espíndola wrote: > Thanks! > > I see that you added > > touch -r .version Makefile.in aclocal.m4 m4/ltversion.m4 configure > > Which I assume is to prevent make from trying to recreate those files. I > also see that you upgraded autoconf: Yes, it happens because the timestamps in the distfile were out of order. I added -dm to MAKE_FLAGS while I was figuring this out. None of the patches in the port touch autoconf/automake input files so this is ok. > AUTOCONF_VERSION= 2.69 > > But given the "touch", is autoconf still needed? It's needed for tests, I moved it to TEST_DEPENDS as well. (I made sure that those still work when libtool is configured/built with autoconf not present). Re AUTOCONF_VERSION, I checked the version of the bundled generated configure script and set the same, this is usually the best method for ports.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/23 08:45:05 Modified files: lang/go: Makefile Log message: add a "native_bootstrap" pseudo-flavour, similar to jdk's, allowing build with an existing installed go package. tweak/ok jsing@
Re: Update libtool
Thanks!
I see that you added
touch -r .version Makefile.in aclocal.m4 m4/ltversion.m4 configure
Which I assume is to prevent make from trying to recreate those files. I
also see that you upgraded autoconf:
AUTOCONF_VERSION= 2.69
But given the "touch", is autoconf still needed?
Thanks,
Rafael
Stuart Henderson writes:
> I'll do some testing, I'm using this updated diff
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/libtool/Makefile,v
> retrieving revision 1.85
> diff -u -p -r1.85 Makefile
> --- Makefile 12 Jul 2019 20:44:40 - 1.85
> +++ Makefile 23 Feb 2021 15:22:13 -
> @@ -3,12 +3,10 @@
> COMMENT-main=generic shared library support script
> COMMENT-ltdl=GNU libtool system independent dlopen wrapper
>
> -VERSION= 2.4.2
> +VERSION= 2.4.6
> DISTNAME=libtool-${VERSION}
> PKGNAME-main=${DISTNAME}
> PKGNAME-ltdl=libltdl-${VERSION}
> -REVISION-main= 0
> -REVISION-ltdl= 1
> CATEGORIES= devel
> MASTER_SITES=${MASTER_SITE_GNU:=libtool/}
>
> @@ -21,8 +19,9 @@ MAINTAINER= Brad Smith # GPLv2+
> PERMIT_PACKAGE= Yes
>
> -AUTOCONF_VERSION= 2.67
> -BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS}
> +AUTOCONF_VERSION= 2.69
> +BUILD_DEPENDS= devel/m4
> +TEST_DEPENDS=${MODGNU_AUTOCONF_DEPENDS}
>
> MAKE_ENV+= ${_lt_libs}
> MAKE_FLAGS+= ${_lt_libs}
> @@ -45,6 +44,8 @@ RUN_DEPENDS-main= devel/libtool,-ltdl
>
> pre-configure:
> @cd ${WRKDIR}/bin && ln -sf /usr/bin/true g77
> + cd ${WRKSRC}; \
> + touch -r .version Makefile.in aclocal.m4 m4/ltversion.m4 configure
>
> do-test:
> @cd ${WRKDIR}/bin && ln -sf \
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/libtool/distinfo,v
> retrieving revision 1.16
> diff -u -p -r1.16 distinfo
> --- distinfo 18 Jan 2015 03:13:17 - 1.16
> +++ distinfo 23 Feb 2021 15:22:13 -
> @@ -1,2 +1,2 @@
> -SHA256 (libtool-2.4.2.tar.gz) = s43kSGKphyk809jfrhxAnVFLbE55TryTZI/r+a/DiRg=
> -SIZE (libtool-2.4.2.tar.gz) = 2632347
> +SHA256 (libtool-2.4.6.tar.gz) = 471NXT0CWjbCHdavfqgYoq/NTfwepaF7OdeFS80MBuM=
> +SIZE (libtool-2.4.6.tar.gz) = 1806697
> Index: patches/patch-doc_libtool_texi
> ===
> RCS file: /cvs/ports/devel/libtool/patches/patch-doc_libtool_texi,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-doc_libtool_texi
> --- patches/patch-doc_libtool_texi22 Sep 2011 21:10:19 - 1.4
> +++ patches/patch-doc_libtool_texi23 Feb 2021 15:22:13 -
> @@ -1,11 +1,12 @@
> $OpenBSD: patch-doc_libtool_texi,v 1.4 2011/09/22 21:10:19 jasper Exp $
> doc/libtool.texi.origWed Jun 8 11:04:53 2011
> -+++ doc/libtool.texi Wed Jun 8 11:05:44 2011
> -@@ -11,16 +11,16 @@
> - @set MAILLIST the Libtool mailing list @email{libtool@@gnu.org}
> - @set objdir .libs
> +Index: doc/libtool.texi
> +--- doc/libtool.texi.orig
> doc/libtool.texi
> +@@ -30,15 +30,15 @@ and with no Back-Cover Texts. A copy of the license i
> + the section entitled ``GNU Free Documentation License''.
> + @end copying
>
> --@dircategory GNU programming tools
> +-@dircategory Software development
> +@dircategory Programming & development tools
> @direntry
> * Libtool: (libtool). Generic shared library support script.
> @@ -13,11 +14,10 @@ $OpenBSD: patch-doc_libtool_texi,v 1.4 2
>
> @dircategory Individual utilities
> @direntry
> --* libtool-invocation: (libtool)Invoking libtool.
> -+* libtool-invocation: (libtool) Invoking libtool.
> - Running the @code{libtool}
> script.
> --* libtoolize: (libtool)Invoking libtoolize. Adding libtool support.
> -+* libtoolize: (libtool) Invoking libtoolize. Adding libtool support.
> +-* libtool-invocation: (libtool)Invoking libtool. Running the @code{libtool}
> script.
> +-* libtoolize: (libtool)Invoking libtoolize. Adding libtool support.
> ++* libtool-invocation: (libtool) Invoking libtool. Running the
> @code{libtool} script.
> ++* libtoolize: (libtool) Invoking libtoolize. Adding libtool
> support.
> @end direntry
>
> - @ifnottex
> + @titlepage
> Index: patches/patch-libltdl_config_ltmain_sh
> ===
> RCS file: /cvs/ports/devel/libtool/patches/patch-libltdl_config_ltmain_sh,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-libltdl_config_ltmain_sh
> --- patches/patch-libltdl_config_ltmain_sh1 Nov 2011 16:07:31 -
> 1.2
> +++ patches/patch-libltdl_config_ltmain_sh23 Feb 2021 15:22:13 -
> @@ -1,9 +1,11 @@
> -$OpenBSD: patch-libltdl_config_ltmain_sh,v 1.2 2011/11/01 16:07:31 jasper
> Exp $
> libltdl/config/ltmain.sh.origMon Oct 17 06:19:35 2011
> -+++ libltdl/config/ltmain.sh Sat Oct 29 07:05:47 2011
> -@@ -2714,51
Re: Remove devel/mk
On Tue, Feb 23, 2021 at 11:59:12PM +1100, Jonathan Gray wrote: > devel/mk was also the only use of > > devel/libfmt > devel/libbio > devel/libregexp9 > devel/libutf Correct, those we can tackle now; I had not yet checked their relation to plan9/plan9port. Only libbio and libregexp9 seem to be part of plan9port, i.e. $ pkg_info -L plan9port | egrep 'lib/lib(fmt|bio|regexp9|utf)' /usr/local/plan9/lib/libbio.a /usr/local/plan9/lib/libregexp9.a Due to the dependencies between those ports we can only only delete all of them as far as I can tell. They all build but it is doubtworthy whether anyone uses them. None of them have seen any updates since import in 2003 and it's the story with upstream not providing any versions. OK to remove those?
Re: Update libtool
I'll do some testing, I'm using this updated diff
Index: Makefile
===
RCS file: /cvs/ports/devel/libtool/Makefile,v
retrieving revision 1.85
diff -u -p -r1.85 Makefile
--- Makefile12 Jul 2019 20:44:40 - 1.85
+++ Makefile23 Feb 2021 15:22:13 -
@@ -3,12 +3,10 @@
COMMENT-main= generic shared library support script
COMMENT-ltdl= GNU libtool system independent dlopen wrapper
-VERSION= 2.4.2
+VERSION= 2.4.6
DISTNAME= libtool-${VERSION}
PKGNAME-main= ${DISTNAME}
PKGNAME-ltdl= libltdl-${VERSION}
-REVISION-main= 0
-REVISION-ltdl= 1
CATEGORIES=devel
MASTER_SITES= ${MASTER_SITE_GNU:=libtool/}
@@ -21,8 +19,9 @@ MAINTAINER= Brad Smith
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2021/02/23 08:16:14 Modified files: net/munin : Makefile distinfo Log message: update to munin-2.0.67
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/02/23 07:48:13 Modified files: www/firefox-esr: Tag: OPENBSD_6_8 Makefile distinfo Log message: www/firefox-esr: MFC update to 78.8.0. See https://www.mozilla.org/en-US/firefox/78.8.0/releasenotes/ Fixes https://www.mozilla.org/en-US/security/advisories/mfsa2021-08/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/02/23 07:47:53 Modified files: www/firefox-esr: Makefile distinfo www/firefox-esr-i18n: Makefile.inc distinfo Removed files: www/firefox-esr/patches: patch-Cargo_toml Log message: www/firefox-esr: update to 78.8.0. See https://www.mozilla.org/en-US/firefox/78.8.0/releasenotes/ Fixes https://www.mozilla.org/en-US/security/advisories/mfsa2021-08/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/02/23 07:46:30 Modified files: www/mozilla-firefox: Makefile distinfo www/mozilla-firefox/patches: patch-dom_ipc_ContentChild_cpp patch-widget_nsPrintSettingsImpl_cpp www/firefox-i18n: Makefile.inc distinfo Added files: www/mozilla-firefox/patches: patch-mozglue_misc_Uptime_cpp Removed files: www/mozilla-firefox/patches: patch-Cargo_toml Log message: www/mozilla-firefox: update to 86.0. See https://www.mozilla.org/en-US/firefox/86.0/releasenotes/ Fixes https://www.mozilla.org/en-US/security/advisories/mfsa2021-07/ - drop patch-Cargo_toml, was from upstream in #1684261 - add patch from #1686405 to fix the build on non-tier1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/23 07:40:58 Modified files: textproc/solr : Makefile distinfo Log message: update to solr-8.8.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/23 07:30:05 Modified files: graphics/ffmpeg: Makefile distinfo x11/mplayer: Makefile Removed files: graphics/ffmpeg/patches: patch-libavcodec_x86_h264_deblock_asm patch-libavfilter_x86_vf_blend_asm patch-libavutil_x86_x86inc_asm patch-libswscale_x86_yuv_2_rgb_asm Log message: update to FFmpeg 4.3.2, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/23 07:29:03 Modified files: databases/mariadb: Makefile distinfo databases/mariadb/patches: patch-mysys_crc32_crc32c_cc databases/mariadb/pkg: PLIST-tests Removed files: databases/mariadb/patches: patch-mysys_CMakeLists_txt patch-storage_oqgraph_CMakeLists_txt patch-unittest_mysys_stacktrace-t_c Log message: update to MariaDB 10.5.9, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/23 07:27:33 Modified files: mail/dovecot : Makefile Added files: mail/dovecot/patches: patch-src_plugins_fts_decode2text_sh Log message: Dovecot tweaks: depend on libstemmer/libexttextcat to build snowball filters, fix paths to tools (pdftotext, etc) in decode2text.sh which can optionally be used to index attachments. OK Brad.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/02/23 07:24:40 Modified files: graphics/openjp2: Makefile distinfo graphics/openjp2/patches: patch-CMakeLists_txt graphics/openjp2/pkg: PLIST Log message: graphics/openjp2: update to 2.4.0. See https://github.com/uclouvain/openjpeg/blob/v2.4.0/NEWS.md#openjpeg-240-december-2021 Went in an amd64 bulk without issues, gdal & Pillow seem to be happy with it. ok ajacoutot@
Re: [MAINTAINER UPDATE] graphics/openimageio -> 2.2.11.1
On Mon, Feb 22, 2021 at 01:28:26AM -0500, Daniel Dickman wrote:
>
>
> On Mon, 22 Feb 2021, Rafael Sadowski wrote:
>
> > >
> > > Bump for a new release.
> >
> > Still OK for me but we need to import robin-map first. A second OK is
> > needed.
> >
>
> Where is the port for robin-map? Can someone resend it?
Avoid the previous diff as there is a mistake and the robin-map
port has been attached at the very end.
Index: Makefile
===
RCS file: /cvs/ports/graphics/openimageio/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- Makefile23 Jan 2021 12:46:26 - 1.50
+++ Makefile22 Feb 2021 15:29:57 -
@@ -8,13 +8,11 @@ COMMENT = library for reading and writi
GH_ACCOUNT = OpenImageIO
GH_PROJECT = oiio
GH_TAGNAME = Release-$V
-V =2.2.10.0
-ROBIN_VER =0.6.2
+V =2.2.11.1
DISTNAME = openimageio-${V}
-REVISION = 0
-SHARED_LIBS += OpenImageIO 8.0 # 2.2.10
-SHARED_LIBS += OpenImageIO_Util4.0 # 2.2.10
+SHARED_LIBS += OpenImageIO 9.0 # 2.2.11
+SHARED_LIBS += OpenImageIO_Util5.0 # 2.2.11
CATEGORIES = graphics devel
@@ -34,11 +32,6 @@ WANTLIB += boost_filesystem-mt boost_sys
WANTLIB += bz2 c freetype gif intl jpeg m openjp2 png pugixml
WANTLIB += raw_r swscale tiff util webp webpdemux z
-MASTER_SITES0 =https://github.com/Tessil/robin-map/
-
-DISTFILES =${DISTNAME}.tar.gz \
- robin-map-{archive/v}${ROBIN_VER}.tar.gz:0
-
MODULES = devel/cmake \
lang/python \
x11/qt5
@@ -48,8 +41,9 @@ MODPY_VERSION = ${MODPY_DEFAULT_VERSION
COMPILER = base-clang ports-gcc
BUILD_DEPENDS =devel/fmt \
- textproc/txt2man \
- devel/py-pybind11${MODPY_FLAVOR}
+ devel/py-pybind11${MODPY_FLAVOR} \
+ devel/robin-map \
+ textproc/txt2man
LIB_DEPENDS = devel/boost \
graphics/ffmpeg \
@@ -64,11 +58,13 @@ LIB_DEPENDS = devel/boost \
textproc/pugixml
CONFIGURE_ARGS += -DCMAKE_INSTALL_MANDIR="man/man1" \
+
-DCMAKE_LIBRARY_PATH="${WRKBUILD}/lib:${CMAKE_LIBRARY_PATH}" \
-DSTOP_ON_WARNING=OFF \
-DUSE_CCACHE=OFF \
- -DUSE_DICOM=OFF \
+ -DDCMTK_FOUND=OFF \
-DUSE_EXTERNAL_PUGIXML=ON \
-DUSE_OPENCV=OFF \
+ -DUSE_OPENVDB=OFF \
-DUSE_HDF5=OFF \
-DUSE_LIBHEIF=OFF \
-Dpybind11_DIR=${MODPY_SITEPKG}/pybind11/share/cmake/pybind11/
@@ -78,10 +74,6 @@ CONFIGURE_ARGS +=-DCMAKE_INSTALL_MANDIR
CONFIGURE_ENV += LDFLAGS="${LDFLAGS} -latomic"
WANTLIB += atomic
.endif
-
-post-extract:
- mkdir ${WRKSRC}/ext
- cp -r ${WRKDIR}/robin-map-${ROBIN_VER} ${WRKSRC}/ext/robin-map
post-install:
find ${PREFIX} -name '*.orig' -delete
Index: distinfo
===
RCS file: /cvs/ports/graphics/openimageio/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo5 Jan 2021 20:53:18 - 1.10
+++ distinfo22 Feb 2021 15:29:57 -
@@ -1,4 +1,2 @@
-SHA256 (openimageio-2.2.10.0.tar.gz) =
28Dj6XGEl9n3HqAfsd6Lh0SXda2dvOpNJTjZxSu+HVo=
-SHA256 (robin-map-0.6.2.tar.gz) = wI7Esb8chesNZDIkSmqJhiIp2hy4NPP5D7qNw12MjvE=
-SIZE (openimageio-2.2.10.0.tar.gz) = 29215970
-SIZE (robin-map-0.6.2.tar.gz) = 63782
+SHA256 (openimageio-2.2.11.1.tar.gz) =
EgFw6FF9iRH1Kw+1bxTrVqrYjt1yzJ5LLjXHQCUpO30=
+SIZE (openimageio-2.2.11.1.tar.gz) = 29250377
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/openimageio/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST 5 Jan 2021 20:53:18 - 1.11
+++ pkg/PLIST 22 Feb 2021 15:29:57 -
@@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.11 2021/01/05 20:53:18 jca Exp $
-@conflict idiff-*
+@comment $OpenBSD: PLIST,v$
@bin bin/iconvert
@bin bin/idiff
@bin bin/igrep
@@ -70,7 +69,7 @@ lib/cmake/OpenImageIO/OpenImageIOTargets
@lib lib/libOpenImageIO.so.${LIBOpenImageIO_VERSION}
@lib lib/libOpenImageIO_Util.so.${LIBOpenImageIO_Util_VERSION}
lib/pkgconfig/OpenImageIO.pc
-lib/python${MODPY_VERSION}/site-packages/OpenImageIO.so.8.0
+lib/python${MODPY_VERSION}/site-packages/OpenImageIO.${MODPY_PYC_MAGIC_TAG}so.9.0
@man man/man1/iconvert.1
@man man/man1/idiff.1
@man man/man1/igrep.1
robin-map.tar.gz
Description: Binary data
move flask rdeps to py3 only
Hello,
Here are the rdeps for Flask all moved to py3-only with the exception
of www/py-httpbin. There ends up being a chain up to www/py-requests
which I haven't looked at yet.
Did I miss anything in the transition?
cc: maintainer of py-pygal
Thanks,
Lucas
diff 91da35285afbebf06da96cfbe031b710b83c4904 /usr/ports
blob - 441e289d3cf1b64e4ac5e950640b5bba6f8a1f3c
file + databases/Makefile
--- databases/Makefile
+++ databases/Makefile
@@ -158,7 +158,6 @@
SUBDIR += py-bsddb3
SUBDIR += py-bsddb3,python3
SUBDIR += py-carbon
- SUBDIR += py-flask-sqlalchemy
SUBDIR += py-flask-sqlalchemy,python3
SUBDIR += py-influxdb,python3
SUBDIR += py-ldap,python3
blob - ef63a0397a65e883cb2443cd98f0db942b3ee733
file + databases/py-flask-sqlalchemy/Makefile
--- databases/py-flask-sqlalchemy/Makefile
+++ databases/py-flask-sqlalchemy/Makefile
@@ -5,7 +5,7 @@ COMMENT = sqlalchemy support for flask
MODPY_EGG_VERSION = 2.4.1
DISTNAME = Flask-SQLAlchemy-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME:L}
-REVISION = 0
+REVISION = 1
CATEGORIES = databases www
@@ -19,7 +19,7 @@ MODPY_PI =Yes
MODULES = lang/python
FLAVORS = python3
-FLAVOR ?=
+FLAVOR ?= python3
MODPY_SETUPTOOLS = Yes
MODPY_PYTEST = Yes
blob - cae8a93eececf04bdac8947e2ed4e4f96c3a3c66
file + databases/py-flask-sqlalchemy/pkg/PLIST
--- databases/py-flask-sqlalchemy/pkg/PLIST
+++ databases/py-flask-sqlalchemy/pkg/PLIST
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.4 2019/12/30 13:04:17 sthen Exp $
+@conflict py-flask-sqlalchemy-*
+@pkgpath databases/py-flask-sqlalchemy
lib/python${MODPY_VERSION}/site-packages/Flask_SQLAlchemy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/Flask_SQLAlchemy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/Flask_SQLAlchemy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
blob - f65bf00abf54fe4d71500d2d91512eb7496573c8
file + devel/quirks/files/Quirks.pm
--- devel/quirks/files/Quirks.pm
+++ devel/quirks/files/Quirks.pm
@@ -584,6 +584,11 @@ my $stem_extensions = {
'py-dot' => 'py3-dot',
'py-last' => 'py3-last',
'py-flask-principal' => 'py3-flask-principal',
+ 'py-flask-sqlalchemy' => 'py3-flask-sqlalchemy',
+ 'py-flask-login' => 'py3-flask-login',
+ 'py-flask-wtf' => 'py3-flask-wtf',
+ 'py-pygal' => 'py3-pygal',
+ 'py-wtforms' => 'py3-wtforms',
};
my $obsolete_reason = {
blob - fa5a7d4cada5cee7bc45a84e43130bdd99c850b1
file + graphics/Makefile
--- graphics/Makefile
+++ graphics/Makefile
@@ -249,7 +249,6 @@
SUBDIR += py-cycler
SUBDIR += py-cycler,python3
SUBDIR += py-dot,python3
- SUBDIR += py-pygal
SUBDIR += py-pygal,python3
SUBDIR += py-imageio,python3
SUBDIR += py-imagesize,python3
blob - bb38269e329fced722e693d053a37b12a1142d2f
file + graphics/py-pygal/Makefile
--- graphics/py-pygal/Makefile
+++ graphics/py-pygal/Makefile
@@ -5,7 +5,7 @@ COMMENT = python svg graph plotting library
MODPY_EGG_VERSION = 2.4.0
DISTNAME = pygal-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 1
+REVISION = 2
CATEGORIES = graphics
@@ -19,7 +19,7 @@ MODPY_PI =Yes
MODPY_SETUPTOOLS = Yes
FLAVORS = python3
-FLAVOR ?=
+FLAVOR ?= python3
BUILD_DEPENDS += devel/py-test-runner${MODPY_FLAVOR}
blob - a33f01bcfb2fccc948ab20e58bc8f6690c0608f1
file + graphics/py-pygal/pkg/PLIST
--- graphics/py-pygal/pkg/PLIST
+++ graphics/py-pygal/pkg/PLIST
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2019/03/16 06:17:50 semarie Exp $
+@conflict py-pygal-*
+@pkgpath graphics/py-pygal
@comment bin/pygal_gen.py
lib/python${MODPY_VERSION}/site-packages/pygal/
lib/python${MODPY_VERSION}/site-packages/pygal-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
blob - 48db665b351321068dd9884b546fadf2a048ba5c
file + www/Makefile
--- www/Makefile
+++ www/Makefile
@@ -442,10 +442,8 @@
SUBDIR += py-flask
SUBDIR += py-flask,python3
SUBDIR += py-flask-cors
- SUBDIR += py-flask-login
SUBDIR += py-flask-login,python3
SUBDIR += py-flask-principal,python3
- SUBDIR += py-flask-wtf
SUBDIR += py-flask-wtf,python3
SUBDIR += py-flup
SUBDIR += py-flup,python3
@@ -529,7 +527,6 @@
SUBDIR += py-werkzeug
SUBDIR += py-werkzeug,python3
SUBDIR += py-wsgiproxy
- SUBDIR += py-wtforms
SUBDIR += py-wtforms,python3
SUBDIR += py-wstools
SUBDIR += py-wstools,python3
blob - 2a8a79240e17c8cb6e1e00483c578cb4ea9a71f1
file + www/py-flask-login/Makefile
--- www/py-flask-login/Makefile
+++ www/py-flask-login/Makefile
@@ -5,7 +5,7 @@ COMMENT = user session management for flask
MODPY_EGG_VERSION =0.4.1
DISTNAME = Flask-Login-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME:L}
-REVISION = 2
+REVISION =
Re: Remove devel/mk
On Tue, Feb 23, 2021 at 12:50:55PM +0100, Klemens Nanni wrote: > Fails with "-fno-common" and Upstream HOMEPAGE (equals MASTER_SITES) now > points to https://9fans.github.io/plan9port/unix/ which provides > unversioned tarballs with links to checksums that yield 404; same story > for their manual page links on that page. The GitHub repository does > not contain releases either. > > So devel/mk is now unportable due to upstream, but we have an > up-to-date plan9/plan9port which packages from the very same upstream > repo (using GH_COMMIT and dates as DISTNAME versions, it seems) which > ships > /usr/local/plan9/bin/mk > /usr/local/plan9/man/man1/mk.1 > /usr/local/plan9/unix/man/mk.1 > > OK to remove? > I'd just point at plan9/plan9port in the `obsolete_reason' and not do > any merging as that port contains much more and mk(1) lives somewhere > else entirely anyway. devel/mk was also the only use of devel/libfmt devel/libbio devel/libregexp9 devel/libutf
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/02/23 05:48:54 Modified files: devel : Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm Removed files: devel/mk : Makefile distinfo devel/mk/files : Make.OpenBSD devel/mk/patches: patch-Makefile devel/mk/pkg : DESCR PLIST Log message: Remove devel/mk Fails with "-fno-common" and upstream HOMEPAGE (equals MASTER_SITES) now points to https://9fans.github.io/plan9port/unix/ which provides unversioned tarballs with links to checksums that yield 404; same story for their manual page links on that page. The GitHub repository does not contain releases either. This is now unportable but there is an up-to-date plan9/plan9port which packages from the very same upstream (using git commit hashes and dates as versions) which ships also ships mk(1). OK sthen
Re: UPDATE: Apachetop-0.19.7
On 2021/02/23 11:45, Gonzalo L. Rodriguez wrote:
> Hello,
>
> Little update for Apachetop to 0.19.7.
>
> Cheers.-
>
> --
>
>%gonzalo
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/apachetop/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- Makefile 12 Jul 2019 20:49:39 - 1.15
> +++ Makefile 22 Feb 2021 09:29:38 -
> @@ -2,10 +2,9 @@
>
> COMMENT =top-like monitor for Apache
>
> -V = 0.18.4
> +V = 0.19.7
> DISTNAME = apachetop-$V
> CATEGORIES = sysutils
> -REVISION = 0
>
> MAINTAINER = Gonzalo L. R.
>
> @@ -21,7 +20,8 @@ COMPILER = base-clang ports-gcc base-gc
> MASTER_SITES =
> https://github.com/tessus/apachetop/releases/download/$V/
>
> CONFIGURE_STYLE =gnu
> -
> +CONFIGURE_ENV = NCURSES_CFLAGS='-L${LOCALBASE}/lib' \
*hmm* that doesn't exactly make sense. maybe this to avoid someone
trying to figure out why it's looking for ncurses in the wrong dir?
(-L would be for LDFLAGS anyway..)
# requires ncurses pkg-config files, unless NCURSES_CFLAGS
# *and* NCURSES_LIBS are set
CONFIGURE_ENV = NCURSES_CFLAGS=' ' \
NCURSES_LIBS="-lncurses"
Re: [UPDATE] x11/polybar 3.5.4
On 2021/02/23 10:41, Guy Godfroy wrote: > Hello, > > Thanks to recent py-sphinx update, here is the diff to update polybar. > > On the old version of the port, i3 support was explicitly disabled, > don't know why. I re-enabled it and it works fine. Diff doesn't apply directly against -current. > MAINTAINER = Jasper Lievisse Adriaanse it's customary to CC the maintainer in case they aren't watching ports@. > RCS file: patches/patch-src_modules_temperature_cpp > diff -N patches/patch-src_modules_temperature_cpp > --- patches/patch-src_modules_temperature_cpp 12 Dec 2019 17:09:47 - > 1.2 > +++ /dev/null 1 Jan 1970 00:00:00 - > @@ -1,91 +0,0 @@ > -$OpenBSD: patch-src_modules_temperature_cpp,v 1.2 2019/12/12 17:09:47 jasper > Exp $ > - > -Index: src/modules/temperature.cpp > src/modules/temperature.cpp.orig > -+++ src/modules/temperature.cpp > -@@ -8,6 +8,17 @@ This patch needs updating for the new version rather than deleting.
Remove devel/mk
Fails with "-fno-common" and Upstream HOMEPAGE (equals MASTER_SITES) now points to https://9fans.github.io/plan9port/unix/ which provides unversioned tarballs with links to checksums that yield 404; same story for their manual page links on that page. The GitHub repository does not contain releases either. So devel/mk is now unportable due to upstream, but we have an up-to-date plan9/plan9port which packages from the very same upstream repo (using GH_COMMIT and dates as DISTNAME versions, it seems) which ships /usr/local/plan9/bin/mk /usr/local/plan9/man/man1/mk.1 /usr/local/plan9/unix/man/mk.1 OK to remove? I'd just point at plan9/plan9port in the `obsolete_reason' and not do any merging as that port contains much more and mk(1) lives somewhere else entirely anyway.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/02/23 04:24:03 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Removed files: mail/avenger : Makefile distinfo mail/avenger/patches: patch-asmtpd_starttls_C patch-etc_asmtpd_conf mail/avenger/pkg: DESCR MESSAGE PLIST Log message: Remove mail/avenger We package 0.8.3 05-Apr-2012 but 0.8.4 in 13-Jul-2013 and 0.8.5 in 08-Oct-2018 were released; the release tarball's NEWS file states "changes to make it compile with newer g++ and libcrypto" and "Manually parse /etc/resolv.conf, rather than attempting to make use of the res data structure (which at least on OpenBSD no longer actually contains the addresses of resolvers)". This port fails to build with "-fno-common" and noone has spoken up on ports@ to fix and update it. PS: http://www.mailavenger.org/NEWS is sitll missing 0.8.5 changes, so best look at the actual tarball. OK gnezdo
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/02/23 03:46:18 Modified files: security : Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm Removed files: security/tempwatch: Makefile distinfo security/tempwatch/patches: patch-Makefile patch-check_tmp_c patch-list_utils_c security/tempwatch/pkg: DESCR PLIST Log message: Remove security/tempwatch Fails to build with "-fno-common" and busy loop stat(2)s watched files driving up CPU usage instead of using kevent(2) or so. No activity upstream, FreeBSD maintains a port with local patches called (security/l0pht-watch in their ports tree) in case anyone is interested in resurrecting this. OK jca naddy
UPDATE: Apachetop-0.19.7
Hello,
Little update for Apachetop to 0.19.7.
Cheers.-
--
%gonzalo
Index: Makefile
===
RCS file: /cvs/ports/sysutils/apachetop/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile12 Jul 2019 20:49:39 - 1.15
+++ Makefile22 Feb 2021 09:29:38 -
@@ -2,10 +2,9 @@
COMMENT = top-like monitor for Apache
-V =0.18.4
+V =0.19.7
DISTNAME = apachetop-$V
CATEGORIES = sysutils
-REVISION = 0
MAINTAINER = Gonzalo L. R.
@@ -21,7 +20,8 @@ COMPILER =base-clang ports-gcc base-gc
MASTER_SITES =
https://github.com/tessus/apachetop/releases/download/$V/
CONFIGURE_STYLE = gnu
-
+CONFIGURE_ENV =NCURSES_CFLAGS='-L${LOCALBASE}/lib' \
+ NCURSES_LIBS="-lncurses"
CONFIGURE_ARGS = --with-logfile=/var/www/logs/access_log
.include
Index: distinfo
===
RCS file: /cvs/ports/sysutils/apachetop/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo13 Apr 2018 07:39:33 - 1.4
+++ distinfo22 Feb 2021 09:29:38 -
@@ -1,2 +1,2 @@
-SHA256 (apachetop-0.18.4.tar.gz) = NO4604Dx98BVqWKWQg8VARtSJ4FpETfqTjo29r0ZVWg=
-SIZE (apachetop-0.18.4.tar.gz) = 128849
+SHA256 (apachetop-0.19.7.tar.gz) = fwrRzRHNH4YFK7/WPyfstst0ASoXMhNUr3Cr8FmYxOs=
+SIZE (apachetop-0.19.7.tar.gz) = 132665
samba AD DC status
Hello,
I'm trying to setup a Samba AD DC on 6.8 (amd64) and it always fails
to start with following error:
8<
[2021/02/23 10:58:06.223190, 0] ../source4/smbd/server.c:587(binary_smbd_main)
samba version 4.9.18 started.
Copyright Andrew Tridgell and the Samba Team 1992-2018
[2021/02/23 10:58:06.305556, 0] ../lib/util/fault.c:79(fault_report)
===
[2021/02/23 10:58:06.305856, 0] ../lib/util/fault.c:80(fault_report)
INTERNAL ERROR: Signal 11 in pid 65725 (4.9.18)
If you are running a recent Samba version, and if you think this problem is
not yet fixed in the latest versions, please consider reporting this bug, see
https://wiki.samba.org/index.php/Bug_Reporting
[2021/02/23 10:58:06.306307, 0] ../lib/util/fault.c:86(fault_report)
===
[2021/02/23 10:58:06.306420, 0] ../lib/util/fault.c:132(smb_panic_default)
smb_panic_default: PANIC (pid 65725): internal error
[2021/02/23 10:58:06.306865, 0] ../lib/util/fault.c:265(log_stack_trace)
BACKTRACE: 11 stack frames:
#0 0x2724a461f55 at /usr/local/lib/libsamba-util.so.5.0
#1 0x2724a461dd4 at /usr/local/lib/libsamba-util.so.5.0
#2 0x2724a461d45 at /usr/local/lib/libsamba-util.so.5.0
#3 0x2724a462133 at /usr/local/lib/libsamba-util.so.5.0
#4 0x2724a461d29 at /usr/local/lib/libsamba-util.so.5.0
#5 0x27288e77005
#6 0x27210347d5b at /usr/local/lib/samba/libntvfs-samba4.so
#7 0x271ce6be9ef at
/usr/local/lib/samba/service/smb.so
#8 0x271e299d668 at
/usr/local/lib/samba/libsamba-modules-samba4.so
#9 0x26fa4ee3bb2 at samba
#10 0x26fa4ee2d31 at samba
8<
There are some relevant information here:
http://openbsd-archive.7691.n7.nabble.com/samba4-and-ACL-s-td312340.html
Did something change since that time?
I changed this:
diff /usr/local/lib/python2.7/site-packages/samba/netcmd/domain.py{.orig,}
532c532
< use_rfc2307=use_rfc2307, skip_sysvolacl=False,
---
> use_rfc2307=use_rfc2307, skip_sysvolacl=True,
and generated smb.conf file using:
samba-tool domain provision --use-rfc2307 --server-role=dc \
--dns-backend=SAMBA_INTERNAL --realm=FOO.COM \
--domain=FOO --adminpass=mypass
It looks like this:
8<
# Global parameters
[global]
dns forwarder = 192.168.178.1
netbios name = MS-AD
realm = FOO.COM
server role = active directory domain controller
workgroup = FOO
idmap_ldb:use rfc2307 = yes
xattr_tdb:file = /var/samba/xattr.tdb
[netlogon]
path = /var/samba/sysvol/foo.com/scripts
read only = No
[sysvol]
path = /var/samba/sysvol
read only = No
8<
I also tried to add 'acl_xattr:ignore system acls = yes' to [global] but
it doesn't help.
Is there a solution for this problem?
Thank you,
Best.
--
Olivier Cherrier
Phone: +352691570680
mailto:o...@symacx.com
sparc64 bulk build report
Bulk build on sparc64-0a.ports.openbsd.org Started : Sat Feb 20 15:27:59 MST 2021 Finished: Tue Feb 23 03:18:05 MST 2021 Duration: 2 Days 11 hours 50 minutes Built using OpenBSD 6.9-beta (GENERIC.MP) #698: Fri Feb 19 23:55:06 MST 2021 Built 9326 packages Number of packages built each day: Feb 20: 5315 Feb 21: 2791 Feb 22: 1205 Feb 23: 15 Critical path missing pkgs: http://build-failures.rhaalovely.net/sparc64/2021-02-20/summary.log Build failures: 29 http://build-failures.rhaalovely.net/sparc64/2021-02-20/audio/audacious/player.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/audio/ncmpcpp.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/comms/syncterm.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/databases/leveldb.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/databases/sqlports,-list.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/devel/glog.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/devel/keystone/python,python3.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/devel/spidermonkey78.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/emulators/emulationstation.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/games/frotz.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/games/odamex.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/games/openxcom.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/games/renpy.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/geo/spatialite/gui.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/graphics/asymptote.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/graphics/exiv2.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/graphics/kdiagram.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/math/mlpack,-main.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/multimedia/gstreamer-0.10/plugins-bad,-main.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/net/barrier.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/net/kdsoap.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/net/pmacct,postgresql.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/print/cups-bjnp.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/print/gutenprint.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/productivity/gnucash.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/security/flasm.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/sysutils/libvirt.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/www/ap2-mod_perl.log http://build-failures.rhaalovely.net/sparc64/2021-02-20/x11/roxterm.log Recurrent failures: failures/comms/syncterm.log failures/devel/glog.log failures/devel/keystone/python,python3.log failures/devel/spidermonkey78.log failures/emulators/emulationstation.log failures/games/frotz.log failures/games/odamex.log failures/games/openxcom.log failures/geo/spatialite/gui.log failures/graphics/asymptote.log failures/graphics/exiv2.log failures/math/mlpack,-main.log failures/multimedia/gstreamer-0.10/plugins-bad,-main.log failures/net/barrier.log failures/print/cups-bjnp.log failures/print/gutenprint.log failures/productivity/gnucash.log failures/sysutils/libvirt.log failures/x11/roxterm.log New failures: +failures/audio/audacious/player.log +failures/audio/ncmpcpp.log +failures/databases/leveldb.log +failures/databases/sqlports,-list.log +failures/games/renpy.log +failures/graphics/kdiagram.log +failures/net/kdsoap.log +failures/net/pmacct,postgresql.log +failures/security/flasm.log +failures/www/ap2-mod_perl.log Resolved failures: -failures/audio/hydrogen.log -failures/devel/py-asn1-modules,python3.log -failures/net/qsyncthingtray.log -failures/www/ruby-websocket-driver,ruby26.log -failures/x11/grantlee-qt5.log Packages newly built: +audio/hydrogen +databases/py-carbon +databases/py-ldap,python3 +databases/py-ldap0,python3 +databases/web2ldap +devel/libcdada +devel/py-asn1-modules,python3 +devel/py-buildbot/buildbot +devel/py-buildslave +devel/py-enrich,python3 +devel/py-importlib_resources,python3 +devel/py-rich,python3 +devel/py-twisted,python3 +devel/py-wcmatch,python3 +misc/subsurface +net/avahi,,-gui +net/deluge +net/deluge-ltconfig +net/poezio +net/py-slixmpp,python3 +net/qsyncthingtray +net/synapse +net/telepathy/telepathy-logger +security/py-service_identity +security/py-service_identity,python3 +security/py-trustme,python3 +textproc/py-bracex,python3 +textproc/py-sphinxcontrib/applehelp +textproc/py-sphinxcontrib/devhelp +textproc/py-sphinxcontrib/htmlhelp +textproc/py-sphinxcontrib/jsmath +textproc/py-sphinxcontrib/qthelp +textproc/py-sphinxcontrib/serializinghtml +textproc/py-sphinxcontrib/websupport +www/py-treq,python3 +www/ruby-websocket-driver,ruby26 +www/ruby-websocket-driver,ruby30 +x11/grantlee-qt5 Packages not built this time: -audio/audacious/player
Re: [UPDATE] x11/polybar 3.5.4
Hello,
Thanks to recent py-sphinx update, here is the diff to update polybar.
On the old version of the port, i3 support was explicitly disabled,
don't know why. I re-enabled it and it works fine.
Works on amd64.
OK?
Le 17/02/2021 à 11:37, Stuart Henderson a écrit :
> Hold off on the update, or disable doc generation, or try to patch
> around it.
>
? maildiff
Index: Makefile
===
RCS file: /cvs/ports/x11/polybar/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile10 Dec 2020 02:20:31 - 1.11
+++ Makefile23 Feb 2021 09:36:42 -
@@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2020/12/10 02:20:31 daniel Exp $
COMMENT = fast and easy-to-use status bar
-V =3.4.3
+V =3.5.4
DISTNAME = polybar-$V
CATEGORIES = x11
-REVISION = 1
HOMEPAGE = https://polybar.github.io/
MAINTAINER = Jasper Lievisse Adriaanse
@@ -18,7 +17,7 @@ WANTLIB += pulse xcb xcb-composite xcb-c
WANTLIB += xcb-image xcb-randr xcb-util xcb-xkb xcb-xrm z
MASTER_SITES = https://github.com/polybar/polybar/releases/download/$V/
-EXTRACT_SUFX = .tar
+EXTRACT_SUFX = .tar.gz
# C++14
COMPILER = base-clang ports-gcc
@@ -30,7 +29,7 @@ DEBUG_PACKAGES =${BUILD_PACKAGES}
MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
BUILD_DEPENDS =${RUN_DEPENDS} \
- textproc/py-sphinx${MODPY_FLAVOR}>=1.5
+ textproc/py-sphinx${MODPY_FLAVOR}>=2.4.3
LIB_DEPENDS = audio/libmpdclient \
audio/pulseaudio \
@@ -43,12 +42,11 @@ RUN_DEPENDS = x11/py-xcbgen${MODPY_FLAVO
fonts/unifont
CONFIGURE_ARGS = -DENABLE_CCACHE=OFF \
- -DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib -lintl
-L${LOCALBASE}/lib/inotify -linotify -Wl,-rpath,${LOCALBASE}/lib/inotify" \
- -DENABLE_I3=OFF
+ -DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib -lintl
-L${LOCALBASE}/lib/inotify -linotify -Wl,-rpath,${LOCALBASE}/lib/inotify"
NO_TEST = Yes
-WRKDIST = ${WRKDIR}/polybar
+WRKDIST = ${WRKDIR}/polybar-$V
pre-configure:
${SUBST_CMD} ${WRKSRC}/cmake/02-opts.cmake \
Index: distinfo
===
RCS file: /cvs/ports/x11/polybar/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo15 May 2020 08:07:55 - 1.4
+++ distinfo23 Feb 2021 09:36:42 -
@@ -1,2 +1,2 @@
-SHA256 (polybar-3.4.3.tar) = 1O0SHB05YEk/gmj5ZtZalNlMRkakq7ExaH43tjYWgi8=
-SIZE (polybar-3.4.3.tar) = 2713600
+SHA256 (polybar-3.5.4.tar.gz) = Ezr06LKfQmWVrTt3OUju4nJ1IwiHhERzhT55QMeVnCs=
+SIZE (polybar-3.5.4.tar.gz) = 409258
Index: patches/patch-cmake_02-opts_cmake
===
RCS file: patches/patch-cmake_02-opts_cmake
diff -N patches/patch-cmake_02-opts_cmake
--- patches/patch-cmake_02-opts_cmake 4 Nov 2019 19:14:00 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-cmake_02-opts_cmake,v 1.1 2019/11/04 19:14:00 jasper Exp $
-
-Index: cmake/02-opts.cmake
cmake/02-opts.cmake.orig
-+++ cmake/02-opts.cmake
-@@ -1,7 +1,7 @@
- #
- # Build options
- #
--checklib(BUILD_DOC "binary" sphinx-build)
-+checklib(BUILD_DOC "binary" sphinx-build${MODPY_BIN_SUFFIX})
-
- checklib(ENABLE_ALSA "pkg-config" alsa)
- checklib(ENABLE_CURL "pkg-config" libcurl)
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: patches/patch-doc_CMakeLists_txt
diff -N patches/patch-doc_CMakeLists_txt
--- patches/patch-doc_CMakeLists_txt4 Nov 2019 19:14:00 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-doc_CMakeLists_txt,v 1.1 2019/11/04 19:14:00 jasper Exp $
-
-Index: doc/CMakeLists.txt
doc/CMakeLists.txt.orig
-+++ doc/CMakeLists.txt
-@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
- project(polybar-doc NONE)
-
- find_program(SPHINX_EXECUTABLE
-- NAMES sphinx-build
-+ NAMES sphinx-build${MODPY_BIN_SUFFIX}
- DOC "Sphinx Documentation Builder")
-
- if(NOT SPHINX_EXECUTABLE)
Index: patches/patch-include_modules_cpu_hpp
===
RCS file: /cvs/ports/x11/polybar/patches/patch-include_modules_cpu_hpp,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-include_modules_cpu_hpp
--- patches/patch-include_modules_cpu_hpp 20 Sep 2019 08:18:42 -
1.1.1.1
+++ patches/patch-include_modules_cpu_hpp 23 Feb 2021 09:36:42 -
@@ -3,23 +3,17 @@ $OpenBSD: patch-include_modules_cpu_hpp,
Index: include/modules/cpu.hpp
--- include/modules/cpu.hpp.orig
+++ include/modules/cpu.hpp
-@@ -7,10 +7,19 @@ POLYBAR_NS
-
- namespace modules {
+@@ -9,7 +9,13 @@ namespace modules {
struct cpu_time {
-+#ifdef __OpenBSD__
unsigned long long user;
Re: emulators/libretro-genesis-plus-gx update
Jeremy Evans writes: > This updates libretro-genesis-plus-gx to the latest GitHub commit, which > builds cleanly with -fno-common after some Makefile patching. ok bentley@ > I'm not really sure how to configure Retroarch I consider Retroarch's configuration rather impenetrable. $ wc -l .config/retroarch/retroarch.cfg 2941 .config/retroarch/retroarch.cfg
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2021/02/23 02:34:36 Modified files: net/dico : Makefile Log message: Use MASTER_SITE_GNU. suggested by naddy@
x11/agar update + -fno-common fix
Hi,
Here's an update to agar-1.6.0 and agartest-1.6.0.
The update is actually still broken with -fno-common, but it's only one
variable so it was easy enough to fix for real.
There was a lot of weird churn in this update. For instance, there's no
point in enabling iconv because it will unfixably break the build. The
end result seems to work though, as demonstrated by running the tests
in agartest.
ok?
Index: Makefile.inc
===
RCS file: /cvs/ports/x11/agar/Makefile.inc,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.inc
--- Makefile.inc9 Nov 2020 21:48:25 - 1.4
+++ Makefile.inc23 Feb 2021 09:25:32 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.4 2020/11/09 21:48:25 cwen Exp $
-V ?= 1.5.0
+V ?= 1.6.0
DISTNAME ?=agar-$V
CATEGORIES ?= x11
@@ -10,7 +10,7 @@ HOMEPAGE ?= https://libagar.org/
# BSD
PERMIT_PACKAGE ?= Yes
-MASTER_SITES ?=http://stable.hypertriton.com/agar/
+MASTER_SITES ?=https://stable.hypertriton.com/agar/
CONFIGURE_STYLE ?= simple
Index: agar/Makefile
===
RCS file: /cvs/ports/x11/agar/agar/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- agar/Makefile 1 Aug 2020 18:47:33 - 1.7
+++ agar/Makefile 23 Feb 2021 09:25:32 -
@@ -3,31 +3,30 @@
COMMENT = cross-platform widget toolkit
PKGNAME = agar-$V
-REVISION = 4
-SHARED_LIBS += ag_au 0.0 # 5.0
-SHARED_LIBS += ag_core 0.0 # 5.0
-SHARED_LIBS += ag_dev0.0 # 5.0
-SHARED_LIBS += ag_gui0.0 # 5.0
-SHARED_LIBS += ag_math 0.0 # 5.0
-SHARED_LIBS += ag_vg 0.0 # 5.0
-
-WANTLIB += GL SDL X11 X11-xcb Xdamage Xext Xfixes Xinerama Xxf86vm
-WANTLIB += db drm expat fontconfig freetype glapi iconv jpeg m
-WANTLIB += png pthread sndio usbhid xcb xcb-dri2
-WANTLIB += xcb-glx z
+SHARED_LIBS += ag_au 0.1 # 5.0
+SHARED_LIBS += ag_core 1.0 # 5.0
+SHARED_LIBS += ag_gui1.0 # 5.0
+SHARED_LIBS += ag_map0.0 # 5.0
+SHARED_LIBS += ag_math 1.0 # 5.0
+SHARED_LIBS += ag_net0.0 # 5.0
+SHARED_LIBS += ag_sg 0.0 # 5.0
+SHARED_LIBS += ag_sk 0.0 # 5.0
+SHARED_LIBS += ag_vg 1.0 # 5.0
LIB_DEPENDS = audio/libsndfile \
audio/portaudio-svn \
- converters/libiconv \
- databases/db/v4 \
devel/sdl \
graphics/jpeg \
graphics/png
-CONFIGURE_ARGS += --with-gl=${X11BASE} \
+CONFIGURE_ARGS += --enable-au \
+ --enable-map \
+ --with-gl=${X11BASE} \
--with-x=${X11BASE} \
--with-portaudio=${LOCALBASE} \
--with-sndfile=${LOCALBASE}
+
+MAKE_FLAGS = PKGCONFIG_LIBDIR=${PREFIX}/lib/pkgconfig
.include
Index: agar/distinfo
===
RCS file: /cvs/ports/x11/agar/agar/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- agar/distinfo 10 Oct 2016 09:33:17 - 1.1.1.1
+++ agar/distinfo 23 Feb 2021 09:25:32 -
@@ -1,2 +1,2 @@
-SHA256 (agar-1.5.0.tar.gz) = gjQt7TQsV4FBmEvv6TGPPTdhduX0J64yePiYXyZmPAA=
-SIZE (agar-1.5.0.tar.gz) = 2427644
+SHA256 (agar-1.6.0.tar.gz) = dQAC8LNo+1guRWlqjfxT+0X1U2eSp/BSDNzCC0iMni4=
+SIZE (agar-1.6.0.tar.gz) = 22133371
Index: agar/patches/patch-Makefile
===
RCS file: /cvs/ports/x11/agar/agar/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile
--- agar/patches/patch-Makefile 10 Oct 2016 09:33:17 - 1.1.1.1
+++ agar/patches/patch-Makefile 23 Feb 2021 09:25:32 -
@@ -1,15 +1,17 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2016/10/10 09:33:17 bentley Exp $
Makefile.orig Mon Aug 24 03:08:39 2015
-+++ Makefile Mon Aug 24 03:08:48 2015
-@@ -83,9 +83,9 @@ install-config:
- ${SUDO} ${INSTALL_PROG} $$PROG ${DESTDIR}${BINDIR}; \
- done
- @echo "${INSTALL_DATA_DIR} ${PREFIX}/share/aclocal"
-- @${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/aclocal
-+ @${SUDO} ${INSTALL_DATA_DIR} ${PREFIX}/share/aclocal
+Index: Makefile
+--- Makefile.orig
Makefile
+@@ -90,10 +90,10 @@ install-config:
+ fi
+ @if [ ! -e "${DESTDIR}${PREFIX}/share/aclocal" ]; then \
+ echo "${INSTALL_DATA_DIR} ${PREFIX}/share/aclocal"; \
+- ${SUDO} ${INSTALL_DATA_DIR}
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2021/02/23 02:16:26 ports/x11/agar/test/patches Update of /cvs/ports/x11/agar/test/patches In directory cvs.openbsd.org:/tmp/cvs-serv18688/test/patches Log Message: Directory /cvs/ports/x11/agar/test/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2021/02/23 01:10:37 Modified files: net/swirc : Makefile distinfo Removed files: net/swirc/patches: patch-configure Log message: Update to swirc-3.2.6 Diff from maintainer Markus Uhlin
