From nobody Wed Oct 20 06:23:02 2021 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 AE89218051F8; Wed, 20 Oct 2021 06:23: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 4HZ0sf4XV8z4mQm; Wed, 20 Oct 2021 06:23: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 7BFD022C0E; Wed, 20 Oct 2021 06:23: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 19K6N29D096720; Wed, 20 Oct 2021 06:23:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19K6N21N096719; Wed, 20 Oct 2021 06:23:02 GMT (envelope-from git) Date: Wed, 20 Oct 2021 06:23:02 GMT Message-Id: <202110200623.19K6N21N096719@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: b8fadbfc1c69 - main - sysutils/parkverbot: update the port to version 1.4 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: b8fadbfc1c6975a1c3f5e5d168fc7ecca46e2223 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=b8fadbfc1c6975a1c3f5e5d168fc7ecca46e2223 commit b8fadbfc1c6975a1c3f5e5d168fc7ecca46e2223 Author: Alexey Dokuchaev AuthorDate: 2021-10-20 06:21:48 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-10-20 06:21:50 +0000 sysutils/parkverbot: update the port to version 1.4 Reported by: portscout --- sysutils/parkverbot/Makefile | 2 +- sysutils/parkverbot/distinfo | 6 ++-- sysutils/parkverbot/files/patch-src_parkverbot.c | 38 ++++++------------------ 3 files changed, 13 insertions(+), 33 deletions(-) diff --git a/sysutils/parkverbot/Makefile b/sysutils/parkverbot/Makefile index 0fb34dfd0e14..620a519bc610 100644 --- a/sysutils/parkverbot/Makefile +++ b/sysutils/parkverbot/Makefile @@ -1,7 +1,7 @@ # Created by: Alexey Dokuchaev PORTNAME= parkverbot -PORTVERSION= 1.3 +PORTVERSION= 1.4 CATEGORIES= sysutils MASTER_SITES= https://inai.de/files/parkverbot/ diff --git a/sysutils/parkverbot/distinfo b/sysutils/parkverbot/distinfo index 9b865c28271c..561b134ee77d 100644 --- a/sysutils/parkverbot/distinfo +++ b/sysutils/parkverbot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1599224321 -SHA256 (parkverbot-1.3.tar.xz) = 721b4e8c87b3751db4d7adf33f24e4b4af88491626e20b5f5e2f42addd45d848 -SIZE (parkverbot-1.3.tar.xz) = 74356 +TIMESTAMP = 1634490016 +SHA256 (parkverbot-1.4.tar.xz) = f8a1c2bbcf5821e677e50e59ad8cf281c6750f9410fd87939c7235f045b3afea +SIZE (parkverbot-1.4.tar.xz) = 75460 diff --git a/sysutils/parkverbot/files/patch-src_parkverbot.c b/sysutils/parkverbot/files/patch-src_parkverbot.c index ddb394970412..c277daa38d12 100644 --- a/sysutils/parkverbot/files/patch-src_parkverbot.c +++ b/sysutils/parkverbot/files/patch-src_parkverbot.c @@ -1,4 +1,4 @@ ---- src/parkverbot.c.orig 2013-01-28 15:01:56 UTC +--- src/parkverbot.c.orig 2021-10-17 16:58:59 UTC +++ src/parkverbot.c @@ -18,6 +18,7 @@ #include @@ -8,35 +8,15 @@ #include #include #include -@@ -34,7 +35,8 @@ - struct pv_bdev_entry { +@@ -36,6 +37,7 @@ struct pv_bdev_entry { struct HXlist_head anchor; const char *path; -- loff_t size, prev_pos; -+ off_t size, prev_pos; + off_t size, prev_pos; + unsigned sector_size; int fd; }; -@@ -43,7 +45,7 @@ static struct timespec pv_req_interval = {4, 0}; - static unsigned long long pv_disk_window = 16384; - static unsigned long long pv_buffer_size = 64; - --static const char *pv_readable_size(char *buf, size_t bufsize, loff_t size) -+static const char *pv_readable_size(char *buf, size_t bufsize, off_t size) - { - static const char unit_names[][2] = - {"", "K", "M", "G", "T", "P", "E", "Y", "Z"}; -@@ -73,7 +75,7 @@ static bool pv_in_window(size_t prev_pos, size_t new_p - static int pv_mainloop(void) - { - struct pv_bdev_entry *e; -- loff_t new_pos; -+ off_t new_pos; - ssize_t read_ret; - char *buffer; - -@@ -86,6 +88,12 @@ static int pv_mainloop(void) +@@ -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); @@ -49,7 +29,7 @@ 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)); -@@ -118,6 +126,7 @@ static bool pv_open_device(const char *path) +@@ -104,6 +112,7 @@ static bool pv_open_device(const char *path) struct pv_bdev_entry *e; char buf[32]; uint64_t size; @@ -57,7 +37,7 @@ int fd; fd = open(path, O_RDONLY | O_BINARY); -@@ -125,10 +134,14 @@ static bool pv_open_device(const char *path) +@@ -111,10 +120,14 @@ static bool pv_open_device(const char *path) fprintf(stderr, "%s: %s\n", path, strerror(errno)); return false; } @@ -74,16 +54,16 @@ e = malloc(sizeof(*e)); if (e == NULL) { fprintf(stderr, "%s: %s\n", __func__, strerror(errno)); -@@ -138,9 +151,10 @@ static bool pv_open_device(const char *path) +@@ -124,9 +137,10 @@ static bool pv_open_device(const char *path) HXlist_init(&e->anchor); e->path = path; e->size = size; + e->sector_size = sector_size; e->fd = fd; - printf("Added %s (size %s)\n", e->path, -- pv_readable_size(buf, sizeof(buf), e->size)); +- HX_unit_size(buf, sizeof(buf), e->size, 1024, 0)); + printf("Added %s (size %s, sector size %d bytes)\n", e->path, -+ pv_readable_size(buf, sizeof(buf), e->size), sector_size); ++ HX_unit_size(buf, sizeof(buf), e->size, 1024, 0), sector_size); HXlist_add_tail(&pv_bdev_list, &e->anchor); return true; }