From owner-dev-commits-ports-all@freebsd.org Wed Jul 28 05:52:36 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 8EDBA651910; Wed, 28 Jul 2021 05:52:36 +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 4GZN9J3MnSz4RZ2; Wed, 28 Jul 2021 05:52:36 +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 5CC1518C21; Wed, 28 Jul 2021 05:52:36 +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 16S5qacH025031; Wed, 28 Jul 2021 05:52:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16S5qau9025030; Wed, 28 Jul 2021 05:52:36 GMT (envelope-from git) Date: Wed, 28 Jul 2021 05:52:36 GMT Message-Id: <202107280552.16S5qau9025030@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: 70984f1ada63 - main - print/a2ps: fix build with clang buildins MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dinoex X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70984f1ada639d0e44db6427d656b53ad34dbe77 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2021 05:52:36 -0000 The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=70984f1ada639d0e44db6427d656b53ad34dbe77 commit 70984f1ada639d0e44db6427d656b53ad34dbe77 Author: Dirk Meyer AuthorDate: 2021-07-28 05:51:52 +0000 Commit: Dirk Meyer CommitDate: 2021-07-28 05:51:52 +0000 print/a2ps: fix build with clang buildins --- print/a2ps/files/patch-options.c | 2 +- print/a2ps/files/patch-output.c | 6 ++---- print/a2ps/files/patch-path-concat.c | 11 +++++++++++ print/a2ps/files/patch-printers.c | 2 +- print/a2ps/files/patch-printlen.c | 9 +++++---- print/a2ps/files/patch-title.c | 2 +- 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/print/a2ps/files/patch-options.c b/print/a2ps/files/patch-options.c index a5ec2217d8ad..e4f214a09350 100644 --- a/print/a2ps/files/patch-options.c +++ b/print/a2ps/files/patch-options.c @@ -1,6 +1,6 @@ --- lib/options.c.orig 1999-08-31 17:42:41 UTC +++ lib/options.c -@@ -493,6 +493,15 @@ a2ps_handle_options (a2ps_job * job, int +@@ -493,6 +493,15 @@ a2ps_handle_options (a2ps_job * job, int argc, char *a /* A font size is given */ job->fontsize = get_length ("--font-size", cp, 0.0, 0.0, "pt", range_min_strict); diff --git a/print/a2ps/files/patch-output.c b/print/a2ps/files/patch-output.c index 325dc1887b78..a4b487661f87 100644 --- a/print/a2ps/files/patch-output.c +++ b/print/a2ps/files/patch-output.c @@ -1,8 +1,6 @@ -Fix for CVE-2015-8107 -http://www.openwall.com/lists/oss-security/2015/11/16/4 --- lib/output.c.orig 1999-08-31 17:42:41 UTC -+++ lib/output.c 2015-11-18 07:08:31.672864000 +0100 -@@ -525,7 +525,7 @@ ++++ lib/output.c +@@ -525,7 +525,7 @@ output_file (struct output * out, a2ps_job * job, expand_user_string (job, FIRST_FILE (job), (const uchar *) "Expand: requirement", (const uchar *) token)); diff --git a/print/a2ps/files/patch-path-concat.c b/print/a2ps/files/patch-path-concat.c new file mode 100644 index 000000000000..8f8edd4120d8 --- /dev/null +++ b/print/a2ps/files/patch-path-concat.c @@ -0,0 +1,11 @@ +--- lib/path-concat.c.orig 1999-10-10 18:34:46 UTC ++++ lib/path-concat.c +@@ -31,7 +31,7 @@ + #endif + #include + +-char *malloc (); ++#include + + #ifndef DIRECTORY_SEPARATOR + # define DIRECTORY_SEPARATOR '/' diff --git a/print/a2ps/files/patch-printers.c b/print/a2ps/files/patch-printers.c index 52ff8ac9b185..e19d419fa0e0 100644 --- a/print/a2ps/files/patch-printers.c +++ b/print/a2ps/files/patch-printers.c @@ -1,6 +1,6 @@ --- lib/printers.c.orig 1999-10-11 22:01:59 UTC +++ lib/printers.c -@@ -315,8 +315,8 @@ a2ps_printers_new (struct a2ps_common_s +@@ -315,8 +315,8 @@ a2ps_printers_new (struct a2ps_common_s * common) res->ppd = NULL; /* Printer's ppd are not read yet */ /* Output */ diff --git a/print/a2ps/files/patch-printlen.c b/print/a2ps/files/patch-printlen.c index 4afb7da9f1d5..d56cc8e24b29 100644 --- a/print/a2ps/files/patch-printlen.c +++ b/print/a2ps/files/patch-printlen.c @@ -1,6 +1,6 @@ --- lib/printlen.c.orig 1999-08-31 17:42:42 UTC +++ lib/printlen.c -@@ -28,14 +28,11 @@ Foundation, Inc., 59 Temple Place - Suit +@@ -28,15 +28,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, unsigned long strtoul (); static int @@ -11,12 +11,13 @@ int total_width = 0; int width = 0; - va_list ap; -- -- memcpy (&ap, args, sizeof (va_list)); +- memcpy (&ap, args, sizeof (va_list)); +- for (cp = format ; *cp ; cp++) { -@@ -99,7 +96,7 @@ int_printflen (const char *format, va_li + if (*cp != '%') +@@ -99,7 +96,7 @@ int_printflen (const char *format, va_list *args) int vprintflen (const char *format, va_list args) { diff --git a/print/a2ps/files/patch-title.c b/print/a2ps/files/patch-title.c index 7f0a807aa26f..a444fc7ead76 100644 --- a/print/a2ps/files/patch-title.c +++ b/print/a2ps/files/patch-title.c @@ -1,6 +1,6 @@ --- lib/title.c.orig 1999-08-28 16:54:19 UTC +++ lib/title.c -@@ -88,6 +88,8 @@ title (stream, c, center_p, format, va_a +@@ -88,6 +88,8 @@ title (stream, c, center_p, format, va_alist) if (center_p) for (padding = 0 ; padding < 79 - len ; padding += 2) putc (' ', stream);