From nobody Wed May 1 19:47:51 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VV6zq5p1lz5JxXK; Wed, 1 May 2024 19:47: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 4VV6zq51l4z4h34; Wed, 1 May 2024 19:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714592871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p/MNKIOuwaPYKx24S2e2JDKKCcuC0gqCBk9K+6yXDE0=; b=RFUy2KpldS1zvfSupI4UI7ruWnkSmNTdZqp5cEaY7c8DEieNYOl9cLWLqguoHT7CQsNDsW +1kVAiOncee6WADzFvPyGFmcHVNuTGxPtrS2seLu4/T9QGGg0HSrwOJ0IaX5JfXpVqxPgL OwXnqFhoPEMsllkTdfU25bWcBiaOT7X/u/V5CwTVOH9IM8UiDbN2XhR/O70R2Vj+/QATF4 L5464/fPsJ0M9y2v5zT9fKRBxMXlxEL0CPjOTxFbLT4hcOi5sZSVy5x56raarntQCxwWy+ rWQvZE8OV7t5Z2tZ77S8Ta0cChbnoXvSxl11SmJVA6CNgxP5OZd9/zuNxbgGEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714592871; a=rsa-sha256; cv=none; b=m15Do54RWOA4shcS78rtq1WNUauG5ZXqOBjGPb9LRK7CRCBwZ6ilmgfy/NGBx44OcieLDM FW7c2t42J6UuxtF+xpRiioOOj6dN97qcl5jmUXIsHIe0JMWCM5DF/QtC4LGz6BvCvhY27l SE1r+tZ3/lm/pe04AaPfTp5zWCKNa+BZ5wAlLeN+lJpiyv1avLUXHDJKl6prh/JhjDkjxH YCvDnh0J9JIefvMSVK+nisJABwSKO9ihWK38T0Di+LES+bwETKC4q1f0fykdw1BCjcxDhE ENC7QG6eL8b5KdAyZr+l5VVx1UQ572q+/+JWY2sCVbM+pxIf9GLrn1mTpW1cGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714592871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p/MNKIOuwaPYKx24S2e2JDKKCcuC0gqCBk9K+6yXDE0=; b=HAGm9Tm17kAa0pkZ3WTZQOHm53/ROAqiJiWUW/A4bmqeIpNPoltSBYxbnALFkXLhWVKJNa 4aYX+YRfT3q002nelERF5Td9d5hqhvUBxMWjecBBP3BGYlkhetIheVTl77aJodotjsmu8d TcdfV8+aJanOixmSK8097b6WBVLIVP9BqCnGuX0P3dtbKuOsz1a235np1qFtWBFYJS9Mm1 oafMgGgFadINNN+97KwpWM9WEn6tm1qi5YKaX/kK2P/x0RoxmXZnCzTMUlaX9w4rFif3lA 4HzIqbRXM6UvYzCzGXrr2jBmqJ5DD1Sb3Gj2ebN+giisSzaM0ZmEDIX5vU6wJQ== 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 4VV6zq4ct3zXtK; Wed, 1 May 2024 19:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 441JlpWE083365; Wed, 1 May 2024 19:47:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 441Jlp5T083362; Wed, 1 May 2024 19:47:51 GMT (envelope-from git) Date: Wed, 1 May 2024 19:47:51 GMT Message-Id: <202405011947.441Jlp5T083362@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 0bdbff31c50d - main - devel/busd: unbreak runtime after a6a8cadce02a List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org 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/main X-Git-Reftype: branch X-Git-Commit: 0bdbff31c50d12c07ba5370bf524d8ea86f9097a Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=0bdbff31c50d12c07ba5370bf524d8ea86f9097a commit 0bdbff31c50d12c07ba5370bf524d8ea86f9097a Author: Jan Beich AuthorDate: 2024-05-01 19:40:28 +0000 Commit: Jan Beich CommitDate: 2024-05-01 19:47:34 +0000 devel/busd: unbreak runtime after a6a8cadce02a --- devel/busd/Makefile | 3 +-- devel/busd/files/patch-zbus | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/devel/busd/Makefile b/devel/busd/Makefile index 42cbc9341a6b..76cd7bdd7bf8 100644 --- a/devel/busd/Makefile +++ b/devel/busd/Makefile @@ -1,5 +1,6 @@ PORTNAME= busd DISTVERSION= 0.3.0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org @@ -9,8 +10,6 @@ WWW= https://github.com/dbus2/busd LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE-MIT -IGNORE= https://github.com/dbus2/busd/issues/86 - USES= cargo USE_GITHUB= yes GH_ACCOUNT= dbus2 diff --git a/devel/busd/files/patch-zbus b/devel/busd/files/patch-zbus new file mode 100644 index 000000000000..f6d1c1014e41 --- /dev/null +++ b/devel/busd/files/patch-zbus @@ -0,0 +1,28 @@ +https://github.com/dbus2/zbus/pull/757 + +--- cargo-crates/zbus-4.2.0/src/connection/handshake/common.rs.orig 2006-07-24 01:21:28 UTC ++++ cargo-crates/zbus-4.2.0/src/connection/handshake/common.rs +@@ -122,17 +122,13 @@ impl Common { + if self.first_command { + // The first command is sent by the client so we can assume it's the server. + self.first_command = false; +- // leading 0 is sent separately for `freebsd` and `dragonfly`. +- #[cfg(not(any(target_os = "freebsd", target_os = "dragonfly")))] +- { +- if self.recv_buffer[0] != b'\0' { +- return Err(Error::Handshake( +- "First client byte is not NUL!".to_string(), +- )); +- } +- +- start_index = 1; ++ if self.recv_buffer[0] != b'\0' { ++ return Err(Error::Handshake( ++ "First client byte is not NUL!".to_string(), ++ )); + } ++ ++ start_index = 1; + }; + + let line_bytes = self.recv_buffer.drain(..=lf_index);