CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2019/07/15 21:49:32 Modified files: databases/ports-readmes: Makefile databases/ports-readmes/files: make-readmes port.tt2 Log message: forgot that one (pointed out by naddy)
Re: Lynis-2.7.5
On Mon, Jul 15, 2019 at 11:42:37AM +0200, Gonzalo L. Rodriguez wrote: > Hello, > > Update for Lynis to 2.7.5: > > https://cisofy.com/changelog/lynis/#275 > > OK? Comments? Tested and works fine. ok lteo@ > Cheers.- > > -- > > - gonzalo > Index: Makefile > === > RCS file: /cvs/ports/security/lynis/Makefile,v > retrieving revision 1.35 > diff -u -p -r1.35 Makefile > --- Makefile 12 Jul 2019 20:49:05 - 1.35 > +++ Makefile 15 Jul 2019 09:41:25 - > @@ -2,7 +2,7 @@ > > COMMENT= security auditing tool > > -DISTNAME = lynis-2.7.4 > +DISTNAME = lynis-2.7.5 > > CATEGORIES= security > > Index: distinfo > === > RCS file: /cvs/ports/security/lynis/distinfo,v > retrieving revision 1.31 > diff -u -p -r1.31 distinfo > --- distinfo 2 May 2019 09:27:09 - 1.31 > +++ distinfo 15 Jul 2019 09:41:25 - > @@ -1,2 +1,2 @@ > -SHA256 (lynis-2.7.4.tar.gz) = o/YVeT/4BzO64VWEiTpAhhAdiRxhw6UtKA37ZYy5j70= > -SIZE (lynis-2.7.4.tar.gz) = 287563 > +SHA256 (lynis-2.7.5.tar.gz) = PSet5zpcEkiSWtnAYAJJQM5dICn0CqqQH0MxSIj+Mk0= > +SIZE (lynis-2.7.5.tar.gz) = 288688 > Index: pkg/PLIST > === > RCS file: /cvs/ports/security/lynis/pkg/PLIST,v > retrieving revision 1.19 > diff -u -p -r1.19 PLIST > --- pkg/PLIST 2 May 2019 09:27:09 - 1.19 > +++ pkg/PLIST 15 Jul 2019 09:41:25 - > @@ -22,6 +22,7 @@ share/lynis/db/languages/ > share/lynis/db/languages/az > share/lynis/db/languages/br > share/lynis/db/languages/cn > +share/lynis/db/languages/da > share/lynis/db/languages/de > share/lynis/db/languages/en > share/lynis/db/languages/en-GB
UPDATE: java/gradle 5.5.1
This updates Gradle to 5.5.1. https://docs.gradle.org/5.5.1/release-notes.html I have confirmed that my WIP ghidra diff at https://marc.info/?l=openbsd-ports=156323935501672=2 builds successfully with this Gradle update. ok? Index: Makefile === RCS file: /cvs/ports/java/gradle/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile17 Jun 2019 02:03:44 - 1.1.1.1 +++ Makefile14 Jul 2019 02:41:55 - @@ -2,7 +2,7 @@ COMMENT = build automation tool -DISTNAME = gradle-5.4.1 +DISTNAME = gradle-5.5.1 EXTRACT_SUFX = -bin.zip CATEGORIES = java Index: distinfo === RCS file: /cvs/ports/java/gradle/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo17 Jun 2019 02:03:44 - 1.1.1.1 +++ distinfo14 Jul 2019 02:45:00 - @@ -1,2 +1,2 @@ -SHA256 (gradle-5.4.1-bin.zip) = e9utHk9U8TyKeKvADCbUTdhwnUrttwTZE/sbt4rAJdw= -SIZE (gradle-5.4.1-bin.zip) = 87107055 +SHA256 (gradle-5.5.1-bin.zip) = IioD/PL8rzaRdnzpVJ9469SnfnP54jo5aJn7cLQgzQA= +SIZE (gradle-5.5.1-bin.zip) = 89152247 Index: pkg/PLIST === RCS file: /cvs/ports/java/gradle/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 17 Jun 2019 02:03:44 - 1.1.1.1 +++ pkg/PLIST 14 Jul 2019 02:46:51 - @@ -12,8 +12,8 @@ share/java/gradle/init.d/ share/java/gradle/init.d/readme.txt share/java/gradle/lib/ share/java/gradle/lib/annotations-13.0.jar -share/java/gradle/lib/ant-1.9.13.jar -share/java/gradle/lib/ant-launcher-1.9.13.jar +share/java/gradle/lib/ant-1.9.14.jar +share/java/gradle/lib/ant-launcher-1.9.14.jar share/java/gradle/lib/asm-7.0.jar share/java/gradle/lib/asm-analysis-7.0.jar share/java/gradle/lib/asm-commons-7.0.jar @@ -21,51 +21,54 @@ share/java/gradle/lib/asm-tree-7.0.jar share/java/gradle/lib/commons-compress-1.18.jar share/java/gradle/lib/commons-io-2.6.jar share/java/gradle/lib/commons-lang-2.6.jar +share/java/gradle/lib/failureaccess-1.0.1.jar share/java/gradle/lib/fastutil-8.2.1-min.jar -share/java/gradle/lib/gradle-api-metadata-5.4.1.jar -share/java/gradle/lib/gradle-base-services-5.4.1.jar -share/java/gradle/lib/gradle-base-services-groovy-5.4.1.jar -share/java/gradle/lib/gradle-build-cache-5.4.1.jar -share/java/gradle/lib/gradle-build-cache-packaging-5.4.1.jar -share/java/gradle/lib/gradle-build-option-5.4.1.jar -share/java/gradle/lib/gradle-cli-5.4.1.jar -share/java/gradle/lib/gradle-core-5.4.1.jar -share/java/gradle/lib/gradle-core-api-5.4.1.jar -share/java/gradle/lib/gradle-docs-5.4.1.jar -share/java/gradle/lib/gradle-execution-5.4.1.jar -share/java/gradle/lib/gradle-files-5.4.1.jar -share/java/gradle/lib/gradle-installation-beacon-5.4.1.jar -share/java/gradle/lib/gradle-jvm-services-5.4.1.jar -share/java/gradle/lib/gradle-kotlin-dsl-5.4.1.jar -share/java/gradle/lib/gradle-kotlin-dsl-tooling-models-5.4.1.jar -share/java/gradle/lib/gradle-launcher-5.4.1.jar -share/java/gradle/lib/gradle-logging-5.4.1.jar -share/java/gradle/lib/gradle-messaging-5.4.1.jar -share/java/gradle/lib/gradle-model-core-5.4.1.jar -share/java/gradle/lib/gradle-model-groovy-5.4.1.jar -share/java/gradle/lib/gradle-native-5.4.1.jar -share/java/gradle/lib/gradle-persistent-cache-5.4.1.jar -share/java/gradle/lib/gradle-process-services-5.4.1.jar -share/java/gradle/lib/gradle-resources-5.4.1.jar -share/java/gradle/lib/gradle-runtime-api-info-5.4.1.jar -share/java/gradle/lib/gradle-snapshots-5.4.1.jar -share/java/gradle/lib/gradle-tooling-api-5.4.1.jar -share/java/gradle/lib/gradle-wrapper-5.4.1.jar +share/java/gradle/lib/gradle-api-metadata-5.5.1.jar +share/java/gradle/lib/gradle-base-services-5.5.1.jar +share/java/gradle/lib/gradle-base-services-groovy-5.5.1.jar +share/java/gradle/lib/gradle-build-cache-5.5.1.jar +share/java/gradle/lib/gradle-build-cache-packaging-5.5.1.jar +share/java/gradle/lib/gradle-build-option-5.5.1.jar +share/java/gradle/lib/gradle-cli-5.5.1.jar +share/java/gradle/lib/gradle-core-5.5.1.jar +share/java/gradle/lib/gradle-core-api-5.5.1.jar +share/java/gradle/lib/gradle-docs-5.5.1.jar +share/java/gradle/lib/gradle-execution-5.5.1.jar +share/java/gradle/lib/gradle-files-5.5.1.jar +share/java/gradle/lib/gradle-installation-beacon-5.5.1.jar +share/java/gradle/lib/gradle-instant-execution-5.5.1.jar +share/java/gradle/lib/gradle-jvm-services-5.5.1.jar +share/java/gradle/lib/gradle-kotlin-dsl-5.5.1.jar +share/java/gradle/lib/gradle-kotlin-dsl-tooling-models-5.5.1.jar +share/java/gradle/lib/gradle-launcher-5.5.1.jar +share/java/gradle/lib/gradle-logging-5.5.1.jar +share/java/gradle/lib/gradle-messaging-5.5.1.jar +share/java/gradle/lib/gradle-model-core-5.5.1.jar +share/java/gradle/lib/gradle-model-groovy-5.5.1.jar +share/java/gradle/lib/gradle-native-5.5.1.jar +share/java/gradle/lib/gradle-persistent-cache-5.5.1.jar
Re: [NEW] security/ghidra
On Sat, Jun 22, 2019 at 10:26:11PM -0400, Lawrence Teo wrote: > On Fri, Jun 21, 2019 at 01:48:59AM -0600, Anthony J. Bentley wrote: > > Lawrence Teo writes: > > > I used SUBST_CMD to substitute WRKDIR in GHelpBuilder.java, and > > > accidentally included the substituted value in my diff when I > > > regenerated patches. > > > > > > I have fixed it in this latest diff. Could you please test if it works > > > for you? > > > > Thanks, ghidra and the decompiler work fine now. > > Great to hear that it works! > > > If any patches are pulled from GitHub, please add a comment with the > > commit or a link to the pull request. > > > > ok bentley@ > > Thanks for the ok and feedback. I have created a new diff where I have > added the link to the GitHub pull request as a comment to all the patch > files that were created/adapted from that pull request. There are no > changes apart from adding those comments. > > Remi, are you ok with this going in? Here's an updated diff so that it will apply after sthen@'s PERMIT_PACKAGE_CDROM -> PERMIT_PACKAGE sweep. There are no other changes. Index: Makefile === RCS file: /cvs/ports/security/ghidra/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- Makefile12 Jul 2019 20:49:02 - 1.4 +++ Makefile14 Jul 2019 03:04:19 - @@ -6,9 +6,13 @@ ONLY_FOR_ARCHS = amd64 COMMENT = software reverse engineering (SRE) framework VERSION = 9.0.4 -REVISION = 0 -DISTNAME = ghidra_9.0.4_PUBLIC_20190516 -PKGNAME = ghidra-${VERSION} +GHIDRA_DATE = 20190516 +REVISION = 1 + +GH_ACCOUNT = NationalSecurityAgency +GH_PROJECT = ghidra +GH_TAGNAME = Ghidra_${VERSION}_build +DISTNAME = ghidra-${VERSION} CATEGORIES = security @@ -19,30 +23,113 @@ MAINTAINER = Remi Pointel https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-${YAJSW_VER}/ +MASTER_SITES2 =https://repo.maven.apache.org/maven2/ EXTRACT_SUFX = .zip +ST4_VER = 4.1 +HAMCREST_VER = 1.3 +JAVACC_VER = 5.0 +JMOCKIT_VER = 1.44 +JSON_SIMPLE_VER = 1.1.1 +JUNIT_VER =4.12 +YAJSW_VER =12.12 + +JAR_DISTFILES += ST4{org/antlr/ST4/${ST4_VER}/ST4}-${ST4_VER}.jar +JAR_DISTFILES += hamcrest{org/hamcrest/hamcrest-all/${HAMCREST_VER}/hamcrest}-all-${HAMCREST_VER}.jar +JAR_DISTFILES += javacc{net/java/dev/javacc/javacc/${JAVACC_VER}/javacc}-${JAVACC_VER}.jar +JAR_DISTFILES += jmockit{org/jmockit/jmockit/${JMOCKIT_VER}/jmockit}-${JMOCKIT_VER}.jar +JAR_DISTFILES += json-simple{com/googlecode/json-simple/json-simple/${JSON_SIMPLE_VER}/json-simple}-${JSON_SIMPLE_VER}.jar +JAR_DISTFILES += junit{junit/junit/${JUNIT_VER}/junit}-${JUNIT_VER}.jar + +DISTFILES =${DISTNAME}.tar.gz +DISTFILES += ghidra_${VERSION}_PUBLIC_${GHIDRA_DATE}${EXTRACT_SUFX}:0 +DISTFILES += yajsw-stable-${YAJSW_VER}${EXTRACT_SUFX}:1 +DISTFILES += ${JAR_DISTFILES:C/$/:2/} + +EXTRACT_ONLY = ${DISTNAME}.tar.gz + MODULES = java MODJAVA_VER = 11+ +BUILD_DEPENDS =archivers/unzip \ + devel/bison \ + java/gradle \ + shells/bash + RUN_DEPENDS = shells/bash \ java/javaPathHelper -NO_BUILD = Yes NO_TEST = Yes -WRKDIST = ${WRKDIR}/${PKGNAME:S/-/_/} +SUBST_VARS += GHIDRA_DATE VERSION WRKDIR + +JAR_DIRS +=Features-FileFormats +JAR_DIRS +=Features-Python +JAR_DIRS +=Framework-Docking +JAR_DIRS +=Framework-FileSystem +JAR_DIRS +=Framework-Generic +JAR_DIRS +=Framework-Graph +JAR_DIRS +=Framework-Project +JAR_DIRS +=Framework-SoftwareModeling post-extract: @perl -pi -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \ - ${WRKSRC}/ghidraRun + ${WRKSRC}/Ghidra/RuntimeScripts/Linux/ghidraRun + @perl -pi -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \ + ${WRKSRC}/Ghidra/RuntimeScripts/Linux/support/launch.sh @perl -pi -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \ - ${WRKSRC}/support/launch.sh + ${WRKSRC}/Ghidra/RuntimeScripts/Linux/support/launch.sh + @perl -pi -e 's,(application.version)=.*,\1=${VERSION},' \ + ${WRKSRC}/Ghidra/application.properties + +# Steps derived from: +# https://github.com/NationalSecurityAgency/ghidra/blob/master/DevGuide.md +pre-build: + cp ${FILESDIR}/repos.gradle ${WRKDIR} + ${SUBST_CMD} ${WRKDIR}/repos.gradle \ + ${WRKSRC}/Ghidra/Framework/Help/src/main/java/help/GHelpBuilder.java + mkdir ${WRKDIR}/{flatRepo,gradle,home} +.for dir in ${JAR_DIRS} + unzip -j ${DISTDIR}/ghidra_${VERSION}_PUBLIC_${GHIDRA_DATE}.zip \ +
Re: sqlports info available as a json in the CDN/mirrors, yay or nay?
On Tue, 2 Jul 2019 17:42:07 +0200, Juan Francisco Cantero Hurtado wrote: > I've the python script but I've not started yet with the port. The > question for the porters (and in special people running the bulks, > signing/uploading packages) is, are you against this idea? It looks like to me no one has any objection :)
Re: plan9port: win(1) hang on acme(1) window
Hi! On 07/15, Andrea Biscuola wrote: > I was trying to debug it anyway by myself. I also opened up an issue on the github repository of the project: https://github.com/9fans/plan9port/issues/275
[ports-gcc] Unbreak devel/pycdc (was: Re: powerpc bulk build report)
> http://build-failures.rhaalovely.net//powerpc/2019-06-29/devel/pycdc.log Using -Werror for releases seems ambitious to me, especially that GCC is very adept at generating them. I've removed the flag, and it builds [0] on macppc. Tests pass as well. Same thing for amd64 where there is no warning at all to start with. Comments/feedback are welcome! Charlène. [0] https://bin.charlenew.xyz/pycdc.log Index: Makefile === RCS file: /cvs/ports/devel/pycdc/Makefile,v retrieving revision 1.4 diff -u -p -u -p -r1.4 Makefile --- Makefile12 Jul 2019 20:45:56 - 1.4 +++ Makefile15 Jul 2019 22:14:54 - @@ -3,7 +3,7 @@ COMMENT = python bytecode disassembler and decompiler DISTNAME = pycdc-0.0.20180428 -REVISION = 1 +REVISION = 2 GH_ACCOUNT = zrax GH_PROJECT = pycdc Index: patches/patch-CMakeLists_txt === RCS file: patches/patch-CMakeLists_txt diff -N patches/patch-CMakeLists_txt --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-CMakeLists_txt15 Jul 2019 22:14:54 - @@ -0,0 +1,17 @@ +$OpenBSD$ + +Fix for ports-gcc, the code generates warnings that triggers a +build failure + +Index: CMakeLists.txt +--- CMakeLists.txt.orig CMakeLists.txt +@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 2.8) + find_package(PythonInterp REQUIRED) + + if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") +-set(CMAKE_CXX_FLAGS "-Wall -Wextra -Werror ${CMAKE_CXX_FLAGS}") ++set(CMAKE_CXX_FLAGS "-Wall -Wextra ${CMAKE_CXX_FLAGS}") + endif() + + set(PYTHON_VERSIONS
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2019/07/15 15:54:17 Modified files: audio/qsynth : Makefile distinfo audio/qsynth/patches: patch-src_qsynthOptions_cpp Log message: simple update to 0.5.7
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/07/15 15:50:18 Modified files: multimedia/qtav: Makefile Added files: multimedia/qtav/patches: patch-src_codec_video_SurfaceInteropCUDA_cpp Log message: qtav: unbreak with ports-gcc Fix various occurrences where ports-gcc doesn't want to consider NULL as false. OK rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2019/07/15 15:45:43 Modified files: sysutils/facter: Makefile distinfo sysutils/facter/patches: patch-lib_CMakeLists_txt Removed files: sysutils/facter/patches: patch-CMakeLists_txt patch-lib_src_facts_posix_uptime_resolver_cc Log message: simple update to 3.14.1, eventually got the utpmx patches merged upstream.
[ports-gcc] Unbreak graphics/vulkan-loader (was: Re: powerpc bulk build report)
> http://build-failures.rhaalovely.net//powerpc/2019-06-29/graphics/vulkan-loader.log The problem here is pretty simple as soon as base-gcc is implied: - it has missing switches (that's the failure seen in the log) - anonymous unions require -std=gnu99 (that's also in the log, "declarations that declare nothing" warnings) - i fixed those in the CMakeLists, but then it fails with another classic: "error: thread-local storage not supported for this target" I guess it's enough to allow me a COMPILER change. It has fixed the build [0], i can't say anything about runtime since no macppc video cards are compatible. I made no REVISION bump, because it has never been built on base-gcc archs and it implies no changes for base-clang ones. Comments/feedback are welcome! Charlène. [0] https://bin.charlenew.xyz/vulkan-loader.log Index: Makefile === RCS file: /cvs/ports/graphics/vulkan-loader/Makefile,v retrieving revision 1.3 diff -u -p -u -p -r1.3 Makefile --- Makefile22 Jun 2019 17:02:24 - 1.3 +++ Makefile15 Jul 2019 21:25:27 - @@ -26,6 +26,9 @@ RUN_DEPENDS = graphics/vulkan-headers CONFIGURE_ARGS = -DBUILD_WSI_WAYLAND_SUPPORT=False +# Thread local storage +COMPILER = base-clang ports-gcc + MODULES = devel/cmake \ lang/python MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
[ports-gcc] Unbreak multimedia/qtav (was: Re: powerpc bulk build report)
On Sun, 14 Jul 2019 06:46:44 -0600 (MDT) lan...@openbsd.org wrote: > http://build-failures.rhaalovely.net//powerpc/2019-06-29/multimedia/qtav.log > http://build-failures.rhaalovely.net/sparc64/2019-06-09/multimedia/qtav.log Classic issue here, GCC doesn't like to see NULL as an equivalent for false. It seems like an upstream "typo", because there are many occurrences where booleans are used. It builds fine on amd64 and macppc (there are no tests). Comments/feedback are welcome! Charlène. Index: Makefile === RCS file: /cvs/ports/multimedia/qtav/Makefile,v retrieving revision 1.3 diff -u -p -u -p -r1.3 Makefile --- Makefile12 Jul 2019 20:47:57 - 1.3 +++ Makefile15 Jul 2019 20:27:40 - @@ -5,6 +5,7 @@ COMMENT = FFmpeg-based Qt multimedia fra GH_ACCOUNT = wang-bin GH_PROJECT = QtAV GH_TAGNAME = v1.12.0 +REVISION = 0 PKGNAME = ${DISTNAME:L} Index: patches/patch-src_codec_video_SurfaceInteropCUDA_cpp === RCS file: patches/patch-src_codec_video_SurfaceInteropCUDA_cpp diff -N patches/patch-src_codec_video_SurfaceInteropCUDA_cpp --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_codec_video_SurfaceInteropCUDA_cpp15 Jul 2019 20:27:40 - @@ -0,0 +1,26 @@ +$OpenBSD$ + +ports-gcc fix for: +converting to 'bool' from 'std::nullptr_t' requires direct-initialization + +Index: src/codec/video/SurfaceInteropCUDA.cpp +--- src/codec/video/SurfaceInteropCUDA.cpp.orig src/codec/video/SurfaceInteropCUDA.cpp +@@ -132,7 +132,7 @@ bool HostInteropResource::map(int picIndex, const CUVI + if (!ensureResource(pitch, H)) //copy height is coded height + return false; + // the same thread (context) as cuMemAllocHost, so no ccontext switch is needed +-CUDA_ENSURE(cuMemcpyDtoH(host_mem.data, devptr, pitch*H*3/2), NULL); ++CUDA_ENSURE(cuMemcpyDtoH(host_mem.data, devptr, pitch*H*3/2), false); + host_mem.index = picIndex; + } + // map to texture +@@ -173,7 +173,7 @@ bool HostInteropResource::ensureResource(int pitch, in + if (!share_ctx) // cuMemFreeHost will be called in dtor which is not the current thread. + CUDA_WARN(cuCtxPushCurrent(ctx)); + // NV12 +-CUDA_ENSURE(cuMemAllocHost((void**)_mem.data, pitch*height*3/2), NULL); ++CUDA_ENSURE(cuMemAllocHost((void**)_mem.data, pitch*height*3/2), false); + if (!share_ctx) + CUDA_WARN(cuCtxPopCurrent(NULL)); //can be null or + return true;
[fix, all archs] audio/clementine: fix with ports-gcc and future chromaprint version
Hi, I've 2 itches to scratch with clementine now my chromaprint update has a pretty good shape and works fine on macppc/amd64. 1) Support chromaprint >= 1.4 -- Because our version of clementine is old, it's not compatible with recent versions of chromaprint. What i'm proposing here is an upstream fix that allows clementine to be built with chromaprint-1.1 (what we have in CVS at the moment) and chromaprint-1.4.3. This change impacts all archs. 2) Unbreak with ports-gcc -- > http://build-failures.rhaalovely.net/sparc64/last/audio/clementine.log (does not build on macppc, chromaprint-1.1 is broken due to narrowing errors) The problem is that: - clementine is expected to be built with -std=c++0x - since protobuf>=3.6, we now need to build it with C++11 - the bundled libechonest is built with -Werror with GCC only, and use features that are deprecated in C++11, generating a warning and thus a build failure - a header was missing further in the build :] Testing --- On macppc/arm* you'll need the -wip chromaprint-1.4.3 [0]. Please note that music tags autofill won't work in any case. I suspect the musicbrainz code in our clementine is too old as well. It's not a chromaprint issues, py-acoustid, another consumer, find the same songs. - amd64:builds and works fine with any version of chromaprint - macppc: with the -wip chromaprint-1.4.3, it builds [1] and still either stay stuck trying to load tracks, or SIGSEGV with egdb getting a SIGTRAP as soon as i press the play button. That was already there back in gcc-4.9. ports-lib-depends-check reports extra stuff in wantlib but it's actually linked against them according to ldd, or otherwise dlopen()'d. Comments/testing reports are welcome! Charlène. [0] https://github.com/jasperla/openbsd-wip/tree/master/audio/chromaprint [1] https://bin.charlenew.xyz/clementine.png Index: Makefile === RCS file: /cvs/ports/audio/clementine/Makefile,v retrieving revision 1.37 diff -u -p -u -p -r1.37 Makefile --- Makefile12 Jul 2019 20:43:32 - 1.37 +++ Makefile15 Jul 2019 18:15:39 - @@ -5,7 +5,7 @@ COMMENT = Qt4-based featureful music pla V =1.2.3 DISTNAME = clementine-${V} CATEGORIES = audio x11 -REVISION = 14 +REVISION = 15 HOMEPAGE = https://clementine-player.org/ @@ -32,6 +32,8 @@ WANTLIB += plist MODULES = devel/cmake x11/qt4 COMPILER = base-clang ports-gcc +# clementine is originally meant to be build with c++0x, but +# protobuf>=3.6 wants c++11 CXXFLAGS +=-std=c++11 BUILD_DEPENDS =devel/boost \ Index: patches/patch-3rdparty_libechonest_CMakeLists_txt === RCS file: patches/patch-3rdparty_libechonest_CMakeLists_txt diff -N patches/patch-3rdparty_libechonest_CMakeLists_txt --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-3rdparty_libechonest_CMakeLists_txt 15 Jul 2019 18:15:39 - @@ -0,0 +1,20 @@ +$OpenBSD$ + +ports-gcc: don't build with -Werror because the code uses dynamic +exception specifications that are deprecated in C++11, thus +generating a warning. + +Index: 3rdparty/libechonest/CMakeLists.txt +--- 3rdparty/libechonest/CMakeLists.txt.orig 3rdparty/libechonest/CMakeLists.txt +@@ -40,10 +40,6 @@ set( LIBECHONEST_H + + QT4_WRAP_CPP( ${LIBECHONEST_H} ) + +-if (CMAKE_COMPILER_IS_GNUCXX) +-add_definitions( -Werror ) +-endif (CMAKE_COMPILER_IS_GNUCXX) +- + SET( OS_SPECIFIC_LINK_LIBRARIES "" ) + IF( APPLE OR MINGW ) + SET( OS_SPECIFIC_LINK_LIBRARIES ${QJSON_LIBRARIES} ) Index: patches/patch-src_devices_giolister_cpp === RCS file: patches/patch-src_devices_giolister_cpp diff -N patches/patch-src_devices_giolister_cpp --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_devices_giolister_cpp 15 Jul 2019 18:15:39 - @@ -0,0 +1,16 @@ +$OpenBSD$ + +Add missing header for ports-gcc, from upstream: +https://github.com/clementine-player/Clementine/pull/5630/commits/a2f7d018c7bdee96d4cefd5a1ec0c4f710fea226 + +Index: src/devices/giolister.cpp +--- src/devices/giolister.cpp.orig src/devices/giolister.cpp +@@ -17,6 +17,7 @@ + + #include "config.h" + ++#include + #include + + #include Index: patches/patch-src_musicbrainz_chromaprinter_cpp === RCS file: patches/patch-src_musicbrainz_chromaprinter_cpp diff -N patches/patch-src_musicbrainz_chromaprinter_cpp --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_musicbrainz_chromaprinter_cpp 15 Jul 2019 18:15:39 - @@ -0,0 +1,34 @@ +$OpenBSD$ + +Unbreak with chromaprint >=1.4 (and keep backward compat), see:
Re: plan9port: win(1) hang on acme(1) window
Hi > Hi, > > On 07/15, Andrea Biscuola wrote: > > Hi Patrick > > > > On Mon, 15 Jul 2019 11:03:54 -0400 > > Patrick Marchand wrote: > > > > > [snip] > > > > > > Here's a new diff, I messed up the previous one and it did not > > > include the deletion of the web patch, that has been upstreamed > > > since the last port upgrade. > > > > I applied your patch, but a hunk for the patch-INSALL file does > > not apply cleanly. Inline, the content of patch-INSTALL.rej > Dont have the time right now to check exactly how I borked the diff. Don't worry, no rush :) I was trying to debug it anyway by myself. > > But here's my patches/patch-INSTALL file: > > $OpenBSD: patch-INSTALL,v 1.6 2017/02/28 02:27:41 gsoar > es Exp $ > > Index: INSTALL > --- INSTALL.orig > +++ INSTALL > @@ -134,7 +134,7 @@ fi > if [ `uname` != Darwin ]; then > # Determine whether fontsrv X11 files are avail > able. > rm -f a.out > - cc -o a.out -c -Iinclude -I/usr/include -I/usr/ > local/include -I/usr/include/freetype2 -I/usr/local/inc > lude/freetype2 \ > + ${CC} -o a.out -c -Iinclude -I/usr/include -I/u > sr/local/include -I/usr/include/freetype2 -I/usr/local/ > include/freetype2 \ > -I/usr/X11R6/include -I/usr/X11R6/include/f > reetype2 src/cmd/fontsrv/x11.c >/dev/null 2>&1 > if [ -f a.out ]; then > echo " fontsrv dependencies found." I'll try that and, eventually, see if I can fix it. Thanks -- Andrea
Re: plan9port: win(1) hang on acme(1) window
Hi, On 07/15, Andrea Biscuola wrote: > Hi Patrick > > On Mon, 15 Jul 2019 11:03:54 -0400 > Patrick Marchand wrote: > > > [snip] > > > > Here's a new diff, I messed up the previous one and it did not > > include the deletion of the web patch, that has been upstreamed > > since the last port upgrade. > > I applied your patch, but a hunk for the patch-INSALL file does > not apply cleanly. Inline, the content of patch-INSTALL.rej Dont have the time right now to check exactly how I borked the diff. But here's my patches/patch-INSTALL file: $OpenBSD: patch-INSTALL,v 1.6 2017/02/28 02:27:41 gsoar es Exp $ Index: INSTALL --- INSTALL.orig +++ INSTALL @@ -134,7 +134,7 @@ fi if [ `uname` != Darwin ]; then # Determine whether fontsrv X11 files are avail able. rm -f a.out - cc -o a.out -c -Iinclude -I/usr/include -I/usr/ local/include -I/usr/include/freetype2 -I/usr/local/inc lude/freetype2 \ + ${CC} -o a.out -c -Iinclude -I/usr/include -I/u sr/local/include -I/usr/include/freetype2 -I/usr/local/ include/freetype2 \ -I/usr/X11R6/include -I/usr/X11R6/include/f reetype2 src/cmd/fontsrv/x11.c >/dev/null 2>&1 if [ -f a.out ]; then echo " fontsrv dependencies found."
Re: git-daemon may unexpectedly run as root
On Mon, Jul 15, 2019 at 11:15:55AM +0200, Klemens Nanni wrote: > On Mon, Jul 15, 2019 at 08:05:56AM +0200, Antoine Jacoutot wrote: > > How so? What makes it behave differently when both options are started > > from rc.d? > Both are started from rc.d through `su -l ...', both get their HOME, > USER, PATH, etc. set - that means different `daemon_user' values will > cause different values in those environment variables. > > `daemon_user=root daemon_flags=-u _gitdaemon' will therefore start as > root, drop privileges, but run with HOME=/root as it is not reset. > > `daemon_user=_gitdaemon' will therefore start as _gitdaemon, not drop > privileges and keep its proper environment, where everything already > matches the running user. Yes I know that, I wrote the framework :-) My question is how will it make it behave different? -- Antoine
Re: plan9port: win(1) hang on acme(1) window
Hi Patrick On Mon, 15 Jul 2019 11:03:54 -0400 Patrick Marchand wrote: > [snip] > > Here's a new diff, I messed up the previous one and it did not > include the deletion of the web patch, that has been upstreamed > since the last port upgrade. I applied your patch, but a hunk for the patch-INSALL file does not apply cleanly. Inline, the content of patch-INSTALL.rej @@ -1,37 +1,14 @@ $OpenBSD: patch-INSTALL,v 1.6 2017/02/28 02:27:41 gsoares Exp $ INSTALL.orig Wed Nov 2 20:17:40 2016 -+++ INSTALLMon Feb 27 21:57:58 2017 -@@ -128,7 +128,7 @@ fi +Index: INSTALL +--- INSTALL.orig INSTALL +@@ -134,7 +134,7 @@ fi if [ `uname` != Darwin ]; then # Determine whether fontsrv X11 files are available. rm -f a.out -- gcc -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \ +- cc -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \ + ${CC} -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \ -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 src/cmd/fontsrv/x11.c >/dev/null 2>&1 if [ -f a.out ]; then echo " fontsrv dependencies found." -@@ -151,7 +151,7 @@ cd src - if $dobuild; then - if [ ! -x ../bin/mk ]; then - echo "* Building mk..." -- ../dist/buildmk 2>&1 | sed 's/^[+] //' -+ ../dist/buildmk 2>&1 - fi - if [ ! -x ../bin/mk ]; then - echo "* Error: mk failed to build." -@@ -159,7 +159,6 @@ if $dobuild; then - fi - - echo "* Building everything (be patient)..." -- mk clean - mk libs-nuke - mk all || exit 1 - if [ ! -x $PLAN9/src/cmd/o.cleanname -o ! -x $PLAN9/src/cmd/acme/o.acme ]; then -@@ -218,5 +217,5 @@ if $doinstall; then - echo " PLAN9=$PLAN9 export PLAN9" - echo ' PATH=$PATH:$PLAN9/bin export PATH' - fi --) 2>&1 | tee install.log | $awk -f $PLAN9/dist/isum.awk -v 'copy='install.sum -+) 2>&1 | tee install.log - The patch command output, for the patch command is: -- |Index: patches/patch-INSTALL |=== |RCS file: /cvs/ports/plan9/plan9port/patches/patch-INSTALL,v |retrieving revision 1.6 |diff -u -p -u -p -r1.6 patch-INSTALL |--- patches/patch-INSTALL 28 Feb 2017 02:27:41 - 1.6 |+++ patches/patch-INSTALL 15 Jul 2019 14:37:14 - -- Patching file patches/patch-INSTALL using Plan A... Hunk #1 failed at 1. 1 out of 1 hunks failed--saving rejects to patches/patch-INSTALL.rej -- Andrea
Re: plan9port: win(1) hang on acme(1) window
On 07/15, Andrea Biscuola wrote: > > On 07/15, Patrick Marchand wrote: > > > > Let me know if I messed something up, as its the first time I create > > a diff for a port. > > > > I also updated the url's as the old bell labs one are now dead and > > Rus Cox changed his homepage. > > Ok, I'll try to build from ports this evening with your patch. Here's a new diff, I messed up the previous one and it did not include the deletion of the web patch, that has been upstreamed since the last port upgrade. Index: Makefile === RCS file: /cvs/ports/plan9/plan9port/Makefile,v retrieving revision 1.29 diff -u -p -u -p -r1.29 Makefile --- Makefile12 Jul 2019 20:48:54 - 1.29 +++ Makefile15 Jul 2019 14:37:14 - @@ -4,13 +4,13 @@ ONLY_FOR_ARCHS = amd64 i386 powerpc BROKEN-powerpc = threading issues COMMENT = Plan 9 from user space -REVISION = 3 +REVISION = 0 -DISTNAME = plan9port-20180117 +DISTNAME = plan9port-20190710 GH_ACCOUNT = 9fans GH_PROJECT = plan9port -GH_COMMIT =019be4481fee53a999ccb73c78e40df5f408b24e +GH_COMMIT =e995a0c101863688d5f14649ae3de45a7c43789c CATEGORIES = plan9 @@ -27,8 +27,8 @@ WANTLIB = X11 Xext c m pthread util fon DISTFILES =${GH_COMMIT}.tar.gz pgw.tar.bz2:1 \ roget.tar.bz2:0 scat.tgz:1 DIST_SUBDIR = plan9port -MASTER_SITES0 =http://pdos.lcs.mit.edu/~rsc/software/plan9/ -MASTER_SITES1 =http://pdos.lcs.mit.edu/~rsc/ +MASTER_SITES0 =https://9fans.github.io/plan9port/ +MASTER_SITES1 =https://swtch.com/~rsc/ BUILD_DEPENDS =archivers/bzip2 RUN_DEPENDS = print/ghostscript/gnu \ @@ -64,8 +64,6 @@ do-install: .for l in .cvsignore .hg .hgignore .hgtags .gitignore .gitkeep *.orig *.beforesubst .travis.yml find ${WRKSRC} -name "$l" -exec rm -f {} \; .endfor - cd ${WRKSRC} && sed -i 's#/usr/local#${TRUEPREFIX}#' \ - `cat lib/moveplan9.files` ${INSTALL_DATA_DIR} ${PLAN9} cd ${WRKSRC} && pax -rw . ${PLAN9} cd ${PREFIX} && ln -s ../plan9/bin/9 bin/9 Index: distinfo === RCS file: /cvs/ports/plan9/plan9port/distinfo,v retrieving revision 1.11 diff -u -p -u -p -r1.11 distinfo --- distinfo20 Jan 2018 03:29:56 - 1.11 +++ distinfo15 Jul 2019 14:37:14 - @@ -1,8 +1,8 @@ -SHA256 (plan9port/019be4481fee53a999ccb73c78e40df5f408b24e.tar.gz) = BKlh9K2ee1SDvPLGG9Fi59a/L2Gv1G/rETPnARCaK4k= +SHA256 (plan9port/e995a0c101863688d5f14649ae3de45a7c43789c.tar.gz) = Y54LsBco/9fMF1Husb/HMUYV2I1vp/TN4hAzrZdiJiQ= SHA256 (plan9port/pgw.tar.bz2) = WMdWEelUjG7muSL6OsgnCmPsJMn88b1OPtEYQn8TVtw= SHA256 (plan9port/roget.tar.bz2) = sk8FE1Tavljx2CXinbOGCRyErsmBJdvkma3spRoyqDY= SHA256 (plan9port/scat.tgz) = qZX1JUSnEvK9uH9TFjjUyEYiT6khLQNOO9joCcuZvh4= -SIZE (plan9port/019be4481fee53a999ccb73c78e40df5f408b24e.tar.gz) = 23431472 +SIZE (plan9port/e995a0c101863688d5f14649ae3de45a7c43789c.tar.gz) = 23439831 SIZE (plan9port/pgw.tar.bz2) = 9404968 SIZE (plan9port/roget.tar.bz2) = 482956 SIZE (plan9port/scat.tgz) = 5145346 Index: patches/patch-INSTALL === RCS file: /cvs/ports/plan9/plan9port/patches/patch-INSTALL,v retrieving revision 1.6 diff -u -p -u -p -r1.6 patch-INSTALL --- patches/patch-INSTALL 28 Feb 2017 02:27:41 - 1.6 +++ patches/patch-INSTALL 15 Jul 2019 14:37:14 - @@ -1,37 +1,14 @@ $OpenBSD: patch-INSTALL,v 1.6 2017/02/28 02:27:41 gsoares Exp $ INSTALL.orig Wed Nov 2 20:17:40 2016 -+++ INSTALLMon Feb 27 21:57:58 2017 -@@ -128,7 +128,7 @@ fi +Index: INSTALL +--- INSTALL.orig INSTALL +@@ -134,7 +134,7 @@ fi if [ `uname` != Darwin ]; then # Determine whether fontsrv X11 files are available. rm -f a.out -- gcc -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \ +- cc -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \ + ${CC} -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \ -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 src/cmd/fontsrv/x11.c >/dev/null 2>&1 if [ -f a.out ]; then echo " fontsrv dependencies found." -@@ -151,7 +151,7 @@ cd src - if $dobuild; then - if [ ! -x ../bin/mk ]; then - echo "* Building mk..." -- ../dist/buildmk 2>&1 | sed 's/^[+] //' -+ ../dist/buildmk 2>&1 - fi - if [ ! -x ../bin/mk ]; then - echo "* Error: mk failed to build." -@@ -159,7 +159,6 @@ if
Re: [MAINTAINER UPDATE] www/sblg to 0.4.28
Committed, thanks.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/07/15 08:15:18 Modified files: www/sblg : Makefile distinfo Log message: Update to sblg 0.4.28 Documentation updates only: clarify "multi-standalone" mode as combined, remove references to amalgamation, clarify where tag symbols may be used, add more meaningful examples, etc. No code change. >From Bryan Vyhmeister, thanks.
[MAINTAINER UPDATE] www/sblg to 0.4.28
This is another simple maintainer update of sblg from 0.4.26 to 0.4.28. The changes included in this release are: sblg 0.4.28: "Documentation updates only: clarify "multi-standalone" mode as combined, remove references to amalgamation, clarify where tag symbols may be used, add more meaningful examples, etc. No code change." I did testing on amd64 with no issues. It should work fine everywhere especially since this is only a documentation change. If someone could ok and commit, that would be great. Thank you. Bryan Index: www/sblg/Makefile === RCS file: /cvs/ports/www/sblg/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- www/sblg/Makefile 12 Jul 2019 20:51:05 - 1.21 +++ www/sblg/Makefile 15 Jul 2019 13:59:19 - @@ -2,7 +2,7 @@ COMMENT = simple off-line blog utility -DISTNAME = sblg-0.4.26 +DISTNAME = sblg-0.4.28 CATEGORIES = www HOMEPAGE = https://kristaps.bsd.lv/sblg/ Index: www/sblg/distinfo === RCS file: /cvs/ports/www/sblg/distinfo,v retrieving revision 1.19 diff -u -p -r1.19 distinfo --- www/sblg/distinfo 14 Jun 2019 06:46:47 - 1.19 +++ www/sblg/distinfo 15 Jul 2019 13:59:19 - @@ -1,2 +1,2 @@ -SHA256 (sblg-0.4.26.tar.gz) = 4DGlSl1Nijv5LUF2qCQMih+cFJnVERwU6aatGxWhWd0= -SIZE (sblg-0.4.26.tar.gz) = 72732 +SHA256 (sblg-0.4.28.tar.gz) = F5DS/3QRITtxLcDAik7MAqhQyaO8+Ote/+MZfKSgcIM= +SIZE (sblg-0.4.28.tar.gz) = 72518
Re: plan9port: win(1) hang on acme(1) window
Hi Patrick > Hi! > > On 07/15, Patrick Marchand wrote: > > Let me know if I messed something up, as its the first time I create > a diff for a port. > > I also updated the url's as the old bell labs one are now dead and > Rus Cox changed his homepage. Ok, I'll try to build from ports this evening with your patch. > Index: Makefile > === > RCS file: /cvs/ports/plan9/plan9port/Makefile,v > retrieving revision 1.29 > diff -u -p -u -p -r1.29 Makefile > --- Makefile 12 Jul 2019 20:48:54 - 1.29 > +++ Makefile 15 Jul 2019 12:19:13 - > @@ -4,13 +4,13 @@ ONLY_FOR_ARCHS =amd64 i386 powerpc > BROKEN-powerpc = threading issues > > COMMENT =Plan 9 from user space > -REVISION = 3 > +REVISION = 0 > > -DISTNAME = plan9port-20180117 > +DISTNAME = plan9port-20190710 > > GH_ACCOUNT = 9fans > GH_PROJECT = plan9port > -GH_COMMIT = 019be4481fee53a999ccb73c78e40df5f408b24e > +GH_COMMIT = e995a0c101863688d5f14649ae3de45a7c43789c > > CATEGORIES = plan9 > > @@ -27,8 +27,8 @@ WANTLIB = X11 Xext c m pthread util fon > DISTFILES = ${GH_COMMIT}.tar.gz pgw.tar.bz2:1 \ > roget.tar.bz2:0 scat.tgz:1 > DIST_SUBDIR =plan9port > -MASTER_SITES0 = http://pdos.lcs.mit.edu/~rsc/software/plan9/ > -MASTER_SITES1 = http://pdos.lcs.mit.edu/~rsc/ > +MASTER_SITES0 = https://9fans.github.io/plan9port/ > +MASTER_SITES1 = https://swtch.com/~rsc/ > > BUILD_DEPENDS = archivers/bzip2 > RUN_DEPENDS =print/ghostscript/gnu \ > @@ -64,8 +64,6 @@ do-install: > .for l in .cvsignore .hg .hgignore .hgtags .gitignore .gitkeep *.orig > *.beforesubst .travis.yml > find ${WRKSRC} -name "$l" -exec rm -f {} \; > .endfor > - cd ${WRKSRC} && sed -i 's#/usr/local#${TRUEPREFIX}#' \ > - `cat lib/moveplan9.files` > ${INSTALL_DATA_DIR} ${PLAN9} > cd ${WRKSRC} && pax -rw . ${PLAN9} > cd ${PREFIX} && ln -s ../plan9/bin/9 bin/9 > Index: distinfo > === > RCS file: /cvs/ports/plan9/plan9port/distinfo,v > retrieving revision 1.11 > diff -u -p -u -p -r1.11 distinfo > --- distinfo 20 Jan 2018 03:29:56 - 1.11 > +++ distinfo 15 Jul 2019 12:19:13 - > @@ -1,8 +1,8 @@ > -SHA256 (plan9port/019be4481fee53a999ccb73c78e40df5f408b24e.tar.gz) = > BKlh9K2ee1SDvPLGG9Fi59a/L2Gv1G/rETPnARCaK4k= > +SHA256 (plan9port/e995a0c101863688d5f14649ae3de45a7c43789c.tar.gz) = > Y54LsBco/9fMF1Husb/HMUYV2I1vp/TN4hAzrZdiJiQ= > SHA256 (plan9port/pgw.tar.bz2) = WMdWEelUjG7muSL6OsgnCmPsJMn88b1OPtEYQn8TVtw= > SHA256 (plan9port/roget.tar.bz2) = > sk8FE1Tavljx2CXinbOGCRyErsmBJdvkma3spRoyqDY= > SHA256 (plan9port/scat.tgz) = qZX1JUSnEvK9uH9TFjjUyEYiT6khLQNOO9joCcuZvh4= > -SIZE (plan9port/019be4481fee53a999ccb73c78e40df5f408b24e.tar.gz) = 23431472 > +SIZE (plan9port/e995a0c101863688d5f14649ae3de45a7c43789c.tar.gz) = 23439831 > SIZE (plan9port/pgw.tar.bz2) = 9404968 > SIZE (plan9port/roget.tar.bz2) = 482956 > SIZE (plan9port/scat.tgz) = 5145346 > Index: patches/patch-INSTALL > === > RCS file: /cvs/ports/plan9/plan9port/patches/patch-INSTALL,v > retrieving revision 1.6 > diff -u -p -u -p -r1.6 patch-INSTALL > --- patches/patch-INSTALL 28 Feb 2017 02:27:41 - 1.6 > +++ patches/patch-INSTALL 15 Jul 2019 12:19:13 - > @@ -1,37 +1,14 @@ > $OpenBSD: patch-INSTALL,v 1.6 2017/02/28 02:27:41 gsoares Exp $ > > INSTALL.orig Wed Nov 2 20:17:40 2016 > -+++ INSTALL Mon Feb 27 21:57:58 2017 > -@@ -128,7 +128,7 @@ fi > +Index: INSTALL > +--- INSTALL.orig > INSTALL > +@@ -134,7 +134,7 @@ fi > if [ `uname` != Darwin ]; then > # Determine whether fontsrv X11 files are available. > rm -f a.out > --gcc -o a.out -c -Iinclude -I/usr/include -I/usr/local/include > -I/usr/include/freetype2 -I/usr/local/include/freetype2 \ > +-cc -o a.out -c -Iinclude -I/usr/include -I/usr/local/include > -I/usr/include/freetype2 -I/usr/local/include/freetype2 \ > +${CC} -o a.out -c -Iinclude -I/usr/include -I/usr/local/include > -I/usr/include/freetype2 -I/usr/local/include/freetype2 \ > -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 > src/cmd/fontsrv/x11.c >/dev/null 2>&1 > if [ -f a.out ]; then > echo " fontsrv dependencies found." > -@@ -151,7 +151,7 @@ cd src > - if $dobuild; then > - if [ ! -x ../bin/mk ]; then > - echo "* Building mk..." > --../dist/buildmk 2>&1 | sed 's/^[+] //' > -+../dist/buildmk 2>&1 > - fi > - if [ ! -x ../bin/mk ]; then > - echo "* Error: mk failed to build." > -@@ -159,7 +159,6 @@ if $dobuild; then > - fi > - > - echo "* Building everything (be
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/07/15 07:35:35 Modified files: infrastructure/lib/OpenBSD/PortGen/Port: PyPI.pm Log message: Change the PyPI module of portgen(1) to create DESCR from the longer description field from the JSON about the module rather than the summary (which is used for COMMENT in the Makefile). This provides a better starting point to create the DESCR from. OK afresh1@ sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2019/07/15 07:23:05 Modified files: x11/smplayer : Makefile distinfo Log message: Update for SMPlayer to 19.5.0 OK bket@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2019/07/15 07:21:51 Modified files: x11/smtube : Makefile distinfo Log message: Update for SMTube to 19.6.0. OK bket@
Re: UPDATE: Smtube-19.6.0
On Mon 15/07/2019 13:55, Gonzalo L. Rodriguez wrote: > Hello, > > Update for SMTube to 19.6.0: > > http://www.smtube.org/ > > OK? Comments? One comment, HOMEPAGE=https://www.smtube.org/ OK bket@
Re: UPDATE: SMPlayer-19.5.0
On Mon 15/07/2019 14:11, Gonzalo L. Rodriguez wrote: > Hello, > > Update for SMPlayer to 19.5.0: > > https://www.smplayer.info/en/changes > > OK? Comments? Looks good, and works for me. One comment, maybe change HOMEPAGE to https://www.smplayer.info/ ? OK bket@
Re: plan9port: win(1) hang on acme(1) window
Hi! On 07/15, Patrick Marchand wrote: > On 07/15, a...@gmx.com wrote: > > What can I do for helping the mantainer debug the issue? > I tried upgrading the port to the latest version (Which I will send > to the maintainer / ports list today.) But while the rest of the > programs work well, win(1) still hangs when given a command. Let me know if I messed something up, as its the first time I create a diff for a port. I also updated the url's as the old bell labs one are now dead and Rus Cox changed his homepage. Index: Makefile === RCS file: /cvs/ports/plan9/plan9port/Makefile,v retrieving revision 1.29 diff -u -p -u -p -r1.29 Makefile --- Makefile12 Jul 2019 20:48:54 - 1.29 +++ Makefile15 Jul 2019 12:19:13 - @@ -4,13 +4,13 @@ ONLY_FOR_ARCHS = amd64 i386 powerpc BROKEN-powerpc = threading issues COMMENT = Plan 9 from user space -REVISION = 3 +REVISION = 0 -DISTNAME = plan9port-20180117 +DISTNAME = plan9port-20190710 GH_ACCOUNT = 9fans GH_PROJECT = plan9port -GH_COMMIT =019be4481fee53a999ccb73c78e40df5f408b24e +GH_COMMIT =e995a0c101863688d5f14649ae3de45a7c43789c CATEGORIES = plan9 @@ -27,8 +27,8 @@ WANTLIB = X11 Xext c m pthread util fon DISTFILES =${GH_COMMIT}.tar.gz pgw.tar.bz2:1 \ roget.tar.bz2:0 scat.tgz:1 DIST_SUBDIR = plan9port -MASTER_SITES0 =http://pdos.lcs.mit.edu/~rsc/software/plan9/ -MASTER_SITES1 =http://pdos.lcs.mit.edu/~rsc/ +MASTER_SITES0 =https://9fans.github.io/plan9port/ +MASTER_SITES1 =https://swtch.com/~rsc/ BUILD_DEPENDS =archivers/bzip2 RUN_DEPENDS = print/ghostscript/gnu \ @@ -64,8 +64,6 @@ do-install: .for l in .cvsignore .hg .hgignore .hgtags .gitignore .gitkeep *.orig *.beforesubst .travis.yml find ${WRKSRC} -name "$l" -exec rm -f {} \; .endfor - cd ${WRKSRC} && sed -i 's#/usr/local#${TRUEPREFIX}#' \ - `cat lib/moveplan9.files` ${INSTALL_DATA_DIR} ${PLAN9} cd ${WRKSRC} && pax -rw . ${PLAN9} cd ${PREFIX} && ln -s ../plan9/bin/9 bin/9 Index: distinfo === RCS file: /cvs/ports/plan9/plan9port/distinfo,v retrieving revision 1.11 diff -u -p -u -p -r1.11 distinfo --- distinfo20 Jan 2018 03:29:56 - 1.11 +++ distinfo15 Jul 2019 12:19:13 - @@ -1,8 +1,8 @@ -SHA256 (plan9port/019be4481fee53a999ccb73c78e40df5f408b24e.tar.gz) = BKlh9K2ee1SDvPLGG9Fi59a/L2Gv1G/rETPnARCaK4k= +SHA256 (plan9port/e995a0c101863688d5f14649ae3de45a7c43789c.tar.gz) = Y54LsBco/9fMF1Husb/HMUYV2I1vp/TN4hAzrZdiJiQ= SHA256 (plan9port/pgw.tar.bz2) = WMdWEelUjG7muSL6OsgnCmPsJMn88b1OPtEYQn8TVtw= SHA256 (plan9port/roget.tar.bz2) = sk8FE1Tavljx2CXinbOGCRyErsmBJdvkma3spRoyqDY= SHA256 (plan9port/scat.tgz) = qZX1JUSnEvK9uH9TFjjUyEYiT6khLQNOO9joCcuZvh4= -SIZE (plan9port/019be4481fee53a999ccb73c78e40df5f408b24e.tar.gz) = 23431472 +SIZE (plan9port/e995a0c101863688d5f14649ae3de45a7c43789c.tar.gz) = 23439831 SIZE (plan9port/pgw.tar.bz2) = 9404968 SIZE (plan9port/roget.tar.bz2) = 482956 SIZE (plan9port/scat.tgz) = 5145346 Index: patches/patch-INSTALL === RCS file: /cvs/ports/plan9/plan9port/patches/patch-INSTALL,v retrieving revision 1.6 diff -u -p -u -p -r1.6 patch-INSTALL --- patches/patch-INSTALL 28 Feb 2017 02:27:41 - 1.6 +++ patches/patch-INSTALL 15 Jul 2019 12:19:13 - @@ -1,37 +1,14 @@ $OpenBSD: patch-INSTALL,v 1.6 2017/02/28 02:27:41 gsoares Exp $ INSTALL.orig Wed Nov 2 20:17:40 2016 -+++ INSTALLMon Feb 27 21:57:58 2017 -@@ -128,7 +128,7 @@ fi +Index: INSTALL +--- INSTALL.orig INSTALL +@@ -134,7 +134,7 @@ fi if [ `uname` != Darwin ]; then # Determine whether fontsrv X11 files are available. rm -f a.out -- gcc -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \ +- cc -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \ + ${CC} -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \ -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 src/cmd/fontsrv/x11.c >/dev/null 2>&1 if [ -f a.out ]; then echo " fontsrv dependencies found." -@@ -151,7 +151,7 @@ cd src - if $dobuild; then - if [ ! -x ../bin/mk ]; then - echo "* Building mk..." -- ../dist/buildmk 2>&1 | sed 's/^[+] //' -+ ../dist/buildmk 2>&1 - fi - if [ ! -x ../bin/mk ]; then - echo "* Error: mk failed to build." -@@ -159,7
UPDATE: SMPlayer-19.5.0
Hello, Update for SMPlayer to 19.5.0: https://www.smplayer.info/en/changes OK? Comments? Cheers.- -- - gonzalo Index: Makefile === RCS file: /cvs/ports/x11/smplayer/Makefile,v retrieving revision 1.58 diff -u -p -r1.58 Makefile --- Makefile12 Jul 2019 20:51:21 - 1.58 +++ Makefile15 Jul 2019 12:09:50 - @@ -2,9 +2,8 @@ COMMENT = complete front-end for MPlayer and MPV -DISTNAME = smplayer-19.1.0 +DISTNAME = smplayer-19.5.0 CATEGORIES = multimedia x11 -REVISION = 0 HOMEPAGE = http://smplayer.sourceforge.net/ Index: distinfo === RCS file: /cvs/ports/x11/smplayer/distinfo,v retrieving revision 1.40 diff -u -p -r1.40 distinfo --- distinfo21 Feb 2019 07:54:09 - 1.40 +++ distinfo15 Jul 2019 12:09:50 - @@ -1,2 +1,2 @@ -SHA256 (smplayer-19.1.0.tar.bz2) = ekg9JMko+lHo1IMiz9fXR/pb9s9YdQXSmkTCVqu2Q2A= -SIZE (smplayer-19.1.0.tar.bz2) = 5169546 +SHA256 (smplayer-19.5.0.tar.bz2) = tcsrN/yaIlu3KHvyagpJn3tGv/aIFhuOXq4NltdNqvU= +SIZE (smplayer-19.5.0.tar.bz2) = 5175017
Re: plan9port: win(1) hang on acme(1) window
On 07/15, a...@gmx.com wrote: > Hi ports! > > I use plan9port abitually for developing various programs. > In particular, acme(1) is my editor of choice. After the > latest update, using win(1) inside acme(1), does not work > anymore. > > If you are working in acme(1) and you try to run a command > in a win(1), nothing happen, as it seems that the underlying > shell does not receive and process the written commands. > > What can I do for helping the mantainer debug the issue? > > Regards > > Andrea > I can reproduce this bug on saturday's snapshot (on two different computers). I tried upgrading the port to the latest version (Which I will send to the maintainer / ports list today.) But while the rest of the programs work well, win(1) still hangs when given a command. I've tried running a ktrace(1) which I've attached to this email. The SIGINT at the end was given manually. My next attempt will be to apply this patch[1] as win.c uses libthread. Thanks [1] https://github.com/9fans/plan9port/pull/226/files ktrace.out Description: Binary data
Re: UPDATE: Smtube-19.6.0
On Mon, Jul 15, 2019 at 01:55:23PM +0200, Gonzalo L. Rodriguez wrote: HOMEPAGE redirects to www.smtube.org which has proper TLS, maybe use that?
UPDATE: Smtube-19.6.0
Hello, Update for SMTube to 19.6.0: http://www.smtube.org/ OK? Comments? Cheers.- -- - gonzalo Index: Makefile === RCS file: /cvs/ports/x11/smtube/Makefile,v retrieving revision 1.34 diff -u -p -r1.34 Makefile --- Makefile12 Jul 2019 20:51:21 - 1.34 +++ Makefile15 Jul 2019 11:52:40 - @@ -4,8 +4,7 @@ USE_WXNEEDED = Yes COMMENT = browse and download YouTube videos -DISTNAME = smtube-18.11.0 -REVISION = 0 +DISTNAME = smtube-19.6.0 CATEGORIES = multimedia x11 Index: distinfo === RCS file: /cvs/ports/x11/smtube/distinfo,v retrieving revision 1.23 diff -u -p -r1.23 distinfo --- distinfo14 Dec 2018 09:44:28 - 1.23 +++ distinfo15 Jul 2019 11:52:40 - @@ -1,2 +1,2 @@ -SHA256 (smtube-18.11.0.tar.bz2) = Fz9/CQLTNu9COyB0ZUvvRhMm7m+6Zp9UhlyBrFs9qmU= -SIZE (smtube-18.11.0.tar.bz2) = 747832 +SHA256 (smtube-19.6.0.tar.bz2) = 9UIz7MJWP9iCF/+lhDsjL8WoUUwJyZ4E/qFkZdrUcDQ= +SIZE (smtube-19.6.0.tar.bz2) = 748844
Re: [NEW] audio/libopenmpt
On Fri, Jul 12, 2019 at 11:13:31AM +0200, Raphael Graf wrote: > On Tue, Jun 25, 2019 at 04:13:51PM +0200, Christian Weisgerber wrote: > > Raphael Graf: > > > > > Does anyone know why the large file support is disabled in mpg123? > > > > Because it doesn't make sense. off_t is always the same on OpenBSD > > and does not change depending on how code defines _FILE_OFFSET_BITS. > > > > Yes, the problem is that libopenmpt sets _FILE_OFFSET_BITS=64. > > From a comment in mpg123.h: > "When the app defines _FILE_OFFSET_BITS, it wants non-default large file > support, and thus functions with added suffix (mpg123_open_64)." > > This can be worked around in the libopenmpt port by setting > MPG123_NO_LARGENAME, see attached diff. > With this diff, the port works fine on macppc too. Thanks for diving into this and for the diff, rapha@. Here is a new tarball with those changes included. OK to import? libopenmpt.tar.gz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2019/07/15 05:05:09 Modified files: net/bgpq3 : Makefile net/bgpq3/pkg : DESCR Log message: Update description OK sthen@
Re: net/pfstat ioctl: DIOCIGETIFACES: Operation not supported by device
On 2019/07/15 08:26, d.rausch...@gmail.com wrote: > Hi, > > On Sun, Jul 14, 2019 at 10:35:08PM +0100, Stuart Henderson wrote: > > On 2019/07/14 19:24, d.rausch...@gmail.com wrote: > > > Hi, > > > > > > i am running OpenBSD 6.5 current BUILDINFO Build date: 1562835291 - > > > Thu Jul 11 08:54:51 UTC 2019 and ports from the same day. Platform is > > > i386. > > > > Ports or packages? > > Packages. > > > struct pfi_kif in the kernel was incompatibly changed in pfvar.h 1.492 > > (new variable was inserted in the middle of the struct) meaning that > > userland programs using this needed to be rebuilt. > > > > I have bumped REVISION in all the ports I could find using this (including > > pfstat) to trigger updates when new packages are available > > > > New i386 packages haven't been built yet (they're nearly done and should > > appear in the next 6 hours or so) but if you build from ports (on an up > > to date system, i.e. kernel + userland including compXX.tgz all updated) > > I believe it should work again. > > Yes it works again after doing a pkg_add -u > > Thank you. > > Regards > Dieter Great - thanks for the report btw, it can be hard to spot this type of kernel change when it's committed and it was more through luck than design that I noticed it before you hit it :-)
Re: Switch portgen(1) PyPI module to populate pkg/DESCR from description
On 2019/07/14 18:19, Andrew Hewus Fresh wrote: > On Sun, Jul 14, 2019 at 07:34:57PM -0400, Kurt Mosiejczuk wrote: > > Right now the portgen(1) PyPI module populates DESCR from the "summary" > > section of the json it fetches. The summary is the same thing it uses > > for COMMENT and it's really too sparse for DESCR. This simple diff > > switches it to use the description field. That is the field displayed > > on the project page for pypi.org. It will probably often need trimming down > > but I think that's a better starting point than the summary. > > This switches COMMENT to use the long "description", I think you meant > to change the `set_decr` line that is 6 lines down from that. > > In any case, I did look at using $di->{info}{description} for pkg/DESCR > at some point in the past, but it was a big change and pretty much would > *require* editing DESCR. I guess that's true of the "summary" as well, > so if you prefer this, OK afresh1@ OK with me too, I think this is a better starting point to edit from. > > > > > cc afresh1 > > > > --Kurt > > > > Index: PyPI.pm > > === > > RCS file: /cvs/ports/infrastructure/lib/OpenBSD/PortGen/Port/PyPI.pm,v > > retrieving revision 1.16 > > diff -u -p -r1.16 PyPI.pm > > --- PyPI.pm 16 May 2019 16:01:10 - 1.16 > > +++ PyPI.pm 14 Jul 2019 23:21:37 - > > @@ -81,7 +86,7 @@ sub fill_in_makefile > > > > $self->set_other( 'MODPY_PI', 'Yes' ); > > $self->set_other( 'MODPY_SETUPTOOLS', 'Yes' ); > > - $self->set_comment( $di->{info}{summary} ); > > + $self->set_comment( $di->{info}{description} ); > > $self->set_other( 'MODPY_EGG_VERSION', $version ); > > $self->set_distname($distname); > > $self->set_modules('lang/python'); > > > > -- > andrew - http://afresh1.com > > People who invent random theories which only defend the vendor must have > been beaten as children. Beaten with sticks. > At least, that's my theory. > -- Theo De Raadt >
Lynis-2.7.5
Hello, Update for Lynis to 2.7.5: https://cisofy.com/changelog/lynis/#275 OK? Comments? Cheers.- -- - gonzalo Index: Makefile === RCS file: /cvs/ports/security/lynis/Makefile,v retrieving revision 1.35 diff -u -p -r1.35 Makefile --- Makefile12 Jul 2019 20:49:05 - 1.35 +++ Makefile15 Jul 2019 09:41:25 - @@ -2,7 +2,7 @@ COMMENT= security auditing tool -DISTNAME = lynis-2.7.4 +DISTNAME = lynis-2.7.5 CATEGORIES=security Index: distinfo === RCS file: /cvs/ports/security/lynis/distinfo,v retrieving revision 1.31 diff -u -p -r1.31 distinfo --- distinfo2 May 2019 09:27:09 - 1.31 +++ distinfo15 Jul 2019 09:41:25 - @@ -1,2 +1,2 @@ -SHA256 (lynis-2.7.4.tar.gz) = o/YVeT/4BzO64VWEiTpAhhAdiRxhw6UtKA37ZYy5j70= -SIZE (lynis-2.7.4.tar.gz) = 287563 +SHA256 (lynis-2.7.5.tar.gz) = PSet5zpcEkiSWtnAYAJJQM5dICn0CqqQH0MxSIj+Mk0= +SIZE (lynis-2.7.5.tar.gz) = 288688 Index: pkg/PLIST === RCS file: /cvs/ports/security/lynis/pkg/PLIST,v retrieving revision 1.19 diff -u -p -r1.19 PLIST --- pkg/PLIST 2 May 2019 09:27:09 - 1.19 +++ pkg/PLIST 15 Jul 2019 09:41:25 - @@ -22,6 +22,7 @@ share/lynis/db/languages/ share/lynis/db/languages/az share/lynis/db/languages/br share/lynis/db/languages/cn +share/lynis/db/languages/da share/lynis/db/languages/de share/lynis/db/languages/en share/lynis/db/languages/en-GB
Re: git-daemon may unexpectedly run as root
On Mon, Jul 15, 2019 at 08:05:56AM +0200, Antoine Jacoutot wrote: > How so? What makes it behave differently when both options are started > from rc.d? Both are started from rc.d through `su -l ...', both get their HOME, USER, PATH, etc. set - that means different `daemon_user' values will cause different values in those environment variables. `daemon_user=root daemon_flags=-u _gitdaemon' will therefore start as root, drop privileges, but run with HOME=/root as it is not reset. `daemon_user=_gitdaemon' will therefore start as _gitdaemon, not drop privileges and keep its proper environment, where everything already matches the running user.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/07/15 02:47:45 Modified files: net/libbind: Makefile Added files: net/libbind/patches: patch-include_netdb_h Log message: libbind's version of netdb.h has ai_addr and ai_canonname the wrong way round compared to the one in base; swap them, fixing a failure with net/bro in cluster mode tracked down by Matt Dunwoodie. ok aja@ (libbind is the BIND resolver used in very few specialist cases where the resolver in base isn't compatible enough - previously used for mtr but now it's only used by bro. I am still quietly hoping that bro will switch to another resolver library sometime and we can remove this hack of a port again :-)
plan9port: win(1) hang on acme(1) window
Hi ports! I use plan9port abitually for developing various programs. In particular, acme(1) is my editor of choice. After the latest update, using win(1) inside acme(1), does not work anymore. If you are working in acme(1) and you try to run a command in a win(1), nothing happen, as it seems that the underlying shell does not receive and process the written commands. What can I do for helping the mantainer debug the issue? Regards Andrea
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2019/07/15 01:34:17 Modified files: security/sqlmap: Makefile distinfo security/sqlmap/pkg: PLIST Log message: Update for SQLMap to 1.3.7 OK lteo@
Re: net/pfstat ioctl: DIOCIGETIFACES: Operation not supported by device
Hi, On Sun, Jul 14, 2019 at 10:35:08PM +0100, Stuart Henderson wrote: > On 2019/07/14 19:24, d.rausch...@gmail.com wrote: > > Hi, > > > > i am running OpenBSD 6.5 current BUILDINFO Build date: 1562835291 - > > Thu Jul 11 08:54:51 UTC 2019 and ports from the same day. Platform is > > i386. > > Ports or packages? Packages. > struct pfi_kif in the kernel was incompatibly changed in pfvar.h 1.492 > (new variable was inserted in the middle of the struct) meaning that > userland programs using this needed to be rebuilt. > > I have bumped REVISION in all the ports I could find using this (including > pfstat) to trigger updates when new packages are available > > New i386 packages haven't been built yet (they're nearly done and should > appear in the next 6 hours or so) but if you build from ports (on an up > to date system, i.e. kernel + userland including compXX.tgz all updated) > I believe it should work again. Yes it works again after doing a pkg_add -u Thank you. Regards Dieter
Re: git-daemon may unexpectedly run as root
> > I don't understand which difference you mean. > > Could you please try to explain your point better? > The daemon itself won't reset the environment, so starting it as root > with `-u _gitdaemon' will preserve stuff like HOME whereas setting > `$daemon_user' will cause it to be started with a properly set > environment. How so? What makes it behave differently when both options are started from rc.d? > > Are you referring to the environment being different when started > > as a non-root user? I would trust rc.d(8) to do the right thing > > with the environment. > Yes; having said the above, I do agree here. Just wanted to point out > that these two approaches are not the same. > > > Break in what way? > Thought of the inetd thing, please disregard. > > > Please consider that any setup that runs this thing as root is a hazard. > > Can you name any potential consequences which the proposed change might > > introduce which are actually worse than running git-daemon as root? > Running the daemon on privileged ports as only root may do so, which > would work with `--user _gitdaemon' but not `daemon_user=_gitdaemon', > but that not a bright idea anyway. > > Also, git-daemon(1) has `--group' as well: dropping to a group other > than the user's primary one will only work then started as root. > However, I doubt that people are running such setups. > > > Even if there were people how wanted to run git-daemon as root on purpose > > I wouldn't see any reason for us to support them in doing so. > Providing a safe default is good and since my initial doubts were based > on my own stupidity alone (--inetd in rc.d does not make sense), > OK kn. > -- Antoine