CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2019/02/10 00:16:24 Modified files: net/owncloudclient: Makefile distinfo Log message: update to owncloudclient-2.5.3
[maintainer update] gerbil-0.15.1
Hi, Here's small patch release update to Gerbil scheme so that it works with Gambit-4.9.3. Timo Index: Makefile === RCS file: /cvs/ports/lang/gerbil/Makefile,v retrieving revision 1.5 diff -u -p -u -p -r1.5 Makefile --- Makefile3 Feb 2019 18:32:50 - 1.5 +++ Makefile10 Feb 2019 07:03:52 - @@ -7,7 +7,7 @@ COMMENT = dialect of Scheme designed for GH_ACCOUNT = vyzo GH_PROJECT = gerbil -GH_TAGNAME = v0.15 +GH_TAGNAME = v0.15.1 CATEGORIES = lang Index: distinfo === RCS file: /cvs/ports/lang/gerbil/distinfo,v retrieving revision 1.2 diff -u -p -u -p -r1.2 distinfo --- distinfo3 Feb 2019 18:32:50 - 1.2 +++ distinfo10 Feb 2019 07:03:52 - @@ -1,2 +1,2 @@ -SHA256 (gerbil-0.15.tar.gz) = 4rNfU90bOJN1HodsSNOMkXIYlycXgxkqeb+gfDf91GQ= -SIZE (gerbil-0.15.tar.gz) = 1325238 +SHA256 (gerbil-0.15.1.tar.gz) = PSnuzaqEWwc7+EE81U5CCz9Ix5wl5D+rWjed3gKdDN4= +SIZE (gerbil-0.15.1.tar.gz) = 1326871 Index: pkg/PLIST === RCS file: /cvs/ports/lang/gerbil/pkg/PLIST,v retrieving revision 1.2 diff -u -p -u -p -r1.2 PLIST --- pkg/PLIST 3 Feb 2019 18:32:50 - 1.2 +++ pkg/PLIST 10 Feb 2019 07:03:52 - @@ -366,7 +366,6 @@ gerbil/lib/scheme/ilist.ssxi.ss @bin gerbil/lib/scheme/ilist__rt.o1 gerbil/lib/scheme/inexact-impl.ssi gerbil/lib/scheme/inexact-impl.ssxi.ss -@bin gerbil/lib/scheme/inexact-impl__0.o1 @bin gerbil/lib/scheme/inexact-impl__rt.o1 gerbil/lib/scheme/inexact.ssi gerbil/lib/scheme/inexact.ssxi.ss
[update] gambit-4.9.3
Hi,
Here's an update for Gambit scheme. Note that this breaks the current Gerbil
scheme
version in ports but I'll have patch to update it to latest version.
Timo
Index: Makefile
===
RCS file: /cvs/ports/lang/gambit/Makefile,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile
--- Makefile20 Jan 2019 20:11:59 - 1.34
+++ Makefile9 Feb 2019 10:44:41 -
@@ -2,7 +2,7 @@
COMMENT= complete, efficient and reliable implementation of Scheme
-V= 4.9.2
+V= 4.9.3
DISTNAME= gambit-v${V:S/./_/g}
PKGNAME= gambit-$V
API_V= ${V:R:S/./0/}00${V:E}
Index: distinfo
===
RCS file: /cvs/ports/lang/gambit/distinfo,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 distinfo
--- distinfo20 Jan 2019 20:11:59 - 1.18
+++ distinfo9 Feb 2019 10:44:41 -
@@ -1,2 +1,2 @@
-SHA256 (gambit-v4_9_2.tgz) = njcUwCxMXOR49YS2/Up/vIe7WueLXaWx4U0+OaBV77I=
-SIZE (gambit-v4_9_2.tgz) = 13714749
+SHA256 (gambit-v4_9_3.tgz) = ExaFum1nT9c5CVD25KRvGVFHeNBTQ6Pik5dmBrc4wdw=
+SIZE (gambit-v4_9_3.tgz) = 13736448
Index: patches/patch-configure
===
RCS file: /cvs/ports/lang/gambit/patches/patch-configure,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-configure
--- patches/patch-configure 5 Sep 2018 21:39:18 - 1.9
+++ patches/patch-configure 9 Feb 2019 10:44:41 -
@@ -5,7 +5,7 @@ FLAGS_OPT_RTS doesn't honor the CFLAGS.
Index: configure
--- configure.orig
+++ configure
-@@ -14243,7 +14243,7 @@ if test "$C_COMP_VISUALC" = yes; then
+@@ -14245,7 +14245,7 @@ if test "$C_COMP_VISUALC" = yes; then
else
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/02/09 17:17:09 Modified files: games/wtf : Makefile distinfo Log message: Update to wtf-20190201
Re: install(1) broken
On Sat, Feb 09, 2019 at 05:23:09PM -0500, Ted Unangst wrote: > Marc Espie wrote: > > hey, your commit to install(1) broke something. > > > > Specifically lang/go-boostrap now produces a broken package which can't > > be used to build go. > > > > All the go/bootstrap/pkg/tool/openbsd_amd64/* > > have lost their x bit > > > > Relevant fake install information, it definitely looks like the last line > > is now a no-op. > > > # These get installed via `find' however we need them to be executable > > /pobj/go-bootstrap-1.4.20171003/bin/install -d -m 755 > > /pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap/pkg/tool//openbsd_amd64 > > /pobj/go-bootstrap-1.4.20171003/bin/install -c -m 755 -p > > /pobj/go-bootstrap-1.4.20171003/go/pkg/tool//openbsd_amd64/* > > /pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap/pkg/tool//openbsd_amd64 > > Yes. This is a weird way to invoke chmod, but that's what it wants. This actually makes some kind of sense in a broader context. Specifically, install_flags are a somewhat standard way to enforce ownership/permissions on a file, whether while copying it from one place to another... or after moving it. It's way simpler to bundle everything into a single variable than having several separate variables to do things.
Re: bump p5-Devel-CheckLib to newer version ?
On Thu, 24 Jan 2019 19:51:45 -0700 Andrew Hewus Fresh wrote: > On Mon, Jan 07, 2019 at 02:50:43PM -0500, sven falempin wrote: > > -DISTNAME = Devel-CheckLib-1.02 > > +DISTNAME = Devel-CheckLib-1.12 > > Had to patch this manually as it wouldn't apply, but after that this > seems fine, although I did remove the REVISION as it's no longer > needed. > > However, version 1.13 is on the CPAN, so I think we should pick up > that one. > > OK? > Hi everyone, It may need some tiny tweaks, i'm joining a diff with them. It requires a new test dependency. The test runs differently [1] with Mock::Config. It's still passing :) Also WANTLIB is here, and i don't get why because the module is pure Perl. Maybe there is something i don't know about yet? 'make port-lib-depends-check' and portgen(1) agree with the 2 changes, consumers have been built successfully. What do you think about it? Charlène. [1] https://metacpan.org/source/MATTN/Devel-CheckLib-1.13/t/multi-word-compiler.t Index: Makefile === RCS file: /cvs/ports/devel/p5-Devel-CheckLib/Makefile,v retrieving revision 1.3 diff -u -p -u -p -r1.3 Makefile --- Makefile29 Dec 2017 07:24:49 - 1.3 +++ Makefile8 Feb 2019 22:58:13 - @@ -3,15 +3,15 @@ COMMENT = module to check for C library availablity MODULES = cpan -DISTNAME = Devel-CheckLib-1.02 +DISTNAME = Devel-CheckLib-1.13 CATEGORIES = devel -REVISION = 0 # perl PERMIT_PACKAGE_CDROM = Yes -WANTLIB= perl +TEST_DEPENDS = devel/p5-IO-CaptureOutput>=1.0801 \ + devel/p5-Mock-Config>=0.02 -TEST_DEPENDS = devel/p5-IO-CaptureOutput>=1.0801 +PKG_ARCH = * .include Index: distinfo === RCS file: /cvs/ports/devel/p5-Devel-CheckLib/distinfo,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 distinfo --- distinfo2 Jan 2015 14:23:29 - 1.1.1.1 +++ distinfo8 Feb 2019 22:58:13 - @@ -1,2 +1,2 @@ -SHA256 (Devel-CheckLib-1.02.tar.gz) = 72/Ef77zbIOeM4V4iKfO2BY4IwW4C/NH/1upvw9d7EM= -SIZE (Devel-CheckLib-1.02.tar.gz) = 13277 +SHA256 (Devel-CheckLib-1.13.tar.gz) = JK39kIcF36xLsyBxF2PzcSa3XPVLNWbCwnx83vnEKag= +SIZE (Devel-CheckLib-1.13.tar.gz) = 15450
Re: NEW: security/exploitdb and security/exploitdb-papers
Am Mittwoch, Februar 06, 2019 23:21 CET, "Sebastian Reitenbach" schrieb: > This is the searchsploit tool, and a local version of the exploit database, > sometimes it's handy to have that offline available. > > The Exploit Database is an archive of public exploits and corresponding > vulnerable software, developed for use by penetration testers and > vulnerability researchers. Its aim is to serve as the most comprehensive > collection of exploits, shellcode and papers gathered through direct > submissions, mailing lists, and other public sources, and present them > in a freely-available and easy-to-navigate database. The Exploit > Database is a repository for exploits and Proof-of-Concepts rather than > advisories, making it a valuable resource for those who need actionable > data right away. > > any comments, concerns, objections, or even OK? The exploitdb itself is in, now only with regard to exploitdb-papers. Jasper@ suggested to put it under books CATEGORY, as well as add missing NO_TEST. However, he was a bit concerned about the distfile size, well for me it would still be nice to have that contents for easy install as package offline available, even if not all contents is super high quality, therefore here's an updated version again. anyone else yay or nay? cheers, Sebastian exploitdb-papers.tar.gz Description: application/gzip
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2019/02/09 15:48:36 Modified files: security : Makefile Log message: hook up exploitdb
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/02/09 15:48:59 Modified files: net/toot : Makefile distinfo Log message: Update toot-0.20 Makefile missing from release tarball, hence the now hand-rolled tests. >From trondd < trondd at kagu-tsuchi dot com > who also tested the new proxy feature, thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2019/02/09 15:47:26 Log message: The Exploit Database is an archive of public exploits and corresponding vulnerable software, developed for use by penetration testers and vulnerability researchers. Its aim is to serve as the most comprehensive collection of exploits, shellcode and papers gathered through direct submissions, mailing lists, and other public sources, and present them in a freely-available and easy-to-navigate database. The Exploit Database is a repository for exploits and Proof-of-Concepts rather than advisories, making it a valuable resource for those who need actionable data right away. tested and OK on a bit earlier version rpointel@ feedback and OK jasper@ Status: Vendor Tag: sebastia Release Tags: sebastia_20170209 N ports/security/exploitdb/Makefile N ports/security/exploitdb/distinfo N ports/security/exploitdb/patches/patch-searchsploit N ports/security/exploitdb/patches/patch-_searchsploit_rc N ports/security/exploitdb/pkg/DESCR N ports/security/exploitdb/pkg/PLIST No conflicts created by this import
Re: [WIP/NEW] 1oom - Master of Orion 1 engine
[...] > Ping? It would be nice to get this in. Tarball reattached for convenience. > > ~Brian > Portswise looks fine to me. I tested running with and without the fixbug file - both started up fine. Haven't tested any other startup options. The main menu plays music, but after starting a game music seems to be missing - there is no difference between "FX only" and "Music" in the game's options menu. I don't know if the original does have music there or not. Since I don't know if this is a bug or not and it otherwise seems to work fine (on only a few minutes of testing), ok thfr@.
Re: UPDATE: xschem 2.8.1 -> 2.8.2
On Fri, Feb 08, 2019 at 12:27:04AM +0200, Hannu Vuolasaho wrote:
> to 7. helmik. 2019 klo 0.30 Klemens Nanni (k...@openbsd.org) kirjoitti:
> >> On Wed, Feb 06, 2019 at 09:00:41PM +0200, Hannu Vuolasaho wrote:
> > > I also noticed the move of the examples and pcb,
> > > So they shouldn't
> > > be cluttering system library.
> > Nonetheless there is a clear seperation between documentation and
> > example (configuration). All ports install them into the appropiate
> > locations and I see no reason here to make an exception for xschem.
>
> You are quite correct. After re-reading porter's guide, I also think that
> examples belong to examples directory.
>
> Below diff which patches them to examples.
Here's a diff that actually applies and simply passes EXAMPLESDIR
through FAKE_FLAGS instead of patching the Makefile.
I've also removed your extra examples/ subdirectory to avoid paths like
/usr/local/share/examples/xschem/examples/.
Maybe upstream is interested in these changes to examples from the docs?
What do you think? Rest of the is from you.
Index: Makefile
===
RCS file: /cvs/ports/cad/xschem/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile4 Jan 2019 20:35:47 - 1.1.1.1
+++ Makefile9 Feb 2019 22:24:40 -
@@ -2,7 +2,7 @@
COMMENT = hierarchical schematic capture program
-DISTNAME = xschem-2.8.1
+DISTNAME = xschem-2.8.2
CATEGORIES = cad
@@ -35,12 +35,12 @@ CONFIGURE_ARGS =--cflags/libs/script/tc
--prefix="${LOCALBASE}" \
/arg/tk-version=${MODTK_VERSION}
-FAKE_FLAGS = MANDIR="${DESTDIR}${PREFIX}/man"
+FAKE_FLAGS = MANDIR="${DESTDIR}${PREFIX}/man" \
+ XEXAMPLESDIR="${DESTDIR}${PREFIX}/share/examples/xschem"
NO_TEST = Yes
pre-configure:
${MODTCL_WISH_ADJ} ${WRKSRC}/src/xschem.tcl ${WRKSRC}/utile/utile.tcl
- ${SUBST_CMD} ${WRKSRC}/doc/manpages/xschem.1
.include
Index: distinfo
===
RCS file: /cvs/ports/cad/xschem/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo4 Jan 2019 20:35:47 - 1.1.1.1
+++ distinfo7 Feb 2019 23:26:42 -
@@ -1,2 +1,2 @@
-SHA256 (xschem-2.8.1.tar.gz) = ojF15ukLA0JZWEOnFRAHe2ZgQFD2jRwWQiiXQ5mJUzY=
-SIZE (xschem-2.8.1.tar.gz) = 2411252
+SHA256 (xschem-2.8.2.tar.gz) = NDcxy6DUgzJorKPgzq3pmeO0uVDs4MeLWUIomgbSCgI=
+SIZE (xschem-2.8.2.tar.gz) = 3741517
Index: patches/patch-doc_manpages_xschem_1
===
RCS file: patches/patch-doc_manpages_xschem_1
diff -N patches/patch-doc_manpages_xschem_1
--- patches/patch-doc_manpages_xschem_1 4 Jan 2019 20:35:47 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,28 +0,0 @@
-$OpenBSD: patch-doc_manpages_xschem_1,v 1.1.1.1 2019/01/04 20:35:47 kn Exp $
-
-Index: doc/manpages/xschem.1
doc/manpages/xschem.1.orig
-+++ doc/manpages/xschem.1
-@@ -117,7 +117,7 @@ sets TCL frontend debug
-
- .TP
-
--.B $PREFIX/share/xschem/xschemrc
-+.B ${PREFIX}/share/xschem/xschemrc
- default configuration
- .TP
-
-@@ -134,11 +134,11 @@ settings not overridden will remain as set from the sy
- or user config
- .TP
-
--.B $PREFIX/share/xschem/systemlib
-+.B ${PREFIX}/share/xschem/systemlib
- builtin essentials, such as font and missing symbol graphics
- .TP
-
--.B $PREFIX/share/xschem/utile
-+.B ${PREFIX}/share/xschem/utile
- TODO
- .TP
-
Index: patches/patch-src_xinit_c
===
RCS file: patches/patch-src_xinit_c
diff -N patches/patch-src_xinit_c
--- patches/patch-src_xinit_c 4 Jan 2019 20:35:47 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_xinit_c,v 1.1.1.1 2019/01/04 20:35:47 kn Exp $
-
-Fix stylistical compiler warnings
-
-Index: src/xinit.c
src/xinit.c.orig
-+++ src/xinit.c
-@@ -686,7 +686,7 @@ int source_tcl_file(char *s)
- char tmp[1024];
- if(Tcl_EvalFile(interp, s)==TCL_ERROR) {
- fprintf(errfp, "Tcl_AppInit() error: can not execute %s, please fix:\n",
s);
--fprintf(errfp, Tcl_GetStringResult(interp));
-+fprintf(errfp, "%s", Tcl_GetStringResult(interp));
- fprintf(errfp, "\n");
- my_snprintf(tmp, S(tmp), "tk_messageBox -icon error -type ok -message \
-{Tcl_AppInit() err 1: can not execute %s, please fix:\n %s}",
Index: patches/patch-xschem_library_Makefile
===
RCS file: /cvs/ports/cad/xschem/patches/patch-xschem_library_Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-xschem_library_Makefile
--- patches/patch-xschem_library_Makefile 4 Jan 2019 20:35:47 -
1.1.1.1
+++ patches/patch-xschem_library_Makefile 9 Feb 2019
Re: install(1) broken
Marc Espie wrote:
> hey, your commit to install(1) broke something.
>
> Specifically lang/go-boostrap now produces a broken package which can't
> be used to build go.
>
> All the go/bootstrap/pkg/tool/openbsd_amd64/*
> have lost their x bit
>
> Relevant fake install information, it definitely looks like the last line
> is now a no-op.
> # These get installed via `find' however we need them to be executable
> /pobj/go-bootstrap-1.4.20171003/bin/install -d -m 755
> /pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap/pkg/tool//openbsd_amd64
> /pobj/go-bootstrap-1.4.20171003/bin/install -c -m 755 -p
> /pobj/go-bootstrap-1.4.20171003/go/pkg/tool//openbsd_amd64/*
> /pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap/pkg/tool//openbsd_amd64
Yes. This is a weird way to invoke chmod, but that's what it wants.
I think this was a long standing bug in install? If the files match, we need
to continue on with to_fd == existing file so that metadata updates work.
Index: xinstall.c
===
RCS file: /cvs/src/usr.bin/xinstall/xinstall.c,v
retrieving revision 1.68
diff -u -p -r1.68 xinstall.c
--- xinstall.c 8 Feb 2019 12:53:44 - 1.68
+++ xinstall.c 9 Feb 2019 22:21:03 -
@@ -313,8 +313,12 @@ install(char *from_name, char *to_name,
(void)unlink(tempfile);
}
}
- (void)close(to_fd);
- to_fd = temp_fd;
+ if (!files_match) {
+ (void)close(to_fd);
+ to_fd = temp_fd;
+ } else {
+ close(temp_fd);
+ }
}
/*
Re: install(1) broken
Hi Marc, Marc Espie wrote on Sat, Feb 09, 2019 at 10:03:20PM +0100: > hey, your commit to install(1) broke something. > > Specifically lang/go-boostrap now produces a broken package which can't > be used to build go. > > All the go/bootstrap/pkg/tool/openbsd_amd64/* > have lost their x bit > > Relevant fake install information, it definitely looks like the last line > is now a no-op. [...] > install -c -m 755 -p [...] Sorry for the disruption. It looks like the bug was not caused, but merely exposed by my commit. I reverted my commit anyway such than we can first fix the bug without a hurry, then reapply my change. I did not revert the manual page change to minimize churn, expecting that the change will eventually be put back. A preliminary analysis indicates that 1. install -m 755 foo bar always applies 755 to bar 2. install -S-m 755 foo bar always applies 755 to bar 3. install -S -p -m 755 foo bar only applies 755 if the file content changes Item 3 looks like a bug to me. Similar effects may or may not apply to the owner and the flags. I will look in more detail later. Yours, Ingo
install(1) broken
hey, your commit to install(1) broke something.
Specifically lang/go-boostrap now produces a broken package which can't
be used to build go.
All the go/bootstrap/pkg/tool/openbsd_amd64/*
have lost their x bit
Relevant fake install information, it definitely looks like the last line
is now a no-op.
>>> Running fake in lang/go-bootstrap at 1549742487
===> lang/go-bootstrap
===> Faking installation for go-bootstrap-1.4.20171003p0
/pobj/go-bootstrap-1.4.20171003/bin/install -d -m 755
/pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap
/pobj/go-bootstrap-1.4.20171003/bin/install -d -m 755
/pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap/bin
/pobj/go-bootstrap-1.4.20171003/bin/install -c -m 755 -p
/pobj/go-bootstrap-1.4.20171003/go/bin/go{,fmt}
/pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap/bin
find /pobj/go-bootstrap-1.4.20171003/go -maxdepth 1 -type f ! -name .git\* !
-name .hg\* -exec /pobj/go-bootstrap-1.4.20171003/bin/install -c -m 644 -p {}
/pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap \;
cd /pobj/go-bootstrap-1.4.20171003/go && find doc -type d -exec
/pobj/go-bootstrap-1.4.20171003/bin/install -d -m 755
/pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap/{} \; -o
-type f ! -name \*.orig -exec /pobj/go-bootstrap-1.4.20171003/bin/install -c
-m 644 -p {}
/pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap/{} \;
cd /pobj/go-bootstrap-1.4.20171003/go && find include -type d -exec
/pobj/go-bootstrap-1.4.20171003/bin/install -d -m 755
/pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap/{} \; -o
-type f ! -name \*.orig -exec /pobj/go-bootstrap-1.4.20171003/bin/install -c
-m 644 -p {}
/pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap/{} \;
cd /pobj/go-bootstrap-1.4.20171003/go && find lib -type d -exec
/pobj/go-bootstrap-1.4.20171003/bin/install -d -m 755
/pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap/{} \; -o
-type f ! -name \*.orig -exec /pobj/go-bootstrap-1.4.20171003/bin/install -c
-m 644 -p {}
/pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap/{} \;
cd /pobj/go-bootstrap-1.4.20171003/go && find misc -type d -exec
/pobj/go-bootstrap-1.4.20171003/bin/install -d -m 755
/pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap/{} \; -o
-type f ! -name \*.orig -exec /pobj/go-bootstrap-1.4.20171003/bin/install -c
-m 644 -p {}
/pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap/{} \;
cd /pobj/go-bootstrap-1.4.20171003/go && find src -type d -exec
/pobj/go-bootstrap-1.4.20171003/bin/install -d -m 755
/pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap/{} \; -o
-type f ! -name \*.orig -exec /pobj/go-bootstrap-1.4.20171003/bin/install -c
-m 644 -p {}
/pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap/{} \;
cd /pobj/go-bootstrap-1.4.20171003/go && find pkg -type d -exec
/pobj/go-bootstrap-1.4.20171003/bin/install -d -m 755
/pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap/{} \; -o
-type f ! -name \*.orig -exec /pobj/go-bootstrap-1.4.20171003/bin/install -c
-m 644 -p {}
/pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap/{} \;
# These get installed via `find' however we need them to be executable
/pobj/go-bootstrap-1.4.20171003/bin/install -d -m 755
/pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap/pkg/tool//openbsd_amd64
/pobj/go-bootstrap-1.4.20171003/bin/install -c -m 755 -p
/pobj/go-bootstrap-1.4.20171003/go/pkg/tool//openbsd_amd64/*
/pobj/go-bootstrap-1.4.20171003/fake-amd64/usr/local/go/bootstrap/pkg/tool//openbsd_amd64
Re: [UPDATE] www/newsboat to 2.14
On Fri, Feb 08, 2019 at 09:54:02PM +, Stuart Henderson wrote: > On 2019/02/08 22:27, Remi Locherer wrote: > > Hi Frederic > > > > On Thu, Feb 07, 2019 at 11:47:09AM +0100, Frederic Cambus wrote: > > > Hi ports@, > > > > > > Here is a diff to update newsboat to 2.14, which now depends on Rust > > > and Cargo. All the work was done by semarie@. > > > > > > I've been running newsboat for three weeks with this diff and haven't > > > noticed any regressions, but more testing would definitely be welcome. > > > > > > Comments? OK? > > > > It builds and runs fine on my amd64 box. > > > > It's the first time I'm looking into a port that uses rust. Did you > > create the list of crates automatically? > > Yes, from the list from upstream via rust.port.mk, see port-modules(5). That is nice! > > > I wonder because I see the > > winapi and fuchsia-zircon crates in the list. > > You're supposed to close your eyes for that bit so you don't drip > tears onto your keyboard ;) > I see. ;-) OK remi@ for updating newsboat to 2.14.
UPDATE: iaxclient - FFmpeg API
Update API usage to deal with current vs new FFmpeg API.
Index: Makefile
===
RCS file: /home/cvs/ports/telephony/iaxclient/Makefile,v
retrieving revision 1.40
diff -u -p -u -p -r1.40 Makefile
--- Makefile17 Dec 2018 01:08:29 - 1.40
+++ Makefile9 Feb 2019 18:44:11 -
@@ -6,7 +6,7 @@ COMMENT-tcl=IAX client library, tcl bin
DISTNAME= iaxclient-2.1beta3
PKGNAME-main= ${DISTNAME}
PKGNAME-tcl= ${DISTNAME:S/iaxclient/iaxclient-tcl/}
-REVISION= 22
+REVISION= 23
CATEGORIES=telephony
SHARED_LIBS= tcliaxclient02 0.0 \
Index: patches/patch-lib_codec_ffmpeg_c
===
RCS file: /home/cvs/ports/telephony/iaxclient/patches/patch-lib_codec_ffmpeg_c,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-lib_codec_ffmpeg_c
--- patches/patch-lib_codec_ffmpeg_c27 Apr 2014 20:52:50 - 1.4
+++ patches/patch-lib_codec_ffmpeg_c9 Feb 2019 19:14:46 -
@@ -2,8 +2,9 @@ $OpenBSD: patch-lib_codec_ffmpeg_c,v 1.4
Update for newer FFmpeg API.
lib/codec_ffmpeg.c.origMon Apr 7 12:05:42 2008
-+++ lib/codec_ffmpeg.c Thu Apr 24 20:26:53 2014
+Index: lib/codec_ffmpeg.c
+--- lib/codec_ffmpeg.c.orig
lib/codec_ffmpeg.c
@@ -23,11 +23,7 @@
#include "codec_ffmpeg.h"
#include "iaxclient_lib.h"
@@ -16,7 +17,7 @@ Update for newer FFmpeg API.
struct slice_header_t
{
-@@ -63,7 +59,7 @@ struct decoder_ctx
+@@ -63,30 +59,30 @@ struct decoder_ctx
static struct slice_set_t * g_slice_set = 0;
@@ -25,6 +26,36 @@ Update for newer FFmpeg API.
{
switch (format)
{
+ case IAXC_FORMAT_H261:
+- return CODEC_ID_H261;
++ return AV_CODEC_ID_H261;
+
+ case IAXC_FORMAT_H263:
+- return CODEC_ID_H263;
++ return AV_CODEC_ID_H263;
+
+ case IAXC_FORMAT_H263_PLUS:
+- return CODEC_ID_H263P;
++ return AV_CODEC_ID_H263P;
+
+ case IAXC_FORMAT_MPEG4:
+- return CODEC_ID_MPEG4;
++ return AV_CODEC_ID_MPEG4;
+
+ case IAXC_FORMAT_H264:
+- return CODEC_ID_H264;
++ return AV_CODEC_ID_H264;
+
+ case IAXC_FORMAT_THEORA:
+- return CODEC_ID_THEORA;
++ return AV_CODEC_ID_THEORA;
+
+ default:
+- return CODEC_ID_NONE;
++ return AV_CODEC_ID_NONE;
+ }
+ }
+
@@ -165,10 +161,14 @@ static int pass_frame_to_decoder(AVCodecContext * avct
{
int bytes_decoded;
@@ -59,6 +90,15 @@ Update for newer FFmpeg API.
if ( bytes_decoded < 0 )
{
fprintf(stderr,
+@@ -374,7 +378,7 @@ static int encode(struct iaxc_video_codec *c,
+ struct encoder_ctx *e = (struct encoder_ctx *) c->encstate;
+ int encoded_size;
+
+- avcodec_get_frame_defaults(e->picture);
++ av_frame_unref(e->picture);
+
+ e->picture->data[0] = (unsigned char *)in;
+ e->picture->data[1] = (unsigned char *)in
@@ -441,6 +445,7 @@ struct iaxc_video_codec *codec_video_ffmpeg_new(int fo
{
struct encoder_ctx *e;
@@ -75,7 +115,7 @@ Update for newer FFmpeg API.
avcodec_register_all();
c->format = format;
-@@ -475,7 +479,7 @@ struct iaxc_video_codec *codec_video_ffmpeg_new(int fo
+@@ -475,10 +479,10 @@ struct iaxc_video_codec *codec_video_ffmpeg_new(int fo
if (!c->encstate)
goto bail;
e = c->encstate;
@@ -83,7 +123,11 @@ Update for newer FFmpeg API.
+ e->avctx = avcodec_alloc_context3(NULL);
if (!e->avctx)
goto bail;
- e->picture = avcodec_alloc_frame();
+- e->picture = avcodec_alloc_frame();
++ e->picture = av_frame_alloc();
+ if (!e->picture)
+ goto bail;
+ /* The idea here is that the encoded frame that will land in this
@@ -496,7 +500,7 @@ struct iaxc_video_codec *codec_video_ffmpeg_new(int fo
if (!c->decstate)
goto bail;
@@ -93,61 +137,150 @@ Update for newer FFmpeg API.
if (!d->avctx)
goto bail;
d->picture = avcodec_alloc_frame();
-@@ -524,9 +528,6 @@ struct iaxc_video_codec *codec_video_ffmpeg_new(int fo
- e->avctx->pix_fmt = PIX_FMT_YUV420P;
+@@ -521,20 +525,20 @@ struct iaxc_video_codec *codec_video_ffmpeg_new(int fo
+
+ /* This determines how often i-frames are sent */
+ e->avctx->gop_size = framerate * 3;
+- e->avctx->pix_fmt = PIX_FMT_YUV420P;
++ e->avctx->pix_fmt = AV_PIX_FMT_YUV420P;
e->avctx->has_b_frames = 0;
- e->avctx->mb_qmin = e->avctx->qmin = 10;
- e->avctx->mb_qmax = e->avctx->qmax = 10;
-
++#if 0
e->avctx->lmin = 2 * FF_QP2LAMBDA;
e->avctx->lmax = 10 * FF_QP2LAMBDA;
++#endif
++
e->avctx->global_quality = FF_QP2LAMBDA * 2;
-@@ -561,7 +562,8 @@ struct iaxc_video_codec
Re: texlive & evince
Hi, On Thu, Feb 07, 2019 at 05:34:35PM +0100, Jeremie Courreges-Anglas wrote: > > Index: pkg/PLIST-synctex > > === > > RCS file: pkg/PLIST-synctex > > diff -N pkg/PLIST-synctex > > --- /dev/null 1 Jan 1970 00:00:00 - > > +++ pkg/PLIST-synctex 4 Feb 2019 17:39:55 - > > @@ -0,0 +1,15 @@ > > +@comment $OpenBSD$ > > +@conflict teTeX_base-* > > +@conflict pdfjam-* > > +@conflict ht-<2 > > +@conflict texlive_texmf-buildset-<2018 > > +@conflict texlive_base-<2018p1 > > The last line looks fine but I doubt that you need to copy the other > @conflict lines. Were the -synctex files once provided by one of those > packages? I looked at what espie@ did with the mktexlsr subpackage. The only conflict that might have conceivably included synctex was teTeX_base, but the synctex source code has copyright starting 2008, and teTeX died in 2006. So, I guess not. > As already discussed, I don't understand how it helps for those depends > to be that strict. Aren't files more commonly moved between > texlive/texmf subpackages, rather than from texlive/base to > texlive/texmf? Unless I'm missing something, we may easily avoid the > problem by only stating minimal versions: less chances for errors and less > churn for pkg_add -u. Please find a diff below. Yep, sounds good. Diff also looks good. So are we saying that, with that change, the diff I posted to move synctex into it's own sub-package would then be good to go (once we fix the merge conflicts that will be caused by your change)? > Well, as mentioned by kili there's also the option to force evince to > always use its internal copy. This means one more copy of synctex to > watch for security/portability issues, but on the other hand this would > decouple evince and texlive updates. Not a bad idea given the recent, > undocumented API/ABI break in libsynctex... > > https://github.com/jlaurens/synctex/issues/23 My gut feeling says we should use the one from TeX live, but I think we should hear from jasper@ and/or aja@, since they are the ones who maintain evince. Guys, what would you prefer? Thanks -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/02/09 12:31:43 Modified files: multimedia/libquicktime: Makefile multimedia/libquicktime/patches: patch-plugins_ffmpeg_audio_c patch-plugins_ffmpeg_params_c patch-plugins_ffmpeg_video_c Added files: multimedia/libquicktime/patches: patch-plugins_ffmpeg_lqt_ffmpeg_c patch-plugins_ffmpeg_params_h Log message: Cope with newer ffmpeg API (4.x) >From Brad Smith
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2019/02/09 10:55:28 Modified files: www/luakit : Makefile distinfo www/luakit/patches: patch-Makefile www/luakit/pkg : PLIST Removed files: www/luakit/patches: patch-config_globals_lua Log message: Update luakit to 2.1 - Switch to using version numbers vs a date. - Stop trying to run tests. OK gsoares@
UPDATE: chromaprint - FFmpeg API
Update fpcalc in chromaprint to the newer FFmpeg API.
Index: Makefile
===
RCS file: /home/cvs/ports/audio/chromaprint/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile18 Dec 2018 20:32:32 - 1.10
+++ Makefile9 Feb 2019 17:50:05 -
@@ -6,7 +6,7 @@ DISTNAME = chromaprint-1.1
CATEGORIES = audio devel
HOMEPAGE = https://acoustid.org/chromaprint
MASTER_SITES = https://bitbucket.org/acoustid/chromaprint/downloads/
-REVISION = 2
+REVISION = 3
SHARED_LIBS = chromaprint 1.0 # 0.1
Index: patches/patch-examples_fpcalc_c
===
RCS file: patches/patch-examples_fpcalc_c
diff -N patches/patch-examples_fpcalc_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-examples_fpcalc_c 9 Feb 2019 17:49:28 -
@@ -0,0 +1,34 @@
+$OpenBSD$
+
+Update for newer FFmpeg API.
+
+Index: examples/fpcalc.c
+--- examples/fpcalc.c.orig
examples/fpcalc.c
+@@ -126,7 +126,7 @@ int decode_audio_file(ChromaprintContext *chromaprint_
+ remaining = max_length * codec_ctx->channels * codec_ctx->sample_rate;
+ chromaprint_start(chromaprint_ctx, codec_ctx->sample_rate,
codec_ctx->channels);
+
+- frame = avcodec_alloc_frame();
++ frame = av_frame_alloc();
+
+ while (1) {
+ if (av_read_frame(format_ctx, ) < 0) {
+@@ -134,7 +134,7 @@ int decode_audio_file(ChromaprintContext *chromaprint_
+ }
+
+ if (packet.stream_index == stream_index) {
+- avcodec_get_frame_defaults(frame);
++ av_frame_unref(frame);
+
+ got_frame = 0;
+ consumed = avcodec_decode_audio4(codec_ctx, frame,
_frame, );
+@@ -190,7 +190,7 @@ finish:
+
+ done:
+ if (frame) {
+- avcodec_free_frame();
++ av_frame_free();
+ }
+ if (dst_data[0]) {
+ av_freep(_data[0]);
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2019/02/09 10:49:54 Modified files: fonts/hermit-font: Makefile distinfo fonts/hermit-font/pkg: PLIST Log message: Update to hermit-2.0
Re: p5-Net-FTPServer update to 1.125, fix with perl 5.28
> On 9 Feb 2019, at 17:00, Stuart Henderson wrote: > > The in-tree version of p5-Net-FTPServer fails at build time with > the pending Perl update. > > Diff below: > > - updates to 1.125 which fixes the build issue > - removes the old patches which are no longer needed > - adds new patch to fix a faulty regex > - adds new patch to raise the default memory limit (fixes some > tests and probably some runtime issues) > - port tweak: more exact license, use the MODCPAN_EXAMPLES ports > infrastructure > > One test still fails out-of-memory due to the limits but > most things work and going higher than 32MB per concurrent user > seems a bit much. > > Any OKs? Anil, do you still want to be listed as maintainer? Not used this for >15 years, so removing me as maintainer would be appreciated :-) thanks, Anil
UPDATE: pianobar - FFmpeg API
Pull in a patch to deal with current vs new FFmpeg API. Just removing
use of a deprecated header.
Index: patches/patch-src_player_c
===
RCS file: /home/cvs/ports/audio/pianobar/patches/patch-src_player_c,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 patch-src_player_c
--- patches/patch-src_player_c 24 Aug 2017 09:06:10 - 1.22
+++ patches/patch-src_player_c 9 Feb 2019 17:00:17 -
@@ -1,21 +1,27 @@
$OpenBSD: patch-src_player_c,v 1.22 2017/08/24 09:06:10 dcoppa Exp $
-XXX Revert:
-commit f3dff6792232d1e3f2deb8baf21dc1fa81581090
-Author: Lars-Dominik Braun
-Date: Fri Mar 24 10:02:27 2017
+- XXX Revert:
+ commit f3dff6792232d1e3f2deb8baf21dc1fa81581090
+ Author: Lars-Dominik Braun
+ Date: Fri Mar 24 10:02:27 2017
-Replace deprecated avcodec_decode_audio4
+ Replace deprecated avcodec_decode_audio4
-Use new send_packet/receive_frame API.
-
-Bumps libav and ffmpeg version requirements. Revert this commit if
-you need an older version.
+ Use new send_packet/receive_frame API.
+- Remove deprecated header avfiltergraph.h
Index: src/player.c
--- src/player.c.orig
+++ src/player.c
-@@ -166,23 +166,16 @@ static bool openStream (player_t * const player) {
+@@ -36,7 +36,6 @@ THE SOFTWARE.
+ #include
+ #include
+ #include
+-#include
+ #include
+ #include
+ #ifdef HAVE_LIBAVFILTER_AVCODEC_H
+@@ -166,23 +165,16 @@ static bool openStream (player_t * const player) {
}
player->st = player->fctx->streams[player->streamIdx];
@@ -42,7 +48,7 @@ Index: src/player.c
softfail ("codec_open2");
}
-@@ -203,7 +196,7 @@ static bool openFilter (player_t * const player) {
+@@ -203,7 +195,7 @@ static bool openFilter (player_t * const player) {
/* filter setup */
char strbuf[256];
int ret = 0;
@@ -51,7 +57,7 @@ Index: src/player.c
if ((player->fgraph = avfilter_graph_alloc ()) == NULL) {
softfail ("graph_alloc");
-@@ -212,11 +205,17 @@ static bool openFilter (player_t * const player) {
+@@ -212,11 +204,17 @@ static bool openFilter (player_t * const player) {
/* abuffer */
AVRational time_base = player->st->time_base;
@@ -72,7 +78,7 @@ Index: src/player.c
if ((ret = avfilter_graph_create_filter (>fabuf,
avfilter_get_by_name ("abuffer"), NULL, strbuf, NULL,
player->fgraph)) < 0) {
-@@ -264,14 +263,14 @@ static bool openFilter (player_t * const player) {
+@@ -264,14 +262,14 @@ static bool openFilter (player_t * const player) {
/*setup libao
*/
static bool openDevice (player_t * const player) {
@@ -90,7 +96,7 @@ Index: src/player.c
aoFmt.byte_format = AO_FMT_NATIVE;
int driver = ao_default_driver_id ();
-@@ -289,7 +288,6 @@ static int play (player_t * const player) {
+@@ -289,7 +287,6 @@ static int play (player_t * const player) {
assert (player != NULL);
AVPacket pkt;
@@ -98,7 +104,7 @@ Index: src/player.c
av_init_packet ();
pkt.data = NULL;
pkt.size = 0;
-@@ -300,28 +298,18 @@ static int play (player_t * const player) {
+@@ -300,28 +297,18 @@ static int play (player_t * const player) {
filteredFrame = av_frame_alloc ();
assert (filteredFrame != NULL);
@@ -137,7 +143,7 @@ Index: src/player.c
/* pausing */
pthread_mutex_lock (>pauseMutex);
if (player->doPause) {
-@@ -333,50 +321,54 @@ static int play (player_t * const player) {
+@@ -333,50 +320,54 @@ static int play (player_t * const player) {
}
pthread_mutex_unlock (>pauseMutex);
@@ -221,7 +227,7 @@ Index: src/player.c
}
static void finish (player_t * const player) {
-@@ -386,9 +378,9 @@ static void finish (player_t * const player) {
+@@ -386,9 +377,9 @@ static void finish (player_t * const player) {
avfilter_graph_free (>fgraph);
player->fgraph = NULL;
}
Index: patches/patch-src_player_h
===
RCS file: patches/patch-src_player_h
diff -N patches/patch-src_player_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_player_h 9 Feb 2019 17:02:50 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Remove deprecated header avfiltergraph.h
+
+Index: src/player.h
+--- src/player.h.orig
src/player.h
+@@ -34,7 +34,6 @@ THE SOFTWARE.
+ #include
+ #include
+ #include
+-#include
+ #include
+
+ #include "settings.h"
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/02/09 10:09:49 Modified files: www/p5-HTML-FormatText-WithLinks-AndTables: Makefile www/p5-HTML-FormatText-WithLinks-AndTables/pkg: PLIST Log message: remove junk README.pod files that "Older versions of ExtUtils::MakeMaker may errantly install" - unbreaks packaging with perl 5.28
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/02/09 10:02:39 ports/security/p5-Crypt-Twofish/patches Update of /cvs/ports/security/p5-Crypt-Twofish/patches In directory cvs.openbsd.org:/tmp/cvs-serv77935/patches Log Message: Directory /cvs/ports/security/p5-Crypt-Twofish/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/02/09 10:03:00 Added files: security/p5-Crypt-Twofish/patches: patch-tab_tables_pl Log message: fix build with perl 5.26+
p5-Net-FTPServer update to 1.125, fix with perl 5.28
The in-tree version of p5-Net-FTPServer fails at build time with
the pending Perl update.
Diff below:
- updates to 1.125 which fixes the build issue
- removes the old patches which are no longer needed
- adds new patch to fix a faulty regex
- adds new patch to raise the default memory limit (fixes some
tests and probably some runtime issues)
- port tweak: more exact license, use the MODCPAN_EXAMPLES ports
infrastructure
One test still fails out-of-memory due to the limits but
most things work and going higher than 32MB per concurrent user
seems a bit much.
Any OKs? Anil, do you still want to be listed as maintainer?
Index: Makefile
===
RCS file: /cvs/ports/net/p5-Net-FTPServer/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile20 Mar 2016 19:56:52 - 1.13
+++ Makefile9 Feb 2019 16:57:59 -
@@ -4,8 +4,7 @@ COMMENT=secure, extensible and configur
MODULES= cpan
PKG_ARCH= *
-DISTNAME= Net-FTPServer-1.122
-REVISION= 2
+DISTNAME= Net-FTPServer-1.125
CATEGORIES=net
MAINTAINER=Anil Madhavapeddy
@@ -17,14 +16,11 @@ RUN_DEPENDS=archivers/p5-Archive-Zip \
devel/p5-File-Sync \
devel/p5-IO-stringy
-# GPL
+# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
-FAKE_FLAGS=NOCONF=1
-CONFIG_DIR=${PREFIX}/share/examples/p5-Net-FTPServer
-
-post-install:
- ${INSTALL_DATA_DIR} ${CONFIG_DIR}
- ${INSTALL_DATA} ${WRKSRC}/ftpd.conf ${CONFIG_DIR}/ftpd.conf
+FAKE_FLAGS=NOCONF=1
+MODCPAN_EXAMPLES= Yes
+MODCPAN_EXAMPLES_DIST= etc
.include
Index: distinfo
===
RCS file: /cvs/ports/net/p5-Net-FTPServer/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo18 Jan 2015 03:14:45 - 1.5
+++ distinfo9 Feb 2019 16:57:59 -
@@ -1,2 +1,2 @@
-SHA256 (Net-FTPServer-1.122.tar.gz) =
16UlfJgu2qg7LNXBy7MZCie4+ZlrOCy6pp0sXWFx11w=
-SIZE (Net-FTPServer-1.122.tar.gz) = 127256
+SHA256 (Net-FTPServer-1.125.tar.gz) =
FoPXF+ddec1mMwjVHO8o4S0sUklstu9Q9XCRkqyQ4MU=
+SIZE (Net-FTPServer-1.125.tar.gz) = 128458
Index: patches/patch-lib_Net_FTPServer_pm
===
RCS file: /cvs/ports/net/p5-Net-FTPServer/patches/patch-lib_Net_FTPServer_pm,v
retrieving revision 1.1
diff -u -p -r1.1 patch-lib_Net_FTPServer_pm
--- patches/patch-lib_Net_FTPServer_pm 8 Sep 2009 21:10:59 - 1.1
+++ patches/patch-lib_Net_FTPServer_pm 9 Feb 2019 16:57:59 -
@@ -1,112 +1,49 @@
-$OpenBSD: patch-lib_Net_FTPServer_pm,v 1.1 2009/09/08 21:10:59 bluhm Exp $
lib/Net/FTPServer.pm.orig Fri Jul 15 12:10:22 2005
-+++ lib/Net/FTPServer.pm Thu Aug 27 17:13:15 2009
-@@ -4228,7 +4228,7 @@ sub _archive_generator_zip
-
-$zip->addMember ($memb);
-$memb->desiredCompressionMethod
-- (&{$ {Archive::Zip::}{COMPRESSION_DEFLATED}});
-+ (::Zip::COMPRESSION_DEFLATED);
-$memb->desiredCompressionLevel (9);
- }
-},
-@@ -4260,7 +4260,7 @@ sub _archive_generator_zip
- if ($file)
- {
- unlink $tmpname;
-- $zip->writeToFileHandle ($file, 1) == &{$ {Archive::Zip::}{AZ_OK}}
-+ $zip->writeToFileHandle ($file, 1) == ::Zip::AZ_OK
- or die "failed to write to zip file: $!";
- $file->seek (0, 0);
- }
-@@ -4269,7 +4269,7 @@ sub _archive_generator_zip
- unless ($file)
+$OpenBSD$
+
+Hunk #1/2 - Default memory limit is too low, various tests fail with
+16MB. 32MB still has a failure in t/240abort.t but most things work
+ok and 240abort.t represents an unusual situation. (It can be made
+to work with 64MB in perl 5.28 - earlier perl needs even more).
+
+Hunk #3 - Typo found by newer perl's "Unescaped left brace in regex"
+deprecation warning.
+
+Index: lib/Net/FTPServer.pm
+--- lib/Net/FTPServer.pm.orig
lib/Net/FTPServer.pm
+@@ -358,7 +358,7 @@ process and are important in avoiding denial of servic
+ attacks against the FTP server.
+
+ Resource Default Unit
+- limit memory 16384 KBytes Amount of memory per child
++ limit memory 32768 KBytes Amount of memory per child
+ limit nr processes10 (none) Number of processes
+ limit nr files20 (none) Number of open files
+
+@@ -367,7 +367,7 @@ limit to C<-1>.
+
+ Example:
+
+- limit memory: 32768
++ limit memory: 65536
+ limit nr processes:20
+ limit nr files:40
+
+@@ -2680,7 +2680,7 @@ sub run
+ # Perform normal per-process limits.
+ if ($r == 0)
{
- $file = new IO::Scalar;
-- $zip->writeToFileHandle ($file, 1) == &{$ {Archive::Zip::}{AZ_OK}}
-+ $zip->writeToFileHandle ($file, 1) == ::Zip::AZ_OK
- or die "failed to write to zip file: $!";
- $file->seek (0, 0);
- }
-@@
zabbix 4.0.4
The following diff updates zabbix to 4.0.4.
Release notes: https://www.zabbix.com/rn/rn4.0.4
I'm running this for few days now w/o any issues (amd64).
Index: Makefile
===
RCS file: /cvs/ports/net/zabbix/Makefile,v
retrieving revision 1.156
diff -u -p -r1.156 Makefile
--- Makefile12 Dec 2018 13:34:31 - 1.156
+++ Makefile7 Feb 2019 09:14:10 -
@@ -5,7 +5,7 @@ COMMENT-server =network and application
COMMENT-proxy =network and application monitoring - proxy
COMMENT-web = network and application monitoring - web frontend
-VERSION = 4.0.0
+VERSION = 4.0.4
DISTNAME = zabbix-${VERSION}
FULLPKGNAME-main = zabbix-agent-${VERSION}
FULLPKGPATH-main = net/zabbix,-main
@@ -15,8 +15,6 @@ FULLPKGPATH-proxy = net/zabbix,-proxy
FULLPKGNAME-web = zabbix-web-${VERSION}
FULLPKGPATH-web = net/zabbix,-web
CATEGORIES = net
-REVISION-main =0
-REVISION-web = 0
MAJV = ${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
Index: distinfo
===
RCS file: /cvs/ports/net/zabbix/distinfo,v
retrieving revision 1.45
diff -u -p -r1.45 distinfo
--- distinfo26 Oct 2018 06:57:21 - 1.45
+++ distinfo7 Feb 2019 09:14:10 -
@@ -1,2 +1,2 @@
-SHA256 (zabbix-4.0.0.tar.gz) = VnPhBhVhAq/4xngaiQ2mzt/Jdc8T2W2HSbTHEm9Ca8c=
-SIZE (zabbix-4.0.0.tar.gz) = 17984379
+SHA256 (zabbix-4.0.4.tar.gz) = +OUFWeJQ3C5zKRmptS1ikibStELOm+k9OrIIbdJvPBk=
+SIZE (zabbix-4.0.4.tar.gz) = 18045463
Index: patches/patch-conf_zabbix_server_conf
===
RCS file: /cvs/ports/net/zabbix/patches/patch-conf_zabbix_server_conf,v
retrieving revision 1.10
diff -u -p -r1.10 patch-conf_zabbix_server_conf
--- patches/patch-conf_zabbix_server_conf 26 Oct 2018 06:57:21 -
1.10
+++ patches/patch-conf_zabbix_server_conf 7 Feb 2019 09:14:10 -
@@ -12,15 +12,15 @@ Index: conf/zabbix_server.conf
### Option: LogFileSize
# Maximum size of log file in MB.
-@@ -124,6 +124,7 @@ DBUser=zabbix
+@@ -123,6 +123,7 @@ DBUser=zabbix
# Mandatory: no
# Default:
# DBSocket=
+DBSocket=/var/www/var/run/mysql/mysql.sock
### Option: DBPort
- # Database port when not using local socket. Ignored for SQLite.
-@@ -506,6 +507,7 @@ Timeout=4
+ # Database port when not using local socket.
+@@ -504,6 +505,7 @@ Timeout=4
# Mandatory: no
# Default:
# AlertScriptsPath=${datadir}/zabbix/alertscripts
@@ -28,7 +28,7 @@ Index: conf/zabbix_server.conf
### Option: ExternalScripts
# Full path to location of external scripts.
-@@ -523,6 +525,7 @@ Timeout=4
+@@ -521,6 +523,7 @@ Timeout=4
# Mandatory: no
# Default:
# FpingLocation=/usr/sbin/fping
@@ -36,7 +36,7 @@ Index: conf/zabbix_server.conf
### Option: Fping6Location
# Location of fping6.
-@@ -532,6 +535,7 @@ Timeout=4
+@@ -530,6 +533,7 @@ Timeout=4
# Mandatory: no
# Default:
# Fping6Location=/usr/sbin/fping6
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/zabbix/patches/patch-configure,v
retrieving revision 1.23
diff -u -p -r1.23 patch-configure
--- patches/patch-configure 26 Oct 2018 06:57:21 - 1.23
+++ patches/patch-configure 7 Feb 2019 09:14:10 -
@@ -28,7 +28,7 @@ Index: configure
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
-@@ -12500,12 +12501,12 @@ LIBS="$LIBS $ICONV_LIBS"
+@@ -12512,12 +12513,12 @@ LIBS="$LIBS $ICONV_LIBS"
RANLIB="ranlib"
Index: patches/patch-src_libs_zbxcrypto_tls_c
===
RCS file: /cvs/ports/net/zabbix/patches/patch-src_libs_zbxcrypto_tls_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_libs_zbxcrypto_tls_c
--- patches/patch-src_libs_zbxcrypto_tls_c 12 Aug 2018 13:25:53 -
1.1
+++ patches/patch-src_libs_zbxcrypto_tls_c 7 Feb 2019 09:14:10 -
@@ -36,7 +36,17 @@ Index: src/libs/zbxcrypto/tls.c
static void OPENSSL_cleanup(void)
{
-@@ -1419,6 +1422,7 @@ static unsigned int zbx_psk_client_cb(SSL *ssl,
const
+@@ -229,7 +232,9 @@ ZBX_THREAD_LOCAL static size_t
psk_len_for_cb = 0;
+ static intinit_done = 0;
+ /* variables for capturing PSK identity from server callback function */
+ ZBX_THREAD_LOCAL static int incoming_connection_has_psk = 0;
++#ifndef OPENSSL_NO_PSK
+ ZBX_THREAD_LOCAL static char
incoming_connection_psk_id[PSK_MAX_IDENTITY_LEN + 1];
++#endif
+ /* buffer for messages produced by zbx_openssl_info_cb() */
+ ZBX_THREAD_LOCAL char info_buf[256];
+ #endif
+@@ -1442,6
Linking issue with VLC 3
I have been looking at updating VLC to version 3, but as I am looking into = it I have run into a linking issue. I am looking for any help to resolve the iss= ue. The issue is with VLC building a libtool convenience library called libcomp= at to provide various substitute functions which don't exist on OpenBSD, e.g. ffs= ll(), strnstr() and tdestroy(). Here is a start at an update plus FFmpeg 4.1 which is required for VLC 3. https://comstyle.com/ffmpeg/ffmpeg.diff https://comstyle.com/ffmpeg/vlc.diff libtool: link: cc -shared -fPIC -DPIC -o .libs/libhttps_plugin.so access/= http/.libs/access.o .libs/libhttps_plugin.lax/libcompat.a/dummy.o .libs/l= ibhttps_plugin.lax/libcompat.a/ffsll.o .libs/libhttps_plugin.lax/libcompat.= a/strnstr.o .libs/libhttps_plugin.lax/libcompat.a/strverscmp.o .libs/libhtt= ps_plugin.lax/libcompat.a/tdestroy.o .libs/libhttps_plugin.lax/libvlc_http= =2Ea/dummy.o =2Elibs/libhttps_plugin.lax/libvlc_http.a/ffsll.o .libs/libhttps_plugin.lax= /libvlc_http.a/libvlc_http_la-chunked.o .libs/libhttps_plugin.lax/libvlc_ht= tp.a/libvlc_http_la-connmgr.o .libs/libhttps_plugin.lax/libvlc_http.a/libvl= c_http_la-file.o .libs/libhttps_plugin.lax/libvlc_http.a/libvlc_http_la-h1c= onn.o .libs/libhttps_plugin.lax/libvlc_http.a/libvlc_http_la-h2conn.o .libs= /libhttps_plugin.lax/libvlc_http.a/libvlc_http_la-h2frame.o .libs/libhttps_= plugin.lax/libvlc_http.a/libvlc_http_la-h2output.o .libs/libhttps_plugin.la= x/libvlc_http.a/libvlc_http_la-hpack.o .libs/libhttps_plugin.lax/libvlc_htt= p.a/libvlc_http_la-hpackenc.o .libs/libhttps_plugin.lax/libvlc_http.a/libvl= c_http_la-live.o .libs/libhttps_plugin.lax/libvlc_http.a/libvlc_http_la-mes= sage.o .libs/libhttps_plugin.lax/libvlc_http.a/libvlc_http_la-resource.o .l= ibs/libhttps_plugin.lax/libvlc_http.a/libvlc_http_la-tunnel.o .libs/libhttp= s_plugin.lax/libvlc_http.a/strnstr.o .libs/libhttps_plugin.lax/libvlc_http.= a/strverscmp.o .libs/libhttps_plugin.lax/libvlc_http.a/tdestroy.o -L/home= /ports/pobj/vlc-3.0.6/vlc-3.0.6/src/.libs -L/usr/X11R6/lib -L/usr/local/lib= -L../src/.libs -lvlccore -lidn -lintl -liconv -lc -ldbus-1 -lm -lpthread = -O2 -Wl,-z -Wl,defs -Wl,-retain-symbols-file,.libs/libhttps_plugin.exp ld: error: duplicate symbol: ffsll >>> defined at ffsll.c >>>.libs/libhttps_plugin.lax/libcompat.a/ffsll.o:(ffsll) >>> defined at ffsll.c >>>.libs/libhttps_plugin.lax/libvlc_http.a/ffsll.o:(.text+0x0) ld: error: duplicate symbol: strnstr >>> defined at strnstr.c >>>.libs/libhttps_plugin.lax/libcompat.a/strnstr.o:(strnstr) >>> defined at strnstr.c >>>.libs/libhttps_plugin.lax/libvlc_http.a/strnstr.o:(.text+0x0) ld: error: duplicate symbol: strverscmp >>> defined at strverscmp.c >>>.libs/libhttps_plugin.lax/libcompat.a/strverscmp.o:(strversc= mp) >>> defined at strverscmp.c >>>.libs/libhttps_plugin.lax/libvlc_http.a/strverscmp.o:(.text+= 0x0) ld: error: duplicate symbol: tdestroy >>> defined at tdestroy.c >>>.libs/libhttps_plugin.lax/libcompat.a/tdestroy.o:(tdestroy) >>> defined at tdestroy.c >>>.libs/libhttps_plugin.lax/libvlc_http.a/tdestroy.o:(.text+0x= 0)
x11/freerdp: update to 2.0.0-rc4
Can anyone give it a try ? The patch to overcome timerfd_create() is a bit
naive.
My usage (connecting to Windows 10, Windows 2012 & Windows 2016 with
drive redirection) did not show any problem.
xfreerdp /v:windowscomputer /u:denis /clipboard
/drive:openbsd,/home/denis/documents
Denis
Index: Makefile
===
RCS file: /cvs/ports/x11/freerdp/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile11 Dec 2018 11:12:22 - 1.35
+++ Makefile9 Feb 2019 14:58:50 -
@@ -3,10 +3,9 @@
# Also: __sync_fetch_and_add_4 __sync_add_and_fetch_4 __sync_sub_and_fetch_4
BROKEN-hppa = undefined reference to __sync_val_compare_and_swap_4
-COMMENT = open source client for Windows Terminal Server
-DISTNAME = freerdp-2.0.0-rc1
-PKGNAME = freerdp-2.0.0rc1
-REVISION = 2
+COMMENT = open source client for the Remote Desktop Protocol
+DISTNAME = freerdp-2.0.0-rc4
+PKGNAME = freerdp-2.0.0rc4
CATEGORIES = x11 net
SHARED_LIBS += freerdp-client2 0.0 # 2.0
Index: distinfo
===
RCS file: /cvs/ports/x11/freerdp/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo28 Apr 2018 19:20:17 - 1.8
+++ distinfo9 Feb 2019 14:58:50 -
@@ -1,2 +1,2 @@
-SHA256 (freerdp-2.0.0-rc1.tar.gz) =
8JogqXEWPCeD77egtIyGBuIPl7RB9xjyUoNDgnex+Hs=
-SIZE (freerdp-2.0.0-rc1.tar.gz) = 6575999
+SHA256 (freerdp-2.0.0-rc4.tar.gz) =
vRzVV5dlsta0RFCMr8ezZpxo/yJGlBoIHncfdEsVD2o=
+SIZE (freerdp-2.0.0-rc4.tar.gz) = 6662044
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/x11/freerdp/patches/patch-CMakeLists_txt,v
retrieving revision 1.6
diff -u -p -r1.6 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt28 Apr 2018 19:20:17 - 1.6
+++ patches/patch-CMakeLists_txt9 Feb 2019 14:58:50 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.6 201
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -953,9 +953,9 @@ if(WAYLAND_FOUND)
+@@ -1081,9 +1081,9 @@ if(WAYLAND_FOUND)
endif()
if(BSD)
Index: patches/patch-client_X11_CMakeLists_txt
===
RCS file: /cvs/ports/x11/freerdp/patches/patch-client_X11_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-client_X11_CMakeLists_txt
--- patches/patch-client_X11_CMakeLists_txt 28 Apr 2018 19:20:17 -
1.3
+++ patches/patch-client_X11_CMakeLists_txt 9 Feb 2019 14:58:50 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-client_X11_CMakeLists_tx
Index: client/X11/CMakeLists.txt
--- client/X11/CMakeLists.txt.orig
+++ client/X11/CMakeLists.txt
-@@ -203,7 +203,7 @@ endif()
+@@ -225,7 +225,7 @@ endif()
include_directories(${CMAKE_SOURCE_DIR}/resources)
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-client freerdp m)
Index: patches/patch-libfreerdp_core_nla_c
===
RCS file: patches/patch-libfreerdp_core_nla_c
diff -N patches/patch-libfreerdp_core_nla_c
--- patches/patch-libfreerdp_core_nla_c 8 Jun 2018 20:32:16 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,29 +0,0 @@
-$OpenBSD: patch-libfreerdp_core_nla_c,v 1.1 2018/06/08 20:32:16 denis Exp $
-
-Fix nla: don't use server version
-
-
https://github.com/FreeRDP/FreeRDP/commit/e7ae3f6babc881d893411a5ada9156abe8525b2f
-
-Index: libfreerdp/core/nla.c
libfreerdp/core/nla.c.orig
-+++ libfreerdp/core/nla.c
-@@ -1663,14 +1663,18 @@ BOOL nla_send(rdpNla* nla)
- static int nla_decode_ts_request(rdpNla* nla, wStream* s)
- {
- int length;
-+ UINT32 version = 0;
-
- /* TSRequest */
- if (!ber_read_sequence_tag(s, ) ||
- !ber_read_contextual_tag(s, 0, , TRUE) ||
-- !ber_read_integer(s, >version))
-+ !ber_read_integer(s, ))
- {
- return -1;
- }
-+
-+ if (version < nla->version)
-+ nla->version = version;
-
- /* [1] negoTokens (NegoData) */
- if (ber_read_contextual_tag(s, 1, , TRUE) != FALSE)
Index: patches/patch-libfreerdp_crypto_tls_c
===
RCS file: /cvs/ports/x11/freerdp/patches/patch-libfreerdp_crypto_tls_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-libfreerdp_crypto_tls_c
--- patches/patch-libfreerdp_crypto_tls_c 24 Oct 2018 17:10:22 -
1.3
+++ patches/patch-libfreerdp_crypto_tls_c 9 Feb 2019 14:58:50 -
@@ -2,10 +2,22 @@ $OpenBSD: patch-libfreerdp_crypto_tls_c,
Stop reaching into libssl internals to send TLS alerts.
+Also, 2.0.0-rc4 do not build with LibreSSL :
+https://github.com/FreeRDP/FreeRDP/issues/5049#issuecomment-441084530
+
Index: libfreerdp/crypto/tls.c
---
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/02/09 08:23:07 Modified files: editors/libreoffice: Makefile distinfo editors/libreoffice/patches: patch-RepositoryExternal_mk patch-basic_source_runtime_methods_cxx patch-configure patch-desktop_source_app_app_cxx patch-external_cppunit_UnpackedTarball_cppunit_mk patch-external_liborcus_ExternalPackage_liborcus_mk patch-external_pdfium_UnpackedTarball_pdfium_mk patch-oox_Library_oox_mk patch-sal_cppunittester_cppunittester_cxx patch-sal_osl_unx_system_hxx patch-sc_source_core_data_column3_cxx patch-shell_source_unix_exec_shellexec_cxx patch-solenv_gbuild_platform_com_GCC_defs_mk patch-solenv_gbuild_platform_unxgcc_mk patch-vcl_Library_vclplug_gen_mk patch-vcl_Library_vclplug_gtk3_mk editors/libreoffice/pkg: PLIST-main Added files: editors/libreoffice/patches: patch-connectivity_Library_mysqlc_mk patch-sal_osl_unx_uunxapi_cxx Removed files: editors/libreoffice/patches: patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx patch-sdext_source_pdfimport_xpdfwrapper_pnghelper_cxx patch-sdext_source_pdfimport_xpdfwrapper_wrapper_gpl_cxx patch-svx_Executable_pixelctl_mk Log message: update to 6.2.0.3
mail/mblaze: update to 0.5
Hi,
The changelog...
* New tool msearch to wrap several mail indexers.
* New zsh completion _mblaze.
* mnext/mprev were removed (you can call `mless +`/`mless -`).
* The GnuPG tools in contrib/ now use gpg2.
* mshow exits with error if it could not extract all attachments
* mrep: add -noquote to disable quoting the message replied to
* mdeliver: keep permissions of messages
* mcom: aborting the editor is now more like delete than cancel
* mcom: add -send to send directly without editing
* mcom: check if mail is formatted sensibly
* mpick: new flag -v for statistics
* mscan: new flag -v for statistics
* magrep: add -h, which is like -p but doesn't print the file name
* mscan: prioritize displaying trashed mail over other markers
* mpick: fix off-by-one in expression parsing
* Many bug fixes
Ok?
Index: Makefile
===
RCS file: /cvs/ports/mail/mblaze/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile31 Aug 2018 10:31:41 - 1.4
+++ Makefile9 Feb 2019 15:03:59 -
@@ -2,7 +2,7 @@
COMMENT = set of Maildir utilities
-VERSION = 0.4
+VERSION = 0.5
DISTNAME = mblaze-${VERSION}
GH_ACCOUNT = chneukirchen
GH_PROJECT = mblaze
Index: distinfo
===
RCS file: /cvs/ports/mail/mblaze/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo31 Aug 2018 10:31:41 - 1.3
+++ distinfo9 Feb 2019 15:04:10 -
@@ -1,2 +1,2 @@
-SHA256 (mblaze-0.4.tar.gz) = g9/9f+dPqHFkLpfblOJ8BFBvdG+k1rovlcGogGONbgw=
-SIZE (mblaze-0.4.tar.gz) = 85934
+SHA256 (mblaze-0.5.tar.gz) = Myec8PRowD0y6MH44FbPFwBewwISY0FQv+DZDG5Pkm4=
+SIZE (mblaze-0.5.tar.gz) = 90587
Index: pkg/PLIST
===
RCS file: /cvs/ports/mail/mblaze/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 31 Aug 2018 10:31:41 - 1.3
+++ pkg/PLIST 9 Feb 2019 15:05:24 -
@@ -18,9 +18,7 @@ bin/mless
@bin bin/mlist
@bin bin/mmime
bin/mmkdir
-bin/mnext
@bin bin/mpick
-bin/mprev
bin/mquote
bin/mrefile
bin/mrep
Re: go uses too many CPUs
On 19-02-08 21:16:02, Stuart Henderson wrote:
> On 2019/02/08 19:12, Marc Espie wrote:
> > On Fri, Feb 08, 2019 at 12:10:02AM -0500, Ted Unangst wrote:
> > > Go tries to use NCPU cpus. Unfortunately, half of them are turned off
> > > because
> > > hw.smt=0 by default, and then go spends a lot of time fighting against
> > > itself.
> > >
> > > The diff below, against go/src/runtime, changes to use the number of CPUs
> > > online. It's possible for this number to change, and thus become stale,
> > > but
> > > that's unlikely, and not the default.
> > >
> > > (This sysctl was added in 6.4.)
> > >
> > > --- os_openbsd.go.origFri Feb 8 00:02:27 2019
> > > +++ os_openbsd.go Fri Feb 8 00:06:21 2019
> > > @@ -85,8 +85,8 @@
> > > _KERN_OSREV = 3
> > >
> > > _CTL_HW = 6
> > > - _HW_NCPU = 3
> > > _HW_PAGESIZE = 7
> > > + _HW_NCPUONLINE = 25
> > > )
> > >
> > > func sysctlInt(mib []uint32) (int32, bool) {
> > > @@ -101,7 +101,7 @@
> > >
> > > func getncpu() int32 {
> > > // Fetch hw.ncpu via sysctl.
> > > - if ncpu, ok := sysctlInt([]uint32{_CTL_HW, _HW_NCPU}); ok {
> > > + if ncpu, ok := sysctlInt([]uint32{_CTL_HW, _HW_NCPUONLINE}); ok {
> > > return int32(ncpu)
> > > }
> > > return 1
>
> IIRC upstream had some requirement for supporting the previous OS version
> for their builders, so might be better to have fallback code in case
> _HW_NCPUONLINE isn't available.
This is correct - I've landed a diff that just switches to hw.ncpuonline,
however
a different version will go upstream.
> > Is there at least a knob to turn that off entirely ?
> >
> > Like, specifically, when you are bulk-building ports, you do not want go
> > to hog on every cpu while it's not alone.
> >
> > Parallelizing everything is not always (very often not actually) a win.
>
> On 2019/02/08 19:55, Otto Moerbeek wrote:
> > The GOMACPROCS env var is what you're looking for. If you set it to 1
> > go will use 1 core at max.
>
> There are two different things.
>
> go.port.mk's build command line (used for some but not all ports) calls
> "go install -p ${MAKE_JOBS}", that controls how many parallel processes
> are used. (some like sysutils/prometheus use a different build system).
>
> GOMAXPROCS (X not C) is different - number of threads within one process.
It is the number of threads that can simultaneously execute user-level Go code.
There may be more or less threads than this in a Go process, depending on
whether there is a need for concurrency and/or if threads are blocked in
system calls.
> So if both are in play maybe you get N(smp_cores) processes * N(smp_cores)
> threads ...
[BUG] can't start supertux because it expects files in wrong places
Hi! $ supertux2 [FATAL] /usr/obj/ports/supertux-0.6.0/SuperTux-v0.6.0-Source/src/supertux/main.cpp:604 Unexpected exception: boost::filesystem::status: Permission denied: "/usr/obj/ports/supertux-0.6.0/SuperTux-v0.6.0-Source/data/credits.stxt"
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: js...@cvs.openbsd.org 2019/02/09 08:09:19 Modified files: lang/go: Makefile Added files: lang/go/patches: patch-src_runtime_os_openbsd_go Log message: Use hw.ncpuonline rather than hw.ncpu to determine how many threads to run. Prompted by tedu@
Re: password-store depends on gnupg-1.4.23?
Stuart Henderson(s...@spacehopper.org) on 2019.02.06 23:08:34 +: > On 2019/02/06 23:32, Sebastian Benoit wrote: > > $ doas pkg_delete gnupg-1.4.23p1 > > can't delete gnupg-1.4.23p1 without deleting password-store-1.7.3 > > Delete them as well ? [y/N/a] > > > > but password-store has security/gnupg2 as dependency, not gnupg-1.4... > > > > Port: password-store-1.7.3 > > Path: security/password-store > > Info: simple password store > > Maint: David Dahlberg > > Index: security > > L-deps: > > B-deps: archivers/xz devel/gmake > > R-deps: converters/base64 devel/git graphics/libqrencode misc/gnugetopt > > security/gnupg2 shells/bash sysutils/colortree x11/xclip > > Archs: any > > > > $ pkg_info | grep gnupg > > gnupg-1.4.23p1 GNU privacy guard - a free PGP replacement > > gnupg-2.2.12GNU privacy guard - a free PGP replacement > > > > Is there some magic i have to do? > > I just fixed this by adding the missing PKGSPEC line to gnupg2 (the > "opposite" of the one already present in gnupg1). > > If you update ports/security/gnupg2 in your tree (no need to build it) > and rebuild/update password-store from ports it should fix things up for > you - or it should be picked up automatically in a normal pkg_add -u > run after new pkgs are available. Yes, that works. Thanks :)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/02/09 03:05:46 Modified files: sysutils/terraform/provider-alicloud: Makefile distinfo sysutils/terraform/provider-aws: Makefile distinfo sysutils/terraform/provider-fastly: Makefile distinfo Log message: Update terraform providers.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/02/09 02:53:41 Modified files: sysutils/govmomi: Makefile distinfo Log message: update to govc-0.20.0.
nedit receives SIGABRT when an item from Help menu is selected
Dear ports@ readers, all in the subject... This is a gdb backtrace after e.g "Getting Started" (but the same thing happens whichever item I select from Help menu): [...] $ gdb nedit GNU gdb 6.3 Copyright 2004 Free Software Foundation, Inc. GDB is free software, covered by the GNU General Public License, and you are welcome to change it and/or distribute copies of it under certain conditions. Type "show copying" to see the conditions. There is absolutely no warranty for GDB. Type "show warranty" for details. This GDB was configured as "amd64-unknown-openbsd6.4"... (gdb) run Starting program: /usr/local/bin/nedit UTF8 locale not supported. Program received signal SIGABRT, Aborted. thrkill () at -:3 3 -: No such file or directory. in - Current language: auto; currently asm (gdb) bt #0 thrkill () at -:3 #1 0x0eb099ca984c in __stack_smash_handler (func=Variable "func" is not available. ) at /usr/src/lib/libc/sys/stack_protector.c:79 #2 0x0eae83ebe83a in helpCB (menuItem=0xeb0a4e27000, clientData=0xeb0bb7fc000, callData=0x7f7bac90) from /usr/local/bin/nedit #3 0x0eb0d325c535 in XtCallCallbackList () from /usr/X11R6/lib/libXt.so.11.0 #4 0x0eb0d805d065 in BtnUp (wid=0xeb0a4e27000, event=0x7f7bb2e8, params=Variable "params" is not available. ) at PushB.c:2658 #5 0x0eb0d329e072 in HandleActions () from /usr/X11R6/lib/libXt.so.11.0 #6 0x0eb0d329bbc3 in HandleSimpleState () from /usr/X11R6/lib/libXt.so.11.0 #7 0x0eb0d329b483 in _XtTranslateEvent () from /usr/X11R6/lib/libXt.so.11.0 #8 0x0eb0d326d887 in XtDispatchEventToWidget () from /usr/X11R6/lib/libXt.so.11.0 #9 0x0eb0d326e2cd in _XtDefaultDispatcher () from /usr/X11R6/lib/libXt.so.11.0 #10 0x0eb0d326dd8a in XtDispatchEvent () from /usr/X11R6/lib/libXt.so.11.0 #11 0x0eb0d327ba13 in XtAppProcessEvent () from /usr/X11R6/lib/libXt.so.11.0 #12 0x0eb0d326e7ad in XtAppMainLoop () from /usr/X11R6/lib/libXt.so.11.0 #13 0x0eae83ea6459 in main (argc=1, argv=0x7f7bbd78) at nedit.c:760 (gdb) [...] Any hints? -- Alessandro DE LAURENZIS [mailto:jus...@atlantide.t28.net] Web: http://www.atlantide.t28.net LinkedIn: https://www.linkedin.com/in/delaurenzis/
