Re: update smplayer to 24.5.0 and add missing RDEP
Am 5. Juni 2024 10:44:10 MESZ schrieb Omar Polo : >On 2024/05/29 11:00:24 +0200, Florian Viehweger >wrote: >> > > While running 'make fake' i saw the following line, but it seems >> > > harmless: >> > > ./get_svn_revision.sh[8]: git: not found >> > >> > Do the package contents change if git is installed? >> > >> > make package >> > make clean=fake >> > doas pkg_add git >> > make repackage >> >> No, PLIST is not changed. >> >> After looking at the code, I understand that get_svn_revision.sh checks >> the revision and writes that information into 2 files. This is done to >> avoid spurious rebuilds. >> >> Since we are not checking out via git and using releases, this is not >> needed. Git rightfully fails itself as this is not a git repository. >> >> Adding git is therefore not needed. > >Yet, it could be useful to neuter it anyway. It happened in the past >that a developer had /usr/ports has a git checkout and this was causing >some headaches building stuff since the default build directory is under >/usr/ports. > >In graphics/nsxiv for example we have this to avoid patching the port. > > # don't invoke git at all. > pre-build: > ln -sf /usr/bin/true ${WRKDIR}/bin/git > > >Just my two cents. not saying this has to be done for smplayer too, i >honestly haven't reasoned about what can happen in this case if >/usr/ports is under git nor what happens if git is symlinked to true (or >false.) I like that idea. Lets see what gonzalo thinks. -- greetings, Florian Viehweger
Re: new port: mail/p5-Email-Outlook-Message
On Fri, Jun 7, 2024 at 2:20 PM Stuart Henderson wrote: > Added automatically if you set > > MAKE_ENV= TEST_POD=1 > > -- > Sent from a phone, apologies for poor formatting. > > Now with MAKE_ENV= TEST_POD=1 as Stuart mentioned: ===> Regression tests for p5-Email-Outlook-Message-0.921 PERL_DL_NONLAZY=1 "/usr/bin/perl" "-MExtUtils::Command::MM" "-MTest::Harness" "-e" "undef *Test::Harness::Switches; test_harness(0, 'blib/lib', 'blib/arch')" t/*.t t/basics.t ... ok t/charset.t .. ok t/full_structure.t ... ok t/gpg_signed.t ... ok t/internals.t ok t/plain_jpeg_attached.t .. ok t/plain_uc_unsent.t .. ok t/plain_uc_wc_unsent.t ... ok t/plain_unsent.t . ok t/pod_coverage.t . ok All tests successful. Files=10, Tests=122, 2 wallclock secs ( 0.05 usr 0.05 sys + 1.52 cusr 0.42 csys = 2.04 CPU) Result: PASS port tgz attached p5-Email-Outlook-Message.tgz Description: application/compressed-tar
Re: [NEW] vo-amrwbenc
On Jun 06 11:47:05, h...@stare.cz wrote: > On Jun 04 13:29:21, s...@spacehopper.org wrote: > > On 2024/06/04 12:38, Jan Stary wrote: > > > The audio/opencore-amr port provides amrnb (narrowband encoder + decoder) > > > and amrwb (wideband decoder). This is the missing part, the wideband > > > encoder. > > > > > > Tested on current/amd64, please test everywhere. > > > (Also tested with aduio/sox.) > > > > > > Jan > > > > > > > whitespace is rather inconsistent. ok sthen with this on top. > > Would anyone commit this please? Thanks. No really, e.g. audio/sox could use it then. > > > diff --git a/audio/vo-amrwbenc/Makefile b/audio/vo-amrwbenc/Makefile > > index ebbdc01..0bb4bdf 100644 > > --- a/audio/vo-amrwbenc/Makefile > > +++ b/audio/vo-amrwbenc/Makefile > > @@ -1,8 +1,8 @@ > > -COMMENT= VisualOn AMR-WB encoder library > > -CATEGORIES = audio > > +COMMENT= VisualOn AMR-WB encoder library > > +CATEGORIES=audio > > > > -DISTNAME = vo-amrwbenc-0.1.3 > > -SHARED_LIBS= vo-amrwbenc 0.0 > > +DISTNAME= vo-amrwbenc-0.1.3 > > +SHARED_LIBS= vo-amrwbenc 0.0 > > > > HOMEPAGE= https://opencore-amr.sourceforge.net/ > > SITES= ${SITE_SOURCEFORGE:=opencore-amr/} > > > >
Re: [new] archivers/py-zstandard
On Mon, 10 Jun 2024 00:16:17 +0100, Kirill A. Korinsky wrote: > > On Sun, 09 Jun 2024 23:03:50 +0100, > Stuart Henderson wrote: > > > > I'd expect cffi to use dlopen not static linking. We normally record > > those as LIB_DEPENDS and WANTLIB with a comment next to the WANTLIB > > saying "uses dlopen" (check-lib-depends will say 'Extra' in that case). > > > > Unfortunately, that's not the case here. > and my use case with make uninstall and make install was wrong because I missed clean. Long story short, at the end, --system-zstd is usless here. This project had hardcoded expected version of zstd which is part of distrivutive: https://github.com/indygreg/python-zstandard/blob/main/c-ext/backend_c.c#L155 Here an issue where it was asked to be relaxed: https://github.com/indygreg/python-zstandard/issues/132 So, no way to make it with dynamic linking. And here an updated version with fixed tests. -- wbr, Kirill py-zstandard-0.22.0.tgz Description: Binary data
Re: new port: mail/p5-Email-Outlook-Message
OK (whoever imports, beware the CVS dirs in the tar) On 2024/06/10 04:00, Abel Abraham Camarillo Ojeda wrote: > > > On Fri, Jun 7, 2024 at 2:20 PM Stuart Henderson wrote: > > Added automatically if you set > > MAKE_ENV= TEST_POD=1 > > -- > Sent from a phone, apologies for poor formatting. > > > > Now with MAKE_ENV= TEST_POD=1 as Stuart mentioned: > > ===> Regression tests for p5-Email-Outlook-Message-0.921 > PERL_DL_NONLAZY=1 "/usr/bin/perl" "-MExtUtils::Command::MM" "-MTest::Harness" > "-e" "undef > *Test::Harness::Switches; test_harness(0, 'blib/lib', 'blib/arch')" t/*.t > t/basics.t ... ok > t/charset.t .. ok > t/full_structure.t ... ok > t/gpg_signed.t ... ok > t/internals.t ok > t/plain_jpeg_attached.t .. ok > t/plain_uc_unsent.t .. ok > t/plain_uc_wc_unsent.t ... ok > t/plain_unsent.t . ok > t/pod_coverage.t . ok > All tests successful. > Files=10, Tests=122, 2 wallclock secs ( 0.05 usr 0.05 sys + 1.52 cusr > 0.42 csys = 2.04 > CPU) > Result: PASS > > port tgz attached >
Re: net/tcpflow: fix build
On Sun, Jun 09, 2024 at 11:21:58PM +0100, Kirill A. Korinsky wrote: > Hi, > > Thanks for reply. > > On Sun, 09 Jun 2024 18:04:32 +0100, > Jeremie Courreges-Anglas wrote: > > > > On Sun, Jun 09, 2024 at 11:03:54AM +0100, Kirill A. Korinsky wrote: > > > On Sat, 08 Jun 2024 23:35:32 +0100, > > > Kirill A. Korinsky wrote: > > > > > > > > Probably it worth to add an -extra flavor with all features. > > > > > > > > > > Here small update for net/tcpflow which includes: > > > - add textproc/tre to enjoy regexes; > > > - extended flavor to use cairo and exiv2. > > > > tcpflow isn't linked against libexiv2 and its header files aren't > > included because HAVE_EXIV2 isn't defined. portcheck warns about it. > > So exiv2 doesn't bring any feature and it doesn't make sense to add > > it as a dep. > > Frankly speaking the last 30 minutes I spent to dig why here missed > HAVE_EXIV2, and my investigation lead to quite large commit without any > exaplanation: [1] the commit where check for header was introduced and [2] > the commit where such HAVE_EXIV2 was introduced. > > I doubt that it was tested by anyone, and this code seems to be out of use. > > Thus, in future version of dfxml such dependency was removed, so, no need to > keep note about it. > > > Regarding cairo support I don't know if it is useful. What bothers me > > is that configure.ac adds a bunch of other libraries because upstream > > uses a static link there on mingw. Self-inflicted pain, and extra > > libs look extra. LIB_DEPENDS=archivers/bzip2 just look bogus, cairo > > doesn't depend on it in our tree. > > > > To me this all looks fragile and I wouldn't link a privileged tool to > > such libraries. You don't *have* to ship such a FLAVOR. > > Thanks. I absolutley agree that cairo and other stuff looks fragile and > wired, special for that software. > > > So that leaves the addition of textproc/tre (I didn't look) > > I jsut spent antoher hour into this code to figuring out how to use it to > test. I do not understand. All cases inside different scanners which should > configure it, simple hasn't got a way to do it. > > Nor any documentation about it. > > Seems that it also useless here. I see this in configure.ac: |## regex support |## there are several options |## tre is better than regex I'm not sure what to think about it, but it has to be handled one way or the other: currently it's going to be picked up and will cause random errors in bulk builds. See proposal below. > > and theneed to add --without-o3 because the build currently uses -O3 > > instead of respecting CFLAGS. > > Very good point. > > Also, I abit tired from created report.xml by tcpflow when using it with -c > and suggested a patch to upstream to avoid that [3] which I've included into > updated diff. Looking at the tool (I don't use it myself) I suspect you could use tcpflow -X /dev/null -c. Is this really something where you want to deviate from upstream? If so, I can add that patch too (I have committed the rest). Updated diff with REVISION fixed. ? patches/patch-src_tcpflow_cpp Index: Makefile === RCS file: /cvs/ports/net/tcpflow/Makefile,v diff -u -p -r1.29 Makefile --- Makefile8 Jun 2024 21:53:45 - 1.29 +++ Makefile10 Jun 2024 11:53:25 - @@ -3,6 +3,7 @@ COMMENT=tool for capturing data from T V= 1.6.1 DISTNAME= tcpflow-${V} CATEGORIES=net +REVISION= 0 SITES= https://github.com/simsong/tcpflow/releases/download/tcpflow-${V}/ @@ -20,13 +21,14 @@ COMPILER= base-clang ports-gcc BUILD_DEPENDS= devel/boost LIB_DEPENDS= databases/sqlite3 -# a test for cairo has a side effect which brokes pcap test -# when it can't find cairo, so, disable it. -CONFIGURE_ARGS=--enable-cairo=false +CONFIGURE_STYLE= autoreconf +CONFIGURE_ARGS=--enable-cairo=false \ + --without-o3 +# Forcefully disable detection of unwanted optional deps +CONFIGURE_ENV= ac_cv_header_tre_tre_h=no \ + ac_cv_lib_tre_tre_regcomp=no AUTOCONF_VERSION= 2.71 AUTOMAKE_VERSION= 1.16 - -CONFIGURE_STYLE= autoreconf .include -- jca
Re: [new] archivers/py-zstandard
and here small additional polish of this port: diff --git archivers/py-zstandard/Makefile archivers/py-zstandard/Makefile index aff042031b1..91b6e4516c3 100644 --- archivers/py-zstandard/Makefile +++ archivers/py-zstandard/Makefile @@ -16,11 +16,11 @@ MODPY_PYBUILD = setuptools FLAVORS = python3 FLAVOR = python3 -MODPY_PYTEST_ARGS =-v tests/ +MODPY_PYTEST_ARGS =tests/ MODPY_TEST_DIR = ${WRKDIR} pre-test: - @rm -r ${WRKDIR}/tests + @rm -rf ${WRKDIR}/tests @cp -r ${WRKSRC}/tests ${WRKDIR}/ .include -- wbr, Kirill py-zstandard-0.22.0.tgz Description: Binary data
net/synapse: fix tests
ports@ I discovered that make test for net/synapse doesn't work, all tests fail. Thus, tests seems to be leaked and it consumes near 8G of RAM before it was killed due to hit the hard limit on my system. To avoid that I had added pytest-forked to run each test in dedicated process that allows to limit memory consumption to 200-300 mb, thsu, py-test-forked had missed dependecy to py-py which is known issue: https://github.com/pytest-dev/pytest-forked/issues/88 Anyway, some tests still fails due to requerement postgresql: === short test summary info FAILED tests/app/test_openid_listener.py::FederationReaderOpenIDListenerTests::test_openid_listener_0 FAILED tests/app/test_openid_listener.py::FederationReaderOpenIDListenerTests::test_openid_listener_1 FAILED tests/app/test_openid_listener.py::FederationReaderOpenIDListenerTests::test_openid_listener_2 FAILED tests/app/test_openid_listener.py::FederationReaderOpenIDListenerTests::test_openid_listener_3 FAILED tests/replication/test_federation_ack.py::FederationAckTestCase::test_federation_ack_sent FAILED tests/storage/test_rollback_worker.py::WorkerSchemaTests::test_not_upgraded_current_schema_version_with_outstanding_deltas FAILED tests/storage/test_rollback_worker.py::WorkerSchemaTests::test_not_upgraded_old_schema_version FAILED tests/storage/test_rollback_worker.py::WorkerSchemaTests::test_rolling_back FAILED tests/storage/test_room_search.py::EventSearchInsertionTest::test_null_byte FAILED tests/storage/test_room_search.py::MessageSearchTest::test_sqlite_search ERROR tests/federation/transport/server/test__base.py::test_disconnect ERROR tests/http/test_servlet.py::test_disconnect ERROR tests/replication/http/test__base.py::test_disconnect ERROR tests/test_server.py::test_disconnect = 10 failed, 2816 passed, 302 skipped, 196 warnings, 4 errors in 2082.83s (0:34:42) = So, here the diff: diff --git net/synapse/Makefile net/synapse/Makefile index 14d1308402c..54a2525ab69 100644 --- net/synapse/Makefile +++ net/synapse/Makefile @@ -71,11 +71,19 @@ RUN_DEPENDS += www/py-requests${MODPY_FLAVOR} TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH} \ devel/py-mock${MODPY_FLAVOR} \ devel/py-parameterized${MODPY_FLAVOR} \ + devel/py-test-forked${MODPY_FLAVOR} \ www/py-jwt${MODPY_FLAVOR} do-configure: @${MODCARGO_configure} +MODPY_PYTEST_ARGS =--forked tests/ +MODPY_TEST_DIR = ${WRKDIR} + +pre-test: + @rm -fr ${WRKDIR}/tests + @cp -r ${WRKSRC}/tests ${WRKDIR}/ + # to generate rust modules.inc: # make modcargo-gen-crates and modcargo-gen-crates-licenses .include "modules.inc" diff --git devel/py-test-forked/Makefile devel/py-test-forked/Makefile index 4682cc8931b..37738d5184a 100644 --- devel/py-test-forked/Makefile +++ devel/py-test-forked/Makefile @@ -4,7 +4,7 @@ MODPY_EGG_VERSION = 1.6.0 DISTNAME = pytest-forked-${MODPY_EGG_VERSION} PKGNAME = py-test-forked-${MODPY_EGG_VERSION} -REVISION = 0 +REVISION = 1 CATEGORIES = devel @@ -22,6 +22,7 @@ MODPY_PI =Yes MODPY_PYBUILD =setuptools_scm MODPY_PYTEST_ARGS =-v -RUN_DEPENDS = devel/py-test${MODPY_FLAVOR} +RUN_DEPENDS = devel/py-py${MODPY_FLAVOR} \ + devel/py-test${MODPY_FLAVOR} .include -- wbr, Kirill
Re: net/tcpflow: fix build
On Mon, 10 Jun 2024 12:54:52 +0100, Jeremie Courreges-Anglas wrote: > > On Sun, Jun 09, 2024 at 11:21:58PM +0100, Kirill A. Korinsky wrote: > I see this in configure.ac: > > |## regex support > |## there are several options > |## tre is better than regex > > I'm not sure what to think about it, but it has to be handled one way > or the other: currently it's going to be picked up and will cause > random errors in bulk builds. See proposal below. > agreed with your changes. > > Also, I abit tired from created report.xml by tcpflow when using it with -c > > and suggested a patch to upstream to avoid that [3] which I've included into > > updated diff. > > Looking at the tool (I don't use it myself) I suspect you could use > tcpflow -X /dev/null -c. Is this really something where you want to > deviate from upstream? If so, I can add that patch too (I have > committed the rest). More idiomatic way is tcpflow -S enable_report=NO -c (which is the same thing that my patch does). And yes, I'd like to deviate from upstream because this is behaviour of tcpflow-0.21 and I expect that this change in creating a lot of unexpected report.xml after upgrade to 7.6 isn't somehting expected. -- wbr, Kirill
Re: net/synapse: fix tests
Le Mon, Jun 10, 2024 at 03:01:23PM +0100, Kirill A. Korinsky a écrit : > ports@ > > I discovered that make test for net/synapse doesn't work, all tests fail. > > Thus, tests seems to be leaked and it consumes near 8G of RAM before it was > killed due to hit the hard limit on my system. > > To avoid that I had added pytest-forked to run each test in dedicated > process that allows to limit memory consumption to 200-300 mb, > thsu, py-test-forked had missed dependecy to py-py which is known issue: > https://github.com/pytest-dev/pytest-forked/issues/88 > > Anyway, some tests still fails due to requerement postgresql: there's some goo in postgresql ports to start a throwaway psql instance to run tests if you want to give it a shot. Landry
devel/py-twisted: missed test dependency
ports@, I've noticed that devel/py-twisted had missed test dependencies. Here the diff: diff --git devel/py-twisted/Makefile devel/py-twisted/Makefile index 0b11f9a0317..65b6f46d878 100644 --- devel/py-twisted/Makefile +++ devel/py-twisted/Makefile @@ -40,7 +40,8 @@ RUN_DEPENDS = devel/py-asn1${MODPY_FLAVOR} \ FLAVORS = python3 FLAVOR = python3 -TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH} +TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH} \ + devel/py-hypothesis${MODPY_FLAVOR} TEST_ENV = LC_ALL=en_US.UTF-8 TESTDIR = ${WRKSRC}/regress -- wbr, Kirill
Re: net/synapse: fix tests
On Mon, 10 Jun 2024 15:21:46 +0100, Landry Breuil wrote: > > there's some goo in postgresql ports to start a throwaway psql instance > to run tests if you want to give it a shot. > Not now, I need to update security/py-service_identity and this is one of dependant of that port, so, I need to confirm that it doesn't broken. That forced me to fix tests on the first place. -- wbr, Kirill
[update]: security/py-service_identity: 21.1.0 -> 24.1.0
ports@, Here an update of security/py-service_identity to the last released version 24.1.0 which was released in January 2024. Changelog: https://service-identity.readthedocs.io/en/stable/changelog.html This release contains tests on pypi that allow to moves away from github. As dependency it is used at: 1. devel/py-twisted 2. net/synapse 3. security/py-trustme To test it I run make test on -current/amd64 before and after upgrade inside each dependency, and no new failure is discovered. So, it seems like safe upgrade. diff --git security/py-service_identity/Makefile security/py-service_identity/Makefile index 9cab998de99..28621623eb6 100644 --- security/py-service_identity/Makefile +++ security/py-service_identity/Makefile @@ -1,13 +1,8 @@ COMMENT = service identity verification for pyOpenSSL/py-cryptography -MODPY_EGG_VERSION =21.1.0 -PKGNAME = py-${DISTNAME:S/-/_/} -REVISION = 3 - -# also on pypi, but no tests present -GH_ACCOUNT = pyca -GH_PROJECT = service-identity -GH_TAGNAME = ${MODPY_EGG_VERSION} +MODPY_EGG_VERSION =24.1.0 +DISTNAME= service_identity-${MODPY_EGG_VERSION} +PKGNAME = py-${DISTNAME} CATEGORIES = security @@ -15,8 +10,10 @@ CATEGORIES = security PERMIT_PACKAGE = Yes MODULES = lang/python -MODPY_PYBUILD =setuptools +MODPY_PI= Yes +MODPY_PYBUILD =hatch-vcs +BUILD_DEPENDS= devel/py-hatch-fancy-pypi-readme${MODPY_FLAVOR} RUN_DEPENDS = devel/py-asn1${MODPY_FLAVOR} \ devel/py-asn1-modules${MODPY_FLAVOR} \ devel/py-attrs${MODPY_FLAVOR} \ diff --git security/py-service_identity/distinfo security/py-service_identity/distinfo index 8fbb57e62f6..6c242252faf 100644 --- security/py-service_identity/distinfo +++ security/py-service_identity/distinfo @@ -1,2 +1,2 @@ -SHA256 (service-identity-21.1.0.tar.gz) = VBKUrWBgwQ4oVU82uxwVThH3GtPiOhYO6mLv+b9QUiw= -SIZE (service-identity-21.1.0.tar.gz) = 35326 +SHA256 (service_identity-24.1.0.tar.gz) = aCnJ1i+4MsLhxDVimwqMR24ZKYgfKL7k0gvCQWEAkiE= +SIZE (service_identity-24.1.0.tar.gz) = 40183 diff --git security/py-service_identity/patches/patch-src_service_identity___init___py security/py-service_identity/patches/patch-src_service_identity___init___py new file mode 100644 index 000..1f3a27d8ea2 --- /dev/null +++ security/py-service_identity/patches/patch-src_service_identity___init___py @@ -0,0 +1,15 @@ +https://github.com/pyca/service-identity/issues/68 +Index: src/service_identity/__init__.py +--- src/service_identity/__init__.py.orig src/service_identity/__init__.py +@@ -58,6 +58,9 @@ def __getattr__(name: str) -> str: + return meta["Project-URL"].split(" ", 1)[1] + + if name == "__email__": +-return meta["Author-email"].split("<", 1)[1].rstrip(">") ++if "<" in meta["Author-email"]: ++return meta["Author-email"].split("<", 1)[1].rstrip(">") ++else: ++return meta["Author-email"] + + return meta[dunder_to_metadata[name]] diff --git security/py-service_identity/pkg/PLIST security/py-service_identity/pkg/PLIST index e47a1ec325e..fda0228f172 100644 --- security/py-service_identity/pkg/PLIST +++ security/py-service_identity/pkg/PLIST @@ -1,28 +1,25 @@ @pkgpath security/py-service_identity lib/python${MODPY_VERSION}/site-packages/service_identity/ lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/AUTHORS.rst -lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/LICENSE lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/METADATA lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/RECORD lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/licenses/ +lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/licenses/LICENSE lib/python${MODPY_VERSION}/site-packages/service_identity/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}_common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} -lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_P
flag grafana as agplv3
Hi, maybe we should specify the more restrictive licensing: Index: Makefile === RCS file: /cvs/ports/sysutils/grafana/Makefile,v diff -u -p -r1.40 Makefile --- Makefile18 Mar 2024 22:37:44 - 1.40 +++ Makefile10 Jun 2024 16:03:21 - @@ -25,7 +25,7 @@ DISTFILES.a = grafana-$V.linux-amd64.ta SITES =https://ports.lucasraab.me/ SITES.a = https://dl.grafana.com/oss/release/ -# Apache 2.0 (bundles roboto and opensans fonts) +# AGPLv3 (https://grafana.com/licensing/) PERMIT_PACKAGE = Yes MODULES = lang/go patch attached Index: Makefile === RCS file: /cvs/ports/sysutils/grafana/Makefile,v diff -u -p -r1.40 Makefile --- Makefile 18 Mar 2024 22:37:44 - 1.40 +++ Makefile 10 Jun 2024 16:03:21 - @@ -25,7 +25,7 @@ DISTFILES.a = grafana-$V.linux-amd64.ta SITES = https://ports.lucasraab.me/ SITES.a = https://dl.grafana.com/oss/release/ -# Apache 2.0 (bundles roboto and opensans fonts) +# AGPLv3 (https://grafana.com/licensing/) PERMIT_PACKAGE = Yes MODULES = lang/go
Re: UPDATE: GCC 11.4.0
On Sun, Jun 09, 2024 at 04:07:42AM -0400, Brad Smith wrote: > Here is a start at an update to GCC 11.4.0. > > Build tested on aarch64, amd64 and i386. Also build-tested on riscv64. -- jca
[new] www/py-hyperframe: new port (version 6.0.1)
ports@, As part of updating security/wapiti I need to bring python mitmproxy which depends on h2 and h3/quick protocol. So, here the first pice of bring to ports h2: HTTP/2 framing code Homepage: https://pypi.org/project/hyperframe/ Tested on -current/amd64. -- wbr, Kirill hyperframe.tgz Description: Binary data
www/py-hpack: new port (version 4.0.0)
ports@, Here the next pice of bring to ports h2: HTTP/2 header encoder / decoder. Homepage: https://pypi.org/project/hpack/ Tested on -current/amd64. -- wbr, Kirill hpack.tgz Description: Binary data
www/py-h2: new port (version 4.1.0)
ports@, And, finally, here the h2 port itself that implements HTTP/2 for python. Homepage: https://pypi.org/project/h2/ Tested on -current/amd64. -- wbr, Kirill h2.tgz Description: Binary data
Re: flag grafana as agplv3
On Mon, Jun 10, 2024 at 10:17:02AM -0600, Abel Abraham Camarillo Ojeda wrote: > Hi, > > maybe we should specify the more restrictive licensing: sysutils/loki uses: # AGPLv3 + some bits Apache 2.0 I'd suggest both should use the same license marker and the one in loki looks more complete. You could put the URL on a line of its own below. > Index: Makefile > === > RCS file: /cvs/ports/sysutils/grafana/Makefile,v > diff -u -p -r1.40 Makefile > --- Makefile18 Mar 2024 22:37:44 - 1.40 > +++ Makefile10 Jun 2024 16:03:21 - > @@ -25,7 +25,7 @@ DISTFILES.a = grafana-$V.linux-amd64.ta > SITES =https://ports.lucasraab.me/ > SITES.a = https://dl.grafana.com/oss/release/ > > -# Apache 2.0 (bundles roboto and opensans fonts) > +# AGPLv3 (https://grafana.com/licensing/) > PERMIT_PACKAGE = Yes > > MODULES = lang/go > > > patch attached > Index: Makefile > === > RCS file: /cvs/ports/sysutils/grafana/Makefile,v > diff -u -p -r1.40 Makefile > --- Makefile 18 Mar 2024 22:37:44 - 1.40 > +++ Makefile 10 Jun 2024 16:03:21 - > @@ -25,7 +25,7 @@ DISTFILES.a = grafana-$V.linux-amd64.ta > SITES = https://ports.lucasraab.me/ > SITES.a =https://dl.grafana.com/oss/release/ > > -# Apache 2.0 (bundles roboto and opensans fonts) > +# AGPLv3 (https://grafana.com/licensing/) > PERMIT_PACKAGE = Yes > > MODULES =lang/go -- jca
net/py-publicsuffix2: new port (version 2.20191221)
ports@ Here another dependency of future port mitmproxy net/py-publicsuffix2. net/py-publicsuffix2 is an API to use https://publicsuffix.org/ -- wbr, Kirill publicsuffix2.tgz Description: Binary data
devel/py-kaitaistruct: new port (version 0.10)
ports@, Here the next dependency for mitmproxy which is required to update and fix security/wapiti: devel/py-kaitaistruct Kaitai Struct is a declarative language used for describing various binary data structures laid out in files or in memory: i.e. binary file formats, network stream packet formats, etc. Tested on -current/amd64. -- wbr, Kirill py-kaitaistruct.tgz Description: Binary data
archivers/py-lsqpack: new port (version 0.3.18)
ports@, The next dependencies for mitmproxy is aioquic aka HTTP3 which depends on custom compression algorithm archivers/py-lsqpack. Homepage: https://github.com/aiortc/pylsqpack This is pythond bindings for ls-qpack, but, unfortently it supports only API from old version due some limitations, see: https://github.com/aiortc/pylsqpack/issues/23 So, it ships its own fork of old version of ls-qpack, and no need archivers/ls-qpack. But I did it, and if you think that we need it, I ready to send it but this port contains only .so and .h files and I doubt that it needed by anything. Tested on -current/amd64. -- wbr, Kirill py-lsqpack.tgz Description: Binary data
www/py-aioquic: new port (version 1.0.0)
ports@, Here the www/py-aioquic which is dependency for mitmproxy. aioquic is a library for the QUIC network protocol in Python. It features a minimal TLS 1.3 implementation, a QUIC stack and an HTTP/3 stack. Homepage: https://github.com/aiortc/aioquic Tested on -current/amd64 and it requires an update of security/py-service_identity which I've sent early today. Anyway, some tests is filed due to: - ed448 is not supported by this version of OpenSSL - Invalid argument at setsockopt(IPPROTO_IPV6, IPV6_V6ONLY) which is expected. -- wbr, Kirill py-aioquic.tgz Description: Binary data
www/py-asgiref: new port (version 3.8.1)
ports@ Here the last missed dependency for mitmproxy: asgiref. ASGI is a standard for Python asynchronous web apps and servers to communicate with each other, and positioned as an asynchronous successor to WSGI. Homepage: https://github.com/django/asgiref Tested on -current/amd64. -- wbr, Kirill asgiref.tgz Description: Binary data
Re: net/tcpflow: fix build
On Mon, Jun 10, 2024 at 03:18:15PM +0100, Kirill A. Korinsky wrote: > On Mon, 10 Jun 2024 12:54:52 +0100, > Jeremie Courreges-Anglas wrote: > > > > On Sun, Jun 09, 2024 at 11:21:58PM +0100, Kirill A. Korinsky wrote: [...] > > > Also, I abit tired from created report.xml by tcpflow when using it with > > > -c > > > and suggested a patch to upstream to avoid that [3] which I've included > > > into > > > updated diff. > > > > Looking at the tool (I don't use it myself) I suspect you could use > > tcpflow -X /dev/null -c. Is this really something where you want to > > deviate from upstream? If so, I can add that patch too (I have > > committed the rest). > > More idiomatic way is tcpflow -S enable_report=NO -c (which is the same > thing that my patch does). And yes, I'd like to deviate from upstream > because this is behaviour of tcpflow-0.21 and I expect that this change in > creating a lot of unexpected report.xml after upgrade to 7.6 isn't somehting > expected. Fine with me. Committed, thanks. -- jca
[-stable UPDATE] samba-4.19.7
Here is an update to the latest release of the Samba 4.19 release series for -stable. Release notes: https://www.samba.org/samba/history/samba-4.19.7.html Tests/comments/OKs welcome. Index: Makefile === RCS file: /cvs/ports/net/samba/Makefile,v retrieving revision 1.343.2.1 diff -u -p -r1.343.2.1 Makefile --- Makefile16 Apr 2024 16:44:24 - 1.343.2.1 +++ Makefile10 Jun 2024 19:20:02 - @@ -1,4 +1,4 @@ -VERSION = 4.19.6 +VERSION = 4.19.7 DISTNAME = samba-${VERSION} EPOCH =0 Index: distinfo === RCS file: /cvs/ports/net/samba/distinfo,v retrieving revision 1.114.2.1 diff -u -p -r1.114.2.1 distinfo --- distinfo16 Apr 2024 16:44:24 - 1.114.2.1 +++ distinfo10 Jun 2024 19:20:02 - @@ -1,2 +1,2 @@ -SHA256 (samba-4.19.6.tar.gz) = ZTtSCVVU28IjxjuWr1zfnpjD4EhUnF9WFD07M9zhzvE= -SIZE (samba-4.19.6.tar.gz) = 41847853 +SHA256 (samba-4.19.7.tar.gz) = K7uACvLWvHucI+cIzVjQCNo7+m735iHZ7ItTOH7+5EU= +SIZE (samba-4.19.7.tar.gz) = 41851647 Index: pkg/PLIST-main === RCS file: /cvs/ports/net/samba/pkg/PLIST-main,v retrieving revision 1.73 diff -u -p -r1.73 PLIST-main --- pkg/PLIST-main 12 Oct 2023 07:28:23 - 1.73 +++ pkg/PLIST-main 10 Jun 2024 19:20:03 - @@ -1042,6 +1042,10 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}check_output.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}downgradedatabase.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}downgradedatabase.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}http_chunk.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}http_chunk.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}http_content.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}http_content.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}mdsearch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}mdsearch.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}ndrdump.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} @@ -1073,6 +1077,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/bug13653.py lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/check_output.py lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/downgradedatabase.py +lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/http_chunk.py +lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/http_content.py lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/mdsearch.py lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/ndrdump.py lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/netads_dns.py
security/py-mitmproxy: new port (version 10.3.0)
ports@, Here a new port security/py-mitmproxy and security/py-mitmproxy_rs which I'd like to send as one part because this two ports are logically linked together and the last one is useless without the first one. mitmproxy is an interactive, SSL/TLS-capable intercepting proxy with a console interface for HTTP/1, HTTP/2, and WebSockets. It contains also mitmdump which is the command-line version of mitmproxy. Think tcpdump for HTTP. And mitmweb which is a web-based interface for mitmproxy. Homepage: https://mitmproxy.org/ -- wbr, Kirill mitmproxy.tgz Description: Binary data
Re: security/py-mitmproxy: new port (version 10.3.0)
- main port is a standalone tool that happens to be written in python so would be better as mitmproxy rather than py-mitmproxy (and get rid of FLAVOR/FLAVORS) - no An / trailing . in COMMENT - there's a proper distfile so please use that instead of github: https://downloads.mitmproxy.org/10.3.0/mitmproxy-10.3.0.tar.gz On 2024/06/11 00:03, Kirill A. Korinsky wrote: > ports@, > > Here a new port security/py-mitmproxy and security/py-mitmproxy_rs which I'd > like to send as one part because this two ports are logically linked > together and the last one is useless without the first one. btw, I think generally it would have be helpful to include the set of dependencies with the main port too; splitting across half a dozen or so emails makes it harder to keep track of them all, and someone testing this will need to look at the others. I'll try to look at the others but din't have all that much time atm. > mitmproxy is an interactive, SSL/TLS-capable intercepting proxy with a > console interface for HTTP/1, HTTP/2, and WebSockets. It contains also > mitmdump which is the command-line version of mitmproxy. Think tcpdump for > HTTP. And mitmweb which is a web-based interface for mitmproxy. > > Homepage: https://mitmproxy.org/ > > -- > wbr, Kirill