From nobody Mon Apr 11 07:58:47 2022 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 739B61AAEB77; Mon, 11 Apr 2022 07:58: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 4KcLpH2pVbz3Hpn; Mon, 11 Apr 2022 07:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649663927; 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=+6UhkmwzRPoDFL65gztZCjKv7v0Wn9f7lCWsWNVAJAw=; b=uj+nw2DCiFzJ4AjCAepeFVBP0hddlBQ3WFTT1cEHy9u8aoqQOMsyUmBCIhizI1FbQmOPVV 6eZzUMKMFmpChGec5UIKIRAmz3m5JCr578fG114c+4umww8IEBszdtK9ORTptjxrTrOPln ldw1F1od39lxKFj9y2dK3HhI/sx2mYapcH0rPgIagDdJRx5aRdTY2qK/H9R7xsYNxr48WF SHCp5HLD15C7od5LLnS3oE63/PJf90aidMNXkoy1xmIUs+YSRQp4VHNf4XBeAl5I/eFABv EdjYASfaP/FLpf+tw8BTU+gqYfhNcnakEFpLgVeMqKDt3qxbawBgf3maNkhjeQ== 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 407771F289; Mon, 11 Apr 2022 07:58: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 23B7wlUO057804; Mon, 11 Apr 2022 07:58:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23B7wlWN057803; Mon, 11 Apr 2022 07:58:47 GMT (envelope-from git) Date: Mon, 11 Apr 2022 07:58:47 GMT Message-Id: <202204110758.23B7wlWN057803@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: d90109c46f35 - main - sysutils/parkverbot: update the port to version 1.5 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d90109c46f356336fbfc3ee57eeb90135c2ff1f6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649663927; 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=+6UhkmwzRPoDFL65gztZCjKv7v0Wn9f7lCWsWNVAJAw=; b=b2FtMspvKlStnfV85Da80NSDB3DI9lya+iTI3jabKWE0Oj5s1+h0fuPfgxfenX6S/DA54E E/H6SHYF0aabUH1gI8p97QArBgtLcw8iHcNpDINqVHQseFchy31TMirwxJLQRYPOfidDan FWQmbR9AvDiarbfclNAQerDgzGK1ZzVdUWkJCR4IJ2/0mzngRfn33zNvISohrPBHcp3Uk3 1YjbJvDOf/kCjSpNhgVEs9rrhRPu7f4AapsfoSu9z5MEN+VRMuV+C2AFuWb1xTokgsvtwQ aPdY2tmuYCfEOTMWLRqS1YkM0IzFvXFfH5gEcltlud1rGz3hn6E5Z6xOfULpfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649663927; a=rsa-sha256; cv=none; b=jOzUiwH/tPacCXzIIeYAgKyk1qZePgXvQyuS56jTbOdt+ZutfzvM6b4zZyxaAOJRHcT/M/ OhTZOUBvTdbbU3X1LPk0hq4ijoyzN3evuglJ9T0b3UPPmi/x4MfqCPZQ5/YtIpi1ACUyFD qkv+RBIQ2ubVtMPVbJI301xlIE9u0rtpYI/SP0AdZ9ybEiMGL32HHTzJSPNhN2TgJfgpYt hlprgikP150v2K9aQFpympi5uFW1Oyl5nBAgeEWbWSFcVRDOWfTWuCWd7FTJjhh6KY2d6W xK4gnE4Ya/BClRdfPPwfHv2oBZh52oyiPxNyjHhRsDaWqbgrc9lXUTfXMoPNzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=d90109c46f356336fbfc3ee57eeb90135c2ff1f6 commit d90109c46f356336fbfc3ee57eeb90135c2ff1f6 Author: Alexey Dokuchaev AuthorDate: 2022-04-11 07:58:04 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-04-11 07:58:04 +0000 sysutils/parkverbot: update the port to version 1.5 FreeBSD support had been integrated upstream; however, keep the small hunk of our patch which reports the sector size, could be useful for debugging potential problems. Reported by: portscout --- sysutils/parkverbot/Makefile | 2 +- sysutils/parkverbot/distinfo | 6 +-- sysutils/parkverbot/files/patch-src_parkverbot.c | 62 ++---------------------- 3 files changed, 7 insertions(+), 63 deletions(-) diff --git a/sysutils/parkverbot/Makefile b/sysutils/parkverbot/Makefile index 620a519bc610..e0e620bfae7a 100644 --- a/sysutils/parkverbot/Makefile +++ b/sysutils/parkverbot/Makefile @@ -1,7 +1,7 @@ # Created by: Alexey Dokuchaev PORTNAME= parkverbot -PORTVERSION= 1.4 +PORTVERSION= 1.5 CATEGORIES= sysutils MASTER_SITES= https://inai.de/files/parkverbot/ diff --git a/sysutils/parkverbot/distinfo b/sysutils/parkverbot/distinfo index 561b134ee77d..50a581229da9 100644 --- a/sysutils/parkverbot/distinfo +++ b/sysutils/parkverbot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634490016 -SHA256 (parkverbot-1.4.tar.xz) = f8a1c2bbcf5821e677e50e59ad8cf281c6750f9410fd87939c7235f045b3afea -SIZE (parkverbot-1.4.tar.xz) = 75460 +TIMESTAMP = 1649595137 +SHA256 (parkverbot-1.5.tar.xz) = a52e88a60e0a11163ab596dde7d264ba9e80016cf4f276368bfe81f666456e20 +SIZE (parkverbot-1.5.tar.xz) = 78488 diff --git a/sysutils/parkverbot/files/patch-src_parkverbot.c b/sysutils/parkverbot/files/patch-src_parkverbot.c index c277daa38d12..04931af78b4f 100644 --- a/sysutils/parkverbot/files/patch-src_parkverbot.c +++ b/sysutils/parkverbot/files/patch-src_parkverbot.c @@ -1,64 +1,8 @@ ---- src/parkverbot.c.orig 2021-10-17 16:58:59 UTC +--- src/parkverbot.c.orig 2022-04-10 12:51:33 UTC +++ src/parkverbot.c -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -36,6 +37,7 @@ struct pv_bdev_entry { - struct HXlist_head anchor; - const char *path; - off_t size, prev_pos; -+ unsigned sector_size; - int fd; - }; - -@@ -72,6 +74,12 @@ static int pv_mainloop(void) - while (true) { - HXlist_for_each_entry(e, &pv_bdev_list, anchor) { - new_pos = HX_drand(0, e->size); -+ /* -+ * read(2) and write(2) require the offset to be -+ * a multiple of the sector size, otherwise they -+ * will return EINVAL; see FreeBSD PR 91149. -+ */ -+ new_pos -= new_pos % e->sector_size; - if (pv_in_window(e->prev_pos, new_pos, e)) { - printf("%s: %llu (in guard window)\n", e->path, - static_cast(unsigned long long, new_pos)); -@@ -104,6 +112,7 @@ static bool pv_open_device(const char *path) - struct pv_bdev_entry *e; - char buf[32]; - uint64_t size; -+ unsigned sector_size; - int fd; - - fd = open(path, O_RDONLY | O_BINARY); -@@ -111,10 +120,14 @@ static bool pv_open_device(const char *path) - fprintf(stderr, "%s: %s\n", path, strerror(errno)); - return false; - } -- if (ioctl(fd, BLKGETSIZE64, &size) < 0) { -- fprintf(stderr, "%s: BLKGETSIZE64: %s\n", path, strerror(errno)); -+ if (ioctl(fd, DIOCGSECTORSIZE, §or_size) < 0) { -+ fprintf(stderr, "%s: DIOCGSECTORSIZE: %s\n", path, strerror(errno)); - return false; - } -+ if (ioctl(fd, DIOCGMEDIASIZE, &size) < 0) { -+ fprintf(stderr, "%s: DIOCGMEDIASIZE: %s\n", path, strerror(errno)); -+ return false; -+ } - e = malloc(sizeof(*e)); - if (e == NULL) { - fprintf(stderr, "%s: %s\n", __func__, strerror(errno)); -@@ -124,9 +137,10 @@ static bool pv_open_device(const char *path) - HXlist_init(&e->anchor); - e->path = path; +@@ -150,8 +150,8 @@ static bool pv_open_device(const char *path) e->size = size; -+ e->sector_size = sector_size; + e->sector_size = sector_size; e->fd = fd; - printf("Added %s (size %s)\n", e->path, - HX_unit_size(buf, sizeof(buf), e->size, 1024, 0));