From nobody Mon Sep 30 23:59:26 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 4XHdMy3KlBz5Xs5n; Mon, 30 Sep 2024 23:59:26 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHdMy2RgNz4gVG; Mon, 30 Sep 2024 23:59:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727740766; 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=8dO6yZyMkvX4AZ87ny8gtxXmS/GmvPexOMoysli+bgM=; b=I77zBC17O9dNXeRcaXm6L38al96OjK7L71IcWAUZV5Cp0WxfKGzY/V2TRJy156KR3oZ0MW PZmGE15fF2vLBzNzPsgkNiA9Uw3gvznle5mEF6vLmElARa52MSDO782M8rAamilN9gbN7J qx3C1ofF6o6+PR9UT5ecs9ZiFv6vZQwhLm2maTdwCGBrqV3FhEFlcAD7a83qlFs1eRDYAa Wfshu4vu0wPNho6TlMhSyXY3MtZkW0Nry3rOVFTh4h0GfFsjEUl16uee+Mot0bI+C82CLb 4xuGZRqem58ue0MIYsNJMZksn48/3nVbGNtGb1hFaij0R/JbDyI6gUxplSdzyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727740766; 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=8dO6yZyMkvX4AZ87ny8gtxXmS/GmvPexOMoysli+bgM=; b=hUYDL4dXCH42G2vmHFlwEt9H7AVHDNMju7LHabY5VrEAnyTL4qi0i0/3M2+6cmPBPkIvW+ Hd5xJdtMg6M+wKty/Vt+WObf5PLjXUF0mI1+AQlH+XbuXhmX/jieP3xLPbb54dZY4KPpG7 kBubSjDo74LXmmtytkXMR5VdUfptdhI7JCs6qmE5OmTOioPp/SPV6WkQYeZG0BseT46nzY gjseBsB7fCAshSLcwFJLalu6kjBNjRdb/jax0bpnHMy42wIqqtn5jy1OxlPkpP5ymlXinF UuO4yacrTk3wR2lr3Zvb7w0oNw3TI+DE4ah1ZgtPw8ccqR+OX9Ad8g6hQLREhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727740766; a=rsa-sha256; cv=none; b=Y7pX6kdD+p2Cg6ysi80SECsG+wVjKPae1wFoz9ZUaqYqbSaDewXOuBxa2a97NvHG8AqorK oH+c/fsgadF1S8kEChl/xmUEF3yt32tFCqvyQnT4IzwibWxznd8bzfIuI9sfgNKTyDk6fN l4+Kdz7KyAx7YBWCX5lskEg0eYDec4ewB7U5iOyGXYObmypEUzZGIdxxZKwVm+UySBuOOG 9YCS2b2tHRpSUPtaSkSpFKtyJ6i3lc0q3t/CrSod17+4B/0lgpORnTQipUxKEKV7xuqo/x 08M+IGL1efsW0tEnyz6tJudI6MXryN5KRcCzSON97UTnYWR+O+VXts1MXwgWpQ== 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 4XHdMy1d09z1Crw; Mon, 30 Sep 2024 23:59:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UNxQa0080753; Mon, 30 Sep 2024 23:59:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UNxQbN080750; Mon, 30 Sep 2024 23:59:26 GMT (envelope-from git) Date: Mon, 30 Sep 2024 23:59:26 GMT Message-Id: <202409302359.48UNxQbN080750@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: cc977a4b8b8b - main - sysutils/copytape: include errno.h for errno 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: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc977a4b8b8bd932d57b86c55415328eb09e3647 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=cc977a4b8b8bd932d57b86c55415328eb09e3647 commit cc977a4b8b8bd932d57b86c55415328eb09e3647 Author: Brooks Davis AuthorDate: 2024-09-30 15:56:09 +0000 Commit: Brooks Davis CommitDate: 2024-09-30 23:59:21 +0000 sysutils/copytape: include errno.h for errno errno must be accessed by a macro from errno.h. Tidy includes and add unistd.h for read/write. Consolidate patches for easy of maintenance. This code is borderline useless and certainly broken with modern tape sizes due to the use of ints for sizes. PR: 281781 Approved by: sjroz@verizon.net (maintainer) --- sysutils/copytape/Makefile | 2 +- .../files/{patch-copytape.c_1 => patch-copytape.c} | 23 +++++++++++++++++----- sysutils/copytape/files/patch-copytape.c_2 | 11 ----------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/sysutils/copytape/Makefile b/sysutils/copytape/Makefile index ede11c03c22a..c2ad2ab39f43 100644 --- a/sysutils/copytape/Makefile +++ b/sysutils/copytape/Makefile @@ -1,6 +1,6 @@ PORTNAME= copytape PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= COMP_SOURCES/unix/volume10 DISTNAME= copytape diff --git a/sysutils/copytape/files/patch-copytape.c_1 b/sysutils/copytape/files/patch-copytape.c similarity index 59% rename from sysutils/copytape/files/patch-copytape.c_1 rename to sysutils/copytape/files/patch-copytape.c index 0be1bdc8d526..8dc9a0708c88 100644 --- a/sysutils/copytape/files/patch-copytape.c_1 +++ b/sysutils/copytape/files/patch-copytape.c @@ -1,15 +1,28 @@ ---- copytape.c.orig Fri Oct 23 17:23:06 1998 -+++ copytape.c Fri Oct 23 17:23:46 1998 -@@ -36,7 +36,7 @@ +--- copytape.c.orig ++++ copytape.c +@@ -28,15 +28,18 @@ + */ - extern int errno; + +-#include + #include + #include + #include + #include + +-extern int errno; ++#include ++#include ++#include ++#include ++#include -#define BUFLEN 262144 /* max tape block size */ +#define BUFLEN (1024*1024) /* max tape block size */ #define TAPE_MARK -100 /* return record length if we read a * tape mark */ #define END_OF_TAPE -101 /* 2 consecutive tape marks */ -@@ -149,7 +149,7 @@ +@@ -149,7 +152,7 @@ len = input(from); } while (len > 0); if (len == FORMAT_ERROR) { diff --git a/sysutils/copytape/files/patch-copytape.c_2 b/sysutils/copytape/files/patch-copytape.c_2 deleted file mode 100644 index 8838843a4939..000000000000 --- a/sysutils/copytape/files/patch-copytape.c_2 +++ /dev/null @@ -1,11 +0,0 @@ ---- copytape.c.orig 2013-10-16 06:54:00.000000000 -0400 -+++ copytape.c 2013-10-16 06:54:13.000000000 -0400 -@@ -29,6 +29,8 @@ - - - #include -+#include -+#include - #include - #include - #include