From owner-dev-commits-ports-branches@freebsd.org Mon May 24 07:25:33 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6852F65749F; Mon, 24 May 2021 07:25:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FpTJY2QH8z4Z3M; Mon, 24 May 2021 07:25:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3BD3A2626B; Mon, 24 May 2021 07:25:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14O7PXV5061088; Mon, 24 May 2021 07:25:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14O7PXKw061087; Mon, 24 May 2021 07:25:33 GMT (envelope-from git) Date: Mon, 24 May 2021 07:25:33 GMT Message-Id: <202105240725.14O7PXKw061087@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 039306834f7c - 2021Q2 - sysutils/azure-agent: Update to 2.2.54.2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 039306834f7cbe407bd03d32bc546120ece28a9a Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 May 2021 07:25:33 -0000 The branch 2021Q2 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=039306834f7cbe407bd03d32bc546120ece28a9a commit 039306834f7cbe407bd03d32bc546120ece28a9a Author: Li-Wen Hsu AuthorDate: 2021-05-23 13:37:40 +0000 Commit: Li-Wen Hsu CommitDate: 2021-05-24 07:25:11 +0000 sysutils/azure-agent: Update to 2.2.54.2 PR: 243046, 248543, 248651 Approved by: whu (maintainer, implicitly) (cherry picked from commit b185a2b866b8642e2500dd691267694ac388875b) --- sysutils/azure-agent/Makefile | 10 +++---- sysutils/azure-agent/distinfo | 6 ++--- ...-azurelinuxagent_daemon_resourcedisk_freebsd.py | 31 ++++++++++++++-------- .../files/patch-config_freebsd_waagent.conf | 14 ++++------ 4 files changed, 32 insertions(+), 29 deletions(-) diff --git a/sysutils/azure-agent/Makefile b/sysutils/azure-agent/Makefile index 0b895a31742b..6d8c48229ace 100644 --- a/sysutils/azure-agent/Makefile +++ b/sysutils/azure-agent/Makefile @@ -1,8 +1,7 @@ PORTNAME= azure-agent -PORTVERSION= 2.2.45 +PORTVERSION= 2.2.54.2 DISTVERSIONPREFIX= v -PORTREVISION= 2 CATEGORIES= sysutils PATCH_SITES= https://github.com/Azure/WALinuxAgent/commit/ @@ -14,13 +13,12 @@ LICENSE= APACHE20 RUN_DEPENDS= sudo:security/sudo \ bash:shells/bash \ - base64:converters/base64 \ dmidecode:sysutils/dmidecode \ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR} \ - ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss + ca_root_nss>0:security/ca_root_nss NO_BUILD= yes -USES= python:3.5+ shebangfix +USES= python shebangfix SHEBANG_FILES= bin/waagent bin/waagent2.0 @@ -39,7 +37,7 @@ post-patch: -e "s,/usr/sbin/waagent,${PREFIX}/sbin/waagent,g" \ ${WRKSRC}/bin/waagent2.0 ${REINPLACE_CMD} -e "s,:/usr/local/bin,:/usr/local/bin:/usr/local/sbin,g" \ - -e "s,python,${PYTHON_VERSION},g" \ + -e "s,python,${PYTHON_CMD},g" \ ${WRKSRC}/init/freebsd/waagent ${REINPLACE_CMD} -e "s,/usr/sbin,${PREFIX}/sbin,g" \ ${WRKSRC}/init/waagent diff --git a/sysutils/azure-agent/distinfo b/sysutils/azure-agent/distinfo index ace22c2cc6de..686bcb239916 100644 --- a/sysutils/azure-agent/distinfo +++ b/sysutils/azure-agent/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1590110519 -SHA256 (Azure-WALinuxAgent-v2.2.45_GH0.tar.gz) = ded5ecf2ce17b3e375147a386ba13554b52098475dc06974e9780cc04ca893ee -SIZE (Azure-WALinuxAgent-v2.2.45_GH0.tar.gz) = 937466 +TIMESTAMP = 1621586743 +SHA256 (Azure-WALinuxAgent-v2.2.54.2_GH0.tar.gz) = 2c047d262ca55718268a0921c7bd04b6c1ab1032bd885e3e0949107f493e7b7c +SIZE (Azure-WALinuxAgent-v2.2.54.2_GH0.tar.gz) = 1814212 diff --git a/sysutils/azure-agent/files/patch-azurelinuxagent_daemon_resourcedisk_freebsd.py b/sysutils/azure-agent/files/patch-azurelinuxagent_daemon_resourcedisk_freebsd.py index 9d8853e89142..347ba8ab5641 100644 --- a/sysutils/azure-agent/files/patch-azurelinuxagent_daemon_resourcedisk_freebsd.py +++ b/sysutils/azure-agent/files/patch-azurelinuxagent_daemon_resourcedisk_freebsd.py @@ -1,10 +1,10 @@ ---- azurelinuxagent/daemon/resourcedisk/freebsd.py.orig 2020-05-22 12:55:32 UTC +--- azurelinuxagent/daemon/resourcedisk/freebsd.py.orig 2021-05-18 18:30:52 UTC +++ azurelinuxagent/daemon/resourcedisk/freebsd.py @@ -1,6 +1,7 @@ # Microsoft Azure Linux Agent # # Copyright 2018 Microsoft Corporation -+# Copyright 2020 The FreeBSD Foundation ++# Copyright 2020-2021 The FreeBSD Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ - 2. GPT: The resource disk partition is /dev/da1p2, /dev/da1p1 is for reserved usage. """ - def __init__(self): + def __init__(self): # pylint: disable=W0235 super(FreeBSDResourceDiskHandler, self).__init__() @staticmethod @@ -76,7 +76,7 @@ device = self.osutil.device_for_ide_port(1) if device is None or device not in disks: -@@ -90,94 +101,186 @@ class FreeBSDResourceDiskHandler(ResourceDiskHandler): +@@ -90,94 +101,195 @@ class FreeBSDResourceDiskHandler(ResourceDiskHandler): raise ResourceDiskError("Unable to detect resource disk device.") logger.info('Resource disk device {0} found.', device) @@ -97,16 +97,21 @@ + raise ResourceDiskError("Cannot get resource disk size.") + disk_info = output.split() + block_size = int(disk_info[1]) -+ disk_size = int(disk_info[2]) ++ err, output = shellutil.run_get_output("gpart show {0} | grep '=>'".format(device)) ++ if err: ++ raise ResourceDiskError("Cannot get resource disk partition information.") ++ disk_info = output.split() ++ partition_size = int(disk_info[2]) * block_size ++ + swap_size = 0 + if conf.get_resourcedisk_enable_swap(): + swap_size_mb = conf.get_resourcedisk_swap_size_mb() + swap_size = swap_size_mb * 1024 * 1024 -+ resource_size = disk_size - swap_size ++ resource_size = partition_size - swap_size + if resource_size < MINIMAL_RESOURCE_PARTITION_SIZE: + resource_size = MINIMAL_RESOURCE_PARTITION_SIZE -+ swap_size = disk_size - resource_size ++ swap_size = partition_size - resource_size + + # get size of the current swap partition + current_swap_size = 0 @@ -283,7 +288,7 @@ - if os.path.isfile(swapfile) and os.path.getsize(swapfile) != size: - logger.info("Remove old swap file") -- shellutil.run("swapoff -a", chk_err=False) +- shellutil.run("swapoff {0}".format(swapfile), chk_err=False) - os.remove(swapfile) + # get swap partition (geom provider) + err, output = shellutil.run_get_output('mount') @@ -308,8 +313,11 @@ - mddevice = shellutil.run_get_output( - "mdconfig -a -t vnode -f {0}".format(swapfile))[1].rstrip() - shellutil.run("chmod 0600 /dev/{0}".format(mddevice)) -+ if shellutil.run("swapon {0}".format(swap_provider_name)): -+ raise ResourceDiskError(swap_provider_name) ++ err, output = shellutil.run_get_output( ++ "swapctl -l | grep {0}".format(swap_provider_name)) ++ if not output: ++ if shellutil.run("swapon {0}".format(swap_provider_name)): ++ raise ResourceDiskError(swap_provider_name) - if conf.get_resourcedisk_enable_swap_encryption(): - shellutil.run("kldload aesni") @@ -327,6 +335,7 @@ - raise ResourceDiskError("/dev/{0}".format(mddevice)) - logger.info( - "Enabled {0}KB of swap at /dev/{1} ({2})".format(size_kb, mddevice, swapfile)) -+ size_mb = shellutil.run_get_output("swapctl -lm")[1].split()[1] ++ size_mb = shellutil.run_get_output( ++ "swapctl -lm | grep {0}".format(swap_provider_name))[1].split()[1] + logger.info( + "Enabled {0}MB of swap at {1}".format(size_mb, swap_provider_name)) diff --git a/sysutils/azure-agent/files/patch-config_freebsd_waagent.conf b/sysutils/azure-agent/files/patch-config_freebsd_waagent.conf index 95dd7a1d0379..9dd22728d4b4 100644 --- a/sysutils/azure-agent/files/patch-config_freebsd_waagent.conf +++ b/sysutils/azure-agent/files/patch-config_freebsd_waagent.conf @@ -1,15 +1,11 @@ ---- config/freebsd/waagent.conf.orig 2020-05-22 16:31:32 UTC +--- config/freebsd/waagent.conf.orig 2021-05-21 08:58:28 UTC +++ config/freebsd/waagent.conf -@@ -48,10 +48,10 @@ ResourceDisk.Filesystem=ufs - ResourceDisk.MountPoint=/mnt/resource - - # Create and use swapfile on resource disk. --ResourceDisk.EnableSwap=n -+ResourceDisk.EnableSwap=y +@@ -49,7 +49,7 @@ ResourceDisk.MountPoint=/mnt/resource + ResourceDisk.EnableSwap=y # Size of the swapfile. --ResourceDisk.SwapSizeMB=0 +-ResourceDisk.SwapSizeMB=16384 +ResourceDisk.SwapSizeMB=2048 - # Comma-seperated list of mount options. See man(8) for valid options. + # Comma-separated list of mount options. See mount(8) for valid options. ResourceDisk.MountOptions=None From owner-dev-commits-ports-branches@freebsd.org Mon May 24 15:18:46 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9AFC7637000; Mon, 24 May 2021 15:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FpgpZ434cz4tRf; Mon, 24 May 2021 15:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6EDFE4966; Mon, 24 May 2021 15:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14OFIkKj086222; Mon, 24 May 2021 15:18:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14OFIkOd086221; Mon, 24 May 2021 15:18:46 GMT (envelope-from git) Date: Mon, 24 May 2021 15:18:46 GMT Message-Id: <202105241518.14OFIkOd086221@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: d5e4b679aaf4 - 2021Q2 - www/firefox: fix dependency version information MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: d5e4b679aaf426a4a5f4e735f26870f7a7bcdb2a Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 May 2021 15:18:46 -0000 The branch 2021Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=d5e4b679aaf426a4a5f4e735f26870f7a7bcdb2a commit d5e4b679aaf426a4a5f4e735f26870f7a7bcdb2a Author: Christoph Moench-Tegeder AuthorDate: 2021-05-24 15:07:29 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2021-05-24 15:18:26 +0000 www/firefox: fix dependency version information According to: build/moz.configure/nspr.configure (NSPR, sets minimum version) build/moz.configure/nss.configure (NSS, sets minimum version) gfx/harfbuzz/README.mozilla (harfbuzz embedded copy, we use our own) gfx/graphite2/README.mozilla (graphite2 embedded copy, we use our own) media/libpng/README (libpng embedded copy, we use our own) media/libvpx/config/vpx_version.h (libvpx embedded copy, we use our own) may this help me when I touch it next time (cherry picked from commit 31c1a83b5c002170ca78ef9e6e0e51864dc1ce89) --- www/firefox/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 708c98746909..24083f259305 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -13,12 +13,12 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.26:devel/nspr \ - nss>=3.62:security/nss \ + nss>=3.63:security/nss \ icu>=67.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=2.7.4:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ - png>=1.6.35:graphics/png \ + png>=1.6.37:graphics/png \ libvpx>=1.8.2:multimedia/libvpx \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ From owner-dev-commits-ports-branches@freebsd.org Mon May 24 15:44:30 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BC158637547; Mon, 24 May 2021 15:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FphNG4nvzz3MNW; Mon, 24 May 2021 15:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 881124FA3; Mon, 24 May 2021 15:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14OFiUT8025293; Mon, 24 May 2021 15:44:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14OFiUm3025292; Mon, 24 May 2021 15:44:30 GMT (envelope-from git) Date: Mon, 24 May 2021 15:44:30 GMT Message-Id: <202105241544.14OFiUm3025292@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Sofian Brabez Subject: git: e78459a378dc - 2021Q2 - security/crowdsec-firewall-bouncer: new port MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sbz X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: e78459a378dc5a5997ca0d938e3fceeb43e11c05 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 May 2021 15:44:30 -0000 The branch 2021Q2 has been updated by sbz: URL: https://cgit.FreeBSD.org/ports/commit/?id=e78459a378dc5a5997ca0d938e3fceeb43e11c05 commit e78459a378dc5a5997ca0d938e3fceeb43e11c05 Author: Sofian Brabez AuthorDate: 2021-05-24 15:14:29 +0000 Commit: Sofian Brabez CommitDate: 2021-05-24 15:43:10 +0000 security/crowdsec-firewall-bouncer: new port Crowdsec bouncer written in golang for firewalls. cs-firewall-bouncer will fetch new and old decisions from a CrowdSec API to add them in a blocklist used by supported firewalls. WWW: https://github.com/crowdsecurity/cs-firewall-bouncer (cherry picked from commit 9ecdfbcdb55b424ca0df02b4a7fd72fc298cf9bf) --- security/Makefile | 1 + security/crowdsec-firewall-bouncer/Makefile | 39 ++++++++++++++++++++++ security/crowdsec-firewall-bouncer/distinfo | 5 +++ .../files/crowdsec_firewall.in | 25 ++++++++++++++ .../crowdsec-firewall-bouncer/files/pkg-message.in | 21 ++++++++++++ security/crowdsec-firewall-bouncer/pkg-descr | 6 ++++ security/crowdsec-firewall-bouncer/pkg-plist | 2 ++ 7 files changed, 99 insertions(+) diff --git a/security/Makefile b/security/Makefile index e375845d1fc8..d6ffc058e624 100644 --- a/security/Makefile +++ b/security/Makefile @@ -105,6 +105,7 @@ SUBDIR += crackpkcs12 SUBDIR += create-cert SUBDIR += crowdsec + SUBDIR += crowdsec-firewall-bouncer SUBDIR += cryptlib SUBDIR += cryptopp SUBDIR += ct-submit diff --git a/security/crowdsec-firewall-bouncer/Makefile b/security/crowdsec-firewall-bouncer/Makefile new file mode 100644 index 000000000000..cc954af98728 --- /dev/null +++ b/security/crowdsec-firewall-bouncer/Makefile @@ -0,0 +1,39 @@ +PORTNAME= crowdsec-firewall-bouncer +PORTVERSION= 0.0.12 +DISTVERSIONPREFIX= v +CATEGORIES= security + +MAINTAINER= sbz@FreeBSD.org +COMMENT= Crowdsec bouncer written in golang for firewalls + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= crowdsec>0:security/crowdsec + +USES= go:modules + +USE_RC_SUBR= crowdsec_firewall + +GO_MODULE= github.com/crowdsecurity/cs-firewall-bouncer + +GO_BUILDFLAGS= -ldflags "-s -w \ + -X github.com/crowdsecurity/cs-firewall-bouncer/pkg/version.Version=v${PORTVERSION} \ + -X github.com/crowdsecurity/cs-firewall-bouncer/pkg/version.Tag=freebsd" + +SUB_FILES= pkg-message + +post-patch: + ${REINPLACE_CMD} 's,$${BACKEND},pf,g' \ + ${WRKSRC}/config/cs-firewall-bouncer.yaml + +do-install: + @${MKDIR} ${STAGEDIR}${ETCDIR} + + ${INSTALL_DATA} ${WRKSRC}/config/cs-firewall-bouncer.yaml \ + ${STAGEDIR}${ETCDIR}/cs-firewall-bouncer.yaml.sample + + ${INSTALL_PROGRAM} ${WRKDIR}/bin/crowdsec-firewall-bouncer \ + ${STAGEDIR}${PREFIX}/bin/cs-firewall-bouncer + +.include diff --git a/security/crowdsec-firewall-bouncer/distinfo b/security/crowdsec-firewall-bouncer/distinfo new file mode 100644 index 000000000000..ed0ddfb6c133 --- /dev/null +++ b/security/crowdsec-firewall-bouncer/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1620824385 +SHA256 (go/security_crowdsec-firewall-bouncer/crowdsec-firewall-bouncer-v0.0.12/v0.0.12.mod) = 62de12d4c417718ea7d7e009d7d06f103518c67e168db04c988808783e1e588d +SIZE (go/security_crowdsec-firewall-bouncer/crowdsec-firewall-bouncer-v0.0.12/v0.0.12.mod) = 1335 +SHA256 (go/security_crowdsec-firewall-bouncer/crowdsec-firewall-bouncer-v0.0.12/v0.0.12.zip) = 9a82915c2f2f8d4872ebfaf4cc6046cbdc1ab5af42e3a22a721b4a29007fa25c +SIZE (go/security_crowdsec-firewall-bouncer/crowdsec-firewall-bouncer-v0.0.12/v0.0.12.zip) = 143391 diff --git a/security/crowdsec-firewall-bouncer/files/crowdsec_firewall.in b/security/crowdsec-firewall-bouncer/files/crowdsec_firewall.in new file mode 100755 index 000000000000..48aa4cb1e16d --- /dev/null +++ b/security/crowdsec-firewall-bouncer/files/crowdsec_firewall.in @@ -0,0 +1,25 @@ +#!/bin/sh +# +# PROVIDE: crowdsec_firewall +# REQUIRE: LOGIN DAEMON NETWORKING +# KEYWORD: shutdown +# + +. /etc/rc.subr + +name=crowdsec_firewall +desc="Crowdsec Firewall" +rcvar=crowdsec_firewall_enable + +load_rc_config $name + +: ${crowdsec_firewall_enbable:="NO"} +: ${crowdsec_firewall_config:="%%PREFIX%%/etc/crowdsec-firewall-bouncer/cs-firewall-bouncer.yaml"} + +pidfile=/var/run/$name.pid +required_files="$crowdsec_firewall_config" +procname="%%PREFIX%%/bin/cs-firewall-bouncer" +command=/usr/sbin/daemon +command_args="-fp $pidfile -t '$desc' -- '$procname' -c '$crowdsec_firewall_config'" + +run_rc_command "$1" diff --git a/security/crowdsec-firewall-bouncer/files/pkg-message.in b/security/crowdsec-firewall-bouncer/files/pkg-message.in new file mode 100644 index 000000000000..77449b1567d1 --- /dev/null +++ b/security/crowdsec-firewall-bouncer/files/pkg-message.in @@ -0,0 +1,21 @@ +[ +{ type: install + message: < persist + +# create crowdsec ipv6 table +table persist + +# sysrc crowdsec_firewall_enable="YES" +EOM +} +] diff --git a/security/crowdsec-firewall-bouncer/pkg-descr b/security/crowdsec-firewall-bouncer/pkg-descr new file mode 100644 index 000000000000..e666b29dbc2e --- /dev/null +++ b/security/crowdsec-firewall-bouncer/pkg-descr @@ -0,0 +1,6 @@ +Crowdsec bouncer written in golang for firewalls. + +cs-firewall-bouncer will fetch new and old decisions from a CrowdSec API to add +them in a blocklist used by supported firewalls. + +WWW: https://github.com/crowdsecurity/cs-firewall-bouncer diff --git a/security/crowdsec-firewall-bouncer/pkg-plist b/security/crowdsec-firewall-bouncer/pkg-plist new file mode 100644 index 000000000000..d70a51ea77f3 --- /dev/null +++ b/security/crowdsec-firewall-bouncer/pkg-plist @@ -0,0 +1,2 @@ +@sample etc/crowdsec-firewall-bouncer/cs-firewall-bouncer.yaml.sample +bin/cs-firewall-bouncer From owner-dev-commits-ports-branches@freebsd.org Mon May 24 20:17:09 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C62DD63C02B; Mon, 24 May 2021 20:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FppQs24BRz4vLY; Mon, 24 May 2021 20:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2886D10A5B; Mon, 24 May 2021 20:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14OKH9Fl084844; Mon, 24 May 2021 20:17:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14OKH9A3084843; Mon, 24 May 2021 20:17:09 GMT (envelope-from git) Date: Mon, 24 May 2021 20:17:09 GMT Message-Id: <202105242017.14OKH9A3084843@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 589133ba8296 - 2021Q2 - www/firefox-esr: update to 78.11.0 (rc1) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 589133ba8296277e83467a18be93fb0d2f68d278 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 May 2021 20:17:09 -0000 The branch 2021Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=589133ba8296277e83467a18be93fb0d2f68d278 commit 589133ba8296277e83467a18be93fb0d2f68d278 Author: Christoph Moench-Tegeder AuthorDate: 2021-05-24 20:14:23 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2021-05-24 20:16:51 +0000 www/firefox-esr: update to 78.11.0 (rc1) Release Notes (soon): https://www.mozilla.org/en-US/firefox/78.11.0/releasenotes/ (cherry picked from commit b946bb269e06621f7ab7e6bb9835c7690bce409b) --- www/firefox-esr/Makefile | 2 +- www/firefox-esr/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 1506b9247b13..cfe7b061e9ec 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -1,7 +1,7 @@ # Created by: Alan Eldridge PORTNAME= firefox -DISTVERSION= 78.10.1 +DISTVERSION= 78.11.0 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo index f94562aee1b2..22e7a1333139 100644 --- a/www/firefox-esr/distinfo +++ b/www/firefox-esr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1620070953 -SHA256 (firefox-78.10.1esr.source.tar.xz) = c41f45072b0eb84b9c5dcb381298f91d49249db97784c7e173b5f210cd15cf3f -SIZE (firefox-78.10.1esr.source.tar.xz) = 334444960 +TIMESTAMP = 1621877926 +SHA256 (firefox-78.11.0esr.source.tar.xz) = b5f77c4611eebc600df130893a85a357c6d51f5608c69fa31cdf23e2b5cf618e +SIZE (firefox-78.11.0esr.source.tar.xz) = 336949020 From owner-dev-commits-ports-branches@freebsd.org Mon May 24 23:24:38 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4AC1863F817; Mon, 24 May 2021 23:24:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fptb970VHz3Dyn; Mon, 24 May 2021 23:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AA4A1132C9; Mon, 24 May 2021 23:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14ONObHf035063; Mon, 24 May 2021 23:24:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14ONObAH035062; Mon, 24 May 2021 23:24:37 GMT (envelope-from git) Date: Mon, 24 May 2021 23:24:37 GMT Message-Id: <202105242324.14ONObAH035062@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Palle Girgensohn Subject: git: 8c25791ab1ff - 2021Q2 - databases/pg_partman: Update to 4.5.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: girgen X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 8c25791ab1ff2356b3f03aec6d164141cf53cc2e Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 May 2021 23:24:38 -0000 The branch 2021Q2 has been updated by girgen: URL: https://cgit.FreeBSD.org/ports/commit/?id=8c25791ab1ff2356b3f03aec6d164141cf53cc2e commit 8c25791ab1ff2356b3f03aec6d164141cf53cc2e Author: Palle Girgensohn AuthorDate: 2021-05-24 09:20:07 +0000 Commit: Palle Girgensohn CommitDate: 2021-05-24 23:24:26 +0000 databases/pg_partman: Update to 4.5.1 Security: 5fa90ee6-bc9e-11eb-a287-e0d55e2a8bf9 (cherry picked from commit 370c7631a13560605f62525b3b6fb7181727e38a) --- databases/pg_partman/Makefile | 2 +- databases/pg_partman/distinfo | 6 +++--- databases/pg_partman/pkg-plist | 8 ++++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/databases/pg_partman/Makefile b/databases/pg_partman/Makefile index 2d85fc7d1bd8..1f3823c63e3c 100644 --- a/databases/pg_partman/Makefile +++ b/databases/pg_partman/Makefile @@ -1,7 +1,7 @@ PORTNAME= pg_partman DISTVERSIONPREFIX= v -DISTVERSION= 4.4.0 +DISTVERSION= 4.5.1 CATEGORIES= databases MAINTAINER= lacey.leanne@gmail.com diff --git a/databases/pg_partman/distinfo b/databases/pg_partman/distinfo index 10ca3ba49ab3..81729d35dcd3 100644 --- a/databases/pg_partman/distinfo +++ b/databases/pg_partman/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1592940570 -SHA256 (keithf4-pg_partman-v4.4.0_GH0.tar.gz) = d035af8a98798ec8a2e547d38c320e1b90ebfa8c41feb49b926076dcf71777f2 -SIZE (keithf4-pg_partman-v4.4.0_GH0.tar.gz) = 1067348 +TIMESTAMP = 1621839968 +SHA256 (keithf4-pg_partman-v4.5.1_GH0.tar.gz) = c37ca049d37eb5a6fceea805007acfadaadd2c2fa70938ffb6f7a918b5772c37 +SIZE (keithf4-pg_partman-v4.5.1_GH0.tar.gz) = 1161985 diff --git a/databases/pg_partman/pkg-plist b/databases/pg_partman/pkg-plist index 5d622e8a56e9..5032adb386e5 100644 --- a/databases/pg_partman/pkg-plist +++ b/databases/pg_partman/pkg-plist @@ -10,7 +10,8 @@ lib/postgresql/pg_partman_bgw.so %%PORTDOCS%%%%DOCSDIR%%/migrate_to_native.md %%PORTDOCS%%%%DOCSDIR%%/migration_to_partman.md %%PORTDOCS%%%%DOCSDIR%%/pg_partman.md -%%PORTDOCS%%%%DOCSDIR%%/pg_partman_howto.md +%%PORTDOCS%%%%DOCSDIR%%/pg_partman_howto_native.md +%%PORTDOCS%%%%DOCSDIR%%/pg_partman_howto_triggerbased.md share/postgresql/extension/pg_partman--0.1.0--0.1.1.sql share/postgresql/extension/pg_partman--0.1.1--0.1.2.sql share/postgresql/extension/pg_partman--0.1.2--0.2.0.sql @@ -84,5 +85,8 @@ share/postgresql/extension/pg_partman--4.2.1--4.2.2.sql share/postgresql/extension/pg_partman--4.2.2--4.3.0.sql share/postgresql/extension/pg_partman--4.3.0--4.3.1.sql share/postgresql/extension/pg_partman--4.3.1--4.4.0.sql -share/postgresql/extension/pg_partman--4.4.0.sql +share/postgresql/extension/pg_partman--4.4.0--4.5.0.sql +share/postgresql/extension/pg_partman--4.4.1--4.5.0.sql +share/postgresql/extension/pg_partman--4.5.0--4.5.1.sql +share/postgresql/extension/pg_partman--4.5.1.sql share/postgresql/extension/pg_partman.control From owner-dev-commits-ports-branches@freebsd.org Mon May 24 23:43:53 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1A1EE63FBFA; Mon, 24 May 2021 23:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fpv1P0CN7z3KdF; Mon, 24 May 2021 23:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E33DC13917; Mon, 24 May 2021 23:43:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14ONhqCE061214; Mon, 24 May 2021 23:43:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14ONhqob061213; Mon, 24 May 2021 23:43:52 GMT (envelope-from git) Date: Mon, 24 May 2021 23:43:52 GMT Message-Id: <202105242343.14ONhqob061213@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bryan Drewery Subject: git: 9501a687f6e1 - 2021Q2 - irc/irssi: Update to 1.2.3 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 9501a687f6e152712d053092d37761951be00260 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 May 2021 23:43:53 -0000 The branch 2021Q2 has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=9501a687f6e152712d053092d37761951be00260 commit 9501a687f6e152712d053092d37761951be00260 Author: Lewis Cook AuthorDate: 2021-04-16 17:26:24 +0000 Commit: Bryan Drewery CommitDate: 2021-05-24 23:41:54 +0000 irc/irssi: Update to 1.2.3 Changes: https://irssi.org/NEWS/#v1-2-3 PR: 255116 Submitted by: David O'Rourke (maintainer) Approved by: mentors (implicit) (cherry picked from commit 1ed838f5dead7db6ce68317480917f89461d848e) --- irc/irssi/Makefile | 3 +- irc/irssi/distinfo | 6 +- irc/irssi/files/patch-src_core_modules.c | 20 ------ irc/irssi/files/patch-src_core_servers-reconnect.c | 61 ------------------ irc/irssi/files/patch-src_core_servers-setup.c | 72 ---------------------- irc/irssi/files/patch-src_fe-text_term-terminfo.c | 15 ----- irc/irssi/pkg-plist | 1 + 7 files changed, 5 insertions(+), 173 deletions(-) diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile index b4629f10da7a..fc08180a22db 100644 --- a/irc/irssi/Makefile +++ b/irc/irssi/Makefile @@ -1,7 +1,6 @@ PORTNAME= irssi -PORTVERSION= 1.2.2 -PORTREVISION= 2 +PORTVERSION= 1.2.3 PORTEPOCH= 2 CATEGORIES?= irc MASTER_SITES= https://github.com/irssi/irssi/releases/download/${PORTVERSION}/ diff --git a/irc/irssi/distinfo b/irc/irssi/distinfo index 4131bae2724f..969342bbe3e9 100644 --- a/irc/irssi/distinfo +++ b/irc/irssi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1615547467 -SHA256 (irssi-1.2.2.tar.xz) = 6727060c918568ba2ff4295ad736128dba0b995d7b20491bca11f593bd857578 -SIZE (irssi-1.2.2.tar.xz) = 1140844 +TIMESTAMP = 1618317211 +SHA256 (irssi-1.2.3.tar.xz) = a647bfefed14d2221fa77b6edac594934dc672c4a560417b1abcbbc6b88d769f +SIZE (irssi-1.2.3.tar.xz) = 1145292 diff --git a/irc/irssi/files/patch-src_core_modules.c b/irc/irssi/files/patch-src_core_modules.c deleted file mode 100644 index c0961ce9bcb9..000000000000 --- a/irc/irssi/files/patch-src_core_modules.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/core/modules.c.orig 2021-03-13 16:34:06 UTC -+++ src/core/modules.c -@@ -214,7 +214,7 @@ MODULE_FILE_REC *module_register_full(const char *name - module = g_new0(MODULE_REC, 1); - module->name = g_strdup(name); - -- modules = g_slist_append(modules, module); -+ modules = g_slist_prepend(modules, module); - } - - file = module_file_find(module, submodule); -@@ -226,7 +226,7 @@ MODULE_FILE_REC *module_register_full(const char *name - file->name = g_strdup(submodule); - file->defined_module_name = g_strdup(defined_module_name); - -- module->files = g_slist_append(module->files, file); -+ module->files = g_slist_prepend(module->files, file); - return file; - } - diff --git a/irc/irssi/files/patch-src_core_servers-reconnect.c b/irc/irssi/files/patch-src_core_servers-reconnect.c deleted file mode 100644 index f7bc7ffd728d..000000000000 --- a/irc/irssi/files/patch-src_core_servers-reconnect.c +++ /dev/null @@ -1,61 +0,0 @@ ---- src/core/servers-reconnect.c.orig 2019-08-29 13:48:46 UTC -+++ src/core/servers-reconnect.c -@@ -151,10 +151,6 @@ static int server_reconnect_timeout(void) - - static void sserver_connect(SERVER_SETUP_REC *rec, SERVER_CONNECT_REC *conn) - { -- conn->family = rec->family; -- conn->address = g_strdup(rec->address); -- if (conn->port == 0) conn->port = rec->port; -- - server_setup_fill_reconn(conn, rec); - server_reconnect_add(conn, rec->last_connect+reconnect_time); - server_connect_unref(conn); -@@ -181,10 +177,20 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, - dest->tag = g_strdup(src->tag); - - if (connect_info) { -- dest->family = src->family; -+ dest->family = src->family; - dest->address = g_strdup(src->address); - dest->port = src->port; - dest->password = g_strdup(src->password); -+ -+ dest->use_tls = src->use_tls; -+ dest->tls_cert = g_strdup(src->tls_cert); -+ dest->tls_pkey = g_strdup(src->tls_pkey); -+ dest->tls_verify = src->tls_verify; -+ dest->tls_cafile = g_strdup(src->tls_cafile); -+ dest->tls_capath = g_strdup(src->tls_capath); -+ dest->tls_ciphers = g_strdup(src->tls_ciphers); -+ dest->tls_pinned_cert = g_strdup(src->tls_pinned_cert); -+ dest->tls_pinned_pubkey = g_strdup(src->tls_pinned_pubkey); - } - - dest->chatnet = g_strdup(src->chatnet); -@@ -207,16 +213,6 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, - dest->no_autosendcmd = src->no_autosendcmd; - dest->unix_socket = src->unix_socket; - -- dest->use_tls = src->use_tls; -- dest->tls_cert = g_strdup(src->tls_cert); -- dest->tls_pkey = g_strdup(src->tls_pkey); -- dest->tls_verify = src->tls_verify; -- dest->tls_cafile = g_strdup(src->tls_cafile); -- dest->tls_capath = g_strdup(src->tls_capath); -- dest->tls_ciphers = g_strdup(src->tls_ciphers); -- dest->tls_pinned_cert = g_strdup(src->tls_pinned_cert); -- dest->tls_pinned_pubkey = g_strdup(src->tls_pinned_pubkey); -- - return dest; - } - -@@ -293,7 +289,7 @@ static void sig_reconnect(SERVER_REC *server) - (!rec->last_connect || !rec->last_failed || - rec->last_connect < now-FAILED_RECONNECT_WAIT)) { - if (rec == sserver) -- conn->port = server->connrec->port; -+ conn->port = server->connrec->port; - sserver_connect(rec, conn); - return; - } diff --git a/irc/irssi/files/patch-src_core_servers-setup.c b/irc/irssi/files/patch-src_core_servers-setup.c deleted file mode 100644 index e565d2cd1eb5..000000000000 --- a/irc/irssi/files/patch-src_core_servers-setup.c +++ /dev/null @@ -1,72 +0,0 @@ ---- src/core/servers-setup.c.orig 2019-08-29 13:48:46 UTC -+++ src/core/servers-setup.c -@@ -108,6 +108,35 @@ void server_setup_fill_reconn(SERVER_CONNECT_REC *conn - if (sserver->password != NULL && conn->password == NULL) - conn->password = g_strdup(sserver->password); - -+ if (sserver->no_proxy) -+ g_free_and_null(conn->proxy); -+ -+ if (sserver->family != 0 && conn->family == 0) -+ conn->family = sserver->family; -+ if (sserver->address && !conn->address) -+ conn->address = g_strdup(sserver->address); -+ if (sserver->port > 0 && conn->port <= 0) -+ conn->port = sserver->port; -+ -+ conn->use_tls = sserver->use_tls; -+ if (conn->tls_cert == NULL && sserver->tls_cert != NULL && sserver->tls_cert[0] != '\0') -+ conn->tls_cert = g_strdup(sserver->tls_cert); -+ if (conn->tls_pkey == NULL && sserver->tls_pkey != NULL && sserver->tls_pkey[0] != '\0') -+ conn->tls_pkey = g_strdup(sserver->tls_pkey); -+ if (conn->tls_pass == NULL && sserver->tls_pass != NULL && sserver->tls_pass[0] != '\0') -+ conn->tls_pass = g_strdup(sserver->tls_pass); -+ conn->tls_verify = sserver->tls_verify; -+ if (conn->tls_cafile == NULL && sserver->tls_cafile != NULL && sserver->tls_cafile[0] != '\0') -+ conn->tls_cafile = g_strdup(sserver->tls_cafile); -+ if (conn->tls_capath == NULL && sserver->tls_capath != NULL && sserver->tls_capath[0] != '\0') -+ conn->tls_capath = g_strdup(sserver->tls_capath); -+ if (conn->tls_ciphers == NULL && sserver->tls_ciphers != NULL && sserver->tls_ciphers[0] != '\0') -+ conn->tls_ciphers = g_strdup(sserver->tls_ciphers); -+ if (conn->tls_pinned_cert == NULL && sserver->tls_pinned_cert != NULL && sserver->tls_pinned_cert[0] != '\0') -+ conn->tls_pinned_cert = g_strdup(sserver->tls_pinned_cert); -+ if (conn->tls_pinned_pubkey == NULL && sserver->tls_pinned_pubkey != NULL && sserver->tls_pinned_pubkey[0] != '\0') -+ conn->tls_pinned_pubkey = g_strdup(sserver->tls_pinned_pubkey); -+ - signal_emit("server setup fill reconn", 2, conn, sserver); - } - -@@ -158,33 +187,6 @@ static void server_setup_fill_server(SERVER_CONNECT_RE - g_return_if_fail(IS_SERVER_SETUP(sserver)); - - sserver->last_connect = time(NULL); -- -- if (sserver->no_proxy) -- g_free_and_null(conn->proxy); -- -- if (sserver->family != 0 && conn->family == 0) -- conn->family = sserver->family; -- if (sserver->port > 0 && conn->port <= 0) -- conn->port = sserver->port; -- -- conn->use_tls = sserver->use_tls; -- if (conn->tls_cert == NULL && sserver->tls_cert != NULL && sserver->tls_cert[0] != '\0') -- conn->tls_cert = g_strdup(sserver->tls_cert); -- if (conn->tls_pkey == NULL && sserver->tls_pkey != NULL && sserver->tls_pkey[0] != '\0') -- conn->tls_pkey = g_strdup(sserver->tls_pkey); -- if (conn->tls_pass == NULL && sserver->tls_pass != NULL && sserver->tls_pass[0] != '\0') -- conn->tls_pass = g_strdup(sserver->tls_pass); -- conn->tls_verify = sserver->tls_verify; -- if (conn->tls_cafile == NULL && sserver->tls_cafile != NULL && sserver->tls_cafile[0] != '\0') -- conn->tls_cafile = g_strdup(sserver->tls_cafile); -- if (conn->tls_capath == NULL && sserver->tls_capath != NULL && sserver->tls_capath[0] != '\0') -- conn->tls_capath = g_strdup(sserver->tls_capath); -- if (conn->tls_ciphers == NULL && sserver->tls_ciphers != NULL && sserver->tls_ciphers[0] != '\0') -- conn->tls_ciphers = g_strdup(sserver->tls_ciphers); -- if (conn->tls_pinned_cert == NULL && sserver->tls_pinned_cert != NULL && sserver->tls_pinned_cert[0] != '\0') -- conn->tls_pinned_cert = g_strdup(sserver->tls_pinned_cert); -- if (conn->tls_pinned_pubkey == NULL && sserver->tls_pinned_pubkey != NULL && sserver->tls_pinned_pubkey[0] != '\0') -- conn->tls_pinned_pubkey = g_strdup(sserver->tls_pinned_pubkey); - - server_setup_fill_reconn(conn, sserver); - diff --git a/irc/irssi/files/patch-src_fe-text_term-terminfo.c b/irc/irssi/files/patch-src_fe-text_term-terminfo.c deleted file mode 100644 index 90a4774c014c..000000000000 --- a/irc/irssi/files/patch-src_fe-text_term-terminfo.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/fe-text/term-terminfo.c.orig 2019-08-29 13:48:46 UTC -+++ src/fe-text/term-terminfo.c -@@ -672,7 +672,11 @@ void term_stop(void) - - static int input_utf8(const unsigned char *buffer, int size, unichar *result) - { -- unichar c = g_utf8_get_char_validated((char *)buffer, size); -+ unichar c = g_utf8_get_char_validated((char *) buffer, size); -+ -+ /* GLib >= 2.63 do not accept Unicode NUL anymore */ -+ if (c == (unichar) -2 && *buffer == 0 && size > 0) -+ c = 0; - - switch (c) { - case (unichar)-1: diff --git a/irc/irssi/pkg-plist b/irc/irssi/pkg-plist index f75a37a79b30..ef16c1f83f8e 100644 --- a/irc/irssi/pkg-plist +++ b/irc/irssi/pkg-plist @@ -132,6 +132,7 @@ include/irssi/src/irc/notifylist/notify-setup.h include/irssi/src/irc/notifylist/notifylist.h include/irssi/src/lib-config/iconfig.h include/irssi/src/lib-config/module.h +@dir lib/irssi/modules %%PROXY%%lib/irssi/modules/libirc_proxy.a %%PROXY%%lib/irssi/modules/libirc_proxy.so %%OTR%%lib/irssi/modules/libotr_core.a From owner-dev-commits-ports-branches@freebsd.org Tue May 25 00:50:51 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 442FD6408EC; Tue, 25 May 2021 00:50:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FpwVg1PB7z3v4V; Tue, 25 May 2021 00:50:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 18793146FC; Tue, 25 May 2021 00:50:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14P0opRL052106; Tue, 25 May 2021 00:50:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14P0opk2052105; Tue, 25 May 2021 00:50:51 GMT (envelope-from git) Date: Tue, 25 May 2021 00:50:51 GMT Message-Id: <202105250050.14P0opk2052105@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: cba0401e7bcc - 2021Q2 - emulators/yuzu: update to s20210524 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: cba0401e7bcc0525229e3bde002fb4a6ccdeb4a5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 May 2021 00:50:51 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=cba0401e7bcc0525229e3bde002fb4a6ccdeb4a5 commit cba0401e7bcc0525229e3bde002fb4a6ccdeb4a5 Author: Jan Beich AuthorDate: 2021-05-24 19:02:37 +0000 Commit: Jan Beich CommitDate: 2021-05-25 00:50:11 +0000 emulators/yuzu: update to s20210524 Changes: https://github.com/yuzu-emu/yuzu/compare/5068279f2...aee3b57c4 (cherry picked from commit 71e737582cc0e704dd21bb75d64012694b872e81) --- emulators/yuzu/Makefile | 4 ++-- emulators/yuzu/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index dd5796e35b58..14871a8fadce 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,6 +1,6 @@ PORTNAME= yuzu -PORTVERSION= s20210520 +PORTVERSION= s20210524 PORTREVISION?= 0 CATEGORIES= emulators @@ -43,7 +43,7 @@ LIB_DEPENDS= liblz4.so:archivers/liblz4 \ USE_GITHUB= yes GH_ACCOUNT= yuzu-emu -GH_TAGNAME= 5068279f2 +GH_TAGNAME= aee3b57c4 GH_TUPLE= yuzu-emu:mbedtls:v2.16.9-115-g8c88150ca:mbedtls/externals/mbedtls \ KhronosGroup:SPIRV-Headers:2c51218:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \ KhronosGroup:Vulkan-Headers:v1.2.145:Vulkan_Headers/externals/Vulkan-Headers \ diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo index e70ac0009e61..da7845686617 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1621579634 -SHA256 (yuzu-emu-yuzu-s20210520-5068279f2_GH0.tar.gz) = 4742e0ab17c3d738a49b1dc64be4f9ccf36c15a525ea3bb0f164efb668c3cae8 -SIZE (yuzu-emu-yuzu-s20210520-5068279f2_GH0.tar.gz) = 3838530 +TIMESTAMP = 1621882957 +SHA256 (yuzu-emu-yuzu-s20210524-aee3b57c4_GH0.tar.gz) = 33a29013ac93c7d265dc7b95e0064e854b07b5549bd942fca2b5f367ecc329d2 +SIZE (yuzu-emu-yuzu-s20210524-aee3b57c4_GH0.tar.gz) = 3837198 SHA256 (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 8cd6d075b4da0ad5fb995eb37390e2e6088be8d41ab1cdfc7e7e4256bd991450 SIZE (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 2679189 SHA256 (KhronosGroup-SPIRV-Headers-2c51218_GH0.tar.gz) = 08f70947b69e17c7e322156adcd471cf02b4b3f63e7baf8ee0f02d32603ac5ff From owner-dev-commits-ports-branches@freebsd.org Tue May 25 00:50:52 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6791C640A6F; Tue, 25 May 2021 00:50:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FpwVh2S1Vz3v9n; Tue, 25 May 2021 00:50:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3AFB9145A8; Tue, 25 May 2021 00:50:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14P0oq7h052127; Tue, 25 May 2021 00:50:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14P0oqxb052126; Tue, 25 May 2021 00:50:52 GMT (envelope-from git) Date: Tue, 25 May 2021 00:50:52 GMT Message-Id: <202105250050.14P0oqxb052126@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: b3655c33d3de - 2021Q2 - graphics/mesa-devel: update to 21.1.b.1818 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: b3655c33d3de70ea767cfe3f1dca0e3317eebcbc Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 May 2021 00:50:52 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=b3655c33d3de70ea767cfe3f1dca0e3317eebcbc commit b3655c33d3de70ea767cfe3f1dca0e3317eebcbc Author: Jan Beich AuthorDate: 2021-05-24 17:41:34 +0000 Commit: Jan Beich CommitDate: 2021-05-25 00:50:12 +0000 graphics/mesa-devel: update to 21.1.b.1818 Changes: https://gitlab.freedesktop.org/mesa/mesa/-/compare/80f0726e4c4...f18c55708a6 (cherry picked from commit 8fda1b0ad57e66c4c88160553ffc11dd914f4d1f) --- graphics/mesa-devel/Makefile | 4 ++-- graphics/mesa-devel/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 53c6daff2a49..c21ce073ec38 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,7 +1,7 @@ PORTNAME= mesa -DISTVERSION= 21.1-branchpoint-1763 -DISTVERSIONSUFFIX= -ga04d0a304ab +DISTVERSION= 21.1-branchpoint-1818 +DISTVERSIONSUFFIX= -gf18c55708a6 CATEGORIES= graphics PKGNAMESUFFIX= -devel diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo index 15dd90e9b69b..97892ff334b9 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1621638837 -SHA256 (mesa3d-mesa-21.1-branchpoint-1763-ga04d0a304ab_GH0.tar.gz) = 10e8bfead72d87d58379687bfc23831956cf0ed4d7c25afc7a5ab8701e959aad -SIZE (mesa3d-mesa-21.1-branchpoint-1763-ga04d0a304ab_GH0.tar.gz) = 23721376 +TIMESTAMP = 1621889677 +SHA256 (mesa3d-mesa-21.1-branchpoint-1818-gf18c55708a6_GH0.tar.gz) = 1c2f9f32fc9f548f345a2dbdf718b30fdab8d9bbf1e265b6de09ff27c2341a72 +SIZE (mesa3d-mesa-21.1-branchpoint-1818-gf18c55708a6_GH0.tar.gz) = 23726038 SHA256 (55822330540d.patch) = fc776fee1d59f743a060ad1f78e1d9eba8826beb1fe7abef1734a407734b6109 SIZE (55822330540d.patch) = 1278 SHA256 (f6c7569ad9ea.patch) = 481784ca37e35549bf265e21eee1b9a29d2b0b8d3294de1d5b6b83a84f3d7a9b From owner-dev-commits-ports-branches@freebsd.org Tue May 25 08:32:45 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 18518647D84; Tue, 25 May 2021 08:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fq6ld02T8z3GG0; Tue, 25 May 2021 08:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DD2A31A6C4; Tue, 25 May 2021 08:32:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14P8WiUm066313; Tue, 25 May 2021 08:32:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14P8WiUx066312; Tue, 25 May 2021 08:32:44 GMT (envelope-from git) Date: Tue, 25 May 2021 08:32:44 GMT Message-Id: <202105250832.14P8WiUx066312@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 6a456af02d7e - 2021Q2 - sysutils/accountsservice: Update to 0.6.55 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 6a456af02d7efda292eb0c52887c1a1964478589 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 May 2021 08:32:45 -0000 The branch 2021Q2 has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=6a456af02d7efda292eb0c52887c1a1964478589 commit 6a456af02d7efda292eb0c52887c1a1964478589 Author: Olivier Duchateau AuthorDate: 2021-05-24 15:38:38 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-05-25 08:31:57 +0000 sysutils/accountsservice: Update to 0.6.55 This update also fixes the userdel functionality. PR: 249445 Reviewed by: 0mp Approved by: maintainer timeout MFH: 2021Q2 Security: 75aae50b-9e3c-11eb-9bc3-8c164582fbac Security: CVE-2018-14036 (cherry picked from commit ffb1311e56725702208e807cfc63c8163c6b4a52) --- sysutils/accountsservice/Makefile | 30 +-- sysutils/accountsservice/distinfo | 6 +- sysutils/accountsservice/files/patch-configure | 21 -- sysutils/accountsservice/files/patch-meson.build | 16 ++ .../files/patch-meson__post__install.py | 13 + sysutils/accountsservice/files/patch-src_daemon.c | 282 ++++++++++++++++++++- .../files/patch-src_libaccountsservice_act-user.c | 11 + .../accountsservice/files/patch-src_meson.build | 13 + sysutils/accountsservice/files/patch-src_user.c | 190 ++++++++++---- sysutils/accountsservice/files/patch-src_user.h | 27 ++ .../accountsservice/files/patch-src_wtmp-helper.h | 10 + sysutils/accountsservice/pkg-descr | 6 +- sysutils/accountsservice/pkg-install | 9 - sysutils/accountsservice/pkg-plist | 51 ++-- 14 files changed, 540 insertions(+), 145 deletions(-) diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile index 86751efc375b..04c8893a3d36 100644 --- a/sysutils/accountsservice/Makefile +++ b/sysutils/accountsservice/Makefile @@ -1,7 +1,7 @@ # Created by: Koop Mast PORTNAME= accountsservice -PORTVERSION= 0.6.42 +PORTVERSION= 0.6.55 CATEGORIES= sysutils devel MASTER_SITES= http://www.freedesktop.org/software/${PORTNAME}/ @@ -11,28 +11,18 @@ COMMENT= D-Bus interface for user account query and manipulation LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ - libpolkit-gobject-1.so:sysutils/polkit +BUILD_DEPENDS= dbus>0:devel/dbus +LIB_DEPENDS= libpolkit-gobject-1.so:sysutils/polkit -USE_GNOME= glib20 intlhack introspection:build libxslt -USES= cpe gettext gmake gnome libtool localbase:ldflags pathfix \ +USE_GNOME= glib20 intltool introspection:build libxslt +USES= cpe gettext gnome localbase:ldflags meson \ pkgconfig tar:xz CPE_VENDOR= ray_stode -GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= --disable-systemd --localstatedir=/var/ -INSTALL_TARGET= install-strip - -# XXX HACK! this file isn't present on the pristine jails of the builders -# and configure breaks without it. Beter solutions welcome. -.if defined(PACKAGE_BUILDING) -CONFIGURE_ENV+= ac_cv_file__var_log_utx_log=yes -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|/etc/gdm/custom.conf|${LOCALBASE}/etc/gdm/custom.conf|g' \ - ${WRKSRC}/src/daemon.c - @${REINPLACE_CMD} -e 's|/lib/AccountsService|/db/AccountsService|g' \ - ${WRKSRC}/src/user.c ${WRKSRC}/src/Makefile.in +MESON_ARGS= -Dsystemdsystemunitdir=no \ + -Dgdmconffile=${LOCALBASE}/etc/gdm/custom.conf \ + -Dsystemd=false \ + -Delogind=false \ + -Dlocalstatedir=/var .include diff --git a/sysutils/accountsservice/distinfo b/sysutils/accountsservice/distinfo index c933d57be71f..71694a1bde05 100644 --- a/sysutils/accountsservice/distinfo +++ b/sysutils/accountsservice/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1468052689 -SHA256 (accountsservice-0.6.42.tar.xz) = e56494c2f18627900b57234e5628923cc16a37bf8fd16b06c46118d6ae9c007e -SIZE (accountsservice-0.6.42.tar.xz) = 380500 +TIMESTAMP = 1600462353 +SHA256 (accountsservice-0.6.55.tar.xz) = ff2b2419a7e06bd9cb335ffe391c7409b49a0f0130b890bd54692a3986699c9b +SIZE (accountsservice-0.6.55.tar.xz) = 97972 diff --git a/sysutils/accountsservice/files/patch-configure b/sysutils/accountsservice/files/patch-configure deleted file mode 100644 index cbf3790afc2b..000000000000 --- a/sysutils/accountsservice/files/patch-configure +++ /dev/null @@ -1,21 +0,0 @@ ---- configure.orig 2014-03-15 15:02:28.000000000 +0100 -+++ configure 2014-03-15 15:03:01.000000000 +0100 -@@ -14527,6 +14527,18 @@ - done - - -+for ac_func in fgetpwent -+do : -+ ac_fn_c_check_func "$LINENO" "fgetpwent" "ac_cv_func_fgetpwent" -+if test "x$ac_cv_func_fgetpwent" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_FGETPWENT 1 -+_ACEOF -+ -+fi -+done -+ -+ - - - diff --git a/sysutils/accountsservice/files/patch-meson.build b/sysutils/accountsservice/files/patch-meson.build new file mode 100644 index 000000000000..13ecb2d1e712 --- /dev/null +++ b/sysutils/accountsservice/files/patch-meson.build @@ -0,0 +1,16 @@ +--- meson.build.orig 2018-09-29 12:54:53 UTC ++++ meson.build +@@ -82,8 +82,11 @@ if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', p + elif cc.has_header_symbol('paths.h', '_PATH_WTMPX') + config_h.set('PATH_WTMP', '_PATH_WTMPX') + else +- assert(run_command('test', '-e', '/var/log/utx.log').returncode() == 0, 'Do not know which filename to watch for wtmp changes') +- config_h.set_quoted('PATH_WTMP', '/var/log/utx.log') ++ # Ugly hack for jails builders! ++ _system = host_machine.system().to_lower() ++ if _system.contains('freebsd') ++ config_h.set_quoted('PATH_WTMP', '/var/log/utx.log') ++ endif + endif + + # compiler flags diff --git a/sysutils/accountsservice/files/patch-meson__post__install.py b/sysutils/accountsservice/files/patch-meson__post__install.py new file mode 100644 index 000000000000..e0d71f5e7c41 --- /dev/null +++ b/sysutils/accountsservice/files/patch-meson__post__install.py @@ -0,0 +1,13 @@ +--- meson_post_install.py.orig 2019-04-23 15:16:09 UTC ++++ meson_post_install.py +@@ -9,8 +9,8 @@ localstatedir = os.path.normpath(destdir + os.sep + sy + # FIXME: meson will not track the creation of these directories + # https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39 + dst_dirs = [ +- (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775), +- (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700), ++ (os.path.join(localstatedir, 'db', 'AccountsService', 'icons'), 0o775), ++ (os.path.join(localstatedir, 'db', 'AccountsService', 'users'), 0o700), + ] + + for (dst_dir, dst_dir_mode) in dst_dirs: diff --git a/sysutils/accountsservice/files/patch-src_daemon.c b/sysutils/accountsservice/files/patch-src_daemon.c index 29226ddd111f..3a7131000a89 100644 --- a/sysutils/accountsservice/files/patch-src_daemon.c +++ b/sysutils/accountsservice/files/patch-src_daemon.c @@ -1,15 +1,227 @@ ---- src/daemon.c.orig 2014-03-23 09:36:37.194365289 +0000 -+++ src/daemon.c 2014-03-23 09:36:39.836364714 +0000 -@@ -48,7 +48,7 @@ - #define PATH_PASSWD "/etc/passwd" - #define PATH_SHADOW "/etc/shadow" - #define PATH_GROUP "/etc/group" --#define PATH_GDM_CUSTOM "/etc/gdm/custom.conf" -+#define PATH_GDM_CUSTOM "/usr/local/etc/gdm/custom.conf" - - enum { - PROP_0, -@@ -892,20 +892,18 @@ +--- src/daemon.c.orig 2018-09-26 13:20:49 UTC ++++ src/daemon.c +@@ -79,7 +79,11 @@ typedef struct { + GHashTable *extension_ifaces; + } DaemonPrivate; + ++#ifdef HAVE_SHADOW_H + typedef struct passwd * (* EntryGeneratorFunc) (Daemon *, GHashTable *, gpointer *, struct spwd **shadow_entry); ++#else ++typedef struct passwd * (* EntryGeneratorFunc) (Daemon *, GHashTable *, gpointer *); ++#endif + + static void daemon_accounts_accounts_iface_init (AccountsAccountsIface *iface); + +@@ -154,17 +158,25 @@ remove_cache_files (const gchar *user_name) + } + + static struct passwd * ++#ifdef HAVE_SHADOW_H + entry_generator_fgetpwent (Daemon *daemon, + GHashTable *users, + gpointer *state, + struct spwd **spent) ++#else ++entry_generator_fgetpwent (Daemon *daemon, ++ GHashTable *users, ++ gpointer *state) ++#endif + { + struct passwd *pwent; + ++#ifdef HAVE_SHADOW_H + struct { + struct spwd spbuf; + char buf[1024]; + } *shadow_entry_buffers; ++#endif + + struct { + FILE *fp; +@@ -175,6 +187,7 @@ entry_generator_fgetpwent (Daemon *daemon, + if (*state == NULL) { + GHashTable *shadow_users = NULL; + FILE *fp; ++#ifdef HAVE_SHADOW_H + struct spwd *shadow_entry; + + fp = fopen (PATH_SHADOW, "r"); +@@ -208,6 +221,7 @@ entry_generator_fgetpwent (Daemon *daemon, + g_clear_pointer (&shadow_users, g_hash_table_unref); + return NULL; + } ++#endif + + fp = fopen (PATH_PASSWD, "r"); + if (fp == NULL) { +@@ -229,12 +243,17 @@ entry_generator_fgetpwent (Daemon *daemon, + if (g_hash_table_size (users) < MAX_LOCAL_USERS) { + pwent = fgetpwent (generator_state->fp); + if (pwent != NULL) { ++#ifdef HAVE_SHADOW_H + shadow_entry_buffers = g_hash_table_lookup (generator_state->users, pwent->pw_name); + + if (shadow_entry_buffers != NULL) { + *spent = &shadow_entry_buffers->spbuf; + } + return pwent; ++#else ++ if (!generator_state->users || g_hash_table_lookup (generator_state->users, pwent->pw_name)) ++ return pwent; ++#endif + } + } + +@@ -248,10 +267,16 @@ entry_generator_fgetpwent (Daemon *daemon, + } + + static struct passwd * ++#ifdef HAVE_SHADOW_H + entry_generator_cachedir (Daemon *daemon, + GHashTable *users, + gpointer *state, + struct spwd **shadow_entry) ++#else ++entry_generator_cachedir (Daemon *daemon, ++ GHashTable *users, ++ gpointer *state) ++#endif + { + struct passwd *pwent; + g_autoptr(GError) error = NULL; +@@ -293,7 +318,9 @@ entry_generator_cachedir (Daemon *daemon, + errno = 0; + pwent = getpwnam (name); + if (pwent != NULL) { ++#ifdef HAVE_SHADOW_H + *shadow_entry = getspnam (pwent->pw_name); ++#endif + + return pwent; + } else if (errno == 0) { +@@ -329,10 +356,16 @@ entry_generator_cachedir (Daemon *daemon, + } + + static struct passwd * ++#ifdef HAVE_SHADOW_H + entry_generator_requested_users (Daemon *daemon, + GHashTable *users, + gpointer *state, + struct spwd **shadow_entry) ++#else ++entry_generator_requested_users (Daemon *daemon, ++ GHashTable *users, ++ gpointer *state) ++#endif + { + DaemonPrivate *priv = daemon_get_instance_private (daemon); + struct passwd *pwent; +@@ -360,7 +393,9 @@ entry_generator_requested_users (Daemon *daemon, + if (pwent == NULL) { + g_debug ("user '%s' requested previously but not present on system", name); + } else { ++#ifdef HAVE_SHADOW_H + *shadow_entry = getspnam (pwent->pw_name); ++#endif + + return pwent; + } +@@ -383,19 +418,29 @@ load_entries (Daemon *daemon, + DaemonPrivate *priv = daemon_get_instance_private (daemon); + gpointer generator_state = NULL; + struct passwd *pwent; ++#ifdef HAVE_SHADOW_H + struct spwd *spent = NULL; ++#endif + User *user = NULL; + + g_assert (entry_generator != NULL); + + for (;;) { ++#ifdef HAVE_SHADOW_H + spent = NULL; + pwent = entry_generator (daemon, users, &generator_state, &spent); ++#else ++ pwent = entry_generator (daemon, users, &generator_state); ++#endif + if (pwent == NULL) + break; + + /* Skip system users... */ ++#ifdef HAVE_SHADOW_H + if (!explicitly_requested && !user_classify_is_human (pwent->pw_uid, pwent->pw_name, pwent->pw_shell, spent? spent->sp_pwdp : NULL)) { ++#else ++ if (!explicitly_requested && !user_classify_is_human (pwent->pw_uid, pwent->pw_name, pwent->pw_shell, NULL)) { ++#endif + g_debug ("skipping user: %s", pwent->pw_name); + continue; + } +@@ -417,7 +462,11 @@ load_entries (Daemon *daemon, + + /* freeze & update users not already in the new list */ + g_object_freeze_notify (G_OBJECT (user)); ++#ifdef HAVE_SHADOW_H + user_update_from_pwent (user, pwent, spent); ++#else ++ user_update_from_pwent (user, pwent); ++#endif + + g_hash_table_insert (users, g_strdup (user_get_user_name (user)), user); + g_debug ("loaded user: %s", user_get_user_name (user)); +@@ -823,15 +872,24 @@ throw_error (GDBusMethodInvocation *context, + } + + static User * ++#ifdef HAVE_SHADOW_H + add_new_user_for_pwent (Daemon *daemon, + struct passwd *pwent, + struct spwd *spent) ++#else ++add_new_user_for_pwent (Daemon *daemon, ++ struct passwd *pwent) ++#endif + { + DaemonPrivate *priv = daemon_get_instance_private (daemon); + User *user; + + user = user_new (daemon, pwent->pw_uid); ++#ifdef HAVE_SHADOW_H + user_update_from_pwent (user, pwent, spent); ++#else ++ user_update_from_pwent (user, pwent); ++#endif + user_register (user); + + g_hash_table_insert (priv->users, +@@ -860,9 +918,13 @@ daemon_local_find_user_by_id (Daemon *daemon, + user = g_hash_table_lookup (priv->users, pwent->pw_name); + + if (user == NULL) { ++#ifdef HAVE_SHADOW_H + struct spwd *spent; + spent = getspnam (pwent->pw_name); + user = add_new_user_for_pwent (daemon, pwent, spent); ++#else ++ user = add_new_user_for_pwent (daemon, pwent); ++#endif + + priv->explicitly_requested_users = g_list_append (priv->explicitly_requested_users, + g_strdup (pwent->pw_name)); +@@ -888,9 +950,13 @@ daemon_local_find_user_by_name (Daemon *daemon, + user = g_hash_table_lookup (priv->users, pwent->pw_name); + + if (user == NULL) { ++#ifdef HAVE_SHADOW_H + struct spwd *spent; + spent = getspnam (pwent->pw_name); + user = add_new_user_for_pwent (daemon, pwent, spent); ++#else ++ user = add_new_user_for_pwent (daemon, pwent); ++#endif + + priv->explicitly_requested_users = g_list_append (priv->explicitly_requested_users, + g_strdup (pwent->pw_name)); +@@ -1095,10 +1161,12 @@ daemon_create_user_authorized_cb (Daemon sys_log (context, "create user '%s'", cd->user_name); @@ -24,12 +236,18 @@ + argv[4] = "-c"; + argv[5] = cd->real_name; if (cd->account_type == ACCOUNT_TYPE_ADMINISTRATOR) { + if (EXTRA_ADMIN_GROUPS != NULL && EXTRA_ADMIN_GROUPS[0] != '\0') + admin_groups = g_strconcat (ADMIN_GROUP, ",", +@@ -1106,15 +1174,11 @@ daemon_create_user_authorized_cb (Daemon + else + admin_groups = g_strdup (ADMIN_GROUP); + - argv[4] = "-G"; -- argv[5] = ADMIN_GROUP; +- argv[5] = admin_groups; - argv[6] = "--"; - argv[7] = cd->user_name; + argv[6] = "-G"; -+ argv[7] = ADMIN_GROUP; ++ argv[7] = admin_groups; argv[8] = NULL; } else if (cd->account_type == ACCOUNT_TYPE_STANDARD) { @@ -38,3 +256,39 @@ argv[6] = NULL; } else { +@@ -1281,7 +1345,7 @@ daemon_delete_user_authorized_cb (Daemon + DeleteUserData *ud = data; + g_autoptr(GError) error = NULL; + struct passwd *pwent; +- const gchar *argv[6]; ++ const gchar *argv[5]; + User *user; + + pwent = getpwuid (ud->uid); +@@ -1307,19 +1371,16 @@ daemon_delete_user_authorized_cb (Daemon + + user_set_saved (user, FALSE); + +- argv[0] = "/usr/sbin/userdel"; ++ argv[0] = "/usr/sbin/pw"; ++ argv[1] = "userdel"; + if (ud->remove_files) { +- argv[1] = "-f"; +- argv[2] = "-r"; +- argv[3] = "--"; +- argv[4] = pwent->pw_name; +- argv[5] = NULL; ++ argv[2] = pwent->pw_name; ++ argv[3] = "-r"; ++ argv[4] = NULL; + } + else { +- argv[1] = "-f"; +- argv[2] = "--"; +- argv[3] = pwent->pw_name; +- argv[4] = NULL; ++ argv[2] = pwent->pw_name; ++ argv[3] = NULL; + } + + if (!spawn_with_login_uid (context, argv, &error)) { diff --git a/sysutils/accountsservice/files/patch-src_libaccountsservice_act-user.c b/sysutils/accountsservice/files/patch-src_libaccountsservice_act-user.c new file mode 100644 index 000000000000..f8b4dfae0ce7 --- /dev/null +++ b/sysutils/accountsservice/files/patch-src_libaccountsservice_act-user.c @@ -0,0 +1,11 @@ +--- src/libaccountsservice/act-user.c.orig 2018-04-04 13:59:42 UTC ++++ src/libaccountsservice/act-user.c +@@ -26,8 +26,6 @@ + #include + #include + +-#include +- + #include + #include + #include diff --git a/sysutils/accountsservice/files/patch-src_meson.build b/sysutils/accountsservice/files/patch-src_meson.build new file mode 100644 index 000000000000..9687666febae --- /dev/null +++ b/sysutils/accountsservice/files/patch-src_meson.build @@ -0,0 +1,13 @@ +--- src/meson.build.orig 2018-09-29 12:54:53 UTC ++++ src/meson.build +@@ -26,8 +26,8 @@ deps = [ + cflags = [ + '-DLOCALSTATEDIR="@0@"'.format(act_localstatedir), + '-DDATADIR="@0@"'.format(act_datadir), +- '-DICONDIR="@0@"'.format(join_paths(act_localstatedir, 'lib', 'AccountsService', 'icons')), +- '-DUSERDIR="@0@"'.format(join_paths(act_localstatedir, 'lib', 'AccountsService', 'users')), ++ '-DICONDIR="@0@"'.format(join_paths(act_localstatedir, 'db', 'AccountsService', 'icons')), ++ '-DUSERDIR="@0@"'.format(join_paths(act_localstatedir, 'db', 'AccountsService', 'users')), + ] + + libaccounts_generated = static_library( diff --git a/sysutils/accountsservice/files/patch-src_user.c b/sysutils/accountsservice/files/patch-src_user.c index 9a5dd9a588af..bf8b2708e969 100644 --- a/sysutils/accountsservice/files/patch-src_user.c +++ b/sysutils/accountsservice/files/patch-src_user.c @@ -1,93 +1,155 @@ ---- src/user.c.orig 2014-03-15 15:16:49.000000000 +0100 -+++ src/user.c 2014-03-15 15:31:57.000000000 +0100 -@@ -873,11 +873,11 @@ - "change real name of user '%s' (%d) to '%s'", - user->user_name, user->uid, name); +--- src/user.c.orig 2018-04-20 20:52:07 UTC ++++ src/user.c +@@ -138,9 +138,14 @@ user_reset_icon_file (User *user) + } + + void ++#ifdef HAVE_SHADOW_H + user_update_from_pwent (User *user, + struct passwd *pwent, + struct spwd *spent) ++#else ++user_update_from_pwent (User *user, ++ struct passwd *pwent) ++#endif + { + g_autofree gchar *real_name = NULL; + gboolean is_system_account; +@@ -199,8 +204,10 @@ user_update_from_pwent (User *user, + accounts_user_set_shell (ACCOUNTS_USER (user), pwent->pw_shell); + + passwd = NULL; ++#ifdef HAVE_SHADOW_H + if (spent) + passwd = spent->sp_pwdp; ++#endif + + if (passwd && passwd[0] == '!') { + locked = TRUE; +@@ -218,6 +225,7 @@ user_update_from_pwent (User *user, + mode = PASSWORD_MODE_NONE; + } + ++#ifdef HAVE_SHADOW_H + if (spent) { + if (spent->sp_lstchg == 0) { + mode = PASSWORD_MODE_SET_AT_LOGIN; +@@ -231,6 +239,9 @@ user_update_from_pwent (User *user, + user->days_after_expiration_until_lock = spent->sp_inact; + user->account_expiration_policy_known = TRUE; + } ++#else ++ user->expiration_time = pwent->pw_expire; ++#endif + + accounts_user_set_password_mode (ACCOUNTS_USER (user), mode); + is_system_account = !user_classify_is_human (accounts_user_get_uid (ACCOUNTS_USER (user)), +@@ -813,11 +824,11 @@ user_change_real_name_authorized_cb (Daemon + accounts_user_get_uid (ACCOUNTS_USER (user)), + name); - argv[0] = "/usr/sbin/usermod"; - argv[1] = "-c"; - argv[2] = name; - argv[3] = "--"; -- argv[4] = user->user_name; +- argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user)); + argv[0] = "/usr/sbin/pw"; + argv[1] = "usermod"; -+ argv[2] = user->user_name; ++ argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user)); + argv[3] = "-c"; + argv[4] = name; argv[5] = NULL; - error = NULL; -@@ -947,11 +947,11 @@ - "change name of user '%s' (%d) to '%s'", - old_name, user->uid, name); + if (!spawn_with_login_uid (context, argv, &error)) { +@@ -882,11 +893,11 @@ user_change_user_name_authorized_cb (Daemon + accounts_user_get_uid (ACCOUNTS_USER (user)), + name); - argv[0] = "/usr/sbin/usermod"; - argv[1] = "-l"; - argv[2] = name; - argv[3] = "--"; -- argv[4] = user->user_name; +- argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user)); + argv[0] = "/usr/sbin/pw"; + argv[1] = "usermod"; -+ argv[2] = user->user_name; ++ argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user)); + argv[3] = "-n"; + argv[4] = name; argv[5] = NULL; - error = NULL; -@@ -1229,13 +1229,12 @@ - "change home directory of user '%s' (%d) to '%s'", - user->user_name, user->uid, home_dir); + if (!spawn_with_login_uid (context, argv, &error)) { +@@ -1183,7 +1194,7 @@ user_change_home_dir_authorized_cb (Daemon + { + gchar *home_dir = data; + g_autoptr(GError) error = NULL; +- const gchar *argv[7]; ++ const gchar *argv[6]; + + if (g_strcmp0 (accounts_user_get_home_directory (ACCOUNTS_USER (user)), home_dir) != 0) { + sys_log (context, +@@ -1192,13 +1203,12 @@ user_change_home_dir_authorized_cb (Daemon + accounts_user_get_uid (ACCOUNTS_USER (user)), + home_dir); - argv[0] = "/usr/sbin/usermod"; - argv[1] = "-m"; - argv[2] = "-d"; - argv[3] = home_dir; - argv[4] = "--"; -- argv[5] = user->user_name; +- argv[5] = accounts_user_get_user_name (ACCOUNTS_USER (user)); - argv[6] = NULL; + argv[0] = "/usr/sbin/pw"; + argv[1] = "-d"; + argv[2] = home_dir; + argv[3] = "-n"; -+ argv[4] = user->user_name; ++ argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user)); + argv[5] = NULL; - error = NULL; if (!spawn_with_login_uid (context, argv, &error)) { -@@ -1291,11 +1290,11 @@ - "change shell of user '%s' (%d) to '%s'", - user->user_name, user->uid, shell); + throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message); +@@ -1249,11 +1259,11 @@ user_change_shell_authorized_cb (Daemon + accounts_user_get_uid (ACCOUNTS_USER (user)), + shell); - argv[0] = "/usr/sbin/usermod"; - argv[1] = "-s"; - argv[2] = shell; - argv[3] = "--"; -- argv[4] = user->user_name; +- argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user)); + argv[0] = "/usr/sbin/pw"; + argv[1] = "usermod"; -+ argv[2] = user->user_name; ++ argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user)); + argv[3] = "-s"; + argv[4] = shell; argv[5] = NULL; - error = NULL; -@@ -1551,11 +1550,10 @@ + if (!spawn_with_login_uid (context, argv, &error)) { +@@ -1456,7 +1466,7 @@ user_change_locked_authorized_cb (Daemon + { + gboolean locked = GPOINTER_TO_INT (data); + g_autoptr(GError) error = NULL; +- const gchar *argv[5]; ++ const gchar *argv[4]; + + if (accounts_user_get_locked (ACCOUNTS_USER (user)) != locked) { sys_log (context, - "%s account of user '%s' (%d)", - locked ? "locking" : "unlocking", user->user_name, user->uid); +@@ -1464,11 +1474,10 @@ user_change_locked_authorized_cb (Daemon + locked ? "locking" : "unlocking", + accounts_user_get_user_name (ACCOUNTS_USER (user)), + accounts_user_get_uid (ACCOUNTS_USER (user))); - argv[0] = "/usr/sbin/usermod"; - argv[1] = locked ? "-L" : "-U"; - argv[2] = "--"; -- argv[3] = user->user_name; +- argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); - argv[4] = NULL; + argv[0] = "/usr/sbin/pw"; + argv[1] = locked ? "lock" : "unlock"; -+ argv[2] = user->user_name; ++ argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user)); + argv[3] = NULL; - error = NULL; if (!spawn_with_login_uid (context, argv, &error)) { -@@ -1664,11 +1662,11 @@ + throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message); +@@ -1589,11 +1598,11 @@ user_change_account_type_authorized_cb (Daemon g_free (groups); @@ -95,29 +157,38 @@ - argv[1] = "-G"; - argv[2] = str->str; - argv[3] = "--"; -- argv[4] = user->user_name; +- argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user)); + argv[0] = "/usr/sbin/pw"; + argv[1] = "usermod"; -+ argv[2] = user->user_name; ++ argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user)); + argv[3] = "-G"; + argv[4] = str->str; argv[5] = NULL; - g_string_free (str, FALSE); -@@ -1735,10 +1733,8 @@ + if (!spawn_with_login_uid (context, argv, &error)) { +@@ -1643,7 +1652,7 @@ user_change_password_mode_authorized_cb (Daemon + { + PasswordMode mode = GPOINTER_TO_INT (data); + g_autoptr(GError) error = NULL; +- const gchar *argv[6]; ++ const gchar *argv[5]; + + if (((PasswordMode) accounts_user_get_password_mode (ACCOUNTS_USER (user))) != mode) { + sys_log (context, +@@ -1658,10 +1667,8 @@ user_change_password_mode_authorized_cb (Daemon mode == PASSWORD_MODE_NONE) { argv[0] = "/usr/bin/passwd"; - argv[1] = "-d"; - argv[2] = "--"; -- argv[3] = user->user_name; +- argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); - argv[4] = NULL; -+ argv[1] = user->user_name; ++ argv[1] = accounts_user_get_user_name (ACCOUNTS_USER (user)); + argv[2] = NULL; - error = NULL; if (!spawn_with_login_uid (context, argv, &error)) { -@@ -1748,12 +1744,11 @@ + throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message); +@@ -1669,12 +1676,11 @@ user_change_password_mode_authorized_cb (Daemon } if (mode == PASSWORD_MODE_SET_AT_LOGIN) { @@ -127,42 +198,51 @@ + argv[1] = "-e"; argv[2] = "0"; - argv[3] = "--"; -- argv[4] = user->user_name; +- argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user)); - argv[5] = NULL; -+ argv[3] = user->user_name; ++ argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); + argv[4] = NULL; - error = NULL; if (!spawn_with_login_uid (context, argv, &error)) { -@@ -1777,11 +1772,10 @@ - } + throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message); +@@ -1690,11 +1696,10 @@ user_change_password_mode_authorized_cb (Daemon + accounts_user_set_locked (ACCOUNTS_USER (user), FALSE); } - else if (user->locked) { + else if (accounts_user_get_locked (ACCOUNTS_USER (user))) { - argv[0] = "/usr/sbin/usermod"; - argv[1] = "-U"; - argv[2] = "--"; -- argv[3] = user->user_name; +- argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); - argv[4] = NULL; + argv[0] = "/usr/sbin/pw"; + argv[1] = "unlock"; -+ argv[2] = user->user_name; ++ argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user)); + argv[3] = NULL; - error = NULL; if (!spawn_with_login_uid (context, argv, &error)) { -@@ -1852,12 +1846,11 @@ + throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message); +@@ -1759,7 +1764,7 @@ user_change_password_authorized_cb (Daemon + { + gchar **strings = data; + g_autoptr(GError) error = NULL; +- const gchar *argv[6]; ++ const gchar *argv[5]; + + sys_log (context, + "set password and hint of user '%s' (%d)", +@@ -1768,12 +1773,11 @@ user_change_password_authorized_cb (Daemon g_object_freeze_notify (G_OBJECT (user)); - argv[0] = "/usr/sbin/usermod"; -+ argv[0] = "/usr/bin/chpass"; ++ argv[0] = "/usr/sbin/chpass"; argv[1] = "-p"; argv[2] = strings[0]; - argv[3] = "--"; -- argv[4] = user->user_name; +- argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user)); - argv[5] = NULL; -+ argv[3] = user->user_name; ++ argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); + argv[4] = NULL; - error = NULL; if (!spawn_with_login_uid (context, argv, &error)) { + throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message); diff --git a/sysutils/accountsservice/files/patch-src_user.h b/sysutils/accountsservice/files/patch-src_user.h new file mode 100644 index 000000000000..fa8454f7518c --- /dev/null +++ b/sysutils/accountsservice/files/patch-src_user.h @@ -0,0 +1,27 @@ +--- src/user.h.orig 2016-09-06 17:31:50 UTC ++++ src/user.h +@@ -22,7 +22,9 @@ + + #include + #include ++#ifdef HAVE_SHADOW_H + #include ++#endif + + #include + #include +@@ -54,9 +56,14 @@ GType user_get_type (void) G_G + User * user_new (Daemon *daemon, + uid_t uid); + ++#ifdef HAVE_SHADOW_H + void user_update_from_pwent (User *user, + struct passwd *pwent, + struct spwd *spent); ++#else ++void user_update_from_pwent (User *user, ++ struct passwd *pwent); ++#endif + void user_update_from_keyfile (User *user, + GKeyFile *keyfile); + void user_update_local_account_property (User *user, diff --git a/sysutils/accountsservice/files/patch-src_wtmp-helper.h b/sysutils/accountsservice/files/patch-src_wtmp-helper.h new file mode 100644 index 000000000000..ab14253510ac --- /dev/null +++ b/sysutils/accountsservice/files/patch-src_wtmp-helper.h @@ -0,0 +1,10 @@ +--- src/wtmp-helper.h.orig 2016-09-06 19:48:50 UTC ++++ src/wtmp-helper.h +@@ -23,7 +23,6 @@ + + #include + #include +-#include + + const gchar * wtmp_helper_get_path_for_monitor (void); + void wtmp_helper_update_login_frequencies (GHashTable *users); diff --git a/sysutils/accountsservice/pkg-descr b/sysutils/accountsservice/pkg-descr index afd9fd7e3dac..f18aadd89c52 100644 --- a/sysutils/accountsservice/pkg-descr +++ b/sysutils/accountsservice/pkg-descr @@ -3,7 +3,7 @@ The AccountsService project provides o A set of D-Bus interfaces for querying and manipulating user account information. - o An implementation of these interfaces based on the usermod(8), - useradd(8) and userdel(8) commands. + o An implementation of these interfaces based on the pw(8) + command. -WWW: https://cgit.freedesktop.org/accountsservice/ +WWW: https://gitlab.freedesktop.org/accountsservice/accountsservice diff --git a/sysutils/accountsservice/pkg-install b/sysutils/accountsservice/pkg-install deleted file mode 100644 index 65319d21350f..000000000000 --- a/sysutils/accountsservice/pkg-install +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -case $2 in -POST-INSTALL) - /bin/mkdir -p /var/db/AccountsService/users/ - /bin/mkdir -p /var/db/AccountsService/icons/ - exit 0 - ;; -esac diff --git a/sysutils/accountsservice/pkg-plist b/sysutils/accountsservice/pkg-plist index cb362dad0f43..c9b64a57e942 100644 --- a/sysutils/accountsservice/pkg-plist +++ b/sysutils/accountsservice/pkg-plist @@ -4,7 +4,6 @@ include/accountsservice-1.0/act/act-user-manager.h include/accountsservice-1.0/act/act-user.h include/accountsservice-1.0/act/act.h lib/girepository-1.0/AccountsService-1.0.typelib -lib/libaccountsservice.a lib/libaccountsservice.so lib/libaccountsservice.so.0 lib/libaccountsservice.so.0.0.0 @@ -14,40 +13,38 @@ share/dbus-1/interfaces/org.freedesktop.Accounts.User.xml share/dbus-1/interfaces/org.freedesktop.Accounts.xml share/dbus-1/system-services/org.freedesktop.Accounts.service share/gir-1.0/AccountsService-1.0.gir -share/gtk-doc/html/libaccountsservice/ActUser.html -share/gtk-doc/html/libaccountsservice/ActUserManager.html -share/gtk-doc/html/libaccountsservice/annotation-glossary.html -share/gtk-doc/html/libaccountsservice/api-index-full.html -share/gtk-doc/html/libaccountsservice/ch01.html -share/gtk-doc/html/libaccountsservice/home.png -share/gtk-doc/html/libaccountsservice/index.html -share/gtk-doc/html/libaccountsservice/left-insensitive.png -share/gtk-doc/html/libaccountsservice/left.png -share/gtk-doc/html/libaccountsservice/libaccountsservice.devhelp2 -share/gtk-doc/html/libaccountsservice/right-insensitive.png -share/gtk-doc/html/libaccountsservice/right.png -share/gtk-doc/html/libaccountsservice/style.css -share/gtk-doc/html/libaccountsservice/up-insensitive.png -share/gtk-doc/html/libaccountsservice/up.png +share/locale/af/LC_MESSAGES/accounts-service.mo share/locale/ar/LC_MESSAGES/accounts-service.mo -share/locale/bg_BG/LC_MESSAGES/accounts-service.mo +share/locale/as/LC_MESSAGES/accounts-service.mo +share/locale/ast/LC_MESSAGES/accounts-service.mo +share/locale/az/LC_MESSAGES/accounts-service.mo +share/locale/be/LC_MESSAGES/accounts-service.mo +share/locale/bg/LC_MESSAGES/accounts-service.mo share/locale/bn_IN/LC_MESSAGES/accounts-service.mo share/locale/ca/LC_MESSAGES/accounts-service.mo share/locale/ca@valencia/LC_MESSAGES/accounts-service.mo share/locale/cs/LC_MESSAGES/accounts-service.mo +share/locale/cy/LC_MESSAGES/accounts-service.mo share/locale/da/LC_MESSAGES/accounts-service.mo share/locale/de/LC_MESSAGES/accounts-service.mo share/locale/el/LC_MESSAGES/accounts-service.mo +share/locale/en/LC_MESSAGES/accounts-service.mo share/locale/en_GB/LC_MESSAGES/accounts-service.mo share/locale/eo/LC_MESSAGES/accounts-service.mo share/locale/es/LC_MESSAGES/accounts-service.mo -share/locale/fa_IR/LC_MESSAGES/accounts-service.mo +share/locale/et/LC_MESSAGES/accounts-service.mo +share/locale/eu/LC_MESSAGES/accounts-service.mo +share/locale/fa/LC_MESSAGES/accounts-service.mo share/locale/fi/LC_MESSAGES/accounts-service.mo +share/locale/fo/LC_MESSAGES/accounts-service.mo share/locale/fr/LC_MESSAGES/accounts-service.mo +share/locale/fur/LC_MESSAGES/accounts-service.mo share/locale/ga/LC_MESSAGES/accounts-service.mo share/locale/gl/LC_MESSAGES/accounts-service.mo +share/locale/gu/LC_MESSAGES/accounts-service.mo share/locale/he/LC_MESSAGES/accounts-service.mo share/locale/hi/LC_MESSAGES/accounts-service.mo +share/locale/hr/LC_MESSAGES/accounts-service.mo share/locale/hu/LC_MESSAGES/accounts-service.mo share/locale/ia/LC_MESSAGES/accounts-service.mo share/locale/id/LC_MESSAGES/accounts-service.mo @@ -55,28 +52,42 @@ share/locale/it/LC_MESSAGES/accounts-service.mo share/locale/ja/LC_MESSAGES/accounts-service.mo share/locale/ka/LC_MESSAGES/accounts-service.mo share/locale/kk/LC_MESSAGES/accounts-service.mo +share/locale/kn/LC_MESSAGES/accounts-service.mo share/locale/ko/LC_MESSAGES/accounts-service.mo +share/locale/ky/LC_MESSAGES/accounts-service.mo share/locale/lt/LC_MESSAGES/accounts-service.mo share/locale/lv/LC_MESSAGES/accounts-service.mo +share/locale/ml/LC_MESSAGES/accounts-service.mo +share/locale/mr/LC_MESSAGES/accounts-service.mo +share/locale/ms/LC_MESSAGES/accounts-service.mo +share/locale/nb/LC_MESSAGES/accounts-service.mo share/locale/nl/LC_MESSAGES/accounts-service.mo +share/locale/nn/LC_MESSAGES/accounts-service.mo +share/locale/oc/LC_MESSAGES/accounts-service.mo +share/locale/or/LC_MESSAGES/accounts-service.mo share/locale/pa/LC_MESSAGES/accounts-service.mo share/locale/pl/LC_MESSAGES/accounts-service.mo +share/locale/pt/LC_MESSAGES/accounts-service.mo share/locale/pt_BR/LC_MESSAGES/accounts-service.mo share/locale/ro/LC_MESSAGES/accounts-service.mo share/locale/ru/LC_MESSAGES/accounts-service.mo share/locale/sk/LC_MESSAGES/accounts-service.mo *** 21 LINES SKIPPED *** From owner-dev-commits-ports-branches@freebsd.org Tue May 25 08:42:35 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 49B0B647BAF; Tue, 25 May 2021 08:42:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fq6yz1ZcBz3JZS; Tue, 25 May 2021 08:42:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1EDD51ABED; Tue, 25 May 2021 08:42:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14P8gZeA079795; Tue, 25 May 2021 08:42:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14P8gZN0079794; Tue, 25 May 2021 08:42:35 GMT (envelope-from git) Date: Tue, 25 May 2021 08:42:35 GMT Message-Id: <202105250842.14P8gZN0079794@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 3b0f68ffad72 - 2021Q2 - www/firefox: update to 89.0 (rc1) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 3b0f68ffad729f34b9ef06e513e66f1854ee5fd3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 May 2021 08:42:35 -0000 The branch 2021Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=3b0f68ffad729f34b9ef06e513e66f1854ee5fd3 commit 3b0f68ffad729f34b9ef06e513e66f1854ee5fd3 Author: Christoph Moench-Tegeder AuthorDate: 2021-05-25 08:40:34 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2021-05-25 08:42:11 +0000 www/firefox: update to 89.0 (rc1) Release Notes (soon): https://www.mozilla.org/en-US/firefox/89.0/releasenotes/ (cherry picked from commit dcfa581a83553181ba72f0cb97e35504a81cbef8) --- www/firefox/Makefile | 7 ++-- www/firefox/distinfo | 6 +-- www/firefox/files/patch-bug1686713 | 76 -------------------------------------- 3 files changed, 6 insertions(+), 83 deletions(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 24083f259305..85b7ab212bbc 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,8 +1,7 @@ # Created by: Alan Eldridge PORTNAME= firefox -DISTVERSION= 88.0.1 -PORTREVISION= 1 +DISTVERSION= 89.0 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ @@ -13,10 +12,10 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.26:devel/nspr \ - nss>=3.63:security/nss \ + nss>=3.64:security/nss \ icu>=67.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ - harfbuzz>=2.7.4:print/harfbuzz \ + harfbuzz>=2.8.0:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.37:graphics/png \ libvpx>=1.8.2:multimedia/libvpx \ diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 0c892d9d8dd6..524e7a2c2f81 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1620159548 -SHA256 (firefox-88.0.1.source.tar.xz) = 83df1eae0e28fe99661fd5d39d705cdab2e108b4a24ce12c2db6183c632804cc -SIZE (firefox-88.0.1.source.tar.xz) = 376465316 +TIMESTAMP = 1621929239 +SHA256 (firefox-89.0.source.tar.xz) = 926584209afc12920bf24f8d28e1e186c8ef9bd245376d18a89356f94aadd279 +SIZE (firefox-89.0.source.tar.xz) = 372248708 diff --git a/www/firefox/files/patch-bug1686713 b/www/firefox/files/patch-bug1686713 deleted file mode 100644 index f4e1eb4c0a98..000000000000 --- a/www/firefox/files/patch-bug1686713 +++ /dev/null @@ -1,76 +0,0 @@ -commit 89e72841a8f5 -Author: Greg V -Date: Thu Jan 14 22:16:53 2021 +0000 - - Bug 1686713 - Fix mozglue/misc/Uptime build on *BSD ---- - mozglue/misc/Uptime.cpp | 28 +++++++++++++++++----------- - 1 file changed, 17 insertions(+), 11 deletions(-) - -diff --git mozglue/misc/Uptime.cpp mozglue/misc/Uptime.cpp -index bded4017ec13..0e953101994d 100644 ---- mozglue/misc/Uptime.cpp -+++ mozglue/misc/Uptime.cpp -@@ -43,9 +43,7 @@ Maybe NowIncludingSuspendMs() { - return Some(clock_gettime_nsec_np(CLOCK_MONOTONIC_RAW) / kNSperMS); - } - --#endif // macOS -- --#if defined(XP_WIN) -+#elif defined(XP_WIN) - - // Number of hundreds of nanoseconds in a millisecond - static constexpr uint64_t kHNSperMS = 10000; -@@ -77,11 +75,23 @@ Maybe NowIncludingSuspendMs() { - pQueryInterruptTime(&interrupt_time); - return Some(interrupt_time / kHNSperMS); - } --#endif // XP_WIN - --#if defined(XP_LINUX) // including Android -+#else -+ - # include - -+# ifdef CLOCK_UPTIME // FreeBSD, OpenBSD -+# define CLOCK_EXCLUDING_SUSPEND CLOCK_UPTIME -+# else -+# define CLOCK_EXCLUDING_SUSPEND CLOCK_MONOTONIC -+# endif -+ -+# ifdef CLOCK_BOOTTIME // Linux (including Android), OpenBSD (== MONOTONIC) -+# define CLOCK_INCLUDING_SUSPEND CLOCK_BOOTTIME -+# else -+# define CLOCK_INCLUDING_SUSPEND CLOCK_MONOTONIC -+# endif -+ - // Number of nanoseconds in a millisecond. - static constexpr uint64_t kNSperMS = 1000000; - -@@ -92,23 +102,19 @@ uint64_t TimespecToMilliseconds(struct timespec aTs) { - Maybe NowExcludingSuspendMs() { - struct timespec ts = {0}; - -- if (clock_gettime(CLOCK_MONOTONIC, &ts)) { -+ if (clock_gettime(CLOCK_EXCLUDING_SUSPEND, &ts)) { - return Nothing(); - } - return Some(TimespecToMilliseconds(ts)); - } - - Maybe NowIncludingSuspendMs() { --# ifndef CLOCK_BOOTTIME -- return Nothing(); --# else - struct timespec ts = {0}; - -- if (clock_gettime(CLOCK_BOOTTIME, &ts)) { -+ if (clock_gettime(CLOCK_INCLUDING_SUSPEND, &ts)) { - return Nothing(); - } - return Some(TimespecToMilliseconds(ts)); --# endif - } - - #endif // XP_LINUX From owner-dev-commits-ports-branches@freebsd.org Tue May 25 15:56:27 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 17E1A64FC2C; Tue, 25 May 2021 15:56:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FqJbb08j3z3P0D; Tue, 25 May 2021 15:56:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D409620800; Tue, 25 May 2021 15:56:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14PFuQrG054444; Tue, 25 May 2021 15:56:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14PFuQOY054443; Tue, 25 May 2021 15:56:26 GMT (envelope-from git) Date: Tue, 25 May 2021 15:56:26 GMT Message-Id: <202105251556.14PFuQOY054443@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 9966f49bbdbe - 2021Q2 - www/nginx-devel: security update to 1.21.0. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 9966f49bbdbe496d00ea10fd4d948245868fad79 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 May 2021 15:56:27 -0000 The branch 2021Q2 has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=9966f49bbdbe496d00ea10fd4d948245868fad79 commit 9966f49bbdbe496d00ea10fd4d948245868fad79 Author: Sergey A. Osokin AuthorDate: 2021-05-25 15:49:35 +0000 Commit: Sergey A. Osokin CommitDate: 2021-05-25 15:56:20 +0000 www/nginx-devel: security update to 1.21.0. Security: 0882f019-bd60-11eb-9bdd-8c164567ca3c Security: CVE-2021-23017 *) Security: 1-byte memory overwrite might occur during DNS server response processing if the "resolver" directive was used, allowing an attacker who is able to forge UDP packets from the DNS server to cause worker process crash or, potentially, arbitrary code execution (CVE-2021-23017). *) Feature: variables support in the "proxy_ssl_certificate", "proxy_ssl_certificate_key" "grpc_ssl_certificate", "grpc_ssl_certificate_key", "uwsgi_ssl_certificate", and "uwsgi_ssl_certificate_key" directives. *) Feature: the "max_errors" directive in the mail proxy module. *) Feature: the mail proxy module supports POP3 and IMAP pipelining. *) Feature: the "fastopen" parameter of the "listen" directive in the stream module. Thanks to Anbang Wen. *) Bugfix: special characters were not escaped during automatic redirect with appended trailing slash. *) Bugfix: connections with clients in the mail proxy module might be closed unexpectedly when using SMTP pipelining. (cherry picked from commit 07d1217a854d49123e013cb0f485de8b6a04f9a6) --- www/nginx-devel/Makefile | 3 +-- www/nginx-devel/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 829af541fe0e..cfe7b458aa56 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -1,8 +1,7 @@ # Created by: Sergey A. Osokin PORTNAME?= nginx -PORTVERSION= 1.19.9 -PORTREVISION= 1 +PORTVERSION= 1.21.0 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index 2d3fcb73fa6d..8fe34cfa16ff 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1617711524 -SHA256 (nginx-1.19.9.tar.gz) = 2e35dff06a9826e8aca940e9e8be46b7e4b12c19a48d55bfc2dc28fc9cc7d841 -SIZE (nginx-1.19.9.tar.gz) = 1060580 +TIMESTAMP = 1621957259 +SHA256 (nginx-1.21.0.tar.gz) = fe192a4bac2bd3a769e8695cb9fe14a00e57eaceb919095347a83b5b2afc0771 +SIZE (nginx-1.21.0.tar.gz) = 1063682 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208 SHA256 (nginx_mod_h264_streaming-2.2.7.tar.gz) = 6d974ba630cef59de1f60996c66b401264a345d25988a76037c2856cec756c19 From owner-dev-commits-ports-branches@freebsd.org Wed May 26 23:24:28 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 257816485DD; Wed, 26 May 2021 23:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fr6V40LMpz4yMc; Wed, 26 May 2021 23:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DDD4019C8B; Wed, 26 May 2021 23:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14QNOR0h080453; Wed, 26 May 2021 23:24:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14QNORTU080452; Wed, 26 May 2021 23:24:27 GMT (envelope-from git) Date: Wed, 26 May 2021 23:24:27 GMT Message-Id: <202105262324.14QNORTU080452@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Danilo G. Baio" Subject: git: 2c7f2928f3ee - 2021Q2 - net/libzmq4: Update to 4.3.4, Fix security issues MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dbaio X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 2c7f2928f3eeebf2c17a168c5182137faea9b837 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 May 2021 23:24:28 -0000 The branch 2021Q2 has been updated by dbaio: URL: https://cgit.FreeBSD.org/ports/commit/?id=2c7f2928f3eeebf2c17a168c5182137faea9b837 commit 2c7f2928f3eeebf2c17a168c5182137faea9b837 Author: Thomas Petig AuthorDate: 2021-05-25 23:16:19 +0000 Commit: Danilo G. Baio CommitDate: 2021-05-26 00:54:29 +0000 net/libzmq4: Update to 4.3.4, Fix security issues - Patches removed were incorporated upstream. Changelog: https://github.com/zeromq/libzmq/releases/tag/v4.3.2 https://github.com/zeromq/libzmq/releases/tag/v4.3.3 https://github.com/zeromq/libzmq/releases/tag/v4.3.4 PR: 255102 Approved by: koobs (maintainer, implicit) Security: 21ec4428-bdaa-11eb-a04e-641c67a117d8 Security: 6954a2b0-bda8-11eb-a04e-641c67a117d8 Co-authored-by: Danilo G. Baio (cherry picked from commit f3f486e42206887b05bcca9675087b976b8eb27c) --- net/libzmq4/Makefile | 4 +- net/libzmq4/distinfo | 6 +- net/libzmq4/files/patch-PR3358 | 179 ----------------------------- net/libzmq4/files/patch-PR3359 | 45 -------- net/libzmq4/files/patch-tests_testutil.hpp | 11 ++ net/libzmq4/pkg-plist | 5 +- 6 files changed, 19 insertions(+), 231 deletions(-) diff --git a/net/libzmq4/Makefile b/net/libzmq4/Makefile index f40793c8ebba..9ec49a783dab 100644 --- a/net/libzmq4/Makefile +++ b/net/libzmq4/Makefile @@ -1,8 +1,7 @@ PORTNAME= libzmq4 DISTVERSIONPREFIX= v -DISTVERSION= 4.3.1 -PORTREVISION= 1 +DISTVERSION= 4.3.4 CATEGORIES= net MASTER_SITES= https://github.com/zeromq/libzmq/releases/download/${DISTVERSIONFULL}/ DISTNAME= zeromq-${DISTVERSION} @@ -69,7 +68,6 @@ CFLAGS+= -Wno-long-long CONFIGURE_ARGS+= --enable-debug .endif - .if !${PORT_OPTIONS:MSODIUM} && !${PORT_OPTIONS:MTWEETNACL} CONFIGURE_ARGS+= --disable-curve .endif diff --git a/net/libzmq4/distinfo b/net/libzmq4/distinfo index 0835af750f96..6b51cfb6fde1 100644 --- a/net/libzmq4/distinfo +++ b/net/libzmq4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1548985858 -SHA256 (zeromq-4.3.1.tar.gz) = bcbabe1e2c7d0eec4ed612e10b94b112dd5f06fcefa994a0c79a45d835cd21eb -SIZE (zeromq-4.3.1.tar.gz) = 1490122 +TIMESTAMP = 1621855285 +SHA256 (zeromq-4.3.4.tar.gz) = c593001a89f5a85dd2ddf564805deb860e02471171b3f204944857336295c3e5 +SIZE (zeromq-4.3.4.tar.gz) = 2486520 diff --git a/net/libzmq4/files/patch-PR3358 b/net/libzmq4/files/patch-PR3358 deleted file mode 100644 index 6372b6f7a26c..000000000000 --- a/net/libzmq4/files/patch-PR3358 +++ /dev/null @@ -1,179 +0,0 @@ -From 4147957a5eec57ec7a2a416dca74c3c0299a3432 Mon Sep 17 00:00:00 2001 -From: Luca Boccassi -Date: Sun, 13 Jan 2019 13:08:10 +0000 -Subject: [PATCH 1/2] Problem: test_security_zap fails on architectures that - disallow unaligned pointer access - -Solution: use memcpy instead of doing pointer arithmetics with casting -and dereferencing to fix the error on sparc64 ---- - tests/testutil_security.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git tests/testutil_security.hpp tests/testutil_security.hpp -index 90999118c..437bfb298 100644 ---- tests/testutil_security.hpp -+++ tests/testutil_security.hpp -@@ -345,7 +345,7 @@ static int get_monitor_event_internal (void *monitor_, - uint8_t *data = (uint8_t *) zmq_msg_data (&msg); - uint16_t event = *(uint16_t *) (data); - if (value_) -- *value_ = *(uint32_t *) (data + 2); -+ memcpy (value_, data + 2, sizeof (uint32_t)); - - // Second frame in message contains event address - zmq_msg_init (&msg); - -From f64b697095c6d8862bdfd2a159857e915bbf20ee Mon Sep 17 00:00:00 2001 -From: Luca Boccassi -Date: Sun, 13 Jan 2019 14:50:07 +0000 -Subject: [PATCH 2/2] Problem: tests use hard-coded fixed IPC file path - -Solution: use wildcards or random directories to avoid races when -multiple users are running the same test on the same machine ---- - tests/test_pair_ipc.cpp | 9 +++++++-- - tests/test_rebind_ipc.cpp | 13 ++++++++----- - tests/test_reconnect_ivl.cpp | 10 +++++++--- - tests/test_use_fd.cpp | 24 +++++++++++++++++++----- - 4 files changed, 41 insertions(+), 15 deletions(-) - -diff --git tests/test_pair_ipc.cpp tests/test_pair_ipc.cpp -index c9a216dd2..ab4dde350 100644 ---- tests/test_pair_ipc.cpp -+++ tests/test_pair_ipc.cpp -@@ -44,11 +44,16 @@ void tearDown () - - void test_roundtrip () - { -+ char my_endpoint[256]; -+ size_t len = sizeof (my_endpoint); -+ - void *sb = test_context_socket (ZMQ_PAIR); -- TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "ipc:///tmp/test_pair_ipc")); -+ TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "ipc://*")); -+ TEST_ASSERT_SUCCESS_ERRNO ( -+ zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, my_endpoint, &len)); - - void *sc = test_context_socket (ZMQ_PAIR); -- TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, "ipc:///tmp/test_pair_ipc")); -+ TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint)); - - bounce (sb, sc); - -diff --git tests/test_rebind_ipc.cpp tests/test_rebind_ipc.cpp -index 830d18030..784641270 100644 ---- tests/test_rebind_ipc.cpp -+++ tests/test_rebind_ipc.cpp -@@ -42,24 +42,27 @@ void tearDown () - teardown_test_context (); - } - --static const char *SOCKET_ADDR = "ipc:///tmp/test_rebind_ipc"; -- - void test_rebind_ipc () - { -+ char my_endpoint[256]; -+ size_t len = sizeof (my_endpoint); -+ - void *sb0 = test_context_socket (ZMQ_PUSH); - void *sb1 = test_context_socket (ZMQ_PUSH); - -- TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb0, SOCKET_ADDR)); -+ TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb0, "ipc://*")); -+ TEST_ASSERT_SUCCESS_ERRNO ( -+ zmq_getsockopt (sb0, ZMQ_LAST_ENDPOINT, my_endpoint, &len)); - - void *sc = test_context_socket (ZMQ_PULL); -- TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, SOCKET_ADDR)); -+ TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint)); - - send_string_expect_success (sb0, "42", 0); - recv_string_expect_success (sc, "42", 0); - - test_context_socket_close (sb0); - -- TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb1, SOCKET_ADDR)); -+ TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb1, my_endpoint)); - - send_string_expect_success (sb1, "42", 0); - recv_string_expect_success (sc, "42", 0); -diff --git tests/test_reconnect_ivl.cpp tests/test_reconnect_ivl.cpp -index b67b40e5f..6dd0e4cd2 100644 ---- tests/test_reconnect_ivl.cpp -+++ tests/test_reconnect_ivl.cpp -@@ -71,11 +71,15 @@ void test_reconnect_ivl_against_pair_socket (const char *my_endpoint_, - #if !defined(ZMQ_HAVE_WINDOWS) && !defined(ZMQ_HAVE_GNU) - void test_reconnect_ivl_ipc (void) - { -- const char *ipc_endpoint = "ipc:///tmp/test_reconnect_ivl"; -+ char my_endpoint[256]; -+ size_t len = sizeof (my_endpoint); -+ - void *sb = test_context_socket (ZMQ_PAIR); -- TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, ipc_endpoint)); -+ TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "ipc://*")); -+ TEST_ASSERT_SUCCESS_ERRNO ( -+ zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, my_endpoint, &len)); - -- test_reconnect_ivl_against_pair_socket (ipc_endpoint, sb); -+ test_reconnect_ivl_against_pair_socket (my_endpoint, sb); - test_context_socket_close (sb); - } - #endif -diff --git tests/test_use_fd.cpp tests/test_use_fd.cpp -index 67414f5bf..e9852b13d 100644 ---- tests/test_use_fd.cpp -+++ tests/test_use_fd.cpp -@@ -237,24 +237,38 @@ void pre_allocate_sock_ipc_int (void *zmq_socket_, const char *path_) - sizeof (struct sockaddr_un)); - } - -+char ipc_endpoint[16]; -+ - void pre_allocate_sock_ipc (void *sb_, char *my_endpoint_) - { -- pre_allocate_sock_ipc_int (sb_, "/tmp/test_use_fd_ipc"); -- strcpy (my_endpoint_, "ipc:///tmp/test_use_fd_ipc"); -+ strcpy (ipc_endpoint, "tmpXXXXXX"); -+ -+#ifdef HAVE_MKDTEMP -+ TEST_ASSERT_TRUE (mkdtemp (ipc_endpoint)); -+ strcat (ipc_endpoint, "/ipc"); -+#else -+ int fd = mkstemp (ipc_endpoint); -+ TEST_ASSERT_TRUE (fd != -1); -+ close (fd); -+#endif -+ -+ pre_allocate_sock_ipc_int (sb_, ipc_endpoint); -+ strcpy (my_endpoint_, "ipc://"); -+ strcat (my_endpoint_, ipc_endpoint); - } - - void test_req_rep_ipc () - { - test_req_rep (pre_allocate_sock_ipc); - -- TEST_ASSERT_SUCCESS_ERRNO (unlink ("/tmp/test_use_fd_ipc")); -+ TEST_ASSERT_SUCCESS_ERRNO (unlink (ipc_endpoint)); - } - - void test_pair_ipc () - { - test_pair (pre_allocate_sock_ipc); - -- TEST_ASSERT_SUCCESS_ERRNO (unlink ("/tmp/test_use_fd_ipc")); -+ TEST_ASSERT_SUCCESS_ERRNO (unlink (ipc_endpoint)); - } - - void test_client_server_ipc () -@@ -262,7 +276,7 @@ void test_client_server_ipc () - #if defined(ZMQ_SERVER) && defined(ZMQ_CLIENT) - test_client_server (pre_allocate_sock_ipc); - -- TEST_ASSERT_SUCCESS_ERRNO (unlink ("/tmp/test_use_fd_ipc")); -+ TEST_ASSERT_SUCCESS_ERRNO (unlink (ipc_endpoint)); - #endif - } - diff --git a/net/libzmq4/files/patch-PR3359 b/net/libzmq4/files/patch-PR3359 deleted file mode 100644 index 7b30f59dcede..000000000000 --- a/net/libzmq4/files/patch-PR3359 +++ /dev/null @@ -1,45 +0,0 @@ -From d55956574d3b98268ec31045b012029ffc4b1a8c Mon Sep 17 00:00:00 2001 -From: Luca Boccassi -Date: Mon, 14 Jan 2019 00:10:08 +0000 -Subject: [PATCH] Problem: test_rebind_ipc still fails - -Solution: create manually the random IPC file to reuse ---- - tests/test_rebind_ipc.cpp | 20 +++++++++++++++----- - 1 file changed, 15 insertions(+), 5 deletions(-) - -diff --git tests/test_rebind_ipc.cpp tests/test_rebind_ipc.cpp -index 784641270..b14cb81d9 100644 ---- tests/test_rebind_ipc.cpp -+++ tests/test_rebind_ipc.cpp -@@ -44,15 +44,25 @@ void tearDown () - - void test_rebind_ipc () - { -- char my_endpoint[256]; -- size_t len = sizeof (my_endpoint); -+ char my_endpoint[32], random_file[16]; -+ strcpy (random_file, "tmpXXXXXX"); -+ -+#ifdef HAVE_MKDTEMP -+ TEST_ASSERT_TRUE (mkdtemp (random_file)); -+ strcat (random_file, "/ipc"); -+#else -+ int fd = mkstemp (random_file); -+ TEST_ASSERT_TRUE (fd != -1); -+ close (fd); -+#endif -+ -+ strcpy (my_endpoint, "ipc://"); -+ strcat (my_endpoint, random_file); - - void *sb0 = test_context_socket (ZMQ_PUSH); - void *sb1 = test_context_socket (ZMQ_PUSH); - -- TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb0, "ipc://*")); -- TEST_ASSERT_SUCCESS_ERRNO ( -- zmq_getsockopt (sb0, ZMQ_LAST_ENDPOINT, my_endpoint, &len)); -+ TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb0, my_endpoint)); - - void *sc = test_context_socket (ZMQ_PULL); - TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint)); diff --git a/net/libzmq4/files/patch-tests_testutil.hpp b/net/libzmq4/files/patch-tests_testutil.hpp new file mode 100644 index 000000000000..4b303062d057 --- /dev/null +++ b/net/libzmq4/files/patch-tests_testutil.hpp @@ -0,0 +1,11 @@ +--- tests/testutil.hpp.orig 2021-01-03 21:46:02 UTC ++++ tests/testutil.hpp +@@ -45,6 +45,8 @@ + #include + #include + #include ++#include ++#include + #endif + + // This defines the settle time used in tests; raise this if we diff --git a/net/libzmq4/pkg-plist b/net/libzmq4/pkg-plist index af477900c133..1f7a59bcf572 100644 --- a/net/libzmq4/pkg-plist +++ b/net/libzmq4/pkg-plist @@ -2,7 +2,7 @@ include/zmq_utils.h include/zmq.h lib/libzmq.so lib/libzmq.so.5 -lib/libzmq.so.5.2.1 +lib/libzmq.so.5.2.4 libdata/pkgconfig/libzmq.pc %%MANPAGES%%man/man3/zmq_atomic_counter_dec.3.gz %%MANPAGES%%man/man3/zmq_atomic_counter_destroy.3.gz @@ -13,6 +13,7 @@ libdata/pkgconfig/libzmq.pc %%MANPAGES%%man/man3/zmq_bind.3.gz %%MANPAGES%%man/man3/zmq_close.3.gz %%MANPAGES%%man/man3/zmq_connect.3.gz +%%MANPAGES%%man/man3/zmq_connect_peer.3.gz %%MANPAGES%%man/man3/zmq_ctx_get.3.gz %%MANPAGES%%man/man3/zmq_ctx_new.3.gz %%MANPAGES%%man/man3/zmq_ctx_set.3.gz @@ -31,6 +32,7 @@ libdata/pkgconfig/libzmq.pc %%MANPAGES%%man/man3/zmq_msg_get.3.gz %%MANPAGES%%man/man3/zmq_msg_gets.3.gz %%MANPAGES%%man/man3/zmq_msg_init.3.gz +%%MANPAGES%%man/man3/zmq_msg_init_buffer.3.gz %%MANPAGES%%man/man3/zmq_msg_init_data.3.gz %%MANPAGES%%man/man3/zmq_msg_init_size.3.gz %%MANPAGES%%man/man3/zmq_msg_more.3.gz @@ -53,6 +55,7 @@ libdata/pkgconfig/libzmq.pc %%MANPAGES%%man/man3/zmq_setsockopt.3.gz %%MANPAGES%%man/man3/zmq_socket.3.gz %%MANPAGES%%man/man3/zmq_socket_monitor.3.gz +%%MANPAGES%%man/man3/zmq_socket_monitor_versioned.3.gz %%MANPAGES%%man/man3/zmq_strerror.3.gz %%MANPAGES%%man/man3/zmq_timers.3.gz %%MANPAGES%%man/man3/zmq_unbind.3.gz From owner-dev-commits-ports-branches@freebsd.org Thu May 27 00:55:09 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 86ACC64A620; Thu, 27 May 2021 00:55:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fr8Vj3GBzz54w0; Thu, 27 May 2021 00:55:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 526251A8F0; Thu, 27 May 2021 00:55:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14R0t9Bc000288; Thu, 27 May 2021 00:55:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14R0t9Bl000287; Thu, 27 May 2021 00:55:09 GMT (envelope-from git) Date: Thu, 27 May 2021 00:55:09 GMT Message-Id: <202105270055.14R0t9Bl000287@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: ec4bc9831585 - 2021Q2 - graphics/mesa-devel: update to 21.1.b.1978 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: ec4bc98315850c4be73b0b2493c8280e4f8ff6dc Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 May 2021 00:55:09 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=ec4bc98315850c4be73b0b2493c8280e4f8ff6dc commit ec4bc98315850c4be73b0b2493c8280e4f8ff6dc Author: Jan Beich AuthorDate: 2021-05-26 23:32:12 +0000 Commit: Jan Beich CommitDate: 2021-05-27 00:55:02 +0000 graphics/mesa-devel: update to 21.1.b.1978 Changes: https://gitlab.freedesktop.org/mesa/mesa/-/compare/f18c55708a6...8418334efe5 (cherry picked from commit 9f5f45095ca75cbecd11addb195f112f0d929265) --- graphics/mesa-devel/Makefile | 4 ++-- graphics/mesa-devel/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index c21ce073ec38..c9fb02d95c42 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,7 +1,7 @@ PORTNAME= mesa -DISTVERSION= 21.1-branchpoint-1818 -DISTVERSIONSUFFIX= -gf18c55708a6 +DISTVERSION= 21.1-branchpoint-1978 +DISTVERSIONSUFFIX= -g8418334efe5 CATEGORIES= graphics PKGNAMESUFFIX= -devel diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo index 97892ff334b9..e04fa5a44139 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1621889677 -SHA256 (mesa3d-mesa-21.1-branchpoint-1818-gf18c55708a6_GH0.tar.gz) = 1c2f9f32fc9f548f345a2dbdf718b30fdab8d9bbf1e265b6de09ff27c2341a72 -SIZE (mesa3d-mesa-21.1-branchpoint-1818-gf18c55708a6_GH0.tar.gz) = 23726038 +TIMESTAMP = 1622074368 +SHA256 (mesa3d-mesa-21.1-branchpoint-1978-g8418334efe5_GH0.tar.gz) = 9041d57b90fcea3aa39a64a1a3ce6ff784d1adffca789b11e98df3e77b0e05d6 +SIZE (mesa3d-mesa-21.1-branchpoint-1978-g8418334efe5_GH0.tar.gz) = 23719451 SHA256 (55822330540d.patch) = fc776fee1d59f743a060ad1f78e1d9eba8826beb1fe7abef1734a407734b6109 SIZE (55822330540d.patch) = 1278 SHA256 (f6c7569ad9ea.patch) = 481784ca37e35549bf265e21eee1b9a29d2b0b8d3294de1d5b6b83a84f3d7a9b From owner-dev-commits-ports-branches@freebsd.org Thu May 27 03:02:02 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AEE8E630262; Thu, 27 May 2021 03:02:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FrCK64TdXz3PnJ; Thu, 27 May 2021 03:02:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 82AC51C9A7; Thu, 27 May 2021 03:02:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14R3220U072774; Thu, 27 May 2021 03:02:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14R322pD072773; Thu, 27 May 2021 03:02:02 GMT (envelope-from git) Date: Thu, 27 May 2021 03:02:02 GMT Message-Id: <202105270302.14R322pD072773@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 665817a84315 - 2021Q2 - x11/phosh: add missing dependency after 5e9ec28809ec MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 665817a843152eca22d23a3986b72901461cce91 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 May 2021 03:02:02 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=665817a843152eca22d23a3986b72901461cce91 commit 665817a843152eca22d23a3986b72901461cce91 Author: Jan Beich AuthorDate: 2021-05-27 02:22:04 +0000 Commit: Jan Beich CommitDate: 2021-05-27 03:01:56 +0000 x11/phosh: add missing dependency after 5e9ec28809ec (phosh:1234): GLib-GIO-ERROR **: Settings schema 'org.gnome.shell.keybindings' is not installed (cherry picked from commit 0d5f0ec8304d07f7138b5a3972ec72c48d4fd03b) --- x11/phosh/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/x11/phosh/Makefile b/x11/phosh/Makefile index 226c681cfb65..3c5cbabf0412 100644 --- a/x11/phosh/Makefile +++ b/x11/phosh/Makefile @@ -2,6 +2,7 @@ PORTNAME= phosh DISTVERSIONPREFIX= v DISTVERSION= 0.8.1 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= jbeich@FreeBSD.org @@ -19,7 +20,8 @@ LIB_DEPENDS= libfeedback-0.0.so:accessibility/feedbackd \ libupower-glib.so:sysutils/upower \ libhandy-1.so:x11-toolkits/libhandy RUN_DEPENDS= phoc:x11-wm/phoc \ - gnome-session:x11/gnome-session + gnome-session:x11/gnome-session \ + ${LOCALBASE}/share/glib-2.0/schemas/org.gnome.shell.gschema.xml:x11/gnome-shell USES= compiler:c11 gettext gnome meson pkgconfig python:build shebangfix USE_GITLAB= yes From owner-dev-commits-ports-branches@freebsd.org Thu May 27 08:44:27 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9A5A6636747; Thu, 27 May 2021 08:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FrLwC3mzdz4gWL; Thu, 27 May 2021 08:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6A3C8210C5; Thu, 27 May 2021 08:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14R8iRri025552; Thu, 27 May 2021 08:44:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14R8iR5Q025551; Thu, 27 May 2021 08:44:27 GMT (envelope-from git) Date: Thu, 27 May 2021 08:44:27 GMT Message-Id: <202105270844.14R8iR5Q025551@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Juraj Lutter Subject: git: 7fcc60bbc883 - 2021Q2 - sysutils/zrepl: Update to 0.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 7fcc60bbc883dec7a6452fdcaf420111f00c0da6 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 May 2021 08:44:27 -0000 The branch 2021Q2 has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=7fcc60bbc883dec7a6452fdcaf420111f00c0da6 commit 7fcc60bbc883dec7a6452fdcaf420111f00c0da6 Author: Juraj Lutter AuthorDate: 2021-05-25 14:44:06 +0000 Commit: Juraj Lutter CommitDate: 2021-05-27 08:43:46 +0000 sysutils/zrepl: Update to 0.4.0 Differential Revision: https://reviews.freebsd.org/D30453 Approved by: lcook (maintainer) (cherry picked from commit 1d16ddefe2a3b0d5ff889a962f5057cb1fa6b82c) --- sysutils/zrepl/Makefile | 67 +++------------------------ sysutils/zrepl/distinfo | 118 ++---------------------------------------------- 2 files changed, 11 insertions(+), 174 deletions(-) diff --git a/sysutils/zrepl/Makefile b/sysutils/zrepl/Makefile index 77a85de261bb..38ded8f82ac8 100644 --- a/sysutils/zrepl/Makefile +++ b/sysutils/zrepl/Makefile @@ -1,12 +1,11 @@ # Created by: Nikolai Lifanov and Ben Woods PORTNAME= zrepl -PORTVERSION= 0.3.1 DISTVERSIONPREFIX= v -PORTREVISION= 1 +DISTVERSION= 0.4.0 CATEGORIES= sysutils -MAINTAINER= woodsb02@FreeBSD.org +MAINTAINER= lcook@FreeBSD.org COMMENT= ZFS dataset replication tool LICENSE= MIT @@ -14,70 +13,16 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= gmake go:modules USE_RC_SUBR= zrepl + +GO_MODULE= github.com/${PORTNAME}/${PORTNAME} + SUB_FILES= pkg-message -USE_GITHUB= yes -GH_TUPLE= \ - alecthomas:kingpin:v2.2.6:alecthomas_kingpin/vendor/gopkg.in/alecthomas/kingpin.v2 \ - alecthomas:template:fb15b899a751:alecthomas_template/vendor/github.com/alecthomas/template \ - alecthomas:units:c3de453c63f4:alecthomas_units/vendor/github.com/alecthomas/units \ - beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \ - cespare:xxhash:v2.1.0:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \ - davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ - fatih:color:v1.7.0:fatih_color/vendor/github.com/fatih/color \ - ftrvxmtrx:fd:c6d800382fff:ftrvxmtrx_fd/vendor/github.com/ftrvxmtrx/fd \ - gdamore:encoding:v1.0.0:gdamore_encoding/vendor/github.com/gdamore/encoding \ - gdamore:tcell:v1.2.0:gdamore_tcell/vendor/github.com/gdamore/tcell \ - gitchander:permutation:9e56b92e9909:gitchander_permutation/vendor/github.com/gitchander/permutation \ - go-logfmt:logfmt:v0.4.0:go_logfmt_logfmt/vendor/github.com/go-logfmt/logfmt \ - go-sql-driver:mysql:b2c03bcae3d4:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \ - go-yaml:yaml:v2.2.2:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ - golang:appengine:v1.1.0:golang_appengine/vendor/google.golang.org/appengine \ - golang:net:d28f0bde5980:golang_net/vendor/golang.org/x/net \ - golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \ - golang:sync:112230192c58:golang_sync/vendor/golang.org/x/sync \ - golang:sys:33540a1f6037:golang_sys/vendor/golang.org/x/sys \ - golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \ - golang:tools:40960b6deb8e:golang_tools/vendor/golang.org/x/tools \ - google:go-genproto:c66870c02cf8:google_go_genproto/vendor/google.golang.org/genproto \ - google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \ - grpc:grpc-go:v1.17.0:grpc_grpc_go/vendor/google.golang.org/grpc \ - inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \ - jinzhu:copier:db4671f3a9b8:jinzhu_copier/vendor/github.com/jinzhu/copier \ - konsorten:go-windows-terminal-sequences:v1.0.1:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \ - kr:logfmt:b84e30acd515:kr_logfmt/vendor/github.com/kr/logfmt \ - kr:pretty:v0.1.0:kr_pretty/vendor/github.com/kr/pretty \ - kr:text:v0.1.0:kr_text/vendor/github.com/kr/text \ - lib:pq:v1.2.0:lib_pq/vendor/github.com/lib/pq \ - lucasb-eyer:go-colorful:v1.0.2:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \ - mattn:go-colorable:v0.1.4:mattn_go_colorable/vendor/github.com/mattn/go-colorable \ - mattn:go-isatty:v0.0.8:mattn_go_isatty/vendor/github.com/mattn/go-isatty \ - mattn:go-runewidth:v0.0.4:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \ - matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \ - montanaflynn:stats:v0.5.0:montanaflynn_stats/vendor/github.com/montanaflynn/stats \ - pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \ - pkg:profile:v1.2.1:pkg_profile/vendor/github.com/pkg/profile \ - pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \ - problame:go-netssh:26439f9f0dc5:problame_go_netssh/vendor/github.com/problame/go-netssh \ - prometheus:client_golang:v1.2.1:prometheus_client_golang/vendor/github.com/prometheus/client_golang \ - prometheus:client_model:14fe0d1b01d4:prometheus_client_model/vendor/github.com/prometheus/client_model \ - prometheus:common:v0.7.0:prometheus_common/vendor/github.com/prometheus/common \ - prometheus:procfs:v0.0.5:prometheus_procfs/vendor/github.com/prometheus/procfs \ - sergi:go-diff:da645544ed44:sergi_go_diff/vendor/github.com/sergi/go-diff \ - sirupsen:logrus:v1.4.2:sirupsen_logrus/vendor/github.com/sirupsen/logrus \ - spf13:cobra:v0.0.2:spf13_cobra/vendor/github.com/spf13/cobra \ - spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \ - stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify \ - theckman:goconstraint:v1.11.0:theckman_goconstraint/vendor/github.com/theckman/goconstraint \ - willf:bitset:v1.1.10:willf_bitset/vendor/github.com/willf/bitset \ - yudai:gojsondiff:7b1b7adf999d:yudai_gojsondiff/vendor/github.com/yudai/gojsondiff \ - yudai:golcs:ecda9a501e82:yudai_golcs/vendor/github.com/yudai/golcs \ - zrepl:yaml-config:cbb6b0cf4bdd:zrepl_yaml_config/vendor/github.com/zrepl/yaml-config OPTIONS_DEFINE= EXAMPLES MANPAGES OPTIONS_DEFAULT= MANPAGES -MANPAGES_USES= python:build,3.6+ MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.8.5,1:textproc/py-sphinx@${PY_FLAVOR} +MANPAGES_USES= python:build,3.6+ MANPAGES_PLIST_FILES= man/man1/zrepl.1.gz .include diff --git a/sysutils/zrepl/distinfo b/sysutils/zrepl/distinfo index eb37381bfc4e..88b4ab9a7667 100644 --- a/sysutils/zrepl/distinfo +++ b/sysutils/zrepl/distinfo @@ -1,113 +1,5 @@ -TIMESTAMP = 1611269188 -SHA256 (zrepl-zrepl-v0.3.1_GH0.tar.gz) = 46c4540c330ec68f30eafa9c44f27bfc04fcac85a2fe54b72b051c73cd11f66d -SIZE (zrepl-zrepl-v0.3.1_GH0.tar.gz) = 383904 -SHA256 (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 4624eae43489de8a71ea60efaf6744c581b6bd62909f7514c484c1ea0efaba5a -SIZE (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 44383 -SHA256 (alecthomas-template-fb15b899a751_GH0.tar.gz) = 2e2a44375eca48ce941182504b5d13aa98182b9a3f64ace33bfda52208bd0f5e -SIZE (alecthomas-template-fb15b899a751_GH0.tar.gz) = 55339 -SHA256 (alecthomas-units-c3de453c63f4_GH0.tar.gz) = b2eb77de46e677edb150bb4bf81d213416a477525980e315264cbd70b22d0ece -SIZE (alecthomas-units-c3de453c63f4_GH0.tar.gz) = 3485 -SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825 -SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867 -SHA256 (cespare-xxhash-v2.1.0_GH0.tar.gz) = e290af0281cb450d295eafbecdbc3138f94c3ff728f14714af055a1d9a4ce15d -SIZE (cespare-xxhash-v2.1.0_GH0.tar.gz) = 9198 -SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e -SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152 -SHA256 (fatih-color-v1.7.0_GH0.tar.gz) = 4650d7aa3feed266fc85d91dc34ca9cffdf7ee03ea29bf2cbf84bbecc75fb755 -SIZE (fatih-color-v1.7.0_GH0.tar.gz) = 816449 -SHA256 (ftrvxmtrx-fd-c6d800382fff_GH0.tar.gz) = 69b71ef7c26bca3b06e9f75d3949a0536b8e0146a9154e8ec999dce6da6d4b0a -SIZE (ftrvxmtrx-fd-c6d800382fff_GH0.tar.gz) = 3276 -SHA256 (gdamore-encoding-v1.0.0_GH0.tar.gz) = 8fb8593a69cd86f16233d63dd6d74181136ec8f22900c509e961a25eb4b2e013 -SIZE (gdamore-encoding-v1.0.0_GH0.tar.gz) = 10886 -SHA256 (gdamore-tcell-v1.2.0_GH0.tar.gz) = 39f3d1fb6c30b911141f6d19d3e3ee1352af7907336910811a8e60b2f10c8d8b -SIZE (gdamore-tcell-v1.2.0_GH0.tar.gz) = 146485 -SHA256 (gitchander-permutation-9e56b92e9909_GH0.tar.gz) = 9f3575a75189ea932be960ef18a38d3ded4ef190d497a017ecebf0f4d25c9a8d -SIZE (gitchander-permutation-9e56b92e9909_GH0.tar.gz) = 4966 -SHA256 (go-logfmt-logfmt-v0.4.0_GH0.tar.gz) = eddccc7c8d39a6381f7152e73ebf3c725de317c5b984d8a77282e63915aa834d -SIZE (go-logfmt-logfmt-v0.4.0_GH0.tar.gz) = 12724 -SHA256 (go-sql-driver-mysql-b2c03bcae3d4_GH0.tar.gz) = 3c2356551b8115a7a2457d0c9a4b7e296d549badfffe06722d34a3d3459ad4e5 -SIZE (go-sql-driver-mysql-b2c03bcae3d4_GH0.tar.gz) = 89452 -SHA256 (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 42c3e4ef9eca2860d22b3c6c5582c6c13fb4b417e5ebc1acc56ee5e2c4ddcaff -SIZE (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 70656 -SHA256 (golang-appengine-v1.1.0_GH0.tar.gz) = 83e0a8b26421bb2701bbd09a19b9242928573d41e912dd56eb331bac6a5c4aa6 -SIZE (golang-appengine-v1.1.0_GH0.tar.gz) = 302553 -SHA256 (golang-net-d28f0bde5980_GH0.tar.gz) = 40f4d37b315f4a6867ab5beadf4d73f93b9c1d777b48ec66d59f953a4a19acb4 -SIZE (golang-net-d28f0bde5980_GH0.tar.gz) = 1097062 -SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65 -SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285 -SHA256 (golang-sync-112230192c58_GH0.tar.gz) = 6d98880ea18369550cb12d7011df8e4b21c5b7588268a412b863b5c9d2fa0313 -SIZE (golang-sync-112230192c58_GH0.tar.gz) = 16832 -SHA256 (golang-sys-33540a1f6037_GH0.tar.gz) = 09ebdf007413c2eaddce123137443d08d1848be410c58896e772f0481ec385d5 -SIZE (golang-sys-33540a1f6037_GH0.tar.gz) = 1497659 -SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb -SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619 -SHA256 (golang-tools-40960b6deb8e_GH0.tar.gz) = 52208c4763a7d7911b83c9d7c8cfde852410a60230b75a25bad61ca32689244a -SIZE (golang-tools-40960b6deb8e_GH0.tar.gz) = 2848894 -SHA256 (google-go-genproto-c66870c02cf8_GH0.tar.gz) = 156e7cd1f95947c3f3293e18baa7af04e0da58eeeb3475f15bcc308ff491f31a -SIZE (google-go-genproto-c66870c02cf8_GH0.tar.gz) = 2191164 -SHA256 (google-uuid-v1.1.1_GH0.tar.gz) = bebd4b0b4ea152a9793615ef23c83f688876d8c284a2092264d20a4bf4ffc423 -SIZE (google-uuid-v1.1.1_GH0.tar.gz) = 13543 -SHA256 (grpc-grpc-go-v1.17.0_GH0.tar.gz) = 891add70cc16c9e2dc07986fd6e8fae44a36921727411f0b652afbc76e0fb169 -SIZE (grpc-grpc-go-v1.17.0_GH0.tar.gz) = 563534 -SHA256 (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e317aa253d342be3447def97f1fa9e10eb5ad819f6 -SIZE (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 2290 -SHA256 (jinzhu-copier-db4671f3a9b8_GH0.tar.gz) = 82684446197805059b37f348a1489342cb487ee5a8601bec4cd4edcebb9a4dcb -SIZE (jinzhu-copier-db4671f3a9b8_GH0.tar.gz) = 5036 -SHA256 (konsorten-go-windows-terminal-sequences-v1.0.1_GH0.tar.gz) = e36c5a5de388bf72db3037b47f025b09e574be8d0bc74b3e44c960cba0880e87 -SIZE (konsorten-go-windows-terminal-sequences-v1.0.1_GH0.tar.gz) = 1909 -SHA256 (kr-logfmt-b84e30acd515_GH0.tar.gz) = bf056ba7960b6846f2aa2c6ec0a217ead3e7259bc6c537f9f3ba3af6eb82cb80 -SIZE (kr-logfmt-b84e30acd515_GH0.tar.gz) = 6411 -SHA256 (kr-pretty-v0.1.0_GH0.tar.gz) = 3aeb5d90b719765781befb9f156d0d0b8e5a7aafbcf15321e9eabbd35df31358 -SIZE (kr-pretty-v0.1.0_GH0.tar.gz) = 8550 -SHA256 (kr-text-v0.1.0_GH0.tar.gz) = b67f2744020b25f9298153af0992db252d195edd7ca5afa3b19d6ac300c2d14e -SIZE (kr-text-v0.1.0_GH0.tar.gz) = 8686 -SHA256 (lib-pq-v1.2.0_GH0.tar.gz) = 052e9ce4472eda212e5034fd0298fcf254c22925b1d596b1d043a7a60fe4672e -SIZE (lib-pq-v1.2.0_GH0.tar.gz) = 96083 -SHA256 (lucasb-eyer-go-colorful-v1.0.2_GH0.tar.gz) = 9ca738f5e694587af132cdfedefe1c8fbc5e2fe4339286884fe051742d970140 -SIZE (lucasb-eyer-go-colorful-v1.0.2_GH0.tar.gz) = 430545 -SHA256 (mattn-go-colorable-v0.1.4_GH0.tar.gz) = 157806ad8125e6bef4d9b58c9125ccb98a8343136f93faf442ab0cc6e7c24c11 -SIZE (mattn-go-colorable-v0.1.4_GH0.tar.gz) = 8981 -SHA256 (mattn-go-isatty-v0.0.8_GH0.tar.gz) = 4f40edb394582f49ac6330bc807be93018216ef485eb65f00adcf61b670d4f3e -SIZE (mattn-go-isatty-v0.0.8_GH0.tar.gz) = 3564 -SHA256 (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 1973c2de25bc69c3786a00e8118f4d22aa0d040bdfe46c8c8c30419b23e53dfe -SIZE (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 19827 -SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b -SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184 -SHA256 (montanaflynn-stats-v0.5.0_GH0.tar.gz) = 7013ef675c1836a574e20ae81b71ac4854796cc2a8abf55e176d4643849e3778 -SIZE (montanaflynn-stats-v0.5.0_GH0.tar.gz) = 28893 -SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356 -SIZE (pkg-errors-v0.8.1_GH0.tar.gz) = 11009 -SHA256 (pkg-profile-v1.2.1_GH0.tar.gz) = 21b6541e7cad44e984e9bad1dc700def6e52fa1affa38a867f32ff6a6bec3ac0 -SIZE (pkg-profile-v1.2.1_GH0.tar.gz) = 5789 -SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda -SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398 -SHA256 (problame-go-netssh-26439f9f0dc5_GH0.tar.gz) = 39e0ffba466d2dc89057a25c59edd12592312e0435070b700b78023aaa3bf09d -SIZE (problame-go-netssh-26439f9f0dc5_GH0.tar.gz) = 15297 -SHA256 (prometheus-client_golang-v1.2.1_GH0.tar.gz) = fe6a626322d22d8ce9780320fd04a64a90c9a7aa62ec88809651072b30a10e6a -SIZE (prometheus-client_golang-v1.2.1_GH0.tar.gz) = 142465 -SHA256 (prometheus-client_model-14fe0d1b01d4_GH0.tar.gz) = e86922566dae5bd684e2b77baabfaee9df34ce11cd7c8bae688b512b3a496f03 -SIZE (prometheus-client_model-14fe0d1b01d4_GH0.tar.gz) = 57495 -SHA256 (prometheus-common-v0.7.0_GH0.tar.gz) = 71b1dce2afd959f9fcab3b5e097dfa9d398a61749851d290114746a3f8f119ae -SIZE (prometheus-common-v0.7.0_GH0.tar.gz) = 100520 -SHA256 (prometheus-procfs-v0.0.5_GH0.tar.gz) = 0a28cd42f6c727ccd48878f7506f0a9c87b72e7dba122f8c6884aba3aab7c800 -SIZE (prometheus-procfs-v0.0.5_GH0.tar.gz) = 112152 -SHA256 (sergi-go-diff-da645544ed44_GH0.tar.gz) = b90c77c55769fffabfc555092910960be9481d105b20da510c921da56166f025 -SIZE (sergi-go-diff-da645544ed44_GH0.tar.gz) = 42371 -SHA256 (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 67f2ddf467b7e63d2d2529d227946a331e245aeef7e2e4521ae82647b5ef84d9 -SIZE (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 41373 -SHA256 (spf13-cobra-v0.0.2_GH0.tar.gz) = 5703ee865c6e7b11a471889fa05b8a4178b1ff8d98982bcadb46753b305e3d6b -SIZE (spf13-cobra-v0.0.2_GH0.tar.gz) = 100775 -SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808 -SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796 -SHA256 (stretchr-testify-v1.4.0_GH0.tar.gz) = 3ae072321569a8cd6d77de8f3be774165e136198ce808df0a31589237ba59698 -SIZE (stretchr-testify-v1.4.0_GH0.tar.gz) = 110085 -SHA256 (theckman-goconstraint-v1.11.0_GH0.tar.gz) = 98d95306dc3679374fb954f9a25a01606fc96a166fdcbda5226ff6f50d58dfcf -SIZE (theckman-goconstraint-v1.11.0_GH0.tar.gz) = 5945 -SHA256 (willf-bitset-v1.1.10_GH0.tar.gz) = cae0a87412803d087eeb59a8ca26c399c57bff66f79966e3a4cce9a09de17b98 -SIZE (willf-bitset-v1.1.10_GH0.tar.gz) = 18708 -SHA256 (yudai-gojsondiff-7b1b7adf999d_GH0.tar.gz) = ac06dcedd4af0024cfaa8b9e2195611eecf5ee3ee1361d5186b07f0dea7eba02 -SIZE (yudai-gojsondiff-7b1b7adf999d_GH0.tar.gz) = 578880 -SHA256 (yudai-golcs-ecda9a501e82_GH0.tar.gz) = 080b0331f2d3e1f96446247afdc1c095d2ba2aca63a9b353fc4621e881d1dfa7 -SIZE (yudai-golcs-ecda9a501e82_GH0.tar.gz) = 3700 -SHA256 (zrepl-yaml-config-cbb6b0cf4bdd_GH0.tar.gz) = e91a8f240ec331d9cd2fecfaa47772e41c0ff182a335f5793d2f26ec8b1ac902 -SIZE (zrepl-yaml-config-cbb6b0cf4bdd_GH0.tar.gz) = 71249 +TIMESTAMP = 1621953202 +SHA256 (go/sysutils_zrepl/zrepl-v0.4.0/v0.4.0.mod) = 62e77080cd47c24eb90eb7c0a9d61f91bd5b5eb07bd23690c417b54d52acb0c6 +SIZE (go/sysutils_zrepl/zrepl-v0.4.0/v0.4.0.mod) = 2646 +SHA256 (go/sysutils_zrepl/zrepl-v0.4.0/v0.4.0.zip) = 81d3e8e32833f51aa6892a4a78c30eca7ca43dcd2bfb0039235aa854292a7afb +SIZE (go/sysutils_zrepl/zrepl-v0.4.0/v0.4.0.zip) = 551435 From owner-dev-commits-ports-branches@freebsd.org Thu May 27 08:54:14 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EB4376369EA; Thu, 27 May 2021 08:54:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FrM7V6NZgz4gwL; Thu, 27 May 2021 08:54:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C42C021046; Thu, 27 May 2021 08:54:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14R8sEiS038902; Thu, 27 May 2021 08:54:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14R8sExR038901; Thu, 27 May 2021 08:54:14 GMT (envelope-from git) Date: Thu, 27 May 2021 08:54:14 GMT Message-Id: <202105270854.14R8sExR038901@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kirill Ponomarev Subject: git: 54a1797990e4 - 2021Q2 - devel/pcre2: update to 10.37 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: krion X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 54a1797990e4f68fe299159e9af611856a8aca38 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 May 2021 08:54:15 -0000 The branch 2021Q2 has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=54a1797990e4f68fe299159e9af611856a8aca38 commit 54a1797990e4f68fe299159e9af611856a8aca38 Author: Kirill Ponomarev AuthorDate: 2021-05-27 08:53:26 +0000 Commit: Kirill Ponomarev CommitDate: 2021-05-27 08:54:10 +0000 devel/pcre2: update to 10.37 (cherry picked from commit 6456d569b37addb9839eb53c63e6f14d52d00ebe) --- devel/pcre2/Makefile | 2 +- devel/pcre2/distinfo | 6 +++--- devel/pcre2/pkg-plist | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/devel/pcre2/Makefile b/devel/pcre2/Makefile index 4c0d22f21df6..fdacf9f01c5b 100644 --- a/devel/pcre2/Makefile +++ b/devel/pcre2/Makefile @@ -1,7 +1,7 @@ # Created by: Mark Felder PORTNAME= pcre2 -PORTVERSION= 10.36 +PORTVERSION= 10.37 CATEGORIES= devel MASTER_SITES= SF/pcre/${PORTNAME}/${PORTVERSION} diff --git a/devel/pcre2/distinfo b/devel/pcre2/distinfo index 250da859ef7e..409005cd7cac 100644 --- a/devel/pcre2/distinfo +++ b/devel/pcre2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1607337860 -SHA256 (pcre2-10.36.tar.gz) = b95ddb9414f91a967a887d69617059fb672b914f56fa3d613812c1ee8e8a1a37 -SIZE (pcre2-10.36.tar.gz) = 2290719 +TIMESTAMP = 1622105407 +SHA256 (pcre2-10.37.tar.gz) = 04e214c0c40a97b8a5c2b4ae88a3aa8a93e6f2e45c6b3534ddac351f26548577 +SIZE (pcre2-10.37.tar.gz) = 2299767 diff --git a/devel/pcre2/pkg-plist b/devel/pcre2/pkg-plist index 0c22cf7c508b..0c122f894036 100644 --- a/devel/pcre2/pkg-plist +++ b/devel/pcre2/pkg-plist @@ -6,19 +6,19 @@ include/pcre2posix.h lib/libpcre2-16.a lib/libpcre2-16.so lib/libpcre2-16.so.0 -lib/libpcre2-16.so.0.10.1 +lib/libpcre2-16.so.0.10.2 lib/libpcre2-32.a lib/libpcre2-32.so lib/libpcre2-32.so.0 -lib/libpcre2-32.so.0.10.1 +lib/libpcre2-32.so.0.10.2 lib/libpcre2-8.a lib/libpcre2-8.so lib/libpcre2-8.so.0 -lib/libpcre2-8.so.0.10.1 +lib/libpcre2-8.so.0.10.2 lib/libpcre2-posix.a lib/libpcre2-posix.so -lib/libpcre2-posix.so.2 -lib/libpcre2-posix.so.2.0.3 +lib/libpcre2-posix.so.3 +lib/libpcre2-posix.so.3.0.0 libdata/pkgconfig/libpcre2-16.pc libdata/pkgconfig/libpcre2-32.pc libdata/pkgconfig/libpcre2-8.pc From owner-dev-commits-ports-branches@freebsd.org Fri May 28 09:04:49 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2ED5164FDBB; Fri, 28 May 2021 09:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FrzKF0kHpz4h1X; Fri, 28 May 2021 09:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F1347147C1; Fri, 28 May 2021 09:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14S94mdT071888; Fri, 28 May 2021 09:04:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14S94mg7071887; Fri, 28 May 2021 09:04:48 GMT (envelope-from git) Date: Fri, 28 May 2021 09:04:48 GMT Message-Id: <202105280904.14S94mg7071887@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mikael Urankar Subject: git: 98162a46a6a3 - 2021Q2 - security/py-passlib: Update to 1.7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 98162a46a6a30e6c258a5e5e11d85e7fd80d8294 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 May 2021 09:04:49 -0000 The branch 2021Q2 has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=98162a46a6a30e6c258a5e5e11d85e7fd80d8294 commit 98162a46a6a30e6c258a5e5e11d85e7fd80d8294 Author: Mikael Urankar AuthorDate: 2021-05-28 08:47:54 +0000 Commit: Mikael Urankar CommitDate: 2021-05-28 09:04:38 +0000 security/py-passlib: Update to 1.7.4 Changes: - https://passlib.readthedocs.io/en/stable/history/1.7.html#id2 - https://passlib.readthedocs.io/en/stable/history/1.7.html#id1 PR: 256189 Approved by: koobs (maintainer) (cherry picked from commit 3bcd5a9d5bef6170c1e78d80dfa04c85fad54c82) --- security/py-passlib/Makefile | 2 +- security/py-passlib/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/security/py-passlib/Makefile b/security/py-passlib/Makefile index dc69ea1d486d..b32ac2fb4e07 100644 --- a/security/py-passlib/Makefile +++ b/security/py-passlib/Makefile @@ -1,7 +1,7 @@ # Created by: Kubilay Kocak PORTNAME= passlib -PORTVERSION= 1.7.2 +PORTVERSION= 1.7.4 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/py-passlib/distinfo b/security/py-passlib/distinfo index 0c0380757843..91384e4729fc 100644 --- a/security/py-passlib/distinfo +++ b/security/py-passlib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1585542566 -SHA256 (passlib-1.7.2.tar.gz) = 8d666cef936198bc2ab47ee9b0410c94adf2ba798e5a84bf220be079ae7ab6a8 -SIZE (passlib-1.7.2.tar.gz) = 649654 +TIMESTAMP = 1622117631 +SHA256 (passlib-1.7.4.tar.gz) = defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c4152ebe04 +SIZE (passlib-1.7.4.tar.gz) = 689844 From owner-dev-commits-ports-branches@freebsd.org Fri May 28 09:53:21 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C21FF650752; Fri, 28 May 2021 09:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fs0PF4t92z4l0w; Fri, 28 May 2021 09:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8F4F11541C; Fri, 28 May 2021 09:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14S9rLbh037982; Fri, 28 May 2021 09:53:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14S9rLpx037981; Fri, 28 May 2021 09:53:21 GMT (envelope-from git) Date: Fri, 28 May 2021 09:53:21 GMT Message-Id: <202105280953.14S9rLpx037981@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Juraj Lutter Subject: git: ce849e898a7e - 2021Q2 - net/samba41[23]: Update to 4.12.15 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: ce849e898a7eb12a44a7cc872362485d8b8d5165 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 May 2021 09:53:21 -0000 The branch 2021Q2 has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=ce849e898a7eb12a44a7cc872362485d8b8d5165 commit ce849e898a7eb12a44a7cc872362485d8b8d5165 Author: Timur I. Bakeyev AuthorDate: 2021-05-04 00:16:47 +0000 Commit: Juraj Lutter CommitDate: 2021-05-28 09:52:47 +0000 net/samba41[23]: Update to 4.12.15 Updated net/samba412 and net/samba413 to fix CVE-2021-20254. Also fixed: * Incorrect include line for the bind backend(255415) * Broken pkg-plist with NO_PYTHON(254033) * Broken URL parsing in LDAP client(252385) PR: 255415 254033 252385 Security: CVE-2021-20254 (cherry picked from commit 3887986f673b9aa45588ab13e18544654ba5218a) --- net/samba412/Makefile | 2 +- net/samba412/distinfo | 6 +- net/samba412/files/patch-bind | 2 +- net/samba412/files/patch-linuxisms | 68 ++++ net/samba412/pkg-plist | 702 ++++++++++++++++++------------------- net/samba413/Makefile | 2 +- net/samba413/distinfo | 6 +- net/samba413/files/patch-bind | 2 +- net/samba413/files/patch-linuxisms | 91 +++++ 9 files changed, 520 insertions(+), 361 deletions(-) diff --git a/net/samba412/Makefile b/net/samba412/Makefile index 453e061c7158..eddff1d0da02 100644 --- a/net/samba412/Makefile +++ b/net/samba412/Makefile @@ -22,7 +22,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/0001-Zfs-provision-1.patch:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.12.14 +SAMBA4_VERSION= 4.12.15 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} diff --git a/net/samba412/distinfo b/net/samba412/distinfo index 0ff1113a1220..51c1b8c16578 100644 --- a/net/samba412/distinfo +++ b/net/samba412/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1616641716 -SHA256 (samba-4.12.14.tar.gz) = 440f8cb4e2365eeace049e00824bdac53017487f4fc9cd86b76cd76d8d860980 -SIZE (samba-4.12.14.tar.gz) = 18260926 +TIMESTAMP = 1620008043 +SHA256 (samba-4.12.15.tar.gz) = f29694212fc6e076f62163124fd01535bea1f158cc8b0e24844481140dfebb47 +SIZE (samba-4.12.15.tar.gz) = 18259918 diff --git a/net/samba412/files/patch-bind b/net/samba412/files/patch-bind index 78e3f5523d4f..137d00026136 100644 --- a/net/samba412/files/patch-bind +++ b/net/samba412/files/patch-bind @@ -64,7 +64,7 @@ + + bind9_dlz = ( + ' # For %s\n' -+ ' %sdatabase %s/bind9/dlz_bind%s.so";' ++ ' %sdatabase "dlopen %s/bind9/dlz_bind%s.so";' + ) % ( + bind9_version, bind9_disabled, samba.param.modules_dir(), bind9_dlz_version + ) diff --git a/net/samba412/files/patch-linuxisms b/net/samba412/files/patch-linuxisms new file mode 100644 index 000000000000..bea5adb57185 --- /dev/null +++ b/net/samba412/files/patch-linuxisms @@ -0,0 +1,68 @@ +--- libcli/http/http.c.orig 2020-07-09 13:33:56 ++++ libcli/http/http.c +@@ -141,7 +141,19 @@ static enum http_read_status http_parse_headers(struct + return HTTP_ALL_DATA_READ; + } + ++#ifdef FREEBSD ++ int s0, s1, s2, s3; s0 = s1 = s2 = s3 = 0; ++ n = sscanf(line, "%n%*[^:]%n: %n%*[^\r\n]%n\r\n", &s0, &s1, &s2, &s3); ++ ++ if(n >= 0) { ++ key = calloc(sizeof(char), s1-s0+1); ++ value = calloc(sizeof(char), s3-s2+1); ++ ++ n = sscanf(line, "%[^:]: %[^\r\n]\r\n", key, value); ++ } ++#else + n = sscanf(line, "%m[^:]: %m[^\r\n]\r\n", &key, &value); ++#endif + if (n != 2) { + DEBUG(0, ("%s: Error parsing header '%s'\n", __func__, line)); + status = HTTP_DATA_CORRUPTED; +@@ -167,7 +179,7 @@ error: + static bool http_parse_response_line(struct http_read_response_state *state) + { + bool status = true; +- char *protocol; ++ char *protocol = NULL; + char *msg = NULL; + char major; + char minor; +@@ -187,18 +199,32 @@ static bool http_parse_response_line(struct http_read_ + return false; + } + ++#ifdef FREEBSD ++ int s0, s1, s2, s3; s0 = s1 = s2 = s3 = 0; ++ n = sscanf(line, "%n%*[^/]%n/%c.%c %d %n%*[^\r\n]%n\r\n", ++ &s0, &s1, &major, &minor, &code, &s2, &s3); ++ ++ if(n == 3) { ++ protocol = calloc(sizeof(char), s1-s0+1); ++ msg = calloc(sizeof(char), s3-s2+1); ++ ++ n = sscanf(line, "%[^/]/%c.%c %d %[^\r\n]\r\n", ++ protocol, &major, &minor, &code, msg); ++ } ++#else + n = sscanf(line, "%m[^/]/%c.%c %d %m[^\r\n]\r\n", + &protocol, &major, &minor, &code, &msg); ++#endif + +- DEBUG(11, ("%s: Header parsed(%i): protocol->%s, major->%c, minor->%c, " +- "code->%d, message->%s\n", __func__, n, protocol, major, minor, +- code, msg)); +- + if (n != 5) { + DEBUG(0, ("%s: Error parsing header\n", __func__)); + status = false; + goto error; + } ++ ++ DEBUG(11, ("%s: Header parsed(%i): protocol->%s, major->%c, minor->%c, " ++ "code->%d, message->%s\n", __func__, n, protocol, major, minor, ++ code, msg)); + + if (major != '1') { + DEBUG(0, ("%s: Bad HTTP major number '%c'\n", __func__, major)); diff --git a/net/samba412/pkg-plist b/net/samba412/pkg-plist index 6b234c6bd7c8..85b35108887b 100644 --- a/net/samba412/pkg-plist +++ b/net/samba412/pkg-plist @@ -599,7 +599,7 @@ man/man8/nmbd.8.gz man/man8/pam_winbind.8.gz man/man8/pdbedit.8.gz man/man8/samba_downgrade_db.8.gz -man/man8/samba-gpupdate.8.gz +%%SAMBA4_PYTHON%%man/man8/samba-gpupdate.8.gz man/man8/samba-regedit.8.gz man/man8/samba-tool.8.gz man/man8/samba.8.gz @@ -727,353 +727,353 @@ man/man8/winbindd.8.gz %%CLUSTER%%@dir /var/lib %%CLUSTER%%@dir /var/run/ctdb @comment Python block -%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dckeytab%%PYTHON_EXT_SUFFIX%%.so -%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/posix_eadb%%PYTHON_EXT_SUFFIX%%.so -%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/xattr_native%%PYTHON_EXT_SUFFIX%%.so -%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/xattr_tdb%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/__init__.py -%%PYTHON_SITELIBDIR%%/samba/_glue%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/_ldb%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/auth_util.py -%%PYTHON_SITELIBDIR%%/samba/auth%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/colour.py -%%PYTHON_SITELIBDIR%%/samba/common.py -%%PYTHON_SITELIBDIR%%/samba/compat.py -%%PYTHON_SITELIBDIR%%/samba/credentials%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/crypto%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dbchecker.py -%%PYTHON_SITELIBDIR%%/samba/dcerpc/__init__.py -%%PYTHON_SITELIBDIR%%/samba/dcerpc/atsvc%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/auth%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/base%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/dcerpc%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/dfs%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/dns%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/dnsp%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/dnsserver%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/drsblobs%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/drsuapi%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/echo%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/epmapper%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/idmap%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/initshutdown%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/irpc%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/krb5pac%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/lsa%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/mdssvc%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/messaging%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/mgmt%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/misc%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/nbt%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/netlogon%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/ntlmssp%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/preg%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/samr%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/security%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/server_id%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/smb_acl%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/spoolss%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/srvsvc%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/svcctl%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/unixinfo%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/winbind%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/windows_event_ids%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/winreg%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/winspool%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/witness%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/wkssvc%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/dcerpc/xattr%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/descriptor.py -%%PYTHON_SITELIBDIR%%/samba/dnsserver.py -%%PYTHON_SITELIBDIR%%/samba/domain_update.py -%%PYTHON_SITELIBDIR%%/samba/drs_utils.py -%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dsdb_dns%%PYTHON_EXT_SUFFIX%%.so -%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dsdb%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/emulate/__init__.py -%%PYTHON_SITELIBDIR%%/samba/emulate/traffic_packets.py -%%PYTHON_SITELIBDIR%%/samba/emulate/traffic.py -%%PYTHON_SITELIBDIR%%/samba/forest_update.py -%%PYTHON_SITELIBDIR%%/samba/gensec%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/getopt.py -%%PYTHON_SITELIBDIR%%/samba/gp_ext_loader.py -%%PYTHON_SITELIBDIR%%/samba/gp_parse/__init__.py -%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_aas.py -%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_csv.py -%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_inf.py -%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_ini.py -%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_pol.py -%%PYTHON_SITELIBDIR%%/samba/gp_sec_ext.py -%%PYTHON_SITELIBDIR%%/samba/gpclass.py -%%PYTHON_SITELIBDIR%%/samba/gpo%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/graph.py -%%PYTHON_SITELIBDIR%%/samba/hostconfig.py -%%PYTHON_SITELIBDIR%%/samba/idmap.py -%%PYTHON_SITELIBDIR%%/samba/join.py -%%PYTHON_SITELIBDIR%%/samba/kcc/__init__.py -%%PYTHON_SITELIBDIR%%/samba/kcc/debug.py -%%PYTHON_SITELIBDIR%%/samba/kcc/graph_utils.py -%%PYTHON_SITELIBDIR%%/samba/kcc/graph.py -%%PYTHON_SITELIBDIR%%/samba/kcc/kcc_utils.py -%%PYTHON_SITELIBDIR%%/samba/kcc/ldif_import_export.py -%%PYTHON_SITELIBDIR%%/samba/logger.py -%%PYTHON_SITELIBDIR%%/samba/mdb_util.py -%%PYTHON_SITELIBDIR%%/samba/messaging%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/ms_display_specifiers.py -%%PYTHON_SITELIBDIR%%/samba/ms_forest_updates_markdown.py -%%PYTHON_SITELIBDIR%%/samba/ms_schema_markdown.py -%%PYTHON_SITELIBDIR%%/samba/ms_schema.py -%%PYTHON_SITELIBDIR%%/samba/ndr.py -%%PYTHON_SITELIBDIR%%/samba/net%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/netbios%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/netcmd/__init__.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/common.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/computer.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/contact.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/dbcheck.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/delegation.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/dns.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/domain_backup.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/domain.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/drs.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/dsacl.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/forest.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/fsmo.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/gpo.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/group.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/ldapcmp.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/main.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/nettime.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/ntacl.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/ou.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/processes.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/pso.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/rodc.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/schema.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/sites.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/spn.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/testparm.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/user.py -%%PYTHON_SITELIBDIR%%/samba/netcmd/visualize.py -%%PYTHON_SITELIBDIR%%/samba/ntacls.py -%%PYTHON_SITELIBDIR%%/samba/ntstatus%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/param%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/policy%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/provision/__init__.py -%%PYTHON_SITELIBDIR%%/samba/provision/backend.py -%%PYTHON_SITELIBDIR%%/samba/provision/common.py -%%PYTHON_SITELIBDIR%%/samba/provision/kerberos_implementation.py -%%PYTHON_SITELIBDIR%%/samba/provision/kerberos.py -%%PYTHON_SITELIBDIR%%/samba/provision/sambadns.py -%%PYTHON_SITELIBDIR%%/samba/registry%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/remove_dc.py -%%PYTHON_SITELIBDIR%%/samba/samba3/__init__.py -%%PYTHON_SITELIBDIR%%/samba/samba3/libsmb_samba_internal%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/samba3/mdscli%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/samba3/param%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/samba3/passdb%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/samba3/smbd%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/samdb.py -%%PYTHON_SITELIBDIR%%/samba/schema.py -%%PYTHON_SITELIBDIR%%/samba/sd_utils.py -%%PYTHON_SITELIBDIR%%/samba/security%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/sites.py -%%PYTHON_SITELIBDIR%%/samba/subnets.py -%%PYTHON_SITELIBDIR%%/samba/subunit/__init__.py -%%PYTHON_SITELIBDIR%%/samba/subunit/run.py -%%PYTHON_SITELIBDIR%%/samba/tdb_util.py -%%PYTHON_SITELIBDIR%%/samba/tests/__init__.py -%%PYTHON_SITELIBDIR%%/samba/tests/audit_log_base.py -%%PYTHON_SITELIBDIR%%/samba/tests/audit_log_dsdb.py -%%PYTHON_SITELIBDIR%%/samba/tests/audit_log_pass_change.py -%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_base.py -%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_ncalrpc.py -%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_netlogon_bad_creds.py -%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_netlogon.py -%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_pass_change.py -%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_samlogon.py -%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_winbind.py -%%PYTHON_SITELIBDIR%%/samba/tests/auth_log.py -%%PYTHON_SITELIBDIR%%/samba/tests/auth.py -%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/__init__.py -%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/bug13653.py -%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/check_output.py -%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/downgradedatabase.py -%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/mdfind.py -%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/ndrdump.py -%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/netads_json.py -%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/samba_dnsupdate.py -%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/smbcontrol_process.py -%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/smbcontrol.py -%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/traffic_learner.py -%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/traffic_replay.py -%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/traffic_summary.py -%%PYTHON_SITELIBDIR%%/samba/tests/common.py -%%PYTHON_SITELIBDIR%%/samba/tests/complex_expressions.py -%%PYTHON_SITELIBDIR%%/samba/tests/core.py -%%PYTHON_SITELIBDIR%%/samba/tests/credentials.py -%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/__init__.py -%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/array.py -%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/bare.py -%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/dnsserver.py -%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/integer.py -%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/mdssvc.py -%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/misc.py -%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/raw_protocol.py -%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/raw_testcase.py -%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/registry.py -%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpc_talloc.py -%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpcecho.py -%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/sam.py -%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/srvsvc.py -%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/string_tests.py -%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/testrpc.py -%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/unix.py -%%PYTHON_SITELIBDIR%%/samba/tests/dckeytab.py -%%PYTHON_SITELIBDIR%%/samba/tests/dns_base.py -%%PYTHON_SITELIBDIR%%/samba/tests/dns_forwarder_helpers/server.py -%%PYTHON_SITELIBDIR%%/samba/tests/dns_forwarder.py -%%PYTHON_SITELIBDIR%%/samba/tests/dns_invalid.py -%%PYTHON_SITELIBDIR%%/samba/tests/dns_packet.py -%%PYTHON_SITELIBDIR%%/samba/tests/dns_tkey.py -%%PYTHON_SITELIBDIR%%/samba/tests/dns_wildcard.py -%%PYTHON_SITELIBDIR%%/samba/tests/dns.py -%%PYTHON_SITELIBDIR%%/samba/tests/docs.py -%%PYTHON_SITELIBDIR%%/samba/tests/domain_backup_offline.py -%%PYTHON_SITELIBDIR%%/samba/tests/domain_backup.py -%%PYTHON_SITELIBDIR%%/samba/tests/dsdb_lock.py -%%PYTHON_SITELIBDIR%%/samba/tests/dsdb_schema_attributes.py -%%PYTHON_SITELIBDIR%%/samba/tests/dsdb.py -%%PYTHON_SITELIBDIR%%/samba/tests/emulate/__init__.py -%%PYTHON_SITELIBDIR%%/samba/tests/emulate/traffic_packet.py -%%PYTHON_SITELIBDIR%%/samba/tests/emulate/traffic.py -%%PYTHON_SITELIBDIR%%/samba/tests/encrypted_secrets.py -%%PYTHON_SITELIBDIR%%/samba/tests/gensec.py -%%PYTHON_SITELIBDIR%%/samba/tests/get_opt.py -%%PYTHON_SITELIBDIR%%/samba/tests/getdcname.py -%%PYTHON_SITELIBDIR%%/samba/tests/glue.py -%%PYTHON_SITELIBDIR%%/samba/tests/gpo.py -%%PYTHON_SITELIBDIR%%/samba/tests/graph.py -%%PYTHON_SITELIBDIR%%/samba/tests/group_audit.py -%%PYTHON_SITELIBDIR%%/samba/tests/hostconfig.py -%%PYTHON_SITELIBDIR%%/samba/tests/join.py -%%PYTHON_SITELIBDIR%%/samba/tests/kcc/__init__.py -%%PYTHON_SITELIBDIR%%/samba/tests/kcc/graph_utils.py -%%PYTHON_SITELIBDIR%%/samba/tests/kcc/graph.py -%%PYTHON_SITELIBDIR%%/samba/tests/kcc/kcc_utils.py -%%PYTHON_SITELIBDIR%%/samba/tests/kcc/ldif_import_export.py -%%PYTHON_SITELIBDIR%%/samba/tests/krb5_credentials.py -%%PYTHON_SITELIBDIR%%/samba/tests/ldap_raw.py -%%PYTHON_SITELIBDIR%%/samba/tests/ldap_referrals.py -%%PYTHON_SITELIBDIR%%/samba/tests/libsmb.py -%%PYTHON_SITELIBDIR%%/samba/tests/loadparm.py -%%PYTHON_SITELIBDIR%%/samba/tests/lsa_string.py -%%PYTHON_SITELIBDIR%%/samba/tests/messaging.py -%%PYTHON_SITELIBDIR%%/samba/tests/net_join_no_spnego.py -%%PYTHON_SITELIBDIR%%/samba/tests/net_join.py -%%PYTHON_SITELIBDIR%%/samba/tests/netbios.py -%%PYTHON_SITELIBDIR%%/samba/tests/netcmd.py -%%PYTHON_SITELIBDIR%%/samba/tests/netlogonsvc.py -%%PYTHON_SITELIBDIR%%/samba/tests/ntacls_backup.py -%%PYTHON_SITELIBDIR%%/samba/tests/ntacls.py -%%PYTHON_SITELIBDIR%%/samba/tests/ntlm_auth_base.py -%%PYTHON_SITELIBDIR%%/samba/tests/ntlm_auth_krb5.py -%%PYTHON_SITELIBDIR%%/samba/tests/ntlm_auth.py -%%PYTHON_SITELIBDIR%%/samba/tests/ntlmdisabled.py -%%PYTHON_SITELIBDIR%%/samba/tests/pam_winbind_chauthtok.py -%%PYTHON_SITELIBDIR%%/samba/tests/pam_winbind_warn_pwd_expire.py -%%PYTHON_SITELIBDIR%%/samba/tests/pam_winbind.py -%%PYTHON_SITELIBDIR%%/samba/tests/param.py -%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_fl2003.py -%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_fl2008.py -%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_gpgme.py -%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_ldap.py -%%PYTHON_SITELIBDIR%%/samba/tests/password_hash.py -%%PYTHON_SITELIBDIR%%/samba/tests/password_quality.py -%%PYTHON_SITELIBDIR%%/samba/tests/password_test.py -%%PYTHON_SITELIBDIR%%/samba/tests/policy.py -%%PYTHON_SITELIBDIR%%/samba/tests/posixacl.py -%%PYTHON_SITELIBDIR%%/samba/tests/prefork_restart.py -%%PYTHON_SITELIBDIR%%/samba/tests/process_limits.py -%%PYTHON_SITELIBDIR%%/samba/tests/provision.py -%%PYTHON_SITELIBDIR%%/samba/tests/pso.py -%%PYTHON_SITELIBDIR%%/samba/tests/py_credentials.py -%%PYTHON_SITELIBDIR%%/samba/tests/registry.py -%%PYTHON_SITELIBDIR%%/samba/tests/s3idmapdb.py -%%PYTHON_SITELIBDIR%%/samba/tests/s3param.py -%%PYTHON_SITELIBDIR%%/samba/tests/s3passdb.py -%%PYTHON_SITELIBDIR%%/samba/tests/s3registry.py -%%PYTHON_SITELIBDIR%%/samba/tests/s3windb.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/__init__.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/base.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/computer.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/contact.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/demote.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/dnscmd.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/dsacl.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/forest.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/fsmo.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/gpo.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/group.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/help.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/join_lmdb_size.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/join.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/ntacl.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/ou.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/passwordsettings.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/processes.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/promote_dc_lmdb_size.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/provision_lmdb_size.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/provision_password_check.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/rodc.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/schema.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/sites.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/timecmd.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_check_password_script.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_virtualCryptSHA_base.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_virtualCryptSHA_gpg.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_virtualCryptSHA_userPassword.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_virtualCryptSHA.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_wdigest.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/visualize_drs.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/visualize.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba_upgradedns_lmdb.py -%%PYTHON_SITELIBDIR%%/samba/tests/samba3sam.py -%%PYTHON_SITELIBDIR%%/samba/tests/samdb_api.py -%%PYTHON_SITELIBDIR%%/samba/tests/samdb.py -%%PYTHON_SITELIBDIR%%/samba/tests/security.py -%%PYTHON_SITELIBDIR%%/samba/tests/segfault.py -%%PYTHON_SITELIBDIR%%/samba/tests/smb.py -%%PYTHON_SITELIBDIR%%/samba/tests/smbd_base.py -%%PYTHON_SITELIBDIR%%/samba/tests/smbd_fuzztest.py -%%PYTHON_SITELIBDIR%%/samba/tests/source.py -%%PYTHON_SITELIBDIR%%/samba/tests/strings.py -%%PYTHON_SITELIBDIR%%/samba/tests/subunitrun.py -%%PYTHON_SITELIBDIR%%/samba/tests/tdb_util.py -%%PYTHON_SITELIBDIR%%/samba/tests/upgrade.py -%%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovision.py -%%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovisionneeddc.py -%%PYTHON_SITELIBDIR%%/samba/tests/usage.py -%%PYTHON_SITELIBDIR%%/samba/tests/xattr.py -%%PYTHON_SITELIBDIR%%/samba/upgrade.py -%%PYTHON_SITELIBDIR%%/samba/upgradehelpers.py -%%PYTHON_SITELIBDIR%%/samba/uptodateness.py -%%PYTHON_SITELIBDIR%%/samba/werror%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/samba/xattr.py -@dir %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool -@dir %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc -@dir %%PYTHON_SITELIBDIR%%/samba/tests/blackbox -@dir %%PYTHON_SITELIBDIR%%/samba/tests -@dir %%PYTHON_SITELIBDIR%%/samba/samba3 -@dir %%PYTHON_SITELIBDIR%%/samba/provision -@dir %%PYTHON_SITELIBDIR%%/samba/netcmd -@dir %%PYTHON_SITELIBDIR%%/samba/dcerpc -@dir %%PYTHON_SITELIBDIR%%/samba +%%AD_DC%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dckeytab%%PYTHON_EXT_SUFFIX%%.so +%%AD_DC%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/posix_eadb%%PYTHON_EXT_SUFFIX%%.so +%%AD_DC%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/xattr_native%%PYTHON_EXT_SUFFIX%%.so +%%AD_DC%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/xattr_tdb%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/__init__.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/_glue%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/_ldb%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/auth_util.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/auth%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/colour.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/common.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/compat.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/credentials%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/crypto%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dbchecker.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/__init__.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/atsvc%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/auth%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/base%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/dcerpc%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/dfs%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/dns%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/dnsp%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/dnsserver%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/drsblobs%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/drsuapi%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/echo%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/epmapper%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/idmap%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/initshutdown%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/irpc%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/krb5pac%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/lsa%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/mdssvc%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/messaging%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/mgmt%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/misc%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/nbt%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/netlogon%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/ntlmssp%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/preg%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/samr%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/security%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/server_id%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/smb_acl%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/spoolss%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/srvsvc%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/svcctl%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/unixinfo%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/winbind%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/windows_event_ids%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/winreg%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/winspool%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/witness%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/wkssvc%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/xattr%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/descriptor.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dnsserver.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/domain_update.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/drs_utils.py +%%AD_DC%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dsdb_dns%%PYTHON_EXT_SUFFIX%%.so +%%AD_DC%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dsdb%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/emulate/__init__.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/emulate/traffic_packets.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/emulate/traffic.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/forest_update.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/gensec%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/getopt.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/gp_ext_loader.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/gp_parse/__init__.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_aas.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_csv.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_inf.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_ini.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_pol.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/gp_sec_ext.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/gpclass.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/gpo%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/graph.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/hostconfig.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/idmap.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/join.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/kcc/__init__.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/kcc/debug.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/kcc/graph_utils.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/kcc/graph.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/kcc/kcc_utils.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/kcc/ldif_import_export.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/logger.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/mdb_util.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/messaging%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/ms_display_specifiers.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/ms_forest_updates_markdown.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/ms_schema_markdown.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/ms_schema.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/ndr.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/net%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netbios%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/__init__.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/common.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/computer.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/contact.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/dbcheck.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/delegation.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/dns.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/domain_backup.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/domain.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/drs.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/dsacl.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/forest.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/fsmo.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/gpo.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/group.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/ldapcmp.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/main.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/nettime.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/ntacl.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/ou.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/processes.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/pso.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/rodc.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/schema.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/sites.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/spn.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/testparm.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/user.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/visualize.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/ntacls.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/ntstatus%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/param%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/policy%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/provision/__init__.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/provision/backend.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/provision/common.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/provision/kerberos_implementation.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/provision/kerberos.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/provision/sambadns.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/registry%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/remove_dc.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/samba3/__init__.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/samba3/libsmb_samba_internal%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/samba3/mdscli%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/samba3/param%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/samba3/passdb%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/samba3/smbd%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/samdb.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/schema.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/sd_utils.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/security%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/sites.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/subnets.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/subunit/__init__.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/subunit/run.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tdb_util.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/__init__.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/audit_log_base.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/audit_log_dsdb.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/audit_log_pass_change.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_base.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_ncalrpc.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_netlogon_bad_creds.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_netlogon.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_pass_change.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_samlogon.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_winbind.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/auth_log.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/auth.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/__init__.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/bug13653.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/check_output.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/downgradedatabase.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/mdfind.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/ndrdump.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/netads_json.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/samba_dnsupdate.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/smbcontrol_process.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/smbcontrol.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/traffic_learner.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/traffic_replay.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/traffic_summary.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/common.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/complex_expressions.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/core.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/credentials.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/__init__.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/array.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/bare.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/dnsserver.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/integer.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/mdssvc.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/misc.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/raw_protocol.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/raw_testcase.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/registry.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpc_talloc.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpcecho.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/sam.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/srvsvc.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/string_tests.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/testrpc.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/unix.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dckeytab.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dns_base.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dns_forwarder_helpers/server.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dns_forwarder.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dns_invalid.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dns_packet.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dns_tkey.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dns_wildcard.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dns.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/docs.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/domain_backup_offline.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/domain_backup.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dsdb_lock.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dsdb_schema_attributes.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dsdb.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/emulate/__init__.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/emulate/traffic_packet.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/emulate/traffic.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/encrypted_secrets.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/gensec.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/get_opt.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/getdcname.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/glue.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/gpo.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/graph.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/group_audit.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/hostconfig.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/join.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/kcc/__init__.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/kcc/graph_utils.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/kcc/graph.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/kcc/kcc_utils.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/kcc/ldif_import_export.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/krb5_credentials.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/ldap_raw.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/ldap_referrals.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/libsmb.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/loadparm.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/lsa_string.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/messaging.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/net_join_no_spnego.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/net_join.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/netbios.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/netcmd.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/netlogonsvc.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/ntacls_backup.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/ntacls.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/ntlm_auth_base.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/ntlm_auth_krb5.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/ntlm_auth.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/ntlmdisabled.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/pam_winbind_chauthtok.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/pam_winbind_warn_pwd_expire.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/pam_winbind.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/param.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_fl2003.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_fl2008.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_gpgme.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_ldap.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/password_hash.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/password_quality.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/password_test.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/policy.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/posixacl.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/prefork_restart.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/process_limits.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/provision.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/pso.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/py_credentials.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/registry.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/s3idmapdb.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/s3param.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/s3passdb.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/s3registry.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/s3windb.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/__init__.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/base.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/computer.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/contact.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/demote.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/dnscmd.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/dsacl.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/forest.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/fsmo.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/gpo.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/group.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/help.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/join_lmdb_size.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/join.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/ntacl.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/ou.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/passwordsettings.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/processes.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/promote_dc_lmdb_size.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/provision_lmdb_size.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/provision_password_check.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/rodc.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/schema.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/sites.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/timecmd.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_check_password_script.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_virtualCryptSHA_base.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_virtualCryptSHA_gpg.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_virtualCryptSHA_userPassword.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_virtualCryptSHA.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_wdigest.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/visualize_drs.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/visualize.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_upgradedns_lmdb.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba3sam.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samdb_api.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samdb.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/security.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/segfault.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/smb.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/smbd_base.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/smbd_fuzztest.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/source.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/strings.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/subunitrun.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/tdb_util.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/upgrade.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovision.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovisionneeddc.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/usage.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/xattr.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/upgrade.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/upgradehelpers.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/uptodateness.py +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/werror%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/xattr.py +%%SAMBA4_PYTHON%%@dir %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool +%%SAMBA4_PYTHON%%@dir %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc +%%SAMBA4_PYTHON%%@dir %%PYTHON_SITELIBDIR%%/samba/tests/blackbox +%%SAMBA4_PYTHON%%@dir %%PYTHON_SITELIBDIR%%/samba/tests +%%SAMBA4_PYTHON%%@dir %%PYTHON_SITELIBDIR%%/samba/samba3 +%%SAMBA4_PYTHON%%@dir %%PYTHON_SITELIBDIR%%/samba/provision +%%SAMBA4_PYTHON%%@dir %%PYTHON_SITELIBDIR%%/samba/netcmd +%%SAMBA4_PYTHON%%@dir %%PYTHON_SITELIBDIR%%/samba/dcerpc +%%SAMBA4_PYTHON%%@dir %%PYTHON_SITELIBDIR%%/samba @comment Use bundled libraries %%SAMBA4_BUNDLED_CMOCKA%%lib/samba4/private/libcmocka-samba4.so -%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/_ldb_text.py -%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/ldb%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/_ldb_text.py +%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/ldb%%PYTHON_EXT_SUFFIX%%.so %%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON%%lib/samba4/private/libpyldb-util%%PYTHON_EXT_SUFFIX%%.so.2 %%SAMBA4_BUNDLED_LDB%%bin/samba-ldbdump %%SAMBA4_BUNDLED_LDB%%bin/samba-ldbadd @@ -1096,19 +1096,19 @@ man/man8/winbindd.8.gz %%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/server_sort.so %%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/skel.so %%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/tdb.so -%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/talloc%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/talloc%%PYTHON_EXT_SUFFIX%%.so %%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON%%lib/samba4/private/libpytalloc-util%%PYTHON_EXT_SUFFIX%%.so.2 %%SAMBA4_BUNDLED_TALLOC%%lib/samba4/private/libtalloc.so.2 %%SAMBA4_BUNDLED_TALLOC%%man/man3/talloc.3.gz -%%SAMBA4_BUNDLED_TDB%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/_tdb_text.py -%%SAMBA4_BUNDLED_TDB%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/tdb%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_BUNDLED_TDB%%%%SAMBA4_PYTHON%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/_tdb_text.py +%%SAMBA4_BUNDLED_TDB%%%%SAMBA4_PYTHON%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/tdb%%PYTHON_EXT_SUFFIX%%.so %%SAMBA4_BUNDLED_TDB%%bin/samba-tdbbackup %%SAMBA4_BUNDLED_TDB%%bin/samba-tdbdump %%SAMBA4_BUNDLED_TDB%%bin/samba-tdbrestore %%SAMBA4_BUNDLED_TDB%%bin/samba-tdbtool %%SAMBA4_BUNDLED_TDB%%lib/samba4/private/libtdb.so.1 -%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/_tevent%%PYTHON_EXT_SUFFIX%%.so -%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/tevent.py +%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_PYTHON%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/_tevent%%PYTHON_EXT_SUFFIX%%.so +%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_PYTHON%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/tevent.py %%SAMBA4_BUNDLED_TEVENT%%lib/samba4/private/libtevent.so.0 %%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbadd.1.gz %%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbdel.1.gz diff --git a/net/samba413/Makefile b/net/samba413/Makefile index 4451cc32fb5f..2305173f5a1e 100644 --- a/net/samba413/Makefile +++ b/net/samba413/Makefile @@ -22,7 +22,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/0001-Zfs-provision-1.patch:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.13.7 +SAMBA4_VERSION= 4.13.8 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} diff --git a/net/samba413/distinfo b/net/samba413/distinfo index 009b229bb627..eac112201282 100644 --- a/net/samba413/distinfo +++ b/net/samba413/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1616597731 -SHA256 (samba-4.13.7.tar.gz) = 4e7d700867071047be74d802e25f071255bb7f382c2d788ecb7526fa61c95baa -SIZE (samba-4.13.7.tar.gz) = 18432921 +TIMESTAMP = 1619833148 +SHA256 (samba-4.13.8.tar.gz) = 3347c0c62cc5b1df1fc92d802282e809c354bfb4941a33c91a7fda3795efbf7f +SIZE (samba-4.13.8.tar.gz) = 18438995 diff --git a/net/samba413/files/patch-bind b/net/samba413/files/patch-bind index 78e3f5523d4f..137d00026136 100644 --- a/net/samba413/files/patch-bind +++ b/net/samba413/files/patch-bind @@ -64,7 +64,7 @@ + + bind9_dlz = ( + ' # For %s\n' -+ ' %sdatabase %s/bind9/dlz_bind%s.so";' ++ ' %sdatabase "dlopen %s/bind9/dlz_bind%s.so";' + ) % ( + bind9_version, bind9_disabled, samba.param.modules_dir(), bind9_dlz_version + ) diff --git a/net/samba413/files/patch-linuxisms b/net/samba413/files/patch-linuxisms new file mode 100644 index 000000000000..36d2ac1bc26e --- /dev/null +++ b/net/samba413/files/patch-linuxisms @@ -0,0 +1,91 @@ +--- libcli/http/http.c.orig 2020-07-09 13:33:56 ++++ libcli/http/http.c +@@ -141,7 +141,19 @@ static enum http_read_status http_parse_headers(struct + return HTTP_ALL_DATA_READ; + } + ++#ifdef FREEBSD ++ int s0, s1, s2, s3; s0 = s1 = s2 = s3 = 0; ++ n = sscanf(line, "%n%*[^:]%n: %n%*[^\r\n]%n\r\n", &s0, &s1, &s2, &s3); ++ ++ if(n >= 0) { ++ key = calloc(sizeof(char), s1-s0+1); ++ value = calloc(sizeof(char), s3-s2+1); ++ ++ n = sscanf(line, "%[^:]: %[^\r\n]\r\n", key, value); ++ } ++#else + n = sscanf(line, "%m[^:]: %m[^\r\n]\r\n", &key, &value); ++#endif + if (n != 2) { + DEBUG(0, ("%s: Error parsing header '%s'\n", __func__, line)); + status = HTTP_DATA_CORRUPTED; +@@ -167,7 +179,7 @@ error: + static bool http_parse_response_line(struct http_read_response_state *state) + { + bool status = true; +- char *protocol; ++ char *protocol = NULL; + char *msg = NULL; + char major; + char minor; +@@ -187,18 +199,32 @@ static bool http_parse_response_line(struct http_read_ + return false; + } + ++#ifdef FREEBSD ++ int s0, s1, s2, s3; s0 = s1 = s2 = s3 = 0; ++ n = sscanf(line, "%n%*[^/]%n/%c.%c %d %n%*[^\r\n]%n\r\n", ++ &s0, &s1, &major, &minor, &code, &s2, &s3); ++ ++ if(n == 3) { ++ protocol = calloc(sizeof(char), s1-s0+1); ++ msg = calloc(sizeof(char), s3-s2+1); ++ ++ n = sscanf(line, "%[^/]/%c.%c %d %[^\r\n]\r\n", ++ protocol, &major, &minor, &code, msg); ++ } ++#else + n = sscanf(line, "%m[^/]/%c.%c %d %m[^\r\n]\r\n", + &protocol, &major, &minor, &code, &msg); ++#endif + +- DEBUG(11, ("%s: Header parsed(%i): protocol->%s, major->%c, minor->%c, " +- "code->%d, message->%s\n", __func__, n, protocol, major, minor, +- code, msg)); +- + if (n != 5) { + DEBUG(0, ("%s: Error parsing header\n", __func__)); + status = false; *** 32 LINES SKIPPED *** From owner-dev-commits-ports-branches@freebsd.org Fri May 28 12:51:15 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 93B5D653287; Fri, 28 May 2021 12:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fs4LW3p4nz3GBy; Fri, 28 May 2021 12:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6A5CD17578; Fri, 28 May 2021 12:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14SCpF1G074630; Fri, 28 May 2021 12:51:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14SCpFSu074629; Fri, 28 May 2021 12:51:15 GMT (envelope-from git) Date: Fri, 28 May 2021 12:51:15 GMT Message-Id: <202105281251.14SCpFSu074629@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dima Panov Subject: git: 139e75894d46 - 2021Q2 - graphics/gimp-app: use canonical name for AALIB option MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 139e75894d4643c41415dfd4895ef7753a330d92 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 May 2021 12:51:15 -0000 The branch 2021Q2 has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=139e75894d4643c41415dfd4895ef7753a330d92 commit 139e75894d4643c41415dfd4895ef7753a330d92 Author: Dima Panov AuthorDate: 2021-05-28 12:49:09 +0000 Commit: Dima Panov CommitDate: 2021-05-28 12:51:03 +0000 graphics/gimp-app: use canonical name for AALIB option PR: 255819 Submitted by: amdmi3@ (cherry picked from commit b2d56ea4ae001063d2546bd1a772c053008bdd97) --- graphics/gimp-app/Makefile | 10 +++++----- graphics/gimp-app/pkg-plist | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index 4083df205b43..17f99eb2515f 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -82,9 +82,9 @@ PLIST_SUB+= LIBVER=0.1000.${PORTVERSION:E} USES+= desktop-file-utils -OPTIONS_DEFINE?= AA GHOSTSCRIPT \ +OPTIONS_DEFINE?= AALIB GHOSTSCRIPT \ LIBHEIF LIBMNG OPENEXR OPENJPEG SIMD WEBP WMF -OPTIONS_DEFAULT= AA LIBMNG OPENEXR OPENJPEG SIMD WEBP WMF +OPTIONS_DEFAULT= AALIB LIBMNG OPENEXR OPENJPEG SIMD WEBP WMF OPTIONS_SUB= yes .endif @@ -101,9 +101,9 @@ LIB_DEPENDS+= libgimp-2.0.so:graphics/gimp-app DEBUG_CONFIGURE_ON= --enable-debug -AA_DESC= Ascii-art Plug-in -AA_LIB_DEPENDS= libaa.so:graphics/aalib -AA_CONFIGURE_WITH= aa +AALIB_DESC= Ascii-art Plug-in +AALIB_LIB_DEPENDS= libaa.so:graphics/aalib +AALIB_CONFIGURE_WITH= aa LIBHEIF_DESC= ISO/IEC 23008-12:2017 HEIF file format support LIBHEIF_LIB_DEPENDS= libheif.so:graphics/libheif diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist index 3c4440ffd45b..d6a2d8e5a5bb 100644 --- a/graphics/gimp-app/pkg-plist +++ b/graphics/gimp-app/pkg-plist @@ -309,7 +309,7 @@ libexec/gimp/2.2/plug-ins/despeckle/despeckle libexec/gimp/2.2/plug-ins/destripe/destripe libexec/gimp/2.2/plug-ins/edge-dog/edge-dog libexec/gimp/2.2/plug-ins/emboss/emboss -%%AA%%libexec/gimp/2.2/plug-ins/file-aa/file-aa +%%AALIB%%libexec/gimp/2.2/plug-ins/file-aa/file-aa libexec/gimp/2.2/plug-ins/file-bmp/file-bmp libexec/gimp/2.2/plug-ins/file-cel/file-cel libexec/gimp/2.2/plug-ins/file-compressor/file-compressor From owner-dev-commits-ports-branches@freebsd.org Fri May 28 23:24:08 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1E26C6343D8; Fri, 28 May 2021 23:24:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FsLNm0M3pz3C3T; Fri, 28 May 2021 23:24:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E8ACF20126; Fri, 28 May 2021 23:24:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14SNO7U8010020; Fri, 28 May 2021 23:24:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14SNO7Oe010019; Fri, 28 May 2021 23:24:07 GMT (envelope-from git) Date: Fri, 28 May 2021 23:24:07 GMT Message-Id: <202105282324.14SNO7Oe010019@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 3c770fea0977 - 2021Q2 - devel/rust-cbindgen: update to 0.19.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 3c770fea0977b1b0c1a6a97634ccf899cfbff777 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 May 2021 23:24:08 -0000 The branch 2021Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=3c770fea0977b1b0c1a6a97634ccf899cfbff777 commit 3c770fea0977b1b0c1a6a97634ccf899cfbff777 Author: Jan Beich AuthorDate: 2021-04-08 16:19:38 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2021-05-28 23:23:18 +0000 devel/rust-cbindgen: update to 0.19.0 Changes: https://github.com/eqrion/cbindgen/releases/tag/v0.19.0 Reported by: GitHub (watch releases) (cherry picked from commit 2ac2c33875a4fcb11d6d2fb445fb55888ec25051) --- devel/rust-cbindgen/Makefile | 3 +-- devel/rust-cbindgen/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/devel/rust-cbindgen/Makefile b/devel/rust-cbindgen/Makefile index a5ad4f22d706..61ee52f13900 100644 --- a/devel/rust-cbindgen/Makefile +++ b/devel/rust-cbindgen/Makefile @@ -1,7 +1,6 @@ PORTNAME= cbindgen -DISTVERSION= 0.18.0 -PORTREVISION= 1 +DISTVERSION= 0.19.0 CATEGORIES= devel MASTER_SITES= CRATESIO PKGNAMEPREFIX= rust- diff --git a/devel/rust-cbindgen/distinfo b/devel/rust-cbindgen/distinfo index d70198570e5c..0b037a4ecc50 100644 --- a/devel/rust-cbindgen/distinfo +++ b/devel/rust-cbindgen/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1614370164 -SHA256 (rust/crates/cbindgen-0.18.0.tar.gz) = 97449daf9b8c245bcad10bbc7c9f4a37c06172c18dd5f9fac340deefc309b957 -SIZE (rust/crates/cbindgen-0.18.0.tar.gz) = 180380 +TIMESTAMP = 1617898778 +SHA256 (rust/crates/cbindgen-0.19.0.tar.gz) = 38728c31b994e4b849cf59feefb4a8bf26acd299ee0b92c9fb35bd14ad4b8dfa +SIZE (rust/crates/cbindgen-0.19.0.tar.gz) = 181286 SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b SIZE (rust/crates/ansi_term-0.11.0.tar.gz) = 17087 SHA256 (rust/crates/atty-0.2.14.tar.gz) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8 From owner-dev-commits-ports-branches@freebsd.org Fri May 28 23:24:55 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CC8CA634657; Fri, 28 May 2021 23:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FsLPg5TYzz3C5m; Fri, 28 May 2021 23:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A0F5220127; Fri, 28 May 2021 23:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14SNOtN5010601; Fri, 28 May 2021 23:24:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14SNOtXH010600; Fri, 28 May 2021 23:24:55 GMT (envelope-from git) Date: Fri, 28 May 2021 23:24:55 GMT Message-Id: <202105282324.14SNOtXH010600@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: e9f452ba35e6 - 2021Q2 - www/firefox: update to 89.0 (rc2) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: e9f452ba35e630f91469ec3ef4adb0c3804f29f1 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 May 2021 23:24:55 -0000 The branch 2021Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=e9f452ba35e630f91469ec3ef4adb0c3804f29f1 commit e9f452ba35e630f91469ec3ef4adb0c3804f29f1 Author: Christoph Moench-Tegeder AuthorDate: 2021-05-28 23:15:43 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2021-05-28 23:24:33 +0000 www/firefox: update to 89.0 (rc2) Release Notes (soon): https://www.mozilla.org/en-US/firefox/89.0/releasenotes/ (cherry picked from commit a05a34b83a19cbbc0a07c905f3c6744ea3dc8116) --- www/firefox/Makefile | 3 ++- www/firefox/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 85b7ab212bbc..fae52637c7c1 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -2,10 +2,11 @@ PORTNAME= firefox DISTVERSION= 89.0 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 524e7a2c2f81..94056f782f2b 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1621929239 -SHA256 (firefox-89.0.source.tar.xz) = 926584209afc12920bf24f8d28e1e186c8ef9bd245376d18a89356f94aadd279 -SIZE (firefox-89.0.source.tar.xz) = 372248708 +TIMESTAMP = 1622239541 +SHA256 (firefox-89.0.source.tar.xz) = db43d7d5796455051a5b847f6daa3423393803c9288c8b6d7f1186f5e2e0a90a +SIZE (firefox-89.0.source.tar.xz) = 371153536 From owner-dev-commits-ports-branches@freebsd.org Fri May 28 23:27:47 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9893663451D; Fri, 28 May 2021 23:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FsLSz3sCHz3Cbt; Fri, 28 May 2021 23:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6C62A200B3; Fri, 28 May 2021 23:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14SNRlkY012245; Fri, 28 May 2021 23:27:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14SNRlba012244; Fri, 28 May 2021 23:27:47 GMT (envelope-from git) Date: Fri, 28 May 2021 23:27:47 GMT Message-Id: <202105282327.14SNRlba012244@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 50477f68e31b - 2021Q2 - Mk/bsd.gecko.mk: bump rust-cbindgen dependency to 0.19.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 50477f68e31baa36286fd8d9239766ce9133225a Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 May 2021 23:27:47 -0000 The branch 2021Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=50477f68e31baa36286fd8d9239766ce9133225a commit 50477f68e31baa36286fd8d9239766ce9133225a Author: Christoph Moench-Tegeder AuthorDate: 2021-05-28 23:17:47 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2021-05-28 23:27:26 +0000 Mk/bsd.gecko.mk: bump rust-cbindgen dependency to 0.19.0 that's required for Firefox 89.0, and works for Thunderbird, too Log: http://beefy13.nyi.freebsd.org/data/130i386-quarterly/ec4bc9831585/logs/firefox-89.0,2.log Dependency defined in: build/moz.configure/bindgen.configure Reported by: pkg-fallout (cherry picked from commit 542fc012150030542a7eb9cc32c0bad96d4ef479) --- Mk/bsd.gecko.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 6714f8d145fe..6a89b04159f4 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -75,7 +75,7 @@ BINARY_ALIAS+= python3=${PYTHON_CMD} BUNDLE_LIBS= yes BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \ - rust-cbindgen>=0.16.0:devel/rust-cbindgen \ + rust-cbindgen>=0.19.0:devel/rust-cbindgen \ ${RUST_DEFAULT}>=1.51.0:lang/${RUST_DEFAULT} \ node:www/node LIB_DEPENDS+= libdrm.so:graphics/libdrm From owner-dev-commits-ports-branches@freebsd.org Sat May 29 06:41:00 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 45CDD63AC28; Sat, 29 May 2021 06:41:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FsX4r1Kyqz3rWw; Sat, 29 May 2021 06:41:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 15D25257C2; Sat, 29 May 2021 06:41:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14T6exoe000460; Sat, 29 May 2021 06:40:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14T6exd7000459; Sat, 29 May 2021 06:40:59 GMT (envelope-from git) Date: Sat, 29 May 2021 06:40:59 GMT Message-Id: <202105290640.14T6exd7000459@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Koichiro Iwao Subject: git: d0644f544ca6 - 2021Q2 - devel/ruby-build: Update to 20210526 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: meta X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: d0644f544ca67bc5fc2d0c203147db9c3e19ca37 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 May 2021 06:41:00 -0000 The branch 2021Q2 has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=d0644f544ca67bc5fc2d0c203147db9c3e19ca37 commit d0644f544ca67bc5fc2d0c203147db9c3e19ca37 Author: Koichiro Iwao AuthorDate: 2021-05-29 02:02:14 +0000 Commit: Koichiro Iwao CommitDate: 2021-05-29 02:10:32 +0000 devel/ruby-build: Update to 20210526 Relnotes: https://github.com/rbenv/ruby-build/releases/tag/v20210510 Relnotes: https://github.com/rbenv/ruby-build/releases/tag/v20210526 (cherry picked from commit b43fe9f1bfde6ef6a24d0f45baf9d6295d15b72a) --- devel/ruby-build/Makefile | 2 +- devel/ruby-build/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/ruby-build/Makefile b/devel/ruby-build/Makefile index 51db6c4d5395..52bb125e5dc2 100644 --- a/devel/ruby-build/Makefile +++ b/devel/ruby-build/Makefile @@ -1,6 +1,6 @@ PORTNAME= ruby-build -PORTVERSION= 20210423 +PORTVERSION= 20210526 DISTVERSIONPREFIX= v CATEGORIES= devel ruby DIST_SUBDIR= rbenv diff --git a/devel/ruby-build/distinfo b/devel/ruby-build/distinfo index 2b150dbb8395..463e808d5418 100644 --- a/devel/ruby-build/distinfo +++ b/devel/ruby-build/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619183128 -SHA256 (rbenv/rbenv-ruby-build-v20210423_GH0.tar.gz) = bffdf6f9572a9a2d3cf6d9cbc44a27470b5c9b77009abd3489876a2e452e44ac -SIZE (rbenv/rbenv-ruby-build-v20210423_GH0.tar.gz) = 71007 +TIMESTAMP = 1622094552 +SHA256 (rbenv/rbenv-ruby-build-v20210526_GH0.tar.gz) = 1d311dfa06061163769ad332df8041039f98ae6bc9bc7847f2187b5591e59666 +SIZE (rbenv/rbenv-ruby-build-v20210526_GH0.tar.gz) = 71014 From owner-dev-commits-ports-branches@freebsd.org Sat May 29 10:55:56 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3F3E163E420; Sat, 29 May 2021 10:55:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fsdl011BTz4hLk; Sat, 29 May 2021 10:55:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 06DB2CAD; Sat, 29 May 2021 10:55:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14TAttOj037575; Sat, 29 May 2021 10:55:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14TAttfD037574; Sat, 29 May 2021 10:55:55 GMT (envelope-from git) Date: Sat, 29 May 2021 10:55:55 GMT Message-Id: <202105291055.14TAttfD037574@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Andree Subject: git: e29840cb4261 - 2021Q2 - security/openvpn-devel: switch to Gitlab and new maintainer MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: e29840cb4261abfd9a5aaeda433466f23d920636 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 May 2021 10:55:56 -0000 The branch 2021Q2 has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=e29840cb4261abfd9a5aaeda433466f23d920636 commit e29840cb4261abfd9a5aaeda433466f23d920636 Author: Matthias Andree AuthorDate: 2021-05-29 09:48:46 +0000 Commit: Matthias Andree CommitDate: 2021-05-29 10:55:23 +0000 security/openvpn-devel: switch to Gitlab and new maintainer The previous maintainer asked that the port be removed, but we seem to have found a better solution. Gert Doering volunteered to take over the port and reference Git directly. Import security/openvpn fix for leftover .orig files. PR: 256209 Maintainer change implicitly Approved by: ecrist@secure-computing.net (removal request) New contents reviewed and Approved by: gert@greenie.muc.de (new maintainer, by IRC/mail) MFH because original port no longer fetchable, Eric F. Crist removed his download files. (cherry picked from commit 9364842b3b08f9eaa49bf80c7c14550c2689ab7f) --- security/openvpn-devel/Makefile | 122 +++++++++++---------- security/openvpn-devel/distinfo | 6 +- .../files/patch-src_openvpn_openssl__compat.h | 20 ---- 3 files changed, 68 insertions(+), 80 deletions(-) diff --git a/security/openvpn-devel/Makefile b/security/openvpn-devel/Makefile index f942b69ff7e6..842e7f77fe82 100644 --- a/security/openvpn-devel/Makefile +++ b/security/openvpn-devel/Makefile @@ -1,94 +1,101 @@ # Created by: Matthias Andree -PORTNAME= openvpn -DISTVERSION= 202113 -CATEGORIES= security net net-vpn -MASTER_SITES= https://secure-computing.net/files/openvpn/ -PKGNAMESUFFIX= -devel +PORTNAME= openvpn +DISTVERSION= g20210527 +PORTEPOCH= 1 +CATEGORIES= security net net-vpn +PKGNAMESUFFIX= -devel -MAINTAINER= ecrist@secure-computing.net +MAINTAINER= gert@greenie.muc.de # let's use ?= in spite of portlint WARNings because this might become # security/openvpn one day which would then have a slave port: -COMMENT?= Secure IP/Ethernet tunnel daemon +COMMENT?= Secure IP/Ethernet tunnel daemon -LICENSE= GPLv2 +LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYRIGHT.GPL -IGNORE_SSL= libressl libressl-devel +BUILD_DEPENDS+= cmocka>=0:sysutils/cmocka \ + rst2man:textproc/py-docutils +LIB_DEPENDS+= liblzo2.so:archivers/lzo2 -USES= cpe libtool pkgconfig shebangfix tar:xz +USES= autoreconf cpe libtool pkgconfig shebangfix tar:xz +IGNORE_SSL= libressl libressl-devel +USE_GITLAB= yes +GL_COMMIT= 890225c1783d0f11b2092495ff902a46d7d0d4cd +USE_RC_SUBR= openvpn + +SHEBANG_FILES= sample/sample-scripts/auth-pam.pl sample/sample-scripts/ucn.pl \ + sample/sample-scripts/verify-cn -CONFLICTS_INSTALL?= openvpn-2.[!4].* openvpn-[!2].* openvpn-beta-[0-9]* openvpn-devel-[0-9]* openvpn-mbedtls-[0-9]* GNU_CONFIGURE= yes -WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX} -SHEBANG_FILES= sample/sample-scripts/verify-cn \ - sample/sample-scripts/auth-pam.pl \ - sample/sample-scripts/ucn.pl CONFIGURE_ARGS+= --enable-strict # set PLUGIN_LIBDIR so that unqualified plugin paths are found: CONFIGURE_ENV+= PLUGINDIR="${PREFIX}/lib/openvpn/plugins" # let OpenVPN's configure script pick up the requisite libraries, # but do not break the plugin build if an older version is installed -CPPFLAGS+= -I${WRKSRC}/include -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -OPTIONS_DEFINE= PKCS11 EASYRSA DOCS EXAMPLES X509ALTUSERNAME \ - TEST LZ4 SMALL TUNNELBLICK -OPTIONS_DEFAULT= EASYRSA OPENSSL TEST LZ4 -OPTIONS_SINGLE= SSL -OPTIONS_SINGLE_SSL= OPENSSL MBEDTLS -PKCS11_DESC= Use security/pkcs11-helper -EASYRSA_DESC= Install security/easy-rsa RSA helper package -MBEDTLS_DESC= SSL/TLS via mbedTLS (lacks TLS v1.3) -TUNNELBLICK_DESC= Tunnelblick XOR scramble patch (READ HELP!) -X509ALTUSERNAME_DESC= Enable --x509-username-field (OpenSSL only) -SMALL_DESC= Build a smaller executable with fewer features +.ifdef (LOG_OPENVPN) +CFLAGS+= -DLOG_OPENVPN=${LOG_OPENVPN} +.endif -EASYRSA_RUN_DEPENDS= easy-rsa>=0:security/easy-rsa +CPPFLAGS+= -I${WRKSRC}/include -I${LOCALBASE}/include -DCONFIGURE_GIT_REVISION='\"${GL_COMMIT}\"' -DCONFIGURE_GIT_FLAGS= +LDFLAGS+= -L${LOCALBASE}/lib -PKCS11_LIB_DEPENDS= libpkcs11-helper.so:security/pkcs11-helper -PKCS11_CONFIGURE_ENABLE= pkcs11 -PKCS11_PREVENTS= MBEDTLS -PKCS11_PREVENTS_MSG= OpenVPN cannot use pkcs11-helper with mbedTLS. Disable PKCS11, or use OpenSSL instead +CONFLICTS_INSTALL?= openvpn-2.[!4].* openvpn-[!2].* openvpn-beta-[0-9]* \ + openvpn-devel-[0-9]* openvpn-mbedtls-[0-9]* -TUNNELBLICK_EXTRA_PATCHES= ${FILESDIR}/extra-tunnelblick-openvpn_xorpatch +SUB_FILES= openvpn-client pkg-message -X509ALTUSERNAME_CONFIGURE_ENABLE= x509-alt-username +PORTDOCS= * +PORTEXAMPLES= * +OPTIONS_DEFINE= DOCS EASYRSA EXAMPLES LZ4 PKCS11 SMALL TEST TUNNELBLICK \ + X509ALTUSERNAME +OPTIONS_DEFAULT= EASYRSA LZ4 OPENSSL TEST +OPTIONS_SINGLE= SSL +OPTIONS_SINGLE_SSL= MBEDTLS OPENSSL + +# option descriptions and interdependencies + +EASYRSA_DESC= Install security/easy-rsa RSA helper package +MBEDTLS_DESC= SSL/TLS via mbedTLS (lacks TLS v1.3) +PKCS11_DESC= Use security/pkcs11-helper +PKCS11_PREVENTS= MBEDTLS +PKCS11_PREVENTS_MSG= OpenVPN cannot use pkcs11-helper with mbedTLS. \ + Disable PKCS11, or use OpenSSL instead +SMALL_DESC= Build a smaller executable with fewer features +TUNNELBLICK_DESC= Tunnelblick XOR scramble patch (READ HELP!) +X509ALTUSERNAME_DESC= Enable --x509-username-field (OpenSSL only) X509ALTUSERNAME_PREVENTS= MBEDTLS -X509ALTUSERNAME_PREVENTS_MSG= OpenVPN ${DISTVERSION} cannot use --x509-username-field with mbedTLS. Disable X509ALTUSERNAME, or use OpenSSL instead +X509ALTUSERNAME_PREVENTS_MSG= OpenVPN ${DISTVERSION} cannot use \ + --x509-username-field with mbedTLS. Disable \ + X509ALTUSERNAME, or use OpenSSL instead -OPENSSL_USES= ssl -OPENSSL_CONFIGURE_ON= --with-crypto-library=openssl +# option implementations -LZ4_CONFIGURE_OFF= --disable-lz4 +EASYRSA_RUN_DEPENDS= easy-rsa>=0:security/easy-rsa -SMALL_CONFIGURE_ON= --enable-small +LZ4_LIB_DEPENDS+= liblz4.so:archivers/liblz4 +LZ4_CONFIGURE_OFF= --disable-lz4 MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls MBEDTLS_CONFIGURE_ON= --with-crypto-library=mbedtls -USE_RC_SUBR= openvpn - -SUB_FILES= pkg-message openvpn-client - -.ifdef (LOG_OPENVPN) -CFLAGS+= -DLOG_OPENVPN=${LOG_OPENVPN} -.endif - -BUILD_DEPENDS+= cmocka>=0:sysutils/cmocka \ - rst2man:textproc/py-docutils -LIB_DEPENDS+= liblzo2.so:archivers/lzo2 +OPENSSL_USES= ssl +OPENSSL_CONFIGURE_ON= --with-crypto-library=openssl -LZ4_LIB_DEPENDS+= liblz4.so:archivers/liblz4 +PKCS11_LIB_DEPENDS= libpkcs11-helper.so:security/pkcs11-helper +PKCS11_CONFIGURE_ENABLE= pkcs11 -PORTDOCS= * -PORTEXAMPLES= * +SMALL_CONFIGURE_ON= --enable-small TEST_ALL_TARGET= check TEST_TEST_TARGET_OFF= check +TUNNELBLICK_EXTRA_PATCHES= ${FILESDIR}/extra-tunnelblick-openvpn_xorpatch + +X509ALTUSERNAME_CONFIGURE_ENABLE= x509-alt-username + pre-configure: .ifdef (LOG_OPENVPN) @${ECHO} "Building with LOG_OPENVPN=${LOG_OPENVPN}" @@ -109,10 +116,10 @@ post-configure: .include .if ${PORT_OPTIONS:MMBEDTLS} -_tlslibs=libmbedtls libmbedx509 libmbedcrypto +_tlslibs= libmbedtls libmbedx509 libmbedcrypto .else # OpenSSL -_tlslibs=libssl libcrypto +_tlslibs= libssl libcrypto .endif # sanity check that we don't inherit incompatible SSL libs through, @@ -140,5 +147,6 @@ post-install-DOCS-on: post-install-EXAMPLES-on: (cd ${WRKSRC}/sample && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/) ${CHMOD} ${BINMODE} ${STAGEDIR}${EXAMPLESDIR}/sample-scripts/* + ${RM} ${STAGEDIR}${EXAMPLESDIR}/sample-config-files/*.orig .include diff --git a/security/openvpn-devel/distinfo b/security/openvpn-devel/distinfo index a811b8535a88..8b9af1ac43cb 100644 --- a/security/openvpn-devel/distinfo +++ b/security/openvpn-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617626192 -SHA256 (openvpn-202113.tar.xz) = 54e5b6870855138fdc92e19354fb03665dde4dd7b899b1672a8fbd85d9b926e5 -SIZE (openvpn-202113.tar.xz) = 1065804 +TIMESTAMP = 1622278095 +SHA256 (openvpn-openvpn-890225c1783d0f11b2092495ff902a46d7d0d4cd_GL0.tar.gz) = 0677e95122f96634ad8b8215052f5cd51ccd554bbd70ab53a05f33c157b27554 +SIZE (openvpn-openvpn-890225c1783d0f11b2092495ff902a46d7d0d4cd_GL0.tar.gz) = 1133002 diff --git a/security/openvpn-devel/files/patch-src_openvpn_openssl__compat.h b/security/openvpn-devel/files/patch-src_openvpn_openssl__compat.h deleted file mode 100644 index 4f72e79ef421..000000000000 --- a/security/openvpn-devel/files/patch-src_openvpn_openssl__compat.h +++ /dev/null @@ -1,20 +0,0 @@ ---- src/openvpn/openssl_compat.h.orig 2019-02-20 12:28:23 UTC -+++ src/openvpn/openssl_compat.h -@@ -735,7 +735,7 @@ SSL_CTX_get_max_proto_version(SSL_CTX *ctx) - } - #endif /* SSL_CTX_get_max_proto_version */ - --#ifndef SSL_CTX_set_min_proto_version -+#if !defined(SSL_CTX_set_min_proto_version) && !defined(LIBRESSL_VERSION_NUMBER) - /** Mimics SSL_CTX_set_min_proto_version for OpenSSL < 1.1 */ - static inline int - SSL_CTX_set_min_proto_version(SSL_CTX *ctx, long tls_ver_min) -@@ -764,7 +764,7 @@ SSL_CTX_set_min_proto_version(SSL_CTX *ctx, long tls_v - } - #endif /* SSL_CTX_set_min_proto_version */ - --#ifndef SSL_CTX_set_max_proto_version -+#if !defined(SSL_CTX_set_max_proto_version) && !defined(LIBRESSL_VERSION_NUMBER) - /** Mimics SSL_CTX_set_max_proto_version for OpenSSL < 1.1 */ - static inline int - SSL_CTX_set_max_proto_version(SSL_CTX *ctx, long tls_ver_max) From owner-dev-commits-ports-branches@freebsd.org Sun May 30 09:42:22 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1D3E465207C; Sun, 30 May 2021 09:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FtD3f0N4Jz4VtQ; Sun, 30 May 2021 09:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EA7541ADD9; Sun, 30 May 2021 09:42:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14U9gLTM049948; Sun, 30 May 2021 09:42:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14U9gL29049935; Sun, 30 May 2021 09:42:21 GMT (envelope-from git) Date: Sun, 30 May 2021 09:42:21 GMT Message-Id: <202105300942.14U9gL29049935@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dima Panov Subject: git: f09ca5935793 - 2021Q2 - databases/mysql57-*: update to 5.7.32 GA release MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: f09ca5935793c8a522d926cc4c7b3fe5807e4d3b Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 May 2021 09:42:22 -0000 The branch 2021Q2 has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=f09ca5935793c8a522d926cc4c7b3fe5807e4d3b commit f09ca5935793c8a522d926cc4c7b3fe5807e4d3b Author: Dima Panov AuthorDate: 2021-05-30 09:39:09 +0000 Commit: Dima Panov CommitDate: 2021-05-30 09:42:00 +0000 databases/mysql57-*: update to 5.7.32 GA release Release Notes: https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-34.html PR: 255748 (based on) MFH: 2021Q2 Approved by: joneum@ (implicit) (cherry picked from commit ebbb2d513387c14bbb667f88e84ffbdb87a4dda3) --- ...e_build__configurations_compiler__options.cmake | 16 +++++++-------- databases/mysql57-server/Makefile | 4 +++- databases/mysql57-server/distinfo | 6 +++--- ...e_build__configurations_compiler__options.cmake | 20 ++++++++++++++++++ ...oup__replication_src_recovery_state_transfer.cc | 20 ++++++++++++++++++ databases/mysql57-server/files/patch-sql_binlog.cc | 24 ++++++++++++++++++++++ .../files/patch-sql_locks_shared__spin__lock.cc | 12 +++++------ .../files/patch-storage_innobase_fsp_fsp0fsp.cc | 11 ++++++++++ 8 files changed, 95 insertions(+), 18 deletions(-) diff --git a/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake b/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake index 713c197992bc..f8c13ec7c398 100644 --- a/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake +++ b/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake @@ -1,20 +1,20 @@ --- cmake/build_configurations/compiler_options.cmake.orig 2016-08-25 11:52:06 UTC +++ cmake/build_configurations/compiler_options.cmake -@@ -29,7 +29,7 @@ IF(UNIX) +@@ -43,7 +43,7 @@ IF(UNIX) # Default GCC flags IF(CMAKE_COMPILER_IS_GNUCC) -- SET(COMMON_C_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") -+ SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") +- SET(COMMON_C_FLAGS "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") ++ SET(COMMON_C_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing") # Disable inline optimizations for valgrind testing to avoid false positives IF(WITH_VALGRIND) - SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}") -@@ -42,7 +42,7 @@ IF(UNIX) - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") + STRING_PREPEND(COMMON_C_FLAGS "-fno-inline ") +@@ -68,7 +68,7 @@ IF(UNIX) + ENDIF() ENDIF() IF(CMAKE_COMPILER_IS_GNUCXX) -- SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") -+ SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") +- SET(COMMON_CXX_FLAGS "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") ++ SET(COMMON_CXX_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing") # GCC 6 has C++14 as default, set it explicitly to the old default. EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GXX_VERSION) diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile index 1af690f7166a..0b35f4507a2c 100644 --- a/databases/mysql57-server/Makefile +++ b/databases/mysql57-server/Makefile @@ -1,7 +1,7 @@ # Created by: Mahdi Mokhtari PORTNAME?= mysql -PORTVERSION= 5.7.33 +PORTVERSION= 5.7.34 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-5.7 @@ -32,6 +32,8 @@ LIB_DEPENDS+= libcurl.so:ftp/curl \ CMAKE_BUILD_TYPE= Release +CXXFLAGS+= -DNDEBUG + CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \ -DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \ diff --git a/databases/mysql57-server/distinfo b/databases/mysql57-server/distinfo index 8821daa19afd..1eab4b5543c1 100644 --- a/databases/mysql57-server/distinfo +++ b/databases/mysql57-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1612332815 -SHA256 (mysql-boost-5.7.33.tar.gz) = cfcaf6f37a055d808fe1472eb0359864e2227aa0206c55c4e1961bab2ecc304b -SIZE (mysql-boost-5.7.33.tar.gz) = 52912380 +TIMESTAMP = 1621509617 +SHA256 (mysql-boost-5.7.34.tar.gz) = 5bc2c7c0bb944b5bb219480dde3c1caeb049e7351b5bba94c3b00ac207929c7b +SIZE (mysql-boost-5.7.34.tar.gz) = 52891142 diff --git a/databases/mysql57-server/files/patch-cmake_build__configurations_compiler__options.cmake b/databases/mysql57-server/files/patch-cmake_build__configurations_compiler__options.cmake new file mode 100644 index 000000000000..f8c13ec7c398 --- /dev/null +++ b/databases/mysql57-server/files/patch-cmake_build__configurations_compiler__options.cmake @@ -0,0 +1,20 @@ +--- cmake/build_configurations/compiler_options.cmake.orig 2016-08-25 11:52:06 UTC ++++ cmake/build_configurations/compiler_options.cmake +@@ -43,7 +43,7 @@ IF(UNIX) + + # Default GCC flags + IF(CMAKE_COMPILER_IS_GNUCC) +- SET(COMMON_C_FLAGS "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") ++ SET(COMMON_C_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing") + # Disable inline optimizations for valgrind testing to avoid false positives + IF(WITH_VALGRIND) + STRING_PREPEND(COMMON_C_FLAGS "-fno-inline ") +@@ -68,7 +68,7 @@ IF(UNIX) + ENDIF() + ENDIF() + IF(CMAKE_COMPILER_IS_GNUCXX) +- SET(COMMON_CXX_FLAGS "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") ++ SET(COMMON_CXX_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing") + # GCC 6 has C++14 as default, set it explicitly to the old default. + EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion + OUTPUT_VARIABLE GXX_VERSION) diff --git a/databases/mysql57-server/files/patch-rapid_plugin_group__replication_src_recovery_state_transfer.cc b/databases/mysql57-server/files/patch-rapid_plugin_group__replication_src_recovery_state_transfer.cc new file mode 100644 index 000000000000..42d191ec2da4 --- /dev/null +++ b/databases/mysql57-server/files/patch-rapid_plugin_group__replication_src_recovery_state_transfer.cc @@ -0,0 +1,20 @@ +--- rapid/plugin/group_replication/src/recovery_state_transfer.cc.orig 2021-03-26 06:58:52 UTC ++++ rapid/plugin/group_replication/src/recovery_state_transfer.cc +@@ -711,6 +711,7 @@ int Recovery_state_transfer::purge_recovery_slave_thre + donor_connection_interface.initialize_channel(const_cast(""), + 0, + NULL, NULL, ++ false, + NULL, + NULL, + NULL, +@@ -718,8 +719,7 @@ int Recovery_state_transfer::purge_recovery_slave_thre + NULL, + NULL, + NULL, +- NULL, +- NULL, ++ false, + DEFAULT_THREAD_PRIORITY, + 1, false, true, true); + diff --git a/databases/mysql57-server/files/patch-sql_binlog.cc b/databases/mysql57-server/files/patch-sql_binlog.cc new file mode 100644 index 000000000000..7367bc283603 --- /dev/null +++ b/databases/mysql57-server/files/patch-sql_binlog.cc @@ -0,0 +1,24 @@ +--- sql/binlog.cc.orig 2021-03-26 06:58:52 UTC ++++ sql/binlog.cc +@@ -9973,8 +9973,8 @@ void MYSQL_BIN_LOG::report_missing_purged_gtids(const + + char* missing_gtids= NULL; + char* slave_executed_gtids= NULL; +- gtid_missing.to_string(&missing_gtids, NULL); +- slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL); ++ gtid_missing.to_string(&missing_gtids, false); ++ slave_executed_gtid_set->to_string(&slave_executed_gtids, false); + + /* + Log the information about the missing purged GTIDs to the error log +@@ -10045,8 +10045,8 @@ void MYSQL_BIN_LOG::report_missing_gtids(const Gtid_se + Gtid_set gtid_missing(slave_executed_gtid_set->get_sid_map()); + gtid_missing.add_gtid_set(slave_executed_gtid_set); + gtid_missing.remove_gtid_set(previous_gtid_set); +- gtid_missing.to_string(&missing_gtids, NULL); +- slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL); ++ gtid_missing.to_string(&missing_gtids, false); ++ slave_executed_gtid_set->to_string(&slave_executed_gtids, false); + + String tmp_uuid; + uchar name[]= "slave_uuid"; diff --git a/databases/mysql57-server/files/patch-sql_locks_shared__spin__lock.cc b/databases/mysql57-server/files/patch-sql_locks_shared__spin__lock.cc index 44325de6c602..ca63b9f31439 100644 --- a/databases/mysql57-server/files/patch-sql_locks_shared__spin__lock.cc +++ b/databases/mysql57-server/files/patch-sql_locks_shared__spin__lock.cc @@ -1,11 +1,11 @@ ---- sql/locks/shared_spin_lock.cc.orig 2020-12-10 03:01:55 UTC +--- sql/locks/shared_spin_lock.cc.orig 2021-05-20 11:22:55 UTC +++ sql/locks/shared_spin_lock.cc -@@ -239,7 +239,7 @@ lock::Shared_spin_lock &lock::Shared_spin_lock::try_or - { - this->spin_exclusive_lock(); - } +@@ -242,7 +242,7 @@ lock::Shared_spin_lock &lock::Shared_spin_lock::try_or + #if defined(__APPLE__) + my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast(self)); + #else - my_atomic_store64(&this->m_exclusive_owner, self); + my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast(self)); + #endif return (*this); } - diff --git a/databases/mysql57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc b/databases/mysql57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc new file mode 100644 index 000000000000..8d2627e75010 --- /dev/null +++ b/databases/mysql57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc @@ -0,0 +1,11 @@ +--- storage/innobase/fsp/fsp0fsp.cc.orig 2021-03-26 06:58:52 UTC ++++ storage/innobase/fsp/fsp0fsp.cc +@@ -1281,7 +1281,7 @@ fsp_header_decode_encryption_info( + + if (elen == MY_AES_BAD_DATA) { + my_free(master_key); +- return(NULL); ++ return(false); + } + + /* Check checksum bytes. */ From owner-dev-commits-ports-branches@freebsd.org Sun May 30 15:40:35 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 094996577CD; Sun, 30 May 2021 15:40:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FtN0y6lGRz3D0c; Sun, 30 May 2021 15:40:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CF6CA1F98C; Sun, 30 May 2021 15:40:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14UFeYbw024465; Sun, 30 May 2021 15:40:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14UFeYrf024464; Sun, 30 May 2021 15:40:34 GMT (envelope-from git) Date: Sun, 30 May 2021 15:40:34 GMT Message-Id: <202105301540.14UFeYrf024464@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: c6ce38ae4397 - 2021Q2 - www/firefox: depend on libpci to qualify for WebRender by default MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: c6ce38ae4397e2e33b5d44bafbc558a3443ba33b Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 May 2021 15:40:35 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=c6ce38ae4397e2e33b5d44bafbc558a3443ba33b commit c6ce38ae4397e2e33b5d44bafbc558a3443ba33b Author: Jan Beich AuthorDate: 2021-05-30 14:20:26 +0000 Commit: Jan Beich CommitDate: 2021-05-30 15:38:55 +0000 www/firefox: depend on libpci to qualify for WebRender by default On Intel Skylake this enables WebRender for Xorg and Wayland (wlroots). Xwayland isn't qualified yet but Firefox can be tricked by unsetting WAYLAND_DISPLAY or simply switching to native via MOZ_ENABLE_WAYLAND. PR: 255344 Reported by: Evgeniy Khramtsov (via gecko@ list) (cherry picked from commit f079b462f891b1e5c2cec31ac1190c73c17b0054) --- Mk/bsd.gecko.mk | 3 +++ www/firefox/Makefile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 6a89b04159f4..42e0fddff3e5 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -79,6 +79,9 @@ BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \ ${RUST_DEFAULT}>=1.51.0:lang/${RUST_DEFAULT} \ node:www/node LIB_DEPENDS+= libdrm.so:graphics/libdrm +.if ${MOZILLA_VER:R:R} >= 85 +RUN_DEPENDS+= ${LOCALBASE}/lib/libpci.so:devel/libpci +.endif MOZ_EXPORT+= ${CONFIGURE_ENV} \ PERL="${PERL}" \ PYTHON3="${PYTHON_CMD}" \ diff --git a/www/firefox/Makefile b/www/firefox/Makefile index fae52637c7c1..850c827c9513 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -2,7 +2,7 @@ PORTNAME= firefox DISTVERSION= 89.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ From owner-dev-commits-ports-branches@freebsd.org Sun May 30 18:32:32 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AB1BE6329E5; Sun, 30 May 2021 18:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FtRqN4SgHz3PvD; Sun, 30 May 2021 18:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 81A9D21763; Sun, 30 May 2021 18:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14UIWWiu054559; Sun, 30 May 2021 18:32:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14UIWWfg054558; Sun, 30 May 2021 18:32:32 GMT (envelope-from git) Date: Sun, 30 May 2021 18:32:32 GMT Message-Id: <202105301832.14UIWWfg054558@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 183f39e759ad - 2021Q2 - www/gallery-dl: update to 1.17.5 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 183f39e759adcb21a994c6320fc98da7093f4f04 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 May 2021 18:32:32 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=183f39e759adcb21a994c6320fc98da7093f4f04 commit 183f39e759adcb21a994c6320fc98da7093f4f04 Author: Jan Beich AuthorDate: 2021-05-30 17:24:00 +0000 Commit: Jan Beich CommitDate: 2021-05-30 18:31:31 +0000 www/gallery-dl: update to 1.17.5 Changes: https://github.com/mikf/gallery-dl/releases/tag/v1.17.5 Reported by: GitHub (watch releases) (cherry picked from commit f92880116d8bcbf171b38a9b770974a1f6bb3167) --- www/gallery-dl/Makefile | 2 +- www/gallery-dl/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/gallery-dl/Makefile b/www/gallery-dl/Makefile index 4708be445362..3b74b3918300 100644 --- a/www/gallery-dl/Makefile +++ b/www/gallery-dl/Makefile @@ -1,7 +1,7 @@ PORTNAME= gallery-dl DISTVERSIONPREFIX= v -DISTVERSION= 1.17.4 +DISTVERSION= 1.17.5 CATEGORIES= www # Implicit approval to commit trivial version updates. diff --git a/www/gallery-dl/distinfo b/www/gallery-dl/distinfo index f77b27b6bb6a..ce3cf2f6507e 100644 --- a/www/gallery-dl/distinfo +++ b/www/gallery-dl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1620416268 -SHA256 (mikf-gallery-dl-v1.17.4_GH0.tar.gz) = 61f3396edc717274f32af5a54cde9a671d9787ff46c1adfad37254f1e140308d -SIZE (mikf-gallery-dl-v1.17.4_GH0.tar.gz) = 354616 +TIMESTAMP = 1622395440 +SHA256 (mikf-gallery-dl-v1.17.5_GH0.tar.gz) = cc97557d84e5761f1af3d5706acb70760243aa7137b49253ce235a3f32d5f086 +SIZE (mikf-gallery-dl-v1.17.5_GH0.tar.gz) = 359212 From owner-dev-commits-ports-branches@freebsd.org Sun May 30 22:39:32 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 001AA638E2A; Sun, 30 May 2021 22:39:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FtYJM6f3Gz4f4W; Sun, 30 May 2021 22:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CCF9724EC5; Sun, 30 May 2021 22:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14UMdVxe080685; Sun, 30 May 2021 22:39:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14UMdVMw080684; Sun, 30 May 2021 22:39:31 GMT (envelope-from git) Date: Sun, 30 May 2021 22:39:31 GMT Message-Id: <202105302239.14UMdVMw080684@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 567aa9c05c47 - 2021Q2 - x11-toolkits/wlroots: backport fix for bundled libXcursor MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 567aa9c05c47773a68f12d168cfb2c249c3101d1 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 May 2021 22:39:32 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=567aa9c05c47773a68f12d168cfb2c249c3101d1 commit 567aa9c05c47773a68f12d168cfb2c249c3101d1 Author: Evgeniy Khramtsov AuthorDate: 2021-05-30 22:15:53 +0000 Commit: Jan Beich CommitDate: 2021-05-30 22:37:23 +0000 x11-toolkits/wlroots: backport fix for bundled libXcursor PR: 256274 Security: CVE-2013-2003 (cherry picked from commit fc72140f6f4a11e87aeb620aa7b9034308ef93ae) --- x11-toolkits/wlroots/Makefile | 2 ++ x11-toolkits/wlroots/distinfo | 2 ++ 2 files changed, 4 insertions(+) diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile index c300e99431a6..6f0082e98b8d 100644 --- a/x11-toolkits/wlroots/Makefile +++ b/x11-toolkits/wlroots/Makefile @@ -1,11 +1,13 @@ PORTNAME= wlroots DISTVERSION= 0.12.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 8bdf0df41719.patch:-p1 # https://github.com/swaywm/wlroots/pull/2064 PATCHFILES+= 90cb6d26877b.patch:-p1 # https://github.com/swaywm/wlroots/pull/2064 +PATCHFILES+= d0c1f0c0b637.patch:-p1 # https://github.com/swaywm/wlroots/pull/2908 MAINTAINER= jbeich@FreeBSD.org COMMENT= Modular Wayland compositor library diff --git a/x11-toolkits/wlroots/distinfo b/x11-toolkits/wlroots/distinfo index 3706fc23d866..7d15779683f0 100644 --- a/x11-toolkits/wlroots/distinfo +++ b/x11-toolkits/wlroots/distinfo @@ -5,5 +5,7 @@ SHA256 (8bdf0df41719.patch) = 038fb04b004f862f5ee9a2ad6f97592c94501283b17af6537d SIZE (8bdf0df41719.patch) = 5800 SHA256 (90cb6d26877b.patch) = 65c9c9f45d9916da143b76dec3280f7414c757ff2cf9992897ed69cfcaed5edd SIZE (90cb6d26877b.patch) = 3971 +SHA256 (d0c1f0c0b637.patch) = 489aae1a14e7fecde4acfd09b3321975adae9b191fc859894e38cfad1b1ea9b7 +SIZE (d0c1f0c0b637.patch) = 1129 SHA256 (fcee578b13eb.patch) = 641ae85b3730854f9cbafe9f5f27ddc7c79fa5eb59ff1f5d2ea64f6e6179ca29 SIZE (fcee578b13eb.patch) = 27688