CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2019/02/07 00:49:48 Modified files: games : Makefile Log message: + gzdoom I forgot to add it. Spotted by @jasper
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: giova...@cvs.openbsd.org2019/02/07 00:30:07 Modified files: net: Makefile Log message: +p5-POE-Component-Client-DNS-Recursive +p5-POE-Component-Server-DNS +p5-POE-Filter-DNS-TCP
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: patr...@cvs.openbsd.org 2019/02/07 00:29:04 Modified files: sysutils/u-boot: Makefile Log message: Switch from Allwinner's ATF to the official ARM Trusted Firmware repository. There has been plenty of upstreaming effort which improves support for devices like the Pinebook.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: patr...@cvs.openbsd.org 2019/02/07 00:23:50 Modified files: sysutils/arm-trusted-firmware: Makefile distinfo sysutils/arm-trusted-firmware/patches: patch-plat_rockchip_rk3399_include_shared_bl31_param_h Log message: Update ARM Trusted Firmware to a more recent version. Unfortunately there has been no release since October '18, but the Allwinner SoC and thus the Pinebook work a lot better using the recent upstreaming efforts. So we grab a recent commit from master as a "beta" version. ok jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: giova...@cvs.openbsd.org2019/02/07 00:19:46 Log message: Import POE::Component::Server::DNS, a non-blocking, concurrent DNS server POE component ok afresh1@ pkg/DESCR: POE::Component::Server::DNS is a POE component that implements a DNS server. It uses POE::Component::Client::DNS to handle resolving when configured as 'forward_only' and Net::DNS::Resolver::Recurse wrapped by POE::Component::Generic to perform recursion. One may add handlers to massage and manipulate responses to particular queries which is vaguely modelled after Net::DNS::Nameserver. Status: Vendor Tag: giovanni Release Tags: giovanni_20190207 N ports/net/p5-POE-Component-Server-DNS/Makefile N ports/net/p5-POE-Component-Server-DNS/distinfo N ports/net/p5-POE-Component-Server-DNS/pkg/DESCR N ports/net/p5-POE-Component-Server-DNS/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: giova...@cvs.openbsd.org2019/02/07 00:18:18 Log message: Import POE::Component::Client::DNS::Recursive, a POE component that implements a recursive DNS client. ok afresh1@ pkg/DESCR: POE::Component::Client::DNS::Recursive is a POE component that implements a recursive DNS client. POE sessions and components can spawn a POE::Component::Client::DNS::Recursive instance to perform a DNS query. The component will perform its task and return the results to the requesting session. One may also enable tracing of the delegation path from the root name servers for the name being looked up. Status: Vendor Tag: giovanni Release Tags: giovanni_20190207 N ports/net/p5-POE-Component-Client-DNS-Recursive/Makefile N ports/net/p5-POE-Component-Client-DNS-Recursive/distinfo N ports/net/p5-POE-Component-Client-DNS-Recursive/pkg/DESCR N ports/net/p5-POE-Component-Client-DNS-Recursive/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: giova...@cvs.openbsd.org2019/02/07 00:16:08 Log message: Import POE::Filter::DNS::TCP, a POE Filter to handle DNS over TCP connections ok afresh1@ pkg/DESCR: POE::Filter::DNS::TCP is a POE::Filter for parsing and generating DNS messages received from or transmitted (respectively) over TCP as per RFC 1035. Status: Vendor Tag: giovanni Release Tags: giovanni_20190207 N ports/net/p5-POE-Filter-DNS-TCP/Makefile N ports/net/p5-POE-Filter-DNS-TCP/distinfo N ports/net/p5-POE-Filter-DNS-TCP/pkg/DESCR N ports/net/p5-POE-Filter-DNS-TCP/pkg/PLIST No conflicts created by this import
Re: UPDATE: libquicktime - CVE
On Sun, Feb 03, 2019 at 12:52:20AM -0500, Brad Smith wrote: > Fix a bunch of CVE. > > CVE-2016-2399, CVE-2017-9122, CVE-2017-9123, CVE-2017-9124, CVE-2017-9125, > CVE-2017-9126, CVE-2017-9127, CVE-2017-9128 A second rev. One of the patches had a missing chunk. Index: Makefile === RCS file: /home/cvs/ports/multimedia/libquicktime/Makefile,v retrieving revision 1.58 diff -u -p -u -p -r1.58 Makefile --- Makefile24 Oct 2018 14:28:08 - 1.58 +++ Makefile7 Feb 2019 02:21:06 - @@ -3,7 +3,7 @@ COMMENT= library for reading and writing QuickTime files DISTNAME= libquicktime-1.2.4 -REVISION= 12 +REVISION= 13 CATEGORIES=multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libquicktime/} Index: patches/patch-include_lqt_funcprotos_h === RCS file: patches/patch-include_lqt_funcprotos_h diff -N patches/patch-include_lqt_funcprotos_h --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-include_lqt_funcprotos_h 3 Feb 2019 05:41:28 - @@ -0,0 +1,21 @@ +$OpenBSD$ + +CVE-2017-9122, CVE-2017-9123, CVE-2017-9124, CVE-2017-9125, CVE-2017-9126, +CVE-2017-9127, CVE-2017-9128 + +Index: include/lqt_funcprotos.h +--- include/lqt_funcprotos.h.orig include/lqt_funcprotos.h +@@ -1345,9 +1345,9 @@ int quicktime_write_int32_le(quicktime_t *file, long v + int quicktime_write_char32(quicktime_t *file, char *string); + float quicktime_read_fixed16(quicktime_t *file); + int quicktime_write_fixed16(quicktime_t *file, float number); +-unsigned long quicktime_read_uint32(quicktime_t *file); +-long quicktime_read_int32(quicktime_t *file); +-long quicktime_read_int32_le(quicktime_t *file); ++uint32_t quicktime_read_uint32(quicktime_t *file); ++int32_t quicktime_read_int32(quicktime_t *file); ++int32_t quicktime_read_int32_le(quicktime_t *file); + int64_t quicktime_read_int64(quicktime_t *file); + int64_t quicktime_read_int64_le(quicktime_t *file); + long quicktime_read_int24(quicktime_t *file); Index: patches/patch-src_atom_c === RCS file: patches/patch-src_atom_c diff -N patches/patch-src_atom_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_atom_c3 Feb 2019 05:41:00 - @@ -0,0 +1,18 @@ +$OpenBSD$ + +CVE-2017-9122, CVE-2017-9123, CVE-2017-9124, CVE-2017-9125, CVE-2017-9126, +CVE-2017-9127, CVE-2017-9128 + +Index: src/atom.c +--- src/atom.c.orig src/atom.c +@@ -131,6 +131,9 @@ int quicktime_atom_read_header(quicktime_t *file, quic + atom->size = read_size64(header); + atom->end = atom->start + atom->size; + } ++/* Avoid broken files */ ++if(atom->end > file->total_length) ++ result = 1; + } + + Index: patches/patch-src_lqt_quicktime_c === RCS file: patches/patch-src_lqt_quicktime_c diff -N patches/patch-src_lqt_quicktime_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_lqt_quicktime_c 3 Feb 2019 05:41:13 - @@ -0,0 +1,19 @@ +$OpenBSD$ + +CVE-2017-9122, CVE-2017-9123, CVE-2017-9124, CVE-2017-9125, CVE-2017-9126, +CVE-2017-9127, CVE-2017-9128 + +Index: src/lqt_quicktime.c +--- src/lqt_quicktime.c.orig src/lqt_quicktime.c +@@ -1788,8 +1788,8 @@ int quicktime_read_info(quicktime_t *file) + quicktime_set_position(file, start_position); + free(temp); + +-quicktime_read_moov(file, >moov, _atom); +-got_header = 1; ++if(!quicktime_read_moov(file, >moov, _atom)) ++ got_header = 1; + } + else + quicktime_atom_skip(file, _atom); Index: patches/patch-src_moov_c === RCS file: patches/patch-src_moov_c diff -N patches/patch-src_moov_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_moov_c3 Feb 2019 05:40:43 - @@ -0,0 +1,18 @@ +$OpenBSD$ + +CVE-2017-9122, CVE-2017-9123, CVE-2017-9124, CVE-2017-9125, CVE-2017-9126, +CVE-2017-9127, CVE-2017-9128 + +Index: src/moov.c +--- src/moov.c.orig src/moov.c +@@ -218,7 +218,8 @@ int quicktime_read_moov(quicktime_t *file, quicktime_m + if(quicktime_atom_is(_atom, "trak")) + { + quicktime_trak_t *trak = quicktime_add_trak(file); +- quicktime_read_trak(file, trak, _atom); ++ if(quicktime_read_trak(file, trak, _atom)) ++ return 1; + } + else + if(quicktime_atom_is(_atom, "udta")) Index: patches/patch-src_trak_c === RCS file: patches/patch-src_trak_c diff -N patches/patch-src_trak_c --- /dev/null 1 Jan 1970
Re: sysutils/coreutils problem
Awesome, thanks! I just want to run chromium and xfce4. If those can be made, I can wait until libc 95.0 comes to openbsd server. Thank you very much, again Now compiling is going well. Kenji 2019年2月7日(木) 8:22 Stuart Henderson : > On 2019/02/07 07:48, 岡本健二 wrote: > > Thank you very much. > > > > >Is there a particular reason to be building these yourself? Normally > it's > > >recommended to use packages. > > > > Because I cannot pkg_add due to miss-matches of libc version etc. > > My libc version is 95.o, however, many requires 94.0... > > Ah yes - I have been upgrading often recently, so I didn't run into this > :-) > > I have a saved copy of base64.tgz with libc.so.94.0 from which you can > extract libc.so.94.0 if you like, until the new packages are available. > The SHA256.sig is included so you can make sure that it's a genuine > snapshot. > > https://junkpile.org/20190202-amd64/base64.tgz > https://junkpile.org/20190202-amd64/SHA256.sig > >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/02/06 16:31:32 Modified files: graphics/ImageMagick: Makefile distinfo Log message: update to ImageMagick-6.9.10-26
Re: sysutils/coreutils problem
On 2019/02/07 07:48, 岡本健二 wrote: > Thank you very much. > > >Is there a particular reason to be building these yourself? Normally it's > >recommended to use packages. > > Because I cannot pkg_add due to miss-matches of libc version etc. > My libc version is 95.o, however, many requires 94.0... Ah yes - I have been upgrading often recently, so I didn't run into this :-) I have a saved copy of base64.tgz with libc.so.94.0 from which you can extract libc.so.94.0 if you like, until the new packages are available. The SHA256.sig is included so you can make sure that it's a genuine snapshot. https://junkpile.org/20190202-amd64/base64.tgz https://junkpile.org/20190202-amd64/SHA256.sig
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/02/06 16:09:53 Modified files: lang/gcc/8 : Makefile Log message: mark BROKEN-i386: non-ABS relocation R_386_GOTOFF against symbol .LC60
Re: password-store depends on gnupg-1.4.23?
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.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/02/06 16:05:18 Modified files: security/gnupg2: Makefile Log message: add missing PKGSPEC to gnupg2; benno@ noticed that "pkg_delete gnupg-1.4.23p1" required deleting password-store. the latter's dependency is on security/gnupg2 but without a PKGSPEC set here, the default pkgspec of "gnupg-*" was used.
Re: sysutils/coreutils problem
Thank you very much. >Is there a particular reason to be building these yourself? Normally it's >recommended to use packages. Because I cannot pkg_add due to miss-matches of libc version etc. My libc version is 95.o, however, many requires 94.0... Kenji 2019年2月6日(水) 20:37 Stuart Henderson : > On 2019/02/06 19:57, 岡本健二 wrote: > > I'm facing another problem at /usr/ports/sysutils/coreutils: > > > > make install ended eroor, which says: > > > > ... > > checking whether mknod can create fifo... without root privileges... > > configure: error: you should not run configure as root > > (set FORCE_UNSAFE_CONFIGURE=1 in environment to bypass this work) > > > > Yes, I'm running make as root to install the program. > > Ok, export FORCE_UNSAFE_CONFIGUE=1, and then make distclean, and then > > make install again. > > However, this error comes again. > > > > What's going on here? > > > > Kenji > > Set "SUDO=doas" or "SUDO=sudo" in /etc/mk.conf and run "make" as your > normal > user. Ports infrastructure will switch to root as needed (only pkg_add > needs > to run as root - no part of the main ports build/packaging process needs > it). > > Is there a particular reason to be building these yourself? Normally it's > recommended to use packages. > > >
password-store depends on gnupg-1.4.23?
$ 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?
Re: UPDATE: xschem 2.8.1 -> 2.8.2
On Wed, Feb 06, 2019 at 09:00:41PM +0200, Hannu Vuolasaho wrote: > I also noticed the move of the examples and pcb, The examples are > mainly for documentation > and aren't supposed to be used as starting point. Also the pcb has > same fate. pcb directory > isn't needed any more for tEDAx export. Those are provided as > reference and will be redone > or removed when library system is further developed. 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. > The manpage is generated at the end of configure. Configure's --prefix > is expanded when xschem.1.in > is converted to xschem.1 manpage. See scconfig/hooks.c > > scconfig uses @/local/xschem/prefix@ for it's prefix configuration variable. Oh, right; it already did that when I looked at your port before importing it - forgot it by now, sorry.
Re: UPDATE: net/syncthing
Edd Barrett writes: > On Tue, Feb 05, 2019 at 11:44:06PM +0100, Alex Holst wrote: >> I'll follow up with that diff. > > Here's Alex's diff. > > We had a private exchange, and agreed that we'd include stcli (which he > relies on). > > Note that stcli used to be in a separate repo, but it moved into the > main repo. Alex's change just links it to the build. > > We also agreed that we should raise an issue upstream to allow stcli to > talk via local domain socket, or at the very least, accept the password > via a prompt (instead of on the command line or via the environment). > > So just looking for an OK now. OK abieber@ after REVISION is whacked! > > Index: Makefile > === > RCS file: /home/holsta/cvs/ports/net/syncthing/Makefile,v > retrieving revision 1.23 > diff -u -p -r1.23 Makefile > --- Makefile 4 Sep 2018 12:46:19 - 1.23 > +++ Makefile 6 Feb 2019 12:17:42 - > @@ -2,10 +2,10 @@ > > COMMENT =open decentralized synchronization utility > > -V = 0.14.47 > +V = 1.0.1 > DISTNAME = syncthing-${V} > DISTFILES = syncthing-source-v${V}${EXTRACT_SUFX} > REVISION = 0 > > CATEGORIES = net > HOMEPAGE = https://syncthing.net/ > @@ -31,11 +31,15 @@ do-build: > cd ${WRKSRC} && ${MODGO_CMD} run build.go \ > -version v${V} -no-upgrade > > +# Some tests fail, but they are bugs in the test suite itself, not Syncthing. > +# We are working with upstream to fix these: > +# https://forum.syncthing.net/t/openbsd-test-debugging/12799 > do-test: > cd ${WRKSRC} && ${MODGO_CMD} run build.go test > > do-install: > ${INSTALL_PROGRAM} ${WRKSRC}/bin/syncthing ${PREFIX}/bin/ > + ${INSTALL_PROGRAM} ${WRKSRC}/bin/stcli ${PREFIX}/bin/ > .for sec in 1 5 7 > ${INSTALL_MAN} ${WRKSRC}/man/*.${sec} ${PREFIX}/man/man${sec}/ > .endfor > Index: distinfo > === > RCS file: /home/holsta/cvs/ports/net/syncthing/distinfo,v > retrieving revision 1.14 > diff -u -p -r1.14 distinfo > --- distinfo 4 Jun 2018 08:51:48 - 1.14 > +++ distinfo 6 Feb 2019 12:14:53 - > @@ -1,2 +1,2 @@ > -SHA256 (syncthing-source-v0.14.47.tar.gz) = > krNTXKPqeyfFsux3EIiGXNbpHYEaCBa+OaYoOjBn5vM= > -SIZE (syncthing-source-v0.14.47.tar.gz) = 10496524 > +SHA256 (syncthing-source-v1.0.1.tar.gz) = > w2KR786nkN+ds7Z6OaZOMqdzMkiava6CYKKV2ukBWj0= > +SIZE (syncthing-source-v1.0.1.tar.gz) = 6876569 > Index: patches/patch-build_go > === > RCS file: /home/holsta/cvs/ports/net/syncthing/patches/patch-build_go,v > retrieving revision 1.6 > diff -u -p -r1.6 patch-build_go > --- patches/patch-build_go24 Feb 2018 10:14:24 - 1.6 > +++ patches/patch-build_go6 Feb 2019 12:14:53 - > @@ -2,7 +2,28 @@ $OpenBSD: patch-build_go,v 1.6 2018/02/2 > Index: build.go > --- build.go.orig > +++ build.go > -@@ -461,7 +461,7 @@ func appendParameters(args []string, tags []string, ta > +@@ -186,6 +186,20 @@ var targets = map[string]target{ > + {src: "AUTHORS", dst: > "deb/usr/share/doc/syncthing-relaypoolsrv/AUTHORS.txt", perm: 0644}, > + }, > + }, > ++"stcli": { > ++name:"stcli", > ++debname: "stcli", > ++debdeps: []string{"libc6"}, > ++description: "Syncthing Commandline Interface", > ++buildPkg:"github.com/syncthing/syncthing/cmd/stcli", > ++binaryName: "stcli", // .exe will be added automatically for > Windows builds > ++archiveFiles: []archiveFile{ > ++{src: "{{binary}}", dst: "{{binary}}", perm: 0755}, > ++}, > ++installationFiles: []archiveFile{ > ++{src: "{{binary}}", dst: "deb/usr/bin/{{binary}}", > perm: 0755}, > ++}, > ++}, > + } > + > + func init() { > +@@ -490,7 +504,7 @@ func appendParameters(args []string, tags []string, ta > > if !debugBinary { > // Regular binaries get version tagged and skip some debug > symbols > Index: pkg/PLIST > === > RCS file: /home/holsta/cvs/ports/net/syncthing/pkg/PLIST,v > retrieving revision 1.4 > diff -u -p -r1.4 PLIST > --- pkg/PLIST 4 Sep 2018 12:46:19 - 1.4 > +++ pkg/PLIST 6 Feb 2019 12:14:59 - > @@ -1,7 +1,15 @@ > @comment $OpenBSD: PLIST,v 1.4 2018/09/04 12:46:19 espie Exp $ > @newgroup _syncthing:768 > @newuser _syncthing:768:_syncthing:daemon:Syncthing > user:${VARBASE}/syncthing:/sbin/nologin > +@rcscript ${RCDIR}/syncthing > +@owner _syncthing > +@group _syncthing > +@sample ${VARBASE}/syncthing/ > +@extraunexec rm -rf ${VARBASE}/syncthing/{.,}* > +@owner > +@group > @bin bin/syncthing > +@bin bin/stcli > @man man/man1/stdiscosrv.1 > @man man/man1/strelaysrv.1 > @man man/man1/syncthing.1 > @@
Split games/minetest into main, server and data subpackages
Hi! This split is based on what Arch Linux have already done. Also I am willing to take maintainership of this port. Note that this game doesn't link to libpq, but it still builds with PostgreSQL support. Index: Makefile === RCS file: /cvs/ports/games/minetest/Makefile,v retrieving revision 1.28 diff -u -p -u -p -r1.28 Makefile --- Makefile2 Nov 2018 18:48:39 - 1.28 +++ Makefile6 Feb 2019 20:11:22 - @@ -1,23 +1,33 @@ # $OpenBSD: Makefile,v 1.28 2018/11/02 18:48:39 naddy Exp $ -COMMENT = infinite-world block sandbox game -# minetest_game is still 0.4.17 -# this is engine's bug fix release -GAME_V = 0.4.17 -V =${GAME_V}.1 +COMMENT-main = Infinite-world block sandbox game client +COMMENT-server = Infinite-world block sandbox game server +COMMENT-data = Minetest game data +GAME_V = 0.4.17.1 +V =${GAME_V} DISTNAME = minetest-${V} +PKGNAME-main = minetest-${V} +PKGNAME-server = minetest-server-${V} +PKGNAME-data = minetest-data-${V} CATEGORIES = games x11 -REVISION = 4 +REVISION-main =5 HOMEPAGE = http://www.minetest.net/ +MAINTAINER = Leonid Bobrov + # source LGPLv2.1/ datas CC BY-SA 3.0 PERMIT_PACKAGE_CDROM = Yes -WANTLIB += ${COMPILER_LIBCXX} GL GLU ICE Irrlicht SM X11 Xext -WANTLIB += Xxf86vm bz2 c curl curses form freetype gmp iconv intl -WANTLIB += jpeg luajit-${MODLUA_VERSION} m ogg openal png pq -WANTLIB += spatialindex sqlite3 vorbis vorbisfile z +MULTI_PACKAGES = -main -server -data + +WANTLIB-server += ${COMPILER_LIBCXX} c curl curses form gmp hiredis +WANTLIB-server += iconv intl jsoncpp leveldb luajit-${MODLUA_VERSION} +WANTLIB-server += m spatialindex sqlite3 z + +WANTLIB-main += ${WANTLIB-server} GL GLU ICE Irrlicht SM X11 Xext +WANTLIB-main += Xxf86vm bz2 freetype jpeg ogg openal png16 +WANTLIB-main += vorbis vorbisfile COMPILER = base-clang ports-gcc base-gcc @@ -29,31 +39,47 @@ DISTFILES = minetest-{minetest/archive/ MODULES = devel/cmake \ lang/lua -CONFIGURE_ARGS = -DENABLE_GETTEXT=ON -DCUSTOM_MANDIR=${PREFIX}/man -CONFIGURE_ARGS+= -DENABLE_REDIS=FALSE -DENABLE_LEVELDB=FALSE -CONFIGURE_ARGS+= -DBUILD_SERVER=TRUE +MODLUA_RUNDEP =No + +CONFIGURE_ARGS = -DBUILD_SERVER=TRUE \ + -DCUSTOM_MANDIR=${PREFIX}/man \ + -DENABLE_GETTEXT=TRUE \ + -DENABLE_SYSTEM_JSONCPP=TRUE \ + -DUSE_GPROF=TRUE CONFIGURE_ENV += CXXFLAGS="-I${X11BASE}/include" -BUILD_DEPENDS =devel/gettext-tools +BUILD_DEPENDS =devel/gettext-tools \ + devel/doxygen -RUN_DEPENDS = devel/desktop-file-utils \ +RUN_DEPENDS-main = devel/desktop-file-utils \ + games/minetest,-data \ x11/gtk+3,-guic -LIB_DEPENDS = audio/openal \ - devel/gmp \ - databases/sqlite3 \ +RUN_DEPENDS-server = games/minetest,-data + +cLIB_DEPENDS = databases/leveldb \ + databases/libhiredis \ databases/postgresql \ + databases/sqlite3 \ + devel/gmp \ + devel/jsoncpp \ geo/spatialindex \ - audio/libvorbis \ lang/luajit \ - net/curl \ + net/curl + +LIB_DEPENDS-main = ${cLIB_DEPENDS} \ + audio/libvorbis \ + audio/openal \ x11/irrlicht +LIB_DEPENDS-server = ${cLIB_DEPENDS} \ + devel/gettext + NO_TEST = Yes post-install: mv ${WRKDIR}/minetest_game-${GAME_V}/ \ - ${PREFIX}/share/minetest/games/minetest_game + ${PREFIX}/share/minetest/games/minetest_game chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/minetest/games/minetest_game .include Index: distinfo === RCS file: /cvs/ports/games/minetest/distinfo,v retrieving revision 1.9 diff -u -p -u -p -r1.9 distinfo --- distinfo25 Jun 2018 20:02:06 - 1.9 +++ distinfo6 Feb 2019 20:11:22 - @@ -1,4 +1,4 @@ SHA256 (minetest-0.4.17.1.tar.gz) = zSXUDFP0kjJe2r0vY5clD0CmHLn+Sh1N1usDDg0c61k= -SHA256 (minetest-game-0.4.17.tar.gz) = 8KsHy0fBVAsgFr92o24u7Ciw6ngnv2b8VEfgxeXUSV0= +SHA256 (minetest-game-0.4.17.1.tar.gz) = JtXqB1AychmMkuaE780wj41F+49ietYKpTwybgLpECw= SIZE (minetest-0.4.17.1.tar.gz) = 7758675 -SIZE (minetest-game-0.4.17.tar.gz) = 1356784 +SIZE (minetest-game-0.4.17.1.tar.gz) = 1356682 Index:
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2019/02/06 13:02:04 Modified files: net/curl : Tag: OPENBSD_6_4 Makefile Added files: net/curl/patches: Tag: OPENBSD_6_4 patch-lib_smtp_c patch-lib_vauth_ntlm_c Log message: Security fixes: CVE-2018-16890: NTLM type-2 out-of-bounds buffer read CVE-2019-3822: NTLMv2 type-3 header stack buffer overflow CVE-2019-3823: SMTP end-of-response out-of-bounds read
Re: Update net/toxcore and take maintainership back
On Wed, Feb 06, 2019 at 01:09:13PM -0500, Brian Callahan wrote: > I think we're looking at two independent issues: > 1. Does the bootstrap daemon work? > 2. Does it work through init with a fancy rcctl script? > > The answer to question 1 is unequivocally "yes" since I was running it on my > machine and it worked. The answer to question 2 is a little trickier. At the > moment it seems to be "no" but in reality it's more like "not yet." > > Because the answer to question 1 is yes, I think we should return to > building and shipping the daemon. Because toxcore is a dependency of other > ports, I don't think the answer to question 2 should block the update but it > should be something to be worked on for future inclusion (or more likely > upstreaming). > > ~Brian > Ok, I'll try to take a work on rcctl later, meanwhile this diff is ready to commit: Index: Makefile === RCS file: /cvs/ports/net/toxcore/Makefile,v retrieving revision 1.3 diff -u -p -u -p -r1.3 Makefile --- Makefile9 Aug 2018 23:25:58 - 1.3 +++ Makefile6 Feb 2019 19:29:02 - @@ -2,22 +2,22 @@ COMMENT = Tox client library -V =0.2.3 -REVISION = 0 +V =0.2.9 DISTNAME = toxcore-$V GH_ACCOUNT = TokTok GH_PROJECT = c-toxcore GH_TAGNAME = v$V -SHARED_LIBS += toxcore 0.1 # 0.1 +SHARED_LIBS += toxcore 0.2 # 2.9 CATEGORIES = net telephony HOMEPAGE = https://tox.chat/ +MAINTAINER = Leonid Bobrov + # GPLv3+ PERMIT_PACKAGE_CDROM = Yes - WANTLIB = c config m opus pthread sodium vpx Index: distinfo === RCS file: /cvs/ports/net/toxcore/distinfo,v retrieving revision 1.2 diff -u -p -u -p -r1.2 distinfo --- distinfo26 Jun 2018 20:34:04 - 1.2 +++ distinfo6 Feb 2019 19:29:02 - @@ -1,2 +1,2 @@ -SHA256 (toxcore-0.2.3.tar.gz) = IsUvKGxG0/gC7baXi88qU/gwE2Pit0V4RhNCejO6OjQ= -SIZE (toxcore-0.2.3.tar.gz) = 471336 +SHA256 (toxcore-0.2.9.tar.gz) = qMlicJRH+5sMuxqQ7BlFobLScrTTIjVsSKTjiCsSZ+c= +SIZE (toxcore-0.2.9.tar.gz) = 510806 Index: pkg/PLIST === RCS file: /cvs/ports/net/toxcore/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 PLIST --- pkg/PLIST 29 Apr 2018 11:14:09 - 1.1.1.1 +++ pkg/PLIST 6 Feb 2019 19:29:02 - @@ -1,4 +1,5 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2018/04/29 11:14:09 landry Exp $ +@bin bin/DHT_bootstrap @bin bin/tox-bootstrapd include/tox/ include/tox/tox.h
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2019/02/06 12:07:12 Modified files: textproc/py-natsort: Makefile distinfo Log message: update to py-natsort-6.0.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2019/02/06 12:06:48 Modified files: textproc/pdfpc : Makefile distinfo Log message: update to pdfpc-4.3.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2019/02/06 12:03:12 Modified files: devel/p5-Config-IniFiles: Makefile distinfo Log message: update to p5-Config-IniFiles-3.01
Re: UPDATE: xschem 2.8.1 -> 2.8.2
Hi! I also noticed the move of the examples and pcb, The examples are mainly for documentation and aren't supposed to be used as starting point. Also the pcb has same fate. pcb directory isn't needed any more for tEDAx export. Those are provided as reference and will be redone or removed when library system is further developed. So they shouldn't be cluttering system library. The manpage is generated at the end of configure. Configure's --prefix is expanded when xschem.1.in is converted to xschem.1 manpage. See scconfig/hooks.c scconfig uses @/local/xschem/prefix@ for it's prefix configuration variable. Best regards, Hannu Vuolasaho ma 4. helmik. 2019 klo 21.43 Klemens Nanni (k...@openbsd.org) kirjoitti: > > Your diff does not apply. > > Examples are now installed into the wrong location, can you fix that? > > xschem.1 now has hardcoded paths in it, they need the same replacing > as before, so instead of removing the patch and SUBST_CMD, simply update > the patch.
Re: enigmail and thunderbird
On 2/6/19 8:47 AM, Otto Moerbeek wrote: > Hi, > > on current enigmail does not seem to work well, if the passphrase in > gpg-agent is expired, it does not present a dialog to get it and > signing fails. If I seperately update the passpharse in gpg-agent via > a command line request enigmail is able to sign. > > Is this known? Any possible fix? > untested diff follows. Cheers Giovanni Index: Makefile === RCS file: /var/cvs/ports/mail/enigmail/Makefile,v retrieving revision 1.45 diff -u -p -r1.45 Makefile --- Makefile 5 Oct 2018 18:53:33 - 1.45 +++ Makefile 6 Feb 2019 18:19:44 - @@ -5,7 +5,7 @@ ONLY_FOR_ARCHS = i386 amd64 powerpc spar COMMENT-main = GnuPG extension for Thunderbird COMMENT-seamonkey = GnuPG extension for Seamonkey -V = 2.0.8 +V = 2.0.9 DISTNAME = enigmail-${V} PKGNAME-main = ${PKGNAME} PKGNAME-seamonkey = enigmail-seamonkey-${V} Index: distinfo === RCS file: /var/cvs/ports/mail/enigmail/distinfo,v retrieving revision 1.25 diff -u -p -r1.25 distinfo --- distinfo 5 Oct 2018 18:53:33 - 1.25 +++ distinfo 6 Feb 2019 18:19:50 - @@ -1,2 +1,2 @@ -SHA256 (enigmail-2.0.8.tar.gz) = 9sTwVcf9r0NHOe+Ae5qLHSpEihGCIRPVGIPQUmLRUtc= -SIZE (enigmail-2.0.8.tar.gz) = 2525691 +SHA256 (enigmail-2.0.9.tar.gz) = +gMJwHCJgqSUI5fpF7h/dUJWip/vZL2vUD8NAPqsmlE= +SIZE (enigmail-2.0.9.tar.gz) = 2541100 Index: patches/patch-Makefile === RCS file: /var/cvs/ports/mail/enigmail/patches/patch-Makefile,v retrieving revision 1.1 diff -u -p -r1.1 patch-Makefile --- patches/patch-Makefile 4 Sep 2016 14:58:59 - 1.1 +++ patches/patch-Makefile 6 Feb 2019 18:23:30 - @@ -1,7 +1,17 @@ $OpenBSD: patch-Makefile,v 1.1 2016/09/04 14:58:59 giovanni Exp $ Makefile.orig Fri Jun 10 15:08:01 2016 -+++ Makefile Fri Jun 10 15:08:34 2016 -@@ -33,7 +33,7 @@ xpi: +Index: Makefile +--- Makefile.orig Makefile +@@ -3,7 +3,7 @@ + # file, You can obtain one at https://mozilla.org/MPL/2.0/. + + XPI_MODULE = enigmail +-XPI_MODULE_VERS = 2.0.8 ++XPI_MODULE_VERS = 2.0.9 + + DEPTH = . + +@@ -32,7 +32,7 @@ xpi: $(DIRS) $(srcdir)/util/genxpi $(XPIFILE) $(XPI_MODULE_VERS) $(DIST) $(srcdir) $(XPI_MODULE) $(ENABLE_LANG) check:
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2019/02/06 11:22:15 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: update CVE entry for net/curl; reminded by danj@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2019/02/06 11:14:05 Modified files: net/curl : Makefile distinfo net/curl/pkg : PLIST Log message: Update to 7.64.0. Includes fixes for CVE-2018-16890: NTLM type-2 out-of-bounds buffer read CVE-2019-3822: NTLMv2 type-3 header stack buffer overflow CVE-2019-3823: SMTP end-of-response out-of-bounds read
Re: Update net/toxcore and take maintainership back
On 2/6/19 11:15 AM, Leonid Bobrov wrote: Hi Brian! First, I tried setting up daemon at init level, I added to /usr/ports/infrastructure/db/user.list the following: 831 _toxdht _toxdht net/toxcore Then I added toxdht.rc to net/toxcore/pkg with contents: ``` #!/bin/ksh daemon="${TRUEPREFIX}/bin/tox-bootstrapd --config /etc/tox-bootstrapd.conf" . /etc/rc.d/rc.subr rc_pre() { rm -f /var/run/tox-bootstrapd/tox-bootstrapd.pid } ``` Then I appended to plist (with post-install target in Makefile to have sample configuration file): ``` @newgroup _toxdht:831 @newuser _toxdht:831:831:daemon:Tox DHT bootstrap daemon:/var/lib/tox-bootstrapd:/sbin/nologin @rcscript ${RCDIR}/toxdht share/examples/tox-bootstrapd/tox-bootstrapd.conf.sample @sample ${SYSCONFDIR}/tox-bootstrapd.conf @mode 750 @owner _toxdht @group _toxdht @sample /var/lib/tox-bootstrapd/ @mode 755 @sample /var/run/tox-bootstrapd/ ``` After that I ran `rcctl start toxdht` and got output "toxdht(ok)", it created /var/run/tox-bootstrapd/tox-bootstrapd.pid file and exited, I couldn't find it by running both ps(1) (with -aux flags) and top(1), then I tried manually running it: ``` $ doas -u _toxdht tox-bootstrapd --config /etc/tox-boostrapd.conf $ echo $? 0 ``` Again it created /var/run/tox-bootstrapd/tox-bootstrapd.pid file, but again I couldn't find its process. Here's default config I used: https://github.com/TokTok/c-toxcore/blob/master/other/bootstrap_daemon/tox-bootstrapd.conf I can't understand how to make it run at init level. I think we're looking at two independent issues: 1. Does the bootstrap daemon work? 2. Does it work through init with a fancy rcctl script? The answer to question 1 is unequivocally "yes" since I was running it on my machine and it worked. The answer to question 2 is a little trickier. At the moment it seems to be "no" but in reality it's more like "not yet." Because the answer to question 1 is yes, I think we should return to building and shipping the daemon. Because toxcore is a dependency of other ports, I don't think the answer to question 2 should block the update but it should be something to be worked on for future inclusion (or more likely upstreaming). ~Brian
Re: Improve net/utox and take maintainership back
I've fixed \n\r line endings problem, but I can't send that properly as a plain text patch (emacs and neomutt are amazing), so I am attaching a tarball where you can run `cvs diff -uNp`: utox.tar.gz Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/02/06 09:41:56 Modified files: www/chromium : Makefile distinfo www/chromium/patches: patch-BUILD_gn patch-ash_display_mirror_window_controller_cc patch-base_BUILD_gn patch-base_debug_stack_trace_posix_cc patch-base_process_launch_h patch-base_process_process_metrics_openbsd_cc patch-base_process_process_posix_cc patch-base_threading_platform_thread_linux_cc patch-base_threading_platform_thread_posix_cc patch-build_config_BUILDCONFIG_gn patch-build_config_BUILD_gn patch-build_config_compiler_BUILD_gn patch-build_config_compiler_compiler_gni patch-build_toolchain_gcc_toolchain_gni patch-cc_BUILD_gn patch-chrome_app_chrome_main_delegate_cc patch-chrome_app_chromium_strings_grd patch-chrome_app_generated_resources_grd patch-chrome_app_google_chrome_strings_grd patch-chrome_app_settings_strings_grdp patch-chrome_browser_about_flags_cc patch-chrome_browser_after_startup_task_utils_cc patch-chrome_browser_apps_platform_apps_api_music_manager_private_device_id_linux_cc patch-chrome_browser_browser_process_impl_cc patch-chrome_browser_browser_process_impl_h patch-chrome_browser_browser_resources_grd patch-chrome_browser_chrome_browser_main_cc patch-chrome_browser_chrome_content_browser_client_cc patch-chrome_browser_chrome_content_browser_client_h patch-chrome_browser_download_chrome_download_manager_delegate_cc patch-chrome_browser_download_download_prefs_cc patch-chrome_browser_extensions_BUILD_gn patch-chrome_browser_extensions_bookmark_app_helper_cc patch-chrome_browser_extensions_browser_context_keyed_service_factories_cc patch-chrome_browser_first_run_first_run_internal_posix_cc patch-chrome_browser_flag_descriptions_cc patch-chrome_browser_flag_descriptions_h patch-chrome_browser_media_webrtc_webrtc_log_uploader_cc patch-chrome_browser_metrics_chrome_metrics_service_client_cc patch-chrome_browser_net_system_network_context_manager_cc patch-chrome_browser_prefs_browser_prefs_cc patch-chrome_browser_prefs_pref_service_incognito_whitelist_cc patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles_cc patch-chrome_browser_profiles_profile_io_data_cc patch-chrome_browser_resources_plugin_metadata_plugins_linux_json patch-chrome_browser_safe_browsing_incident_reporting_incident_reporting_service_cc patch-chrome_browser_sync_chrome_sync_client_cc patch-chrome_browser_task_manager_sampling_task_group_cc patch-chrome_browser_task_manager_sampling_task_group_h patch-chrome_browser_task_manager_sampling_task_group_sampler_cc patch-chrome_browser_task_manager_sampling_task_manager_impl_cc patch-chrome_browser_ui_browser_command_controller_cc patch-chrome_browser_ui_browser_window_h patch-chrome_browser_ui_tab_helpers_cc patch-chrome_browser_ui_task_manager_task_manager_table_model_cc patch-chrome_browser_ui_toolbar_app_menu_model_cc patch-chrome_browser_ui_views_chrome_browser_main_extra_parts_views_cc patch-chrome_browser_ui_views_chrome_views_delegate_h patch-chrome_browser_ui_views_frame_browser_frame_cc patch-chrome_browser_ui_views_frame_browser_view_cc
Re: Update net/toxic and take maintainership back
On Wed, Feb 06, 2019 at 10:55:47AM -0500, Brian Callahan wrote: > Just PREFIX=${PREFIX} here. Same with MANDIR, just PREFIX instead of > TRUEPREFIX. > Otherwise this looks ok. I was able to connect to my server. But I have no > friends on tox and therefore no one to talk to so I can't test beyond that. > > ~Brian > Ok, done. BTW, you can contact me, run: /add BC252E4D78BADE36A9DED84CD55A872082282E1A425C77403C5170642533EC27910AC1B25BBB Index: Makefile === RCS file: /cvs/ports/net/toxic/Makefile,v retrieving revision 1.4 diff -u -p -u -p -r1.4 Makefile --- Makefile9 Aug 2018 23:25:58 - 1.4 +++ Makefile6 Feb 2019 10:12:39 - @@ -2,17 +2,18 @@ COMMENT = ncurses-based Tox client -GH_ACCOUNT = Jfreegman +GH_ACCOUNT = TokTok GH_PROJECT = toxic -GH_TAGNAME = v0.8.2 -REVISION = 2 +GH_TAGNAME = v0.8.3 CATEGORIES = net +MAINTAINER = Leonid Bobrov + # GPLv3+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB += alut c config curses curl intl m openal png pthread +WANTLIB += alut c config curses curl intl m openal png16 pthread WANTLIB += qrencode toxcore util z ${MODPY_WANTLIB} LIB_DEPENDS = audio/freealut \ @@ -21,8 +22,10 @@ LIB_DEPENDS =audio/freealut \ net/curl \ graphics/libqrencode -MAKE_ENV +=ENABLE_PYTHON=1 \ - USER_CFLAGS="${CFLAGS}" +MAKE_ENV +=ENABLE_PYTHON=1 +FAKE_FLAGS += PREFIX=${PREFIX} \ + MANDIR=${PREFIX}/man + MODULES = lang/python MODPY_VERSION =${MODPY_DEFAULT_VERSION_3} CONFIGURE_STYLE = none Index: distinfo === RCS file: /cvs/ports/net/toxic/distinfo,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 distinfo --- distinfo29 Apr 2018 11:16:30 - 1.1.1.1 +++ distinfo6 Feb 2019 10:12:39 - @@ -1,2 +1,2 @@ -SHA256 (toxic-0.8.2.tar.gz) = U72+09ctAA+eQ7iCNSPFiVQLgRvCN+1vO03fD+b5prc= -SIZE (toxic-0.8.2.tar.gz) = 1146526 +SHA256 (toxic-0.8.3.tar.gz) = l/JrosJXwQQ5/S/ygMqQw37SJdhvRnQKCPAv8uRFng4= +SIZE (toxic-0.8.3.tar.gz) = 1147100 Index: patches/patch-Makefile === RCS file: /cvs/ports/net/toxic/patches/patch-Makefile,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-Makefile --- patches/patch-Makefile 29 Apr 2018 11:16:30 - 1.1.1.1 +++ patches/patch-Makefile 6 Feb 2019 10:12:39 - @@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2018/ Index: Makefile --- Makefile.orig +++ Makefile -@@ -62,20 +62,17 @@ OBJ := $(addprefix $(BUILD_DIR)/, $(OBJ)) +@@ -57,20 +57,17 @@ OBJ := $(addprefix $(BUILD_DIR)/, $(OBJ)) all: $(BUILD_DIR)/toxic $(BUILD_DIR)/toxic: $(OBJ)
[UPDATE] audio/abcde 2.9.2 -> 2.9.3
Hi ports, abcde 2.9.3 has been released yesterday, so here is an update! What's new upstream [1]: - Replace non portable sed code with a simple awk statement - Deal with bizarre cdda2wav behaviour when doing cdtext lookup - Add support for detecting if recode is installed when the mungefilename directive is used in abcde.conf What's new in the port: - Changed my MAINTAINER mail address - Dropped the upstreamed patch What i've tested successfully, with the default abcde.conf: - ripping to wav, mp3, flac, ogg - embedded album art - musicbrainz support Any comments/feedback? Charlène. [1] https://git.einval.com/cgi-bin/gitweb.cgi?p=abcde.git;a=blob_plain;f=changelog;h=e72086e88e069b5ec5a24b93672b1a1da2aa2d89;hb=HEAD Index: Makefile === RCS file: /cvs/ports/audio/abcde/Makefile,v retrieving revision 1.28 diff -u -p -u -p -r1.28 Makefile --- Makefile31 Aug 2018 08:48:12 - 1.28 +++ Makefile6 Feb 2019 14:14:59 - @@ -2,13 +2,13 @@ COMMENT= command-line utility to rip and encode audio cds -DISTNAME= abcde-2.9.2 +DISTNAME= abcde-2.9.3 EPOCH= 0 CATEGORIES=audio HOMEPAGE= https://abcde.einval.com/ -MAINTAINER=Charlene Wendling +MAINTAINER=Charlene Wendling # Artistic or GPLv2+ PERMIT_PACKAGE_CDROM= Yes Index: distinfo === RCS file: /cvs/ports/audio/abcde/distinfo,v retrieving revision 1.14 diff -u -p -u -p -r1.14 distinfo --- distinfo31 Aug 2018 08:48:12 - 1.14 +++ distinfo6 Feb 2019 14:14:59 - @@ -1,2 +1,2 @@ -SHA256 (abcde-2.9.2.tar.gz) = NDVsbqTMObM8gHJhv9+OjaiQWy7VAxMUfHiyg+72hY0= -SIZE (abcde-2.9.2.tar.gz) = 160799 +SHA256 (abcde-2.9.3.tar.gz) = BGzQu6eN1LvcvPgv5iWGXGDfNaAFSC3hOmaZxaO4MSQ= +SIZE (abcde-2.9.3.tar.gz) = 160876 Index: patches/patch-abcde === RCS file: patches/patch-abcde diff -N patches/patch-abcde --- patches/patch-abcde 31 Aug 2018 08:48:12 - 1.10 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,15 +0,0 @@ -$OpenBSD: patch-abcde,v 1.10 2018/08/31 08:48:12 landry Exp $ -Fix tracks offsets list gathering, will be fixed for v2.9.3 -Upstream commit 8de69dd9476d40b4d61b25532f0a22acd932d765 -Index: abcde abcde.orig -+++ abcde -@@ -2110,7 +2110,7 @@ do_discid () - CDPARANOIAAUDIOTRACKS="$TRACKS" - - LEADOUT="$(echo "$CDPARANOIAOUTPUT" | grep -Eo '^TOTAL[[:space:]]+([[:digit:]]+)' | get_last)" -- OFFSETS="$(echo "$CDPARANOIAOUTPUT" | sed -n -e's/^ .* \([0-9]\+\) \[.*/\1/p')" -+ OFFSETS="$(echo "$CDPARANOIAOUTPUT" | awk '/^ +.*\[/ {print $4}')" - makeids - ;; - *)
Re: Improve net/utox and take maintainership back
It's useless, I've just checked the MIME version of this patch, uTox port will wait, I'll make complete DOS2UNIX conversion then.
Re: Improve net/utox and take maintainership back
On Wed, Feb 06, 2019 at 10:59:18AM -0500, Brian Callahan wrote: > This diff failed to apply (patches/patch-CMakeLists_txt failed). > > ~Brian > I guess I know why: it contains weird ^M symbols at the end of each line and I guess Emacs didn't copy them, this time I'll attach it with MIME, try it: Index: Makefile === RCS file: /cvs/ports/net/utox/Makefile,v retrieving revision 1.5 diff -u -p -u -p -r1.5 Makefile --- Makefile12 Sep 2018 19:33:25 - 1.5 +++ Makefile6 Feb 2019 13:03:53 - @@ -7,17 +7,19 @@ V = 0.17.0 DISTNAME = uTox-${V}-full PKGNAME = utox-${V} MASTER_SITES = https://github.com/uTox/uTox/releases/download/v${V}/ -REVISION = 2 +REVISION = 3 CATEGORIES = net HOMEPAGE = https://utox.io +MAINTAINER = Leonid Bobrov + # MIT PERMIT_PACKAGE_CDROM = Yes -WANTLIB += ICE SM X11 Xext Xrender c fontconfig freetype m pthread -WANTLIB += openal opus sodium toxcore v4lconvert vpx +WANTLIB += ICE SM X11 Xext Xrender c dbus-1 fontconfig freetype +WANTLIB += m openal opus pthread sodium toxcore v4lconvert vpx MODULES = devel/cmake @@ -26,14 +28,15 @@ RUN_DEPENDS = devel/desktop-file-utils \ LIB_DEPENDS += audio/openal \ multimedia/libv4l \ - net/toxcore + net/toxcore \ + x11/dbus COMPILER = base-clang ports-gcc -NO_TEST = yes - WRKDIST = ${WRKDIR}/uTox -CONFIGURE_ARGS =-DLLD_EMUL:String=${LLD_EMUL} +CONFIGURE_ARGS =-DLLD_EMUL:String=${LLD_EMUL} \ + -DENABLE_FILTERAUDIO=Off \ + -DENABLE_TESTS=On .include Index: patches/patch-CMakeLists_txt === RCS file: /cvs/ports/net/utox/patches/patch-CMakeLists_txt,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt29 Apr 2018 11:15:17 - 1.1.1.1 +++ patches/patch-CMakeLists_txt6 Feb 2019 13:03:53 - @@ -1,27 +1,76 @@ -$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2018/04/29 11:15:17 landry Exp $ +$OpenBSD$ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -184,8 +184,8 @@ add_cflag("-fPIC") +@@ -1,5 +1,4 @@ + cmake_minimum_required(VERSION 3.2) +-set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6 CACHE STRING "Minimum OS X deployment version") + project(uTox LANGUAGES C) + + # +@@ -31,13 +30,12 @@ if(WIN32) + set(WINDOWS TRUE) + elseif(APPLE) + if(CMAKE_SYSTEM_NAME MATCHES ".*MacOS.*") ++set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6 CACHE STRING "Minimum OS X deployment version") + set(MACOSX TRUE) + endif() + elseif(UNIX) + if(CMAKE_SYSTEM_NAME MATCHES ".*Linux") + set(LINUX TRUE) +-elseif(CMAKE_SYSTEM_NAME MATCHES "kOpenBSD.*|OpenBSD.*") +-set(OPENBSD TRUE) + elseif(CMAKE_SYSTEM_NAME MATCHES "kNetBSD.*|NetBSD.*") + set(NETBSD TRUE) + elseif(CMAKE_SYSTEM_NAME MATCHES "kFreeBSD.*|FreeBSD") +@@ -103,12 +101,10 @@ if(WINDOWS AND NOT CROSS_COMPILING) + # Helping Cygwin out again.. + set(WIN64 TRUE) + endif() +-elseif(FREEBSD) +-include(cmake/toolchain-freebsd.cmake) +-elseif(OPENBSD OR NETBSD) +-include(cmake/toolchain-openbsd.cmake) + elseif(APPLE) + include(cmake/macOS.cmake) ++elseif(FREEBSD) ++set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/local/lib" CACHE STRING "" FORCE) + endif() + + +@@ -184,8 +180,7 @@ add_cflag("-fPIC") # Fix GNU stack if(CMAKE_C_COMPILER_ID MATCHES "GNU") # Have ld strip the symbols from Release and MinSizeRel build types. -set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Os") -set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os -s") -+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -s") if(LINUX) # enable Link Time Optimization on gcc (linux only currently) -@@ -220,8 +220,8 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang") +@@ -220,9 +215,12 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang") endif() # Have ld strip the symbols from Release and MinSizeRel build types. (-Oz is clang specific) -set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Os") -set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Oz -s") -+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ") +set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -s") ++if(FREEBSD) ++set(LIBRARIES ${LIBRARIES} "cxxrt") ++endif() ++ if(NOT ENABLE_ASAN) if(NOT APPLE) + add_cflag("-fsanitize=safe-stack") +@@ -303,6 +301,9 @@ elseif(APPLE) + add_definitions("-x objective-c") + add_subdirectory(src/cocoa) + elseif(UNIX) ++find_package(X11 REQUIRED) ++include_directories(${X11_INCLUDE_DIR}) ++ + add_subdirectory(src/xlib) +
Re: Update: www/py-httpbin-0.5.0p1
On Wed, Feb 06, 2019 at 03:11:08PM +, Linda Lapinlampi wrote: > Hi maintainer, a small revision update here. If I may, here's a new diff which also pulls a patch from Debian to also unconditionally disable tracking beacons from py-httpbin. Index: Makefile === RCS file: /cvs/ports/www/py-httpbin/Makefile,v retrieving revision 1.4 diff -u -p -u -p -r1.4 Makefile --- Makefile 3 Jan 2017 19:28:48 - 1.4 +++ Makefile 6 Feb 2019 16:14:38 - @@ -5,11 +5,12 @@ COMMENT = HTTP request and response ser MODPY_EGG_VERSION = 0.5.0 DISTNAME = httpbin-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 0 +REVISION = 1 CATEGORIES = www -HOMEPAGE = https://github.com/Runscope/httpbin +MASTER_SITES0 = https://salsa.debian.org/python-team/applications/httpbin/raw/debian/0.5.0+dfsg-1/debian/patches/ +PATCHFILES = landing-page-privacy-breach.patch:0 MAINTAINER = Alexandr Shadchin @@ -31,5 +32,7 @@ FLAVORS = python3 FLAVOR ?= NO_TEST = Yes + +MAKE_ENV += LC_CTYPE=en_US.UTF-8 .include Index: distinfo === RCS file: /cvs/ports/www/py-httpbin/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- distinfo 19 Aug 2016 07:39:05 - 1.3 +++ distinfo 6 Feb 2019 16:14:38 - @@ -1,2 +1,4 @@ SHA256 (httpbin-0.5.0.tar.gz) = efvF0n5BlOqQiw+hjgmlnZXSh8kWZ6ppvNAQNC0VibU= +SHA256 (landing-page-privacy-breach.patch) = NVQ8hq9BSHNAfQDgpPL777YgQGVpfTig2IvCHNF8vgk= SIZE (httpbin-0.5.0.tar.gz) = 88698 +SIZE (landing-page-privacy-breach.patch) = 653 Index: patches/patch-setup_py === RCS file: patches/patch-setup_py diff -N patches/patch-setup_py --- patches/patch-setup_py 19 Aug 2016 07:39:05 - 1.2 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,15 +0,0 @@ -$OpenBSD: patch-setup_py,v 1.2 2016/08/19 07:39:05 shadchin Exp $ setup.py.orig Thu Aug 11 05:49:19 2016 -+++ setup.py Thu Aug 18 10:14:50 2016 -@@ -1,8 +1,9 @@ - from setuptools import setup, find_packages - import os -+import codecs - --long_description = open( --os.path.join(os.path.dirname(__file__), 'README.rst')).read() -+long_description = codecs.open( -+os.path.join(os.path.dirname(__file__), 'README.rst'), encoding='utf-8').read() - - setup( - name="httpbin",
Re: UPDATE: net/syncthing
On Tue, Feb 05, 2019 at 11:44:06PM +0100, Alex Holst wrote: > I'll follow up with that diff. Here's Alex's diff. We had a private exchange, and agreed that we'd include stcli (which he relies on). Note that stcli used to be in a separate repo, but it moved into the main repo. Alex's change just links it to the build. We also agreed that we should raise an issue upstream to allow stcli to talk via local domain socket, or at the very least, accept the password via a prompt (instead of on the command line or via the environment). So just looking for an OK now. Index: Makefile === RCS file: /home/holsta/cvs/ports/net/syncthing/Makefile,v retrieving revision 1.23 diff -u -p -r1.23 Makefile --- Makefile4 Sep 2018 12:46:19 - 1.23 +++ Makefile6 Feb 2019 12:17:42 - @@ -2,10 +2,10 @@ COMMENT = open decentralized synchronization utility -V =0.14.47 +V =1.0.1 DISTNAME = syncthing-${V} DISTFILES =syncthing-source-v${V}${EXTRACT_SUFX} REVISION = 0 CATEGORIES = net HOMEPAGE = https://syncthing.net/ @@ -31,11 +31,15 @@ do-build: cd ${WRKSRC} && ${MODGO_CMD} run build.go \ -version v${V} -no-upgrade +# Some tests fail, but they are bugs in the test suite itself, not Syncthing. +# We are working with upstream to fix these: +# https://forum.syncthing.net/t/openbsd-test-debugging/12799 do-test: cd ${WRKSRC} && ${MODGO_CMD} run build.go test do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/syncthing ${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/bin/stcli ${PREFIX}/bin/ .for sec in 1 5 7 ${INSTALL_MAN} ${WRKSRC}/man/*.${sec} ${PREFIX}/man/man${sec}/ .endfor Index: distinfo === RCS file: /home/holsta/cvs/ports/net/syncthing/distinfo,v retrieving revision 1.14 diff -u -p -r1.14 distinfo --- distinfo4 Jun 2018 08:51:48 - 1.14 +++ distinfo6 Feb 2019 12:14:53 - @@ -1,2 +1,2 @@ -SHA256 (syncthing-source-v0.14.47.tar.gz) = krNTXKPqeyfFsux3EIiGXNbpHYEaCBa+OaYoOjBn5vM= -SIZE (syncthing-source-v0.14.47.tar.gz) = 10496524 +SHA256 (syncthing-source-v1.0.1.tar.gz) = w2KR786nkN+ds7Z6OaZOMqdzMkiava6CYKKV2ukBWj0= +SIZE (syncthing-source-v1.0.1.tar.gz) = 6876569 Index: patches/patch-build_go === RCS file: /home/holsta/cvs/ports/net/syncthing/patches/patch-build_go,v retrieving revision 1.6 diff -u -p -r1.6 patch-build_go --- patches/patch-build_go 24 Feb 2018 10:14:24 - 1.6 +++ patches/patch-build_go 6 Feb 2019 12:14:53 - @@ -2,7 +2,28 @@ $OpenBSD: patch-build_go,v 1.6 2018/02/2 Index: build.go --- build.go.orig +++ build.go -@@ -461,7 +461,7 @@ func appendParameters(args []string, tags []string, ta +@@ -186,6 +186,20 @@ var targets = map[string]target{ + {src: "AUTHORS", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/AUTHORS.txt", perm: 0644}, + }, + }, ++ "stcli": { ++ name:"stcli", ++ debname: "stcli", ++ debdeps: []string{"libc6"}, ++ description: "Syncthing Commandline Interface", ++ buildPkg:"github.com/syncthing/syncthing/cmd/stcli", ++ binaryName: "stcli", // .exe will be added automatically for Windows builds ++ archiveFiles: []archiveFile{ ++ {src: "{{binary}}", dst: "{{binary}}", perm: 0755}, ++ }, ++ installationFiles: []archiveFile{ ++ {src: "{{binary}}", dst: "deb/usr/bin/{{binary}}", perm: 0755}, ++ }, ++ }, + } + + func init() { +@@ -490,7 +504,7 @@ func appendParameters(args []string, tags []string, ta if !debugBinary { // Regular binaries get version tagged and skip some debug symbols Index: pkg/PLIST === RCS file: /home/holsta/cvs/ports/net/syncthing/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 4 Sep 2018 12:46:19 - 1.4 +++ pkg/PLIST 6 Feb 2019 12:14:59 - @@ -1,7 +1,15 @@ @comment $OpenBSD: PLIST,v 1.4 2018/09/04 12:46:19 espie Exp $ @newgroup _syncthing:768 @newuser _syncthing:768:_syncthing:daemon:Syncthing user:${VARBASE}/syncthing:/sbin/nologin +@rcscript ${RCDIR}/syncthing +@owner _syncthing +@group _syncthing +@sample ${VARBASE}/syncthing/ +@extraunexec rm -rf ${VARBASE}/syncthing/{.,}* +@owner +@group @bin bin/syncthing +@bin bin/stcli @man man/man1/stdiscosrv.1 @man man/man1/strelaysrv.1 @man man/man1/syncthing.1 @@ -19,8 +27,3 @@ @man man/man7/syncthing-security.7 @man man/man7/syncthing-versioning.7 share/doc/pkg-readmes/${PKGSTEM} -@rcscript ${RCDIR}/syncthing -@owner _syncthing -@group _syncthing -@sample ${VARBASE}/syncthing/ -@extraunexec rm
Re: Update net/toxcore and take maintainership back
Hi Brian! First, I tried setting up daemon at init level, I added to /usr/ports/infrastructure/db/user.list the following: 831 _toxdht _toxdht net/toxcore Then I added toxdht.rc to net/toxcore/pkg with contents: ``` #!/bin/ksh daemon="${TRUEPREFIX}/bin/tox-bootstrapd --config /etc/tox-bootstrapd.conf" . /etc/rc.d/rc.subr rc_pre() { rm -f /var/run/tox-bootstrapd/tox-bootstrapd.pid } ``` Then I appended to plist (with post-install target in Makefile to have sample configuration file): ``` @newgroup _toxdht:831 @newuser _toxdht:831:831:daemon:Tox DHT bootstrap daemon:/var/lib/tox-bootstrapd:/sbin/nologin @rcscript ${RCDIR}/toxdht share/examples/tox-bootstrapd/tox-bootstrapd.conf.sample @sample ${SYSCONFDIR}/tox-bootstrapd.conf @mode 750 @owner _toxdht @group _toxdht @sample /var/lib/tox-bootstrapd/ @mode 755 @sample /var/run/tox-bootstrapd/ ``` After that I ran `rcctl start toxdht` and got output "toxdht(ok)", it created /var/run/tox-bootstrapd/tox-bootstrapd.pid file and exited, I couldn't find it by running both ps(1) (with -aux flags) and top(1), then I tried manually running it: ``` $ doas -u _toxdht tox-bootstrapd --config /etc/tox-boostrapd.conf $ echo $? 0 ``` Again it created /var/run/tox-bootstrapd/tox-bootstrapd.pid file, but again I couldn't find its process. Here's default config I used: https://github.com/TokTok/c-toxcore/blob/master/other/bootstrap_daemon/tox-bootstrapd.conf I can't understand how to make it run at init level.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/02/06 09:14:42 Modified files: devel/p5-MooseX-Role-Parameterized: Makefile distinfo devel/p5-MooseX-Role-Parameterized/pkg: PLIST Log message: Update p5-MooseX-Role-Parameterized to 1.10 Changelog: https://metacpan.org/changes/release/ETHER/MooseX-Role-Parameterized-1.10 OK bcallah@ sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/02/06 09:08:21 Modified files: devel/p5-MooseX-Role-WithOverloading: Makefile distinfo devel/p5-MooseX-Role-WithOverloading/pkg: PLIST Log message: Update p5-MooseX-Role-WithOverloading to 0.17 Changelog: https://metacpan.org/changes/distribution/MooseX-Role-WithOverloading OK bcallah@ sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/02/06 09:02:33 Modified files: devel/p5-MooseX-Daemonize: Makefile distinfo Log message: Update p5-MooseX-Daemonize to 0.21 Changelog: https://metacpan.org/changes/distribution/MooseX-Daemonize Tweaks and OK sthen@, OK bcallah@
Re: Improve net/utox and take maintainership back
On 2/6/19 8:09 AM, Leonid Bobrov wrote: Hi! I'm willing to maintain this port. There are several impovements I've made to this port: * D-Bus support (upstreamed); * Tests support, all tests pass (upstreamed); * push-to-talk support (not upstreamed); * expanded description using upstream's README. This diff failed to apply (patches/patch-CMakeLists_txt failed). ~Brian Index: Makefile === RCS file: /cvs/ports/net/utox/Makefile,v retrieving revision 1.5 diff -u -p -u -p -r1.5 Makefile --- Makefile12 Sep 2018 19:33:25 - 1.5 +++ Makefile6 Feb 2019 13:03:53 - @@ -7,17 +7,19 @@ V = 0.17.0 DISTNAME =uTox-${V}-full PKGNAME = utox-${V} MASTER_SITES =https://github.com/uTox/uTox/releases/download/v${V}/ -REVISION = 2 +REVISION = 3 CATEGORIES = net HOMEPAGE = https://utox.io +MAINTAINER = Leonid Bobrov + # MIT PERMIT_PACKAGE_CDROM =Yes -WANTLIB += ICE SM X11 Xext Xrender c fontconfig freetype m pthread -WANTLIB += openal opus sodium toxcore v4lconvert vpx +WANTLIB += ICE SM X11 Xext Xrender c dbus-1 fontconfig freetype +WANTLIB += m openal opus pthread sodium toxcore v4lconvert vpx MODULES = devel/cmake @@ -26,14 +28,15 @@ RUN_DEPENDS = devel/desktop-file-utils \ LIB_DEPENDS += audio/openal \ multimedia/libv4l \ - net/toxcore + net/toxcore \ + x11/dbus COMPILER = base-clang ports-gcc -NO_TEST = yes - WRKDIST = ${WRKDIR}/uTox -CONFIGURE_ARGS =-DLLD_EMUL:String=${LLD_EMUL} +CONFIGURE_ARGS =-DLLD_EMUL:String=${LLD_EMUL} \ + -DENABLE_FILTERAUDIO=Off \ + -DENABLE_TESTS=On .include Index: patches/patch-CMakeLists_txt === RCS file: /cvs/ports/net/utox/patches/patch-CMakeLists_txt,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt29 Apr 2018 11:15:17 - 1.1.1.1 +++ patches/patch-CMakeLists_txt6 Feb 2019 13:03:53 - @@ -1,27 +1,76 @@ -$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2018/04/29 11:15:17 landry Exp $ +$OpenBSD$ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -184,8 +184,8 @@ add_cflag("-fPIC") +@@ -1,5 +1,4 @@ + cmake_minimum_required(VERSION 3.2) +-set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6 CACHE STRING "Minimum OS X deployment version") + project(uTox LANGUAGES C) + + # +@@ -31,13 +30,12 @@ if(WIN32) + set(WINDOWS TRUE) + elseif(APPLE) + if(CMAKE_SYSTEM_NAME MATCHES ".*MacOS.*") ++set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6 CACHE STRING "Minimum OS X deployment version") + set(MACOSX TRUE) + endif() + elseif(UNIX) + if(CMAKE_SYSTEM_NAME MATCHES ".*Linux") + set(LINUX TRUE) +-elseif(CMAKE_SYSTEM_NAME MATCHES "kOpenBSD.*|OpenBSD.*") +-set(OPENBSD TRUE) + elseif(CMAKE_SYSTEM_NAME MATCHES "kNetBSD.*|NetBSD.*") + set(NETBSD TRUE) + elseif(CMAKE_SYSTEM_NAME MATCHES "kFreeBSD.*|FreeBSD") +@@ -103,12 +101,10 @@ if(WINDOWS AND NOT CROSS_COMPILING) + # Helping Cygwin out again.. + set(WIN64 TRUE) + endif() +-elseif(FREEBSD) +-include(cmake/toolchain-freebsd.cmake) +-elseif(OPENBSD OR NETBSD) +-include(cmake/toolchain-openbsd.cmake) + elseif(APPLE) + include(cmake/macOS.cmake) ++elseif(FREEBSD) ++set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/local/lib" CACHE STRING "" FORCE) + endif() + + +@@ -184,8 +180,7 @@ add_cflag("-fPIC") # Fix GNU stack if(CMAKE_C_COMPILER_ID MATCHES "GNU") # Have ld strip the symbols from Release and MinSizeRel build types. -set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Os") -set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os -s") -+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -s") if(LINUX) # enable Link Time Optimization on gcc (linux only currently) -@@ -220,8 +220,8 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang") +@@ -220,9 +215,12 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang") endif() # Have ld strip the symbols from Release and MinSizeRel build types. (-Oz is clang specific) -set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Os") -set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Oz -s") -+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ") +set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -s") ++if(FREEBSD) ++set(LIBRARIES ${LIBRARIES} "cxxrt") ++endif() ++ if(NOT ENABLE_ASAN) if(NOT APPLE) + add_cflag("-fsanitize=safe-stack") +@@ -303,6 +301,9 @@ elseif(APPLE) + add_definitions("-x objective-c") + add_subdirectory(src/cocoa) + elseif(UNIX)
Re: Update net/toxic and take maintainership back
On 2/6/19 5:23 AM, Leonid Bobrov wrote: Hi! I am willing to maintain this port. Full changelog can be found here: https://github.com/TokTok/toxic/compare/v0.8.2...v0.8.3 Toxic's upstream has moved to https://github.com/TokTok/toxic, so all issues and PRs should go there. After the last PR I've sent to Toxic, it stopped ignoring CFLAGS in environment variables and stopped forcing -g flag in CFLAGS, but that change required me to manually set PREFIX and MANDIR in FAKE_FLAGS because Toxic and its man pages were installed in wrong directories. Index: Makefile === RCS file: /cvs/ports/net/toxic/Makefile,v retrieving revision 1.4 diff -u -p -u -p -r1.4 Makefile --- Makefile9 Aug 2018 23:25:58 - 1.4 +++ Makefile6 Feb 2019 10:12:39 - @@ -2,17 +2,18 @@ COMMENT = ncurses-based Tox client -GH_ACCOUNT = Jfreegman +GH_ACCOUNT = TokTok GH_PROJECT = toxic -GH_TAGNAME = v0.8.2 -REVISION = 2 +GH_TAGNAME = v0.8.3 CATEGORIES = net +MAINTAINER = Leonid Bobrov + # GPLv3+ PERMIT_PACKAGE_CDROM =Yes -WANTLIB += alut c config curses curl intl m openal png pthread +WANTLIB += alut c config curses curl intl m openal png16 pthread WANTLIB += qrencode toxcore util z ${MODPY_WANTLIB} LIB_DEPENDS = audio/freealut \ @@ -21,8 +22,10 @@ LIB_DEPENDS =audio/freealut \ net/curl \ graphics/libqrencode -MAKE_ENV += ENABLE_PYTHON=1 \ - USER_CFLAGS="${CFLAGS}" +MAKE_ENV +=ENABLE_PYTHON=1 +FAKE_FLAGS += PREFIX=${TRUEPREFIX} \ + MANDIR=${TRUEPREFIX}/man Just PREFIX=${PREFIX} here. Same with MANDIR, just PREFIX instead of TRUEPREFIX. Otherwise this looks ok. I was able to connect to my server. But I have no friends on tox and therefore no one to talk to so I can't test beyond that. ~Brian + MODULES = lang/python MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3} CONFIGURE_STYLE = none Index: distinfo === RCS file: /cvs/ports/net/toxic/distinfo,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 distinfo --- distinfo29 Apr 2018 11:16:30 - 1.1.1.1 +++ distinfo6 Feb 2019 10:12:39 - @@ -1,2 +1,2 @@ -SHA256 (toxic-0.8.2.tar.gz) = U72+09ctAA+eQ7iCNSPFiVQLgRvCN+1vO03fD+b5prc= -SIZE (toxic-0.8.2.tar.gz) = 1146526 +SHA256 (toxic-0.8.3.tar.gz) = l/JrosJXwQQ5/S/ygMqQw37SJdhvRnQKCPAv8uRFng4= +SIZE (toxic-0.8.3.tar.gz) = 1147100 Index: patches/patch-Makefile === RCS file: /cvs/ports/net/toxic/patches/patch-Makefile,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-Makefile --- patches/patch-Makefile 29 Apr 2018 11:16:30 - 1.1.1.1 +++ patches/patch-Makefile 6 Feb 2019 10:12:39 - @@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2018/ Index: Makefile --- Makefile.orig +++ Makefile -@@ -62,20 +62,17 @@ OBJ := $(addprefix $(BUILD_DIR)/, $(OBJ)) +@@ -57,20 +57,17 @@ OBJ := $(addprefix $(BUILD_DIR)/, $(OBJ)) all: $(BUILD_DIR)/toxic $(BUILD_DIR)/toxic: $(OBJ)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/02/06 08:53:35 Modified files: devel/p5-MooseX-ConfigFromFile: Makefile distinfo Log message: Update p5-MooseX-ConfigFromFile to 0.14 Changelog: https://metacpan.org/changes/release/ETHER/MooseX-ConfigFromFile-0.14 OK sthen@ bcallah@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/02/06 08:40:30 Modified files: devel : Makefile Log message: +p5-MooseX-Types-Path-Tiny
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/02/06 08:39:36 Log message: Import devel/p5-MooseX-Types-Path-Tiny 0.012 OK sthen@ bcallah@ This module provides Path::Tiny types for Moose. It handles two important types of coercion: - coercing objects with overloaded stringification - coercing to absolute paths It also can check to ensure that files or directories exist. Status: Vendor Tag: cwen Release Tags: cwen_20190206 N ports/devel/p5-MooseX-Types-Path-Tiny/Makefile N ports/devel/p5-MooseX-Types-Path-Tiny/distinfo N ports/devel/p5-MooseX-Types-Path-Tiny/pkg/DESCR N ports/devel/p5-MooseX-Types-Path-Tiny/pkg/PLIST No conflicts created by this import
Re: Update net/toxcore and take maintainership back
Hi Leonid -- On 2/6/19 4:55 AM, Leonid Bobrov wrote: Hi! While I was contributing to Ravenports, John Marino from DragonFly BSD explained me why I should be maintainer. So I am willing to take back maintainership of ports I submitted to this mailing list. I disabled bootstrap daemon because it doesn't work, it immediately starts and exits with 0, no error messages displayed (yes, I did proper configuration). Without this daemon libconfig is not needed. How are you setting up your bootstrap daemon? It works for me here. I'm using this very simple config, named tox-bootstrap.conf: --- port = 33445 keys_file_path = "/home/brian/keys" pid_file_path = "/home/brian/tox-bootstrapd.pid" enable_ipv6 = false enable_lan_discovery = true enable_tcp_relay = true tcp_relay_ports = [443, 3389, 33445] enable_motd = true motd = "tox-bootstrapd OpenBSD" bootstrap_nodes = ( { address = "node.tox.biribiri.org" port = 33445 public_key = "F404ABAA1C99A9D37D61AB54898F56793E1DEF8BD46B1038B9D822E8460FAB67" } ) --- Then when I run $ tox-bootstrapd --config=/home/brian/tox-bootstrap.conf --foreground --log-backend=stdout I get this output: Running "tox-bootstrapd" version 102009. No 'enable_ipv4_fallback' setting in configuration file. Using default 'enable_ipv4_fallback': true Successfully read: 'pid_file_path': /home/brian/tox-bootstrapd.pid 'keys_file_path': /home/brian/keys 'port': 33445 'enable_ipv6': false 'enable_ipv4_fallback': true 'enable_lan_discovery': true 'enable_tcp_relay': true Read 3 TCP ports: Port #0: 443 Port #1: 3389 Port #2: 33445 'enable_motd': true 'motd': tox-bootstrapd OpenBSD General config read successfully Set MOTD successfully. Keys are managed successfully. Initialized Tox TCP server successfully. Current limit on the number of files this process can open (1024) is rather low for the proper functioning of the TCP server. Consider raising the limit to at least 4096 or the recommended 32768. Continuing using the current limit (1024). Successfully added bootstrap node #0: node.tox.biribiri.org:33445 F404ABAA1C99A9D37D61AB54898F56793E1DEF8BD46B1038B9D822E8460FAB67 List of bootstrap nodes read successfully. Public Key: D286EE94197170165FF3C6E922FB8B03D521E2BA61C4C40E4EAF5DEDCB081249 Initialized LAN discovery successfully. Connected to another bootstrap node successfully. And it sits and waits for connections (haven't tried your tox client update yet). This tells me that maybe we need to ship some sort of default configuration file? And possibly directions on how to use the bootstrap server because it was not at all obvious to me and took a bit of poking around. I'd much rather ship the bootstrap server than not. ~Brian Full changelog can be found here: https://github.com/TokTok/c-toxcore/blob/master/CHANGELOG.md Also this port has net/msgpack, audio/portaudio-svn, devel/gtest, audio/libsndfile and graphics/opencv as test dependencies (I had to figure that out myself because upstream doesn't mention that), but trying to actually run those tests makes me stuck in infinite loop, so I won't touch NO_TEST=Yes line. Index: Makefile === RCS file: /cvs/ports/net/toxcore/Makefile,v retrieving revision 1.3 diff -u -p -u -p -r1.3 Makefile --- Makefile9 Aug 2018 23:25:58 - 1.3 +++ Makefile6 Feb 2019 08:45:34 - @@ -2,29 +2,30 @@ COMMENT = Tox client library -V = 0.2.3 -REVISION = 0 +V =0.2.9 DISTNAME =toxcore-$V GH_ACCOUNT = TokTok GH_PROJECT = c-toxcore GH_TAGNAME = v$V -SHARED_LIBS += toxcore 0.1 # 0.1 +SHARED_LIBS += toxcore 0.2 # 2.9 CATEGORIES = net telephony HOMEPAGE = https://tox.chat/ +MAINTAINER = Leonid Bobrov + # GPLv3+ PERMIT_PACKAGE_CDROM =Yes - -WANTLIB = c config m opus pthread sodium vpx +WANTLIB = c m opus pthread sodium vpx MODULES = devel/cmake +CONFIGURE_ARGS = -DBOOTSTRAP_DAEMON=Off + LIB_DEPENDS = audio/opus \ - devel/libconfig \ multimedia/libvpx \ security/libsodium Index: distinfo === RCS file: /cvs/ports/net/toxcore/distinfo,v retrieving revision 1.2 diff -u -p -u -p -r1.2 distinfo --- distinfo26 Jun 2018 20:34:04 - 1.2 +++ distinfo6 Feb 2019 08:45:34 - @@ -1,2 +1,2 @@ -SHA256 (toxcore-0.2.3.tar.gz) = IsUvKGxG0/gC7baXi88qU/gwE2Pit0V4RhNCejO6OjQ= -SIZE (toxcore-0.2.3.tar.gz) = 471336 +SHA256 (toxcore-0.2.9.tar.gz) = qMlicJRH+5sMuxqQ7BlFobLScrTTIjVsSKTjiCsSZ+c= +SIZE (toxcore-0.2.9.tar.gz) = 510806 Index: pkg/PLIST === RCS file: /cvs/ports/net/toxcore/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 PLIST --- pkg/PLIST 29 Apr 2018 11:14:09 - 1.1.1.1 +++
Update: www/py-httpbin-0.5.0p1
Hi maintainer, a small revision update here. While I'll look into updating to py-http-bin-0.7.0 in the future (upcoming www/py-treq port claims version == 0.5.0 as its dependency), I don't think the patch originally supplied in 2016 is needed today to support Python 2.5 and earlier on OpenBSD. I had no trouble compiling with LC_CTYPE=C, but just in case I've added UTF-8 there to replace the patch. MODPY_PI sets HOMEPAGE, so I've removed it too. Ok? Index: Makefile === RCS file: /cvs/ports/www/py-httpbin/Makefile,v retrieving revision 1.4 diff -u -p -u -p -r1.4 Makefile --- Makefile 3 Jan 2017 19:28:48 - 1.4 +++ Makefile 6 Feb 2019 14:59:23 - @@ -5,12 +5,10 @@ COMMENT = HTTP request and response ser MODPY_EGG_VERSION = 0.5.0 DISTNAME = httpbin-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 0 +REVISION = 1 CATEGORIES = www -HOMEPAGE = https://github.com/Runscope/httpbin - MAINTAINER = Alexandr Shadchin # MIT @@ -31,5 +29,7 @@ FLAVORS = python3 FLAVOR ?= NO_TEST = Yes + +MAKE_ENV += LC_CTYPE=en_US.UTF-8 .include Index: patches/patch-setup_py === RCS file: patches/patch-setup_py diff -N patches/patch-setup_py --- patches/patch-setup_py 19 Aug 2016 07:39:05 - 1.2 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,15 +0,0 @@ -$OpenBSD: patch-setup_py,v 1.2 2016/08/19 07:39:05 shadchin Exp $ setup.py.orig Thu Aug 11 05:49:19 2016 -+++ setup.py Thu Aug 18 10:14:50 2016 -@@ -1,8 +1,9 @@ - from setuptools import setup, find_packages - import os -+import codecs - --long_description = open( --os.path.join(os.path.dirname(__file__), 'README.rst')).read() -+long_description = codecs.open( -+os.path.join(os.path.dirname(__file__), 'README.rst'), encoding='utf-8').read() - - setup( - name="httpbin",
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/02/06 08:06:27 Modified files: devel : Makefile Log message: +p5-MooseX-Types-Stringlike
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/02/06 08:04:18 Log message: Import devel/p5-MooseX-Types-Stringlike 0.003 OK sthen@ bcallah@ This Perl module provides a more general version of the "Str" type. If coercions are enabled, it will accept objects that overload stringification and coerces them into strings. Status: Vendor Tag: cwen Release Tags: cwen_20190206 N ports/devel/p5-MooseX-Types-Stringlike/Makefile N ports/devel/p5-MooseX-Types-Stringlike/distinfo N ports/devel/p5-MooseX-Types-Stringlike/pkg/DESCR N ports/devel/p5-MooseX-Types-Stringlike/pkg/PLIST No conflicts created by this import
Re: Improve net/utox and take maintainership back
On 2/6/19 9:14 AM, Brian Callahan wrote: I must have been overzealous in cleaning out my "send to /dev/null" list because here you are in my inbox again. Why should any of us bother given your track record? I imagine your diffs with languish here without some sort of serious long-term change in attitude. It's been brought to my attention that I missed an apology email from you. And having read it, I'm willing to accept that apology. I'll look at one of your diffs later today. ~Brian ~Brian On 2/6/19 8:09 AM, Leonid Bobrov wrote: Hi! I'm willing to maintain this port. There are several impovements I've made to this port: * D-Bus support (upstreamed); * Tests support, all tests pass (upstreamed); * push-to-talk support (not upstreamed); * expanded description using upstream's README. Index: Makefile === RCS file: /cvs/ports/net/utox/Makefile,v retrieving revision 1.5 diff -u -p -u -p -r1.5 Makefile --- Makefile 12 Sep 2018 19:33:25 - 1.5 +++ Makefile 6 Feb 2019 13:03:53 - @@ -7,17 +7,19 @@ V = 0.17.0 DISTNAME = uTox-${V}-full PKGNAME = utox-${V} MASTER_SITES = https://github.com/uTox/uTox/releases/download/v${V}/ -REVISION = 2 +REVISION = 3 CATEGORIES = net HOMEPAGE = https://utox.io +MAINTAINER = Leonid Bobrov + # MIT PERMIT_PACKAGE_CDROM = Yes -WANTLIB += ICE SM X11 Xext Xrender c fontconfig freetype m pthread -WANTLIB += openal opus sodium toxcore v4lconvert vpx +WANTLIB += ICE SM X11 Xext Xrender c dbus-1 fontconfig freetype +WANTLIB += m openal opus pthread sodium toxcore v4lconvert vpx MODULES = devel/cmake @@ -26,14 +28,15 @@ RUN_DEPENDS = devel/desktop-file-utils \ LIB_DEPENDS += audio/openal \ multimedia/libv4l \ - net/toxcore + net/toxcore \ + x11/dbus COMPILER = base-clang ports-gcc -NO_TEST = yes - WRKDIST = ${WRKDIR}/uTox -CONFIGURE_ARGS =-DLLD_EMUL:String=${LLD_EMUL} +CONFIGURE_ARGS =-DLLD_EMUL:String=${LLD_EMUL} \ + -DENABLE_FILTERAUDIO=Off \ + -DENABLE_TESTS=On .include Index: patches/patch-CMakeLists_txt === RCS file: /cvs/ports/net/utox/patches/patch-CMakeLists_txt,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt 29 Apr 2018 11:15:17 - 1.1.1.1 +++ patches/patch-CMakeLists_txt 6 Feb 2019 13:03:53 - @@ -1,27 +1,76 @@ -$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2018/04/29 11:15:17 landry Exp $ +$OpenBSD$ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -184,8 +184,8 @@ add_cflag("-fPIC") +@@ -1,5 +1,4 @@ + cmake_minimum_required(VERSION 3.2) +-set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6 CACHE STRING "Minimum OS X deployment version") + project(uTox LANGUAGES C) + + # +@@ -31,13 +30,12 @@ if(WIN32) + set(WINDOWS TRUE) + elseif(APPLE) + if(CMAKE_SYSTEM_NAME MATCHES ".*MacOS.*") ++ set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6 CACHE STRING "Minimum OS X deployment version") + set(MACOSX TRUE) + endif() + elseif(UNIX) + if(CMAKE_SYSTEM_NAME MATCHES ".*Linux") + set(LINUX TRUE) +- elseif(CMAKE_SYSTEM_NAME MATCHES "kOpenBSD.*|OpenBSD.*") +- set(OPENBSD TRUE) + elseif(CMAKE_SYSTEM_NAME MATCHES "kNetBSD.*|NetBSD.*") + set(NETBSD TRUE) + elseif(CMAKE_SYSTEM_NAME MATCHES "kFreeBSD.*|FreeBSD") +@@ -103,12 +101,10 @@ if(WINDOWS AND NOT CROSS_COMPILING) + # Helping Cygwin out again.. + set(WIN64 TRUE) + endif() +-elseif(FREEBSD) +- include(cmake/toolchain-freebsd.cmake) +-elseif(OPENBSD OR NETBSD) +- include(cmake/toolchain-openbsd.cmake) + elseif(APPLE) + include(cmake/macOS.cmake) ++elseif(FREEBSD) ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/local/lib" CACHE STRING "" FORCE) + endif() + + +@@ -184,8 +180,7 @@ add_cflag("-fPIC") # Fix GNU stack if(CMAKE_C_COMPILER_ID MATCHES "GNU") # Have ld strip the symbols from Release and MinSizeRel build types. - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Os") - set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os -s") -+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") + set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -s") if(LINUX) # enable Link Time Optimization on gcc (linux only currently) -@@ -220,8 +220,8 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang") +@@ -220,9 +215,12 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang") endif() # Have ld strip the symbols from Release and MinSizeRel build types. (-Oz is clang specific) - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Os") - set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Oz -s") -+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ")
rdp clients - "reverse" (server->client) attacks
- Forwarded message from Stuart Henderson - From: Stuart Henderson Date: Wed, 6 Feb 2019 07:22:39 -0700 (MST) To: ports-chan...@openbsd.org Subject: CVS: cvs.openbsd.org: ports CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/02/06 07:22:39 Modified files: x11/rdesktop : Makefile distinfo Removed files: x11/rdesktop/patches: patch-rdpdr_c Log message: security update to rdesktop-1.8.4 info at https://research.checkpoint.com/reverse-rdp-attack-code-execution-on-rdp-clients/ - End forwarded message - Note that xfreerdp is also affected by issues mentioned in this writeup and has received fixes upstream in 2.00rc4, but we are currently stuck at rc1 as newer versions require timerfd_create().
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/02/06 07:23:35 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: cve quirk for rdesktop
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/02/06 07:22:39 Modified files: x11/rdesktop : Makefile distinfo Removed files: x11/rdesktop/patches: patch-rdpdr_c Log message: security update to rdesktop-1.8.4 info at https://research.checkpoint.com/reverse-rdp-attack-code-execution-on-rdp-clients/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2019/02/06 07:21:15 Modified files: audio/portaudio-svn: Makefile distinfo audio/portaudio-svn/files: pa_sndio.c audio/portaudio-svn/patches: patch-configure_in patch-include_portaudio_h Log message: Upgrade to portaudio-svn-1960 One function added, tweak our sndio bits while here. Tests and ok ratchov@
Re: Improve net/utox and take maintainership back
I must have been overzealous in cleaning out my "send to /dev/null" list because here you are in my inbox again. Why should any of us bother given your track record? I imagine your diffs with languish here without some sort of serious long-term change in attitude. ~Brian On 2/6/19 8:09 AM, Leonid Bobrov wrote: Hi! I'm willing to maintain this port. There are several impovements I've made to this port: * D-Bus support (upstreamed); * Tests support, all tests pass (upstreamed); * push-to-talk support (not upstreamed); * expanded description using upstream's README. Index: Makefile === RCS file: /cvs/ports/net/utox/Makefile,v retrieving revision 1.5 diff -u -p -u -p -r1.5 Makefile --- Makefile12 Sep 2018 19:33:25 - 1.5 +++ Makefile6 Feb 2019 13:03:53 - @@ -7,17 +7,19 @@ V = 0.17.0 DISTNAME =uTox-${V}-full PKGNAME = utox-${V} MASTER_SITES =https://github.com/uTox/uTox/releases/download/v${V}/ -REVISION = 2 +REVISION = 3 CATEGORIES = net HOMEPAGE = https://utox.io +MAINTAINER = Leonid Bobrov + # MIT PERMIT_PACKAGE_CDROM =Yes -WANTLIB += ICE SM X11 Xext Xrender c fontconfig freetype m pthread -WANTLIB += openal opus sodium toxcore v4lconvert vpx +WANTLIB += ICE SM X11 Xext Xrender c dbus-1 fontconfig freetype +WANTLIB += m openal opus pthread sodium toxcore v4lconvert vpx MODULES = devel/cmake @@ -26,14 +28,15 @@ RUN_DEPENDS = devel/desktop-file-utils \ LIB_DEPENDS += audio/openal \ multimedia/libv4l \ - net/toxcore + net/toxcore \ + x11/dbus COMPILER = base-clang ports-gcc -NO_TEST = yes - WRKDIST = ${WRKDIR}/uTox -CONFIGURE_ARGS =-DLLD_EMUL:String=${LLD_EMUL} +CONFIGURE_ARGS =-DLLD_EMUL:String=${LLD_EMUL} \ + -DENABLE_FILTERAUDIO=Off \ + -DENABLE_TESTS=On .include Index: patches/patch-CMakeLists_txt === RCS file: /cvs/ports/net/utox/patches/patch-CMakeLists_txt,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt29 Apr 2018 11:15:17 - 1.1.1.1 +++ patches/patch-CMakeLists_txt6 Feb 2019 13:03:53 - @@ -1,27 +1,76 @@ -$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2018/04/29 11:15:17 landry Exp $ +$OpenBSD$ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -184,8 +184,8 @@ add_cflag("-fPIC") +@@ -1,5 +1,4 @@ + cmake_minimum_required(VERSION 3.2) +-set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6 CACHE STRING "Minimum OS X deployment version") + project(uTox LANGUAGES C) + + # +@@ -31,13 +30,12 @@ if(WIN32) + set(WINDOWS TRUE) + elseif(APPLE) + if(CMAKE_SYSTEM_NAME MATCHES ".*MacOS.*") ++set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6 CACHE STRING "Minimum OS X deployment version") + set(MACOSX TRUE) + endif() + elseif(UNIX) + if(CMAKE_SYSTEM_NAME MATCHES ".*Linux") + set(LINUX TRUE) +-elseif(CMAKE_SYSTEM_NAME MATCHES "kOpenBSD.*|OpenBSD.*") +-set(OPENBSD TRUE) + elseif(CMAKE_SYSTEM_NAME MATCHES "kNetBSD.*|NetBSD.*") + set(NETBSD TRUE) + elseif(CMAKE_SYSTEM_NAME MATCHES "kFreeBSD.*|FreeBSD") +@@ -103,12 +101,10 @@ if(WINDOWS AND NOT CROSS_COMPILING) + # Helping Cygwin out again.. + set(WIN64 TRUE) + endif() +-elseif(FREEBSD) +-include(cmake/toolchain-freebsd.cmake) +-elseif(OPENBSD OR NETBSD) +-include(cmake/toolchain-openbsd.cmake) + elseif(APPLE) + include(cmake/macOS.cmake) ++elseif(FREEBSD) ++set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/local/lib" CACHE STRING "" FORCE) + endif() + + +@@ -184,8 +180,7 @@ add_cflag("-fPIC") # Fix GNU stack if(CMAKE_C_COMPILER_ID MATCHES "GNU") # Have ld strip the symbols from Release and MinSizeRel build types. -set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Os") -set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os -s") -+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -s") if(LINUX) # enable Link Time Optimization on gcc (linux only currently) -@@ -220,8 +220,8 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang") +@@ -220,9 +215,12 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang") endif() # Have ld strip the symbols from Release and MinSizeRel build types. (-Oz is clang specific) -set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Os") -set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Oz -s") -+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ") +set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -s") ++if(FREEBSD) ++set(LIBRARIES ${LIBRARIES} "cxxrt") ++endif() ++ if(NOT ENABLE_ASAN)
Re: [NEW] fonts/work-sans
On 2/1/19 4:03 PM, George Rosamond wrote: pkg/DESCR Work Sans is a 9 weight typeface family based loosely on early Grotesques, i.e. Stephenson Blake, Miller & Richard and Bauerschen Giesserei. The core of the fonts are optimised for on-screen medium-sized text usage (14px-48px), but still can be used in print well. The fonts at the extreme weights are designed more for display use. Overall, features are simplified and optimised for screen resolutions, for example, diacritic marks are larger than how they would be in print. This port contains both desktop (OTF) and web fonts (TTF, WOFF, WOFF2). Fixed up version attached: Replaces the MASTER_SITES with the GH_* variables. There's no stable tarball release from upstream, and the GH_* variables make that clear. Or maybe we just host a tarball of our own on the NYCBUG mirror? Make it so distinfo wasn't looking for a v1.6.tar.gz file, as that's not a unique enough name. Fixed a typo in COMMENT (typface -> typeface). ~Brian work-sans.tgz Description: Binary data
Re: [UPDATE] textproc/unrtf =>0.21.10
Hi -- On 2/5/19 9:50 AM, George Rosamond wrote: George Rosamond: Updated from 0.21.9 plus fixed formatting of Makefile and DESCR. Also bumped automake version to 1.15. Resubmitting with diff attached and not inline, without bumping automake. If we're going to go the reformatting the Makefile route, we might as well go all the way. That whole auto* dance can go away too; since 0.21.9 there have been no symlinks in the config directory. I'm not sure what's wrong with DESCR? It looks fine to me and wraps at 72 characters. New patch looks like the attached. ~Brian Index: Makefile === RCS file: /cvs/ports/textproc/unrtf/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- Makefile 30 Dec 2014 15:02:32 - 1.14 +++ Makefile 6 Feb 2019 13:47:57 - @@ -1,37 +1,22 @@ -# $OpenBSD: Makefile,v 1.14 2014/12/30 15:02:32 sthen Exp $ +# $OpenBSD: Makefile,v 1.16 2016/04/09 20:14:49 naddy Exp $ -COMMENT= RTF document converter +COMMENT = RTF document converter +DISTNAME = unrtf-0.21.10 +CATEGORIES = textproc -DISTNAME= unrtf-0.21.8 -CATEGORIES= textproc - -HOMEPAGE= https://www.gnu.org/software/unrtf/unrtf.html - -MASTER_SITES= ${MASTER_SITE_GNU:=unrtf/} +HOMEPAGE = https://www.gnu.org/software/unrtf/unrtf.html # GPLv3+ -PERMIT_PACKAGE_CDROM= Yes - -WANTLIB += c - -MODULES= converters/libiconv +PERMIT_PACKAGE_CDROM = Yes -CONFIGURE_STYLE= gnu +WANTLIB += c iconv -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -liconv" +MASTER_SITES = ${MASTER_SITE_GNU:=unrtf/} -# rm/bootstrap are only done because of symlinks to /usr/share/auto* -# in ${WRKSRC}/config for missing/etc. -# -BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \ - ${MODGNU_AUTOMAKE_DEPENDS} -AUTOCONF_VERSION= 2.69 -AUTOMAKE_VERSION= 1.11 +LIB_DEPENDS = converters/libiconv -post-patch: - rm ${WRKSRC}/config/* - cd ${WRKSRC}; AUTOCONF_VERSION=${AUTOCONF_VERSION} \ - AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./bootstrap +CONFIGURE_STYLE = gnu +CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -liconv" .include Index: distinfo === RCS file: /cvs/ports/textproc/unrtf/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 27 Apr 2015 18:20:47 - 1.6 +++ distinfo 6 Feb 2019 13:47:57 - @@ -1,2 +1,2 @@ -SHA256 (unrtf-0.21.9.tar.gz) = IqN4JvltdU4zX7afgDbAaMAN0B7p7dlGGjbfAIX7jd0= -SIZE (unrtf-0.21.9.tar.gz) = 828590 +SHA256 (unrtf-0.21.10.tar.gz) = tJ8gIR+mn/+X1C1ueCpi1+LaZwsGSVHxS7/5aMk3NK4= +SIZE (unrtf-0.21.10.tar.gz) = 812696
Re: [WIP/NEW] 1oom - Master of Orion 1 engine
On 12/28/18 1:45 PM, Brian Callahan wrote: On 11/25/18 11:09 AM, Brian Callahan wrote: On 11/24/18 5:26 PM, Max Fillinger wrote: On Fri, Nov 23, 2018 at 09:40:41PM -0500, Brian Callahan wrote: On 11/23/18 7:05 PM, Max Fillinger wrote: Thanks for your help! * No MAINTAINER--do you want it? What does that entail? I want to keep this port working and up to date, if I can. But I won't be any help if someone has, for example, a problem on a non-i386/amd64 platform. * Made the building of your fixbugs.pbx more sane and in the appropriate places for the port. I added a comment explaining why we have a post-build and post-install. Your comment in the Makefile seems a bit misleading. fixbugs.pbx is for when you *don't* want the bugs of the original game. I'd suggest something like: # Create patch file to allow the user to disable bug-compatibility with # the original game. Alright, that's my misunderstanding of what the file does then. ~Brian Here's a new archive, essentially the same as before but with me written in as MAINTAINER and the comment fixed. Sure. I'm ok with this. ~Brian Ping. Ping? It would be nice to get this in. Tarball reattached for convenience. ~Brian 1oom.tgz Description: Binary data
Improve net/utox and take maintainership back
Hi! I'm willing to maintain this port. There are several impovements I've made to this port: * D-Bus support (upstreamed); * Tests support, all tests pass (upstreamed); * push-to-talk support (not upstreamed); * expanded description using upstream's README. Index: Makefile === RCS file: /cvs/ports/net/utox/Makefile,v retrieving revision 1.5 diff -u -p -u -p -r1.5 Makefile --- Makefile12 Sep 2018 19:33:25 - 1.5 +++ Makefile6 Feb 2019 13:03:53 - @@ -7,17 +7,19 @@ V = 0.17.0 DISTNAME = uTox-${V}-full PKGNAME = utox-${V} MASTER_SITES = https://github.com/uTox/uTox/releases/download/v${V}/ -REVISION = 2 +REVISION = 3 CATEGORIES = net HOMEPAGE = https://utox.io +MAINTAINER = Leonid Bobrov + # MIT PERMIT_PACKAGE_CDROM = Yes -WANTLIB += ICE SM X11 Xext Xrender c fontconfig freetype m pthread -WANTLIB += openal opus sodium toxcore v4lconvert vpx +WANTLIB += ICE SM X11 Xext Xrender c dbus-1 fontconfig freetype +WANTLIB += m openal opus pthread sodium toxcore v4lconvert vpx MODULES = devel/cmake @@ -26,14 +28,15 @@ RUN_DEPENDS = devel/desktop-file-utils \ LIB_DEPENDS += audio/openal \ multimedia/libv4l \ - net/toxcore + net/toxcore \ + x11/dbus COMPILER = base-clang ports-gcc -NO_TEST = yes - WRKDIST = ${WRKDIR}/uTox -CONFIGURE_ARGS =-DLLD_EMUL:String=${LLD_EMUL} +CONFIGURE_ARGS =-DLLD_EMUL:String=${LLD_EMUL} \ + -DENABLE_FILTERAUDIO=Off \ + -DENABLE_TESTS=On .include Index: patches/patch-CMakeLists_txt === RCS file: /cvs/ports/net/utox/patches/patch-CMakeLists_txt,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt29 Apr 2018 11:15:17 - 1.1.1.1 +++ patches/patch-CMakeLists_txt6 Feb 2019 13:03:53 - @@ -1,27 +1,76 @@ -$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2018/04/29 11:15:17 landry Exp $ +$OpenBSD$ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -184,8 +184,8 @@ add_cflag("-fPIC") +@@ -1,5 +1,4 @@ + cmake_minimum_required(VERSION 3.2) +-set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6 CACHE STRING "Minimum OS X deployment version") + project(uTox LANGUAGES C) + + # +@@ -31,13 +30,12 @@ if(WIN32) + set(WINDOWS TRUE) + elseif(APPLE) + if(CMAKE_SYSTEM_NAME MATCHES ".*MacOS.*") ++set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6 CACHE STRING "Minimum OS X deployment version") + set(MACOSX TRUE) + endif() + elseif(UNIX) + if(CMAKE_SYSTEM_NAME MATCHES ".*Linux") + set(LINUX TRUE) +-elseif(CMAKE_SYSTEM_NAME MATCHES "kOpenBSD.*|OpenBSD.*") +-set(OPENBSD TRUE) + elseif(CMAKE_SYSTEM_NAME MATCHES "kNetBSD.*|NetBSD.*") + set(NETBSD TRUE) + elseif(CMAKE_SYSTEM_NAME MATCHES "kFreeBSD.*|FreeBSD") +@@ -103,12 +101,10 @@ if(WINDOWS AND NOT CROSS_COMPILING) + # Helping Cygwin out again.. + set(WIN64 TRUE) + endif() +-elseif(FREEBSD) +-include(cmake/toolchain-freebsd.cmake) +-elseif(OPENBSD OR NETBSD) +-include(cmake/toolchain-openbsd.cmake) + elseif(APPLE) + include(cmake/macOS.cmake) ++elseif(FREEBSD) ++set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/local/lib" CACHE STRING "" FORCE) + endif() + + +@@ -184,8 +180,7 @@ add_cflag("-fPIC") # Fix GNU stack if(CMAKE_C_COMPILER_ID MATCHES "GNU") # Have ld strip the symbols from Release and MinSizeRel build types. -set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Os") -set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os -s") -+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -s") if(LINUX) # enable Link Time Optimization on gcc (linux only currently) -@@ -220,8 +220,8 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang") +@@ -220,9 +215,12 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang") endif() # Have ld strip the symbols from Release and MinSizeRel build types. (-Oz is clang specific) -set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Os") -set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Oz -s") -+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ") +set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -s") ++if(FREEBSD) ++set(LIBRARIES ${LIBRARIES} "cxxrt") ++endif() ++ if(NOT ENABLE_ASAN) if(NOT APPLE) + add_cflag("-fsanitize=safe-stack") +@@ -303,6 +301,9 @@ elseif(APPLE) + add_definitions("-x objective-c") + add_subdirectory(src/cocoa) + elseif(UNIX) ++find_package(X11 REQUIRED) ++include_directories(${X11_INCLUDE_DIR}) ++ + add_subdirectory(src/xlib) + + if(LINUX) Index:
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/02/06 06:09:09 Modified files: emulators/mame : Makefile Added files: emulators/mame/patches: patch-3rdparty_asio_include_asio_detail_config_hpp Log message: fix asio build in emulators/mame with libc++; similar to devel/boost but no need to consider the case with a ports-clang compiler on a gcc arch (which uses libstdc++ not libc++). amd64 test and ok jca (i386 is broken due to a different issue)
Re: emulators/mame, fix with new libc++ (asio, similar to boost)
On Tue, Feb 05 2019, Stuart Henderson wrote: > It hasn't finished a full build yet (still running), but at least has > got past the previous breakage point. > > ok if it finishes? It fixes the build on amd64, ok jca@ I would have kept a fallback on for clang-using-libestdc++ (what I tried to do with my devel/boost patch). But since this port is already only for i386/amd64, I'm not sure it's relevant. > Index: Makefile > === > RCS file: /cvs/ports/emulators/mame/Makefile,v > retrieving revision 1.20 > diff -u -p -r1.20 Makefile > --- Makefile 4 Feb 2019 10:12:52 - 1.20 > +++ Makefile 5 Feb 2019 15:25:19 - > @@ -82,6 +82,7 @@ post-extract: > xargs sed -i 's|"png.h"|"localpng.h"|' > @perl -pi -e 's/\r//g' ${WRKSRC}/makefile ${WRKSRC}/scripts/genie.lua \ > ${WRKSRC}/3rdparty/genie/build/gmake.bsd/genie.make \ > + ${WRKSRC}/3rdparty/asio/include/asio/detail/config.hpp \ > ${WRKSRC}/docs/man/* ${WRKSRC}/keymaps/* > > do-install: > Index: patches/patch-3rdparty_asio_include_asio_detail_config_hpp > === > RCS file: patches/patch-3rdparty_asio_include_asio_detail_config_hpp > diff -N patches/patch-3rdparty_asio_include_asio_detail_config_hpp > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-3rdparty_asio_include_asio_detail_config_hpp5 Feb > 2019 15:25:19 - > @@ -0,0 +1,18 @@ > +$OpenBSD$ > + > +libc++ 7.x moved string_view out of experimental > + > +Index: 3rdparty/asio/include/asio/detail/config.hpp > +--- 3rdparty/asio/include/asio/detail/config.hpp.orig > 3rdparty/asio/include/asio/detail/config.hpp > +@@ -708,9 +708,8 @@ > + # if !defined(ASIO_DISABLE_STD_STRING_VIEW) > + # if defined(__clang__) > + # if (__cplusplus >= 201103) > +-#if __has_include() > ++#if __has_include() > + # define ASIO_HAS_STD_STRING_VIEW 1 > +-# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1 > + #endif // __has_include() > + # endif // (__cplusplus >= 201103) > + # endif // defined(__clang__) > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2019/02/06 04:43:35 Modified files: devel/boost: Makefile Added files: devel/boost/patches: patch-boost_asio_detail_config_hpp patch-boost_asio_detail_string_view_hpp Log message: Unbreak on clang archs, prefer to ok Brad (maintainer) libc++7 made a stub containing only #error " has been removed. Use instead." One can wonder why upstream kept the header at all.
Re: sysutils/coreutils problem
On 2019/02/06 19:57, 岡本健二 wrote: > I'm facing another problem at /usr/ports/sysutils/coreutils: > > make install ended eroor, which says: > > ... > checking whether mknod can create fifo... without root privileges... > configure: error: you should not run configure as root > (set FORCE_UNSAFE_CONFIGURE=1 in environment to bypass this work) > > Yes, I'm running make as root to install the program. > Ok, export FORCE_UNSAFE_CONFIGUE=1, and then make distclean, and then > make install again. > However, this error comes again. > > What's going on here? > > Kenji Set "SUDO=doas" or "SUDO=sudo" in /etc/mk.conf and run "make" as your normal user. Ports infrastructure will switch to root as needed (only pkg_add needs to run as root - no part of the main ports build/packaging process needs it). Is there a particular reason to be building these yourself? Normally it's recommended to use packages.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/02/06 04:36:26 Modified files: x11/menumaker : Makefile Log message: Zap empty comment, my bad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/02/06 04:35:00 Modified files: x11: Makefile Log message: +menumaker
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/02/06 04:33:45 Log message: Import menumaker MenuMaker is a menu generation utility for X window managers on *NIX systems. It is capable of finding lots of installed programs and generating a root menu consistent across all supported environments. From Alessandro DE LAURENZIS OK sthen Status: Vendor Tag: kn Release Tags: kn_20190206 N ports/x11/menumaker/Makefile N ports/x11/menumaker/distinfo N ports/x11/menumaker/pkg/DESCR N ports/x11/menumaker/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/02/06 04:27:07 Modified files: sysutils/awscli: Makefile distinfo sysutils/awscli/pkg: PLIST Log message: Update to awscli-1.16.98.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/02/06 04:26:52 Modified files: net/py-botocore: Makefile distinfo Log message: Update to py-botocore-1.12.88.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/02/06 04:26:37 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py-boto3-1.9.88.
Re: sysutils/coreutils problem
On Wed, Feb 06, 2019 at 07:57:33PM +0900, 岡本健二 wrote: > I'm facing another problem at /usr/ports/sysutils/coreutils: > > make install ended eroor, which says: > > ... > checking whether mknod can create fifo... without root privileges... > configure: error: you should not run configure as root > (set FORCE_UNSAFE_CONFIGURE=1 in environment to bypass this work) > > Yes, I'm running make as root to install the program. > Ok, export FORCE_UNSAFE_CONFIGUE=1, and then make distclean, and then > make install again. > However, this error comes again. > > What's going on here? > > Kenji Check your spelling of the word "CONFIGURE". -- Andreas Kusalananda Kähäri, National Bioinformatics Infrastructure Sweden (NBIS), Uppsala University, Sweden.
sysutils/coreutils problem
I'm facing another problem at /usr/ports/sysutils/coreutils: make install ended eroor, which says: ... checking whether mknod can create fifo... without root privileges... configure: error: you should not run configure as root (set FORCE_UNSAFE_CONFIGURE=1 in environment to bypass this work) Yes, I'm running make as root to install the program. Ok, export FORCE_UNSAFE_CONFIGUE=1, and then make distclean, and then make install again. However, this error comes again. What's going on here? Kenji
Re: python problem?
Ok, thanks for the clarification. 2019年2月6日(水) 19:37 Stuart Henderson : > On 2019/02/06 11:05, 岡本健二 wrote: > > So, it may indicate pythons on the -current is not a reliable > application... > > Not at all. It indicates that some modules that *might* be loaded as > Python extensions require W+X mappings - in particular WebKit bindings. > > > By the way, I should have created /usr/ports as an independent partition. > > Ideally yes. > >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/02/06 03:40:54 Modified files: sysutils/google-cloud-sdk: Makefile distinfo sysutils/google-cloud-sdk/pkg: PLIST Log message: Update to google-cloud-sdk-233.0.0.
Re: python problem?
On 2019/02/06 11:05, 岡本健二 wrote: > So, it may indicate pythons on the -current is not a reliable application... Not at all. It indicates that some modules that *might* be loaded as Python extensions require W+X mappings - in particular WebKit bindings. > By the way, I should have created /usr/ports as an independent partition. Ideally yes.
Re: Update net/toxcore and take maintainership back
Sorry, new diff, DHT_bootstrap binary is useless because it doesn't work too. This should be final sane diff: Index: Makefile === RCS file: /cvs/ports/net/toxcore/Makefile,v retrieving revision 1.3 diff -u -p -u -p -r1.3 Makefile --- Makefile9 Aug 2018 23:25:58 - 1.3 +++ Makefile6 Feb 2019 10:29:31 - @@ -2,29 +2,30 @@ COMMENT = Tox client library -V =0.2.3 -REVISION = 0 +V =0.2.9 DISTNAME = toxcore-$V GH_ACCOUNT = TokTok GH_PROJECT = c-toxcore GH_TAGNAME = v$V -SHARED_LIBS += toxcore 0.1 # 0.1 +SHARED_LIBS += toxcore 0.2 # 2.9 CATEGORIES = net telephony HOMEPAGE = https://tox.chat/ +MAINTAINER = Leonid Bobrov + # GPLv3+ PERMIT_PACKAGE_CDROM = Yes - -WANTLIB = c config m opus pthread sodium vpx +WANTLIB = m opus pthread sodium vpx MODULES = devel/cmake +CONFIGURE_ARGS = -DBOOTSTRAP_DAEMON=Off -DDHT_BOOTSTRAP=Off + LIB_DEPENDS = audio/opus \ - devel/libconfig \ multimedia/libvpx \ security/libsodium Index: distinfo === RCS file: /cvs/ports/net/toxcore/distinfo,v retrieving revision 1.2 diff -u -p -u -p -r1.2 distinfo --- distinfo26 Jun 2018 20:34:04 - 1.2 +++ distinfo6 Feb 2019 10:29:31 - @@ -1,2 +1,2 @@ -SHA256 (toxcore-0.2.3.tar.gz) = IsUvKGxG0/gC7baXi88qU/gwE2Pit0V4RhNCejO6OjQ= -SIZE (toxcore-0.2.3.tar.gz) = 471336 +SHA256 (toxcore-0.2.9.tar.gz) = qMlicJRH+5sMuxqQ7BlFobLScrTTIjVsSKTjiCsSZ+c= +SIZE (toxcore-0.2.9.tar.gz) = 510806 Index: pkg/PLIST === RCS file: /cvs/ports/net/toxcore/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 PLIST --- pkg/PLIST 29 Apr 2018 11:14:09 - 1.1.1.1 +++ pkg/PLIST 6 Feb 2019 10:29:31 - @@ -1,5 +1,4 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2018/04/29 11:14:09 landry Exp $ -@bin bin/tox-bootstrapd include/tox/ include/tox/tox.h include/tox/toxav.h
Update net/toxic and take maintainership back
Hi! I am willing to maintain this port. Full changelog can be found here: https://github.com/TokTok/toxic/compare/v0.8.2...v0.8.3 Toxic's upstream has moved to https://github.com/TokTok/toxic, so all issues and PRs should go there. After the last PR I've sent to Toxic, it stopped ignoring CFLAGS in environment variables and stopped forcing -g flag in CFLAGS, but that change required me to manually set PREFIX and MANDIR in FAKE_FLAGS because Toxic and its man pages were installed in wrong directories. Index: Makefile === RCS file: /cvs/ports/net/toxic/Makefile,v retrieving revision 1.4 diff -u -p -u -p -r1.4 Makefile --- Makefile9 Aug 2018 23:25:58 - 1.4 +++ Makefile6 Feb 2019 10:12:39 - @@ -2,17 +2,18 @@ COMMENT = ncurses-based Tox client -GH_ACCOUNT = Jfreegman +GH_ACCOUNT = TokTok GH_PROJECT = toxic -GH_TAGNAME = v0.8.2 -REVISION = 2 +GH_TAGNAME = v0.8.3 CATEGORIES = net +MAINTAINER = Leonid Bobrov + # GPLv3+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB += alut c config curses curl intl m openal png pthread +WANTLIB += alut c config curses curl intl m openal png16 pthread WANTLIB += qrencode toxcore util z ${MODPY_WANTLIB} LIB_DEPENDS = audio/freealut \ @@ -21,8 +22,10 @@ LIB_DEPENDS =audio/freealut \ net/curl \ graphics/libqrencode -MAKE_ENV +=ENABLE_PYTHON=1 \ - USER_CFLAGS="${CFLAGS}" +MAKE_ENV +=ENABLE_PYTHON=1 +FAKE_FLAGS += PREFIX=${TRUEPREFIX} \ + MANDIR=${TRUEPREFIX}/man + MODULES = lang/python MODPY_VERSION =${MODPY_DEFAULT_VERSION_3} CONFIGURE_STYLE = none Index: distinfo === RCS file: /cvs/ports/net/toxic/distinfo,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 distinfo --- distinfo29 Apr 2018 11:16:30 - 1.1.1.1 +++ distinfo6 Feb 2019 10:12:39 - @@ -1,2 +1,2 @@ -SHA256 (toxic-0.8.2.tar.gz) = U72+09ctAA+eQ7iCNSPFiVQLgRvCN+1vO03fD+b5prc= -SIZE (toxic-0.8.2.tar.gz) = 1146526 +SHA256 (toxic-0.8.3.tar.gz) = l/JrosJXwQQ5/S/ygMqQw37SJdhvRnQKCPAv8uRFng4= +SIZE (toxic-0.8.3.tar.gz) = 1147100 Index: patches/patch-Makefile === RCS file: /cvs/ports/net/toxic/patches/patch-Makefile,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-Makefile --- patches/patch-Makefile 29 Apr 2018 11:16:30 - 1.1.1.1 +++ patches/patch-Makefile 6 Feb 2019 10:12:39 - @@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2018/ Index: Makefile --- Makefile.orig +++ Makefile -@@ -62,20 +62,17 @@ OBJ := $(addprefix $(BUILD_DIR)/, $(OBJ)) +@@ -57,20 +57,17 @@ OBJ := $(addprefix $(BUILD_DIR)/, $(OBJ)) all: $(BUILD_DIR)/toxic $(BUILD_DIR)/toxic: $(OBJ)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/02/06 03:20:59 Modified files: meta/gnome : Makefile Log message: Sync version with gnome-desktop.
Re: [UPDATE] net/prosody to 0.11.1
On Sun, Jan 27, 2019 at 11:21:53AM +0100, Henrik Friedrichsen wrote: > And another small update to 0.11.2: Final ping. It'd be nice to have this in before the 6.6 freeze.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/02/06 03:20:40 Modified files: x11/gnome/desktop: Makefile distinfo x11/gnome/desktop/patches: patch-libgnome-desktop_Makefile_in x11/gnome/desktop/pkg: PLIST Log message: Update to gnome-desktop-3.30.2.1.
Update net/toxcore and take maintainership back
Hi! While I was contributing to Ravenports, John Marino from DragonFly BSD explained me why I should be maintainer. So I am willing to take back maintainership of ports I submitted to this mailing list. I disabled bootstrap daemon because it doesn't work, it immediately starts and exits with 0, no error messages displayed (yes, I did proper configuration). Without this daemon libconfig is not needed. Full changelog can be found here: https://github.com/TokTok/c-toxcore/blob/master/CHANGELOG.md Also this port has net/msgpack, audio/portaudio-svn, devel/gtest, audio/libsndfile and graphics/opencv as test dependencies (I had to figure that out myself because upstream doesn't mention that), but trying to actually run those tests makes me stuck in infinite loop, so I won't touch NO_TEST=Yes line. Index: Makefile === RCS file: /cvs/ports/net/toxcore/Makefile,v retrieving revision 1.3 diff -u -p -u -p -r1.3 Makefile --- Makefile9 Aug 2018 23:25:58 - 1.3 +++ Makefile6 Feb 2019 08:45:34 - @@ -2,29 +2,30 @@ COMMENT = Tox client library -V =0.2.3 -REVISION = 0 +V =0.2.9 DISTNAME = toxcore-$V GH_ACCOUNT = TokTok GH_PROJECT = c-toxcore GH_TAGNAME = v$V -SHARED_LIBS += toxcore 0.1 # 0.1 +SHARED_LIBS += toxcore 0.2 # 2.9 CATEGORIES = net telephony HOMEPAGE = https://tox.chat/ +MAINTAINER = Leonid Bobrov + # GPLv3+ PERMIT_PACKAGE_CDROM = Yes - -WANTLIB = c config m opus pthread sodium vpx +WANTLIB = c m opus pthread sodium vpx MODULES = devel/cmake +CONFIGURE_ARGS = -DBOOTSTRAP_DAEMON=Off + LIB_DEPENDS = audio/opus \ - devel/libconfig \ multimedia/libvpx \ security/libsodium Index: distinfo === RCS file: /cvs/ports/net/toxcore/distinfo,v retrieving revision 1.2 diff -u -p -u -p -r1.2 distinfo --- distinfo26 Jun 2018 20:34:04 - 1.2 +++ distinfo6 Feb 2019 08:45:34 - @@ -1,2 +1,2 @@ -SHA256 (toxcore-0.2.3.tar.gz) = IsUvKGxG0/gC7baXi88qU/gwE2Pit0V4RhNCejO6OjQ= -SIZE (toxcore-0.2.3.tar.gz) = 471336 +SHA256 (toxcore-0.2.9.tar.gz) = qMlicJRH+5sMuxqQ7BlFobLScrTTIjVsSKTjiCsSZ+c= +SIZE (toxcore-0.2.9.tar.gz) = 510806 Index: pkg/PLIST === RCS file: /cvs/ports/net/toxcore/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 PLIST --- pkg/PLIST 29 Apr 2018 11:14:09 - 1.1.1.1 +++ pkg/PLIST 6 Feb 2019 08:45:34 - @@ -1,5 +1,5 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2018/04/29 11:14:09 landry Exp $ -@bin bin/tox-bootstrapd +@bin bin/DHT_bootstrap include/tox/ include/tox/tox.h include/tox/toxav.h
Re: Update: telephony/py-phonenumbers-8.10.4
On Mon, Feb 04, 2019 at 08:39:14PM +, Linda Lapinlampi wrote: > On Mon, Feb 04, 2019 at 09:23:31PM +0100, Daniel Jakots wrote: > > On Mon, 4 Feb 2019 20:17:01 +, Linda Lapinlampi > > wrote: > > > COMMENT =port of Google's libphonenumber library > > > -#' > > > > why do you remove it? > > I didn't consider it important, thought might as well. Does removing it > mess up with syntax highlighting in your editor? > > Here's that removed, once more. > > > > +HOMEPAGE = > > > https://github.com/daviddrysdale/python-phonenumbers + > > > > is its addition worth it? i.e. is it better than the default homepage > > from the python module? > > No, removed it now. Leftover from diff merge. the diff is ok semarie@ if someone wants to commit it. else I will do it in a few days. Thanks. -- Sebastien Marie > Index: Makefile > === > RCS file: /cvs/ports/telephony/py-phonenumbers/Makefile,v > retrieving revision 1.1.1.1 > diff -u -p -u -p -r1.1.1.1 Makefile > --- Makefile 16 Nov 2018 08:48:52 - 1.1.1.1 > +++ Makefile 4 Feb 2019 20:35:52 - > @@ -3,7 +3,7 @@ > COMMENT =port of Google's libphonenumber library > #' > > -MODPY_EGG_VERSION = 8.9.16 > +MODPY_EGG_VERSION = 8.10.4 > DISTNAME = phonenumbers-${MODPY_EGG_VERSION} > PKGNAME =py-${DISTNAME} > > @@ -18,5 +18,7 @@ MODPY_SETUPTOOLS = Yes > > FLAVORS =python3 > FLAVOR ?= > + > +MAKE_ENV += LC_CTYPE=C.UTF-8 > > .include > Index: distinfo > === > RCS file: /cvs/ports/telephony/py-phonenumbers/distinfo,v > retrieving revision 1.1.1.1 > diff -u -p -u -p -r1.1.1.1 distinfo > --- distinfo 16 Nov 2018 08:48:52 - 1.1.1.1 > +++ distinfo 4 Feb 2019 20:35:52 - > @@ -1,2 +1,2 @@ > -SHA256 (phonenumbers-8.9.16.tar.gz) = > 5GCnHBK558V+2dJ+KVPQMY/nWNUIkla7pB3QtRdzVbE= > -SIZE (phonenumbers-8.9.16.tar.gz) = 2912838 > +SHA256 (phonenumbers-8.10.4.tar.gz) = > EncGsXQ9LAz1db4CUmLJ5F5off69SxFMojHJ3x5xOHQ= > +SIZE (phonenumbers-8.10.4.tar.gz) = 2888075 > Index: pkg/PLIST > === > RCS file: /cvs/ports/telephony/py-phonenumbers/pkg/PLIST,v > retrieving revision 1.1.1.1 > diff -u -p -u -p -r1.1.1.1 PLIST > --- pkg/PLIST 16 Nov 2018 08:48:53 - 1.1.1.1 > +++ pkg/PLIST 4 Feb 2019 20:35:52 - > @@ -665,7 +665,6 @@ lib/python${MODPY_VERSION}/site-packages > > lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/${MODPY_PYCACHE}data25.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/${MODPY_PYCACHE}data26.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/${MODPY_PYCACHE}data27.${MODPY_PYC_MAGIC_TAG}pyc > -lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/${MODPY_PYCACHE}data28.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/${MODPY_PYCACHE}data3.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/${MODPY_PYCACHE}data4.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/${MODPY_PYCACHE}data5.${MODPY_PYC_MAGIC_TAG}pyc > @@ -695,7 +694,6 @@ lib/python${MODPY_VERSION}/site-packages > lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/data25.py > lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/data26.py > lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/data27.py > -lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/data28.py > lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/data3.py > lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/data4.py > lib/python${MODPY_VERSION}/site-packages/phonenumbers/geodata/data5.py
Re: [new] gzdoom-3.6.0
timo.my...@bittivirhe.fi (Timo Myyrä) wrote: > Jeremie Courreges-Anglas writes: > > > On Mon, Jan 14 2019, Solene Rapenne wrote: > >> Solene Rapenne wrote: > >>> Solene Rapenne wrote: > > > > [...] > > > >>> I finally found the origin of the issue when loading brutal doom (and some > >>> others mods I hope). When loading assets and making animations, it looks > >>> for > >>> duplicates. > >>> > >>> I don't fully understand the logic here, I read that in case of duplicate, > >>> it free the old one and replace it with the current object? > >>> > >>> It's a dirty hack but commenting the free instruction permit to play mods > >>> (having duplicates in their animations I think?) with no noticeable memory > >>> usage change. I added a puts("duplicate") to see if this happens often, it > >>> was like 7 duplicates for brutal doom. As it's only happening at load > >>> time, > >>> I would say it's pretty safe to not free this. > >>> > >>> What do you think? > >>> > >>> Index: src/textures/animations.cpp > >>> --- src/textures/animations.cpp.orig > >>> +++ src/textures/animations.cpp > >>> @@ -73,7 +73,7 @@ FAnimDef *FTextureManager::AddAnim (FAnimDef *anim) > >>> if (mAnimations[i]->BasePic == anim->BasePic) > >>> { > >>> // Found one! > >>> - free (mAnimations[i]); > >>> + //free (mAnimations[i]); > >>> mAnimations[i] = anim; > >>> return anim; > >>> } > >> > >> Last version in tarball, including my patch. I've been able to play and > >> did not > >> encounter any issue. From my code reading, it will wastes a few MB of > >> memory if > >> a mod make heavy use of animated textures and have duplicates. > > > > No opinion regarding the workaround. > > > > Looks fine ports-wise except for libexecinfo which should go to > > LIB_DEPENDS instead of BUILD_DEPENDS, and "execinfo" should be added to > > WANTLIB. > > > > With this addressed, ok jca@ to import. > > Ok, here's new 3.7.2 version with changes added. > > timo I choosed to import 3.7.1 as it was tested and approved. I didn't want to delay it longer... I tried the 3.7.2 version and no issue so far. Ok solene@ for update. I've seen a gzdoom-lite version is now released, it targets older computers and will not receive any graphical enhancements anymore, is there someone interested in it?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2019/02/06 02:32:21 Log message: Import gzdoom-3.7.1 ZDoom is a source port for the modern era, supporting current hardware and operating systems and sporting a vast array of user options. Make Doom your own again! With awesome work from Timo Myyr?? (maintainer), Ryan Freeman, jca@, fcambus@ ok jca@ fcambus@ Status: Vendor Tag: solene Release Tags: solene_20190206 N ports/games/gzdoom/Makefile N ports/games/gzdoom/distinfo N ports/games/gzdoom/pkg/DESCR N ports/games/gzdoom/pkg/PLIST N ports/games/gzdoom/pkg/README N ports/games/gzdoom/patches/patch-src_CMakeLists_txt N ports/games/gzdoom/patches/patch-src_sound_mididevices_music_fluidsynth_mididevice_cpp N ports/games/gzdoom/patches/patch-src_textures_animations_cpp No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2019/02/06 01:59:40 Modified files: net/libmaxminddb: Makefile distinfo Log message: Update GeoLite2 databases to latest version.
NEW: devel/ruby-optimist
Hi, for an update of databases/ruby-hiera-eyaml I need the optimist gem. They switched from the (deprecated) trollop to optimist. Optimist is a commandline option parser for Ruby that just gets out of your way. One line of code per option is all you need to write. For that, you get a nice automatically-generated help page, robust option parsing, command subcompletion, and sensible defaults for everything you don't specify. any comments, or OK? cheers, Sebastian ruby-optimist.tar.gz Description: application/gzip